diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..5a080d1
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [tlhunter]
+custom: https://www.paypal.me/phobosrising/5
diff --git a/.gitignore b/.gitignore
index 75693ab..0ce3f6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ sessions/*
 .netrwhist
 tags
 tags-ja
+local.vimrc
+spell
diff --git a/README.md b/README.md
index 3b4c7e1..91a35bc 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ![Screenshot](./screenshot.png "Screenshot of this .vimrc in action")
 
 This Vim configuration is meant to make Vim feel more like an IDE than a simple console-based text editor.
-I use it mostly under with MacVIM and Linux GVim though I occasionally run it directly in a terminal.
+This configuration is optimized for use with GVim though it certainly works in the terminal as well.
 
 ## Installation
 
@@ -14,7 +14,7 @@ You can run `git pull` inside of `~/.vim` if you'd ever like to grab the latest
 
 ```bash
 cd ~
-git clone git://github.com/tlhunter/vimrc.git .vim
+git clone git@github.com:tlhunter/vimrc.git .vim
 ln -s ~/.vim/vimrc ~/.vimrc # Optional, needed for some VIM installations
 ```
 
@@ -30,7 +30,6 @@ wget https://github.com/tlhunter/vimrc/archive/master.zip
 
 * Edit many files at the same time
 * File Browser on left side of screen
-* Functions, Variables, Classes on right
 * Move between files in center screen
 * View status of the current GIT repo, if applicable
 * Additional features when running under MacVIM
@@ -38,7 +37,7 @@ wget https://github.com/tlhunter/vimrc/archive/master.zip
 
 ### Leader Key
 
-As of `v0.2.0`, the Leader key is now bound to `Space` (used to be `Comma`)
+- Space
 
 ### Switching between files (Buffers)
 
@@ -55,7 +54,6 @@ As of `v0.2.0`, the Leader key is now bound to `Space` (used to be `Comma`)
 * Use `<Leader>n` to toggle the file browser
 * Use `Ctrl P` to perform a recursive fuzzy filename search
 * Use `<Leader>a` and type a phrase to search to search based on content within your files (quote and escape if needed)
-* Use `<Leader>A` to close the open ack search results at the bottom of the screen
 
 ### File Browser (NERDTree)
 
@@ -68,29 +66,3 @@ As of `v0.2.0`, the Leader key is now bound to `Space` (used to be `Comma`)
 * Use `?` if you'd like some NERDTree documentation
 * Use `o` to open the selected file in a new buffer
 * Use `t` to open the selected file in a new tab
-
-### Tabs
-
-* Use `Cmd t` (or `Alt t` in Linux GVim) to open a new tab
-* Use `Cmd w` (or `Alt w` in Linux GVim) to close the current tab
-* Use `Cmd 1` to `Cmd 9` (or `Alt 1` to `Alt 9` in Linux GVim) to navigate to the specified tab
-
-### Themes (ColorSchemes)
-
-There is a very large collection of colorschemes in this repository.
-Many of them can be seen [here](http://vimcolors.com/).
-Set the scheme using `:colorscheme NAME`.
-
-* Use `<Leader>x` to switch to a random theme.
-
-### Text Navigation
-
-Other than the myriad of built-in methods for navigating text...
-
-* Use `<Leader><Leader>b` to highlight and jump to previous words
-* Use `<Leader><Leader>w` to highlight and jump to following words
-
-### Copying and Pasting between OS
-
-* Use `<Leader>c` to copy the highlighted text into the OS clipboard
-* Use `<Leader>v` to paste the OS clipboard into the document
diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim
deleted file mode 100644
index be68389..0000000
--- a/autoload/pathogen.vim
+++ /dev/null
@@ -1,230 +0,0 @@
-" pathogen.vim - path option manipulation
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.0
-
-" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
-"
-" For management of individually installed plugins in ~/.vim/bundle (or
-" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
-" prior to `fileype plugin indent on` 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
-
-" Point of entry for basic default usage.  Give a directory name to invoke
-" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
-" to invoke pathogen#runtime_prepend_subdirectories().  Afterwards,
-" pathogen#cycle_filetype() is invoked.
-function! pathogen#infect(...) abort " {{{1
-  let source_path = a:0 ? a:1 : 'bundle'
-  if source_path =~# '[\\/]'
-    call pathogen#runtime_prepend_subdirectories(source_path)
-  else
-    call pathogen#runtime_append_all_bundles(source_path)
-  endif
-  call pathogen#cycle_filetype()
-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 has_key(seen,a:list[i])
-      call remove(a:list,i)
-    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
-
-" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
-" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
-function! pathogen#is_disabled(path) " {{{1
-  if a:path =~# '\~$'
-    return 1
-  elseif !exists("g:pathogen_disabled")
-    return 0
-  endif
-  let sep = pathogen#separator()
-  return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
-endfunction "}}}1
-
-" Prepend all subdirectories of path to the rtp, and append all 'after'
-" directories in those subdirectories.
-function! pathogen#runtime_prepend_subdirectories(path) " {{{1
-  let sep    = pathogen#separator()
-  let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
-  let after  = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
-  let rtp = pathogen#split(&rtp)
-  let path = expand(a:path)
-  call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
-  let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
-  return &rtp
-endfunction " }}}1
-
-" For each directory in rtp, check for a subdirectory named dir.  If it
-" exists, add all subdirectories of that subdirectory to the rtp, immediately
-" after the original directory.  If no argument is given, 'bundle' is used.
-" Repeated calls with the same arguments are ignored.
-function! pathogen#runtime_append_all_bundles(...) " {{{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$'
-      let list +=  filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
-    else
-      let list +=  [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
-    endif
-  endfor
-  let &rtp = pathogen#join(pathogen#uniq(list))
-  return 1
-endfunction
-
-let s:done_bundles = ''
-" }}}1
-
-" Invoke :helptags on all non-$VIM doc directories in runtimepath.
-function! pathogen#helptags() " {{{1
-  let sep = pathogen#separator()
-  for dir in pathogen#split(&rtp)
-    if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.'/doc') == 2 && !empty(glob(dir.'/doc/*')) && (!filereadable(dir.'/doc/tags') || filewritable(dir.'/doc/tags'))
-      helptags `=dir.'/doc'`
-    endif
-  endfor
-endfunction " }}}1
-
-command! -bar Helptags :call pathogen#helptags()
-
-" Like findfile(), but hardcoded to use the runtimepath.
-function! pathogen#rtpfindfile(file,count) "{{{1
-  let rtp = pathogen#join(1,pathogen#split(&rtp))
-  return fnamemodify(findfile(a:file,rtp,a:count),':p')
-endfunction " }}}1
-
-function! s:find(count,cmd,file,...) " {{{1
-  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
-  let file = pathogen#rtpfindfile(a:file,a:count)
-  if file ==# ''
-    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
-  elseif a:0
-    let path = file[0:-strlen(a:file)-2]
-    execute a:1.' `=path`'
-    return a:cmd.' '.fnameescape(a:file)
-  else
-    return a:cmd.' '.fnameescape(file)
-  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 matches = split(glob(path.sep.pattern),"\n")
-    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
-    call map(matches,'v:val[strlen(path)+1:-1]')
-    for match in matches
-      let found[match] = 1
-    endfor
-  endfor
-  return sort(keys(found))
-endfunction " }}}1
-
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read<bang>',<q-args>)
-command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,'lcd')
-
-" vim:set ft=vim ts=8 sw=2 sts=2:
diff --git a/bundle/ack/doc/ack.txt b/bundle/ack/doc/ack.txt
deleted file mode 100644
index 4d57841..0000000
--- a/bundle/ack/doc/ack.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-*ack.txt*   Plugin that integrates ack with Vim
-
-==============================================================================
-Author:  Antoine Imbert <antoine.imbert+ackvim@gmail.com>         *ack-author*
-License: Same terms as Vim itself (see |license|)
-
-==============================================================================
-INTRODUCTION                                                             *ack*
-
-This plugin is a front for the Perl module App::Ack.  Ack can be used as a
-replacement for grep.  This plugin will allow you to run ack from vim, and
-shows the results in a split window.
-
-:Ack [options] {pattern} [{directory}]                                  *:Ack*
-
-    Search recursively in {directory} (which defaults to the current
-    directory) for the {pattern}.  Behaves just like the |:grep| command, but
-    will open the |Quickfix| window for you.
-
-:AckAdd [options] {pattern} [{directory}]                            *:AckAdd*
-
-    Just like |:Ack| + |:grepadd|.  Appends the |quickfix| with the results
-
-:LAck [options] {pattern} [{directory}]                                *:LAck*
-
-    Just like |:Ack| + |:lgrep|.  Searches, but opens in |location-list|
-
-:LAckAdd [options] {pattern} [{directory}]                          *:LAckAdd*
-
-    Just like |:Ack| + |:lgrepadd|.  Searches, but appends results to
-    |location-list|
-
-Files containing the search term will be listed in the split window, along
-with the line number of the occurrence, once for each occurrence.  <Enter> on
-a line in this window will open the file, and place the cursor on the matching
-line.
-
-See http://search.cpan.org/~petdance/ack/ack for more information.
diff --git a/bundle/ack/plugin/ack.vim b/bundle/ack/plugin/ack.vim
deleted file mode 100644
index 1aecd51..0000000
--- a/bundle/ack/plugin/ack.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" NOTE: You must, of course, install the ack script
-"       in your path.
-" On Ubuntu:
-"   sudo apt-get install ack-grep
-"   ln -s /usr/bin/ack-grep /usr/bin/ack
-" With MacPorts:
-"   sudo port install p5-app-ack
-
-let g:ackprg="ack\\ -H\\ --nocolor\\ --nogroup"
-
-function! Ack(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:ackprg
-    execute "silent! grep " . a:args
-    botright copen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! AckAdd(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:ackprg
-    execute "silent! grepadd " . a:args
-    botright copen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! LAck(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:ackprg
-    execute "silent! lgrep " . a:args
-    botright lopen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! LAckAdd(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:ackprg
-    execute "silent! lgrepadd " . a:args
-    botright lopen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-command! -nargs=* -complete=file Ack call Ack(<q-args>)
-command! -nargs=* -complete=file AckAdd call AckAdd(<q-args>)
-command! -nargs=* -complete=file LAck call LAck(<q-args>)
-command! -nargs=* -complete=file LAckAdd call LAckAdd(<q-args>)
diff --git a/bundle/airline/.gitignore b/bundle/airline/.gitignore
deleted file mode 100755
index 296f094..0000000
--- a/bundle/airline/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-doc/tags
-*.lock
-.vim-flavor
diff --git a/bundle/airline/.travis.yml b/bundle/airline/.travis.yml
deleted file mode 100755
index 9ed483e..0000000
--- a/bundle/airline/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-script: rake ci
diff --git a/bundle/airline/Gemfile b/bundle/airline/Gemfile
deleted file mode 100755
index 088f22e..0000000
--- a/bundle/airline/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source 'https://rubygems.org/'
-gem 'vim-flavor', '~> 1.1'
diff --git a/bundle/airline/LICENSE b/bundle/airline/LICENSE
deleted file mode 100755
index 9a5a8b7..0000000
--- a/bundle/airline/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (C) 2013-2014 Bailey Ling
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/bundle/airline/README.md b/bundle/airline/README.md
deleted file mode 100755
index eaf1a47..0000000
--- a/bundle/airline/README.md
+++ /dev/null
@@ -1,220 +0,0 @@
-# vim-airline [![Build Status](https://travis-ci.org/bling/vim-airline.png)](https://travis-ci.org/bling/vim-airline)
-
-Lean &amp; mean status/tabline for vim that's light as air.
-
-![img](https://github.com/bling/vim-airline/wiki/screenshots/demo.gif)
-
-# Features
-
-*  Tiny core written with extensibility in mind ([open/closed principle][8]).
-*  Integrates with a variety of plugins, including: [vim-bufferline][6], [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [vim-signify][30], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35].
-*  Looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
-*  Optimized for speed; it loads in under a millisecond.
-*  Extensive suite of themes for popular color schemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others; have a look at the [screenshots][14] in the wiki.
-*  Supports 7.2 as the minimum Vim version.
-*  The master branch tries to be as stable as possible, and new features are merged in only after they have gone through a [full regression test][33].
-*  Unit testing suite.
-
-## Straightforward customization
-
-If you don't like the defaults, you can replace all sections with standard `statusline` syntax.  Give your statusline that you've built over the years a face lift.
-
-![image](https://f.cloud.github.com/assets/306502/1009429/d69306da-0b38-11e3-94bf-7c6e3eef41e9.png)
-
-## Automatic truncation
-
-Sections and parts within sections can be configured to automatically hide when the window size shrinks.
-
-![image](https://f.cloud.github.com/assets/306502/1060831/05c08aac-11bc-11e3-8470-a506a3037f45.png)
-
-## Smarter tab line
-
-Automatically displays all buffers when there's only one tab open.
-
-![tabline](https://f.cloud.github.com/assets/306502/1072623/44c292a0-1495-11e3-9ce6-dcada3f1c536.gif)
-
-This is disabled by default; add the following to your vimrc to enable the extension:
-
-    let g:airline#extensions#tabline#enabled = 1
-
-Separators can be configured independently for the tabline, so here is how you can define "straight" tabs:
-
-    let g:airline#extensions#tabline#left_sep = ' '
-    let g:airline#extensions#tabline#left_alt_sep = '|'
-
-## Seamless integration
-
-vim-airline integrates with a variety of plugins out of the box.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off).
-
-#### [ctrlp.vim][10]
-![image](https://f.cloud.github.com/assets/306502/962258/7345a224-04ec-11e3-8b5a-f11724a47437.png)
-
-#### [unite.vim][9]
-![image](https://f.cloud.github.com/assets/306502/962319/4d7d3a7e-04ed-11e3-9d59-ab29cb310ff8.png)
-
-#### [tagbar][19]
-![image](https://f.cloud.github.com/assets/306502/962150/7e7bfae6-04ea-11e3-9e28-32af206aed80.png)
-
-#### [csv.vim][28]
-![image](https://f.cloud.github.com/assets/306502/962204/cfc1210a-04eb-11e3-8a93-42e6bcd21efa.png)
-
-#### [syntastic][5]
-![image](https://f.cloud.github.com/assets/306502/962864/9824c484-04f7-11e3-9928-da94f8c7da5a.png)
-
-#### hunks ([vim-gitgutter][29] & [vim-signify][30])
-![image](https://f.cloud.github.com/assets/306502/995185/73fc7054-09b9-11e3-9d45-618406c6ed98.png)
-
-#### [virtualenv][31]
-![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
-
-#### [tmuxline][35]
-![image](https://f.cloud.github.com/assets/1532071/1559276/4c28fbac-4fc7-11e3-90ef-7e833d980f98.gif)
-
-#### [promptline][36]
-![airline-promptline-sc](https://f.cloud.github.com/assets/1532071/1871900/7d4b28a0-789d-11e3-90e4-16f37269981b.gif)
-
-## Extras
-
-vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
-
-#### whitespace
-![image](https://f.cloud.github.com/assets/306502/962401/2a75385e-04ef-11e3-935c-e3b9f0e954cc.png)
-
-## Configurable and extensible
-
-#### Fine-tuned configuration
-
-Every section is composed of parts, and you can reorder and reconfigure them at will.
-
-![image](https://f.cloud.github.com/assets/306502/1073278/f291dd4c-14a3-11e3-8a83-268e2753f97d.png)
-
-Sections can contain accents, which allows for very granular control of visuals (see configuration [here](https://github.com/bling/vim-airline/issues/299#issuecomment-25772886)).
-
-![image](https://f.cloud.github.com/assets/306502/1195815/4bfa38d0-249d-11e3-823e-773cfc2ca894.png)
-
-#### Extensible pipeline
-
-Completely transform the statusline to your liking.  Build out the statusline as you see fit by extracting colors from the current colorscheme's highlight groups.
-
-![allyourbase](https://f.cloud.github.com/assets/306502/1022714/e150034a-0da7-11e3-94a5-ca9d58a297e8.png)
-
-# Rationale
-
-There's already [powerline][2], why yet another statusline?
-
-*  100% vimscript; no python needed.
-
-What about [vim-powerline][1]?
-
-*  vim-powerline has been deprecated in favor of the newer, unifying powerline, which is under active development; the new version is written in python at the core and exposes various bindings such that it can style statuslines not only in vim, but also tmux, bash, zsh, and others.
-
-# Where did the name come from?
-
-I wrote the initial version on an airplane, and since it's light as air it turned out to be a good name.  Thanks for flying vim!
-
-# Installation
-
-This plugin follows the standard runtime path structure, and as such it can be installed with a variety of plugin managers:
-
-*  [Pathogen][11]
-  *  `git clone https://github.com/bling/vim-airline ~/.vim/bundle/vim-airline`
-*  [NeoBundle][12]
-  *  `NeoBundle 'bling/vim-airline'`
-*  [Vundle][13]
-  *  `Plugin 'bling/vim-airline'`
-*  [VAM][22]
-  *  `call vam#ActivateAddons([ 'vim-airline' ])`
-*  manual
-  *  copy all of the files into your `~/.vim` directory
-
-# Configuration
-
-`:help airline`
-
-The default setting of 'laststatus' is for the statusline to not appear until a split is created. If you want it to appear all the time, add the following to your vimrc:
-`set laststatus=2`
-
-# Integrating with powerline fonts
-
-For the nice looking powerline symbols to appear, you will need to install a patched font.  Instructions can be found in the official powerline [documentation][20].  Prepatched fonts can be found in the [powerline-fonts][3] repository.
-
-Finally, you can add the convenience variable `let g:airline_powerline_fonts = 1` to your vimrc which will automatically populate the `g:airline_symbols` dictionary with the powerline symbols.
-
-# FAQ
-
-Solutions to common problems can be found in the [Wiki][27].
-
-# Performance
-
-Whoa!  Everything got slow all of a sudden...
-
-vim-airline strives to make it easy to use out of the box, which means that by default it will look for all compatible plugins that you have installed and enable the relevant extension.
-
-Many optimizations have been made such that the majority of users will not see any performance degradation, but it can still happen.  For example, users who routinely open very large files may want to disable the tagbar extension, as it can be very expensive to scan for the name of the current function.
-
-The [minivimrc][7] project has some helper mappings to troubleshoot performance related issues.
-
-# Screenshots
-
-A full list of screenshots for various themes can be found in the [Wiki][14].
-
-# Bugs
-
-Tracking down bugs can take a very long time due to different configurations, versions, and operating systems.  To ensure a timely response, please help me out by doing the following:
-
-*  Reproduce it with this [minivimrc][7] repository to rule out any configuration conflicts.
-*  A link to your vimrc or a gist which shows how you configured the plugin(s).
-*  And so I can reproduce; your `:version` of vim, and the commit of vim-airline you're using.
-
-# Contributions
-
-Contributions and pull requests are welcome.  Please take note of the following guidelines:
-
-*  Adhere to the existing style as much as possible; notably, 2 space indents and long-form keywords.
-*  Keep the history clean! squash your branches before you submit a pull request. `pull --rebase` is your friend.
-*  Any changes to the core should be tested against Vim 7.2.
-*  If you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
-
-# License
-
-MIT License. Copyright (c) 2013-2014 Bailey Ling.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/bling/vim-airline/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
-[1]: https://github.com/Lokaltog/vim-powerline
-[2]: https://github.com/Lokaltog/powerline
-[3]: https://github.com/Lokaltog/powerline-fonts
-[4]: https://github.com/tpope/vim-fugitive
-[5]: https://github.com/scrooloose/syntastic
-[6]: https://github.com/bling/vim-bufferline
-[7]: https://github.com/bling/minivimrc
-[8]: http://en.wikipedia.org/wiki/Open/closed_principle
-[9]: https://github.com/Shougo/unite.vim
-[10]: https://github.com/kien/ctrlp.vim
-[11]: https://github.com/tpope/vim-pathogen
-[12]: https://github.com/Shougo/neobundle.vim
-[13]: https://github.com/gmarik/vundle
-[14]: https://github.com/bling/vim-airline/wiki/Screenshots
-[15]: https://github.com/techlivezheng/vim-plugin-minibufexpl
-[16]: https://github.com/sjl/gundo.vim
-[17]: https://github.com/mbbill/undotree
-[18]: https://github.com/scrooloose/nerdtree
-[19]: https://github.com/majutsushi/tagbar
-[20]: https://powerline.readthedocs.org/en/master/installation.html#patched-fonts
-[21]: https://bitbucket.org/ludovicchabant/vim-lawrencium
-[22]: https://github.com/MarcWeber/vim-addon-manager
-[23]: https://github.com/altercation/solarized
-[24]: https://github.com/chriskempson/tomorrow-theme
-[25]: https://github.com/tomasr/molokai
-[26]: https://github.com/nanotech/jellybeans.vim
-[27]: https://github.com/bling/vim-airline/wiki/FAQ
-[28]: https://github.com/chrisbra/csv.vim
-[29]: https://github.com/airblade/vim-gitgutter
-[30]: https://github.com/mhinz/vim-signify
-[31]: https://github.com/jmcantrell/vim-virtualenv
-[32]: https://github.com/chriskempson/base16-vim
-[33]: https://github.com/bling/vim-airline/wiki/Test-Plan
-[34]: http://eclim.org
-[35]: https://github.com/edkolev/tmuxline.vim
-[36]: https://github.com/edkolev/promptline.vim
diff --git a/bundle/airline/Rakefile b/bundle/airline/Rakefile
deleted file mode 100755
index 741cfc2..0000000
--- a/bundle/airline/Rakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env rake
-
-task :default => [:test]
-
-task :ci => [:dump, :test]
-
-task :dump do
-  sh 'vim --version'
-end
-
-task :test do
-  sh 'bundle exec vim-flavor test'
-end
-
diff --git a/bundle/airline/autoload/airline.vim b/bundle/airline/autoload/airline.vim
deleted file mode 100755
index 81cf3b5..0000000
--- a/bundle/airline/autoload/airline.vim
+++ /dev/null
@@ -1,172 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
-
-let s:sections = ['a','b','c','gutter','x','y','z','warning']
-let s:inactive_funcrefs = []
-
-function! airline#add_statusline_func(name)
-  call airline#add_statusline_funcref(function(a:name))
-endfunction
-
-function! airline#add_statusline_funcref(function)
-  if index(g:airline_statusline_funcrefs, a:function) >= 0
-    echohl WarningMsg
-    echo 'The airline statusline funcref '.string(a:function).' has already been added.'
-    echohl NONE
-    return
-  endif
-  call add(g:airline_statusline_funcrefs, a:function)
-endfunction
-
-function! airline#remove_statusline_func(name)
-  let i = index(g:airline_statusline_funcrefs, function(a:name))
-  if i > -1
-    call remove(g:airline_statusline_funcrefs, i)
-  endif
-endfunction
-
-function! airline#add_inactive_statusline_func(name)
-  call add(s:inactive_funcrefs, function(a:name))
-endfunction
-
-function! airline#load_theme()
-  if exists('*airline#themes#{g:airline_theme}#refresh')
-    call airline#themes#{g:airline_theme}#refresh()
-  endif
-
-  let palette = g:airline#themes#{g:airline_theme}#palette
-  call airline#themes#patch(palette)
-
-  if exists('g:airline_theme_patch_func')
-    let Fn = function(g:airline_theme_patch_func)
-    call Fn(palette)
-  endif
-
-  call airline#highlighter#load_theme()
-  call airline#extensions#load_theme()
-endfunction
-
-function! airline#switch_theme(name)
-  try
-    let palette = g:airline#themes#{a:name}#palette "also lazy loads the theme
-    let g:airline_theme = a:name
-  catch
-    echohl WarningMsg | echo 'The specified theme cannot be found.' | echohl NONE
-    if exists('g:airline_theme')
-      return
-    else
-      let g:airline_theme = 'dark'
-    endif
-  endtry
-
-  let w:airline_lastmode = ''
-  call airline#update_statusline()
-  call airline#load_theme()
-
-  " this is required to prevent clobbering the startup info message, i don't know why...
-  call airline#check_mode(winnr())
-endfunction
-
-function! airline#switch_matching_theme()
-  if exists('g:colors_name')
-    try
-      let palette = g:airline#themes#{g:colors_name}#palette
-      call airline#switch_theme(g:colors_name)
-      return 1
-    catch
-      for map in items(g:airline_theme_map)
-        if match(g:colors_name, map[0]) > -1
-          call airline#switch_theme(map[1])
-          return 1
-        endif
-      endfor
-    endtry
-  endif
-  return 0
-endfunction
-
-function! airline#update_statusline()
-  for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
-    call setwinvar(nr, 'airline_active', 0)
-    let context = { 'winnr': nr, 'active': 0, 'bufnr': winbufnr(nr) }
-    call s:invoke_funcrefs(context, s:inactive_funcrefs)
-  endfor
-
-  unlet! w:airline_render_left
-  unlet! w:airline_render_right
-  for section in s:sections
-    unlet! w:airline_section_{section}
-  endfor
-
-  let w:airline_active = 1
-  let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) }
-  call s:invoke_funcrefs(context, g:airline_statusline_funcrefs)
-endfunction
-
-let s:contexts = {}
-let s:core_funcrefs = [
-      \ function('airline#extensions#apply'),
-      \ function('airline#extensions#default#apply') ]
-function! s:invoke_funcrefs(context, funcrefs)
-  let builder = airline#builder#new(a:context)
-  let err = airline#util#exec_funcrefs(a:funcrefs + s:core_funcrefs, builder, a:context)
-  if err == 1
-    let a:context.line = builder.build()
-    let s:contexts[a:context.winnr] = a:context
-    call setwinvar(a:context.winnr, '&statusline', '%!airline#statusline('.a:context.winnr.')')
-  endif
-endfunction
-
-function! airline#statusline(winnr)
-  if has_key(s:contexts, a:winnr)
-    return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
-  endif
-
-  " in rare circumstances this happens...see #276
-  return ''
-endfunction
-
-function! airline#check_mode(winnr)
-  let context = s:contexts[a:winnr]
-
-  if get(w:, 'airline_active', 1)
-    let l:m = mode()
-    if l:m ==# "i"
-      let l:mode = ['insert']
-    elseif l:m ==# "R"
-      let l:mode = ['replace']
-    elseif l:m =~# '\v(v|V||s|S|)'
-      let l:mode = ['visual']
-    else
-      let l:mode = ['normal']
-    endif
-    let w:airline_current_mode = get(g:airline_mode_map, l:m, l:m)
-  else
-    let l:mode = ['inactive']
-    let w:airline_current_mode = get(g:airline_mode_map, '__')
-  endif
-
-  if g:airline_detect_modified && &modified
-    call add(l:mode, 'modified')
-  endif
-
-  if g:airline_detect_paste && &paste
-    call add(l:mode, 'paste')
-  endif
-
-  if &readonly || ! &modifiable
-    call add(l:mode, 'readonly')
-  endif
-
-  let mode_string = join(l:mode)
-  if get(w:, 'airline_lastmode', '') != mode_string
-    call airline#highlighter#highlight_modified_inactive(context.bufnr)
-    call airline#highlighter#highlight(l:mode)
-    let w:airline_lastmode = mode_string
-  endif
-
-  return ''
-endfunction
-
diff --git a/bundle/airline/autoload/airline/builder.vim b/bundle/airline/autoload/airline/builder.vim
deleted file mode 100755
index 5f4e080..0000000
--- a/bundle/airline/autoload/airline/builder.vim
+++ /dev/null
@@ -1,134 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:prototype = {}
-
-function! s:prototype.split(...)
-  call add(self._sections, ['|', a:0 ? a:1 : '%='])
-endfunction
-
-function! s:prototype.add_section_spaced(group, contents)
-  call self.add_section(a:group, (g:airline_symbols.space).a:contents.(g:airline_symbols.space))
-endfunction
-
-function! s:prototype.add_section(group, contents)
-  call add(self._sections, [a:group, a:contents])
-endfunction
-
-function! s:prototype.add_raw(text)
-  call add(self._sections, ['', a:text])
-endfunction
-
-function! s:get_prev_group(sections, i)
-  let x = a:i - 1
-  while x >= 0
-    let group = a:sections[x][0]
-    if group != '' && group != '|'
-      return group
-    endif
-    let x = x - 1
-  endwhile
-  return ''
-endfunction
-
-function! s:prototype.build()
-  let side = 1
-  let line = ''
-  let i = 0
-  let length = len(self._sections)
-  let split = 0
-
-  while i < length
-    let section = self._sections[i]
-    let group = section[0]
-    let contents = section[1]
-    let prev_group = s:get_prev_group(self._sections, i)
-
-    if group == ''
-      let line .= contents
-    elseif group == '|'
-      let side = 0
-      let line .= contents
-      let split = 1
-    else
-      if prev_group == ''
-        let line .= '%#'.group.'#'
-      elseif split
-        let line .= s:get_transitioned_seperator(self, prev_group, group, side)
-        let split = 0
-      else
-        let line .= s:get_seperator(self, prev_group, group, side)
-      endif
-      let line .= s:get_accented_line(self, group, contents)
-    endif
-
-    let i = i + 1
-  endwhile
-
-  if !self._context.active
-    let line = substitute(line, '%#.\{-}\ze#', '\0_inactive', 'g')
-  endif
-  return line
-endfunction
-
-function! s:should_change_group(group1, group2)
-  if a:group1 == a:group2
-    return 0
-  endif
-  let color1 = airline#highlighter#get_highlight(a:group1)
-  let color2 = airline#highlighter#get_highlight(a:group2)
-  if has('gui_running')
-    return color1[1] != color2[1] || color1[0] != color2[0]
-  else
-    return color1[3] != color2[3] || color1[2] != color2[2]
-  endif
-endfunction
-
-function! s:get_transitioned_seperator(self, prev_group, group, side)
-  let line = ''
-  call airline#highlighter#add_separator(a:prev_group, a:group, a:side)
-  let line .= '%#'.a:prev_group.'_to_'.a:group.'#'
-  let line .= a:side ? a:self._context.left_sep : a:self._context.right_sep
-  let line .= '%#'.a:group.'#'
-  return line
-endfunction
-
-function! s:get_seperator(self, prev_group, group, side)
-  if s:should_change_group(a:prev_group, a:group)
-    return s:get_transitioned_seperator(a:self, a:prev_group, a:group, a:side)
-  else
-    return a:side ? a:self._context.left_alt_sep : a:self._context.right_alt_sep
-  endif
-endfunction
-
-function! s:get_accented_line(self, group, contents)
-  if a:self._context.active
-    let contents = []
-    let content_parts = split(a:contents, '__accent')
-    for cpart in content_parts
-      let accent = matchstr(cpart, '_\zs[^#]*\ze')
-      call add(contents, cpart)
-    endfor
-    let line = join(contents, a:group)
-    let line = substitute(line, '__restore__', a:group, 'g')
-  else
-    let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
-    let line = substitute(line, '%#__restore__#', '', 'g')
-  endif
-  return line
-endfunction
-
-function! airline#builder#new(context)
-  let builder = copy(s:prototype)
-  let builder._context = a:context
-  let builder._sections = []
-
-  call extend(builder._context, {
-        \ 'left_sep': g:airline_left_sep,
-        \ 'left_alt_sep': g:airline_left_alt_sep,
-        \ 'right_sep': g:airline_right_sep,
-        \ 'right_alt_sep': g:airline_right_alt_sep,
-        \ }, 'keep')
-  return builder
-endfunction
-
diff --git a/bundle/airline/autoload/airline/debug.vim b/bundle/airline/autoload/airline/debug.vim
deleted file mode 100755
index 28424a6..0000000
--- a/bundle/airline/autoload/airline/debug.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-function! airline#debug#profile1()
-  profile start airline-profile-switch.log
-  profile func *
-  profile file *
-  split
-  for i in range(1, 1000)
-    wincmd w
-    redrawstatus
-  endfor
-  profile pause
-  noautocmd qall!
-endfunction
-
-function! airline#debug#profile2()
-  profile start airline-profile-cursor.log
-  profile func *
-  profile file *
-  edit blank
-  call setline(1, 'all your base are belong to us')
-  call setline(2, 'all your base are belong to us')
-  let positions = [[1,2], [2,2], [1,2], [1,1]]
-  for i in range(1, 1000)
-    for pos in positions
-      call cursor(pos[0], pos[1])
-      redrawstatus
-    endfor
-  endfor
-  profile pause
-  noautocmd qall!
-endfunction
-
-function! airline#debug#profile3()
-  profile start airline-profile-mode.log
-  profile func *
-  profile file *
-
-  for i in range(1000)
-    startinsert
-    redrawstatus
-    stopinsert
-    redrawstatus
-  endfor
-
-  profile pause
-  noautocmd qall!
-endfunction
-
diff --git a/bundle/airline/autoload/airline/deprecation.vim b/bundle/airline/autoload/airline/deprecation.vim
deleted file mode 100755
index cf7e787..0000000
--- a/bundle/airline/autoload/airline/deprecation.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-function! airline#deprecation#check()
-  if exists('g:airline_enable_fugitive') || exists('g:airline_fugitive_prefix')
-    echom 'The g:airline_enable_fugitive and g:airline_fugitive_prefix variables are obsolete. Please read the documentation about the branch extension.'
-  endif
-
-  let tests = [
-        \ [ 'g:airline_paste_symbol', 'g:airline_symbols.paste' ],
-        \ [ 'g:airline_readonly_symbol', 'g:airline_symbols.readonly' ],
-        \ [ 'g:airline_linecolumn_prefix', 'g:airline_symbols.linenr' ],
-        \ [ 'g:airline_branch_prefix', 'g:airline_symbols.branch' ],
-        \ [ 'g:airline_branch_empty_message', 'g:airline#extensions#branch#empty_message' ],
-        \ [ 'g:airline_detect_whitespace', 'g:airline#extensions#whitespace#enabled|show_message' ],
-        \ [ 'g:airline_enable_hunks', 'g:airline#extensions#hunks#enabled' ],
-        \ [ 'g:airline_enable_tagbar', 'g:airline#extensions#tagbar#enabled' ],
-        \ [ 'g:airline_enable_csv', 'g:airline#extensions#csv#enabled' ],
-        \ [ 'g:airline_enable_branch', 'g:airline#extensions#branch#enabled' ],
-        \ [ 'g:airline_enable_bufferline', 'g:airline#extensions#bufferline#enabled' ],
-        \ [ 'g:airline_enable_syntastic', 'g:airline#extensions#syntastic#enabled' ],
-        \ [ 'g:airline_enable_eclim', 'g:airline#extensions#eclim#enabled' ],
-        \ ]
-  for test in tests
-    if exists(test[0])
-      let max = winwidth(0) - 16
-      let msg = printf('The variable %s is deprecated and may not work in the future. It has been replaced with %s. Please read the documentation.', test[0], test[1])
-      echom msg[:max].'...'
-    endif
-  endfor
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions.vim b/bundle/airline/autoload/airline/extensions.vim
deleted file mode 100755
index 22a91cf..0000000
--- a/bundle/airline/autoload/airline/extensions.vim
+++ /dev/null
@@ -1,242 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:ext = {}
-let s:ext._theme_funcrefs = []
-
-function! s:ext.add_statusline_func(name) dict
-  call airline#add_statusline_func(a:name)
-endfunction
-function! s:ext.add_statusline_funcref(function) dict
-  call airline#add_statusline_funcref(a:function)
-endfunction
-function! s:ext.add_inactive_statusline_func(name) dict
-  call airline#add_inactive_statusline_func(a:name)
-endfunction
-function! s:ext.add_theme_func(name) dict
-  call add(self._theme_funcrefs, function(a:name))
-endfunction
-
-let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
-
-let s:filetype_overrides = {
-      \ 'nerdtree': [ 'NERD', '' ],
-      \ 'gundo': [ 'Gundo', '' ],
-      \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
-      \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
-      \ 'startify': [ 'startify', '' ],
-      \ 'vim-plug': [ 'Plugins', '' ],
-      \ }
-
-let s:filetype_regex_overrides = {}
-
-function! s:check_defined_section(name)
-  if !exists('w:airline_section_{a:name}')
-    let w:airline_section_{a:name} = g:airline_section_{a:name}
-  endif
-endfunction
-
-function! airline#extensions#append_to_section(name, value)
-  call <sid>check_defined_section(a:name)
-  let w:airline_section_{a:name} .= a:value
-endfunction
-
-function! airline#extensions#prepend_to_section(name, value)
-  call <sid>check_defined_section(a:name)
-  let w:airline_section_{a:name} = a:value . w:airline_section_{a:name}
-endfunction
-
-function! airline#extensions#apply_left_override(section1, section2)
-  let w:airline_section_a = a:section1
-  let w:airline_section_b = a:section2
-  let w:airline_section_c = airline#section#create(['readonly'])
-  let w:airline_render_left = 1
-  let w:airline_render_right = 0
-endfunction
-
-let s:active_winnr = -1
-function! airline#extensions#apply(...)
-  let s:active_winnr = winnr()
-
-  if s:is_excluded_window()
-    return -1
-  endif
-
-  if &buftype == 'help'
-    call airline#extensions#apply_left_override('Help', '%f')
-    let w:airline_section_x = ''
-    let w:airline_section_y = ''
-    let w:airline_render_right = 1
-  endif
-
-  if &previewwindow
-    let w:airline_section_a = 'Preview'
-    let w:airline_section_b = ''
-    let w:airline_section_c = bufname(winbufnr(winnr()))
-  endif
-
-  if has_key(s:filetype_overrides, &ft)
-    let args = s:filetype_overrides[&ft]
-    call airline#extensions#apply_left_override(args[0], args[1])
-  endif
-
-  for item in items(s:filetype_regex_overrides)
-    if match(&ft, item[0]) >= 0
-      call airline#extensions#apply_left_override(item[1][0], item[1][1])
-    endif
-  endfor
-endfunction
-
-function! s:is_excluded_window()
-  for matchft in g:airline_exclude_filetypes
-    if matchft ==# &ft
-      return 1
-    endif
-  endfor
-
-  for matchw in g:airline_exclude_filenames
-    if matchstr(expand('%'), matchw) ==# matchw
-      return 1
-    endif
-  endfor
-
-  if g:airline_exclude_preview && &previewwindow
-    return 1
-  endif
-
-  return 0
-endfunction
-
-function! airline#extensions#load_theme()
-  call airline#util#exec_funcrefs(s:ext._theme_funcrefs, g:airline#themes#{g:airline_theme}#palette)
-endfunction
-
-function! s:sync_active_winnr()
-  if exists('#airline') && winnr() != s:active_winnr
-    call airline#update_statusline()
-  endif
-endfunction
-
-function! airline#extensions#load()
-  " non-trivial number of external plugins use eventignore=all, so we need to account for that
-  autocmd CursorMoved * call <sid>sync_active_winnr()
-
-  call airline#extensions#quickfix#init(s:ext)
-
-  if get(g:, 'loaded_unite', 0)
-    call airline#extensions#unite#init(s:ext)
-  endif
-
-  if exists(':NetrwSettings')
-    call airline#extensions#netrw#init(s:ext)
-  endif
-
-  if get(g:, 'loaded_vimfiler', 0)
-    let g:vimfiler_force_overwrite_statusline = 0
-  endif
-
-  if get(g:, 'loaded_ctrlp', 0)
-    call airline#extensions#ctrlp#init(s:ext)
-  endif
-
-  if get(g:, 'command_t_loaded', 0)
-    call airline#extensions#commandt#init(s:ext)
-  endif
-
-  if exists(':UndotreeToggle')
-    call airline#extensions#undotree#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#hunks#enabled', 1) && get(g:, 'airline_enable_hunks', 1))
-        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter') || exists('g:loaded_changes'))
-    call airline#extensions#hunks#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#tagbar#enabled', 1) && get(g:, 'airline_enable_tagbar', 1))
-        \ && exists(':TagbarToggle')
-    call airline#extensions#tagbar#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#csv#enabled', 1) && get(g:, 'airline_enable_csv', 1))
-        \ && (get(g:, 'loaded_csv', 0) || exists(':Table'))
-    call airline#extensions#csv#init(s:ext)
-  endif
-
-  if exists(':VimShell')
-    let s:filetype_overrides['vimshell'] = ['vimshell','%{vimshell#get_status_string()}']
-    let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
-  endif
-
-  if (get(g:, 'airline#extensions#branch#enabled', 1) && get(g:, 'airline_enable_branch', 1))
-        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
-        \     (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
-    call airline#extensions#branch#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#bufferline#enabled', 1) && get(g:, 'airline_enable_bufferline', 1))
-        \ && exists('*bufferline#get_status_string')
-    call airline#extensions#bufferline#init(s:ext)
-  endif
-
-  if isdirectory($VIRTUAL_ENV) && get(g:, 'airline#extensions#virtualenv#enabled', 1)
-    call airline#extensions#virtualenv#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
-    call airline#extensions#eclim#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#syntastic#enabled', 1) && get(g:, 'airline_enable_syntastic', 1))
-        \ && exists(':SyntasticCheck')
-    call airline#extensions#syntastic#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#whitespace#enabled', 1) && get(g:, 'airline_detect_whitespace', 1))
-    call airline#extensions#whitespace#init(s:ext)
-  endif
-
-  if get(g:, 'airline#extensions#tabline#enabled', 0)
-    call airline#extensions#tabline#init(s:ext)
-  endif
-
-  if get(g:, 'airline#extensions#tmuxline#enabled', 1) && exists(':Tmuxline')
-    call airline#extensions#tmuxline#init(s:ext)
-  endif
-
-  if get(g:, 'airline#extensions#promptline#enabled', 1) && exists(':PromptlineSnapshot') && len(get(g:, 'airline#extensions#promptline#snapshot_file', ''))
-    call airline#extensions#promptline#init(s:ext)
-  endif
-
-  if get(g:, 'airline#extensions#nrrwrgn#enabled', 1) && exists(':NR') == 2
-      call airline#extensions#nrrwrgn#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#capslock#enabled', 1) && exists('*CapsLockStatusline'))
-    call airline#extensions#capslock#init(s:ext)
-  endif
-
-  if (get(g:, 'airline#extensions#windowswap#enabled', 1) && get(g:, 'loaded_windowswap', 0))
-    call airline#extensions#windowswap#init(s:ext)
-  endif
-
-  if !get(g:, 'airline#extensions#disable_rtp_load', 0)
-    " load all other extensions, which are not part of the default distribution.
-    " (autoload/airline/extensions/*.vim outside of our s:script_path).
-    for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
-      " we have to check both resolved and unresolved paths, since it's possible
-      " that they might not get resolved properly (see #187)
-      if stridx(tolower(resolve(fnamemodify(file, ':p'))), s:script_path) < 0
-            \ && stridx(tolower(fnamemodify(file, ':p')), s:script_path) < 0
-        let name = fnamemodify(file, ':t:r')
-        if !get(g:, 'airline#extensions#'.name.'#enabled', 1)
-          continue
-        endif
-        try
-          call airline#extensions#{name}#init(s:ext)
-        catch
-        endtry
-      endif
-    endfor
-  endif
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/branch.vim b/bundle/airline/autoload/airline/extensions/branch.vim
deleted file mode 100755
index e97cae8..0000000
--- a/bundle/airline/autoload/airline/extensions/branch.vim
+++ /dev/null
@@ -1,122 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:has_fugitive = exists('*fugitive#head')
-let s:has_lawrencium = exists('*lawrencium#statusline')
-let s:has_vcscommand = get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')
-
-if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
-  finish
-endif
-
-let s:git_dirs = {}
-function! s:get_git_branch(path)
-  if has_key(s:git_dirs, a:path)
-    return s:git_dirs[a:path]
-  endif
-
-  let dir = fugitive#extract_git_dir(a:path)
-  if empty(dir)
-    let name = ''
-  else
-    try
-      let line = join(readfile(dir . '/HEAD'))
-      if strpart(line, 0, 16) == 'ref: refs/heads/'
-        let name = strpart(line, 16)
-      else
-        " raw commit hash
-        let name = strpart(line, 0, 7)
-      endif
-    catch
-      let name = ''
-    endtry
-  endif
-
-  let s:git_dirs[a:path] = name
-  return name
-endfunction
-
-function! airline#extensions#branch#head()
-  if exists('b:airline_head') && !empty(b:airline_head)
-    return b:airline_head
-  endif
-
-  let b:airline_head = ''
-  let found_fugitive_head = 0
-
-  if s:has_fugitive && !exists('b:mercurial_dir')
-    let b:airline_head = fugitive#head(7)
-    let found_fugitive_head = 1
-
-    if empty(b:airline_head) && !exists('b:git_dir')
-      let b:airline_head = s:get_git_branch(expand("%:p:h"))
-    endif
-  endif
-
-  if empty(b:airline_head)
-    if s:has_lawrencium
-      let b:airline_head = lawrencium#statusline()
-    endif
-  endif
-
-  if empty(b:airline_head)
-    if s:has_vcscommand
-      call VCSCommandEnableBufferSetup()
-      if exists('b:VCSCommandBufferInfo')
-        let b:airline_head = get(b:VCSCommandBufferInfo, 0, '')
-      endif
-    endif
-  endif
-
-  if empty(b:airline_head) || !found_fugitive_head && !s:check_in_path()
-    let b:airline_head = ''
-  endif
-
-  if exists("g:airline#extensions#branch#displayed_head_limit")
-    let w:displayed_head_limit = g:airline#extensions#branch#displayed_head_limit
-    if len(b:airline_head) > w:displayed_head_limit - 1
-      let b:airline_head = b:airline_head[0:w:displayed_head_limit - 1].'…'
-    endif
-  endif
-
-  return b:airline_head
-endfunction
-
-function! airline#extensions#branch#get_head()
-  let head = airline#extensions#branch#head()
-  let empty_message = get(g:, 'airline#extensions#branch#empty_message',
-      \ get(g:, 'airline_branch_empty_message', ''))
-  let symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
-  return empty(head)
-        \ ? empty_message
-        \ : printf('%s%s', empty(symbol) ? '' : symbol.(g:airline_symbols.space), head)
-endfunction
-
-function! s:check_in_path()
-  if !exists('b:airline_branch_path')
-    let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
-    let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
-
-    if !filereadable(root) "not a file
-      " if .git is a directory, it's the old submodule format
-      if match(root, '\.git$') >= 0
-        let root = expand(fnamemodify(root, ':h'))
-      else
-        " else it's the newer format, and we need to guesstimate
-        let pattern = '\.git\(\\\|\/\)modules\(\\\|\/\)'
-        if match(root, pattern) >= 0
-          let root = substitute(root, pattern, '', '')
-        endif
-    endif
-
-    let b:airline_file_in_root = stridx(bufferpath, root) > -1
-  endif
-  return b:airline_file_in_root
-endfunction
-
-function! airline#extensions#branch#init(ext)
-  call airline#parts#define_function('branch', 'airline#extensions#branch#get_head')
-
-  autocmd BufReadPost * unlet! b:airline_file_in_root
-  autocmd CursorHold,ShellCmdPost,CmdwinLeave * unlet! b:airline_head
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/bufferline.vim b/bundle/airline/autoload/airline/extensions/bufferline.vim
deleted file mode 100755
index 6dc97fe..0000000
--- a/bundle/airline/autoload/airline/extensions/bufferline.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists('*bufferline#get_status_string')
-  finish
-endif
-
-let s:overwrite = get(g:, 'airline#extensions#bufferline#overwrite_variables', 1)
-
-function! airline#extensions#bufferline#init(ext)
-  if s:overwrite
-    highlight bufferline_selected gui=bold cterm=bold term=bold
-    highlight link bufferline_selected_inactive airline_c_inactive
-    let g:bufferline_inactive_highlight = 'airline_c'
-    let g:bufferline_active_highlight = 'bufferline_selected'
-    let g:bufferline_active_buffer_left = ''
-    let g:bufferline_active_buffer_right = ''
-    let g:bufferline_separator = g:airline_symbols.space
-  endif
-
-  call airline#parts#define_raw('file', '%{bufferline#refresh_status()}'.bufferline#get_status_string())
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/capslock.vim b/bundle/airline/autoload/airline/extensions/capslock.vim
deleted file mode 100755
index 689b561..0000000
--- a/bundle/airline/autoload/airline/extensions/capslock.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-" MIT License. Copyright (c) 2014 Mathias Andersson.
-" vim: et ts=2 sts=2 sw=2
-if !exists('*CapsLockStatusline')
-  finish
-endif
-
-function! airline#extensions#capslock#status()
-  return CapsLockStatusline() == '[caps]' ? 'CAPS' : ''
-endfunction
-
-function! airline#extensions#capslock#init(ext)
-  call airline#parts#define_function('capslock', 'airline#extensions#capslock#status')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/commandt.vim b/bundle/airline/autoload/airline/extensions/commandt.vim
deleted file mode 100755
index e549f27..0000000
--- a/bundle/airline/autoload/airline/extensions/commandt.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'command_t_loaded', 0)
-  finish
-endif
-
-function! airline#extensions#commandt#apply(...)
-  if bufname('%') ==# 'GoToFile'
-    call airline#extensions#apply_left_override('CommandT', '')
-  endif
-endfunction
-
-function! airline#extensions#commandt#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#commandt#apply')
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/csv.vim b/bundle/airline/autoload/airline/extensions/csv.vim
deleted file mode 100755
index 2c296ab..0000000
--- a/bundle/airline/autoload/airline/extensions/csv.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'loaded_csv', 0) && !exists(':Table')
-  finish
-endif
-
-let s:column_display = get(g:, 'airline#extensions#csv#column_display', 'Number')
-
-function! airline#extensions#csv#get_column()
-  if exists('*CSV_WCol')
-    if s:column_display ==# 'Name'
-      return '['.CSV_WCol('Name').CSV_WCol().']'
-    else
-      return '['.CSV_WCol().']'
-    endif
-  endif
-  return ''
-endfunction
-
-function! airline#extensions#csv#apply(...)
-  if &ft ==# "csv"
-    call airline#extensions#prepend_to_section('gutter',
-          \ g:airline_left_alt_sep.' %{airline#extensions#csv#get_column()}')
-  endif
-endfunction
-
-function! airline#extensions#csv#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#csv#apply')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/ctrlp.vim b/bundle/airline/autoload/airline/extensions/ctrlp.vim
deleted file mode 100755
index ef7da68..0000000
--- a/bundle/airline/autoload/airline/extensions/ctrlp.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-
-let s:color_template = get(g:, 'airline#extensions#ctrlp#color_template', 'insert')
-
-function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
-  return {
-        \ 'CtrlPdark'   : a:dark,
-        \ 'CtrlPlight'  : a:light,
-        \ 'CtrlPwhite'  : a:white,
-        \ 'CtrlParrow1' : [ a:light[1] , a:white[1] , a:light[3] , a:white[3] , ''     ] ,
-        \ 'CtrlParrow2' : [ a:white[1] , a:light[1] , a:white[3] , a:light[3] , ''     ] ,
-        \ 'CtrlParrow3' : [ a:light[1] , a:dark[1]  , a:light[3] , a:dark[3]  , ''     ] ,
-        \ }
-endfunction
-
-function! airline#extensions#ctrlp#load_theme(palette)
-  if exists('a:palette.ctrlp')
-    let theme = a:palette.ctrlp
-  else
-    let s:color_template = has_key(a:palette, s:color_template) ? s:color_template : 'insert'
-    let theme = airline#extensions#ctrlp#generate_color_map(
-          \ a:palette[s:color_template]['airline_c'],
-          \ a:palette[s:color_template]['airline_b'],
-          \ a:palette[s:color_template]['airline_a'])
-  endif
-  for key in keys(theme)
-    call airline#highlighter#exec(key, theme[key])
-  endfor
-endfunction
-
-" Arguments: focus, byfname, regexp, prv, item, nxt, marked
-function! airline#extensions#ctrlp#ctrlp_airline(...)
-  let b = airline#builder#new({'active': 1})
-  if a:2 == 'file'
-    call b.add_section_spaced('CtrlPlight', 'by fname')
-  endif
-  if a:3
-    call b.add_section_spaced('CtrlPlight', 'regex')
-  endif
-  if get(g:, 'airline#extensions#ctrlp#show_adjacent_modes', 1)
-    call b.add_section_spaced('CtrlPlight', a:4)
-    call b.add_section_spaced('CtrlPwhite', a:5)
-    call b.add_section_spaced('CtrlPlight', a:6)
-  else
-    call b.add_section_spaced('CtrlPwhite', a:5)
-  endif
-  call b.add_section_spaced('CtrlPdark', a:7)
-  call b.split()
-  call b.add_section_spaced('CtrlPdark', a:1)
-  call b.add_section_spaced('CtrlPdark', a:2)
-  call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
-  return b.build()
-endfunction
-
-" Argument: len
-function! airline#extensions#ctrlp#ctrlp_airline_status(...)
-  let len = '%#CtrlPdark# '.a:1
-  let dir = '%=%<%#CtrlParrow3#'.g:airline_right_sep.'%#CtrlPlight# '.getcwd().' %*'
-  return len.dir
-endfunction
-
-function! airline#extensions#ctrlp#apply(...)
-  " disable statusline overwrite if ctrlp already did it
-  return match(&statusline, 'CtrlPwhite') >= 0 ? -1 : 0
-endfunction
-
-function! airline#extensions#ctrlp#init(ext)
-  let g:ctrlp_status_func = {
-        \ 'main': 'airline#extensions#ctrlp#ctrlp_airline',
-        \ 'prog': 'airline#extensions#ctrlp#ctrlp_airline_status',
-        \ }
-  call a:ext.add_statusline_func('airline#extensions#ctrlp#apply')
-  call a:ext.add_theme_func('airline#extensions#ctrlp#load_theme')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/default.vim b/bundle/airline/autoload/airline/extensions/default.vim
deleted file mode 100755
index faa1fb6..0000000
--- a/bundle/airline/autoload/airline/extensions/default.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
-      \ 'b': 79,
-      \ 'x': 60,
-      \ 'y': 88,
-      \ 'z': 45,
-      \ })
-let s:layout = get(g:, 'airline#extensions#default#layout', [
-      \ [ 'a', 'b', 'c' ],
-      \ [ 'x', 'y', 'z', 'warning' ]
-      \ ])
-
-function! s:get_section(winnr, key, ...)
-  if has_key(s:section_truncate_width, a:key)
-    if winwidth(a:winnr) < s:section_truncate_width[a:key]
-      return ''
-    endif
-  endif
-  let spc = g:airline_symbols.space
-  let text = airline#util#getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key})
-  let [prefix, suffix] = [get(a:000, 0, '%('.spc), get(a:000, 1, spc.'%)')]
-  return empty(text) ? '' : prefix.text.suffix
-endfunction
-
-function! s:build_sections(builder, context, keys)
-  for key in a:keys
-    if key == 'warning' && !a:context.active
-      continue
-    endif
-    call s:add_section(a:builder, a:context, key)
-  endfor
-endfunction
-
-if v:version >= 704 || (v:version >= 703 && has('patch81'))
-  function s:add_section(builder, context, key)
-    " i have no idea why the warning section needs special treatment, but it's
-    " needed to prevent separators from showing up
-    if a:key == 'warning'
-      call a:builder.add_raw('%(')
-    endif
-    call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
-    if a:key == 'warning'
-      call a:builder.add_raw('%)')
-    endif
-  endfunction
-else
-  " older version don't like the use of %(%)
-  function s:add_section(builder, context, key)
-    if a:key == 'warning'
-      call a:builder.add_raw('%#airline_warning#'.s:get_section(a:context.winnr, a:key))
-    else
-      call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
-    endif
-  endfunction
-endif
-
-function! airline#extensions#default#apply(builder, context)
-  let winnr = a:context.winnr
-  let active = a:context.active
-
-  if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
-    call s:build_sections(a:builder, a:context, s:layout[0])
-  else
-    let text = s:get_section(winnr, 'c')
-    if empty(text)
-      let text = ' %f%m '
-    endif
-    call a:builder.add_section('airline_c'.(a:context.bufnr), text)
-  endif
-
-  call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
-
-  if airline#util#getwinvar(winnr, 'airline_render_right', 1)
-    call s:build_sections(a:builder, a:context, s:layout[1])
-  endif
-
-  return 1
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/eclim.vim b/bundle/airline/autoload/airline/extensions/eclim.vim
deleted file mode 100755
index e2f6531..0000000
--- a/bundle/airline/autoload/airline/extensions/eclim.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':ProjectCreate')
-  finish
-endif
-
-function! airline#extensions#eclim#creat_line(...)
-  if &filetype == "tree"
-    let builder = a:1
-    call builder.add_section('airline_a', ' Project ')
-    call builder.add_section('airline_b', ' %f ')
-    call builder.add_section('airline_c', '')
-  return 1
-  endif
-endfunction
-
-function! airline#extensions#eclim#get_warnings()
-  let eclimList = eclim#display#signs#GetExisting()
-
-  if !empty(eclimList)
-    " Remove any non-eclim signs (see eclim#display#signs#Update)
-    " First check for just errors since they are more important.
-    " If there are no errors, then check for warnings.
-    let errorList = filter(copy(eclimList), 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\)$"')
-
-    if (empty(errorList))
-      " use the warnings
-      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(warning\\)$"')
-      let type = 'W'
-    else
-      " Use the errors
-      let eclimList = errorList
-      let type = 'E'
-    endif
-
-    if !empty(eclimList)
-      let errorsLine = eclimList[0]['line']
-      let errorsNumber = len(eclimList)
-      let errors = "[Eclim:" . type . " line:".string(errorsLine)." (".string(errorsNumber).")]"
-      if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
-        return errors.(g:airline_symbols.space)
-      endif
-    endif
-  endif
-  return ''
-endfunction
-
-function! airline#extensions#eclim#init(ext)
-  call airline#parts#define_function('eclim', 'airline#extensions#eclim#get_warnings')
-  call a:ext.add_statusline_func('airline#extensions#eclim#creat_line')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/example.vim b/bundle/airline/autoload/airline/extensions/example.vim
deleted file mode 100755
index 4a1932d..0000000
--- a/bundle/airline/autoload/airline/extensions/example.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-" we don't actually want this loaded :P
-finish
-
-" Due to some potential rendering issues, the use of the `space` variable is
-" recommended.
-let s:spc = g:airline_symbols.space
-
-" Extension specific variables can be defined the usual fashion.
-if !exists('g:airline#extensions#example#number_of_cats')
-  let g:airline#extensions#example#number_of_cats = 42
-endif
-
-" First we define an init function that will be invoked from extensions.vim
-function! airline#extensions#example#init(ext)
-
-  " Here we define a new part for the plugin.  This allows users to place this
-  " extension in arbitrary locations.
-  call airline#parts#define_raw('cats', '%{airline#extensions#example#get_cats()}')
-
-  " Next up we add a funcref so that we can run some code prior to the
-  " statusline getting modifed.
-  call a:ext.add_statusline_func('airline#extensions#example#apply')
-
-  " You can also add a funcref for inactive statuslines.
-  " call a:ext.add_inactive_statusline_func('airline#extensions#example#unapply')
-endfunction
-
-" This function will be invoked just prior to the statusline getting modified.
-function! airline#extensions#example#apply(...)
-  " First we check for the filetype.
-  if &filetype == "nyancat"
-
-    " Let's say we want to append to section_c, first we check if there's
-    " already a window-local override, and if not, create it off of the global
-    " section_c.
-    let w:airline_section_c = get(w:, 'airline_section_c', g:airline_section_c)
-
-    " Then we just append this extenion to it, optionally using separators.
-    let w:airline_section_c .= s:spc.g:airline_left_alt_sep.s:spc.'%{airline#extensions#example#get_cats()}'
-  endif
-endfunction
-
-" Finally, this function will be invoked from the statusline.
-function! airline#extensions#example#get_cats()
-  let cats = ''
-  for i in range(1, g:airline#extensions#example#number_of_cats)
-    let cats .= ' (,,,)=(^.^)=(,,,) '
-  endfor
-  return cats
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/hunks.vim b/bundle/airline/autoload/airline/extensions/hunks.vim
deleted file mode 100755
index 968fd66..0000000
--- a/bundle/airline/autoload/airline/extensions/hunks.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0) && !get(g:, 'loaded_changes', 0)
-  finish
-endif
-
-let s:non_zero_only = get(g:, 'airline#extensions#hunks#non_zero_only', 0)
-let s:hunk_symbols = get(g:, 'airline#extensions#hunks#hunk_symbols', ['+', '~', '-'])
-
-function! s:get_hunks_signify()
-  let hunks = sy#repo#get_stats()
-  if hunks[0] >= 0
-    return hunks
-  endif
-  return []
-endfunction
-
-function! s:is_branch_empty()
-  return exists('*airline#extensions#branch#head') && empty(airline#extensions#branch#head())
-endfunction
-
-function! s:get_hunks_gitgutter()
-  if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
-    return ''
-  endif
-  return GitGutterGetHunkSummary()
-endfunction
-
-function! s:get_hunks_changes()
-  if !get(b:, 'changes_view_enabled', 0) || s:is_branch_empty()
-    return []
-  endif
-  let hunks = changes#GetStats()
-  for i in hunks
-    if i > 0
-      return hunks
-    endif
-  endfor
-  return []
-endfunction
-
-function! s:get_hunks_empty()
-  return ''
-endfunction
-
-let s:source_func = ''
-function! s:get_hunks()
-  if empty(s:source_func)
-    if get(g:, 'loaded_signify', 0)
-      let s:source_func = 's:get_hunks_signify'
-    elseif exists('*GitGutterGetHunkSummary')
-      let s:source_func = 's:get_hunks_gitgutter'
-    elseif exists('*changes#GetStats')
-      let s:source_func = 's:get_hunks_changes'
-    else
-      let s:source_func = 's:get_hunks_empty'
-    endif
-  endif
-  return {s:source_func}()
-endfunction
-
-function! airline#extensions#hunks#get_hunks()
-  if !get(w:, 'airline_active', 0)
-    return ''
-  endif
-  let hunks = s:get_hunks()
-  let string = ''
-  if !empty(hunks)
-    for i in [0, 1, 2]
-      if s:non_zero_only == 0 || hunks[i] > 0
-        let string .= printf('%s%s ', s:hunk_symbols[i], hunks[i])
-      endif
-    endfor
-  endif
-  return string
-endfunction
-
-function! airline#extensions#hunks#init(ext)
-  call airline#parts#define_function('hunks', 'airline#extensions#hunks#get_hunks')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/netrw.vim b/bundle/airline/autoload/airline/extensions/netrw.vim
deleted file mode 100755
index debb088..0000000
--- a/bundle/airline/autoload/airline/extensions/netrw.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':NetrwSettings')
-  finish
-endif
-
-function! airline#extensions#netrw#apply(...)
-  if &ft == 'netrw'
-    let spc = g:airline_symbols.space
-
-    call a:1.add_section('airline_a', spc.'netrw'.spc)
-    if exists('*airline#extensions#branch#get_head')
-      call a:1.add_section('airline_b', spc.'%{airline#extensions#branch#get_head()}'.spc)
-    endif
-    call a:1.add_section('airline_c', spc.'%f'.spc)
-    call a:1.split()
-    call a:1.add_section('airline_y', spc.'%{airline#extensions#netrw#sortstring()}'.spc)
-    return 1
-  endif
-endfunction
-
-function! airline#extensions#netrw#init(ext)
-  let g:netrw_force_overwrite_statusline = 0
-  call a:ext.add_statusline_func('airline#extensions#netrw#apply')
-endfunction
-
-
-function! airline#extensions#netrw#sortstring()
-  let order = (g:netrw_sort_direction =~ 'n') ? '+' : '-'
-  return g:netrw_sort_by . (g:airline_symbols.space) . '[' . order . ']'
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/nrrwrgn.vim b/bundle/airline/autoload/airline/extensions/nrrwrgn.vim
deleted file mode 100755
index 338f6e0..0000000
--- a/bundle/airline/autoload/airline/extensions/nrrwrgn.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'loaded_nrrw_rgn', 0)
-  finish
-endif
-
-function! airline#extensions#nrrwrgn#apply(...)
-  if exists(":WidenRegion") == 2
-    let spc = g:airline_symbols.space
-    if !exists("*nrrwrgn#NrrwRgnStatus()") || empty(nrrwrgn#NrrwRgnStatus())
-      call a:1.add_section('airline_a', printf('%s[Narrowed%s#%d]', spc, spc, b:nrrw_instn))
-      let bufname=(get(b:, 'orig_buf', 0) ? bufname(b:orig_buf) : substitute(bufname('%'), '^Nrrwrgn_\zs.*\ze_\d\+$', submatch(0), ''))
-      call a:1.add_section('airline_c', spc.bufname.spc)
-      call a:1.split()
-    else
-      let dict=nrrwrgn#NrrwRgnStatus()
-      let vmode = { 'v': 'Char ', 'V': 'Line ', '': 'Block '}
-      let mode = dict.visual ? vmode[dict.visual] : vmode['V']
-      let winwidth = winwidth(0)
-      if winwidth < 80
-        let mode = mode[0]
-      endif
-      let title = (winwidth < 80 ? "Nrrw" : "Narrowed ")
-      let multi = (winwidth < 80 ? 'M' : 'Multi')
-      call a:1.add_section('airline_a', printf('[%s%s%s#%d]%s', (dict.multi ? multi : ""),
-        \ title, mode, b:nrrw_instn, spc))
-      let name = dict.fullname
-      if name !=# '[No Name]'
-        if winwidth > 100
-          " need some space
-          let name = fnamemodify(dict.fullname, ':~')
-          if strlen(name) > 8
-            " shorten name
-            let name = substitute(name, '\(.\)[^/\\]*\([/\\]\)', '\1\2', 'g')
-          endif
-        else
-          let name = fnamemodify(dict.fullname, ':t')
-        endif
-      endif
-      let range=(dict.multi ? '' : printf("[%d-%d]", dict.start[1], dict.end[1]))
-      call a:1.add_section('airline_c', printf("%s %s %s", name, range, dict.enabled ? "\u2713" : '!'))
-      call a:1.split()
-      call a:1.add_section('airline_x', get(g:, 'airline_section_x').spc)
-      call a:1.add_section('airline_y', spc.get(g:, 'airline_section_y').spc)
-      call a:1.add_section('airline_z', spc.get(g:, 'airline_section_z'))
-    endif
-    return 1
-  endif
-endfunction
-
-function! airline#extensions#nrrwrgn#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#nrrwrgn#apply')
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/promptline.vim b/bundle/airline/autoload/airline/extensions/promptline.vim
deleted file mode 100755
index 50b9708..0000000
--- a/bundle/airline/autoload/airline/extensions/promptline.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':PromptlineSnapshot')
-  finish
-endif
-
-if !exists('airline#extensions#promptline#snapshot_file') || !len('airline#extensions#promptline#snapshot_file')
-  finish
-endif
-
-let s:prompt_snapshot_file = get(g:, 'airline#extensions#promptline#snapshot_file', '')
-let s:color_template = get(g:, 'airline#extensions#promptline#color_template', 'normal')
-
-function! airline#extensions#promptline#init(ext)
-  call a:ext.add_theme_func('airline#extensions#promptline#set_prompt_colors')
-endfunction
-
-function! airline#extensions#promptline#set_prompt_colors(palette)
-  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
-  let mode_palette = a:palette[color_template]
-
-  if !has_key(g:, 'promptline_symbols')
-    let g:promptline_symbols = {
-          \ 'left'           : g:airline_left_sep,
-          \ 'right'          : g:airline_right_sep,
-          \ 'left_alt'       : g:airline_left_alt_sep,
-          \ 'right_alt'      : g:airline_right_alt_sep}
-  endif
-
-  let promptline_theme = promptline#api#create_theme_from_airline(mode_palette)
-  call promptline#api#create_snapshot_with_theme(s:prompt_snapshot_file, promptline_theme)
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/quickfix.vim b/bundle/airline/autoload/airline/extensions/quickfix.vim
deleted file mode 100755
index 2be4077..0000000
--- a/bundle/airline/autoload/airline/extensions/quickfix.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
-let g:airline#extensions#quickfix#location_text = 'Location'
-
-function! airline#extensions#quickfix#apply(...)
-  if &buftype == 'quickfix'
-    let w:airline_section_a = s:get_text()
-    let w:airline_section_b = '%{get(w:, "quickfix_title", "")}'
-    let w:airline_section_c = ''
-    let w:airline_section_x = ''
-  endif
-endfunction
-
-function! airline#extensions#quickfix#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#quickfix#apply')
-endfunction
-
-function! s:get_text()
-  redir => buffers
-  silent ls
-  redir END
-
-  let nr = bufnr('%')
-  for buf in split(buffers, '\n')
-    if match(buf, '\v^\s*'.nr) > -1
-      if match(buf, '\cQuickfix') > -1
-        return g:airline#extensions#quickfix#quickfix_text
-      else
-        return g:airline#extensions#quickfix#location_text
-      endif
-    endif
-  endfor
-  return ''
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/syntastic.vim b/bundle/airline/autoload/airline/extensions/syntastic.vim
deleted file mode 100755
index f7179af..0000000
--- a/bundle/airline/autoload/airline/extensions/syntastic.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':SyntasticCheck')
-  finish
-endif
-
-function! airline#extensions#syntastic#get_warnings()
-  let errors = SyntasticStatuslineFlag()
-  if strlen(errors) > 0
-    return errors.(g:airline_symbols.space)
-  endif
-  return ''
-endfunction
-
-function! airline#extensions#syntastic#init(ext)
-  call airline#parts#define_function('syntastic', 'airline#extensions#syntastic#get_warnings')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/tabline.vim b/bundle/airline/autoload/airline/extensions/tabline.vim
deleted file mode 100755
index bbab057..0000000
--- a/bundle/airline/autoload/airline/extensions/tabline.vim
+++ /dev/null
@@ -1,363 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
-let s:excludes = get(g:, 'airline#extensions#tabline#excludes', [])
-let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
-let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
-let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
-let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
-let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
-let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
-let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
-let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
-let s:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
-let s:spc = g:airline_symbols.space
-
-let s:number_map = &encoding == 'utf-8'
-      \ ? {
-      \ '0': '⁰',
-      \ '1': '¹',
-      \ '2': '²',
-      \ '3': '³',
-      \ '4': '⁴',
-      \ '5': '⁵',
-      \ '6': '⁶',
-      \ '7': '⁷',
-      \ '8': '⁸',
-      \ '9': '⁹'
-      \ }
-      \ : {}
-
-function! airline#extensions#tabline#init(ext)
-  if has('gui_running')
-    set guioptions-=e
-  endif
-
-  autocmd User AirlineToggledOn call s:toggle_on()
-  autocmd User AirlineToggledOff call s:toggle_off()
-  autocmd BufDelete * let s:current_bufnr = -1
-
-  call s:toggle_on()
-  call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
-  if s:buffer_idx_mode
-    call s:define_buffer_idx_mode_mappings()
-  endif
-endfunction
-
-function! s:toggle_off()
-  if exists('s:original_tabline')
-    let &tabline = s:original_tabline
-    let &showtabline = s:original_showtabline
-  endif
-endfunction
-
-function! s:toggle_on()
-  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
-
-  set tabline=%!airline#extensions#tabline#get()
-  if s:buf_min_count <= 0 && s:tab_min_count <= 1
-    set showtabline=2
-  else
-    augroup airline_tabline
-      autocmd!
-      if s:show_buffers == 1
-        autocmd BufEnter * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()))
-        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(s:get_buffer_list()) - 1)
-      else
-        autocmd TabEnter * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
-      endif
-    augroup END
-  endif
-endfunction
-
-function! airline#extensions#tabline#load_theme(palette)
-  let colors    = get(a:palette, 'tabline', {})
-  let l:tab     = get(colors, 'airline_tab', a:palette.normal.airline_b)
-  let l:tabsel  = get(colors, 'airline_tabsel', a:palette.normal.airline_a)
-  let l:tabtype = get(colors, 'airline_tabtype', a:palette.visual.airline_a)
-  let l:tabfill = get(colors, 'airline_tabfill', a:palette.normal.airline_c)
-  let l:tabmod  = get(colors, 'airline_tabmod', a:palette.insert.airline_a)
-  if has_key(a:palette, 'normal_modified') && has_key(a:palette.normal_modified, 'airline_c')
-    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal_modified.airline_c)
-  else
-    "Fall back to normal airline_c if modified airline_c isn't present
-    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal.airline_c)
-  endif
-
-  let l:tabhid  = get(colors, 'airline_tabhid', a:palette.normal.airline_c)
-  call airline#highlighter#exec('airline_tab', l:tab)
-  call airline#highlighter#exec('airline_tabsel', l:tabsel)
-  call airline#highlighter#exec('airline_tabtype', l:tabtype)
-  call airline#highlighter#exec('airline_tabfill', l:tabfill)
-  call airline#highlighter#exec('airline_tabmod', l:tabmod)
-  call airline#highlighter#exec('airline_tabmod_unsel', l:tabmodu)
-  call airline#highlighter#exec('airline_tabhid', l:tabhid)
-endfunction
-
-function! s:show_tabline(min_count, total_count)
-  if a:total_count >= a:min_count
-    if &showtabline != 2
-      set showtabline=2
-    endif
-  else
-    if &showtabline != 0
-      set showtabline=0
-    endif
-  endif
-endfunction
-
-function! airline#extensions#tabline#get()
-  let curtabcnt = tabpagenr('$')
-  if curtabcnt != s:current_tabcnt
-    let s:current_tabcnt = curtabcnt
-    let s:current_bufnr = -1  " force a refresh...
-  endif
-  if s:show_buffers && curtabcnt == 1
-    return s:get_buffers()
-  else
-    return s:get_tabs()
-  endif
-endfunction
-
-function! airline#extensions#tabline#title(n)
-  let buflist = tabpagebuflist(a:n)
-  let winnr = tabpagewinnr(a:n)
-  return airline#extensions#tabline#get_buffer_name(buflist[winnr - 1])
-endfunction
-
-function! airline#extensions#tabline#get_buffer_name(nr)
-  return airline#extensions#tabline#{s:formatter}#format(a:nr, get(s:, 'current_buffer_list', s:get_buffer_list()))
-endfunction
-
-function! s:get_buffer_list()
-  let buffers = []
-  let cur = bufnr('%')
-  for nr in range(1, bufnr('$'))
-    if buflisted(nr) && bufexists(nr)
-      for ex in s:excludes
-        if match(bufname(nr), ex)
-          continue
-        endif
-      endfor
-      if getbufvar(nr, 'current_syntax') == 'qf'
-        continue
-      endif
-      call add(buffers, nr)
-    endif
-  endfor
-
-  let s:current_buffer_list = buffers
-  return buffers
-endfunction
-
-function! s:get_visible_buffers()
-  let buffers = s:get_buffer_list()
-  let cur = bufnr('%')
-
-  let total_width = 0
-  let max_width = 0
-
-  for nr in buffers
-    let width = len(airline#extensions#tabline#get_buffer_name(nr)) + 4
-    let total_width += width
-    let max_width = max([max_width, width])
-  endfor
-
-  " only show current and surrounding buffers if there are too many buffers
-  let position  = index(buffers, cur)
-  let vimwidth = &columns
-  if total_width > vimwidth && position > -1
-    let buf_count = len(buffers)
-
-    " determine how many buffers to show based on the longest buffer width,
-    " use one on the right side and put the rest on the left
-    let buf_max   = vimwidth / max_width
-    let buf_right = 1
-    let buf_left  = max([0, buf_max - buf_right])
-
-    let start = max([0, position - buf_left])
-    let end   = min([buf_count, position + buf_right])
-
-    " fill up available space on the right
-    if position < buf_left
-      let end += (buf_left - position)
-    endif
-
-    " fill up available space on the left
-    if end > buf_count - 1 - buf_right
-      let start -= max([0, buf_right - (buf_count - 1 - position)])
-    endif
-
-    let buffers = eval('buffers[' . start . ':' . end . ']')
-
-    if start > 0
-      call insert(buffers, -1, 0)
-    endif
-
-    if end < buf_count - 1
-      call add(buffers, -1)
-    endif
-  endif
-
-  let g:current_visible_buffers = buffers
-  return buffers
-endfunction
-
-let s:current_bufnr = -1
-let s:current_tabnr = -1
-let s:current_tabcnt = -1
-let s:current_tabline = ''
-let s:current_modified = 0
-function! s:get_buffers()
-  let cur = bufnr('%')
-  if cur == s:current_bufnr
-    if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
-      return s:current_tabline
-    endif
-  endif
-
-  let l:index = 1
-  let b = s:new_builder()
-  let tab_bufs = tabpagebuflist(tabpagenr())
-  for nr in s:get_visible_buffers()
-    if nr < 0
-      call b.add_raw('%#airline_tabhid#...')
-      continue
-    endif
-
-    if cur == nr
-      if g:airline_detect_modified && getbufvar(nr, '&modified')
-        let group = 'airline_tabmod'
-      else
-        let group = 'airline_tabsel'
-      endif
-      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
-    else
-      if g:airline_detect_modified && getbufvar(nr, '&modified')
-        let group = 'airline_tabmod_unsel'
-      elseif index(tab_bufs, nr) > -1
-        let group = 'airline_tab'
-      else
-        let group = 'airline_tabhid'
-      endif
-    endif
-
-    if s:buffer_idx_mode
-      if len(s:number_map) > 0
-        call b.add_section(group, s:spc . get(s:number_map, l:index, '') . '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)' . s:spc)
-      else
-        call b.add_section(group, '['.l:index.s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.']')
-      endif
-      let l:index = l:index + 1
-    else
-      call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
-    endif
-  endfor
-
-  call b.add_section('airline_tabfill', '')
-  call b.split()
-  call b.add_section('airline_tabfill', '')
-  call b.add_section('airline_tabtype', ' buffers ')
-
-  let s:current_bufnr = cur
-  let s:current_tabline = b.build()
-  return s:current_tabline
-endfunction
-
-function! s:select_tab(buf_index)
-  " no-op when called in the NERDTree buffer
-  if exists('t:NERDTreeBufName') && bufname('%') == t:NERDTreeBufName
-    return
-  endif
-
-  let idx = a:buf_index
-  if g:current_visible_buffers[0] == -1
-    let idx = idx + 1
-  endif
-
-  let buf = get(g:current_visible_buffers, idx, 0)
-  if buf != 0
-    exec 'b!' . buf
-  endif
-endfunction
-
-function! s:define_buffer_idx_mode_mappings()
-  noremap <unique> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
-  noremap <unique> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
-  noremap <unique> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
-  noremap <unique> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
-  noremap <unique> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
-  noremap <unique> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
-  noremap <unique> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
-  noremap <unique> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
-  noremap <unique> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
-endfunction
-
-function! s:new_builder()
-  let builder_context = {
-        \ 'active'        : 1,
-        \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
-        \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
-        \ }
-  if get(g:, 'airline_powerline_fonts', 0)
-    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
-    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
-  else
-    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
-    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
-  endif
-
-  return airline#builder#new(builder_context)
-endfunction
-
-function! s:get_tabs()
-  let curbuf = bufnr('%')
-  let curtab = tabpagenr()
-  if curbuf == s:current_bufnr && curtab == s:current_tabnr
-    if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
-      return s:current_tabline
-    endif
-  endif
-
-  let b = s:new_builder()
-  for i in range(1, tabpagenr('$'))
-    if i == curtab
-      let group = 'airline_tabsel'
-      if g:airline_detect_modified
-        for bi in tabpagebuflist(i)
-          if getbufvar(bi, '&modified')
-            let group = 'airline_tabmod'
-          endif
-        endfor
-      endif
-      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
-    else
-      let group = 'airline_tab'
-    endif
-    let val = '%('
-    if s:show_tab_nr
-      if s:tab_nr_type == 0
-        let val .= ' %{len(tabpagebuflist('.i.'))}'
-      else
-        let val .= (g:airline_symbols.space).i
-      endif
-    endif
-    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
-  endfor
-
-  call b.add_raw('%T')
-  call b.add_section('airline_tabfill', '')
-  call b.split()
-  if s:show_close_button
-    call b.add_section('airline_tab', ' %999X'.s:close_symbol.' ')
-  endif
-  if s:show_tab_type
-    call b.add_section('airline_tabtype', ' tabs ')
-  endif
-
-  let s:current_bufnr = curbuf
-  let s:current_tabnr = curtab
-  let s:current_tabline = b.build()
-  return s:current_tabline
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/tabline/default.vim b/bundle/airline/autoload/airline/extensions/tabline/default.vim
deleted file mode 100755
index 4f1ed40..0000000
--- a/bundle/airline/autoload/airline/extensions/tabline/default.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
-let s:fnamecollapse = get(g:, 'airline#extensions#tabline#fnamecollapse', 1)
-let s:buf_nr_format = get(g:, 'airline#extensions#tabline#buffer_nr_format', '%s: ')
-let s:buf_nr_show = get(g:, 'airline#extensions#tabline#buffer_nr_show', 0)
-let s:buf_modified_symbol = g:airline_symbols.modified
-
-function! airline#extensions#tabline#default#format(bufnr, buffers)
-  let _ = ''
-
-  let name = bufname(a:bufnr)
-  if empty(name)
-    let _ .= '[No Name]'
-  else
-    if s:fnamecollapse
-      let _ .= substitute(fnamemodify(name, s:fmod), '\v\w\zs.{-}\ze(\\|/)', '', 'g')
-    else
-      let _ .= fnamemodify(name, s:fmod)
-    endif
-  endif
-
-  return airline#extensions#tabline#default#wrap_name(a:bufnr, _)
-endfunction
-
-function! airline#extensions#tabline#default#wrap_name(bufnr, buffer_name)
-  let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
-  let _ .= substitute(a:buffer_name, '\\', '/', 'g')
-
-  if getbufvar(a:bufnr, '&modified') == 1
-    let _ .= s:buf_modified_symbol
-  endif
-  return _
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/tabline/unique_tail.vim b/bundle/airline/autoload/airline/extensions/tabline/unique_tail.vim
deleted file mode 100755
index e4a790d..0000000
--- a/bundle/airline/autoload/airline/extensions/tabline/unique_tail.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-function! airline#extensions#tabline#unique_tail#format(bufnr, buffers)
-  let duplicates = {}
-  let tails = {}
-  let map = {}
-  for nr in a:buffers
-    let name = bufname(nr)
-    if empty(name)
-      let map[nr] = '[No Name]'
-    else
-      let tail = fnamemodify(name, ':t')
-      if has_key(tails, tail)
-        let duplicates[nr] = nr
-      endif
-      let tails[tail] = 1
-      let map[nr] = airline#extensions#tabline#default#wrap_name(nr, tail)
-    endif
-  endfor
-
-  for nr in values(duplicates)
-    let map[nr] = airline#extensions#tabline#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
-  endfor
-
-  return map[a:bufnr]
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/tabline/unique_tail_improved.vim b/bundle/airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
deleted file mode 100755
index 3590fbb..0000000
--- a/bundle/airline/autoload/airline/extensions/tabline/unique_tail_improved.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:skip_symbol = '…'
-
-function! airline#extensions#tabline#unique_tail_improved#format(bufnr, buffers)
-  if len(a:buffers) <= 1 " don't need to compare bufnames if has less than one buffer opened
-    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
-  endif
-
-  let curbuf_tail = fnamemodify(bufname(a:bufnr), ':t')
-  let do_deduplicate = 0
-  let path_tokens = {}
-
-  for nr in a:buffers
-    let name = bufname(nr)
-    if !empty(name) && nr != a:bufnr && fnamemodify(name, ':t') == curbuf_tail " only perform actions if curbuf_tail isn't unique
-      let do_deduplicate = 1
-      let tokens = reverse(split(substitute(fnamemodify(name, ':p:h'), '\\', '/', 'g'), '/'))
-      let token_index = 0
-      for token in tokens
-        if token == '' | continue | endif
-        if token == '.' | break | endif
-        if !has_key(path_tokens, token_index)
-          let path_tokens[token_index] = {}
-        endif
-        let path_tokens[token_index][token] = 1
-        let token_index += 1
-      endfor
-    endif
-  endfor
-
-  if do_deduplicate == 1
-    let path = []
-    let token_index = 0
-    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:h'), '\\', '/', 'g'), '/'))
-      if token == '.' | break | endif
-      let duplicated = 0
-      let uniq = 1
-      let single = 1
-      if has_key(path_tokens, token_index)
-        let duplicated = 1
-        if len(keys(path_tokens[token_index])) > 1 | let single = 0 | endif
-        if has_key(path_tokens[token_index], token) | let uniq = 0 | endif
-      endif
-      call insert(path, {'token': token, 'duplicated': duplicated, 'uniq': uniq, 'single': single})
-      let token_index += 1
-    endfor
-
-    let buf_name = [curbuf_tail]
-    let has_uniq = 0
-    let has_skipped = 0
-    for token1 in reverse(path)
-      if !token1['duplicated'] && len(buf_name) > 1
-        call insert(buf_name, s:skip_symbol)
-        let has_skipped = 0
-        break
-      endif
-
-      if has_uniq == 1
-        call insert(buf_name, s:skip_symbol)
-        let has_skipped = 0
-        break
-      endif
-
-      if token1['uniq'] == 0 && token1['single'] == 1
-        let has_skipped = 1
-      else
-        if has_skipped == 1
-          call insert(buf_name, s:skip_symbol)
-          let has_skipped = 0
-        endif
-        call insert(buf_name, token1['token'])
-      endif
-
-      if token1['uniq'] == 1
-        let has_uniq = 1
-      endif
-    endfor
-
-    if has_skipped == 1
-      call insert(buf_name, s:skip_symbol)
-    endif
-
-    return airline#extensions#tabline#default#wrap_name(a:bufnr, join(buf_name, '/'))
-  else
-    return airline#extensions#tabline#default#format(a:bufnr, a:buffers)
-  endif
-endfunction
diff --git a/bundle/airline/autoload/airline/extensions/tagbar.vim b/bundle/airline/autoload/airline/extensions/tagbar.vim
deleted file mode 100755
index 56919a8..0000000
--- a/bundle/airline/autoload/airline/extensions/tagbar.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':TagbarToggle')
-  finish
-endif
-
-let s:flags = get(g:, 'airline#extensions#tagbar#flags', '')
-let s:spc = g:airline_symbols.space
-
-" Arguments: current, sort, fname
-function! airline#extensions#tagbar#get_status(...)
-  let builder = airline#builder#new({ 'active': a:1 })
-  call builder.add_section('airline_a', s:spc.'Tagbar'.s:spc)
-  call builder.add_section('airline_b', s:spc.a:2.s:spc)
-  call builder.add_section('airline_c', s:spc.a:3.s:spc)
-  return builder.build()
-endfunction
-
-function! airline#extensions#tagbar#inactive_apply(...)
-  if getwinvar(a:2.winnr, '&filetype') == 'tagbar'
-    return -1
-  endif
-endfunction
-
-let s:airline_tagbar_last_lookup_time = 0
-let s:airline_tagbar_last_lookup_val = ''
-function! airline#extensions#tagbar#currenttag()
-  if get(w:, 'airline_active', 0)
-    if s:airline_tagbar_last_lookup_time != localtime()
-      let s:airline_tagbar_last_lookup_val = tagbar#currenttag('%s', '', s:flags)
-      let s:airline_tagbar_last_lookup_time = localtime()
-    endif
-    return s:airline_tagbar_last_lookup_val
-  endif
-  return ''
-endfunction
-
-function! airline#extensions#tagbar#init(ext)
-  call a:ext.add_inactive_statusline_func('airline#extensions#tagbar#inactive_apply')
-  let g:tagbar_status_func = 'airline#extensions#tagbar#get_status'
-
-  call airline#parts#define_function('tagbar', 'airline#extensions#tagbar#currenttag')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/tmuxline.vim b/bundle/airline/autoload/airline/extensions/tmuxline.vim
deleted file mode 100755
index 363709b..0000000
--- a/bundle/airline/autoload/airline/extensions/tmuxline.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':Tmuxline')
-  finish
-endif
-
-let s:tmuxline_snapshot_file = get(g:, 'airline#extensions#tmuxline#snapshot_file', '')
-let s:color_template = get(g:, 'airline#extensions#tmuxline#color_template', 'normal')
-
-function! airline#extensions#tmuxline#init(ext)
-  call a:ext.add_theme_func('airline#extensions#tmuxline#set_tmux_colors')
-endfunction
-
-function! airline#extensions#tmuxline#set_tmux_colors(palette)
-  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
-  let mode_palette = a:palette[color_template]
-
-  let tmuxline_theme = tmuxline#api#create_theme_from_airline(mode_palette)
-  call tmuxline#api#set_theme(tmuxline_theme)
-
-  if strlen(s:tmuxline_snapshot_file)
-    call tmuxline#api#snapshot(s:tmuxline_snapshot_file)
-  endif
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/undotree.vim b/bundle/airline/autoload/airline/extensions/undotree.vim
deleted file mode 100755
index f577ffd..0000000
--- a/bundle/airline/autoload/airline/extensions/undotree.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !exists(':UndotreeToggle')
-  finish
-endif
-
-function! airline#extensions#undotree#apply(...)
-  if exists('t:undotree')
-    if &ft == 'undotree'
-      if exists('*t:undotree.GetStatusLine')
-        call airline#extensions#apply_left_override('undo', '%{t:undotree.GetStatusLine()}')
-      else
-        call airline#extensions#apply_left_override('undotree', '%f')
-      endif
-    endif
-
-    if &ft == 'diff' && exists('*t:diffpanel.GetStatusLine')
-      call airline#extensions#apply_left_override('diff', '%{t:diffpanel.GetStatusLine()}')
-    endif
-  endif
-endfunction
-
-function! airline#extensions#undotree#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#undotree#apply')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/unite.vim b/bundle/airline/autoload/airline/extensions/unite.vim
deleted file mode 100755
index d230b6f..0000000
--- a/bundle/airline/autoload/airline/extensions/unite.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !get(g:, 'loaded_unite', 0)
-  finish
-endif
-
-function! airline#extensions#unite#apply(...)
-  if &ft == 'unite'
-    call a:1.add_section('airline_a', ' Unite ')
-    call a:1.add_section('airline_b', ' %{get(unite#get_context(), "buffer_name", "")} ')
-    call a:1.add_section('airline_c', ' %{unite#get_status_string()} ')
-    call a:1.split()
-    call a:1.add_section('airline_y', ' %{get(unite#get_context(), "real_buffer_name", "")} ')
-    return 1
-  endif
-endfunction
-
-function! airline#extensions#unite#init(ext)
-  let g:unite_force_overwrite_statusline = 0
-  call a:ext.add_statusline_func('airline#extensions#unite#apply')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/virtualenv.vim b/bundle/airline/autoload/airline/extensions/virtualenv.vim
deleted file mode 100755
index 27f847e..0000000
--- a/bundle/airline/autoload/airline/extensions/virtualenv.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if !isdirectory($VIRTUAL_ENV)
-  finish
-endif
-
-let s:spc = g:airline_symbols.space
-
-function! airline#extensions#virtualenv#init(ext)
-  call a:ext.add_statusline_func('airline#extensions#virtualenv#apply')
-endfunction
-
-function! airline#extensions#virtualenv#apply(...)
-  if &filetype =~ "python"
-    if get(g:, 'virtualenv_loaded', 0)
-      let statusline = virtualenv#statusline()
-    else
-      let statusline = fnamemodify($VIRTUAL_ENV, ':t')
-    endif
-    call airline#extensions#append_to_section('x',
-          \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
-  endif
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/whitespace.vim b/bundle/airline/autoload/airline/extensions/whitespace.vim
deleted file mode 100755
index 8657412..0000000
--- a/bundle/airline/autoload/airline/extensions/whitespace.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-" http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
-
-" for backwards compatibility
-if exists('g:airline_detect_whitespace')
-  let s:show_message = g:airline_detect_whitespace == 1
-else
-  let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1)
-endif
-
-let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace)
-let s:default_checks = ['indent', 'trailing']
-
-let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
-let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
-let s:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)
-
-let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
-
-let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
-
-function! s:check_mixed_indent()
-  if s:indent_algo == 1
-    " [<tab>]<space><tab>
-    " spaces before or between tabs are not allowed
-    let t_s_t = '(^\t* +\t\s*\S)'
-    " <tab>(<space> x count)
-    " count of spaces at the end of tabs should be less then tabstop value
-    let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
-    return search('\v' . t_s_t . '|' . t_l_s, 'nw')
-  else
-    return search('\v(^\t+ +)|(^ +\t+)', 'nw')
-  endif
-endfunction
-
-function! airline#extensions#whitespace#check()
-  if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
-    return ''
-  endif
-
-  if !exists('b:airline_whitespace_check')
-    let b:airline_whitespace_check = ''
-    let checks = get(g:, 'airline#extensions#whitespace#checks', s:default_checks)
-
-    let trailing = 0
-    if index(checks, 'trailing') > -1
-      let trailing = search('\s$', 'nw')
-    endif
-
-    let mixed = 0
-    if index(checks, 'indent') > -1
-      let mixed = s:check_mixed_indent()
-    endif
-
-    if trailing != 0 || mixed != 0
-      let b:airline_whitespace_check = s:symbol
-      if s:show_message
-        if trailing != 0
-          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:trailing_format, trailing)
-        endif
-        if mixed != 0
-          let b:airline_whitespace_check .= (g:airline_symbols.space).printf(s:mixed_indent_format, mixed)
-        endif
-      endif
-    endif
-  endif
-  return b:airline_whitespace_check
-endfunction!
-
-function! airline#extensions#whitespace#toggle()
-  if s:enabled
-    augroup airline_whitespace
-      autocmd!
-    augroup END
-    augroup! airline_whitespace
-    let s:enabled = 0
-  else
-    call airline#extensions#whitespace#init()
-    let s:enabled = 1
-  endif
-
-  if exists("g:airline#extensions#whitespace#enabled")
-    let g:airline#extensions#whitespace#enabled = s:enabled
-    if s:enabled && match(g:airline_section_warning, '#whitespace#check') < 0
-      let g:airline_section_warning .= airline#section#create(['whitespace'])
-      call airline#update_statusline()
-    endif
-  endif
-  echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
-endfunction
-
-function! airline#extensions#whitespace#init(...)
-  call airline#parts#define_function('whitespace', 'airline#extensions#whitespace#check')
-
-  unlet! b:airline_whitespace_check
-  augroup airline_whitespace
-    autocmd!
-    autocmd CursorHold,BufWritePost * unlet! b:airline_whitespace_check
-  augroup END
-endfunction
-
diff --git a/bundle/airline/autoload/airline/extensions/windowswap.vim b/bundle/airline/autoload/airline/extensions/windowswap.vim
deleted file mode 100755
index 2beb91c..0000000
--- a/bundle/airline/autoload/airline/extensions/windowswap.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" vim: et ts=2 sts=2 sw=2
-
-if !exists('g:loaded_windowswap')
-  finish
-endif
-
-let s:spc = g:airline_symbols.space
-
-if !exists('g:airline#extensions#windowswap#indicator_text')
-  let g:airline#extensions#windowswap#indicator_text = 'WS'
-endif
-
-function! airline#extensions#windowswap#init(ext)
-  call airline#parts#define_function('windowswap', 'airline#extensions#windowswap#get_status')
-endfunction
-
-function! airline#extensions#windowswap#get_status()
-  if WindowSwap#HasMarkedWindow() && WindowSwap#GetMarkedWindowNum() == winnr()
-    return g:airline#extensions#windowswap#indicator_text.s:spc
-  endif
-  return ''
-endfunction
-
diff --git a/bundle/airline/autoload/airline/highlighter.vim b/bundle/airline/autoload/airline/highlighter.vim
deleted file mode 100755
index 17a6cf5..0000000
--- a/bundle/airline/autoload/airline/highlighter.vim
+++ /dev/null
@@ -1,159 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running')
-let s:separators = {}
-let s:accents = {}
-
-function! s:gui2cui(rgb, fallback)
-  if a:rgb == ''
-    return a:fallback
-  endif
-  let rgb = map(matchlist(a:rgb, '#\(..\)\(..\)\(..\)')[1:3], '0 + ("0x".v:val)')
-  let rgb = [rgb[0] > 127 ? 4 : 0, rgb[1] > 127 ? 2 : 0, rgb[2] > 127 ? 1 : 0]
-  return rgb[0]+rgb[1]+rgb[2]
-endfunction
-
-function! s:get_syn(group, what)
-  " need to pass in mode, known to break on 7.3.547
-  let mode = has('gui_running') ? 'gui' : 'cterm'
-  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, mode)
-  if empty(color) || color == -1
-    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, mode)
-  endif
-  if empty(color) || color == -1
-    if has('gui_running')
-      let color = a:what ==# 'fg' ? '#000000' : '#FFFFFF'
-    else
-      let color = a:what ==# 'fg' ? 0 : 1
-    endif
-  endif
-  return color
-endfunction
-
-function! s:get_array(fg, bg, opts)
-  let fg = a:fg
-  let bg = a:bg
-  return has('gui_running')
-        \ ? [ fg, bg, '', '', join(a:opts, ',') ]
-        \ : [ '', '', fg, bg, join(a:opts, ',') ]
-endfunction
-
-function! airline#highlighter#get_highlight(group, ...)
-  let fg = s:get_syn(a:group, 'fg')
-  let bg = s:get_syn(a:group, 'bg')
-  let reverse = has('gui_running')
-        \ ? synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'gui')
-        \ : synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'cterm')
-        \|| synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'term')
-  return reverse ? s:get_array(bg, fg, a:000) : s:get_array(fg, bg, a:000)
-endfunction
-
-function! airline#highlighter#get_highlight2(fg, bg, ...)
-  let fg = s:get_syn(a:fg[0], a:fg[1])
-  let bg = s:get_syn(a:bg[0], a:bg[1])
-  return s:get_array(fg, bg, a:000)
-endfunction
-
-function! airline#highlighter#exec(group, colors)
-  let colors = a:colors
-  if s:is_win32term
-    let colors[2] = s:gui2cui(get(colors, 0, ''), get(colors, 2, ''))
-    let colors[3] = s:gui2cui(get(colors, 1, ''), get(colors, 3, ''))
-  endif
-  exec printf('hi %s %s %s %s %s %s %s %s',
-        \ a:group,
-        \ get(colors, 0, '') != '' ? 'guifg='.colors[0] : '',
-        \ get(colors, 1, '') != '' ? 'guibg='.colors[1] : '',
-        \ get(colors, 2, '') != '' ? 'ctermfg='.colors[2] : '',
-        \ get(colors, 3, '') != '' ? 'ctermbg='.colors[3] : '',
-        \ get(colors, 4, '') != '' ? 'gui='.colors[4] : '',
-        \ get(colors, 4, '') != '' ? 'cterm='.colors[4] : '',
-        \ get(colors, 4, '') != '' ? 'term='.colors[4] : '')
-endfunction
-
-function! s:exec_separator(dict, from, to, inverse, suffix)
-  let l:from = airline#themes#get_highlight(a:from.a:suffix)
-  let l:to = airline#themes#get_highlight(a:to.a:suffix)
-  let group = a:from.'_to_'.a:to.a:suffix
-  if a:inverse
-    let colors = [ l:from[1], l:to[1], l:from[3], l:to[3] ]
-  else
-    let colors = [ l:to[1], l:from[1], l:to[3], l:from[3] ]
-  endif
-  let a:dict[group] = colors
-  call airline#highlighter#exec(group, colors)
-endfunction
-
-function! airline#highlighter#load_theme()
-  for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
-    call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
-  endfor
-  call airline#highlighter#highlight(['inactive'])
-  call airline#highlighter#highlight(['normal'])
-endfunction
-
-function! airline#highlighter#add_separator(from, to, inverse)
-  let s:separators[a:from.a:to] = [a:from, a:to, a:inverse]
-  call <sid>exec_separator({}, a:from, a:to, a:inverse, '')
-endfunction
-
-function! airline#highlighter#add_accent(accent)
-  let s:accents[a:accent] = 1
-endfunction
-
-function! airline#highlighter#highlight_modified_inactive(bufnr)
-  if getbufvar(a:bufnr, '&modified')
-    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c')
-          \ ? g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c : []
-  else
-    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive.airline_c')
-          \ ? g:airline#themes#{g:airline_theme}#palette.inactive.airline_c : []
-  endif
-
-  if !empty(colors)
-    call airline#highlighter#exec('airline_c'.(a:bufnr).'_inactive', colors)
-  endif
-endfunction
-
-function! airline#highlighter#highlight(modes)
-  let p = g:airline#themes#{g:airline_theme}#palette
-
-  " draw the base mode, followed by any overrides
-  let mapped = map(a:modes, 'v:val == a:modes[0] ? v:val : a:modes[0]."_".v:val')
-  let suffix = a:modes[0] == 'inactive' ? '_inactive' : ''
-  for mode in mapped
-    if exists('g:airline#themes#{g:airline_theme}#palette[mode]')
-      let dict = g:airline#themes#{g:airline_theme}#palette[mode]
-      for kvp in items(dict)
-        let mode_colors = kvp[1]
-        call airline#highlighter#exec(kvp[0].suffix, mode_colors)
-
-        for accent in keys(s:accents)
-          if !has_key(p.accents, accent)
-            continue
-          endif
-          let colors = copy(mode_colors)
-          if p.accents[accent][0] != ''
-            let colors[0] = p.accents[accent][0]
-          endif
-          if p.accents[accent][2] != ''
-            let colors[2] = p.accents[accent][2]
-          endif
-          if len(colors) >= 5
-            let colors[4] = get(p.accents[accent], 4, '')
-          else
-            call add(colors, get(p.accents[accent], 4, ''))
-          endif
-          call airline#highlighter#exec(kvp[0].suffix.'_'.accent, colors)
-        endfor
-      endfor
-
-      " TODO: optimize this
-      for sep in items(s:separators)
-        call <sid>exec_separator(dict, sep[1][0], sep[1][1], sep[1][2], suffix)
-      endfor
-    endif
-  endfor
-endfunction
-
diff --git a/bundle/airline/autoload/airline/init.vim b/bundle/airline/autoload/airline/init.vim
deleted file mode 100755
index 021b3b2..0000000
--- a/bundle/airline/autoload/airline/init.vim
+++ /dev/null
@@ -1,114 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-function! s:check_defined(variable, default)
-  if !exists(a:variable)
-    let {a:variable} = a:default
-  endif
-endfunction
-
-let s:loaded = 0
-function! airline#init#bootstrap()
-  if s:loaded
-    return
-  endif
-  let s:loaded = 1
-
-  let g:airline#init#bootstrapping = 1
-
-  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b0":">")
-  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b1":">")
-  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b2":"<")
-  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b3":"<")
-  call s:check_defined('g:airline_detect_modified', 1)
-  call s:check_defined('g:airline_detect_paste', 1)
-  call s:check_defined('g:airline_detect_iminsert', 0)
-  call s:check_defined('g:airline_inactive_collapse', 1)
-  call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
-  call s:check_defined('g:airline_exclude_filetypes', [])
-  call s:check_defined('g:airline_exclude_preview', 0)
-
-  call s:check_defined('g:airline_mode_map', {})
-  call extend(g:airline_mode_map, {
-        \ '__' : '------',
-        \ 'n'  : 'NORMAL',
-        \ 'i'  : 'INSERT',
-        \ 'R'  : 'REPLACE',
-        \ 'v'  : 'VISUAL',
-        \ 'V'  : 'V-LINE',
-        \ 'c'  : 'COMMAND',
-        \ '' : 'V-BLOCK',
-        \ 's'  : 'SELECT',
-        \ 'S'  : 'S-LINE',
-        \ '' : 'S-BLOCK',
-        \ }, 'keep')
-
-  call s:check_defined('g:airline_theme_map', {})
-  call extend(g:airline_theme_map, {
-        \ 'Tomorrow.*': 'tomorrow',
-        \ 'base16.*': 'base16',
-        \ 'mo[l|n]okai': 'molokai',
-        \ 'wombat.*': 'wombat',
-        \ '.*zenburn.*': 'zenburn',
-        \ '.*solarized.*': 'solarized',
-        \ }, 'keep')
-
-  call s:check_defined('g:airline_symbols', {})
-  call extend(g:airline_symbols, {
-        \ 'paste': get(g:, 'airline_paste_symbol', 'PASTE'),
-        \ 'readonly': get(g:, 'airline_readonly_symbol', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a2" : 'RO'),
-        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? "\u2739" : '!',
-        \ 'linenr': get(g:, 'airline_linecolumn_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a1" : ':' ),
-        \ 'branch': get(g:, 'airline_branch_prefix', get(g:, 'airline_powerline_fonts', 0) ? "\ue0a0" : ''),
-        \ 'modified': '+',
-        \ 'space': ' ',
-        \ }, 'keep')
-
-  call airline#parts#define('mode', {
-        \ 'function': 'airline#parts#mode',
-        \ 'accent': 'bold',
-        \ })
-  call airline#parts#define_function('iminsert', 'airline#parts#iminsert')
-  call airline#parts#define_function('paste', 'airline#parts#paste')
-  call airline#parts#define_function('filetype', 'airline#parts#filetype')
-  call airline#parts#define('readonly', {
-        \ 'function': 'airline#parts#readonly',
-        \ 'accent': 'red',
-        \ })
-  call airline#parts#define_raw('file', '%f%m')
-  call airline#parts#define_raw('linenr', '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#')
-  call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
-  call airline#parts#define_empty(['hunks', 'branch', 'tagbar', 'syntastic', 'eclim', 'whitespace','windowswap'])
-  call airline#parts#define_text('capslock', '')
-
-  unlet g:airline#init#bootstrapping
-endfunction
-
-function! airline#init#sections()
-  let spc = g:airline_symbols.space
-  if !exists('g:airline_section_a')
-    let g:airline_section_a = airline#section#create_left(['mode', 'paste', 'capslock', 'iminsert'])
-  endif
-  if !exists('g:airline_section_b')
-    let g:airline_section_b = airline#section#create(['hunks', 'branch'])
-  endif
-  if !exists('g:airline_section_c')
-    let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
-  endif
-  if !exists('g:airline_section_gutter')
-    let g:airline_section_gutter = airline#section#create(['%='])
-  endif
-  if !exists('g:airline_section_x')
-    let g:airline_section_x = airline#section#create_right(['tagbar', 'filetype'])
-  endif
-  if !exists('g:airline_section_y')
-    let g:airline_section_y = airline#section#create_right(['ffenc'])
-  endif
-  if !exists('g:airline_section_z')
-    let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3c '])
-  endif
-  if !exists('g:airline_section_warning')
-    let g:airline_section_warning = airline#section#create(['syntastic', 'eclim', 'whitespace'])
-  endif
-endfunction
-
diff --git a/bundle/airline/autoload/airline/parts.vim b/bundle/airline/autoload/airline/parts.vim
deleted file mode 100755
index b0356b1..0000000
--- a/bundle/airline/autoload/airline/parts.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-let s:parts = {}
-
-" PUBLIC API {{{
-
-function! airline#parts#define(key, config)
-  let s:parts[a:key] = get(s:parts, a:key, {})
-  if exists('g:airline#init#bootstrapping')
-    call extend(s:parts[a:key], a:config, 'keep')
-  else
-    call extend(s:parts[a:key], a:config, 'force')
-  endif
-endfunction
-
-function! airline#parts#define_function(key, name)
-  call airline#parts#define(a:key, { 'function': a:name })
-endfunction
-
-function! airline#parts#define_text(key, text)
-  call airline#parts#define(a:key, { 'text': a:text })
-endfunction
-
-function! airline#parts#define_raw(key, raw)
-  call airline#parts#define(a:key, { 'raw': a:raw })
-endfunction
-
-function! airline#parts#define_minwidth(key, width)
-  call airline#parts#define(a:key, { 'minwidth': a:width })
-endfunction
-
-function! airline#parts#define_condition(key, predicate)
-  call airline#parts#define(a:key, { 'condition': a:predicate })
-endfunction
-
-function! airline#parts#define_accent(key, accent)
-  call airline#parts#define(a:key, { 'accent': a:accent })
-endfunction
-
-function! airline#parts#define_empty(keys)
-  for key in a:keys
-    call airline#parts#define_raw(key, '')
-  endfor
-endfunction
-
-function! airline#parts#get(key)
-  return get(s:parts, a:key, {})
-endfunction
-
-" }}}
-
-function! airline#parts#mode()
-  return get(w:, 'airline_current_mode', '')
-endfunction
-
-function! airline#parts#paste()
-  return g:airline_detect_paste && &paste ? g:airline_symbols.paste : ''
-endfunction
-
-function! airline#parts#iminsert()
-  if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name')
-    return toupper(b:keymap_name)
-  endif
-  return ''
-endfunction
-
-function! airline#parts#readonly()
-  return &readonly ? g:airline_symbols.readonly : ''
-endfunction
-
-function! airline#parts#filetype()
-  return &filetype
-endfunction
-
-function! airline#parts#ffenc()
-  return printf('%s%s', &fenc, strlen(&ff) > 0 ? '['.&ff.']' : '')
-endfunction
-
diff --git a/bundle/airline/autoload/airline/section.vim b/bundle/airline/autoload/airline/section.vim
deleted file mode 100755
index 06d930f..0000000
--- a/bundle/airline/autoload/airline/section.vim
+++ /dev/null
@@ -1,73 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-call airline#init#bootstrap()
-let s:spc = g:airline_symbols.space
-
-function! s:wrap_accent(part, value)
-  if exists('a:part.accent')
-    call airline#highlighter#add_accent(a:part.accent)
-    return '%#__accent_'.(a:part.accent).'#'.a:value.'%#__restore__#'
-  endif
-  return a:value
-endfunction
-
-function! s:create(parts, append)
-  let _ = ''
-  for idx in range(len(a:parts))
-    let part = airline#parts#get(a:parts[idx])
-    let val = ''
-
-    if exists('part.function')
-      let func = (part.function).'()'
-    elseif exists('part.text')
-      let func = '"'.(part.text).'"'
-    else
-      if a:append > 0 && idx != 0
-        let val .= s:spc.g:airline_left_alt_sep.s:spc
-      endif
-      if a:append < 0 && idx != 0
-        let val = s:spc.g:airline_right_alt_sep.s:spc.val
-      endif
-      if exists('part.raw')
-        let _ .= s:wrap_accent(part, val.(part.raw))
-        continue
-      else
-        let _ .= s:wrap_accent(part, val.a:parts[idx])
-        continue
-      endif
-    endif
-
-    let minwidth = get(part, 'minwidth', 0)
-
-    if a:append > 0 && idx != 0
-      let partval = printf('%%{airline#util#append(%s,%s)}', func, minwidth)
-    elseif a:append < 0 && idx != len(a:parts) - 1
-      let partval = printf('%%{airline#util#prepend(%s,%s)}', func, minwidth)
-    else
-      let partval = printf('%%{airline#util#wrap(%s,%s)}', func, minwidth)
-    endif
-
-    if exists('part.condition')
-      let partval = substitute(partval, '{', '\="{".(part.condition)." ? "', '')
-      let partval = substitute(partval, '}', ' : ""}', '')
-    endif
-
-    let val .= s:wrap_accent(part, partval)
-    let _ .= val
-  endfor
-  return _
-endfunction
-
-function! airline#section#create(parts)
-  return s:create(a:parts, 0)
-endfunction
-
-function! airline#section#create_left(parts)
-  return s:create(a:parts, 1)
-endfunction
-
-function! airline#section#create_right(parts)
-  return s:create(a:parts, -1)
-endfunction
-
diff --git a/bundle/airline/autoload/airline/themes.vim b/bundle/airline/autoload/airline/themes.vim
deleted file mode 100755
index 07e0324..0000000
--- a/bundle/airline/autoload/airline/themes.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-" generates a dictionary which defines the colors for each highlight group
-function! airline#themes#generate_color_map(sect1, sect2, sect3, ...)
-  let palette = {
-        \ 'airline_a': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , get(a:sect1 , 4 , '') ] ,
-        \ 'airline_b': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , get(a:sect2 , 4 , '') ] ,
-        \ 'airline_c': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , get(a:sect3 , 4 , '') ] ,
-        \ }
-
-  if a:0 > 0
-    call extend(palette, {
-          \ 'airline_x': [ a:1[0] , a:1[1] , a:1[2] , a:1[3] , get(a:1 , 4 , '' ) ] ,
-          \ 'airline_y': [ a:2[0] , a:2[1] , a:2[2] , a:2[3] , get(a:2 , 4 , '' ) ] ,
-          \ 'airline_z': [ a:3[0] , a:3[1] , a:3[2] , a:3[3] , get(a:3 , 4 , '' ) ] ,
-          \ })
-  else
-    call extend(palette, {
-          \ 'airline_x': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , '' ] ,
-          \ 'airline_y': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , '' ] ,
-          \ 'airline_z': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , '' ] ,
-          \ })
-  endif
-
-  return palette
-endfunction
-
-function! airline#themes#get_highlight(group, ...)
-  return call('airline#highlighter#get_highlight', [a:group] + a:000)
-endfunction
-
-function! airline#themes#get_highlight2(fg, bg, ...)
-  return call('airline#highlighter#get_highlight2', [a:fg, a:bg] + a:000)
-endfunction
-
-function! airline#themes#patch(palette)
-  for mode in keys(a:palette)
-    if !has_key(a:palette[mode], 'airline_warning')
-      let a:palette[mode]['airline_warning'] = [ '#000000', '#df5f00', 232, 166 ]
-    endif
-  endfor
-
-  let a:palette.accents = get(a:palette, 'accents', {})
-  let a:palette.accents.bold = [ '', '', '', '', 'bold' ]
-  let a:palette.accents.italic = [ '', '', '', '', 'italic' ]
-
-  if !has_key(a:palette.accents, 'red')
-    let a:palette.accents.red = [ '#ff0000' , '' , 160 , '' ]
-  endif
-  if !has_key(a:palette.accents, 'green')
-    let a:palette.accents.green = [ '#008700' , '' , 22  , '' ]
-  endif
-  if !has_key(a:palette.accents, 'blue')
-    let a:palette.accents.blue = [ '#005fff' , '' , 27  , '' ]
-  endif
-  if !has_key(a:palette.accents, 'yellow')
-    let a:palette.accents.yellow = [ '#dfff00' , '' , 190 , '' ]
-  endif
-  if !has_key(a:palette.accents, 'orange')
-    let a:palette.accents.orange = [ '#df5f00' , '' , 166 , '' ]
-  endif
-  if !has_key(a:palette.accents, 'purple')
-    let a:palette.accents.purple = [ '#af00df' , '' , 128 , '' ]
-  endif
-endfunction
-
diff --git a/bundle/airline/autoload/airline/themes/badwolf.vim b/bundle/airline/autoload/airline/themes/badwolf.vim
deleted file mode 100755
index 41a25d1..0000000
--- a/bundle/airline/autoload/airline/themes/badwolf.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-let s:N1 = [ '#141413' , '#aeee00' , 232 , 154 ] " blackestgravel & lime
-let s:N2 = [ '#f4cf86' , '#45413b' , 222 , 238 ] " dirtyblonde    & deepgravel
-let s:N3 = [ '#8cffba' , '#242321' , 121 , 235 ] " saltwatertaffy & darkgravel
-let s:N4 = [ '#666462' , 241 ]                   " mediumgravel
-
-let s:I1 = [ '#141413' , '#0a9dff' , 232 , 39  ] " blackestgravel & tardis
-let s:I2 = [ '#f4cf86' , '#005fff' , 222 , 27  ] " dirtyblonde    & facebook
-let s:I3 = [ '#0a9dff' , '#242321' , 39  , 235 ] " tardis         & darkgravel
-
-let s:V1 = [ '#141413' , '#ffa724' , 232 , 214 ] " blackestgravel & orange
-let s:V2 = [ '#000000' , '#fade3e' , 16  , 221 ] " coal           & dalespale
-let s:V3 = [ '#000000' , '#b88853' , 16  , 137 ] " coal           & toffee
-let s:V4 = [ '#c7915b' , 173 ]                   " coffee
-
-let s:PA = [ '#f4cf86' , 222 ]                   " dirtyblonde
-let s:RE = [ '#ff9eb8' , 211 ]                   " dress
-
-let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
-
-let g:airline#themes#badwolf#palette = {}
-
-let g:airline#themes#badwolf#palette.accents = {
-      \ 'red': [ '#ff2c4b' , '' , 196 , '' , '' ]
-      \ }
-
-let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#badwolf#palette.normal_modified = {
-      \ 'airline_b': [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
-      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
-
-
-let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#badwolf#palette.insert_modified = {
-      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
-let g:airline#themes#badwolf#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] }
-
-
-let g:airline#themes#badwolf#palette.replace = copy(airline#themes#badwolf#palette.insert)
-let g:airline#themes#badwolf#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#badwolf#palette.replace_modified = g:airline#themes#badwolf#palette.insert_modified
-
-
-let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#badwolf#palette.visual_modified = {
-      \ 'airline_c': [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
-
-
-let g:airline#themes#badwolf#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#badwolf#palette.inactive_modified = {
-      \ 'airline_c': [ s:V1[1]   , ''        , s:V1[3]   , ''        , ''     ] }
-
diff --git a/bundle/airline/autoload/airline/themes/base16.vim b/bundle/airline/autoload/airline/themes/base16.vim
deleted file mode 100755
index 469435e..0000000
--- a/bundle/airline/autoload/airline/themes/base16.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-if get(g:, 'airline#themes#base16#constant', 0)
-  let g:airline#themes#base16#palette = {}
-
-  " Color palette
-  let s:gui_dark_gray = '#202020'
-  let s:cterm_dark_gray = 234
-  let s:gui_med_gray_hi = '#303030'
-  let s:cterm_med_gray_hi = 236
-  let s:gui_med_gray_lo = '#3a3a3a'
-  let s:cterm_med_gray_lo = 237
-  let s:gui_light_gray = '#505050'
-  let s:cterm_light_gray = 239
-  let s:gui_green = '#99cc99'
-  let s:cterm_green = 151
-  let s:gui_blue = '#6a9fb5'
-  let s:cterm_blue = 67
-  let s:gui_purple = '#aa759f'
-  let s:cterm_purple = 139
-  let s:gui_orange = '#d28445'
-  let s:cterm_orange = 173
-  let s:gui_red = '#ac4142'
-  let s:cterm_red = 131
-  let s:gui_pink = '#d7afd7'
-  let s:cterm_pink = 182
-
-  " Normal mode
-  let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
-  let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
-  let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-  let g:airline#themes#base16#palette.normal_modified = {
-        \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
-        \ }
-
-  " Insert mode
-  let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
-  let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
-  let g:airline#themes#base16#palette.insert_modified = copy(g:airline#themes#base16#palette.normal_modified)
-  let g:airline#themes#base16#palette.insert_paste = {
-        \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
-        \ }
-
-  " Replace mode
-  let g:airline#themes#base16#palette.replace = {
-        \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
-        \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
-        \ }
-  let g:airline#themes#base16#palette.replace_modified = copy(g:airline#themes#base16#palette.insert_modified)
-
-  " Visual mode
-  let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
-  let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
-  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
-  let g:airline#themes#base16#palette.visual_modified = copy(g:airline#themes#base16#palette.insert_modified)
-
-  " Inactive window
-  let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_dark_gray, s:cterm_med_gray_hi, '']
-  let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#base16#palette.inactive_modified = {
-        \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
-        \ }
-else
-  function! airline#themes#base16#refresh()
-    let g:airline#themes#base16#palette = {}
-
-    let g:airline#themes#base16#palette.accents = {
-          \ 'red': airline#themes#get_highlight('Constant'),
-          \ }
-
-    let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
-    let s:N2 = airline#themes#get_highlight('Visual')
-    let s:N3 = airline#themes#get_highlight('CursorLine')
-    let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-    let group = airline#themes#get_highlight('vimCommand')
-    let g:airline#themes#base16#palette.normal_modified = {
-          \ 'statusline': [ group[0], '', group[2], '', '' ]
-          \ }
-
-    let s:I1 = airline#themes#get_highlight2(['DiffAdded', 'bg'], ['DiffAdded', 'fg'], 'bold')
-    let s:I2 = airline#themes#get_highlight2(['DiffAdded', 'fg'], ['Normal', 'bg'])
-    let s:I3 = s:N3
-    let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-    let g:airline#themes#base16#palette.insert_modified = g:airline#themes#base16#palette.normal_modified
-
-    let s:R1 = airline#themes#get_highlight2(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
-    let s:R2 = s:N2
-    let s:R3 = s:N3
-    let g:airline#themes#base16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-    let g:airline#themes#base16#palette.replace_modified = g:airline#themes#base16#palette.normal_modified
-
-    let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
-    let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
-    let s:V3 = s:N3
-    let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-    let g:airline#themes#base16#palette.visual_modified = g:airline#themes#base16#palette.normal_modified
-
-    let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
-    let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-    let g:airline#themes#base16#palette.inactive_modified = {
-          \ 'airline_c': [ group[0], '', group[2], '', '' ]
-          \ }
-  endfunction
-  call airline#themes#base16#refresh()
-endif
-
diff --git a/bundle/airline/autoload/airline/themes/bubblegum.vim b/bundle/airline/autoload/airline/themes/bubblegum.vim
deleted file mode 100755
index f2378ce..0000000
--- a/bundle/airline/autoload/airline/themes/bubblegum.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Color palette
-let s:gui_dark_gray = '#303030'
-let s:cterm_dark_gray = 236
-let s:gui_med_gray_hi = '#444444'
-let s:cterm_med_gray_hi = 238
-let s:gui_med_gray_lo = '#3a3a3a'
-let s:cterm_med_gray_lo = 237
-let s:gui_light_gray = '#b2b2b2'
-let s:cterm_light_gray = 249
-let s:gui_green = '#afd787'
-let s:cterm_green = 150
-let s:gui_blue = '#87afd7'
-let s:cterm_blue = 110
-let s:gui_purple = '#afafd7'
-let s:cterm_purple = 146
-let s:gui_orange = '#d7af5f'
-let s:cterm_orange = 179
-let s:gui_red = '#d78787'
-let s:cterm_red = 174
-let s:gui_pink = '#d7afd7'
-let s:cterm_pink = 182
-
-let g:airline#themes#bubblegum#palette = {}
-
-" Normal mode
-let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
-let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
-let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#bubblegum#palette.normal_modified = {
-      \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
-      \ }
-
-" Insert mode
-let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
-let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
-let g:airline#themes#bubblegum#palette.insert_modified = copy(g:airline#themes#bubblegum#palette.normal_modified)
-let g:airline#themes#bubblegum#palette.insert_paste = {
-      \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
-      \ }
-
-" Replace mode
-let g:airline#themes#bubblegum#palette.replace = {
-      \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
-      \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
-      \ }
-let g:airline#themes#bubblegum#palette.replace_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
-
-" Visual mode
-let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
-let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
-let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
-let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
-
-" Inactive window
-let s:IA = [s:gui_light_gray, s:gui_med_gray_hi, s:cterm_light_gray, s:cterm_med_gray_hi, '']
-let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#bubblegum#palette.inactive_modified = {
-      \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
-      \ }
-
-" CtrlP
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#bubblegum#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, '' ] ,
-      \ [ s:gui_orange, s:gui_med_gray_lo, s:cterm_orange, s:cterm_med_gray_lo, '' ] ,
-      \ [ s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green, 'bold' ] )
diff --git a/bundle/airline/autoload/airline/themes/dark.vim b/bundle/airline/autoload/airline/themes/dark.vim
deleted file mode 100755
index 217b2f1..0000000
--- a/bundle/airline/autoload/airline/themes/dark.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Each theme is contained in its own file and declares variables scoped to the
-" file.  These variables represent the possible "modes" that airline can
-" detect.  The mode is the return value of mode(), which gets converted to a
-" readable string.  The following is a list currently supported modes: normal,
-" insert, replace, visual, and inactive.
-"
-" Each mode can also have overrides.  These are small changes to the mode that
-" don't require a completely different look.  "modified" and "paste" are two
-" such supported overrides.  These are simply suffixed to the major mode,
-" separated by an underscore.  For example, "normal_modified" would be normal
-" mode where the current buffer is modified.
-"
-" The theming algorithm is a 2-pass system where the mode will draw over all
-" parts of the statusline, and then the override is applied after.  This means
-" it is possible to specify a subset of the theme in overrides, as it will
-" simply overwrite the previous colors.  If you want simultaneous overrides,
-" then they will need to change different parts of the statusline so they do
-" not conflict with each other.
-"
-" First, let's define an empty dictionary and assign it to the "palette"
-" variable. The # is a separator that maps with the directory structure. If
-" you get this wrong, Vim will complain loudly.
-let g:airline#themes#dark#palette = {}
-
-" First let's define some arrays. The s: is just a VimL thing for scoping the
-" variables to the current script. Without this, these variables would be
-" declared globally. Now let's declare some colors for normal mode and add it
-" to the dictionary.  The array is in the format:
-" [ guifg, guibg, ctermfg, ctermbg, opts ]. See "help attr-list" for valid
-" values for the "opt" value.
-let s:N1   = [ '#00005f' , '#dfff00' , 17  , 190 ]
-let s:N2   = [ '#ffffff' , '#444444' , 255 , 238 ]
-let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
-let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-" Here we define overrides for when the buffer is modified.  This will be
-" applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
-" declared.
-let g:airline#themes#dark#palette.normal_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-
-
-let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
-let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
-let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
-let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#dark#palette.insert_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-let g:airline#themes#dark#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#dark#palette.replace = copy(g:airline#themes#dark#palette.insert)
-let g:airline#themes#dark#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
-let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palette.insert_modified
-
-
-let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
-let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
-let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
-let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#dark#palette.visual_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-
-
-let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
-let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
-let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
-let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-let g:airline#themes#dark#palette.inactive_modified = {
-      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
-      \ }
-
-
-" Accents are used to give parts within a section a slightly different look or
-" color. Here we are defining a "red" accent, which is used by the 'readonly'
-" part by default. Only the foreground colors are specified, so the background
-" colors are automatically extracted from the underlying section colors. What
-" this means is that regardless of which section the part is defined in, it
-" will be red instead of the section's foreground color. You can also have
-" multiple parts with accents within a section.
-let g:airline#themes#dark#palette.accents = {
-      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
-      \ }
-
-
-" Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
-" variable so that related functionality is loaded iff the user is using
-" ctrlp. Note that this is optional, and if you do not define ctrlp colors
-" they will be chosen automatically from the existing palette.
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#dark#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
-      \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
-      \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
-
diff --git a/bundle/airline/autoload/airline/themes/durant.vim b/bundle/airline/autoload/airline/themes/durant.vim
deleted file mode 100755
index 56be7ba..0000000
--- a/bundle/airline/autoload/airline/themes/durant.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
-let s:N2 = [ '#93a1a1' , '#586e75' , 245 , 240 ]
-let s:N3 = [ '#93a1a1' , '#073642' , 240 , 233 ]
-let g:airline#themes#durant#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-
-let g:airline#themes#durant#normal_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-
-
-
-let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
-let s:I2 = [ '#9e9e9e' , '#303030' , 247 , 236 ]
-let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ]
-let g:airline#themes#durant#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#durant#palette.insert_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-let g:airline#themes#durant#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#durant#palette.replace = copy(g:airline#themes#durant#palette.insert)
-let g:airline#themes#durant#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
-
-let g:airline#themes#durant#palette.replace_modified = g:airline#themes#durant#palette.insert_modified
-
-let s:V1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ]
-let s:V2 = [ '#ffffff' , '#44403a' , 255, 238 ]
-let s:V3 = [ '#90a680' , '#2e2d2a' , 64, 235 ]
-let g:airline#themes#durant#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#durant#palette.visual_modified = {
-      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
-      \ }
-
-
-let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
-let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
-let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
-let g:airline#themes#durant#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-let g:airline#themes#durant#palette.inactive_modified = {
-      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
-      \ }
-
-
-let g:airline#themes#durant#palette.accents = {
-      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
-      \ }
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-  let g:airline#themes#durant#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-        \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
-        \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
-        \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
-
diff --git a/bundle/airline/autoload/airline/themes/hybrid.vim b/bundle/airline/autoload/airline/themes/hybrid.vim
deleted file mode 100755
index b0df844..0000000
--- a/bundle/airline/autoload/airline/themes/hybrid.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-" vim-airline companion theme of Hybrid
-" (https://github.com/w0ng/vim-hybrid)
-
-let g:airline#themes#hybrid#palette = {}
-
-function! airline#themes#hybrid#refresh()
-    let s:N1 = airline#themes#get_highlight('DiffAdd')
-    let s:N2 = airline#themes#get_highlight('CursorLine')
-    let s:N3 = airline#themes#get_highlight('PMenu')
-    let g:airline#themes#hybrid#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-    let modified_group = airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
-    let g:airline#themes#hybrid#palette.normal_modified = {
-                \ 'airline_c': airline#themes#get_highlight2(['Text', 'fg'], ['SpellRare', 'bg'], 'bold')
-                \ }
-
-    let warning_group = airline#themes#get_highlight('SpellRare')
-    let g:airline#themes#hybrid#palette.normal.airline_warning = warning_group
-    let g:airline#themes#hybrid#palette.normal_modified.airline_warning = warning_group
-
-    let s:I1 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffText', 'bg'], 'bold')
-    let s:I2 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellLocal', 'bg'], 'bold')
-    let s:I3 = airline#themes#get_highlight2(['Text', 'fg'], ['SpellCap', 'bg'], 'bold')
-    let g:airline#themes#hybrid#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-    let g:airline#themes#hybrid#palette.insert_modified = g:airline#themes#hybrid#palette.normal_modified
-    let g:airline#themes#hybrid#palette.insert.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
-    let g:airline#themes#hybrid#palette.insert_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
-
-    let s:R1 = airline#themes#get_highlight('DiffChange')
-    let s:R2 = s:N2
-    let s:R3 = s:N3
-    let g:airline#themes#hybrid#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-    let replace_group = airline#themes#get_highlight('SpellRare')
-    let g:airline#themes#hybrid#palette.replace_modified = g:airline#themes#hybrid#palette.normal_modified
-    let g:airline#themes#hybrid#palette.replace.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
-    let g:airline#themes#hybrid#palette.replace_modified.airline_warning = g:airline#themes#hybrid#palette.replace_modified.airline_warning
-
-    let s:V1 = airline#themes#get_highlight2(['Text', 'fg'], ['Folded', 'bg'], 'bold')
-    let s:V2 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffDelete', 'bg'], 'bold')
-    let s:V3 = airline#themes#get_highlight2(['Text', 'fg'], ['Error', 'bg'], 'bold')
-    let g:airline#themes#hybrid#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-    let g:airline#themes#hybrid#palette.visual_modified = g:airline#themes#hybrid#palette.normal_modified
-    let g:airline#themes#hybrid#palette.visual.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
-    let g:airline#themes#hybrid#palette.visual_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
-
-    let s:IA = airline#themes#get_highlight('StatusLineNC')
-    let g:airline#themes#hybrid#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-    let g:airline#themes#hybrid#palette.inactive_modified = {
-                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
-                \ }
-
-    let g:airline#themes#hybrid#palette.accents = {
-                \ 'red': airline#themes#get_highlight('Constant'),
-                \ }
-
-endfunction
-
-call airline#themes#hybrid#refresh()
diff --git a/bundle/airline/autoload/airline/themes/jellybeans.vim b/bundle/airline/autoload/airline/themes/jellybeans.vim
deleted file mode 100755
index 201068c..0000000
--- a/bundle/airline/autoload/airline/themes/jellybeans.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-let g:airline#themes#jellybeans#palette = {}
-
-" The name of the function must be 'refresh'.
-function! airline#themes#jellybeans#refresh()
-  " This theme is an example of how to use helper functions to extract highlight
-  " values from the corresponding colorscheme. It was written in a hurry, so it
-  " is very minimalistic. If you are a jellybeans user and want to make updates,
-  " please send pull requests.
-
-  " Here are examples where the entire highlight group is copied and an airline
-  " compatible color array is generated.
-  let s:N1 = airline#themes#get_highlight('DbgCurrent', 'bold')
-  let s:N2 = airline#themes#get_highlight('Folded')
-  let s:N3 = airline#themes#get_highlight('NonText')
-
-  let g:airline#themes#jellybeans#palette.accents = {
-        \ 'red': airline#themes#get_highlight('Constant'),
-        \ }
-
-  let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-  let g:airline#themes#jellybeans#palette.normal_modified = {
-        \ 'airline_c': [ '#ffb964', '', 215, '', '' ]
-        \ }
-
-  let s:I1 = airline#themes#get_highlight('DiffAdd', 'bold')
-  let s:I2 = s:N2
-  let s:I3 = s:N3
-  let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-  let g:airline#themes#jellybeans#palette.insert_modified = g:airline#themes#jellybeans#palette.normal_modified
-
-  let s:R1 = airline#themes#get_highlight('WildMenu', 'bold')
-  let s:R2 = s:N2
-  let s:R3 = s:N3
-  let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-  let g:airline#themes#jellybeans#palette.replace_modified = g:airline#themes#jellybeans#palette.normal_modified
-
-  " Sometimes you want to mix and match colors from different groups, you can do
-  " that with this method.
-  let s:V1 = airline#themes#get_highlight2(['TabLineSel', 'bg'], ['DiffDelete', 'bg'], 'bold')
-  let s:V2 = s:N2
-  let s:V3 = s:N3
-  let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-  let g:airline#themes#jellybeans#palette.visual_modified = g:airline#themes#jellybeans#palette.normal_modified
-
-  " And of course, you can always do it manually as well.
-  let s:IA = [ '#444444', '#1c1c1c', 237, 234 ]
-  let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#jellybeans#palette.inactive_modified = g:airline#themes#jellybeans#palette.normal_modified
-endfunction
-
-call airline#themes#jellybeans#refresh()
-
diff --git a/bundle/airline/autoload/airline/themes/kalisi.vim b/bundle/airline/autoload/airline/themes/kalisi.vim
deleted file mode 100755
index 78504fa..0000000
--- a/bundle/airline/autoload/airline/themes/kalisi.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-"
-" Colorscheme: Kalisi for airline. Inspired by powerline.
-" Arthur Jaron
-" hifreeo@gmail.com
-" 24.10.2014 
- 
-" Visual mode                                   
-let s:V1 = [ '#0087ff' , '#ffffff','33','231']
-let s:V2 = [ '#005faf' , '#5fafff','25','75']
-let s:V3 = [ '#87d7ff' , '#005faf','117','25']
-
-" Replace mode
-let s:R1 = [ '#d75fff' , '#ffffff','171','231']
-let s:R2 = [ '#5f005f' , '#d75fff','53','171']
-let s:R3 = [ '#ff87ff' , '#8700af','213','91']
-
-let g:airline#themes#kalisi#palette = {}
-
-
-function! airline#themes#kalisi#refresh()
-
-  let s:StatusLine = airline#themes#get_highlight('StatusLine')
-  let s:StatusLineNC = airline#themes#get_highlight('StatusLineNC')
-
-  " Insert mode                                    
-  let s:I1 = [ '#ffffff' , '#e80000','231','160']
-  let s:I2 = [ '#ff0000' , '#5f0000','196','52']
-  let s:I3 = s:StatusLine
-
-  " Normal mode
-  let s:N1 = [ '#005f00' , '#afd700','22','148'] 
-  let s:N2 = [ '#afd700' , '#005f00','148','22'] 
-  let s:N3 = s:StatusLine
-
-  " Tabline Plugin
-  let g:airline#themes#kalisi#palette.tabline = {
-        \ 'airline_tab':    ['#bcbcbc', '#005f00','250','22'],
-        \ 'airline_tabsel': ['#404042', '#A6DB29','238','148'],
-        \ 'airline_tabtype':['#afd700', '#204d20','148','22'],
-        \ 'airline_tabfill': s:StatusLine,
-        \ 'airline_tabhid': ['#c5c5c5', '#404042','251','238'],
-        \ 'airline_tabmod': ['#d7ff00', '#afd700','190','148'],
-        \ 'airline_tabmod_unsel':  ['#d7ff00', '#005f00','190','22']
-        \ }
-
-  let g:airline#themes#kalisi#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-  let g:airline#themes#kalisi#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-  let g:airline#themes#kalisi#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-  let g:airline#themes#kalisi#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-
-  " Inactive Mode
-  let s:IA = airline#themes#get_highlight('StatusLineNC')
-  let g:airline#themes#kalisi#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#kalisi#palette.inactive_modified = {
-        \ 'airline_c':  ['#d7ff00', s:IA[1],'190',s:IA[3]],
-        \ }
-
-endfunction
-
-call airline#themes#kalisi#refresh()
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#kalisi#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ s:StatusLine,
-      \ ['#afd700', '#005f00','148','22'],
-      \ [ '#005f00' , '#afd700' , '22','148']
-      \)
-
diff --git a/bundle/airline/autoload/airline/themes/kolor.vim b/bundle/airline/autoload/airline/themes/kolor.vim
deleted file mode 100755
index e61f56f..0000000
--- a/bundle/airline/autoload/airline/themes/kolor.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-let g:airline#themes#kolor#palette = {}
-
-let s:N1 = [ '#e2e2e2' , '#4f3598' , 254 , 56  ]
-let s:N2 = [ '#ff5fd7' , '#242322' , 206 , 234 ]
-let s:N3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
-
-let g:airline#themes#kolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-let g:airline#themes#kolor#palette.normal_modified = {
-      \ 'airline_c': [ '#e2e2e2' , '#4f3598' , 254     , 56      , ''     ] ,
-      \ }
-
-
-let s:I1 = [ '#242322' , '#7eaefd' , 234 , 111 ]
-let s:I2 = [ '#75d7d8' , '#242322' , 80  , 234 ]
-let s:I3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
-let g:airline#themes#kolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#kolor#palette.insert_modified = {
-      \ 'airline_c': [ '#242322' , '#7eaefd' , 234     , 111     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#kolor#palette.replace = copy(g:airline#themes#kolor#palette.insert)
-let g:airline#themes#kolor#palette.replace.airline_a = [ s:I2[0]   , '#005154' , s:I2[2] , 23      , ''     ]
-let g:airline#themes#kolor#palette.replace_modified = {
-      \ 'airline_c': [ '#e2e2e2' , '#005154' , 254 , 23  , '' ] ,
-      \ }
-
-
-let s:V1 = [ '#242322' , '#e6987a' , 234 , 180 ]
-let s:V2 = [ '#dbc570' , '#242322' , 186 , 234 ]
-let s:V3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
-let g:airline#themes#kolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#kolor#palette.visual_modified = {
-      \ 'airline_c': [ '#242322' , '#e6987a' , 234     , 180      , ''     ] ,
-      \ }
-
-
-let s:IA1 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
-let s:IA2 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 ]
-let s:IA3 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
-let g:airline#themes#kolor#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-let g:airline#themes#kolor#palette.inactive_modified = {
-      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
-      \ }
-
-
-let g:airline#themes#kolor#palette.accents = {
-      \ 'red': [ '#d96e8a' , '' , 168 , ''  ]
-      \ }
-
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#kolor#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#e2e2e2' , '#4a4a4a' , 254 , 238 , ''     ],
-      \ [ '#e2e2e2' , '#242322' , 254 , 234 , ''     ],
-      \ [ '#e2e2e2' , '#4f3598' , 254 , 56  , 'bold' ])
diff --git a/bundle/airline/autoload/airline/themes/laederon.vim b/bundle/airline/autoload/airline/themes/laederon.vim
deleted file mode 100755
index 115c107..0000000
--- a/bundle/airline/autoload/airline/themes/laederon.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" vim-airline companion theme of Laederon
-" (https://github.com/Donearm/Laederon)
-
-" Normal mode
-let s:N1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ] " blackestgravel & snow
-let s:N2 = [ '#ffffff' , '#44403a' , 255, 238 ] " snow & deepgravel
-let s:N3 = [ '#90a680' , '#2e2d2a' , 64, 235 ] " dilutedpaint & darkgravel
-let s:N4 = [ '#777470' , 240 ] " gravel
-
-" Insert mode
-let s:I1 = [ '#1a1a18' , '#1693a5' , 232 , 62 ] " blackestgravel & crystallake
-let s:I2 = [ '#515744' , '#44403a' , 101 , 238 ] " lichen & deepgravel
-let s:I3 = [ '#1693a5' , '#2e2d2a' , 39 , 235 ] " crystallake & darkgravel
-
-" Visual mode
-let s:V1 = [ '#1a1a18' , '#ab3e5d' , 232 , 161 ] " blackestgravel & raspberry
-let s:V2 = [ '#000000' , '#908571' , 16 , 252 ] " coal & winterterrain
-let s:V3 = [ '#ab3e5d' , '#8c7f77' , 161 , 245 ] " raspberry & wetcoldterrain
-let s:V4 = [ '#515744' , 101 ] " lichen
-
-" Replace mode
-let s:RE = [ '#233e09' , 22 ] " oakleaf
-
-" Paste mode
-let s:PA = [ '#ab3e5d' , 161 ] " raspberry
-
-let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3], s:N3[3] , '' ]
-
-
-let g:airline#themes#laederon#palette = {}
-
-let g:airline#themes#laederon#palette.accents = {
-      \ 'red': [ '#ef393d' , '' , 196 , '' , '' ]
-      \ }
-
-let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#laederon#palette.normal_modified = {
-      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
-      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
-
-
-let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#laederon#palette.insert_modified = {
-      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-let g:airline#themes#laederon#palette.insert_paste = {
-      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
-
-
-let g:airline#themes#laederon#palette.replace = copy(airline#themes#laederon#palette.insert)
-let g:airline#themes#laederon#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#laederon#palette.replace_modified = g:airline#themes#laederon#palette.insert_modified
-
-
-let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#laederon#palette.visual_modified = {
-      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
-
-
-let g:airline#themes#laederon#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#laederon#palette.inactive_modified = {
-      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
-
diff --git a/bundle/airline/autoload/airline/themes/light.vim b/bundle/airline/autoload/airline/themes/light.vim
deleted file mode 100755
index d9fe844..0000000
--- a/bundle/airline/autoload/airline/themes/light.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-let g:airline#themes#light#palette = {}
-
-let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27  ]
-let s:N2 = [ '#000087' , '#00dfff' , 18  , 45  ]
-let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
-let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#light#palette.normal_modified = {
-      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ }
-
-
-let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
-let s:I2 = [ '#005f00' , '#00df87' , 22  , 42  ]
-let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
-let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#light#palette.insert_modified = {
-      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ }
-let g:airline#themes#light#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#light#palette.replace = copy(g:airline#themes#light#palette.insert)
-let g:airline#themes#light#palette.replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
-let g:airline#themes#light#palette.replace_modified = g:airline#themes#light#palette.insert_modified
-
-
-let s:V1 = [ '#ffffff' , '#ff5f00' , 255 , 202 ]
-let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
-let s:V3 = [ '#df5f00' , '#ffff87' , 166 , 228 ]
-let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#light#palette.visual_modified = {
-      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
-      \ }
-
-
-let s:IA1 = [ '#666666' , '#b2b2b2' , 242 , 249 , '' ]
-let s:IA2 = [ '#8a8a8a' , '#d0d0d0' , 245 , 252 , '' ]
-let s:IA3 = [ '#a8a8a8' , '#ffffff' , 248 , 255 , '' ]
-let g:airline#themes#light#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-let g:airline#themes#light#palette.inactive_modified = {
-      \ 'airline_c': [ '#df0000' , ''        , 160     , ''      , ''     ] ,
-      \ }
-
diff --git a/bundle/airline/autoload/airline/themes/lucius.vim b/bundle/airline/autoload/airline/themes/lucius.vim
deleted file mode 100755
index e386900..0000000
--- a/bundle/airline/autoload/airline/themes/lucius.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-let g:airline#themes#lucius#palette = {}
-
-function! airline#themes#lucius#refresh()
-
-    let s:N1 = airline#themes#get_highlight('StatusLine')
-    let s:N2 = airline#themes#get_highlight('Folded')
-    let s:N3 = airline#themes#get_highlight('CursorLine')
-    let g:airline#themes#lucius#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-    let modified_group = airline#themes#get_highlight('Statement')
-    let g:airline#themes#lucius#palette.normal_modified = {
-                \ 'airline_c': [modified_group[0], '', modified_group[2], '', '']
-                \ }
-
-    let warning_group = airline#themes#get_highlight('DiffDelete')
-    let g:airline#themes#lucius#palette.normal.airline_warning = warning_group
-    let g:airline#themes#lucius#palette.normal_modified.airline_warning = warning_group
-
-    let s:I1 = airline#themes#get_highlight('DiffAdd')
-    let s:I2 = s:N2
-    let s:I3 = s:N3
-    let g:airline#themes#lucius#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-    let g:airline#themes#lucius#palette.insert_modified = g:airline#themes#lucius#palette.normal_modified
-    let g:airline#themes#lucius#palette.insert.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
-    let g:airline#themes#lucius#palette.insert_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
-
-    let s:R1 = airline#themes#get_highlight('DiffChange')
-    let s:R2 = s:N2
-    let s:R3 = s:N3
-    let g:airline#themes#lucius#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-    let g:airline#themes#lucius#palette.replace_modified = g:airline#themes#lucius#palette.normal_modified
-    let g:airline#themes#lucius#palette.replace.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
-    let g:airline#themes#lucius#palette.replace_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
-
-    let s:V1 = airline#themes#get_highlight('Cursor')
-    let s:V2 = s:N2
-    let s:V3 = s:N3
-    let g:airline#themes#lucius#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-    let g:airline#themes#lucius#palette.visual_modified = g:airline#themes#lucius#palette.normal_modified
-    let g:airline#themes#lucius#palette.visual.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
-    let g:airline#themes#lucius#palette.visual_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
-
-    let s:IA = airline#themes#get_highlight('StatusLineNC')
-    let g:airline#themes#lucius#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-    let g:airline#themes#lucius#palette.inactive_modified = {
-                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
-                \ }
-
-    let g:airline#themes#lucius#palette.accents = {
-                \ 'red': airline#themes#get_highlight('Constant'),
-                \ }
-
-endfunction
-
-call airline#themes#lucius#refresh()
-
diff --git a/bundle/airline/autoload/airline/themes/luna.vim b/bundle/airline/autoload/airline/themes/luna.vim
deleted file mode 100755
index 879d862..0000000
--- a/bundle/airline/autoload/airline/themes/luna.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-" vim-airline companion theme of Luna
-" (https://github.com/Pychimp/vim-luna)
-
-let g:airline#themes#luna#palette = {}
-
-let g:airline#themes#luna#palette.accents = {
-      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
-      \ }
-
-
-let s:N1 = [ '#ffffff' , '#005252' , 231  , 36 ]
-let s:N2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
-let s:N3 = [ '#ffffff' , '#002b2b' , 231  , 23 ]
-let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#luna#palette.normal_modified = {
-      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
-      \ }
-
-
-let s:I1 = [ '#ffffff' , '#789f00' , 231 , 106 ]
-let s:I2 = [ '#ffffff' , '#003f3f' , 231 , 29  ]
-let s:I3 = [ '#ffffff' , '#002b2b' , 231 , 23  ]
-let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#luna#palette.insert_modified = {
-      \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
-      \ }
-let g:airline#themes#luna#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#luna#palette.replace = copy(g:airline#themes#luna#palette.insert)
-let g:airline#themes#luna#palette.replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
-let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palette.insert_modified
-
-let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
-let s:V2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
-let s:V3 = [ '#ffffff' , '#002b2b' , 231  , 23  ]
-let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#luna#palette.visual_modified = {
-      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
-      \ }
-
-let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]
-let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#luna#palette.inactive_modified = {
-      \ 'airline_c': [ '#e20000' , ''        , 166      , ''      , ''     ] ,
-      \ }
-
-let g:airline#themes#luna#palette.tabline = {
-      \ 'airline_tab':  ['#2aa198', '#003f3f',  231, 29, ''],
-      \ 'airline_tabsel':  ['#ffffff', '#2e8b57',  231, 36, ''],
-      \ 'airline_tabtype':  ['#ffffff', '#005252',  231, 36, ''],
-      \ 'airline_tabfill':  ['#ffffff', '#002b2b',  231, 23, ''],
-      \ 'airline_tabmod':  ['#ffffff', '#780000',  231, 88, ''],
-      \ }
-
-let s:WI = [ '#ffffff', '#5f0000', 231, 88 ]
-let g:airline#themes#luna#palette.normal.airline_warning = [
-     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
-     \ ]
-
-let g:airline#themes#luna#palette.normal_modified.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.insert.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.insert_modified.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.visual.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.visual_modified.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.replace.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-let g:airline#themes#luna#palette.replace_modified.airline_warning =
-    \ g:airline#themes#luna#palette.normal.airline_warning
-
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#ffffff' , '#002b2b' , 231 , 23 , ''     ] ,
-      \ [ '#ffffff' , '#005252' , 231 , 36 , ''     ] ,
-      \ [ '#ffffff' , '#973d45' , 231 , 95 , ''     ] )
-
diff --git a/bundle/airline/autoload/airline/themes/molokai.vim b/bundle/airline/autoload/airline/themes/molokai.vim
deleted file mode 100755
index 1998f00..0000000
--- a/bundle/airline/autoload/airline/themes/molokai.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-let g:airline#themes#molokai#palette = {}
-
-let g:airline#themes#molokai#palette.accents = {
-      \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
-      \ }
-
-
-" Normal mode
-let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
-let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16  ] " info
-let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67  ] " statusline
-
-let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#molokai#palette.normal_modified = {
-      \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
-      \ }
-
-
-" Insert mode
-let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
-let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
-let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
-
-let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#molokai#palette.insert_modified = {
-      \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
-      \ }
-
-
-" Replace mode
-let g:airline#themes#molokai#palette.replace = copy(g:airline#themes#molokai#palette.insert)
-let g:airline#themes#molokai#palette.replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
-let g:airline#themes#molokai#palette.replace_modified = {
-      \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
-      \ }
-
-
-" Visual mode
-let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
-let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
-let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
-
-let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#molokai#palette.visual_modified = {
-      \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
-      \ }
-
-
-" Inactive
-let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
-let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#molokai#palette.inactive_modified = {
-      \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
-      \ }
-
-
-" CtrlP
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#molokai#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#f8f8f0' , '#465457' , 253 , 67  , ''     ] ,
-      \ [ '#f8f8f0' , '#232526' , 253 , 16  , ''     ] ,
-      \ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] )
-
diff --git a/bundle/airline/autoload/airline/themes/monochrome.vim b/bundle/airline/autoload/airline/themes/monochrome.vim
deleted file mode 100755
index 7dd1a17..0000000
--- a/bundle/airline/autoload/airline/themes/monochrome.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-let g:airline#themes#monochrome#palette = {}
-
-function! airline#themes#monochrome#refresh()
-  let s:SL = airline#themes#get_highlight('StatusLine')
-  let g:airline#themes#monochrome#palette.normal = airline#themes#generate_color_map(s:SL, s:SL, s:SL)
-  let g:airline#themes#monochrome#palette.insert = g:airline#themes#monochrome#palette.normal
-  let g:airline#themes#monochrome#palette.replace = g:airline#themes#monochrome#palette.normal
-  let g:airline#themes#monochrome#palette.visual = g:airline#themes#monochrome#palette.normal
-
-  let s:SLNC = airline#themes#get_highlight('StatusLineNC')
-  let g:airline#themes#monochrome#palette.inactive = airline#themes#generate_color_map(s:SLNC, s:SLNC, s:SLNC)
-endfunction
-
-call airline#themes#monochrome#refresh()
-
diff --git a/bundle/airline/autoload/airline/themes/murmur.vim b/bundle/airline/autoload/airline/themes/murmur.vim
deleted file mode 100755
index 08e4757..0000000
--- a/bundle/airline/autoload/airline/themes/murmur.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-let g:airline#themes#murmur#palette = {}
-
-" Color palette
-let s:cterm_termbg    = 237  " Background for branch and file format blocks
-let s:gui_termbg      = '#5F5F5F'
-let s:cterm_termfg    = 144  " Foreground for branch and file format blocks
-let s:gui_termfg      = '#AFAF87'
-
-let s:cterm_termbg2   = 234  " Background for middle block
-let s:gui_termbg2     = '#1C1C1C'
-let s:cterm_termfg2   = 39   " Foreground for middle block
-let s:gui_termfg2     = '#F5F5F5'
-
-let s:cterm_normalbg  = 27   " Background for normal mode and file position blocks
-let s:gui_normalbg    = '#5F87FF'
-let s:cterm_normalfg  = 15   " Foreground for normal mode and file position blocks
-let s:gui_normalfg    = '#FFFFFF'
-
-let s:cterm_insertbg  = 70   " Background for insert mode and file position blocks
-let s:gui_insertbg    = '#87AF5F'
-let s:cterm_insertfg  = 15   " Foreground for insert mode and file position blocks
-let s:gui_insertfg    = '#FFFFFF'
-
-let s:cterm_visualbg  = 166  " Background for visual mode and file position blocks
-let s:gui_visualbg    = '#ff8c00'
-let s:cterm_visualfg  = 15   " Foreground for visual mode and file position blocks
-let s:gui_visualfg    = '#FFFFFF'
-
-let s:cterm_replacebg = 88   " Background for replace mode and file position blocks
-let s:gui_replacebg   = '#870000'
-let s:cterm_replacefg = 15   " Foreground for replace mode and file position blocks
-let s:gui_replacefg   = '#FFFFFF'
-
-let s:cterm_alert     = 88   " Modified file alert color
-let s:gui_alert       = '#870000'
-
-let s:cterm_inactivebg = 234 " Background for inactive mode
-let s:gui_inactivebg   = '#1C1C1C'
-let s:cterm_inactivefg = 239 " Foreground for inactive mode
-let s:gui_inactivefg   = '#4E4E4E'
-
-" Branch and file format
-let s:BB = [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg] " Branch and file format blocks
-
-" Normal mode
-let s:N1 = [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg] " Outside blocks in normal mode
-let s:N2 = [s:gui_termfg2, s:gui_termbg2, s:cterm_normalbg, s:cterm_termbg2]     " Middle block
-let g:airline#themes#murmur#palette.normal = airline#themes#generate_color_map(s:N1, s:BB, s:N2)
-let g:airline#themes#murmur#palette.normal_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
-
-" Insert mode
-let s:I1 = [s:gui_insertfg, s:gui_insertbg, s:cterm_insertfg, s:cterm_insertbg] " Outside blocks in insert mode
-let s:I2 = [s:gui_insertbg, s:gui_termbg2, s:cterm_insertbg, s:cterm_termbg2]   " Middle block
-let g:airline#themes#murmur#palette.insert = airline#themes#generate_color_map(s:I1, s:BB, s:I2)
-let g:airline#themes#murmur#palette.insert_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
-
-" Replace mode
-let s:R1 = [s:gui_replacefg, s:gui_replacebg, s:cterm_replacefg, s:cterm_replacebg]  " Outside blocks in replace mode
-let s:R2 = [s:gui_termfg, s:gui_termbg2, s:cterm_termfg, s:cterm_termbg2]            " Middle block
-let g:airline#themes#murmur#palette.replace = airline#themes#generate_color_map(s:R1, s:BB, s:R2)
-let g:airline#themes#murmur#palette.replace_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
-
-" Visual mode
-let s:V1 = [s:gui_visualfg, s:gui_visualbg, s:cterm_visualfg, s:cterm_visualbg] " Outside blocks in visual mode
-let s:V2 = [s:gui_visualbg, s:gui_termbg2, s:cterm_visualbg, s:cterm_termbg2]   " Middle block
-let g:airline#themes#murmur#palette.visual = airline#themes#generate_color_map(s:V1, s:BB, s:V2)
-let g:airline#themes#murmur#palette.visual_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
-
-" Inactive mode
-let s:IA1 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
-let s:IA2 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
-let s:IA3 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
-let g:airline#themes#murmur#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-
-" CtrlP plugin colors
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#murmur#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg, ''],
-      \ [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg, ''],
-      \ [s:gui_termfg2, s:gui_termbg2, s:cterm_termfg2, s:cterm_termbg2, 'bold'])
diff --git a/bundle/airline/autoload/airline/themes/powerlineish.vim b/bundle/airline/autoload/airline/themes/powerlineish.vim
deleted file mode 100755
index d550e11..0000000
--- a/bundle/airline/autoload/airline/themes/powerlineish.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" Theme to mimic the default colorscheme of powerline
-" Not 100% the same so it's powerline... ish.
-"
-" Differences from default powerline:
-" * Paste indicator isn't colored different
-" * Far right hand section matches the color of the mode indicator
-"
-" Differences from other airline themes:
-" * No color differences when you're in a modified buffer
-" * Visual mode only changes the mode section. Otherwise
-"   it appears the same as normal mode
-
-" Normal mode                                    " fg             & bg
-let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ] " darkestgreen   & brightgreen
-let s:N2 = [ '#9e9e9e' , '#303030' , 247 , 236 ] " gray8          & gray2
-let s:N3 = [ '#ffffff' , '#121212' , 231 , 233 ] " white          & gray4
-
-" Insert mode                                    " fg             & bg
-let s:I1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] " darkestcyan    & white
-let s:I2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] " darkcyan       & darkblue
-let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] " mediumcyan     & darkestblue
-
-" Visual mode                                    " fg             & bg
-let s:V1 = [ '#080808' , '#ffaf00' , 232 , 214 ] " gray3          & brightestorange
-
-" Replace mode                                   " fg             & bg
-let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
-
-let g:airline#themes#powerlineish#palette = {}
-
-let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#powerlineish#palette.insert_replace = {
-      \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
-
-let g:airline#themes#powerlineish#palette.visual = {
-      \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
-
-let g:airline#themes#powerlineish#palette.replace = copy(airline#themes#powerlineish#palette.normal)
-let g:airline#themes#powerlineish#palette.replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
-
-
-let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
-let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-
diff --git a/bundle/airline/autoload/airline/themes/raven.vim b/bundle/airline/autoload/airline/themes/raven.vim
deleted file mode 100755
index 02bfd73..0000000
--- a/bundle/airline/autoload/airline/themes/raven.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-let g:airline#themes#raven#palette = {}
-
-let g:airline#themes#raven#palette.accents = {
-      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
-      \ }
-
-let s:N1 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
-let s:N2 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
-let s:N3 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
-let g:airline#themes#raven#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#raven#palette.normal_modified = {
-      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
-      \ }
-
-let s:I1 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
-let s:I2 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
-let s:I3 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
-let g:airline#themes#raven#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#raven#palette.insert_modified = {
-      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
-      \ }
-let g:airline#themes#raven#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#2e2e2e' , s:I1[2] , 235 , '' ] ,
-      \ }
-
-let g:airline#themes#raven#palette.replace = copy(g:airline#themes#raven#palette.insert)
-let g:airline#themes#raven#palette.replace.airline_a = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
-let g:airline#themes#raven#palette.replace.airline_z = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
-let g:airline#themes#raven#palette.replace_modified = g:airline#themes#raven#palette.insert_modified
-
-let s:V1 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
-let s:V2 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
-let s:V3 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
-let g:airline#themes#raven#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#raven#palette.visual_modified = {
-      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
-      \ }
-
-let s:IA = [ '#5e5e5e' , '#222222' , 59 , 235 , '' ]
-let g:airline#themes#raven#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#raven#palette.inactive_modified = {
-      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
-       \ }
-
-let g:airline#themes#raven#palette.tabline = {
-      \ 'airline_tab':      ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
-      \ 'airline_tabsel':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
-      \ 'airline_tabtype':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
-      \ 'airline_tabfill':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
-      \ 'airline_tabmod':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
-      \ }
-
-let s:WI = [ '#ff0000', '#2e2e2e', 196, 235 ]
-let g:airline#themes#raven#palette.normal.airline_warning = [
-     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
-     \ ]
-
-let g:airline#themes#raven#palette.normal_modified.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.insert.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.insert_modified.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.visual.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.visual_modified.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.replace.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-let g:airline#themes#raven#palette.replace_modified.airline_warning =
-    \ g:airline#themes#raven#palette.normal.airline_warning
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#raven#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
-      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
-      \ [ '#2e2e2e' , '#a4c639' , 235 , 149 , ''     ] )
diff --git a/bundle/airline/autoload/airline/themes/serene.vim b/bundle/airline/autoload/airline/themes/serene.vim
deleted file mode 100755
index 9191c07..0000000
--- a/bundle/airline/autoload/airline/themes/serene.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-let g:airline#themes#serene#palette = {}
-
-let s:guibg = '#080808'
-let s:termbg = 232
-let s:termsep = 236
-let s:guisep = '#303030'
-
-let s:N1 = [ '#00dfff' , s:guibg , 45  , s:termbg ]
-let s:N2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
-let s:N3 = [ '#767676' , s:guibg , 7   , s:termbg ]
-
-let g:airline#themes#serene#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#serene#palette.normal_modified = {
-      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
-      \ }
-
-let s:I1 = [ '#5fff00' , s:guibg , 82  , s:termbg ]
-let s:I2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
-let s:I3 = [ '#767676' , s:guibg , 7   , s:termbg ]
-let g:airline#themes#serene#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#serene#palette.insert_modified = copy(g:airline#themes#serene#palette.normal_modified)
-let g:airline#themes#serene#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ }
-
-let g:airline#themes#serene#palette.replace = {
-      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
-      \ }
-let g:airline#themes#serene#palette.replace_modified = copy(g:airline#themes#serene#palette.normal_modified)
-
-let s:V1 = [ '#dfdf00' , s:guibg , 184 , s:termbg ]
-let s:V2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
-let s:V3 = [ '#767676' , s:guibg , 7   , s:termbg ]
-let g:airline#themes#serene#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#serene#palette.visual_modified = copy(g:airline#themes#serene#palette.normal_modified)
-
-let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
-let s:IA2 = [ '#4e4e4e' , s:guisep , 239 , s:termsep , '' ]
-let g:airline#themes#serene#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
-let g:airline#themes#serene#palette.inactive_modified = copy(g:airline#themes#serene#palette.normal_modified)
-
diff --git a/bundle/airline/autoload/airline/themes/silver.vim b/bundle/airline/autoload/airline/themes/silver.vim
deleted file mode 100755
index fd85edb..0000000
--- a/bundle/airline/autoload/airline/themes/silver.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-let g:airline#themes#silver#palette = {}
-
-let g:airline#themes#silver#palette.accents = {
-      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
-      \ }
-
-let s:N1 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
-let s:N2 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
-let s:N3 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
-let g:airline#themes#silver#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#silver#palette.normal_modified = {
-      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
-      \ }
-
-let s:I1 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
-let s:I2 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
-let s:I3 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
-let g:airline#themes#silver#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#silver#palette.insert_modified = {
-      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
-      \ }
-let g:airline#themes#silver#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#e1e1e1' , s:I1[2] , 188 , '' ] ,
-      \ }
-
-let g:airline#themes#silver#palette.replace = copy(g:airline#themes#silver#palette.insert)
-let g:airline#themes#silver#palette.replace.airline_a = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
-let g:airline#themes#silver#palette.replace.airline_z = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
-let g:airline#themes#silver#palette.replace_modified = g:airline#themes#silver#palette.insert_modified
-
-let s:V1 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
-let s:V2 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
-let s:V3 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
-let g:airline#themes#silver#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#silver#palette.visual_modified = {
-      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
-      \ }
-
-let s:IA = [ '#a1a1a1' , '#dddddd' , 145 , 188 , '' ]
-let g:airline#themes#silver#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#silver#palette.inactive_modified = {
-      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
-       \ }
-
-let g:airline#themes#silver#palette.tabline = {
-      \ 'airline_tab':      ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
-      \ 'airline_tabsel':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
-      \ 'airline_tabtype':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
-      \ 'airline_tabfill':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
-      \ 'airline_tabmod':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
-      \ }
-
-let s:WI = [ '#ff0000', '#e1e1e1', 196, 188 ]
-let g:airline#themes#silver#palette.normal.airline_warning = [
-     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
-     \ ]
-
-let g:airline#themes#silver#palette.normal_modified.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.insert.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.insert_modified.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.visual.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.visual_modified.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.replace.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-let g:airline#themes#silver#palette.replace_modified.airline_warning =
-    \ g:airline#themes#silver#palette.normal.airline_warning
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#silver#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
-      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
-      \ [ '#e1e1e1' , '#007599' , 188 , 30  , ''     ] )
diff --git a/bundle/airline/autoload/airline/themes/simple.vim b/bundle/airline/autoload/airline/themes/simple.vim
deleted file mode 100755
index a111a1c..0000000
--- a/bundle/airline/autoload/airline/themes/simple.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-let g:airline#themes#simple#palette = {}
-
-let s:guibg = '#080808'
-let s:guibg2 = '#1c1c1c'
-let s:termbg = 232
-let s:termbg2= 234
-
-let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
-let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
-let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
-let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#simple#palette.normal_modified = {
-      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
-      \ }
-
-
-let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
-let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
-let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#simple#palette.insert_modified = copy(g:airline#themes#simple#palette.normal_modified)
-let g:airline#themes#simple#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
-      \ }
-
-
-let g:airline#themes#simple#palette.replace = {
-      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
-      \ }
-let g:airline#themes#simple#palette.replace_modified = copy(g:airline#themes#simple#palette.normal_modified)
-
-
-let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
-let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
-let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
-let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simple#palette.normal_modified)
-
-
-let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
-let s:IA2 = [ '#4e4e4e' , s:guibg2 , 239 , s:termbg2 , '' ]
-let g:airline#themes#simple#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
-let g:airline#themes#simple#palette.inactive_modified = {
-      \ 'airline_c': [ '#df0000', '', 160, '', '' ] ,
-      \ }
-
diff --git a/bundle/airline/autoload/airline/themes/sol.vim b/bundle/airline/autoload/airline/themes/sol.vim
deleted file mode 100755
index 89ea505..0000000
--- a/bundle/airline/autoload/airline/themes/sol.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" vim-airline companion theme of Sol
-" (https://github.com/Pychimp/vim-sol)
-
-let g:airline#themes#sol#palette = {}
-
-let g:airline#themes#sol#palette.accents = {
-      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
-      \ }
-
-let s:N1 = [ '#343434' , '#a0a0a0' , 237 , 248 ]
-let s:N2 = [ '#343434' , '#b3b3b3' , 237 , 250 ]
-let s:N3 = [ '#343434' , '#c7c7c7' , 237 , 252 ]
-let g:airline#themes#sol#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#sol#palette.normal_modified = {
-      \ 'airline_c': [ '#ffffff' , '#ff6868' , 237 , 209 , '' ] ,
-      \ }
-
-
-let s:I1 = [ '#eeeeee' , '#09643f' , 255 , 30  ]
-let s:I2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
-let s:I3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
-let g:airline#themes#sol#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#sol#palette.insert_modified = {
-      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
-      \ }
-let g:airline#themes#sol#palette.insert_paste = {
-      \ 'airline_a': [ s:I1[0]   , '#09643f' , s:I1[2] , 30 , '' ] ,
-      \ }
-
-
-let g:airline#themes#sol#palette.replace = copy(g:airline#themes#sol#palette.insert)
-let g:airline#themes#sol#palette.replace.airline_a = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
-let g:airline#themes#sol#palette.replace.airline_z = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
-let g:airline#themes#sol#palette.replace_modified = g:airline#themes#sol#palette.insert_modified
-
-let s:V1 = [ '#ffff9a' , '#ff6003' , 222 , 202 ]
-let s:V2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
-let s:V3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
-let g:airline#themes#sol#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#sol#palette.visual_modified = {
-      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
-      \ }
-
-let s:IA = [ '#777777' , '#c7c7c7' , 244 , 251 , '' ]
-let g:airline#themes#sol#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#sol#palette.inactive_modified = {
-      \ 'airline_c': [ '#ff3535' , '' , 203 , '' , '' ] ,
-       \ }
-
-let g:airline#themes#sol#palette.tabline = {
-      \ 'airline_tab':      ['#343434', '#b3b3b3',  237, 250, ''],
-      \ 'airline_tabsel':   ['#ffffff', '#004b9a',  231, 31 , ''],
-      \ 'airline_tabtype':  ['#343434', '#a0a0a0',  237, 248, ''],
-      \ 'airline_tabfill':  ['#343434', '#c7c7c7',  237, 251, ''],
-      \ 'airline_tabmod':   ['#343434', '#ffdbc7',  237, 216, ''],
-      \ }
-
-let s:WI = [ '#eeeeee', '#e33900', 255, 166 ]
-let g:airline#themes#sol#palette.normal.airline_warning = [
-     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
-     \ ]
-
-let g:airline#themes#sol#palette.normal_modified.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.insert.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.insert_modified.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.visual.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.visual_modified.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.replace.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-let g:airline#themes#sol#palette.replace_modified.airline_warning =
-    \ g:airline#themes#sol#palette.normal.airline_warning
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#sol#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#343434' , '#c7c7c7' , 237 , 251 , ''     ] ,
-      \ [ '#343434' , '#b3b3b3' , 237 , 250 , ''     ] ,
-      \ [ '#eeeeee' , '#007fff' , 255 , 27  , ''     ] )
diff --git a/bundle/airline/autoload/airline/themes/solarized.vim b/bundle/airline/autoload/airline/themes/solarized.vim
deleted file mode 100755
index 30ba47e..0000000
--- a/bundle/airline/autoload/airline/themes/solarized.vim
+++ /dev/null
@@ -1,176 +0,0 @@
-let g:airline#themes#solarized#palette = {}
-
-function! airline#themes#solarized#refresh()
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Options
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  let s:background  = get(g:, 'airline_solarized_bg', &background)
-  let s:ansi_colors = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0
-  let s:tty         = &t_Co == 8
-
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Colors
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Base colors
-  let s:base03  = {'t': s:ansi_colors ?   8 : (s:tty ? '0' : 234), 'g': '#002b36'}
-  let s:base02  = {'t': s:ansi_colors ? '0' : (s:tty ? '0' : 235), 'g': '#073642'}
-  let s:base01  = {'t': s:ansi_colors ?  10 : (s:tty ? '0' : 240), 'g': '#586e75'}
-  let s:base00  = {'t': s:ansi_colors ?  11 : (s:tty ? '7' : 241), 'g': '#657b83'}
-  let s:base0   = {'t': s:ansi_colors ?  12 : (s:tty ? '7' : 244), 'g': '#839496'}
-  let s:base1   = {'t': s:ansi_colors ?  14 : (s:tty ? '7' : 245), 'g': '#93a1a1'}
-  let s:base2   = {'t': s:ansi_colors ?   7 : (s:tty ? '7' : 254), 'g': '#eee8d5'}
-  let s:base3   = {'t': s:ansi_colors ?  15 : (s:tty ? '7' : 230), 'g': '#fdf6e3'}
-  let s:yellow  = {'t': s:ansi_colors ?   3 : (s:tty ? '3' : 136), 'g': '#b58900'}
-  let s:orange  = {'t': s:ansi_colors ?   9 : (s:tty ? '1' : 166), 'g': '#cb4b16'}
-  let s:red     = {'t': s:ansi_colors ?   1 : (s:tty ? '1' : 160), 'g': '#dc322f'}
-  let s:magenta = {'t': s:ansi_colors ?   5 : (s:tty ? '5' : 125), 'g': '#d33682'}
-  let s:violet  = {'t': s:ansi_colors ?  13 : (s:tty ? '5' : 61 ), 'g': '#6c71c4'}
-  let s:blue    = {'t': s:ansi_colors ?   4 : (s:tty ? '4' : 33 ), 'g': '#268bd2'}
-  let s:cyan    = {'t': s:ansi_colors ?   6 : (s:tty ? '6' : 37 ), 'g': '#2aa198'}
-  let s:green   = {'t': s:ansi_colors ?   2 : (s:tty ? '2' : 64 ), 'g': '#859900'}
-
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Simple mappings
-  " NOTE: These are easily tweakable mappings. The actual mappings get
-  " the specific gui and terminal colors from the base color dicts.
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Normal mode
-  if s:background == 'dark'
-    let s:N1 = [s:base3, s:base1, 'bold']
-    let s:N2 = [s:base2, (s:tty ? s:base01 : s:base00), '']
-    let s:N3 = [s:base01, s:base02, '']
-  else
-    let s:N1 = [s:base2, s:base00, 'bold']
-    let s:N2 = [(s:tty ? s:base01 : s:base2), s:base1, '']
-    let s:N3 = [s:base1, s:base2, '']
-  endif
-  let s:NF = [s:orange, s:N3[1], '']
-  let s:NW = [s:base3, s:orange, '']
-  if s:background == 'dark'
-    let s:NM = [s:base1, s:N3[1], '']
-    let s:NMi = [s:base2, s:N3[1], '']
-  else
-    let s:NM = [s:base01, s:N3[1], '']
-    let s:NMi = [s:base02, s:N3[1], '']
-  endif
-
-  " Insert mode
-  let s:I1 = [s:N1[0], s:yellow, 'bold']
-  let s:I2 = s:N2
-  let s:I3 = s:N3
-  let s:IF = s:NF
-  let s:IM = s:NM
-
-  " Visual mode
-  let s:V1 = [s:N1[0], s:magenta, 'bold']
-  let s:V2 = s:N2
-  let s:V3 = s:N3
-  let s:VF = s:NF
-  let s:VM = s:NM
-
-  " Replace mode
-  let s:R1 = [s:N1[0], s:red, '']
-  let s:R2 = s:N2
-  let s:R3 = s:N3
-  let s:RM = s:NM
-  let s:RF = s:NF
-
-  " Inactive, according to VertSplit in solarized
-  " (bg dark: base00; bg light: base0)
-  if s:background == 'dark'
-    let s:IA = [s:base02, s:base00, '']
-  else
-    let s:IA = [s:base2, s:base0, '']
-  endif
-
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  " Actual mappings
-  " WARNING: Don't modify this section unless necessary.
-  """"""""""""""""""""""""""""""""""""""""""""""""
-  let s:NFa = [s:NF[0].g, s:NF[1].g, s:NF[0].t, s:NF[1].t, s:NF[2]]
-  let s:IFa = [s:IF[0].g, s:IF[1].g, s:IF[0].t, s:IF[1].t, s:IF[2]]
-  let s:VFa = [s:VF[0].g, s:VF[1].g, s:VF[0].t, s:VF[1].t, s:VF[2]]
-  let s:RFa = [s:RF[0].g, s:RF[1].g, s:RF[0].t, s:RF[1].t, s:RF[2]]
-
-  let g:airline#themes#solarized#palette.accents = {
-        \ 'red': s:NFa,
-        \ }
-
-  let g:airline#themes#solarized#palette.inactive = airline#themes#generate_color_map(
-        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
-        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
-        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]])
-  let g:airline#themes#solarized#palette.inactive_modified = {
-        \ 'airline_c': [s:NMi[0].g, '', s:NMi[0].t, '', s:NMi[2]]}
-
-  let g:airline#themes#solarized#palette.normal = airline#themes#generate_color_map(
-        \ [s:N1[0].g, s:N1[1].g, s:N1[0].t, s:N1[1].t, s:N1[2]],
-        \ [s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]],
-        \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]])
-
-  let g:airline#themes#solarized#palette.normal.airline_warning = [
-        \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
-
-  let g:airline#themes#solarized#palette.normal_modified = {
-        \ 'airline_c': [s:NM[0].g, s:NM[1].g,
-        \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
-
-  let g:airline#themes#solarized#palette.normal_modified.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.insert = airline#themes#generate_color_map(
-        \ [s:I1[0].g, s:I1[1].g, s:I1[0].t, s:I1[1].t, s:I1[2]],
-        \ [s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]],
-        \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]])
-
-  let g:airline#themes#solarized#palette.insert.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.insert_modified = {
-        \ 'airline_c': [s:IM[0].g, s:IM[1].g,
-        \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
-
-  let g:airline#themes#solarized#palette.insert_modified.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.visual = airline#themes#generate_color_map(
-        \ [s:V1[0].g, s:V1[1].g, s:V1[0].t, s:V1[1].t, s:V1[2]],
-        \ [s:V2[0].g, s:V2[1].g, s:V2[0].t, s:V2[1].t, s:V2[2]],
-        \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]])
-
-  let g:airline#themes#solarized#palette.visual.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.visual_modified = {
-        \ 'airline_c': [s:VM[0].g, s:VM[1].g,
-        \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
-
-  let g:airline#themes#solarized#palette.visual_modified.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.replace = airline#themes#generate_color_map(
-        \ [s:R1[0].g, s:R1[1].g, s:R1[0].t, s:R1[1].t, s:R1[2]],
-        \ [s:R2[0].g, s:R2[1].g, s:R2[0].t, s:R2[1].t, s:R2[2]],
-        \ [s:R3[0].g, s:R3[1].g, s:R3[0].t, s:R3[1].t, s:R3[2]])
-
-  let g:airline#themes#solarized#palette.replace.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.replace_modified = {
-        \ 'airline_c': [s:RM[0].g, s:RM[1].g,
-        \ s:RM[0].t, s:RM[1].t, s:RM[2]]}
-
-  let g:airline#themes#solarized#palette.replace_modified.airline_warning =
-        \ g:airline#themes#solarized#palette.normal.airline_warning
-
-  let g:airline#themes#solarized#palette.tabline = {}
-
-  let g:airline#themes#solarized#palette.tabline.airline_tab = [
-        \ s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]]
-
-  let g:airline#themes#solarized#palette.tabline.airline_tabtype = [
-        \ s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]]
-endfunction
-
-call airline#themes#solarized#refresh()
-
diff --git a/bundle/airline/autoload/airline/themes/tomorrow.vim b/bundle/airline/autoload/airline/themes/tomorrow.vim
deleted file mode 100755
index f382fc1..0000000
--- a/bundle/airline/autoload/airline/themes/tomorrow.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-let g:airline#themes#tomorrow#palette = {}
-
-function! airline#themes#tomorrow#refresh()
-  let g:airline#themes#tomorrow#palette.accents = {
-        \ 'red': airline#themes#get_highlight('Constant'),
-        \ }
-
-  let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Directory', 'fg'], 'bold')
-  let s:N2 = airline#themes#get_highlight('Pmenu')
-  let s:N3 = airline#themes#get_highlight('CursorLine')
-  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-
-  let group = airline#themes#get_highlight('vimCommand')
-  let g:airline#themes#tomorrow#palette.normal_modified = {
-        \ 'airline_c': [ group[0], '', group[2], '', '' ]
-        \ }
-
-  let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')
-  let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
-  let s:I3 = s:N3
-  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-  let g:airline#themes#tomorrow#palette.insert_modified = g:airline#themes#tomorrow#palette.normal_modified
-
-  let s:R1 = airline#themes#get_highlight('Error', 'bold')
-  let s:R2 = s:N2
-  let s:R3 = s:N3
-  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-  let g:airline#themes#tomorrow#palette.replace_modified = g:airline#themes#tomorrow#palette.normal_modified
-
-  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
-  let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
-  let s:V3 = s:N3
-  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-  let g:airline#themes#tomorrow#palette.visual_modified = g:airline#themes#tomorrow#palette.normal_modified
-
-  let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
-  let g:airline#themes#tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#tomorrow#palette.inactive_modified = {
-        \ 'airline_c': [ group[0], '', group[2], '', '' ]
-        \ }
-endfunction
-
-call airline#themes#tomorrow#refresh()
-
diff --git a/bundle/airline/autoload/airline/themes/ubaryd.vim b/bundle/airline/autoload/airline/themes/ubaryd.vim
deleted file mode 100755
index 70232ef..0000000
--- a/bundle/airline/autoload/airline/themes/ubaryd.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" vim-airline companion theme of Ubaryd
-" (https://github.com/Donearm/Ubaryd)
-
-" Normal mode
-let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
-let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
-let s:N3 = [ '#b88853' , '#242321' , 137, 235 ] " toffee & darkgravel
-let s:N4 = [ '#857f78' , 243 ] " gravel
-
-" Insert mode
-let s:I1 = [ '#1a1a18' , '#fade3e' , 232 , 221 ] " blackestgravel & warmcorn
-let s:I2 = [ '#c7b386' , '#45413b' , 252 , 238 ] " bleaksand & deepgravel
-let s:I3 = [ '#f4cf86' , '#242321' , 222 , 235 ] " lighttannedskin & darkgravel
-
-" Visual mode
-let s:V1 = [ '#1c1b1a' , '#9a4820' , 233 , 88 ] " blackgravel & warmadobe
-let s:V2 = [ '#000000' , '#88633f' , 16 , 95 ] " coal & cappuccino
-let s:V3 = [ '#88633f' , '#c7b386' , 95 , 252 ] " cappuccino & bleaksand
-let s:V4 = [ '#c14c3d' , 160 ] " tannedumbrella
-
-" Replace mode
-let s:RE = [ '#c7915b' , 173 ] " nut
-
-" Paste mode
-let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
-
-let s:IA = [ s:N2[1], s:N3[1], s:N2[3], s:N3[3], '' ]	
-
-let g:airline#themes#ubaryd#palette = {}
-
-let g:airline#themes#ubaryd#palette.accents = {
-      \ 'red': [ '#ff7400' , '' , 196 , '' , '' ],
-      \ }
-
-let g:airline#themes#ubaryd#palette.inactive = {
-      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
-
-
-let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#ubaryd#palette.normal_modified = {
-      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
-      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
-
-
-let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#ubaryd#palette.insert_modified = {
-      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
-let g:airline#themes#ubaryd#palette.insert_paste = {
-      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
-
-
-let g:airline#themes#ubaryd#palette.replace = copy(airline#themes#ubaryd#palette.insert)
-let g:airline#themes#ubaryd#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
-let g:airline#themes#ubaryd#palette.replace_modified = g:airline#themes#ubaryd#palette.insert_modified
-
-
-let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#ubaryd#palette.visual_modified = {
-      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
-
-let g:airline#themes#ubaryd#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#ubaryd#palette.inactive_modified = {
-      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
-
diff --git a/bundle/airline/autoload/airline/themes/understated.vim b/bundle/airline/autoload/airline/themes/understated.vim
deleted file mode 100755
index b3e7917..0000000
--- a/bundle/airline/autoload/airline/themes/understated.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-let g:airline#themes#understated#palette = {}
-
-let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69]  " Outside blocks in normal mode (mode and file position)
-let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
-let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
-
-let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,}
-
-let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position)
-let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
-let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
-let g:airline#themes#understated#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
-let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,}
-
-let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, '']
-let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
-
-let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130]
-let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59]
-let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59]
-let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,}
-
-let s:V1 = ['#080808', '#FFAF00', 232, 214]
-let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
-let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
-let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
-let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
-let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,}
-
-let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']}
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#understated#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ ['#FFFFFF', '#1C1C1C', 15, 234, '' ],
-      \ ['#FFFFFF', '#262626', 15, 235, '' ],
-      \ ['#FFFFFF', '#303030', 15, 236, 'bold'])
-
diff --git a/bundle/airline/autoload/airline/themes/wombat.vim b/bundle/airline/autoload/airline/themes/wombat.vim
deleted file mode 100755
index 39fdc4c..0000000
--- a/bundle/airline/autoload/airline/themes/wombat.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" vim-airline companion theme of Wombat
-" looks great with wombat256 vim colorscheme
-
-" Normal mode
-"          [ guifg, guibg, ctermfg, ctermbg, opts ]
-let s:N1 = [ '#141413' , '#CAE682' , 232 , 192 ] " mode
-let s:N2 = [ '#CAE682' , '#32322F' , 192 , 236 ] " info
-let s:N3 = [ '#CAE682' , '#242424' , 192 , 234 ] " statusline
-let s:N4 = [ '#86CD74' , 113 ]                   " mode modified
-
-" Insert mode
-let s:I1 = [ '#141413' , '#FDE76E' , 232 , 227 ]
-let s:I2 = [ '#FDE76E' , '#32322F' , 227 , 236 ]
-let s:I3 = [ '#FDE76E' , '#242424' , 227 , 234 ]
-let s:I4 = [ '#FADE3E' , 221 ]
-
-" Visual mode
-let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 153 ]
-let s:V2 = [ '#B5D3F3' , '#32322F' , 153 , 236 ]
-let s:V3 = [ '#B5D3F3' , '#242424' , 153 , 234 ]
-let s:V4 = [ '#7CB0E6' , 111 ]
-
-" Replace mode
-let s:R1 = [ '#141413' , '#E5786D' , 232 , 173 ]
-let s:R2 = [ '#E5786D' , '#32322F' , 173 , 236 ]
-let s:R3 = [ '#E5786D' , '#242424' , 173 , 234 ]
-let s:R4 = [ '#E55345' , 203 ]
-
-" Paste mode
-let s:PA = [ '#94E42C' , 47 ]
-
-" Info modified
-let s:IM = [ '#40403C' , 238 ]
-
-" Inactive mode
-let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
-
-let g:airline#themes#wombat#palette = {}
-
-let g:airline#themes#wombat#palette.accents = {
-      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
-      \ }
-
-let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-let g:airline#themes#wombat#palette.normal_modified = {
-    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
-    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
-    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
-
-
-let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-let g:airline#themes#wombat#palette.insert_modified = {
-    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
-    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
-    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
-
-
-let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-let g:airline#themes#wombat#palette.visual_modified = {
-    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
-    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
-    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
-
-
-let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-let g:airline#themes#wombat#palette.replace_modified = {
-    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
-    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
-    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
-
-
-let g:airline#themes#wombat#palette.insert_paste = {
-    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
-    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
-    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
-
-
-let g:airline#themes#wombat#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-let g:airline#themes#wombat#palette.inactive_modified = {
-    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
-
-
-if !get(g:, 'loaded_ctrlp', 0)
-  finish
-endif
-let g:airline#themes#wombat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
-      \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
-      \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
-      \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )
-
diff --git a/bundle/airline/autoload/airline/themes/zenburn.vim b/bundle/airline/autoload/airline/themes/zenburn.vim
deleted file mode 100755
index 9883c21..0000000
--- a/bundle/airline/autoload/airline/themes/zenburn.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-let g:airline#themes#zenburn#palette = {}
-
-function! airline#themes#zenburn#refresh()
-  let g:airline#themes#zenburn#palette.accents = {
-        \ 'red': airline#themes#get_highlight('Constant'),
-        \ }
-
-  let s:N1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Folded', 'fg'], 'bold')
-  let s:N2 = airline#themes#get_highlight('Folded')
-  let s:N3 = airline#themes#get_highlight('NonText')
-
-  let g:airline#themes#zenburn#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
-  let s:Nmod = airline#themes#get_highlight('Comment')
-  let g:airline#themes#zenburn#palette.normal_modified = {
-        \ 'airline_c': s:Nmod
-        \ }
-
-  let s:I1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['String', 'fg'], 'bold')
-  let s:I2 = airline#themes#get_highlight2(['String', 'fg'], ['Folded', 'bg'])
-  let s:I3 = s:N3
-  let g:airline#themes#zenburn#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
-  let g:airline#themes#zenburn#palette.insert_modified = g:airline#themes#zenburn#palette.normal_modified
-
-  let s:R1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Comment', 'fg'], 'bold')
-  let s:R2 = airline#themes#get_highlight2(['Comment', 'fg'], ['Folded', 'bg'])
-  let s:R3 = s:N3
-  let g:airline#themes#zenburn#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
-  let g:airline#themes#zenburn#palette.replace_modified = g:airline#themes#zenburn#palette.normal_modified
-
-  let s:V1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Identifier', 'fg'], 'bold')
-  let s:V2 = airline#themes#get_highlight2(['Identifier', 'fg'], ['Folded', 'bg'])
-  let s:V3 = s:N3
-  let g:airline#themes#zenburn#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
-  let g:airline#themes#zenburn#palette.visual_modified = g:airline#themes#zenburn#palette.normal_modified
-
-  let s:IA = airline#themes#get_highlight('NonText')
-  let g:airline#themes#zenburn#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
-  let g:airline#themes#zenburn#palette.inactive_modified = {
-        \ 'airline_c': s:Nmod
-        \ }
-endfunction
-
-call airline#themes#zenburn#refresh()
-
diff --git a/bundle/airline/autoload/airline/util.vim b/bundle/airline/autoload/airline/util.vim
deleted file mode 100755
index a04bd0b..0000000
--- a/bundle/airline/autoload/airline/util.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-call airline#init#bootstrap()
-let s:spc = g:airline_symbols.space
-
-function! airline#util#wrap(text, minwidth)
-  if a:minwidth > 0 && winwidth(0) < a:minwidth
-    return ''
-  endif
-  return a:text
-endfunction
-
-function! airline#util#append(text, minwidth)
-  if a:minwidth > 0 && winwidth(0) < a:minwidth
-    return ''
-  endif
-  let prefix = s:spc == "\ua0" ? s:spc : s:spc.s:spc
-  return empty(a:text) ? '' : prefix.g:airline_left_alt_sep.s:spc.a:text
-endfunction
-
-function! airline#util#prepend(text, minwidth)
-  if a:minwidth > 0 && winwidth(0) < a:minwidth
-    return ''
-  endif
-  return empty(a:text) ? '' : a:text.s:spc.g:airline_right_alt_sep.s:spc
-endfunction
-
-if v:version >= 704
-  function! airline#util#getwinvar(winnr, key, def)
-    return getwinvar(a:winnr, a:key, a:def)
-  endfunction
-else
-  function! airline#util#getwinvar(winnr, key, def)
-    let winvals = getwinvar(a:winnr, '')
-    return get(winvals, a:key, a:def)
-  endfunction
-endif
-
-if v:version >= 704
-  function! airline#util#exec_funcrefs(list, ...)
-    for Fn in a:list
-      let code = call(Fn, a:000)
-      if code != 0
-        return code
-      endif
-    endfor
-    return 0
-  endfunction
-else
-  function! airline#util#exec_funcrefs(list, ...)
-    " for 7.2; we cannot iterate the list, hence why we use range()
-    " for 7.3-[97, 328]; we cannot reuse the variable, hence the {}
-    for i in range(0, len(a:list) - 1)
-      let Fn{i} = a:list[i]
-      let code = call(Fn{i}, a:000)
-      if code != 0
-        return code
-      endif
-    endfor
-    return 0
-  endfunction
-endif
-
diff --git a/bundle/airline/doc/airline.txt b/bundle/airline/doc/airline.txt
deleted file mode 100755
index ddc81ce..0000000
--- a/bundle/airline/doc/airline.txt
+++ /dev/null
@@ -1,793 +0,0 @@
-*airline.txt*  Lean and mean status/tabline that's light as air
-*airline*
-                   _                       _      _ _                        ~
-            __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
-            \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
-             \ V /| | | | | | |_____| (_| | | |  | | | | | |  __/            ~
-              \_/ |_|_| |_| |_|      \__,_|_|_|  |_|_|_| |_|\___|            ~
-                                                                             ~
-==============================================================================
-CONTENTS                                                  *airline-contents*
-
-   01. Intro ............................................... |airline-intro|
-   02. Features ......................................... |airline-features|
-   03. Name ................................................. |airline-name|
-   04. Configuration ............................... |airline-configuration|
-   05. Commands ......................................... |airline-commands|
-   06. Customization ............................... |airline-customization|
-   07. Extensions ..................................... |airline-extensions|
-   08. Advanced Customization ............. |airline-advanced-customization|
-   09. Funcrefs ......................................... |airline-funcrefs|
-   10. Pipeline ......................................... |airline-pipeline|
-   11. Writing Extensions ..................... |airline-writing-extensions|
-   12. Writing Themes ..................................... |airline-themes|
-   13. Troubleshooting ........................... |airline-troubleshooting|
-   14. Contributions ............................... |airline-contributions|
-   15. License ........................................... |airline-license|
-
-==============================================================================
-INTRODUCTION                                                 *airline-intro*
-
-vim-airline is a fast and lightweight alternative to powerline, written
-in 100% vimscript with no outside dependencies.
-
-==============================================================================
-FEATURES                                                  *airline-features*
-
-*  tiny core written with extensibility in mind.
-*  integrates with many popular plugins.
-*  looks good with regular fonts, and provides configuration points so you
-   can use unicode or powerline symbols.
-*  optimized for speed; it loads in under a millisecond.
-*  fully customizable; if you know a little 'statusline' syntax you can
-   tweak it to your needs.
-*  extremely easy to write themes.
-
-==============================================================================
-NAME                                                          *airline-name*
-
-Where did the name come from?
-
-I wrote this on an airplane, and since it's light as air it turned out to be a
-good name :-)
-
-==============================================================================
-CONFIGURATION                                        *airline-configuration*
-
-There are a couple configuration values available (shown with their default
-values):
-
-* the separator used on the left side >
-  let g:airline_left_sep='>'
-<
-* the separator used on the right side >
-  let g:airline_right_sep='<'
-<
-* enable modified detection >
-  let g:airline_detect_modified=1
-
-* enable paste detection >
-  let g:airline_detect_paste=1
-<
-* enable iminsert detection >
-  let g:airline_detect_iminsert=0
-<
-* determine whether inactive windows should have the left section collapsed to
-  only the filename of that buffer.  >
-  let g:airline_inactive_collapse=1
-<
-* themes are automatically selected based on the matching colorscheme. this
-  can be overridden by defining a value. >
-  let g:airline_theme=
-<
-* if you want to patch the airline theme before it gets applied, you can
-  supply the name of a function where you can modify the palette. >
-  let g:airline_theme_patch_func = 'AirlineThemePatch'
-  function! AirlineThemePatch(palette)
-    if g:airline_theme == 'badwolf'
-      for colors in values(a:palette.inactive)
-        let colors[3] = 245
-      endfor
-    endif
-  endfunction
-<
-* enable/disable automatic population of the `g:airline_symbols` dictionary
-  with powerline symbols. >
-  let g:airline_powerline_fonts=0
-<
-* define the set of text to display for each mode.  >
-  let g:airline_mode_map = {} " see source for the defaults
-
-  " or copy paste the following into your vimrc for shortform text
-  let g:airline_mode_map = {
-      \ '__' : '-',
-      \ 'n'  : 'N',
-      \ 'i'  : 'I',
-      \ 'R'  : 'R',
-      \ 'c'  : 'C',
-      \ 'v'  : 'V',
-      \ 'V'  : 'V',
-      \ '' : 'V',
-      \ 's'  : 'S',
-      \ 'S'  : 'S',
-      \ '' : 'S',
-      \ }
-<
-* define the set of filename match queries which excludes a window from having
-  its statusline modified >
-  let g:airline_exclude_filenames = [] " see source for current list
-<
-* define the set of filetypes which are excluded from having its window
-  statusline modified >
-  let g:airline_exclude_filetypes = [] " see source for current list
-<
-* defines whether the preview window should be excluded from have its window
-  statusline modified (may help with plugins which use the preview window
-  heavily) >
-  let g:airline_exclude_preview = 0
-<
-==============================================================================
-COMMANDS                                                  *airline-commands*
-
-:AirlineTheme {theme-name}                                   *:AirlineTheme*
-  Displays or changes the current theme.
-
-:AirlineToggleWhitespace                          *:AirlineToggleWhitespace*
-  Toggles whitespace detection.
-
-:AirlineToggle                                              *:AirlineToggle*
-  Toggles between the standard 'statusline' and airline.
-
-:AirlineRefresh                                            *:AirlineRefresh*
-  Refreshes all highlight groups and redraws the statusline.
-
-==============================================================================
-CUSTOMIZATION                                        *airline-customization*
-
-The following are some unicode symbols for customizing the left/right
-separators, as well as the powerline font glyths.
-
-Note: You must define the dictionary first before setting values. Also, it's a
-good idea to check whether if it exists as to avoid accidentally overwritting
-its contents. >
-  if !exists('g:airline_symbols')
-    let g:airline_symbols = {}
-  endif
-
-  " unicode symbols
-  let g:airline_left_sep = '»'
-  let g:airline_left_sep = '▶'
-  let g:airline_right_sep = '«'
-  let g:airline_right_sep = '◀'
-  let g:airline_symbols.linenr = '␊'
-  let g:airline_symbols.linenr = '␤'
-  let g:airline_symbols.linenr = '¶'
-  let g:airline_symbols.branch = '⎇'
-  let g:airline_symbols.paste = 'ρ'
-  let g:airline_symbols.paste = 'Þ'
-  let g:airline_symbols.paste = '∥'
-  let g:airline_symbols.whitespace = 'Ξ'
-
-  " powerline symbols
-  let g:airline_left_sep = ''
-  let g:airline_left_alt_sep = ''
-  let g:airline_right_sep = ''
-  let g:airline_right_alt_sep = ''
-  let g:airline_symbols.branch = ''
-  let g:airline_symbols.readonly = ''
-  let g:airline_symbols.linenr = ''
-
-  " old vim-powerline symbols
-  let g:airline_left_sep = '⮀'
-  let g:airline_left_alt_sep = '⮁'
-  let g:airline_right_sep = '⮂'
-  let g:airline_right_alt_sep = '⮃'
-  let g:airline_symbols.branch = '⭠'
-  let g:airline_symbols.readonly = '⭤'
-  let g:airline_symbols.linenr = '⭡'
-<
-
-For more intricate customizations, you can replace the predefined sections
-with the usual statusline syntax.
-
-Note: If you define any section variables it will replace the default values
-entirely.  If you want to disable only certain parts of a section you can try
-using variables defined in the |airline-configuration| or |airline-extensions|
-section.
->
-  variable names                default contents
-  ----------------------------------------------------------------------------
-  let g:airline_section_a       (mode, paste, iminsert)
-  let g:airline_section_b       (hunks, branch)
-  let g:airline_section_c       (bufferline or filename)
-  let g:airline_section_gutter  (readonly, csv)
-  let g:airline_section_x       (tagbar, filetype, virtualenv)
-  let g:airline_section_y       (fileencoding, fileformat)
-  let g:airline_section_z       (percentage, line number, column number)
-  let g:airline_section_warning (syntastic, whitespace)
-
-  " here is an example of how you could replace the branch indicator with
-  " the current working directory, followed by the filename.
-  let g:airline_section_b = '%{getcwd()}'
-  let g:airline_section_c = '%t'
-<
-==============================================================================
-EXTENSIONS                                              *airline-extensions*
-
-Most extensions are enabled by default and lazily loaded when the
-corresponding plugin (if any) is detected.
-
-By default, airline will attempt to load any extension it can find in the
-'runtimepath'.  On some systems this can result in an undersirable startup
-cost.  You can disable the check with the following flag. >
-  let g:airline#extensions#disable_rtp_load = 1
-<
-  Note: Third party plugins that rely on this behavior will be affected. You
-  will need to manually load them.
-
--------------------------------------                      *airline-default*
-The default extension understands all of the `g:` variables in the
-|airline-configuration| section, however it also has some more fine-tuned
-configuration values that you can use.
-
-* control which sections get truncated and at what width. >
-  let g:airline#extensions#default#section_truncate_width = {
-      \ 'b': 79,
-      \ 'x': 60,
-      \ 'y': 88,
-      \ 'z': 45,
-      \ }
-
-  " Note: set to an empty dictionary to disable truncation.
-  let g:airline#extensions#default#section_truncate_width = {}
-<
-* configure the layout of the sections by specificing an array of two arrays
-  (first array is the left side, second array is the right side). >
-  let g:airline#extensions#default#layout = [
-      \ [ 'a', 'b', 'c' ],
-      \ [ 'x', 'y', 'z', 'warning' ]
-      \ ]
-<
--------------------------------------                     *airline-quickfix*
-The quickfix extension is a simple built-in extension which determines
-whether the buffer is a quickfix or location list buffer, and adjusts the
-title accordingly.
-
-* configure the title text for quickfix buffers >
-  let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
-<
-* configure the title text for location list buffers >
-  let g:airline#extensions#quickfix#location_text = 'Location'
-<
-
--------------------------------------                   *airline-bufferline*
-vim-bufferline <https://github.com/bling/vim-bufferline>
-
-* enable/disable bufferline integration >
-  let g:airline#extensions#bufferline#enabled = 1
-<
-* determine whether bufferline will overwrite customization variables >
-  let g:airline#extensions#bufferline#overwrite_variables = 1
-<
--------------------------------------                       *airline-branch*
-fugitive.vim <https://github.com/tpope/vim-fugitive>
-lawrencium   <https://bitbucket.org/ludovicchabant/vim-lawrencium>
-vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
-
-* enable/disable fugitive/lawrencium integration >
-  let g:airline#extensions#branch#enabled = 1
-<
-* change the text for when no branch is detected >
-  let g:airline#extensions#branch#empty_message = ''
-
-* use vcscommand.vim if available >
-  let g:airline#extensions#branch#use_vcscommand = 0
-
-* truncate long branch names to a fixed length >
-  let g:airline#extensions#branch#displayed_head_limit = 10
-
--------------------------------------                    *airline-syntastic*
-syntastic <https://github.com/scrooloose/syntastic>
-
-* enable/disable syntastic integration >
-  let g:airline#extensions#syntastic#enabled = 1
-<
--------------------------------------                       *airline-tagbar*
-tagbar <https://github.com/majutsushi/tagbar>
-
-* enable/disable tagbar integration >
-  let g:airline#extensions#tagbar#enabled = 1
-<
-* change how tags are displayed (:help tagbar-statusline) >
-  let g:airline#extensions#tagbar#flags = ''  (default)
-  let g:airline#extensions#tagbar#flags = 'f'
-  let g:airline#extensions#tagbar#flags = 's'
-  let g:airline#extensions#tagbar#flags = 'p'
-<
--------------------------------------                          *airline-csv*
-csv.vim <https://github.com/chrisbra/csv.vim>
-
-* enable/disable csv integration for displaying the current column. >
-  let g:airline#extensions#csv#enabled = 1
-<
-* change how columns are displayed. >
-  let g:airline#extensions#csv#column_display = 'Number' (default)
-  let g:airline#extensions#csv#column_display = 'Name'
-<
--------------------------------------                        *airline-hunks*
-vim-gitgutter <https://github.com/airblade/vim-gitgutter>
-vim-signify <https://github.com/mhinz/vim-signify>
-changesPlugin <https://github.com/chrisbra/changesPlugin>
-
-* enable/disable showing a summary of changed hunks under source control. >
-  let g:airline#extensions#hunks#enabled = 1
-<
-* enable/disable showing only non-zero hunks. >
-  let g:airline#extensions#hunks#non_zero_only = 0
-<
-* set hunk count symbols. >
-  let g:airline#extensions#hunks#hunk_symbols = ['+', '~', '-']
-<
--------------------------------------                        *airline-ctrlp*
-ctrlp <https://github.com/kien/ctrlp.vim>
-
-* configure which mode colors should ctrlp window use (takes effect
-  only if the active airline theme doesn't define ctrlp colors) >
-  let g:airline#extensions#ctrlp#color_template = 'insert' (default)
-  let g:airline#extensions#ctrlp#color_template = 'normal'
-  let g:airline#extensions#ctrlp#color_template = 'visual'
-  let g:airline#extensions#ctrlp#color_template = 'replace'
-<
-
-* configure whether to show the previous and next modes (mru, buffer, etc...)
->
- let g:airline#extensions#ctrlp#show_adjacent_modes = 1
-<
--------------------------------------                   *airline-virtualenv*
-virtualenv <https://github.com/jmcantrell/vim-virtualenv>
-
-* enable/disable virtualenv integration >
-  let g:airline#extensions#virtualenv#enabled = 1
-<
--------------------------------------                        *airline-eclim*
-eclim <https://eclim.org>
-
-* enable/disable eclim integration, which works well with the
-  |airline-syntastic| extension. >
-  let g:airline#extensions#eclim#enabled = 1
-
--------------------------------------                   *airline-whitespace*
-* enable/disable detection of whitespace errors. >
-  let g:airline#extensions#whitespace#enabled = 1
-<
-* customize the type of mixed indent checking to perform. >
-  " must be all spaces or all tabs before the first non-whitespace character
-  let g:airline#extensions#whitespace#mixed_indent_algo = 0 (default)
-
-  " certain number of spaces are allowed after tabs, but not in between
-  " this algorithm works well for /** */ style comments in a tab-indented file
-  let g:airline#extensions#whitespace#mixed_indent_algo = 1
-<
-* customize the whitespace symbol. >
-  let g:airline#extensions#whitespace#symbol = '!'
-<
-* configure which whitespace checks to enable. >
-  let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing' ]
-<
-* configure the maximum number of lines where whitespace checking is enabled. >
-  let g:airline#extensions#whitespace#max_lines = 20000
-<
-* configure whether a message should be displayed. >
-  let g:airline#extensions#whitespace#show_message = 1
-<
-* configure the formatting of the warning messages. >
-  let g:airline#extensions#whitespace#trailing_format = 'trailing[%s]'
-  let g:airline#extensions#whitespace#mixed_indent_format = 'mixed-indent[%s]'
-<
--------------------------------------                      *airline-tabline*
-* enable/disable enhanced tabline. >
-  let g:airline#extensions#tabline#enabled = 0
-<
-* enable/disable displaying buffers with a single tab. >
-  let g:airline#extensions#tabline#show_buffers = 1
-<
-* configure filename match rules to exclude from the tabline. >
-  let g:airline#extensions#tabline#excludes = []
-<
-* configure how numbers are calculated in tab mode. >
-  let g:airline#extensions#tabline#tab_nr_type = 0 " # of splits (default)
-  let g:airline#extensions#tabline#tab_nr_type = 1 " tab number
-<
-* enable/disable displaying tab number in tabs mode. >
-  let g:airline#extensions#tabline#show_tab_nr = 1
-
-* enable/disable displaying tab type (far right)
-  let g:airline#extensions#tabline#show_tab_type = 1
-
-* enable/disable displaying index of the buffer.
-
-When enabled, numbers will be displayed in the tabline and mappings will be
-exposed to allow you to select a buffer directly.  Up to 9 mappings will be
-exposed.
-
-  let g:airline#extensions#tabline#buffer_idx_mode = 1
-  nmap <leader>1 <Plug>AirlineSelectTab1
-  nmap <leader>2 <Plug>AirlineSelectTab2
-  nmap <leader>3 <Plug>AirlineSelectTab3
-  nmap <leader>4 <Plug>AirlineSelectTab4
-  nmap <leader>5 <Plug>AirlineSelectTab5
-  nmap <leader>6 <Plug>AirlineSelectTab6
-  nmap <leader>7 <Plug>AirlineSelectTab7
-  nmap <leader>8 <Plug>AirlineSelectTab8
-  nmap <leader>9 <Plug>AirlineSelectTab9
-
-  Note: Mappings will be ignored within a NERDTree buffer.
-
-* defines the name of a formatter for how buffer names are displayed. >
-  let g:airline#extensions#tabline#formatter = 'default'
-
-  " here is how you can define a 'foo' formatter:
-  function! airline#extensions#tabline#foo#format(bufnr, buffers)
-    return fnamemodify(bufname(a:bufnr), ':t')
-  endfunction
-  let g:airline#extensions#tabline#formatter = 'foo'
-<
-  Note: the following variables are only used by the 'default' formatter.
-
-    * configure whether buffer numbers should be shown. >
-      let g:airline#extensions#tabline#buffer_nr_show = 0
-<
-    * configure how buffer numbers should be formatted with |printf|. >
-      let g:airline#extensions#tabline#buffer_nr_format = '%s: '
-<
-    * configure the formatting of filenames (see |filename-modifiers|). >
-      let g:airline#extensions#tabline#fnamemod = ':p:.'
-<
-    * configure collapsing parent directories in buffer name. >
-      let g:airline#extensions#tabline#fnamecollapse = 1
-
-  " The `unique_tail` algorithm will display the tail of the filename, unless
-  " there is another file of the same name, in which it will display it along
-  " with the containing parent directory.
-  let g:airline#extensions#tabline#formatter = 'unique_tail'
-
-  " The `unique_tail_improved` - another algorithm, that will smartly uniquify
-  " buffers names with similar filename, suppressing common parts of paths.
-  let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
-<
-* configure the minimum number of buffers needed to show the tabline. >
-  let g:airline#extensions#tabline#buffer_min_count = 0
-<
-  Note: this setting only applies to a single tab and when `show_buffers` is
-  true.
-
-* configure the minimum number of tabs needed to show the tabline. >
-  let g:airline#extensions#tabline#tab_min_count = 0
-<
-  Note: this setting only applies when `show_buffers` is false.
-
-* configure separators for the tabline only. >
-  let g:airline#extensions#tabline#left_sep = ''
-  let g:airline#extensions#tabline#left_alt_sep = ''
-  let g:airline#extensions#tabline#right_sep = ''
-  let g:airline#extensions#tabline#right_alt_sep = ''
-
-* configure whether close button should be shown
-  let g:airline#extensions#tabline#show_close_button = 1
-
-* configure symbol used to represent close button
-  let g:airline#extensions#tabline#close_symbol = 'X'
-
-<
-Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
-
--------------------------------------                     *airline-tmuxline*
-tmuxline <https://github.com/edkolev/tmuxline.vim>
-
-* enable/disable tmuxline integration >
-  let g:airline#extensions#tmuxline#enabled = 0
-<
-* configure which mode colors should be used in tmux statusline >
-  let airline#extensions#tmuxline#color_template = 'normal' (default)
-  let airline#extensions#tmuxline#color_template = 'insert'
-  let airline#extensions#tmuxline#color_template = 'visual'
-  let airline#extensions#tmuxline#color_template = 'replace'
-<
-* if specified, setting this option will trigger writing to the file whenever the
-  airline theme is applied, i.e. when :AirlineTheme is executed and on vim
-  startup >
-  airline#extensions#tmuxline#snapshot_file = "~/.tmux-statusline-colors.conf"
-<
--------------------------------------                   *airline-promptline*
-promptline <https://github.com/edkolev/promptline.vim>
-
-* configure the path to the snapshot .sh file. Mandatory option. The created
-  file should be sourced by the shell on login >
-  " in .vimrc
-  airline#extensions#promptline#snapshot_file = "~/.shell_prompt.sh"
-
-  " in .bashrc/.zshrc
-  [ -f ~/.shell_prompt.sh ] && source ~/.shell_prompt.sh
-<
-* enable/disable promptline integration >
-  let g:airline#extensions#promptline#enabled = 0
-<
-* configure which mode colors should be used in prompt >
-  let airline#extensions#promptline#color_template = 'normal' (default)
-  let airline#extensions#promptline#color_template = 'insert'
-  let airline#extensions#promptline#color_template = 'visual'
-  let airline#extensions#promptline#color_template = 'replace'
-<
--------------------------------------                    *airline-nrrwrgn*
-NrrwRgn <https://github.com/chrisbra/NrrwRgn>
-
-* enable/disable NrrwRgn integration >
-  let g:airline#extensions#nrrwrgn#enabled = 1
-
--------------------------------------                        *airline-capslock*
-vim-capslock <https://github.com/tpope/vim-capslock>
-
-* enable/disable vim-capslock integration >
-  let g:airline#extensions#capslock#enabled = 1
-
--------------------------------------                       *airline-windowswap*
-vim-windowswap <https://github.com/wesQ3/vim-windowswap>
-
-* enable/disable vim-windowswap integration >
-  let g:airline#extensions#windowswap#enabled = 1
-
-* set marked window indicator string >
-  let g:airline#extensions#windowswap#indicator_text = 'WS'
-<
-==============================================================================
-ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
-
-The defaults will accomodate the mass majority of users with minimal
-configuration. However, if you want to reposition sections or contents you can
-do so with built-in helper functions, which makes it possible to create
-sections in a more declarative style.
-
--------------------------------------                        *airline-parts*
-A part is something that contains metadata that eventually gets rendered into
-the statusline. You can define parts that contain constant strings or
-functions. Defining parts is needed if you want to use features like automatic
-insertion of separators or hiding based on window width.
-
-For example, this is how you would define a part function: >
-  call airline#parts#define_function('foo', 'GetFooText')
-<
-Here is how you would define a part that is visible only if the window width
-greater than a minimum width. >
-  call airline#parts#define_minwidth('foo', 50)
-<
-Parts can be configured to be visible conditionally. >
-  call airline#parts#define_condition('foo', 'getcwd() =~ "work_dir"')
-<
-Note: Part definitions are combinative; e.g. the two examples above modify the
-same `foo` part.
-
-Note: Look at the source code and tests for the full API.
-
--------------------------------------             *airline-predefined-parts*
-Before is a list of parts that are predefined by vim-airline.
-
-* `mode`           displays the current mode
-* `iminsert`       displays the current insert method
-* `paste`          displays the paste indicator
-* `filetype`       displays the file type
-* `readonly`       displays the read only indicator
-* `file`           displays the filename and modified indicator
-* `ffenc`          displays the file format and encoding
-
-And the following are defined for their respective extensions:
-
-`hunks`, `branch`, `tagbar`, `syntastic`, `whitespace`
-
--------------------------------------                      *airline-accents*
-Accents can be defined on any part, like so: >
-  call airline#parts#define_accent('foo', 'red')
-<
-This will override the colors of that part by using what is defined in that
-particular accent. In the above example, the `red` accent is used, which means
-regardless of which section the part is used in, it will have red foreground
-colors instead of the section's default foreground color.
-
-The following accents are defined by default. Themes can define their variants
-of the colors, but defaults will be provided if missing. >
-  bold, italic, red, green, blue, yellow, orange, purple
-<
-The defaults configure the mode and line number parts to be bold, and the
-readonly part to be red.
-
--------------------------------------                     *airline-sections*
-Once a part is defined, you can use helper functions to generate the
-statuslines for each section. For example, to use the part above, we could
-define a section like this: >
-  function! AirlineInit()
-    let g:airline_section_a = airline#section#create(['mode', ' ', 'foo'])
-    let g:airline_section_b = airline#section#create_left(['ffenc','file'])
-    let g:airline_section_c = airline#section#create(['%{getcwd()}'])
-  endfunction
-  autocmd VimEnter * call AirlineInit()
-<
-This will create a section with the `mode`, followed by a space, and our `foo`
-part in section `a`. Section `b` will have two parts with a left-side
-separator. And section `c` will contain the current path. You may notice that
-the space and cwd are not defined parts. For convenience, if a part of that
-key does not exist, it will be inserted as is. The unit tests will be a good
-resource for possibilities.
-
-Note: The use of |VimEnter| is important, because most extensions are lazily
-loaded, so we must give them a chance to define their parts before we can use
-them.
-
-Note: The `airline#section#create` function and friends will do its best to
-create a section with the appropriate separators, but it only works for
-function and text parts. Special 'statusline' items like %f or raw/undefined
-parts will not work as it is not possible to inspect their widths/contents
-before rendering to the statusline.
-
-==============================================================================
-FUNCREFS                                                  *airline-funcrefs*
-
-vim-airline internally uses funcrefs to integrate with third party plugins,
-and you can tap into this functionality to extend it for you needs. This is
-the most powerful way to customize the statusline, and sometimes it may be
-easier to go this route than the above methods.
-
-Every section can have two values. The default value is the global `g:`
-variable which is used in the absense of a `w:` value. This makes it very easy
-to override only certain parts of the statusline by only defining window-local
-variables for a subset of all sections.
-
--------------------------------------                  *add_statusline_func*
-The following is an example of how you can extend vim-airline to support a
-new plugin. >
-  function! MyPlugin(...)
-    if &filetype == 'MyPluginFileType'
-      let w:airline_section_a = 'MyPlugin'
-      let w:airline_section_b = '%f'
-      let w:airline_section_c = '%{MyPlugin#function()}'
-      let g:airline_variable_referenced_in_statusline = 'foo'
-    endif
-  endfunction
-  call airline#add_statusline_func('MyPlugin')
-<
-Notice that only the left side of the statusline is overwritten. This means
-the right side (the line/column numbers, etc) will be intact.
-
--------------------------------------               *remove_statusline_func*
-You can also remove a function as well, which is useful for when you want a
-temporary override. >
-  call airline#remove_statusline_func('MyPlugin')
-<
-
-==============================================================================
-PIPELINE                                                  *airline-pipeline*
-
-Sometimes you want to do more than just use overrides.  The statusline funcref
-is invoked and passed two arguments.  The first of these arguments is the
-statusline builder.  You can use this to build completely custom statuslines
-to your liking.  Here is an example: >
->
-  function! MyPlugin(...)
-    " first variable is the statusline builder
-    let builder = a:1
-
-    " WARNING: the API for the builder is not finalized and may change
-    call builder.add_section('Normal', '%f')
-    call builder.add_section('WarningMsg', '%{getcwd()}')
-    call builder.split()
-    call builder.add_section('airline_z', '%p%%')
-
-    " tell the core to use the contents of the builder
-    return 1
-  endfunction
-<
-The above example uses various example highlight groups to demonstrate
-that you can use any combination from the loaded colorscheme. However, if
-you want colors to change between modes, you should use one of the section
-highlight groups, e.g. `airline_a` and `airline_b`.
-
-The second variable is the context, which is a dictionary containing various
-values such as whether the statusline is active or not, and the window number.
->
-  context = {
-    'winnr': 'the window number for the statusline',
-    'active': 'whether the window is active or not',
-    'bufnr': 'the current buffer for this window',
-  }
-<
--------------------------------------        *airline-pipeline-return-codes*
-The pipeline accepts various return codes and can be used to determine the
-next action.  The following are the supported codes: >
-   0   the default, continue on with the next funcref
-  -1   do not modify the statusline
-   1   modify the statusline with the current contents of the builder
-<
-Note: Any value other than 0 will halt the pipeline and prevent the next
-funcref from executing.
-
-==============================================================================
-WRITING EXTENSIONS                              *airline-writing-extensions*
-
-For contributions into the plugin, here are the following guidelines:
-
-1.  For simple 'filetype' checks, they can be added directly into the
-`extensions.vim` file.
-
-2.  Pretty much everything else should live as a separate file under the
-`extensions/` directory.
-
-  a.  Inside `extensions.vim`, add a check for some variable or command that
-      is always available (these must be defined in `plugin/`, and _not_
-      `autoload/` of the other plugin).  If it exists, then initialize the
-      extension. This ensures that the extension is loaded if and only if the
-      user has the other plugin installed.  Also, a check to
-      `airline#extensions#foo_plugin#enabled` should be performed to allow the
-      user to disable it.
-
-  b.  Configuration variables for the extension should reside in the
-      extension, e.g. `g:airline#extensions#foo_plugin#bar_variable`.
-
-See the source of |example.vim| for documented code of how to write one.
-Looking at the other extensions is also a good resource.
-
-==============================================================================
-WRITING THEMES                                              *airline-themes*
-
-Themes are written "close to the metal" -- you will need to know some basic
-VimL syntax to write a theme, but if you've written in any programming
-language before it will be easy to pick up.
-
-The |dark.vim| theme fully documents this procedure and will guide you through
-the process.  The |jellybeans.vim| theme is another example of how to write a
-theme, but instead of manually declaring colors, it extracts the values from
-highlight groups.
-
-==============================================================================
-TROUBLESHOOTING                                    *airline-troubleshooting*
-
-Q. There are no colors.
-A. You need to set up your terminal correctly.  For more details, see
-   <http://vim.wikia.com/wiki/256_colors_in_vim>.  Alternatively, if you want
-   to bypass the automatic detection of terminal colors, you can force Vim
-   into 256 color mode with this: >
-  set t_Co=256
-<
-Q. The statusline does not appear until I create a split.
-A. This is the default setting of 'laststatus'.  If you want it to appear all
-   the time, add the following to your vimrc: >
-  set laststatus=2
-<
-Q. Powerline symbols are not showing up.
-A. First, you must install patched powerline fonts. Second, you must enable
-   unicode in vim.  >
-  set encoding=utf-8
-<
-Q. There is a pause when leaving insert mode.
-A. Add the following to your vimrc.  >
-  set ttimeoutlen=50
-<
-Q. The colors look a little off for some themes.
-A. Certain themes are derived from the active colorscheme by extracting colors
-   from predefined highlight groups.  These airline themes will look good for
-   their intended matching colorschemes, but will be hit or miss when loaded
-   with other colorschemes.
-
-
-Solutions to other common problems can be found in the Wiki:
-<https://github.com/bling/vim-airline/wiki/FAQ>
-
-==============================================================================
-CONTRIBUTIONS                                        *airline-contributions*
-
-Contributions and pull requests are welcome.
-
-==============================================================================
-LICENSE                                                    *airline-license*
-
-MIT License.  Copyright © 2013-2014 Bailey Ling.
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/bundle/airline/plugin/airline.vim b/bundle/airline/plugin/airline.vim
deleted file mode 100755
index d53c492..0000000
--- a/bundle/airline/plugin/airline.vim
+++ /dev/null
@@ -1,109 +0,0 @@
-" MIT License. Copyright (c) 2013-2014 Bailey Ling.
-" vim: et ts=2 sts=2 sw=2
-
-if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
-  finish
-endif
-let g:loaded_airline = 1
-
-" autocmd VimEnter * call airline#deprecation#check()
-
-let s:airline_initialized = 0
-let s:airline_theme_defined = 0
-function! s:init()
-  if !s:airline_initialized
-    let s:airline_initialized = 1
-
-    call airline#init#bootstrap()
-    call airline#extensions#load()
-    call airline#init#sections()
-
-    let s:airline_theme_defined = exists('g:airline_theme')
-    if s:airline_theme_defined || !airline#switch_matching_theme()
-      let g:airline_theme = get(g:, 'airline_theme', 'dark')
-      call airline#switch_theme(g:airline_theme)
-    endif
-  endif
-endfunction
-
-function! s:on_window_changed()
-  if pumvisible()
-    return
-  endif
-  call <sid>init()
-  call airline#update_statusline()
-endfunction
-
-function! s:on_colorscheme_changed()
-  call <sid>init()
-  if !s:airline_theme_defined
-    if airline#switch_matching_theme()
-      return
-    endif
-  endif
-
-  " couldn't find a match, or theme was defined, just refresh
-  call airline#load_theme()
-endfunction
-
-function airline#cmdwinenter(...)
-  call airline#extensions#apply_left_override('Command Line', '')
-endfunction
-
-function! s:airline_toggle()
-  if exists("#airline")
-    augroup airline
-      au!
-    augroup END
-    augroup! airline
-
-    if exists("s:stl")
-      let &stl = s:stl
-    endif
-
-    silent doautocmd User AirlineToggledOff
-  else
-    let s:stl = &statusline
-    augroup airline
-      autocmd!
-
-      autocmd CmdwinEnter *
-            \ call airline#add_statusline_func('airline#cmdwinenter')
-            \ | call <sid>on_window_changed()
-      autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
-
-      autocmd ColorScheme * call <sid>on_colorscheme_changed()
-      autocmd VimEnter,WinEnter,BufWinEnter,FileType,BufUnload,VimResized *
-            \ call <sid>on_window_changed()
-
-      autocmd BufWritePost */autoload/airline/themes/*.vim
-            \ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
-            \ | call airline#load_theme()
-    augroup END
-
-    silent doautocmd User AirlineToggledOn
-
-    if s:airline_initialized
-      call <sid>on_window_changed()
-    endif
-  endif
-endfunction
-
-function! s:get_airline_themes(a, l, p)
-  let files = split(globpath(&rtp, 'autoload/airline/themes/'.a:a.'*'), "\n")
-  return map(files, 'fnamemodify(v:val, ":t:r")')
-endfunction
-function! s:airline_theme(...)
-  if a:0
-    call airline#switch_theme(a:1)
-  else
-    echo g:airline_theme
-  endif
-endfunction
-command! -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
-command! AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
-command! AirlineToggle call <sid>airline_toggle()
-command! AirlineRefresh call airline#load_theme() | call airline#update_statusline()
-
-call <sid>airline_toggle()
-
diff --git a/bundle/airline/t/airline.vim b/bundle/airline/t/airline.vim
deleted file mode 100755
index 78ab6d7..0000000
--- a/bundle/airline/t/airline.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-let g:airline_theme = 'dark'
-call airline#init#bootstrap()
-call airline#init#sections()
-source plugin/airline.vim
-
-function! MyFuncref(...)
-  call a:1.add_raw('hello world')
-  return 1
-endfunction
-
-function! MyIgnoreFuncref(...)
-  return -1
-endfunction
-
-function! MyAppend1(...)
-  call a:1.add_raw('hello')
-endfunction
-
-function! MyAppend2(...)
-  call a:1.add_raw('world')
-endfunction
-
-describe 'airline'
-  before
-    let g:airline_statusline_funcrefs = []
-  end
-
-  it 'should run user funcrefs first'
-    call airline#add_statusline_func('MyFuncref')
-    let &statusline = ''
-    call airline#update_statusline()
-    Expect airline#statusline(1) =~ 'hello world'
-  end
-
-  it 'should not change the statusline with -1'
-    call airline#add_statusline_funcref(function('MyIgnoreFuncref'))
-    let &statusline = 'foo'
-    call airline#update_statusline()
-    Expect &statusline == 'foo'
-  end
-
-  it 'should support multiple chained funcrefs'
-    call airline#add_statusline_func('MyAppend1')
-    call airline#add_statusline_func('MyAppend2')
-    call airline#update_statusline()
-    Expect airline#statusline(1) =~ 'helloworld'
-  end
-
-  it 'should allow users to redefine sections'
-    let g:airline_section_a = airline#section#create(['mode', 'mode'])
-    call airline#update_statusline()
-    Expect airline#statusline(1) =~ '%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#%#airline_a_bold#%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#'
-  end
-
-  it 'should remove funcrefs properly'
-    let c = len(g:airline_statusline_funcrefs)
-    call airline#add_statusline_func('MyIgnoreFuncref')
-    call airline#remove_statusline_func('MyIgnoreFuncref')
-    Expect len(g:airline_statusline_funcrefs) == c
-  end
-
-  it 'should overwrite the statusline with active and inactive splits'
-    wincmd s
-    Expect airline#statusline(1) !~ 'inactive'
-    Expect airline#statusline(2) =~ 'inactive'
-    wincmd c
-  end
-
-  it 'should collapse the inactive split if the variable is set true'
-    let g:airline_inactive_collapse = 1
-    wincmd s
-    Expect getwinvar(2, '&statusline') !~ 'airline#parts#mode'
-    wincmd c
-  end
-
-  it 'should not collapse the inactive split if the variable is set false'
-    let g:airline_inactive_collapse = 0
-    wincmd s
-    Expect getwinvar(2, '&statusline') != 'airline#parts#mode'
-    wincmd c
-  end
-
-  it 'should include check_mode'
-    Expect airline#statusline(1) =~ 'airline#check_mode'
-  end
-end
-
diff --git a/bundle/airline/t/builder.vim b/bundle/airline/t/builder.vim
deleted file mode 100755
index 57feb14..0000000
--- a/bundle/airline/t/builder.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-let g:airline_theme = 'dark'
-call airline#init#bootstrap()
-
-describe 'active builder'
-  before
-    let s:builder = airline#builder#new({'active': 1})
-  end
-
-  it 'should start with an empty statusline'
-    let stl = s:builder.build()
-    Expect stl == ''
-  end
-
-  it 'should transition colors from one to the next'
-    call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('Search', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ '%#Normal#hello%#Normal_to_Search#>%#Search#world'
-  end
-
-  it 'should reuse highlight group if background colors match'
-    highlight Foo1 ctermfg=1 ctermbg=2
-    highlight Foo2 ctermfg=1 ctermbg=2
-    call s:builder.add_section('Foo1', 'hello')
-    call s:builder.add_section('Foo2', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ '%#Foo1#hello>world'
-  end
-
-  it 'should switch highlight groups if foreground colors differ'
-    highlight Foo1 ctermfg=1 ctermbg=2
-    highlight Foo2 ctermfg=2 ctermbg=2
-    call s:builder.add_section('Foo1', 'hello')
-    call s:builder.add_section('Foo2', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ '%#Foo1#hello%#Foo1_to_Foo2#>%#Foo2#world'
-  end
-
-  it 'should split left/right sections'
-    call s:builder.split()
-    let stl = s:builder.build()
-    Expect stl =~ '%='
-  end
-
-  it 'after split, sections use the right separator'
-    call s:builder.split()
-    call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('Search', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ 'hello%#Normal_to_Search#<%#Search#world'
-  end
-
-  it 'should not repeat the same highlight group'
-    call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('Normal', 'hello')
-    let stl = s:builder.build()
-    Expect stl == '%#Normal#hello>hello'
-  end
-
-  it 'should replace accent groups with the specified group'
-    call s:builder.add_section('Normal', '%#__accent_foo#hello')
-    let stl = s:builder.build()
-    Expect stl == '%#Normal#%#Normal_foo#hello'
-  end
-
-  it 'should replace two accent groups with correct groups'
-    call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world')
-    let stl = s:builder.build()
-    Expect stl =~ '%#Normal_foo#hello%#Normal_bar#world'
-  end
-
-  it 'should special restore group should go back to previous group'
-    call s:builder.add_section('Normal', '%#__restore__#')
-    let stl = s:builder.build()
-    Expect stl !~ '%#__restore__#'
-    Expect stl =~ '%#Normal#'
-  end
-
-  it 'should blend colors from the left through the split to the right'
-    call s:builder.add_section('Normal', 'hello')
-    call s:builder.split()
-    call s:builder.add_section('Search', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ 'Normal_to_Search'
-  end
-end
-
-describe 'inactive builder'
-  before
-    let s:builder = airline#builder#new({'active': 0})
-  end
-
-  it 'should transition colors from one to the next'
-    call s:builder.add_section('Normal', 'hello')
-    call s:builder.add_section('Search', 'world')
-    let stl = s:builder.build()
-    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_Search_inactive#>%#Search_inactive#world'
-  end
-
-  it 'should not render accents'
-    call s:builder.add_section('Normal', '%#__accent_foo#hello%#foo#foo%#__accent_bar#world')
-    let stl = s:builder.build()
-    Expect stl == '%#Normal_inactive#hello%#foo_inactive#fooworld'
-  end
-end
-
diff --git a/bundle/airline/t/commands.vim b/bundle/airline/t/commands.vim
deleted file mode 100755
index b56b881..0000000
--- a/bundle/airline/t/commands.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-call airline#init#bootstrap()
-call airline#init#sections()
-
-source plugin/airline.vim
-
-describe 'commands'
-  it 'should toggle off and on'
-    execute 'AirlineToggle'
-    Expect exists('#airline') to_be_false
-    execute 'AirlineToggle'
-    Expect exists('#airline') to_be_true
-  end
-
-  it 'should toggle whitespace off and on'
-    call airline#extensions#load()
-    execute 'AirlineToggleWhitespace'
-    Expect exists('#airline_whitespace') to_be_false
-    execute 'AirlineToggleWhitespace'
-    Expect exists('#airline_whitespace') to_be_true
-  end
-
-  it 'should display theme name with no args'
-    execute 'AirlineTheme simple'
-    Expect g:airline_theme == 'simple'
-    execute 'AirlineTheme dark'
-    Expect g:airline_theme == 'dark'
-  end
-
-  it 'should have a refresh command'
-    Expect exists(':AirlineRefresh') to_be_true
-  end
-end
-
diff --git a/bundle/airline/t/extensions_default.vim b/bundle/airline/t/extensions_default.vim
deleted file mode 100755
index d6fc572..0000000
--- a/bundle/airline/t/extensions_default.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-let g:airline_theme = 'dark'
-call airline#init#bootstrap()
-call airline#init#sections()
-source plugin/airline.vim
-call airline#load_theme()
-
-describe 'default'
-  before
-    let s:builder = airline#builder#new({'active': 1})
-  end
-
-  it 'should use the layout'
-    let g:airline#extensions#default#layout = [
-          \ [ 'c', 'a', 'b', 'warning' ],
-          \ [ 'x', 'z', 'y' ]
-          \ ]
-    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
-    let stl = s:builder.build()
-    Expect stl =~ 'airline_c_to_airline_a'
-    Expect stl =~ 'airline_a_to_airline_b'
-    Expect stl =~ 'airline_b_to_airline_warning'
-    Expect stl =~ 'airline_x_to_airline_z'
-    Expect stl =~ 'airline_z_to_airline_y'
-  end
-
-  it 'should only render warning section in active splits'
-    wincmd s
-    Expect airline#statusline(1) =~ 'warning'
-    Expect airline#statusline(2) !~ 'warning'
-    wincmd c
-  end
-end
-
diff --git a/bundle/airline/t/highlighter.vim b/bundle/airline/t/highlighter.vim
deleted file mode 100755
index a1ed490..0000000
--- a/bundle/airline/t/highlighter.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-let g:airline_theme = 'dark'
-
-describe 'highlighter'
-  it 'should create separator highlight groups'
-    hi Foo1 ctermfg=1 ctermbg=2
-    hi Foo2 ctermfg=3 ctermbg=4
-    call airline#highlighter#add_separator('Foo1', 'Foo2', 0)
-    let hl = airline#highlighter#get_highlight('Foo1_to_Foo2')
-    Expect hl == [ '', '', '4', '2', '' ]
-  end
-
-  it 'should populate accent colors'
-    Expect exists('g:airline#themes#dark#palette.normal.airline_c_red') to_be_false
-    Expect hlID('airline_c_red') == 0
-    call airline#themes#patch(g:airline#themes#dark#palette)
-    call airline#highlighter#add_accent('red')
-    call airline#highlighter#highlight(['normal'])
-    Expect hlID('airline_c_red') != 0
-  end
-end
-
diff --git a/bundle/airline/t/init.vim b/bundle/airline/t/init.vim
deleted file mode 100755
index 86efe58..0000000
--- a/bundle/airline/t/init.vim
+++ /dev/null
@@ -1,77 +0,0 @@
-let s:sections = ['a', 'b', 'c', 'gutter', 'x', 'y', 'z', 'warning']
-
-function! s:clear()
-  for key in s:sections
-    unlet! g:airline_section_{key}
-  endfor
-endfunction
-
-call airline#init#bootstrap()
-
-describe 'init sections'
-  before
-    call s:clear()
-    call airline#init#sections()
-  end
-
-  after
-    call s:clear()
-  end
-
-  it 'section a should have mode, paste, iminsert'
-    Expect g:airline_section_a =~ 'mode'
-    Expect g:airline_section_a =~ 'paste'
-    Expect g:airline_section_a =~ 'iminsert'
-  end
-
-  it 'section b should be blank because no extensions are installed'
-    Expect g:airline_section_b == ''
-  end
-
-  it 'section c should be file'
-    Expect g:airline_section_c == '%<%f%m %#__accent_red#%{airline#util#wrap(airline#parts#readonly(),0)}%#__restore__#'
-  end
-
-  it 'section x should be filetype'
-    Expect g:airline_section_x == '%{airline#util#wrap(airline#parts#filetype(),0)}'
-  end
-
-  it 'section y should be fenc and ff'
-    Expect g:airline_section_y =~ 'ff'
-    Expect g:airline_section_y =~ 'fenc'
-  end
-
-  it 'section z should be line numbers'
-    Expect g:airline_section_z =~ '%3p%%'
-    Expect g:airline_section_z =~ '%4l'
-    Expect g:airline_section_z =~ '%3c'
-  end
-
-  it 'should not redefine sections already defined'
-    for s in s:sections
-      let g:airline_section_{s} = s
-    endfor
-    call airline#init#bootstrap()
-    for s in s:sections
-      Expect g:airline_section_{s} == s
-    endfor
-  end
-
-  it 'all default statusline extensions should be blank'
-    Expect airline#parts#get('hunks').raw == ''
-    Expect airline#parts#get('branch').raw == ''
-    Expect airline#parts#get('tagbar').raw == ''
-    Expect airline#parts#get('syntastic').raw == ''
-    Expect airline#parts#get('eclim').raw == ''
-    Expect airline#parts#get('whitespace').raw == ''
-  end
-end
-
-describe 'init parts'
-  it 'should not redefine parts already defined'
-    call airline#parts#define_raw('linenr', 'bar')
-    call airline#init#sections()
-    Expect g:airline_section_z =~ 'bar'
-  end
-end
-
diff --git a/bundle/airline/t/parts.vim b/bundle/airline/t/parts.vim
deleted file mode 100755
index ee7c92e..0000000
--- a/bundle/airline/t/parts.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-describe 'parts'
-  it 'overwrites existing values'
-    call airline#parts#define('foo', { 'test': '123' })
-    Expect airline#parts#get('foo').test == '123'
-    call airline#parts#define('foo', { 'test': '321' })
-    Expect airline#parts#get('foo').test == '321'
-  end
-
-  it 'can define a function part'
-    call airline#parts#define_function('func', 'bar')
-    Expect airline#parts#get('func').function == 'bar'
-  end
-
-  it 'can define a text part'
-    call airline#parts#define_text('text', 'bar')
-    Expect airline#parts#get('text').text == 'bar'
-  end
-
-  it 'can define a raw part'
-    call airline#parts#define_raw('raw', 'bar')
-    Expect airline#parts#get('raw').raw == 'bar'
-  end
-
-  it 'can define a minwidth'
-    call airline#parts#define_minwidth('mw', 123)
-    Expect airline#parts#get('mw').minwidth == 123
-  end
-
-  it 'can define a condition'
-    call airline#parts#define_condition('part', '1')
-    Expect airline#parts#get('part').condition == '1'
-  end
-
-  it 'can define a accent'
-    call airline#parts#define_accent('part', 'red')
-    Expect airline#parts#get('part').accent == 'red'
-  end
-end
-
diff --git a/bundle/airline/t/section.vim b/bundle/airline/t/section.vim
deleted file mode 100755
index 034440c..0000000
--- a/bundle/airline/t/section.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-function! SectionSpec()
-endfunction
-
-describe 'section'
-  before
-    call airline#parts#define_text('text', 'text')
-    call airline#parts#define_raw('raw', 'raw')
-    call airline#parts#define_function('func', 'SectionSpec')
-  end
-
-  it 'should be able to reference default parts'
-    let s = airline#section#create(['paste'])
-    Expect s == '%{airline#util#wrap(airline#parts#paste(),0)}'
-  end
-
-  it 'should create sections with no separators'
-    let s = airline#section#create(['text', 'raw', 'func'])
-    Expect s == '%{airline#util#wrap("text",0)}raw%{airline#util#wrap(SectionSpec(),0)}'
-  end
-
-  it 'should create left sections with separators'
-    let s = airline#section#create_left(['text', 'text'])
-    Expect s == '%{airline#util#wrap("text",0)}%{airline#util#append("text",0)}'
-  end
-
-  it 'should create right sections with separators'
-    let s = airline#section#create_right(['text', 'text'])
-    Expect s == '%{airline#util#prepend("text",0)}%{airline#util#wrap("text",0)}'
-  end
-
-  it 'should prefix with accent group if provided and restore afterwards'
-    call airline#parts#define('hi', {
-          \ 'raw': 'hello',
-          \ 'accent': 'red',
-          \ })
-    let s = airline#section#create(['hi'])
-    Expect s == '%#__accent_red#hello%#__restore__#'
-  end
-
-  it 'should accent functions'
-    call airline#parts#define_function('hi', 'Hello')
-    call airline#parts#define_accent('hi', 'bold')
-    let s = airline#section#create(['hi'])
-    Expect s == '%#__accent_bold#%{airline#util#wrap(Hello(),0)}%#__restore__#'
-  end
-
-  it 'should parse out a section from the distro'
-    call airline#extensions#load()
-    let s = airline#section#create(['whitespace'])
-    Expect s =~ 'airline#extensions#whitespace#check'
-  end
-
-  it 'should use parts as is if they are not found'
-    let s = airline#section#create(['asdf', 'func'])
-    Expect s == 'asdf%{airline#util#wrap(SectionSpec(),0)}'
-  end
-
-  it 'should force add separators for raw and missing keys'
-    let s = airline#section#create_left(['asdf', 'raw'])
-    Expect s == 'asdf > raw'
-    let s = airline#section#create_left(['asdf', 'aaaa', 'raw'])
-    Expect s == 'asdf > aaaa > raw'
-    let s = airline#section#create_right(['raw', '%f'])
-    Expect s == 'raw < %f'
-    let s = airline#section#create_right(['%t', 'asdf', '%{getcwd()}'])
-    Expect s == '%t < asdf < %{getcwd()}'
-  end
-
-  it 'should empty out parts that do not pass their condition'
-    call airline#parts#define_text('conditional', 'conditional')
-    call airline#parts#define_condition('conditional', '0')
-    let s = airline#section#create(['conditional'])
-    Expect s == '%{0 ? airline#util#wrap("conditional",0) : ""}'
-  end
-end
-
diff --git a/bundle/airline/t/themes.vim b/bundle/airline/t/themes.vim
deleted file mode 100755
index d735229..0000000
--- a/bundle/airline/t/themes.vim
+++ /dev/null
@@ -1,68 +0,0 @@
-describe 'themes'
-  after
-    highlight clear Foo
-    highlight clear Normal
-  end
-
-  it 'should extract correct colors'
-    highlight Foo ctermfg=1 ctermbg=2
-    let colors = airline#themes#get_highlight('Foo')
-    Expect colors[2] == '1'
-    Expect colors[3] == '2'
-  end
-
-  it 'should extract from normal if colors unavailable'
-    highlight Normal ctermfg=100 ctermbg=200
-    highlight Foo ctermbg=2
-    let colors = airline#themes#get_highlight('Foo')
-    Expect colors[2] == '100'
-    Expect colors[3] == '2'
-  end
-
-  it 'should flip target group if it is reversed'
-    highlight Foo ctermbg=222 ctermfg=103 term=reverse
-    let colors = airline#themes#get_highlight('Foo')
-    Expect colors[2] == '222'
-    Expect colors[3] == '103'
-  end
-
-  it 'should pass args through correctly'
-    let hl = airline#themes#get_highlight('Foo', 'bold', 'italic')
-    Expect hl == ['', '', 0, 1, 'bold,italic']
-
-    let hl = airline#themes#get_highlight2(['Foo','bg'], ['Foo','fg'], 'italic', 'bold')
-    Expect hl == ['', '', 1, 0, 'italic,bold']
-  end
-
-  it 'should generate color map with mirroring'
-    let map = airline#themes#generate_color_map(
-          \ [ 1, 1, 1, 1, '1' ],
-          \ [ 2, 2, 2, 2, '2' ],
-          \ [ 3, 3, 3, 3, '3' ],
-          \ )
-    Expect map.airline_a[0] == 1
-    Expect map.airline_b[0] == 2
-    Expect map.airline_c[0] == 3
-    Expect map.airline_x[0] == 3
-    Expect map.airline_y[0] == 2
-    Expect map.airline_z[0] == 1
-  end
-
-  it 'should generate color map with full set of colors'
-    let map = airline#themes#generate_color_map(
-          \ [ 1, 1, 1, 1, '1' ],
-          \ [ 2, 2, 2, 2, '2' ],
-          \ [ 3, 3, 3, 3, '3' ],
-          \ [ 4, 4, 4, 4, '4' ],
-          \ [ 5, 5, 5, 5, '5' ],
-          \ [ 6, 6, 6, 6, '6' ],
-          \ )
-    Expect map.airline_a[0] == 1
-    Expect map.airline_b[0] == 2
-    Expect map.airline_c[0] == 3
-    Expect map.airline_x[0] == 4
-    Expect map.airline_y[0] == 5
-    Expect map.airline_z[0] == 6
-  end
-end
-
diff --git a/bundle/airline/t/util.vim b/bundle/airline/t/util.vim
deleted file mode 100755
index 913de9d..0000000
--- a/bundle/airline/t/util.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-call airline#init#bootstrap()
-
-function! Util1()
-  let g:count += 1
-endfunction
-function! Util2()
-  let g:count += 2
-endfunction
-function! Util3(...)
-  let g:count = a:0
-endfunction
-
-describe 'util'
-  before
-    let g:count = 0
-  end
-
-  it 'has append wrapper function'
-    Expect airline#util#append('', 0) == ''
-    Expect airline#util#append('1', 0) == '  > 1'
-  end
-
-  it 'has prepend wrapper function'
-    Expect airline#util#prepend('', 0) == ''
-    Expect airline#util#prepend('1', 0) == '1 < '
-  end
-
-  it 'has getwinvar function'
-    Expect airline#util#getwinvar(1, 'asdf', '123') == '123'
-    call setwinvar(1, 'vspec', 'is cool')
-    Expect airline#util#getwinvar(1, 'vspec', '') == 'is cool'
-  end
-
-  it 'has exec funcrefs helper functions'
-    call airline#util#exec_funcrefs([function('Util1'), function('Util2')])
-    Expect g:count == 3
-
-    call airline#util#exec_funcrefs([function('Util3')], 1, 2, 3, 4)
-    Expect g:count == 4
-  end
-
-  it 'should ignore minwidth if less than 0'
-    Expect airline#util#append('foo', -1) == '  > foo'
-    Expect airline#util#prepend('foo', -1) == 'foo < '
-    Expect airline#util#wrap('foo', -1) == 'foo'
-  end
-
-  it 'should return empty if winwidth() > minwidth'
-    Expect airline#util#append('foo', 99999) == ''
-    Expect airline#util#prepend('foo', 99999) == ''
-    Expect airline#util#wrap('foo', 99999) == ''
-  end
-end
-
diff --git a/bundle/coffee-script/.gitignore b/bundle/coffee-script/.gitignore
deleted file mode 100644
index 1ff7b05..0000000
--- a/bundle/coffee-script/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.*.sw[a-z]
-.*.un~
-doc/tags
-
diff --git a/bundle/coffee-script/Copying.md b/bundle/coffee-script/Copying.md
deleted file mode 100644
index 51cf8d1..0000000
--- a/bundle/coffee-script/Copying.md
+++ /dev/null
@@ -1,15 +0,0 @@
-                DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                        Version 2, December 2004
-
-     Copyright (C) 2010 to 2012 Mick Koch <kchmck@gmail.com>
-
-     Everyone is permitted to copy and distribute verbatim or modified
-     copies of this license document, and changing it is allowed as long
-     as the name is changed.
-
-                DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-       TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-      0. You just DO WHAT THE FUCK YOU WANT TO.
-
-
diff --git a/bundle/coffee-script/Makefile b/bundle/coffee-script/Makefile
deleted file mode 100644
index e6ef409..0000000
--- a/bundle/coffee-script/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-REF = HEAD
-VERSION = $(shell git describe --always $(REF))
-
-ARCHIVE = vim-coffee-script-$(VERSION).zip
-ARCHIVE_DIRS = after autoload compiler doc ftdetect ftplugin indent syntax
-
-# Don't do anything by default.
-all:
-
-# Make vim.org zipball.
-archive:
-	git archive $(REF) -o $(ARCHIVE) -- $(ARCHIVE_DIRS)
-
-# Remove zipball.
-clean:
-	-rm -f $(ARCHIVE)
-
-# Build the list of syntaxes for @coffeeAll.
-coffeeAll:
-	@grep -E 'syn (match|region)' syntax/coffee.vim |\
-	 grep -v 'contained' |\
-	 awk '{print $$3}' |\
-	 uniq
-
-.PHONY: all archive clean hash coffeeAll
diff --git a/bundle/coffee-script/News.md b/bundle/coffee-script/News.md
deleted file mode 100644
index 9706796..0000000
--- a/bundle/coffee-script/News.md
+++ /dev/null
@@ -1,18 +0,0 @@
-### Version 002 (December 5, 2011)
-
-Added binary numbers (0b0101) and fixed some bugs (#9, #62, #63, #65).
-
-### Version 001 (October 18, 2011)
-
-Removed deprecated `coffee_folding` option, added `coffee_compile_vert` option,
-split out compiler, fixed indentation and syntax bugs, and added Haml support
-and omnicompletion.
-
- - The coffee compiler is now a proper vim compiler that can be loaded with
-   `:compiler coffee`.
- - The `coffee_compile_vert` option can now be set to split the CoffeeCompile
-   buffer vertically by default.
- - CoffeeScript is now highlighted inside the `:coffeescript` filter in Haml.
- - Omnicompletion (`:help compl-omni`) now uses JavaScript's dictionary to
-   complete words.
- - We now have a fancy version number.
diff --git a/bundle/coffee-script/Readme.md b/bundle/coffee-script/Readme.md
deleted file mode 100644
index d557848..0000000
--- a/bundle/coffee-script/Readme.md
+++ /dev/null
@@ -1,599 +0,0 @@
-This project adds [CoffeeScript] support to vim. It covers syntax, indenting,
-compiling, and more.
-
-![Screenshot](http://i.imgur.com/j1BhpZQ.png)
-
-[CoffeeScript]: http://coffeescript.org/
-
-## Table of Contents
-
-- Installation
-  - [Requirements](#requirements)
-  - [Install using Pathogen](#install-using-pathogen)
-  - [Install using Vundle](#install-using-vundle)
-  - [Install from a Zip File](#install-from-a-zip-file)
-- Coffee Commands
-  - [Compile to JavaScript](#compile-to-javascript)
-  - [Compile CoffeeScript Snippets](#coffeecompile-compile-coffeescript-snippets)
-  - [Live Preview Compiling](#coffeewatch-live-preview-compiling)
-  - [Run CoffeeScript Snippets](#coffeerun-run-coffeescript-snippets)
-  - [Lint your CoffeeScript](#coffeelint-lint-your-coffeescript)
-- Extras
-  - [Literate CoffeeScript](#literate-coffeescript)
-  - [CoffeeScript in HTML](#coffeescript-in-html)
-  - [CoffeeScript in Haml](#coffeescript-in-haml)
-- Configuration
-  - [Custom Autocmds](#custom-autocmds)
-  - [Configuration Variables](#configuration-variables)
-  - [Configure Syntax Highlighting](#configure-syntax-highlighting)
-  - [Tune Vim for CoffeeScript](#tune-vim-for-coffeescript)
-
-## Requirements
-
- - vim 7.4 or later
- - coffee 1.2.0 or later
-
-## Install using Pathogen
-
-This project uses rolling releases based on git commits, so pathogen is a
-natural fit for it. If you're already using pathogen, you can skip to step 4.
-
-1. Install [pathogen.vim] into `~/.vim/autoload/` (see [pathogen's
-   readme][install-pathogen] for more information.)
-
-[pathogen.vim]: http://www.vim.org/scripts/script.php?script_id=2332
-[install-pathogen]: https://github.com/tpope/vim-pathogen#installation
-
-2. Enable pathogen in your vimrc. Here's a bare-minimum vimrc that enables
-   all the features of `vim-coffee-script`:
-
-   ```vim
-   call pathogen#infect()
-   syntax enable
-   filetype plugin indent on
-   ```
-
-   If you already have a vimrc built up, just make sure it contains these calls,
-   in this order.
-
-3. Create the directory `~/.vim/bundle/`:
-
-        mkdir ~/.vim/bundle
-
-4. Clone the `vim-coffee-script` repo into `~/.vim/bundle/`:
-
-        git clone https://github.com/kchmck/vim-coffee-script.git ~/.vim/bundle/vim-coffee-script/
-
-Updating takes two steps:
-
-1. Change into `~/.vim/bundle/vim-coffee-script/`:
-
-        cd ~/.vim/bundle/vim-coffee-script
-
-2. Pull in the latest changes:
-
-        git pull
-
-## Install using Vundle
-
-1. [Install Vundle] into `~/.vim/bundle/`.
-
-[Install Vundle]: https://github.com/gmarik/vundle#quick-start
-
-2. Configure your vimrc for Vundle. Here's a bare-minimum vimrc that enables all
-   the features of `vim-coffee-script`:
-
-
-   ```vim
-   set nocompatible
-   filetype off
-
-   set rtp+=~/.vim/bundle/vundle/
-   call vundle#rc()
-
-   Bundle 'kchmck/vim-coffee-script'
-
-   syntax enable
-   filetype plugin indent on
-   ```
-
-   If you're adding Vundle to a built-up vimrc, just make sure all these calls
-   are in there and that they occur in this order.
-
-3. Open vim and run `:BundleInstall`.
-
-To update, open vim and run `:BundleInstall!` (notice the bang!)
-
-## Install from a Zip File
-
-1. Download the latest zip file from [vim.org][zip].
-
-2. Extract the archive into `~/.vim/`:
-
-        unzip -od ~/.vim/ ARCHIVE.zip
-
-   This should create the files `~/.vim/autoload/coffee.vim`,
-   `~/.vim/compiler/coffee.vim`, etc.
-
-You can update the plugin using the same steps.
-
-[zip]: http://www.vim.org/scripts/script.php?script_id=3590
-
-## Compile to JavaScript
-
-A `coffee` wrapper for use with `:make` is enabled automatically for coffee
-files if no other compiler is loaded. To enable it manually, run
-
-    :compiler coffee
-
-The `:make` command is then configured to use the `coffee` compiler and
-recognize its errors. I've included a quick reference here but be sure to check
-out [`:help :make`][make] for a full reference of the command.
-
-  ![make](http://i.imgur.com/scUXmxR.png)
-
-  ![make Result](http://i.imgur.com/eGIjEdn.png)
-
-[make]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:make_makeprg
-
-Consider the full signature of a `:make` call as
-
-    :[silent] make[!] [COFFEE-OPTIONS]...
-
-By default `:make` shows all compiler output and jumps to the first line
-reported as an error. Compiler output can be hidden with a leading `:silent`:
-
-    :silent make
-
-Line-jumping can be turned off by adding a bang:
-
-    :make!
-
-`COFFEE-OPTIONS` given to `:make` are passed along to `coffee` (see also
-[`coffee_make_options`](#coffee_make_options)):
-
-    :make --bare --output /some/dir
-
-See the [full table of options](http://coffeescript.org/#usage) for a
-list of all the options that `coffee` recognizes.
-
-*Configuration*: [`coffee_compiler`](#coffee_compiler),
-[`coffee_make_options`](#coffee_make_options)
-
-#### The quickfix window
-
-Compiler errors are added to the [quickfix] list by `:make`, but the quickfix
-window isn't automatically shown. The [`:cwindow`][cwindow] command will pop up
-the quickfix window if there are any errors:
-
-    :make
-    :cwindow
-
-This is usually the desired behavior, so you may want to add an autocmd to your
-vimrc to do this automatically:
-
-    autocmd QuickFixCmdPost * nested cwindow | redraw!
-
-The `redraw!` command is needed to fix a redrawing quirk in terminal vim, but
-can removed for gVim.
-
-[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
-[cwindow]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#:cwindow
-
-#### Recompile on write
-
-To recompile a file when it's written, add a `BufWritePost` autocmd to your
-vimrc:
-
-    autocmd BufWritePost *.coffee silent make!
-
-#### Cake and Cakefiles
-
-A `cake` compiler is also available with the call
-
-    :compiler cake
-
-You can then use `:make` as above to run your Cakefile and capture any `coffee`
-errors:
-
-    :silent make build
-
-It runs within the current directory, so make sure you're in the directory of
-your Cakefile before calling it.
-
-*Configuration*: [`coffee_cake`](#coffee_cake),
-[`coffee_cake_options`](#coffee_cake_options)
-
-## CoffeeCompile: Compile CoffeeScript Snippets
-
-CoffeeCompile shows how the current file or a snippet of CoffeeScript is
-compiled to JavaScript.
-
-    :[RANGE] CoffeeCompile [vert[ical]] [WINDOW-SIZE]
-
-Calling `:CoffeeCompile` without a range compiles the whole file:
-
-  ![CoffeeCompile](http://i.imgur.com/0zFG0l0.png)
-
-  ![CoffeeCompile Result](http://i.imgur.com/bpiAxaa.png)
-
-Calling it with a range, like in visual mode, compiles only the selected snippet
-of CoffeeScript:
-
-  ![CoffeeCompile Snippet](http://i.imgur.com/x3OT3Ay.png)
-
-  ![Compiled Snippet](http://i.imgur.com/J02j4T8.png)
-
-Each file gets its own CoffeeCompile buffer, and the same buffer is used for all
-future calls of `:CoffeeCompile` on that file. It can be quickly closed by
-hitting `q` in normal mode.
-
-Using `vert` opens the CoffeeCompile buffer vertically instead of horizontally
-(see also [`coffee_compile_vert`](#coffee_compile_vert)):
-
-    :CoffeeCompile vert
-
-By default the CoffeeCompile buffer splits the source buffer in half, but this
-can be overridden by passing in a `WINDOW-SIZE`:
-
-    :CoffeeCompile 4
-
-*Configuration*: [`coffee_compiler`](#coffee_compiler`),
-[`coffee_compile_vert`](#coffee_compile_vert)
-
-#### Quick syntax checking
-
-If compiling a snippet results in a compiler error, CoffeeCompile adds that
-error to the [quickfix] list.
-
-[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
-
-  ![Syntax Checking](http://i.imgur.com/RC8accF.png)
-
-  ![Syntax Checking Result](http://i.imgur.com/gi1ON75.png)
-
-You can use this to quickly check the syntax of a snippet.
-
-## CoffeeWatch: Live Preview Compiling
-
-CoffeeWatch emulates using the Try CoffeeScript preview box on the [CoffeeScript
-homepage][CoffeeScript].
-
-  ![CoffeeWatch](http://i.imgur.com/TRHdIMG.png)
-
-  ![CoffeeWatch Result](http://i.imgur.com/rJbOeeS.png)
-
-CoffeeWatch takes the same options as CoffeeCompile:
-
-    :CoffeeWatch [vert[ical]] [WINDOW-SIZE]
-
-After a source buffer is watched, leaving insert mode or saving the file fires
-off a recompile of the CoffeeScript:
-
-  ![Insert Mode](http://i.imgur.com/SBVcf4k.png)
-
-  ![Recompile](http://i.imgur.com/pbPMog7.png)
-
-You can force recompilation by calling `:CoffeeWatch`.
-
-To get synchronized scrolling of the source buffer and CoffeeWatch buffer, set
-[`'scrollbind'`](http://vimdoc.sourceforge.net/htmldoc/options.html#'scrollbind')
-on each:
-
-    :setl scrollbind
-
-*Configuration*: [`coffee_compiler`](#coffee_compiler),
-[`coffee_watch_vert`](#coffee_watch_vert)
-
-## CoffeeRun: Run CoffeeScript Snippets
-
-CoffeeRun compiles the current file or selected snippet and runs the resulting
-JavaScript.
-
-  ![CoffeeRun](http://i.imgur.com/YSkHUuQ.png)
-
-  ![CoffeeRun Output](http://i.imgur.com/wZQbggN.png)
-
-The command has two forms:
-
-    :CoffeeRun [PROGRAM-OPTIONS]...
-
-This form applies when no `RANGE` is given or when the given range is `1,$`
-(first line to last line). It allows passing `PROGRAM-OPTIONS` to your compiled
-program. The filename is passed directly to `coffee` so you must save the file
-for your changes to take effect.
-
-    :RANGE CoffeeRun [COFFEE-OPTIONS]...
-
-This form applies with all other ranges. It compiles and runs the lines within
-the given `RANGE` and any extra `COFFEE-OPTIONS` are passed to `coffee`.
-
-*Configuration*: [`coffee_compiler`](#coffee_compiler),
-[`coffee_run_vert`](#coffee_run_vert)
-
-## CoffeeLint: Lint your CoffeeScript
-
-CoffeeLint runs [coffeelint](http://www.coffeelint.org/) (version 0.5.7 or later
-required) on the current file and adds any issues to the [quickfix] list.
-
-  ![CoffeeLint](http://i.imgur.com/UN8Nr5N.png)
-
-  ![CoffeeLint Result](http://i.imgur.com/9hSIj3W.png)
-
-    :[RANGE] CoffeeLint[!] [COFFEELINT-OPTIONS]... [ | cwindow]
-
-If a `RANGE` is given, only those lines are piped to `coffeelint`. Options given
-in `COFFEELINT-OPTIONS` are passed to `coffeelint` (see also
-[`coffee_lint_options`](#coffee_lint_options)):
-
-    :CoffeeLint -f lint.json
-
-It behaves very similar to `:make`, described [above](#compile-to-javascript).
-
-    :CoffeeLint! | cwindow
-
-*Configuration*: [`coffee_linter`](#coffee_linter),
-[`coffee_lint_options`](#coffee_lint_options)
-
-## Literate CoffeeScript
-
-Literate CoffeeScript syntax and indent support is provided by
-[vim-literate-coffeescript]. The `Coffee` commands detect when they're running
-on a litcoffee file and pass the `--literate` flag to their respective tools,
-but at this time the commands are not automatically loaded when a litcoffee file
-is opened.
-
-[vim-literate-coffeescript]: https://github.com/mintplant/vim-literate-coffeescript
-
-To load them, run
-
-    runtime ftplugin/coffee.vim
-
-while inside a litcoffee buffer. To do this automatically, add
-
-    autocmd FileType litcoffee runtime ftplugin/coffee.vim
-
-to your vimrc.
-
-## CoffeeScript in HTML
-
-CoffeeScript is highlighted and indented within
-
-```html
-<script type="text/coffeescript">
-</script>
-```
-
-blocks in html files.
-
-## CoffeeScript in Haml
-
-CoffeeScript is highlighted within the `:coffeescript` filter in haml files:
-
-```haml
-:coffeescript
-  console.log "hullo"
-```
-
-At this time, coffee indenting doesn't work in these blocks.
-
-## Custom Autocmds
-
-You can [define commands][autocmd-explain] to be ran automatically on these
-custom events.
-
-In all cases, the name of the command running the event (`CoffeeCompile`,
-`CoffeeWatch`, or `CoffeeRun`) is matched by the [`{pat}`][autocmd] argument.
-You can match all commands with a `*` or only specific commands by separating
-them with a comma: `CoffeeCompile,CoffeeWatch`.
-
-[autocmd-explain]: http://vimdoc.sourceforge.net/htmldoc/usr_40.html#40.3
-[autocmd]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#:autocmd
-
-#### CoffeeBufNew
-
-CoffeeBufNew is ran when a new scratch buffer is created. It's called from the
-new buffer, so it can be used to do additional set up.
-
-```vim
-augroup CoffeeBufNew
-  autocmd User * set wrap
-augroup END
-```
-
-*Used By*: CoffeeCompile, CoffeeWatch, CoffeeRun
-
-#### CoffeeBufUpdate
-
-CoffeeBufUpdate is ran when a scratch buffer is updated with output from
-`coffee`. It's called from the scratch buffer, so it can be used to alter the
-compiled output.
-
-```vim
-" Switch back to the source buffer after updating.
-augroup CoffeeBufUpdate
-  autocmd User CoffeeCompile,CoffeeRun exec bufwinnr(b:coffee_src_buf) 'wincmd w'
-augroup END
-```
-
-For example, to strip off the "Generated by" comment on the first line, put this
-in your vimrc:
-
-```vim
-function! s:RemoveGeneratedBy()
-  " If there was an error compiling, there's no comment to remove.
-  if v:shell_error
-    return
-  endif
-
-  " Save cursor position.
-  let pos = getpos('.')
-
-  " Remove first line.
-  set modifiable
-  1 delete _
-  set nomodifiable
-
-  " Restore cursor position.
-  call setpos('.', pos)
-endfunction
-
-augroup CoffeeBufUpdate
-  autocmd User CoffeeCompile,CoffeeWatch call s:RemoveGeneratedBy()
-augroup END
-```
-
-*Used By*: CoffeeCompile, CoffeeWatch, CoffeeRun
-
-## Configuration Variables
-
-This is the full list of configuration variables available, with example
-settings and default values. Use these in your vimrc to control the default
-behavior.
-
-#### coffee\_indent\_keep\_current
-
-By default, the indent function matches the indent of the previous line if it
-doesn't find a reason to indent or outdent. To change this behavior so it
-instead keeps the [current indent of the cursor][98], use
-
-    let coffee_indent_keep_current = 1
-
-[98]: https://github.com/kchmck/vim-coffee-script/pull/98
-
-*Default*: `unlet coffee_indent_keep_current`
-
-Note that if you change this after a coffee file has been loaded, you'll have to
-reload the indent script for the change to take effect:
-
-    unlet b:did_indent | runtime indent/coffee.vim
-
-#### coffee\_compiler
-
-Path to the `coffee` executable used by the `Coffee` commands:
-
-    let coffee_compiler = '/usr/bin/coffee'
-
-*Default*: `'coffee'` (search `$PATH` for executable)
-
-#### coffee\_make\_options
-
-Options to pass to `coffee` with `:make`:
-
-    let coffee_make_options = '--bare'
-
-*Default*: `''` (nothing)
-
-Note that `coffee_make_options` is embedded into `'makeprg'`, so `:compiler
-coffee` must be ran after changing `coffee_make_options` for the changes to take
-effect.
-
-#### coffee\_cake
-
-Path to the `cake` executable:
-
-    let coffee_cake = '/opt/bin/cake'
-
-*Default*: `'cake'` (search `$PATH` for executable)
-
-#### coffee\_cake\_options
-
-Options to pass to `cake` with `:make`:
-
-    let coffee_cake_options = 'build'
-
-*Default*: `''` (nothing)
-
-#### coffee\_linter
-
-Path to the `coffeelint` executable:
-
-    let coffee_linter = '/opt/bin/coffeelint'
-
-*Default*: `'coffeelint'` (search `$PATH` for executable)
-
-#### coffee\_lint\_options
-
-Options to pass to `coffeelint`:
-
-    let coffee_lint_options = '-f lint.json'
-
-*Default*: `''` (nothing)
-
-#### coffee\_compile\_vert
-
-Open the CoffeeCompile buffer with a vertical split instead of a horizontal
-one:
-
-    let coffee_compile_vert = 1
-
-*Default*: `unlet coffee_compile_vert`
-
-#### coffee\_watch\_vert
-
-Open the CoffeeWatch buffer with a vertical split instead of a horizontal
-one:
-
-    let coffee_watch_vert = 1
-
-*Default*: `unlet coffee_watch_vert`
-
-#### coffee\_run\_vert
-
-Open the CoffeeRun buffer with a vertical split instead of a horizontal
-one:
-
-    let coffee_run_vert = 1
-
-*Default*: `unlet coffee_run_vert`
-
-## Configure Syntax Highlighting
-
-Add these lines to your vimrc to disable the relevant syntax group.
-
-#### Disable trailing whitespace error
-
-Trailing whitespace is highlighted as an error by default. This can be disabled
-with:
-
-    hi link coffeeSpaceError NONE
-
-#### Disable trailing semicolon error
-
-Trailing semicolons are considered an error (for help transitioning from
-JavaScript.) This can be disabled with:
-
-    hi link coffeeSemicolonError NONE
-
-#### Disable reserved words error
-
-Reserved words like `function` and `var` are highlighted as an error where
-they're not allowed in CoffeeScript. This can be disabled with:
-
-    hi link coffeeReservedError NONE
-
-## Tune Vim for CoffeeScript
-
-Changing these core settings can make vim more CoffeeScript friendly.
-
-#### Fold by indentation
-
-Folding by indentation works well for CoffeeScript functions and classes:
-
-  ![Folding](http://i.imgur.com/gDgUBdO.png)
-
-To fold by indentation in CoffeeScript files, add this line to your vimrc:
-
-    autocmd BufNewFile,BufReadPost *.coffee setl foldmethod=indent nofoldenable
-
-With this, folding is disabled by default but can be quickly toggled per-file
-by hitting `zi`. To enable folding by default, remove `nofoldenable`:
-
-    autocmd BufNewFile,BufReadPost *.coffee setl foldmethod=indent
-
-#### Two-space indentation
-
-To get standard two-space indentation in CoffeeScript files, add this line to
-your vimrc:
-
-    autocmd BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
diff --git a/bundle/coffee-script/Thanks.md b/bundle/coffee-script/Thanks.md
deleted file mode 100644
index 8ddcf23..0000000
--- a/bundle/coffee-script/Thanks.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Thanks to all bug reporters, and special thanks to those who have contributed
-code:
-
-    Brian Egan (brianegan):
-          Initial compiling support
-
-    Ches Martin (ches):
-          Initial vim docs
-
-    Chris Hoffman (cehoffman):
-          Add new keywoards from, to, and do
-          Highlight the - in negative integers
-          Add here regex highlighting, increase fold level for here docs
-
-    David Wilhelm (bigfish):
-          CoffeeRun command
-
-    Jay Adkisson (jayferd):
-          Support for eco templates
-
-    Karl Guertin (grayrest)
-          Cakefiles are coffeescript
-
-    Maciej Konieczny (narfdotpl):
-          Fix funny typo
-
-    Matt Sacks (mattsa):
-          Javascript omni-completion
-          coffee_compile_vert option
-
-    Nick Stenning (nickstenning):
-          Fold by indentation for coffeescript
-
-    Simon Lipp (sloonz):
-          Trailing spaces are not error on lines containing only spaces
-
-    Stéphan Kochen (stephank):
-          Initial HTML CoffeeScript highlighting
-
-    Sven Felix Oberquelle (Svelix):
-          Haml CoffeeScript highlighting
-
-    Wei Dai (clvv):
-          Fix the use of Vim built-in make command.
diff --git a/bundle/coffee-script/Todo.md b/bundle/coffee-script/Todo.md
deleted file mode 100644
index 3d4ffaa..0000000
--- a/bundle/coffee-script/Todo.md
+++ /dev/null
@@ -1 +0,0 @@
-- Don't highlight bad operator combinations
diff --git a/bundle/coffee-script/after/indent/html.vim b/bundle/coffee-script/after/indent/html.vim
deleted file mode 100644
index 10ca6ce..0000000
--- a/bundle/coffee-script/after/indent/html.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" Load the coffee and html indent functions.
-unlet b:did_indent
-runtime indent/coffee.vim
-let s:coffeeIndentExpr = &l:indentexpr
-
-" Load html last so it can overwrite coffee settings.
-unlet b:did_indent
-runtime indent/html.vim
-let s:htmlIndentExpr = &l:indentexpr
-
-" Inject our wrapper indent function.
-setlocal indentexpr=GetCoffeeHtmlIndent(v:lnum)
-
-function! GetCoffeeHtmlIndent(curlinenum)
-  " See if we're inside a coffeescript block.
-  let scriptlnum = searchpair('<script [^>]*type="text/coffeescript"[^>]*>', '',
-  \                           '</script>', 'bWn')
-  let prevlnum = prevnonblank(a:curlinenum)
-
-  " If we're in the script block and the previous line isn't the script tag
-  " itself, use coffee indenting.
-  if scriptlnum && scriptlnum != prevlnum
-    exec 'return ' s:coffeeIndentExpr
-  endif
-
-  " Otherwise use html indenting.
-  exec 'return ' s:htmlIndentExpr
-endfunction
diff --git a/bundle/coffee-script/after/syntax/haml.vim b/bundle/coffee-script/after/syntax/haml.vim
deleted file mode 100644
index 4c517eb..0000000
--- a/bundle/coffee-script/after/syntax/haml.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" Inherit coffee from html so coffeeComment isn't redefined and given higher
-" priority than hamlInterpolation.
-syn cluster hamlCoffeescript contains=@htmlCoffeeScript
-syn region  hamlCoffeescriptFilter matchgroup=hamlFilter
-\                                  start="^\z(\s*\):coffee\z(script\)\?\s*$"
-\                                  end="^\%(\z1 \| *$\)\@!"
-\                                  contains=@hamlCoffeeScript,hamlInterpolation
-\                                  keepend
diff --git a/bundle/coffee-script/after/syntax/html.vim b/bundle/coffee-script/after/syntax/html.vim
deleted file mode 100644
index 9e2eb3a..0000000
--- a/bundle/coffee-script/after/syntax/html.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" Syntax highlighting for text/coffeescript script tags
-syn include @htmlCoffeeScript syntax/coffee.vim
-syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
-\                       end=#</script>#me=s-1 keepend
-\                       contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
-\                       containedin=htmlHead
diff --git a/bundle/coffee-script/autoload/coffee.vim b/bundle/coffee-script/autoload/coffee.vim
deleted file mode 100644
index 04d5efb..0000000
--- a/bundle/coffee-script/autoload/coffee.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" Set up some common global/buffer variables.
-function! coffee#CoffeeSetUpVariables()
-  " Path to coffee executable
-  if !exists('g:coffee_compiler')
-    let g:coffee_compiler = 'coffee'
-  endif
-
-  " Options passed to coffee with make
-  if !exists('g:coffee_make_options')
-    let g:coffee_make_options = ''
-  endif
-
-  " Path to cake executable
-  if !exists('g:coffee_cake')
-    let g:coffee_cake = 'cake'
-  endif
-
-  " Extra options passed to cake
-  if !exists('g:coffee_cake_options')
-    let g:coffee_cake_options = ''
-  endif
-
-  " Path to coffeelint executable
-  if !exists('g:coffee_linter')
-    let g:coffee_linter = 'coffeelint'
-  endif
-
-  " Options passed to CoffeeLint
-  if !exists('g:coffee_lint_options')
-    let g:coffee_lint_options = ''
-  endif
-
-  " Pass the litcoffee flag to tools in this buffer if a litcoffee file is open.
-  " Let the variable be overwritten so it can be updated if a different filetype
-  " is set.
-  if &filetype == 'litcoffee'
-    let b:coffee_litcoffee = '--literate'
-  else
-    let b:coffee_litcoffee = ''
-  endif
-endfunction
-
-function! coffee#CoffeeSetUpErrorFormat()
-  CompilerSet errorformat=Error:\ In\ %f\\,\ %m\ on\ line\ %l,
-                         \Error:\ In\ %f\\,\ Parse\ error\ on\ line\ %l:\ %m,
-                         \SyntaxError:\ In\ %f\\,\ %m,
-                         \%f:%l:%c:\ error:\ %m,
-                         \%-G%.%#
-endfunction
diff --git a/bundle/coffee-script/compiler/cake.vim b/bundle/coffee-script/compiler/cake.vim
deleted file mode 100644
index 0a3c703..0000000
--- a/bundle/coffee-script/compiler/cake.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-if exists('current_compiler')
-  finish
-endif
-
-let current_compiler = 'cake'
-call coffee#CoffeeSetUpVariables()
-
-exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
-\                                    g:coffee_cake_options . ' $*', ' ')
-call coffee#CoffeeSetUpErrorFormat()
diff --git a/bundle/coffee-script/compiler/coffee.vim b/bundle/coffee-script/compiler/coffee.vim
deleted file mode 100644
index a70fa64..0000000
--- a/bundle/coffee-script/compiler/coffee.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" All this is needed to support compiling filenames with spaces, quotes, and
-" such. The filename is escaped and embedded into the `makeprg` setting.
-"
-" Because of this, `makeprg` must be updated on every file rename. And because
-" of that, `CompilerSet` can't be used because it doesn't exist when the
-" rename autocmd is ran. So, we have to do some checks to see whether `compiler`
-" was called locally or globally, and respect that in the rest of the script.
-
-if exists('current_compiler')
-  finish
-endif
-
-let current_compiler = 'coffee'
-call coffee#CoffeeSetUpVariables()
-
-" Pattern to check if coffee is the compiler
-let s:pat = '^' . current_compiler
-
-" Get a `makeprg` for the current filename.
-function! s:GetMakePrg()
-  return g:coffee_compiler .
-  \      ' -c' .
-  \      ' ' . b:coffee_litcoffee .
-  \      ' ' . g:coffee_make_options .
-  \      ' $*' .
-  \      ' ' . fnameescape(expand('%'))
-endfunction
-
-" Set `makeprg` and return 1 if coffee is still the compiler, else return 0.
-function! s:SetMakePrg()
-  if &l:makeprg =~ s:pat
-    let &l:makeprg = s:GetMakePrg()
-  elseif &g:makeprg =~ s:pat
-    let &g:makeprg = s:GetMakePrg()
-  else
-    return 0
-  endif
-
-  return 1
-endfunction
-
-" Set a dummy compiler so we can check whether to set locally or globally.
-exec 'CompilerSet makeprg=' . current_compiler
-" Then actually set the compiler.
-call s:SetMakePrg()
-call coffee#CoffeeSetUpErrorFormat()
-
-function! s:CoffeeMakeDeprecated(bang, args)
-  echoerr 'CoffeeMake is deprecated! Please use :make instead, its behavior ' .
-  \       'is identical.'
-  sleep 5
-  exec 'make' . a:bang a:args
-endfunction
-
-" Compile the current file.
-command! -bang -bar -nargs=* CoffeeMake
-\        call s:CoffeeMakeDeprecated(<q-bang>, <q-args>)
-
-" Set `makeprg` on rename since we embed the filename in the setting.
-augroup CoffeeUpdateMakePrg
-  autocmd!
-
-  " Update `makeprg` if coffee is still the compiler, else stop running this
-  " function.
-  function! s:UpdateMakePrg()
-    if !s:SetMakePrg()
-      autocmd! CoffeeUpdateMakePrg
-    endif
-  endfunction
-
-  " Set autocmd locally if compiler was set locally.
-  if &l:makeprg =~ s:pat
-    autocmd BufFilePost,BufWritePost <buffer> call s:UpdateMakePrg()
-  else
-    autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
-  endif
-augroup END
diff --git a/bundle/coffee-script/doc/coffee-script.txt b/bundle/coffee-script/doc/coffee-script.txt
deleted file mode 100644
index 1b43cf3..0000000
--- a/bundle/coffee-script/doc/coffee-script.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Please see the project readme for up-to-date docs:
-https://github.com/kchmck/vim-coffee-script
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/bundle/coffee-script/ftdetect/coffee.vim b/bundle/coffee-script/ftdetect/coffee.vim
deleted file mode 100644
index 5056929..0000000
--- a/bundle/coffee-script/ftdetect/coffee.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-autocmd BufNewFile,BufRead *.coffee set filetype=coffee
-autocmd BufNewFile,BufRead *Cakefile set filetype=coffee
-autocmd BufNewFile,BufRead *.coffeekup,*.ck set filetype=coffee
-autocmd BufNewFile,BufRead *._coffee set filetype=coffee
-
-function! s:DetectCoffee()
-    if getline(1) =~ '^#!.*\<coffee\>'
-        set filetype=coffee
-    endif
-endfunction
-
-autocmd BufNewFile,BufRead * call s:DetectCoffee()
diff --git a/bundle/coffee-script/ftplugin/coffee.vim b/bundle/coffee-script/ftplugin/coffee.vim
deleted file mode 100644
index c44fe97..0000000
--- a/bundle/coffee-script/ftplugin/coffee.vim
+++ /dev/null
@@ -1,404 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-if exists('b:did_ftplugin')
-  finish
-endif
-
-let b:did_ftplugin = 1
-call coffee#CoffeeSetUpVariables()
-
-setlocal formatoptions-=t formatoptions+=croql
-setlocal comments=:# commentstring=#\ %s
-setlocal omnifunc=javascriptcomplete#CompleteJS
-
-" Create custom augroups.
-augroup CoffeeBufUpdate | augroup END
-augroup CoffeeBufNew | augroup END
-
-" Enable coffee compiler if a compiler isn't set already.
-if !len(&l:makeprg)
-  compiler coffee
-endif
-
-" Switch to the window for buf.
-function! s:SwitchWindow(buf)
-  exec bufwinnr(a:buf) 'wincmd w'
-endfunction
-
-" Create a new scratch buffer and return the bufnr of it. After the function
-" returns, vim remains in the scratch buffer so more set up can be done.
-function! s:ScratchBufBuild(src, vert, size)
-  if a:size <= 0
-    if a:vert
-      let size = winwidth(bufwinnr(a:src)) / 2
-    else
-      let size = winheight(bufwinnr(a:src)) / 2
-    endif
-  endif
-
-  if a:vert
-    vertical belowright new
-    exec 'vertical resize' size
-  else
-    belowright new
-    exec 'resize' size
-  endif
-
-  setlocal bufhidden=wipe buftype=nofile nobuflisted noswapfile nomodifiable
-  nnoremap <buffer> <silent> q :hide<CR>
-
-  return bufnr('%')
-endfunction
-
-" Replace buffer contents with text and delete the last empty line.
-function! s:ScratchBufUpdate(buf, text)
-  " Move to the scratch buffer.
-  call s:SwitchWindow(a:buf)
-
-  " Double check we're in the scratch buffer before overwriting.
-  if bufnr('%') != a:buf
-    throw 'unable to change to scratch buffer'
-  endif
-
-  setlocal modifiable
-    silent exec '% delete _'
-    silent put! =a:text
-    silent exec '$ delete _'
-  setlocal nomodifiable
-endfunction
-
-" Parse the output of coffee into a qflist entry for src buffer.
-function! s:ParseCoffeeError(output, src, startline)
-  " Coffee error is always on first line?
-  let match = matchlist(a:output,
-  \                     '^\(\f\+\|\[stdin\]\):\(\d\):\(\d\): error: \(.\{-}\)' . "\n")
-
-  if !len(match)
-    return
-  endif
-
-  " Consider the line number from coffee as relative and add it to the beginning
-  " line number of the range the command was called on, then subtract one for
-  " zero-based relativity.
-  call setqflist([{'bufnr': a:src, 'lnum': a:startline + str2nr(match[2]) - 1,
-  \                'type': 'E', 'col': str2nr(match[3]), 'text': match[4]}], 'r')
-endfunction
-
-" Reset source buffer variables.
-function! s:CoffeeCompileResetVars()
-  " Variables defined in source buffer:
-  "   b:coffee_compile_buf: bufnr of output buffer
-  " Variables defined in output buffer:
-  "   b:coffee_src_buf: bufnr of source buffer
-  "   b:coffee_compile_pos: previous cursor position in output buffer
-
-  let b:coffee_compile_buf = -1
-endfunction
-
-function! s:CoffeeWatchResetVars()
-  " Variables defined in source buffer:
-  "   b:coffee_watch_buf: bufnr of output buffer
-  " Variables defined in output buffer:
-  "   b:coffee_src_buf: bufnr of source buffer
-  "   b:coffee_watch_pos: previous cursor position in output buffer
-
-  let b:coffee_watch_buf = -1
-endfunction
-
-function! s:CoffeeRunResetVars()
-  " Variables defined in CoffeeRun source buffer:
-  "   b:coffee_run_buf: bufnr of output buffer
-  " Variables defined in CoffeeRun output buffer:
-  "   b:coffee_src_buf: bufnr of source buffer
-  "   b:coffee_run_pos: previous cursor position in output buffer
-
-  let b:coffee_run_buf = -1
-endfunction
-
-" Clean things up in the source buffers.
-function! s:CoffeeCompileClose()
-  " Switch to the source buffer if not already in it.
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-  call s:CoffeeCompileResetVars()
-endfunction
-
-function! s:CoffeeWatchClose()
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-  silent! autocmd! CoffeeAuWatch * <buffer>
-  call s:CoffeeWatchResetVars()
-endfunction
-
-function! s:CoffeeRunClose()
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-  call s:CoffeeRunResetVars()
-endfunction
-
-" Compile the lines between startline and endline and put the result into buf.
-function! s:CoffeeCompileToBuf(buf, startline, endline)
-  let src = bufnr('%')
-  let input = join(getline(a:startline, a:endline), "\n")
-
-  " Coffee doesn't like empty input.
-  if !len(input)
-    " Function should still return within output buffer.
-    call s:SwitchWindow(a:buf)
-    return
-  endif
-
-  " Pipe lines into coffee.
-  let output = system(g:coffee_compiler .
-  \                   ' -scb' .
-  \                   ' ' . b:coffee_litcoffee .
-  \                   ' 2>&1', input)
-
-  " Paste output into output buffer.
-  call s:ScratchBufUpdate(a:buf, output)
-
-  " Highlight as JavaScript if there were no compile errors.
-  if v:shell_error
-    call s:ParseCoffeeError(output, src, a:startline)
-    setlocal filetype=
-  else
-    " Clear the quickfix list.
-    call setqflist([], 'r')
-    setlocal filetype=javascript
-  endif
-endfunction
-
-" Peek at compiled CoffeeScript in a scratch buffer. We handle ranges like this
-" to prevent the cursor from being moved (and its position saved) before the
-" function is called.
-function! s:CoffeeCompile(startline, endline, args)
-  if a:args =~ '\<watch\>'
-    echoerr 'CoffeeCompile watch is deprecated! Please use CoffeeWatch instead'
-    sleep 5
-    call s:CoffeeWatch(a:args)
-    return
-  endif
-
-  " Switch to the source buffer if not already in it.
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-
-  " Bail if not in source buffer.
-  if !exists('b:coffee_compile_buf')
-    return
-  endif
-
-  " Build the output buffer if it doesn't exist.
-  if bufwinnr(b:coffee_compile_buf) == -1
-    let src = bufnr('%')
-
-    let vert = exists('g:coffee_compile_vert') || a:args =~ '\<vert\%[ical]\>'
-    let size = str2nr(matchstr(a:args, '\<\d\+\>'))
-
-    " Build the output buffer and save the source bufnr.
-    let buf = s:ScratchBufBuild(src, vert, size)
-    let b:coffee_src_buf = src
-
-    " Set the buffer name.
-    exec 'silent! file [CoffeeCompile ' . src . ']'
-
-    " Clean up the source buffer when the output buffer is closed.
-    autocmd BufWipeout <buffer> call s:CoffeeCompileClose()
-    " Save the cursor when leaving the output buffer.
-    autocmd BufLeave <buffer> let b:coffee_compile_pos = getpos('.')
-
-    " Run user-defined commands on new buffer.
-    silent doautocmd CoffeeBufNew User CoffeeCompile
-
-    " Switch back to the source buffer and save the output bufnr. This also
-    " triggers BufLeave above.
-    call s:SwitchWindow(src)
-    let b:coffee_compile_buf = buf
-  endif
-
-  " Fill the scratch buffer.
-  call s:CoffeeCompileToBuf(b:coffee_compile_buf, a:startline, a:endline)
-  " Reset cursor to previous position.
-  call setpos('.', b:coffee_compile_pos)
-
-  " Run any user-defined commands on the scratch buffer.
-  silent doautocmd CoffeeBufUpdate User CoffeeCompile
-endfunction
-
-" Update the scratch buffer and switch back to the source buffer.
-function! s:CoffeeWatchUpdate()
-  call s:CoffeeCompileToBuf(b:coffee_watch_buf, 1, '$')
-  call setpos('.', b:coffee_watch_pos)
-  silent doautocmd CoffeeBufUpdate User CoffeeWatch
-  call s:SwitchWindow(b:coffee_src_buf)
-endfunction
-
-" Continually compile a source buffer.
-function! s:CoffeeWatch(args)
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-
-  if !exists('b:coffee_watch_buf')
-    return
-  endif
-
-  if bufwinnr(b:coffee_watch_buf) == -1
-    let src = bufnr('%')
-
-    let vert = exists('g:coffee_watch_vert') || a:args =~ '\<vert\%[ical]\>'
-    let size = str2nr(matchstr(a:args, '\<\d\+\>'))
-
-    let buf = s:ScratchBufBuild(src, vert, size)
-    let b:coffee_src_buf = src
-
-    exec 'silent! file [CoffeeWatch ' . src . ']'
-
-    autocmd BufWipeout <buffer> call s:CoffeeWatchClose()
-    autocmd BufLeave <buffer> let b:coffee_watch_pos = getpos('.')
-
-    silent doautocmd CoffeeBufNew User CoffeeWatch
-
-    call s:SwitchWindow(src)
-    let b:coffee_watch_buf = buf
-  endif
-
-  " Make sure only one watch autocmd is defined on this buffer.
-  silent! autocmd! CoffeeAuWatch * <buffer>
-
-  augroup CoffeeAuWatch
-    autocmd InsertLeave <buffer> call s:CoffeeWatchUpdate()
-    autocmd BufWritePost <buffer> call s:CoffeeWatchUpdate()
-  augroup END
-
-  call s:CoffeeWatchUpdate()
-endfunction
-
-" Run a snippet of CoffeeScript between startline and endline.
-function! s:CoffeeRun(startline, endline, args)
-  silent! call s:SwitchWindow(b:coffee_src_buf)
-
-  if !exists('b:coffee_run_buf')
-    return
-  endif
-
-  if bufwinnr(b:coffee_run_buf) == -1
-    let src = bufnr('%')
-
-    let buf = s:ScratchBufBuild(src, exists('g:coffee_run_vert'), 0)
-    let b:coffee_src_buf = src
-
-    exec 'silent! file [CoffeeRun ' . src . ']'
-
-    autocmd BufWipeout <buffer> call s:CoffeeRunClose()
-    autocmd BufLeave <buffer> let b:coffee_run_pos = getpos('.')
-
-    silent doautocmd CoffeeBufNew User CoffeeRun
-
-    call s:SwitchWindow(src)
-    let b:coffee_run_buf = buf
-  endif
-
-  if a:startline == 1 && a:endline == line('$')
-    let output = system(g:coffee_compiler .
-    \                   ' ' . b:coffee_litcoffee .
-    \                   ' ' . fnameescape(expand('%')) .
-    \                   ' ' . a:args)
-  else
-    let input = join(getline(a:startline, a:endline), "\n")
-
-    if !len(input)
-      return
-    endif
-
-    let output = system(g:coffee_compiler .
-    \                   ' -s' .
-    \                   ' ' . b:coffee_litcoffee .
-    \                   ' ' . a:args, input)
-  endif
-
-  call s:ScratchBufUpdate(b:coffee_run_buf, output)
-  call setpos('.', b:coffee_run_pos)
-
-  silent doautocmd CoffeeBufUpdate User CoffeeRun
-endfunction
-
-" Run coffeelint on a file, and add any errors between startline and endline
-" to the quickfix list.
-function! s:CoffeeLint(startline, endline, bang, args)
-  let input = join(getline(a:startline, a:endline), "\n")
-
-  if !len(input)
-    return
-  endif
-
-  let output = system(g:coffee_linter .
-  \                   ' -s --csv' .
-  \                   ' ' . b:coffee_litcoffee .
-  \                   ' ' . g:coffee_lint_options .
-  \                   ' ' . a:args .
-  \                   ' 2>&1', input)
-
-  " Convert output into an array and strip off the csv header.
-  let lines = split(output, "\n")[1:]
-  let buf = bufnr('%')
-  let qflist = []
-
-  for line in lines
-    let match = matchlist(line, '^stdin,\(\d\+\),\d*,\(error\|warn\),\(.\+\)$')
-
-    " Ignore unmatched lines.
-    if !len(match)
-      continue
-    endif
-
-    " The 'type' will result in either 'E' or 'W'.
-    call add(qflist, {'bufnr': buf, 'lnum': a:startline + str2nr(match[1]) - 1,
-    \                 'type': toupper(match[2][0]), 'text': match[3]})
-  endfor
-
-  " Replace the quicklist with our items.
-  call setqflist(qflist, 'r')
-
-  " If not given a bang, jump to first error.
-  if !len(a:bang)
-    silent! cc 1
-  endif
-endfunction
-
-" Complete arguments for Coffee* commands.
-function! s:CoffeeComplete(cmd, cmdline, cursor)
-  let args = ['vertical']
-
-  " If no partial command, return all possibilities.
-  if !len(a:cmd)
-    return args
-  endif
-
-  let pat = '^' . a:cmd
-
-  for arg in args
-    if arg =~ pat
-      return [arg]
-    endif
-  endfor
-endfunction
-
-" Set initial state variables if they don't exist
-if !exists('b:coffee_compile_buf')
-  call s:CoffeeCompileResetVars()
-endif
-
-if !exists('b:coffee_watch_buf')
-  call s:CoffeeWatchResetVars()
-endif
-
-if !exists('b:coffee_run_buf')
-  call s:CoffeeRunResetVars()
-endif
-
-command! -range=% -bar -nargs=* -complete=customlist,s:CoffeeComplete
-\        CoffeeCompile call s:CoffeeCompile(<line1>, <line2>, <q-args>)
-command! -bar -nargs=* -complete=customlist,s:CoffeeComplete
-\        CoffeeWatch call s:CoffeeWatch(<q-args>)
-command! -range=% -bar -nargs=* CoffeeRun
-\        call s:CoffeeRun(<line1>, <line2>, <q-args>)
-command! -range=% -bang -bar -nargs=* CoffeeLint
-\        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
diff --git a/bundle/coffee-script/indent/coffee.vim b/bundle/coffee-script/indent/coffee.vim
deleted file mode 100644
index 7bd82e3..0000000
--- a/bundle/coffee-script/indent/coffee.vim
+++ /dev/null
@@ -1,428 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-if exists('b:did_indent')
-  finish
-endif
-
-let b:did_indent = 1
-
-setlocal autoindent
-setlocal indentexpr=GetCoffeeIndent(v:lnum)
-" Make sure GetCoffeeIndent is run when these are typed so they can be
-" indented or outdented.
-setlocal indentkeys+=0],0),0.,=else,=when,=catch,=finally
-
-" If no indenting or outdenting is needed, either keep the indent of the cursor
-" (use autoindent) or match the indent of the previous line.
-if exists('g:coffee_indent_keep_current')
-  let s:DEFAULT_LEVEL = '-1'
-else
-  let s:DEFAULT_LEVEL = 'indent(prevnlnum)'
-endif
-
-" Only define the function once.
-if exists('*GetCoffeeIndent')
-  finish
-endif
-
-" Keywords that begin a block
-let s:BEGIN_BLOCK_KEYWORD = '\C^\%(if\|unless\|else\|for\|while\|until\|'
-\                         . 'loop\|switch\|when\|try\|catch\|finally\|'
-\                         . 'class\)\>\%(\s*:\)\@!'
-
-" An expression that uses the result of a statement
-let s:COMPOUND_EXPRESSION = '\C\%([^-]-\|[^+]+\|[^/]/\|[:=*%&|^<>]\)\s*'
-\                         . '\%(if\|unless\|for\|while\|until\|loop\|switch\|'
-\                         . 'try\|class\)\>'
-
-" Combine the two above
-let s:BEGIN_BLOCK = s:BEGIN_BLOCK_KEYWORD . '\|' . s:COMPOUND_EXPRESSION
-
-" Operators that begin a block but also count as a continuation
-let s:BEGIN_BLOCK_OP = '[([{:=]$'
-
-" Begins a function block
-let s:FUNCTION = '[-=]>$'
-
-" Operators that continue a line onto the next line
-let s:CONTINUATION_OP = '\C\%(\<\%(is\|isnt\|and\|or\)\>\|'
-\                     . '[^-]-\|[^+]+\|[^-=]>\|[^.]\.\|[<*/%&|^,]\)$'
-
-" Ancestor operators that prevent continuation indenting
-let s:CONTINUATION = s:CONTINUATION_OP . '\|' . s:BEGIN_BLOCK_OP
-
-" A closing bracket by itself on a line followed by a continuation
-let s:BRACKET_CONTINUATION = '^\s*[}\])]\s*' . s:CONTINUATION_OP
-
-" A continuation dot access
-let s:DOT_ACCESS = '^\.'
-
-" Keywords that break out of a block
-let s:BREAK_BLOCK_OP = '\C^\%(return\|break\|continue\|throw\)\>'
-
-" A condition attached to the end of a statement
-let s:POSTFIX_CONDITION = '\C\S\s\+\zs\<\%(if\|unless\|when\|while\|until\)\>'
-
-" A then contained in brackets
-let s:CONTAINED_THEN = '\C[(\[].\{-}\<then\>.\{-\}[)\]]'
-
-" An else with a condition attached
-let s:ELSE_COND = '\C^\s*else\s\+\<\%(if\|unless\)\>'
-
-" A single-line else statement (without a condition attached)
-let s:SINGLE_LINE_ELSE = '\C^else\s\+\%(\<\%(if\|unless\)\>\)\@!'
-
-" Pairs of starting and ending keywords, with an initial pattern to match
-let s:KEYWORD_PAIRS = [
-\  ['\C^else\>', '\C\<\%(if\|unless\|when\|else\s\+\%(if\|unless\)\)\>',
-\   '\C\<else\>'],
-\  ['\C^catch\>', '\C\<try\>', '\C\<catch\>'],
-\  ['\C^finally\>', '\C\<try\>', '\C\<finally\>']
-\]
-
-" Pairs of starting and ending brackets
-let s:BRACKET_PAIRS = {']': '\[', '}': '{', ')': '('}
-
-" Max lines to look back for a match
-let s:MAX_LOOKBACK = 50
-
-" Syntax names for strings
-let s:SYNTAX_STRING = 'coffee\%(String\|AssignString\|Embed\|Regex\|Heregex\|'
-\                   . 'Heredoc\)'
-
-" Syntax names for comments
-let s:SYNTAX_COMMENT = 'coffee\%(Comment\|BlockComment\|HeregexComment\)'
-
-" Syntax names for strings and comments
-let s:SYNTAX_STRING_COMMENT = s:SYNTAX_STRING . '\|' . s:SYNTAX_COMMENT
-
-" Compatibility code for shiftwidth() as recommended by the docs, but modified
-" so there isn't as much of a penalty if shiftwidth() exists.
-if exists('*shiftwidth')
-  let s:ShiftWidth = function('shiftwidth')
-else
-  function! s:ShiftWidth()
-    return &shiftwidth
-  endfunction
-endif
-
-" Get the linked syntax name of a character.
-function! s:SyntaxName(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name')
-endfunction
-
-" Check if a character is in a comment.
-function! s:IsComment(lnum, col)
-  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_COMMENT
-endfunction
-
-" Check if a character is in a string.
-function! s:IsString(lnum, col)
-  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_STRING
-endfunction
-
-" Check if a character is in a comment or string.
-function! s:IsCommentOrString(lnum, col)
-  return s:SyntaxName(a:lnum, a:col) =~ s:SYNTAX_STRING_COMMENT
-endfunction
-
-" Search a line for a regex until one is found outside a string or comment.
-function! s:SearchCode(lnum, regex)
-  " Start at the first column and look for an initial match (including at the
-  " cursor.)
-  call cursor(a:lnum, 1)
-  let pos = search(a:regex, 'c', a:lnum)
-
-  while pos
-    if !s:IsCommentOrString(a:lnum, col('.'))
-      return 1
-    endif
-
-    " Move to the match and continue searching (don't accept matches at the
-    " cursor.)
-    let pos = search(a:regex, '', a:lnum)
-  endwhile
-
-  return 0
-endfunction
-
-" Search for the nearest previous line that isn't a comment.
-function! s:GetPrevNormalLine(startlnum)
-  let curlnum = a:startlnum
-
-  while curlnum
-    let curlnum = prevnonblank(curlnum - 1)
-
-    " Return the line if the first non-whitespace character isn't a comment.
-    if !s:IsComment(curlnum, indent(curlnum) + 1)
-      return curlnum
-    endif
-  endwhile
-
-  return 0
-endfunction
-
-function! s:SearchPair(startlnum, lookback, skip, open, close)
-  " Go to the first column so a:close will be matched even if it's at the
-  " beginning of the line.
-  call cursor(a:startlnum, 1)
-  return searchpair(a:open, '', a:close, 'bnW', a:skip, max([1, a:lookback]))
-endfunction
-
-" Skip if a match
-"  - is in a string or comment
-"  - is a single-line statement that isn't immediately
-"    adjacent
-"  - has a postfix condition and isn't an else statement or compound
-"    expression
-function! s:ShouldSkip(startlnum, lnum, col)
-  return s:IsCommentOrString(a:lnum, a:col) ||
-  \      s:SearchCode(a:lnum, '\C\<then\>') && a:startlnum - a:lnum > 1 ||
-  \      s:SearchCode(a:lnum, s:POSTFIX_CONDITION) &&
-  \      getline(a:lnum) !~ s:ELSE_COND &&
-  \     !s:SearchCode(a:lnum, s:COMPOUND_EXPRESSION)
-endfunction
-
-" Search for the nearest and farthest match for a keyword pair.
-function! s:SearchMatchingKeyword(startlnum, open, close)
-  let skip = 's:ShouldSkip(' . a:startlnum . ", line('.'), line('.'))"
-
-  " Search for the nearest match.
-  let nearestlnum = s:SearchPair(a:startlnum, a:startlnum - s:MAX_LOOKBACK,
-  \                              skip, a:open, a:close)
-
-  if !nearestlnum
-    return []
-  endif
-
-  " Find the nearest previous line with indent less than or equal to startlnum.
-  let ind = indent(a:startlnum)
-  let lookback = s:GetPrevNormalLine(a:startlnum)
-
-  while lookback && indent(lookback) > ind
-    let lookback = s:GetPrevNormalLine(lookback)
-  endwhile
-
-  " Search for the farthest match. If there are no other matches, then the
-  " nearest match is also the farthest one.
-  let matchlnum = nearestlnum
-
-  while matchlnum
-    let lnum = matchlnum
-    let matchlnum = s:SearchPair(matchlnum, lookback, skip, a:open, a:close)
-  endwhile
-
-  return [nearestlnum, lnum]
-endfunction
-
-" Strip a line of a trailing comment and surrounding whitespace.
-function! s:GetTrimmedLine(lnum)
-  " Try to find a comment starting at the first column.
-  call cursor(a:lnum, 1)
-  let pos = search('#', 'c', a:lnum)
-
-  " Keep searching until a comment is found or search returns 0.
-  while pos
-    if s:IsComment(a:lnum, col('.'))
-      break
-    endif
-
-    let pos = search('#', '', a:lnum)
-  endwhile
-
-  if !pos
-    " No comment was found so use the whole line.
-    let line = getline(a:lnum)
-  else
-    " Subtract 1 to get to the column before the comment and another 1 for
-    " column indexing -> zero-based indexing.
-    let line = getline(a:lnum)[:col('.') - 2]
-  endif
-
-  return substitute(substitute(line, '^\s\+', '', ''),
-  \                                  '\s\+$', '', '')
-endfunction
-
-" Get the indent policy when no special rules are used.
-function! s:GetDefaultPolicy(curlnum)
-  " Check whether equalprg is being ran on existing lines.
-  if strlen(getline(a:curlnum)) == indent(a:curlnum)
-    " If not indenting an existing line, use the default policy.
-    return s:DEFAULT_LEVEL
-  else
-    " Otherwise let autoindent determine what to do with an existing line.
-    return '-1'
-  endif
-endfunction
-
-function! GetCoffeeIndent(curlnum)
-  " Get the previous non-blank line (may be a comment.)
-  let prevlnum = prevnonblank(a:curlnum - 1)
-
-  " Bail if there's no code before.
-  if !prevlnum
-    return -1
-  endif
-
-  " Bail if inside a multiline string.
-  if s:IsString(a:curlnum, 1)
-    let prevnlnum = prevlnum
-    exec 'return' s:GetDefaultPolicy(a:curlnum)
-  endif
-
-  " Get the code part of the current line.
-  let curline = s:GetTrimmedLine(a:curlnum)
-  " Get the previous non-comment line.
-  let prevnlnum = s:GetPrevNormalLine(a:curlnum)
-
-  " Check if the current line is the closing bracket in a bracket pair.
-  if has_key(s:BRACKET_PAIRS, curline[0])
-    " Search for a matching opening bracket.
-    let matchlnum = s:SearchPair(a:curlnum, a:curlnum - s:MAX_LOOKBACK,
-    \                            "s:IsCommentOrString(line('.'), col('.'))",
-    \                            s:BRACKET_PAIRS[curline[0]], curline[0])
-
-    if matchlnum
-      " Match the indent of the opening bracket.
-      return indent(matchlnum)
-    else
-      " No opening bracket found (bad syntax), so bail.
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-  endif
-
-  " Check if the current line is the closing keyword in a keyword pair.
-  for pair in s:KEYWORD_PAIRS
-    if curline =~ pair[0]
-      " Find the nearest and farthest matches within the same indent level.
-      let matches = s:SearchMatchingKeyword(a:curlnum, pair[1], pair[2])
-
-      if len(matches)
-        " Don't force indenting/outdenting as long as line is already lined up
-        " with a valid match
-        return max([min([indent(a:curlnum), indent(matches[0])]),
-        \           indent(matches[1])])
-      else
-        " No starting keyword found (bad syntax), so bail.
-        exec 'return' s:GetDefaultPolicy(a:curlnum)
-      endif
-    endif
-  endfor
-
-  " Check if the current line is a `when` and not the first in a switch block.
-  if curline =~ '\C^when\>' && !s:SearchCode(prevnlnum, '\C\<switch\>')
-    " Look back for a `when`.
-    while prevnlnum
-      if getline(prevnlnum) =~ '\C^\s*when\>'
-        " Indent to match the found `when`, but don't force indenting (for when
-        " indenting nested switch blocks.)
-        return min([indent(a:curlnum), indent(prevnlnum)])
-      endif
-
-      let prevnlnum = s:GetPrevNormalLine(prevnlnum)
-    endwhile
-
-    " No matching `when` found (bad syntax), so bail.
-    exec 'return' s:GetDefaultPolicy(a:curlnum)
-  endif
-
-  " If the previous line is a comment, use its indentation, but don't force
-  " indenting.
-  if prevlnum != prevnlnum
-    return min([indent(a:curlnum), indent(prevlnum)])
-  endif
-
-  let prevline = s:GetTrimmedLine(prevnlnum)
-
-  " Always indent after these operators.
-  if prevline =~ s:BEGIN_BLOCK_OP
-    return indent(prevnlnum) + s:ShiftWidth()
-  endif
-
-  " Indent if the previous line starts a function block, but don't force
-  " indenting if the line is non-blank (for empty function bodies.)
-  if prevline =~ s:FUNCTION
-    if strlen(getline(a:curlnum)) > indent(a:curlnum)
-      return min([indent(prevnlnum) + s:ShiftWidth(), indent(a:curlnum)])
-    else
-      return indent(prevnlnum) + s:ShiftWidth()
-    endif
-  endif
-
-  " Check if continuation indenting is needed. If the line ends in a slash, make
-  " sure it isn't a regex.
-  if prevline =~ s:CONTINUATION_OP &&
-  \  !(prevline =~ '/$' && s:IsString(prevnlnum, col([prevnlnum, '$']) - 1))
-    " Don't indent if the continuation follows a closing bracket.
-    if prevline =~ s:BRACKET_CONTINUATION
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-
-    let prevprevnlnum = s:GetPrevNormalLine(prevnlnum)
-
-    " Don't indent if not the first continuation.
-    if prevprevnlnum && s:GetTrimmedLine(prevprevnlnum) =~ s:CONTINUATION
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-
-    " Continuation indenting seems to vary between programmers, so if the line
-    " is non-blank, don't override the indentation
-    if strlen(getline(a:curlnum)) > indent(a:curlnum)
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-
-    " Otherwise indent a level.
-    return indent(prevnlnum) + s:ShiftWidth()
-  endif
-
-  " Check if the previous line starts with a keyword that begins a block.
-  if prevline =~ s:BEGIN_BLOCK
-    " Indent if the current line doesn't start with `then` and the previous line
-    " isn't a single-line statement.
-    if curline !~ '\C^\<then\>' && !s:SearchCode(prevnlnum, '\C\<then\>') &&
-    \  prevline !~ s:SINGLE_LINE_ELSE
-      return indent(prevnlnum) + s:ShiftWidth()
-    else
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-  endif
-
-  " Indent a dot access if it's the first.
-  if curline =~ s:DOT_ACCESS
-    if prevline !~ s:DOT_ACCESS
-      return indent(prevnlnum) + s:ShiftWidth()
-    else
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-  endif
-
-  " Outdent if a keyword breaks out of a block as long as it doesn't have a
-  " postfix condition (and the postfix condition isn't a single-line statement.)
-  if prevline =~ s:BREAK_BLOCK_OP
-    if !s:SearchCode(prevnlnum, s:POSTFIX_CONDITION) ||
-    \   s:SearchCode(prevnlnum, '\C\<then\>') &&
-    \  !s:SearchCode(prevnlnum, s:CONTAINED_THEN)
-      " Don't force indenting.
-      return min([indent(a:curlnum), indent(prevnlnum) - s:ShiftWidth()])
-    else
-      exec 'return' s:GetDefaultPolicy(a:curlnum)
-    endif
-  endif
-
-  " Check if inside brackets.
-  let matchlnum = s:SearchPair(a:curlnum, a:curlnum - s:MAX_LOOKBACK,
-  \                            "s:IsCommentOrString(line('.'), col('.'))",
-  \                            '\[\|(\|{', '\]\|)\|}')
-
-  " If inside brackets, indent relative to the brackets, but don't outdent an
-  " already indented line.
-  if matchlnum
-    return max([indent(a:curlnum), indent(matchlnum) + s:ShiftWidth()])
-  endif
-
-  " No special rules applied, so use the default policy.
-  exec 'return' s:GetDefaultPolicy(a:curlnum)
-endfunction
diff --git a/bundle/coffee-script/syntax/coffee.vim b/bundle/coffee-script/syntax/coffee.vim
deleted file mode 100755
index eea5084..0000000
--- a/bundle/coffee-script/syntax/coffee.vim
+++ /dev/null
@@ -1,223 +0,0 @@
-" Language:    CoffeeScript
-" Maintainer:  Mick Koch <kchmck@gmail.com>
-" URL:         http://github.com/kchmck/vim-coffee-script
-" License:     WTFPL
-
-" Bail if our syntax is already loaded.
-if exists('b:current_syntax') && b:current_syntax == 'coffee'
-  finish
-endif
-
-" Include JavaScript for coffeeEmbed.
-syn include @coffeeJS syntax/javascript.vim
-silent! unlet b:current_syntax
-
-" Highlight long strings.
-syntax sync fromstart
-
-" CoffeeScript identifiers can have dollar signs.
-setlocal isident+=$
-
-" These are `matches` instead of `keywords` because vim's highlighting
-" priority for keywords is higher than matches. This causes keywords to be
-" highlighted inside matches, even if a match says it shouldn't contain them --
-" like with coffeeAssign and coffeeDot.
-syn match coffeeStatement /\<\%(return\|break\|continue\|throw\)\>/ display
-hi def link coffeeStatement Statement
-
-syn match coffeeRepeat /\<\%(for\|while\|until\|loop\)\>/ display
-hi def link coffeeRepeat Repeat
-
-syn match coffeeConditional /\<\%(if\|else\|unless\|switch\|when\|then\)\>/
-\                           display
-hi def link coffeeConditional Conditional
-
-syn match coffeeException /\<\%(try\|catch\|finally\)\>/ display
-hi def link coffeeException Exception
-
-syn match coffeeKeyword /\<\%(new\|in\|of\|by\|and\|or\|not\|is\|isnt\|class\|extends\|super\|do\)\>/
-\                       display
-" The `own` keyword is only a keyword after `for`.
-syn match coffeeKeyword /\<for\s\+own\>/ contained containedin=coffeeRepeat
-\                       display
-hi def link coffeeKeyword Keyword
-
-syn match coffeeOperator /\<\%(instanceof\|typeof\|delete\)\>/ display
-hi def link coffeeOperator Operator
-
-" The first case matches symbol operators only if they have an operand before.
-syn match coffeeExtendedOp /\%(\S\s*\)\@<=[+\-*/%&|\^=!<>?.]\{-1,}\|[-=]>\|--\|++\|:/
-\                          display
-syn match coffeeExtendedOp /\<\%(and\|or\)=/ display
-hi def link coffeeExtendedOp coffeeOperator
-
-" This is separate from `coffeeExtendedOp` to help differentiate commas from
-" dots.
-syn match coffeeSpecialOp /[,;]/ display
-hi def link coffeeSpecialOp SpecialChar
-
-syn match coffeeBoolean /\<\%(true\|on\|yes\|false\|off\|no\)\>/ display
-hi def link coffeeBoolean Boolean
-
-syn match coffeeGlobal /\<\%(null\|undefined\)\>/ display
-hi def link coffeeGlobal Type
-
-" A special variable
-syn match coffeeSpecialVar /\<\%(this\|prototype\|arguments\)\>/ display
-hi def link coffeeSpecialVar Special
-
-" An @-variable
-syn match coffeeSpecialIdent /@\%(\I\i*\)\?/ display
-hi def link coffeeSpecialIdent Identifier
-
-" A class-like name that starts with a capital letter
-syn match coffeeObject /\<\u\w*\>/ display
-hi def link coffeeObject Structure
-
-" A constant-like name in SCREAMING_CAPS
-syn match coffeeConstant /\<\u[A-Z0-9_]\+\>/ display
-hi def link coffeeConstant Constant
-
-" A variable name
-syn cluster coffeeIdentifier contains=coffeeSpecialVar,coffeeSpecialIdent,
-\                                     coffeeObject,coffeeConstant
-
-" A non-interpolated string
-syn cluster coffeeBasicString contains=@Spell,coffeeEscape
-" An interpolated string
-syn cluster coffeeInterpString contains=@coffeeBasicString,coffeeInterp
-
-" Regular strings
-syn region coffeeString start=/"/ skip=/\\\\\|\\"/ end=/"/
-\                       contains=@coffeeInterpString
-syn region coffeeString start=/'/ skip=/\\\\\|\\'/ end=/'/
-\                       contains=@coffeeBasicString
-hi def link coffeeString String
-
-" A integer, including a leading plus or minus
-syn match coffeeNumber /\i\@<![-+]\?\d\+\%([eE][+-]\?\d\+\)\?/ display
-" A hex, binary, or octal number
-syn match coffeeNumber /\<0[xX]\x\+\>/ display
-syn match coffeeNumber /\<0[bB][01]\+\>/ display
-syn match coffeeNumber /\<0[oO][0-7]\+\>/ display
-hi def link coffeeNumber Number
-
-" A floating-point number, including a leading plus or minus
-syn match coffeeFloat /\i\@<![-+]\?\d*\.\@<!\.\d\+\%([eE][+-]\?\d\+\)\?/
-\                     display
-hi def link coffeeFloat Float
-
-" An error for reserved keywords, taken from the RESERVED array:
-" http://coffeescript.org/documentation/docs/lexer.html#section-67
-syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|package\|private\|protected\|public\|static\|yield\)\>/
-\                             display
-hi def link coffeeReservedError Error
-
-" A normal object assignment
-syn match coffeeObjAssign /@\?\I\i*\s*\ze::\@!/ contains=@coffeeIdentifier display
-hi def link coffeeObjAssign Identifier
-
-syn keyword coffeeTodo TODO FIXME XXX contained
-hi def link coffeeTodo Todo
-
-syn match coffeeComment /#.*/ contains=@Spell,coffeeTodo
-hi def link coffeeComment Comment
-
-syn region coffeeBlockComment start=/####\@!/ end=/###/
-\                             contains=@Spell,coffeeTodo
-hi def link coffeeBlockComment coffeeComment
-
-" A comment in a heregex
-syn region coffeeHeregexComment start=/#/ end=/\ze\/\/\/\|$/ contained
-\                               contains=@Spell,coffeeTodo
-hi def link coffeeHeregexComment coffeeComment
-
-" Embedded JavaScript
-syn region coffeeEmbed matchgroup=coffeeEmbedDelim
-\                      start=/`/ skip=/\\\\\|\\`/ end=/`/ keepend
-\                      contains=@coffeeJS
-hi def link coffeeEmbedDelim Delimiter
-
-syn region coffeeInterp matchgroup=coffeeInterpDelim start=/#{/ end=/}/ contained
-\                       contains=@coffeeAll
-hi def link coffeeInterpDelim PreProc
-
-" A string escape sequence
-syn match coffeeEscape /\\\d\d\d\|\\x\x\{2\}\|\\u\x\{4\}\|\\./ contained display
-hi def link coffeeEscape SpecialChar
-
-" A regex -- must not follow a parenthesis, number, or identifier, and must not
-" be followed by a number
-syn region coffeeRegex start=#\%(\%()\|\i\@<!\d\)\s*\|\i\)\@<!/=\@!\s\@!#
-\                      end=#/[gimy]\{,4}\d\@!#
-\                      oneline contains=@coffeeBasicString,coffeeRegexCharSet
-syn region coffeeRegexCharSet start=/\[/ end=/]/ contained
-\                             contains=@coffeeBasicString
-hi def link coffeeRegex String
-hi def link coffeeRegexCharSet coffeeRegex
-
-" A heregex
-syn region coffeeHeregex start=#///# end=#///[gimy]\{,4}#
-\                        contains=@coffeeInterpString,coffeeHeregexComment,
-\                                  coffeeHeregexCharSet
-\                        fold
-syn region coffeeHeregexCharSet start=/\[/ end=/]/ contained
-\                               contains=@coffeeInterpString
-hi def link coffeeHeregex coffeeRegex
-hi def link coffeeHeregexCharSet coffeeHeregex
-
-" Heredoc strings
-syn region coffeeHeredoc start=/"""/ end=/"""/ contains=@coffeeInterpString
-\                        fold
-syn region coffeeHeredoc start=/'''/ end=/'''/ contains=@coffeeBasicString
-\                        fold
-hi def link coffeeHeredoc String
-
-" An error for trailing whitespace, as long as the line isn't just whitespace
-syn match coffeeSpaceError /\S\@<=\s\+$/ display
-hi def link coffeeSpaceError Error
-
-" An error for trailing semicolons, for help transitioning from JavaScript
-syn match coffeeSemicolonError /;$/ display
-hi def link coffeeSemicolonError Error
-
-" Ignore reserved words in dot accesses.
-syn match coffeeDotAccess /\.\@<!\.\s*\I\i*/he=s+1 contains=@coffeeIdentifier
-hi def link coffeeDotAccess coffeeExtendedOp
-
-" Ignore reserved words in prototype accesses.
-syn match coffeeProtoAccess /::\s*\I\i*/he=s+2 contains=@coffeeIdentifier
-hi def link coffeeProtoAccess coffeeExtendedOp
-
-" This is required for interpolations to work.
-syn region coffeeCurlies matchgroup=coffeeCurly start=/{/ end=/}/
-\                        contains=@coffeeAll
-syn region coffeeBrackets matchgroup=coffeeBracket start=/\[/ end=/\]/
-\                         contains=@coffeeAll
-syn region coffeeParens matchgroup=coffeeParen start=/(/ end=/)/
-\                       contains=@coffeeAll
-
-" These are highlighted the same as commas since they tend to go together.
-hi def link coffeeBlock coffeeSpecialOp
-hi def link coffeeBracket coffeeBlock
-hi def link coffeeCurly coffeeBlock
-hi def link coffeeParen coffeeBlock
-
-" This is used instead of TOP to keep things coffee-specific for good
-" embedding. `contained` groups aren't included.
-syn cluster coffeeAll contains=coffeeStatement,coffeeRepeat,coffeeConditional,
-\                              coffeeException,coffeeKeyword,coffeeOperator,
-\                              coffeeExtendedOp,coffeeSpecialOp,coffeeBoolean,
-\                              coffeeGlobal,coffeeSpecialVar,coffeeSpecialIdent,
-\                              coffeeObject,coffeeConstant,coffeeString,
-\                              coffeeNumber,coffeeFloat,coffeeReservedError,
-\                              coffeeObjAssign,coffeeComment,coffeeBlockComment,
-\                              coffeeEmbed,coffeeRegex,coffeeHeregex,
-\                              coffeeHeredoc,coffeeSpaceError,
-\                              coffeeSemicolonError,coffeeDotAccess,
-\                              coffeeProtoAccess,coffeeCurlies,coffeeBrackets,
-\                              coffeeParens
-
-if !exists('b:current_syntax')
-  let b:current_syntax = 'coffee'
-endif
diff --git a/bundle/coffee-script/test/test-interp.coffee b/bundle/coffee-script/test/test-interp.coffee
deleted file mode 100644
index 399ea0d..0000000
--- a/bundle/coffee-script/test/test-interp.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Nested curlies
-" >> #{ == { { { } } } == } << "
-" >> #{ == { abc: { def: 42 } } == } << "
diff --git a/bundle/coffee-script/test/test-ops.coffee b/bundle/coffee-script/test/test-ops.coffee
deleted file mode 100644
index 54be8db..0000000
--- a/bundle/coffee-script/test/test-ops.coffee
+++ /dev/null
@@ -1,90 +0,0 @@
-# Various operators
-abc instanceof def
-typeof abc
-delete abc
-abc::def
-
-abc + def
-abc - def
-abc * def
-abc / def
-abc % def
-abc & def
-abc | def
-abc ^ def
-abc >> def
-abc << def
-abc >>> def
-abc ? def
-abc && def
-abc and def
-abc || def
-abc or def
-
-abc += def
-abc -= def
-abc *= def
-abc /= def
-abc %= def
-abc &= def
-abc |= def
-abc ^= def
-abc >>= def
-abc <<= def
-abc >>>= def
-abc ?= def
-abc &&= def
-abc ||= def
-
-abc and= def
-abc or= def
-
-abc.def.ghi
-abc?.def?.ghi
-
-abc < def
-abc > def
-abc = def
-abc == def
-abc != def
-abc <= def
-abc >= def
-
-abc++
-abc--
-++abc
---abc
-
-# Nested operators
-abc[def] = ghi
-abc[def[ghi: jkl]] = 42
-@abc[def] = ghi
-
-abc["#{def = 42}"] = 42
-abc["#{def.ghi = 42}"] = 42
-abc["#{def[ghi] = 42}"] = 42
-abc["#{def['ghi']}"] = 42
-
-# Object assignments
-abc =
-  def: 123
-  DEF: 123
-  @def: 123
-  Def: 123
-  'def': 123
-  42: 123
-
-# Operators shouldn't be highlighted
-vector=
-wand=
-
-abc+++
-abc---
-abc ** def
-abc &&& def
-abc ^^ def
-abc ===== def
-abc <==== def
-abc >==== def
-abc +== def
-abc =^= def
diff --git a/bundle/coffee-script/test/test-reserved.coffee b/bundle/coffee-script/test/test-reserved.coffee
deleted file mode 100644
index b841760..0000000
--- a/bundle/coffee-script/test/test-reserved.coffee
+++ /dev/null
@@ -1,27 +0,0 @@
-# Should be an error
-function = 42
-var = 42
-
-# Shouldn't be an error
-abc.with = 42
-function: 42
-var: 42
-
-# Keywords shouldn't be highlighted
-abc.function
-abc.do
-abc.break
-abc.true
-
-abc::function
-abc::do
-abc::break
-abc::true
-
-abc:: function
-abc. function
-
-# Numbers should be highlighted
-def.42
-def .42
-def::42
diff --git a/bundle/coffee-script/test/test.haml b/bundle/coffee-script/test/test.haml
deleted file mode 100644
index ae19fba..0000000
--- a/bundle/coffee-script/test/test.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-:coffeescript
-  class Hello
-    # test
diff --git a/bundle/coffee-script/test/test.html b/bundle/coffee-script/test/test.html
deleted file mode 100644
index 3479145..0000000
--- a/bundle/coffee-script/test/test.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<head>
-  <script type="text/coffeescript">
-    abc = {
-      def: 42
-    }
-  </script>
-</head>
diff --git a/bundle/colorscheme-switcher/INSTALL.md b/bundle/colorscheme-switcher/INSTALL.md
deleted file mode 100755
index c46440e..0000000
--- a/bundle/colorscheme-switcher/INSTALL.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Installation instructions
-
-*Please note that the vim-colorscheme-switcher plug-in requires my vim-misc plug-in which is separately distributed.*
-
-There are two ways to install the vim-colorscheme-switcher plug-in and it's up to you which you prefer, both options are explained below. Please note that below are generic installation instructions while some Vim plug-ins may have external dependencies, please refer to the plug-in's [readme](README.md) for details.
-
-## Installation using ZIP archives
-
-Unzip the most recent ZIP archives of the [vim-colorscheme-switcher](http://peterodding.com/code/vim/downloads/colorscheme-switcher.zip) and [vim-misc](http://peterodding.com/code/vim/downloads/misc.zip) plug-ins inside your Vim profile directory (usually this is `~/.vim` on UNIX and `%USERPROFILE%\vimfiles` on Windows), restart Vim and execute the command `:helptags ~/.vim/doc` (use `:helptags ~\vimfiles\doc` instead on Windows).
-
-If you get warnings about overwriting existing files while unpacking the ZIP archives you probably don't need to worry about this because it's most likely caused by files like `README.md`, `INSTALL.md` and `addon-info.json`. If these files bother you then you can remove them after unpacking the ZIP archives, they are not required to use the plug-in.
-
-## Installation using a Vim plug-in manager
-
-If you prefer you can also use [Pathogen](http://www.vim.org/scripts/script.php?script_id=2332), [Vundle](https://github.com/gmarik/vundle) or a similar tool to install and update the [vim-colorscheme-switcher](https://github.com/xolox/vim-colorscheme-switcher) and [vim-misc](https://github.com/xolox/vim-misc) plug-ins using local clones of the git repositories. This takes a bit of work to set up the first time but it makes updating much easier, and it keeps each plug-in in its own directory which helps to keep your Vim profile uncluttered.
diff --git a/bundle/colorscheme-switcher/README.md b/bundle/colorscheme-switcher/README.md
deleted file mode 100755
index f448225..0000000
--- a/bundle/colorscheme-switcher/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Color scheme switcher for Vim
-
-The colorscheme switcher plug-in for the [Vim text editor] [vim] makes it easy to quickly switch between [colorschemes] [cs]. It defines commands and mappings to switch to the next and previous color schemes.
-
-## Installation
-
-Please refer to the [installation instructions] [howto-install] available on GitHub. Once you've installed the plug-in you can try it out by executing `:NextColorScheme` to switch to the next color scheme.
-
-If you didn't change the plug-in's configuration you can use the `F8` and `Shift-F8` keys to switch to the next/previous color scheme and `Control-F8` to switch to a random color scheme.
-
-## Commands
-
-### The `:NextColorScheme` command
-
-Switch to the next color scheme. After the last color scheme the cycle repeats from the first color scheme.
-
-### The `:PrevColorScheme` command
-
-Switch to the previous color scheme. After the first color scheme the cycle repeats from the last color scheme.
-
-### The `:RandomColorScheme` command
-
-Switch to a random color scheme. Because Vim doesn't actually expose random numbers the microseconds of the current time are used to improvise a source of randomness. It's nothing like real randomness but convincing enough for this plug-in :-).
-
-## Options
-
-The colorscheme switcher plug-in should work out of the box, but you can change the configuration defaults if you want to change how the plug-in works.
-
-### The `g:colorscheme_switcher_define_mappings` option
-
-By default the plug-in maps the following keys in insert and normal mode:
-
-- `F8` switches to the next color scheme
-- `Shift-F8` switches to the previous color scheme
-
-To disable these mappings (e.g. because you're already using them for a different purpose) you can set the option `g:colorscheme_switcher_define_mappings` to 0 (false) in your [vimrc script] [vimrc].
-
-### The `g:colorscheme_switcher_keep_background` option
-
-If you set this variable to 1 (true) and cycle to the next/previous color scheme, the plug-in will skip color schemes with a different ['background'] [bg]. By default this is set to 0 (false).
-
-This is useful when you want to see only light or dark color schemes, for example because the sun is shining (you'll want a light background) or because it's late at night (then you'll likely prefer a dark background).
-
-### The `g:colorscheme_switcher_exclude` option
-
-A list with names of color schemes to be ignored by the plug-in. By default the list is empty. Here's an example of how you can set this:
-
-    :let g:colorscheme_switcher_exclude = ['default', 'test']
-
-### The `g:colorscheme_switcher_exclude_builtins` option
-
-If you set this variable to 1 (true) the color schemes bundled with Vim (installed in `$VIMRUNTIME`) are ignored and instead only the color schemes that you specifically installed in your Vim profile are used.
-
-### The `g:colorscheme_switcher_command` option
-
-This option is a string specifying the Vim command used to switch between color schemes. It defaults to the [:colorscheme] [cs] command. You can set this option to integrate the vim-colorscheme-switcher plug-in with other plug-ins like [colorsupport.vim](https://github.com/vim-scripts/colorsupport.vim) and [guicolorscheme.vim](https://github.com/vim-scripts/guicolorscheme.vim).
-
-## See also
-
-The [vim-colorscheme-manager](https://github.com/Taverius/vim-colorscheme-manager) plug-in is an add-on for vim-colorscheme-switcher that adds features like more convenient blacklist management and automatic loading of the last used color scheme when Vim starts up or a session is loaded.
-
-## Known problems
-
-The way Vim color schemes are written isn't really compatible with the idea of quickly switching between lots of color schemes. In my opinion this is an ugly implementation detail of how Vim works internally, in other words I think it's a bug that should be fixed... Here are some references that explain the problem in some detail:
-
-- [Vim colorscheme leaves a wake of destruction when switching away](https://github.com/altercation/solarized/issues/102)
-- [gVim: remove syntax highlighting groups](http://stackoverflow.com/questions/12915797/gvim-remove-syntax-highlighting-groups)
-
-Since this behavior hinders cycling through color schemes, the colorscheme switcher plug-in includes a workaround that should hide the problem:
-
-1. At startup a dictionary is created which will be used to remember links between highlighting groups;
-2. Before and after loading a color scheme, the colorscheme switcher plug-in runs the [:highlight] [hi] command without any arguments to find links between highlighting groups. Each link that is found is added to the dictionary. Existing entries are updated. This is done by calling `xolox#colorscheme_switcher#find_links()`.
-3. After loading a color scheme, the colorscheme switcher plug-in runs the [:highlight] [hi] command without any arguments to find highlighting groups in the state 'cleared'. For each of these groups, if they were previously linked, the link is restored. This is done by calling `xolox#colorscheme_switcher#restore_links()`.
-
-Probably this solution is still not perfect, but it's a lot better than the behavior out of the box: Before I implemented the steps above, when I would cycle through my color schemes, Vim would eventually end up with black text on a white background and nothing else! With the steps above, I can cycle as many times as I want and all of the color schemes I've checked so far look fine.
-
-## Contact
-
-If you have questions, bug reports, suggestions, etc. the author can be contacted at <peter@peterodding.com>. The latest version is available at <http://peterodding.com/code/vim/colorscheme-switcher/> and <http://github.com/xolox/vim-colorscheme-switcher>. If you like this plug-in please vote for it on [Vim Online] [vim_online].
-
-## License
-
-This software is licensed under the [MIT license] [mit].
-© 2015 Peter Odding &lt;<peter@peterodding.com>&gt;.
-
-
-[bg]: http://vimdoc.sourceforge.net/htmldoc/options.html#'background'
-[cs]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#:colorscheme
-[dcs]: http://peterodding.com/code/vim/downloads/colorscheme-switcher.zip
-[dms]: http://peterodding.com/code/vim/downloads/misc.zip
-[hi]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#:highlight
-[howto-install]: https://github.com/xolox/vim-colorscheme-switcher/blob/master/INSTALL.md
-[mit]: http://en.wikipedia.org/wiki/MIT_License
-[vim]: http://www.vim.org/
-[vim_online]: http://www.vim.org/scripts/script.php?script_id=4586
-[vimrc]: http://vimdoc.sourceforge.net/htmldoc/starting.html#vimrc
diff --git a/bundle/colorscheme-switcher/addon-info.json b/bundle/colorscheme-switcher/addon-info.json
deleted file mode 100755
index 5cbe240..0000000
--- a/bundle/colorscheme-switcher/addon-info.json
+++ /dev/null
@@ -1 +0,0 @@
-{"vim_script_nr": 4586, "dependencies": {"vim-misc": {}}, "homepage": "http://peterodding.com/code/vim/colorscheme-switcher", "name": "vim-colorscheme-switcher"}
\ No newline at end of file
diff --git a/bundle/colorscheme-switcher/autoload/xolox/colorscheme_switcher.vim b/bundle/colorscheme-switcher/autoload/xolox/colorscheme_switcher.vim
deleted file mode 100755
index add53aa..0000000
--- a/bundle/colorscheme-switcher/autoload/xolox/colorscheme_switcher.vim
+++ /dev/null
@@ -1,157 +0,0 @@
-" Vim plug-in
-" Maintainer: Peter Odding <peter@peterodding.com>
-" Last Change: April 1, 2015
-" URL: http://peterodding.com/code/vim/colorscheme-switcher
-
-let g:xolox#colorscheme_switcher#version = '0.5.1'
-
-" Dictionary with previously seen links between highlighting groups.
-if !exists('s:known_links')
-  let s:known_links = {}
-endif
-
-function! xolox#colorscheme_switcher#next() " {{{1
-  " Switch to the next color scheme.
-  return xolox#colorscheme_switcher#cycle(1)
-endfunction
-
-function! xolox#colorscheme_switcher#previous() " {{{1
-  " Switch to the previous color scheme.
-  return xolox#colorscheme_switcher#cycle(0)
-endfunction
-
-function! xolox#colorscheme_switcher#random() " {{{1
-  " Switch to a random color scheme.
-  let choices = xolox#colorscheme_switcher#find_names()
-  if exists('g:colors_name')
-    call filter(choices, 'v:val != g:colors_name')
-  endif
-  let original_background = &background
-  for i in range(len(choices))
-    let index = xolox#colorscheme_switcher#random_number(len(choices))
-    call xolox#colorscheme_switcher#switch_to(choices[index])
-    if !xolox#misc#option#get('colorscheme_switcher_keep_background', 0) || &background == original_background
-      call xolox#misc#msg#info('colorscheme-switcher.vim %s: Loaded random color scheme (%s)', g:xolox#colorscheme_switcher#version, choices[index])
-      return
-    endif
-  endfor
-  call xolox#misc#msg#debug('colorscheme-switcher.vim %s: Ran out of color schemes!', g:xolox#colorscheme_switcher#version)
-endfunction
-
-function! xolox#colorscheme_switcher#cycle(forward) " {{{1
-  " Switch to the next or previous color scheme.
-  let choices = xolox#colorscheme_switcher#find_names()
-  let index = exists('g:colors_name') ? index(choices, g:colors_name) : 0
-  let original_background = &background
-  for i in range(len(choices))
-    if a:forward
-      let index = (index + 1) % len(choices)
-    else
-      let index = (index ? index : len(choices)) - 1
-    endif
-    call xolox#colorscheme_switcher#switch_to(choices[index])
-    if !xolox#misc#option#get('colorscheme_switcher_keep_background', 0) || &background == original_background
-      call xolox#misc#msg#info('colorscheme-switcher.vim %s: Loaded color scheme %s (%i/%i)', g:xolox#colorscheme_switcher#version, choices[index], index, len(choices))
-      return
-    endif
-  endfor
-  call xolox#misc#msg#debug('colorscheme-switcher.vim %s: Ran out of color schemes!', g:xolox#colorscheme_switcher#version)
-endfunction
-
-function! xolox#colorscheme_switcher#find_names() " {{{1
-  " Get a sorted list with the available color schemes.
-  let matches = {}
-  let exclude_list = xolox#misc#option#get('colorscheme_switcher_exclude', [])
-  let exclude_builtins = xolox#misc#option#get('colorscheme_switcher_exclude_builtins', 0)
-  for fname in split(globpath(&runtimepath, 'colors/*.vim'), '\n')
-    let name = fnamemodify(fname, ':t:r')
-    " Ignore names in the exclude list.
-    if index(exclude_list, name) == -1
-      " Ignore color schemes bundled with Vim?
-      if !(exclude_builtins && xolox#misc#path#starts_with(fname, $VIMRUNTIME))
-        let matches[name] = 1
-      endif
-    endif
-  endfor
-  return sort(keys(matches), 1)
-endfunction
-
-function! xolox#colorscheme_switcher#find_links() " {{{1
-  " Find and remember links between highlighting groups.
-  call xolox#misc#msg#debug('colorscheme-switcher.vim %s: Using :highlight command to discover links between highlighting groups ..', g:xolox#colorscheme_switcher#version)
-  redir => listing
-  try
-    silent highlight
-  finally
-    redir END
-  endtry
-  for line in split(listing, "\n")
-    let tokens = split(line)
-    " We're looking for lines like "String xxx links to Constant" in the
-    " output of the :highlight command.
-    if len(tokens) == 5 && tokens[1] == 'xxx' && tokens[2] == 'links' && tokens[3] == 'to'
-      let fromgroup = tokens[0]
-      let togroup = tokens[4]
-      let s:known_links[fromgroup] = togroup
-    endif
-  endfor
-  call xolox#misc#msg#debug('colorscheme-switcher.vim %s: Found %i links between highlighting groups in output of :highlight command.', g:xolox#colorscheme_switcher#version, len(s:known_links))
-endfunction
-
-function! xolox#colorscheme_switcher#restore_links() " {{{1
-  " Restore broken links between highlighting groups.
-  redir => listing
-  try
-    silent highlight
-  finally
-    redir END
-  endtry
-  let num_restored = 0
-  for line in split(listing, "\n")
-    let tokens = split(line)
-    " We're looking for lines like "String xxx cleared" in the
-    " output of the :highlight command.
-    if len(tokens) == 3 && tokens[1] == 'xxx' && tokens[2] == 'cleared'
-      let fromgroup = tokens[0]
-      let togroup = get(s:known_links, fromgroup, '')
-      if !empty(togroup)
-        execute 'hi link' fromgroup togroup
-        let num_restored += 1
-      endif
-    endif
-  endfor
-  call xolox#misc#msg#debug('colorscheme-switcher.vim %s: Restored %i links between highlighting groups.', g:xolox#colorscheme_switcher#version, num_restored)
-endfunction
-
-function! xolox#colorscheme_switcher#switch_to(name) " {{{1
-  " Switch to the given color scheme.
-  call xolox#colorscheme_switcher#find_links()
-  let command = xolox#misc#option#get('colorscheme_switcher_command', 'colorscheme')
-  execute command fnameescape(a:name)
-  " Set the global colors_name variable because some color scheme scripts fail
-  " to do so or use the wrong name (for example rainbow_autumn uses autumn).
-  let g:colors_name = a:name
-  " Enable the user to customize the loaded color scheme.
-  silent execute 'doautocmd ColorScheme' fnameescape(a:name)
-  " Restore syntax group links as the last step to make sure the syntax group
-  " links are not clobbered by user defined automatic commands.
-  call xolox#colorscheme_switcher#restore_links()
-  " It looks like terminal Vim has some peculiarities of its own and the
-  " following workaround may improve its behavior. Because I don't yet
-  " understand exactly how or why this works, I've decided to add the
-  " workaround but only apply it when it seems to be relevant (in
-  " terminal Vim). For details refer to issue #6 on GitHub:
-  " https://github.com/xolox/vim-colorscheme-switcher/issues/6
-  if !has('gui_running')
-    let &syntax = &syntax
-  endif
-endfunction
-
-function! xolox#colorscheme_switcher#random_number(limit) " {{{1
-  " Generate a `random' number (for some definition of the word).
-  let components = split(reltimestr(reltime()), '\.')
-  let microseconds = components[-1] + 0
-  return microseconds % a:limit
-endfunction
-
-" vim: ts=2 sw=2 et fdm=marker
diff --git a/bundle/colorscheme-switcher/doc/colorscheme-switcher.txt b/bundle/colorscheme-switcher/doc/colorscheme-switcher.txt
deleted file mode 100755
index 650cf68..0000000
--- a/bundle/colorscheme-switcher/doc/colorscheme-switcher.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-*colorscheme-switcher.txt*  Color scheme switcher for Vim
-
-===============================================================================
-Contents ~
-
- 1. Introduction                            |colorscheme-switcher-introduction|
- 2. Installation                            |colorscheme-switcher-installation|
- 3. Commands                                    |colorscheme-switcher-commands|
-  1. The |:NextColorScheme| command
-  2. The |:PrevColorScheme| command
-  3. The |:RandomColorScheme| command
- 4. Options                                      |colorscheme-switcher-options|
-  1. The |g:colorscheme_switcher_define_mappings| option
-  2. The |g:colorscheme_switcher_keep_background| option
-  3. The |g:colorscheme_switcher_exclude| option
-  4. The |g:colorscheme_switcher_exclude_builtins| option
-  5. The |g:colorscheme_switcher_command| option
- 5. See also                                    |colorscheme-switcher-see-also|
- 6. Known problems                        |colorscheme-switcher-known-problems|
- 7. Contact                                      |colorscheme-switcher-contact|
- 8. License                                      |colorscheme-switcher-license|
- 9. References                                |colorscheme-switcher-references|
-
-===============================================================================
-                                            *colorscheme-switcher-introduction*
-Introduction ~
-
-The colorscheme switcher plug-in for the Vim text editor makes it easy to
-quickly switch between colorschemes (see |:colorscheme|). It defines commands
-and mappings to switch to the next and previous color schemes.
-
-===============================================================================
-                                            *colorscheme-switcher-installation*
-Installation ~
-
-Please refer to the installation instructions [1] available on GitHub. Once
-you've installed the plug-in you can try it out by executing |:NextColorScheme|
-to switch to the next color scheme.
-
-If you didn't change the plug-in's configuration you can use the 'F8' and
-'Shift-F8' keys to switch to the next/previous color scheme and 'Control-F8' to
-switch to a random color scheme.
-
-===============================================================================
-                                                *colorscheme-switcher-commands*
-Commands ~
-
--------------------------------------------------------------------------------
-The *:NextColorScheme* command
-
-Switch to the next color scheme. After the last color scheme the cycle repeats
-from the first color scheme.
-
--------------------------------------------------------------------------------
-The *:PrevColorScheme* command
-
-Switch to the previous color scheme. After the first color scheme the cycle
-repeats from the last color scheme.
-
--------------------------------------------------------------------------------
-The *:RandomColorScheme* command
-
-Switch to a random color scheme. Because Vim doesn't actually expose random
-numbers the microseconds of the current time are used to improvise a source of
-randomness. It's nothing like real randomness but convincing enough for this
-plug-in :-).
-
-===============================================================================
-                                                 *colorscheme-switcher-options*
-Options ~
-
-The colorscheme switcher plug-in should work out of the box, but you can change
-the configuration defaults if you want to change how the plug-in works.
-
--------------------------------------------------------------------------------
-The *g:colorscheme_switcher_define_mappings* option
-
-By default the plug-in maps the following keys in insert and normal mode:
-
-- 'F8' switches to the next color scheme
-- 'Shift-F8' switches to the previous color scheme
-
-To disable these mappings (e.g. because you're already using them for a
-different purpose) you can set the option
-|g:colorscheme_switcher_define_mappings| to 0 (false) in your |vimrc| script.
-
--------------------------------------------------------------------------------
-The *g:colorscheme_switcher_keep_background* option
-
-If you set this variable to 1 (true) and cycle to the next/previous color
-scheme, the plug-in will skip color schemes with a different |'background'|. By
-default this is set to 0 (false).
-
-This is useful when you want to see only light or dark color schemes, for
-example because the sun is shining (you'll want a light background) or because
-it's late at night (then you'll likely prefer a dark background).
-
--------------------------------------------------------------------------------
-The *g:colorscheme_switcher_exclude* option
-
-A list with names of color schemes to be ignored by the plug-in. By default the
-list is empty. Here's an example of how you can set this:
->
-  :let g:colorscheme_switcher_exclude = ['default', 'test']
-<
--------------------------------------------------------------------------------
-The *g:colorscheme_switcher_exclude_builtins* option
-
-If you set this variable to 1 (true) the color schemes bundled with Vim
-(installed in '$VIMRUNTIME') are ignored and instead only the color schemes
-that you specifically installed in your Vim profile are used.
-
--------------------------------------------------------------------------------
-The *g:colorscheme_switcher_command* option
-
-This option is a string specifying the Vim command used to switch between color
-schemes. It defaults to the |:colorscheme| command. You can set this option to
-integrate the vim-colorscheme-switcher plug-in with other plug-ins like
-colorsupport.vim [2] and guicolorscheme.vim [3].
-
-===============================================================================
-                                                *colorscheme-switcher-see-also*
-See also ~
-
-The vim-colorscheme-manager [4] plug-in is an add-on for vim-colorscheme-
-switcher that adds features like more convenient blacklist management and
-automatic loading of the last used color scheme when Vim starts up or a session
-is loaded.
-
-===============================================================================
-                                          *colorscheme-switcher-known-problems*
-Known problems ~
-
-The way Vim color schemes are written isn't really compatible with the idea of
-quickly switching between lots of color schemes. In my opinion this is an ugly
-implementation detail of how Vim works internally, in other words I think it's
-a bug that should be fixed... Here are some references that explain the problem
-in some detail:
-
-- Vim colorscheme leaves a wake of destruction when switching away [5]
-- gVim: remove syntax highlighting groups [6]
-
-Since this behavior hinders cycling through color schemes, the colorscheme
-switcher plug-in includes a workaround that should hide the problem:
-
-1. At startup a dictionary is created which will be used to remember links
-   between highlighting groups;
-
-2. Before and after loading a color scheme, the colorscheme switcher plug-in
-   runs the |:highlight| command without any arguments to find links between
-   highlighting groups. Each link that is found is added to the dictionary.
-   Existing entries are updated. This is done by calling
-   'xolox#colorscheme_switcher#find_links()'.
-
-3. After loading a color scheme, the colorscheme switcher plug-in runs the
-   |:highlight| command without any arguments to find highlighting groups in
-   the state 'cleared'. For each of these groups, if they were previously
-   linked, the link is restored. This is done by calling
-   'xolox#colorscheme_switcher#restore_links()'.
-
-Probably this solution is still not perfect, but it's a lot better than the
-behavior out of the box: Before I implemented the steps above, when I would
-cycle through my color schemes, Vim would eventually end up with black text on
-a white background and nothing else! With the steps above, I can cycle as many
-times as I want and all of the color schemes I've checked so far look fine.
-
-===============================================================================
-                                                 *colorscheme-switcher-contact*
-Contact ~
-
-If you have questions, bug reports, suggestions, etc. the author can be
-contacted at peter@peterodding.com. The latest version is available at
-http://peterodding.com/code/vim/colorscheme-switcher/ and
-http://github.com/xolox/vim-colorscheme-switcher. If you like this plug-in
-please vote for it on Vim Online [7].
-
-===============================================================================
-                                                 *colorscheme-switcher-license*
-License ~
-
-This software is licensed under the MIT license [8]. © 2015 Peter Odding
-<peter@peterodding.com>.
-
-===============================================================================
-                                              *colorscheme-switcher-references*
-References ~
-
-[1] https://github.com/xolox/vim-colorscheme-switcher/blob/master/INSTALL.md
-[2] https://github.com/vim-scripts/colorsupport.vim
-[3] https://github.com/vim-scripts/guicolorscheme.vim
-[4] https://github.com/Taverius/vim-colorscheme-manager
-[5] https://github.com/altercation/solarized/issues/102
-[6] http://stackoverflow.com/questions/12915797/gvim-remove-syntax-highlighting-groups
-[7] http://www.vim.org/scripts/script.php?script_id=4586
-[8] http://en.wikipedia.org/wiki/MIT_License
-
-vim: ft=help
diff --git a/bundle/colorscheme-switcher/plugin/colorscheme-switcher.vim b/bundle/colorscheme-switcher/plugin/colorscheme-switcher.vim
deleted file mode 100755
index 98bf443..0000000
--- a/bundle/colorscheme-switcher/plugin/colorscheme-switcher.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" Vim plug-in
-" Maintainer: Peter Odding <peter@peterodding.com>
-" Last Change: June 25, 2014
-" URL: http://peterodding.com/code/vim/colorscheme-switcher
-
-" This Vim plug-in defines commands and key mappings to quickly switch between
-" color schemes (with the same &background if so desired).
-
-if &cp || exists('g:loaded_colorscheme_switcher')
-  finish
-endif
-
-" Make sure vim-misc is installed.
-try
-  " The point of this code is to do something completely innocent while making
-  " sure the vim-misc plug-in is installed. We specifically don't use Vim's
-  " exists() function because it doesn't load auto-load scripts that haven't
-  " already been loaded yet (last tested on Vim 7.3).
-  call type(g:xolox#misc#version)
-catch
-  echomsg "Warning: The vim-colorscheme-switcher plug-in requires the vim-misc plug-in which seems not to be installed! For more information please review the installation instructions in the readme (also available on the homepage and on GitHub). The vim-colorscheme-switcher plug-in will now be disabled."
-  let g:loaded_colorscheme_switcher = 1
-  finish
-endtry
-
-if xolox#misc#option#get('colorscheme_switcher_define_mappings', 1)
-  inoremap <silent> <F8> <C-O>:NextColorScheme<CR>
-  nnoremap <silent> <F8> :NextColorScheme<CR>
-  inoremap <silent> <S-F8> <C-O>:PrevColorScheme<CR>
-  nnoremap <silent> <S-F8> :PrevColorScheme<CR>
-  inoremap <silent> <C-F8> <C-O>:RandomColorScheme<CR>
-  nnoremap <silent> <C-F8> :RandomColorScheme<CR>
-endif
-
-command! -bar NextColorScheme call xolox#colorscheme_switcher#next()
-command! -bar PrevColorScheme call xolox#colorscheme_switcher#previous()
-command! -bar RandomColorScheme call xolox#colorscheme_switcher#random()
-
-" Don't reload the plug-in once it has loaded successfully.
-let g:loaded_colorscheme_switcher = 1
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/ctrlp/autoload/ctrlp.vim b/bundle/ctrlp/autoload/ctrlp.vim
deleted file mode 100755
index a05013d..0000000
--- a/bundle/ctrlp/autoload/ctrlp.vim
+++ /dev/null
@@ -1,2400 +0,0 @@
-" =============================================================================
-" File:          autoload/ctrlp.vim
-" Description:   Fuzzy file, buffer, mru, tag, etc finder.
-" Author:        Kien Nguyen <github.com/kien>
-" Version:       1.79
-" =============================================================================
-
-" ** Static variables {{{1
-" s:ignore() {{{2
-fu! s:ignore()
-	let igdirs = [
-		\ '\.git',
-		\ '\.hg',
-		\ '\.svn',
-		\ '_darcs',
-		\ '\.bzr',
-		\ '\.cdv',
-		\ '\~\.dep',
-		\ '\~\.dot',
-		\ '\~\.nib',
-		\ '\~\.plst',
-		\ '\.pc',
-		\ '_MTN',
-		\ 'blib',
-		\ 'CVS',
-		\ 'RCS',
-		\ 'SCCS',
-		\ '_sgbak',
-		\ 'autom4te\.cache',
-		\ 'cover_db',
-		\ '_build',
-		\ ]
-	let igfiles = [
-		\ '\~$',
-		\ '#.+#$',
-		\ '[._].*\.swp$',
-		\ 'core\.\d+$',
-		\ '\.exe$',
-		\ '\.so$',
-		\ '\.bak$',
-		\ '\.png$',
-		\ '\.jpg$',
-		\ '\.gif$',
-		\ '\.zip$',
-		\ '\.rar$',
-		\ '\.tar\.gz$',
-		\ ]
-	retu {
-		\ 'dir': '\v[\/]('.join(igdirs, '|').')$',
-		\ 'file': '\v'.join(igfiles, '|'),
-		\ }
-endf
-" Script local vars {{{2
-let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
-	\ ['g:ctrlp_', 'b:ctrlp_', {
-	\ 'abbrev':                ['s:abbrev', {}],
-	\ 'arg_map':               ['s:argmap', 0],
-	\ 'buffer_func':           ['s:buffunc', {}],
-	\ 'by_filename':           ['s:byfname', 0],
-	\ 'custom_ignore':         ['s:usrign', s:ignore()],
-	\ 'default_input':         ['s:deftxt', 0],
-	\ 'dont_split':            ['s:nosplit', 'netrw'],
-	\ 'dotfiles':              ['s:showhidden', 0],
-	\ 'extensions':            ['s:extensions', []],
-	\ 'follow_symlinks':       ['s:folsym', 0],
-	\ 'highlight_match':       ['s:mathi', [1, 'CtrlPMatch']],
-	\ 'jump_to_buffer':        ['s:jmptobuf', 'Et'],
-	\ 'key_loop':              ['s:keyloop', 0],
-	\ 'lazy_update':           ['s:lazy', 0],
-	\ 'match_func':            ['s:matcher', {}],
-	\ 'match_window':          ['s:mw', ''],
-	\ 'match_window_bottom':   ['s:mwbottom', 1],
-	\ 'match_window_reversed': ['s:mwreverse', 1],
-	\ 'max_depth':             ['s:maxdepth', 40],
-	\ 'max_files':             ['s:maxfiles', 10000],
-	\ 'max_height':            ['s:mxheight', 10],
-	\ 'max_history':           ['s:maxhst', exists('+hi') ? &hi : 20],
-	\ 'mruf_default_order':    ['s:mrudef', 0],
-	\ 'open_func':             ['s:openfunc', {}],
-	\ 'open_multi':            ['s:opmul', '1v'],
-	\ 'open_new_file':         ['s:newfop', 'v'],
-	\ 'prompt_mappings':       ['s:urprtmaps', 0],
-	\ 'regexp_search':         ['s:regexp', 0],
-	\ 'root_markers':          ['s:rmarkers', []],
-	\ 'split_window':          ['s:splitwin', 0],
-	\ 'status_func':           ['s:status', {}],
-	\ 'tabpage_position':      ['s:tabpage', 'ac'],
-	\ 'use_caching':           ['s:caching', 1],
-	\ 'user_command':          ['s:usrcmd', ''],
-	\ 'validate':              ['s:validate', ''],
-	\ 'working_path_mode':     ['s:pathmode', 'ra'],
-	\ 'line_prefix':					 ['s:lineprefix', '> '],
-	\ 'open_single_match':     ['s:opensingle', []],
-	\ }, {
-	\ 'open_multiple_files':   's:opmul',
-	\ 'regexp':                's:regexp',
-	\ 'reuse_window':          's:nosplit',
-	\ 'show_hidden':           's:showhidden',
-	\ 'switch_buffer':         's:jmptobuf',
-	\ }, {
-	\ 'root_markers':          's:rmarkers',
-	\ 'user_command':          's:usrcmd',
-	\ 'working_path_mode':     's:pathmode',
-	\ }]
-
-" Global options
-let s:glbs = { 'magic': 1, 'to': 1, 'tm': 0, 'sb': 1, 'hls': 0, 'im': 0,
-	\ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'ttimeout': 0,
-	\ 'gcr': 'a:blinkon0', 'ic': 1, 'lmap': '', 'mousef': 0, 'imd': 1 }
-
-" Keymaps
-let [s:lcmap, s:prtmaps] = ['nn <buffer> <silent>', {
-	\ 'PrtBS()':              ['<bs>', '<c-]>'],
-	\ 'PrtDelete()':          ['<del>'],
-	\ 'PrtDeleteWord()':      ['<c-w>'],
-	\ 'PrtClear()':           ['<c-u>'],
-	\ 'PrtSelectMove("j")':   ['<c-j>', '<down>'],
-	\ 'PrtSelectMove("k")':   ['<c-k>', '<up>'],
-	\ 'PrtSelectMove("t")':   ['<Home>', '<kHome>'],
-	\ 'PrtSelectMove("b")':   ['<End>', '<kEnd>'],
-	\ 'PrtSelectMove("u")':   ['<PageUp>', '<kPageUp>'],
-	\ 'PrtSelectMove("d")':   ['<PageDown>', '<kPageDown>'],
-	\ 'PrtHistory(-1)':       ['<c-n>'],
-	\ 'PrtHistory(1)':        ['<c-p>'],
-	\ 'AcceptSelection("e")': ['<cr>', '<2-LeftMouse>'],
-	\ 'AcceptSelection("h")': ['<c-x>', '<c-cr>', '<c-s>'],
-	\ 'AcceptSelection("t")': ['<c-t>'],
-	\ 'AcceptSelection("v")': ['<c-v>', '<RightMouse>'],
-	\ 'ToggleFocus()':        ['<s-tab>'],
-	\ 'ToggleRegex()':        ['<c-r>'],
-	\ 'ToggleByFname()':      ['<c-d>'],
-	\ 'ToggleType(1)':        ['<c-f>', '<c-up>'],
-	\ 'ToggleType(-1)':       ['<c-b>', '<c-down>'],
-	\ 'PrtExpandDir()':       ['<tab>'],
-	\ 'PrtInsert("c")':       ['<MiddleMouse>', '<insert>'],
-	\ 'PrtInsert()':          ['<c-\>'],
-	\ 'PrtCurStart()':        ['<c-a>'],
-	\ 'PrtCurEnd()':          ['<c-e>'],
-	\ 'PrtCurLeft()':         ['<c-h>', '<left>', '<c-^>'],
-	\ 'PrtCurRight()':        ['<c-l>', '<right>'],
-	\ 'PrtClearCache()':      ['<F5>'],
-	\ 'PrtDeleteEnt()':       ['<F7>'],
-	\ 'CreateNewFile()':      ['<c-y>'],
-	\ 'MarkToOpen()':         ['<c-z>'],
-	\ 'OpenMulti()':          ['<c-o>'],
-	\ 'PrtExit()':            ['<esc>', '<c-c>', '<c-g>'],
-	\ }]
-
-if !has('gui_running')
-	cal add(s:prtmaps['PrtBS()'], remove(s:prtmaps['PrtCurLeft()'], 0))
-en
-
-let s:compare_lim = 3000
-
-let s:ficounts = {}
-
-let s:ccex = s:pref.'clear_cache_on_exit'
-
-" Regexp
-let s:fpats = {
-	\ '^\(\\|\)\|\(\\|\)$': '\\|',
-	\ '^\\\(zs\|ze\|<\|>\)': '^\\\(zs\|ze\|<\|>\)',
-	\ '^\S\*$': '\*',
-	\ '^\S\\?$': '\\?',
-	\ }
-
-" Keypad
-let s:kprange = {
-	\ 'Plus': '+',
-	\ 'Minus': '-',
-	\ 'Divide': '/',
-	\ 'Multiply': '*',
-	\ 'Point': '.',
-	\ }
-
-" Highlight groups
-let s:hlgrps = {
-	\ 'NoEntries': 'Error',
-	\ 'Mode1': 'Character',
-	\ 'Mode2': 'LineNr',
-	\ 'Stats': 'Function',
-	\ 'Match': 'Identifier',
-	\ 'PrtBase': 'Comment',
-	\ 'PrtText': 'Normal',
-	\ 'PrtCursor': 'Constant',
-	\ }
-
-" lname, sname of the basic(non-extension) modes
-let s:coretypes = [
-	\ ['files', 'fil'],
-	\ ['buffers', 'buf'],
-	\ ['mru files', 'mru'],
-\ ]
-
-" Get the options {{{2
-fu! s:opts(...)
-	unl! s:usrign s:usrcmd s:urprtmaps
-	for each in ['byfname', 'regexp', 'extensions'] | if exists('s:'.each)
-		let {each} = s:{each}
-	en | endfo
-	for [ke, va] in items(s:opts)
-		let {va[0]} = exists(s:pref.ke) ? {s:pref.ke} : va[1]
-	endfo
-	unl va
-	for [ke, va] in items(s:new_opts)
-		let {va} = {exists(s:pref.ke) ? s:pref.ke : va}
-	endfo
-	unl va
-	for [ke, va] in items(s:lc_opts)
-		if exists(s:bpref.ke)
-			unl {va}
-			let {va} = {s:bpref.ke}
-		en
-	endfo
-	" Match window options
-	cal s:match_window_opts()
-	" One-time values
-	if a:0 && a:1 != {}
-		unl va
-		for [ke, va] in items(a:1)
-			let opke = substitute(ke, '\(\w:\)\?ctrlp_', '', '')
-			if has_key(s:lc_opts, opke)
-				let sva = s:lc_opts[opke]
-				unl {sva}
-				let {sva} = va
-			en
-		endfo
-	en
-	for each in ['byfname', 'regexp'] | if exists(each)
-		let s:{each} = {each}
-	en | endfo
-	if !exists('g:ctrlp_tilde_homedir') | let g:ctrlp_tilde_homedir = 0 | en
-	if !exists('g:ctrlp_newcache') | let g:ctrlp_newcache = 0 | en
-	let s:maxdepth = min([s:maxdepth, 100])
-	let s:glob = s:showhidden ? '.*\|*' : '*'
-	let s:igntype = empty(s:usrign) ? -1 : type(s:usrign)
-	let s:lash = ctrlp#utils#lash()
-	if s:keyloop
-		let [s:lazy, s:glbs['imd']] = [0, 0]
-	en
-	if s:lazy
-		cal extend(s:glbs, { 'ut': ( s:lazy > 1 ? s:lazy : 250 ) })
-	en
-	" Extensions
-	if !( exists('extensions') && extensions == s:extensions )
-		for each in s:extensions
-			exe 'ru autoload/ctrlp/'.each.'.vim'
-		endfo
-	en
-	" Keymaps
-	if type(s:urprtmaps) == 4
-		cal extend(s:prtmaps, s:urprtmaps)
-	en
-endf
-
-fu! s:match_window_opts()
-	let s:mw_pos =
-		\ s:mw =~ 'top\|bottom' ? matchstr(s:mw, 'top\|bottom') :
-		\ exists('g:ctrlp_match_window_bottom') ? ( s:mwbottom ? 'bottom' : 'top' )
-		\ : 'bottom'
-	let s:mw_order =
-		\ s:mw =~ 'order:[^,]\+' ? matchstr(s:mw, 'order:\zs[^,]\+') :
-		\ exists('g:ctrlp_match_window_reversed') ? ( s:mwreverse ? 'btt' : 'ttb' )
-		\ : 'btt'
-	let s:mw_max =
-		\ s:mw =~ 'max:[^,]\+' ? str2nr(matchstr(s:mw, 'max:\zs\d\+')) :
-		\ exists('g:ctrlp_max_height') ? s:mxheight
-		\ : 10
-	let s:mw_min =
-		\ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
-	let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
-	let s:mw_min = min([s:mw_min, s:mw_max])
-	let s:mw_res =
-		\ s:mw =~ 'results:[^,]\+' ? str2nr(matchstr(s:mw, 'results:\zs\d\+'))
-		\ : min([s:mw_max, &lines])
-	let s:mw_res = max([s:mw_res, 1])
-endf
-"}}}1
-" * Open & Close {{{1
-fu! s:Open()
-	cal s:log(1)
-	cal s:getenv()
-	cal s:execextvar('enter')
-	sil! exe 'keepa' ( s:mw_pos == 'top' ? 'to' : 'bo' ) '1new ControlP'
-	cal s:buffunc(1)
-	let [s:bufnr, s:winw] = [bufnr('%'), winwidth(0)]
-	let [s:focus, s:prompt] = [1, ['', '', '']]
-	abc <buffer>
-	if !exists('s:hstry')
-		let hst = filereadable(s:gethistloc()[1]) ? s:gethistdata() : ['']
-		let s:hstry = empty(hst) || !s:maxhst ? [''] : hst
-	en
-	for [ke, va] in items(s:glbs) | if exists('+'.ke)
-		sil! exe 'let s:glb_'.ke.' = &'.ke.' | let &'.ke.' = '.string(va)
-	en | endfo
-	if s:opmul != '0' && has('signs')
-		sign define ctrlpmark text=+> texthl=CtrlPMark
-		hi def link CtrlPMark Search
-	en
-	cal s:setupblank()
-endf
-
-fu! s:Close()
-	cal s:buffunc(0)
-	if winnr('$') == 1
-		bw!
-	el
-		try | bun!
-		cat | clo! | endt
-		cal s:unmarksigns()
-	en
-	for key in keys(s:glbs) | if exists('+'.key)
-		sil! exe 'let &'.key.' = s:glb_'.key
-	en | endfo
-	if exists('s:glb_acd') | let &acd = s:glb_acd | en
-	let g:ctrlp_lines = []
-	if s:winres[1] >= &lines && s:winres[2] == winnr('$')
-		exe s:winres[0].s:winres[0]
-	en
-	unl! s:focus s:hisidx s:hstgot s:marked s:statypes s:cline s:init s:savestr
-		\ s:mrbs s:did_exp
-	cal ctrlp#recordhist()
-	cal s:execextvar('exit')
-	cal s:log(0)
-	let v:errmsg = s:ermsg
-	ec
-endf
-" * Clear caches {{{1
-fu! ctrlp#clr(...)
-	let [s:matches, g:ctrlp_new{ a:0 ? a:1 : 'cache' }] = [1, 1]
-endf
-
-fu! ctrlp#clra()
-	let cadir = ctrlp#utils#cachedir()
-	if isdirectory(cadir)
-		let cafiles = split(s:glbpath(s:fnesc(cadir, 'g', ','), '**', 1), "\n")
-		let eval = '!isdirectory(v:val) && v:val !~ ''\v[\/]cache[.a-z]+$|\.log$'''
-		sil! cal map(s:ifilter(cafiles, eval), 'delete(v:val)')
-	en
-	cal ctrlp#clr()
-endf
-
-fu! s:Reset(args)
-	let opts = has_key(a:args, 'opts') ? [a:args['opts']] : []
-	cal call('s:opts', opts)
-	cal s:autocmds()
-	cal ctrlp#utils#opts()
-	cal s:execextvar('opts')
-endf
-" * Files {{{1
-fu! ctrlp#files()
-	let cafile = ctrlp#utils#cachefile()
-	if g:ctrlp_newcache || !filereadable(cafile) || s:nocache(cafile)
-		let [lscmd, s:initcwd, g:ctrlp_allfiles] = [s:lsCmd(), s:dyncwd, []]
-		" Get the list of files
-		if empty(lscmd)
-			if !ctrlp#igncwd(s:dyncwd)
-				cal s:InitCustomFuncs()
-				cal s:GlobPath(s:fnesc(s:dyncwd, 'g', ','), 0)
-        cal s:CloseCustomFuncs()
-			en
-		el
-			sil! cal ctrlp#progress('Indexing...')
-			try | cal s:UserCmd(lscmd)
-			cat | retu [] | endt
-		en
-		" Remove base directory
-		cal ctrlp#rmbasedir(g:ctrlp_allfiles)
-		if len(g:ctrlp_allfiles) <= s:compare_lim
-			cal sort(g:ctrlp_allfiles, 'ctrlp#complen')
-		en
-		cal s:writecache(cafile)
-		let catime = getftime(cafile)
-	el
-		let catime = getftime(cafile)
-		if !( exists('s:initcwd') && s:initcwd == s:dyncwd )
-			\ || get(s:ficounts, s:dyncwd, [0, catime])[1] != catime
-			let s:initcwd = s:dyncwd
-			let g:ctrlp_allfiles = ctrlp#utils#readfile(cafile)
-		en
-	en
-	cal extend(s:ficounts, { s:dyncwd : [len(g:ctrlp_allfiles), catime] })
-	retu g:ctrlp_allfiles
-endf
-
-fu! s:InitCustomFuncs()
-	if s:igntype == 4 && has_key(s:usrign, 'func-init') && s:usrign['func-init'] != ''
-		exe call(s:usrign['func-init'], [])
-	en
-endf
-
-fu! s:CloseCustomFuncs()
-	if s:igntype == 4 && has_key(s:usrign, 'func-close') && s:usrign['func-close'] != ''
-		exe call(s:usrign['func-close'], [])
-	en
-endf
-
-fu! s:GlobPath(dirs, depth)
-	let entries = split(globpath(a:dirs, s:glob), "\n")
-	let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1]
-	cal extend(g:ctrlp_allfiles, dnf[1])
-	if !empty(dnf[0]) && !s:maxf(len(g:ctrlp_allfiles)) && depth <= s:maxdepth
-		sil! cal ctrlp#progress(len(g:ctrlp_allfiles), 1)
-		cal s:GlobPath(join(map(dnf[0], 's:fnesc(v:val, "g", ",")'), ','), depth)
-	en
-endf
-
-fu! s:UserCmd(lscmd)
-	let [path, lscmd] = [s:dyncwd, a:lscmd]
-	let do_ign =
-		\ type(s:usrcmd) == 4 && has_key(s:usrcmd, 'ignore') && s:usrcmd['ignore']
-	if do_ign && ctrlp#igncwd(s:cwd) | retu | en
-	if exists('+ssl') && &ssl
-		let [ssl, &ssl, path] = [&ssl, 0, tr(path, '/', '\')]
-	en
-	if (has('win32') || has('win64')) && match(&shellcmdflag, "/") != -1
-		let lscmd = substitute(lscmd, '\v(^|\&\&\s*)\zscd (/d)@!', 'cd /d ', '')
-	en
-	let path = exists('*shellescape') ? shellescape(path) : path
-	let g:ctrlp_allfiles = split(system(printf(lscmd, path)), "\n")
-	if exists('+ssl') && exists('ssl')
-		let &ssl = ssl
-		cal map(g:ctrlp_allfiles, 'tr(v:val, "\\", "/")')
-	en
-	if exists('s:vcscmd') && s:vcscmd
-		cal map(g:ctrlp_allfiles, 'tr(v:val, "/", "\\")')
-	en
-	if do_ign
-		if !empty(s:usrign)
-			let g:ctrlp_allfiles = ctrlp#dirnfile(g:ctrlp_allfiles)[1]
-		en
-		if &wig != ''
-			cal filter(g:ctrlp_allfiles, 'glob(v:val) != ""')
-		en
-	en
-endf
-
-fu! s:lsCmd()
-	let cmd = s:usrcmd
-	if type(cmd) == 1
-		retu cmd
-	elsei type(cmd) == 3 && len(cmd) >= 2 && cmd[:1] != ['', '']
-		if s:findroot(s:dyncwd, cmd[0], 0, 1) == []
-			retu len(cmd) == 3 ? cmd[2] : ''
-		en
-		let s:vcscmd = s:lash == '\'
-		retu cmd[1]
-	elsei type(cmd) == 4 && ( has_key(cmd, 'types') || has_key(cmd, 'fallback') )
-		let fndroot = []
-		if has_key(cmd, 'types') && cmd['types'] != {}
-			let [markrs, cmdtypes] = [[], values(cmd['types'])]
-			for pair in cmdtypes
-				cal add(markrs, pair[0])
-			endfo
-			let fndroot = s:findroot(s:dyncwd, markrs, 0, 1)
-		en
-		if fndroot == []
-			retu has_key(cmd, 'fallback') ? cmd['fallback'] : ''
-		en
-		for pair in cmdtypes
-			if pair[0] == fndroot[0] | brea | en
-		endfo
-		let s:vcscmd = s:lash == '\'
-		retu pair[1]
-	en
-endf
-" - Buffers {{{1
-fu! ctrlp#buffers(...)
-	let ids = sort(filter(range(1, bufnr('$')), '(empty(getbufvar(v:val, "&bt"))'
-		\ .' || s:isneovimterminal(v:val)) && getbufvar(v:val, "&bl")'), 's:compmreb')
-	if a:0 && a:1 == 'id'
-		retu ids
-	el
-		let bufs = [[], []]
-		for id in ids
-			let bname = bufname(id)
-			let ebname = bname == ''
-			let fname = fnamemodify(ebname ? '['.id.'*No Name]' : bname, ':.')
-			cal add(bufs[ebname], fname)
-		endfo
-		retu bufs[0] + bufs[1]
-	en
-endf
-" * MatchedItems() {{{1
-fu! s:MatchIt(items, pat, limit, exc)
-	let [lines, id] = [[], 0]
-	let pat =
-		\ s:byfname() ? map(split(a:pat, '^[^;]\+\\\@<!\zs;', 1), 's:martcs.v:val')
-		\ : s:martcs.a:pat
-	for item in a:items
-		let id += 1
-		try | if !( s:ispath && item == a:exc ) && call(s:mfunc, [item, pat]) >= 0
-			cal add(lines, item)
-		en | cat | brea | endt
-		if a:limit > 0 && len(lines) >= a:limit | brea | en
-	endfo
-	let s:mdata = [s:dyncwd, s:itemtype, s:regexp, s:sublist(a:items, id, -1)]
-	retu lines
-endf
-
-fu! s:MatchedItems(items, pat, limit)
-	let exc = exists('s:crfilerel') ? s:crfilerel : ''
-	let items = s:narrowable() ? s:matched + s:mdata[3] : a:items
-	if s:matcher != {}
-		let argms =
-			\ has_key(s:matcher, 'arg_type') && s:matcher['arg_type'] == 'dict' ? [{
-			\ 'items':  items,
-			\ 'str':    a:pat,
-			\ 'limit':  a:limit,
-			\ 'mmode':  s:mmode(),
-			\ 'ispath': s:ispath,
-			\ 'crfile': exc,
-			\ 'regex':  s:regexp,
-			\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
-		let lines = call(s:matcher['match'], argms, s:matcher)
-	el
-		let lines = s:MatchIt(items, a:pat, a:limit, exc)
-	en
-	let s:matches = len(lines)
-	unl! s:did_exp
-	retu lines
-endf
-
-fu! s:SplitPattern(str)
-	let str = a:str
-	let s:savestr = str
-	if s:regexp
-		let pat = s:regexfilter(str)
-	el
-		let lst = split(str, '\zs')
-		if exists('+ssl') && !&ssl
-			cal map(lst, 'escape(v:val, ''\'')')
-		en
-		for each in ['^', '$', '.']
-			cal map(lst, 'escape(v:val, each)')
-		endfo
-	en
-	if exists('lst')
-		let pat = ''
-		if !empty(lst)
-			if s:byfname() && index(lst, ';') > 0
-				let fbar = index(lst, ';')
-				let lst_1 = s:sublist(lst, 0, fbar - 1)
-				let lst_2 = len(lst) - 1 > fbar ? s:sublist(lst, fbar + 1, -1) : ['']
-				let pat = s:buildpat(lst_1).';'.s:buildpat(lst_2)
-			el
-				let pat = s:buildpat(lst)
-			en
-		en
-	en
-	retu escape(pat, '~')
-endf
-" * BuildPrompt() {{{1
-fu! s:Render(lines, pat)
-	let [&ma, lines, s:res_count] = [1, a:lines, len(a:lines)]
-	let height = min([max([s:mw_min, s:res_count]), s:winmaxh])
-	let pat = s:byfname() ? split(a:pat, '^[^;]\+\\\@<!\zs;', 1)[0] : a:pat
-	let cur_cmd = 'keepj norm! '.( s:mw_order == 'btt' ? 'G' : 'gg' ).'1|'
-	" Setup the match window
-	sil! exe '%d _ | res' height
-	" Print the new items
-	if empty(lines)
-		let [s:matched, s:lines] = [[], []]
-		let lines = [' == NO ENTRIES ==']
-		cal setline(1, s:offset(lines, height - 1))
-		setl noma nocul
-		exe cur_cmd
-		cal s:unmarksigns()
-		if s:dohighlight() | cal clearmatches() | en
-		retu
-	en
-	let s:matched = copy(lines)
-	" Sorting
-	if !s:nosort()
-		let s:compat = s:martcs.pat
-		cal sort(lines, 's:mixedsort')
-		unl s:compat
-	en
-	if s:mw_order == 'btt' | cal reverse(lines) | en
-	let s:lines = copy(lines)
-	cal map(lines, 's:formatline(v:val)')
-	cal setline(1, s:offset(lines, height))
-	setl noma cul
-	exe cur_cmd
-	cal s:unmarksigns()
-	cal s:remarksigns()
-	if exists('s:cline') && s:nolim != 1
-		cal cursor(s:cline, 1)
-	en
-	" Highlighting
-	if s:dohighlight()
-		cal s:highlight(pat, s:mathi[1])
-	en
-endf
-
-fu! s:Update(str)
-	" Get the previous string if existed
-	let oldstr = exists('s:savestr') ? s:savestr : ''
-	" Get the new string sans tail
-	let str = s:sanstail(a:str)
-	" Stop if the string's unchanged
-	if str == oldstr && !empty(str) && !exists('s:force') | retu | en
-	" Optionally send the string to a custom validate function
-	if s:validate != '' | let str = call(s:validate, [str]) | en
-	let s:martcs = &scs && str =~ '\u' ? '\C' : ''
-	let pat = s:matcher == {} ? s:SplitPattern(str) : str
-	let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
-		\ : s:MatchedItems(g:ctrlp_lines, pat, s:mw_res)
-	cal s:Render(lines, pat)
-	return lines
-endf
-
-fu! s:ForceUpdate()
-	sil! cal s:Update(escape(s:getinput(), '\'))
-endf
-
-fu! s:BuildPrompt(upd)
-	let base = ( s:regexp ? 'r' : '>' ).( s:byfname() ? 'd' : '>' ).'> '
-	let str = escape(s:getinput(), '\')
-	let lazy = str == '' || exists('s:force') || !has('autocmd') ? 0 : s:lazy
-	if a:upd && !lazy && ( s:matches || s:regexp || exists('s:did_exp')
-		\ || str =~ '\(\\\(<\|>\)\|[*|]\)\|\(\\\:\([^:]\|\\:\)*$\)' )
-		sil! cal s:Update(str)
-	en
-	sil! cal ctrlp#statusline()
-	" Toggling
-	let [hiactive, hicursor, base] = s:focus
-		\ ? ['CtrlPPrtText', 'CtrlPPrtCursor', base]
-		\ : ['CtrlPPrtBase', 'CtrlPPrtBase', tr(base, '>', '-')]
-	let hibase = 'CtrlPPrtBase'
-	" Build it
-	redr
-	let prt = copy(s:prompt)
-	cal map(prt, 'escape(v:val, ''"\'')')
-	exe 'echoh' hibase '| echon "'.base.'"
-		\ | echoh' hiactive '| echon "'.prt[0].'"
-		\ | echoh' hicursor '| echon "'.prt[1].'"
-		\ | echoh' hiactive '| echon "'.prt[2].'" | echoh None'
-	" Append the cursor at the end
-	if empty(prt[1]) && s:focus
-		exe 'echoh' hibase '| echon "_" | echoh None'
-	en
-endf
-" - SetDefTxt() {{{1
-fu! s:SetDefTxt()
-	if s:deftxt == '0' || ( s:deftxt == 1 && !s:ispath ) | retu | en
-	let txt = s:deftxt
-	if !type(txt)
-		let path = s:crfpath.s:lash(s:crfpath)
-		let txt = txt && !stridx(path, s:dyncwd) ? ctrlp#rmbasedir([path])[0] : ''
-	en
-	let s:prompt[0] = txt
-endf
-" ** Prt Actions {{{1
-" Editing {{{2
-fu! s:PrtClear()
-	if !s:focus | retu | en
-	unl! s:hstgot
-	let [s:prompt, s:matches] = [['', '', ''], 1]
-	cal s:BuildPrompt(1)
-endf
-
-fu! s:PrtAdd(char)
-	unl! s:hstgot
-	let s:act_add = 1
-	let s:prompt[0] .= a:char
-	cal s:BuildPrompt(1)
-	unl s:act_add
-endf
-
-fu! s:PrtBS()
-	if !s:focus | retu | en
-	unl! s:hstgot
-	let [s:prompt[0], s:matches] = [substitute(s:prompt[0], '.$', '', ''), 1]
-	cal s:BuildPrompt(1)
-endf
-
-fu! s:PrtDelete()
-	if !s:focus | retu | en
-	unl! s:hstgot
-	let [prt, s:matches] = [s:prompt, 1]
-	let prt[1] = matchstr(prt[2], '^.')
-	let prt[2] = substitute(prt[2], '^.', '', '')
-	cal s:BuildPrompt(1)
-endf
-
-fu! s:PrtDeleteWord()
-	if !s:focus | retu | en
-	unl! s:hstgot
-	let [str, s:matches] = [s:prompt[0], 1]
-	let str = str =~ '\W\w\+$' ? matchstr(str, '^.\+\W\ze\w\+$')
-		\ : str =~ '\w\W\+$' ? matchstr(str, '^.\+\w\ze\W\+$')
-		\ : str =~ '\s\+$' ? matchstr(str, '^.*\S\ze\s\+$')
-		\ : str =~ '\v^(\S+|\s+)$' ? '' : str
-	let s:prompt[0] = str
-	cal s:BuildPrompt(1)
-endf
-
-fu! s:PrtInsert(...)
-	if !s:focus | retu | en
-	let type = !a:0 ? '' : a:1
-	if !a:0
-		let type = s:insertstr()
-		if type == 'cancel' | retu | en
-	en
-	if type ==# 'r'
-		let regcont = s:getregs()
-		if regcont < 0 | retu | en
-	en
-	unl! s:hstgot
-	let s:act_add = 1
-	let s:prompt[0] .= type ==# 'w' ? s:crword
-		\ : type ==# 'f' ? s:crgfile
-		\ : type ==# 's' ? s:regisfilter('/')
-		\ : type ==# 'v' ? s:crvisual
-		\ : type ==# 'c' ? s:regisfilter('+')
-		\ : type ==# 'r' ? regcont : ''
-	cal s:BuildPrompt(1)
-	unl s:act_add
-endf
-
-fu! s:PrtExpandDir()
-	if !s:focus | retu | en
-	let str = s:getinput('c')
-	if str =~ '\v^\@(cd|lc[hd]?|chd)\s.+' && s:spi
-		let hasat = split(str, '\v^\@(cd|lc[hd]?|chd)\s*\zs')
-		let str = get(hasat, 1, '')
-		if str =~# '\v^[~$]\i{-}[\/]?|^#(\<?\d+)?:(p|h|8|\~|\.|g?s+)'
-			let str = expand(s:fnesc(str, 'g'))
-		elsei str =~# '\v^(\%|\<c\h{4}\>):(p|h|8|\~|\.|g?s+)'
-			let spc = str =~# '^%' ? s:crfile
-				\ : str =~# '^<cfile>' ? s:crgfile
-				\ : str =~# '^<cword>' ? s:crword
-				\ : str =~# '^<cWORD>' ? s:crnbword : ''
-			let pat = '(:(p|h|8|\~|\.|g?s(.)[^\3]*\3[^\3]*\3))+'
-			let mdr = matchstr(str, '\v^[^:]+\zs'.pat)
-			let nmd = matchstr(str, '\v^[^:]+'.pat.'\zs.{-}$')
-			let str = fnamemodify(s:fnesc(spc, 'g'), mdr).nmd
-		en
-	en
-	if str == '' | retu | en
-	unl! s:hstgot
-	let s:act_add = 1
-	let [base, seed] = s:headntail(str)
-	if str =~# '^[\/]'
-		let base = expand('/').base
-	en
-	let dirs = s:dircompl(base, seed)
-	if len(dirs) == 1
-		let str = dirs[0]
-	elsei len(dirs) > 1
-		let str .= s:findcommon(dirs, str)
-	en
-	let s:prompt[0] = exists('hasat') ? hasat[0].str : str
-	cal s:BuildPrompt(1)
-	unl s:act_add
-endf
-" Movement {{{2
-fu! s:PrtCurLeft()
-	if !s:focus | retu | en
-	let prt = s:prompt
-	if !empty(prt[0])
-		let s:prompt = [substitute(prt[0], '.$', '', ''), matchstr(prt[0], '.$'),
-			\ prt[1] . prt[2]]
-	en
-	cal s:BuildPrompt(0)
-endf
-
-fu! s:PrtCurRight()
-	if !s:focus | retu | en
-	let prt = s:prompt
-	let s:prompt = [prt[0] . prt[1], matchstr(prt[2], '^.'),
-		\ substitute(prt[2], '^.', '', '')]
-	cal s:BuildPrompt(0)
-endf
-
-fu! s:PrtCurStart()
-	if !s:focus | retu | en
-	let str = join(s:prompt, '')
-	let s:prompt = ['', matchstr(str, '^.'), substitute(str, '^.', '', '')]
-	cal s:BuildPrompt(0)
-endf
-
-fu! s:PrtCurEnd()
-	if !s:focus | retu | en
-	let s:prompt = [join(s:prompt, ''), '', '']
-	cal s:BuildPrompt(0)
-endf
-
-fu! s:PrtSelectMove(dir)
-	let wht = winheight(0)
-	let dirs = {'t': 'gg','b': 'G','j': 'j','k': 'k','u': wht.'k','d': wht.'j'}
-	exe 'keepj norm!' dirs[a:dir]
-	if s:nolim != 1 | let s:cline = line('.') | en
-	if line('$') > winheight(0) | cal s:BuildPrompt(0) | en
-endf
-
-fu! s:PrtSelectJump(char)
-	let lines = copy(s:lines)
-	if s:byfname()
-		cal map(lines, 'split(v:val, ''[\/]\ze[^\/]\+$'')[-1]')
-	en
-	" Cycle through matches, use s:jmpchr to store last jump
-	let chr = escape(matchstr(a:char, '^.'), '.~')
-	let smartcs = &scs && chr =~ '\u' ? '\C' : ''
-	if match(lines, smartcs.'^'.chr) >= 0
-		" If not exists or does but not for the same char
-		let pos = match(lines, smartcs.'^'.chr)
-		if !exists('s:jmpchr') || ( exists('s:jmpchr') && s:jmpchr[0] != chr )
-			let [jmpln, s:jmpchr] = [pos, [chr, pos]]
-		elsei exists('s:jmpchr') && s:jmpchr[0] == chr
-			" Start of lines
-			if s:jmpchr[1] == -1 | let s:jmpchr[1] = pos | en
-			let npos = match(lines, smartcs.'^'.chr, s:jmpchr[1] + 1)
-			let [jmpln, s:jmpchr] = [npos == -1 ? pos : npos, [chr, npos]]
-		en
-		exe 'keepj norm!' ( jmpln + 1 ).'G'
-		if s:nolim != 1 | let s:cline = line('.') | en
-		if line('$') > winheight(0) | cal s:BuildPrompt(0) | en
-	en
-endf
-" Misc {{{2
-fu! s:PrtFocusMap(char)
-	cal call(( s:focus ? 's:PrtAdd' : 's:PrtSelectJump' ), [a:char])
-endf
-
-fu! s:PrtClearCache()
-	if s:itemtype == 0
-		cal ctrlp#clr()
-	elsei s:itemtype > 2
-		cal ctrlp#clr(s:statypes[s:itemtype][1])
-	en
-	if s:itemtype == 2
-		let g:ctrlp_lines = ctrlp#mrufiles#refresh()
-	el
-		cal ctrlp#setlines()
-	en
-	let s:force = 1
-	cal s:BuildPrompt(1)
-	unl s:force
-endf
-
-fu! s:PrtDeleteEnt()
-	if s:itemtype == 2
-		cal s:PrtDeleteMRU()
-	elsei type(s:getextvar('wipe')) == 1
-		cal s:delent(s:getextvar('wipe'))
-	en
-endf
-
-fu! s:PrtDeleteMRU()
-	if s:itemtype == 2
-		cal s:delent('ctrlp#mrufiles#remove')
-	en
-endf
-
-fu! s:PrtExit()
-	if bufnr('%') == s:bufnr && bufname('%') == 'ControlP'
-		noa cal s:Close()
-		noa winc p
-	en
-endf
-
-fu! s:PrtHistory(...)
-	if !s:focus || !s:maxhst | retu | en
-	let [str, hst, s:matches] = [join(s:prompt, ''), s:hstry, 1]
-	" Save to history if not saved before
-	let [hst[0], hslen] = [exists('s:hstgot') ? hst[0] : str, len(hst)]
-	let idx = exists('s:hisidx') ? s:hisidx + a:1 : a:1
-	" Limit idx within 0 and hslen
-	let idx = idx < 0 ? 0 : idx >= hslen ? hslen > 1 ? hslen - 1 : 0 : idx
-	let s:prompt = [hst[idx], '', '']
-	let [s:hisidx, s:hstgot, s:force] = [idx, 1, 1]
-	cal s:BuildPrompt(1)
-	unl s:force
-endf
-"}}}1
-" * Mappings {{{1
-fu! s:MapNorms()
-	if exists('s:nmapped') && s:nmapped == s:bufnr | retu | en
-	let pcmd = "nn \<buffer> \<silent> \<k%s> :\<c-u>cal \<SID>%s(\"%s\")\<cr>"
-	let cmd = substitute(pcmd, 'k%s', 'char-%d', '')
-	let pfunc = 'PrtFocusMap'
-	let ranges = [32, 33, 125, 126] + range(35, 91) + range(93, 123)
-	for each in [34, 92, 124]
-		exe printf(cmd, each, pfunc, escape(nr2char(each), '"|\'))
-	endfo
-	for each in ranges
-		exe printf(cmd, each, pfunc, nr2char(each))
-	endfo
-	for each in range(0, 9)
-		exe printf(pcmd, each, pfunc, each)
-	endfo
-	for [ke, va] in items(s:kprange)
-		exe printf(pcmd, ke, pfunc, va)
-	endfo
-	let s:nmapped = s:bufnr
-endf
-
-fu! s:MapSpecs()
-	if !( exists('s:smapped') && s:smapped == s:bufnr )
-		" Correct arrow keys in terminal
-		if ( has('termresponse') && v:termresponse =~ "\<ESC>" )
-			\ || &term =~? '\vxterm|<k?vt|gnome|screen|linux|ansi'
-			for each in ['\A <up>','\B <down>','\C <right>','\D <left>']
-				exe s:lcmap.' <esc>['.each
-			endfo
-		en
-	en
-	for [ke, va] in items(s:prtmaps) | for kp in va
-		exe s:lcmap kp ':<c-u>cal <SID>'.ke.'<cr>'
-	endfo | endfo
-	let s:smapped = s:bufnr
-endf
-
-fu! s:KeyLoop()
-	let t_ve = &t_ve
-	set t_ve=
-	try
-		wh exists('s:init') && s:keyloop
-			redr
-			let nr = getchar()
-			let chr = !type(nr) ? nr2char(nr) : nr
-			if nr >=# 0x20
-				cal s:PrtFocusMap(chr)
-			el
-				let cmd = matchstr(maparg(chr), ':<C-U>\zs.\+\ze<CR>$')
-				exe ( cmd != '' ? cmd : 'norm '.chr )
-			en
-		endw
-	fina
-		let &t_ve = t_ve
-	endt
-endf
-" * Toggling {{{1
-fu! s:ToggleFocus()
-	let s:focus = !s:focus
-	cal s:BuildPrompt(0)
-endf
-
-fu! s:ToggleRegex()
-	let s:regexp = !s:regexp
-	cal s:PrtSwitcher()
-endf
-
-fu! s:ToggleByFname()
-	if s:ispath
-		let s:byfname = !s:byfname
-		let s:mfunc = s:mfunc()
-		cal s:PrtSwitcher()
-	en
-endf
-
-fu! s:ToggleType(dir)
-	let max = len(g:ctrlp_ext_vars) + 2
-	let next = s:walker(max, s:itemtype, a:dir)
-	cal ctrlp#syntax()
-	cal ctrlp#setlines(next)
-	cal s:PrtSwitcher()
-endf
-
-fu! s:ToggleKeyLoop()
-	let s:keyloop = !s:keyloop
-	if exists('+imd')
-		let &imd = !s:keyloop
-	en
-	if s:keyloop
-		let [&ut, s:lazy] = [0, 0]
-		cal s:KeyLoop()
-	elsei has_key(s:glbs, 'ut')
-		let [&ut, s:lazy] = [s:glbs['ut'], 1]
-	en
-endf
-
-fu! s:ToggleMRURelative()
-	cal ctrlp#mrufiles#tgrel()
-	cal s:PrtClearCache()
-endf
-
-fu! s:PrtSwitcher()
-	let [s:force, s:matches] = [1, 1]
-	cal s:BuildPrompt(1)
-	unl s:force
-endf
-" - SetWD() {{{1
-fu! s:SetWD(args)
-	if has_key(a:args, 'args') && stridx(a:args['args'], '--dir') >= 0
-		\ && exists('s:dyncwd')
-		cal ctrlp#setdir(s:dyncwd) | retu
-	en
-	if has_key(a:args, 'dir') && a:args['dir'] != ''
-		cal ctrlp#setdir(a:args['dir']) | retu
-	en
-	let pmodes = has_key(a:args, 'mode') ? a:args['mode'] : s:pathmode
-	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
-	if (!type(pmodes))
-		let pmodes =
-			\ pmodes == 0 ? '' :
-			\ pmodes == 1 ? 'a' :
-			\ pmodes == 2 ? 'r' :
-			\ 'c'
-	en
-	let spath = pmodes =~ 'd' ? s:dyncwd : pmodes =~ 'w' ? s:cwd : s:crfpath
-	for pmode in split(pmodes, '\zs')
-		if ctrlp#setpathmode(pmode, spath) | retu | en
-	endfo
-endf
-" * AcceptSelection() {{{1
-fu! ctrlp#acceptfile(...)
-	let useb = 0
-	if a:0 == 1 && type(a:1) == 4
-		let [md, line] = [a:1['action'], a:1['line']]
-		let atl = has_key(a:1, 'tail') ? a:1['tail'] : ''
-	el
-		let [md, line] = [a:1, a:2]
-		let atl = a:0 > 2 ? a:3 : ''
-	en
-	if !type(line)
-		let [filpath, bufnr, useb] = [line, line, 1]
-	el
-		let filpath = fnamemodify(line, ':p')
-		if s:nonamecond(line, filpath)
-			let bufnr = str2nr(matchstr(line, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
-			let [filpath, useb] = [bufnr, 1]
-		el
-			let bufnr = bufnr('^'.filpath.'$')
-		en
-	en
-	cal s:PrtExit()
-	let tail = s:tail()
-	let j2l = atl != '' ? atl : matchstr(tail, '^ +\zs\d\+$')
-	if ( s:jmptobuf =~ md || ( !empty(s:jmptobuf) && s:jmptobuf !~# '\v^0$' && md =~ '[et]' ) ) && bufnr > 0
-		\ && !( md == 'e' && bufnr == bufnr('%') )
-		let [jmpb, bufwinnr] = [1, bufwinnr(bufnr)]
-		let buftab = ( s:jmptobuf =~# '[tTVH]' || s:jmptobuf > 1 )
-			\ ? s:buftab(bufnr, md) : [0, 0]
-	en
-	" Switch to existing buffer or open new one
-	if exists('jmpb') && bufwinnr > 0
-		\ && !( md == 't' && ( s:jmptobuf !~# toupper(md) || buftab[0] ) )
-		exe bufwinnr.'winc w'
-		if j2l | cal ctrlp#j2l(j2l) | en
-	elsei exists('jmpb') && buftab[0]
-		\ && !( md =~ '[evh]' && s:jmptobuf !~# toupper(md) )
-		exe 'tabn' buftab[0]
-		exe buftab[1].'winc w'
-		if j2l | cal ctrlp#j2l(j2l) | en
-	el
-		" Determine the command to use
-		let useb = bufnr > 0 && buflisted(bufnr) && ( empty(tail) || useb )
-		let cmd =
-			\ md == 't' || s:splitwin == 1 ? ( useb ? 'tab sb' : 'tabe' ) :
-			\ md == 'h' || s:splitwin == 2 ? ( useb ? 'sb' : 'new' ) :
-			\ md == 'v' || s:splitwin == 3 ? ( useb ? 'vert sb' : 'vne' ) :
-			\ call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
-		" Reset &switchbuf option
-		let [swb, &swb] = [&swb, '']
-		" Open new window/buffer
-		let [fid, tail] = [( useb ? bufnr : filpath ), ( atl != '' ? ' +'.atl : tail )]
-		let args = [cmd, fid, tail, 1, [useb, j2l]]
-		cal call('s:openfile', args)
-		let &swb = swb
-	en
-endf
-
-fu! s:SpecInputs(str)
-	if a:str =~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*)$' && s:spi
-		let cwd = s:dyncwd
-		cal ctrlp#setdir(a:str =~ '^\.\.\.*$' ?
-			\ '../'.repeat('../', strlen(a:str) - 2) : a:str)
-		if cwd != s:dyncwd | cal ctrlp#setlines() | en
-		cal s:PrtClear()
-		retu 1
-	elsei a:str == s:lash && s:spi
-		cal s:SetWD({ 'mode': 'rd' })
-		cal ctrlp#setlines()
-		cal s:PrtClear()
-		retu 1
-	elsei a:str =~ '^@.\+' && s:spi
-		retu s:at(a:str)
-	elsei a:str == '?'
-		cal s:PrtExit()
-		let hlpwin = &columns > 159 ? '| vert res 80' : ''
-		sil! exe 'bo vert h ctrlp-mappings' hlpwin '| norm! 0'
-		retu 1
-	en
-	retu 0
-endf
-
-fu! s:AcceptSelection(action)
-	let [md, icr] = [a:action[0], match(a:action, 'r') >= 0]
-	let subm = icr || ( !icr && md == 'e' )
-	if !subm && s:OpenMulti(md) != -1 | retu | en
-	let str = s:getinput()
-	if subm | if s:SpecInputs(str) | retu | en | en
-	" Get the selected line
-	let line = ctrlp#getcline()
-	if !subm && !s:itemtype && line == '' && line('.') > s:offset
-		\ && str !~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*|/|\\|\?|\@.+)$'
-		cal s:CreateNewFile(md) | retu
-	en
-	if empty(line) | retu | en
-	" Do something with it
-	if s:openfunc != {} && has_key(s:openfunc, s:ctype)
-		let actfunc = s:openfunc[s:ctype]
-		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'list'
-	el
-		if s:itemtype < 3
-			let [actfunc, type] = ['ctrlp#acceptfile', 'dict']
-		el
-			let [actfunc, exttype] = [s:getextvar('accept'), s:getextvar('act_farg')]
-			let type = exttype == 'dict' ? exttype : 'list'
-		en
-	en
-	let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr }]
-		\ : [md, line]
-	cal call(actfunc, actargs)
-endf
-" - CreateNewFile() {{{1
-fu! s:CreateNewFile(...)
-	let [md, str] = ['', s:getinput('n')]
-	if empty(str) | retu | en
-	if s:argmap && !a:0
-		" Get the extra argument
-		let md = s:argmaps(md, 1)
-		if md == 'cancel' | retu | en
-	en
-	let str = s:sanstail(str)
-	let [base, fname] = s:headntail(str)
-	if fname =~ '^[\/]$' | retu | en
-	if exists('s:marked') && len(s:marked)
-		" Use the first marked file's path
-		let path = fnamemodify(values(s:marked)[0], ':p:h')
-		let base = path.s:lash(path).base
-		let str = fnamemodify(base.s:lash.fname, ':.')
-	en
-	if base != '' | if isdirectory(ctrlp#utils#mkdir(base))
-		let optyp = str | en | el | let optyp = fname
-	en
-	if !exists('optyp') | retu | en
-	let [filpath, tail] = [fnamemodify(optyp, ':p'), s:tail()]
-	if !stridx(filpath, s:dyncwd) | cal s:insertcache(str) | en
-	cal s:PrtExit()
-	let cmd = md == 'r' ? ctrlp#normcmd('e') :
-		\ s:newfop =~ '1\|t' || ( a:0 && a:1 == 't' ) || md == 't' ? 'tabe' :
-		\ s:newfop =~ '2\|h' || ( a:0 && a:1 == 'h' ) || md == 'h' ? 'new' :
-		\ s:newfop =~ '3\|v' || ( a:0 && a:1 == 'v' ) || md == 'v' ? 'vne' :
-		\ ctrlp#normcmd('e')
-	cal s:openfile(cmd, filpath, tail, 1)
-endf
-" * OpenMulti() {{{1
-fu! s:MarkToOpen()
-	if s:bufnr <= 0 || s:opmul == '0'
-		\ || ( s:itemtype > 2 && s:getextvar('opmul') != 1 )
-		retu
-	en
-	let line = ctrlp#getcline()
-	if empty(line) | retu | en
-	let filpath = s:ispath ? fnamemodify(line, ':p') : line
-	if exists('s:marked') && s:dictindex(s:marked, filpath) > 0
-		" Unmark and remove the file from s:marked
-		let key = s:dictindex(s:marked, filpath)
-		cal remove(s:marked, key)
-		if empty(s:marked) | unl s:marked | en
-		if has('signs')
-			exe 'sign unplace' key 'buffer='.s:bufnr
-		en
-	el
-		" Add to s:marked and place a new sign
-		if exists('s:marked')
-			let vac = s:vacantdict(s:marked)
-			let key = empty(vac) ? len(s:marked) + 1 : vac[0]
-			let s:marked = extend(s:marked, { key : filpath })
-		el
-			let [key, s:marked] = [1, { 1 : filpath }]
-		en
-		if has('signs')
-			exe 'sign place' key 'line='.line('.').' name=ctrlpmark buffer='.s:bufnr
-		en
-	en
-	sil! cal ctrlp#statusline()
-endf
-
-fu! s:OpenMulti(...)
-	let has_marked = exists('s:marked')
-	if ( !has_marked && a:0 ) || s:opmul == '0' || !s:ispath
-		\ || ( s:itemtype > 2 && s:getextvar('opmul') != 1 )
-		retu -1
-	en
-	" Get the options
-	let [nr, md] = [matchstr(s:opmul, '\d\+'), matchstr(s:opmul, '[thvi]')]
-	let [ur, jf] = [s:opmul =~ 'r', s:opmul =~ 'j']
-	let md = a:0 ? a:1 : ( md == '' ? 'v' : md )
-	let nopt = exists('g:ctrlp_open_multiple_files')
-	if !has_marked
-		let line = ctrlp#getcline()
-		if line == '' | retu | en
-		let marked = { 1 : fnamemodify(line, ':p') }
-		let [nr, ur, jf, nopt] = ['1', 0, 0, 1]
-	en
-	if ( s:argmap || !has_marked ) && !a:0
-		let md = s:argmaps(md, !has_marked ? 2 : 0)
-		if md == 'c'
-			cal s:unmarksigns()
-			unl! s:marked
-			cal s:BuildPrompt(0)
-		elsei !has_marked && md =~ '[axd]'
-			retu s:OpenNoMarks(md, line)
-		en
-		if md =~ '\v^c(ancel)?$' | retu | en
-		let nr = nr == '0' ? ( nopt ? '' : '1' ) : nr
-		let ur = !has_marked && md == 'r' ? 1 : ur
-	en
-	let mkd = values(has_marked ? s:marked : marked)
-	cal s:sanstail(join(s:prompt, ''))
-	cal s:PrtExit()
-	if nr == '0' || md == 'i'
-		retu map(mkd, "s:openfile('bad', v:val, '', 0)")
-	en
-	let tail = s:tail()
-	let [emptytail, bufnr] = [empty(tail), bufnr('^'.mkd[0].'$')]
-	let useb = bufnr > 0 && buflisted(bufnr) && emptytail
-	" Move to a replaceable window
-	let ncmd = ( useb ? ['b', 'bo vert sb'] : ['e', 'bo vne'] )
-		\ + ( ur ? [] : ['ignruw'] )
-	let fst = call('ctrlp#normcmd', ncmd)
-	" Check if the current window has a replaceable buffer
-	let repabl = !( md == 't' && !ur ) && empty(bufname('%')) && empty(&l:ft)
-	" Commands for the rest of the files
-	let [ic, cmds] = [1, { 'v': ['vert sb', 'vne'], 'h': ['sb', 'new'],
-		\ 't': ['tab sb', 'tabe'] }]
-	let [swb, &swb] = [&swb, '']
-	if md == 't' && ctrlp#tabcount() < tabpagenr()
-		let s:tabct = ctrlp#tabcount()
-	en
-	" Open the files
-	for va in mkd
-		let bufnr = bufnr('^'.va.'$')
-		if bufnr < 0 && getftype(va) == '' | con | en
-		let useb = bufnr > 0 && buflisted(bufnr) && emptytail
-		let snd = md != '' && has_key(cmds, md) ?
-			\ ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' )
-		let cmd = ic == 1 && ( !( !ur && fst =~ '^[eb]$' ) || repabl ) ? fst : snd
-		let conds = [( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 ),
-			\ nr != '' && nr < ic]
-		if conds[nopt]
-			if !buflisted(bufnr) | cal s:openfile('bad', va, '', 0) | en
-		el
-			cal s:openfile(cmd, useb ? bufnr : va, tail, ic == 1)
-			if jf | if ic == 1
-				let crpos = [tabpagenr(), winnr()]
-			el
-				let crpos[0] += tabpagenr() <= crpos[0]
-				let crpos[1] += winnr() <= crpos[1]
-			en | en
-			let ic += 1
-		en
-	endfo
-	if jf && exists('crpos') && ic > 2
-		exe ( md == 't' ? 'tabn '.crpos[0] : crpos[1].'winc w' )
-	en
-	let &swb = swb
-	unl! s:tabct
-endf
-
-fu! s:OpenNoMarks(md, line)
-	if a:md == 'a'
-		let [s:marked, key] = [{}, 1]
-		for line in s:lines
-			let s:marked = extend(s:marked, { key : fnamemodify(line, ':p') })
-			let key += 1
-		endfo
-		cal s:remarksigns()
-		cal s:BuildPrompt(0)
-	elsei a:md == 'x'
-		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'dict'
-		let argms = type == 'dict' ? [{ 'action': a:md, 'line': a:line }]
-			\ : [a:md, a:line]
-		cal call(s:openfunc[s:ctype], argms, s:openfunc)
-	elsei a:md == 'd'
-		let dir = fnamemodify(a:line, ':h')
-		if isdirectory(dir)
-			cal ctrlp#setdir(dir)
-			cal ctrlp#switchtype(0)
-			cal ctrlp#recordhist()
-			cal s:PrtClear()
-		en
-	en
-endf
-" ** Helper functions {{{1
-" Sorting {{{2
-fu! ctrlp#complen(...)
-	" By length
-	let [len1, len2] = [strlen(a:1), strlen(a:2)]
-	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
-endf
-
-fu! s:compmatlen(...)
-	" By match length
-	let mln1 = s:shortest(s:matchlens(a:1, s:compat))
-	let mln2 = s:shortest(s:matchlens(a:2, s:compat))
-	retu mln1 == mln2 ? 0 : mln1 > mln2 ? 1 : -1
-endf
-
-fu! s:comptime(...)
-	" By last modified time
-	let [time1, time2] = [getftime(a:1), getftime(a:2)]
-	retu time1 == time2 ? 0 : time1 < time2 ? 1 : -1
-endf
-
-fu! s:compmreb(...)
-	" By last entered time (bufnr)
-	let [id1, id2] = [index(s:mrbs, a:1), index(s:mrbs, a:2)]
-	retu id1 == id2 ? 0 : id1 > id2 ? 1 : -1
-endf
-
-fu! s:compmref(...)
-	" By last entered time (MRU)
-	let [id1, id2] = [index(g:ctrlp_lines, a:1), index(g:ctrlp_lines, a:2)]
-	retu id1 == id2 ? 0 : id1 > id2 ? 1 : -1
-endf
-
-fu! s:comparent(...)
-	" By same parent dir
-	if !stridx(s:crfpath, s:dyncwd)
-		let [as1, as2] = [s:dyncwd.s:lash().a:1, s:dyncwd.s:lash().a:2]
-		let [loc1, loc2] = [s:getparent(as1), s:getparent(as2)]
-		if loc1 == s:crfpath && loc2 != s:crfpath | retu -1 | en
-		if loc2 == s:crfpath && loc1 != s:crfpath | retu 1  | en
-		retu 0
-	en
-	retu 0
-endf
-
-fu! s:compfnlen(...)
-	" By filename length
-	let len1 = strlen(split(a:1, s:lash)[-1])
-	let len2 = strlen(split(a:2, s:lash)[-1])
-	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
-endf
-
-fu! s:matchlens(str, pat, ...)
-	if empty(a:pat) || index(['^', '$'], a:pat) >= 0 | retu {} | en
-	let st   = a:0 ? a:1 : 0
-	let lens = a:0 >= 2 ? a:2 : {}
-	let nr   = a:0 >= 3 ? a:3 : 0
-	if nr > 20 | retu {} | en
-	if match(a:str, a:pat, st) >= 0
-		let [mst, mnd] = [matchstr(a:str, a:pat, st), matchend(a:str, a:pat, st)]
-		let lens = extend(lens, { nr : [strlen(mst), mst] })
-		let lens = s:matchlens(a:str, a:pat, mnd, lens, nr + 1)
-	en
-	retu lens
-endf
-
-fu! s:shortest(lens)
-	retu min(map(values(a:lens), 'v:val[0]'))
-endf
-
-fu! s:mixedsort(...)
-	if s:itemtype == 1
-		let pat = '[\/]\?\[\d\+\*No Name\]$'
-		if a:1 =~# pat && a:2 =~# pat | retu 0
-		elsei a:1 =~# pat | retu 1
-		elsei a:2 =~# pat | retu -1 | en
-	en
-	let [cln, cml] = [ctrlp#complen(a:1, a:2), s:compmatlen(a:1, a:2)]
-	if s:ispath
-		let ms = []
-		if s:res_count < 21
-			let ms += [s:compfnlen(a:1, a:2)]
-			if s:itemtype !~ '^[12]$' | let ms += [s:comptime(a:1, a:2)] | en
-			if !s:itemtype | let ms += [s:comparent(a:1, a:2)] | en
-		en
-		if s:itemtype =~ '^[12]$'
-			let ms += [s:compmref(a:1, a:2)]
-			let cln = cml ? cln : 0
-		en
-		let ms += [cml, 0, 0, 0]
-		let mp = call('s:multipliers', ms[:3])
-		retu cln + ms[0] * mp[0] + ms[1] * mp[1] + ms[2] * mp[2] + ms[3] * mp[3]
-	en
-	retu cln + cml * 2
-endf
-
-fu! s:multipliers(...)
-	let mp0 = !a:1 ? 0 : 2
-	let mp1 = !a:2 ? 0 : 1 + ( !mp0 ? 1 : mp0 )
-	let mp2 = !a:3 ? 0 : 1 + ( !( mp0 + mp1 ) ? 1 : ( mp0 + mp1 ) )
-	let mp3 = !a:4 ? 0 : 1 + ( !( mp0 + mp1 + mp2 ) ? 1 : ( mp0 + mp1 + mp2 ) )
-	retu [mp0, mp1, mp2, mp3]
-endf
-
-fu! s:compval(...)
-	retu a:1 - a:2
-endf
-" Statusline {{{2
-fu! ctrlp#statusline()
-	if !exists('s:statypes')
-		let s:statypes = copy(s:coretypes)
-		if !empty(g:ctrlp_ext_vars)
-			cal map(copy(g:ctrlp_ext_vars),
-				\ 'add(s:statypes, [ v:val["lname"], v:val["sname"] ])')
-		en
-	en
-	let tps = s:statypes
-	let max = len(tps) - 1
-	let nxt = tps[s:walker(max, s:itemtype,  1)][1]
-	let prv = tps[s:walker(max, s:itemtype, -1)][1]
-	let s:ctype = tps[s:itemtype][0]
-	let focus   = s:focus ? 'prt'  : 'win'
-	let byfname = s:ispath ? s:byfname ? 'file' : 'path' : 'line'
-	let marked  = s:opmul != '0' ?
-		\ exists('s:marked') ? ' <'.s:dismrk().'>' : ' <->' : ''
-	if s:status != {}
-		let argms =
-			\ has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict' ? [{
-			\ 'focus':   focus,
-			\ 'byfname': byfname,
-			\ 'regex':   s:regexp,
-			\ 'prev':    prv,
-			\ 'item':    s:ctype,
-			\ 'next':    nxt,
-			\ 'marked':  marked,
-			\ }] : [focus, byfname, s:regexp, prv, s:ctype, nxt, marked]
-		let &l:stl = call(s:status['main'], argms, s:status)
-	el
-		let item    = '%#CtrlPMode1# '.s:ctype.' %*'
-		let focus   = '%#CtrlPMode2# '.focus.' %*'
-		let byfname = '%#CtrlPMode1# '.byfname.' %*'
-		let regex   = s:regexp  ? '%#CtrlPMode2# regex %*' : ''
-		let slider  = ' <'.prv.'>={'.item.'}=<'.nxt.'>'
-		let dir     = ' %=%<%#CtrlPMode2# %{getcwd()} %*'
-		let &l:stl  = focus.byfname.regex.slider.marked.dir
-	en
-endf
-
-fu! s:dismrk()
-	retu has('signs') ? len(s:marked) :
-		\ '%<'.join(values(map(copy(s:marked), 'split(v:val, "[\\/]")[-1]')), ', ')
-endf
-
-fu! ctrlp#progress(enum, ...)
-	if has('macunix') || has('mac') | sl 1m | en
-	let txt = a:0 ? '(press ctrl-c to abort)' : ''
-	if s:status != {}
-		let argms = has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict'
-			\ ? [{ 'str': a:enum }] : [a:enum]
-		let &l:stl = call(s:status['prog'], argms, s:status)
-	el
-		let &l:stl = '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# %{getcwd()} %*'
-	en
-	redraws
-endf
-" *** Paths {{{2
-" Line formatting {{{3
-fu! s:formatline(str)
-	let str = a:str
-	if s:itemtype == 1
-		let filpath = fnamemodify(str, ':p')
-		let bufnr = s:nonamecond(str, filpath)
-			\ ? str2nr(matchstr(str, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
-			\ : bufnr('^'.filpath.'$')
-		let idc = ( bufnr == bufnr('#') ? '#' : '' )
-			\ . ( getbufvar(bufnr, '&ma') ? '' : '-' )
-			\ . ( getbufvar(bufnr, '&ro') ? '=' : '' )
-			\ . ( getbufvar(bufnr, '&mod') ? '+' : '' )
-		let str .= idc != '' ? ' '.idc : ''
-	en
-	let cond = s:ispath && ( s:winw - 4 ) < s:strwidth(str)
-	retu s:lineprefix.( cond ? s:pathshorten(str) : str )
-endf
-
-fu! s:pathshorten(str)
-	retu matchstr(a:str, '^.\{9}').'...'
-		\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
-endf
-
-fu! s:offset(lines, height)
-	let s:offset = s:mw_order == 'btt' ? ( a:height - s:res_count ) : 0
-	retu s:offset > 0 ? ( repeat([''], s:offset) + a:lines ) : a:lines
-endf
-" Directory completion {{{3
-fu! s:dircompl(be, sd)
-	if a:sd == '' | retu [] | en
-	if a:be == ''
-		let [be, sd] = [s:dyncwd, a:sd]
-	el
-		let be = a:be.s:lash(a:be)
-		let sd = be.a:sd
-	en
-	let dirs = split(globpath(s:fnesc(be, 'g', ','), a:sd.'*/'), "\n")
-	if a:be == ''
-		let dirs = ctrlp#rmbasedir(dirs)
-	en
-	cal filter(dirs, '!match(v:val, escape(sd, ''~$.\''))'
-		\ . ' && v:val !~ ''\v(^|[\/])\.{1,2}[\/]$''')
-	retu dirs
-endf
-
-fu! s:findcommon(items, seed)
-	let [items, id, cmn, ic] = [copy(a:items), strlen(a:seed), '', 0]
-	cal map(items, 'strpart(v:val, id)')
-	for char in split(items[0], '\zs')
-		for item in items[1:]
-			if item[ic] != char | let brk = 1 | brea | en
-		endfo
-		if exists('brk') | brea | en
-		let cmn .= char
-		let ic += 1
-	endfo
-	retu cmn
-endf
-" Misc {{{3
-fu! s:headntail(str)
-	let parts = split(a:str, '[\/]\ze[^\/]\+[\/:]\?$')
-	retu len(parts) == 1 ? ['', parts[0]] : len(parts) == 2 ? parts : []
-endf
-
-fu! s:lash(...)
-	retu ( a:0 ? a:1 : s:dyncwd ) !~ '[\/]$' ? s:lash : ''
-endf
-
-fu! s:ispathitem()
-	retu s:itemtype < 3 || ( s:itemtype > 2 && s:getextvar('type') == 'path' )
-endf
-
-fu! ctrlp#igncwd(cwd)
-	retu ctrlp#utils#glob(a:cwd, 0) == '' ||
-		\ ( s:igntype >= 0 && s:usrign(a:cwd, getftype(a:cwd)) )
-endf
-
-fu! ctrlp#dirnfile(entries)
-	let [items, cwd] = [[[], []], s:dyncwd.s:lash()]
-	for each in a:entries
-		let etype = getftype(each)
-		if s:igntype >= 0 && s:usrign(each, etype) | con | en
-		if etype == 'dir'
-			if s:showhidden | if each !~ '[\/]\.\{1,2}$'
-				cal add(items[0], each)
-			en | el
-				cal add(items[0], each)
-			en
-		elsei etype == 'link'
-			if s:folsym
-				let isfile = !isdirectory(each)
-				if s:folsym == 2 || !s:samerootsyml(each, isfile, cwd)
-					cal add(items[isfile], each)
-				en
-			en
-		elsei etype == 'file'
-			cal add(items[1], each)
-		en
-	endfo
-	retu items
-endf
-
-fu! s:usrign(item, type)
-	if s:igntype == 1 | retu a:item =~ s:usrign | end
-	if s:igntype == 2
-		if call(s:usrign, [a:item, a:type])
-			retu 1
-		end
-	elsei s:igntype == 4
-		if has_key(s:usrign, a:type) && s:usrign[a:type] != ''
-					\ && a:item =~ s:usrign[a:type]
-			retu 1
-		elsei has_key(s:usrign, 'func') && s:usrign['func'] != ''
-					\ && call(s:usrign['func'], [a:item, a:type])
-			retu 1
-		end
-	end
-	retu 0
-endf
-
-fu! s:samerootsyml(each, isfile, cwd)
-	let resolve = fnamemodify(resolve(a:each), ':p:h')
-	let resolve .= s:lash(resolve)
-	retu !( stridx(resolve, a:cwd) && ( stridx(a:cwd, resolve) || a:isfile ) )
-endf
-
-fu! ctrlp#rmbasedir(items)
-	let cwd = s:dyncwd.s:lash()
-	if a:items != [] && !stridx(a:items[0], cwd)
-		let idx = strlen(cwd)
-		retu map(a:items, 'strpart(v:val, idx)')
-	en
-	retu a:items
-endf
-" Working directory {{{3
-fu! s:getparent(item)
-	let parent = substitute(a:item, '[\/][^\/]\+[\/:]\?$', '', '')
-	if parent == '' || parent !~ '[\/]'
-		let parent .= s:lash
-	en
-	retu parent
-endf
-
-fu! s:findroot(curr, mark, depth, type)
-	let [depth, fnd] = [a:depth + 1, 0]
-	if type(a:mark) == 1
-		let fnd = s:glbpath(s:fnesc(a:curr, 'g', ','), a:mark, 1) != ''
-	elsei type(a:mark) == 3
-		for markr in a:mark
-			if s:glbpath(s:fnesc(a:curr, 'g', ','), markr, 1) != ''
-				let fnd = 1
-				brea
-			en
-		endfo
-	en
-	if fnd
-		if !a:type | cal ctrlp#setdir(a:curr) | en
-		retu [exists('markr') ? markr : a:mark, a:curr]
-	elsei depth > s:maxdepth
-		cal ctrlp#setdir(s:cwd)
-	el
-		let parent = s:getparent(a:curr)
-		if parent != a:curr
-			retu s:findroot(parent, a:mark, depth, a:type)
-		en
-	en
-	retu []
-endf
-
-fu! ctrlp#setpathmode(pmode, ...)
-	if a:pmode == 'c' || ( a:pmode == 'a' && stridx(s:crfpath, s:cwd) < 0 )
-		if exists('+acd') | let [s:glb_acd, &acd] = [&acd, 0] | en
-		cal ctrlp#setdir(s:crfpath)
-		retu 1
-	elsei a:pmode == 'r'
-		let spath = a:0 ? a:1 : s:crfpath
-		let markers = ['.git', '.hg', '.svn', '.bzr', '_darcs']
-		if type(s:rmarkers) == 3 && !empty(s:rmarkers)
-			if s:findroot(spath, s:rmarkers, 0, 0) != [] | retu 1 | en
-			cal filter(markers, 'index(s:rmarkers, v:val) < 0')
-		en
-		if s:findroot(spath, markers, 0, 0) != [] | retu 1 | en
-	en
-	retu 0
-endf
-
-fu! ctrlp#setdir(path, ...)
-	let cmd = a:0 ? a:1 : 'lc!'
-	sil! exe cmd s:fnesc(a:path, 'c')
-	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
-endf
-" Fallbacks {{{3
-fu! s:glbpath(...)
-	retu call('ctrlp#utils#globpath', a:000)
-endf
-
-fu! s:fnesc(...)
-	retu call('ctrlp#utils#fnesc', a:000)
-endf
-
-fu! ctrlp#setlcdir()
-	if exists('*haslocaldir')
-		cal ctrlp#setdir(getcwd(), haslocaldir() ? 'lc!' : 'cd!')
-	en
-endf
-" Highlighting {{{2
-fu! ctrlp#syntax()
-	if ctrlp#nosy() | retu | en
-	for [ke, va] in items(s:hlgrps) | cal ctrlp#hicheck('CtrlP'.ke, va) | endfo
-	if synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
-		sil! exe 'hi CtrlPLinePre '.( has("gui_running") ? 'gui' : 'cterm' ).'fg=bg'
-	en
-	sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
-	if hlexists('CtrlPLinePre')
-		sy match CtrlPLinePre '^>'
-	en
-endf
-
-fu! s:highlight(pat, grp)
-	if s:matcher != {} | retu | en
-	cal clearmatches()
-	if !empty(a:pat) && s:ispath
-		if s:regexp
-			let pat = substitute(a:pat, '\\\@<!\^', '^> \\zs', 'g')
-			cal matchadd(a:grp, ( s:martcs == '' ? '\c' : '\C' ).pat)
-		el
-			let pat = a:pat
-
-			" get original characters so we can rebuild pat
-			let chars = split(pat, '\[\^\\\?.\]\\{-}')
-
-			" Build a pattern like /a.*b.*c/ from abc (but with .\{-} non-greedy
-			" matchers instead)
-			let pat = join(chars, '.\{-}')
-			" Ensure we match the last version of our pattern
-			let ending = '\(.*'.pat.'\)\@!'
-			" Case sensitive?
-			let beginning = ( s:martcs == '' ? '\c' : '\C' ).'^.*'
-			if s:byfname
-				" Make sure there are no slashes in our match
-				let beginning = beginning.'\([^\/]*$\)\@='
-			end
-
-			for i in range(len(chars))
-				" Surround our current target letter with \zs and \ze so it only
-				" actually matches that one letter, but has all preceding and trailing
-				" letters as well.
-				" \zsa.*b.*c
-				" a\(\zsb\|.*\zsb)\ze.*c
-				let charcopy = copy(chars)
-				if i == 0
-					let charcopy[i] = '\zs'.charcopy[i].'\ze'
-					let middle = join(charcopy, '.\{-}')
-				else
-					let before = join(charcopy[0:i-1], '.\{-}')
-					let after = join(charcopy[i+1:-1], '.\{-}')
-					let c = charcopy[i]
-					" for abc, match either ab.\{-}c or a.*b.\{-}c in that order
-					let cpat = '\(\zs'.c.'\|'.'.*\zs'.c.'\)\ze.*'
-					let middle = before.cpat.after
-				endif
-
-				" Now we matchadd for each letter, the basic form being:
-				" ^.*\zsx\ze.*$, but with our pattern we built above for the letter,
-				" and a negative lookahead ensuring that we only highlight the last
-				" occurrence of our letters. We also ensure that our matcher is case
-				" insensitive or sensitive depending.
-				cal matchadd(a:grp, beginning.middle.ending)
-			endfor
-		en
-
-		cal matchadd('CtrlPLinePre', '^>')
-	en
-endf
-
-fu! s:dohighlight()
-	retu s:mathi[0] && exists('*clearmatches') && !ctrlp#nosy()
-endf
-" Prompt history {{{2
-fu! s:gethistloc()
-	let utilcadir = ctrlp#utils#cachedir()
-	let cache_dir = utilcadir.s:lash(utilcadir).'hist'
-	retu [cache_dir, cache_dir.s:lash(cache_dir).'cache.txt']
-endf
-
-fu! s:gethistdata()
-	retu ctrlp#utils#readfile(s:gethistloc()[1])
-endf
-
-fu! ctrlp#recordhist()
-	let str = join(s:prompt, '')
-	if empty(str) || !s:maxhst | retu | en
-	let hst = s:hstry
-	if len(hst) > 1 && hst[1] == str | retu | en
-	cal extend(hst, [str], 1)
-	if len(hst) > s:maxhst | cal remove(hst, s:maxhst, -1) | en
-	cal ctrlp#utils#writecache(hst, s:gethistloc()[0], s:gethistloc()[1])
-endf
-" Signs {{{2
-fu! s:unmarksigns()
-	if !s:dosigns() | retu | en
-	for key in keys(s:marked)
-		exe 'sign unplace' key 'buffer='.s:bufnr
-	endfo
-endf
-
-fu! s:remarksigns()
-	if !s:dosigns() | retu | en
-	for ic in range(1, len(s:lines))
-		let line = s:ispath ? fnamemodify(s:lines[ic - 1], ':p') : s:lines[ic - 1]
-		let key = s:dictindex(s:marked, line)
-		if key > 0
-			exe 'sign place' key 'line='.ic.' name=ctrlpmark buffer='.s:bufnr
-		en
-	endfo
-endf
-
-fu! s:dosigns()
-	retu exists('s:marked') && s:bufnr > 0 && s:opmul != '0' && has('signs')
-endf
-" Lists & Dictionaries {{{2
-fu! s:ifilter(list, str)
-	let [rlist, estr] = [[], substitute(a:str, 'v:val', 'each', 'g')]
-	for each in a:list
-		try
-			if eval(estr)
-				cal add(rlist, each)
-			en
-		cat | con | endt
-	endfo
-	retu rlist
-endf
-
-fu! s:dictindex(dict, expr)
-	for key in keys(a:dict)
-		if a:dict[key] == a:expr | retu key | en
-	endfo
-	retu -1
-endf
-
-fu! s:vacantdict(dict)
-	retu filter(range(1, max(keys(a:dict))), '!has_key(a:dict, v:val)')
-endf
-
-fu! s:sublist(l, s, e)
-	retu v:version > 701 ? a:l[(a:s):(a:e)] : s:sublist7071(a:l, a:s, a:e)
-endf
-
-fu! s:sublist7071(l, s, e)
-	let [newlist, id, ae] = [[], a:s, a:e == -1 ? len(a:l) - 1 : a:e]
-	wh id <= ae
-		cal add(newlist, get(a:l, id))
-		let id += 1
-	endw
-	retu newlist
-endf
-" Buffers {{{2
-fu! s:buftab(bufnr, md)
-	for tabnr in range(1, tabpagenr('$'))
-		if tabpagenr() == tabnr && a:md == 't' | con | en
-		let buflist = tabpagebuflist(tabnr)
-		if index(buflist, a:bufnr) >= 0
-			for winnr in range(1, tabpagewinnr(tabnr, '$'))
-				if buflist[winnr - 1] == a:bufnr | retu [tabnr, winnr] | en
-			endfo
-		en
-	endfo
-	retu [0, 0]
-endf
-
-fu! s:bufwins(bufnr)
-	let winns = 0
-	for tabnr in range(1, tabpagenr('$'))
-		let winns += count(tabpagebuflist(tabnr), a:bufnr)
-	endfo
-	retu winns
-endf
-
-fu! s:nonamecond(str, filpath)
-	retu a:str =~ '[\/]\?\[\d\+\*No Name\]$' && !filereadable(a:filpath)
-		\ && bufnr('^'.a:filpath.'$') < 1
-endf
-
-fu! ctrlp#normcmd(cmd, ...)
-	if a:0 < 2 && s:nosplit() | retu a:cmd | en
-	let norwins = filter(range(1, winnr('$')),
-		\ 'empty(getbufvar(winbufnr(v:val), "&bt")) || s:isneovimterminal(v:val)')
-	for each in norwins
-		let bufnr = winbufnr(each)
-		if empty(bufname(bufnr)) && empty(getbufvar(bufnr, '&ft'))
-			let fstemp = each | brea
-		en
-	endfo
-	let norwin = empty(norwins) ? 0 : norwins[0]
-	if norwin
-		if index(norwins, winnr()) < 0
-			exe ( exists('fstemp') ? fstemp : norwin ).'winc w'
-		en
-		retu a:cmd
-	en
-	retu a:0 ? a:1 : 'bo vne'
-endf
-
-fu! ctrlp#modfilecond(w)
-	retu &mod && !&hid && &bh != 'hide' && s:bufwins(bufnr('%')) == 1 && !&cf &&
-		\ ( ( !&awa && a:w ) || filewritable(fnamemodify(bufname('%'), ':p')) != 1 )
-endf
-
-fu! s:nosplit()
-	retu !empty(s:nosplit) && match([bufname('%'), &l:ft, &l:bt], s:nosplit) >= 0
-endf
-
-fu! s:setupblank()
-	setl noswf nonu nobl nowrap nolist nospell nocuc wfh
-	setl fdc=0 fdl=99 tw=0 bt=nofile bh=unload
-	if v:version > 702
-		setl nornu noudf cc=0
-	en
-endf
-
-fu! s:leavepre()
-	if exists('s:bufnr') && s:bufnr == bufnr('%') | bw! | en
-	if !( exists(s:ccex) && !{s:ccex} )
-		\ && !( has('clientserver') && len(split(serverlist(), "\n")) > 1 )
-		cal ctrlp#clra()
-	en
-endf
-
-fu! s:checkbuf()
-	if !exists('s:init') && exists('s:bufnr') && s:bufnr > 0
-		exe s:bufnr.'bw!'
-	en
-endf
-
-fu! s:iscmdwin()
-	let ermsg = v:errmsg
-	sil! noa winc p
-	sil! noa winc p
-	let [v:errmsg, ermsg] = [ermsg, v:errmsg]
-	retu ermsg =~ '^E11:'
-endf
-" Arguments {{{2
-fu! s:at(str)
-	if a:str =~ '\v^\@(cd|lc[hd]?|chd).*'
-		let str = substitute(a:str, '\v^\@(cd|lc[hd]?|chd)\s*', '', '')
-		if str == '' | retu 1 | en
-		let str = str =~ '^%:.\+' ? fnamemodify(s:crfile, str[1:]) : str
-		let path = fnamemodify(expand(str, 1), ':p')
-		if isdirectory(path)
-			if path != s:dyncwd
-				cal ctrlp#setdir(path)
-				cal ctrlp#setlines()
-			en
-			cal ctrlp#recordhist()
-			cal s:PrtClear()
-		en
-		retu 1
-	en
-	retu 0
-endf
-
-fu! s:tail()
-	if exists('s:optail') && !empty('s:optail')
-		let tailpref = s:optail !~ '^\s*+' ? ' +' : ' '
-		retu tailpref.s:optail
-	en
-	retu ''
-endf
-
-fu! s:sanstail(str)
-	let str = s:spi ?
-		\ substitute(a:str, '^\(@.*$\|\\\\\ze@\|\.\.\zs[.\/]\+$\)', '', 'g') : a:str
-	let [str, pat] = [substitute(str, '\\\\', '\', 'g'), '\([^:]\|\\:\)*$']
-	unl! s:optail
-	if str =~ '\\\@<!:'.pat
-		let s:optail = matchstr(str, '\\\@<!:\zs'.pat)
-		let str = substitute(str, '\\\@<!:'.pat, '', '')
-	en
-	retu substitute(str, '\\\ze:', '', 'g')
-endf
-
-fu! s:argmaps(md, i)
-	let roh = [
-		\ ['Open Multiple Files', '/h[i]dden/[c]lear', ['i', 'c']],
-		\ ['Create a New File', '/[r]eplace', ['r']],
-		\ ['Open Selected', '/[r]eplace', ['r', 'd', 'a']],
-		\ ]
-	if a:i == 2
-		if !buflisted(bufnr('^'.fnamemodify(ctrlp#getcline(), ':p').'$'))
-			let roh[2][1] .= '/h[i]dden'
-			let roh[2][2] += ['i']
-		en
-		if s:openfunc != {} && has_key(s:openfunc, s:ctype)
-			let roh[2][1] .= '/e[x]ternal'
-			let roh[2][2] += ['x']
-		en
-	en
-	let str = roh[a:i][0].': [t]ab/[v]ertical/[h]orizontal'.roh[a:i][1].'? '
-	retu s:choices(str, ['t', 'v', 'h'] + roh[a:i][2], 's:argmaps', [a:md, a:i])
-endf
-
-fu! s:insertstr()
-	let str = 'Insert: c[w]ord/c[f]ile/[s]earch/[v]isual/[c]lipboard/[r]egister? '
-	retu s:choices(str, ['w', 'f', 's', 'v', 'c', 'r'], 's:insertstr', [])
-endf
-
-fu! s:textdialog(str)
-	redr | echoh MoreMsg | echon a:str | echoh None
-	retu nr2char(getchar())
-endf
-
-fu! s:choices(str, choices, func, args)
-	let char = s:textdialog(a:str)
-	if index(a:choices, char) >= 0
-		retu char
-	elsei char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
-		cal s:BuildPrompt(0)
-		retu 'cancel'
-	elsei char =~# "\<CR>" && a:args != []
-		retu a:args[0]
-	en
-	retu call(a:func, a:args)
-endf
-
-fu! s:getregs()
-	let char = s:textdialog('Insert from register: ')
-	if char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
-		cal s:BuildPrompt(0)
-		retu -1
-	elsei char =~# "\<CR>"
-		retu s:getregs()
-	en
-	retu s:regisfilter(char)
-endf
-
-fu! s:regisfilter(reg)
-	retu substitute(getreg(a:reg), "[\t\n]", ' ', 'g')
-endf
-" Misc {{{2
-fu! s:modevar()
-	let s:matchtype = s:mtype()
-	let s:ispath = s:ispathitem()
-	let s:mfunc = s:mfunc()
-	let s:nolim = s:getextvar('nolim')
-	let s:dosort = s:getextvar('sort')
-	let s:spi = !s:itemtype || s:getextvar('specinput') > 0
-endf
-
-fu! s:nosort()
-	retu s:matcher != {} || s:nolim == 1 || ( s:itemtype == 2 && s:mrudef )
-		\ || ( s:itemtype =~ '\v^(1|2)$' && s:prompt == ['', '', ''] ) || !s:dosort
-endf
-
-fu! s:byfname()
-	retu s:ispath && s:byfname
-endf
-
-fu! s:narrowable()
-	retu exists('s:act_add') && exists('s:matched') && s:matched != []
-		\ && exists('s:mdata') && s:mdata[:2] == [s:dyncwd, s:itemtype, s:regexp]
-		\ && s:matcher == {} && !exists('s:did_exp')
-endf
-
-fu! s:getinput(...)
-	let [prt, spi] = [s:prompt, ( a:0 ? a:1 : '' )]
-	if s:abbrev != {}
-		let gmd = has_key(s:abbrev, 'gmode') ? s:abbrev['gmode'] : ''
-		let str = ( gmd =~ 't' && !a:0 ) || spi == 'c' ? prt[0] : join(prt, '')
-		if gmd =~ 't' && gmd =~ 'k' && !a:0 && matchstr(str, '.$') =~ '\k'
-			retu join(prt, '')
-		en
-		let [pf, rz] = [( s:byfname() ? 'f' : 'p' ), ( s:regexp ? 'r' : 'z' )]
-		for dict in s:abbrev['abbrevs']
-			let dmd = has_key(dict, 'mode') ? dict['mode'] : ''
-			let pat = escape(dict['pattern'], '~')
-			if ( dmd == '' || ( dmd =~ pf && dmd =~ rz && !a:0 )
-				\ || dmd =~ '['.spi.']' ) && str =~ pat
-				let [str, s:did_exp] = [join(split(str, pat, 1), dict['expanded']), 1]
-			en
-		endfo
-		if gmd =~ 't' && !a:0
-			let prt[0] = str
-		el
-			retu str
-		en
-	en
-	retu spi == 'c' ? prt[0] : join(prt, '')
-endf
-
-fu! s:strwidth(str)
-	retu exists('*strdisplaywidth') ? strdisplaywidth(a:str) : strlen(a:str)
-endf
-
-fu! ctrlp#j2l(nr)
-	exe 'norm!' a:nr.'G'
-	sil! norm! zvzz
-endf
-
-fu! s:maxf(len)
-	retu s:maxfiles && a:len > s:maxfiles
-endf
-
-fu! s:regexfilter(str)
-	let str = a:str
-	for key in keys(s:fpats) | if str =~ key
-		let str = substitute(str, s:fpats[key], '', 'g')
-	en | endfo
-	retu str
-endf
-
-fu! s:walker(m, p, d)
-	retu a:d >= 0 ? a:p < a:m ? a:p + a:d : 0 : a:p > 0 ? a:p + a:d : a:m
-endf
-
-fu! s:delent(rfunc)
-	if a:rfunc == '' | retu | en
-	let [s:force, tbrem] = [1, []]
-	if exists('s:marked')
-		let tbrem = values(s:marked)
-		cal s:unmarksigns()
-		unl s:marked
-	en
-	if tbrem == [] && ( has('dialog_gui') || has('dialog_con') ) &&
-		\ confirm("Wipe all entries?", "&OK\n&Cancel") != 1
-		unl s:force
-		cal s:BuildPrompt(0)
-		retu
-	en
-	let g:ctrlp_lines = call(a:rfunc, [tbrem])
-	cal s:BuildPrompt(1)
-	unl s:force
-endf
-
-fu! s:isneovimterminal(buf)
-	retu has('nvim') && getbufvar(a:buf, "&bt") == "terminal"
-endf
-" Entering & Exiting {{{2
-fu! s:getenv()
-	let [s:cwd, s:winres] = [getcwd(), [winrestcmd(), &lines, winnr('$')]]
-	let [s:crword, s:crnbword] = [expand('<cword>', 1), expand('<cWORD>', 1)]
-	let [s:crgfile, s:crline] = [expand('<cfile>', 1), getline('.')]
-	let [s:winmaxh, s:crcursor] = [min([s:mw_max, &lines]), getpos('.')]
-	let [s:crbufnr, s:crvisual] = [bufnr('%'), s:lastvisual()]
-	let s:crfile = bufname('%') == ''
-		\ ? '['.s:crbufnr.'*No Name]' : expand('%:p', 1)
-	let s:crfpath = expand('%:p:h', 1)
-	let s:mrbs = ctrlp#mrufiles#bufs()
-endf
-
-fu! s:lastvisual()
-	let cview = winsaveview()
-	let [ovreg, ovtype] = [getreg('v'), getregtype('v')]
-	let [oureg, outype] = [getreg('"'), getregtype('"')]
-	sil! norm! gv"vy
-	let selected = s:regisfilter('v')
-	cal setreg('v', ovreg, ovtype)
-	cal setreg('"', oureg, outype)
-	cal winrestview(cview)
-	retu selected
-endf
-
-fu! s:log(m)
-	if exists('g:ctrlp_log') && g:ctrlp_log | if a:m
-		let cadir = ctrlp#utils#cachedir()
-		let apd = g:ctrlp_log > 1 ? '>' : ''
-		sil! exe 'redi! >'.apd cadir.s:lash(cadir).'ctrlp.log'
-	el
-		sil! redi END
-	en | en
-endf
-
-fu! s:buffunc(e)
-	if a:e && has_key(s:buffunc, 'enter')
-		cal call(s:buffunc['enter'], [], s:buffunc)
-	elsei !a:e && has_key(s:buffunc, 'exit')
-		cal call(s:buffunc['exit'], [], s:buffunc)
-	en
-endf
-
-fu! s:openfile(cmd, fid, tail, chkmod, ...)
-	let cmd = a:cmd
-	if a:chkmod && cmd =~ '^[eb]$' && ctrlp#modfilecond(!( cmd == 'b' && &aw ))
-		let cmd = cmd == 'b' ? 'sb' : 'sp'
-	en
-	let cmd = cmd =~ '^tab' ? ctrlp#tabcount().cmd : cmd
-	let j2l = a:0 && a:1[0] ? a:1[1] : 0
-	exe cmd.( a:0 && a:1[0] ? '' : a:tail ) s:fnesc(a:fid, 'f')
-	if j2l
-		cal ctrlp#j2l(j2l)
-	en
-	if !empty(a:tail)
-		sil! norm! zvzz
-	en
-	if cmd != 'bad'
-		cal ctrlp#setlcdir()
-	en
-endf
-
-fu! ctrlp#tabcount()
-	if exists('s:tabct')
-		let tabct = s:tabct
-		let s:tabct += 1
-	elsei !type(s:tabpage)
-		let tabct = s:tabpage
-	elsei type(s:tabpage) == 1
-		let tabpos =
-			\ s:tabpage =~ 'c' ? tabpagenr() :
-			\ s:tabpage =~ 'f' ? 1 :
-			\ s:tabpage =~ 'l' ? tabpagenr('$') :
-			\ tabpagenr()
-		let tabct =
-			\ s:tabpage =~ 'a' ? tabpos :
-			\ s:tabpage =~ 'b' ? tabpos - 1 :
-			\ tabpos
-	en
-	retu tabct < 0 ? 0 : tabct
-endf
-
-fu! s:settype(type)
-	retu a:type < 0 ? exists('s:itemtype') ? s:itemtype : 0 : a:type
-endf
-" Matching {{{2
-fu! s:matchfname(item, pat)
-	let parts = split(a:item, '[\/]\ze[^\/]\+$')
-	let mfn = match(parts[-1], a:pat[0])
-	retu len(a:pat) == 1 ? mfn : len(a:pat) == 2 ?
-		\ ( mfn >= 0 && ( len(parts) == 2 ? match(parts[0], a:pat[1]) : -1 ) >= 0
-		\ ? 0 : -1 ) : -1
-endf
-
-fu! s:matchtabs(item, pat)
-	retu match(split(a:item, '\t\+')[0], a:pat)
-endf
-
-fu! s:matchtabe(item, pat)
-	retu match(split(a:item, '\t\+[^\t]\+$')[0], a:pat)
-endf
-
-fu! s:buildpat(lst)
-	let pat = a:lst[0]
-	for item in range(1, len(a:lst) - 1)
-		let pat .= '[^'.a:lst[item - 1].']\{-}'.a:lst[item]
-	endfo
-	retu pat
-endf
-
-fu! s:mfunc()
-	let mfunc = 'match'
-	if s:byfname()
-		let mfunc = 's:matchfname'
-	elsei s:itemtype > 2
-		let matchtypes = { 'tabs': 's:matchtabs', 'tabe': 's:matchtabe' }
-		if has_key(matchtypes, s:matchtype)
-			let mfunc = matchtypes[s:matchtype]
-		en
-	en
-	retu mfunc
-endf
-
-fu! s:mmode()
-	let matchmodes = {
-		\ 'match': 'full-line',
-		\ 's:matchfname': 'filename-only',
-		\ 's:matchtabs': 'first-non-tab',
-		\ 's:matchtabe': 'until-last-tab',
-		\ }
-	retu matchmodes[s:mfunc]
-endf
-" Cache {{{2
-fu! s:writecache(cafile)
-	if ( g:ctrlp_newcache || !filereadable(a:cafile) ) && !s:nocache()
-		cal ctrlp#utils#writecache(g:ctrlp_allfiles)
-		let g:ctrlp_newcache = 0
-	en
-endf
-
-fu! s:nocache(...)
-	if !s:caching
-		retu 1
-	elsei s:caching > 1
-		if !( exists(s:ccex) && !{s:ccex} ) || has_key(s:ficounts, s:dyncwd)
-			retu get(s:ficounts, s:dyncwd, [0, 0])[0] < s:caching
-		elsei a:0 && filereadable(a:1)
-			retu len(ctrlp#utils#readfile(a:1)) < s:caching
-		en
-		retu 1
-	en
-	retu 0
-endf
-
-fu! s:insertcache(str)
-	let [data, g:ctrlp_newcache, str] = [g:ctrlp_allfiles, 1, a:str]
-	if data == [] || strlen(str) <= strlen(data[0])
-		let pos = 0
-	elsei strlen(str) >= strlen(data[-1])
-		let pos = len(data) - 1
-	el
-		let pos = 0
-		for each in data
-			if strlen(each) > strlen(str) | brea | en
-			let pos += 1
-		endfo
-	en
-	cal insert(data, str, pos)
-	cal s:writecache(ctrlp#utils#cachefile())
-endf
-" Extensions {{{2
-fu! s:mtype()
-	retu s:itemtype > 2 ? s:getextvar('type') : 'path'
-endf
-
-fu! s:execextvar(key)
-	if !empty(g:ctrlp_ext_vars)
-		cal map(filter(copy(g:ctrlp_ext_vars),
-			\ 'has_key(v:val, a:key)'), 'eval(v:val[a:key])')
-	en
-endf
-
-fu! s:getextvar(key)
-	if s:itemtype > 2
-		let vars = g:ctrlp_ext_vars[s:itemtype - 3]
-		retu has_key(vars, a:key) ? vars[a:key] : -1
-	en
-	retu get(g:, 'ctrlp_' . s:matchtype . '_' . a:key, -1)
-endf
-
-fu! ctrlp#getcline()
-	let [linenr, offset] = [line('.'), ( s:offset > 0 ? s:offset : 0 )]
-	retu !empty(s:lines) && !( offset && linenr <= offset )
-		\ ? s:lines[linenr - 1 - offset] : ''
-endf
-
-fu! ctrlp#getmarkedlist()
-	retu exists('s:marked') ? values(s:marked) : []
-endf
-
-fu! ctrlp#clearmarkedlist()
-	let s:marked = {}
-endf
-
-fu! ctrlp#exit()
-	cal s:PrtExit()
-endf
-
-fu! ctrlp#prtclear()
-	cal s:PrtClear()
-endf
-
-fu! ctrlp#switchtype(id)
-	cal s:ToggleType(a:id - s:itemtype)
-endf
-
-fu! ctrlp#nosy()
-	retu !( has('syntax') && exists('g:syntax_on') )
-endf
-
-fu! ctrlp#hicheck(grp, defgrp)
-	if !hlexists(a:grp)
-		exe 'hi link' a:grp a:defgrp
-	en
-endf
-
-fu! ctrlp#call(func, ...)
-	retu call(a:func, a:000)
-endf
-
-fu! ctrlp#getvar(var)
-	retu {a:var}
-endf
-"}}}1
-" * Initialization {{{1
-fu! ctrlp#setlines(...)
-	if a:0 | let s:itemtype = a:1 | en
-	cal s:modevar()
-	let types = ['ctrlp#files()', 'ctrlp#buffers()', 'ctrlp#mrufiles#list()']
-	if !empty(g:ctrlp_ext_vars)
-		cal map(copy(g:ctrlp_ext_vars), 'add(types, v:val["init"])')
-	en
-	let g:ctrlp_lines = eval(types[s:itemtype])
-endf
-
-" Returns [lname, sname]
-fu! s:CurTypeName()
-	if s:itemtype < 3
-		return s:coretypes[s:itemtype]
-	else
-		return [s:getextvar("lname"), s:getextvar('sname')]
-	endif
-endfu
-
-fu! s:ExitIfSingleCandidate()
-	if len(s:Update(s:prompt[0])) == 1
-		call s:AcceptSelection('e')
-		call ctrlp#exit()
-		return 1
-	endif
-	return 0
-endfu
-
-fu! ctrlp#init(type, ...)
-	if exists('s:init') || s:iscmdwin() | retu | en
-	let [s:ermsg, v:errmsg] = [v:errmsg, '']
-	let [s:matches, s:init] = [1, 1]
-	cal s:Reset(a:0 ? a:1 : {})
-	noa cal s:Open()
-	cal s:SetWD(a:0 ? a:1 : {})
-	cal s:MapNorms()
-	cal s:MapSpecs()
-	cal ctrlp#syntax()
-	cal ctrlp#setlines(s:settype(a:type))
-	cal s:SetDefTxt()
-	let curName = s:CurTypeName()
-	let shouldExitSingle = index(s:opensingle, curName[0])>=0 || index(s:opensingle, curName[1])>=0
-	if shouldExitSingle && s:ExitIfSingleCandidate()
-		return 0
-	endif
-	cal s:BuildPrompt(1)
-	if s:keyloop | cal s:KeyLoop() | en
-	return 1
-endf
-" - Autocmds {{{1
-if has('autocmd')
-	aug CtrlPAug
-		au!
-		au BufEnter ControlP cal s:checkbuf()
-		au BufLeave ControlP noa cal s:Close()
-		au VimLeavePre * cal s:leavepre()
-	aug END
-en
-
-fu! s:autocmds()
-	if !has('autocmd') | retu | en
-	if exists('#CtrlPLazy')
-		au! CtrlPLazy
-	en
-	if s:lazy
-		aug CtrlPLazy
-			au!
-			au CursorHold ControlP cal s:ForceUpdate()
-		aug END
-	en
-endf
-"}}}
-
-" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle/ctrlp/plugin/ctrlp.vim b/bundle/ctrlp/plugin/ctrlp.vim
deleted file mode 100755
index 5f5303f..0000000
--- a/bundle/ctrlp/plugin/ctrlp.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" =============================================================================
-" File:          plugin/ctrlp.vim
-" Description:   Fuzzy file, buffer, mru, tag, etc finder.
-" Author:        Kien Nguyen <github.com/kien>
-" =============================================================================
-" GetLatestVimScripts: 3736 1 :AutoInstall: ctrlp.zip
-
-if ( exists('g:loaded_ctrlp') && g:loaded_ctrlp ) || v:version < 700 || &cp
-	fini
-en
-let g:loaded_ctrlp = 1
-
-let [g:ctrlp_lines, g:ctrlp_allfiles, g:ctrlp_alltags, g:ctrlp_alldirs,
-	\ g:ctrlp_allmixes, g:ctrlp_buftags, g:ctrlp_ext_vars, g:ctrlp_builtins]
-	\ = [[], [], [], [], {}, {}, [], 2]
-
-if !exists('g:ctrlp_map') | let g:ctrlp_map = '<c-p>' | en
-if !exists('g:ctrlp_cmd') | let g:ctrlp_cmd = 'CtrlP' | en
-
-com! -n=? -com=dir CtrlP         cal ctrlp#init(0, { 'dir': <q-args> })
-com! -n=? -com=dir CtrlPMRUFiles cal ctrlp#init(2, { 'dir': <q-args> })
-
-com! -bar CtrlPBuffer   cal ctrlp#init(1)
-com! -n=? CtrlPLastMode cal ctrlp#init(-1, { 'args': <q-args> })
-
-com! -bar CtrlPClearCache     cal ctrlp#clr()
-com! -bar CtrlPClearAllCaches cal ctrlp#clra()
-
-com! -bar ClearCtrlPCache     cal ctrlp#clr()
-com! -bar ClearAllCtrlPCaches cal ctrlp#clra()
-
-com! -bar CtrlPCurWD   cal ctrlp#init(0, { 'mode': '' })
-com! -bar CtrlPCurFile cal ctrlp#init(0, { 'mode': 'c' })
-com! -bar CtrlPRoot    cal ctrlp#init(0, { 'mode': 'r' })
-
-exe 'nn <silent> <plug>(ctrlp) :<c-u>'.g:ctrlp_cmd.'<cr>'
-
-if g:ctrlp_map != '' && !hasmapto('<plug>(ctrlp)')
-	exe 'map' g:ctrlp_map '<plug>(ctrlp)'
-en
-
-cal ctrlp#mrufiles#init()
-
-com! -bar CtrlPTag      cal ctrlp#init(ctrlp#tag#id())
-com! -bar CtrlPQuickfix cal ctrlp#init(ctrlp#quickfix#id())
-
-com! -n=? -com=dir CtrlPDir
-	\ cal ctrlp#init(ctrlp#dir#id(), { 'dir': <q-args> })
-
-com! -n=? -com=buffer CtrlPBufTag
-	\ cal ctrlp#init(ctrlp#buffertag#cmd(0, <q-args>))
-
-com! -bar CtrlPBufTagAll cal ctrlp#init(ctrlp#buffertag#cmd(1))
-com! -bar CtrlPRTS       cal ctrlp#init(ctrlp#rtscript#id())
-com! -bar CtrlPUndo      cal ctrlp#init(ctrlp#undo#id())
-
-com! -n=? -com=buffer CtrlPLine
-	\ cal ctrlp#init(ctrlp#line#cmd(1, <q-args>))
-
-com! -n=? -com=buffer CtrlPChange
-	\ cal ctrlp#init(ctrlp#changes#cmd(0, <q-args>))
-
-com! -bar CtrlPChangeAll   cal ctrlp#init(ctrlp#changes#cmd(1))
-com! -bar CtrlPMixed       cal ctrlp#init(ctrlp#mixed#id())
-com! -bar CtrlPBookmarkDir cal ctrlp#init(ctrlp#bookmarkdir#id())
-
-com! -n=? -com=dir -bang CtrlPBookmarkDirAdd
-	\ cal ctrlp#call('ctrlp#bookmarkdir#add', '<bang>', <q-args>)
-
-" vim:ts=2:sw=2:sts=2
diff --git a/bundle/easymotion/.gitignore b/bundle/easymotion/.gitignore
deleted file mode 100755
index 5d0b4ff..0000000
--- a/bundle/easymotion/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-doc/tags
-tmp*
-*.lock
-.vim-flavor
diff --git a/bundle/easymotion/.travis.yml b/bundle/easymotion/.travis.yml
deleted file mode 100755
index 09f727d..0000000
--- a/bundle/easymotion/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: ruby
-rvm:
-    - 2.0.0
-before_script:
-    - bundle install
-    - bundle show
-script:
-    - rake ci
-install:
-    - git clone https://github.com/kana/vim-vspec.git
diff --git a/bundle/easymotion/Gemfile b/bundle/easymotion/Gemfile
deleted file mode 100755
index c562fee..0000000
--- a/bundle/easymotion/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org/'
-
-gem 'vim-flavor', '~> 1.1'
-gem 'rake'
diff --git a/bundle/easymotion/README.md b/bundle/easymotion/README.md
deleted file mode 100755
index fdf1385..0000000
--- a/bundle/easymotion/README.md
+++ /dev/null
@@ -1,321 +0,0 @@
-Vim motion on speed!
-=====
-[![Build Status](https://travis-ci.org/Lokaltog/vim-easymotion.svg?branch=master)](https://travis-ci.org/Lokaltog/vim-easymotion)
-
-![Animated demonstration](https://f.cloud.github.com/assets/3797062/2039359/a8e938d6-899f-11e3-8789-60025ea83656.gif)
-
-About the authors
-=====
-
-| Authors          |                               |
-|------------------|-------------------------------|
-| Kim Silkebækken | https://github.com/Lokaltog   |
-| haya14busa       | https://github.com/haya14busa |
-
-The EasyMotion project, revived!
-======
-
-Starting from version 2.0 [haya14busa](https://github.com/haya14busa) will be
-taking over the project from [Lokaltog](https://github.com/Lokaltog). He's
-improved the default motions, implemented many useful new features, and fixed
-some bugs.
-
-EasyMotion is now completely
-
-- **Well-behaved**: It's consistent with the default motions of Vim and works
-  well in all modes. And it now supports repeating with the dot operator.
-- **Configurable**: You can easily configure its behavior and map it to any key
-- **Sophisticated**: Provide flawless, smooth and fast motions with minimal keystrokes
-
-Even though some default behaviors were modified and many new features were
-added, I carefully considered backward compatibility. So those of you updating
-from older versions can do so without worry and start benefitting immediately
-from all the new features!
-
-Introduction
-=====
-
-EasyMotion provides a much simpler way to use some motions in vim. It
-takes the `<number>` out of `<number>w` or `<number>f{char}` by
-highlighting all possible choices and allowing you to press one key to
-jump directly to the target.
-
-When one of the available motions is triggered, all visible text
-preceding or following the cursor is faded, and motion targets are
-highlighted.
-
-EasyMotion is triggered by the provided mappings. This readme only covers the
-basics; please refer to
-[`:help easymotion.txt`](https://github.com/Lokaltog/vim-easymotion/blob/master/doc/easymotion.txt#L86)
-to see all the available mappings.
-
-Important notes
-=====
-
-### Default bindings
-
-**The default leader has been changed to `<Leader><Leader>` to avoid
-conflicts with other plugins you may have installed.** This can easily be
-changed back to pre-1.3 behavior by rebinding the leader in your vimrc:
-
-```vim
-map <Leader> <Plug>(easymotion-prefix)
-```
-
-All motions will then be triggered with `<Leader>` by default, e.g.
-`<Leader>s`, `<Leader>gE`.
-
-### For users of the forked version
-
-SelectLines and SelectPhrase are not actually *motions*, so I've moved them into
-separate plugins.
-
-- https://github.com/haya14busa/vim-easyoperator-line
-- https://github.com/haya14busa/vim-easyoperator-phrase
-
-Usage example for the base features
-=====
-
-	<cursor>Lorem ipsum dolor sit amet.
-
-Type `<Leader><Leader>w`(`<Plug>(easymotion-w)`) to trigger the word motion `w`.
-When the motion is triggered, the text is updated (no braces are actually added,
-the text is highlighted in red by default):
-
-	<cursor>Lorem {a}psum {b}olor {c}it {d}met.
-
-Press `c` to jump to the beginning of the word "sit":
-
-	Lorem ipsum dolor <cursor>sit amet.
-
-Similarly, if you're looking for an "o", you can use the `f` motion.
-Type `<Leader><Leader>fo`, and all "o" characters are highlighted:
-
-	<cursor>L{a}rem ipsum d{b}l{c}r sit amet.
-
-Press `b` to jump to the second "o":
-
-	Lorem ipsum d<cursor>olor sit amet.
-
-Jeffrey Way of Nettuts+ has also [written
-a tutorial](http://net.tutsplus.com/tutorials/other/vim-essential-plugin-easymotion/)
-about EasyMotion.
-
-
-New features in version 2.0
-====
-
-### Two key highlighting
-
-When EasyMotion runs out of single characters to highlight movement targets, it
-now shows you immediately the keys you have to press.
-
-In previous versions you could not see the next character you would need to
-press until you entered the first one. This made movement over long distances
-less fluid. Now you can see at a glance exactly which characters to select to
-get to your destination.
-
-### Bidirectional motions
-
-All motions now come in a bidirectional variants (e.g. `<Plug>(easymotion-s)`,
-`<Plug>(easymotion-bd-w)` and so forth).
-By default, you can already jump forward or backward with `<Leader>s`. A useful
-trick is to map `nmap s <Plug>(easymotion-s)` to use `s` instead and save one
-keystroke!
-
-### 2-character search motion
-
-You can now also perform a 2-character search, similar to [vim-seek](https://github.com/goldfeld/vim-seek)/[vim-sneak](https://github.com/justinmk/vim-sneak) with `<Plug>(easymotion-s2)`. For example you can highlight all words that start with `fu`.
-
-![2-key-find-motion](https://f.cloud.github.com/assets/3797062/2039612/7cafcec8-89a5-11e3-8f2c-5f26a6b83efd.gif)
-
-```vim
-" Gif config
-nmap s <Plug>(easymotion-s2)
-nmap t <Plug>(easymotion-t2)
-```
-
-### n-character search motion
-
-You can also search for `n` characters, which basically can be used to replace the default search of Vim.
-It supports incremental highlighting and you can use `<Tab>` and `<S-Tab>` to scroll down/up a page. If you press
-`<CR>` you get the usual EasyMotion highlighting and can jump to any matching target destination with a
-single keystroke.
-
-What sounds complicated should become clear if you look at the following examples.
-
-![n-key-motion-scroll](https://f.cloud.github.com/assets/3797062/2039254/4fbf7276-899e-11e3-9bf3-1e446cabc097.gif)
-
-![replace-search](https://f.cloud.github.com/assets/3797062/2039751/64b72bd8-89a8-11e3-80ea-2a6b578040b2.gif)
-
-```vim
-" Gif config
-map  / <Plug>(easymotion-sn)
-omap / <Plug>(easymotion-tn)
-
-" These `n` & `N` mappings are options. You do not have to map `n` & `N` to EasyMotion.
-" Without these mappings, `n` & `N` works fine. (These mappings just provide
-" different highlight method and have some other features )
-map  n <Plug>(easymotion-next)
-map  N <Plug>(easymotion-prev)
-```
-
-### Within line motion
-
-Every motion also has variants that are restricted to just the current line
-(e.g. `<Plug>(easymotion-sl)`, `<Plug>(easymotion-bd-wl)`, etc...). This can be
-helpful if you find the full search distracting or slows down vim.
-
-### hjkl motions
-
-EasyMotion can be configured to avoid repetitive use of the `h` `j` `k` and
-`l` keys.
-
-![hjkl-motion](https://f.cloud.github.com/assets/3797062/2039413/d8b32ab2-89a0-11e3-894f-3e81db084cfd.gif)
-
-```vim
-" Gif config
-map <Leader>l <Plug>(easymotion-lineforward)
-map <Leader>j <Plug>(easymotion-j)
-map <Leader>k <Plug>(easymotion-k)
-map <Leader>h <Plug>(easymotion-linebackward)
-
-let g:EasyMotion_startofline = 0 " keep cursor colum when JK motion
-```
-
-### Smartcase & Smartsign
-
-This setting makes EasyMotion work similarly to Vim's `smartcase` option for
-global searches.
-
-```vim
-let g:EasyMotion_smartcase = 1
-```
-
-With this option set, `v` will match both `v` and `V`, but `V` will match `V`
-only. Default: 0.
-
-```vim
-let g:EasyMotion_use_smartsign_us = 1 " US layout
-" or
-let g:EasyMotion_use_smartsign_jp = 1 " JP layout
-```
-
-This applies the same concept, but for symbols and numerals. `1` will match `1`
-and `!`; `!` matches `!` only. Default: 0.
-
-
-### Migemo feature (for Japanese user)
-
-```vim
-let g:EasyMotion_use_migemo = 1
-```
-
-
-Easymotion can match multibyte Japanese characters with alphabetical input.
-For example, `<Leader><Leader>sa` can search 'あ'.
-This feature doesn't require cmigemo because Easymotion includes regex
-patterns generated by cmigemo. However, installing `cmigemo` will make
-2-character and n-character search motions to also support the migemo feature.
-Default:0
-
-
-### Repeat motions
-
-#### Repeat the last motion
-
-`<Plug>(easymotion-repeat)`
-
-#### Repeat the last find motion
-
-In a find motion (e.g. `<Plug>(easymotion-s)`), type `<CR>` without
-input characters to find the last motion again.
-
-#### Jump to next/previous match (even on next/previous page)
-
-* `<Plug>(easymotion-next)`
-* `<Plug>(easymotion-prev)`
-
-#### Support for dot repeat
-
-This requires https://github.com/tpope/vim-repeat.
-
-You can use EasyMotion with operators and press `.` to repeat!
-It is well-behaved, and consistent with the default behavior of Vim.
-
-![repeat-motion](https://f.cloud.github.com/assets/3797062/2039538/0aef66aa-89a4-11e3-8242-c27a5208cfca.gif)
-
-```vim
-" Gif config
-
-" Require tpope/vim-repeat to enable dot repeat support
-" Jump to anywhere with only `s{char}{target}`
-" `s<CR>` repeat last find motion.
-nmap s <Plug>(easymotion-s)
-" Bidirectional & within line 't' motion
-omap t <Plug>(easymotion-bd-tl)
-" Use uppercase target labels and type as a lower case
-let g:EasyMotion_use_upper = 1
- " type `l` and match `l`&`L`
-let g:EasyMotion_smartcase = 1
-" Smartsign (type `3` and match `3`&`#`)
-let g:EasyMotion_use_smartsign_us = 1
-```
-
-
-Installation
-------------
-### Pathogen (https://github.com/tpope/vim-pathogen)
-```
-git clone https://github.com/Lokaltog/vim-easymotion ~/.vim/bundle/vim-easymotion
-```
-
-### Vundle (https://github.com/gmarik/vundle)
-```
-Plugin 'Lokaltog/vim-easymotion'
-```
-
-### NeoBundle (https://github.com/Shougo/neobundle.vim)
-```
-NeoBundle 'Lokaltog/vim-easymotion'
-```
-
-Minimal Configuration Tutorial
-------------------------------
-**I recommend configuring and map keys by yourself if you are true Vimmer.**
-
-**Please do not be satisfied with just installing vim-easymotion, configuring it yourself boost your productivity more and more!**
-
-Default `<Leader><Leader>` prefix isn't easy to press, and I leave them just for backwards compatibility.
-You should at least change prefix key like this `map <Leader> <Plug>(easymotion-prefix)`
-
-Minimal but useful vimrc example:
-
-```
-let g:EasyMotion_do_mapping = 0 " Disable default mappings
-
-" Bi-directional find motion
-" Jump to anywhere you want with minimal keystrokes, with just one key binding.
-" `s{char}{label}`
-nmap s <Plug>(easymotion-s)
-" or
-" `s{char}{char}{label}`
-" Need one more keystroke, but on average, it may be more comfortable.
-nmap s <Plug>(easymotion-s2)
-
-" Turn on case sensitive feature
-let g:EasyMotion_smartcase = 1
-
-" JK motions: Line motions
-map <Leader>j <Plug>(easymotion-j)
-map <Leader>k <Plug>(easymotion-k)
-```
-Now, all you need to remember is `s` and JK motions bindings, and it's good enough to boost your cursor speed!
-
-**`s`** is bidirectional find motion, you can move to anywhere with it.
-
-**`<Leader>j`** & **`<Leader>k`** make it easy to move to the lines.
-
-Of course you can use any key you want instead of `s` such as `<Space>`, `<Leader>s`, etc...
-
-If you want to use more useful mappings, please see [:h easymotion.txt](https://github.com/Lokaltog/vim-easymotion/blob/master/doc/easymotion.txt) for more detail.
diff --git a/bundle/easymotion/Rakefile b/bundle/easymotion/Rakefile
deleted file mode 100755
index 63a3a36..0000000
--- a/bundle/easymotion/Rakefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env rake
-
-task :ci => [:dump, :test]
-
-task :dump do
-  sh 'vim --version'
-end
-
-task :test do
-  sh 'bundle exec vim-flavor test'
-end
diff --git a/bundle/easymotion/autoload/EasyMotion.vim b/bundle/easymotion/autoload/EasyMotion.vim
deleted file mode 100755
index 4135b4f..0000000
--- a/bundle/easymotion/autoload/EasyMotion.vim
+++ /dev/null
@@ -1,1538 +0,0 @@
-scriptencoding utf-8
-" EasyMotion - Vim motions on speed!
-"
-" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-"         haya14busa <hayabusa1419@gmail.com>
-" Source: https://github.com/Lokaltog/vim-easymotion
-"=============================================================================
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-" Init: {{{
-function! EasyMotion#init()
-    call EasyMotion#highlight#load()
-    " Store previous motion info
-    let s:previous = {}
-    " Store previous operator-pending motion info for '.' repeat
-    let s:dot_repeat = {}
-    " Prepare 1-key Migemo Dictionary
-    let s:migemo_dicts = {}
-    let s:EasyMotion_is_active = 0
-    call EasyMotion#reset()
-    " Anywhere regular expression: {{{
-    let re = '\v' .
-        \    '(<.|^$)' . '|' .
-        \    '(.>|^$)' . '|' .
-        \    '(\l)\zs(\u)' . '|' .
-        \    '(_\zs.)' . '|' .
-        \    '(#\zs.)'
-    " 1. word
-    " 2. end of word
-    " 3. CamelCase
-    " 4. after '_' hoge_foo
-    " 5. after '#' hoge#foo
-    let g:EasyMotion_re_anywhere = get(g:, 'EasyMotion_re_anywhere', re)
-
-    " Anywhere regular expression within line:
-    let re = '\v' .
-        \    '(<.|^$)' . '|' .
-        \    '(.>|^$)' . '|' .
-        \    '(\l)\zs(\u)' . '|' .
-        \    '(_\zs.)' . '|' .
-        \    '(#\zs.)'
-    let g:EasyMotion_re_line_anywhere = get(g:, 'EasyMotion_re_line_anywhere', re)
-    "}}}
-    " For other plugin
-    let s:EasyMotion_is_cancelled = 0
-    " 0 -> Success
-    " 1 -> Cancel
-    let g:EasyMotion_ignore_exception = 0
-    return ""
-endfunction
-"}}}
-" Reset: {{{
-function! EasyMotion#reset()
-    let s:flag = {
-        \ 'within_line' : 0,
-        \ 'dot_repeat' : 0,
-        \ 'regexp' : 0,
-        \ 'bd_t' : 0,
-        \ 'find_bd' : 0,
-        \ 'linewise' : 0,
-        \ 'count_dot_repeat' : 0,
-        \ }
-        " regexp: -> regular expression
-        "   This value is used when multi input find motion. If this values is
-        "   1, input text is treated as regexp.(Default: escaped)
-        " bd_t: -> bi-directional 't' motion
-        "   This value is used to re-define regexp only for bi-directional 't'
-        "   motion
-        " find_bd: -> bi-directional find motion
-        "   This value is used to recheck the motion is inclusive or exclusive
-        "   because 'f' & 't' forward find motion is inclusive, but 'F' & 'T'
-        "   backward find motion is exclusive
-        " count_dot_repeat: -> dot repeat with count
-        "   https://github.com/Lokaltog/vim-easymotion/issues/164
-    let s:current = {
-        \ 'is_operator' : 0,
-        \ 'is_search' : 0,
-        \ 'dot_repeat_target_cnt' : 0,
-        \ 'dot_prompt_user_cnt' : 0,
-        \ 'changedtick' : 0,
-        \ }
-        " \ 'start_position' : [],
-        " \ 'cursor_position' : [],
-
-        " is_operator:
-        "   Store is_operator value first because mode(1) value will be
-        "   changed by some operation.
-        " dot_* :
-        "   These values are used when '.' repeat for automatically
-        "   select marker/label characters.(Using count avoid recursive
-        "   prompt)
-        " changedtick:
-        "   :h b:changedtick
-        "   This value is used to avoid side effect of overwriting buffer text
-        "   which will change b:changedtick value. To overwrite g:repeat_tick
-        "   value(defined tpope/vim-repeat), I can avoid this side effect of
-        "   conflicting with tpope/vim-repeat
-        " start_position:
-        "   Original, start cursor position.
-        " cursor_position:
-        "   Usually, this values is same with start_position, but in
-        "   visualmode and 'n' key motion, this value could be different.
-    return ""
-endfunction "}}}
-
-" Motion Functions: {{{
-" -- Find Motion -------------------------
-" Note: {{{
-" num_strokes:
-"   The number of input characters. Currently provide 1, 2, or -1.
-"   '-1' means no limit.
-" visualmode:
-"   Vim script couldn't detect the function is called in visual mode by
-"   mode(1), so tell whether it is in visual mode by argument explicitly
-" direction:
-"   0 -> forward
-"   1 -> backward
-"   2 -> bi-direction (handle forward & backward at the same time) }}}
-function! EasyMotion#S(num_strokes, visualmode, direction) " {{{
-    if a:direction == 1
-        let is_inclusive = 0
-    else
-        " Note: Handle bi-direction later because 'f' motion is inclusive but
-        " 'F' motion is exclusive
-        let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-    endif
-    let s:flag.find_bd = a:direction == 2 ? 1 : 0
-    let re = s:findMotion(a:num_strokes, a:direction)
-    if s:handleEmpty(re, a:visualmode) | return | endif
-    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#T(num_strokes, visualmode, direction) " {{{
-    if a:direction == 1
-        let is_inclusive = 0
-    else
-        " Note: Handle bi-direction later because 't' motion is inclusive but
-        " 'T' motion is exclusive
-        let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-    endif
-    let s:flag.find_bd = a:direction == 2 ? 1 : 0
-    let re = s:findMotion(a:num_strokes, a:direction)
-    if s:handleEmpty(re, a:visualmode) | return | endif
-    if a:direction == 2
-        let s:flag.bd_t = 1
-    elseif a:direction == 1
-        let re = s:convert_t_regexp(re, 1) " backward
-    else
-        let re = s:convert_t_regexp(re, 0) " forward
-    endif
-    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- Word Motion -------------------------
-function! EasyMotion#WB(visualmode, direction) " {{{
-    "FIXME: inconsistent with default vim motion
-    "FIXED: -> EasyMotion#WBK()
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    call s:EasyMotion('\(\<.\|^$\)', a:direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#WBW(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    call s:EasyMotion('\(\(^\|\s\)\@<=\S\|^$\)', a:direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#WBK(visualmode, direction) " {{{
-    " vim's iskeyword style word motion
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    call s:EasyMotion('\(\(\<\|\>\|\s\)\@<=\S\|^$\)', a:direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#E(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-    call s:EasyMotion('\(.\>\|^$\)', a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#EW(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-    call s:EasyMotion('\(\S\(\s\|$\)\|^$\)', a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#EK(visualmode, direction) " {{{
-    " vim's iskeyword style word motion
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-    call s:EasyMotion('\(\S\(\>\|\<\|\s\)\@=\|^$\)', a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- JK Motion ---------------------------
-function! EasyMotion#JK(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let s:flag.linewise = 1
-
-    if g:EasyMotion_startofline
-        call s:EasyMotion('^\(\w\|\s*\zs\|$\)', a:direction, a:visualmode ? visualmode() : '', 0)
-    else
-        let c = col('.')
-        let pattern = printf('^.\{-}\zs\(\%%<%dv.\%%>%dv\|$\)', c + 1, c)
-        call s:EasyMotion(pattern, a:direction, a:visualmode ? visualmode() : '', 0)
-    endif
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#Sol(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let s:flag.linewise = 1
-    call s:EasyMotion('^\(.\|$\)', a:direction, a:visualmode ? visualmode() : '', '')
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#Eol(visualmode, direction) " {{{
-    let s:flag.linewise = 1
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    call s:EasyMotion('\(\w\|\s*\zs\|.\|^\)$', a:direction, a:visualmode ? visualmode() : '', '')
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- Search Motion -----------------------
-function! EasyMotion#Search(visualmode, direction, respect_direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let search_direction = a:respect_direction ?
-    \   (a:direction == 1 ? v:searchforward : 1-v:searchforward) :
-    \   (a:direction)
-    call s:EasyMotion(@/, search_direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- JumpToAnywhere Motion ---------------
-function! EasyMotion#JumpToAnywhere(visualmode, direction) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    call s:EasyMotion( g:EasyMotion_re_anywhere, a:direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- Line Motion -------------------------
-function! EasyMotion#SL(num_strokes, visualmode, direction) " {{{
-    let s:flag.within_line = 1
-    call EasyMotion#S(a:num_strokes, a:visualmode, a:direction)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#TL(num_strokes, visualmode, direction) " {{{
-    let s:flag.within_line = 1
-    call EasyMotion#T(a:num_strokes, a:visualmode, a:direction)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#WBL(visualmode, direction) " {{{
-    let s:flag.within_line = 1
-    call EasyMotion#WBK(a:visualmode, a:direction)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#EL(visualmode, direction) " {{{
-    let s:flag.within_line = 1
-    call EasyMotion#EK(a:visualmode, a:direction)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#LineAnywhere(visualmode, direction) " {{{
-    let s:flag.within_line = 1
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let re = g:EasyMotion_re_line_anywhere
-    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', 0)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- User Motion -------------------------
-function! EasyMotion#User(pattern, visualmode, direction, inclusive) " {{{
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    let is_inclusive = mode(1) ==# 'no' ? a:inclusive : 0
-    let re = a:pattern
-    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" -- Repeat Motion -----------------------
-function! EasyMotion#Repeat(visualmode) " {{{
-    " Repeat previous motion with previous targets
-    if !has_key(s:previous, 'regexp')
-        call s:Message("Previous targets doesn't exist")
-        let s:EasyMotion_is_cancelled = 1
-        return s:EasyMotion_is_cancelled
-    endif
-    let re = s:previous.regexp
-    let direction = s:previous.direction
-    let s:flag.within_line = s:previous.line_flag
-    let s:flag.bd_t = s:previous.bd_t_flag
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    " FIXME: is_inclusive value is inappropriate but handling this value is
-    " difficult and priorities is low because this motion maybe used usually
-    " as a 'normal' motion.
-    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
-
-    call s:EasyMotion(re, direction, a:visualmode ? visualmode() : '', is_inclusive)
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#DotRepeat() " {{{
-    let cnt = v:count1 " avoid overwriting
-
-    " Repeat previous '.' motion with previous targets and operator
-    if !has_key(s:dot_repeat, 'regexp')
-        call s:Message("Previous motion doesn't exist")
-        let s:EasyMotion_is_cancelled = 1
-        return s:EasyMotion_is_cancelled
-    endif
-
-    let re = s:dot_repeat.regexp
-    let direction = s:dot_repeat.direction
-    let is_inclusive = s:dot_repeat.is_inclusive
-
-    for i in range(cnt)
-        " s:EasyMotion() always call reset s:flag & s:current
-        let s:flag.dot_repeat = 1
-        let s:flag.within_line = s:dot_repeat.line_flag
-        let s:flag.bd_t = s:dot_repeat.bd_t_flag
-        let s:current.is_operator = 1
-
-        let s:flag.count_dot_repeat = (i > 0 ? 1 : 0)
-        silent call s:EasyMotion(re, direction, 0, is_inclusive)
-    endfor
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-function! EasyMotion#NextPrevious(visualmode, direction) " {{{
-    " Move next/previous destination using previous motion regexp
-    let cnt = v:count1 " avoid overwriting
-    if !has_key(s:previous, 'regexp')
-        call s:Message("Previous targets doesn't exist")
-        let s:EasyMotion_is_cancelled = 1
-        return s:EasyMotion_is_cancelled
-    endif
-    let re = s:previous.regexp
-    let search_direction = (a:direction >= 1 ? 'b' : '')
-
-    if g:EasyMotion_move_highlight
-        call EasyMotion#highlight#attach_autocmd()
-        call EasyMotion#highlight#add_highlight(re, g:EasyMotion_hl_move)
-    endif
-
-    if ! empty(a:visualmode)
-        " FIXME: blink highlight
-        silent exec 'normal! gv'
-    endif
-
-    " Mark jump-list
-    if cnt > 1
-        " Consider Next/Previous motions as jump motion :h jump-motion
-        " Note: It should add jumplist even if the count isn't given
-        "       considering vim's default behavior of `n` & `N`, but just
-        "       I don't want to do it without the count. Should I add a
-        "       option?
-        normal! m`
-    endif
-
-    " Jump
-    " @vimlint(EVL102, 1, l:_)
-    for _ in range(cnt)
-        keepjumps call searchpos(re, search_direction)
-    endfor
-
-    normal! zv
-
-    call EasyMotion#reset()
-    " -- Activate EasyMotion ----------------- {{{
-    let s:EasyMotion_is_active = 1
-    call EasyMotion#attach_active_autocmd() "}}}
-    return s:EasyMotion_is_cancelled
-endfunction " }}}
-" }}}
-" Helper Functions: {{{
-" -- Message -----------------------------
-function! s:Message(message) " {{{
-    echo 'EasyMotion: ' . a:message
-endfunction " }}}
-function! s:Prompt(message) " {{{
-    echohl Question
-    echo a:message . ': '
-    echohl None
-endfunction " }}}
-function! s:Throw(message) "{{{
-    throw 'EasyMotion: ' . a:message
-endfunction "}}}
-
-" -- Save & Restore values ---------------
-function! s:SaveValue() "{{{
-    if ! s:current.is_search
-        call EasyMotion#helper#VarReset('&scrolloff', 0)
-    endif
-    call EasyMotion#helper#VarReset('&modified', 0)
-    call EasyMotion#helper#VarReset('&modifiable', 1)
-    call EasyMotion#helper#VarReset('&readonly', 0)
-    call EasyMotion#helper#VarReset('&spell', 0)
-    call EasyMotion#helper#VarReset('&virtualedit', '')
-    " if &foldmethod !=# 'expr'
-        call EasyMotion#helper#VarReset('&foldmethod', 'manual')
-    " endif
-endfunction "}}}
-function! s:RestoreValue() "{{{
-    call EasyMotion#helper#VarReset('&scrolloff')
-    call EasyMotion#helper#VarReset('&modified')
-    call EasyMotion#helper#VarReset('&modifiable')
-    call EasyMotion#helper#VarReset('&readonly')
-    call EasyMotion#helper#VarReset('&spell')
-    call EasyMotion#helper#VarReset('&virtualedit')
-    " if &foldmethod !=# 'expr'
-        call EasyMotion#helper#VarReset('&foldmethod')
-    " endif
-endfunction "}}}
-function! s:turn_off_hl_error() "{{{
-    let s:error_hl = EasyMotion#highlight#capture('Error')
-    call EasyMotion#highlight#turn_off(s:error_hl)
-    let s:matchparen_hl = EasyMotion#highlight#capture('MatchParen')
-    call EasyMotion#highlight#turn_off(s:matchparen_hl)
-endfunction "}}}
-function! s:turn_on_hl_error() "{{{
-    if exists('s:error_hl')
-        call EasyMotion#highlight#turn_on(s:error_hl)
-        unlet s:error_hl
-    endif
-
-    if exists('s:matchparen_hl')
-        call EasyMotion#highlight#turn_on(s:matchparen_hl)
-        unlet s:matchparen_hl
-    endif
-endfunction "}}}
-
-" -- Draw --------------------------------
-function! s:SetLines(lines, key) " {{{
-    for [line_num, line] in a:lines
-        keepjumps call setline(line_num, line[a:key])
-    endfor
-endfunction " }}}
-
-" -- Get characters from user input ------
-function! s:GetChar() " {{{
-    let char = getchar()
-    if char == 27
-        " Escape key pressed
-        redraw
-        call s:Message('Cancelled')
-        return ''
-    endif
-    return nr2char(char)
-endfunction " }}}
-
-" -- Find Motion Helper ------------------
-function! s:findMotion(num_strokes, direction) "{{{
-    " Find Motion: S,F,T
-    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
-    " store cursor pos because 'n' key find motion could be jump to offscreen
-    let s:current.original_position = [line('.'), col('.')]
-    let s:current.is_search = a:num_strokes == -1 ? 1: 0
-    let s:flag.regexp = a:num_strokes == -1 ? 1 : 0 " TODO: remove?
-
-    if g:EasyMotion_add_search_history && a:num_strokes == -1
-        let s:previous['input'] = @/
-    else
-        let s:previous['input'] = get(s:previous, 'input', '')
-    endif
-    let input = EasyMotion#command_line#GetInput(
-                    \ a:num_strokes, s:previous.input, a:direction)
-    let s:previous['input'] = input
-
-    " Check that we have an input char
-    if empty(input)
-        return ''
-    endif
-
-    let re = s:convertRegep(input)
-
-    if g:EasyMotion_add_search_history && a:num_strokes == -1
-        let history_re = substitute(re, '\\c\|\\C', '', '')
-        let @/ = history_re "For textobject: 'gn'
-        call histadd('search', history_re)
-    endif
-
-    return re
-endfunction "}}}
-function! s:convertRegep(input) "{{{
-    " 1. regexp
-    " 2. migemo
-    " 3. smartsign
-    " 4. smartcase
-    let re = s:should_use_regexp() ? a:input : s:escape_regexp_char(a:input)
-
-    " Convert space to match only start of spaces
-    if re ==# ' '
-        let re = '\s\+'
-    endif
-
-    if s:should_use_migemo(a:input)
-        let re = s:convertMigemo(re)
-    endif
-
-    if s:should_use_smartsign(a:input)
-        let re = s:convertSmartsign(a:input)
-    endif
-
-    let case_flag = EasyMotion#helper#should_case_sensitive(
-                        \ a:input, s:current.is_search) ? '\c' : '\C'
-    let re = case_flag . re
-    return re
-endfunction "}}}
-function! s:convertMigemo(re) "{{{
-    let re = a:re
-
-    if len(re) > 1
-        " System cmigemo
-        return EasyMotion#cmigemo#getMigemoPattern(re)
-    endif
-
-    " EasyMotion migemo one key dict
-    if ! has_key(s:migemo_dicts, &l:encoding)
-        let s:migemo_dicts[&l:encoding] = EasyMotion#helper#load_migemo_dict()
-    endif
-    if re =~# '^\a$'
-        let re = get(s:migemo_dicts[&l:encoding], re, a:re)
-    endif
-    return re
-endfunction "}}}
-function! s:convertSmartsign(chars) "{{{
-    " Convert given chars to smartsign string
-    " Example: 12 -> [1!][2@]
-    "          a] -> a[]}]
-
-    " Load smartsign dictionary
-    let smart_dict = s:load_smart_dict()
-    " Prepare converted string
-    let converted_str = ''
-    " Get `upper_sign` for each given chars
-    " Split chars into list
-    for char in split(a:chars, '\zs')
-        let upper_sign = s:get_escaped_group_char(smart_dict, char)
-        if upper_sign ==# ''
-            let converted_str .= s:escape_regexp_char(char)
-        else
-            " [1!]
-            let converted_str .= '[' . char . upper_sign . ']'
-        endif
-    endfor
-    return converted_str
-endfunction "}}}
-function! s:get_escaped_group_char(dict, char) "{{{
-    " Get escaped char from given dictionary
-    " return '' if char is not find
-    " Used inside `[]`
-    return escape(get(a:dict, a:char, ''), '^')
-endfunction "}}}
-function! s:escape_regexp_char(char) "{{{
-    return escape(a:char, '.$^~\[]*')
-endfunction "}}}
-function! s:convertSmartcase(re, char) "{{{
-    let re = a:re
-    if a:char =~# '\U' "nonuppercase
-        return '\c' . re
-    else "uppercase
-        return '\C' . re
-    endif
-endfunction "}}}
-function! s:should_use_regexp() "{{{
-    return g:EasyMotion_use_regexp == 1 && s:flag.regexp == 1
-endfunction "}}}
-function! s:should_use_migemo(char) "{{{
-    if ! g:EasyMotion_use_migemo || match(a:char, '\A') != -1
-        return 0
-    endif
-
-    " TODO: use direction to improve
-    if s:flag.within_line == 1
-        let first_line = line('.')
-        let end_line = line('.')
-    else
-        let first_line = line('w0')
-        let end_line = line('w$')
-    endif
-
-    " Skip folded line and check if text include multibyte characters
-    for line in range(first_line, end_line)
-        if EasyMotion#helper#is_folded(line)
-            continue
-        endif
-
-        if EasyMotion#helper#include_multibyte_char(getline(line)) == 1
-            return 1
-        endif
-    endfor
-
-    return 0
-endfunction "}}}
-function! s:should_use_smartsign(char) "{{{
-    " Smartsign Dictionary exists?
-    " \A: non-alphabetic character
-    " Do not use smartsign for n-key find search motions
-    if (exists('g:EasyMotion_use_smartsign_us')  ||
-    \   exists('g:EasyMotion_use_smartsign_jp')) &&
-    \  match(a:char, '\A') != -1 &&
-    \ exists('s:current.is_search') && s:current.is_search == 0
-        return 1
-    else
-        return 0
-    endif
-endfunction "}}}
-function! s:convert_t_regexp(re, direction) "{{{
-    if a:direction == 0 "forward
-        return '\_.\ze\('.a:re.'\)'
-    elseif a:direction == 1 "backward
-        return '\('.a:re.'\)\@<=\_.'
-    endif
-endfunction "}}}
-
-" -- Handle Visual Mode ------------------
-function! s:GetVisualStartPosition(c_pos, v_start, v_end, search_direction) "{{{
-    let vmode = mode(1)
-    if vmode !~# "^[Vv\<C-v>]"
-        call s:Throw('Unkown visual mode:'.vmode)
-    endif
-
-    if vmode ==# 'V' "line-wise Visual
-        " Line-wise Visual {{{
-        if a:v_start[0] == a:v_end[0]
-            if a:search_direction == ''
-                return a:v_start
-            elseif a:search_direction == 'b'
-                return a:v_end
-            else
-                call s:throw('Unkown search_direction')
-            endif
-        else
-            if a:c_pos[0] == a:v_start[0]
-                return a:v_end
-            elseif a:c_pos[0] == a:v_end[0]
-                return a:v_start
-            endif
-        endif
-        "}}}
-    else
-        " Character-wise or Block-wise Visual"{{{
-        if a:c_pos == a:v_start
-            return a:v_end
-        elseif a:c_pos == a:v_end
-            return a:v_start
-        endif
-
-        " virtualedit
-        if a:c_pos[0] == a:v_start[0]
-            return a:v_end
-        elseif a:c_pos[0] == a:v_end[0]
-            return a:v_start
-        elseif EasyMotion#helper#is_greater_coords(a:c_pos, a:v_start) == 1
-            return a:v_end
-        else
-            return a:v_start
-        endif
-        "}}}
-    endif
-endfunction "}}}
-
-" -- Others ------------------------------
-function! s:is_cmdwin() "{{{
-  return bufname('%') ==# '[Command Line]'
-endfunction "}}}
-function! s:should_use_wundo() "{{{
-    " wundu cannot use in command-line window and
-    " unless undolist is not empty
-    return ! s:is_cmdwin() && undotree().seq_last != 0
-endfunction "}}}
-function! s:handleEmpty(input, visualmode) "{{{
-    " if empty, reselect and return 1
-    if empty(a:input)
-        if ! empty(a:visualmode)
-            silent exec 'normal! gv'
-        endif
-        let s:EasyMotion_is_cancelled = 1 " Cancel
-        return 1
-    endif
-    return 0
-endfunction "}}}
-function! s:load_smart_dict() "{{{
-    if exists('g:EasyMotion_use_smartsign_us')
-        return g:EasyMotion#sticky_table#us
-    elseif exists('g:EasyMotion_use_smartsign_jp')
-        return g:EasyMotion#sticky_table#jp
-    else
-        return {}
-    endif
-endfunction "}}}
-function! EasyMotion#attach_active_autocmd() "{{{
-    " Reference: https://github.com/justinmk/vim-sneak
-    augroup plugin-easymotion-active
-        autocmd!
-        autocmd InsertEnter,WinLeave,BufLeave <buffer>
-            \ let s:EasyMotion_is_active = 0
-            \  | autocmd! plugin-easymotion-active * <buffer>
-        autocmd CursorMoved <buffer>
-            \ autocmd plugin-easymotion-active CursorMoved <buffer>
-            \ let s:EasyMotion_is_active = 0
-            \  | autocmd! plugin-easymotion-active * <buffer>
-    augroup END
-endfunction "}}}
-function! EasyMotion#is_active() "{{{
-    return s:EasyMotion_is_active
-endfunction "}}}
-function! EasyMotion#activate(is_visual) "{{{
-    let s:EasyMotion_is_active = 1
-    call EasyMotion#attach_active_autocmd()
-    call EasyMotion#highlight#add_highlight(s:previous.regexp,
-                                          \ g:EasyMotion_hl_move)
-    call EasyMotion#highlight#attach_autocmd()
-    if a:is_visual == 1
-        normal! gv
-    endif
-endfunction "}}}
-function! s:restore_cursor_state(visualmode) "{{{
-    " -- Restore original cursor position/selection
-    if ! empty(a:visualmode)
-        silent exec 'normal! gv'
-        keepjumps call cursor(s:current.cursor_position)
-    else
-        keepjumps call cursor(s:current.original_position)
-    endif
-endfunction " }}}
-" Grouping Algorithms: {{{
-let s:grouping_algorithms = {
-\   1: 'SCTree'
-\ , 2: 'Original'
-\ }
-" -- Single-key/closest target priority tree {{{
-" This algorithm tries to assign one-key jumps to all the targets closest to the cursor.
-" It works recursively and will work correctly with as few keys as two.
-function! s:GroupingAlgorithmSCTree(targets, keys) "{{{
-    " Prepare variables for working
-    let targets_len = len(a:targets)
-    let keys_len = len(a:keys)
-
-    let groups = {}
-
-    let keys = reverse(copy(a:keys))
-
-    " Semi-recursively count targets {{{
-        " We need to know exactly how many child nodes (targets) this branch will have
-        " in order to pass the correct amount of targets to the recursive function.
-
-        " Prepare sorted target count list {{{
-            " This is horrible, I know. But dicts aren't sorted in vim, so we need to
-            " work around that. That is done by having one sorted list with key counts,
-            " and a dict which connects the key with the keys_count list.
-
-            let keys_count = []
-            let keys_count_keys = {}
-
-            let i = 0
-            for key in keys
-                call add(keys_count, 0)
-
-                let keys_count_keys[key] = i
-
-                let i += 1
-            endfor
-        " }}}
-
-        let targets_left = targets_len
-        let level = 0
-        let i = 0
-
-        while targets_left > 0
-            " Calculate the amount of child nodes based on the current level
-            let childs_len = (level == 0 ? 1 : (keys_len - 1) )
-
-            for key in keys
-                " Add child node count to the keys_count array
-                let keys_count[keys_count_keys[key]] += childs_len
-
-                " Subtract the child node count
-                let targets_left -= childs_len
-
-                if targets_left <= 0
-                    " Subtract the targets left if we added too many too
-                    " many child nodes to the key count
-                    let keys_count[keys_count_keys[key]] += targets_left
-
-                    break
-                endif
-
-                let i += 1
-            endfor
-
-            let level += 1
-        endwhile
-    " }}}
-    " Create group tree {{{
-        let i = 0
-        let key = 0
-
-        call reverse(keys_count)
-
-        for key_count in keys_count
-            if key_count > 1
-                " We need to create a subgroup
-                " Recurse one level deeper
-                let groups[a:keys[key]] = s:GroupingAlgorithmSCTree(a:targets[i : i + key_count - 1], a:keys)
-            elseif key_count == 1
-                " Assign single target key
-                let groups[a:keys[key]] = a:targets[i]
-            else
-                " No target
-                continue
-            endif
-
-            let key += 1
-            let i += key_count
-        endfor
-    " }}}
-
-    " Finally!
-    return groups
-endfunction "}}}
-" }}}
-" -- Original ---------------------------- {{{
-function! s:GroupingAlgorithmOriginal(targets, keys)
-    " Split targets into groups (1 level)
-    let targets_len = len(a:targets)
-    " let keys_len = len(a:keys)
-
-    let groups = {}
-
-    let i = 0
-    let root_group = 0
-    try
-        while root_group < targets_len
-            let groups[a:keys[root_group]] = {}
-
-            for key in a:keys
-                let groups[a:keys[root_group]][key] = a:targets[i]
-
-                let i += 1
-            endfor
-
-            let root_group += 1
-        endwhile
-    catch | endtry
-
-    " Flatten the group array
-    if len(groups) == 1
-        let groups = groups[a:keys[0]]
-    endif
-
-    return groups
-endfunction
-" }}}
-
-" -- Coord/key dictionary creation ------- {{{
-function! s:CreateCoordKeyDict(groups, ...)
-    " Dict structure:
-    " 1,2 : a
-    " 2,3 : b
-    let sort_list = []
-    let coord_keys = {}
-    let group_key = a:0 == 1 ? a:1 : ''
-
-    for [key, item] in items(a:groups)
-        let key = group_key . key
-        "let key = ( ! empty(group_key) ? group_key : key)
-
-        if type(item) == type([]) " List
-            " Destination coords
-
-            " The key needs to be zero-padded in order to
-            " sort correctly
-            let dict_key = printf('%05d,%05d', item[0], item[1])
-            let coord_keys[dict_key] = key
-
-            " We need a sorting list to loop correctly in
-            " PromptUser, dicts are unsorted
-            call add(sort_list, dict_key)
-        else
-            " Item is a dict (has children)
-            let coord_key_dict = s:CreateCoordKeyDict(item, key)
-
-            " Make sure to extend both the sort list and the
-            " coord key dict
-            call extend(sort_list, coord_key_dict[0])
-            call extend(coord_keys, coord_key_dict[1])
-        endif
-
-        unlet item
-    endfor
-
-    return [sort_list, coord_keys]
-endfunction
-" }}}
-" }}}
-"}}}
-" Core Functions: {{{
-function! s:PromptUser(groups) "{{{
-    " Recursive
-    let group_values = values(a:groups)
-
-    " -- If only one possible match, jump directly to it {{{
-    if len(group_values) == 1
-        if mode(1) ==# 'no'
-            " Consider jump to first match
-            " NOTE: matchstr() handles multibyte characters.
-            let s:dot_repeat['target'] = matchstr(g:EasyMotion_keys, '^.')
-        endif
-        redraw
-        return group_values[0]
-    endif
-    " }}}
-
-    " -- Prepare marker lines ---------------- {{{
-    let lines = {}
-
-    let coord_key_dict = s:CreateCoordKeyDict(a:groups)
-
-    let prev_col_num = 0
-    for dict_key in sort(coord_key_dict[0])
-        " NOTE: {{{
-        " let g:EasyMotion_keys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        " Perform <Plug>(easymotion-w)
-        "
-        " lines[line_num]['orig']:
-        "   Lorem ipsum dolor sit amet consectetur adipisicing
-        "
-        " {target_char}:
-        "   {L}orem {i}psum {d}olor {s}it {a}met {c}onsectetur {a}dipisicing
-        "
-        " lines[line_num]['marker'], {marker_chars}:
-        "   {A}orem {B}psum {C}olor {D}it {E}met {F}onsectetur {G}dipisicing
-        "   2-key-combo: {marker_chars} could be 1 or 2 chars like {AB}
-        "
-        " }}}
-
-        " Prepare original line and marker line {{{
-        let [line_num, col_num] = split(dict_key, ',')
-
-        let line_num = str2nr(line_num)
-        let col_num = str2nr(col_num)
-        if ! has_key(lines, line_num)
-            let current_line = getline(line_num)
-            let lines[line_num] = {
-                \ 'orig': current_line,
-                \ 'marker': current_line,
-                \ 'mb_compensation': 0,
-                \ }
-            " mb_compensation -> multibyte compensation
-            let prev_col_num = 0
-        endif "}}}
-
-        " Multibyte Compensation: {{{
-        " Solve multibyte issues by matching the byte column
-        " number instead of the visual column
-        " Compensate for byte difference between marker
-        " character and target character
-        "
-        " This has to be done in order to match the correct
-        " column; \%c matches the byte column and not display
-        " column.
-        let col_num = max([prev_col_num + 1,
-                        \  col_num - lines[line_num]['mb_compensation']])
-        let prev_col_num = col_num
-        "}}}
-
-        " Prepare marker characters {{{
-        let marker_chars = coord_key_dict[1][dict_key]
-        let marker_chars_len = EasyMotion#helper#strchars(marker_chars)
-        "}}}
-
-        " Replace {target} with {marker} & Highlight {{{
-        let col_add = 0 " Column add byte length
-        " Disable two-key-combo feature?
-        let marker_max_length = g:EasyMotion_disable_two_key_combo == 1
-                                \ ? 1 : 2
-        for i in range(min([marker_chars_len, marker_max_length]))
-            let marker_char = split(marker_chars, '\zs')[i]
-            " EOL {{{
-            if strlen(lines[line_num]['marker']) < col_num + col_add
-                " Append marker chars if target is EOL
-                let lines[line_num]['marker'] .= ' '
-            endif "}}}
-
-            let target_col_regexp = '\%' . (col_num + col_add) . 'c.'
-            let target_char = matchstr(lines[line_num]['marker'],
-                                      \ target_col_regexp)
-            let space_len = strdisplaywidth(target_char)
-                        \ - strdisplaywidth(marker_char)
-            " Substitute marker character
-            let substitute_expr = marker_char . repeat(' ', space_len)
-
-            let lines[line_num]['marker'] = substitute(
-                \ lines[line_num]['marker'],
-                \ target_col_regexp,
-                \ escape(substitute_expr,'&'),
-                \ '')
-
-            " Highlight targets {{{
-            let _hl_group =
-            \   (marker_chars_len == 1) ? g:EasyMotion_hl_group_target
-            \   : (i == 0) ? g:EasyMotion_hl2_first_group_target
-            \   : g:EasyMotion_hl2_second_group_target
-
-            if exists('*matchaddpos')
-                call EasyMotion#highlight#add_pos_highlight(
-                            \ line_num, col_num + col_add, _hl_group)
-            else
-                call EasyMotion#highlight#add_highlight(
-                    \ '\%' . line_num . 'l' . target_col_regexp,
-                    \ _hl_group)
-            endif
-            "}}}
-
-            " Add marker/target length difference for multibyte compensation
-            let lines[line_num]['mb_compensation'] +=
-                \ strlen(target_char) - strlen(substitute_expr)
-            " Shift column
-            let col_add += strlen(marker_char)
-        endfor
-        "}}}
-    endfor
-
-    let lines_items = items(lines)
-    " }}}
-
-    " -- Put labels on targets & Get User Input & Restore all {{{
-    " Save undo tree {{{
-    let s:undo_file = tempname()
-    if s:should_use_wundo()
-        execute "wundo" s:undo_file
-    endif
-    "}}}
-    try
-        " Set lines with markers {{{
-        call s:SetLines(lines_items, 'marker')
-        redraw "}}}
-
-        " Get target character {{{
-        call s:Prompt('Target key')
-        let char = s:GetChar()
-        "}}}
-
-        " Convert uppercase {{{
-        if g:EasyMotion_use_upper == 1 && match(g:EasyMotion_keys, '\l') == -1
-            let char = toupper(char)
-        endif "}}}
-
-        " Jump first target when Enter or Space key is pressed "{{{
-        if (char ==# "\<CR>" && g:EasyMotion_enter_jump_first == 1) ||
-        \  (char ==# "\<Space>" && g:EasyMotion_space_jump_first == 1)
-            " NOTE: matchstr() is multibyte aware.
-            let char = matchstr(g:EasyMotion_keys, '^.')
-        endif "}}}
-
-        " For dot repeat {{{
-        if mode(1) ==# 'no'
-            " Store previous target when operator pending mode
-            if s:current.dot_prompt_user_cnt == 0
-                " Store
-                let s:dot_repeat['target'] = char
-            else
-                " Append target chars
-                let s:dot_repeat['target'] .= char
-            endif
-        endif "}}}
-
-    finally
-        " Restore original lines
-        call s:SetLines(lines_items, 'orig')
-
-        " Un-highlight targets {{{
-        call EasyMotion#highlight#delete_highlight(
-            \ g:EasyMotion_hl_group_target,
-            \ g:EasyMotion_hl2_first_group_target,
-            \ g:EasyMotion_hl2_second_group_target,
-            \ )
-        " }}}
-
-        " Restore undo tree {{{
-        if s:should_use_wundo() && filereadable(s:undo_file)
-            silent execute "rundo" s:undo_file
-            call delete(s:undo_file)
-            unlet s:undo_file
-        else
-            " Break undo history (undobreak)
-            let old_undolevels = &undolevels
-            set undolevels=-1
-            keepjumps call setline('.', getline('.'))
-            let &undolevels = old_undolevels
-            unlet old_undolevels
-            " FIXME: Error occur by GundoToggle for undo number 2 is empty
-            keepjumps call setline('.', getline('.'))
-        endif "}}}
-
-        redraw
-    endtry "}}}
-
-    " -- Check if we have an input char ------ {{{
-    if empty(char)
-        call s:Throw('Cancelled')
-    endif
-    " }}}
-    " -- Check if the input char is valid ---- {{{
-    if ! has_key(a:groups, char)
-        call s:Throw('Invalid target')
-    endif
-    " }}}
-
-    let target = a:groups[char]
-
-    if type(target) == type([])
-        " Return target coordinates
-        return target
-    else
-        " Prompt for new target character
-        let s:current.dot_prompt_user_cnt += 1
-        return s:PromptUser(target)
-    endif
-endfunction "}}}
-function! s:DotPromptUser(groups) "{{{
-    " Get char from previous target
-    let char = s:dot_repeat.target[s:current.dot_repeat_target_cnt]
-    " For dot repeat target chars
-    let s:current.dot_repeat_target_cnt += 1
-
-    let target = a:groups[char]
-
-    if type(target) == type([])
-        " Return target coordinates
-        return target
-    else
-        " Prompt for new target character
-        return s:PromptUser(target)
-    endif
-endfunction "}}}
-function! s:EasyMotion(regexp, direction, visualmode, is_inclusive) " {{{
-    " Store s:current original_position & cursor_position {{{
-    " current cursor pos.
-    let s:current.cursor_position = [line('.'), col('.')]
-    " original start position.  This value could be changed later in visual
-    " mode
-    let s:current.original_position =
-        \ get(s:current, 'original_position', s:current.cursor_position)
-    "}}}
-
-    let win_first_line = line('w0') " visible first line num
-    let win_last_line  = line('w$') " visible last line num
-
-    " Store the target positions list
-    " e.g. targets = [ [line, col], [line2, col2], ...]
-    let targets = []
-
-    " Store info for Repeat motion {{{
-    if s:flag.dot_repeat != 1
-        " Store Regular Expression
-        let s:previous['regexp'] = a:regexp
-        let s:previous['direction'] = a:direction
-        let s:previous['operator'] = v:operator
-
-        " Note: 'is_inclusive' value could be changed later when
-        " bi-directional find motion depend on 'true' direction the cursor
-        " will move.
-        let s:previous['is_inclusive'] = a:is_inclusive
-
-        " For special motion flag
-        let s:previous['line_flag'] = s:flag.within_line
-        let s:previous['bd_t_flag'] = s:flag.bd_t " bi-directional t motion
-    endif "}}}
-
-    " To avoid side effect of overwriting buffer for tpope/repeat
-    " store current b:changedtick. Use this value later
-    let s:current.changedtick = b:changedtick
-
-    try
-        " -- Reset properties -------------------- {{{
-        " Save original value and set new value
-        call s:SaveValue()
-        call s:turn_off_hl_error()
-        " }}}
-        " Setup searchpos args {{{
-        let search_direction = (a:direction >= 1 ? 'b' : '')
-        let search_stopline = a:direction >= 1 ? win_first_line : win_last_line
-
-        if s:flag.within_line == 1
-            let search_stopline = s:current.original_position[0]
-        endif
-        "}}}
-
-        " Handle visual mode {{{
-        if ! empty(a:visualmode)
-            " Decide at where visual mode start {{{
-            normal! gv
-            let v_start = [line("'<"),col("'<")] " visual_start_position
-            let v_end   = [line("'>"),col("'>")] " visual_end_position
-
-            let v_original_pos = s:GetVisualStartPosition(
-                \ s:current.cursor_position, v_start, v_end, search_direction)
-            "}}}
-
-            " Reselect visual text {{{
-            keepjumps call cursor(v_original_pos)
-            exec "normal! " . a:visualmode
-            keepjumps call cursor(s:current.cursor_position)
-            "}}}
-            " Update s:current.original_position
-            " overwrite original start position
-            let s:current.original_position = v_original_pos
-        endif "}}}
-
-        " Handle bi-directional t motion {{{
-        if s:flag.bd_t == 1
-            let regexp = s:convert_t_regexp(a:regexp, 1) "backward
-        else
-            let regexp = a:regexp
-        endif
-        "}}}
-
-        " Handle dot repeat with count
-        if s:flag.count_dot_repeat
-            let cursor_char = EasyMotion#helper#get_char_by_coord(s:current.cursor_position)
-            if cursor_char =~# regexp
-                call add(targets, s:current.cursor_position)
-            endif
-        endif
-
-        " Construct match dict {{{
-        while 1
-            " Note: searchpos() has side effect which jump cursor position.
-            "       You can disable this side effect by add 'n' flags,
-            "       but in this case, it's better to allows jump side effect
-            "       to gathering matched targets coordinates.
-            let pos = searchpos(regexp, search_direction, search_stopline)
-
-            " Reached end of search range
-            if pos == [0, 0]
-                break
-            endif
-
-            " Skip folded lines {{{
-            if EasyMotion#helper#is_folded(pos[0])
-                if search_direction ==# 'b'
-                    " FIXME: Hmm... I should use filter()
-                    " keepjumps call cursor(foldclosed(pos[0]), 0)
-                else
-                    keepjumps call cursor(foldclosedend(pos[0]+1), 0)
-                endif
-                continue
-            endif "}}}
-
-            call add(targets, pos)
-        endwhile
-        "}}}
-
-        " Handle bidirection "{{{
-        " For bi-directional t motion {{{
-        if s:flag.bd_t == 1
-            let regexp = s:convert_t_regexp(a:regexp, 0) "forward
-        endif
-        "}}}
-        " Reconstruct match dict
-        if a:direction == 2
-            " Forward
-
-            " Jump back cursor_position
-            keepjumps call cursor(s:current.cursor_position[0],
-                                \ s:current.cursor_position[1])
-
-            let targets2 = []
-            if s:flag.within_line == 0
-                let search_stopline = win_last_line
-            else
-                let search_stopline = s:current.cursor_position[0]
-            endif
-            while 1
-                " TODO: refactoring
-                let pos = searchpos(regexp, '', search_stopline)
-                " Reached end of search range
-                if pos == [0, 0]
-                    break
-                endif
-
-                " Skip folded lines {{{
-                if EasyMotion#helper#is_folded(pos[0])
-                    " Always forward
-                    keepjumps call cursor(foldclosedend(pos[0]+1), 0)
-                    continue
-                endif
-                "}}}
-
-                call add(targets2, pos)
-            endwhile
-            " Merge match target dict"{{{
-            let t1 = 0 " backward
-            let t2 = 0 " forward
-            let targets3 = []
-            while t1 < len(targets) || t2 < len(targets2)
-                " Forward -> Backward -> F -> B -> ...
-                if t2 < len(targets2)
-                    call add(targets3, targets2[t2])
-                    let t2 += 1
-                endif
-                if t1 < len(targets)
-                    call add(targets3, targets[t1])
-                    let t1 += 1
-                endif
-            endwhile
-            let targets = targets3
-            "}}}
-        endif
-        "}}}
-        " Handle no match"{{{
-        let targets_len = len(targets)
-        if targets_len == 0
-            call s:Throw('No matches')
-        endif
-        "}}}
-
-        " Attach specific key as marker to gathered matched coordinates
-        let GroupingFn = function('s:GroupingAlgorithm' . s:grouping_algorithms[g:EasyMotion_grouping])
-        let groups = GroupingFn(targets, split(g:EasyMotion_keys, '\zs'))
-
-        " -- Shade inactive source --------------- {{{
-        if g:EasyMotion_do_shade && targets_len != 1 && s:flag.dot_repeat != 1
-            if a:direction == 1 " Backward
-                let shade_hl_re = s:flag.within_line
-                                \ ? '^.*\%#'
-                                \ : '\%'. win_first_line .'l\_.*\%#'
-            elseif a:direction == 0 " Forward
-                let shade_hl_re = s:flag.within_line
-                                \ ? '\%#.*$'
-                                \ : '\%#\_.*\%'. win_last_line .'l'
-            else " Both directions
-                let shade_hl_re = s:flag.within_line
-                                \ ? '^.*\%#.*$'
-                                \ : '\_.*'
-            endif
-
-            call EasyMotion#highlight#add_highlight(
-                \ shade_hl_re, g:EasyMotion_hl_group_shade)
-            if g:EasyMotion_cursor_highlight
-                let cursor_hl_re = '\%#'
-                call EasyMotion#highlight#add_highlight(cursor_hl_re,
-                    \ g:EasyMotion_hl_inc_cursor)
-            endif
-        endif
-        " }}}
-
-        " -- Jump back before prompt for visual scroll {{{
-        " Because searchpos() change current cursor position and
-        " if you just use cursor(s:current.cursor_position) to jump back,
-        " current line will become middle of line window
-        if ! empty(a:visualmode)
-            keepjumps call winrestview({'lnum' : win_first_line, 'topline' : win_first_line})
-        else
-            " for adjusting cursorline
-            keepjumps call cursor(s:current.cursor_position)
-        endif
-        "}}}
-
-        " -- Prompt user for target group/character {{{
-        if s:flag.dot_repeat != 1
-            let coords = s:PromptUser(groups)
-        else
-            let coords = s:DotPromptUser(groups)
-        endif
-        "}}}
-
-        " -- Update cursor position -------------- {{{
-        " First, jump back cursor to original position
-        keepjumps call cursor(s:current.original_position)
-
-        " Consider EasyMotion as jump motion :h jump-motion
-        normal! m`
-
-        " Update selection for visual mode {{{
-        if ! empty(a:visualmode)
-            exec 'normal! ' . a:visualmode
-        endif
-        " }}}
-
-        " For bi-directional motion, checking again whether the motion is
-        " inclusive is necessary. This value will might be updated later
-        let is_inclusive_check = a:is_inclusive
-        " For bi-directional motion, store 'true' direction for dot repeat
-        " to handling inclusive/exclusive motion
-        if a:direction == 2
-            let true_direction =
-                \ EasyMotion#helper#is_greater_coords(
-                \   s:current.original_position, coords) > 0 ?
-                \ 0 : 1
-                " forward : backward
-        else
-            let true_direction = a:direction
-        endif
-
-        if s:flag.dot_repeat == 1
-            " support dot repeat {{{
-            " Use visual mode to emulate dot repeat
-            normal! v
-
-            " Deal with exclusive {{{
-            if s:dot_repeat.is_inclusive == 0
-                " exclusive
-                if s:dot_repeat.true_direction == 0 "Forward
-                    let coords[1] -= 1
-                elseif s:dot_repeat.true_direction == 1 "Backward
-                    " Shift visual selection to left by making cursor one key
-                    " left.
-                    normal! hoh
-                endif
-            endif "}}}
-
-            " Jump to destination
-            keepjumps call cursor(coords[0], coords[1])
-
-            " Execute previous operator
-            let cmd = s:dot_repeat.operator
-            if s:dot_repeat.operator ==# 'c'
-                let cmd .= getreg('.')
-            endif
-            exec 'normal! ' . cmd
-            "}}}
-        else
-            " Handle inclusive & exclusive {{{
-            " Overwrite inclusive flag for special case {{{
-            if s:flag.find_bd == 1 && true_direction == 1
-                " Note: For bi-directional find motion s(f) & t
-                " If true_direction is backward, the motion is 'exclusive'
-                let is_inclusive_check = 0 " overwrite
-                let s:previous.is_inclusive = 0 " overwrite
-            endif "}}}
-            if is_inclusive_check
-                " Note: {{{
-                " Inclusive motion requires that we eat one more
-                " character to the right by forcing the motion to inclusive
-                " if we're using a forward motion because
-                " > :h exclusive
-                " > Note that when using ':' any motion becomes characterwise
-                " > exclusive.
-                " and EasyMotion use ':'
-                " See: h: o_v }}}
-                normal! v
-            endif " }}}
-
-            if s:current.is_operator && s:flag.linewise
-                " TODO: Is there better solution?
-                " Maike it linewise
-                normal! V
-            endif
-
-            " Adjust screen especially for visual scroll & offscreen search {{{
-            " Otherwise, cursor line will move middle line of window
-            keepjumps call winrestview({'lnum' : win_first_line, 'topline' : win_first_line})
-
-            " Jump to destination
-            keepjumps call cursor(coords[0], coords[1])
-
-            " To avoid side effect of overwriting buffer {{{
-            " for tpope/vim-repeat
-            " See: :h b:changedtick
-            if exists('g:repeat_tick')
-                if g:repeat_tick == s:current.changedtick
-                    let g:repeat_tick = b:changedtick
-                endif
-            endif "}}}
-        endif
-
-        " Set tpope/vim-repeat {{{
-        if s:current.is_operator == 1 &&
-                \ !(v:operator ==# 'y' && match(&cpo, 'y') == -1)
-            " Store previous info for dot repeat {{{
-            let s:dot_repeat.regexp = a:regexp
-            let s:dot_repeat.direction = a:direction
-            let s:dot_repeat.line_flag = s:flag.within_line
-            let s:dot_repeat.is_inclusive = is_inclusive_check
-            let s:dot_repeat.operator = v:operator
-            let s:dot_repeat.bd_t_flag = s:flag.bd_t " Bidirectional t motion
-            let s:dot_repeat.true_direction = true_direction " Check inclusive
-            "}}}
-            silent! call repeat#set("\<Plug>(easymotion-dotrepeat)")
-        endif "}}}
-
-        " Highlight all the matches by n-key find motions {{{
-        if s:current.is_search == 1 && s:current.is_operator == 0
-            " It seems let &hlsearch=&hlsearch doesn't work when called
-            " in script, so use :h feedkeys() instead.
-            " Ref: :h v:hlsearch
-            " FIXME: doesn't work with `c` operator
-            call EasyMotion#helper#silent_feedkeys(
-                                    \ ":let &hlsearch=&hlsearch\<CR>",
-                                    \ 'hlsearch', 'n')
-        endif "}}}
-
-        call s:Message('Jumping to [' . coords[0] . ', ' . coords[1] . ']')
-        let s:EasyMotion_is_cancelled = 0 " Success
-        "}}}
-    catch /^EasyMotion:.*/
-        redraw
-
-        " Show exception message
-        if g:EasyMotion_ignore_exception != 1
-            echo v:exception
-        endif
-
-        let s:previous['regexp'] = a:regexp
-        " -- Activate EasyMotion ----------------- {{{
-        let s:EasyMotion_is_active = 1
-        call EasyMotion#attach_active_autocmd() "}}}
-
-        call s:restore_cursor_state(a:visualmode)
-        let s:EasyMotion_is_cancelled = 1 " Cancel
-    catch
-        call s:Message(v:exception . ' : ' . v:throwpoint)
-        call s:restore_cursor_state(a:visualmode)
-        let s:EasyMotion_is_cancelled = 1 " Cancel
-    finally
-        " -- Restore properties ------------------ {{{
-        call s:RestoreValue()
-        call s:turn_on_hl_error()
-        call EasyMotion#reset()
-        " }}}
-        " -- Remove shading ---------------------- {{{
-        call EasyMotion#highlight#delete_highlight()
-        " }}}
-
-        if s:EasyMotion_is_cancelled == 0 " Success
-            " -- Landing Highlight ------------------- {{{
-            if g:EasyMotion_landing_highlight
-                call EasyMotion#highlight#add_highlight(a:regexp,
-                                                      \ g:EasyMotion_hl_move)
-                call EasyMotion#highlight#attach_autocmd()
-            endif "}}}
-            " -- Activate EasyMotion ----------------- {{{
-            let s:EasyMotion_is_active = 1
-            call EasyMotion#attach_active_autocmd() "}}}
-        endif
-    endtry
-endfunction " }}}
-"}}}
-" }}}
-
-call EasyMotion#init()
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/autoload/EasyMotion/cmigemo.vim b/bundle/easymotion/autoload/EasyMotion/cmigemo.vim
deleted file mode 100755
index 7c84e19..0000000
--- a/bundle/easymotion/autoload/EasyMotion/cmigemo.vim
+++ /dev/null
@@ -1,109 +0,0 @@
-"=============================================================================
-" FILE: autoload/EasyMotion/cmigemo.vim
-" AUTHOR: haya14busa
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-scriptencoding utf-8
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-function! s:has_vimproc() "{{{
-  if !exists('s:exists_vimproc')
-    try
-      silent call vimproc#version()
-      let s:exists_vimproc = 1
-    catch
-      let s:exists_vimproc = 0
-    endtry
-  endif
-
-  return s:exists_vimproc
-endfunction "}}}
-
-function! EasyMotion#cmigemo#system(...) "{{{
-    return call(s:has_vimproc() ? 'vimproc#system' : 'system', a:000)
-endfunction "}}}
-
-function! s:SearchDict2(name) "{{{
-    let path = $VIM . ',' . &runtimepath
-    let dict = globpath(path, "dict/".a:name)
-    if dict == ''
-        let dict = globpath(path, a:name)
-    endif
-    if dict == ''
-        for path in [
-                \ '/usr/local/share/migemo/',
-                \ '/usr/local/share/cmigemo/',
-                \ '/usr/local/share/',
-                \ '/usr/share/cmigemo/',
-                \ '/usr/share/',
-                \ ]
-            let path = path . a:name
-            if filereadable(path)
-                let dict = path
-                break
-            endif
-        endfor
-    endif
-    let dict = matchstr(dict, "^[^\<NL>]*")
-    return dict
-endfunction "}}}
-
-function! s:SearchDict() "{{{
-  for path in [
-        \ 'migemo/'.&encoding.'/migemo-dict',
-        \ &encoding.'/migemo-dict',
-        \ 'migemo-dict',
-        \ ]
-    let dict = s:SearchDict2(path)
-    if dict != ''
-      return dict
-    endif
-  endfor
-  echoerr 'a dictionary for migemo is not found'
-  echoerr 'your encoding is '.&encoding
-endfunction "}}}
-
-function! EasyMotion#cmigemo#getMigemoPattern(input) "{{{
-    if !exists('s:migemodict')
-        let s:migemodict = s:SearchDict()
-    endif
-
-    if has('migemo')
-        " Use migemo().
-        return migemo(a:input)
-    elseif executable('cmigemo')
-        " Use cmigemo.
-        return EasyMotion#cmigemo#system('cmigemo -v -w "'.a:input.'" -d "'.s:migemodict.'"')
-    else
-        " Not supported
-        return a:input
-    endif
-endfunction "}}}
-
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/autoload/EasyMotion/command_line.vim b/bundle/easymotion/autoload/EasyMotion/command_line.vim
deleted file mode 100755
index 9a80fd8..0000000
--- a/bundle/easymotion/autoload/EasyMotion/command_line.vim
+++ /dev/null
@@ -1,288 +0,0 @@
-"=============================================================================
-" FILE: autoload/EasyMotion/command_line.vim
-" AUTHOR: haya14busa
-" Reference: https://github.com/osyo-manga/vim-over
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-scriptencoding utf-8
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-" CommandLine:
-let s:V = vital#of('easymotion')
-let s:cmdline = s:V.import('Over.Commandline.Base')
-let s:modules = s:V.import("Over.Commandline.Modules")
-let s:search = s:cmdline.make()
-let s:search.highlights.prompt = 'Question'
-
-" Add Module: {{{
-call s:search.connect('Exit')
-call s:search.connect('Cancel')
-call s:search.connect('Redraw')
-call s:search.connect('DrawCommandline')
-call s:search.connect('Delete')
-call s:search.connect('CursorMove')
-call s:search.connect('Paste')
-call s:search.connect('BufferComplete')
-call s:search.connect('InsertRegister')
-call s:search.connect('ExceptionExit')
-call s:search.connect(s:modules.get('ExceptionMessage').make('EasyMotion: ', 'echom'))
-call s:search.connect(s:modules.get('History').make('/'))
-call s:search.connect(s:modules.get('NoInsert').make_special_chars())
-call s:search.connect(s:modules.get('KeyMapping').make_emacs())
-call s:search.connect(s:modules.get('Doautocmd').make('EMCommandLine'))
-
-let s:module = {
-\   "name" : "EasyMotion",
-\}
-function! s:module.on_char_pre(cmdline)
-    if a:cmdline.is_input("<Over>(em-scroll-f)")
-        call s:scroll(0)
-        call a:cmdline.setchar('')
-    elseif a:cmdline.is_input("<Over>(em-scroll-b)")
-        call s:scroll(1)
-        call a:cmdline.setchar('')
-    elseif a:cmdline.is_input("<Over>(em-jumpback)")
-        keepjumps call setpos('.', s:save_orig_pos)
-        let s:orig_pos = s:save_orig_pos
-        let s:orig_line_start = getpos('w0')
-        let s:orig_line_end = getpos('w$')
-        let s:direction = s:save_direction
-        call a:cmdline.setchar('')
-    elseif a:cmdline.is_input("<Over>(em-openallfold)")
-        " TODO: better solution
-        normal! zR
-        call a:cmdline.setchar('')
-    endif
-endfunction
-call s:search.connect(s:module)
-"}}}
-
-" CommandLine Keymap: {{{
-function! s:search.keymapping() "{{{
-    return {
-\       "\<C-l>" : {
-\           "key" : "<Over>(buffer-complete)",
-\           "noremap" : 1,
-\       },
-\       "\<Tab>"   : {
-\           "key" : "<Over>(em-scroll-f)",
-\           "noremap" : 1,
-\       },
-\       "\<S-Tab>" : {
-\           "key" : "<Over>(em-scroll-b)",
-\           "noremap" : 1,
-\       },
-\       "\<C-o>"   : {
-\           "key" : "<Over>(em-jumpback)",
-\           "noremap" : 1,
-\       },
-\       "\<C-z>"   : {
-\           "key" : "<Over>(em-openallfold)",
-\           "noremap" : 1,
-\       },
-\       "\<CR>"   : {
-\           "key" : "<Over>(exit)",
-\           "noremap" : 1,
-\           "lock" : 1,
-\       },
-\   }
-endfunction "}}}
-
-" Fins Motion CommandLine Mapping Command: {{{
-function! EasyMotion#command_line#cmap(args)
-    let lhs = s:as_keymapping(a:args[0])
-    let rhs = s:as_keymapping(a:args[1])
-    call s:search.cmap(lhs, rhs)
-endfunction
-function! EasyMotion#command_line#cnoremap(args)
-    let lhs = s:as_keymapping(a:args[0])
-    let rhs = s:as_keymapping(a:args[1])
-    call s:search.cnoremap(lhs, rhs)
-endfunction
-function! EasyMotion#command_line#cunmap(lhs)
-    let lhs = s:as_keymapping(a:lhs)
-    call s:search.cunmap(lhs)
-endfunction
-function! s:as_keymapping(key)
-    execute 'let result = "' . substitute(a:key, '\(<.\{-}>\)', '\\\1', 'g') . '"'
-    return result
-endfunction
-"}}}
-"}}}
-
-" Event: {{{
-function! s:search.on_enter(cmdline) "{{{
-    if s:num_strokes == -1
-        call EasyMotion#highlight#delete_highlight()
-        call EasyMotion#helper#VarReset('&scrolloff', 0)
-        if g:EasyMotion_do_shade
-            call EasyMotion#highlight#add_highlight('\_.*',
-                                                \ g:EasyMotion_hl_group_shade)
-        endif
-    endif
-    if g:EasyMotion_cursor_highlight
-        call EasyMotion#highlight#add_highlight('\%#',
-                                              \ g:EasyMotion_hl_inc_cursor)
-    endif
-endfunction "}}}
-function! s:search.on_leave(cmdline) "{{{
-    if s:num_strokes == -1
-        call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_inc_search)
-    endif
-endfunction "}}}
-function! s:search.on_char(cmdline) "{{{
-    if s:num_strokes == -1
-        let re = s:search.getline()
-        if EasyMotion#helper#should_case_sensitive(re, 1)
-            let case_flag = '\c'
-        else
-            let case_flag = '\C'
-        endif
-        let re .= case_flag
-        if g:EasyMotion_inc_highlight
-            call s:inc_highlight(re)
-        endif
-        if g:EasyMotion_off_screen_search
-            call s:off_screen_search(re)
-        endif
-    elseif s:search.line.length() >=  s:num_strokes
-        call s:search.exit()
-    endif
-endfunction "}}}
-"}}}
-
-" Main:
-function! EasyMotion#command_line#GetInput(num_strokes, prev, direction) "{{{
-    let s:num_strokes = a:num_strokes
-
-    let s:prompt_base = s:getPromptMessage(a:num_strokes)
-    call s:search.set_prompt(s:prompt_base)
-
-    " Screen: cursor position, first and last line
-    let s:orig_pos = getpos('.')
-    let s:orig_line_start = getpos('w0')
-    let s:orig_line_end = getpos('w$')
-    let s:save_orig_pos = deepcopy(s:orig_pos)
-
-    " Direction:
-    let s:direction = a:direction == 1 ? 'b' : ''
-    let s:save_direction = deepcopy(s:direction)
-
-    let input = s:search.get()
-    if input == '' && ! s:search.exit_code()
-        return a:prev
-    elseif s:search.exit_code() == 1 || s:search.exit_code() == -1
-        call s:Cancell()
-        return ''
-    else
-        return input
-    endif
-endfunction "}}}
-
-" Helper:
-function! s:Cancell() " {{{
-    call EasyMotion#highlight#delete_highlight()
-    call EasyMotion#helper#VarReset('&scrolloff')
-    keepjumps call setpos('.', s:save_orig_pos)
-    echo 'EasyMotion: Cancelled'
-    return ''
-endfunction " }}}
-function! s:getPromptMessage(num_strokes) "{{{
-    if a:num_strokes == 1
-        let prompt = substitute(
-            \ substitute(g:EasyMotion_prompt,'{n}', a:num_strokes, 'g'),
-            \ '(s)', '', 'g')
-    elseif a:num_strokes == -1
-        let prompt = substitute(
-            \ substitute(g:EasyMotion_prompt, '{n}\s\{0,1}', '', 'g'),
-            \ '(s)', 's', 'g')
-    else
-        let prompt = substitute(
-            \ substitute(g:EasyMotion_prompt,'{n}', a:num_strokes, 'g'),
-            \ '(s)', 's', 'g')
-    endif
-    return prompt
-endfunction "}}}
-
-function! s:off_screen_search(re) "{{{
-    " First: search within visible screen range
-    call s:adjust_screen()
-    " Error occur when '\zs' without '!'
-    silent! let pos = searchpos(a:re, s:direction . 'n', s:orig_line_end[1])
-    if pos != [0, 0]
-        " Restore cursor posision
-        keepjumps call setpos('.', s:orig_pos)
-    else
-        " Second: if there were no much, search off screen
-        silent! let pos = searchpos(a:re, s:direction)
-        if pos != [0, 0]
-            " Match
-            keepjumps call setpos('.', pos)
-            " Move cursor
-            if s:save_direction != 'b'
-                normal! zzH0
-            else
-                normal! zzL0
-            endif
-        else
-            " No much
-            call s:adjust_screen()
-            keepjumps call setpos('.', s:orig_pos)
-        endif
-    endif
-    " redraw
-endfunction "}}}
-function! s:adjust_screen() "{{{
-    if s:save_direction != 'b'
-        " Forward
-        keepjumps call setpos('.', s:orig_line_start)
-        normal! zt
-    else
-        " Backward
-        keepjumps call setpos('.', s:orig_line_end)
-        normal! zb
-    endif
-endfunction "}}}
-function! s:scroll(direction) "{{{
-    " direction: 0 -> forward, 1 -> backward
-    exec a:direction == 0 ? "normal! \<C-f>" : "normal! \<C-b>"
-    let s:orig_pos = getpos('.')
-    let s:orig_line_start = getpos('w0')
-    let s:orig_line_end = getpos('w$')
-    let s:direction = a:direction == 0 ? '' : 'b'
-endfunction "}}}
-function! s:inc_highlight(re) "{{{
-    call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_inc_search)
-    if s:search.line.length() > 0
-        " Error occur when '\zs' without '!'
-        silent! call EasyMotion#highlight#add_highlight(a:re, g:EasyMotion_hl_inc_search)
-    endif
-endfunction "}}}
-
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/autoload/EasyMotion/helper.vim b/bundle/easymotion/autoload/EasyMotion/helper.vim
deleted file mode 100755
index 9cbee30..0000000
--- a/bundle/easymotion/autoload/EasyMotion/helper.vim
+++ /dev/null
@@ -1,167 +0,0 @@
-"=============================================================================
-" FILE: autoload/EasyMotion/helper.vim
-" AUTHOR: haya14busa
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-scriptencoding utf-8
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-function! EasyMotion#helper#mode(flag) "{{{
-    return mode(a:flag) == "\<C-v>" ? "C-v" : mode(a:flag)
-endfunction "}}}
-
-function! EasyMotion#helper#get_char_by_coord(coord) "{{{
-    " @param coord: [lnum, col] or [bufnum, lnum, col, off]
-    if len(a:coord) == 4
-        let [line_num, col_num] = [a:coord[1], a:coord[2]]
-    else
-        let [line_num, col_num] = a:coord
-    endif
-    let target_col_regexp = '\%' . (col_num) . 'c.'
-    return matchstr(getline(line_num), target_col_regexp)
-endfunction "}}}
-
-function! EasyMotion#helper#is_greater_coords(coords1, coords2) "{{{
-    " [line_num, col_num] < [line_num, col_num]
-    "
-    " coords1 < coords2  : return 1
-    " coords1 > coords2  : return -1
-    " coords1 == coords2 : return 0
-    if a:coords1 == a:coords2 | return 0 | endif
-
-    if a:coords1[0] < a:coords2[0]
-        return 1
-    elseif a:coords1[0] > a:coords2[0]
-        return -1
-    endif
-
-    " Same line
-    if a:coords1[1] < a:coords2[1]
-        return 1
-    elseif a:coords1[1] > a:coords2[1]
-        return -1
-    endif
-endfunction "}}}
-
-function! EasyMotion#helper#is_folded(line) "{{{
-    " Return false if g:EasyMotion_skipfoldedline == 1
-    " and line is start of folded lines
-    let _foldclosed = foldclosed(a:line)
-    return _foldclosed != -1 &&
-        \ (g:EasyMotion_skipfoldedline == 1 || a:line != _foldclosed)
-endfunction "}}}
-function! EasyMotion#helper#should_case_sensitive(input, is_search) "{{{
-    if !a:is_search
-        if g:EasyMotion_smartcase == 0
-            return 0
-        else
-            " return 1 if input didn't match uppercase letter
-            return match(a:input, '\u') == -1
-        endif
-    endif
-
-    if (g:EasyMotion_smartcase == 1 && match(a:input, '\u') == -1) ||
-    \  (&ignorecase && &smartcase && match(a:input, '\u') == -1) ||
-    \  (&ignorecase && !&smartcase)
-        return 1
-    endif
-    return 0
-endfunction "}}}
-function! EasyMotion#helper#silent_feedkeys(expr, name, ...) "{{{
-    " Ref:
-    " https://github.com/osyo-manga/vim-over/blob/d51b028c29661d4a5f5b79438ad6d69266753711/autoload/over.vim#L6
-    let mode = get(a:, 1, "m")
-    let name = "easymotion-" . a:name
-    let map = printf("<Plug>(%s)", name)
-    if mode == "n"
-        let command = "nnoremap"
-    else
-        let command = "nmap"
-    endif
-    execute command "<silent>" map printf("%s:nunmap %s<CR>", a:expr, map)
-    if mode(1) !=# 'ce'
-        " FIXME: mode(1) !=# 'ce' exists only for the test
-        "        :h feedkeys() doesn't work while runnning a test script
-        "        https://github.com/kana/vim-vspec/issues/27
-        call feedkeys(printf("\<Plug>(%s)", name))
-    endif
-endfunction "}}}
-function! EasyMotion#helper#VarReset(var, ...) "{{{
-    if ! exists('s:var_reset')
-        let s:var_reset = {}
-    endif
-
-    if a:0 == 0 && has_key(s:var_reset, a:var)
-        " Reset var to original value
-        " setbufvar( or bufname): '' or '%' can be used for the current buffer
-        call setbufvar('%', a:var, s:var_reset[a:var])
-    elseif a:0 == 1
-        " Save original value and set new var value
-
-        let new_value = a:0 == 1 ? a:1 : ''
-
-        " Store original value
-        let s:var_reset[a:var] = getbufvar("", a:var)
-
-        " Set new var value
-        call setbufvar('%', a:var, new_value)
-    endif
-endfunction "}}}
-
-" Migemo {{{
-function! EasyMotion#helper#load_migemo_dict() "{{{
-    let enc = &l:encoding
-    if enc ==# 'utf-8'
-        return EasyMotion#migemo#utf8#load_dict()
-    elseif enc ==# 'cp932'
-        return EasyMotion#migemo#cp932#load_dict()
-    elseif enc ==# 'euc-jp'
-        return EasyMotion#migemo#eucjp#load_dict()
-    else
-        let g:EasyMotion_use_migemo = 0
-        throw "Error: ".enc." is not supported. Migemo is made disabled."
-    endif
-endfunction "}}}
-
-" EasyMotion#helper#strchars() {{{
-if exists('*strchars')
-    function! EasyMotion#helper#strchars(str)
-        return strchars(a:str)
-    endfunction
-else
-    function! EasyMotion#helper#strchars(str)
-        return strlen(substitute(a:str, ".", "x", "g"))
-    endfunction
-endif "}}}
-function! EasyMotion#helper#include_multibyte_char(str) "{{{
-    return strlen(a:str) != EasyMotion#helper#strchars(a:str)
-endfunction "}}}
-"}}}
-
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/autoload/EasyMotion/highlight.vim b/bundle/easymotion/autoload/EasyMotion/highlight.vim
deleted file mode 100755
index 7ca7e16..0000000
--- a/bundle/easymotion/autoload/EasyMotion/highlight.vim
+++ /dev/null
@@ -1,251 +0,0 @@
-"=============================================================================
-" FILE: highlight.vim
-" AUTHOR: haya14busa
-" Reference: https://github.com/t9md/vim-smalls
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-scriptencoding utf-8
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-function! EasyMotion#highlight#load()
-   "load
-endfunction
-
-" -- Default highlighting ---------------- {{{
-let g:EasyMotion_hl_group_target         = get(g:,
-    \ 'EasyMotion_hl_group_target', 'EasyMotionTarget')
-let g:EasyMotion_hl2_first_group_target  = get(g:,
-    \ 'EasyMotion_hl2_first_group_target', 'EasyMotionTarget2First')
-let g:EasyMotion_hl2_second_group_target = get(g:,
-    \ 'EasyMotion_hl2_second_group_target', 'EasyMotionTarget2Second')
-let g:EasyMotion_hl_group_shade          = get(g:,
-    \ 'EasyMotion_hl_group_shade', 'EasyMotionShade')
-
-let g:EasyMotion_hl_inc_search     = get(g:,
-    \ 'EasyMotion_hl_inc_search', 'EasyMotionIncSearch')
-let g:EasyMotion_hl_inc_cursor     = get(g:,
-    \ 'EasyMotion_hl_inc_cursor', 'EasyMotionIncCursor')
-let g:EasyMotion_hl_move           = get(g:,
-    \ 'EasyMotion_hl_move', 'EasyMotionMoveHL')
-
-let s:target_hl_defaults = {
-    \   'gui'     : ['NONE', '#ff0000' , 'bold']
-    \ , 'cterm256': ['NONE', '196'     , 'bold']
-    \ , 'cterm'   : ['NONE', 'red'     , 'bold']
-    \ }
-
-let s:target_hl2_first_defaults = {
-    \   'gui'     : ['NONE', '#ffb400' , 'bold']
-    \ , 'cterm256': ['NONE', '11'      , 'bold']
-    \ , 'cterm'   : ['NONE', 'yellow'  , 'bold']
-    \ }
-
-let s:target_hl2_second_defaults = {
-    \   'gui'     : ['NONE', '#b98300' , 'bold']
-    \ , 'cterm256': ['NONE', '3'       , 'bold']
-    \ , 'cterm'   : ['NONE', 'yellow'  , 'bold']
-    \ }
-
-let s:shade_hl_defaults = {
-    \   'gui'     : ['NONE', '#777777' , 'NONE']
-    \ , 'cterm256': ['NONE', '242'     , 'NONE']
-    \ , 'cterm'   : ['NONE', 'grey'    , 'NONE']
-    \ }
-
-let s:shade_hl_line_defaults = {
-    \   'gui'     : ['red' , '#FFFFFF' , 'NONE']
-    \ , 'cterm256': ['red' , '242'     , 'NONE']
-    \ , 'cterm'   : ['red' , 'grey'    , 'NONE']
-    \ }
-
-let s:target_hl_inc = {
-    \   'gui'     : ['NONE', '#7fbf00' , 'bold']
-    \ , 'cterm256': ['NONE', '40'   , 'bold']
-    \ , 'cterm'   : ['NONE', 'green'   , 'bold']
-    \ }
-let s:target_hl_inc_cursor = {
-    \   'gui'     : ['#ACDBDA', '#121813' , 'bold']
-    \ , 'cterm256': ['cyan'   , '232'   , 'bold']
-    \ , 'cterm'   : ['cyan'   , 'black'   , 'bold']
-    \ }
-let s:target_hl_move = {
-    \   'gui'     : ['#7fbf00', '#121813' , 'bold']
-    \ , 'cterm256': ['green'  , '15'   , 'bold']
-    \ , 'cterm'   : ['green'  , 'white'   , 'bold']
-    \ }
-" }}}
-function! EasyMotion#highlight#InitHL(group, colors) " {{{
-    let group_default = a:group . 'Default'
-
-    " Prepare highlighting variables
-    let guihl = printf('guibg=%s guifg=%s gui=%s', a:colors.gui[0], a:colors.gui[1], a:colors.gui[2])
-    let ctermhl = &t_Co == 256
-        \ ? printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm256[0], a:colors.cterm256[1], a:colors.cterm256[2])
-        \ : printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm[0], a:colors.cterm[1], a:colors.cterm[2])
-
-    " Create default highlighting group
-    execute printf('hi default %s %s %s', group_default, guihl, ctermhl)
-
-    " Check if the hl group exists
-    if hlexists(a:group)
-        redir => hlstatus | exec 'silent hi ' . a:group | redir END
-
-        " Return if the group isn't cleared
-        if hlstatus !~ 'cleared'
-            return
-        endif
-    endif
-
-    " No colors are defined for this group, link to defaults
-    execute printf('hi default link %s %s', a:group, group_default)
-endfunction " }}}
-function! EasyMotion#highlight#init() "{{{
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_group_shade,  s:shade_hl_defaults)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor)
-    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_move, s:target_hl_move)
-    if exists(':CSApprox') == 2 && g:EasyMotion_force_csapprox
-        "TODO: better solution or remove completly
-        CSApprox!
-    endif
-endfunction "}}}
-
-" Reset highlighting after loading a new color scheme {{{
-augroup EasyMotionInitHL
-    autocmd!
-    autocmd ColorScheme * call EasyMotion#highlight#init()
-augroup end
-" }}}
-
-call EasyMotion#highlight#init()
-" Init: {{{
-let s:h = {}
-let s:h.ids = {}
-let s:priorities = {
-    \  g:EasyMotion_hl_group_target : 1,
-    \  g:EasyMotion_hl2_first_group_target : 1,
-    \  g:EasyMotion_hl2_second_group_target : 1,
-    \  g:EasyMotion_hl_group_shade : 0,
-    \  g:EasyMotion_hl_inc_search : 1,
-    \  g:EasyMotion_hl_inc_cursor : 2,
-    \  g:EasyMotion_hl_move : 0,
-    \ }
-for s:group in keys(s:priorities)
-    let s:h.ids[s:group] = []
-endfor
-unlet s:group
-"}}}
-
-function! EasyMotion#highlight#delete_highlight(...) "{{{
-    let groups = !empty(a:000) ? a:000 : keys(s:priorities)
-    for group in groups
-        for id in s:h.ids[group]
-            silent! call matchdelete(id)
-        endfor
-        let s:h.ids[group] = []
-    endfor
-endfunction "}}}
-function! EasyMotion#highlight#add_highlight(re, group) "{{{
-    call add(s:h.ids[a:group], matchadd(a:group, a:re, s:priorities[a:group]))
-endfunction "}}}
-function! EasyMotion#highlight#add_pos_highlight(line_num, col_num, group) "{{{
-    call add(s:h.ids[a:group], matchaddpos(a:group, [[a:line_num, a:col_num]], s:priorities[a:group]))
-endfunction "}}}
-function! EasyMotion#highlight#attach_autocmd() "{{{
-    " Reference: https://github.com/justinmk/vim-sneak
-    augroup plugin-easymotion
-        autocmd!
-        autocmd InsertEnter,WinLeave,BufLeave <buffer>
-            \ silent! call EasyMotion#highlight#delete_highlight()
-            \  | autocmd! plugin-easymotion * <buffer>
-        autocmd CursorMoved <buffer>
-            \ autocmd plugin-easymotion CursorMoved <buffer>
-            \ silent! call EasyMotion#highlight#delete_highlight()
-            \  | autocmd! plugin-easymotion * <buffer>
-    augroup END
-endfunction "}}}
-function! EasyMotion#highlight#add_color_group(new_groups) "{{{
-    let s:priorities = extend(deepcopy(s:priorities), a:new_groups)
-    for group in keys(a:new_groups)
-        let s:h.ids[group] = []
-    endfor
-endfunction "}}}
-
-function! EasyMotion#highlight#capture(hlname) "{{{
-    " Based On: https://github.com/t9md/vim-ezbar
-    "           https://github.com/osyo-manga/vital-over
-    let hlname = a:hlname
-    if !hlexists(hlname)
-        return
-    endif
-    while 1
-        let save_verbose = &verbose
-        let &verbose = 0
-        try
-            redir => HL_SAVE
-            execute 'silent! highlight ' . hlname
-            redir END
-        finally
-            let &verbose = save_verbose
-        endtry
-        if !empty(matchstr(HL_SAVE, 'xxx cleared$'))
-            return ''
-        endif
-        " follow highlight link
-        let ml = matchlist(HL_SAVE, 'links to \zs.*')
-        if !empty(ml)
-            let hlname = ml[0]
-            continue
-        endif
-        break
-    endwhile
-    let HL_SAVE = substitute(matchstr(HL_SAVE, 'xxx \zs.*'),
-                           \ '[ \t\n]\+', ' ', 'g')
-    return [hlname, HL_SAVE]
-endfunction "}}}
-function! EasyMotion#highlight#turn_off(hl) "{{{
-    if type(a:hl) != type([])
-        return
-    endif
-    execute 'highlight ' . a:hl[0] . ' NONE'
-endfunction "}}}
-function! EasyMotion#highlight#turn_on(hl) "{{{
-    if type(a:hl) != type([])
-        return
-    endif
-    execute 'highlight ' . a:hl[0] . ' ' . a:hl[1]
-endfunction "}}}
-
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" __END__  {{{
-" vim: expandtab softtabstop=4 shiftwidth=4
-" vim: foldmethod=marker
-" }}}
diff --git a/bundle/easymotion/autoload/EasyMotion/migemo/cp932.vim b/bundle/easymotion/autoload/EasyMotion/migemo/cp932.vim
deleted file mode 100755
index 8d6e7d9..0000000
--- a/bundle/easymotion/autoload/EasyMotion/migemo/cp932.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-function! EasyMotion#migemo#cp932#load_dict()
-    return {
-        \ 'a' : '\%([��ݕ��N��Ҋ{�b���]毛^�������w�܏��㦚@�o�C�����粕ӓ��J���l���V�Ȍl�ˆ��^���Мۜ��{���Q��z��鸈��W�E�B���{���M�Q榓k�w��{�\�����N�}�H���o���{���t����V�p�������A�֔\���H�Փ��a�ڏS�[矏N�����a�W���o㻓֏��~�ĔM���ؒg��禈������Ŋ��������[���N�Ύ����ҕ����a�e��}�y�R�����X���v���I���\����॑��Ő��V�a�z�\���e���X�~�d�V�E�����Y�эʊ늿�ߎӕT��瑀������剕Օ����P����]��J�ÓV���������쉐�˖ԋY�͈��������b���������般�HꙌ���������ǖ�����s����N��L�[����ӟ�䈮�����N�����z���������P�j�E�D���ɏ͏������W�쏺�H�����q蕚��V����襕��B���\���͈��ԑ�����~㪌Z����Q�s�ň��}�Ĉ��ǝ�ƈ����䒩�툤���@��r�b�����`�~�����q�g���ݝю鈩�[����脝��ōC���K��暖\�ؐԙ���z�Đ��•Ɉ����Œ��a�����S���㈢�Ҍ�ݕ����J�숫�r�G�}�����L�������j���򈡈��}�[�Y�ޝ����K�������g�������O���c������������&�ȁ��_�ڋ��͋��́����ˁ����܌�W���āN�L�M�O�f�`���������A�p�@a]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*�q\|��\_s*��\|�E\_s*�n\|�f\_s*��\|��\_s*��\|�M\_s*�V\_s*��\|��\_s*�T\|��\_s*��\|�Z\_s*�q\|��\_s*��\|�l\_s*��\|��\_s*��\|��\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�w\|��\_s*[����]\|��\_s*�p\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*�{\|��\_s*\%(��\|��\_s*�q\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\|�H\_s*�a\_s*�b\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*�F\|��\_s*��\|��\_s*�`\|�^\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�D\_s*�`\|��\_s*[�������K]\|��\_s*�G\|��\_s*[�m�F]\|�\_s*�x\|��\_s*��\|��\_s*��\|��\_s*��\|�p\_s*\%([�ۓc]\|��\_s*�p\|��\_s*��\)\|��\_s*[�ɁX]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(�d\_s*�b\|�A\_s*�h\_s*��\_s*�X\)\|D\_s*�J\_s*�[\_s*�h\|C\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|�h\_s*\%(�o\_s*�d\_s*�b\|�b\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|��\_s*�~\|��\_s*��\|�c\_s*��\|�n\_s*��\_s*��\|�C\_s*[�^�l���m���]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*�a\_s*��\|��\_s*��\|��\_s*�n\|��\_s*[ꆔn��]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|�g\_s*��\_s*�v\_s*��\_s*A\|��\_s*��\| \_s*�A\_s*�N\_s*�V\_s*�A\_s*��\|�q\_s*�f\|��\_s*�f\|��\_s*�s\_s*��\_s*�x\_s*�Z\_s*�p\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�Y\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�@\|�a\_s*��\_s*��\_s*�@\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�Z\_s*��\_s*�g\_s*�L\_s*�b\_s*�c\_s*�l\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|�g\_s*�p\_s*��\_s*�\\|��\_s*�p\_s*��\_s*�\\|�Z\_s*�@\|��\_s*��\_s*��\_s*��\|�I\_s*\%(��\|�M\_s*��\_s*�X\_s*�^\_s*��\|�h\_s*��\_s*�C\|��\_s*�O\_s*�X\_s*�g\_s*��\_s*�[\_s*��\|��\_s*\%(�g\_s*�L\_s*�[\|�^\_s*\%([�[�i]\|�l\_s*\%(�[\_s*�g\|�C\_s*�g\)\)\)\|�[\_s*\%([�N�K�T�g����]\|�j\_s*��\_s*�O\|�L\_s*�V\_s*��\|�u\_s*��\_s*�[\|�o\_s*�[\_s*�h\|�x\_s*��\_s*�W\_s*��\|�M\_s*��\_s*�X\_s*\%(�g\|�^\_s*��\)\|�]\_s*��\_s*�k\|�X\_s*\%(�`\_s*��\|�e\_s*�B\_s*��\|�^\_s*�[\|�g\_s*\%(��\_s*�A\|��\_s*��\_s*�A\)\)\|�h\_s*��\_s*�[\|�W\_s*\%([�F�[]\|�I\_s*��\_s*�W\)\|�f\_s*�B\_s*\%(�I\|�G\_s*��\_s*�X\|�V\_s*��\_s*��\|�g\_s*��\_s*�A\_s*��\)\|�^\_s*��\|�\\_s*\%(��\_s*�e\_s*�B\|��\_s*�C\_s*�Y\)\|�Z\_s*��\_s*�e\_s*�B\_s*�b\_s*�N\|��\_s*��\)\)\|�z\_s*��\|�o\_s*�C\_s*�g\|�n\_s*��\_s*�}\_s*�Q\_s*�h\_s*��\|��\_s*��\|�l\_s*�H\_s*\%(��\_s*��\_s*��\|�m\_s*�\\)\|�C\_s*\%(�[\_s*�W\_s*�X\|�I\_s*��\|�\\_s*�b\_s*�v\)\|�}\_s*��\_s*�h\_s*�D\_s*�[\_s*�N\|��\_s*\%(�z\_s*��\|��\_s*��\|��\_s*�p\)\|A\_s*\%([tlrImc]\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|�^\_s*�C\_s*�v\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*�V\_s*�X\_s*�e\_s*��\|L\_s*T\_s*�L\_s*�[\|��\_s*��\_s*�N\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*��\_s*�f\_s*��\|�h\_s*��\_s*�C\_s*�u\|d\_s*a\|M\_s*��\_s*�W\_s*�I\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|C\_s*�A\_s*�_\_s*�v\_s*�^\)\|�t\_s*�^\|�`\_s*\%([�S�^��]\|��\_s*��\_s*��\|�a\_s*\%(�^\|��\_s*��\_s*��\_s*��\)\|�^\_s*�C\_s*�v\|�s\_s*��\_s*�s\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*�N\|�h\_s*�G\_s*�L\_s*�X\_s*�p\_s*�[\_s*�g\|�^\_s*�c\_s*�R\_s*��\_s*�o\_s*�[\_s*�^\|�h\_s*��\_s*�C\_s*�u\|��\_s*��\_s*��\_s*��\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|��\_s*��\_s*��\_s*��\)\|��\_s*�p\|�G\_s*\%([�j���A�C�[]\|�b\_s*�`\|��\_s*\%(�h\_s*��\_s*��\|�W\_s*�F\_s*\%(��\|��\_s*�b\_s*�N\)\|�[\_s*��\)\|��\_s*�A\|�I\_s*��\_s*�A\|�X\_s*�e\|�v\_s*��\_s*��\)\)',
-        \ 'b' : '\%([���ݍ����x�f��t���ݖv�{�}�~�Ϟ��s�r�`���ڝ����p�ؖn�l�m�q�����b�Q�쟂�������ۙR廖g�e���䛖����O�E�庈��ꆉK�����㦖R���W�a�X��Z�U�`���Y��N��ϛ��˖S�c�]�f�h�T�^�d��d�ە����_�@��W敖͕ꊱ�����V�G�����J����ڙk�K�럑��㰙p�gꈕ���̕��V�ՙ��A�ğ��~�܍�燙��ᾙj�וؕ�糉•�粂בD�[�k�u�q�J�����������ڒ������ܐ[�W��᳓ؐߕ��ܖܘŕ��h�ᕷ���w�������ŕs�F���U�����򐁕����x�����ᕔ�F�~���o���@�����ԕ�捐l�L�J�x�ʕT�C�Z�z�[���ߞ�㢛��m�p�C�ޜ��r�F��{���q�n�֛�焕S蓔���I�a���l�ߕ[�L�e����ὕ��d�c�b�`�_�a���Γ��Z�r����ۖ������o�ɔ��z���e�����X�]�䛇���g���є��䊑����ы��I���s���������������@�[���bV���������鯝U���A�j���c�U���P�������������W���є��m���\�����e���}�����ޔ��ȉS�i�t��䕔|��ꀊL�����������{�~�}���ŝם��f�\�����Ҕ��Ԗ_�J���m�ה”d���H����ݔ֔ӔՔԔؖ��따������������n�t�k�l�����y�H�Ő�����m���n���\�΂��g�������ۉ���~�b�a�|�_�攞�{�o�n�m�o�p�u�r�A���q���xb]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�{�x�u�r�o]\|��\_s*[�ڂׂԂт�]\|�\_s*�\|��\_s*��\|�A\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*�Z\|��\_s*��\|�r\_s*�r\|��\_s*��\|�\_s*�\|��\_s*�_\|��\_s*�_\|��\_s*��\|�E\_s*��\|�\_s*�\|��\_s*�C\|��\_s*��\|�X\_s*[���j]\|�R\_s*��\_s*�O\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|�z\_s*�c\|�\_s*��\|�u\_s*\%(��\|�l\_s*�b\_s*�N\|�V\_s*�l\_s*�}\)\|��\_s*�q\|�t\_s*�q\|��\_s*��\|�L\_s*[�O��]\|�\_s*�\|�V\_s*�A\_s*�O\|��\_s*[�ĘU]\|�\\_s*�D\|��\_s*[���D]\|��\_s*��\|�o\_s*��\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|�h\_s*��\|��\_s*[�q�@]\|�\\_s*��\|��\_s*[�Žq]\|�\_s*�\|��\_s*��\|��\_s*�q\|�c\_s*��\_s*��\_s*��\|�b\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�K\_s*�N\|��\_s*�q\|��\_s*\%([�ъy�J]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�\_s*��\|��\_s*[���]\|�f\_s*��\_s*��\|�v\_s*��\_s*�R\_s*�M\|��\_s*��\_s*��\|�I\_s*�[\_s*�g\_s*�o\_s*�C\|��\_s*[�b��]\|�t\_s*�@\_s*�S\_s*�b\_s*�g\|�w\_s*�i\|�k\_s*��\|�y\_s*\%(�L\_s*��\|�e\_s*��\_s*�M\_s*�E\_s*�X\)\|�L\_s*�f\|�C\_s*�M\_s*��\_s*�X\|�a\_s*\%([�ʔ����^��]\|��\_s*�E\|�^\_s*�C\_s*�v\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|�|\_s*�X\_s*�v\_s*��\_s*�C\_s*��\|��\_s*��\_s*��\_s*�m\_s*��\_s*��\_s*��\|��\_s*��\_s* \_s*�d\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*�N\)\|�z\_s*�E\_s*�f\|B\_s*\%([h�ʔ����^kiae]\|C\_s*��\_s*��\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|�^\_s*�C\_s*�v\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|�t\_s*��\_s*�b\_s*�c\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|M\_s*P\_s*�t\_s*�@\_s*�C\_s*��\|�X\_s*�v\_s*��\_s*�C\_s*��\|S\_s*\%(D\|�L\_s*�[\|�`\_s*��\_s*�[\_s*�i\|�A\_s*��\_s*�e\_s*�i\|�f\_s*�W\_s*�^\_s*��\)\|O\_s*X\_s*�Z\_s*�b\_s*�g\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|��\_s*��\_s*�N\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|��\_s*�f\)',
-        \ 'c' : '\%([��a�������|�Ҝ��D����ޏn�s���}�������l�a��ʗ���ۗⵘ�ᶐs���Ќ����f�����َ�����řb���I���z���iꑍ����C���麌Z欉��䓚��৙}�Y���ɍ��`�n�����X���M���ȍ��������뜝�k�՞����ߌ�����������匣���Ӎ����������e�W�E�Q���������L�m�՘i�������Q�f���肝K�����ਗ਼�Ჟ�騟����}�{㝛����Ř��ҟ������L���`�t�i���B�R�������H��{ൟ������H�s秝���n�n�������˝J�ܔ���X���L�J�y�ߛ��b�}褜���r�R���t莘m�E��硍h�k���l�K����ᦜ������n�K�}��֞��\��@囍y��ෙ��Μˍ[⠍x����u�X�S�e倘������J�i�^���V�@���A����W����G�D�T�������`ᩍB��ԍp���]�P���I���z�t�_�����k�O�j�R�w�u�P�a�I�|�q�F�X�Z�s�m�r���c���D�ޞ��J�ܛ��͞��w�L�l���������܍���W�����ێ����ЛZ�Ö��s������烌��g���םs�ؑ������e������u����Čٌ̟��]�|����V�������x�֒���绌і�嚙��h���ʉz�njԌך➳���Ҕ�ȏ��˗��Z�������ꉟ��h�@���Z���X������N���ÖZ��驒L�L���Q�k�ŚT���G���i���֙�����↝B�ގE���ِېߐ����������C��G����ዙ��Н�[�T�����אɐ͐Ȑǝ��A�����⣛p蔞��t��d�C�N���ӟ׈��ߙ�Eᝎa���x������㙘��A�����_�b����a���J����ஓϛ��Ƙj�b�H��ⳙA�G�S���L⒑W�s�r��������D�J�A�L��񙒐�枙@�ۑM���H����l�F�K�����D�G�@�B��h�坡�ǑN�����d�D��������I���扙��|���œҝ�ᝩ��⫟Ő�ꎖ�����������v�R�ΐ����y���H�����������`�Ր��������ǍU���}�����[���������҂���z���K�M�z����ⱟJ��㖍������I�����H���E��z�b�o�����x�ܗ��A�ϕ��D�B��ӏ��~���������B䱌s���Z�Y�㙬��ᯞ���ӛ��M�֌N���v������K�@����{���^���Z��퐾�^����������鶔�ňʈ��U�Ñq�������C�~���X�V�T�R�U�W�S�܉_�w�o�^�������鿌~���G�F䇚��`�p�����Y�������۞����ƌI����Әޚ��P�M�������u���o�Ӎ����������c�������q�v�E�|―���ꋀ��Ῑ܌J�ɍC�g�����{�m�������X�؍H���ᜁ��v�㜜���ҙ��g���电�M���˂����捃����A�B������P������D���Y���`���L�������Z��迓��Ӟx���Z������l���W�������ȓ��������G�F�a�Ǝb����乗��M�E�Ε��s�C�F�n�����D�㈵㦋s�����]��Ŗl�^⚑����A潓��g���ߞΖ�儞����b���ɖΜ���臐w�p����d�����[��g�����謎�姎����^���G�������N���H���˒��ΐÎ������ᕹ���R����������K�\�ސˌ�K�Ž��������K����o���q�ҍ������t����������ϔ����O���ӎ��͚��͟��̍��b�A�j�P�֎��y�����ࡐ̝�咙��ݐ���┐Ԏ��^�ېΎގڎ����Y�ώՎˎΎɎԎߎЈޝ��i�S�G���CဋÎ����f�t偛W�V�z������题�����E�������f�����i�g�l�h�k�{��������蜕��婏o�F�����T��碏V�h�q�h�����F�J娏Q�K�����榚S����酝��n��������������S�X�K�U��ڏM�G�j���a�E�N�����O�D�C�A�L�R�T�W�I���H�B�@���M�����\�᭚�����忏w�{���v�x�s�⡏u�r�f�ݐ����Z���u���Vꐚp�y���曐P�]�A�������U�j�J��������f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�N�f�d��C�k���X���ĐL���T�Q�W�i�[�R�M�e�b�I�\�S�^�V���΋n�Z���o䜏���_�י|���䓏��w����򏎏����������ҟ����m䀛���u�L���Џ�������縐��מ�⪎™דɜ�����v���R�I���ߜ��c��B�_�џn���Ո䐯�����B辑����[�����K頏����[��␏���K♏����яҁ������u���i�]��疏֏Ӑ��Ԛ��А�躐���Ϗ��U���J���n���ސ��Ŝ܏��ߏ���Ꮟ����ُ������G���Ꮷ������ଞ������������������������͏Ǐ����ɏ����������Џˏ�暏Ώ��ďƏ��͏ڏ��؏ɏ����������T�l������\�e�g�����p�@�C�ܑ������D�I����冐B�����G���A�H�E�n❎o�m�o�w���v���L���U���������������h���n�ы��Ŏᎊ�t�r�@���{��������w���Ϛ`���������i�Аy�э��i�@�����E���J�X拎}�泛��n���y�o�N�Z�y���ٝ��f���j�{����~����|���{�o���ߘ��I�X�B�]�K�������V�g���u�������p����i���k���l��藘ʛ�Ɠ��j��⏎s��ꏎÎ��~��˔`���Œs��y�d�@���؎���䢊�Y�o�u�m���e�����ᘊ��y���NJ��r���݊��j���ƌy�����Ĉ�呁��e�A���i������������M�ʕr��P�T�M�v���ᚌ�ȍ��f�j�q�s�e�g�h�p�o�t�r����鹜��NJ����D�R���U�ğd��ᥛz�㕖�p�ȌڋA���ԓ�雛��_�B�ߗ��ދȋ�\�����Ί����͏ۋw�d�T��e�z�J�x���Ō`���ӌ^�����H���Ȕ����X��R㎎C���P���t������qK�Š������锯閟������@�����Њ��|��嶝^艔���噞J㹊��������{������歒S�������e顊��j舊����������s�Fጐ��d�P�}���g�����y�a�`�f����S�W���m���e����O���]�ݑ��ڙ̛����ň�����@����`�F�������O���P��\�[��g����ಉG�h���󓂞Њ����~�y�ۉ������}�q�����ɐ��͘����V�،����~ऐ����c���͌��b���w��u�x�v�i�X�Õ��L����ꖊ��G�K�Ə̓C魜S�R���Д߈����K�v���֓S哑t�������ݓk�������L�S�ښ��湛�誝����ᙚٚ]���d䡜����Q���I�v�n��跏ʜ������h���\�f�r�n�z�y�k�l�m�k�g�c�s�t�i�o�݉B�v�l�d���j�ߊg�q�u�p�m嵚��W������~�[�����Z�B���͙��G�r�q�ʟD�䠜j珞i������ƙd�^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�F���׊@��E�m�����L�G���D�ŊA��������K����J����C�������I䯘��Yᷛe�p���՟��b�Nボ�錝A���Q���a��T㼛�㻛f�W�`�c洟a�����⻝q�j����鉙ɞ쏁㣎���V�늬�����M����ϊ�䅟��j���F�����r�������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�g����⭊��|�}�ۚ��ۊ��@�يΞ��؊��󊩐��Ҋ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������ŠԊ׊��ՊĚ^���Ê��NJ����֊��͊������ϊ��w����x�s�q�P�g�ӊe�����a���㞎��ʼnؚĝ̎���d�ˉ��Z�Γ��ٌ����q�҃�����斉����v�q�Ўx�|�ۉԊ��Q���|����ўh�`��ܛ�����嘉������]�Ǝ؉�㟋�z�ɉÈՉʜ����F��荊����ЌC�a�{�����`�e�k�J�m�”ޚ썁�͉̉ώ����o����ז�◚D�S���l���όU���ґݙ͉щݙ��ljӌT��旞g�~�߉惕�砌����ĉ����ጜ����Ə�����戉Č͉ɂ����E�c���‹���ā����ى����q�S���G���B�J�H�x�w�[�`�T�I�r�������|�R�K�����V�F�O�^�Q�U�\�Z���A���Y�z���M�{�P�s�t�}���N�L�v�p�y���u���@�C�]���E�_�����~���D�􄩄��~���������������ԃ��q���X���W�ہA�C�F�N�Ջ��\�Ȑ��ߕϐڃJ�������������������R���V���Zc]\|�\_s*[�����]\|�b\_s*[�R�Z�N�V�J]\|��\_s*[�q����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�m\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*�C\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|��\_s*�@\|�O\_s*[�ȍ�]\|��\_s*[�ĘU]\|�P\_s*�y\|��\_s*��\|��\_s*[���X��]\|�~\_s*��\|�\_s*��\|�S\_s*[�Z��]\|��\_s*�h\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�V\_s*��\|�]\_s*��\|�f\_s*[���l��]\|��\_s*�A\|�s\_s*[�m�E]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*�_\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|�]\_s*[�X�]]\|�\_s*\%([�Ɨ���u�ʑ��Ɏ茓��]\|��\_s*��\|�[\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|7\_s*��\|�V\_s*��\|��\_s*��\|4\_s*��\|�S\_s*[����]\|�R\_s*�{\|�\_s*�\|�h\_s*�t\|��\_s*[�ʈ�]\|��\_s*��\|�O\_s*\%(��\|��\_s*��\)\|�|\_s*[�“�]\|�A\_s*[�o��]\|��\_s*��\|B\_s*r\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|�Q\_s*��\|��\_s*�Y\|�b\_s*��\|�c\_s*�e\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*�Z\|��\_s*�q\|�\_s*�\|�z\_s*��\|�R\_s*\%(�C\_s*�o\|��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�r\_s*�C\|�b\_s*[����]\|��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*�r\|�|\_s*��\|�\\_s*��\|�]\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|�y\_s*��\|�A\_s*�g\|�k\_s*�k\|�@\_s*��\|��\_s*�t\_s*��\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[���r]\|��\_s*\%([���_]\|�C\_s*��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|�C\_s*[���G]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|�_\_s*�o\|��\_s*�\|�B\_s*��\|�A\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*�u\|��\_s*��\_s*��\_s*�e\_s*�N\_s*�m\_s*�T\_s*�C\_s*�G\_s*��\_s*�X\|��\_s*��\|�X\_s*��\_s*�[\_s*�Y\|��\_s*�e\|�g\_s*��\_s*��\_s*�v\|��\_s*[�{��v�菻]\|��\_s*�G\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|�T\_s*\%(��\_s*�`\_s*�[\_s*��\|�G\_s*��\|�C\_s*\%(�g\_s*�J\_s*�C\_s*��\|��\_s*�X\|�N\_s*\%([����]\|��\_s*\%(��\|�b\_s*�N\)\)\|�{\_s*\%(�E\_s*�Y\|�[\_s*�O\)\|�o\_s*\%(�[\|�l\_s*�e\_s*�B\_s*\%(�b\_s*�N\|�N\_s*�X\)\)\|��\_s*��\_s*�[\_s*��\|�_\_s*�[\|�t\_s*�@\_s*�[\|�l\_s*��\_s*�A\)\|�[\_s*\%(�e\_s*�B\_s*�t\_s*�B\_s*�P\_s*�[\_s*�V\_s*��\_s*��\|�N\_s*��\|�J\_s*\%(�X\|��\_s*�X\_s*�N\_s*\%(��\_s*�C\_s*�u\|��\_s*�v\_s*�V\_s*��\_s*��\)\)\|�L\_s*\%(��\_s*\%(��\_s*�[\|��\_s*�[\_s*\%(�^\_s*�[\|�V\_s*��\_s*��\)\)\|�b\_s*�g\)\)\)\|�}\_s*�h\_s*��\_s*�X\|��\_s*�\|�P\_s*\%([���A�C]\|�t\_s*�F\_s*�E\_s*�X\|�v\_s*�X\_s*�g\_s*��\_s*[����]\|�`\_s*��\_s*�b\_s*�v\|��\_s*\%(�^\_s*�E\_s*\%(��\|��\_s*�X\)\|�u\_s*��\_s*�b\_s*�W\)\|�[\_s*\%([�L�W�u�v�X��]\|�N\_s*�E\_s*�H\_s*�[\_s*�N\|�\\_s*��\|�^\_s*��\_s*��\_s*�O\|�p\_s*\%(�[\|�r\_s*��\_s*�e\_s*�B\)\|�V\_s*��\_s*�O\|��\_s*�[\)\|��\_s*\%(�g\|�x\_s*��\_s*�X\|�e\_s*�B\_s*�b\_s*�N\|�r\_s*\%(��\|�[\_s*�j\)\)\|�~\_s*\%(�J\_s*��\|�X\_s*�g\)\)\|�L\_s*\%(��\_s*�m\_s*��\|�v\_s*��\_s*�X\|�P\_s*��\|��\_s*\%([�C�[�A]\|��\_s*�F\|�r\_s*\%(�Y\_s*��\|�X\_s*��\)\|��\_s*\%(�X\|�b\_s*�g\)\|��\_s*�[\_s*�^\_s*�[\|��\_s*�\\_s*�[\|��\_s*\%(�[\|�E\_s*��\|�A\_s*�X\|�I\_s*�V\_s*�e\_s*�B\)\)\|�A\_s*\%(��\|�[\_s*��\|��\_s*�e\_s*�B\)\|�`\_s*��\|�g\_s*�T\_s*��\|��\_s*��\|�}\_s*�C\_s*��\|�b\_s*�J\|��\_s*�[\_s*�g\|��\_s*\%([�h�p�X�u����]\|�f\_s*\%(�B\|��\_s*�b\_s*�N\)\|�r\_s*\%([�A���l]\|�e\_s*\%(�B\|�[\_s*�V\_s*��\_s*��\)\)\|�x\_s*�c\|�o\_s*\%(��\_s*[�G�A]\|��\_s*�[\)\|�g\_s*��\|�V\_s*�[\|�T\_s*��\_s*��\|�^\_s*�s\_s*��\|�s\_s*\%(�g\_s*��\|�^\_s*\%(��\|��\_s*�Y\_s*��\)\)\|�v\_s*\%(��\|�V\_s*��\_s*��\|�e\_s*��\|�`\_s*��\)\|�Z\_s*\%(�C\|��\_s*�[\_s*��\)\|�b\_s*\%([�c�g�`�v]\|�T\_s*�o\|�X\_s*��\|�V\_s*\%(��\|��\_s*�O\|��\_s*\%(�[\|�u\_s*��\)\)\)\|�j\_s*\%(�I\_s*��\|�X\_s*�^\_s*�[\)\|�i\_s*��\|�m\_s*\%(��\|�[\_s*��\|�s\_s*�[\)\|�~\_s*�\\_s*�[\_s*��\|��\_s*\%(��\|��\_s*\%(��\|�b\_s*�g\)\)\|��\_s*\%(��\|�E\_s*�F\_s*�C\|��\_s*��\|��\_s*�C\_s*[���i]\|�b\_s*�g\)\|��\_s*�b\_s*�g\|��\_s*\%([�R�[�A]\|�o\_s*�[\|�u\_s*��\_s*�[\_s*�V\_s*��\_s*��\|�b\_s*�W\|��\_s*�O\)\|�Y\_s*��\)\|��\_s*\%(�R\|�X\_s*�g\|�V\_s*�^\_s*��\)\)\|��\_s*�p\|�`\_s*\%([�^�����}�A]\|��\_s*��\|��\_s*�[\|��\_s*�h\|��\_s*�j\_s*�[\|�R\_s*��\|�b\_s*\%([�v�N]\|�e\_s*��\_s*�I\|�^\_s*�S\_s*��\)\|�L\_s*\%(��\|�[\_s*�^\)\|��\_s*\%(�A\_s*�u\_s*��\|�[\_s*�C\_s*��\_s*�K\_s*��\)\|�[\_s*\%([�t�g�v�N�Y]\|�p\_s*�[\|�^\_s*�[\)\|�F\_s*\%([���X�J�R�A��]\|�U\_s*\%(��\|�[\_s*��\)\|��\_s*\%(�j\_s*�[\|�V\_s*�[\|�m\_s*�u\_s*�C\_s*��\)\|��\_s*\%(�[\|�X\_s*�g\|�b\_s*�V\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*�^\|��\_s*�R\_s*�t\)\|�r\_s*�`\_s*�F\_s*�t\|�_\_s*�[\|�`\_s*�F\_s*��\|�b\_s*\%([�g�N�J]\|�L\_s*��\_s*�O\)\|�C\_s*\%([�X��]\|�j\_s*�[\|�T\_s*�[\|�V\_s*��\_s*�O\)\|�[\_s*\%(��\|�U\_s*��\|�z\_s*�t\)\)\|��\_s*\%([�I�t�h�C���R���E]\|�c\_s*�l\|�N\_s*��\|�v\_s*�^\_s*�[\|�p\_s*�e\_s*�B\|�y\_s*\%(��\|�b\_s*�N\)\|�`\_s*��\|�l\_s*\%(��\|��\_s*�[\|��\_s*��\_s*�O\)\|�b\_s*\%([�N�g]\|�s\_s*�[\|�v\_s*\%(�}\_s*��\|��\_s*��\)\)\|�^\_s*\%(��\_s*[�C�[]\|��\_s*��\_s*�O\)\|��\_s*�}\_s*�[\_s*�X\|��\_s*��\_s*�W\|��\_s*��\|�[\_s*\%([�`�^�g���W]\|�r\_s*��\|�~\_s*\%(�[\|��\_s*�O\)\|��\_s*�[\|��\_s*\%([�Y�X]\|�g\_s*��\)\)\|��\_s*��\_s*�S\)\|��\_s*\%([���R]\|�C\_s*�X\|��\_s*�X\_s*�L\_s*�[\|�[\_s*\%(�N\|�T\_s*�[\|�J\_s*�[\|�L\_s*��\_s*�O\)\|�S\_s*��\|�b\_s*\%(�v\|�s\_s*�[\|�p\_s*�[\)\|��\_s*�\\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\|��\_s*\%(��\|�Y\_s*��\_s*�`\_s*��\)\|�p\_s*��\|C\_s*\%([srdfDeRoa]\|��\_s*��\|�^\_s*��\_s*��\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|�\\_s*��\_s*�O\)\|�^\_s*�C\_s*�v\|T\_s*\%(�X\_s*�L\_s*��\_s*��\|R\_s*L\_s*�L\_s*�[\)\|�V\_s*�F\_s*��\|S\_s*\%(V\_s*�t\_s*�@\_s*�C\_s*��\|�`\_s*��\_s*�[\_s*�i\|�A\_s*��\_s*�e\_s*�i\)\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|�R\_s*��\_s*�p\_s*�C\_s*��\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*�J\_s*��\_s*��\)\|�h\_s*��\_s*�C\_s*�u\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|��\_s*��\_s*�N\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*�L\_s*�[\)\)\|�c\_s*\%(�@\_s*�[\|�B\_s*��\_s*��\|�F\_s*\%(�[\|��\_s*�j\_s*�[\|��\_s*��\)\)\|�Y\_s*�f\|�b\_s*\%([�^��]\|�l\_s*�\\_s*��\_s*�O\|�^\_s*�C\_s*�v\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|��\_s*�r\|�c\_s*�|\_s*�q\_s*�n\_s*�l\|�h\_s*��\_s*�C\_s*�u\|�{\_s*�{\|��\_s*��\_s*�N\|�n\_s*2\|��\_s*�b\_s*\%(��\|�n\_s*�X\_s*�g\_s*�A\)\|��\_s*��\)\)',
-        \ 'd' : '\%([�다�h�b���r�a���ךǏ������t�B�N���{�����c�j���ۓ��Ó��̊��ӓ������ՓœǙI�������~�U�k���N���ӝ����^���}�X������駁́ߓ����ԓ��ӓ��V���W�������֓������W�{�ޙ�x�g�z�𗯗Z�^���m�v�w�ˎ~�y�ǎ��F≓��B����H�D�s�M��ϙ��u���������b�\�B�a�d�ƂŃd�ߐh���ȍj�Γ`�������s�����n�ˌ���g�˒ݕt�ВËl�}�ϒޘA�Ãa���ߗ͒n��������I�L���֓|�Z��睏����J���N�M��Ӌ��ҋ����x�J�يړ_�x�Ԓ|���������F�ڒD�E�U璒���i�N��Օ����n�m���聄��������Гْ̖U���[�g�h�k�i�f�c���d�e�j���Ǟ񐆘Ǒ�䶝\�śP�֑�蚑ʑ��[�������T�������ÞS�ɚ��k�o���Ĝ팚�[�P�c�˂��������D���A�C�d\.�E�c���g�h�������\���B�����ƃh�������_�W�D�f���„t��d]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�h�f�d�a�_]\|��\_s*[�ǂłÂ���]\|�\_s*�\|�s\_s*�X\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*�V\_s*��\|��\_s*��\|�@\_s*��\|�\_s*�\|�Y\_s*��\|�S\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�t��]\|�\_s*��\|�\_s*�\|��\_s*[�I��]\|�\_s*�\|�m\_s*�b\|�x\_s*��\|��\_s*�q\|��\_s*�q\|�\_s*�\|��\_s*�K\|��\_s*�\|��\_s*�B\|�R\_s*��\|��\_s*��\|��\_s*�k\_s*�B\_s*��\|��\_s*\%([���Ɍ�]\|��\_s*�L\|��\_s*�V\_s*�c\|��\_s*\%(��\|��\_s*�b\)\)\|�T\_s*[���B]\|��\_s*��\|��\_s*�|\|��\_s*\%(��\_s*��\|�\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\)\|�R\_s*��\_s*��\_s*�r\_s*�A\|�Y\_s*\%(��\_s*�[\_s*�X\|�b\_s*�N\)\|�C\_s*��\_s*�J\|��\_s*��\|��\_s*�m\|��\_s*��\|�s\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|�n\_s*�[\_s*�O\|��\_s*��\_s*��\_s*��\_s*��\|�j\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*�q\|�L\_s*�q\_s*�q\|�c\_s*\%(�_\|�^\_s*�C\_s*�v\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�b\_s*�u\_s*��\_s*��\_s*�h\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*�N\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|�\\_s*�i\_s*��\|�[\_s*�b\_s*�P\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|D\_s*\%(b\|�^\_s*�C\_s*�v\|T\_s*\%(E\|P\_s*�\\_s*�t\_s*�g\|M\_s*�\\_s*�t\_s*�g\)\|M\_s*A\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|C\_s*\%(�J\_s*�[\_s*�h\|�u\_s*��\_s*��\_s*�h\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|�T\_s*�[\_s*�o\)\|H\_s*C\_s*P\_s*\%(�T\_s*�[\_s*�o\|�N\_s*��\_s*�C\_s*�A\_s*��\_s*�g\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|��\_s*��\_s*�N\|V\_s*D\_s*\%(�{\_s*�b\_s*�N\_s*�X\|�V\_s*��\_s*�b\_s*�v\|�P\_s*�[\_s*�X\|�f\_s*�b\_s*�L\|�h\_s*��\_s*�C\_s*�u\|�I\_s*�[\_s*�f\_s*�B\_s*�I\|�v\_s*��\_s*\%(�[\_s*��\_s*�[\|�C\_s*��\_s*�[\)\|��\_s*�b\_s*�N\|��\_s*�R\_s*�[\_s*�_\_s*�[\|�}\_s*��\_s*�`\|�r\_s*�f\_s*�I\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*�L\_s*�[\)\|I\_s*\%(P\_s*�X\_s*�C\_s*�b\_s*�`\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
-        \ 'e' : '\%([�ኙ����P�G���ҋ�`�ܐ�ݑ����傉��滌ӏ^�Λ�����x������V�x�{�y�󔌜▒厝t㈉z郉u�Չv���w�t�����d�_���Qঢ়o���H��̟����џH�����v���鴉�䆉������`��腖��b膞Ł܉���⥟��}�������|��������叉��͉�����������������l�����U�������~�����o���I�o�k���������t���Țz��瞱����i�͉j�o�ĉb�l��g�s�d�m繉e�r�f�h�n�c�i�ʉq���G�`���`�}�]㉈��Όd���l��˘��d����a�|��b�Ή�d�I�����������������������U�����́߁����Q���M�}���N���p�Ύ��I���ń��R�|�L���^�Ä��Ge]\|A\_s*\%([�ʔ��^��]\|V\_s*\%(�@\_s*��\|��\_s*�D\)\|B\_s*\%(�^\|C\_s*��\)\)\|�`\_s*\%([�ʔ��^��]\|�u\_s*\%(�@\_s*��\|��\_s*�D\)\|�a\_s*�^\)\|��\_s*\%(��\|��\_s*��\)\|�O\_s*��\_s*��\|M\_s*�T\_s*�C\_s*�Y\|�l\_s*�T\_s*�C\_s*�Y\|�G\_s*�X\_s*�q\|��\_s*��\|�g\_s*��\|�E\_s*��\|��\_s*��\_s*�q\|��\_s*�y\|��\_s*�x\|��\_s*�H\|�x\_s*�\|��\_s*[�s��]\|��\_s*��\|�g\_s*�q\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\)\|L\_s*\%(�T\_s*�C\_s*�Y\|L\_s*\%(�T\_s*�C\_s*�Y\|��\_s*��\)\)\|��\_s*\%([��仕Q]\|�m\_s*��\)\|N\_s*��\| \_s*n\_s* \_s*�p\_s*�`\|�m\_s*\%([�‹ɋ�]\|��\_s*��\|�g\_s*�j\_s*�z\_s*�[\_s*��\)\|��\_s*��\|�Z\_s*��\|��\_s*�X\_s*�r\_s*�[\_s*�H\_s*�i\|�r\_s*\%([�g���ȋ�]\|�T\_s*�C\_s*�Y\|�m\_s*��\|�e\_s*��\_s*��\)\|S\_s*\%([����]\|�T\_s*�C\_s*�Y\|N\_s*��\|F\_s*��\_s*��\)\|�q\_s*[���y]\|X\_s*\%([���r]\|O\_s*��\|��\_s*�F\_s*��\)\|�w\_s*\%([���r��]\|��\_s*�F\_s*��\)\|�A\_s*��\|�\_s*��\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|�C\_s*\%(�V\|�W\_s*��\)\|��\_s*�s\_s*��\_s*��\_s*�x\_s*��\_s*��\_s*�c\_s*�c\|��\_s*�[\_s*�N\_s*�X\_s*�e\_s*�[\_s*�V\_s*��\_s*��\|��\_s*\%(�B\|��\_s*�b\)\|�^\_s*\%(�B\|��\_s*�b\)\|��\_s*�[\_s*��\_s*\%(�s\_s*�A\_s*��\|�b\_s*�p\)\|��\_s*\%(�A\_s*��\|�E\_s*��\_s*�s\_s*�E\_s*��\|��\_s*�C\_s*�J\|�[\_s*\%(��\|�m\_s*�X\|�j\_s*�X\|�W\_s*\%(��\|�[\_s*��\)\|�h\_s*��\|��\_s*�J\|��\_s*\%(�X\|�V\_s*�A\)\|�t\_s*\%(��\_s*�e\_s*�X\|�H\_s*\%(��\_s*�A\|�j\_s*�A\_s*��\)\)\|�N\_s*��\_s*�b\_s*�h\|�J\_s*��\)\)\|��\_s*�W\|��\_s*��\|�d\_s*�q\_s*��\_s*\%(�C\_s*��\|�[\_s*��\)\|��\_s*�W\|�]\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|�S\_s*��\_s*��\_s*�T\|�J\_s*�v\_s*�Z\_s*��\_s*��\|�I\_s*\%(�[\|�C\_s*\%(��\_s*�[\|�Q\_s*��\)\)\|��\_s*�s\|�g\_s*��\|��\_s*�O\|��\_s*�Q\_s*��\|�d\_s*\%(�o\_s*�n\|�h\_s*��\_s*�C\_s*�u\|�c\_s*�x\_s*�[\_s*�^\|��\_s*��\_s*��\_s*��\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�^\_s*�C\_s*�v\)\|�A\_s*\%([���C]\|�j\_s*�h\|�[\_s*\%([�}�X��]\|�E\_s*�B\_s*��\|��\_s*��\|�j\_s*�[\|�l\_s*�X\_s*�g\|�~\_s*��\|�V\_s*�[\|��\_s*�[\)\)\|��\_s*��\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*�R\_s*�[\_s*�h\|P\_s*��\_s*�R\_s*�[\_s*�h\|�h\_s*��\_s*�C\_s*�u\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|��\_s*�[\_s*��\|-\_s*m\_s*a\_s*i\_s*l\|�J\_s*�b\_s*�v\|�R\_s*�}\_s*�[\_s*�X\|N\_s*T\_s*E\_s*R\_s*�L\_s*�[\|�^\_s*�C\_s*�v\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*�L\_s*�[\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|�C\_s*\%([�u���A���[]\|�W\_s*�F\_s*�N\_s*�g\|�t\_s*�F\_s*�N\_s*[�g�^]\|�R\_s*\%(�[\_s*��\|��\_s*�C\_s*[�Y�U]\)\|�v\_s*�V\_s*��\_s*��\|�~\_s*��\_s*��\_s*\%(�[\_s*[�g�^]\|�C\_s*�^\)\|�x\_s*��\_s*\%(�g\|�^\_s*�[\)\|�m\_s*�b\_s*�N\|�l\_s*�[\_s*�u\_s*��\|�M\_s*��\_s*�X\|��\_s*�O\_s*\%(��\_s*��\_s*�h\|��\_s*�b\_s*�V\_s*��\)\|�b\_s*�`\|��\_s*\%(�[\|��\_s*��\_s*�O\|�t\_s*�H\_s*��\|�z\_s*��\)\|�O\_s*�W\_s*\%(�b\_s*�g\|�X\_s*�g\)\|�N\_s*\%(�X\|�A\_s*��\_s*�e\_s*�B\)\|�X\_s*�t\_s*�@\_s*�n\_s*��\|��\_s*[���A]\|��\_s*\%(�[\_s*\%(�X\|�U\_s*�[\|�T\_s*�[\)\|�C\_s*\%(��\|�U\_s*�[\|�T\_s*�[\)\|�u\_s*��\)\)\|�E\_s*\%(�[\|�W\_s*�F\_s*�[\_s*�k\)\)',
-        \ 'f' : '\%([���[�Ή������M�֓~���y�`���[脟T����͈�j�͊ȎD�^����J㬐�䔕����b�X�����ʙ��������앶�|�����������������t�y���M�D�����������⁃�����៻��������᳍Ę��W�o���K�����敖�lᆕ���p�������̐k⿕�谌�ꄜ��P�i霝c�������񕥕����h���u������C�����c�������ޔX���܊ܕ����t�e�������������w�t����X�����������s���b�•z�|�����ޘ��w�t�]�АU���㧘V�������o�\�v�ؕ���H��~��������[�������n���D�ҕ����B�y�G�z�o�t�{�ܕ��ݍ~�D���Y�u�@��缕����S��䘔��Y�}��䎙���ʖ|�ӂ��S���́��x�܋��ŕ��U��󕤕�F�U���ӄ��tf]\|�\_s*�\|�b\_s*�t\|��\_s*��\|��\_s*��\|�A\_s*�X\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*�i\|�}\_s*��\_s*��\|�C\_s*�f\|��\_s*\%(�C\|��\_s*[����]\)\|�_\_s*��\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*�c\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[���R]\|��\_s*�t\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�Q\_s*[�l�“�]\|�h\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*�o\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|�_\_s*��\_s*��\|�`\_s*��\|�z\_s*\%(��\_s*�C\_s*�G\|�C\_s*��\|��\_s*\%(�}\_s*\%(��\_s*�g\|��\_s*��\)\|��\_s*�A\_s*\%(�~\_s*�h\|��\_s*�f\_s*�q\_s*�h\)\)\)\|��\_s*�t\|��\_s*��\|�@\_s*�\\|��\_s*��\_s*��\|�C\_s*��\|�q\_s*\%(��\|��\_s*�[\_s*[�Y��]\)\|�P\_s*\%(�^\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*1\_s*�v\_s*�f\|��\_s*�s\|�n\_s*\%(�G\|��\_s*�u\_s*��\|��\_s*��\)\|�_\_s*��\_s*��\|�e\_s*\%(�P\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*�g\_s*��\|�G\_s*�t\)',
-        \ 'g' : '\%([���E�D��ĉ�愍��܍��Ό���ᘭ���Ֆ��@�W龚����o�X�ߔ쐺���n�S�������΍���ᴊ��r���c��������穚�������ꇟ|�����ߍ�������@���ᛈ����䲎��ތ�T�Ɍ����党I⺌Ɍ��w�����5�ݒ��ܝ�z�q�x��Z��ߟ������驌���������Q��������|���k�⚔�nj}�~�|�Yꖚ��P��Ê���q���F����ῌ��V�Ȍ����������������������R������Z���������Ă��C���푐���򕳕ȍ��I�q�Ƒ���䣌��΋������X���{�������j㸌S�Q�R�����ԋ��H�F�ٕ���O����h�[���g�炮�ߌ��N��ۋ����ًҚ�����⚝�����f��耋ʋ����ꟋČ�����C���z�邙F�‹ƋŋÍs�ኋs�t�C�`�U�Z�؋W�ً]�b�X��V�^��E㺙E��a�a���[���c�V���~���؞Fซ\�E鰋_�Y����雎��_�������W�d᥍m�A�Ԑ�݊��v�瑤�ʊ����Ō꓁��^�`���e�����q寊����I�P�}�d�j�k�h�����G��_�~��������팵�ћǘ�����ݙʊہ���꜋��܊���������ߌ����猎��怞ْ՚�罛|�{��Ӝ��ԙ��k�z�x�{�y�w���G�U��������N᳜����ȟ򛻈�R�P�n᫊Y�P�K�w䈊H�V�Q�Z�S�X�M�T�W�[�O�㛴��䃖�A���b�ϊ��|��M���`��P��G�ؙމʉ�딃���a���͉�䮏�����ɉ惕���ꏟ���@���⁄�������K�S�ԃ������҃��������ăσ����ǃ��ӃуɃ��̓˃Ճփ������ƒ��������΃Ã������ЃƃŃȃ����̃ʃ����M�O�Q�s�����Cg]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�S�Q�O�M�K]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*�~\|��\_s*��\|��\_s*�y\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*�s\_s*��\|��\_s*�q\|�H\_s*��\|��\_s*��\|��\_s*��\_s*��\|�~\_s*��\|�i\_s*\%([�ԉ�]\|�V\_s*��\)\|�P\_s*��\_s*��\|�]\_s*\%([�ÌΏ��B]\|�k\_s*��\)\|��\_s*[���`]\|�\_s*�\|�w\_s*�\|�i\_s*�F\|��\_s*��\|��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[���ō�]\|��\_s*��\|��\_s*�E\|�\_s*�\|�~\_s*��\_s*��\_s*�F\|�H\_s*��\|��\_s*[��Ս��i]\|�g\_s*�@\|�\_s*�\|�{\_s*��\|��\_s*\%([�알]\|�Z\_s*��\)\|��\_s*\%([�@����]\|�s\_s*��\_s*��\|��\_s*��\_s*�@\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�c\|��\_s*��\_s*�J\|��\_s*�t\|�L\_s*�q\|�Y\_s*��\|�\_s*�\|��\_s*��\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*�^\|�b\_s*��\|��\_s*��\|�k\_s*�[\|�f\_s*\%(�n\_s*�q\_s*�n\|�a\_s*��\_s*��\_s*��\|��\_s*��\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|�X\_s*�|\_s*�b\_s*�g\|�p\_s*��\|��\_s*��\_s*��\)\|�j\_s*��\_s*�[\_s*�Y\|�m\_s*�[\_s*��\|��\_s*�i\_s*��\_s*��\|�A\_s*��\_s*��\_s*�R\_s*��\_s*�i\_s*��\_s*��\|�q\_s*��\|�N\_s*�b\_s*�p\|��\_s*�q\|�n\_s*�{\_s*��\_s*�[\_s*�l\|��\_s*��\|�G\_s*�[\_s*�e\_s*�{\_s*��\|��\_s*�[\_s*�e\_s*�{\_s*��\|�C\_s*�F\_s*\%(�[\_s*�e\_s*�{\_s*��\|�e\_s*�{\_s*��\)\|��\_s*��\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|��\_s*��\|C\_s*L\|c\_s*c\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|�X\_s*�|\_s*�b\_s*�g\|�p\_s*��\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(�t\_s*�@\_s*�C\_s*��\|�A\_s*�j\_s*��\)\)\|U\_s*I\|N\_s*U\|O\_s*�T\_s*�C\_s*��\|E\_s*T\_s*��\_s*�\\_s*�b\_s*�h\)\|�w\_s*\%(��\_s*��\_s*�h\|��\_s*�}\_s*��\)\|�h\_s*�C\_s*�c\|��\_s*�g\_s*�v\_s*��\|�[\_s*\%(��\_s*\%(�`\_s*��\|�j\_s*�E\_s*��\)\|��\_s*�N\_s*��\_s*�b\_s*�v\|�m\_s*�A\|��\_s*�g\_s*��\_s*�}\_s*��\|�l\_s*\%(�R\_s*��\|��\_s*\%(��\|��\_s*�X\_s*�g\)\)\)\|��\_s*\%(��\|�w\_s*�@\_s*��\)\|�W\_s*\%([�����W�O�m�i�I���[]\|�v\_s*�V\_s*�[\|�A\_s*��\|�C\_s*�h\|�b\_s*�h\|�^\_s*��\|�[\_s*��\|��\_s*�A\_s*��\|��\_s*�b\_s*�g\|�S\_s*��\|��\_s*\%(�t\|��\_s*\%(�h\|�f\_s*�B\_s*�[\_s*�m\)\)\|��\_s*\%(�[\|��\_s*�h\)\|�o\_s*��\_s*�V\_s*�[\|�u\_s*\%(��\|��\_s*��\_s*�^\_s*��\)\|�x\_s*\%(��\_s*�i\_s*�E\|��\_s*��\_s*��\)\|�l\_s*�b\_s*�g\|��\_s*\%(�b\_s*�g\|��\_s*�@\_s*��\_s*[�j�i]\|�o\_s*��\_s*[�j�i]\|�R\_s*\%(�[\_s*�\\|��\_s*�_\)\|��\_s*\%(�W\|�_\_s*�[\_s*�m\)\|�[\_s*\%(�W\|�[\_s*�b\_s*�g\)\)\|��\_s*\%(��\|�C\_s*\%(��\|��\_s*�Y\|�A\_s*��\_s*[�c�g]\)\|�R\_s*\%(��\|��\_s*�b\_s*�e\_s*�B\)\|�[\_s*�}\_s*��\)\|�j\_s*�[\|��\_s*\%([���l]\|�[\_s*�b\_s*�y\|��\_s*\%(�A\|�[\_s*�j\|�G\_s*�b\_s*�^\)\|�k\_s*\%(��\_s*�B\_s*�G\_s*�[\_s*��\|�r\_s*�G\_s*�[\_s*�u\)\)\|�F\_s*\%([�����t���}�l]\|�X\_s*�`\_s*��\_s*�[\|��\_s*�j\_s*��\|��\_s*\%(�[\_s*[�g���h]\|��\_s*\%(�h\|�f\_s*�B\_s*��\|�_\_s*�C\_s*��\)\)\|�~\_s*�j\|�j\_s*�[\|�m\_s*\%([�A�o]\|��\_s*�@\|��\_s*�[\_s*�Y\|�T\_s*�C\_s*�h\)\|��\_s*\%(�}\|�g\_s*\%(��\|��\_s*[�B�[]\)\|�_\_s*�[\)\)\)\)',
-        \ 'h' : '\%([Η�䀞��������L�N������{���w��ʔM���ܖS�Ŗy�j��壌u�������ׁ����󜓏c�����������]�K���g�֚��\✖{�x�j��c�����������ə�ᬖp�W���_���I�•���q�N�u�Y���ږQ���}䚑��N���闈������{�B�P��a����H��������K�A�O�f�D���G�̜d���M�O�E���v��L���C�󝻝��e�M�іk�M�~��O�۝e�Y�_�@����ꅜ��ƕ��n���ܒ��䐤���s�̕��J�������K��療�͌���������z�u���`�œL�K���������H�����Q�Q������ɕ����E憕��w����ǝ́ݕՕ��x�ҝG��⍖ݛQ���a�y�ْ؛i��͕���Û��z�˕r�������Ǖ•�������w�ӗ����ˌ�粂�̞��[�Ή������։A�~���y�`���[脟T�Ǐ͈�͊ȎD��^����J���㬐�䔕����b�X������䎟������앶�|�����������������t�y���M�D��������⁄���៻��������᳘��W�oB���K���敖�lᆕ���p�������̐k⿕�谌�ꄜ��i霘ŕ�������F�������Ӌ��h���u����ⷁ��������ޔX���܊ܕ��t�e���������w�t����X�������s���b�•|�����ޘ��w�t�]�АU���㧕����o�\�v�ؕ���H��~��������[�������n���ҕ����B�y�G�z�o�t�{�ܕ��ݍ~�D���Y�u�@��缕����S���x��Y�}�������V�_�~�Q�P�c���ݕA�S鯝ۏG��G�哘ǝ��|�ጄ�Չ��颕E�h�_�j�k�l㏟q�o���ĕn�p�m�g�i�׋����ʕf�g������R�ʒ��I�J���������������@���P��������v尗���z�h�啸���Ǐ��d�֐ċϏ������d�ΒP�ՓƑ��m���l1�P�u��ഁ����H�͏ݝf�ە��\�P�F�Ѝt鷑M���J焕S���АZ�O�z���n�I�Q�T䊌��Q�P��㟋��q���������W�j�G�E�g��ϏE�S���h������ꤊ��m���O�G�[�T�_�A�L���ѕN�D�J�L�C�Ȋ��l�J�C捍����r�M�K�u蹕U�H�~�q镕V��I�g�j�G�^�Y�~�Z�֙��d���[�ߕ]�W���\�{���_�u���y�i�w�����]�D�g����K��Γ�唛E��࿙���`�ݔߔ���B��ე����B�������ɞw������������혡���鏊�����]�X翔������枈��O���������澊�����|�������瀔�����O��ʎ������z�j�H���Ԍ�������㔈墏Ȑ��[�O�X���J��y������ّj��}�݋Е��o�����ޝ؏����՛��ދ@�@�T�m�����ה�������喗��I���j�Y���D���s���c�P�����Ĕ��J�`������e���]�똟�ƈ�n���n�G���|�F�ɐ�������ꡗI���z�y���t����妝p�������p�����S�����Ǘ����|杙�����b���r�@�؉���瞖z�d�X���x�X�򒌑����������\➁����^��⦔�����鼏��R�x�펾�њ�����虊���M�����ߍ��ϔ����A���ǝ������������唏��������R�����d�ʌv�}�є�������`��ڔ������񏉘o�@�W�����Iᢔ����@����������輔u�̝��ڛu�������v�i�`����ғ����t���\�E�C��p�Bᓔx�o�ޔy�w�W��p�r�q�s�D�z���W�֞��N����崔Νםa⛔����J���Í➷�^䗖}ፖ|���Y�K�唺�Ϟ��ٔ����͔�㆔הєŔ����Ǎ�ʔƔɔ̔Ĕ����Д����_�l�f�H�ǒp�ț�f�����Քb▗����t�����攇���j�ƞP�J���c���y�U�������h����H�ʔe�f��蘒[���������঎��c���Μ͔m���Ɯ���ꏐn�d����ډh�ޑ|���\��㵐��i�͂����������������������������������������������g�]�t������q�z�w�nh]\|�\_s*[�����]\|�b\_s*[�z�w�t�q�n]\|��\_s*[�قւӂЂ�]\|��\_s*��\|�q\_s*�K\|��\_s*��\|�\_s*��\|�m\_s*[�F�C]\|��\_s*�}\|��\_s*[�ΐ�]\|��\_s*�{\|�S\_s*��\|�_\_s*��\|�p\_s*�K\|��\_s*��\_s*�F\|�g\_s*[��]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|�\_s*�@\|�a\_s*��\|��\_s*�q\|�|\_s*\%(�\\|��\_s*��\)\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*�i\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[���R]\|��\_s*�t\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�h\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|�]\_s*�c\_s*��\|��\_s*��\|��\_s*�I\|��\_s*�\|��\_s*��\_s*��\|��\_s*�@\|�_\_s*[����]\|�I\_s*��\|��\_s*��\|�i\_s*�a\|�\_s*�\|��\_s*\%([�l�o]\|��\_s*�o\_s*��\)\|��\_s*��\|��\_s*��\|�f\_s*��\|��\_s*�V\_s*�q\|�_\_s*[����]\|��\_s*�l\|��\_s*[�ƁX]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*�f\_s*�]\|��\_s*��\_s*��\|��\_s*[�c��]\|��\_s*��\|��\_s*[�������B]\|��\_s*��\|��\_s*��\_s*��\|�h\_s*��\|�K\_s*�W\|��\_s*[�j�s]\|�e\_s*��\|�W\_s*��\|��\_s*�q\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�`\_s*��\|��\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�o\_s*��\_s*�|\|��\_s*�E\|��\_s*��\|��\_s*[��]\|�y\_s*[�����t]\|�q\_s*[�f�C]\|��\_s*�t\|��\_s*��\_s*�l\|��\_s*��\|�x\_s*�q\|��\_s*�J\|��\_s*��\_s*��\|�Z\_s*��\|��\_s*��\|��\_s*�]\|�K\_s*[��q]\|�{\_s*\%(��\_s*��\|��\_s*��\)\|�E\_s*[���l]\|��\_s*�s\|�w\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\|0\_s*��\)\|�Q\_s*\%([�l�“�]\|�O\_s*[�Γ�]\)\|�W\_s*�|\|8\_s*��\|�q\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|�C\_s*\%([��i�f����]\|��\_s*��\_s*��\|�f\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|�F\_s*��\|��\_s*�a\_s*�_\_s*��\|�E\_s*�[\_s*�S\|��\_s*\%(�[\|�y\_s*�[\_s*��\|�x\_s*�[\_s*��\|�C\_s*�X\_s*�}\_s*��\_s*�X\|�S\_s*�[\|�O\_s*�m\_s*�[\|�}\_s*�j\_s*\%(�e\|�X\_s*[�g��]\)\)\|��\_s*��\|�\\_s*�Z\_s*�i\_s*��\|��\_s*��\|��\_s*�`\|�C\_s*\%(�_\_s*��\_s*�S\|�X\_s*�p\_s*�j\_s*�A\|��\_s*�[\_s*��\|�G\_s*��\)\|�g\_s*\%(��\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(�W\|�a\_s*��\_s*��\_s*��\)\)\|�I\_s*\%([���[]\|�i\_s*�[\|�m\_s*��\|��\_s*�t\_s*��\_s*�[\_s*��\|�l\_s*\%(�X\_s*\%(�g\|�e\_s*�B\)\|�Q\_s*��\)\|�e\_s*��\|��\_s*�K\_s*�[\|�}\_s*�[\_s*�W\_s*��\)\|�A\_s*\%(��\_s*\%(��\|�x\_s*�[\_s*��\)\|�l\_s*�X\_s*�g\|��\_s*�[\|�_\_s*�}\_s*�[\_s*��\|�V\_s*�F\_s*�b\_s*�g\|�r\_s*�^\_s*�V\_s*�I\_s*��\|�[\_s*\%(�l\_s*�X\_s*�g\|�m\_s*��\_s*�N\_s*�[\_s*��\)\)\|�G\_s*\%(�f\_s*�B\|��\_s*��\_s*�P\|��\_s*\%(�i\|�[\_s*�k\)\|��\_s*�C\_s*�[\_s*�Y\|�N\_s*�g\_s*��\|��\_s*\%(�Q\_s*��\|��\_s*�F\|��\_s*�X\|�}\_s*��\|�~\_s*\%(�b\_s*�g\|�[\_s*�g\)\|�u\_s*��\_s*��\|�i\_s*��\_s*�f\_s*�X\|�L\_s*��\_s*�[\_s*��\)\|�m\_s*�N\|�b\_s*�`\|�C\_s*�`\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�J\_s*�b\_s*�v\|T\_s*\%(M\_s*L\_s*�t\_s*�@\_s*�C\_s*��\|T\_s*P\_s*�T\_s*�[\_s*�o\)\|D\_s*D\_s*��\_s*�R\_s*�[\_s*�_\_s*�[\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|��\_s*[�╽�f]\)',
-        \ 'i' : '\%([����ʼn~��ꍘc�U�T���������n�������翔�䑌��폒������恍ݍ��������r�x�������É��j囚|���d�Q�U���|��軗��Ƒ������B�d���{��佈�S�\嫉�䆍��m�n�ؐF���A�t����F������泌Ìމ��L�����d�������ƜјJ���i��ꌒ��Օa�k�v����ɔžo���������֌��y������M�E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�������~�N�}�z�c���c�t��硉Ɏ������䕟J����s�W���]�b�K�\���Tฐ��]�r����m�П��Ȉ��Z���Ԉ��T�M�ΚÉ����C����������m��覉@������u�B�A�A�ޛ���j�H���و�Ί�ֈ�Y�È�1�P�����D�y���I��D�R������۔џ��ʈዏ�H�ƍ֋U�������h�w�ψ͉]����}�u�b�v���]�Ό��≝�g�М�@�E���S��盈���B�Ο��ݑP�����R�҈Ȋ��ՉU�ג��ߛߘߛ��ږ����ˆ̈،܈Η��͜}�Ė��ˈ��ԍs਒_�ˑ��������ޗǓ��o�֗��D�K���~�������䏈ӈۈ��؈ً����їe�����X�J�z�ˁ����������ɂ�������D������聿�h�C�I���DŽy��i]\|E\_s*��\_s*�[\_s*��\|�a\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|�c\_s*�J\|��\_s*��\_s*��\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\|�~\_s*��\|��\_s*��\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�h\_s*[�‘�]\|�@\_s*��\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�E\_s*[�c�R]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�a\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�C\_s*��\|�w\_s*�h\|��\_s*��\|�]\_s*[���o��Z]\|��\_s*��\|�K\_s*�{\|��\_s*�q\|�_\_s*��\|��\_s*��\_s*��\|��\_s*�r\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*��\|�p\_s*\%(��\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[����]\|<\_s*=\_s*=\_s*>\|�K\_s*�v\_s*�\\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�{\_s*�A\_s*�C\_s*�E\_s*�r\_s*�[\_s*�E\_s*�G\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*�w\|�W\_s*��\_s*��\_s*�@\_s*�\\)\|�t\_s*��\_s*�U\_s*�t\_s*�[\_s*��\_s*�G\_s*��\_s*��\|��\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*�^\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�A\_s*�[\_s*�@\|��\_s*��\_s*��\|�s\_s*\%([�”@��]\|�[\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�S\|��\_s*\%(�A\_s*��\|�V\_s*�t\|�[\_s*�h\|�E\_s*�f\)\|I\_s*\%([rPn]\|R\_s*Q\|�J\_s*�b\_s*�v\|C\_s*\%(�^\_s*�O\|�`\_s*�b\_s*�v\|�J\_s*�[\_s*�h\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(��\_s*��\|�R\_s*�[\_s*�h\)\|A\_s*�o\_s*�X\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(�J\_s*�[\_s*�h\|E\_s*\%(�h\_s*��\_s*�C\_s*�u\|�f\_s*�o\_s*�C\_s*�X\|�P\_s*�[\_s*�u\_s*��\|�R\_s*��\_s*�g\_s*��\_s*�[\_s*��\)\)\|�^\_s*�[\_s*��\|T\_s*\%(�V\_s*�X\_s*�e\_s*��\|�o\_s*�u\_s*��\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|�A\_s*\%(�C\|�[\_s*\%(��\_s*�B\_s*��\|�r\_s*��\)\|��\_s*\%(�v\_s*��\_s*��\_s*�v\_s*\%(�`\_s*��\|�e\_s*��\)\|�f\_s*�p\_s*��\_s*�_\_s*��\|�t\_s*�H\_s*��\_s*\%(��\_s*��\|�}\_s*�e\_s*�B\_s*�[\_s*�N\)\)\)\)',
-        \ 'j' : '\%([���󓈎ȓ��������ǎ����w�x�����H���Û�����K���������H�Ԙ�ᶙ��b�����i�u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l�ŏ��ғ�䴞`䥝�募��t�J����珊�R���������P�����ԟ��i�Uㅏ��{�o������媝m�h���鈐������Y�t��������Y����竐������j�g�@������Ï��ꏗ�����`������~�]�吷�꞊��󝵏������������������G�����A�ژh�G�Q榜휵���@���u���Q�x�h�m��n���p�q���m�m⢙Ï��|⡓���՟��~�[�x����{䤏��z���������y�}�������}��汎�������������G�����E�s���n�𘸏^�F�_�`���O�c�a�_�Y���[�b�]�\�Z�e�d�����m�����������莣���^���y�~�����������i���J玎�������Ȓn�����􎤎��~�������I�m�������V�����k�q���H�j�a�Z���d��������䢎������m���ݝ������������苎Ҏ׋Y�l���������������������D�u�E���`�������_�v�F�J�W�zj]\|�\_s*�\_s*�\|�b\_s*�W\|��\_s*��\|G\_s*\%(��\_s*��\|�p\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�c\_s*��\_s*\%(��\_s*��\|�c\_s*��\)\|�Q\_s*��\|2\_s*��\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|�O\_s*��\_s*��\|��\_s*��\|�G\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\_s*��\_s*��\_s*��\|�[\_s*��\_s*�[\|�G\_s*\%(�z\_s*�o\|��\_s*�R\|��\_s*�~\_s*��\|��\_s*�T\_s*��\_s*��\|�b\_s*�T\_s*�C\)\|�w\_s*\%(��\_s*�X\|�X\_s*�X\)\|�q\_s*��\_s*�l\_s*�X\|�`\_s*�Q\|�k\_s*��\_s*��\_s*�[\_s*\%(��\|��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\_s*�@\_s*��\_s*�w\)\|�n\_s*\%(�C\_s*��\|��\_s*�y\_s*�[\_s*�j\_s*��\)\|��\_s*��\|��\_s*\%([�����j�i�[]\|�C\_s*��\|�G\_s*��\|��\_s*�m\|��\_s*�h\|�k\_s*\%(�X\|�V\_s*��\)\|�X\_s*�p\_s*�[\_s*�X\|�R\_s*[�r�u]\|�b\_s*�P\)\|�t\_s*\%(�@\_s*[���i]\|��\_s*[�I�A]\)\|J\_s*\%(R\_s*��\_s*��\_s*�{\|\.\_s*S\_s*\.\_s*\%(�o\_s*�b\_s*�n\|B\_s*a\_s*c\_s*h\)\|��\_s*�[\_s*�O\|�J\_s*�b\_s*�v\|C\_s*B\_s*�J\_s*�[\_s*�h\|-\_s*P\_s*O\_s*P\|�|\_s*�b\_s*�v\|P\_s*\%(G\_s*�t\_s*�@\_s*�C\_s*��\|E\_s*G\_s*�t\_s*�@\_s*�C\_s*��\)\|I\_s*S\_s*\%(�}\_s*�[\_s*�N\|�R\_s*�[\_s*�h\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*�R\_s*�[\_s*�h\|V\_s*A\_s*\%(�X\_s*�N\_s*��\_s*�v\_s*�g\|�A\_s*�v\_s*��\_s*�b\_s*�g\)\)\|U\_s*N\_s*E\_s*T\)\|�Y\_s*�{\_s*��\|�i\_s*\%(�Q\|�|\_s*�v\_s*�`\_s*�u\_s*�d\|��\_s*�[\_s*�O\|�J\_s*�b\_s*�v\|�|\_s*�b\_s*�v\|�h\_s*�b\_s*�b\_s*�o\_s*��\|�t\_s*\%(�r\|�m\_s*�j\_s*�n\)\|��\_s*��\)\|��\_s*\%([�n���_�m]\|��\_s*�Q\_s*��\|�[\_s*\%([���m]\|�Q\_s*��\_s*�g\|�f\_s*�B\_s*�b\_s*�g\)\|��\_s*\%(�O\|�J\_s*�[\|�P\_s*��\)\|�s\_s*�e\_s*��\|�b\_s*[�J�V]\)\|�C\_s*\%(�G\_s*\%([�i�X]\|��\_s*\%(�X\|�Z\_s*��\)\|�Y\_s*�X\)\|�F\_s*\%(�i\|��\_s*\%(�X\|�Z\_s*��\|�[\_s*��\)\|�[\_s*�K\_s*�[\|��\_s*\%(�N\|�T\_s*��\_s*��\)\)\)\|�z\_s*\%([�^�Z]\|��\_s*�w\|�z\_s*�o\|�A\_s*\%(��\|�L\_s*��\)\)\|��\_s*\%([�u�i]\|��\_s*\%(�O\|�_\_s*��\)\|�G\_s*��\|�A\_s*\%(�q\_s*��\|�L\_s*��\)\|�[\_s*�t\|�[\_s*\%([�g�h]\|�f\_s*��\|�[\_s*�t\)\|�V\_s*\%(�t\|��\_s*�A\)\|�Z\_s*�t\|�n\_s*[�i���l]\)\)',
-        \ 'k' : '\%([����a���|�єV�Ҝ��D����ޏn�s���ߐ��E�}���Ĉ����ۗ�ⵘ�ᶎ��s���Ќ����f�����ꎖ������I���z�Eꑍ��C��欉��䓚䢐�ৎ��u�S�}�Y┍��ɗ`�n�����X���M���ȍ������뜝�k���������������卭�Ӎ��������e�W�E�Q�������L�m�՘i���՝��Q�f���肝K�����ਗ਼�Ჟ�騟����}�{㝛������ҟ������L���`�t�i���B�����R�������H��{ൟ������H�s秝���n�n�������˝J�ܔ�����X���L�J�y�ߛ��b�M褜���r�R���t莘m�j�E��硍h�k���l�K����ᦜ������n�K�}��֞��\��囍y��ෙ��Μˍx����u�X�S�e倘����J�i�^���V�@���A����W����G�D�T����`ᩍB��ԍp�]�i�P���I���z�t�_���K�k�O�j�R�w�U�u�P�a�I�|�q�s�m�r���c���D�ޞ��J�ܛ����w�L�΍���������W������ێ����ЛZ�Ö��s������烌��g���םs���ؑ������e��Ⰿ������u����Čٌ̟��]�|����V�����x�֒���绌я�嚙��h���ʉz�q�njԌך➳�Ҕ�Ï��˗��Z�������ꉟ��h�@�Z���e����s�|�q���W���O�׏b����]�{�Ȍ��t��Ә����n�K���P�B�����^���_�[���r����K�{����������C�������ՙL��ٜš������������w�������_�J���]���p��[�����i���N���J����y�������ʌ�����㮛ӌ��@���ę�������F鄌������������������������������Ō����������|�w���Z���Dờl����c⠞f���a犌l�_�Ϝl���g�����۝k�ڙ��㋜��d��P�n�������������������������������������������������������r�z������壌u�殌e�k�\�g��b�Y�p���]�v�[�R�����ق���Ɣz���ɟK�M�z������ⱟJ��㖍򍥛������I�����H���E��z�b�o������x�ܗ��A���D�B��ӏ��~���������B䱌s���Z�Y�㙬��ᯞ���ӛ��M�ֈϏ��v���L�����K�@����{���^���Z�򏾓�^�����������鶔�ňʈ��U�Ñq���������C�~���ܒw�o�^������鿌~�G�F䇚����`�p���̏L�Y���������ƌI��ގԚ��P�M�����E���u���{�O�����o�Ӟ������c�������H�E�|―�Ĝ����Ῑ܌J�ɍC�g����m�������؍H�ᜁ��v�����g�����M���˙�����i���w�G�J�r���z��W���_���_���l�o�C∋̛����m�����G��摞��d��~������焌N��۟A�@���^�ϛ��l�ɝh�h�f�k�e�i�D���܁ʁ��I������灓�}�E�B�W���b�\���W�����M�������񁝁{�P�����R�U�A���������_�G�����偅�X��������L�J�d�󁃁��Z���]�Q�����F���S���H�O�C���a���c�V���K���⁘�����T�^�����Ɂ����[�|�ၐ�򁪁��N�߁Y���䉌�s�׍@�ܞ��X�����������a�n�݋j�����~�g�����������ݜv⯝v�����������R�Ջڋ��[������a�z�ҝ��Ћی��׋؋ы͋ՋӋϋًދԋߋ֋ΉR����䐝����_�蝨⦘��c�`篋��ы��������������������Nj����������|�y㳛I⸋�蝜��^�t⧜t����������⁙K���Í�⟍[�s�����w���O�����v�S��O�v��h➍F�����������p�Z���i�g�݋������������x�������Z�Nj����]䰋������񋧋��������o��運����d�����������������������q�k����髟_�p�k�����������溂X����}���t瓌��Ë����u�Ӌ����y�Z���P�����|�l�{�v�����u���������x�~�}���z���Y��M��q���J�ƟC�����P���k����؋W���k���d�q�b���H�P���_���b���ᡚy�ɌV���c�ڑ��限�E�K���Y���R�_眎����M�u������������{�G�L�D�I�a���Ί��N�����h���X�ߛ��֗���W�B�뛞�����D�؋Q����恟���㲊��韀�u�����H�����ҋS������U昊����،���r�r�ʝu����M���F���^�����������J���B���Q�i�P���X�O�����ᘊ��y���NJ��r���݊��j���ƌy���Ĉꁽ�e�A���i������������M�ʕr��P�T�M���v��������rᚌ���f�j�q�s�e�g�h�p�o�t�r���ƒb��鹜��NJ����D�R���U�ğd��ᥛz���p�ȌڋA���ԓ�雛��_�B�ߗ��ދȋ�\�����Ί����͏ۋw�d�T��e�z�J�x���Ō`���ӌ^�����H���Ȕ����X��R㎎C���P��������q�Š������锯閊����@�����Њ��|�ȁ�嶝^艔���噞J㹊��������{������歒S�����e顊��j舊����������s�Fጐ��d�P�}���g�����y�a�`�f����S�W���m���e����O���]�ݑ��ڙ̛���������@�����F�������O���k�P��\�[�����ಉG�h�@���󓂞Њ����~�y�ۍ\�������}�����ɐ��͘����V��،����~ऐ����c���͌��b���w��u�x�v�X�Õ��L����ꖊ��C�G�K�ƓC魜S�R���Д߈����K�v���֓S哑t�������ݓk�������L�S�ښ��湛�誝����ᙚٚ]���d䡜����Q���I�v�n��跏ʜ������h���\�f�r�n�z�y�k�l�m�k�g�c�s�t�i�o�݉B�v�l�d���j�ߊg�q�u�p�m嵚��W������~�[�����Z�B���͙��G�r�q�ʟD�䠜j珞i������ƙd�^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�_�F���׊@��E�m�����L�G���D�ŊA��������K����J����C�������I䯘��Yᷛe�p���՟��b�Nボ�錝A���Q���a��T㼛�㻛f�W�`�c洟a�����⻝q�j����鉙ɞ쏁㣟��V�뙁�����M��ϊ�䅟��j�F�����r�������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�A�g����⭊��|�}�ۚ��ۊ��@�يΞ��؊��󊩐��ҊȊ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������ŠԊ׊��ՊĚ^���Ê��NJ����֊͊������ϊ��w����x�s�q�P�g�ӊe�����a���㞎��ʼnؚĝ̎���d���ˉ��Z�Γ��ٌ����q�҃�����斉����v�q�Ўx���|�ۉԌ����Q���|����ўh�`��ܛ�����嘉������]�Ǝ؉�㟋�z�ɉÈՉʜ����F��荊����ЌC�a�{�����`�e�k�J�m�”ޚ썁�͉̉ώ����o����ז�◚D�S���l���όU���ґݙ͉щݙ��ljӌT��旞g�~�߉惕�砌����ĉ����ጜ����Ə�����戉Č͉��ۂ������߄��������V���R���`���i��K�N�~���q�ԃL�J���K���{�P��k]\|�\_s*[�����]\|�b\_s*[�R�P�N�L�J]\|��\_s*[�q����������]\|�O\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*�J\|�H\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|�O\_s*�A\_s*��\|�\_s*�u\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|�S\_s*[�Z��]\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�z\_s*�n\|��\_s*[�q�V��]\|��\_s*��\|�m\_s*�F\|�\\_s*�\|��\_s*��\_s*��\|X\_s*e\|�@\_s*��\|��\_s*�s\|��\_s*��\|�f\_s*�n\|�\_s*�\|�\_s*�z\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|�e\_s*[����]\|�o\_s*[����]\|�j\_s*[����]\|�{\_s*��\|�n\_s*��\|�X\_s*\%([���]\|��\_s*��\)\|��\_s*��\|��\_s*�Z\|��\_s*�q\|��\_s*�T\|�\_s*�\|�z\_s*��\|�\_s*�x\|�R\_s*\%(��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|�t\_s*��\|�\_s*�r\|��\_s*�Z\|�|\_s*��\|�\\_s*��\|�]\_s*��\|��\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|��\_s*��\|�y\_s*��\|�A\_s*�g\|�g\_s*��\|��\_s*�t\_s*��\|C\_s*\%([ormdfa]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[�{��v��]\|��\_s*\%(��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|(\_s*��\_s*)\|��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|��\_s*[�I�v�_]\|��\_s*�_\|�B\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|�m\_s*\%([�u�E]\|�[\_s*��\|�b\_s*\%([�g�N]\|�e\_s*�B\_s*��\_s*�O\|�J\_s*�[\|�L\_s*��\_s*�O\)\)\|�i\_s*\%(�b\_s*\%(�N\|�v\_s*\%(�T\_s*�b\_s*�N\|�U\_s*�b\_s*�N\)\)\|��\_s*�b\_s*�W\|�C\_s*[�t�g�c]\)\|�j\_s*\%(�[\|�b\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\)\|�z\_s*\%(�[\_s*\%(�~\_s*�[\|��\_s*�C\)\|��\_s*�C\_s*�j\)\|�t\_s*\%(�r\_s*��\_s*�C\|��\_s*�V\_s*�`\_s*��\_s*�t\)\|�n\_s*\%(��\|��\_s*�V\_s*��\_s*�[\|�[\_s*��\|�o\_s*��\_s*�t\_s*�X\_s*�N\|��\_s*�c\_s*�[\_s*��\|�`\_s*��\_s*�g\_s*�D\_s*��\_s*�A\_s*��\)\|�j\_s*\%([�_����]\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\_s*��\_s*�n\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-        \ 'l' : '\%([��H����F����D����B����@�����ႌ�P�Q���������ʁ��΁́Ƀ��ȃ����|�����L��l]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�t\_s*��\|��\_s*��\_s*2\_s*��\_s*�@\|\.\_s*\.\_s*\.\|�f\_s*�F\|��\_s*�z\|��\_s*��\|�E\_s*�G\|��\_s*��\|�w\_s*�K\|�{\_s*��\|��\_s*��\|�_\_s*��\|��\_s*\%([�L�C�A�����u�{�g���E�X�R�S�O�[]\|�y\_s*�X\|��\_s*�[\_s*��\|�G\_s*�x\|��\_s*��\|�t\_s*�g\|��\_s*�J\|�x\_s*��\_s*�A\|�r\_s*\%(�[\|��\_s*�O\|�C\_s*\%(�X\_s*�g\|��\_s*�O\)\)\|�e\_s*�B\|�T\_s*��\_s*\%(�W\_s*�F\_s*��\_s*�X\|�[\_s*��\_s*�X\)\|�j\_s*�[\|�N\_s*��\_s*�A\_s*��\|�b\_s*\%([�W�^�e�g�N]\|�L\_s*\%(��\_s*�O\|�[\_s*�h\)\|�J\_s*�[\)\|�J\_s*�[\_s*��\|�P\_s*�[\_s*\%([�g�^��]\|�V\_s*��\_s*��\)\|�K\_s*�[\|�M\_s*��\_s*�O\|�W\_s*\%(�[\|�e\_s*�b\_s*�N\|�X\_s*�e\_s*�B\_s*\%(�N\|�b\_s*�N\)\|�J\_s*��\|�N\_s*�[\_s*��\|�b\_s*[�g�N]\)\|��\_s*��\|��\_s*\%([�S�O�_]\|�{\_s*\%(�N\|�b\_s*�N\)\|�o\_s*��\_s*�f\_s*�B\|�Y\_s*�f\_s*�[\_s*��\|��\_s*[�B�[]\|�W\_s*��\|�h\_s*��\)\|��\_s*\%(�A\_s*��\|�b\_s*�^\|�[\_s*�k\|�C\_s*��\|��\_s*\%([�\�X]\|�c\_s*�H\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\|�t\_s*�m\_s*�`\|��\_s*\%(��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|A\_s*�s\_s*E\_s*�w\|��\_s*\%(��\_s*��\_s*��\_s*��\|�s\_s*��\_s*�w\|��\_s*��\_s*��\_s*�v\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|L\_s*\%([DP]\|�T\_s*�C\_s*�Y\|L\_s*�T\_s*�C\_s*�Y\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*��\_s*�C\_s*�g\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|��\_s*��\_s*��\|�G\_s*��\|��\_s*\%([�B�Z�Y�U�T�X�_�|�������}�i�m���k�u�A�[]\|��\_s*�}\|��\_s*�h\_s*��\|��\_s*��\|�]\_s*�`\_s*�[\_s*��\|�R\_s*\%(��\_s*�X\|�s\_s*��\)\|�N\_s*�[\_s*�h\|�J\_s*\%(�[\|�I\_s*��\)\|�W\_s*[���[]\|�f\_s*[�B��]\|�h\_s*�J\_s*�C\_s*��\|�v\_s*�g\_s*��\|�p\_s*�[\_s*�[\|�O\_s*\%(�j\_s*��\|�i\_s*��\)\|�t\_s*\%([�G�g]\|�^\_s*�[\|�e\_s*�B\_s*��\_s*�O\)\|�e\_s*��\_s*[���V]\|�`\_s*�E\_s*��\|�\\_s*\%(�\\_s*�[\_s*��\|�O\_s*��\_s*�t\_s*�B\)\|�^\_s*�[\|�g\_s*\%([����]\|�}\_s*�X\|�A\_s*�j\_s*�A\|�O\_s*��\_s*�t\|�o\_s*��\_s*�X\_s*�L\_s*�[\)\|�I\_s*\%(�^\_s*�[\_s*��\|�l\_s*��\)\|�~\_s*\%(�e\_s*�b\_s*�h\|�b\_s*[�^�g]\)\|��\_s*\%(�[\_s*�W\_s*��\|�l\_s*��\|��\_s*�`\_s*�F\_s*�b\_s*��\)\|��\_s*�W\_s*��\|�L\_s*\%(�b\_s*�h\|��\_s*�[\_s*��\|�e\_s*��\_s*\%(�X\_s*�^\_s*�C\_s*��\|�V\_s*��\_s*�^\_s*�C\_s*��\)\)\|�G\_s*\%(�]\_s*��\|�[\_s*�W\_s*��\)\|�q\_s*�e\_s*��\_s*�V\_s*��\_s*�^\_s*�C\_s*��\|�l\_s*\%([�A��]\|�b\_s*�g\|�[\_s*�W\_s*��\)\|�j\_s*�A\|�x\_s*\%([����]\|��\_s*�A\|��\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�e\)\|�r\_s*\%([�A�[]\|�h\_s*�[\|��\_s*�O\)\|��\_s*\%([�X�[]\|�u\_s*��\_s*��\_s*�[\_s*�i\|��\_s*��\|�h\_s*�~\_s*��\|�N\_s*�T\_s*��\_s*�u\_s*�[\_s*��\|�b\_s*�N\|�V\_s*�A\_s*��\|�~\_s*�G\_s*�[\_s*��\)\|��\_s*\%(�C\|��\_s*�O\_s*�E\_s*�F\)\|��\_s*\%(�B\_s*��\_s*�O\_s*�X\_s*�g\_s*��\|�@\_s*\%(�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\)\|�o\_s*\%(�e\_s*�B\|�^\_s*��\_s*�A\_s*\%(��\|�j\_s*�Y\_s*��\)\|�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\|�b\_s*\%([�h�s�v�^�N�`�g]\|�X\_s*��\)\)\)',
-        \ 'm' : '\%([ӊ�ߝ����ϙ~�E��ぞ���������I�J��䈐��Ўt�������u�q�v�U�p���ݑ���m�X�����ޖ��\���~���Җ����ߋ����̋��������b�f��{���e�����Җ۟��ٖ՟G������̞N���a�C�ܖS�֖іЖҖ����ێ�]���R�k�ᑔ�R�Ȗ͕�֞��G�̖Ύ��r������ݒ����W�Ϗ����ږӛR��ㅖG�̎����b�p�cᾖɖ˖�ǖȖʝ����Ŗ��Җ��ǖ�������ɓz��������������ї�㸋X���}���ٖ��V�񛘊[������|��r���m����籕S�}����絓ԘA�W�p�����~���׏@�����d����⚕ړk��J⥐���ĐI�ßz峒��������ۚ䖹�����ٖ��d�������Q����Z���x�x������������N���a�D�Y�K�I����������C���T�����Η����������������������X�O�̎S�Z������B���ݜD�X�����L�薦�ޑ��ْ��Á��v���p���x�z�E�G⊖����ɗΔF�����a�ϓ��r�ʘH�����韌Ύ��M倐�ᡞ��䪖��������s�{�S�A���Q���`�����֞�捐����v���P�閨��{�F�������Ŝ\���r�V�m�f���O�ϔ��[�[�p�����䖣�����Ȑg���ϖ�▕n�������aῖא\�ݟ{�f�B坏�㇓�㕓I帑��^�]�ߋ[���]�H�o�q�h������Ɖ������M���ϔ도�d�����h�ʉq�����������ږ��p��鞔C����䍕������̓h�|�{���Š�׈��w���l�e�����C�������d��ꠖq�x�f�����U��X���O�D�E�B��������K�j�i�~�ە��������בS�u�����Җ����K������w�Q�Җ��Ė����Ęd�G����簖��������ڞ_�a���J�Z�Ֆ�攉V�{顜���јԛ���I���ԙ��\�ݖ��ޖ��呾�G�����M�����������挫�D�󏫐�����������m�_�U䝔n�ݑ������ԕ������]�v�s���Җ����T�������֍��v�����ږ�ᄐ�ϐ^���d���șɎG�܂��������򃀁ʁ܁�������ځ}���́΁ށ�ȁ����聹�偅�惢�ˁ������ہ́⁈�~�Ɂ���߁݁��䁾���֖��������Z�������|�}�Ń~���M����m]\|�\_s*[�����]\|�b\_s*[�������~�}]\|��\_s*[���߂ނ݂�]\|�g\_s*[�����t]\|�o\_s*\%([��n�e]\|��\_s*��\|��\_s*��\)\|�\_s*�o\|��\_s*�y\_s*\%(��\|��\_s*��\)\|��\_s*\%([�p�e�n]\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*�z\_s*��\|�k\_s*�~\_s*��\|��\_s*��\|��\_s*�p\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|��\_s*��\_s*��\|�j\_s*�E\|��\_s*��\|��\_s*[�N����]\|�n\_s*��\_s*�F\|�t\_s*��\|�J\_s*��\_s*��\|�v\_s*�w\|��\_s*��\|�z\_s*��\_s*�q\|�v\_s*\%([�����p�L]\|�`\_s*��\|�H\_s*�q\)\|��\_s*��\|�U\_s*��\|6\_s*��\|��\_s*�c\|��\_s*�w\|��\_s*��\|��\_s*�]\_s*�q\|�\_s*�n\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�Y\_s*��\|��\_s*�q\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|�t\_s*�m\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|�R\_s*��\|�\_s*��\|�e\_s*��\|�_\_s*[���q�`]\|�d\_s*��\|��\_s*��\|��\_s*��\|�c\_s*[�q����]\|3\_s*[�“�]\|�R\_s*[�“�]\|�p\_s*[�����q]\|��\_s*��\|��\_s*��\|�c\_s*��\|�C\_s*[�_�]�z�����I�R]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|�y\_s*[�����Y]\|��\_s*�s\|�[\_s*�]\|��\_s*��\|��\_s*��\|�e\_s*�O\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|�s\_s*\%(��\|��\_s*[�_�]]\)\|��\_s*�l\_s*�}\_s*��\_s*�m\_s*�X\|��\_s*�X\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�X�Ў���]\|��\_s*��\|�S\_s*��\|��\_s*�h\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�{\_s*�B\|��\_s*�v\|��\_s*[�o����]\|��\_s*��\|�}\_s*�n\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*�b\|��\_s*�m\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�|\_s*\%(��\_s*�l\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[�V��]\|��\_s*�F\|�S\_s*�j\|��\_s*�q\|��\_s*[�����P]\|��\_s*��\_s*�N\|��\_s*�v\|��\_s*��\_s*��\_s*��\|�j\_s*�[\_s*��\_s*�j\_s*�b\_s*�N\|�P\_s*��\_s*��\|��\_s*�c\|�a\_s*�z\_s*[����]\|��\_s*��\_s*�q\|��\_s*��\_s*�]\|�s\_s*[�K��]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*�h\_s*�q\_s*��\_s*��\_s*��\_s*��\|�{\_s*��\)\|�l\_s*\%(�g\_s*��\|�T\_s*�C\_s*�Y\|�r\_s*�|\_s*�c\_s*�n\_s*�r\|�k\_s*�T\_s*�C\_s*�Y\|��\_s*�D\|��\_s*��\_s*��\|��\_s*�b\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|�v\_s*�Z\_s*�@\|��\_s*��\|�U\_s*�b\_s*�w\_s*��\_s*��\_s*�}\_s*�]\_s*�b\_s*�z\|�n\_s*�s\_s*�I\_s*��\_s*��\|��\_s*�s\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|�C\_s*�m\|��\_s*��\|��\_s*��\|M\_s*\%([dgtnOo��]\|X\_s*�e\_s*��\_s*�r\|�T\_s*�C\_s*�Y\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*�T\_s*�C\_s*�Y\|P\_s*3\_s*�v\_s*��\_s*\%(�[\_s*��\_s*�[\|�C\_s*��\_s*�[\)\|D\_s*\%(�v\_s*��\_s*�[\_s*��\_s*�[\|��\_s*�R\_s*�[\_s*�_\_s*�[\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*�A\_s*�h\_s*��\_s*�X\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\|e\_s*d\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|�G\_s*��\)',
-        \ 'n' : '\%([݃���ɏC�҈�j�����M��l����A�j�������f���w�a�X��H�p�L�ՋH�]�`�k��c��䊉ѓ���o����ь���ْ��E�����{�J���W�@���ГT�K�鑥���͋X�I�N�����ӞG��c�I�X�^�]�\�_�������U�ޔW����ژ��Z�V�L���q��ہ|�Z�‚�Țˑ_�o�^�E����D�J�C�ꋑl�X�L���i���������s�M�JൔK���R�����_�Q�O�R�N���S�l���P��I�B�Q�ם������H���q����ǚ��\�啼�K���L刐@���z���X���ޓ����F�܍f�z�G�E�{�D���z�U�ѓh��Ɲ^吒S�����������L�����E���R�P�{�e�����֏��A�E���U�Д@���P���E��ɔB轟��W�����s�t��x�w�����Z�K���X�f�אn�E�͔D�F�C�l�����ʋѐ����V���_�����a���������玂Q�Ɠ����獐m�򎗉�2���O����r�W㊓��c����k�j�›�����D�T�l��S�V�Q�e�w���o���Ԏ������P�����Y���g糕�粓�Q�^�垙�����ĎC���������Ή������Y�ّӓ��H�a����Ë[�y����m�ܗG�X��Ɩ�Č`�Ɖr����ဗ��v����i�a�����������x�܏A���E�}�����V�Ύ����̔T�����R���f��훕����j����s�Ϟo�o��񁽁ˁ��K��⍉֚a�[���ߝ\�r�P���������n���T����ˆ��b�ޏ��L���ྒྷ�ލ؋������S���~���e�Ȅ��������������������������������������ޖ������������j�l�ʁ`���i�k�m���N�~��n]\|��\_s*��\|��\_s*�q\|��\_s*��\|�x\_s*�U\|��\_s*��\_s*��\|�\_s*��\_s*��\|�T\_s*[�|��]\|��\_s*�C\|�t\_s*��\|�g\_s*[���C]\|�j\_s*[����]\|��\_s*�]\|�L\_s*��\|��\_s*��\|�F\_s*�q\|��\_s*[�@���q]\|�P\_s*�q\|��\_s*�q\|��\_s*��\_s*��\|�h\_s*�V\|�q\_s*�|\|��\_s*�\_s*��\|��\_s*��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�]\_s*�q\|�_\_s*��\|��\_s*�P\|I\_s*I\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�\| \_s*2\_s* \_s*��\_s*��\_s*��\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(�f\|��\_s*��\)\|�|\_s*�\|��\_s*�|\|��\_s*�T\|�s\_s*[����]\|P\_s*b\|L\_s*e\_s*a\_s*d\|�C\_s*[�ۑl]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�|\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|�n\_s*�k\|��\_s*��\|�s\_s*��\|��\_s*��\_s*�X\_s*�g\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|�R\_s*��\|�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|��\_s*�[\_s*�m\_s*�b\_s*�V\_s*��\_s*�E\_s*�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|�I\_s*��\_s*��\_s*�_\|�A\_s*��\_s*��\_s*�J\_s*�l\_s*�b\_s*�g\_s*��\_s*�[\_s*�N\|��\_s*��\|��\_s*�_\|�m\_s*\%([�_�n]\|�N\_s*�B\_s*�[\_s*��\|\.\_s*�x\_s*\.\|��\_s*��\_s*��\_s*��\|�h\_s*�e\_s*�s\_s*�x\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(�w\_s*�s\|��\_s*��\_s*��\_s*��\|��\_s*�|\_s*�i\_s*��\_s*��\_s*��\_s*��\_s*��\|�v\_s*�r\|��\_s*��\_s*��\_s*��\)\|�d\_s*\%(��\_s*��\_s*��\_s*��\|�s\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(�D\|�v\_s*��\)\)\|��\_s*�z\_s*��\|��\_s*��\|��\_s*��\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*��\_s*�[\_s*�h\|H\_s*K\_s*\%(�z\_s*�[\_s*��\|��\_s*�W\_s*�I\)\|T\_s*T\|Y\_s*�_\_s*�E\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|��\_s*�f\|�G\_s*�k\)',
-        \ 'o' : '\%([��ݜ��b�S�M�o�N�O�Ì��Q�������j�w�d���Њd�Y���n�����n���x��������遌��s�s��ና{��≬�ݕL�ڜ����P����؋������y���߁W�S�V�T�R�U�X�����y�􋳙{�E⫝������e���}�t���c�C筞��[�҉���x���^拑����`�q�`�Ɗx���s���N��˗��u���B�b���d�e�������Ȋe�퐊��K�ȉ��򚙁������a�C���O�������݈җ�㱕������z�v�\�d�ʋ������U���K�������������{�|�����w���S�^�����g�]㠟i�����������Ҝ����}�D���ᜳ��[�a�����Q��_�������N�R�������V�M�������ן^�q�቉��r�S�B��������������������蜊׉����W�ꉞ�ʜ䉆���W�T�g�����E���c�T�ٖQ���P�������ѕ���}���ʼn������Y�[���”��u���N�|���Ǜ�ܚǕ��ĐD�V�����E���j�v�ɋN�O���j������؟Ɍ䏏�֒�������Y�~���������щ��I�������偝���a���Ɂ��J���O�́��փ��I��o]\|��\_s*��\_s*��\_s*��\|��\_s*�p\|�\_s*�u\|�\\_s*��\_s*��\|�S\_s*��\|�C\_s*��\_s*�C\_s*��\|��\_s*��\|��\_s*�@\|��\_s*��\|��\_s*�\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�]\|��\_s*��\|��\_s*��\|�T\_s*[������]\|��\_s*[���q]\|�f\_s*[����]\|��\_s*[����]\|�H\_s*��\|��\_s*��\|��\_s*�C\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�p\|��\_s*[�q����]\|��\_s*�N\_s*��\|�{\_s*��\_s*��\|��\_s*��\|��\_s*�b\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�K\_s*��\|��\_s*�l\|�\_s*�c\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�o\_s*��\_s*�U\_s*\%(��\|��\_s*��\)\|��\_s*�m\|��\_s*��\|��\_s*�]\|��\_s*�g\|��\_s*��\|��\_s*��\_s*��\_s*�P\|�A\_s*[�z�n]\|��\_s*[�H��]\|�}\_s*��\|��\_s*�F\|�w\_s*�n\_s*�}\|��\_s*��\|�z\_s*[���i�m�q�x]\|��\_s*��\|�c\_s*[�_����]\|��\_s*�O\|�]\_s*�c\_s*[�ꕃ]\|��\_s*[�~�C��]\|��\_s*\%(�c\|��\_s*��\_s*��\|��\_s*�V\_s*�c\)\|��\_s*��\|��\_s*[�����G��]\|��\_s*��\_s*��\|��\_s*�m\_s*��\_s*��\_s*��\_s*��\_s*\.\|�G\_s*[����]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|��\_s*��\_s*�d\_s*�@\|�E\_s*��\|��\_s*�~\|�E\_s*\%(�B\|�[\_s*\%(�Y\|��\_s*��\)\|��\_s*�{\_s*��\_s*�X\)\|�o\_s*��\|�A\_s*\%(��\|�U\_s*�[\|�E\_s*\%([�`�g]\|�^\_s*�[\)\)\|��\_s*�{\_s*�\\_s*�t\_s*�g\_s*�E\_s*�F\_s*�A\|��\_s*\%(��\_s*[�N��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|�_\_s*��\_s*�a\|��\_s*�\_s*��\|��\_s*��\_s*�_\_s*�f\_s*�j\_s*��\_s*��\|�`\_s*��\_s*��\|��\_s*�K\_s*��\|�n\_s*\%([�r�^]\|�q\_s*�d\|\.\_s*�j\_s*\.\|�r\_s*�X\|��\_s*��\_s*�O\|��\_s*��\_s*��\_s*\%(�k\_s*��\_s*��\_s*��\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*�Z\_s*�q\|��\_s*��\|�_\_s*�f\|O\_s*\%([�^�rsS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*�N\_s*��\_s*�[\_s*�i\_s*�[\|C\_s*R\_s*�\\_s*�t\_s*�g\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|��\_s*��\_s*�O\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
-        \ 'p' : '\%([�B�C�@����{�����s�ܕ��ە����y���~�Օҕ�糕ѕ�粛��ؕ����������z����C�U�ߕ[�i������ᢔ��������p�o�����Ǖ�ƔŔ���•������z�u�s�v�t���j�H�g�d���ς������Ղҁ}�{�Ճ��ӄ�����k����D�������E�_�v�|�Łj�i�݁��a�y�p�P�����Ӄ΃sp]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�|�y�v�s�p]\|��\_s*[�ۂ؂Ղ҂�]\|�\_s*�\|��\_s*�l\_s*��\|�\_s*�\|�O\_s*[�I�D]\|�\_s*�\|��\_s*�R\|��\_s*�D\_s*��\|�\_s*�\|��\_s*�`\|��\_s*��\|�\_s*�\|��\_s*�q\|�b\_s*\%(��\|��\_s*�n\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|�r\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�Ž���]\|�V\_s*\%(��\_s*�[\_s*�h\|��\_s*�V\_s*�r\_s*��\)\|�T\_s*\%(�[\_s*��\|�C\_s*\%([�Y�N�P�R]\|��\_s*�V\_s*�r\_s*��\|��\_s*�E\_s*��\|�L\_s*�b\_s*�N\)\)\|+\_s*��\|�z\_s*\%(��\|�X\_s*�Q\_s*��\)\|�q\_s*��\_s*�|\_s*��\|��\_s*\%(�z\|��\_s*�o\)\|�t\_s*\%(��\_s*�W\_s*�A\_s*��\|��\_s*\%(�C\_s*�W\_s*��\_s*�O\|�[\_s*\%(�Y\|�W\_s*��\_s*�O\)\)\|�^\_s*��\_s*�C\_s*��\|�H\_s*\%([�[���m�g]\|�{\_s*�X\|�r\_s*�A\|�X\_s*�t\_s*�@\_s*�[\|�j\_s*�[\)\|�@\_s*\%(�C\|��\_s*�I\|�[\_s*\%([�W�}]\|�~\_s*��\_s*�O\)\|��\_s*\%(�g\_s*��\|�^\_s*�Y\_s*[���}]\)\|��\_s*[�c�X]\|��\_s*�m\_s*�v\_s*�V\_s*�X\)\|�B\_s*\%([����]\|�W\_s*\%(�b\_s*�N\_s*�X\|�J\_s*��\)\|�[\_s*�r\_s*�[\|�b\_s*�V\_s*��\_s*�O\|��\_s*��\_s*��\|��\_s*�f\_s*��\_s*�t\_s*�B\_s*�A\|��\_s*\%([�X�[�A�p]\|�b\_s*[�v�p]\|�s\_s*\%(��\|�[\_s*�k\)\)\)\|�F\_s*\%(�[\_s*\%([�x�Y]\|�W\_s*��\_s*�O\)\|�C\_s*�Y\|��\_s*��\_s*��\|�j\_s*\%(��\|�b\_s*�N\_s*�X\|�L\_s*�A\|�[\_s*��\)\|�m\_s*\%(�L\_s*�V\|�[\_s*��\)\)\)\|�q\_s*��\|��\_s*��\|�^\_s*��\_s*�p\_s*�N\_s*��\|��\_s*��\|��\_s*��\_s*��\|�i\_s*�s\|�Z\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*�`\|��\_s*��\|�^\_s*��\|�o\_s*\%(�g\|�k\_s*�@\|�b\_s*\%(�^\_s*�`\_s*�s\|�X\_s*�W\|��\_s*�f\_s*��\)\|��\_s*��\_s*��\_s*�r\_s*��\_s*��\_s*��\_s*��\_s*��\|�r\_s*�D\|�D\_s*�r\_s*�D\|��\_s*��\_s*�h\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\)\|�i\_s*��\|�J\_s*��\_s*�E\_s*��\|��\_s*��\_s*��\|�d\_s*��\_s*��\|��\_s*��\_s*�^\|�o\_s*�e\_s*��\_s*��\|�\\_s*��\_s*�t\_s*��\|�_\_s*��\|��\_s*��\_s*[���a]\|��\_s*��\|��\_s*��\|P\_s*\%([umdCaor]\|K\_s*��\|D\_s*F\_s*�t\_s*�@\_s*�C\_s*��\|�R\_s*�[\_s*�h\|�^\_s*�C\_s*��\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*�E\_s*S\)\|I\_s*C\_s*�}\_s*�C\_s*�R\_s*��\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*�{\_s*�g\_s*��\|O\_s*S\_s*\%(�V\_s*�X\_s*�e\_s*��\|I\_s*X\|T\_s*��\_s*�\\_s*�b\_s*�h\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\)',
-        \ 'q' : '\%([�z���ɟK�M�z�������՟J��㖍򍥛������I������H���E�d������z�b�o������x�ܗ��A���ϕ��D�C�B��ӊǏ��~�����������B䱌s���Z���Y�㙬��ᯞ���Ӊ��O�M�֌N�Ϗ��v����L�������K�@����{���^���Z�򏾓��^���A�����������鶊r��ňʈ��U�Ñq���𞀋������C�~���X�V�T�R�U�W�S�܉_�w�o�^�������鿌~�G�F䇚����`�p���̏L���Y�������۞����I���Ȋf�s��ގԚ��P�M�����E���u���{�[�O���֞��o�Ӎ����@�󞔐����ȓS�c�������������S�H�q�v�E�|―�Ĝ��v�ꋀ��Ῑ܌J�ɍC����g����틂�{�m�������{���X�؍H�������ᜁ���v�㜜���ҙ��g���电���M�͋��ˋ���������e�g�f�h��P�H�N��q]\|�\_s*�\|�b\_s*�N\|��\_s*��\|��\_s*��\|�\_s*�\|�~\_s*��\|�\_s*��\|��\_s*�S\|�S\_s*[�Z��]\|��\_s*��\_s*�x\|��\_s*��\|��\_s*�h\|9\_s*��\|��\_s*��\|�^\_s*�{\|��\_s*��\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�V\_s*�l\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|�C\_s*��\|��\_s*[�{��]\|��\_s*��\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([�ƕ����E������]\|�o\_s*��\)\|��\_s*��\|��\_s*�C\_s*�a\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�R\_s*��\_s*�q\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�p\_s*��\_s*�`\|��\_s*�s\_s*�N\_s*��\|�`\_s*��\_s*��\_s*��\_s*��\_s*�}\|Q\_s*\%(I\_s*C\|R\_s*�R\_s*�[\_s*�h\|C\_s*�T\_s*�[\_s*�N\_s*��\|U\_s*O\_s*�J\_s*�[\_s*�h\)\|�w\_s*�x\|�R\_s*\%(�[\_s*��\_s*��\|��\_s*�e\_s*�B\_s*�t\_s*�@\_s*�C\_s*�A\)\|��\_s*��\_s*��\|�J\_s*\%(�U\_s*��\|�^\_s*�[\_s*��\|�X\_s*�o\|�[\_s*�k\_s*�[\_s*��\|�i\_s*�[\_s*�g\|�_\_s*�t\_s*�B\|��\_s*�e\|�h\_s*��\_s*�[\_s*[����]\|��\_s*\%(�`\_s*[�G�F]\|�e\_s*\%(�B\_s*�G\|�b\_s*�g\)\)\|��\_s*�^\_s*[���X��]\)\|��\_s*��\|�L\_s*\%(�g\|�u\_s*��\|�z\_s*�[\_s*�e\|�n\_s*�[\_s*�_\|��\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\|�[\_s*��\|�m\_s*��\|�b\_s*�V\_s*��\|��\_s*\%(�[\|�G\_s*��\)\)\)',
-        \ 'r' : '\%([ۛŘӛĚ̉h�_���R�{��]�Ә[�\���U�^�c���R�P�˞u�l�M�C�����L�属�譚N���d�יC�����R������O�c�YᑘL�S�Q�XᔘW�O�U�ĘT�R�N�b�@�F�࢔����G��m�e�d�i�b�I�E炍��䃟L�B��ڟ����׊a���e�U�x�v��Y���Z�Y���������t����X�F�䫗����ᖗ����w�������灟K�M����l�I瀗��q��ずw���Y�����Q�����r���Q���ݗ����@���B���������A��٘H��ḟ�����pᐗ�㾗ۗݗ��Z���~���K�����ಝ��_����×����ɌI���ʙ��Z�C���X����Y�V���g��×ڛ��Pᎊ}�֗���������������������ᅗ��P���X�a�������МH�W�˗����Ԝ���d�h�g�ҙz�ؗϙ�חїӗ՗��W���O���C�����͗����`����鲛�饗��؞���A���x��@�_���]���q�y���p�����֝����H�×�㇗ߗ��Ɨȗ��열�����ɋ��������ʗ̚i���ś�����胗��������������ؗ����ܘ���A��鋗������i����\�ߗ�仂�טJ���ə���V�������O�����g�T�p�R�E�Y㑟S�B�՛ۛn��A��ࣗ��a����茗����������E煚h����඗��p�����y�����q�Q����㡟I���S���ۗ�ᚘ����痋�����엇���t��f�f��逗ǂ炒�E���S�q���G�B���J�H�[�w�x�I�T�`�r�������K�R�|�F�V���O�W�^�X�U�\�Z���D�A���I�Y�z���M�{�P�s�t�}���N�L�v�p�y���u���@�C���]���E�_�����~���D�֍��㗅���X���������Q�σ���r]\|�\_s*[�����]\|�b\_s*[����������]\|��\_s*[������]\|��\_s*��\|��\_s*[�L��]\|�h\_s*[�E�ߎ�]\|6\_s*[����]\|��\_s*��\_s*��\|�E\_s*�G\|��\_s*��\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|�|\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*�P\_s*�[\_s*�u\_s*��\)\|�C\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*�W\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�s\_s*��\_s*�w\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*�k\_s*��\_s*\%(�w\_s*�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|��\_s*��\|�K\_s*��\|�g\_s*��\|�v\_s*��\|��\_s*��\|��\_s*�A\|��\_s*[���M]\|��\_s*��\|��\_s*��\_s*��\|�Q\_s*\%(�l\_s*��\_s*��\|��\_s*�^\)\|�q\_s*\%(�h\_s*�m\_s*�`\|��\_s*�c\|�r\_s*�|\_s*�Q\_s*�R\_s*�Q\_s*�b\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|�@\_s*�\\_s*��\_s*��\_s*�P\_s*��\|��\_s*�A\_s*�I\|�F\_s*��\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*��\_s*�[\_s*�_\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*��\_s*��\|T\_s*U\_s*R\_s*N\_s*�L\_s*�[\|A\_s*D\_s*M\_s*E\)\)\|��\_s*�K\_s*�\\_s*��\|�A\_s*�[\_s*��\)',
-        \ 's' : '\%([��������}�[��T���y���}����Q��^�����������ǚ��i�����h��掞��y�{�G�O�ʗ��c���������������������ԛ��z��y��u�������߈��S�^���䛣�᜹�K�U���|���\�����}���a������x�����‘���ƜQ�sढ़w��柔�锚t���䇛q���~�H�x�����y�ܑ�䵑q�ȑ����B���J�v�t�������Ƒ��N����ⵑ��r�������|��s�w���p�n�m���y����絒F�\�n�u�L�M�������������N�d�Ƒ[��ꋑj�f�b�`�a���^��𕛑l�X�����􉈑c�Y���iઈ�g�לh�e�e�s�S����z������N�Z��驋��L�L���Q�k�ş��G���i����ↁ��ސِېڐߞ���@���������C��G�����S���ПƝ�[�T���אɐ͊֐Ȑǝ��A������I⣛p蔞��t����d�C�N���ӟ׈��ߛݙ���ܘ��x������㙘��A�����_�b����a���J������ஓϛ��Ƙj�b�H��ⳙA�G�S���L⒑W�s�r葁�������D�J���A�L��񙒐�枙@�ې�M���H����l�F�K���D�G�@�B��h���ǑN�������d�D���������牙��|�œҝ�ᝩ��⫟Ŗ�����������v�R呝y�H���������Ր������U���}�������[���������҂���ߝ�p�S爊��c���a���o�p���I�D�c�����E�R��䊔��T�����ωs��ꈝ��ؐ�������C�S��h�ᓩ�����]�T�\�����~�����u�y�����������齗V�������Œ��������s����v�ǐ��E���p�z����~�d���Ǘ�俑��Y�p�n���z�y��羝�裐���Ð������␕�΁�ʁ܁́�������ˁ��~�Ɂ���ځށ}��ȁ����́��݁��聹�后�����v袝x���������ž�谒N�ː��X���a�V���䐆����H�����������������ґ����]�Z������ʗ��������������������L�z�`��D�ߝX���z�i���擧�����A�B������P������D���Y�����`���L�������Z��迓��x���Z�x����w��圑����ȓ������G���F�a�Ǝb��乗��M�E�Ε��s�C�F���Z���n�����D�㈵㦋s�����]��Ŗl�^⚑�����A潓��g���Ζ�儞������ɖΏd����臐w�p����d�����[��g�����謎�姎��^���G�������N���H���˒��Ύ��܊m��������������\�ސːK�Ž��������K���o���q�҉����t�������ϔ����͚��͎��b�A�j���P�֎ٌ����ࡐ̝�咙��ݐ���┐Ԏ��^�Ύގڎ؎����Y�ώΎɎԎߎЈޝ��ȕi�S�G���CဋÎ����f�t偛W���V�z��������题����瑲���E�������f��������i�g�l�k�{�������蜕��婏o�F�����T��碏V�h�q���h�k�����F�J娏Q�K�����榊��S����酝��n�����������S�X�K�U��ڏM�G�j���a�E�N�����O�D�P�C�A�L�R�T�I���B�@���M�����᭚�����忏w�{�v�x�s�⡏t�u�r�f�����Z���u���Vꐚp�y���曐P�]�A���Ϝ����U�j�J��������f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�h�N�f�d��C�k���X���ĐL���T�Q�W�g�i�[�R�M�e�b�I�_�S���΋n�Z�����o䜏���_�י|���䓏��w�����b��򏎏����������ҟ����m䀛���u�L���Џ�������縐��מ�⪙ד��M�����v���R�����ߜ��c����B�_�џn���Տʈ䐯�����B辑����[����頏��[��␏ݚ����K♏����яҁ������u���i�]��疏ցj�i�Ӑ��Ԛ������Ϗ��U���J���n���ސ��Ŝ܏��ߏ�������ُ����Տ��G����������ଞ������ďޏ������������͏Ǐ����ɏ������������Џ��ۏ�暐��Ώ��̏ďƏ����͏ڏ����؏ɏ��ȏ������T�l������R�e�g�����p�@�C�ܑ��F�������D�I����冐B�������A�H�E❎o�o�w���v�����L���U�����������������n�юr���Ŏᎊ�t�r�@�����{���펦���Ϛ`���������i�Аy�э��i�@�����E����J�X拎}�泟���n���y�o�N�Z�y�z���ٛᝅ�f�׎��j�{��~����|���{�o���ߘ��I�X�B�]�K�������V�g���u�������p�`����i���k���q�l��藘ʛ�Ɠ��j��⏎s���_ꏎ���˔`���Œs��y�@���؎���䢊�o�u�e����ۚ~��礛��J�L��f�V�W�l�����Ȑ���������䰐囋�T��ᰗ����l�I�J���M����h���E�U�嶎��z�\�G�Ԟ��u���V���\���V���f�֟��X�M�ˍ��Ǐ�x���š�����皔��m��匈��^��꛽�O��@���՚N�����\�󎘊j���ې����ŒB睓N�@�d�q�b���P�m���b�q���嗝�W�����Ɣ��f���F��ⲝH�H�B�r���{�吷�W�vᵔu�t�ĉh�|�招��E�䋫�🛋t����剎������櫜��f�|��sट��E�a�`��㓝����������̜c���H�K�c�ߙӎ[�ǎW�Xㄐ��V�����������r�\�]�Z�P�R�Ӂ���3�Q�^O�R�U�S�Y�_�A�T�C�D�搔�@�F���D�N���Z����\�؛�������ԟ����˜�����G�Ɲ��r�ӎÎE�q�������淍K�ȍ���͙Pꎍ��`�B�ڛv�ɍ��V�ҍۍЍю��΍؍̍Ӎȍ֐čՍÍˍ��ҍٍ΍ō鑨�r��Şo焍��e�⩞��y���|�s�����k����w�����N���������������ʎh�S䳍�}�l�э��o���s�⍳�r���ԍ��đ����獸��������R���A��������m嬛O���������ÝL����������������������_�~��n�K�ዎ������������^�d�w�����@�����Y�����Y���ご�򄋄Z�Y�����������������Á������W�n�ŽO���y�ʁ��������`��f�e�����W�_�T�������Z�T�V�\�X�����R�Еbs]\|�\_s*[�����]\|�b\_s*[�\�Z�X�V�T]\|��\_s*[����������]\|�\_s*��\|�\\_s*\%(�H\|�I\_s*��\)\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�g\|��\_s*��\|�v\_s*[�v�X]\|��\_s*�n\|�\_s*��\|��\_s*�c\|��\_s*��\|�B\_s*[�B�X]\|��\_s*�C\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[�ĘU]\|�C\_s*��\|�\_s*��\|�}\_s*��\|�T\_s*��\|�G\_s*�Y\|�f\_s*��\|�V\_s*[�c��]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*�\|�\_s*��\|�b\_s*\%(�^\|��\_s*��\)\|�V\_s*��\|�]\_s*��\|��\_s*��\|�s\_s*[�m�E]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*�_\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|��\_s*[�J��]\|�]\_s*[�X�]]\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�֌��ڎu]\|��\_s*��\)\|7\_s*��\|�V\_s*��\|4\_s*��\|�S\_s*[����]\|�R\_s*�{\|�h\_s*�t\|��\_s*�u\|��\_s*��\|�A\_s*[�o��]\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|��\_s*��\|�c\_s*�e\|��\_s*��\|��\_s*\%(�_\|�C\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*[�Η�]\|�\_s*�\|�\_s*��\|��\_s*��\|�e\_s*��\_s*��\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*�X\|�^\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*�K\|�|\_s*[�“���]\|��\_s*�p\_s*��\|�G\_s*��\|��\_s*��\|��\_s*��\_s*\%(�X\_s*[�N��]\|��\_s*[�N��]\)\|�h\_s*�l\|�S\_s*��\_s*�g\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�e\|��\_s*��\|��\_s*\%(�@\|��\_s*��\_s*��\)\|��\_s*��\|�G\_s*��\|�\_s*�q\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|��\_s*[�T��]\|B\_s*\%(r\|�V\_s*�F\_s*��\)\|�g\_s*��\_s*�q\|��\_s*��\|�u\_s*��\|�A\_s*��\_s*�`\_s*��\_s*��\|�\\_s*��\_s*��\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|��\_s*\%(�V\|�s\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|�]\_s*�f\|�P\_s*�C\_s*�f\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�w\_s*��\|�l\_s*�b\_s*�g\_s*�T\_s*�[\_s*�r\_s*�X\|�U\_s*\%(�b\_s*�N\|�N\_s*�Z\_s*��\|�r\_s*�[\_s*�l\|�E\_s*�o\_s*�[\|��\_s*�[\_s*�N\_s*��\_s*�E\_s*�g\|��\_s*�U\|��\_s*�c\|�C\_s*\%([����]\|��\_s*�[\|�f\_s*��\)\|�[\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\|�[\_s*�~\|�i\_s*�g\_s*��\_s*�E\_s*��\|�]\_s*\%(��\|��\_s*�f\|�[\_s*\%(��\|��\_s*��\_s*�Q\_s*��\)\|�t\_s*�B\_s*�[\)\|�W\_s*\%(��\|�[\_s*\%([�O�N]\|��\_s*��\_s*[�X�Y]\)\|�O\_s*��\_s*��\_s*�g\|��\_s*\%(��\_s*��\|�O\_s*�V\_s*��\_s*�s\_s*�[\_s*��\|�e\_s*�[\_s*�[\)\)\|�r\_s*\%([�Ȏ�]\|�T\_s*�C\_s*�Y\|�r\_s*�T\_s*�C\_s*�Y\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|�t\_s*�m\|��\_s*\%(��\|��\_s*��\_s*��\_s*�`\_s*��\_s*��\_s*��\_s*��\)\|�h\_s*�b\_s*�o\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|�|\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�n\_s*�m\_s*�x\_s* \_s*�m\_s*�d\_s*�v\_s*�r\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*�u\)\|�G\_s*�X\|S\_s*\%([nrgmce��]\|G\_s*M\_s*L\|�T\_s*�C\_s*�Y\|S\_s*�T\_s*�C\_s*�Y\|F\_s*�}\_s*�K\_s*�W\_s*��\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(�v\_s*��\_s*�C\|�N\_s*��\_s*�u\)\|P\_s*\%(��\_s*�R\_s*�[\_s*�h\|A\_s*C\_s*E\_s*�L\_s*�[\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*�L\_s*�[\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\|��\_s*��\)',
-        \ 't' : '\%([Ĝ������R��牉ș��h���Ќ���☝��ω����i���מR���h�����|�������������������c���H����֓�騗���䄋�㜐C䃕����ۏQ榔y�����F�b����r�\����c�����͙��ʓՓך��c�����J������ٓؓڏx�J���Ś�ɍΖ����r���q�N���P�ь{�ԍǝ��ؗ�沖L௜{�ꂜՓ��“��Γ������W�ٟX�B�[�����ѓ�������w�䓄���������~��㫙ٚ���Ċ���U�j����㉱�}�b�馝��F�D����㛎���衞��Cẞ�T�Λ�⅞��M�D�����ğ�椈ꊛ�됀�z�c�����b�u�����ٓ��幓������������������铝�������~����鍓��������򓀓��������������˓t���O�O�̓��m��N�l�ےE�j�q�Ě��\�Z�g�\�莾���p�y�o�o�V�v���Ϗ\�p�{�n�l�n���Z���Ên�򖁞��i���^�y���r䷟��ː}�~�ēe��x�h�u�����r�l�W�P�Ȏ������W�����d�͖����o�R瘉���NནL���J�U��猓H�z���ћ�迟h�A�V�V�z�D�������C�U�A�����d�F�D�x�[���^�៓U�z���a�Z�W�L⽓Y�Q�I�N�G�P���O�c�S������L��ǒ��t�ɞq�ؚ��|��Y�B�h������������@���������稒����ఒ����A���e����ƜV��•��͕��皁�I���������T�P��ז��g�w�ΐى����W�h��іʏ`�t�I�␎���a�S���ڎB�ڐR����ȕ�p�A�n䆉��җ��I�~����焍ߑ��c�z�ߝ����旾���񕌋u���i�����d�͌��g����Q�ǒٚ�؍j�q��塔|�ȕ�ȓ`�B�\�����Չ���㔖�ꉌۑ����ԔԒ̒��v����׏I�Đ��ȒŒǛ��錼�ə��ݙ������������֒ߘ��r�s�s�n���U�T�ӑn�쑢���L���U�����Ό���C���U�֋ސT�Ĝ������ɏՔ��ːs�x���A���t�����y�Õ��Z㋓���ᶌp�k���l�ϐڒʍ��A����h�ՍJ����������Y�_���������Z�o�T���S���N���Ē������������N���Z��������m�֖����’������ޒ}�z���k���e玐��ŗ͓�ߝQ��E�������浖מ`�k�I⌒��O���Ւ����������P蠒����e���Ò�����隓C��U�ǒ����ݟ������l����L�y�’��kꓜ����j���L�K�ӝ���U�o�������{�⒳���\�_���񒝓����[�������������d���������������}���ޒ�����������渒������������x�a�Q�C�N�����I�Ԓ��J�n�����h���f���R�h�t���������n�p�o�m�~�n���@�������������ؒ��������r���p�U�T�u�Ռ��l���h�⚐�tꃒy�ƒw���o�n��v���qᗒv�������k�s��m�x����J�}���֓}�Ԑu���g�q�K���f�e�މ˞���M�o���R�ВLᷖ�非ٌ✔�����y�g栟����˘����l�|�]��漒K�^�ȏ̎]�D���M骓l�D����e�Ȓ@�i�h�g��Ⰽk�X�Y�S��ݛ̝E�Y�U�ԕۏ��X�I���H��蒎a����F�C�{�����}����C�J���F�מ��l��S�s韞����퓃��������ࣕY�ۈɐ���������Ғ����k�B���z�n�Ҋm�����������t�ԚK���p���ЋB�����ŗY����k���˜[�]����썰�͗����K�’e���ʖd休��s�b��饕����|�c�G�鎿�B�ٍ��k���e�d��뛹��k殔C�ĉF���b�W�V�O�������x�h�^���В|⹑��������t�M�闲�F�����������֜Ӝ`�d�H�[�t���؜��T�j�ݝ^���W�h�]������ßp�~���K�����ϓ̝����W�������`�^W�UႚV�J�Rἔ�C�V�Q�a�_�\杒O�S�X�W�Y�b�Z�d�ÒT�P�A�p�]�����鮓F���ѝF�U���V�f�{�������I����痑��~�x�����擑���H�\讖w�����ʝ���[���O���l���ߑړ����ܒ��Б⛔�E�ܑՑ͑����ۑґؑ��ݑ���ّё̑בޑ�΋��H���f��茘ǒ����������֚ꑫ�����—���]�l���o���N�O�ϗ��┭�蛀�S�����u�����N���ЍٚB�_�������P�c�B睘��S�����W���`�V���~�^�Γy���s�f������E������\��؃X�W�����ƃU���c�N�]�����������g�`�E�c���[�^�S�������������������ф����������e����������t]\|�\_s*[�����]\|�b\_s*[�g�e�c�`�^]\|��\_s*[�ƂÂ���]\|�\_s*��\|��\_s*�n\_s*��\|��\_s*[���]\|�\_s*�\|��\_s*�l\|��\_s*��\|��\_s*�V\|��\_s*��\|�i\_s*[���v]\|��\_s*�P\|�h\_s*��\|��\_s*��\|�D\_s*��\_s*��\|��\_s*[�Ŗ�]\|��\_s*[�q��]\|�W\_s*��\|��\_s*��\_s*�E\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�x\|�G\_s*[�ߓ��h]\|��\_s*[����]\|�F\_s*�N\_s*��\|�i\_s*[�v�q]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|��\_s*��\|��\_s*�j\|��\_s*�j\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*��\|��\_s*��\|�g\_s*��\|�Z\_s*��\|�Q\_s*�~\_s*�S\|��\_s*\%(��\|��\_s*�q\)\|�S\_s*[���Z]\|��\_s*\%(��\|��\_s*�a\)\|�X\_s*��\|��\_s*�X\|�\_s*�J\|��\_s*�~\|�~\_s*�J\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(��\|0\_s*��\)\|�P\_s*\%(��\|�O\_s*��\)\|��\_s*��\|��\_s*�l\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(�v\|��\_s*�F\)\|�g\_s*��\|��\_s*��\|�`\_s*��\|��\_s*�w\|��\_s*\%(�V\_s*��\|��\_s*�F\)\|��\_s*\%([��]\|�[\_s*��\|��\_s*��\_s*�N\)\|��\_s*�v\|�r\_s*�q\|��\_s*�r\_s*�q\|��\_s*[�a��]\|��\_s*��\|��\_s*��\|�@\_s*��\_s*��\|�L\_s*�q\|�S\_s*��\|��\_s*��\|�]\_s*�h\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|�G\_s*��\|�u\_s*[�˔�]\|�k\_s*�J\|��\_s*�\|��\_s*�I\_s*�q\|��\_s*�a\|��\_s*�p\|��\_s*[����]\|�A\_s*��\|��\_s*��\_s*�\|��\_s*[���]\|��\_s*��\_s*�\\|��\_s*\%(�\\_s*��\|�A\_s*��\_s*[����]\)\|�t\_s*\%(��\|�{\_s*�V\)\|�h\_s*��\|�e\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*�s\|��\_s*\%(�[\|��\_s*�q\)\|��\_s*�v\|��\_s*��\|�P\_s*��\|��\_s*��\|��\_s*\%(��\|�\_s*��\)\|�E\_s*��\|��\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�s\_s*��\|��\_s*��\|�E\_s*�w\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|�\\_s*[���V]\|�w\_s*��\|�\_s*��\|�i\_s*�K\|��\_s*��\_s*�p\|��\_s*�B\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|�f\_s*�B\_s*�X\|�R\_s*��\_s*��\|�\_s*�l\|�\\_s*\%(�[\_s*[�g���v]\|��\_s*�[\)\|�w\_s*�[\_s*�O\|�[\_s*[�C�����A]\|�Z\_s*\%(�I\|��\_s*�}\|��\_s*\%(��\|�j\_s*�A\_s*�X\)\|��\_s*�s\_s*\%(�[\|�X\_s*�g\)\)\|�V\_s*\%(��\|�b\_s*�N\|�X\_s*��\|�A\_s*�^\_s*�[\|�\\_s*�[\_s*��\_s*�X\|�I\_s*�h\_s*�A\|�[\_s*[�t�^]\)\|�T\_s*\%([�C��]\|�~\_s*��\_s*�O\|�E\_s*�U\_s*��\_s*�h\|��\_s*�u\_s*��\_s*�b\_s*�h\|�[\_s*\%([�h��]\|�e\_s*�B\|�X\_s*�g\_s*��\|�Y\_s*�f\_s*[�C�[�B]\|�}\_s*��\)\|�b\_s*�`\_s*��\_s*�[\|��\_s*\%(�N\|�_\_s*�[\|�L\_s*��\_s*�[\)\|��\_s*�h\_s*�}\_s*�C\_s*�h\)\|�|\_s*��\_s*�y\_s*�v\_s*�`\_s*�h\|�O\_s*\%(�a\_s*�y\|�A\_s*��\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*��\_s*��\|�p\_s*��\|�s\_s*\%([����]\|��\_s*�E\|�j\_s*�W\_s*�O\|�]\_s*�[\_s*��\|�o\_s*�b\_s*�N\|�V\_s*��\_s*�c\|�u\_s*\%(�j\_s*��\_s*�[\_s*�X\|�Q\_s*�[\_s*��\|�h\_s*��\_s*�}\|�A\_s*�j\_s*��\)\|�b\_s*�o\_s*�^\_s*�h\_s*�o\|��\_s*��\|��\_s*��\_s*��\_s*�s\_s*��\_s*��\_s*��\|E\_s*�w\|��\_s*[�w��]\)\|T\_s*\%([bc��mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|�]\_s*�[\_s*��\|X\_s*T\_s*�t\_s*�@\_s*�C\_s*��\|�V\_s*��\_s*�c\|�o\_s*�b\_s*�N\|V\_s*\%(�j\_s*��\_s*�[\_s*�X\|�Q\_s*�[\_s*��\|�h\_s*��\_s*�}\|��\_s*�j\_s*�^\|�A\_s*�j\_s*��\|�V\_s*��\_s*�b\_s*�s\_s*��\_s*�O\)\|C\_s*P\|�R\_s*�[\_s*�h\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*�L\_s*�[\)\|E\_s*L\)\|�d\_s*\%([���b]\|�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\)',
-        \ 'u' : '\%([��y����h�������f�[�l�e���񓴑a�؈����Ϗ��鎽�[�X���D�W�r䷙\��w���u���ќ��z���D鴑��ߚX�����i���^���R�忓��L�M�f��~���ӏ��r戉�楓]��揗w搉S�^�̗��É��򃑂��k�։\�u�����L�G�Q�m���P�O���H⣑��Q�m�����I��V�ߊ��a�������X�S�n�|�o�J���U�󎜚y�팻���ʉf�ژ��ⓐx���ԋ����ʏ��ϙ���܉��A�]りC���D�]��^�@����T�A��������m����S���Y�v�_�������Z�r����N�������T���T�ݗ��Ɠ��Z�J���j���J�ʼnF���A���L�n�ћa���L�ǎ�䥟������H�ӉE������Z���p�Q�G�����ˌ����̉K������Ꚗo�e���Y�^�I�������N�����҃EU���T��u]\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|�y\_s*��\|��\_s*�y\_s*[����]\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�`\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|�C\_s*�M\_s*��\_s*�X\|�I\_s*�}\_s*��\|��\_s*��\_s*�s\_s*�\\|��\_s*\%(�p\_s*��\|�L\_s*��\)\|�A\_s*\%([�X��]\|�O\_s*��\_s*�[\|�[\_s*\%(�V\_s*��\_s*��\|�W\_s*�F\_s*��\_s*�g\|�o\_s*��\)\|��\_s*�e\_s*�B\_s*��\_s*�b\_s*�g\|�|\_s*��\|�b\_s*\%(�v\|�p\_s*�[\|�V\_s*��\_s*�[\)\)\|�P\_s*\%(��\|��\_s*��\)\|�t\_s*\%(�{\_s*�[\_s*�g\|�^\_s*�[\_s*��\|�l\_s*�b\_s*�N\|�m\_s*�h\_s*�w\_s*\%(�t\_s*�F\_s*�A\_s*�[\|�}\_s*�K\_s*�W\_s*��\)\)\|��\_s*\%([�^�j�[]\|�g\_s*\%(��\_s*��\|��\_s*�q\_s*�g\)\|��\_s*\%(�A\|�V\_s*�[\_s*�Y\)\|�v\_s*�V\_s*��\_s*��\|�l\_s*�X\_s*�R\|�i\_s*\%(�J\_s*�C\_s*�g\|�C\_s*�e\_s*�b\_s*�h\)\|�r\_s*�L\_s*\%(�^\_s*�X\|�m\_s*��\)\)\)',
-        \ 'v' : '\%([���F���l�۔ńB�r���Ƀ�v]\|�\_s*�\_s*�\|�b\_s*��\|��\_s*��\|�\_s*�\|�`\_s*�F\_s*��\|��\_s*�^\| \_s*�r\_s*�N\_s*�g\_s*�[\_s*��\|��\_s*�o\|��\_s*�z\|�j\_s*�X\|��\_s*��\|�P\_s*�^\|��\_s*\%(�f\_s*�B\_s*��\|�M\_s*�i\|�j\_s*�X\|�Z\_s*��\_s*��\|�N\_s*�`\_s*��\|��\_s*�L\_s*��\_s*�[\_s*��\|��\_s*��\_s*�[\|�[\_s*�j\_s*��\)\|�u\_s*\%(��\|�]\_s*�[\_s*��\|�T\_s*�C\_s*��\|�l\_s*�b\_s*�N\|�S\_s*�[\_s*��\|�V\_s*�l\|��\_s*�[\_s*�O\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*�b\|�{\_s*\%(�X\_s*�g\_s*�[\_s*�N\|��\_s*�S\_s*��\|��\_s*\%([�K�{�g�^]\|�e\_s*\%(�b\_s*�N\_s*�X\|�[\_s*[�W��]\)\)\|��\_s*��\_s*�[\_s*��\|��\_s*��\_s*\%(�`\|�e\_s*�B\_s*�A\|�^\_s*��\_s*�[\)\|��\_s*�[\|�R\_s*�[\_s*�_\|�[\_s*\%([���g�O]\|��\_s*�g\|�h\_s*�r\_s*\%(��\|��\_s*�A\_s*��\)\|�p\_s*��\|�_\_s*�t\_s*�H\_s*��\|�J\_s*\%(��\|��\_s*�X\_s*�g\)\)\|�L\_s*��\_s*�u\_s*��\_s*��\|�C\_s*\%([�h�X]\|�W\_s*��\_s*�[\|�V\_s*��\_s*�O\)\)\|�w\_s*�b\_s*�g\|��\_s*��\_s*��\|��\_s*��\|�t\_s*\%(�@\_s*\%(��\|�h\_s*�[\_s*�c\)\|�H\_s*\%(��\|��\_s*\%(�N\|�J\_s*�[\)\)\|�F\_s*��\_s*��\_s*�[\_s*��\)\|�E\_s*\%(��\_s*\%(�f\_s*�B\_s*�~\_s*�[\_s*��\|�W\_s*\%(�~\_s*�[\_s*��\|�[\_s*�~\_s*��\|�I\_s*�X\_s*�g\_s*\%(�N\|�b\_s*�N\)\)\)\|�B\_s*\%(��\_s*�i\|��\_s*�X\)\|�H\_s*�b\_s*�J\|�C\_s*\%(��\_s*�X\|��\_s*�i\_s*�[\)\|�F\_s*\%(��\_s*�M\_s*��\_s*�E\_s*�X\|�k\_s*�X\)\)\|�r\_s*\%([�A���u�o�X�U]\|�K\_s*�[\|�n\_s*�[\_s*��\|�^\_s*�~\_s*��\|��\_s*\%(�b\_s*�W\|��\_s*�C\)\|�r\_s*\%(�A\_s*��\|�b\_s*�h\)\|�b\_s*\%(�N\|�L\_s*�[\)\|�Z\_s*��\_s*�e\|�N\_s*\%(�^\_s*�[\|�g\_s*\%(��\|��\_s*[�[�A]\)\)\|�V\_s*\%(��\_s*�X\|�\\_s*��\_s*�[\_s*�Y\)\|��\_s*\%([�`�X]\|�\\_s*��\|�e\_s*�[\_s*�W\|�Z\_s*��\_s*�g\)\|�l\_s*\%(�K\_s*�[\|�O\_s*��\_s*�b\_s*�g\)\|�j\_s*\%([�[��]\|��\_s*�f\_s*��\)\|��\_s*�[\|�G\_s*��\_s*�`\_s*��\_s*��\|�W\_s*\%(��\|�b\_s*�g\|�^\_s*�[\|��\_s*\%(��\|�i\_s*��\_s*�[\)\|��\_s*�A\_s*\%(��\|��\_s*�C\_s*\%(�Y\|�[\_s*�[\_s*�V\_s*��\_s*��\)\)\)\|�_\_s*��\|�f\_s*�I\|��\_s*\%(�S\|�k\_s*�[\_s*�u\)\|�I\_s*��\|��\_s*�W\_s*�A\_s*��\|�B\_s*�[\_s*�i\_s*�X\|�[\_s*\%(�{\|��\_s*�X\|�N\_s*��\|�i\_s*�X\)\)\|�x\_s*\%([�K����]\|�g\_s*�i\_s*��\|�C\_s*�_\_s*�[\|�[\_s*\%(��\|�_\_s*�[\)\|�e\_s*��\_s*��\|�b\_s*�Z\_s*��\|�X\_s*\%([�g�^�p]\|�r\_s*�I\)\|�N\_s*\%(�^\|�g\_s*��\)\|�W\_s*�^\_s*\%(�u\_s*��\|��\_s*�A\_s*��\)\|��\_s*\%([�B�[]\|�t\_s*�@\_s*�C\|�T\_s*�C\_s*��\)\|��\_s*\%(�i\|�V\_s*�e\_s*�B\|�[\_s*�i\|�j\_s*[�J�N]\)\|��\_s*\%(�f\|�x\_s*�b\_s*�g\|�_\_s*��\|��\_s*�[\_s*�k\|�T\_s*\%(�[\_s*�`\|�C\_s*��\)\|��\_s*�b\_s*�g\)\|�m\_s*��\|�j\_s*[�X���A]\|�l\_s*\%(�V\_s*��\_s*��\|�c\_s*�B\_s*�A\|�`\_s*�A\|�Y\_s*�G\_s*��\)\)\|�o\_s*\%([����]\|�C\_s*\%([�A�u���I]\|�p\_s*�[\|�^\_s*\%(��\|��\_s*�e\_s*�B\)\|�L\_s*��\_s*�O\|�U\_s*�[\|�V\_s*��\)\|�b\_s*�g\|�`\_s*�J\_s*��\|�M\_s*�i\|�K\_s*�{\_s*��\_s*�h\|��\_s*\%(�i\_s*�V\|�G\_s*�e\_s*�B\)\|�T\_s*��\|�X\_s*\%(�R\|�P\_s*�X\)\|�J\_s*��\_s*�X\|�P\_s*�[\_s*�V\_s*��\_s*��\|�L\_s*��\_s*�[\_s*��\|�E\_s*�`\_s*��\_s*�[\|��\_s*\%(��\|�G\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�[\|�A\_s*\%(�u\_s*��\|��\_s*�g\)\|�b\_s*�h\|�f\_s*�[\_s*�V\_s*��\_s*��\)\|�k\_s*�A\_s*�c\|�j\_s*\%(��\|�[\_s*��\)\|��\_s*\%([���[]\|��\_s*��\|��\_s*�[\|��\_s*\%(�V\_s*�A\|�`\_s*�m\|�^\_s*�C\_s*��\)\)\|�[\_s*\%([�S�O]\|�`\_s*��\_s*��\|��\_s*�g\_s*�D\_s*�[\_s*�h\|�o\_s*��\|�{\_s*�X\|�x\_s*�i\|�e\_s*�B\_s*�J\_s*��\|�T\_s*�X\|�W\_s*\%(��\|�j\_s*�A\|��\_s*��\)\|�m\_s*��\|�j\_s*�A\|��\_s*��\_s*�g\|�~\_s*\%(��\_s*�I\_s*��\|�L\_s*��\_s*��\_s*�C\_s*�g\)\)\|�i\_s*\%(�L\_s*��\_s*��\_s*�[\|�W\_s*�E\_s*��\)\)\|�u\_s*\%(�C\|��\_s*\%(�h\|�b\_s*�h\)\|�[\_s*�h\_s*�D\_s*�[\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|�]\_s*�[\_s*��\|�T\_s*�C\_s*��\|�l\_s*�b\_s*�N\|�S\_s*�[\_s*��\|J\_s*E\_s*-\_s*��\|�V\_s*�l\|��\_s*�[\_s*�O\|I\_s*S\_s*A\_s*�J\_s*�[\_s*�h\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\)',
-        \ 'w' : '\%([��������������ɒj�����Y��y����h�����ȃ҃��f�[�l�e���񓴑a�؈������鎽�[�X���D�W䷙\��w���u�ќ��z���D鴑��ߚX�����i���^���R�忓��L�M�f��~���ӏ��r戉�楓]��揗w搉S�^�̗��É��򃑂�k�։\�u�����L�G�Q�m���P�O���H⣑��Q�m�����I��V�ߊ��a�������X�S�n�|�o�J���U�󎜚y�팻���ʉf�ژ��ⓐx���ԋ����ʏ��ϙ�����A�]゜��D�]��^�@����T�A��������m����U�S���Y�v���������Z�r����N�������T���T�ݗ��Ɠ��Z�J���j���J�ʼnF���A���L�n�ћa���L�ǎ�䥟������ӉE������Z���p�Q�G�����ˌ����̉K������Ꚗo�e���Y�^�I����������܉������c��㘟|���͊��Ϗp���ԉЍЋƋZ�����ǁ������k�Y���e�o���n���m�܏Νt������s����f�����^�]�o�_�r�q�p�c���i���q��ǘj�n�Ȏ��F�G�d�̘e���Θc�Q�C崙N���Z��Д����ʒt�ሽ�g�f�h�a�Œ�f�Z�N��O�֔j���c���l��H���`���b�̔i�킗�����Ȕg�E��w]\|�\_s*[�������]\|�b\_s*[�����E����]\|��\_s*[������]\|��\_s*��\_s*�~\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|�y\_s*��\|��\_s*�y\_s*[����]\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|��\_s*��\|�o\_s*�D\|��\_s*�Y\_s*��\|��\_s*��\|�i\_s*��\_s*�j\|(\_s*��\_s*)\|��\_s*[����]\|�R\_s*��\|�Y\_s*�z\|�x\_s*��\|Y\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|�x\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�R��]\|��\_s*��\|�a\_s*�t\|��\_s*��\_s*��\_s*�D\_s*�\|��\_s*\%(�`\|��\_s*�m\_s*��\_s*��\)\|�^\_s*�B\_s*��\_s*�D\|��\_s*\%(��\_s*��\_s*��\_s*�E\_s*��\_s*��\|��\_s*��\_s*��\_s*�E\_s*��\_s*��\)\|�u\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|��\_s*��\_s*�O\|��\_s*\%(��\|�C\_s*�X\|�b\_s*�J\_s*�[\|�X\_s*\%(��\_s*�[\|��\_s*��\_s*�O\)\)\|��\_s*\%(�[\_s*�X\|��\_s*�N\_s*��\|�X\_s*�g\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(�b\_s*\%([�v�p]\|�s\_s*��\_s*�O\)\|�C\_s*\%([�^�g]\|�e\_s*�B\_s*��\_s*�O\)\)\|�{\_s*��\_s*�t\|�t\_s*\%([���[]\|�@\_s*�C\_s*��\|�B\_s*\%(�[\_s*�g\|�b\_s*�`\)\)\|�z\_s*\%(�G\_s*[�C�[�A]\|�[\_s*��\|�C\_s*\%(�[\_s*\%(��\|��\_s*�[\)\|�b\_s*\%(�v\|�X\_s*��\|�p\_s*�[\|�g\_s*\%(�j\_s*�[\|�}\_s*��\)\)\)\|��\_s*\%(�C\|�b\_s*[�g�c]\)\)\|�x\_s*��\_s*�i\_s*�[\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(�u\_s*��\_s*�E\_s*�U\|�}\_s*�K\_s*�W\_s*��\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(�y\_s*�[\_s*�W\|��\_s*�W\_s*�I\|�R\_s*�~\_s*�b\_s*�N\|�T\_s*\%(�C\_s*�g\|�[\_s*\%(�o\|�r\_s*�X\)\)\|�h\_s*��\_s*�}\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*�t\_s*�@\_s*�C\_s*��\)\|�x\_s*��\|�v\_s*\%(�t\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|�o\_s*��\_s*�^\_s*�[\|��\_s*\%(��\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|�H\_s*��\_s*�t\|�B\_s*\%([�[��]\|��\_s*\%(��\|�w\_s*��\_s*��\)\)\|�F\_s*\%(��\_s*�_\_s*�[\_s*�X\|��\_s*�i\_s*�[\|�[\_s*�o\_s*�[\|�C\_s*��\)\|�@\_s*\%(�C\_s*[���X]\|�[\_s*�O\_s*�i\_s*�[\|��\_s*�_\|��\_s*\%(�^\_s*�[\|�L\_s*��\_s*�[\_s*��\)\)\)\|�_\_s*�u\_s*��\_s*��\_s*�[\|�^\_s*��\_s*�O\_s*�X\_s*�e\_s*��\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-        \ 'x' : '\%([��H����F����D����B����@�������V���~��x]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�V\_s*��\_s*\%(�z\_s*��\|�t\_s*�H\_s*��\)\|�w\_s*\%([����]\|�f\_s*[�C�[]\|��\_s*��\_s*��\_s*��\|�r\_s*�T\_s*�C\_s*�Y\|�k\_s*\%(��\_s*��\_s*��\|�T\_s*�C\_s*�Y\)\|�E\_s*�B\_s*��\_s*�h\_s*�E\|�[\_s*��\)\|X\_s*\%([����]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|�f\_s*[�C�[]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*�T\_s*�C\_s*�Y\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|�T\_s*�C\_s*�Y\)\|e\_s*n\_s*o\_s*n\)\|�W\_s*�I\_s*��\|�[\_s*\%(�r\_s*�E\_s*�X\|��\_s*\%(�b\_s*�N\_s*�X\|�O\_s*��\_s*�t\_s*�B\)\)\|�n\_s*�r\_s*�G\_s*��\|�U\_s*\%(��\|�r\_s*�G\_s*��\)\|�L\_s*\%(�V\_s*\%(��\|��\_s*��\|��\_s*�g\_s*�[\_s*��\)\|�Z\_s*�m\_s*��\|�T\_s*��\_s*\%(�`\_s*��\|�^\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|�N\_s*\%(�V\_s*�[\|��\_s*�X\_s*�|\_s*�X\_s*�g\|�Z\_s*\%(�i\_s*�L\_s*�X\|�m\_s*�t\_s*�H\_s*��\)\|�U\_s*��\_s*�B\_s*�G\|�T\_s*\%(�C\|��\_s*\%(�g\_s*�X\|�`\_s*�b\_s*�y\|�e\_s*�B\_s*�b\_s*�y\)\)\|��\_s*�X\_s*�}\_s*�X\)\|�G\_s*\%(�N\_s*�X\|�b\_s*�N\_s*�X\)\)',
-        \ 'y' : '\%([։ߕ֍������H�V�ş�ꔗ����؊��Z���ݝ����g���Z�|�~�}�����Ĕ���ϑ��b���b���щx�X�����\���c���c�U���i�F��g�`ᇞ����՗x�揜J�L�Ȟ@�f�����uꡜ���y�����s�@����T��ᘟ���~���m������籝X�yꢗq�s�i�^�w�g�j�s�f��g�t匍��r�o�����חl�d�p�n�їw�z�m�Ï��h�^�S焛@�����㏜棟b���a�Ǘ_�P�`���]�r�Ĕ��S��㿉r���\�\�Q���P�a�����o�K�l�l�P�I�^椂��㒏����̎͒o�ɒ�����t沖L��u���V�K�ᛮ�|��w�䓎樏�ଉ�����������w��亗W���z�F����C�Q���������ޗC�G���E�P�Z�X�N�O�S�З[�H�I�֗F�Y�J�L�k��ሖ����@�g�V�h��O䥝��R埙`�����A懝����|�������M���g���J�䲃���ꍘc�U�T���������n�������翔�䑌���������恍ݍ��������r�x�������É��j囚|���d�Q�U���|��軗��Ƒ������B�d���{���Nj�佈��䆍��m�n�ؐF���A�t����F������泌Ìމ��L�����d�������ƜјJ���i��ꌒ��Փk�v����ɔžo���������֌��y������M�E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�����w�����~�N�}�z�c���c��硉Ɏ��h�����䕟J����s�W���]�b�K�\���Tฐ��]�r����m�П��Ȉ��Z���Ԉ��T�D�M�Κ�I�����C��������m��覉@������u�B�A��A�ޛ���j�H���و�Ί�ֈ�È�1�P�����D�y���I��D�R�����۔џ��ʈዏ�H�ƍ֋U�������h�w�ψ͉]����}�u�b�v���]�Ό��≝�g�М���@�E���S��盈���B�Ο��ݑP�����R�҈Ȋ��U�ג��ߘߛ��ږ����ˆ̈،܈Η��͜}�Ė��ˈ��ԍs��਒_�ˑ��������ޗǓ��o�֗��D�K���~�������䏈ӈۈ��؈ً����e����Ԅ`���t�c���b�ّ������q���ۈŔs���M���l����h�E�`�_�ʗ�S�Q���n���a�_��–z�l���˗D���y������ي��VꞟK������o���Z�މv�N��u��������k����欎��淏��k�q�s�t�r�R�Кݓ@�D洗{�k����J�їT���׈Ջx�ۍN����❔������J�Ĝ\��̖��t�j熔W���쉮�ƕa����ߖ����ˎܓi�댭ውƔ��E�~������ₙ�u�E�~�����������v�F�����������J��Y�C�\���z��y]\|�\_s*[�ղ�]\|�b\_s*[�����C��]\|��\_s*[��䂢��]\|��\_s*��\_s*�b\|�^\_s*��\_s*�b\|�I\_s*��\|��\_s*��\|�B\_s*��\|�I\_s*��\|4\_s*\%([�“�����]\|��\_s*��\|��\_s*��\)\|��\_s*��\|�m\_s*�j\|��\_s*��\|��\_s*��\|�F\_s*��\|��\_s*��\|��\_s*[�q��]\|�j\_s*��\|�h\_s*�L\|�@\_s*��\|�V\_s*��\|��\_s*[���j]\|��\_s*[�q��]\|�i\_s*��\|�W\_s*��\|8\_s*��\|��\_s*��\|�t\_s*\%(��\|�^\_s*�[\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�S\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(�Y\|��\_s*��\)\|��\_s*�M\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*�[\_s*��\)\|�a\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�c\_s*�J\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\|�~\_s*��\|��\_s*��\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�h\_s*[�‘�]\|�@\_s*��\|U\_s*\%(��\|�^\_s*�[\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�E\_s*[�c�R]\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�C\_s*��\|�]\_s*[���o��Z]\|��\_s*��\|��\_s*�q\|�_\_s*��\|��\_s*��\_s*��\|��\_s*�r\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*[����]\|�p\_s*\%([�꓍��]\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ȉ���]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|�s\_s*[�”@]\|��\_s*�{\|��\_s*��\_s*��\|��\_s*��\|��\_s*�L\_s*�n\|��\_s*��\|��\_s*[�c��]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|�V\_s*�\\|�`\_s*�G\|��\_s*�{\_s*��\_s*��\|��\_s*�a\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*�t\|��\_s*��\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�q\|��\_s*[���j]\|�x\_s*\%([�k��]\|�V\_s*��\_s*�c\)\|�G\_s*\%(�z\_s*�o\|�t\_s*�Q\_s*�j\_s*�[\|��\_s*��\_s*�@\_s*��\|�j\_s*�Z\_s*�C\|�[\_s*��\)\|��\_s*�C\)',
-        \ 'z' : '\%([�󉀉��ꑹ��������㔛������������������m�ґX�����f�h�ّ��������ۑ����Y���\�����]��萊��A�K㿑R��䒑U�W�N��征͑V陑T�P�Q�f�O�S�␨������ҐƐŐ��U�ӂ��ž����l�b齕�����A�Z�B������@笐��������C���t�Ó��|�~�D�}���ߍ������󓈎ȓ��������ǎ����w�x����c��H苎ҍ��׎��l�����������㒼�Ó�����K���������H�Ԙ�ᶙ��b�����i�u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l�ŏ��ғ�䴞`䥝�募��t�J����珊�R���������P�����ԟ��i�Uㅏ��{�o������媝m�h���鈐������Y�t��������Y����竐������j�g�@�ݖ�����Ï��ꏗ�����`������~�]��꞊��󝵏������������������G�����A�ژh�G�Q榜휵���@���u���Q�x�h�m��n���p�q���m�m⢙Ï��|⡓���՟��~�[�x����{䤏��z���������y�}�������}��汎�������������G�����E�s���n�𘸏^�F�_�`���O�c�a�_�Y���[�b�]�\�Z�e�d�������m�����������莣���^���y�~�����������i���J玎�������Ȓn�����􎤎��~�������I�m�������V�����k�q���H�j�a�Z���d��������䢎������m�������V�������␷��╍蛽�N���M�����赞��ƎL�G�R�Z�Q�S��ₜ�͛؜�k�O��槎S�b�Μ͎a�c�Z�ː��čϙ����܍ލ��ߍݍ�o������U��������������Y���������]���[�������G�w�Y�]��Z���U�W�[�x�ĄH��z]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�]�[�Y�W�U]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|�o\_s*��\|��\_s*[�����q]\|�\_s*�\|��\_s*��\_s*��\|��\_s*��\|�O\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|�\_s*�\|��\_s*�p\|��\_s*�o\|�C\_s*�@\|�m\_s*��\|��\_s*��\|�k\_s*[�ߌY]\|�\_s*��\|��\_s*�s\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|�\_s*�\|G\_s*\%(��\_s*��\|�p\_s*��\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�Q\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|J\_s*\%(I\_s*S\_s*�R\_s*�[\_s*�h\|�|\_s*�b\_s*�v\|R\_s*��\_s*��\_s*�{\)\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�i\_s*\%(��\_s*�[\_s*�O\|�|\_s*�b\_s*�v\|�t\_s*�m\_s*�j\_s*�n\)\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|�\_s*�u\|�e\_s*��\|��\_s*��\|��\_s*��\|��\_s*�{\|�U\_s*��\_s*��\|��\_s*�H\|��\_s*��\|�T\_s*\%(��\_s*��\|��\_s*�|\_s*�[\_s*�j\_s*��\|��\_s*�S\_s*�T\)\|Z\_s*\%([r��]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|�K\_s*��\_s*�_\_s*��\|�o\_s*�b\_s*�t\_s*�@\|I\_s*P\_s*�t\_s*�@\_s*�C\_s*��\)\|�V\_s*\%(�^\_s*�[\_s*��\|�I\_s*\%(��\|�j\_s*\%(�X\_s*�g\|�Y\_s*��\)\)\)\|�y\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|�`\_s*\%(�N\_s*��\_s*�X\|�A\_s*�m\_s*�[\_s*�[\|��\_s*�[\_s*��\_s*\%(�q\|�b\_s*�q\)\|��\_s*��\_s*�_\_s*�b\_s*�V\_s*��\|�S\_s*�C\_s*�l\_s*��\_s*��\_s*�C\_s*�[\_s*��\)\|�c\_s*\%(�@\_s*\%(��\_s*�g\_s*�D\_s*�X\_s*�g\_s*��\|�C\_s*�g\)\|�F\_s*\%(�i\_s*�[\|�b\_s*�y\_s*��\_s*��\|��\_s*�}\_s*�b\_s*�g\)\|�B\_s*\%(�N\_s*��\_s*�X\|�^\_s*�[\|�[\_s*�O\_s*��\_s*�[\|��\_s*\%(�o\_s*��\_s*��\|�}\_s*�[\_s*�}\_s*��\)\|�S\_s*�C\_s*�l\_s*��\)\)\)',
-        \ 'A' : '\%([��ݕ��N��Ҋ{�b���]毛^�������w�܏��㦚@�o�C�����粕ӓ��J���l���V�Ȍl�ˆ��^���Мۜ��{���Q��z��鸈��W�E�B���{���M�Q榓k�w��{�\�����N�}�H���o���{���t����V�p�������A�֔\���H�Փ��a�ڏS�[矏N�����a�W���o㻓֏��~�ĔM���ؒg��禈������Ŋ��������[���N�Ύ����ҕ����a�e��}�y�R�����X���v���I���\����॑��Ő��V�a�z�\���e���X�~�d�V�E�����Y�эʊ늿�ߎӕT��瑀������剕Օ����P����]��J�ÓV���������쉐�˖ԋY�͈��������b���������般�HꙌ���������ǖ�����s����N��L�[����ӟ�䈮�����N�����z���������P�j�E�D���ɏ͏������W�쏺�H�����q蕚��V����襕��B���\���͈��ԑ�����~㪌Z����Q�s�ň��}�Ĉ��ǝ�ƈ����䒩�툤���@��r�b�����`�~�����q�g���ݝю鈩�[����脝��ōC���K��暖\�ؐԙ���z�Đ��•Ɉ����Œ��a�����S���㈢�Ҍ�ݕ����J�숫�r�G�}�����L�������j���򈡈��}�[�Y�ޝ����K�������g�������O���c����������&�ȁ��_�ڋ��͋��́����ˁ����܌�W���āN�L�M�O�f�`���`�������A�p�@A]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*�q\|��\_s*��\|�E\_s*�n\|�f\_s*��\|��\_s*��\|�M\_s*�V\_s*��\|��\_s*�T\|��\_s*��\|�Z\_s*�q\|��\_s*��\|�l\_s*��\|��\_s*��\|��\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�w\|��\_s*[����]\|��\_s*�p\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*�{\|��\_s*\%(��\|��\_s*�q\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\|�H\_s*�a\_s*�b\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*�F\|��\_s*��\|��\_s*�`\|�^\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�D\_s*�`\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|��\_s*[�������K]\|��\_s*�G\|��\_s*[�m�F]\|�\_s*�x\|��\_s*��\|��\_s*��\|��\_s*��\|�p\_s*\%([�ۓc]\|��\_s*�p\|��\_s*��\)\|��\_s*[�ɁX]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(�d\_s*�b\|�A\_s*�h\_s*��\_s*�X\)\|D\_s*�J\_s*�[\_s*�h\|C\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|�h\_s*\%(�o\_s*�d\_s*�b\|�b\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|��\_s*�~\|��\_s*��\|�c\_s*��\|�n\_s*��\_s*��\|�C\_s*[�^�l���m���]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*�a\_s*��\|��\_s*��\|��\_s*�n\|��\_s*[ꆔn��]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|�g\_s*��\_s*�v\_s*��\_s*A\|��\_s*��\| \_s*�A\_s*�N\_s*�V\_s*�A\_s*��\|�q\_s*�f\|��\_s*�f\|��\_s*�s\_s*��\_s*�x\_s*�Z\_s*�p\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�Y\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�@\|�a\_s*��\_s*��\_s*�@\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�Z\_s*��\_s*�g\_s*�L\_s*�b\_s*�c\_s*�l\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|�g\_s*�p\_s*��\_s*�\\|��\_s*�p\_s*��\_s*�\\|�Z\_s*�@\|��\_s*��\_s*��\_s*��\|�I\_s*\%(��\|�M\_s*��\_s*�X\_s*�^\_s*��\|�h\_s*��\_s*�C\|��\_s*�O\_s*�X\_s*�g\_s*��\_s*�[\_s*��\|��\_s*\%(�g\_s*�L\_s*�[\|�^\_s*\%([�[�i]\|�l\_s*\%(�[\_s*�g\|�C\_s*�g\)\)\)\|�[\_s*\%([�N�K�T�g����]\|�j\_s*��\_s*�O\|�L\_s*�V\_s*��\|�u\_s*��\_s*�[\|�o\_s*�[\_s*�h\|�x\_s*��\_s*�W\_s*��\|�M\_s*��\_s*�X\_s*\%(�g\|�^\_s*��\)\|�]\_s*��\_s*�k\|�X\_s*\%(�`\_s*��\|�e\_s*�B\_s*��\|�^\_s*�[\|�g\_s*\%(��\_s*�A\|��\_s*��\_s*�A\)\)\|�h\_s*��\_s*�[\|�W\_s*\%([�F�[]\|�I\_s*��\_s*�W\)\|�f\_s*�B\_s*\%(�I\|�G\_s*��\_s*�X\|�V\_s*��\_s*��\|�g\_s*��\_s*�A\_s*��\)\|�^\_s*��\|�\\_s*\%(��\_s*�e\_s*�B\|��\_s*�C\_s*�Y\)\|�Z\_s*��\_s*�e\_s*�B\_s*�b\_s*�N\|��\_s*��\)\)\|�z\_s*��\|�o\_s*�C\_s*�g\|�n\_s*��\_s*�}\_s*�Q\_s*�h\_s*��\|��\_s*��\|�l\_s*�H\_s*\%(��\_s*��\_s*��\|�m\_s*�\\)\|�C\_s*\%(�[\_s*�W\_s*�X\|�I\_s*��\|�\\_s*�b\_s*�v\)\|�}\_s*��\_s*�h\_s*�D\_s*�[\_s*�N\|��\_s*\%(�z\_s*��\|��\_s*��\|��\_s*�p\)\|�t\_s*�^\|��\_s*�p\|�G\_s*\%([�j���A�C�[]\|�b\_s*�`\|��\_s*\%(�h\_s*��\_s*��\|�W\_s*�F\_s*\%(��\|��\_s*�b\_s*�N\)\|�[\_s*��\)\|��\_s*�A\|�I\_s*��\_s*�A\|�X\_s*�e\|�v\_s*��\_s*��\)\)',
-        \ 'B' : '\%([���ݍ����x�f��t���ݖv�{�}�~�Ϟ��s�r�`���ڝ����p�ؖn�l�m�q�����b�Q�쟂�������ۙR廖g�e���䛖����O�E�庈��ꆉK�����㦖R���W�a�X��Z�U�`���Y��N��ϛ��˖S�c�]�f�h�T�^�d��d�ە����_�@��W敖͕ꊱ�����V�G�����J����ڙk�K�럑��㰙p�gꈕ���̕��V�ՙ��A�ğ��~�܍�燙��ᾙj�וؕ�糉•�粂בD�[�k�u�q�J�����������ڒ������ܐ[�W��᳓ؐߕ��ܖܘŕ��h�ᕷ���w�������ŕs�F���U�����򐁕����x�����ᕔ�F�~���o���@�����ԕ�捐l�L�J�x�ʕT�C�Z�z�[���ߞ�㢛��m�p�C�ޜ��r�F��{���q�n�֛�焕S蓔���I�a���l�ߕ[�L�e����ὕ��d�c�b�`�_�a���Γ��Z�r����ۖ������o�ɔ��z���e�����X�]�䛇���g���є��䊑����ы��I���s���������������@�[���bV���������鯝U���A�j���c�U���P�������������W���є��m���\�����e���}�����ޔ��ȉS�i�t��䕔|��ꀊL�����������{�~�}���ŝם��f�\�����Ҕ��Ԗ_�J���m�ה”d���H����ݔ֔ӔՔԔؖ��따������������n�t�k�l�����y�H�Ő�����m���n���\�΁g�������ۉ���~�b�a�|�_�攞�{�o�n�m�o�p�a�u�r�A���q���xB]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�{�x�u�r�o]\|��\_s*[�ڂׂԂт�]\|�\_s*�\|��\_s*��\|�A\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*�Z\|��\_s*��\|�r\_s*�r\|��\_s*��\|�\_s*�\|��\_s*�_\|��\_s*�_\|��\_s*��\|�E\_s*��\|�\_s*�\|��\_s*�C\|��\_s*��\|�X\_s*[���j]\|�R\_s*��\_s*�O\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|�z\_s*�c\|�\_s*��\|�u\_s*\%(��\|�l\_s*�b\_s*�N\|�V\_s*�l\_s*�}\)\|��\_s*�q\|�t\_s*�q\|��\_s*��\|�L\_s*[�O��]\|�\_s*�\|�V\_s*�A\_s*�O\|��\_s*[�ĘU]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|�\\_s*�D\|��\_s*[���D]\|��\_s*��\|�o\_s*��\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|�h\_s*��\|��\_s*[�q�@]\|�\\_s*��\|��\_s*[�Žq]\|�\_s*�\|��\_s*��\|��\_s*�q\|�c\_s*��\_s*��\_s*��\|�b\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�K\_s*�N\|��\_s*�q\|��\_s*\%([�ъy�J]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�\_s*��\|��\_s*[���]\|�f\_s*��\_s*��\|�v\_s*��\_s*�R\_s*�M\|��\_s*��\_s*��\|�I\_s*�[\_s*�g\_s*�o\_s*�C\|��\_s*[�b��]\|�t\_s*�@\_s*�S\_s*�b\_s*�g\|�w\_s*�i\|�k\_s*��\|�y\_s*\%(�L\_s*��\|�e\_s*��\_s*�M\_s*�E\_s*�X\)\|�L\_s*�f\|�C\_s*�M\_s*��\_s*�X\|�z\_s*�E\_s*�f\|��\_s*�f\)',
-        \ 'C' : '\%([��a�������|�Ҝ��D����ޏn�s���}�������l�a��ʗ���ۗⵘ�ᶐs���Ќ����f�����َ�����řb���I���z���iꑍ����C���麌Z欉��䓚��৙}�Y���ɍ��`�n�����X���M���ȍ��������뜝�k�՞����ߌ�����������匣���Ӎ����������e�W�E�Q���������L�m�՘i�������Q�f���肝K�����ਗ਼�Ჟ�騟����}�{㝛����Ř��ҟ������L���`�t�i���B�R�������H��{ൟ������H�s秝���n�n�������˝J�ܔ���X���L�J�y�ߛ��b�}褜���r�R���t莘m�E��硍h�k���l�K����ᦜ������n�K�}��֞��\��@囍y��ෙ��Μˍ[⠍x����u�X�S�e倘������J�i�^���V�@���A����W����G�D�T�������`ᩍB��ԍp���]�P���I���z�t�_�����k�O�j�R�w�u�P�a�I�|�q�F�X�Z�s�m�r���c���D�ޞ��J�ܛ��͞��w�L�l���������܍���W�����ێ����ЛZ�Ö��s������烌��g���םs�ؑ������e������u����Čٌ̟��]�|����V�������x�֒���绌і�嚙��h���ʉz�njԌך➳���Ҕ�ȏ��˗��Z�������ꉟ��h�@���Z���X������N���ÖZ��驒L�L���Q�k�ŚT���G���i���֙�����↝B�ގE���ِېߐ����������C��G����ዙ��Н�[�T�����אɐ͐Ȑǝ��A�����⣛p蔞��t��d�C�N���ӟ׈��ߙ�Eᝎa���x������㙘��A�����_�b����a���J����ஓϛ��Ƙj�b�H��ⳙA�G�S���L⒑W�s�r��������D�J�A�L��񙒐�枙@�ۑM���H����l�F�K�����D�G�@�B��h�坡�ǑN�����d�D��������I���扙��|���œҝ�ᝩ��⫟Ő�ꎖ�����������v�R�ΐ����y���H�����������`�Ր��������ǍU���}�����[���������҂���z���K�M�z����ⱟJ��㖍������I�����H���E��z�b�o�����x�ܗ��A�ϕ��D�B��ӏ��~���������B䱌s���Z�Y�㙬��ᯞ���ӛ��M�֌N���v������K�@����{���^���Z��퐾�^����������鶔�ňʈ��U�Ñq�������C�~���X�V�T�R�U�W�S�܉_�w�o�^�������鿌~���G�F䇚��`�p�����Y�������۞����ƌI����Әޚ��P�M�������u���o�Ӎ����������c�������q�v�E�|―���ꋀ��Ῑ܌J�ɍC�g�����{�m�������X�؍H���ᜁ��v�㜜���ҙ��g���电�M���˂����捃����A�B������P������D���Y���`���L�������Z��迓��Ӟx���Z������l���W�������ȓ��������G�F�a�Ǝb����乗��M�E�Ε��s�C�F�n�����D�㈵㦋s�����]��Ŗl�^⚑����A潓��g���ߞΖ�儞����b���ɖΜ���臐w�p����d�����[��g�����謎�姎����^���G�������N���H���˒��ΐÎ������ᕹ���R����������K�\�ސˌ�K�Ž��������K����o���q�ҍ������t����������ϔ����O���ӎ��͚��͟��̍��b�A�j�P�֎��y�����ࡐ̝�咙��ݐ���┐Ԏ��^�ېΎގڎ����Y�ώՎˎΎɎԎߎЈޝ��i�S�G���CဋÎ����f�t偛W�V�z������题�����E�������f�����i�g�l�h�k�{��������蜕��婏o�F�����T��碏V�h�q�h�����F�J娏Q�K�����榚S����酝��n��������������S�X�K�U��ڏM�G�j���a�E�N�����O�D�C�A�L�R�T�W�I���H�B�@���M�����\�᭚�����忏w�{���v�x�s�⡏u�r�f�ݐ����Z���u���Vꐚp�y���曐P�]�A�������U�j�J��������f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�N�f�d��C�k���X���ĐL���T�Q�W�i�[�R�M�e�b�I�\�S�^�V���΋n�Z���o䜏���_�י|���䓏��w����򏎏����������ҟ����m䀛���u�L���Џ�������縐��מ�⪎™דɜ�����v���R�I���ߜ��c��B�_�џn���Ո䐯�����B辑����[�����K頏����[��␏���K♏����яҁ������u���i�]��疏֏Ӑ��Ԛ��А�躐���Ϗ��U���J���n���ސ��Ŝ܏��ߏ���Ꮟ����ُ������G���Ꮷ������ଞ������������������������͏Ǐ����ɏ����������Џˏ�暏Ώ��ďƏ��͏ڏ��؏ɏ����������T�l������\�e�g�����p�@�C�ܑ������D�I����冐B�����G���A�H�E�n❎o�m�o�w���v���L���U���������������h���n�ы��Ŏᎊ�t�r�@���{��������w���Ϛ`���������i�Аy�э��i�@�����E���J�X拎}�泛��n���y�o�N�Z�y���ٝ��f���j�{����~����|���{�o���ߘ��I�X�B�]�K�������V�g���u�������p����i���k���l��藘ʛ�Ɠ��j��⏎s��ꏎÎ��~��˔`���Œs��y�d�@���؎���䢊�Y�o�u�m���e�����ᘊ��y���NJ��r���݊��j���ƌy�����Ĉ�呁��e�A���i������������M�ʕr��P�T�M�v���ᚌ�ȍ��f�j�q�s�e�g�h�p�o�t�r����鹜��NJ����D�R���U�ğd��ᥛz�㕖�p�ȌڋA���ԓ�雛��_�B�ߗ��ދȋ�\�����Ί����͏ۋw�d�T��e�z�J�x���Ō`���ӌ^�����H���Ȕ����X��R㎎C���P���t������qK�Š������锯閟������@�����Њ��|��嶝^艔���噞J㹊��������{������歒S�������e顊��j舊����������s�Fጐ��d�P�}���g�����y�a�`�f����S�W���m���e����O���]�ݑ��ڙ̛����ň�����@����`�F�������O���P��\�[��g����ಉG�h���󓂞Њ����~�y�ۉ������}�q�����ɐ��͘����V�،����~ऐ����c���͌��b���w��u�x�v�i�X�Õ��L����ꖊ��G�K�Ə̓C魜S�R���Д߈����K�v���֓S哑t�������ݓk�������L�S�ښ��湛�誝����ᙚٚ]���d䡜����Q���I�v�n��跏ʜ������h���\�f�r�n�z�y�k�l�m�k�g�c�s�t�i�o�݉B�v�l�d���j�ߊg�q�u�p�m嵚��W������~�[�����Z�B���͙��G�r�q�ʟD�䠜j珞i������ƙd�^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�F���׊@��E�m�����L�G���D�ŊA��������K����J����C�������I䯘��Yᷛe�p���՟��b�Nボ�錝A���Q���a��T㼛�㻛f�W�`�c洟a�����⻝q�j����鉙ɞ쏁㣎���V�늬�����M����ϊ�䅟��j���F�����r�������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�g����⭊��|�}�ۚ��ۊ��@�يΞ��؊��󊩐��Ҋ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������ŠԊ׊��ՊĚ^���Ê��NJ����֊��͊������ϊ��w����x�s�q�P�g�ӊe�����a���㞎��ʼnؚĝ̎���d�ˉ��Z�Γ��ٌ����q�҃�����斉����v�q�Ўx�|�ۉԊ��Q���|����ўh�`��ܛ�����嘉������]�Ǝ؉�㟋�z�ɉÈՉʜ����F��荊����ЌC�a�{�����`�e�k�J�m�”ޚ썁�͉̉ώ����o����ז�◚D�S���l���όU���ґݙ͉щݙ��ljӌT��旞g�~�߉惕�砌����ĉ����ጜ����Ə�����戉Č͉ɂ��E�c���‹���ā����ى����q�S���G���B�J�H�x�w�[�`�T�I�r�������|�R�K�����V�F�O�^�Q�U�\�Z���A���Y�z���M�{�P�s�t�}���N�L�v�p�y���u���@�C�]���E�_�����~���D�􄩄��~���������������ԃ��q���X���W�ہA�C�F�N�Ջ��\�Ȑ��ߕϐڃJ�������������������R���V���Z�bC]\|�\_s*[�����]\|�b\_s*[�R�Z�N�V�J]\|��\_s*[�q����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�m\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*�C\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|��\_s*�@\|�O\_s*[�ȍ�]\|��\_s*[�ĘU]\|�P\_s*�y\|��\_s*��\|��\_s*[���X��]\|�~\_s*��\|�\_s*��\|�S\_s*[�Z��]\|��\_s*�h\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�V\_s*��\|�]\_s*��\|�f\_s*[���l��]\|��\_s*�A\|�s\_s*[�m�E]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*�_\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|�]\_s*[�X�]]\|�\_s*\%([�Ɨ���u�ʑ��Ɏ茓��]\|��\_s*��\|�[\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|7\_s*��\|�V\_s*��\|��\_s*��\|4\_s*��\|�S\_s*[����]\|�R\_s*�{\|�\_s*�\|�h\_s*�t\|��\_s*[�ʈ�]\|��\_s*��\|�O\_s*\%(��\|��\_s*��\)\|�|\_s*[�“�]\|�A\_s*[�o��]\|��\_s*��\|B\_s*r\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|�Q\_s*��\|��\_s*�Y\|�b\_s*��\|�c\_s*�e\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*�Z\|��\_s*�q\|�\_s*�\|�z\_s*��\|�R\_s*\%(�C\_s*�o\|��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�r\_s*�C\|�b\_s*[����]\|��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*�r\|�|\_s*��\|�\\_s*��\|�]\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|�y\_s*��\|�A\_s*�g\|�k\_s*�k\|�@\_s*��\|��\_s*�t\_s*��\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[���r]\|��\_s*\%([���_]\|�C\_s*��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|�C\_s*[���G]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|�_\_s*�o\|��\_s*�\|�B\_s*��\|�A\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*�u\|��\_s*��\_s*��\_s*�e\_s*�N\_s*�m\_s*�T\_s*�C\_s*�G\_s*��\_s*�X\|��\_s*��\|�X\_s*��\_s*�[\_s*�Y\|��\_s*�e\|�g\_s*��\_s*��\_s*�v\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|��\_s*[�{��v�菻]\|��\_s*�G\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|�T\_s*\%(��\_s*�`\_s*�[\_s*��\|�G\_s*��\|�C\_s*\%(�g\_s*�J\_s*�C\_s*��\|��\_s*�X\|�N\_s*\%([����]\|��\_s*\%(��\|�b\_s*�N\)\)\|�{\_s*\%(�E\_s*�Y\|�[\_s*�O\)\|�o\_s*\%(�[\|�l\_s*�e\_s*�B\_s*\%(�b\_s*�N\|�N\_s*�X\)\)\|��\_s*��\_s*�[\_s*��\|�_\_s*�[\|�t\_s*�@\_s*�[\|�l\_s*��\_s*�A\)\|�[\_s*\%(�e\_s*�B\_s*�t\_s*�B\_s*�P\_s*�[\_s*�V\_s*��\_s*��\|�N\_s*��\|�J\_s*\%(�X\|��\_s*�X\_s*�N\_s*\%(��\_s*�C\_s*�u\|��\_s*�v\_s*�V\_s*��\_s*��\)\)\|�L\_s*\%(��\_s*\%(��\_s*�[\|��\_s*�[\_s*\%(�^\_s*�[\|�V\_s*��\_s*��\)\)\|�b\_s*�g\)\)\)\|�}\_s*�h\_s*��\_s*�X\|��\_s*�\|�P\_s*\%([���A�C]\|�t\_s*�F\_s*�E\_s*�X\|�v\_s*�X\_s*�g\_s*��\_s*[����]\|�`\_s*��\_s*�b\_s*�v\|��\_s*\%(�^\_s*�E\_s*\%(��\|��\_s*�X\)\|�u\_s*��\_s*�b\_s*�W\)\|�[\_s*\%([�L�W�u�v�X��]\|�N\_s*�E\_s*�H\_s*�[\_s*�N\|�\\_s*��\|�^\_s*��\_s*��\_s*�O\|�p\_s*\%(�[\|�r\_s*��\_s*�e\_s*�B\)\|�V\_s*��\_s*�O\|��\_s*�[\)\|��\_s*\%(�g\|�x\_s*��\_s*�X\|�e\_s*�B\_s*�b\_s*�N\|�r\_s*\%(��\|�[\_s*�j\)\)\|�~\_s*\%(�J\_s*��\|�X\_s*�g\)\)\|�L\_s*\%(��\_s*�m\_s*��\|�v\_s*��\_s*�X\|�P\_s*��\|��\_s*\%([�C�[�A]\|��\_s*�F\|�r\_s*\%(�Y\_s*��\|�X\_s*��\)\|��\_s*\%(�X\|�b\_s*�g\)\|��\_s*�[\_s*�^\_s*�[\|��\_s*�\\_s*�[\|��\_s*\%(�[\|�E\_s*��\|�A\_s*�X\|�I\_s*�V\_s*�e\_s*�B\)\)\|�A\_s*\%(��\|�[\_s*��\|��\_s*�e\_s*�B\)\|�`\_s*��\|�g\_s*�T\_s*��\|��\_s*��\|�}\_s*�C\_s*��\|�b\_s*�J\|��\_s*�[\_s*�g\|��\_s*\%([�h�p�X�u����]\|�f\_s*\%(�B\|��\_s*�b\_s*�N\)\|�r\_s*\%([�A���l]\|�e\_s*\%(�B\|�[\_s*�V\_s*��\_s*��\)\)\|�x\_s*�c\|�o\_s*\%(��\_s*[�G�A]\|��\_s*�[\)\|�g\_s*��\|�V\_s*�[\|�T\_s*��\_s*��\|�^\_s*�s\_s*��\|�s\_s*\%(�g\_s*��\|�^\_s*\%(��\|��\_s*�Y\_s*��\)\)\|�v\_s*\%(��\|�V\_s*��\_s*��\|�e\_s*��\|�`\_s*��\)\|�Z\_s*\%(�C\|��\_s*�[\_s*��\)\|�b\_s*\%([�c�g�`�v]\|�T\_s*�o\|�X\_s*��\|�V\_s*\%(��\|��\_s*�O\|��\_s*\%(�[\|�u\_s*��\)\)\)\|�j\_s*\%(�I\_s*��\|�X\_s*�^\_s*�[\)\|�i\_s*��\|�m\_s*\%(��\|�[\_s*��\|�s\_s*�[\)\|�~\_s*�\\_s*�[\_s*��\|��\_s*\%(��\|��\_s*\%(��\|�b\_s*�g\)\)\|��\_s*\%(��\|�E\_s*�F\_s*�C\|��\_s*��\|��\_s*�C\_s*[���i]\|�b\_s*�g\)\|��\_s*�b\_s*�g\|��\_s*\%([�R�[�A]\|�o\_s*�[\|�u\_s*��\_s*�[\_s*�V\_s*��\_s*��\|�b\_s*�W\|��\_s*�O\)\|�Y\_s*��\)\|��\_s*\%(�R\|�X\_s*�g\|�V\_s*�^\_s*��\)\)\|��\_s*�p\|�`\_s*\%([�^�����}�A]\|��\_s*��\|��\_s*�[\|��\_s*�h\|��\_s*�j\_s*�[\|�R\_s*��\|�b\_s*\%([�v�N]\|�e\_s*��\_s*�I\|�^\_s*�S\_s*��\)\|�L\_s*\%(��\|�[\_s*�^\)\|��\_s*\%(�A\_s*�u\_s*��\|�[\_s*�C\_s*��\_s*�K\_s*��\)\|�[\_s*\%([�t�g�v�N�Y]\|�p\_s*�[\|�^\_s*�[\)\|�F\_s*\%([���X�J�R�A��]\|�U\_s*\%(��\|�[\_s*��\)\|��\_s*\%(�j\_s*�[\|�V\_s*�[\|�m\_s*�u\_s*�C\_s*��\)\|��\_s*\%(�[\|�X\_s*�g\|�b\_s*�V\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*�^\|��\_s*�R\_s*�t\)\|�r\_s*�`\_s*�F\_s*�t\|�_\_s*�[\|�`\_s*�F\_s*��\|�b\_s*\%([�g�N�J]\|�L\_s*��\_s*�O\)\|�C\_s*\%([�X��]\|�j\_s*�[\|�T\_s*�[\|�V\_s*��\_s*�O\)\|�[\_s*\%(��\|�U\_s*��\|�z\_s*�t\)\)\|��\_s*\%([�I�t�h�C���R���E]\|�c\_s*�l\|�N\_s*��\|�v\_s*�^\_s*�[\|�p\_s*�e\_s*�B\|�y\_s*\%(��\|�b\_s*�N\)\|�`\_s*��\|�l\_s*\%(��\|��\_s*�[\|��\_s*��\_s*�O\)\|�b\_s*\%([�N�g]\|�s\_s*�[\|�v\_s*\%(�}\_s*��\|��\_s*��\)\)\|�^\_s*\%(��\_s*[�C�[]\|��\_s*��\_s*�O\)\|��\_s*�}\_s*�[\_s*�X\|��\_s*��\_s*�W\|��\_s*��\|�[\_s*\%([�`�^�g���W]\|�r\_s*��\|�~\_s*\%(�[\|��\_s*�O\)\|��\_s*�[\|��\_s*\%([�Y�X]\|�g\_s*��\)\)\|��\_s*��\_s*�S\)\|��\_s*\%([���R]\|�C\_s*�X\|��\_s*�X\_s*�L\_s*�[\|�[\_s*\%(�N\|�T\_s*�[\|�J\_s*�[\|�L\_s*��\_s*�O\)\|�S\_s*��\|�b\_s*\%(�v\|�s\_s*�[\|�p\_s*�[\)\|��\_s*�\\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\|��\_s*\%(��\|�Y\_s*��\_s*�`\_s*��\)\|�p\_s*��\|�c\_s*\%(�@\_s*�[\|�B\_s*��\_s*��\|�F\_s*\%(�[\|��\_s*�j\_s*�[\|��\_s*��\)\)\|�Y\_s*�f\)',
-        \ 'D' : '\%([�다�h�b���r�a���ךǏ������t�B�N���{�����c�j���ۓ��Ó��̊��ӓ������ՓœǙI�������~�U�k���N���ӝ����^���}�X������駁́ߓ����ԓ��ӓ��V���W�������֓������W�{�ޙ�x�g�z�𗯗Z�^���m�v�w�ˎ~�y�ǎ��F≓��B����H�D�s�M��ϙ��u���������b�\�B�a�d�ƂŃd�ߐh���ȍj�Γ`�������s�����n�ˌ���g�˒ݕt�ВËl�}�ϒޘA�Ãa���ߗ͒n��������I�L���֓|�Z��睏����J���N�M��Ӌ��ҋ����x�J�يړ_�x�Ԓ|���������F�ڒD�E�U璒���i�N��Օ����n�m���聄��������Гْ̖U���[�g�h�k�i�f�c���d�e�j���Ǟ񐆘Ǒ�䶝\�śP�֑�蚑ʑ��[�������T�������ÞS�ɚ��k�o���Ĝ팚�[�P�c�˂������D���A�C�d\.�E�c���g�h�������\���B�����Ƃc�h�������_�W�D�f���„t��D]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�h�f�d�a�_]\|��\_s*[�ǂłÂ���]\|�\_s*�\|�s\_s*�X\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*�V\_s*��\|��\_s*��\|�@\_s*��\|�\_s*�\|�Y\_s*��\|�S\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�t��]\|�\_s*��\|�\_s*�\|��\_s*[�I��]\|�\_s*�\|�m\_s*�b\|�x\_s*��\|��\_s*�q\|��\_s*�q\|�\_s*�\|��\_s*�K\|��\_s*�\|��\_s*�B\|�R\_s*��\|��\_s*��\|��\_s*�k\_s*�B\_s*��\|��\_s*\%([���Ɍ�]\|��\_s*�L\|��\_s*�V\_s*�c\|��\_s*\%(��\|��\_s*�b\)\)\|�T\_s*[���B]\|��\_s*��\|��\_s*�|\|��\_s*\%(��\_s*��\|�\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\)\|�R\_s*��\_s*��\_s*�r\_s*�A\|�Y\_s*\%(��\_s*�[\_s*�X\|�b\_s*�N\)\|�C\_s*��\_s*�J\|��\_s*��\|��\_s*�m\|��\_s*��\|�s\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|�n\_s*�[\_s*�O\|��\_s*��\_s*��\_s*��\_s*��\|�j\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*�q\|�L\_s*�q\_s*�q\|�\\_s*�i\_s*��\|�[\_s*�b\_s*�P\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|��\_s*��\)',
-        \ 'E' : '\%([�ኙ����P�G���ҋ�`�ܐ�ݑ����傉��滌ӏ^�Λ�����x������V�x�{�y�󔌜▒厝t㈉z郉u�Չv���w�t�����d�_���Qঢ়o���H��̟����џH�����v���鴉�䆉������`��腖��b膞Ł܉���⥟��}�������|��������叉��͉�����������������l�����U�������~�����o���I�o�k���������t���Țz��瞱����i�͉j�o�ĉb�l��g�s�d�m繉e�r�f�h�n�c�i�ʉq���G�`���`�}�]㉈��Όd���l��˘��d����a�|��b�Ή�d�I�����������������������U�����́߁����Q���M�}�N���p�Ύ��I���łd���R�|�L���^�Ä��GE]\|A\_s*\%([�ʔ��^��]\|V\_s*\%(�@\_s*��\|��\_s*�D\)\|B\_s*\%(�^\|C\_s*��\)\)\|�`\_s*\%([�ʔ��^��]\|�u\_s*\%(�@\_s*��\|��\_s*�D\)\|�a\_s*�^\)\|��\_s*\%(��\|��\_s*��\)\|�O\_s*��\_s*��\|M\_s*�T\_s*�C\_s*�Y\|�l\_s*�T\_s*�C\_s*�Y\|�G\_s*�X\_s*�q\|��\_s*��\|�g\_s*��\|�E\_s*��\|��\_s*��\_s*�q\|��\_s*�y\|��\_s*�x\|��\_s*�H\|�x\_s*�\|��\_s*[�s��]\|��\_s*��\|�g\_s*�q\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\)\|L\_s*\%(�T\_s*�C\_s*�Y\|L\_s*\%(�T\_s*�C\_s*�Y\|��\_s*��\)\)\|��\_s*\%([��仕Q]\|�m\_s*��\)\|N\_s*��\| \_s*n\_s* \_s*�p\_s*�`\|�m\_s*\%([�‹ɋ�]\|��\_s*��\|�g\_s*�j\_s*�z\_s*�[\_s*��\)\|��\_s*��\|�Z\_s*��\|��\_s*�X\_s*�r\_s*�[\_s*�H\_s*�i\|�r\_s*\%([�g���ȋ�]\|�T\_s*�C\_s*�Y\|�m\_s*��\|�e\_s*��\_s*��\)\|S\_s*\%([����]\|�T\_s*�C\_s*�Y\|N\_s*��\|F\_s*��\_s*��\)\|�q\_s*[���y]\|X\_s*\%([���r]\|O\_s*��\|��\_s*�F\_s*��\)\|�w\_s*\%([���r��]\|��\_s*�F\_s*��\)\|�A\_s*��\|�\_s*��\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|�C\_s*\%(�V\|�W\_s*��\)\|��\_s*�s\_s*��\_s*��\_s*�x\_s*��\_s*��\_s*�c\_s*�c\|��\_s*�[\_s*�N\_s*�X\_s*�e\_s*�[\_s*�V\_s*��\_s*��\|��\_s*\%(�B\|��\_s*�b\)\|�^\_s*\%(�B\|��\_s*�b\)\|��\_s*�[\_s*��\_s*\%(�s\_s*�A\_s*��\|�b\_s*�p\)\|��\_s*\%(�A\_s*��\|�E\_s*��\_s*�s\_s*�E\_s*��\|��\_s*�C\_s*�J\|�[\_s*\%(��\|�m\_s*�X\|�j\_s*�X\|�W\_s*\%(��\|�[\_s*��\)\|�h\_s*��\|��\_s*�J\|��\_s*\%(�X\|�V\_s*�A\)\|�t\_s*\%(��\_s*�e\_s*�X\|�H\_s*\%(��\_s*�A\|�j\_s*�A\_s*��\)\)\|�N\_s*��\_s*�b\_s*�h\|�J\_s*��\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|�d\_s*�q\_s*��\_s*\%(�C\_s*��\|�[\_s*��\)\|��\_s*�W\|�]\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|�S\_s*��\_s*��\_s*�T\|�J\_s*�v\_s*�Z\_s*��\_s*��\|�I\_s*\%(�[\|�C\_s*\%(��\_s*�[\|�Q\_s*��\)\)\|��\_s*�s\|�g\_s*��\|��\_s*�O\|��\_s*�Q\_s*��\|�A\_s*\%([���C]\|�j\_s*�h\|�[\_s*\%([�}�X��]\|�E\_s*�B\_s*��\|��\_s*��\|�j\_s*�[\|�l\_s*�X\_s*�g\|�~\_s*��\|�V\_s*�[\|��\_s*�[\)\)\|��\_s*��\|e\_s*\%(x\_s*a\|�R\_s*�}\_s*�[\_s*�X\|��\_s*�[\_s*�j\_s*��\_s*�O\)\|�C\_s*\%([�u���A���[]\|�W\_s*�F\_s*�N\_s*�g\|�t\_s*�F\_s*�N\_s*[�g�^]\|�R\_s*\%(�[\_s*��\|��\_s*�C\_s*[�Y�U]\)\|�v\_s*�V\_s*��\_s*��\|�~\_s*��\_s*��\_s*\%(�[\_s*[�g�^]\|�C\_s*�^\)\|�x\_s*��\_s*\%(�g\|�^\_s*�[\)\|�m\_s*�b\_s*�N\|�l\_s*�[\_s*�u\_s*��\|�M\_s*��\_s*�X\|��\_s*�O\_s*\%(��\_s*��\_s*�h\|��\_s*�b\_s*�V\_s*��\)\|�b\_s*�`\|��\_s*\%(�[\|��\_s*��\_s*�O\|�t\_s*�H\_s*��\|�z\_s*��\)\|�O\_s*�W\_s*\%(�b\_s*�g\|�X\_s*�g\)\|�N\_s*\%(�X\|�A\_s*��\_s*�e\_s*�B\)\|�X\_s*�t\_s*�@\_s*�n\_s*��\|��\_s*[���A]\|��\_s*\%(�[\_s*\%(�X\|�U\_s*�[\|�T\_s*�[\)\|�C\_s*\%(��\|�U\_s*�[\|�T\_s*�[\)\|�u\_s*��\)\)\|�E\_s*\%(�[\|�W\_s*�F\_s*�[\_s*�k\)\)',
-        \ 'F' : '\%([���[�Ή������M�֓~���y�`���[脟T����͈�j�͊ȎD�^����J㬐�䔕����b�X�����ʙ��������앶�|�����������������t�y���M�D�����������⁃�����៻��������᳍Ę��W�o���K�����敖�lᆕ���p�������̐k⿕�谌�ꄜ��P�i霝c�������񕥕����h���u������C�����c�������ޔX���܊ܕ����t�e�������������w�t����X�����������s���b�•z�|�����ޘ��w�t�]�АU���㧘V�������o�\�v�ؕ���H��~��������[�������n���D�ҕ����B�y�G�z�o�t�{�ܕ��ݍ~�D���Y�u�@��缕����S��䘔��Y�}��䎙���ʖ|�ӓS���́��x�܋��ŕ��U��e�󕤕��U���ӄ��tF]\|�\_s*�\|�b\_s*�t\|��\_s*��\|��\_s*��\|�A\_s*�X\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*�i\|�}\_s*��\_s*��\|�C\_s*�f\|��\_s*\%(�C\|��\_s*[����]\)\|�_\_s*��\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*�c\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[���R]\|��\_s*�t\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�Q\_s*[�l�“�]\|�h\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*�o\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|�_\_s*��\_s*��\|�`\_s*��\|�z\_s*\%(��\_s*�C\_s*�G\|�C\_s*��\|��\_s*\%(�}\_s*\%(��\_s*�g\|��\_s*��\)\|��\_s*�A\_s*\%(�~\_s*�h\|��\_s*�f\_s*�q\_s*�h\)\)\)\|��\_s*�t\|��\_s*��\|�@\_s*�\\|��\_s*��\_s*��\|�C\_s*��\|�q\_s*\%(��\|��\_s*�[\_s*[�Y��]\)\|�P\_s*\%(�^\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*1\_s*�v\_s*�f\|��\_s*�s\|�n\_s*\%(�G\|��\_s*�u\_s*��\|��\_s*��\)\|�_\_s*��\_s*��\|��\_s*�g\_s*��\|�G\_s*�t\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
-        \ 'G' : '\%([���E�D��ĉ�愍��܍��Ό���ᘭ���Ֆ��@�W龚����o�X�ߔ쐺���n�S�������΍���ᴊ��r���c��������穚�������ꇟ|�����ߍ�������@���ᛈ����䲎��ތ�T�Ɍ����党I⺌Ɍ��w�����5�ݒ��ܝ�z�q�x��Z��ߟ������驌���������Q��������|���k�⚔�nj}�~�|�Yꖚ��P��Ê���q���F����ῌ��V�Ȍ����������������������R������Z���������Ă��C���푐���򕳕ȍ��I�q�Ƒ���䣌��΋������X���{�������j㸌S�Q�R�����ԋ��H�F�ٕ���O����h�[���g�炮�ߌ��N��ۋ����ًҚ�����⚝�����f��耋ʋ����ꟋČ�����C���z�邙F�‹ƋŋÍs�ኋs�t�C�`�U�Z�؋W�ً]�b�X��V�^��E㺙E��a�a���[���c�V���~���؞Fซ\�E鰋_�Y����雎��_�������W�d᥍m�A�Ԑ�݊��v�瑤�ʊ����Ō꓁��^�`���e�����q寊����I�P�}�d�j�k�h�����G��_�~��������팵�ћǘ�����ݙʊہ���꜋��܊���������ߌ����猎��怞ْ՚�罛|�{��Ӝ��ԙ��k�z�x�{�y�w���G�U��������N᳜����ȟ򛻈�R�P�n᫊Y�P�K�w䈊H�V�Q�Z�S�X�M�T�W�[�O�㛴��䃖�A���b�ϊ��|��M���`��P��G�ؙމʉ�딃���a���͉�䮏�����ɉ惕���ꏟ���@���⁄�f�����K�S�ԃ������҃��������ăσ����ǃ��ӃуɃ��̓˃Ճփ������ƒ��������΃Ã������ЃƃŃȃ����̃ʃ����M�O�Q�s�����CG]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�S�Q�O�M�K]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*�~\|��\_s*��\|��\_s*�y\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*�s\_s*��\|��\_s*�q\|�H\_s*��\|��\_s*��\|��\_s*��\_s*��\|�~\_s*��\|�i\_s*\%([�ԉ�]\|�V\_s*��\)\|�P\_s*��\_s*��\|�]\_s*\%([�ÌΏ��B]\|�k\_s*��\)\|��\_s*[���`]\|�\_s*�\|�w\_s*�\|�i\_s*�F\|��\_s*��\|��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[���ō�]\|��\_s*��\|��\_s*�E\|�\_s*�\|�~\_s*��\_s*��\_s*�F\|�H\_s*��\|��\_s*[��Ս��i]\|�g\_s*�@\|�\_s*�\|�{\_s*��\|��\_s*\%([�알]\|�Z\_s*��\)\|��\_s*\%([�@����]\|�s\_s*��\_s*��\|��\_s*��\_s*�@\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�c\|��\_s*��\_s*�J\|��\_s*�t\|�L\_s*�q\|�Y\_s*��\|�\_s*�\|��\_s*��\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*�^\|�b\_s*��\|��\_s*��\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|�k\_s*�[\|�j\_s*��\_s*�[\_s*�Y\|��\_s*��\_s*��\_s*��\|�m\_s*�[\_s*��\|��\_s*�i\_s*��\_s*��\|�A\_s*��\_s*��\_s*�R\_s*��\_s*�i\_s*��\_s*��\|�q\_s*��\|�N\_s*�b\_s*�p\|��\_s*�q\|�n\_s*�{\_s*��\_s*�[\_s*�l\|��\_s*��\|�G\_s*�[\_s*�e\_s*�{\_s*��\|��\_s*�[\_s*�e\_s*�{\_s*��\|�C\_s*�F\_s*\%(�[\_s*�e\_s*�{\_s*��\|�e\_s*�{\_s*��\)\|��\_s*��\|�w\_s*\%(��\_s*��\_s*�h\|��\_s*�}\_s*��\)\|�h\_s*�C\_s*�c\|��\_s*�g\_s*�v\_s*��\|�[\_s*\%(��\_s*\%(�`\_s*��\|�j\_s*�E\_s*��\)\|��\_s*�N\_s*��\_s*�b\_s*�v\|�m\_s*�A\|��\_s*�g\_s*��\_s*�}\_s*��\|�l\_s*\%(�R\_s*��\|��\_s*\%(��\|��\_s*�X\_s*�g\)\)\)\|��\_s*\%(��\|�w\_s*�@\_s*��\)\|�W\_s*\%([�����W�O�m�i�I���[]\|�v\_s*�V\_s*�[\|�A\_s*��\|�C\_s*�h\|�b\_s*�h\|�^\_s*��\|�[\_s*��\|��\_s*�A\_s*��\|��\_s*�b\_s*�g\|�S\_s*��\|��\_s*\%(�t\|��\_s*\%(�h\|�f\_s*�B\_s*�[\_s*�m\)\)\|��\_s*\%(�[\|��\_s*�h\)\|�o\_s*��\_s*�V\_s*�[\|�u\_s*\%(��\|��\_s*��\_s*�^\_s*��\)\|�x\_s*\%(��\_s*�i\_s*�E\|��\_s*��\_s*��\)\|�l\_s*�b\_s*�g\|��\_s*\%(�b\_s*�g\|��\_s*�@\_s*��\_s*[�j�i]\|�o\_s*��\_s*[�j�i]\|�R\_s*\%(�[\_s*�\\|��\_s*�_\)\|��\_s*\%(�W\|�_\_s*�[\_s*�m\)\|�[\_s*\%(�W\|�[\_s*�b\_s*�g\)\)\|��\_s*\%(��\|�C\_s*\%(��\|��\_s*�Y\|�A\_s*��\_s*[�c�g]\)\|�R\_s*\%(��\|��\_s*�b\_s*�e\_s*�B\)\|�[\_s*�}\_s*��\)\|�j\_s*�[\|��\_s*\%([���l]\|�[\_s*�b\_s*�y\|��\_s*\%(�A\|�[\_s*�j\|�G\_s*�b\_s*�^\)\|�k\_s*\%(��\_s*�B\_s*�G\_s*�[\_s*��\|�r\_s*�G\_s*�[\_s*�u\)\)\|�F\_s*\%([�����t���}�l]\|�X\_s*�`\_s*��\_s*�[\|��\_s*�j\_s*��\|��\_s*\%(�[\_s*[�g���h]\|��\_s*\%(�h\|�f\_s*�B\_s*��\|�_\_s*�C\_s*��\)\)\|�~\_s*�j\|�j\_s*�[\|�m\_s*\%([�A�o]\|��\_s*�@\|��\_s*�[\_s*�Y\|�T\_s*�C\_s*�h\)\|��\_s*\%(�}\|�g\_s*\%(��\|��\_s*[�B�[]\)\|�_\_s*�[\)\)\)\)',
-        \ 'H' : '\%([Η�䀞��������L�N������{���w��ʔM���ܖS�Ŗy�j��壌u�������ׁ����󜓏c�����������]�K���g�֚��\✖{�x�j��c�����������ə�ᬖp�W���_���I�•���q�N�u�Y���ږQ���}䚑��N���闈������{�B�P��a����H��������K�A�O�f�D���G�̜d���M�O�E���v��L���C�󝻝��e�M�іk�M�~��O�۝e�Y�_�@����ꅜ��ƕ��n���ܒ��䐤���s�̕��J�������K��療�͌���������z�u���`�œL�K���������H�����Q�Q������ɕ����E憕��w����ǝ́ݕՕ��x�ҝG��⍖ݛQ���a�y�ْ؛i��͕���Û��z�˕r�������Ǖ•�������w�ӗ����ˌ�粂�̞��[�Ή������։A�~���y�`���[脟T�Ǐ͈�͊ȎD��^����J���㬐�䔕����b�X������䎟������앶�|�����������������t�y���M�D��������⁄���៻��������᳘��W�oB���K���敖�lᆕ���p�������̐k⿕�谌�ꄜ��i霘ŕ�������F�������Ӌ��h���u����ⷁ��������ޔX���܊ܕ��t�e���������w�t����X�������s���b�•|�����ޘ��w�t�]�АU���㧕����o�\�v�ؕ���H��~��������[�������n���ҕ����B�y�G�z�o�t�{�ܕ��ݍ~�D���Y�u�@��缕����S���x��Y�}�������V�_�~�Q�P�c���ݕA�S鯝ۏG��G�哘ǝ��|�ጄ�Չ��颕E�h�_�j�k�l㏟q�o���ĕn�p�m�g�i�׋����ʕf�g������R�ʒ��I�J���������������@���P��������v尗���z�h�啸���Ǐ��d�֐ċϏ������d�ΒP�ՓƑ��m���l1�P�u��ഁ����H�͏ݝf�ە��\�P�F�Ѝt鷑M���J焕S���АZ�O�z���n�I�Q�T䊌��Q�P��㟋��q���������W�j�G�E�g��ϏE�S���h������ꤊ��m���O�G�[�T�_�A�L���ѕN�D�J�L�C�Ȋ��l�J�C捍����r�M�K�u蹕U�H�~�q镕V��I�g�j�G�^�Y�~�Z�֙��d���[�ߕ]�W���\�{���_�u���y�i�w�����]�D�g����K��Γ�唛E��࿙���`�ݔߔ���B��ე����B�������ɞw������������혡���鏊�����]�X翔������枈��O���������澊�����|�������瀔�����O��ʎ������z�j�H���Ԍ�������㔈墏Ȑ��[�O�X���J��y������ّj��}�݋Е��o�����ޝ؏����՛��ދ@�@�T�m�����ה�������喗��I���j�Y���D���s���c�P�����Ĕ��J�`������e���]�똟�ƈ�n���n�G���|�F�ɐ�������ꡗI���z�y���t����妝p�������p�����S�����Ǘ����|杙�����b���r�@�؉���瞖z�d�X���x�X�򒌑����������\➁����^��⦔�����鼏��R�x�펾�њ�����虊���M�����ߍ��ϔ����A���ǝ������������唏��������R�����d�ʌv�}�є�������`��ڔ������񏉘o�@�W�����Iᢔ����@����������輔u�̝��ڛu�������v�i�`����ғ����t���\�E�C��p�Bᓔx�o�ޔy�w�W��p�r�q�s�D�z���W�֞��N����崔Νםa⛔����J���Í➷�^䗖}ፖ|���Y�K�唺�Ϟ��ٔ����͔�㆔הєŔ����Ǎ�ʔƔɔ̔Ĕ����Д����_�l�f�H�ǒp�ț�f�����Քb▗����t�����攇���j�ƞP�J���c���y�U�������h����H�ʔe�f��蘒[���������঎��c���Μ͔m���Ɯ���ꏐn�d����ډh�ޑ|���\��㵐��i�̈́��������������������������������������������g�]�t������g�q�z�w�nH]\|�\_s*[�����]\|�b\_s*[�z�w�t�q�n]\|��\_s*[�قւӂЂ�]\|��\_s*��\|�q\_s*�K\|��\_s*��\|�\_s*��\|�m\_s*[�F�C]\|��\_s*�}\|��\_s*[�ΐ�]\|��\_s*�{\|�S\_s*��\|�_\_s*��\|�p\_s*�K\|��\_s*��\_s*�F\|�g\_s*[��]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|�\_s*�@\|�a\_s*��\|��\_s*�q\|�|\_s*\%(�\\|��\_s*��\)\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*�Z\|h\_s*e\_s*c\_s*t\_s*o\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*�i\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[���R]\|��\_s*�t\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�h\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|�]\_s*�c\_s*��\|��\_s*��\|��\_s*�I\|��\_s*�\|��\_s*��\_s*��\|��\_s*�@\|�_\_s*[����]\|�I\_s*��\|��\_s*��\|�i\_s*�a\|�\_s*�\|��\_s*\%([�l�o]\|��\_s*�o\_s*��\)\|��\_s*��\|��\_s*��\|�f\_s*��\|��\_s*�V\_s*�q\|�_\_s*[����]\|��\_s*�l\|��\_s*[�ƁX]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*�f\_s*�]\|��\_s*��\_s*��\|��\_s*[�c��]\|��\_s*��\|��\_s*[�������B]\|��\_s*��\|��\_s*��\_s*��\|�h\_s*��\|�K\_s*�W\|��\_s*[�j�s]\|�e\_s*��\|�W\_s*��\|��\_s*�q\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�`\_s*��\|��\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�o\_s*��\_s*�|\|��\_s*�E\|��\_s*��\|��\_s*[��]\|�y\_s*[�����t]\|�q\_s*[�f�C]\|��\_s*�t\|��\_s*��\_s*�l\|��\_s*��\|�x\_s*�q\|��\_s*�J\|��\_s*��\_s*��\|�Z\_s*��\|��\_s*��\|��\_s*�]\|�K\_s*[��q]\|�{\_s*\%(��\_s*��\|��\_s*��\)\|�E\_s*[���l]\|��\_s*�s\|�w\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\|0\_s*��\)\|�Q\_s*\%([�l�“�]\|�O\_s*[�Γ�]\)\|�W\_s*�|\|8\_s*��\|�q\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|�C\_s*\%([��i�f����]\|��\_s*��\_s*��\|�f\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|�F\_s*��\|��\_s*�a\_s*�_\_s*��\|�E\_s*�[\_s*�S\|��\_s*\%(�[\|�y\_s*�[\_s*��\|�x\_s*�[\_s*��\|�C\_s*�X\_s*�}\_s*��\_s*�X\|�S\_s*�[\|�O\_s*�m\_s*�[\|�}\_s*�j\_s*\%(�e\|�X\_s*[�g��]\)\)\|��\_s*��\|�\\_s*�Z\_s*�i\_s*��\|��\_s*��\|��\_s*�`\|�C\_s*\%(�_\_s*��\_s*�S\|�X\_s*�p\_s*�j\_s*�A\|��\_s*�[\_s*��\|�G\_s*��\)\|�I\_s*\%([���[]\|�i\_s*�[\|�m\_s*��\|��\_s*�t\_s*��\_s*�[\_s*��\|�l\_s*\%(�X\_s*\%(�g\|�e\_s*�B\)\|�Q\_s*��\)\|�e\_s*��\|��\_s*�K\_s*�[\|�}\_s*�[\_s*�W\_s*��\)\|�A\_s*\%(��\_s*\%(��\|�x\_s*�[\_s*��\)\|�l\_s*�X\_s*�g\|��\_s*�[\|�_\_s*�}\_s*�[\_s*��\|�V\_s*�F\_s*�b\_s*�g\|�r\_s*�^\_s*�V\_s*�I\_s*��\|�[\_s*\%(�l\_s*�X\_s*�g\|�m\_s*��\_s*�N\_s*�[\_s*��\)\)\|�G\_s*\%(�f\_s*�B\|��\_s*��\_s*�P\|��\_s*\%(�i\|�[\_s*�k\)\|��\_s*�C\_s*�[\_s*�Y\|�N\_s*�g\_s*��\|��\_s*\%(�Q\_s*��\|��\_s*�F\|��\_s*�X\|�}\_s*��\|�~\_s*\%(�b\_s*�g\|�[\_s*�g\)\|�u\_s*��\_s*��\|�i\_s*��\_s*�f\_s*�X\|�L\_s*��\_s*�[\_s*��\)\|�m\_s*�N\|�b\_s*�`\|�C\_s*�`\)\|��\_s*[�╽�f]\)',
-        \ 'I' : '\%([����ʼn~��ꍘc�U�T���������n�������翔�䑌��폒������恍ݍ��������r�x�������É��j囚|���d�Q�U���|��軗��Ƒ������B�d���{��佈�S�\嫉�䆍��m�n�ؐF���A�t����F������泌Ìމ��L�����d�������ƜјJ���i��ꌒ��Օa�k�v����ɔžo���������֌��y������M�E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�������~�N�}�z�c���c�t��硉Ɏ������䕟J����s�W���]�b�K�\���Tฐ��]�r����m�П��Ȉ��Z���Ԉ��T�M�ΚÉ����C����������m��覉@������u�B�A�A�ޛ���j�H���و�Ί�ֈ�Y�È�1�P�����D�y���I��D�R������۔џ��ʈዏ�H�ƍ֋U�������h�w�ψ͉]����}�u�b�v���]�Ό��≝�g�М�@�E���S��盈���B�Ο��ݑP�����R�҈Ȋ��ՉU�ג��ߛߘߛ��ږ����ˆ̈،܈Η��͜}�Ė��ˈ��ԍs਒_�ˑ��������ޗǓ��o�֗��D�K���~�������䏈ӈۈ��؈ً����їe�����X�J�z�ˁ����������Ɉ�����D������聿�h�C�I���DŽy��I]\|E\_s*��\_s*�[\_s*��\|�a\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|�c\_s*�J\|��\_s*��\_s*��\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\|�~\_s*��\|��\_s*��\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�h\_s*[�‘�]\|�@\_s*��\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�E\_s*[�c�R]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�a\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�C\_s*��\|�w\_s*�h\|��\_s*��\|�]\_s*[���o��Z]\|��\_s*��\|�K\_s*�{\|��\_s*�q\|�_\_s*��\|��\_s*��\_s*��\|��\_s*�r\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*��\|�p\_s*\%(��\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[����]\|<\_s*=\_s*=\_s*>\|�K\_s*�v\_s*�\\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�{\_s*�A\_s*�C\_s*�E\_s*�r\_s*�[\_s*�E\_s*�G\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*�w\|�W\_s*��\_s*��\_s*�@\_s*�\\)\|�t\_s*��\_s*�U\_s*�t\_s*�[\_s*��\_s*�G\_s*��\_s*��\|��\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*�^\|��\_s*�m\_s*�[\_s*�h\|i\_s*\%(�A\_s*�v\_s*��\|P\_s*o\_s*d\|��\_s*�[\_s*�h\|M\_s*a\_s*c\|�m\_s*�[\_s*�h\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�A\_s*�[\_s*�@\|��\_s*��\_s*��\|�s\_s*\%([�”@��]\|�[\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�S\|��\_s*\%(�A\_s*��\|�V\_s*�t\|�[\_s*�h\|�E\_s*�f\)\|�A\_s*\%(�C\|�[\_s*\%(��\_s*�B\_s*��\|�r\_s*��\)\|��\_s*\%(�v\_s*��\_s*��\_s*�v\_s*\%(�`\_s*��\|�e\_s*��\)\|�f\_s*�p\_s*��\_s*�_\_s*��\|�t\_s*�H\_s*��\_s*\%(��\_s*��\|�}\_s*�e\_s*�B\_s*�[\_s*�N\)\)\)\)',
-        \ 'J' : '\%([���󓈎ȓ��������ǎ����w�x�����H���Û�����K���������H�Ԙ�ᶙ��b�����i�u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l�ŏ��ғ�䴞`䥝�募��t�J����珊�R���������P�����ԟ��i�Uㅏ��{�o������媝m�h���鈐������Y�t��������Y����竐������j�g�@������Ï��ꏗ�����`������~�]�吷�꞊��󝵏������������������G�����A�ژh�G�Q榜휵���@���u���Q�x�h�m��n���p�q���m�m⢙Ï��|⡓���՟��~�[�x����{䤏��z���������y�}�������}��汎�������������G�����E�s���n�𘸏^�F�_�`���O�c�a�_�Y���[�b�]�\�Z�e�d�����m�����������莣���^���y�~�����������i���J玎�������Ȓn�����􎤎��~�������I�m�������V�����k�q���H�j�a�Z���d��������䢎������m���ݝ������������苎Ҏ׋Y�l�������������������D�u�E���`�������_�i�v�F�J�W�zJ]\|�\_s*�\_s*�\|�b\_s*�W\|��\_s*��\|G\_s*\%(��\_s*��\|�p\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�c\_s*��\_s*\%(��\_s*��\|�c\_s*��\)\|�Q\_s*��\|2\_s*��\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|�O\_s*��\_s*��\|��\_s*��\|�G\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\_s*��\_s*��\_s*��\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|�[\_s*��\_s*�[\|�G\_s*\%(�z\_s*�o\|��\_s*�R\|��\_s*�~\_s*��\|��\_s*�T\_s*��\_s*��\|�b\_s*�T\_s*�C\)\|�w\_s*\%(��\_s*�X\|�X\_s*�X\)\|�q\_s*��\_s*�l\_s*�X\|�`\_s*�Q\|�k\_s*��\_s*��\_s*�[\_s*\%(��\|��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\_s*�@\_s*��\_s*�w\)\|�n\_s*\%(�C\_s*��\|��\_s*�y\_s*�[\_s*�j\_s*��\)\|��\_s*��\|��\_s*\%([�����j�i�[]\|�C\_s*��\|�G\_s*��\|��\_s*�m\|��\_s*�h\|�k\_s*\%(�X\|�V\_s*��\)\|�X\_s*�p\_s*�[\_s*�X\|�R\_s*[�r�u]\|�b\_s*�P\)\|�t\_s*\%(�@\_s*[���i]\|��\_s*[�I�A]\)\|�Y\_s*�{\_s*��\|��\_s*\%([�n���_�m]\|��\_s*�Q\_s*��\|�[\_s*\%([���m]\|�Q\_s*��\_s*�g\|�f\_s*�B\_s*�b\_s*�g\)\|��\_s*\%(�O\|�J\_s*�[\|�P\_s*��\)\|�s\_s*�e\_s*��\|�b\_s*[�J�V]\)\|�C\_s*\%(�G\_s*\%([�i�X]\|��\_s*\%(�X\|�Z\_s*��\)\|�Y\_s*�X\)\|�F\_s*\%(�i\|��\_s*\%(�X\|�Z\_s*��\|�[\_s*��\)\|�[\_s*�K\_s*�[\|��\_s*\%(�N\|�T\_s*��\_s*��\)\)\)\|�z\_s*\%([�^�Z]\|��\_s*�w\|�z\_s*�o\|�A\_s*\%(��\|�L\_s*��\)\)\|��\_s*\%([�u�i]\|��\_s*\%(�O\|�_\_s*��\)\|�G\_s*��\|�A\_s*\%(�q\_s*��\|�L\_s*��\)\|�[\_s*�t\|�[\_s*\%([�g�h]\|�f\_s*��\|�[\_s*�t\)\|�V\_s*\%(�t\|��\_s*�A\)\|�Z\_s*�t\|�n\_s*[�i���l]\)\)',
-        \ 'K' : '\%([����a���|�єV�Ҝ��D����ޏn�s���ߐ��E�}���Ĉ����ۗ�ⵘ�ᶎ��s���Ќ����f�����ꎖ������I���z�Eꑍ��C��欉��䓚䢐�ৎ��u�S�}�Y┍��ɗ`�n�����X���M���ȍ������뜝�k���������������卭�Ӎ��������e�W�E�Q�������L�m�՘i���՝��Q�f���肝K�����ਗ਼�Ჟ�騟����}�{㝛������ҟ������L���`�t�i���B�����R�������H��{ൟ������H�s秝���n�n�������˝J�ܔ�����X���L�J�y�ߛ��b�M褜���r�R���t莘m�j�E��硍h�k���l�K����ᦜ������n�K�}��֞��\��囍y��ෙ��Μˍx����u�X�S�e倘����J�i�^���V�@���A����W����G�D�T����`ᩍB��ԍp�]�i�P���I���z�t�_���K�k�O�j�R�w�U�u�P�a�I�|�q�s�m�r���c���D�ޞ��J�ܛ����w�L�΍���������W������ێ����ЛZ�Ö��s������烌��g���םs���ؑ������e��Ⰿ������u����Čٌ̟��]�|����V�����x�֒���绌я�嚙��h���ʉz�q�njԌך➳�Ҕ�Ï��˗��Z�������ꉟ��h�@�Z���e����s�|�q���W���O�׏b����]�{�Ȍ��t��Ә����n�K���P�B�����^���_�[���r����K�{����������C�������ՙL��ٜš������������w�������_�J���]���p��[�����i���N���J����y�������ʌ�����㮛ӌ��@���ę�������F鄌������������������������������Ō����������|�w���Z���Dờl����c⠞f���a犌l�_�Ϝl���g�����۝k�ڙ��㋜��d��P�n�������������������������������������������������������r�z������壌u�殌e�k�\�g��b�Y�p���]�v�[�R�����ق���Ɣz���ɟK�M�z������ⱟJ��㖍򍥛������I�����H���E��z�b�o������x�ܗ��A���D�B��ӏ��~���������B䱌s���Z�Y�㙬��ᯞ���ӛ��M�ֈϏ��v���L�����K�@����{���^���Z�򏾓�^�����������鶔�ňʈ��U�Ñq���������C�~���ܒw�o�^������鿌~�G�F䇚����`�p���̏L�Y���������ƌI��ގԚ��P�M�����E���u���{�O�����o�Ӟ������c�������H�E�|―�Ĝ����Ῑ܌J�ɍC�g����m�������؍H�ᜁ��v�����g�����M���˙�����i���w�G�J�r���z��W���_���_���l�o�C∋̛����m�����G��摞��d��~������焌N��۟A�@���^�ϛ��l�ɝh�h�f�k�e�i�D���܁ʁ��I������灓�}�E�B�W���b�\���W�����M�������񁝁{�P�����R�U�A���������_�G�����偅�X��������L�J�d�󁃁��Z���]�Q�����F���S���H�O�C���a���c�V���K���⁘�����T�^�����Ɂ����[�|�ၐ�򁪁��N�߁Y���䉌�s�׍@�ܞ��X�����������a�n�݋j�����~�g�����������ݜv⯝v�����������R�Ջڋ��[������a�z�ҝ��Ћی��׋؋ы͋ՋӋϋًދԋߋ֋ΉR����䐝����_�蝨⦘��c�`篋��ы��������������������Nj����������|�y㳛I⸋�蝜��^�t⧜t����������⁙K���Í�⟍[�s�����w���O�����v�S��O�v��h➍F�����������p�Z���i�g�݋������������x�������Z�Nj����]䰋������񋧋��������o��運����d�����������������������q�k����髟_�p�k�����������溂X����}���t瓌��Ë����u�Ӌ����y�Z���P�����|�l�{�v�����u���������x�~�}���z���Y��M��q���J�ƟC�����P���k����؋W���k���d�q�b���H�P���_���b���ᡚy�ɌV���c�ڑ��限�E�K���Y���R�_眎����M�u������������{�G�L�D�I�a���Ί��N�����h���X�ߛ��֗���W�B�뛞�����D�؋Q����恟���㲊��韀�u�����H�����ҋS������U昊����،���r�r�ʝu����M���F���^�����������J���B���Q�i�P���X�O�����ᘊ��y���NJ��r���݊��j���ƌy���Ĉꁽ�e�A���i������������M�ʕr��P�T�M���v��������rᚌ���f�j�q�s�e�g�h�p�o�t�r���ƒb��鹜��NJ����D�R���U�ğd��ᥛz���p�ȌڋA���ԓ�雛��_�B�ߗ��ދȋ�\�����Ί����͏ۋw�d�T��e�z�J�x���Ō`���ӌ^�����H���Ȕ����X��R㎎C���P��������q�Š������锯閊����@�����Њ��|�ȁ�嶝^艔���噞J㹊��������{������歒S�����e顊��j舊����������s�Fጐ��d�P�}���g�����y�a�`�f����S�W���m���e����O���]�ݑ��ڙ̛���������@�����F�������O���k�P��\�[�����ಉG�h�@���󓂞Њ����~�y�ۍ\�������}�����ɐ��͘����V��،����~ऐ����c���͌��b���w��u�x�v�X�Õ��L����ꖊ��C�G�K�ƓC魜S�R���Д߈����K�v���֓S哑t�������ݓk�������L�S�ښ��湛�誝����ᙚٚ]���d䡜����Q���I�v�n��跏ʜ������h���\�f�r�n�z�y�k�l�m�k�g�c�s�t�i�o�݉B�v�l�d���j�ߊg�q�u�p�m嵚��W������~�[�����Z�B���͙��G�r�q�ʟD�䠜j珞i������ƙd�^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�_�F���׊@��E�m�����L�G���D�ŊA��������K����J����C�������I䯘��Yᷛe�p���՟��b�Nボ�錝A���Q���a��T㼛�㻛f�W�`�c洟a�����⻝q�j����鉙ɞ쏁㣟��V�뙁�����M��ϊ�䅟��j�F�����r�������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�A�g����⭊��|�}�ۚ��ۊ��@�يΞ��؊��󊩐��ҊȊ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������ŠԊ׊��ՊĚ^���Ê��NJ����֊͊������ϊ��w����x�s�q�P�g�ӊe�����a���㞎��ʼnؚĝ̎���d���ˉ��Z�Γ��ٌ����q�҃�����斉����v�q�Ўx���|�ۉԌ����Q���|����ўh�`��ܛ�����嘉������]�Ǝ؉�㟋�z�ɉÈՉʜ����F��荊����ЌC�a�{�����`�e�k�J�m�”ޚ썁�͉̉ώ����o����ז�◚D�S���l���όU���ґݙ͉щݙ��ljӌT��旞g�~�߉惕�砌����ĉ����ጜ����Ə�����戉Č͉��ۂ����߄��������V���R���`���i���j�N�~���q�ԃL�J���K���{�P��K]\|�\_s*[�����]\|�b\_s*[�R�P�N�L�J]\|��\_s*[�q����������]\|�O\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*�J\|�H\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|�O\_s*�A\_s*��\|�\_s*�u\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|�S\_s*[�Z��]\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�z\_s*�n\|k\_s*i\_s*l\_s*o\|��\_s*[�q�V��]\|��\_s*��\|�m\_s*�F\|�\\_s*�\|��\_s*��\_s*��\|X\_s*e\|�@\_s*��\|��\_s*�s\|��\_s*��\|�f\_s*�n\|�\_s*�\|�\_s*�z\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|�e\_s*[����]\|�o\_s*[����]\|�j\_s*[����]\|�{\_s*��\|�n\_s*��\|�X\_s*\%([���]\|��\_s*��\)\|��\_s*��\|��\_s*�Z\|��\_s*�q\|��\_s*�T\|�\_s*�\|�z\_s*��\|�\_s*�x\|�R\_s*\%(��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|�t\_s*��\|�\_s*�r\|��\_s*�Z\|�|\_s*��\|�\\_s*��\|�]\_s*��\|��\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|��\_s*��\|�y\_s*��\|�A\_s*�g\|�g\_s*��\|��\_s*�t\_s*��\|C\_s*\%([ormdfa]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[�{��v��]\|��\_s*\%(��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|(\_s*��\_s*)\|��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|��\_s*[�I�v�_]\|��\_s*�_\|�B\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|�m\_s*\%([�u�E]\|�[\_s*��\|�b\_s*\%([�g�N]\|�e\_s*�B\_s*��\_s*�O\|�J\_s*�[\|�L\_s*��\_s*�O\)\)\|�i\_s*\%(�b\_s*\%(�N\|�v\_s*\%(�T\_s*�b\_s*�N\|�U\_s*�b\_s*�N\)\)\|��\_s*�b\_s*�W\|�C\_s*[�t�g�c]\)\|�j\_s*\%(�[\|�b\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\)\|�z\_s*\%(�[\_s*\%(�~\_s*�[\|��\_s*�C\)\|��\_s*�C\_s*�j\)\|�t\_s*\%(�r\_s*��\_s*�C\|��\_s*�V\_s*�`\_s*��\_s*�t\)\|�n\_s*\%(��\|��\_s*�V\_s*��\_s*�[\|�[\_s*��\|�o\_s*��\_s*�t\_s*�X\_s*�N\|��\_s*�c\_s*�[\_s*��\|�`\_s*��\_s*�g\_s*�D\_s*��\_s*�A\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-        \ 'L' : '\%([��H����F����D����B����@������P�Q���������ʁ��΁́Ƀ��k�ȃ����|�����L��L]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�t\_s*��\|��\_s*��\_s*2\_s*��\_s*�@\|\.\_s*\.\_s*\.\|�f\_s*�F\|l\_s*-\_s*��\_s*��\_s*�g\_s*�[\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�z\|��\_s*��\|�E\_s*�G\|��\_s*��\|�w\_s*�K\|�{\_s*��\|��\_s*��\|�_\_s*��\|��\_s*\%([�L�C�A�����u�{�g���E�X�R�S�O�[]\|�y\_s*�X\|��\_s*�[\_s*��\|�G\_s*�x\|��\_s*��\|�t\_s*�g\|��\_s*�J\|�x\_s*��\_s*�A\|�r\_s*\%(�[\|��\_s*�O\|�C\_s*\%(�X\_s*�g\|��\_s*�O\)\)\|�e\_s*�B\|�T\_s*��\_s*\%(�W\_s*�F\_s*��\_s*�X\|�[\_s*��\_s*�X\)\|�j\_s*�[\|�N\_s*��\_s*�A\_s*��\|�b\_s*\%([�W�^�e�g�N]\|�L\_s*\%(��\_s*�O\|�[\_s*�h\)\|�J\_s*�[\)\|�J\_s*�[\_s*��\|�P\_s*�[\_s*\%([�g�^��]\|�V\_s*��\_s*��\)\|�K\_s*�[\|�M\_s*��\_s*�O\|�W\_s*\%(�[\|�e\_s*�b\_s*�N\|�X\_s*�e\_s*�B\_s*\%(�N\|�b\_s*�N\)\|�J\_s*��\|�N\_s*�[\_s*��\|�b\_s*[�g�N]\)\|��\_s*��\|��\_s*\%([�S�O�_]\|�{\_s*\%(�N\|�b\_s*�N\)\|�o\_s*��\_s*�f\_s*�B\|�Y\_s*�f\_s*�[\_s*��\|��\_s*[�B�[]\|�W\_s*��\|�h\_s*��\)\|��\_s*\%(�A\_s*��\|�b\_s*�^\|�[\_s*�k\|�C\_s*��\|��\_s*\%([�\�X]\|�c\_s*�H\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|�G\_s*��\|��\_s*\%([�B�Z�Y�U�T�X�_�|�������}�i�m���k�u�A�[]\|��\_s*�}\|��\_s*�h\_s*��\|��\_s*��\|�]\_s*�`\_s*�[\_s*��\|�R\_s*\%(��\_s*�X\|�s\_s*��\)\|�N\_s*�[\_s*�h\|�J\_s*\%(�[\|�I\_s*��\)\|�W\_s*[���[]\|�f\_s*[�B��]\|�h\_s*�J\_s*�C\_s*��\|�v\_s*�g\_s*��\|�p\_s*�[\_s*�[\|�O\_s*\%(�j\_s*��\|�i\_s*��\)\|�t\_s*\%([�G�g]\|�^\_s*�[\|�e\_s*�B\_s*��\_s*�O\)\|�e\_s*��\_s*[���V]\|�`\_s*�E\_s*��\|�\\_s*\%(�\\_s*�[\_s*��\|�O\_s*��\_s*�t\_s*�B\)\|�^\_s*�[\|�g\_s*\%([����]\|�}\_s*�X\|�A\_s*�j\_s*�A\|�O\_s*��\_s*�t\|�o\_s*��\_s*�X\_s*�L\_s*�[\)\|�I\_s*\%(�^\_s*�[\_s*��\|�l\_s*��\)\|�~\_s*\%(�e\_s*�b\_s*�h\|�b\_s*[�^�g]\)\|��\_s*\%(�[\_s*�W\_s*��\|�l\_s*��\|��\_s*�`\_s*�F\_s*�b\_s*��\)\|��\_s*�W\_s*��\|�L\_s*\%(�b\_s*�h\|��\_s*�[\_s*��\|�e\_s*��\_s*\%(�X\_s*�^\_s*�C\_s*��\|�V\_s*��\_s*�^\_s*�C\_s*��\)\)\|�G\_s*\%(�]\_s*��\|�[\_s*�W\_s*��\)\|�q\_s*�e\_s*��\_s*�V\_s*��\_s*�^\_s*�C\_s*��\|�l\_s*\%([�A��]\|�b\_s*�g\|�[\_s*�W\_s*��\)\|�j\_s*�A\|�x\_s*\%([����]\|��\_s*�A\|��\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�e\)\|�r\_s*\%([�A�[]\|�h\_s*�[\|��\_s*�O\)\|��\_s*\%([�X�[]\|�u\_s*��\_s*��\_s*�[\_s*�i\|��\_s*��\|�h\_s*�~\_s*��\|�N\_s*�T\_s*��\_s*�u\_s*�[\_s*��\|�b\_s*�N\|�V\_s*�A\_s*��\|�~\_s*�G\_s*�[\_s*��\)\|��\_s*\%(�C\|��\_s*�O\_s*�E\_s*�F\)\|��\_s*\%(�B\_s*��\_s*�O\_s*�X\_s*�g\_s*��\|�@\_s*\%(�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\)\|�o\_s*\%(�e\_s*�B\|�^\_s*��\_s*�A\_s*\%(��\|�j\_s*�Y\_s*��\)\|�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\|�b\_s*\%([�h�s�v�^�N�`�g]\|�X\_s*��\)\)\)',
-        \ 'M' : '\%([ӊ�ߝ����ϙ~�E��ぞ���������I�J��䈐��Ўt�������u�q�v�U�p���ݑ���m�X�����ޖ��\���~���Җ����ߋ����̋��������b�f��{���e�����Җ۟��ٖ՟G������̞N���a�C�ܖS�֖іЖҖ����ێ�]���R�k�ᑔ�R�Ȗ͕�֞��G�̖Ύ��r������ݒ����W�Ϗ����ږӛR��ㅖG�̎����b�p�cᾖɖ˖�ǖȖʝ����Ŗ��Җ��ǖ�������ɓz��������������ї�㸋X���}���ٖ��V�񛘊[������|��r���m����籕S�}����絓ԘA�W�p�����~���׏@�����d����⚕ړk��J⥐���ĐI�ßz峒��������ۚ䖹�����ٖ��d�������Q����Z���x�x������������N���a�D�Y�K�I����������C���T�����Η����������������������X�O�̎S�Z������B���ݜD�X�����L�薦�ޑ��ْ��Á��v���p���x�z�E�G⊖����ɗΔF�����a�ϓ��r�ʘH�����韌Ύ��M倐�ᡞ��䪖��������s�{�S�A���Q���`�����֞�捐����v���P�閨��{�F�������Ŝ\���r�V�m�f���O�ϔ��[�[�p�����䖣�����Ȑg���ϖ�▕n�������aῖא\�ݟ{�f�B坏�㇓�㕓I帑��^�]�ߋ[���]�H�o�q�h������Ɖ������M���ϔ도�d�����h�ʉq�����������ږ��p��鞔C����䍕������̓h�|�{���Š�׈��w���l�e�����C�������d��ꠖq�x�f�����U��X���O�D�E�B��������K�j�i�~�ە��������בS�u�����Җ����K������w�Q�Җ��Ė����Ęd�G����簖��������ڞ_�a���J�Z�Ֆ�攉V�{顜���јԛ���I���ԙ��\�ݖ��ޖ��呾�G�����M�����������挫�D�󏫐�����������m�_�U䝔n�ݑ������ԕ������]�v�s���Җ����T�������֍��v�����ږ�ᄐ�ϐ^���d���șɎG�܌������򃀁ʁ܁�������ځ}���́΁ށ�ȁ����聹�偅�惢�ˁ������ہ́⁈�~�Ɂ���߁݁��䁾���֖��������Z���l�����|�}�Ń~���M����M]\|�\_s*[�����]\|�b\_s*[�������~�}]\|��\_s*[���߂ނ݂�]\|�g\_s*[�����t]\|�o\_s*\%([��n�e]\|��\_s*��\|��\_s*��\)\|�\_s*�o\|��\_s*�y\_s*\%(��\|��\_s*��\)\|��\_s*\%([�p�e�n]\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*�z\_s*��\|�k\_s*�~\_s*��\|��\_s*��\|��\_s*�p\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|��\_s*��\_s*��\|�j\_s*�E\|��\_s*��\|��\_s*[�N����]\|�n\_s*��\_s*�F\|�t\_s*��\|�J\_s*��\_s*��\|�v\_s*�w\|��\_s*��\|�z\_s*��\_s*�q\|�v\_s*\%([�����p�L]\|�`\_s*��\|�H\_s*�q\)\|��\_s*��\|�U\_s*��\|6\_s*��\|��\_s*�c\|��\_s*�w\|��\_s*��\|��\_s*�]\_s*�q\|�\_s*�n\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�Y\_s*��\|��\_s*�q\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|�t\_s*�m\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|�R\_s*��\|�\_s*��\|�e\_s*��\|�_\_s*[���q�`]\|�d\_s*��\|��\_s*��\|��\_s*��\|�c\_s*[�q����]\|3\_s*[�“�]\|�R\_s*[�“�]\|�p\_s*[�����q]\|��\_s*��\|��\_s*��\|�c\_s*��\|�C\_s*[�_�]�z�����I�R]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|�y\_s*[�����Y]\|��\_s*�s\|�[\_s*�]\|��\_s*��\|��\_s*��\|�e\_s*�O\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|�s\_s*\%(��\|��\_s*[�_�]]\)\|��\_s*�l\_s*�}\_s*��\_s*�m\_s*�X\|��\_s*�X\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�X�Ў���]\|��\_s*��\|�S\_s*��\|��\_s*�h\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�{\_s*�B\|��\_s*�v\|��\_s*[�o����]\|��\_s*��\|�}\_s*�n\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*�b\|��\_s*�m\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�|\_s*\%(��\_s*�l\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[�V��]\|��\_s*�F\|�S\_s*�j\|��\_s*�q\|��\_s*[�����P]\|��\_s*��\_s*�N\|��\_s*�v\|��\_s*��\_s*��\_s*��\|��\_s*-\_s*�q\_s*�m\_s*�`\|�j\_s*�[\_s*��\_s*�j\_s*�b\_s*�N\|�P\_s*��\_s*��\|��\_s*�c\|�a\_s*�z\_s*[����]\|��\_s*��\_s*�q\|��\_s*��\_s*�]\|�s\_s*[�K��]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*�h\_s*�q\_s*��\_s*��\_s*��\_s*��\|�{\_s*��\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*�t\_s*�@\_s*�C\_s*��\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|�v\_s*�Z\_s*�@\|��\_s*��\|�U\_s*�b\_s*�w\_s*��\_s*��\_s*�}\_s*�]\_s*�b\_s*�z\|�n\_s*�s\_s*�I\_s*��\_s*��\|��\_s*�s\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|�C\_s*�m\|��\_s*��\|��\_s*��\|�G\_s*��\)',
-        \ 'N' : '\%([ɏC�҈�j�����M��l����A�j�������f���w�a�X��H�p�L�ՋH�]�`�k��c��䊉ѓ���o����ь���ْ��E�����{�J���W�@���ГT�K�鑥���͋X�I�N�����ӞG��c�I�X�^�]�\�_�������U�ޔW����ژ��Z�V�L���q��ہ|�Z�‚�Țˑ_�o�^�E����D�J�C�ꋑl�X�L���i���������s�M�JൔK���R�����_�Q�O�R�N���S�l���P��I�B�Q�ם������H���q����ǚ��\�啼�K���L刐@���z���X���ޓ����F�܍f�z�G�E�{�D���z�U�ѓh��Ɲ^吒S�����������L�����E���R�P�{�e�����֏��A�E���U�Д@���P���E��ɔB轟��W�����s�t��x�w�����Z�K���X�f�אn�E�͔D�F�C�l�����ʋѐ����V���_�����a���������玂Q�Ɠ����獐m�򎗉�2���O����r�W㊓��c����k�j�›�����D�T�l��S�V�Q�e�w���o���Ԏ������P�����Y���g糕�粓�Q�^�垙�����ĎC���������Ή������Y�ّӓ��H�a����Ë[�y����m�ܗG�X��Ɩ�Č`�Ɖr����ဗ��v����i�a�����������x�܏A���E�}�����V�Ύ����̔T�����R���f��훕����j����s�Ϟo�o��񁽁ˁ��K��⍉֚a�[���ߝ\�r�P���������n���T����ˆ��b�ޏ��L���ྒྷ�ލ؋������S���~���e�Ȅ��������������������������������������ޖ����������j�l�m�ʁ`���i�k�m���N�~��N]\|�\_s*[�����]\|�b\_s*[�m�l�k�j�i]\|��\_s*[�̂˂ʂɂ�]\|��\_s*��\|��\_s*�q\|��\_s*��\|�x\_s*�U\|��\_s*��\_s*��\|�\_s*��\_s*��\|�T\_s*[�|��]\|��\_s*�C\|�t\_s*��\|�g\_s*[���C]\|�j\_s*[����]\|��\_s*�]\|�L\_s*��\|��\_s*��\|�F\_s*�q\|��\_s*[�@���q]\|�P\_s*�q\|��\_s*�q\|��\_s*��\_s*��\|�h\_s*�V\|�q\_s*�|\|��\_s*�\_s*��\|��\_s*��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�]\_s*�q\|�_\_s*��\|��\_s*�P\|I\_s*I\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�\| \_s*2\_s* \_s*��\_s*��\_s*��\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(�f\|��\_s*��\)\|�|\_s*�\|��\_s*�|\|��\_s*�T\|�s\_s*[����]\|P\_s*b\|L\_s*e\_s*a\_s*d\|�C\_s*[�ۑl]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�|\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|�n\_s*�k\|��\_s*��\|�s\_s*��\|��\_s*��\_s*�X\_s*�g\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|�R\_s*��\|�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|��\_s*�[\_s*�m\_s*�b\_s*�V\_s*��\_s*�E\_s*�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|�I\_s*��\_s*��\_s*�_\|�A\_s*��\_s*��\_s*�J\_s*�l\_s*�b\_s*�g\_s*��\_s*�[\_s*�N\|��\_s*��\|��\_s*�_\|��\_s*�z\_s*��\|n\_s*\%(��\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|��\_s*��\|��\_s*��\|��\_s*�f\|�G\_s*�k\)',
-        \ 'O' : '\%([��ݜ��b�S�M�o�N�O�Ì��Q�������j�w�d���Њd�Y���n�����n���x��������遌��s�s��ና{��≬�ݕL�ڜ����P����؋������y���߁W�S�V�T�R�U�X�����y�􋳙{�E⫝������e���}�t���c�C筞��[�҉���x���^拑����`�q�`�Ɗx���s���N��˗��u���B�b���d�e�������Ȋe�퐊��K�ȉ��򚙁������a�C���O�������݈җ�㱕������z�v�\�d�ʋ������U���K�������������{�|�����w���S�^�����g�]㠟i�����������Ҝ����}�D���ᜳ��[�a�����Q��_�������N�R�������V�M�������ן^�q�቉��r�S�B��������������������蜊׉����W�ꉞ�ʜ䉆���W�T�g�����E���c�T�ٖQ���P�������ѕ���}���ʼn������Y�[���”��u���N�|���Ǜ�ܚǕ��ĐD�V�����E���j�v�ɋN�O���j������؟Ɍ䏏�֒�������Y�~���������щ��I�����偝���a���Ɂ��J�n���O�́��փ��I��O]\|��\_s*��\_s*��\_s*��\|��\_s*�p\|�\_s*�u\|�\\_s*��\_s*��\|�S\_s*��\|�C\_s*��\_s*�C\_s*��\|��\_s*��\|��\_s*�@\|��\_s*��\|��\_s*�\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�]\|��\_s*��\|��\_s*��\|�T\_s*[������]\|��\_s*[���q]\|�f\_s*[����]\|��\_s*[����]\|�H\_s*��\|��\_s*��\|��\_s*�C\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�p\|��\_s*[�q����]\|��\_s*�N\_s*��\|�{\_s*��\_s*��\|��\_s*��\|��\_s*�b\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�K\_s*��\|��\_s*�l\|�\_s*�c\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�o\_s*��\_s*�U\_s*\%(��\|��\_s*��\)\|��\_s*�m\|��\_s*��\|��\_s*�]\|��\_s*�g\|��\_s*��\|��\_s*��\_s*��\_s*�P\|�A\_s*[�z�n]\|��\_s*[�H��]\|�}\_s*��\|��\_s*�F\|�w\_s*�n\_s*�}\|��\_s*��\|�z\_s*[���i�m�q�x]\|��\_s*��\|�c\_s*[�_����]\|��\_s*�O\|�]\_s*�c\_s*[�ꕃ]\|��\_s*[�~�C��]\|��\_s*\%(�c\|��\_s*��\_s*��\|��\_s*�V\_s*�c\)\|��\_s*��\|��\_s*[�����G��]\|��\_s*��\_s*��\|��\_s*�m\_s*��\_s*��\_s*��\_s*��\_s*\.\|�G\_s*[����]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|��\_s*��\_s*�d\_s*�@\|�E\_s*��\|��\_s*�~\|�E\_s*\%(�B\|�[\_s*\%(�Y\|��\_s*��\)\|��\_s*�{\_s*��\_s*�X\)\|�o\_s*��\|�A\_s*\%(��\|�U\_s*�[\|�E\_s*\%([�`�g]\|�^\_s*�[\)\)\|��\_s*�{\_s*�\\_s*�t\_s*�g\_s*�E\_s*�F\_s*�A\|��\_s*\%(��\_s*[�N��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|�_\_s*��\_s*�a\|��\_s*�\_s*��\|��\_s*��\_s*�_\_s*�f\_s*�j\_s*��\_s*��\|�`\_s*��\_s*��\|��\_s*�K\_s*��\|��\_s*��\|��\_s*�Z\_s*�q\|��\_s*��\|�_\_s*�f\)',
-        \ 'P' : '\%([�B�C�@����{�����s�ܕ��ە����y���~�Օҕ�糕ѕ�粛��ؕ����������z����C�U�ߕ[�i������ᢔ��������p�o�����Ǖ�ƔŔ���•������z�u�s�v�t���j�H�g�d���ω����Ղҁ}�{�Ճ��ӄ�����k����D�o�������E�_�v�|�Łj�i�݁��a�y�p�P�����Ӄ΃sP]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�|�y�v�s�p]\|��\_s*[�ۂ؂Ղ҂�]\|�\_s*�\|��\_s*�l\_s*��\|�\_s*�\|�O\_s*[�I�D]\|�\_s*�\|��\_s*�R\|��\_s*�D\_s*��\|�\_s*�\|��\_s*�`\|��\_s*��\|�\_s*�\|��\_s*�q\|�b\_s*\%(��\|��\_s*�n\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|�r\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�Ž���]\|�V\_s*\%(��\_s*�[\_s*�h\|��\_s*�V\_s*�r\_s*��\)\|�T\_s*\%(�[\_s*��\|�C\_s*\%([�Y�N�P�R]\|��\_s*�V\_s*�r\_s*��\|��\_s*�E\_s*��\|�L\_s*�b\_s*�N\)\)\|+\_s*��\|�z\_s*\%(��\|�X\_s*�Q\_s*��\)\|�q\_s*��\_s*�|\_s*��\|��\_s*\%(�z\|��\_s*�o\)\|�t\_s*\%(��\_s*�W\_s*�A\_s*��\|��\_s*\%(�C\_s*�W\_s*��\_s*�O\|�[\_s*\%(�Y\|�W\_s*��\_s*�O\)\)\|�^\_s*��\_s*�C\_s*��\|�H\_s*\%([�[���m�g]\|�{\_s*�X\|�r\_s*�A\|�X\_s*�t\_s*�@\_s*�[\|�j\_s*�[\)\|�@\_s*\%(�C\|��\_s*�I\|�[\_s*\%([�W�}]\|�~\_s*��\_s*�O\)\|��\_s*\%(�g\_s*��\|�^\_s*�Y\_s*[���}]\)\|��\_s*[�c�X]\|��\_s*�m\_s*�v\_s*�V\_s*�X\)\|�B\_s*\%([����]\|�W\_s*\%(�b\_s*�N\_s*�X\|�J\_s*��\)\|�[\_s*�r\_s*�[\|�b\_s*�V\_s*��\_s*�O\|��\_s*��\_s*��\|��\_s*�f\_s*��\_s*�t\_s*�B\_s*�A\|��\_s*\%([�X�[�A�p]\|�b\_s*[�v�p]\|�s\_s*\%(��\|�[\_s*�k\)\)\)\|�F\_s*\%(�[\_s*\%([�x�Y]\|�W\_s*��\_s*�O\)\|�C\_s*�Y\|��\_s*��\_s*��\|�j\_s*\%(��\|�b\_s*�N\_s*�X\|�L\_s*�A\|�[\_s*��\)\|�m\_s*\%(�L\_s*�V\|�[\_s*��\)\)\)\|�q\_s*��\|��\_s*��\|�^\_s*��\_s*�p\_s*�N\_s*��\|��\_s*��\|��\_s*��\_s*��\|�i\_s*�s\|�Z\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*�`\|��\_s*��\|�^\_s*��\|�i\_s*��\|�J\_s*��\_s*�E\_s*��\|��\_s*��\_s*��\|�d\_s*��\_s*��\|��\_s*��\_s*�^\|�o\_s*�e\_s*��\_s*��\|�\\_s*��\_s*�t\_s*��\|�_\_s*��\|��\_s*��\_s*[���a]\|��\_s*��\|��\_s*��\|p\_s*\%(T\_s*e\_s*X\|H\_s*��\_s*�[\_s*�^\|e\_s*\%(t\_s*a\|r\_s*l\_s*�X\_s*�N\_s*��\_s*�v\_s*�g\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\)',
-        \ 'Q' : '\%([�z���ɟK�M�z�������՟J��㖍򍥛������I������H���E�d������z�b�o������x�ܗ��A���ϕ��D�C�B��ӊǏ��~�����������B䱌s���Z���Y�㙬��ᯞ���Ӊ��O�M�֌N�Ϗ��v����L�������K�@����{���^���Z�򏾓��^���A�����������鶊r��ňʈ��U�Ñq���𞀋������C�~���X�V�T�R�U�W�S�܉_�w�o�^�������鿌~�G�F䇚����`�p���̏L���Y�������۞����I���Ȋf�s��ގԚ��P�M�����E���u���{�[�O���֞��o�Ӎ����@�󞔐����ȓS�c�������������S�H�q�v�E�|―�Ĝ��v�ꋀ��Ῑ܌J�ɍC����g����틂�{�m�������{���X�؍H�������ᜁ���v�㜜���ҙ��g���电���M�͋��ˋ�������p�e�g�f�h��P�H�N��Q]\|�\_s*�\|�b\_s*�N\|��\_s*��\|��\_s*��\|�\_s*�\|�~\_s*��\|�\_s*��\|��\_s*�S\|�S\_s*[�Z��]\|��\_s*��\_s*�x\|��\_s*��\|��\_s*�h\|9\_s*��\|��\_s*��\|�^\_s*�{\|��\_s*��\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�V\_s*�l\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|�C\_s*��\|��\_s*[�{��]\|��\_s*��\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([�ƕ����E������]\|�o\_s*��\)\|��\_s*��\|��\_s*�C\_s*�a\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�R\_s*��\_s*�q\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*�s\_s*�N\_s*��\|�`\_s*��\_s*��\_s*��\_s*��\_s*�}\|�w\_s*�x\|�R\_s*\%(�[\_s*��\_s*��\|��\_s*�e\_s*�B\_s*�t\_s*�@\_s*�C\_s*�A\)\|��\_s*��\_s*��\|�J\_s*\%(�U\_s*��\|�^\_s*�[\_s*��\|�X\_s*�o\|�[\_s*�k\_s*�[\_s*��\|�i\_s*�[\_s*�g\|�_\_s*�t\_s*�B\|��\_s*�e\|�h\_s*��\_s*�[\_s*[����]\|��\_s*\%(�`\_s*[�G�F]\|�e\_s*\%(�B\_s*�G\|�b\_s*�g\)\)\|��\_s*�^\_s*[���X��]\)\|��\_s*��\|�L\_s*\%(�g\|�u\_s*��\|�z\_s*�[\_s*�e\|�n\_s*�[\_s*�_\|��\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\|�[\_s*��\|�m\_s*��\|�b\_s*�V\_s*��\|��\_s*\%(�[\|�G\_s*��\)\)\)',
-        \ 'R' : '\%([ۛŘӛĚ̉h�_���R�{��]�Ә[�\���U�^�c���R�P�˞u�l�M�C�����L�属�譚N���d�יC�����R������O�c�YᑘL�S�Q�XᔘW�O�U�ĘT�R�N�b�@�F�࢔����G��m�e�d�i�b�I�E炍��䃟L�B��ڟ����׊a���e�U�x�v��Y���Z�Y���������t����X�F�䫗����ᖗ����w�������灟K�M����l�I瀗��q��ずw���Y�����Q�����r���Q���ݗ����@���B���������A��٘H��ḟ�����pᐗ�㾗ۗݗ��Z���~���K�����ಝ��_����×����ɌI���ʙ��Z�C���X����Y�V���g��×ڛ��Pᎊ}�֗���������������������ᅗ��P���X�a�������МH�W�˗����Ԝ���d�h�g�ҙz�ؗϙ�חїӗ՗��W���O���C�����͗����`����鲛�饗��؞���A���x��@�_���]���q�y���p�����֝����H�×�㇗ߗ��Ɨȗ��열�����ɋ��������ʗ̚i���ś�����胗��������������ؗ����ܘ���A��鋗������i����\�ߗ�仂�טJ���ə���V�������O�����g�T�p�R�E�Y㑟S�B�՛ۛn��A��ࣗ��a����茗����������E煚h����඗��p�����y�����q�Q����㡟I���S���ۗ�ᚘ����痋�����엇���t��f�f��逗ǂ�E���S�q���G�B���J�H�[�w�x�I�T�`�r�������K�R�|�F�V���O�W�^�X�U�\�Z���D�A���I�Y�z���M�{�P�s�t�}���N�L�v�p�y���u���@�C���]���E�_�����~���D�֍��㗅���X�q���������Q�σ���R]\|�\_s*[�����]\|�b\_s*[����������]\|��\_s*[������]\|��\_s*��\|��\_s*[�L��]\|�h\_s*[�E�ߎ�]\|6\_s*[����]\|��\_s*��\_s*��\|�E\_s*�G\|��\_s*��\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|�|\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*�P\_s*�[\_s*�u\_s*��\)\|�C\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*�W\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�s\_s*��\_s*�w\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*�k\_s*��\_s*\%(�w\_s*�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|��\_s*��\|�K\_s*��\|�g\_s*��\|r\_s*u\_s*b\_s*y\_s*�X\_s*�N\_s*��\_s*�v\_s*�g\|�v\_s*��\|��\_s*��\|��\_s*�A\|��\_s*[���M]\|��\_s*��\|��\_s*��\_s*��\|�Q\_s*\%(�l\_s*��\_s*��\|��\_s*�^\)\|�@\_s*�\\_s*��\_s*��\_s*�P\_s*��\|��\_s*�A\_s*�I\|�F\_s*��\|��\_s*�K\_s*�\\_s*��\|�A\_s*�[\_s*��\)',
-        \ 'S' : '\%([��������}�[��T���y���}����Q��^�����������ǚ��i�����h��掞��y�{�G�O�ʗ��c���������������������ԛ��z��y��u�������߈��S�^���䛣�᜹�K�U���|���\�����}���a������x�����‘���ƜQ�sढ़w��柔�锚t���䇛q���~�H�x�����y�ܑ�䵑q�ȑ����B���J�v�t�������Ƒ��N����ⵑ��r�������|��s�w���p�n�m���y����絒F�\�n�u�L�M�������������N�d�Ƒ[��ꋑj�f�b�`�a���^��𕛑l�X�����􉈑c�Y���iઈ�g�לh�e�e�s�S����z������N�Z��驋��L�L���Q�k�ş��G���i����ↁ��ސِېڐߞ���@���������C��G�����S���ПƝ�[�T���אɐ͊֐Ȑǝ��A������I⣛p蔞��t����d�C�N���ӟ׈��ߛݙ���ܘ��x������㙘��A�����_�b����a���J������ஓϛ��Ƙj�b�H��ⳙA�G�S���L⒑W�s�r葁�������D�J���A�L��񙒐�枙@�ې�M���H����l�F�K���D�G�@�B��h���ǑN�������d�D���������牙��|�œҝ�ᝩ��⫟Ŗ�����������v�R呝y�H���������Ր������U���}�������[���������҂���ߝ�p�S爊��c���a���o�p���I�D�c�����E�R��䊔��T�����ωs��ꈝ��ؐ�������C�S��h�ᓩ�����]�T�\�����~�����u�y�����������齗V�������Œ��������s����v�ǐ��E���p�z����~�d���Ǘ�俑��Y�p�n���z�y��羝�裐���Ð������␕�΁�ʁ܁́�������ˁ��~�Ɂ���ځށ}��ȁ����́��݁��聹�后�����v袝x���������ž�谒N�ː��X���a�V���䐆����H�����������������ґ����]�Z������ʗ��������������������L�z�`��D�ߝX���z�i���擧�����A�B������P������D���Y�����`���L�������Z��迓��x���Z�x����w��圑����ȓ������G���F�a�Ǝb��乗��M�E�Ε��s�C�F���Z���n�����D�㈵㦋s�����]��Ŗl�^⚑�����A潓��g���Ζ�儞������ɖΏd����臐w�p����d�����[��g�����謎�姎��^���G�������N���H���˒��Ύ��܊m��������������\�ސːK�Ž��������K���o���q�҉����t�������ϔ����͚��͎��b�A�j���P�֎ٌ����ࡐ̝�咙��ݐ���┐Ԏ��^�Ύގڎ؎����Y�ώΎɎԎߎЈޝ��ȕi�S�G���CဋÎ����f�t偛W���V�z��������题����瑲���E�������f��������i�g�l�k�{�������蜕��婏o�F�����T��碏V�h�q���h�k�����F�J娏Q�K�����榊��S����酝��n�����������S�X�K�U��ڏM�G�j���a�E�N�����O�D�P�C�A�L�R�T�I���B�@���M�����᭚�����忏w�{�v�x�s�⡏t�u�r�f�����Z���u���Vꐚp�y���曐P�]�A���Ϝ����U�j�J��������f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�h�N�f�d��C�k���X���ĐL���T�Q�W�g�i�[�R�M�e�b�I�_�S���΋n�Z�����o䜏���_�י|���䓏��w�����b��򏎏����������ҟ����m䀛���u�L���Џ�������縐��מ�⪙ד��M�����v���R�����ߜ��c����B�_�џn���Տʈ䐯�����B辑����[����頏��[��␏ݚ����K♏����яҁ������u���i�]��疏ցj�i�Ӑ��Ԛ������Ϗ��U���J���n���ސ��Ŝ܏��ߏ�������ُ����Տ��G����������ଞ������ďޏ������������͏Ǐ����ɏ������������Џ��ۏ�暐��Ώ��̏ďƏ����͏ڏ����؏ɏ��ȏ������T�l������R�e�g�����p�@�C�ܑ��F�������D�I����冐B�������A�H�E❎o�o�w���v�����L���U�����������������n�юr���Ŏᎊ�t�r�@�����{���펦���Ϛ`���������i�Аy�э��i�@�����E����J�X拎}�泟���n���y�o�N�Z�y�z���ٛᝅ�f�׎��j�{��~����|���{�o���ߘ��I�X�B�]�K�������V�g���u�������p�`����i���k���q�l��藘ʛ�Ɠ��j��⏎s���_ꏎ���˔`���Œs��y�@���؎���䢊�o�u�e����ۚ~��礛��J�L��f�V�W�l�����Ȑ���������䰐囋�T��ᰗ����l�I�J���M����h���E�U�嶎��z�\�G�Ԟ��u���V���\���V���f�֟��X�M�ˍ��Ǐ�x���š�����皔��m��匈��^��꛽�O��@���՚N�����\�󎘊j���ې����ŒB睓N�@�d�q�b���P�m���b�q���嗝�W�����Ɣ��f���F��ⲝH�H�B�r���{�吷�W�vᵔu�t�ĉh�|�招��E�䋫�🛋t����剎������櫜��f�|��sट��E�a�`��㓝����������̜c���H�K�c�ߙӎ[�ǎW�Xㄐ��V�����������r�\�]�Z�P�R�Ӂ���3�Q�^O�R�U�S�Y�_�A�T�C�D�搔�@�F���D�N���Z����\�؛�������ԟ����˜�����G�Ɲ��r�ӎÎE�q�������淍K�ȍ���͙Pꎍ��`�B�ڛv�ɍ��V�ҍۍЍю��΍؍̍Ӎȍ֐čՍÍˍ��ҍٍ΍ō鑨�r��Şo焍��e�⩞��y���|�s�����k����w�����N���������������ʎh�S䳍�}�l�э��o���s�⍳�r���ԍ��đ����獸��������R���A��������m嬛O���������ÝL����������������������_�~��n�K�ዎ������������^�d�w�����@�����Y�����Y���ご�򄋄Z�Y���������������Á������W�n�ŽO���y�ʁ��������`��f�e�����W�_�T�������Z�T�r�V�\�X�����R�ЕbS]\|�\_s*[�����]\|�b\_s*[�\�Z�X�V�T]\|��\_s*[����������]\|�\_s*��\|�\\_s*\%(�H\|�I\_s*��\)\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�g\|��\_s*��\|�v\_s*[�v�X]\|��\_s*�n\|�\_s*��\|��\_s*�c\|��\_s*��\|�B\_s*[�B�X]\|��\_s*�C\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[�ĘU]\|�C\_s*��\|�\_s*��\|�}\_s*��\|�T\_s*��\|�G\_s*�Y\|�f\_s*��\|�V\_s*[�c��]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*�\|�\_s*��\|�b\_s*\%(�^\|��\_s*��\)\|�V\_s*��\|�]\_s*��\|��\_s*��\|�s\_s*[�m�E]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*�_\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|��\_s*[�J��]\|�]\_s*[�X�]]\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�֌��ڎu]\|��\_s*��\)\|7\_s*��\|�V\_s*��\|4\_s*��\|�S\_s*[����]\|�R\_s*�{\|�h\_s*�t\|��\_s*�u\|��\_s*��\|�A\_s*[�o��]\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|��\_s*��\|�c\_s*�e\|��\_s*��\|��\_s*\%(�_\|�C\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*[�Η�]\|�\_s*�\|�\_s*��\|��\_s*��\|�e\_s*��\_s*��\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*�X\|�^\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*�K\|�|\_s*[�“���]\|��\_s*�p\_s*��\|�G\_s*��\|��\_s*��\|��\_s*��\_s*\%(�X\_s*[�N��]\|��\_s*[�N��]\)\|�h\_s*�l\|�S\_s*��\_s*�g\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�e\|��\_s*��\|��\_s*\%(�@\|��\_s*��\_s*��\)\|��\_s*��\|�G\_s*��\|�\_s*�q\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|��\_s*[�T��]\|B\_s*\%(r\|�V\_s*�F\_s*��\)\|�g\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|�u\_s*��\|�A\_s*��\_s*�`\_s*��\_s*��\|�\\_s*��\_s*��\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|��\_s*\%(�V\|�s\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|�]\_s*�f\|�P\_s*�C\_s*�f\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�w\_s*��\|�l\_s*�b\_s*�g\_s*�T\_s*�[\_s*�r\_s*�X\|�U\_s*\%(�b\_s*�N\|�N\_s*�Z\_s*��\|�r\_s*�[\_s*�l\|�E\_s*�o\_s*�[\|��\_s*�[\_s*�N\_s*��\_s*�E\_s*�g\|��\_s*�U\|��\_s*�c\|�C\_s*\%([����]\|��\_s*�[\|�f\_s*��\)\|�[\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\|�[\_s*�~\|�i\_s*�g\_s*��\_s*�E\_s*��\|�]\_s*\%(��\|��\_s*�f\|�[\_s*\%(��\|��\_s*��\_s*�Q\_s*��\)\|�t\_s*�B\_s*�[\)\|�W\_s*\%(��\|�[\_s*\%([�O�N]\|��\_s*��\_s*[�X�Y]\)\|�O\_s*��\_s*��\_s*�g\|��\_s*\%(��\_s*��\|�O\_s*�V\_s*��\_s*�s\_s*�[\_s*��\|�e\_s*�[\_s*�[\)\)\|�G\_s*�X\|��\_s*��\)',
-        \ 'T' : '\%([Ĝ������R��牉ș��h���Ќ���☝��ω����i���מR���h�����|�������������������c���H����֓�騗���䄋�㜐C䃕����ۏQ榔y�����F�b����r�\����c�����͙��ʓՓך��c�����J������ٓؓڏx�J���Ś�ɍΖ����r���q�N���P�ь{�ԍǝ��ؗ�沖L௜{�ꂜՓ��“��Γ������W�ٟX�B�[�����ѓ�������w�䓄���������~��㫙ٚ���Ċ���U�j����㉱�}�b�馝��F�D����㛎���衞��Cẞ�T�Λ�⅞��M�D�����ğ�椈ꊛ�됀�z�c�����b�u�����ٓ��幓������������������铝�������~����鍓��������򓀓��������������˓t���O�O�̓��m��N�l�ےE�j�q�Ě��\�Z�g�\�莾���p�y�o�o�V�v���Ϗ\�p�{�n�l�n���Z���Ên�򖁞��i���^�y���r䷟��ː}�~�ēe��x�h�u�����r�l�W�P�Ȏ������W�����d�͖����o�R瘉���NནL���J�U��猓H�z���ћ�迟h�A�V�V�z�D�������C�U�A�����d�F�D�x�[���^�៓U�z���a�Z�W�L⽓Y�Q�I�N�G�P���O�c�S������L��ǒ��t�ɞq�ؚ��|��Y�B�h������������@���������稒����ఒ����A���e����ƜV��•��͕��皁�I���������T�P��ז��g�w�ΐى����W�h��іʏ`�t�I�␎���a�S���ڎB�ڐR����ȕ�p�A�n䆉��җ��I�~����焍ߑ��c�z�ߝ����旾���񕌋u���i�����d�͌��g����Q�ǒٚ�؍j�q��塔|�ȕ�ȓ`�B�\�����Չ���㔖�ꉌۑ����ԔԒ̒��v����׏I�Đ��ȒŒǛ��錼�ə��ݙ������������֒ߘ��r�s�s�n���U�T�ӑn�쑢���L���U�����Ό���C���U�֋ސT�Ĝ������ɏՔ��ːs�x���A���t�����y�Õ��Z㋓���ᶌp�k���l�ϐڒʍ��A����h�ՍJ����������Y�_���������Z�o�T���S���N���Ē������������N���Z��������m�֖����’������ޒ}�z���k���e玐��ŗ͓�ߝQ��E�������浖מ`�k�I⌒��O���Ւ����������P蠒����e���Ò�����隓C��U�ǒ����ݟ������l����L�y�’��kꓜ����j���L�K�ӝ���U�o�������{�⒳���\�_���񒝓����[�������������d���������������}���ޒ�����������渒������������x�a�Q�C�N�����I�Ԓ��J�n�����h���f���R�h�t���������n�p�o�m�~�n���@�������������ؒ��������r���p�U�T�u�Ռ��l���h�⚐�tꃒy�ƒw���o�n��v���qᗒv�������k�s��m�x����J�}���֓}�Ԑu���g�q�K���f�e�މ˞���M�o���R�ВLᷖ�非ٌ✔�����y�g栟����˘����l�|�]��漒K�^�ȏ̎]�D���M骓l�D����e�Ȓ@�i�h�g��Ⰽk�X�Y�S��ݛ̝E�Y�U�ԕۏ��X�I���H��蒎a����F�C�{�����}����C�J���F�מ��l��S�s韞����퓃��������ࣕY�ۈɐ���������Ғ����k�B���z�n�Ҋm�����������t�ԚK���p���ЋB�����ŗY����k���˜[�]����썰�͗����K�’e���ʖd休��s�b��饕����|�c�G�鎿�B�ٍ��k���e�d��뛹��k殔C�ĉF���b�W�V�O�������x�h�^���В|⹑��������t�M�闲�F�����������֜Ӝ`�d�H�[�t���؜��T�j�ݝ^���W�h�]������ßp�~���K�����ϓ̝����W�������`�^W�UႚV�J�Rἔ�C�V�Q�a�_�\杒O�S�X�W�Y�b�Z�d�ÒT�P�A�p�]�����鮓F���ѝF�U���V�f�{�������I����痑��~�x�����擑���H�\讖w�����ʝ���[���O���l���ߑړ����ܒ��Б⛔�E�ܑՑ͑����ۑґؑ��ݑ���ّё̑בޑ�΋��H���f��茘ǒ����������֚ꑫ�����—���]�l���o���N�O�ϗ��┭�蛀�S�����u�����N���ЍٚB�_�������P�c�B睘��S���W���`�V���~�^�Γy���s�f������E������\��؃X�W�����ƃU���c�N�]�����������g�`�E�c���[�^�s�S�������������������ф����������e����������T]\|�\_s*[�����]\|�b\_s*[�g�e�c�`�^]\|��\_s*[�ƂÂ���]\|�\_s*��\|��\_s*�n\_s*��\|��\_s*[���]\|�\_s*�\|��\_s*�l\|��\_s*��\|��\_s*�V\|��\_s*��\|�i\_s*[���v]\|��\_s*�P\|�h\_s*��\|��\_s*��\|�D\_s*��\_s*��\|��\_s*[�Ŗ�]\|��\_s*[�q��]\|�W\_s*��\|��\_s*��\_s*�E\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�x\|�G\_s*[�ߓ��h]\|��\_s*[����]\|�F\_s*�N\_s*��\|�i\_s*[�v�q]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|��\_s*��\|��\_s*�j\|��\_s*�j\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*��\|��\_s*��\|�g\_s*��\|�Z\_s*��\|�Q\_s*�~\_s*�S\|��\_s*\%(��\|��\_s*�q\)\|�S\_s*[���Z]\|��\_s*\%(��\|��\_s*�a\)\|�X\_s*��\|��\_s*�X\|�\_s*�J\|��\_s*�~\|�~\_s*�J\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(��\|0\_s*��\)\|�P\_s*\%(��\|�O\_s*��\)\|��\_s*��\|��\_s*�l\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(�v\|��\_s*�F\)\|�g\_s*��\|��\_s*��\|�`\_s*��\|��\_s*�w\|��\_s*\%(�V\_s*��\|��\_s*�F\)\|��\_s*\%([��]\|�[\_s*��\|��\_s*��\_s*�N\)\|��\_s*�v\|�r\_s*�q\|��\_s*�r\_s*�q\|��\_s*[�a��]\|��\_s*��\|��\_s*��\|�@\_s*��\_s*��\|�L\_s*�q\|�S\_s*��\|��\_s*��\|�]\_s*�h\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|�G\_s*��\|�u\_s*[�˔�]\|�k\_s*�J\|��\_s*�\|��\_s*�I\_s*�q\|��\_s*�a\|��\_s*�p\|��\_s*[����]\|�A\_s*��\|��\_s*��\_s*�\|��\_s*[���]\|��\_s*��\_s*�\\|��\_s*\%(�\\_s*��\|�A\_s*��\_s*[����]\)\|�t\_s*\%(��\|�{\_s*�V\)\|�h\_s*��\|�e\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*�s\|��\_s*\%(�[\|��\_s*�q\)\|��\_s*�v\|��\_s*��\|�P\_s*��\|��\_s*��\|��\_s*\%(��\|�\_s*��\)\|�E\_s*��\|��\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�s\_s*��\|��\_s*��\|�E\_s*�w\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|�\\_s*[���V]\|�w\_s*��\|�\_s*��\|�i\_s*�K\|��\_s*��\_s*�p\|��\_s*�B\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|�f\_s*�B\_s*�X\|�R\_s*��\_s*��\|�\_s*�l\|�\\_s*\%(�[\_s*[�g���v]\|��\_s*�[\)\|�w\_s*�[\_s*�O\|�[\_s*[�C�����A]\|�Z\_s*\%(�I\|��\_s*�}\|��\_s*\%(��\|�j\_s*�A\_s*�X\)\|��\_s*�s\_s*\%(�[\|�X\_s*�g\)\)\|�V\_s*\%(��\|�b\_s*�N\|�X\_s*��\|�A\_s*�^\_s*�[\|�\\_s*�[\_s*��\_s*�X\|�I\_s*�h\_s*�A\|�[\_s*[�t�^]\)\|�T\_s*\%([�C��]\|�~\_s*��\_s*�O\|�E\_s*�U\_s*��\_s*�h\|��\_s*�u\_s*��\_s*�b\_s*�h\|�[\_s*\%([�h��]\|�e\_s*�B\|�X\_s*�g\_s*��\|�Y\_s*�f\_s*[�C�[�B]\|�}\_s*��\)\|�b\_s*�`\_s*��\_s*�[\|��\_s*\%(�N\|�_\_s*�[\|�L\_s*��\_s*�[\)\|��\_s*�h\_s*�}\_s*�C\_s*�h\)\|�|\_s*��\_s*�y\_s*�v\_s*�`\_s*�h\|�O\_s*\%(�a\_s*�y\|�A\_s*��\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*��\_s*��\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|�p\_s*��\|�d\_s*\%([���b]\|�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\)',
-        \ 'U' : '\%([��y����h�������f�[�l�e���񓴑a�؈����Ϗ��鎽�[�X���D�W�r䷙\��w���u���ќ��z���D鴑��ߚX�����i���^���R�忓��L�M�f��~���ӏ��r戉�楓]��揗w搉S�^�̗��É��򃑂��k�։\�u�����L�G�Q�m���P�O���H⣑��Q�m�����I��V�ߊ��a�������X�S�n�|�o�J���U�󎜚y�팻���ʉf�ژ��ⓐx���ԋ����ʏ��ϙ���܉��A�]りC���D�]��^�@����T�A��������m����S���Y�v�_�������Z�r����N�������T���T�ݗ��Ɠ��Z�J���j���J�ʼnF���A���L�n�ћa���L�ǎ�䥟������H�ӉE������Z���p�Q�G�����ˌ����̉K������Ꚗo�e���Y�^�I�����N�����t�҃E���T��U]\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|�y\_s*��\|��\_s*�y\_s*[����]\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�`\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|�C\_s*�M\_s*��\_s*�X\|�I\_s*�}\_s*��\|��\_s*��\_s*�s\_s*�\\|��\_s*\%(�p\_s*��\|�L\_s*��\)\|�A\_s*\%([�X��]\|�O\_s*��\_s*�[\|�[\_s*\%(�V\_s*��\_s*��\|�W\_s*�F\_s*��\_s*�g\|�o\_s*��\)\|��\_s*�e\_s*�B\_s*��\_s*�b\_s*�g\|�|\_s*��\|�b\_s*\%(�v\|�p\_s*�[\|�V\_s*��\_s*�[\)\)\|�P\_s*\%(��\|��\_s*��\)\|��\_s*\%([�^�j�[]\|�g\_s*\%(��\_s*��\|��\_s*�q\_s*�g\)\|��\_s*\%(�A\|�V\_s*�[\_s*�Y\)\|�v\_s*�V\_s*��\_s*��\|�l\_s*�X\_s*�R\|�i\_s*\%(�J\_s*�C\_s*�g\|�C\_s*�e\_s*�b\_s*�h\)\|�r\_s*�L\_s*\%(�^\_s*�X\|�m\_s*��\)\)\)',
-        \ 'V' : '\%([�F���l�u�۔ńB�r���Ƀ�V]\|�\_s*�\_s*�\|�b\_s*��\|��\_s*��\|�\_s*�\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|��\_s*��\_s*�D\|�`\_s*�F\_s*��\|��\_s*�^\| \_s*�r\_s*�N\_s*�g\_s*�[\_s*��\|��\_s*�o\|��\_s*�z\|�j\_s*�X\|��\_s*��\|�P\_s*�^\|��\_s*\%(�f\_s*�B\_s*��\|�M\_s*�i\|�j\_s*�X\|�Z\_s*��\_s*��\|�N\_s*�`\_s*��\|��\_s*�L\_s*��\_s*�[\_s*��\|��\_s*��\_s*�[\|�[\_s*�j\_s*��\)\|��\_s*�b\|�{\_s*\%(�X\_s*�g\_s*�[\_s*�N\|��\_s*�S\_s*��\|��\_s*\%([�K�{�g�^]\|�e\_s*\%(�b\_s*�N\_s*�X\|�[\_s*[�W��]\)\)\|��\_s*��\_s*�[\_s*��\|��\_s*��\_s*\%(�`\|�e\_s*�B\_s*�A\|�^\_s*��\_s*�[\)\|��\_s*�[\|�R\_s*�[\_s*�_\|�[\_s*\%([���g�O]\|��\_s*�g\|�h\_s*�r\_s*\%(��\|��\_s*�A\_s*��\)\|�p\_s*��\|�_\_s*�t\_s*�H\_s*��\|�J\_s*\%(��\|��\_s*�X\_s*�g\)\)\|�L\_s*��\_s*�u\_s*��\_s*��\|�C\_s*\%([�h�X]\|�W\_s*��\_s*�[\|�V\_s*��\_s*�O\)\)\|�w\_s*�b\_s*�g\|��\_s*��\_s*��\|��\_s*��\|�t\_s*\%(�@\_s*\%(��\|�h\_s*�[\_s*�c\)\|�H\_s*\%(��\|��\_s*\%(�N\|�J\_s*�[\)\)\|�F\_s*��\_s*��\_s*�[\_s*��\)\|�E\_s*\%(��\_s*\%(�f\_s*�B\_s*�~\_s*�[\_s*��\|�W\_s*\%(�~\_s*�[\_s*��\|�[\_s*�~\_s*��\|�I\_s*�X\_s*�g\_s*\%(�N\|�b\_s*�N\)\)\)\|�B\_s*\%(��\_s*�i\|��\_s*�X\)\|�H\_s*�b\_s*�J\|�C\_s*\%(��\_s*�X\|��\_s*�i\_s*�[\)\|�F\_s*\%(��\_s*�M\_s*��\_s*�E\_s*�X\|�k\_s*�X\)\)\|�r\_s*\%([�A���u�o�X�U]\|�K\_s*�[\|�n\_s*�[\_s*��\|�^\_s*�~\_s*��\|��\_s*\%(�b\_s*�W\|��\_s*�C\)\|�r\_s*\%(�A\_s*��\|�b\_s*�h\)\|�b\_s*\%(�N\|�L\_s*�[\)\|�Z\_s*��\_s*�e\|�N\_s*\%(�^\_s*�[\|�g\_s*\%(��\|��\_s*[�[�A]\)\)\|�V\_s*\%(��\_s*�X\|�\\_s*��\_s*�[\_s*�Y\)\|��\_s*\%([�`�X]\|�\\_s*��\|�e\_s*�[\_s*�W\|�Z\_s*��\_s*�g\)\|�l\_s*\%(�K\_s*�[\|�O\_s*��\_s*�b\_s*�g\)\|�j\_s*\%([�[��]\|��\_s*�f\_s*��\)\|��\_s*�[\|�G\_s*��\_s*�`\_s*��\_s*��\|�W\_s*\%(��\|�b\_s*�g\|�^\_s*�[\|��\_s*\%(��\|�i\_s*��\_s*�[\)\|��\_s*�A\_s*\%(��\|��\_s*�C\_s*\%(�Y\|�[\_s*�[\_s*�V\_s*��\_s*��\)\)\)\|�_\_s*��\|�f\_s*�I\|��\_s*\%(�S\|�k\_s*�[\_s*�u\)\|�I\_s*��\|��\_s*�W\_s*�A\_s*��\|�B\_s*�[\_s*�i\_s*�X\|�[\_s*\%(�{\|��\_s*�X\|�N\_s*��\|�i\_s*�X\)\)\|�x\_s*\%([�K����]\|�g\_s*�i\_s*��\|�C\_s*�_\_s*�[\|�[\_s*\%(��\|�_\_s*�[\)\|�e\_s*��\_s*��\|�b\_s*�Z\_s*��\|�X\_s*\%([�g�^�p]\|�r\_s*�I\)\|�N\_s*\%(�^\|�g\_s*��\)\|�W\_s*�^\_s*\%(�u\_s*��\|��\_s*�A\_s*��\)\|��\_s*\%([�B�[]\|�t\_s*�@\_s*�C\|�T\_s*�C\_s*��\)\|��\_s*\%(�i\|�V\_s*�e\_s*�B\|�[\_s*�i\|�j\_s*[�J�N]\)\|��\_s*\%(�f\|�x\_s*�b\_s*�g\|�_\_s*��\|��\_s*�[\_s*�k\|�T\_s*\%(�[\_s*�`\|�C\_s*��\)\|��\_s*�b\_s*�g\)\|�m\_s*��\|�j\_s*[�X���A]\|�l\_s*\%(�V\_s*��\_s*��\|�c\_s*�B\_s*�A\|�`\_s*�A\|�Y\_s*�G\_s*��\)\)\|�o\_s*\%([����]\|�C\_s*\%([�A�u���I]\|�p\_s*�[\|�^\_s*\%(��\|��\_s*�e\_s*�B\)\|�L\_s*��\_s*�O\|�U\_s*�[\|�V\_s*��\)\|�b\_s*�g\|�`\_s*�J\_s*��\|�M\_s*�i\|�K\_s*�{\_s*��\_s*�h\|��\_s*\%(�i\_s*�V\|�G\_s*�e\_s*�B\)\|�T\_s*��\|�X\_s*\%(�R\|�P\_s*�X\)\|�J\_s*��\_s*�X\|�P\_s*�[\_s*�V\_s*��\_s*��\|�L\_s*��\_s*�[\_s*��\|�E\_s*�`\_s*��\_s*�[\|��\_s*\%(��\|�G\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�[\|�A\_s*\%(�u\_s*��\|��\_s*�g\)\|�b\_s*�h\|�f\_s*�[\_s*�V\_s*��\_s*��\)\|�k\_s*�A\_s*�c\|�j\_s*\%(��\|�[\_s*��\)\|��\_s*\%([���[]\|��\_s*��\|��\_s*�[\|��\_s*\%(�V\_s*�A\|�`\_s*�m\|�^\_s*�C\_s*��\)\)\|�[\_s*\%([�S�O]\|�`\_s*��\_s*��\|��\_s*�g\_s*�D\_s*�[\_s*�h\|�o\_s*��\|�{\_s*�X\|�x\_s*�i\|�e\_s*�B\_s*�J\_s*��\|�T\_s*�X\|�W\_s*\%(��\|�j\_s*�A\|��\_s*��\)\|�m\_s*��\|�j\_s*�A\|��\_s*��\_s*�g\|�~\_s*\%(��\_s*�I\_s*��\|�L\_s*��\_s*��\_s*�C\_s*�g\)\)\|�i\_s*\%(�L\_s*��\_s*��\_s*�[\|�W\_s*�E\_s*��\)\)\|�u\_s*\%(�C\|��\_s*\%(�h\|�b\_s*�h\)\|�[\_s*�h\_s*�D\_s*�[\)\)',
-        \ 'W' : '\%([��������������ɒj�����Y��y����h�����ȃ҃��f�[�l�e���񓴑a�؈������鎽�[�X���D�W䷙\��w���u�ќ��z���D鴑��ߚX�����i���^���R�忓��L�M�f��~���ӏ��r戉�楓]��揗w搉S�^�̗��É��򃑂�k�։\�u�����L�G�Q�m���P�O���H⣑��Q�m�����I��V�ߊ��a�������X�S�n�|�o�J���U�󎜚y�팻���ʉf�ژ��ⓐx���ԋ����ʏ��ϙ�����A�]゜��D�]��^�@����T�A��������m����U�S���Y�v���������Z�r����N�������T���T�ݗ��Ɠ��Z�J���j���J�ʼnF���A���L�n�ћa���L�ǎ�䥟������ӉE������Z���p�Q�G�����ˌ����̉K������Ꚗo�e���Y�^�I����������܉������c��㘟|���͊��Ϗp���ԉЍЋƋZ�����ǁ������k�Y���e�o���n���m�܏Νt������s����f�����^�]�o�_�r�q�p�c���i���q��ǘj�n�Ȏ��F�G�d�̘e���Θc�Q�C崙N���Z��Д����ʒt�ሽ�g�f�h�a�Œ�f�Z�N��O�֔j���c���l��H���`���b�̔i�핝���Ȕg�v�E��W]\|�\_s*[�������]\|�b\_s*[�����E����]\|��\_s*[������]\|��\_s*��\_s*�~\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|�y\_s*��\|��\_s*�y\_s*[����]\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|��\_s*��\|�o\_s*�D\|��\_s*�Y\_s*��\|��\_s*��\|�i\_s*��\_s*�j\|(\_s*��\_s*)\|��\_s*[����]\|�R\_s*��\|�Y\_s*�z\|�x\_s*��\|Y\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|�x\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�R��]\|��\_s*��\|�a\_s*�t\|��\_s*��\_s*��\_s*�D\_s*�\|��\_s*\%(�`\|��\_s*�m\_s*��\_s*��\)\|�^\_s*�B\_s*��\_s*�D\|��\_s*\%(��\_s*��\_s*��\_s*�E\_s*��\_s*��\|��\_s*��\_s*��\_s*�E\_s*��\_s*��\)\|�u\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|��\_s*��\_s*�O\|��\_s*\%(��\|�C\_s*�X\|�b\_s*�J\_s*�[\|�X\_s*\%(��\_s*�[\|��\_s*��\_s*�O\)\)\|��\_s*\%(�[\_s*�X\|��\_s*�N\_s*��\|�X\_s*�g\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(�b\_s*\%([�v�p]\|�s\_s*��\_s*�O\)\|�C\_s*\%([�^�g]\|�e\_s*�B\_s*��\_s*�O\)\)\|�{\_s*��\_s*�t\|�t\_s*\%([���[]\|�@\_s*�C\_s*��\|�B\_s*\%(�[\_s*�g\|�b\_s*�`\)\)\|�z\_s*\%(�G\_s*[�C�[�A]\|�[\_s*��\|�C\_s*\%(�[\_s*\%(��\|��\_s*�[\)\|�b\_s*\%(�v\|�X\_s*��\|�p\_s*�[\|�g\_s*\%(�j\_s*�[\|�}\_s*��\)\)\)\|��\_s*\%(�C\|�b\_s*[�g�c]\)\)\|�x\_s*��\_s*�i\_s*�[\|w\_s*e\_s*b\_s*�T\_s*\%(�C\_s*�g\|�[\_s*\%(�o\|�r\_s*�X\)\)\|�x\_s*��\|�o\_s*��\_s*�^\_s*�[\|��\_s*\%(��\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|�H\_s*��\_s*�t\|�B\_s*\%([�[��]\|��\_s*\%(��\|�w\_s*��\_s*��\)\)\|�F\_s*\%(��\_s*�_\_s*�[\_s*�X\|��\_s*�i\_s*�[\|�[\_s*�o\_s*�[\|�C\_s*��\)\|�@\_s*\%(�C\_s*[���X]\|�[\_s*�O\_s*�i\_s*�[\|��\_s*�_\|��\_s*\%(�^\_s*�[\|�L\_s*��\_s*�[\_s*��\)\)\)\|�_\_s*�u\_s*��\_s*��\_s*�[\|�^\_s*��\_s*�O\_s*�X\_s*�e\_s*��\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-        \ 'X' : '\%([��H����F����D����B����@���w���V���~��X]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�V\_s*��\_s*\%(�z\_s*��\|�t\_s*�H\_s*��\)\|�W\_s*�I\_s*��\|�[\_s*\%(�r\_s*�E\_s*�X\|��\_s*\%(�b\_s*�N\_s*�X\|�O\_s*��\_s*�t\_s*�B\)\)\|�n\_s*�r\_s*�G\_s*��\|�U\_s*\%(��\|�r\_s*�G\_s*��\)\|�L\_s*\%(�V\_s*\%(��\|��\_s*��\|��\_s*�g\_s*�[\_s*��\)\|�Z\_s*�m\_s*��\|�T\_s*��\_s*\%(�`\_s*��\|�^\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|�N\_s*\%(�V\_s*�[\|��\_s*�X\_s*�|\_s*�X\_s*�g\|�Z\_s*\%(�i\_s*�L\_s*�X\|�m\_s*�t\_s*�H\_s*��\)\|�U\_s*��\_s*�B\_s*�G\|�T\_s*\%(�C\|��\_s*\%(�g\_s*�X\|�`\_s*�b\_s*�y\|�e\_s*�B\_s*�b\_s*�y\)\)\|��\_s*�X\_s*�}\_s*�X\)\|�G\_s*\%(�N\_s*�X\|�b\_s*�N\_s*�X\)\)',
-        \ 'Y' : '\%([։ߕ֍������H�V�ş�ꔗ����؊��Z���ݝ����g���Z�|�~�}�����Ĕ���ϑ��b���b���щx�X�����\���c���c�U���i�F��g�`ᇞ����՗x�揜J�L�Ȟ@�f�����uꡜ���y�����s�@����T��ᘟ���~���m������籝X�yꢗq�s�i�^�w�g�j�s�f��g�t匍��r�o�����חl�d�p�n�їw�z�m�Ï��h�^�S焛@�����㏜棟b���a�Ǘ_�P�`���]�r�Ĕ��S��㿉r���\�\�Q���P�a�����o�K�l�l�P�I�^椂��㒏����̎͒o�ɒ�����t沖L��u���V�K�ᛮ�|��w�䓎樏�ଉ�����������w��亗W���z�F����C�Q���������ޗC�G���E�P�Z�X�N�O�S�З[�H�I�֗F�Y�J�L�k��ሖ����@�g�V�h��O䥝��R埙`�����A懝����|�������M���g���J�䲃���ꍘc�U�T���������n�������翔�䑌���������恍ݍ��������r�x�������É��j囚|���d�Q�U���|��軗��Ƒ������B�d���{���Nj�佈��䆍��m�n�ؐF���A�t����F������泌Ìމ��L�����d�������ƜјJ���i��ꌒ��Փk�v����ɔžo���������֌��y������M�E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�����w�����~�N�}�z�c���c��硉Ɏ��h�����䕟J����s�W���]�b�K�\���Tฐ��]�r����m�П��Ȉ��Z���Ԉ��T�D�M�Κ�I�����C��������m��覉@������u�B�A��A�ޛ���j�H���و�Ί�ֈ�È�1�P�����D�y���I��D�R�����۔џ��ʈዏ�H�ƍ֋U�������h�w�ψ͉]����}�u�b�v���]�Ό��≝�g�М���@�E���S��盈���B�Ο��ݑP�����R�҈Ȋ��U�ג��ߘߛ��ږ����ˆ̈،܈Η��͜}�Ė��ˈ��ԍs��਒_�ˑ��������ޗǓ��o�֗��D�K���~�������䏈ӈۈ��؈ً����e����Ԅ`���t�c���b�ّ������q���ۈŔs���M���l����h�E�`�_�ʗ�S�Q���n���a�_��–z�l���˗D���y������ي��VꞟK������o���Z�މv�N��u��������k����欎��淏��k�q�s�t�r�R�Кݓ@�D洗{�k����J�їT���׈Ջx�ۍN����❔������J�Ĝ\��̖��t�j熔W���쉮�ƕa����ߖ����ˎܓi�댭ውƔ��E�~�������x�u�E�~�����������v�F�����������J�҃C�\���z��Y]\|�\_s*[�ղ�]\|�b\_s*[�����C��]\|��\_s*[��䂢��]\|��\_s*��\_s*�b\|�^\_s*��\_s*�b\|�I\_s*��\|��\_s*��\|�B\_s*��\|�I\_s*��\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|4\_s*\%([�“�����]\|��\_s*��\|��\_s*��\)\|��\_s*��\|�m\_s*�j\|��\_s*��\|��\_s*��\|�F\_s*��\|��\_s*��\|��\_s*[�q��]\|�j\_s*��\|�h\_s*�L\|�@\_s*��\|�V\_s*��\|��\_s*[���j]\|��\_s*[�q��]\|�i\_s*��\|�W\_s*��\|8\_s*��\|��\_s*��\|�t\_s*\%(��\|�^\_s*�[\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�S\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(�Y\|��\_s*��\)\|��\_s*�M\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*�[\_s*��\)\|�a\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�c\_s*�J\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\|�~\_s*��\|��\_s*��\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�h\_s*[�‘�]\|�@\_s*��\|U\_s*\%(��\|�^\_s*�[\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�E\_s*[�c�R]\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�C\_s*��\|�]\_s*[���o��Z]\|��\_s*��\|��\_s*�q\|�_\_s*��\|��\_s*��\_s*��\|��\_s*�r\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*[����]\|�p\_s*\%([�꓍��]\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ȉ���]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|�s\_s*[�”@]\|��\_s*�{\|��\_s*��\_s*��\|��\_s*��\|��\_s*�L\_s*�n\|��\_s*��\|��\_s*[�c��]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|�V\_s*�\\|�`\_s*�G\|��\_s*�{\_s*��\_s*��\|��\_s*�a\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*�t\|��\_s*��\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�q\|��\_s*[���j]\|�G\_s*\%(�z\_s*�o\|�t\_s*�Q\_s*�j\_s*�[\|��\_s*��\_s*�@\_s*��\|�j\_s*�Z\_s*�C\|�[\_s*��\)\|��\_s*�C\)',
-        \ 'Z' : '\%([�󉀉��ꑹ��������㔛������������������m�ґX�����f�h�ّ��������ۑ����Y���\�����]��萊��A�K㿑R��䒑U�W�N��征͑V陑T�P�Q�f�O�S�␨������ҐƐŐ��U�ӂ��ž����l�b齕�����A�Z�B������@笐��������C���t�Ó��|�~�D�}���ߍ������󓈎ȓ��������ǎ����w�x����c��H苎ҍ��׎��l�����������㒼�Ó�����K���������H�Ԙ�ᶙ��b�����i�u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l�ŏ��ғ�䴞`䥝�募��t�J����珊�R���������P�����ԟ��i�Uㅏ��{�o������媝m�h���鈐������Y�t��������Y����竐������j�g�@�ݖ�����Ï��ꏗ�����`������~�]��꞊��󝵏������������������G�����A�ژh�G�Q榜휵���@���u���Q�x�h�m��n���p�q���m�m⢙Ï��|⡓���՟��~�[�x����{䤏��z���������y�}�������}��汎�������������G�����E�s���n�𘸏^�F�_�`���O�c�a�_�Y���[�b�]�\�Z�e�d�������m�����������莣���^���y�~�����������i���J玎�������Ȓn�����􎤎��~�������I�m�������V�����k�q���H�j�a�Z���d��������䢎������m�������V�������␷��╍蛽�N���M�����赞��ƎL�G�R�Z�Q�S��ₜ�͛؜�k�O��槎S�b�Μ͎a�c�Z�ː��čϙ����܍ލ��ߍݍ�o������U��������������Y�������]���[�������G�w�Y�]��Z���U�y�W�[�x�ĄH��Z]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�]�[�Y�W�U]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|�o\_s*��\|��\_s*[�����q]\|�\_s*�\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|��\_s*��\_s*��\|��\_s*��\|�O\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|�\_s*�\|��\_s*�p\|��\_s*�o\|�C\_s*�@\|�m\_s*��\|��\_s*��\|�k\_s*[�ߌY]\|�\_s*��\|��\_s*�s\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|�\_s*�\|G\_s*\%(��\_s*��\|�p\_s*��\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�Q\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|J\_s*\%(I\_s*S\_s*�R\_s*�[\_s*�h\|�|\_s*�b\_s*�v\|R\_s*��\_s*��\_s*�{\)\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�i\_s*\%(��\_s*�[\_s*�O\|�|\_s*�b\_s*�v\|�t\_s*�m\_s*�j\_s*�n\)\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|�\_s*�u\|�e\_s*��\|��\_s*��\|��\_s*��\|��\_s*�{\|�U\_s*��\_s*��\|��\_s*�H\|��\_s*��\|�T\_s*\%(��\_s*��\|��\_s*�|\_s*�[\_s*�j\_s*��\|��\_s*�S\_s*�T\)\|�V\_s*\%(�^\_s*�[\_s*��\|�I\_s*\%(��\|�j\_s*\%(�X\_s*�g\|�Y\_s*��\)\)\)\|�`\_s*\%(�N\_s*��\_s*�X\|�A\_s*�m\_s*�[\_s*�[\|��\_s*�[\_s*��\_s*\%(�q\|�b\_s*�q\)\|��\_s*��\_s*�_\_s*�b\_s*�V\_s*��\|�S\_s*�C\_s*�l\_s*��\_s*��\_s*�C\_s*�[\_s*��\)\|�c\_s*\%(�@\_s*\%(��\_s*�g\_s*�D\_s*�X\_s*�g\_s*��\|�C\_s*�g\)\|�F\_s*\%(�i\_s*�[\|�b\_s*�y\_s*��\_s*��\|��\_s*�}\_s*�b\_s*�g\)\|�B\_s*\%(�N\_s*��\_s*�X\|�^\_s*�[\|�[\_s*�O\_s*��\_s*�[\|��\_s*\%(�o\_s*��\_s*��\|�}\_s*�[\_s*�}\_s*��\)\|�S\_s*�C\_s*�l\_s*��\)\)\)',
-        \ }
-endfunction
diff --git a/bundle/easymotion/autoload/EasyMotion/migemo/eucjp.vim b/bundle/easymotion/autoload/EasyMotion/migemo/eucjp.vim
deleted file mode 100755
index 9c9a3b2..0000000
--- a/bundle/easymotion/autoload/EasyMotion/migemo/eucjp.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-function! EasyMotion#migemo#eucjp#load_dict()
-    return {
-      \ 'a' : '\%([���������Գ���ȯϾ�տ��ƭ�����޾���ӡ��Ť�������Ƭѫ������ͷ�ʷ��İ�Ϳ���������������������ø�������ܶ�������̵����ܵ���������驰��н�������ƪ��鷹ѻ�����ˢ��ǽ�����������ܽ����֦���½�Φ����ؽ����Ǯ�����Ȳ���䰵�Ǵ�������ռ��ݯ�м�������Թ���������ڹ����������ײ�Ϫ��ɽ��������������¹�ͽЮ���������ɷ������庾Ӻ̴������ɵ�����ఽ���������������;������ŷ�������°�����ֵ��ϰ�̣������Ԫƴ�����갮����������������������������ů��ۭ��μ������氰�ﾽϯ�����۸�ޫ��������ۦۥ���˾Ͼ������������������Լݷ�����ʸۣ��齶��ϰ����갥���欷�����԰ǰ��ްưð���Ȱ�����ī�ﰦ��������ð�������­���ҹ������Ӽ밫�Ƽ�������ǹ��������˽�����������������˰����ķ��°���մ���尤�Ը��ʻ�����������ᰢͭ�������˴������±޽�����ک�����г���󰸶�˰ب�Ĥ����������&�ʢ����ܶ��϶���΢����͢����޸姸���ơ��������ǡ�����򦡥��ѧ�a]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*ŵ\|��\_s*��\|��\_s*��\|��\_s*Ʀ\|��\_s*��\|��\_s*��\|��\_s*̾\|�\_s*̾\|��\_s*��\|��\_s*��\|��\_s*[��Ļ]\|��\_s*��\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|¹\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*ʪ\_s*��\)\|��\_s*��\_s*��\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|ޱ\_s*��\|��\_s*��\|Ʀ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*¿\|��\_s*��\|��\_s*��\|��\_s*[������Ǭ]\|��\_s*��\|��\_s*[��ɧ]\|��\_s*��\|��\_s*��\|��\_s*��\|Ҹ\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*[�ˡ�]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|D\_s*��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[ɿ�ͽ�������]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\_s*��\_s*A\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*ư\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|°\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\_s*��\_s*ǽ\|��\_s*��\_s*��\_s*ǽ\|��\_s*ˡ\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([�������ȥ��]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*ǽ\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|A\_s*\%([tlrImc]\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|��\_s*��\_s*��\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*��\_s*��\_s*��\_s*��\|L\_s*T\_s*��\_s*��\|��\_s*��\_s*��\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|d\_s*a\|M\_s*��\_s*��\_s*��\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Ͽ\|��\_s*\%([������]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([�˥ᥢ����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)',
-      \ 'b' : '\%([���߹�������������������������������������ڽھ������������������˲������������ѳ����������̶���˦��꼰����汬�������˳ر˸��˹��˻˶����˺����������˴��˾����˵˿���������������������籸�����촳Ħ����˷ը����˫���������������ѹ���������ʽٷ��ҡ��������޺�����������������������˼������ūʥ��޽޼�����������޿������������������ʪ�ɲ�ʹʸ��̵�����������ʬ�������������������ק�������￡����������͹�������ɵɤ�����ޣ�����ֱ�������ؾ��ݧ���������������ɴ�����졪�¡�����ɼǭ��֢���ʿ������������������ջ��������̤��������������������׹߾������������Ȣ�����®�Ӷ�˪����ȭ��ƯȫȪʵ��ɡüΥ��V̥����ȵ��ٶȶǢ��ʢ�Ļ�ʧ㱸�����Ȥ���������������˽�������������������ʱ��������������೭����������������ȹ���������Ȩؤ��Ƚ���������������ȼ㩺������������������Ȳ������ȴȳ�����������粽�ڱ��������������ĥŽ�У��ʩ�����ݲ���ߡá¡ݡ������ܥСϡΡСѥ֥ӧ����Ҧ¥�b]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ܥ٥֥ӥ�]\|��\_s*[�ܤ٤֤Ӥ�]\|��\_s*��\|��\_s*��\|�\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*Ǥ\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*ݰ\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|˭\_s*[����]\|��\_s*��\|ŷ\_s*�\_s*�\|��\_s*[��϶]\|׽\_s*˥\|��\_s*[̡˥]\|��\_s*Ҵ\|��\_s*Ƭ\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ʼ\_s*[��ˡ]\|ɽ\_s*��\|��\_s*[�Ļ�]\|��\_s*��\|ȯ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�\_s*�\|��\_s*��\|��\_s*\%([�ӳ�ϫ]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([��Ƚ�鷿��]\|��\_s*˦\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s* \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|B\_s*\%([h��Ƚ�鷿kiae]\|C\_s*ʼ\_s*��\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|��\_s*��\_s*��\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|M\_s*P\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(D\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|O\_s*X\_s*��\_s*��\_s*��\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|��\_s*��\_s*��\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|��\_s*��\)',
-      \ 'c' : '\%([���²����ݰ���ť������������ޢ������ͷ°�������������Я⸿�Ƚ�Ҹ����Ǽ����ۻ�������ô�㪸��ۺ��������礷���򼷻쮱����������Ѻ���˹����Ϲ���ٹ������ʺ��ú��������̶�������������������縥���պ������������ۦ�Ĺ����ȹ���������ָ����벹�Һ����٬̫�������ޫ�޳��������䲬��������ު־�����������������������������������������ϹϺ�������٫��Ⱥ������ӫ����ִ�����������ӳ������������������Ӭ�����ص��������޸���ܺս�幡������������͹�䢹�̨����ɹ������ж���๫�ʹ����Ĺ�á�������񹸹��ۥ��������⫹���ֹѸ����������۹չ������̹��˹��عֹ���骹ݹҹ������Թιӹ�ĸ�������ë����������ӭ�͹����޺��������ݻ�����ջ��̼�Ե���ʴ����������Ը���������������������Ƹ۸���ž�������Ķ���ٸ�Ĩ��������������̱۸ɸָ���ܵ������ʽ�����ѻ�������������ᡵ�ǻ��۹��������ɯ����˻���í�ܦ岱���ӵ������ʡ�������޶��٣�໦��������������������������������Ҫ����ͼ���������������������������������������������ٰ���������������֣ڱ��������·����޷�����߫���������������ѩ���Ѣ�����������������������ߥ����������������ѡ����������������������٥Ѩ����������ڣ������������������������������������ݺ���������ګ���������̻�������������������������خ����ع���������������ɹ�������������������Ԥ�����ܯݬݮ��ܱܮ�ݫ������ʵ��ߪ�������������������������������ʤ������վ�߷�������ţ賷�Φۻ����Ү���������·��ط����״����򷬷���������ڶ�������˿��ֲ��̽�����ǰ̰�鶰��������פ��޺���������������ޱ�����Ϳ����������߸������������Ѧ�����庿����ܸ���ȷ������������ˮԢ������ʭ�Цչ����������ġ������ҵ׹�����������������޷��˹��ȸ�����Ң������ڹ��������׶�������ҿ�ȴ���ȷ����ͤ���Ա�������飼�������������ý�Ƴ������ħ����󻼲�������١��������Ĵ������ɸ¢ֺλ����������ߨߧ�¼Ȼ������ο�Ǧ�������ǧ��к�����尷樵Ԧ����������������ܰǢ���������������ܾ����������ؼ������������ż�Ĭ߼���ȼ����𮼻ꩼ�������ɨ���������ũ���������ż�������ʻ��������������������͸忬�ļ������������������ҼԺ������ա�����ĵ��������հ���ռ�������ޯ�κ���բ��ٱ�ؼ��ڷ�����������������������ּ�忼��м�ܼ�����Ѽ׼ͼм˼ּ�Ұ����ʵ�������ż�ެ������ոշ��ܤܣƵ��������������ý�������ʽȽͽɽܼ̿�����������꫽н���ܶ������������������ꪽ��������Ӵ֭�������ϼ����������������������ܽ�����µ�½�����������������������������������Ѯضآ߽�����������ؽ�޴�׽ٽ���䣽ֽ����߿���������������������������Ӣ��������������֪��ǿ������������п¿��������Ŀ˿��ӿ��¿��ǿ���ä���⿹���ƿ����������ʿ������ƿ�謹����������е��������������������������ؽ��������������޵�����������ַ����Ҿ�����������ľ���䬼������������ֹ᳻��������ļ�������������װ�������գ����ң�ط�����������������������Ӿԡ����������Ľ������ؾ����������������Ѿ�����ء�Ͼ��������޾�������������۾¾���騾��ľ㾩�������ܥ�����񾬽��������������Ͼɾ����˾�������ƴ�Ҿ;����о��ƾȾ��Ͼܾþھ˾�����������������������ԧ֤�ѿ�����°�������������濣���鿨�������������л����ػ����㭻�׶�������������������Ӷ��Ǽ�����ӡ���ܻ�������������������������ҿ��Ӻ���ǡ����ɦ�������������֬����寿����¶���ǻ���������������������л�������ף�㬰�Ԯ��Ƿ�Ȼ�ֻ����ѻ���ʻ�̼���������������������̦��Ż���������������ڻ�����ڼ���褴��������λ�Ƥ����������ڹ��ɳ�����߳��˹��ȷ�̢���ư��񢿱Ʊ����ʡ�ܢ��������������ᱵ������������𦪦ʹ�ǡˡҡԡơȡɡѡСա������ج�ɳ�����϶��������������Ѿʸܵ�ȿ����������ǣ�����ʶ�ͽ�����г����Ͼݵع�˵�����ۿ��ٸ��Ƿ����շ�����ͩ������Ϋ��������������������K�Ĵ�������ȱ�������١Ҥ���ҳ��ݢ��ٿ��Ȧ����۫滳�������ܾ��龹�ô���������������������������Ž��޳���������ڳ³����������������������귰������¦���������ǰ�����㡴����姢�������������������������റ����������ҳ��������ݲ��������ҳ����˿����������ڸ����ি�ԣ�����ϸ³ø�����֡١סʷ�����ŭƬ������ŨŬ�Ⱦ�Ť�״׳�����ᰥ��ɬ������Ŵ����ܷ�������̳������봢�Խ�����ڲ��������Ӿ��������������׳�������ڨƿ����ӽ�dzӡϡۡڡ̡͡γ��ȳijԳճʳ��߱��׳���ڼ����ȵҳֳѳ�����Т������Ӽ����뻳�����һר������ݥ�����������������ų�����Ъ�����������Ļ�����������ӳ���ܴ��������߳����ٳ����β����𳭳������dz��������򳬲������������Ԭ��٪�Хٺ������������ù���������٢��Ӳ�����ߵ������۸������������������Ұ���������楼������������������Ѵ���޾�˸�˧�����ӳ�������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ�����ȴ���䯴�������԰�ݴ����۴���ڴ��������Դ�ա�����̴�����δ��˴���ע������Ӵ������Ĵִٴ��״�ӿ���Ŵ��ɴ����ش��ϴ������Ѵ��ش������Գҵ��ȴճƶ�������������Dz����μ����ŲͲ�ӻ�����۷紣�Ҳԥ�Ф�����������Ҳһ��ݲݲִ�������������������ּ���������������ȼڲ�桶���˲Űײ�����ӧ��������ҷ����ܴ���������ѫ�β������βϲѼ����н��������ӥ��������ѷ��������ϲӲ����ɲշ��������߲��������Ʋ��²�������Ⱦ���������Ƹϲˤ��㡦�ı��Ķ��Ƣ����۲ø�ҧ��姨�ৣ�����٧ا��������ӧ���ݧ�����᧷���������������짢�����ۧ秮�ܧ��ԧէާ觯���קѧڧ�֧䧡�����𧦧����ߧ맥�������ߨ���������Ƽ���֦��ҧ駹�����ݡ��������׶������������ܥ����������������������񥷡c]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\_s*Ⱦ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ѥ\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*[�ʺ�]\|��\_s*[��϶]\|ѱ\_s*��\|��\_s*��\|��\_s*[̱����]\|��\_s*��\|�\_s*��\|ɴ\_s*[߻��]\|��\_s*��\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|õ\_s*��\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*[������]\|��\_s*Ϣ\|��\_s*[��Ǧ]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[����]\|�\_s*\%([��α���ֲ����˼���]\|��\_s*��\|Ǽ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|7\_s*��\|��\_s*��\|ʸ\_s*��\|4\_s*��\|��\_s*[ʬ��]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�̰�]\|��\_s*��\|��\_s*\%(̣\|��\_s*��\)\|��\_s*[����]\|͢\_s*[����]\|´\_s*��\|B\_s*r\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*[����]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|ݣ\_s*��\|�\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*ƣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|ʬ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[�����׼꾽]\|ʣ\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\|��\_s*�\|��\_s*\%([���]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*[���]\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����֥ץ���]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ɥѥ��֥��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%(��\_s*[����]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�ĥȥ���]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%([�����ޥ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ץ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�եȥץ���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([������������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([���եɥ��󥳥ꥦ]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[����]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�����ȥॸ]\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*ɸ\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*³\|C\_s*\%([srdfDeRoa]\|��\_s*��\|��\_s*��\_s*��\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|T\_s*\%(��\_s*��\_s*��\_s*��\|R\_s*L\_s*��\_s*��\)\|��\_s*��\_s*��\|S\_s*\%(V\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|��\_s*��\_s*��\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\)\|ú\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*2\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\)\)',
-      \ 'd' : '\%([�������ñ��ӹ������ɾ�������ǯ����Ļ������Ч���������γ����������������ѪƯƺ���ߡ�����ѯƫ�������ƣ�ޡ���Ʒƴ�΢�ƼƵ��Ƴ��Ƹ��Ʋ��ƶưƹ��Ʊƻ��׸�����������۲�αͻϿ�������ظͻ��ڤɻ�����������ǩť��Ů����Ҵ��ޡ����ܬ���ѣ���žȤǥ���ɶ��ʹ˶���������¤��Դ������͸�������������ŵͿ�����Ϣ�ť�������ϼ����¼�êí������ǻ������������ïî���ն��Ե庲��ë�۴��������ݹ�������է��åæǶ�������������ʿ�����ϡ�����������������������ö��׼������������ԥ������������������ٽ��ձ����������ټ����Ωѵ����ί��۴�����̽п������Ѽ߱���ͤ���ľ����Ц������\.���ġ�ȡɢ���������ã����ȥɡ�����������Ǧ��ħբ�d]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ɥǥť¥�]\|��\_s*[�ɤǤŤ¤�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*ŷ\_s*��\|Ʀ\_s*��\|ǡ\_s*��\|��\_s*��\|��\_s*��\|Ǵ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|Ƭ\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|Ĵ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*��\|��\_s*��\_s*ã\_s*¿\|��\_s*\%([��˸�]\|ʿ\_s*��\|��\_s*ŷ\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|ǵ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*ʪ\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|��\_s*��\_s*��\|ȯ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*ά\|��\_s*��\_s*��\|��\_s*��\|D\_s*\%(b\|��\_s*��\_s*��\|T\_s*\%(E\|P\_s*��\_s*��\_s*��\|M\_s*��\_s*��\_s*��\)\|M\_s*A\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|��\_s*��\_s*��\)\|H\_s*C\_s*P\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|��\_s*��\_s*��\|V\_s*D\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*��\_s*��\)\|I\_s*\%(P\_s*��\_s*��\_s*��\_s*��\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
-      \ 'e' : '\%([��������ٱ稰��Զ�����������������콸ս���֦�����������廷�ٱܱ������������������ְױ����ر���Ԩ�ų���ɲ��С�������������ݩ��޽��޼�������������������ާ�����Ǣޱ���޻����ʥ������Ԥ�������ϱ������������ͱ��ն�����߱��������۪�б����������հ���������ܳ������ϱ����Ʊñ����ȱԱű�ƱӱDZɱϱı��̱������������޹�����з�ت�Ͳ���������±ݲ�þв��������������������������������΢ᢺ�����⧮�ޣ姯���Ѣм������ǧ㧳�ݧ������ŧ泌e]\|A\_s*\%([��Ƚ����]\|V\_s*\%(��\_s*��\|��\_s*ͥ\)\|B\_s*\%(��\|C\_s*��\)\)\|��\_s*\%([��Ƚ����]\|��\_s*\%(��\_s*��\|��\_s*ͥ\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|ɰ\_s*��\_s*��\|M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*˹\_s*��\|��\_s*ʪ\|��\_s*��\|˦\_s*��\|��\_s*��\_s*��\|Լ\_s*��\|��\_s*��\|��\_s*ϩ\|��\_s*��\|��\_s*[�Ի�]\|��\_s*ƺ\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|L\_s*\%(��\_s*��\_s*��\|L\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([���ɲ]\|��\_s*��\)\|N\_s*��\| \_s*n\_s* \_s*��\_s*��\|��\_s*\%([�Ķ˶�]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�Ȼ��ʶ�]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|S\_s*\%([����]\|��\_s*��\_s*��\|N\_s*��\|F\_s*��\_s*��\)\|��\_s*[¿��]\|X\_s*\%([����]\|O\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([������]\|��\_s*��\_s*��\)\|��\_s*ƻ\|�\_s*Ʀ\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|��\_s*\%(Ϸ\|�\_s*��\)\|��\_s*��\_s*��\_s*®\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|ݿ\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*Ĵ\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|ȯ\_s*Ÿ\|ɾ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|ɴ\_s*��\_s*��\_s*ŵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*ĥ\|��\_s*��\|��\_s*ò\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*\%([�ޥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*Ω\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*��\_s*��\_s*��\|P\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|��\_s*��\_s*��\|-\_s*m\_s*a\_s*i\_s*l\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|N\_s*T\_s*E\_s*R\_s*��\_s*��\|��\_s*��\_s*��\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*��\_s*��\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|��\_s*\%([�֥����顼]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*[�ȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*[�ȥ�]\|��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[�䥢]\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)',
-      \ 'f' : '\%([��ϼ�в�����ɮ������������˼��ݵ����ϰ�˴ϴʻ�ÿ����ū�����������߹����������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ��������������������޽ʥ޼����⵺�б����ƣ߬�����������������ѵ������ο���ʳ�������������ʰ��ز��ʧʨ��������ؿ����礢�����ı������ǹ���޴�ʤʢ������������ʣʡ��������������Դ������������������������������ҿ������Ϸ����������������������Ƨ����������н������Ҷ������꿣�ڿ�����������ʮ�߹�������ֿ�ʫ�������������������������ݤգ�Ŵ��Ϣ��٢޶���ʩ������ʦ��F�����է��f]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ǹ\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(Ǥ\|��\_s*[����]\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[�滳]\|��\_s*��\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*[�ͤ���]\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Χ\_s*��\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*ǽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*1\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)',
-      \ 'g' : '\%([���������Ʊ��亲�޺��и����Я������ǡ����¹���ɹ���������Ͽ��������й���ⶳ��������������������������ݶ�������蹡����������贻�������˸������Ӫ伸˸���ظ����5��Ķ�����ۻ��ٸ�ѻ����줴�����֡����������������������ɷ޷߷������ݱ���Ŵ�������ɧ��������ѷ�ʸ����������¸�����������������뻲�²����Ƥ�����������ʵ�ʹ����Ұ�¢��襸��ж�����鹶��ܶ�������溷����������ֶ��������򹰶����㼶������ȶ餰��������ݵ����۶�Է֪���������������̵��������Ƹ�����ߤ�������ѧ�ĶȶǶŹ�����Եյ��������ڵ��۵��õ��췷������Ѧ��»·赼��ĵ���������ۧີ�٦�������������ȱ��ⷸ��⧹ε������ߴ�����¦�̳����Ǹ����񷿷�����Ը����걳��������޽��˳̿�������������Ƭ�������︷�������������̴ݢ��������޴��������ḵ�����������������������س�����̳۳ٳܳڳش�㨳���ЩԶ�䳯���������ֽ�糳ӱ��⭳��������賩����������������������ֶ����������Ѵ��ݲ�ծ�������Ө����̲������´��ϲ�谽�����˲�����쾡��󡤬���紤�楬���֦������Ԧ��������ƦѦ����ɦ��զӦ˦��Ϧͦצئ������Ħ��¦����ЦŦ������ҦȦǦʦ����Φ̦����������Ԧ��ç�g]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƭ\_s*��\|��\_s*��\|��\_s*��\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ֱ�]\|ŷ\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([�Ÿо���]\|��\_s*��\)\|Ʀ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��¯]\|��\_s*[���ǹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*[���׹��]\|��\_s*ϡ\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\|��\_s*\%([ˡƻ��]\|��\_s*��\_s*��\|ʹ\_s*��\_s*ˡ\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\|��\_s*��\_s*ë\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*̾\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ϣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|��\_s*��\|C\_s*L\|c\_s*c\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|U\_s*I\|N\_s*U\|O\_s*��\_s*��\_s*��\|E\_s*T\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([��른���Υʥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*[�˥�]\|��\_s*��\_s*[�˥�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*[�ĥ�]\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ե�ޥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*[����]\)\|��\_s*��\)\)\)\)',
-      \ 'h' : '\%([��ά�������мۭϯƶ���������ش���Ǯ����˴��������ꥷֹ����٢��������ڣ��������þ�̷�ȸ�Լ�����������ƾ����������Ե��ұ���ٸ����ޤê����������׺����˲��������˯�������������ˣ˱�������˩��������ˬˢ߰��˥��˨��������ˮ˰˦������˭����ˤ��ڽھ��������Ӯ�������Ʊ�����������������������Ħ������������˫����ԾӬ�����ێ͸�½��Ш���۳ֱ�����׭׬̦������������������������������������������΢���������٨������ղʽ��������������������֢������ʾ��ʻ����������������򰵸͸�؎���ϼ�в������ر�����������˼��ݵ�ɾϰ�ϴʻ���ÿ����ū��������������߹����������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ����������������޽ʥ޼�����б����Bƣ߬���������������ѵ������ο���ʳ������������ʰ��زʩFʦʨ���յ�������ؿ���乢���������ǹ���޴�ʤ��������ʣʡ������������Դ��������������������������ҿ�������������������������Ƨ����������н������Ҷ�����꿣�ڿ�����������ʮ�߹�������ֿ�ʫ�����������������Վ���Ϸ����DzDZ������ɢ���ݽ���ɨ�����ڻ�����ײ����ɦ����������������گ�������������ٶ��������������ɳ����ߪ߫����̩���������ҷ�������������Ψ����ɢ�ʺ���ɽ��ź��ƶѽ���������ñ����¾��Ʒ��1������ඡ���ɩ�Ͼ��Ǽ�����ݱɧ�ҹ���������ɴ���ҿ�������ɪ粹����ɲɱ��桶���ڲ������Ÿ��ͨ妳����ѽ�ʹ���ɱ������������繰����͵��ע������ɯɥ��ɭɤ�ʴ���ɫݤ����̤��ɮɬ���ɶ�������ɷ��������ɿɺ��ɻ������ʼɼ��ɾɸʿɽ�������֡�ڡʡآ���羷�������۬�������զ����Ҹ���������������������壸��������������������������У�����ﴳ�����ɹ����������������ɰ̥������������������ݺ���������������㰤Ҏʻ���ȧ�۽ˡ�ȣ�ַ��ү������ꤾ���׼��׹Ȧ���������������������߶������������ھ�¦�����ൡá˵��ȫƯ��Ȫ�������������������IJ�Ը����ʧ����ȷ��������ȩ�������㳾��С�Ȱ��ϸ����ܥ��˧��������ʢ��ͪ�����ڼ�����������Ѷ�����������������Υȹ��������ȸ��ަ��ɡ�ڲ��������������չ������Ȥ��Һ��ý��������ҹ�Ȣȡ��򾾹�ٰ������®Ȼ��������и���������ݢ֯��ڦ��������������Ԧ��¬��ѳĽ�����̷׿޸��������������ȥȮ�������ϡ����ȭ˪�ȱ��ˡȰ����Ȭȯ�����ڴ�����������������ԯ����������أ��צ�����ɣ����������������������Գ����������߯ޢ�����������Ȩ������ź�ܹ������������ڵ������ȼ��������Ƚ�����������������ɺ�����������Ⱦ����ȿȺ�����ǿ�����������Ժ����������ı����������������۱����������Ŷ����ķ��������Ʊ�����ü����ҵ������਻���Գ������������������������ܱ�����ĥŽ��淿��ʤϣ訬�������������������������������������������ȡ��ա�����ҥۥإ�h]\|��\_s*[�Ύ͎̎ˎ�]\|��\_s*[�ۥإեҥ�]\|��\_s*[�ۤؤդҤ�]\|��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�п�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\_s*��\|��\_s*[����]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*ˡ\|��\_s*λ\|��\_s*��\|��\_s*\%(�\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[�滳]\|��\_s*��\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*\%([�ͽ�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�ȡ�]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|ľ\_s*[�����Ᵽ]\|��\_s*Φ\|��\_s*��\_s*��\|��\_s*��\|��\_s*Ÿ\|��\_s*[�˹�]\|��\_s*��\|��\_s*ƻ\|��\_s*��\|��\_s*��\|��\_s*��\|̢\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ι\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|Ʊ\_s*˦\|��\_s*��\|��\_s*[��ȧ]\|��\_s*[������]\|��\_s*[�ǵ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|Ĺ\_s*ë\|��\_s*��\_s*��\|Ż\_s*Ƭ\|��\_s*��\|��\_s*��\|��\_s*[���]\|��\_s*\%(��\_s*��\|��\_s*��\)\|ͦ\_s*[����]\|ή\_s*��\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\|0\_s*��\)\|��\_s*\%([�ͤ���]\|��\_s*[����]\)\|ø\_s*��\|8\_s*��\|��\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|��\_s*\%([���������]\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*ή\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\|��\_s*ϻ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|T\_s*\%(M\_s*L\_s*��\_s*��\_s*��\_s*��\|T\_s*P\_s*��\_s*��\_s*��\)\|D\_s*D\_s*��\_s*��\_s*��\_s*��\_s*��\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|��\_s*[��ʿ��]\)',
-      \ 'i' : '\%([�����DZߡ�����׶׵���������϶���������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�ݡ����������ȵ������ܵ�述�S׽ꭲ���������ڿ��Ĺ�Ǣ��������̿��쵸Ÿವ������ż���������ϫ��������ĺ�������׻��������к��������ط���Ү������ͦ�����ܡ�����Ǯʰ���������ᰱ�����˻�ް�������������Ϯ�ס����ӱ��������©ĩ��寱��۱İ����ս�˻�С������ݫ�����׸�������ԩ۵�����������������ʰ�ݻ������ְ�յ׮���Ų����������������ΰ�𨱡�������ֱ������������۩���۰��д��ذ�Y�Ű�1��������ڴ�Ū��٥�������������ަ�̰��թ�Ⱥص����°����ذѰϱ�ԣ��������������и�����Ȱ���ǡѦ��״��������ͣ��޻��������׳�԰ʳ�ױ������������������İΰڸް������������Ͱ��ֹ�������������������а�Ψ��ͬ������������հݰ��ڰ۵���������ɹ���ۢ͢����������ˣ�����籥���������ɥ������ɧڻ�i]\|E\_s*��\_s*��\_s*��\|��\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*ë\|��\_s*ʸ\_s*��\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|��\_s*[����]\|�\_s*��\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�\_s*[�Ļ�]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����ﷻ]\|��\_s*��\|ݬ\_s*��\|��\_s*��\|��\_s*��\|��\_s*¹\_s*��\|��\_s*��\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[����]\|<\_s*=\_s*=\_s*>\|ɬ\_s*��\_s*��\_s*ʬ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|ɸ\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Υ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|¨\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|̵\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*Ǽ\_s*ˡ\|��\_s*��\_s*��\|��\_s*\%([��ǡ­]\|��\_s*ʬ\)\|��\_s*��\_s*��\|��\_s*��\|Ƴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|I\_s*\%([rPn]\|R\_s*Q\|��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|A\_s*��\_s*��\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(��\_s*��\_s*��\|E\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|T\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\)',
-      \ 'j' : '\%([���������ֺ�����ɼ������ټ������ľ������¿�̭������ߩ������������ʿ�顿�����ױ��ӿ�������пԿҿؿѿտ��ǽ�������������ޮ�տ��������ٳа������屽���������������������л������������ġп����Ы����������������������ǡ̼����ž�����������������վ�����������ڷ��������������������Ǩ����������è�����ط���������۲�ٽɽμ�����ѽ�Ȼ������Ž���������ޭ�߱��������覽�۽����ڽ޽����޼�쳼��������������ߨ��������������к��ߧ������尽Ľ½��������ý������ƽ�֮�������������꼥��Ώ����߼������������������ֵ�����������������������ᪿλ����������̻�Яϩ�˱�ѻ���ż���б��褻������κ�������������������Լٵ��ͤ��ꨢ�����������������֧�������������ק�������j]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ʊ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Φ\_s*��\_s*ü\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���˥ʡ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*[�ӥ�]\|��\_s*��\)\|��\_s*\%(��\_s*[���]\|��\_s*[����]\)\|J\_s*\%(R\_s*��\_s*��\_s*��\|\.\_s*S\_s*\.\_s*\%(��\_s*��\_s*��\|B\_s*a\_s*c\_s*h\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*B\_s*��\_s*��\_s*��\|-\_s*P\_s*O\_s*P\|��\_s*��\_s*��\|P\_s*\%(G\_s*��\_s*��\_s*��\_s*��\|E\_s*G\_s*��\_s*��\_s*��\_s*��\)\|I\_s*S\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*��\_s*��\_s*��\|V\_s*A\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|U\_s*N\_s*E\_s*T\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*\%([�ϥ����]\|��\_s*��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*\%([�ʥ�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%([�֥�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*[�ʥ��]\)\)',
-      \ 'k' : '\%([�����²�����Ƿ����ť����������������������ư����������Я⸼���Ƚ�Ҹ����Ǽ����������㪸��ۻ��������쮱��������੻�ֿ���Ѻ���������Ϲ���ٹ������ʺ��ú����������������������纯�պ����������ۦ�Ĺ���ȹ���������ָ����벹�Һ����٬̫�������ޫ�޳��������䲬������ު־������������㣸�������������������������������ϹϺ�������٫��Ⱥ��������ӫ����ִ����������ӳ��������������������Ӭ�����ص��������޸���ܺս��������������͹�̨����ɹ������ж�๫�ʹ����Ĺ�á�������񹸹��ۥ�������⫹���ֹѹ����������۹չ������̹��˹��ع��ֹ���骹ݹҹԹιӹ�ĸ�������ë��������ӭ�й�������������ݻ�����ջ��̼�Ժ�ʴ������������Ժ����������Ƹ�䲾������������Ƹ۸���ž������Ķ���ٸ�Ĩ��Ӿ����������̱ۻҸɸָ���ܵ����Ž�����ѻ��������������ǻ�ûƤ��������Ҹ�����ݰ�ٽ����ᾱ��ʷ��������������Ͽ���ٱ�Э��ۿ����ݼ�����������ܷ�������غ������ѭ�����ԡ����������������޲��իҥݾ�������������شկ���ث���ڷ𸳰��̷�����ո����������������丮����������������������������Ǹ����������ݷ�ڸ建�������������������������������ҧ��������Ҿ����ت�����Ϩ���������������������������������������������������������������ꥷ���찷Ʒ̷�����÷���Ҧ���׷��������ۤ�������ܯ��ݬݮ��ܱܮ���ݫ����������ʵ��ߪ�������������������������������ʤ������վ�߷�������ţ賷�Φۻ����Ү���������·��ذѾ����������򷬷���������ڶ�������˿��ֲ��̽������ǰ̰�鶰����������פ��޺������Ϳ���������߷�����������Ѧ��ν���庿ܸ���ȷ����������ˮԢ��ɦ����ʭ�ܿ�����Ц��������ĸ�¢����������������������޷��˹��ȸ����Ң����ڹ����������ҿ�ȶ���������꤯�����������ӽ����廸����������͵�����������θ���˨�������ž����������䷯���ݢݡ��뿸�֨�����ɵɵǵ̵Ƶʡ����ޢ̡����������ޡ��������á��笠��������������ܡ���������������������������塹�����������Ţ��������������硧�����顩�������¢��ġ������������졵�����ˡ�桼�ݢ����������᡺������Ժٹ���ܶ��������������µϴߵ�ʷ���ߵ�̸��������������������������׶ܶ����������۶�ڢ�Ҷݸ��ٶڶӶ϶׶նѶ۶�ֶ�ضб���ڡ��ک������ڪ��������ӵ����Ҩ��ީд�򰰶ɵ�����������ժ亶�����ѿ�����ַ���ﶷ����Ѭз�ź�䡹���������ިٰ���������װ�������������¶����ѹ��������߶�����ҳ����ٶ��������ɶ���Ѿ貶������󶩶��������ж��ᶧ���Ŷ��������ö��������������̾���������̵��������֩켣�������������ŵ���ָյ��������ⱱ�����͵ܵ׵��ֵ�ȷ���ٵߵ޵�۶��ݺ������ʹ���ݤ���ױ���̴����ڵ��������ſ�����өɱȲ�����ø�����ڶ˷�Ҽ����¶���𵦵����������������ۮ�־����ةȩ���ܵ���ѥ���·��д���̧İ�ɺ������������ݸ���������嵥�ڵ���������޿��洴������������ԭ�Ե�������������ڸ�������������������쵧�����������㵫��٣������ֿ۹�������������ڹ��ɳ�����߳��˹��ȷ�̢�ư좿�Ʊ����ʡ�ܢ��������������ᱵ������ר����������������ǡˡҡԡơȡɡѡСա������ô��ج�ɳ�����϶������������Ѿʸܵ�ȿ����������ǣ�����ʶ�ͽ�����г����Ͼݵع�˵�����ۿ��ٸ��Ƿ����շ�����ͩ������Ϋ�������������������Ĵ�������ȱ������١Ҥ���ҳ��ݢʢ��ٿ��Ȧ����۫滳�������ܾ��龹�ô�������������������������Ž��޳���������ڳ³����������������������귰������¦��������������㡴���姢����������̻�������������റ��ɵ��������ҳ��������ݹ��������޳����˿�����������ڸ����ি�ԣ�����ϸ³ø�����֡١׷�����ŭƬ��������ŨŬ��Ť�״׳�����ᰥ��ɬ������Ŵ����ܷ�������̳������봢�Խ�����ڲ��������Ӿ��������������׳�������ڨƿ����ӽ�dzӡϡۡڡ̡͡γ��ȳijԳճʳ��߱��׳���ڼ����ȵҳֳѳ�����Т������Ӽ����뻳�����һר������ݥ�����������������ų�����Ъ�����������Ļ�����������ӳ���ܴ��������߷������ٳ����β����𳭳������dz��������򳬲������������Ԭ��٪�Хٺ������������ù���������٢��Ӳ�����ߵ������۸������������������Ұ����������������ᴮ�������Ѵ���޾��˧�����ӳ�������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ������ȴ���䯴�������԰�ݴ����۴���ڴ��������Դʴ�ա�����̴�����δ��˴���ע������Ӵ������Ĵִٴ��״�ӿ���Ŵ��ɴ����شϴ������Ѵ��ش������Գҵ��ȴճƶ�������������Dz����μ����ŲòͲ�ӻ�����۷紣�Ҳԥ�Ф�����������Ҳһ����ݲݲָ򴢱�����������������ּ���������������ȼڲ�桶���˲Űײ�����ӧ��������ҷ����ܴ���������ѫ�β������βϲѼ����н��������ӥ��������ѷ��������ϲӲ����ɲշ��������߲��������Ʋ��²�������Ⱦ���������Ƹϲ��ݤ�����ᨱ�����秷�����������ʳ�K���߶��Ҧ֥����������ܥ���k]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ⱦ\|�\_s*ë\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ϣ\_s*̣\|�\_s*��\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|ɴ\_s*[߻��]\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��Ƿ��]\|��\_s*��\|��\_s*ɧ\|��\_s*�\|��\_s*��\_s*Ļ\|X\_s*e\|ǡ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*�\|�\_s*��\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[��©]\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|̳\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŵ\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%([ormdfa]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[�����׼�]\|��\_s*\%(��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|(\_s*��\_s*)\|��\_s*��\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*[���׿�]\|��\_s*��\|ݣ\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*\%([�֥�]\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*[�եȥ�]\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-      \ 'l' : '\%([���������������������������������족�����������̢��ТϢ˥�ʥ��ݦ��򧭦�l]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\_s*2\_s*��\_s*ˡ\|\.\_s*\.\_s*\.\|��\_s*��\|��\_s*��\|��\_s*��\|ݦ\_s*ݨ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����������֥ܥȥᥦ����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([�����ƥȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*[�ȥ�]\)\|��\_s*��\|��\_s*\%([������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|A\_s*��\_s*E\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|L\_s*\%([DP]\|��\_s*��\_s*��\|L\_s*��\_s*��\_s*��\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*��\_s*��\_s*��\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���������������ݥ���ޥʥΥ�̥֥���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*[��]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*[�륷]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�ɥԥץ�������]\|��\_s*��\)\)\)',
-      \ 'm' : '\%([�Ӵ��ڬ��������������������ߪ߫�������һս�����������������������ο��������������ʹ��ʪ�������������أ�ε첼Ъ�����Ǵ��ܸ�����ʸ����������ݨ��������ۯ�����ۤ��˴�������������ݼ�˾��dz������ϳ�������ܾը���л��Ӥ����������ո�ľѾ�������ճ����˨�λ�ت�����������������������������������������������ۻ�������������Ϊ溵�ʰ������̺�����������ü������ӹ��������ɴ���������Ϣ͸��¼���߶����ٽ��ﶻ�ŷ�̼��������ǫ�����ƿ������������������̸̻����̵����̴̹��̶��ϻ�����پ���̷̳����믵��Ĺ�ǥߺ���֪������Ь夰�յ�������𢨡�������̮�þ���̬��Ѱ�λ�û������ǣ����ץŹ������̨��º��ļ�š�������Ѣ��١۱����̰������ǧʾ������Ƴ����ϩƻ����м�����������̯̾̿̽�Ե�㴳���ﲸ���̫����������Ĵ��̩���̪��ܳ�̲��̱��׽̭��뷱ο�̧����������������̥̣̦�ʿ���ߎ������ϸ����������ٿ����ܵ������������Ū�¹׿׾�ᵼ��ž���е����������ȱ��μ���°������ż��������̱Ҹ�����Ʀԫ�����ѿ���Ǥ������ʶ������������Ĵ��ٰ������������������ü�����������������ᶶ賹Į�����������Ԥ�硬�ˡʱߴ�ʣ���󺵸����������������������ػ���������������Ϩ����������������������Ż�������������Ȩؤ����������̢�������̡��������������Ϯ�����򾾶��踭ͥ�������������������������Ϻ��������������۾��������̤�������⼬�غ���������������ѿ����������˻��ޣ������������̢ޡࢿ���ܡޢ��΢Т��ʢ���ꢻ���覤�͡碾���ݢϢ��ߢˡ���ߢ������������������⢩��ݥ޺ǥߥ᧮����m]\|��\_s*[�ӎҎюЎ�]\|��\_s*[����ߥ�]\|��\_s*[����ߤ�]\|��\_s*[������]\|��\_s*\%([���Ͽ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*\%(��\|ʸ\_s*��\)\|ξ\_s*\%([�ѿƿ�]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|ر\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*ĥ\|��\_s*[�����]\|��\_s*��\_s*ӧ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��������ͭ]\|��\_s*ƻ\|��\_s*��\)\|��\_s*��\|��\_s*��\|6\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|©\_s*��\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|��\_s*��\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|��\_s*��\|�\_s*ȷ\|��\_s*��\|��\_s*[�����]\|��\_s*��\|��\_s*��\|Φ\_s*��\|��\_s*[�ҽ�Ԣ]\|3\_s*[����]\|��\_s*[����]\|��\_s*[��ȱ��]\|��\_s*��\|ȷ\_s*��\|��\_s*��\|��\_s*[���������˪��]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[ζε��]\|��\_s*��\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(̣\|��\_s*[��ž]\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*��\|��\_s*[���һ���]\|��\_s*��\|ߴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*[��̯��]\|��\_s*��\|��\_s*��\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|Ю\_s*��\|��\_s*��\|��\_s*��\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[Ƿ��]\|��\_s*ɧ\|ʹ\_s*��\|��\_s*��\|��\_s*[��§��]\|��\_s*��\_s*ǯ\|��\_s*��\|¿\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|ñ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*Ǿ\|��\_s*[����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\_s*��\_s*̣\|��\_s*��\_s*\%(��\_s*̣\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%([dgtnOo��]\|X\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*��\_s*��\_s*��\|P\_s*3\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|D\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*��\_s*��\_s*��\_s*��\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\|e\_s*d\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|��\_s*��\)',
-      \ 'n' : '\%([�ݥ��ɽ��԰���ھ�翮������������������Ǽ����¡���۩����׵�˾���̰�ĵ����ƭ���о����Ӹ�����Ī��������ɫ��Ÿˡ����ŵ����§���ϵ���ů������ۨ�����ǹǿǾǽ��������Ƕ��Ǹ�����ЫݻǷ����Ҿ��ݡ�ǻ�ĤΎ�������߿ݦ����եǫդ������ٹǭ���ʿ�ܡ̲������Ǯϫ�Ǭ̭��ܬ����Dzǰdzǯ޺Ǵ�ͺ�DZ��Ǫϣ�����಻��ǩ������͎�Բ���ʾ����迡���۾�ݹ��������ŧ�޹dz�Ǩæ��˥ȴ��ٶ���ɤ̎�ٿ��ô�����������콭��ʨ���߳���Ʋ������ؽ�ǢѦ���浶��ǡ���������ǣ����������ԡբ�١ذ�����լ��ѹ���ٿ�Ǧ��ǥǧǤ�������̶�����������������֮ƨ�������������������������2бð�ˎ���ٸ�������ij���������֧����ť鵵ͼ㳴÷ò����ڳ�в��ּ�����ͱľؽǺޥ��������ϲ˿������ܧ�ƻ�������������б��������������±����ŵ��ڽ�������ͨ��������Ʒ��ȱ���į��ή��¸�������ܩ��Ĺ�����޽�Ⱦ�������棷�м�����ǵ����ճ���Ǣ������������������Զ��������󢿢͢�����������Ǽ̵��ٽ��ձ��޸���������ѵ�����İ����ྨӭ��������ڵ�����˴�������Ƥʨ���������������������������������������̾����������˥̡͢���ʥ̥Φ����ߦ�n]\|Ģ\_s*��\|��\_s*��\|��\_s*��\|��\_s*ö\|��\_s*��\_s*ȿ\|�\_s*��\_s*��\|ϵ\_s*[�ݱ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƿ\|��\_s*��\|ο\_s*�\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|��\_s*�\|I\_s*I\_s*��\|�\_s*ȭ\|��\_s*��\|��\_s*�\| \_s*2\_s* \_s*��\_s*��\_s*��\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*ѵ\|��\_s*[����]\|P\_s*b\|L\_s*e\_s*a\_s*d\|��\_s*[����]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ʪ\)\|��\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|��\_s*��\|ʿ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|ɳ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\|\.\_s*��\_s*\.\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*��\_s*��\_s*��\|H\_s*K\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|T\_s*T\|Y\_s*��\_s*��\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|��\_s*��\|��\_s*��\)',
-      \ 'o' : '\%([���������Ů��ۯ۰�Ÿ�۲������˻������ҳŵ�����س��������������ḯ�Թ����������䲮��ɭ�����������ڶ�����ڼ��ᡸ�������������������������Ǧ��������Ƽ�����Ĺ�Ľ����Ǽ�Բ����������£���������ȳ�־���쿯����Φ�ֲ�ݣ�����ſ����༫�ʳ������ˬ�ʲ�������������񤲷ǰ����߰�θ��������ۻ�ɽ���̶�������Ͷ��笲��������������ݶ����ذ�ߴ�޳����۾��ʲ�����������إ����ᥲ���ص��ռ���鲪�����������ݯݳ���²�۷��겣����ݿ�������ӵ��������꾪Ʊ�����������ٱ�⳸����������͸���Ȳ����������ϵ��˲��˱����¿��ʤ�������Dz����Ϻ��ڨ��������ϯ�ݰ������������ƿ�Ϸ����ͦ�������˵�Ӱ���˿侭�����˸�����಼����ͺ�ߺ��������ӱ����ä���������¢���ˢ����ৰ�ϡ��ئ�����o]\|��\_s*��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*Ȭ\_s*��\|Ŵ\_s*��\|��\_s*ȱ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\|��\_s*�\_s*��\|��\_s*ʴ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ب\_s*��\|˵\_s*[������]\|��\_s*[̼��]\|��\_s*[����]\|��\_s*[����]\|թ\_s*��\|��\_s*��\|��\_s*��\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��̼��]\|��\_s*ǯ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*��\|��\_s*��\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ʪ\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*Υ\|ز\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����������]\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*[�߳���]\|��\_s*\%(��\|��\_s*��\_s*η\|��\_s*ŷ\_s*��\)\|��\_s*Ƭ\|��\_s*[��������]\|��\_s*��\_s*¾\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*\.\|��\_s*[��ζ]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|Ω\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*[ǯ��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*Ŭ\_s*��\|��\_s*\%([�ӷ�]\|��\_s*��\|\.\_s*��\_s*\.\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|O\_s*\%([����sS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*��\_s*��\_s*��\_s*��\_s*��\|C\_s*R\_s*��\_s*��\_s*��\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|��\_s*��\_s*��\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
-      \ 'p' : '\%([ˣˤˡ��������ܮ�������ʻ�����á�����������������������ʬ��������ɤɶ��ɼ����ʿ���ȯ��Ȣ��������������������������ʧʢ����������Ȭ�˱�����ĥ�ѣ�����פԡޡܤצ��ը������̨��󡥡�򢩡����ץ��ǡˡʢߢ��¥ڥѧ������զХ�p]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ݥڥץԥ�]\|��\_s*[�ݤڤפԤ�]\|��\_s*��\|��\_s*��\_s*Į\|��\_s*��\|�\_s*[Ϫϥ]\|��\_s*��\|��\_s*��\|��\_s*ϥ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Τ\|��\_s*��\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|��\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�ļ��]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*\%([��������]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|+\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|Χ\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%([����Υ�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*[���]\)\|��\_s*[�ĥ�]\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([��������]\|��\_s*[�ץ�]\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*\%([�٥�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*³\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*ˡ\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*³\|��\_s*��\_s*��\_s*��\|��\_s*ƺ\_s*��\|��\_s*��\_s*��\|¿\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ž\_s*��\_s*��\_s*��\|��\_s*ʸ\|��\_s*��\_s*[����]\|��\_s*��\|��\_s*��\|P\_s*\%([umdCaor]\|K\_s*��\|D\_s*F\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*��\_s*S\)\|I\_s*C\_s*��\_s*��\_s*��\_s*��\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*��\_s*��\_s*��\|O\_s*S\_s*\%(��\_s*��\_s*��\_s*��\|I\_s*X\|T\_s*��\_s*��\_s*��\_s*��\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\)',
-      \ 'q' : '\%([��ܯ��ݬݮ��ܱܮ����ݫ����������ʵ��ߪ�����緩�����ų����������������������������ʤ��������մɾ�߷��������ţ賷�Φۻ������Ү�������ղ������ط��Ѿ������뷭�����򷬷���������ڶ��������˿����ֲ����̽�������ǰ̰�鶰���ȱ���������פ��޺���������������ޱ�����Ϳ����������߷�����������Ѧ��ν�����庿����ܸ�𷪶��ʳdz����������ˮԢ��ɦ����ʭ��Ӽ��������Цչ��硡����������Ŵ�ġ�������¢�������ҵ׹�������������׶������޷��˹�����ȸ�������Ң�����ܸ����ڹ��������������׶�������ҿ�ȴ���ȷ����϶��Ͷ��ꎸ����ơȡǡɢ���������q]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̼\|�\_s*�\|��\_s*��\|�\_s*��\|��\_s*Ѵ\|ɴ\_s*[߻��]\|��\_s*��\_s*��\|��\_s*ʪ\|��\_s*��\|9\_s*��\|Ĺ\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ŷ\_s*��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\|��\_s*[����]\|��\_s*¢\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([��������ʸ����]\|��\_s*��\)\|��\_s*��\|��\_s*Ѥ\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*��\_s*ϯ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|Q\_s*\%(I\_s*C\|R\_s*��\_s*��\_s*��\|C\_s*��\_s*��\_s*��\_s*��\|U\_s*O\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*[���]\|��\_s*\%(��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*[�ॹ��]\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)',
-      \ 'r' : '\%([���������α����������Ͼ��ϼϽ����Ͽ����߳ϱ������ϮӤ����ۭ�����ӯ������Ѥ��ҩ�������۰��Ϻ��ϭϴϲϹ��ϸϰ϶��ϵϳϯ���ϧ���ȧ��Ϩ������������תϦ�������ݭߣ���ް���ٳ�����Ѷ������Ӻү��ߺ��������������㹵�����������������������������������ݬݮ�����������ҳ��������ҽ��߲��������ݲ��������ϡ��ϣڻ������Ϣ���ϩ���ޥ������������������ﻼ�����Ϭ�������ڶ����Ϋά��ΪΨ�˷�Χ��ҭϻ٤Φ�������������������߱�����ί��βΰαΩ��γέδή������P��������ܲ����ש����������ا��������������������������η������κϤθо��������̺��������������ۢ������ס����������ڢ�������������ɩ������������������ζοε�˵���νμ������λ����ξ����ιΥ����Σ������Ρ΢�����ߢ������������ئ������Τ轤��ϫ��������Ϸ��ԿЬѰڰ�������ݳ�պ��ݴݣ���������������������������������������������������������������ݪڧѴ��������������������������������������ɤ�򱦢����ҧ姨���৫�����ا٧������ӧ��槬���ݧ����᧰��������������ϥ����Ϫ���ۧ秮�ܧ��ԧէާ觯���קѧڧ�֧䧡���駾�𧦧����ߧ맥�غ������������꧲�Ѧ���r]\|��\_s*[�ێڎَ؎�]\|��\_s*[�������]\|��\_s*[�������]\|��\_s*��\|��\_s*[ͭ��]\|��\_s*[˦���]\|6\_s*[����]\|��\_s*̵\_s*��\|ݦ\_s*ݨ\|԰\_s*��\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*§\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ȿ\_s*��\_s*��\|��\_s*\%(��\_s*ʸ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*ǽ\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\|ǧ\_s*��\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*��\_s*��\_s*��\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*��\_s*̲\|T\_s*U\_s*R\_s*N\_s*��\_s*��\|A\_s*D\_s*M\_s*E\)\)\|��\_s*��\_s*ɽ\_s*��\|��\_s*��\_s*��\)',
-      \ 's' : '\%([������Ъ��ۼ��˵ֵ�ڰ��޶�������˿����������Խ�������������������Ǩ����Ψ��м��©­¥«¦¬�������������������̫���ᰳٴտ£��֥��ػǬ߶����ҫݽ���������¹������������������ײ����س��Ȣ�������������������������������������Ҳ���䷫��������������������������������������������������������ç��������î¹½¸º»�����������������������¶�����������ȿ��������������ର�������������������ۤ�������ɯ˻����í�ܦ岱������������޶�������������ܸ�������������������������Ҫ������ͼ�������ϴ�������������ߪ�����������������������ٰ���������������֣ڱ��������·����޷�����߫�����������������ѩ���Ѣ����������������������ߥ������������������ѡ����������������������٥Ѩ��������ڣ�������������������������������������������ګ�����̻�������������������������ع������������������������������Ԥ�����������������¿��б�¼��ͥ����������ӳҰ����ӵ�����ѱ�������ڿ�μ������ͤʹ�������ƫ������ǵ��¨§�ߵ�������̡����������ͷ�������ķ������������״ɿ�צ�����������ߵ���������®ú���϶��ۡڽ����������ſ�������Т�̢ޢϡ�⦤��͡�ߢˡ��ܢ�ޢ�ʡ��΢��ߢ��ꢻ�����������حج�����������ï�Ϳ������巿������H�����������������񾽻������������ľ������������ڧ߭�����湥��ٹ���۵ʿ���Ʃ��Ա���飼�������������ý�Ƴ��������ħ����󻼲�����١����ٶ�������Ĵ��¢ֺ��������ߨ��ߧ�¼Ȼ����ο�Ǧ�������ǧ��ӻ����к�����尷樵Ԧ����������������ܰ��Ǣ�������������ܾ�������н�ؼ������������ż�Ĭ߼���ȼ����𮼻ꩼ�����ɨ���������ũ�������м��޳���ʻ�������������Ϳ��ļ����������������ҼԲ�������ĵ������������ϼ���բ����ٱ�ؼ۷�����������������������ּ���м�ܼڼ�����Ѽм˼ּ�Ұ������ʵ�������ż�ެ������ո��շ��ܤܣƵ����������´���������ý�������ʽȽͽܼ̿�����������꫽н���ܶ��������ܷ������������ꪽ�������쨳�Ӵ֭�������ϼ�������������������ܽ�����µ�½���������������������������������Ѯضآ�����������ؽܽ׽ٽ���䣽սֽ�������������������������������Ӣ����������������֪��ǿ������������п¿��������Ŀ˿��ӿ��¿ɿ��ǿ���ä���⿹���ƿ����������ȿʿ������ƿ�謹������е���������������������������ر������������������޵�����������ַ����Ҿ�����������ľ���������������ֹ����������ľ���������������׾̰�������գ����ң�ط����������������������Ӿԡ��������ʽ������ءˡʾ������������Ѿ�����ء�Ͼ��������޾������������۾¾��׾�騾��ľ��������ܥ�����ƾྫྷ�����������Ͼɾ����˾���������ƴ�Ҿ��ݾ������о��ξƾȾ����Ͼܾþ�ھ˾��ʾ�������������������ԧ֤�ѿ�����°�����������������濣������������������ػ������㭻�׶������������������ӻӶ��Ǽ�����ӡ����ܻ��Ｈ�����������������ҿ��Ӻ���ǡ����ɦ�����������������֬����寿��ڻ��¶�����ǰٻ��������������������л�������ף�㬰�Ԯ��Ƿ�Ȼ�ֻ����ѳ�����ʻ�̼��һ�������������������̦�����������������������ڼ���褴����ֻƤ�����������豫�����dz�˸�������ʿ����������������������ͻ�����ٮ����������ӦͶ��긼���뽿���ܻ����߷��߽Ϋ��ڼ����޴�����ͺ��ɾ�������������������참������ֿ���곡ָ��ӯ�����������˼�����λ��ã��ů͡���ұ��ⷱ�ζ����������۸Τܪ�����Ǿ�����٩�����Ӵ��ܼ������������Ʊ��ݺ���峦�涭�����ո������ප����������������ߦ�»�����ڹ�����������Ŀ������Ģ��ջ��ɻ���������ܢ���������ӻ����������բ���3����O��������������������������������߻��������ú���������ޯ����خ���稺������ռŻ����ø����칹��ʺ����ѱ�����٣���׺˺�㷺ԺݺҺӼ��кںκպʺĺ��ƺ׺źͺ��ԺۺкǺ�ª��������������������ں����Ժ������������غ��ݯ���������������̻��赺����ͼӺ��������Լ亵�����ֺ�������麺�����ú������������������հ����̬����٭����������������������������ϻ�����������⤹���Ż��������������������������맻ź�����󢾢�����ʸ�š�����ɸ���Ļ����ں̢����������ǡƨ�������õ�������������������㧳����s]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|�\_s*��\|��\_s*\%(ϩ\|Ϫ\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�ס�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*[�]\|��\_s*Ѥ\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[��϶]\|��\_s*��\|�\_s*̥\|��\_s*��\|ŵ\_s*��\|��\_s*ͺ\|��\_s*��\|ŷ\_s*[�IJ�]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*��\|�\_s*ƻ\|��\_s*\%(��\|��\_s*��\)\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*��\|��\_s*[��Ǧ]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[ë��]\|��\_s*[����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�ظ��ܻ�]\|��\_s*��\)\|7\_s*��\|��\_s*��\|4\_s*��\|��\_s*[ʬ��]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|͢\_s*[����]\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|ή\_s*[��Υ]\|��\_s*��\|�\_s*��\|Һ\_s*ȭ\|��\_s*��\_s*��\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*Ź\|��\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[������]\|��\_s*��\_s*Ʀ\|ۨ\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[ǯ��]\|��\_s*[ǯ��]\)\|��\_s*��\|ɴ\_s*��\_s*��\|��\_s*¹\_s*��\|��\_s*ƣ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(ˡ\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|��\_s*[ŵ��]\|B\_s*\%(r\|��\_s*��\_s*��\)\|��\_s*ĥ\_s*��\|��\_s*ʬ\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*¤\_s*��\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|��\_s*\%(Ƿ\|��\_s*\%(��\_s*̣\|��\_s*��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*¬\_s*��\_s*ư\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([���]\|��\_s*��\)\)\|��\_s*̣\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%([����]\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([�ʼ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s* \_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|S\_s*\%([nrgmce��]\|G\_s*M\_s*L\|��\_s*��\_s*��\|S\_s*��\_s*��\_s*��\|F\_s*��\_s*��\_s*��\_s*��\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|P\_s*\%(��\_s*��\_s*��\_s*��\|A\_s*C\_s*E\_s*��\_s*��\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*��\_s*��\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\|β\_s*��\)',
-      \ 't' : '\%([�������˳��������ɼ��Ҹ�����ڽ�Ѳ���������۳���������ݽ�꾲������������Ĺｩ�����ƾ�η���䶡�����������ݽ����ȼ��ͧ����������۽�����Ĺ���������������ԥ����Ч�����������ܽ���������˺�̭��������ǯ����ӷֺܺ�ڢ��κ�˭��������ƿ���¢�������Ѹ��ݹ��Ǽƻ������ƺ�����������ܫ���������������Ƴ���۶������岳�������ڮ�ݥ��������ܪ�������ٵ��ֺ����߮��ƪе����즰�������������ƽ��������޹��ơ�������������Ʀ����������ƭ����Ƥ����ƣ������������ƫƥ�����������ո�ﰳ��������믿���æ������Ԧ����ѽ���������������ײ��ѽ��ѹ��ϳ���αͻ���ų�����������Ͽ�ڼ��������Ϳ޻���������������Ȏ��ӱ͹����ʻ���Թ�֥������������ų������ׯ�ŭ��ū�ڳ��ũ�����������ɡ������ץ��������������š�����ż��ſ���Ŷ������ŻŸ��źŲŪůŨű��Ű��Ŵܼ���챭�����ܨ����������������ţ����������������š��������������������������Ţ޸���������׷�Ǝ�ʾ��ʼ������������ŵ������̳���ض��۲���ϸ������̽���Ϫ�������ٴ���ܻ��ܿ���������ѳ����������㪱����γ�����ª������ڼ�����������ָ��ʴ������ϸ��Ⱥ��鲶������ڹ˷Ҿ�����������ѣ������ױ����������³������������������ٽ��ƿ����������븾����������������̢�����������Խϴ���˵���Ϻ�¤������ݶԯ���з��ˤ�����ض࿵�����������˾����ͿԻ�ڻ������ܦ������������Ƶ��⸷ѻ���������̹�Ϣ�Ď����׹����������ۺ��������������紺��N�������㾹���������ٻĿ�����������������������������������������������ٲ��Ŧ����������������������Ȥ��������ܺ�������Ľ��Ҭ��ļ������Ť�����ı����������������׭����������ذ������߭׬�������������ġ����ĵįŽ��������Ƭĸ��ķijĪĢ��ĭ��ƨĻĥĤĨȥħ������İĦĬĮĺĴ�ģIJĶĩīЦ����Ѳפ����دɪ��������������������ɳ���ղ�������ϡѡСο�������������������������漣��֮�ѻ������׷�����������������ڲ�������������������������������������٤������̯�����ֿ�ڸ�ȿ�ˬ���������ܽ��î��Ƣ���í�̱���۸������������������нԻ����վι�ì���ʾλ���Ƨ����٥Ʈ������á�����Ⱦ�䲹���ﴰ����٦��ɶ���ݾ�Źê��éڥ�������çä�ܱ纴������ͤɫ��맰�������������ܭ������ζε�����ɺ�ݰ�������ľ����鶩��ͣ�������Գ���������������Ӭ���ѹ�ҵ�������ͺ���������׼������������Ŭ���Ƶ�����«�ԡý�������ݽ�è���ã�۹��̴��ƿ�����ֻ����Ǥ�Ʊ����ý���ϰ���䶳�ٷɹ��������º����յ���δ����������������������й���������ٿ��Ӹ��þں������������߬������������߸�������ÿWö��ӷëó�ȿC÷ò����ý��ðôùøú��û����õñâ��پ�������ŧڤ��٧Ӷ��߷����������������������������������������������������ڭ��������ʿ��ڬ����������������������������������������������������������ж���Ա�ǿ�����Ĺ��ʲ֫�����­������Ω�����������������ί��ȯ����۴¿¾���¿�ï���Һ�ӣ��������߱��٣����崤��������ŷ���߷����ڢ����������ᦨ�����ɽ���ڥ����覨�ȥ����ġ�žƩ���������ȥ����Ļ�ü�����������������������Ө����������ƨ����䨷��t]\|��\_s*[�ĎΎ���]\|��\_s*[�ȥƥĥ���]\|��\_s*[�ȤƤĤ���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ϸ\|��\_s*��\|��\_s*[���]\|��\_s*�\|��\_s*ľ\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|͸\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��ƻ��]\|��\_s*[����]\|��\_s*ǯ\_s*��\|��\_s*[�׻�]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|ƶ\_s*��\|��\_s*��\|��\_s*��\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*¼\|��\_s*��\|��\_s*̼\|ɻ\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|ε\_s*��\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|ɹ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(��\|0\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Ϸ\_s*Ƭ\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|ܥ\_s*��\_s*�\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*��\|��\_s*ެ\|��\_s*��\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|��\_s*��\|��\_s*[����]\|��\_s*ë\|��\_s*��\|��\_s*Ϫ\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*��\_s*[����]\)\|��\_s*\%(��\|��\_s*˷\)\|��\_s*Ƣ\|��\_s*��\|��\_s*��\|��\_s*[ڳ��]\|��\_s*��\|��\_s*\%(ͼ\|��\_s*��\)\|��\_s*��\|��\_s*��\|ͱ\_s*Ю\|̵\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*��\|��\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ж\_s*��\|Ʋ\_s*��\|ǽ\_s*[ʸǷ]\|��\_s*��\|��\_s*̱\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����ॢ]\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�ե�]\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*[������]\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*ʸ\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|ʸ\_s*��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*˦\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|E\_s*��\|��\_s*[�أ�]\)\|T\_s*\%([bc��mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|��\_s*��\_s*��\|X\_s*T\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|V\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|C\_s*P\|��\_s*��\_s*��\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*��\_s*��\)\|E\_s*L\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
-      \ 'u' : '\%([����Ⱥ��ɶ������ἷ�������ƶ���ڰ����ѽ��뼿������å�����ѽ�������ִ���ء�������¥��ӹ����������ⱳ����ư뭱������������վ�������ž�������𱴵���Ϊ�Ų�����������ر���������󨱲���山���������۲��������񱷸����¹��������ϻ��������������ڴ︽���̱ǰ�����������ֶ����̽��������޲�墱��ⳤز����������ﷵ�����庨��������΢���ױ���������Ӻ��屯Ĭ��Σݵ�汵���²����ͫ���˷Ⱬ�DZ���������������ڽͭ�ɼ��ޢ��Ƥ���ձ������񻾵�ѵ���ھв�ͷ���α������������仺ǿ���⤦���������ԥ�U�姵��u]\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*ǽ\|��\_s*\%(��\_s*��\|ͭ\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|ñ\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ˡ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\)',
-      \ 'v' : '\%([�������͢��ǧ��Ӣ��˥�v]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([���ܥȥ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��ȥ�]\|��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*Ĺ\_s*��\|��\_s*ľ\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([����֥Х���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*[����]\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*[���䥢]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([���]\|��\_s*\%([���֥�]\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|J\_s*E\_s*-\_s*��\|��\_s*��\|��\_s*��\_s*��\|I\_s*S\_s*A\_s*��\_s*��\_s*��\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\)',
-      \ 'w' : '\%([���򲧽����������˽ﲴͺ����Ⱥ��ɶ���ʦԦ���ἷ�������ƶ���ڰ������뼿������å���ѽ����������ء�������¥��ӹ����������ⱳ����ư뭱������������վ�������ž�������𱴵���Ϊ�Ų���������ر���������󨱲���山���������۲��������񱷸����¹��������ϻ��������������ڴ︽���̱ǰ�����������ֶ����̽���������墱���ز����������ﷵ�����庨��������U��΢���׻᢬�������Ӻ��屯Ĭ��Σݵ�汵���²����ͫ���˷Ⱬ�DZ���������������ڽͭ�ɼ��ޢ��Ƥ�ձ������񻾵�ѵ���ھв�ͷ���α������������仺ǿ���⤦�����ܲ����������������ϴ��ѽѴ����ֲҺҶȵ������ɡ�ب����˺�����о���Ƹ���޾�������������������׿׾�б���������IJ��ƻ�Ĺ����������ʻ�駷�������������Ų���ѯ��뻲���Ƚ�����ռ㰿�������´ĸ���ӻͯ��Ͱ����ʬ����������ʨ���������ʤ��������ȥ���w]\|��\_s*[���񎳥���]\|��\_s*[��񥦥��]\|��\_s*[��񤦤��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ͥ\|��\_s*˺\_s*��\|��\_s*��\|��\_s*��\_s*��\|(\_s*��\_s*)\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|Y\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[ͳ��]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*٥\_s*�\|��\_s*\%(��\|ʿ\_s*��\_s*��\_s*��\)\|ݿ\_s*��\_s*��\_s*٥\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%([�ץ�]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([�ࡼ]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[������]\|��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\_s*��\_s*��\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*[��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-      \ 'x' : '\%([���������������������������������秷���ߦ�x]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|ü\_s*��\)\|X\_s*\%([����]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|��\_s*[����]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*��\_s*��\_s*��\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|��\_s*��\_s*��\)\|e\_s*n\_s*o\_s*n\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)',
-      \ 'y' : '\%([�ֲ��غ�������˩շ��޷����ڡ����ڴ�������������ֻۻ�����������������������þ��ӱٵ���㷽���İ��������˧��ȵ��������������׫խ��ۡ�����������������ƫ��ߡ��������������������������ٹ�������������������������������������������������������βž�������ա��Ю�����ô����������ڵ;�Ӹ�����������ǽͽDz����¿�������ͻͷ���Ϳ즤������μ��д�İ�������˭������Ƿ����ְ����������쪾�ற���ᾲ��������͸���۷�����Ͳإ��������ͤͨ����ͱͻ͹ͯͰʹ��ͼͩͪ��ͧͺͫͭ����������͡��ͷ�������ͳ������͢����·��������ͮ������竤掲��������׶׵���������϶��������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�ݡ����������ȵ������ܦ��ɵ�述����������ڿ��Ĺ�Ǣ��������̿��쵸Ÿವ������ż���������ϫ��������ĺ�����׻��������к��������ط���Ү������ͦ�����ܡ�����Ǯʰ���������ᰱ�����˻�ް�������������Ϯ�ס����ӱ��������©��ĩ����寱��۱İ��Ľ�˻��С������ݫ�����׸�������ԩ۵�����������������ʰ�ݻ������ְ�յ��׮����I���������������ΰ�𨱡�������ֱ��������������۩���۰��д��ذ��Ű�1��������ڴ�Ū��٥�������������ަ�̰��թ�Ⱥص����°����ذѰϱ�ԣ��������������и�����Ȱ�����ǡѦ��״��������ͣ��޻��������׳�԰ʳ豶���������������İΰڸް������������Ͱ��ֹ԰�������������������а�Ψ��ͬ������������հݰ��ڰ۵���������ԧ������İ��ø��������Ҳ��ݰ���������ͻ���Ϧ��������S�����ϵ��½�������������ͥ����²����۴����ݬ���������������ٯ��������������̼�ֳ쮼��칽��̡ҡԡաӻ�����šץ����̰���ǫ��͵���ٰ׵��ݹ�������Ȭ���ë��׽�����������Ǹ�������ܿ���������ͼ�������������뻦���輭�����֧��ߡ�������ק��������觫��Y�������ۦ�y]\|��\_s*[�֎Վ���]\|��\_s*[��楤��]\|��\_s*[��椤��]\|��\_s*��\_s*��\|ݿ\_s*��\_s*��\|��\_s*��\|��\_s*Ƹ\|��\_s*��\|��\_s*��\|4\_s*\%([�������]\|��\_s*��\|��\_s*��\)\|¾\_s*��\|��\_s*��\|δ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�Ҹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|Ī\_s*[�Ұ�]\|��\_s*��\|��\_s*��\|8\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ɴ\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(ͺ\|��\_s*��\)\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*��\_s*��\)\|��\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*ë\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|��\_s*[����]\|�\_s*��\|U\_s*\%(��\|��\_s*��\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�\_s*[�Ļ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*[����ﷻ]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*¹\_s*��\|��\_s*��\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|̵\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*[����]\|��\_s*\%([������]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ʱ��]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[��ǡ]\|��\_s*��\|��\_s*ζ\_s*��\|ξ\_s*��\|ή\_s*ŭ\_s*��\|��\_s*��\|��\_s*[����]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|ŷ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*º\|��\_s*��\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*¹\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*[����]\|��\_s*\%([�̼�]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\)',
-      \ 'z' : '\%([�������»¸·­«��֤����±³��²¯°��������������������¡£����¤ź����ȿ������������������������������������������������������������������դ���������������������ظ�������ƦפԦ����Ƭ�ݿ߹��޿���������������ֺ�����ɼ������ټ����Ķ�����Ժ��ټ����������������ľ�������㿬̭������ߩ������������ʿ�顿�����ױ��ӿ�������пԿҿؿѿտ��ǽ�������������ޮ�տ��������ٳа������屽���������������������л������������ġп����Ы����������������������ǡ��̼����ž�����������������վ��������ڷ��������������������Ǩ����������è�����ط���������۲�ٽɽμ�����ѽ�Ȼ������Ž���������ޭ�߱��������覽�۽����ڽ޽����޼�쳼��������������ߨ��������������к��ߧ������尽Ľ½��������ý������ƽ�֮���������������꼥��Ώ����߼������������������ֵ�����������������������ᪿλ����������̻�Яϩ�˱�ѻ���ż���б��褻������Τ�����߷�º������������ֿ������������ܪ�Ȼ�����������������������̻���쩻������ϻ»�߻�����ƺ����ú޺���ߺ�к��������ú�¢����µ�������������좭�����إ����������������٦Ƨ���z]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ȯ\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*��\|Ĵ\_s*��\|��\_s*[�᷺]\|�\_s*��\|��\_s*��\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|J\_s*\%(I\_s*S\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|Z\_s*\%([r��]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|I\_s*P\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\)\)',
-      \ 'A' : '\%([���������Գ���ȯϾ�տ��ƭ�����޾���ӡ��Ť�������Ƭѫ������ͷ�ʷ��İ�Ϳ���������������������ø�������ܶ�������̵����ܵ���������驰��н�������ƪ��鷹ѻ�����ˢ��ǽ�����������ܽ����֦���½�Φ����ؽ����Ǯ�����Ȳ���䰵�Ǵ�������ռ��ݯ�м�������Թ���������ڹ����������ײ�Ϫ��ɽ��������������¹�ͽЮ���������ɷ������庾Ӻ̴������ɵ�����ఽ���������������;������ŷ�������°�����ֵ��ϰ�̣������Ԫƴ�����갮����������������������������ů��ۭ��μ������氰�ﾽϯ�����۸�ޫ��������ۦۥ���˾Ͼ������������������Լݷ�����ʸۣ��齶��ϰ����갥���欷�����԰ǰ��ްưð���Ȱ�����ī�ﰦ��������ð�������­���ҹ������Ӽ밫�Ƽ�������ǹ��������˽�����������������˰����ķ��°���մ���尤�Ը��ʻ�����������ᰢͭ�������˴������±޽�����ک�����г���󰸶�˰ب�Ĥ��������&�ʢ����ܶ��϶���΢����͢����޸姸���ơ��������ǡ�������򦡥��ѧ�A]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*ŵ\|��\_s*��\|��\_s*��\|��\_s*Ʀ\|��\_s*��\|��\_s*��\|��\_s*̾\|�\_s*̾\|��\_s*��\|��\_s*��\|��\_s*[��Ļ]\|��\_s*��\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|¹\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*ʪ\_s*��\)\|��\_s*��\_s*��\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|ޱ\_s*��\|��\_s*��\|Ʀ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*¿\|��\_s*��\|��\_s*��\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|��\_s*[������Ǭ]\|��\_s*��\|��\_s*[��ɧ]\|��\_s*��\|��\_s*��\|��\_s*��\|Ҹ\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*[�ˡ�]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|D\_s*��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[ɿ�ͽ�������]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\_s*��\_s*A\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*ư\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|°\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\_s*��\_s*ǽ\|��\_s*��\_s*��\_s*ǽ\|��\_s*ˡ\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([�������ȥ��]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*ǽ\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*Ͽ\|��\_s*��\|��\_s*\%([�˥ᥢ����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)',
-      \ 'B' : '\%([���߹�������������������������������������ڽھ������������������˲������������ѳ����������̶���˦��꼰����汬�������˳ر˸��˹��˻˶����˺����������˴��˾����˵˿���������������������籸�����촳Ħ����˷ը����˫���������������ѹ���������ʽٷ��ҡ��������޺�����������������������˼������ūʥ��޽޼�����������޿������������������ʪ�ɲ�ʹʸ��̵�����������ʬ�������������������ק�������￡����������͹�������ɵɤ�����ޣ�����ֱ�������ؾ��ݧ���������������ɴ�����졪�¡�����ɼǭ��֢���ʿ������������������ջ��������̤��������������������׹߾������������Ȣ�����®�Ӷ�˪����ȭ��ƯȫȪʵ��ɡüΥ��V̥����ȵ��ٶȶǢ��ʢ�Ļ�ʧ㱸�����Ȥ���������������˽�������������������ʱ��������������೭����������������ȹ���������Ȩؤ��Ƚ���������������ȼ㩺������������������Ȳ������ȴȳ�����������粽�ڱ��������������ĥŽ�С�ʩ�����ݲ���ߡá¡ݡ������ܥСϡΡСѣ¥֥ӧ����Ҧ¥�B]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ܥ٥֥ӥ�]\|��\_s*[�ܤ٤֤Ӥ�]\|��\_s*��\|��\_s*��\|�\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*Ǥ\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*ݰ\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|˭\_s*[����]\|��\_s*��\|ŷ\_s*�\_s*�\|��\_s*[��϶]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|׽\_s*˥\|��\_s*[̡˥]\|��\_s*Ҵ\|��\_s*Ƭ\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ʼ\_s*[��ˡ]\|ɽ\_s*��\|��\_s*[�Ļ�]\|��\_s*��\|ȯ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�\_s*�\|��\_s*��\|��\_s*\%([�ӳ�ϫ]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)',
-      \ 'C' : '\%([���²����ݰ���ť������������ޢ������ͷ°�������������Я⸿�Ƚ�Ҹ����Ǽ����ۻ�������ô�㪸��ۺ��������礷���򼷻쮱����������Ѻ���˹����Ϲ���ٹ������ʺ��ú��������̶�������������������縥���պ������������ۦ�Ĺ����ȹ���������ָ����벹�Һ����٬̫�������ޫ�޳��������䲬��������ު־�����������������������������������������ϹϺ�������٫��Ⱥ������ӫ����ִ�����������ӳ������������������Ӭ�����ص��������޸���ܺս�幡������������͹�䢹�̨����ɹ������ж���๫�ʹ����Ĺ�á�������񹸹��ۥ��������⫹���ֹѸ����������۹չ������̹��˹��عֹ���骹ݹҹ������Թιӹ�ĸ�������ë����������ӭ�͹����޺��������ݻ�����ջ��̼�Ե���ʴ����������Ը���������������������Ƹ۸���ž�������Ķ���ٸ�Ĩ��������������̱۸ɸָ���ܵ������ʽ�����ѻ�������������ᡵ�ǻ��۹��������ɯ����˻���í�ܦ岱���ӵ������ʡ�������޶��٣�໦��������������������������������Ҫ����ͼ���������������������������������������������ٰ���������������֣ڱ��������·����޷�����߫���������������ѩ���Ѣ�����������������������ߥ����������������ѡ����������������������٥Ѩ����������ڣ������������������������������������ݺ���������ګ���������̻�������������������������خ����ع���������������ɹ�������������������Ԥ�����ܯݬݮ��ܱܮ�ݫ������ʵ��ߪ�������������������������������ʤ������վ�߷�������ţ賷�Φۻ����Ү���������·��ط����״����򷬷���������ڶ�������˿��ֲ��̽�����ǰ̰�鶰��������פ��޺���������������ޱ�����Ϳ����������߸������������Ѧ�����庿����ܸ���ȷ������������ˮԢ������ʭ�Цչ����������ġ������ҵ׹�����������������޷��˹��ȸ�����Ң������ڹ��������׶�������ҿ�ȴ���ȷ����ͤ���Ա�������飼�������������ý�Ƴ������ħ����󻼲�������١��������Ĵ������ɸ¢ֺλ����������ߨߧ�¼Ȼ������ο�Ǧ�������ǧ��к�����尷樵Ԧ����������������ܰǢ���������������ܾ����������ؼ������������ż�Ĭ߼���ȼ����𮼻ꩼ�������ɨ���������ũ���������ż�������ʻ��������������������͸忬�ļ������������������ҼԺ������ա�����ĵ��������հ���ռ�������ޯ�κ���բ��ٱ�ؼ��ڷ�����������������������ּ�忼��м�ܼ�����Ѽ׼ͼм˼ּ�Ұ����ʵ�������ż�ެ������ոշ��ܤܣƵ��������������ý�������ʽȽͽɽܼ̿�����������꫽н���ܶ������������������ꪽ��������Ӵ֭�������ϼ����������������������ܽ�����µ�½�����������������������������������Ѯضآ߽�����������ؽ�޴�׽ٽ���䣽ֽ����߿���������������������������Ӣ��������������֪��ǿ������������п¿��������Ŀ˿��ӿ��¿��ǿ���ä���⿹���ƿ����������ʿ������ƿ�謹����������е��������������������������ؽ��������������޵�����������ַ����Ҿ�����������ľ���䬼������������ֹ᳻��������ļ�������������װ�������գ����ң�ط�����������������������Ӿԡ����������Ľ������ؾ����������������Ѿ�����ء�Ͼ��������޾�������������۾¾���騾��ľ㾩�������ܥ�����񾬽��������������Ͼɾ����˾�������ƴ�Ҿ;����о��ƾȾ��Ͼܾþھ˾�����������������������ԧ֤�ѿ�����°�������������濣���鿨�������������л����ػ����㭻�׶�������������������Ӷ��Ǽ�����ӡ���ܻ�������������������������ҿ��Ӻ���ǡ����ɦ�������������֬����寿����¶���ǻ���������������������л�������ף�㬰�Ԯ��Ƿ�Ȼ�ֻ����ѻ���ʻ�̼���������������������̦��Ż���������������ڻ�����ڼ���褴��������λ�Ƥ����������ڹ��ɳ�����߳��˹��ȷ�̢���ư��񢿱Ʊ����ʡ�ܢ��������������ᱵ������������𦪦ʹ�ǡˡҡԡơȡɡѡСա������ج�ɳ�����϶��������������Ѿʸܵ�ȿ����������ǣ�����ʶ�ͽ�����г����Ͼݵع�˵�����ۿ��ٸ��Ƿ����շ�����ͩ������Ϋ��������������������K�Ĵ�������ȱ�������١Ҥ���ҳ��ݢ��ٿ��Ȧ����۫滳�������ܾ��龹�ô���������������������������Ž��޳���������ڳ³����������������������귰������¦���������ǰ�����㡴����姢�������������������������റ����������ҳ��������ݲ��������ҳ����˿����������ڸ����ি�ԣ�����ϸ³ø�����֡١סʷ�����ŭƬ������ŨŬ�Ⱦ�Ť�״׳�����ᰥ��ɬ������Ŵ����ܷ�������̳������봢�Խ�����ڲ��������Ӿ��������������׳�������ڨƿ����ӽ�dzӡϡۡڡ̡͡γ��ȳijԳճʳ��߱��׳���ڼ����ȵҳֳѳ�����Т������Ӽ����뻳�����һר������ݥ�����������������ų�����Ъ�����������Ļ�����������ӳ���ܴ��������߳����ٳ����β����𳭳������dz��������򳬲������������Ԭ��٪�Хٺ������������ù���������٢��Ӳ�����ߵ������۸������������������Ұ���������楼������������������Ѵ���޾�˸�˧�����ӳ�������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ�����ȴ���䯴�������԰�ݴ����۴���ڴ��������Դ�ա�����̴�����δ��˴���ע������Ӵ������Ĵִٴ��״�ӿ���Ŵ��ɴ����ش��ϴ������Ѵ��ش������Գҵ��ȴճƶ�������������Dz����μ����ŲͲ�ӻ�����۷紣�Ҳԥ�Ф�����������Ҳһ��ݲݲִ�������������������ּ���������������ȼڲ�桶���˲Űײ�����ӧ��������ҷ����ܴ���������ѫ�β������βϲѼ����н��������ӥ��������ѷ��������ϲӲ����ɲշ��������߲��������Ʋ��²�������Ⱦ���������Ƹϲˤ����ı��Ķ��Ƣ����۲ø�ҧ��姨�ৣ�����٧ا��������ӧ���ݧ�����᧷���������������짢�����ۧ秮�ܧ��ԧէާ觯���קѧڧ�֧䧡�����𧦧����ߧ맥�������ߨ���������Ƽ���֦��ҧ駹�����ݡ��������׶������������ܥ����������������������񥷡��C]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\_s*Ⱦ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ѥ\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*[�ʺ�]\|��\_s*[��϶]\|ѱ\_s*��\|��\_s*��\|��\_s*[̱����]\|��\_s*��\|�\_s*��\|ɴ\_s*[߻��]\|��\_s*��\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|õ\_s*��\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*[������]\|��\_s*Ϣ\|��\_s*[��Ǧ]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[����]\|�\_s*\%([��α���ֲ����˼���]\|��\_s*��\|Ǽ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|7\_s*��\|��\_s*��\|ʸ\_s*��\|4\_s*��\|��\_s*[ʬ��]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�̰�]\|��\_s*��\|��\_s*\%(̣\|��\_s*��\)\|��\_s*[����]\|͢\_s*[����]\|´\_s*��\|B\_s*r\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*[����]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|ݣ\_s*��\|�\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*ƣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|ʬ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|��\_s*[�����׼꾽]\|ʣ\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\|��\_s*�\|��\_s*\%([���]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*[���]\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����֥ץ���]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ɥѥ��֥��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%(��\_s*[����]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�ĥȥ���]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%([�����ޥ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ץ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�եȥץ���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([������������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([���եɥ��󥳥ꥦ]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[����]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�����ȥॸ]\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*ɸ\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*³\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\)\|ú\_s*��\)',
-      \ 'D' : '\%([�������ñ��ӹ������ɾ�������ǯ����Ļ������Ч���������γ����������������ѪƯƺ���ߡ�����ѯƫ�������ƣ�ޡ���Ʒƴ�΢�ƼƵ��Ƴ��Ƹ��Ʋ��ƶưƹ��Ʊƻ��׸�����������۲�αͻϿ�������ظͻ��ڤɻ�����������ǩť��Ů����Ҵ��ޡ����ܬ���ѣ���žȤǥ���ɶ��ʹ˶���������¤��Դ������͸�������������ŵͿ�����Ϣ�ť�������ϼ����¼�êí������ǻ������������ïî���ն��Ե庲��ë�۴��������ݹ�������է��åæǶ�������������ʿ�����ϡ�����������������������ö��׼������������ԥ������������������ٽ��ձ����������ټ����Ωѵ����ί��۴�����̽п������Ѽ߱���ͤ�ľ����Ц������\.���ġ�ȡɢ���������ã����ȣĥɡ�����������Ǧ��ħբ�D]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ɥǥť¥�]\|��\_s*[�ɤǤŤ¤�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*ŷ\_s*��\|Ʀ\_s*��\|ǡ\_s*��\|��\_s*��\|��\_s*��\|Ǵ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|Ƭ\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|Ĵ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*��\|��\_s*��\_s*ã\_s*¿\|��\_s*\%([��˸�]\|ʿ\_s*��\|��\_s*ŷ\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|ǵ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*ʪ\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|��\_s*��\_s*��\|ȯ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*ά\|��\_s*��\_s*��\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|��\_s*��\)',
-      \ 'E' : '\%([��������ٱ稰��Զ�����������������콸ս���֦�����������廷�ٱܱ������������������ְױ����ر���Ԩ�ų���ɲ��С�������������ݩ��޽��޼�������������������ާ�����Ǣޱ���޻����ʥ������Ԥ�������ϱ������������ͱ��ն�����߱��������۪�б����������հ���������ܳ������ϱ����Ʊñ����ȱԱű�ƱӱDZɱϱı��̱������������޹�����з�ت�Ͳ���������±ݲ�þв��������������������������������΢ᢺ�����⧮�ާ����Ѣм������ǣŧ㧳�ݧ������ŧ泌E]\|A\_s*\%([��Ƚ����]\|V\_s*\%(��\_s*��\|��\_s*ͥ\)\|B\_s*\%(��\|C\_s*��\)\)\|��\_s*\%([��Ƚ����]\|��\_s*\%(��\_s*��\|��\_s*ͥ\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|ɰ\_s*��\_s*��\|M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*˹\_s*��\|��\_s*ʪ\|��\_s*��\|˦\_s*��\|��\_s*��\_s*��\|Լ\_s*��\|��\_s*��\|��\_s*ϩ\|��\_s*��\|��\_s*[�Ի�]\|��\_s*ƺ\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|L\_s*\%(��\_s*��\_s*��\|L\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([���ɲ]\|��\_s*��\)\|N\_s*��\| \_s*n\_s* \_s*��\_s*��\|��\_s*\%([�Ķ˶�]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�Ȼ��ʶ�]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|S\_s*\%([����]\|��\_s*��\_s*��\|N\_s*��\|F\_s*��\_s*��\)\|��\_s*[¿��]\|X\_s*\%([����]\|O\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([������]\|��\_s*��\_s*��\)\|��\_s*ƻ\|�\_s*Ʀ\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|��\_s*\%(Ϸ\|�\_s*��\)\|��\_s*��\_s*��\_s*®\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|ݿ\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|ȯ\_s*Ÿ\|ɾ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|ɴ\_s*��\_s*��\_s*ŵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*ĥ\|��\_s*��\|��\_s*ò\_s*��\|��\_s*\%([��]\|��\_s*��\|��\_s*\%([�ޥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*Ω\|e\_s*\%(x\_s*a\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�֥����顼]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*[�ȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*[�ȥ�]\|��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[�䥢]\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)',
-      \ 'F' : '\%([��ϼ�в�����ɮ������������˼��ݵ����ϰ�˴ϴʻ�ÿ����ū�����������߹����������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ��������������������޽ʥ޼����⵺�б����ƣ߬�����������������ѵ������ο���ʳ�������������ʰ��ز��ʧʨ��������ؿ����礢�����ı������ǹ���޴�ʤʢ������������ʣʡ��������������Դ������������������������������ҿ������Ϸ����������������������Ƨ����������н������Ҷ������꿣�ڿ�����������ʮ�߹�������ֿ�ʫ�������������������������ݤ�Ŵ��Ϣ��٢޶���ʩ�����Ƣ�ʦ�⧶���է��F]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ǹ\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(Ǥ\|��\_s*[����]\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[�滳]\|��\_s*��\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*[�ͤ���]\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Χ\_s*��\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*ǽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*1\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
-      \ 'G' : '\%([���������Ʊ��亲�޺��и����Я������ǡ����¹���ɹ���������Ͽ��������й���ⶳ��������������������������ݶ�������蹡����������贻�������˸������Ӫ伸˸���ظ����5��Ķ�����ۻ��ٸ�ѻ����줴�����֡����������������������ɷ޷߷������ݱ���Ŵ�������ɧ��������ѷ�ʸ����������¸�����������������뻲�²����Ƥ�����������ʵ�ʹ����Ұ�¢��襸��ж�����鹶��ܶ�������溷����������ֶ��������򹰶����㼶������ȶ餰��������ݵ����۶�Է֪���������������̵��������Ƹ�����ߤ�������ѧ�ĶȶǶŹ�����Եյ��������ڵ��۵��õ��췷������Ѧ��»·赼��ĵ���������ۧີ�٦�������������ȱ��ⷸ��⧹ε������ߴ�����¦�̳����Ǹ����񷿷�����Ը����걳��������޽��˳̿�������������Ƭ�������︷�������������̴ݢ��������޴��������ḵ�����������������������س�����̳۳ٳܳڳش�㨳���ЩԶ�䳯���������ֽ�糳ӱ��⭳��������賩����������������������ֶ����������Ѵ��ݲ�ծ�������Ө����̲������´��ϲ�谽�����˲�����쾡��󡤬���Ǵ��楬���֦������Ԧ��������ƦѦ����ɦ��զӦ˦��Ϧͦצئ������Ħ��¦����ЦŦ������ҦȦǦʦ����Φ̦����������Ԧ��ç�G]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƭ\_s*��\|��\_s*��\|��\_s*��\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ֱ�]\|ŷ\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([�Ÿо���]\|��\_s*��\)\|Ʀ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��¯]\|��\_s*[���ǹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*[���׹��]\|��\_s*ϡ\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\|��\_s*\%([ˡƻ��]\|��\_s*��\_s*��\|ʹ\_s*��\_s*ˡ\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\|��\_s*��\_s*ë\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*̾\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ϣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([��른���Υʥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*[�˥�]\|��\_s*��\_s*[�˥�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*[�ĥ�]\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ե�ޥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*[����]\)\|��\_s*��\)\)\)\)',
-      \ 'H' : '\%([��ά�������мۭϯƶ���������ش���Ǯ����˴��������ꥷֹ����٢��������ڣ��������þ�̷�ȸ�Լ�����������ƾ����������Ե��ұ���ٸ����ޤê����������׺����˲��������˯�������������ˣ˱�������˩��������ˬˢ߰��˥��˨��������ˮ˰˦������˭����ˤ��ڽھ��������Ӯ�������Ʊ�����������������������Ħ������������˫����ԾӬ�����ێ͸�½��Ш���۳ֱ�����׭׬̦������������������������������������������΢���������٨������ղʽ��������������������֢������ʾ��ʻ����������������򰵸͸�؎���ϼ�в������ر�����������˼��ݵ�ɾϰ�ϴʻ���ÿ����ū��������������߹����������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ����������������޽ʥ޼�����б����Bƣ߬���������������ѵ������ο���ʳ������������ʰ��زʩFʦʨ���յ�������ؿ���乢���������ǹ���޴�ʤ��������ʣʡ������������Դ��������������������������ҿ�������������������������Ƨ����������н������Ҷ�����꿣�ڿ�����������ʮ�߹�������ֿ�ʫ�����������������Վ���Ϸ����DzDZ������ɢ���ݽ���ɨ�����ڻ�����ײ����ɦ����������������گ�������������ٶ��������������ɳ����ߪ߫����̩���������ҷ�������������Ψ����ɢ�ʺ���ɽ��ź��ƶѽ���������ñ����¾��Ʒ��1������ඡ���ɩ�Ͼ��Ǽ�����ݱɧ�ҹ���������ɴ���ҿ�������ɪ粹����ɲɱ��桶���ڲ������Ÿ��ͨ妳����ѽ�ʹ���ɱ������������繰����͵��ע������ɯɥ��ɭɤ�ʴ���ɫݤ����̤��ɮɬ���ɶ�������ɷ��������ɿɺ��ɻ������ʼɼ��ɾɸʿɽ�������֡�ڡʡآ���羷�������۬�������զ����Ҹ���������������������壸��������������������������У�����ﴳ�����ɹ����������������ɰ̥������������������ݺ���������������㰤Ҏʻ���ȧ�۽ˡ�ȣ�ַ��ү������ꤾ���׼��׹Ȧ���������������������߶������������ھ�¦�����ൡá˵��ȫƯ��Ȫ�������������������IJ�Ը����ʧ����ȷ��������ȩ�������㳾��С�Ȱ��ϸ����ܥ��˧��������ʢ��ͪ�����ڼ�����������Ѷ�����������������Υȹ��������ȸ��ަ��ɡ�ڲ��������������չ������Ȥ��Һ��ý��������ҹ�Ȣȡ��򾾹�ٰ������®Ȼ��������и���������ݢ֯��ڦ��������������Ԧ��¬��ѳĽ�����̷׿޸��������������ȥȮ�������ϡ����ȭ˪�ȱ��ˡȰ����Ȭȯ�����ڴ�����������������ԯ����������أ��צ�����ɣ����������������������Գ����������߯ޢ�����������Ȩ������ź�ܹ������������ڵ������ȼ��������Ƚ�����������������ɺ�����������Ⱦ����ȿȺ�����ǿ�����������Ժ����������ı����������������۱����������Ŷ����ķ��������Ʊ�����ü����ҵ������਻���Գ������������������������ܱ�����ĥŽ��淿��ʤϨ��������������������������������������������ȡ��ա�����ȥҥۥإ�H]\|��\_s*[�Ύ͎̎ˎ�]\|��\_s*[�ۥإեҥ�]\|��\_s*[�ۤؤդҤ�]\|��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�п�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\_s*��\|��\_s*[����]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*ˡ\|��\_s*λ\|��\_s*��\|��\_s*\%(�\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|h\_s*e\_s*c\_s*t\_s*o\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[�滳]\|��\_s*��\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*\%([�ͽ�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�ȡ�]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|ľ\_s*[�����Ᵽ]\|��\_s*Φ\|��\_s*��\_s*��\|��\_s*��\|��\_s*Ÿ\|��\_s*[�˹�]\|��\_s*��\|��\_s*ƻ\|��\_s*��\|��\_s*��\|��\_s*��\|̢\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ι\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|Ʊ\_s*˦\|��\_s*��\|��\_s*[��ȧ]\|��\_s*[������]\|��\_s*[�ǵ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|Ĺ\_s*ë\|��\_s*��\_s*��\|Ż\_s*Ƭ\|��\_s*��\|��\_s*��\|��\_s*[���]\|��\_s*\%(��\_s*��\|��\_s*��\)\|ͦ\_s*[����]\|ή\_s*��\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\|0\_s*��\)\|��\_s*\%([�ͤ���]\|��\_s*[����]\)\|ø\_s*��\|8\_s*��\|��\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|��\_s*\%([���������]\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*ή\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\|��\_s*ϻ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[��ʿ��]\)',
-      \ 'I' : '\%([�����DZߡ�����׶׵���������϶���������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�ݡ����������ȵ������ܵ�述�S׽ꭲ���������ڿ��Ĺ�Ǣ��������̿��쵸Ÿವ������ż���������ϫ��������ĺ�������׻��������к��������ط���Ү������ͦ�����ܡ�����Ǯʰ���������ᰱ�����˻�ް�������������Ϯ�ס����ӱ��������©ĩ��寱��۱İ����ս�˻�С������ݫ�����׸�������ԩ۵�����������������ʰ�ݻ������ְ�յ׮���Ų����������������ΰ�𨱡�������ֱ������������۩���۰��д��ذ�Y�Ű�1��������ڴ�Ū��٥�������������ަ�̰��թ�Ⱥص����°����ذѰϱ�ԣ��������������и�����Ȱ���ǡѦ��״��������ͣ��޻��������׳�԰ʳ�ױ������������������İΰڸް������������Ͱ��ֹ�������������������а�Ψ��ͬ������������հݰ��ڰ۵���������ɹ���ۢ͢����������˰����籥���������ɥ������ɧڻ�I]\|E\_s*��\_s*��\_s*��\|��\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*ë\|��\_s*ʸ\_s*��\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|��\_s*[����]\|�\_s*��\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�\_s*[�Ļ�]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����ﷻ]\|��\_s*��\|ݬ\_s*��\|��\_s*��\|��\_s*��\|��\_s*¹\_s*��\|��\_s*��\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[����]\|<\_s*=\_s*=\_s*>\|ɬ\_s*��\_s*��\_s*ʬ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|ɸ\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Υ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|¨\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|i\_s*\%(��\_s*��\_s*��\|P\_s*o\_s*d\|��\_s*��\_s*��\|M\_s*a\_s*c\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|̵\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*Ǽ\_s*ˡ\|��\_s*��\_s*��\|��\_s*\%([��ǡ­]\|��\_s*ʬ\)\|��\_s*��\_s*��\|��\_s*��\|Ƴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\)',
-      \ 'J' : '\%([���������ֺ�����ɼ������ټ������ľ������¿�̭������ߩ������������ʿ�顿�����ױ��ӿ�������пԿҿؿѿտ��ǽ�������������ޮ�տ��������ٳа������屽���������������������л������������ġп����Ы����������������������ǡ̼����ž�����������������վ�����������ڷ��������������������Ǩ����������è�����ط���������۲�ٽɽμ�����ѽ�Ȼ������Ž���������ޭ�߱��������覽�۽����ڽ޽����޼�쳼��������������ߨ��������������к��ߧ������尽Ľ½��������ý������ƽ�֮�������������꼥��Ώ����߼������������������ֵ�����������������������ᪿλ����������̻�Яϩ�˱�ѻ���ż���б��褻������κ�������������������Լٵ��ͤ��������������������֧�������������ʧק�������J]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ʊ\_s*��\_s*��\_s*��\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Φ\_s*��\_s*ü\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���˥ʡ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*[�ӥ�]\|��\_s*��\)\|��\_s*\%(��\_s*[���]\|��\_s*[����]\)\|��\_s*��\_s*��\|��\_s*\%([�ϥ����]\|��\_s*��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*\%([�ʥ�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%([�֥�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*[�ʥ��]\)\)',
-      \ 'K' : '\%([�����²�����Ƿ����ť����������������������ư����������Я⸼���Ƚ�Ҹ����Ǽ����������㪸��ۻ��������쮱��������੻�ֿ���Ѻ���������Ϲ���ٹ������ʺ��ú����������������������纯�պ����������ۦ�Ĺ���ȹ���������ָ����벹�Һ����٬̫�������ޫ�޳��������䲬������ު־������������㣸�������������������������������ϹϺ�������٫��Ⱥ��������ӫ����ִ����������ӳ��������������������Ӭ�����ص��������޸���ܺս��������������͹�̨����ɹ������ж�๫�ʹ����Ĺ�á�������񹸹��ۥ�������⫹���ֹѹ����������۹չ������̹��˹��ع��ֹ���骹ݹҹԹιӹ�ĸ�������ë��������ӭ�й�������������ݻ�����ջ��̼�Ժ�ʴ������������Ժ����������Ƹ�䲾������������Ƹ۸���ž������Ķ���ٸ�Ĩ��Ӿ����������̱ۻҸɸָ���ܵ����Ž�����ѻ��������������ǻ�ûƤ��������Ҹ�����ݰ�ٽ����ᾱ��ʷ��������������Ͽ���ٱ�Э��ۿ����ݼ�����������ܷ�������غ������ѭ�����ԡ����������������޲��իҥݾ�������������شկ���ث���ڷ𸳰��̷�����ո����������������丮����������������������������Ǹ����������ݷ�ڸ建�������������������������������ҧ��������Ҿ����ت�����Ϩ���������������������������������������������������������������ꥷ���찷Ʒ̷�����÷���Ҧ���׷��������ۤ�������ܯ��ݬݮ��ܱܮ���ݫ����������ʵ��ߪ�������������������������������ʤ������վ�߷�������ţ賷�Φۻ����Ү���������·��ذѾ����������򷬷���������ڶ�������˿��ֲ��̽������ǰ̰�鶰����������פ��޺������Ϳ���������߷�����������Ѧ��ν���庿ܸ���ȷ����������ˮԢ��ɦ����ʭ�ܿ�����Ц��������ĸ�¢����������������������޷��˹��ȸ����Ң����ڹ����������ҿ�ȶ���������꤯�����������ӽ����廸����������͵�����������θ���˨�������ž����������䷯���ݢݡ��뿸�֨�����ɵɵǵ̵Ƶʡ����ޢ̡����������ޡ��������á��笠��������������ܡ���������������������������塹�����������Ţ��������������硧�����顩�������¢��ġ������������졵�����ˡ�桼�ݢ����������᡺������Ժٹ���ܶ��������������µϴߵ�ʷ���ߵ�̸��������������������������׶ܶ����������۶�ڢ�Ҷݸ��ٶڶӶ϶׶նѶ۶�ֶ�ضб���ڡ��ک������ڪ��������ӵ����Ҩ��ީд�򰰶ɵ�����������ժ亶�����ѿ�����ַ���ﶷ����Ѭз�ź�䡹���������ިٰ���������װ�������������¶����ѹ��������߶�����ҳ����ٶ��������ɶ���Ѿ貶������󶩶��������ж��ᶧ���Ŷ��������ö��������������̾���������̵��������֩켣�������������ŵ���ָյ��������ⱱ�����͵ܵ׵��ֵ�ȷ���ٵߵ޵�۶��ݺ������ʹ���ݤ���ױ���̴����ڵ��������ſ�����өɱȲ�����ø�����ڶ˷�Ҽ����¶���𵦵����������������ۮ�־����ةȩ���ܵ���ѥ���·��д���̧İ�ɺ������������ݸ���������嵥�ڵ���������޿��洴������������ԭ�Ե�������������ڸ�������������������쵧�����������㵫��٣������ֿ۹�������������ڹ��ɳ�����߳��˹��ȷ�̢�ư좿�Ʊ����ʡ�ܢ��������������ᱵ������ר����������������ǡˡҡԡơȡɡѡСա������ô��ج�ɳ�����϶������������Ѿʸܵ�ȿ����������ǣ�����ʶ�ͽ�����г����Ͼݵع�˵�����ۿ��ٸ��Ƿ����շ�����ͩ������Ϋ�������������������Ĵ�������ȱ������١Ҥ���ҳ��ݢʢ��ٿ��Ȧ����۫滳�������ܾ��龹�ô�������������������������Ž��޳���������ڳ³����������������������귰������¦��������������㡴���姢����������̻�������������റ��ɵ��������ҳ��������ݹ��������޳����˿�����������ڸ����ি�ԣ�����ϸ³ø�����֡١׷�����ŭƬ��������ŨŬ��Ť�״׳�����ᰥ��ɬ������Ŵ����ܷ�������̳������봢�Խ�����ڲ��������Ӿ��������������׳�������ڨƿ����ӽ�dzӡϡۡڡ̡͡γ��ȳijԳճʳ��߱��׳���ڼ����ȵҳֳѳ�����Т������Ӽ����뻳�����һר������ݥ�����������������ų�����Ъ�����������Ļ�����������ӳ���ܴ��������߷������ٳ����β����𳭳������dz��������򳬲������������Ԭ��٪�Хٺ������������ù���������٢��Ӳ�����ߵ������۸������������������Ұ����������������ᴮ�������Ѵ���޾��˧�����ӳ�������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ������ȴ���䯴�������԰�ݴ����۴���ڴ��������Դʴ�ա�����̴�����δ��˴���ע������Ӵ������Ĵִٴ��״�ӿ���Ŵ��ɴ����شϴ������Ѵ��ش������Գҵ��ȴճƶ�������������Dz����μ����ŲòͲ�ӻ�����۷紣�Ҳԥ�Ф�����������Ҳһ����ݲݲָ򴢱�����������������ּ���������������ȼڲ�桶���˲Űײ�����ӧ��������ҷ����ܴ���������ѫ�β������βϲѼ����н��������ӥ��������ѷ��������ϲӲ����ɲշ��������߲��������Ʋ��²�������Ⱦ���������Ƹϲ��ݤ����ᨱ�����秷�����������ʳ��˥��߶��Ҧ֥����������ܥ���K]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ⱦ\|�\_s*ë\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ϣ\_s*̣\|�\_s*��\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|ɴ\_s*[߻��]\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|k\_s*i\_s*l\_s*o\|��\_s*[��Ƿ��]\|��\_s*��\|��\_s*ɧ\|��\_s*�\|��\_s*��\_s*Ļ\|X\_s*e\|ǡ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*�\|�\_s*��\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[��©]\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|̳\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŵ\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%([ormdfa]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[�����׼�]\|��\_s*\%(��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|(\_s*��\_s*)\|��\_s*��\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*[���׿�]\|��\_s*��\|ݣ\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*\%([�֥�]\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*[�եȥ�]\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-      \ 'L' : '\%([��������������������������������㡱�����������̢��ТϢ˥�̢ʥ��ݦ��򧭦�L]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\_s*2\_s*��\_s*ˡ\|\.\_s*\.\_s*\.\|��\_s*��\|l\_s*-\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ݦ\_s*ݨ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����������֥ܥȥᥦ����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([�����ƥȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*[�ȥ�]\)\|��\_s*��\|��\_s*\%([������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���������������ݥ���ޥʥΥ�̥֥���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*[��]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*[�륷]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�ɥԥץ�������]\|��\_s*��\)\)\)',
-      \ 'M' : '\%([�Ӵ��ڬ��������������������ߪ߫�������һս�����������������������ο��������������ʹ��ʪ�������������أ�ε첼Ъ�����Ǵ��ܸ�����ʸ����������ݨ��������ۯ�����ۤ��˴�������������ݼ�˾��dz������ϳ�������ܾը���л��Ӥ����������ո�ľѾ�������ճ����˨�λ�ت�����������������������������������������������ۻ�������������Ϊ溵�ʰ������̺�����������ü������ӹ��������ɴ���������Ϣ͸��¼���߶����ٽ��ﶻ�ŷ�̼��������ǫ�����ƿ������������������̸̻����̵����̴̹��̶��ϻ�����پ���̷̳����믵��Ĺ�ǥߺ���֪������Ь夰�յ�������𢨡�������̮�þ���̬��Ѱ�λ�û������ǣ����ץŹ������̨��º��ļ�š�������Ѣ��١۱����̰������ǧʾ������Ƴ����ϩƻ����м�����������̯̾̿̽�Ե�㴳���ﲸ���̫����������Ĵ��̩���̪��ܳ�̲��̱��׽̭��뷱ο�̧����������������̥̣̦�ʿ���ߎ������ϸ����������ٿ����ܵ������������Ū�¹׿׾�ᵼ��ž���е����������ȱ��μ���°������ż��������̱Ҹ�����Ʀԫ�����ѿ���Ǥ������ʶ������������Ĵ��ٰ������������������ü�����������������ᶶ賹Į�����������Ԥ�硬�ˡʱߴ�ʣ���󺵸����������������������ػ���������������Ϩ����������������������Ż�������������Ȩؤ����������̢�������̡��������������Ϯ�����򾾶��踭ͥ�������������������������Ϻ��������������۾��������̤�������⼬�غ���������������ѿ����������˻��޸����������̢ޡࢿ���ܡޢ��΢Т��ʢ���ꢻ���覤�͡碾���ݢϢ��ߢˡ���ߢ�������������������͢���ݥ޺ǥߥ᧮����M]\|��\_s*[�ӎҎюЎ�]\|��\_s*[����ߥ�]\|��\_s*[����ߤ�]\|��\_s*[������]\|��\_s*\%([���Ͽ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*\%(��\|ʸ\_s*��\)\|ξ\_s*\%([�ѿƿ�]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|ر\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*ĥ\|��\_s*[�����]\|��\_s*��\_s*ӧ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��������ͭ]\|��\_s*ƻ\|��\_s*��\)\|��\_s*��\|��\_s*��\|6\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|©\_s*��\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|��\_s*��\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|��\_s*��\|�\_s*ȷ\|��\_s*��\|��\_s*[�����]\|��\_s*��\|��\_s*��\|Φ\_s*��\|��\_s*[�ҽ�Ԣ]\|3\_s*[����]\|��\_s*[����]\|��\_s*[��ȱ��]\|��\_s*��\|ȷ\_s*��\|��\_s*��\|��\_s*[���������˪��]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[ζε��]\|��\_s*��\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(̣\|��\_s*[��ž]\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*��\|��\_s*[���һ���]\|��\_s*��\|ߴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*[��̯��]\|��\_s*��\|��\_s*��\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|Ю\_s*��\|��\_s*��\|��\_s*��\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[Ƿ��]\|��\_s*ɧ\|ʹ\_s*��\|��\_s*��\|��\_s*[��§��]\|��\_s*��\_s*ǯ\|��\_s*��\|¿\_s*��\_s*��\_s*��\|��\_s*-\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|ñ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*Ǿ\|��\_s*[����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*��\_s*��\_s*��\_s*��\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\_s*��\_s*̣\|��\_s*��\_s*\%(��\_s*̣\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)',
-      \ 'N' : '\%([�ɽ��԰���ھ�翮������������������Ǽ����¡���۩����׵�˾���̰�ĵ����ƭ���о����Ӹ�����Ī��������ɫ��Ÿˡ����ŵ����§���ϵ���ů������ۨ�����ǹǿǾǽ��������Ƕ��Ǹ�����ЫݻǷ����Ҿ��ݡ�ǻ�ĤΎ�������߿ݦ����եǫդ������ٹǭ���ʿ�ܡ̲������Ǯϫ�Ǭ̭��ܬ����Dzǰdzǯ޺Ǵ�ͺ�DZ��Ǫϣ�����಻��ǩ������͎�Բ���ʾ����迡���۾�ݹ��������ŧ�޹dz�Ǩæ��˥ȴ��ٶ���ɤ̎�ٿ��ô�����������콭��ʨ���߳���Ʋ������ؽ�ǢѦ���浶��ǡ���������ǣ����������ԡբ�١ذ�����լ��ѹ���ٿ�Ǧ��ǥǧǤ�������̶�����������������֮ƨ�������������������������2бð�ˎ���ٸ�������ij���������֧����ť鵵ͼ㳴÷ò����ڳ�в��ּ�����ͱľؽǺޥ��������ϲ˿������ܧ�ƻ�������������б��������������±����ŵ��ڽ�������ͨ��������Ʒ��ȱ���į��ή��¸�������ܩ��Ĺ�����޽�Ⱦ�������棷�м�����ǵ����ճ���Ǣ������������������Զ��������󢿢͢�����������Ǽ̵��ٽ��ձ��޸���������ѵ�����İ����ྨӭ��������ڵ�����˴�������Ƥʨ���������������������������������������̾��������˥ͣ΢̡���ʥ̥Φ����ߦ�N]\|��\_s*[�ɎȎǎƎ�]\|��\_s*[�Υ̥ͥ˥�]\|��\_s*[�Τ̤ͤˤ�]\|Ģ\_s*��\|��\_s*��\|��\_s*��\|��\_s*ö\|��\_s*��\_s*ȿ\|�\_s*��\_s*��\|ϵ\_s*[�ݱ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƿ\|��\_s*��\|ο\_s*�\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|��\_s*�\|I\_s*I\_s*��\|�\_s*ȭ\|��\_s*��\|��\_s*�\| \_s*2\_s* \_s*��\_s*��\_s*��\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*ѵ\|��\_s*[����]\|P\_s*b\|L\_s*e\_s*a\_s*d\|��\_s*[����]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ʪ\)\|��\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|��\_s*��\|ʿ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|ɳ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|n\_s*\%(��\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)',
-      \ 'O' : '\%([���������Ů��ۯ۰�Ÿ�۲������˻������ҳŵ�����س��������������ḯ�Թ����������䲮��ɭ�����������ڶ�����ڼ��ᡸ�������������������������Ǧ��������Ƽ�����Ĺ�Ľ����Ǽ�Բ����������£���������ȳ�־���쿯����Φ�ֲ�ݣ�����ſ����༫�ʳ������ˬ�ʲ�������������񤲷ǰ����߰�θ��������ۻ�ɽ���̶�������Ͷ��笲��������������ݶ����ذ�ߴ�޳����۾��ʲ�����������إ����ᥲ���ص��ռ���鲪�����������ݯݳ���²�۷��겣����ݿ�������ӵ��������꾪Ʊ�����������ٱ�⳸����������͸���Ȳ����������ϵ��˲��˱����¿��ʤ�������Dz����Ϻ��ڨ��������ϯ�ݰ������������ƿ�Ϸ����ͦ�������˵�Ӱ���˿侭�����˸�����಼����ͺ�ߺ��������ӱ����ä�������¢���ˢ����ϧৰ�ϡ��ئ�����O]\|��\_s*��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*Ȭ\_s*��\|Ŵ\_s*��\|��\_s*ȱ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\|��\_s*�\_s*��\|��\_s*ʴ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ب\_s*��\|˵\_s*[������]\|��\_s*[̼��]\|��\_s*[����]\|��\_s*[����]\|թ\_s*��\|��\_s*��\|��\_s*��\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��̼��]\|��\_s*ǯ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*��\|��\_s*��\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ʪ\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*Υ\|ز\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����������]\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*[�߳���]\|��\_s*\%(��\|��\_s*��\_s*η\|��\_s*ŷ\_s*��\)\|��\_s*Ƭ\|��\_s*[��������]\|��\_s*��\_s*¾\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*\.\|��\_s*[��ζ]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|Ω\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*[ǯ��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*Ŭ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)',
-      \ 'P' : '\%([ˣˤˡ��������ܮ�������ʻ�����á�����������������������ʬ��������ɤɶ��ɼ����ʿ���ȯ��Ȣ��������������������������ʧʢ����������Ȭ�˱�����ĥ�ѱ����פԡޡܤצ��ը������̨��󡥣С�򢩡����ץ��ǡˡʢߢ��¥ڥѧ������զХ�P]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ݥڥץԥ�]\|��\_s*[�ݤڤפԤ�]\|��\_s*��\|��\_s*��\_s*Į\|��\_s*��\|�\_s*[Ϫϥ]\|��\_s*��\|��\_s*��\|��\_s*ϥ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Τ\|��\_s*��\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|��\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�ļ��]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*\%([��������]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|+\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|Χ\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%([����Υ�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*[���]\)\|��\_s*[�ĥ�]\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([��������]\|��\_s*[�ץ�]\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*\%([�٥�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*³\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*³\|��\_s*��\_s*��\_s*��\|��\_s*ƺ\_s*��\|��\_s*��\_s*��\|¿\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ž\_s*��\_s*��\_s*��\|��\_s*ʸ\|��\_s*��\_s*[����]\|��\_s*��\|��\_s*��\|p\_s*\%(T\_s*e\_s*X\|H\_s*��\_s*��\_s*��\|e\_s*\%(t\_s*a\|r\_s*l\_s*��\_s*��\_s*��\_s*��\_s*��\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\)',
-      \ 'Q' : '\%([��ܯ��ݬݮ��ܱܮ����ݫ����������ʵ��ߪ�����緩�����ų����������������������������ʤ��������մɾ�߷��������ţ賷�Φۻ������Ү�������ղ������ط��Ѿ������뷭�����򷬷���������ڶ��������˿����ֲ����̽�������ǰ̰�鶰���ȱ���������פ��޺���������������ޱ�����Ϳ����������߷�����������Ѧ��ν�����庿����ܸ�𷪶��ʳdz����������ˮԢ��ɦ����ʭ��Ӽ��������Цչ��硡����������Ŵ�ġ�������¢�������ҵ׹�������������׶������޷��˹�����ȸ�������Ң�����ܸ����ڹ��������������׶�������ҿ�ȴ���ȷ����϶��Ͷ��ꎸ���ѡơȡǡɢ���������Q]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̼\|�\_s*�\|��\_s*��\|�\_s*��\|��\_s*Ѵ\|ɴ\_s*[߻��]\|��\_s*��\_s*��\|��\_s*ʪ\|��\_s*��\|9\_s*��\|Ĺ\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ŷ\_s*��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\|��\_s*[����]\|��\_s*¢\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([��������ʸ����]\|��\_s*��\)\|��\_s*��\|��\_s*Ѥ\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*ϯ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*[���]\|��\_s*\%(��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*[�ॹ��]\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)',
-      \ 'R' : '\%([���������α����������Ͼ��ϼϽ����Ͽ����߳ϱ������ϮӤ����ۭ�����ӯ������Ѥ��ҩ�������۰��Ϻ��ϭϴϲϹ��ϸϰ϶��ϵϳϯ���ϧ���ȧ��Ϩ������������תϦ�������ݭߣ���ް���ٳ�����Ѷ������Ӻү��ߺ��������������㹵�����������������������������������ݬݮ�����������ҳ��������ҽ��߲��������ݲ��������ϡ��ϣڻ������Ϣ���ϩ���ޥ������������������ﻼ�����Ϭ�������ڶ����Ϋά��ΪΨ�˷�Χ��ҭϻ٤Φ�������������������߱�����ί��βΰαΩ��γέδή������P��������ܲ����ש����������ا��������������������������η������κϤθо��������̺��������������ۢ������ס����������ڢ�������������ɩ������������������ζοε�˵���νμ������λ����ξ����ιΥ����Σ������Ρ΢�����ߢ������������ئ������Τ轤��ϫ��������Ϸ��ԿЬѰڰ�������ݳ�պ��ݴݣ���������������������������������������������������������������ݪڧѴ��������������������������������������ɤ鱦�����ҧ姨���৫�����ا٧������ӧ��槬���ݧ����᧰��������������ϥ����Ϫ���ۧ秮�ܧ��ԧէާ觯���קѧڧ�֧䧡���駾�𧦧����ߧ맥�غ���������ҥ���꧲�Ѧ���R]\|��\_s*[�ێڎَ؎�]\|��\_s*[�������]\|��\_s*[�������]\|��\_s*��\|��\_s*[ͭ��]\|��\_s*[˦���]\|6\_s*[����]\|��\_s*̵\_s*��\|ݦ\_s*ݨ\|԰\_s*��\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*§\|��\_s*��\|r\_s*u\_s*b\_s*y\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ȿ\_s*��\_s*��\|��\_s*\%(��\_s*ʸ\_s*��\|��\_s*��\)\|��\_s*ǽ\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\|ǧ\_s*��\|��\_s*��\_s*ɽ\_s*��\|��\_s*��\_s*��\)',
-      \ 'S' : '\%([������Ъ��ۼ��˵ֵ�ڰ��޶�������˿����������Խ�������������������Ǩ����Ψ��м��©­¥«¦¬�������������������̫���ᰳٴտ£��֥��ػǬ߶����ҫݽ���������¹������������������ײ����س��Ȣ�������������������������������������Ҳ���䷫��������������������������������������������������������ç��������î¹½¸º»�����������������������¶�����������ȿ��������������ର�������������������ۤ�������ɯ˻����í�ܦ岱������������޶�������������ܸ�������������������������Ҫ������ͼ�������ϴ�������������ߪ�����������������������ٰ���������������֣ڱ��������·����޷�����߫�����������������ѩ���Ѣ����������������������ߥ������������������ѡ����������������������٥Ѩ��������ڣ�������������������������������������������ګ�����̻�������������������������ع������������������������������Ԥ�����������������¿��б�¼��ͥ����������ӳҰ����ӵ�����ѱ�������ڿ�μ������ͤʹ�������ƫ������ǵ��¨§�ߵ�������̡����������ͷ�������ķ������������״ɿ�צ�����������ߵ���������®ú���϶��ۡڽ����������ſ�������Т�̢ޢϡ�⦤��͡�ߢˡ��ܢ�ޢ�ʡ��΢��ߢ��ꢻ�����������حج�����������ï�Ϳ������巿������H�����������������񾽻������������ľ������������ڧ߭�����湥��ٹ���۵ʿ���Ʃ��Ա���飼�������������ý�Ƴ��������ħ����󻼲�����١����ٶ�������Ĵ��¢ֺ��������ߨ��ߧ�¼Ȼ����ο�Ǧ�������ǧ��ӻ����к�����尷樵Ԧ����������������ܰ��Ǣ�������������ܾ�������н�ؼ������������ż�Ĭ߼���ȼ����𮼻ꩼ�����ɨ���������ũ�������м��޳���ʻ�������������Ϳ��ļ����������������ҼԲ�������ĵ������������ϼ���բ����ٱ�ؼ۷�����������������������ּ���м�ܼڼ�����Ѽм˼ּ�Ұ������ʵ�������ż�ެ������ո��շ��ܤܣƵ����������´���������ý�������ʽȽͽܼ̿�����������꫽н���ܶ��������ܷ������������ꪽ�������쨳�Ӵ֭�������ϼ�������������������ܽ�����µ�½���������������������������������Ѯضآ�����������ؽܽ׽ٽ���䣽սֽ�������������������������������Ӣ����������������֪��ǿ������������п¿��������Ŀ˿��ӿ��¿ɿ��ǿ���ä���⿹���ƿ����������ȿʿ������ƿ�謹������е���������������������������ر������������������޵�����������ַ����Ҿ�����������ľ���������������ֹ����������ľ���������������׾̰�������գ����ң�ط����������������������Ӿԡ��������ʽ������ءˡʾ������������Ѿ�����ء�Ͼ��������޾������������۾¾��׾�騾��ľ��������ܥ�����ƾྫྷ�����������Ͼɾ����˾���������ƴ�Ҿ��ݾ������о��ξƾȾ����Ͼܾþ�ھ˾��ʾ�������������������ԧ֤�ѿ�����°�����������������濣������������������ػ������㭻�׶������������������ӻӶ��Ǽ�����ӡ����ܻ��Ｈ�����������������ҿ��Ӻ���ǡ����ɦ�����������������֬����寿��ڻ��¶�����ǰٻ��������������������л�������ף�㬰�Ԯ��Ƿ�Ȼ�ֻ����ѳ�����ʻ�̼��һ�������������������̦�����������������������ڼ���褴����ֻƤ�����������豫�����dz�˸�������ʿ����������������������ͻ�����ٮ����������ӦͶ��긼���뽿���ܻ����߷��߽Ϋ��ڼ����޴�����ͺ��ɾ�������������������참������ֿ���곡ָ��ӯ�����������˼�����λ��ã��ů͡���ұ��ⷱ�ζ����������۸Τܪ�����Ǿ�����٩�����Ӵ��ܼ������������Ʊ��ݺ���峦�涭�����ո������ප����������������ߦ�»�����ڹ�����������Ŀ������Ģ��ջ��ɻ���������ܢ���������ӻ����������բ���3����O��������������������������������߻��������ú���������ޯ����خ���稺������ռŻ����ø����칹��ʺ����ѱ�����٣���׺˺�㷺ԺݺҺӼ��кںκպʺĺ��ƺ׺źͺ��ԺۺкǺ�ª��������������������ں����Ժ������������غ��ݯ���������������̻��赺����ͼӺ��������Լ亵�����ֺ�������麺�����ú������������������հ����̬����٭����������������������������ϻ�����������⤹���Ż��������������������������맻ź������������ʸ�š�����ɸ���Ļ����ں̢����������ǡƨ�������õ�����������ӥ��������㧳����S]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|�\_s*��\|��\_s*\%(ϩ\|Ϫ\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�ס�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*[�]\|��\_s*Ѥ\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[��϶]\|��\_s*��\|�\_s*̥\|��\_s*��\|ŵ\_s*��\|��\_s*ͺ\|��\_s*��\|ŷ\_s*[�IJ�]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*��\|�\_s*ƻ\|��\_s*\%(��\|��\_s*��\)\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*��\|��\_s*[��Ǧ]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[ë��]\|��\_s*[����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�ظ��ܻ�]\|��\_s*��\)\|7\_s*��\|��\_s*��\|4\_s*��\|��\_s*[ʬ��]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|͢\_s*[����]\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|ή\_s*[��Υ]\|��\_s*��\|�\_s*��\|Һ\_s*ȭ\|��\_s*��\_s*��\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*Ź\|��\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[������]\|��\_s*��\_s*Ʀ\|ۨ\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[ǯ��]\|��\_s*[ǯ��]\)\|��\_s*��\|ɴ\_s*��\_s*��\|��\_s*¹\_s*��\|��\_s*ƣ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(ˡ\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|��\_s*[ŵ��]\|B\_s*\%(r\|��\_s*��\_s*��\)\|��\_s*ĥ\_s*��\|��\_s*��\_s*��\|��\_s*ʬ\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*¤\_s*��\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|��\_s*\%(Ƿ\|��\_s*\%(��\_s*̣\|��\_s*��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*¬\_s*��\_s*ư\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([���]\|��\_s*��\)\)\|��\_s*̣\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%([����]\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|β\_s*��\)',
-      \ 'T' : '\%([�������˳��������ɼ��Ҹ�����ڽ�Ѳ���������۳���������ݽ�꾲������������Ĺｩ�����ƾ�η���䶡�����������ݽ����ȼ��ͧ����������۽�����Ĺ���������������ԥ����Ч�����������ܽ���������˺�̭��������ǯ����ӷֺܺ�ڢ��κ�˭��������ƿ���¢�������Ѹ��ݹ��Ǽƻ������ƺ�����������ܫ���������������Ƴ���۶������岳�������ڮ�ݥ��������ܪ�������ٵ��ֺ����߮��ƪе����즰�������������ƽ��������޹��ơ�������������Ʀ����������ƭ����Ƥ����ƣ������������ƫƥ�����������ո�ﰳ��������믿���æ������Ԧ����ѽ���������������ײ��ѽ��ѹ��ϳ���αͻ���ų�����������Ͽ�ڼ��������Ϳ޻���������������Ȏ��ӱ͹����ʻ���Թ�֥������������ų������ׯ�ŭ��ū�ڳ��ũ�����������ɡ������ץ��������������š�����ż��ſ���Ŷ������ŻŸ��źŲŪůŨű��Ű��Ŵܼ���챭�����ܨ����������������ţ����������������š��������������������������Ţ޸���������׷�Ǝ�ʾ��ʼ������������ŵ������̳���ض��۲���ϸ������̽���Ϫ�������ٴ���ܻ��ܿ���������ѳ����������㪱����γ�����ª������ڼ�����������ָ��ʴ������ϸ��Ⱥ��鲶������ڹ˷Ҿ�����������ѣ������ױ����������³������������������ٽ��ƿ����������븾����������������̢�����������Խϴ���˵���Ϻ�¤������ݶԯ���з��ˤ�����ض࿵�����������˾����ͿԻ�ڻ������ܦ������������Ƶ��⸷ѻ���������̹�Ϣ�Ď����׹����������ۺ��������������紺��N�������㾹���������ٻĿ�����������������������������������������������ٲ��Ŧ����������������������Ȥ��������ܺ�������Ľ��Ҭ��ļ������Ť�����ı����������������׭����������ذ������߭׬�������������ġ����ĵįŽ��������Ƭĸ��ķijĪĢ��ĭ��ƨĻĥĤĨȥħ������İĦĬĮĺĴ�ģIJĶĩīЦ����Ѳפ����دɪ��������������������ɳ���ղ�������ϡѡСο�������������������������漣��֮�ѻ������׷�����������������ڲ�������������������������������������٤������̯�����ֿ�ڸ�ȿ�ˬ���������ܽ��î��Ƣ���í�̱���۸������������������нԻ����վι�ì���ʾλ���Ƨ����٥Ʈ������á�����Ⱦ�䲹���ﴰ����٦��ɶ���ݾ�Źê��éڥ�������çä�ܱ纴������ͤɫ��맰�������������ܭ������ζε�����ɺ�ݰ�������ľ����鶩��ͣ�������Գ���������������Ӭ���ѹ�ҵ�������ͺ���������׼������������Ŭ���Ƶ�����«�ԡý�������ݽ�è���ã�۹��̴��ƿ�����ֻ����Ǥ�Ʊ����ý���ϰ���䶳�ٷɹ��������º����յ���δ����������������������й���������ٿ��Ӹ��þں������������߬������������߸�������ÿWö��ӷëó�ȿC÷ò����ý��ðôùøú��û����õñâ��پ�������ŧڤ��٧Ӷ��߷����������������������������������������������������ڭ��������ʿ��ڬ����������������������������������������������������������ж���Ա�ǿ�����Ĺ��ʲ֫�����­������Ω�����������������ί��ȯ����۴¿¾���¿�ï���Һ�ӣ��������߱��٣����崤������ŷ���߷����ڢ����������ᦨ�����ɽ���ڥ����覨�ȥ����ġ�žƩ���������ȥ����Ļ�ü���ԧ��������������������Ө����������ƨ����䨷��T]\|��\_s*[�ĎΎ���]\|��\_s*[�ȥƥĥ���]\|��\_s*[�ȤƤĤ���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ϸ\|��\_s*��\|��\_s*[���]\|��\_s*�\|��\_s*ľ\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|͸\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��ƻ��]\|��\_s*[����]\|��\_s*ǯ\_s*��\|��\_s*[�׻�]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|ƶ\_s*��\|��\_s*��\|��\_s*��\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*¼\|��\_s*��\|��\_s*̼\|ɻ\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|ε\_s*��\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|ɹ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(��\|0\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Ϸ\_s*Ƭ\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|ܥ\_s*��\_s*�\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*��\|��\_s*ެ\|��\_s*��\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|��\_s*��\|��\_s*[����]\|��\_s*ë\|��\_s*��\|��\_s*Ϫ\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*��\_s*[����]\)\|��\_s*\%(��\|��\_s*˷\)\|��\_s*Ƣ\|��\_s*��\|��\_s*��\|��\_s*[ڳ��]\|��\_s*��\|��\_s*\%(ͼ\|��\_s*��\)\|��\_s*��\|��\_s*��\|ͱ\_s*Ю\|̵\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*��\|��\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ж\_s*��\|Ʋ\_s*��\|ǽ\_s*[ʸǷ]\|��\_s*��\|��\_s*̱\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����ॢ]\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�ե�]\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*[������]\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*ʸ\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|ʸ\_s*��\_s*��\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
-      \ 'U' : '\%([����Ⱥ��ɶ������ἷ�������ƶ���ڰ����ѽ��뼿������å�����ѽ�������ִ���ء�������¥��ӹ����������ⱳ����ư뭱������������վ�������ž�������𱴵���Ϊ�Ų�����������ر���������󨱲���山���������۲��������񱷸����¹��������ϻ��������������ڴ︽���̱ǰ�����������ֶ����̽��������޲�墱��ⳤز����������ﷵ�����庨��������΢���ױ���������Ӻ��屯Ĭ��Σݵ�汵���²����ͫ���˷Ⱬ�DZ���������������ڽͭ�ɼ��ޢ��Ƥ���ձ������񻾵�ѵ���ھв�ͷ���α������������仺ǿ���⤦�������զԥ��姵��U]\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*ǽ\|��\_s*\%(��\_s*��\|ͭ\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|ñ\_s*\%(��\|��\_s*��\)\|��\_s*\%([���ˡ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\)',
-      \ 'V' : '\%([�����֢ͣ��ǧ��Ӣ��˥�V]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([���ܥȥ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��ȥ�]\|��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*Ĺ\_s*��\|��\_s*ľ\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([����֥Х���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*[����]\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*[���䥢]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([���]\|��\_s*\%([���֥�]\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\)',
-      \ 'W' : '\%([���򲧽����������˽ﲴͺ����Ⱥ��ɶ���ʦԦ���ἷ�������ƶ���ڰ������뼿������å���ѽ����������ء�������¥��ӹ����������ⱳ����ư뭱������������վ�������ž�������𱴵���Ϊ�Ų���������ر���������󨱲���山���������۲��������񱷸����¹��������ϻ��������������ڴ︽���̱ǰ�����������ֶ����̽���������墱���ز����������ﷵ�����庨��������U��΢���׻᢬�������Ӻ��屯Ĭ��Σݵ�汵���²����ͫ���˷Ⱬ�DZ���������������ڽͭ�ɼ��ޢ��Ƥ�ձ������񻾵�ѵ���ھв�ͷ���α������������仺ǿ���⤦�����ܲ����������������ϴ��ѽѴ����ֲҺҶȵ������ɡ�ب����˺�����о���Ƹ���޾�������������������׿׾�б���������IJ��ƻ�Ĺ����������ʻ�駷�������������Ų���ѯ��뻲���Ƚ�����ռ㰿�������´ĸ���ӻͯ��Ͱ����ʬ����������ʨ���������ʤ�������ȣץ���W]\|��\_s*[���񎳥���]\|��\_s*[��񥦥��]\|��\_s*[��񤦤��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ͥ\|��\_s*˺\_s*��\|��\_s*��\|��\_s*��\_s*��\|(\_s*��\_s*)\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|Y\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[ͳ��]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*٥\_s*�\|��\_s*\%(��\|ʿ\_s*��\_s*��\_s*��\)\|ݿ\_s*��\_s*��\_s*٥\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%([�ץ�]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([�ࡼ]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[������]\|��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\_s*��\_s*��\|w\_s*e\_s*b\_s*��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*[��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-      \ 'X' : '\%([�������������������������������ا秷���ߦ�X]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)',
-      \ 'Y' : '\%([�ֲ��غ�������˩շ��޷����ڡ����ڴ�������������ֻۻ�����������������������þ��ӱٵ���㷽���İ��������˧��ȵ��������������׫խ��ۡ�����������������ƫ��ߡ��������������������������ٹ�������������������������������������������������������βž�������ա��Ю�����ô����������ڵ;�Ӹ�����������ǽͽDz����¿�������ͻͷ���Ϳ즤������μ��д�İ�������˭������Ƿ����ְ����������쪾�ற���ᾲ��������͸���۷�����Ͳإ��������ͤͨ����ͱͻ͹ͯͰʹ��ͼͩͪ��ͧͺͫͭ����������͡��ͷ�������ͳ������͢����·��������ͮ������竤掲��������׶׵���������϶��������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�ݡ����������ȵ������ܦ��ɵ�述����������ڿ��Ĺ�Ǣ��������̿��쵸Ÿವ������ż���������ϫ��������ĺ�����׻��������к��������ط���Ү������ͦ�����ܡ�����Ǯʰ���������ᰱ�����˻�ް�������������Ϯ�ס����ӱ��������©��ĩ����寱��۱İ��Ľ�˻��С������ݫ�����׸�������ԩ۵�����������������ʰ�ݻ������ְ�յ��׮����I���������������ΰ�𨱡�������ֱ��������������۩���۰��д��ذ��Ű�1��������ڴ�Ū��٥�������������ަ�̰��թ�Ⱥص����°����ذѰϱ�ԣ��������������и�����Ȱ�����ǡѦ��״��������ͣ��޻��������׳�԰ʳ豶���������������İΰڸް������������Ͱ��ֹ԰�������������������а�Ψ��ͬ������������հݰ��ڰ۵���������ԧ������İ��ø��������Ҳ��ݰ���������ͻ���Ϧ��������S�����ϵ��½�������������ͥ����²����۴����ݬ���������������ٯ��������������̼�ֳ쮼��칽��̡ҡԡաӻ�����šץ����̰���ǫ��͵���ٰ׵��ݹ�������Ȭ���ë��׽�����������Ǹ�������ܿ���������ͼ�������������뻦���輭���٧֧��ߡ�������ק��������觫�ԥ������ۦ�Y]\|��\_s*[�֎Վ���]\|��\_s*[��楤��]\|��\_s*[��椤��]\|��\_s*��\_s*��\|ݿ\_s*��\_s*��\|��\_s*��\|��\_s*Ƹ\|��\_s*��\|��\_s*��\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|4\_s*\%([�������]\|��\_s*��\|��\_s*��\)\|¾\_s*��\|��\_s*��\|δ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�Ҹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|Ī\_s*[�Ұ�]\|��\_s*��\|��\_s*��\|8\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ɴ\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(ͺ\|��\_s*��\)\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*��\_s*��\)\|��\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*ë\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|��\_s*[����]\|�\_s*��\|U\_s*\%(��\|��\_s*��\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�\_s*[�Ļ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*[����ﷻ]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*¹\_s*��\|��\_s*��\_s*��\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|̵\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*[����]\|��\_s*\%([������]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ʱ��]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[��ǡ]\|��\_s*��\|��\_s*ζ\_s*��\|ξ\_s*��\|ή\_s*ŭ\_s*��\|��\_s*��\|��\_s*[����]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|ŷ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*º\|��\_s*��\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*¹\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\)',
-      \ 'Z' : '\%([�������»¸·­«��֤����±³��²¯°��������������������¡£����¤ź����ȿ������������������������������������������������������������������դ���������������������ظ�������ƦפԦ����Ƭ�ݿ߹��޿���������������ֺ�����ɼ������ټ����Ķ�����Ժ��ټ����������������ľ�������㿬̭������ߩ������������ʿ�顿�����ױ��ӿ�������пԿҿؿѿտ��ǽ�������������ޮ�տ��������ٳа������屽���������������������л������������ġп����Ы����������������������ǡ��̼����ž�����������������վ��������ڷ��������������������Ǩ����������è�����ط���������۲�ٽɽμ�����ѽ�Ȼ������Ž���������ޭ�߱��������覽�۽����ڽ޽����޼�쳼��������������ߨ��������������к��ߧ������尽Ľ½��������ý������ƽ�֮���������������꼥��Ώ����߼������������������ֵ�����������������������ᪿλ����������̻�Яϩ�˱�ѻ���ż���б��褻������Τ�����߷�º������������ֿ������������ܪ�Ȼ�����������������������̻���쩻������ϻ»�߻�����ƺ����ú޺���ߺ�к��������ú�¢����µ�����������좭�����إ������������ڥ����٦Ƨ���Z]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�����]\|��\_s*��\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ȯ\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*��\|Ĵ\_s*��\|��\_s*[�᷺]\|�\_s*��\|��\_s*��\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|J\_s*\%(I\_s*S\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\)\)',
-    \ }
-endfunction
diff --git a/bundle/easymotion/autoload/EasyMotion/migemo/utf8.vim b/bundle/easymotion/autoload/EasyMotion/migemo/utf8.vim
deleted file mode 100755
index 790fa91..0000000
--- a/bundle/easymotion/autoload/EasyMotion/migemo/utf8.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-function! EasyMotion#migemo#utf8#load_dict()
-    return {
-      \ 'a' : '\%([ｱ餅母渉恤閔憐慌遽蚫鰒鮑袷淡∃主衽袵歩垤蟻麁凡塔蘭露著表霰非諍抗更検革改現競爭争洗殿鉱予豫粗嵐禮恠妖彪殺絢怪綺肖彩漢過謝謬誤礼操綾飴菴黯罨鱇鮟餡行闇按諳晏鞍暗鶩鬚鰓顎喘発肋豈嫂兄崇騰県購贖网罔咫與鼎中新邉邊辺恰頭價価値游遊畔畦堋杏梓与袙衵憬孔坑案侮窖強貴讐讎徒仇黶痣欺鮮字糾嘲薊姐姉曙炮焙炙蜚薹膏脂油危鐙虻泡蹟能痕踪跡東預聚輯纂遏蒐乢軋誂羹壓惇集陸敦暑淳篤熱扱暖温遖斡私圧焦汗央奥奧媼桜櫻塰蜑餘遍普周剰蔗余尼雨甘天凹押樗楝溢艶庵鰺網戯簣鯵味堊渥軛圷憧欠踵幄握芥齷厚漁鯏蜊蕣淺麻浅晰龝煥晢呆朖啓亮晄鑑滉昜旭聡光亨陽洸璋顯輝昿曠諦朗哲顕彬晶賈章商穐彰晃晧昭秋噫瞹穢阨埃欸姶隘文粟曖鮎藹饗靉挨間相哀葭趾朝晨愛跛蹇跫脚蘆葦芦鐐桎足淦赫燈赧紅旃朱茜藜銅赭閼曉暁垢皹皸絳灯證暴証赤呷扇黝榮碧葵蒼煽仰青穴和或哇婀当上阿編吾在併明開韲悪荒襾痾浴唖有挙遭逢嗚敢褪娃安厭充該彼擧會飫倦合亞揚椏宛遇飽惡當あａ藍金＠＆&∧∩論∠銀会∀空域⇔←↓⇒→↑⌒後Ц亜米¨´｀＾’〜≒αÅΑアаАa]\|厦\_s*門\|廈\_s*門\|沫\_s*雪\|食\_s*蟻\_s*獣\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|浣\_s*熊\|菖\_s*蒲\|豆\_s*汁\|蛙\_s*鳴\_s*蝉\_s*噪\|塩\_s*梅\|家\_s*鴨\|趺\_s*坐\|Z\_s*\%(n\|i\_s*n\_s*c\)\|浮\_s*子\|痘\_s*痕\|窪\_s*地\|糠\_s*蝦\|醤\_s*蝦\|信\_s*天\_s*翁\|左\_s*沢\|雅\_s*典\|校\_s*倉\|小\_s*豆\|四\_s*阿\|鴉\_s*\%(片\|鷺\_s*合\_s*戦\_s*物\_s*語\)\|渾\_s*名\|綽\_s*名\|化\_s*野\|翌\_s*檜\|飛\_s*[魚鳥]\|総\_s*角\|木\_s*通\|通\_s*草\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|花\_s*鶏\|我\_s*\%(妻\|孫\_s*子\)\|数\_s*多\|奄\_s*美\|灰\_s*汁\|胡\_s*[床坐座葱]\|日\_s*明\|碩\_s*宏\|祥\_s*[仁彦]\|蜻\_s*蛉\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|生\_s*憎\|匕\_s*首\|英\_s*\%([保田]\|虞\_s*湾\|賀\_s*保\)\|靄\_s*[靄々]\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(電\_s*話\|ア\_s*ド\_s*レ\_s*ス\)\|D\_s*カ\_s*ー\_s*ド\|C\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|Ｉ\_s*\%(Ｐ\_s*電\_s*話\|Ｃ\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|走\_s*目\|鹹\_s*草\|馬\_s*酔\_s*木\|海\_s*[豹人女士部驢]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|褐\_s*毛\_s*和\_s*種\|石\_s*蓴\|白\_s*馬\|水\_s*[黽馬綿]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|ト\_s*リ\_s*プ\_s*ル\_s*A\|公\_s*理\| \_s*ア\_s*ク\_s*シ\_s*ア\_s*ム\|ヒ\_s*素\|砒\_s*素\|京\_s*都\_s*高\_s*度\_s*技\_s*術\_s*研\_s*究\_s*所\|代\_s*入\|遺\_s*産\|抽\_s*象\|G\_s*o\_s*l\_s*d\|自\_s*動\_s*\%(現\_s*金\_s*取\_s*り\_s*扱\_s*い\_s*機\|預\_s*貯\_s*金\_s*機\)\|属\_s*性\|何\_s*か\|か\_s*つ\|お\_s*よ\_s*び\|セ\_s*ン\_s*ト\_s*キ\_s*ッ\_s*ツ\_s*ネ\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|使\_s*用\_s*可\_s*能\|利\_s*用\_s*可\_s*能\|算\_s*法\|割\_s*り\_s*当\_s*て\|オ\_s*\%(レ\|ギ\_s*ュ\_s*ス\_s*タ\_s*ン\|ド\_s*レ\_s*イ\|ン\_s*グ\_s*ス\_s*ト\_s*ロ\_s*ー\_s*ム\|ル\_s*\%(ト\_s*キ\_s*ー\|タ\_s*\%([ーナ]\|ネ\_s*\%(ー\_s*ト\|イ\_s*ト\)\)\)\|ー\_s*\%([クガサトラル]\|ニ\_s*ン\_s*グ\|キ\_s*シ\_s*ン\|ブ\_s*リ\_s*ー\|バ\_s*ー\_s*ド\|ベ\_s*ル\_s*ジ\_s*ュ\|ギ\_s*ュ\_s*ス\_s*\%(ト\|タ\_s*ン\)\|ゾ\_s*ン\_s*ヌ\|ス\_s*\%(チ\_s*ン\|テ\_s*ィ\_s*ン\|タ\_s*ー\|ト\_s*\%(リ\_s*ア\|ラ\_s*リ\_s*ア\)\)\|ド\_s*リ\_s*ー\|ジ\_s*\%([ェー]\|オ\_s*ロ\_s*ジ\)\|デ\_s*ィ\_s*\%(オ\|エ\_s*ン\_s*ス\|シ\_s*ョ\_s*ン\|ト\_s*リ\_s*ア\_s*ム\)\|タ\_s*ム\|ソ\_s*\%(リ\_s*テ\_s*ィ\|ラ\_s*イ\_s*ズ\)\|セ\_s*ン\_s*テ\_s*ィ\_s*ッ\_s*ク\|ロ\_s*ラ\)\)\|配\_s*列\|バ\_s*イ\_s*ト\|ハ\_s*ル\_s*マ\_s*ゲ\_s*ド\_s*ン\|引\_s*数\|人\_s*工\_s*\%(現\_s*実\_s*感\|知\_s*能\)\|イ\_s*\%(ー\_s*ジ\_s*ス\|オ\_s*ン\|ソ\_s*ッ\_s*プ\)\|マ\_s*ル\_s*ド\_s*ゥ\_s*ー\_s*ク\|紫\_s*\%(陽\_s*花\|水\_s*晶\|石\_s*英\)\|A\_s*\%([tlrImc]\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|タ\_s*イ\_s*プ\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*シ\_s*ス\_s*テ\_s*ム\|L\_s*T\_s*キ\_s*ー\|ラ\_s*ン\_s*ク\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*モ\_s*デ\_s*ム\|ド\_s*ラ\_s*イ\_s*ブ\|d\_s*a\|M\_s*ラ\_s*ジ\_s*オ\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|C\_s*ア\_s*ダ\_s*プ\_s*タ\)\|付\_s*録\|Ａ\_s*\%([４型面]\|ｘ\_s*ｏ\_s*ｎ\|Ｂ\_s*\%(型\|ｒ\_s*ｏ\_s*ａ\_s*ｄ\)\|タ\_s*イ\_s*プ\|Ｔ\_s*＆\_s*Ｔ\|ｔ\_s*\%(ｏ\_s*ｋ\|ｈ\_s*ｅ\_s*ｎ\_s*ａ\)\|ラ\_s*ン\_s*ク\|Ｉ\_s*エ\_s*キ\_s*ス\_s*パ\_s*ー\_s*ト\|／\_s*Ｄ\_s*コ\_s*ン\_s*バ\_s*ー\_s*タ\|ド\_s*ラ\_s*イ\_s*ブ\|ｄ\_s*ｏ\_s*ｂ\_s*ｅ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|ｐ\_s*ｐ\_s*ｌ\_s*ｅ\)\|応\_s*用\|エ\_s*\%([ニメアイー]\|ッ\_s*チ\|ン\_s*\%(ド\_s*ラ\_s*ン\|ジ\_s*ェ\_s*\%(ル\|リ\_s*ッ\_s*ク\)\|ゼ\_s*ル\)\|リ\_s*ア\|オ\_s*リ\_s*ア\|ス\_s*テ\|プ\_s*ロ\_s*ン\)\)',
-      \ 'b' : '\%([鯔鰡堀本凡盆煩梵骨凹歿鈕釦沒渤没穆睦濮樸目攴攵朴木僕墨卜牧星抱肪鵬冐氓鋩旄瑁袤儚蟒鉾貌旁网茆牟蒡甍胞謗蠎虻髦黽卯懋榜眸罔乏惘妨帽昴忙剖冒忘茅膀妄尨厖膨貿防紡滂茫望亡傍某謀暈拇保墓暮菩簿誉掘募姥謨模母干彫呆慕坊姆牡乾褒惚戊ぼ冖覓幎汨巾羃冪紅鼈瞥韈蔑塀抃遍辧瓣卞汳宀湎采辯辨辮眄冕勉娩弁邉可辺邊べ船房笛淵縁渊渕斑鞭樗椈太袋深蓋葢盖豚節勿佛物震勃蚋風鰤馼蚊聞文誣無蒲撃打不錻武振分蕪奉吹侮葺毋舞悔憮部廡嘸葡撲撫拭伏歩ぶ米謐人匹浸額鐚跛！広開繆別謬泯旻梹罎岷緡紊檳頻壜愍瓶鬢閔憫敏貧便帛辟百闢白杪″緲憑票猫鋲屏渺眇平錨苗秒描廟病尾火日媚靡糒枇贔未引琵瀰嵋備縻糜弾美眉弭濔比寐毘麋微び早速林尿針腹拂散払祓原塙蠻旛旙鑁鷭幡悗挽判棒絆版輓蕃板播礬阪坂磐番盤晩萬蛮万箱蠅芒挟伴蜂桴枹鉢撥働畠畑糞屎鼻花端離話V魅許秤筏罸魃拔閥橋走箸柱寞藐貘獏暴漠瀑麥縛博駁莫驀爆楳憊狽霾唄吠杯賣苺培煤黴貝焙賠買売陪倍梅媒跋伐末幕曝抜罰庭馬葉婆罵這化馳羽塲晴歯場芭刄刃張貼ばｂ“仏□■⊥下底×｜‖−＼∵麦ボバ］［｛｝ブビБΒбβベb]\|ｯ\_s*\%(ﾎ\_s*ﾞ\|ﾍ\_s*ﾞ\|ﾌ\_s*ﾞ\|ﾋ\_s*ﾞ\|ﾊ\_s*ﾞ\)\|ッ\_s*[ボベブビバ]\|っ\_s*[ぼべぶびば]\|ﾎ\_s*ﾞ\|小\_s*火\|襤\_s*褸\|孟\_s*買\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|南\_s*瓜\|耄\_s*耋\|孑\_s*孑\|包\_s*丁\|ﾍ\_s*ﾞ\|袂\_s*別\|箆\_s*棒\|篦\_s*棒\|胼\_s*胝\|ﾌ\_s*ﾞ\|補\_s*任\|毒\_s*島\|醜\_s*[女男]\|山\_s*毛\_s*欅\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|布\_s*団\|茯\_s*苓\|Ｖ\_s*\%(字\|ネ\_s*ッ\_s*ク\|シ\_s*ネ\_s*マ\)\|附\_s*子\|付\_s*子\|鞦\_s*韆\|豊\_s*[前後]\|ﾋ\_s*ﾞ\|魚\_s*[籠篭]\|彌\_s*縫\|弥\_s*[漫縫]\|吃\_s*驚\|天\_s*鵞\_s*絨\|緬\_s*甸\|賓\_s*頭\_s*盧\|編\_s*木\|柏\_s*槙\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|兵\_s*[衛法]\|表\_s*紙\|拍\_s*[板子]\|ﾊ\_s*ﾞ\|囃\_s*子\|巴\_s*爾\_s*幹\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|薔\_s*薇\|蟠\_s*踞\|鈑\_s*金\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|発\_s*条\|祖\_s*母\_s*さ\_s*ん\|梯\_s*子\|伯\_s*\%([林楽労]\|剌\_s*西\_s*爾\)\|莪\_s*原\|蝗\_s*虫\|飛\_s*[車蝗]\|掲\_s*示\_s*板\|プ\_s*ル\_s*コ\_s*ギ\|作\_s*業\_s*域\|オ\_s*ー\_s*ト\_s*バ\_s*イ\|基\_s*[礎底]\|フ\_s*ァ\_s*ゴ\_s*ッ\_s*ト\|背\_s*景\|北\_s*京\|ペ\_s*\%(キ\_s*ン\|テ\_s*ル\_s*ギ\_s*ウ\_s*ス\)\|臭\_s*素\|イ\_s*ギ\_s*リ\_s*ス\|Ｂ\_s*\%([面判級型ｙ]\|細\_s*胞\|タ\_s*イ\_s*プ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|−\_s*ス\_s*プ\_s*ラ\_s*イ\_s*ン\|ｌ\_s*ｕ\_s*ｅ\_s*Ｎ\_s*ｏ\_s*ｔ\_s*ｅ\|ｕ\_s*ｓ\_s* \_s*Ｅ\_s*ｒ\_s*ｒ\_s*ｏ\_s*ｒ\|ａ\_s*ｃ\_s*ｈ\|ｅ\_s*ｌ\_s*ｌ\_s*研\|ラ\_s*ン\_s*ク\)\|ホ\_s*ウ\_s*素\|B\_s*\%([h面判級型kiae]\|C\_s*兵\_s*器\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|タ\_s*イ\_s*プ\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|フ\_s*レ\_s*ッ\_s*ツ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|M\_s*P\_s*フ\_s*ァ\_s*イ\_s*ル\|ス\_s*プ\_s*ラ\_s*イ\_s*ン\|S\_s*\%(D\|キ\_s*ー\|チ\_s*ュ\_s*ー\_s*ナ\|ア\_s*ン\_s*テ\_s*ナ\|デ\_s*ジ\_s*タ\_s*ル\)\|O\_s*X\_s*セ\_s*ッ\_s*ト\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|ラ\_s*ン\_s*ク\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|硼\_s*素\)',
-      \ 'c' : '\%([ｺ恐怖惟怺※米暦轉頃壼鶤袞鯤坤狠艮獻琿悃很建棍魂菎蒟滾梱溷献痕渾墾恨懇根杪王挙泥裔樸鞐熟枹醴蛩蹊徑径溢毀零錯苔拒箏亊判斷諺理断盡尽辞琴言異事今壽寿鯒冀希礫鯉拱齣狛細腓昆拳瘤鮗兄近谺応應答是爰凩兀惚榾忽輿甑腰拵拗鐺鏝昿仰慌桁袷塙頏絖冦耗亙峺效晄覯糠匣逅閧扛湊羔礦爻壙盍洸鬨浤凰閤窖缸寇岡頁傚湟汞洽崗鮫伉訌誥冓敲磽鏗椌搆肓鍠矼砿犒淆呷鵁皐黌遘昴槹蚣肱肴熕胱猴扣杲蛤狎畊昊餃哽幌鱇峇嫦烋隍恆倥徨啌吭釦闔藁絋棡遑紘稾鴿詬哮困靠皋惶紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘后蝗酵嚆犢稿亢哄睾慷梗笄郊効岬肛項巷鑛洪佼狡昂叩勾喉滉糀晃剛晧曠宏控恍侯煌港皓坑皎耿膏向江膠虹巧鴻鉱衡浩興厚耕弘綱抗購講恒溝薨鋼航孝更校行肯荒高皇光好槲梏谷釛尅斛棘轂哭詰告刻酷穀⌒冴虎觚壷胯鼓児漉糊媚古娘冱虚混粉辜湖虍放葫捏鈷痩鴣瞽詁箍錮蠱蛄粐滬估雇故沽転倒漕罟餬拠超込凅誇懲琥扈袴木蝴呱乕踰弧越孤菰跨壺楜黄股肥己女戸恋兒怙瑚戀夸皷滸濾瓠去濃乎杞こｾ芹鬩旃錢刋箭羶筌孅阡栫舩纎濺舛甎銛簽湶茜槧吮薦癬斬倩痊孱擶贍纖仟磚燹揃綫喘涎荐饌槫濳沾筅蟾牋苫專翦亘鐫僣韆箋僊殱殲闡賎餞羨顫甅竰糎陝踐銓閃∨潺遷銑栴剪煽譫僉瞻践跣栓疝詮銭穿尠戰僭繊腺泉嬋仙擅淺鮮専扇蘚船浅線撰宣洗選煎戦尖先忙伜倅逼狭狹蝉旋鱈薛椄絏洩卩啜泄紲攝緤§渫刹褻浙竊截窃殺説拙摂節切蓆晰威裼績蹐迹蹠跖跡螫瘠勣籍晢夕鶺雪寂∫∬碩惜析席隻甥韲嘶犀菁瀞晟貰擠睛筬淒醒齊婿撕牲齏情萋穽躋歳栖棲掣腥逝惺斉臍旌悽整凄靖製晴迫塞攻瀬急勢世畆丗糶畝堰脊せｸ配椚檪櫪栩椡椪箜櫟含纐婚糞癖潛潜鵠凹窪縊跟頚軛珞頸諄鞋履窟狐轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬楠誓梳串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖Ξξ茸菌楔草圀邦國国漱嗽吻腔φ劫刧粂裙勳熏皹桾皸醺崑燻訓勲葷君委钁企咥銜桑某暝峅昏冥眛鮓比闇位鞍藏暗倉廚厨涅々〃ゝヽゞ仝ヾ公曇雲蜘佝栗狂包胡俥梍枢畔鐵★玄黒徠久孔桍窶暮懼駒苦朽区眩吁繰庫垢紅呉汲宮枸劬煦口９瞿工供吼怐玖貢九惧来來區組奇句狗鳩絎嶇衢くｼ埀謐Σσ蘂蕋蕊痺褥茵鵐蔀鷸鴫霑入責蔵嶌了縞嶋島凋搾澀澁渋縛暫屡柴荵凌鎬忍簧慕舖↓襪認從从．舌扱罔虐Θθ秕粃椎椣尿貎肉臠猪衣榻黙蜆恵楙誠茂成繁惻鋪陣頻閾櫁樒鹽汐潮瑟蛭疾櫛隲隰嫉蟋悉漆躾膝失室沒鎭沈滴雫賤鎮靜静顰尓爾聢乍併然◇□■◆倖幸貭叱征質柵卯滋撓品鬼鍜錏錣痼凝而拉設垂萎栞襞吝咳什導汁験記徴著印☆〇銀城報調蝨虱白濕湿標七僕楚笞霜臀退斥尻後冩寫舍者砂卸柘炙＃♯暹諜喋煮這西娑沙謝紗鯱奢赦洒捨鮭瀉妁鑠抉蹟勺炸決釋皙爍昔斫蜥刳芍酌爵折癪笏赤灼綽杓石尺赭写鷓積遮舎車射斜釈社洙麈殳蛛娶娵諏鬚侏繻銖蹙俶倏菽叔蓿戚肅淑夙粛宿縮殊趣珠恤卆蟀出洲泅楸綉溲遒酬鷲駲緝葺穐蹤繍螽讐甃萩楢逎讎售岫收驟舅囚姑蓚皺鞦銹脩輯醜習羞酋聚舟秀祝袖啾拾蒐収執衆愁就臭蹴週終褶州宗集秋椶棕朱撞種修周手首酒須儁惷悛濬雋皴墫蕣順蠢舜旬浚竣峻駿逡筍瞬俊蓁畛矧縉蔘鷏齔嗔忱譛袗譖娠疹哂脣怎晉鷆臻甄槙寢岑瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵薪晨辰震宸森眞愼伸慎寝晋進深審親臣鍼申心宍信真新薯墅杵岨藷黍苜渚砠狙嶼處胥蜍苴曙背緒雎蔗庶処署所暑奬簫浹橸舂艢廂陞炒鍬庠獎梢璋將厰邵摺淞訟樅筱篠燮橡愴韶咲誚峭甞鯖敞聲懾稍腫政顳枩慯殤秤湫井星廠剿妝霎蛸劭觴愀升錆鬆樵囁鷦嶂醤青従慫逍倡竦爿薔笙樟装肖菖≦＜湘誦聳檣稱声裳蒋蕉嘯慴盛精霄清鈔粧彰鏘悚蕭悄瀟哨焦憔匠鍾償瘴鞘漿頌詔沼妾請唱薑庄渉障奨娼床牀椒抄聖荘宵傷性相生銷召賞猩症昭燒猖昌少尚晶憧紹祥承證笑将焼照招章詳消証硝掌商昇小昃禝稷寔矚謖觸稙軾嗇屬穡拭属燭贖囑嘱織蝕式喰蜀殖諸初触埴植食職嗜笶姉士徙誣氏思染祗時弑滲梔摯肢詩咨祉刺泗輜厶強貲若至師舐咫只施誌呰匙示指締厮啻次賜熾趾駟漬笥贄此司如沚尸髭肆祀鷙諡枝篩豕巵始妛及弛絲浸閇翅緊揣伺糸駛痣矢衰死敷恃茨旨沁嘴蚩試釶俟瓷觜廝緇祠梓址詞之使獅志歯紫雌姿諮占絞視嗣識四恣阯侈幟卮凍史領竢市巳齒偲資止謚耆覗脂芝痴粢孜仕錙耜齎自屎茲岐〆嗤砥知私仔しｶ糜癢粥痒麹輕骨業軽鰔鰈餉通瓶龜甕亀鴈獵鳫殯K猟雁釀鳧鳬髢氈鴨躱巛側厠廁磧瓦獺翡為裘皮〜紮→搦苧碓柄體軆躰躯身体鴉犂烏絡空唐榧茅揀坎澗扞莟丱拑盥嫺鑵蒄瞰淦稈康繝懽憾骭戡奐啣厂鐶讙澣羮寰羹嫻杆鸛歡豢歛罕酣陷皖篏捍瀚勸撼驩卷樌潤觀橄涵渙堪巫覡鉋随萱簪舘艱咸翰柬悍駻燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹緘桓款箝諌諫轗旱坩侃鰥　館莞橇韓患灌勧菅奸刊柑肝看桿干緩寒嵌廣広竿貫巻敢漢環間陥喚閑監喊歓甘寛管慣完汗艦乾幹官観壁椛屍姓庇鞄芳蔓千鯑一勘蜻⊃影陰蔭景＊棧梯筧庚辛柧門廉癩乞Κ川κ合’）〈《‘“”｝｛》〉囓柁鮖悴舵鰍梶錺餝飾篭籠還歸卻皈孵省顧槭楓却帰反返督髮帋守祇韮主裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀模象仇固硬傍難容忝辱頑形方旁型肩風幽滓翳微掠綛纃絣緕擦糟鎹粕春轄戞劼猾瞎恰蛞∧蠍擔濶筈剋蝎曷羯喝餓聒鞨黠刮蘰鬘桂闊括嘗捷豁渇担滑松堅鰹功割戛活暈疽鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿關掲罹抱踵嬶嚊拘関係貌顏郁薫顔母感釡罐窰鴎框叺喧竃竈窯釜缶蒲鎌數数槝栢膳傅畏賢橿姦樫爨炊圍喞託囲鈎『鉤「』」限鍵（傾禿蕪鏑頭齧被兜敵適哉必要称鼎鬲彜彝叶片悲哀愛鋺蛇鉄蜩神奏金楫裹磆餅徒褐糧粮膈覺∠埆蠖貉幗隱擴寉骼癨壑咯椁嚇茖愨槨膕掴覈殼穫狢霍礁恪擱匿撹攪喀廓較郭］】【〔〕［殻挌劃閣格隠覚矍革獲馘攫核鶴拡客隔角確蠏壞畍丐獪褂恠喙峡夬觧械揩醢匯廨誡誨嵬櫂隗茴徊迴枴懈价椢榿囘蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧皆界疥魁偕改繪貝胛絵甲快灰槐晦懐介回塊解階廻戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡和代茄缺飼嫁華堝變狩上訶架何啝火日菓欠苅繋稼ヶ个噛譁科跏舸賭禍支窩課花刈渦嚼掛呵替葭柯畫駆嘩崋化霞蝌迦顆価馨家借蝦罅駈斯賈嘉易果戈廈哥買闕且克墟靴訛驅換踝描軻嗅價嗄可彼夥香歌河珂鹿個痂書假荷耶笳咼藉糅舁搗渮袈下萪貸厦禾貨咬寡箇卦苛譌枷掻過画ヵ黴遐兼醸翔仮佳蚊懸伽賀淅勝涸苟蝸謌夏枯暇かｃ・…塩閉倶錫呼∩取籐加交бТуЖоВЙЗзжЪЯУИвяшфлСКрпХЁОЭРФЫЩъБыШйхМкПгдмцНЛёаиэетАГЬюЕЮсьнщД♪┼╋×╂┿○●◎銅∪χΧ子чЧ株Ц珈、，色ク衝競構簡制≡変接カ┐┘┗┏┓┌┛└正コ¢シ℃セc]\|ｯ\_s*[ｺｾｸｼｶ]\|ッ\_s*[コセクシカ]\|っ\_s*[子こせくしか]\|焜\_s*炉\|嫡\_s*妻\|二\_s*合\_s*半\|牛\_s*尾\_s*魚\|巨\_s*勢\|独\_s*楽\|居\_s*士\|特\_s*牛\|粫\_s*門\|甦\_s*生\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|傴\_s*僂\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|懺\_s*法\|前\_s*[妻栽]\|妹\_s*尾\|嘲\_s*笑\|儕\_s*輩\|斎\_s*次\|済\_s*[民々済]\|蒸\_s*[籠篭]\|救\_s*世\|莎\_s*草\|百\_s*[濟済]\|恭\_s*敬\|9\_s*[日月]\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|探\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|老\_s*舗\|望\_s*潮\|健\_s*か\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|卓\_s*袱\|桎\_s*梏\|柳\_s*葉\_s*魚\|蠹\_s*魚\|汚\_s*点\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|云\_s*[々云]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|7\_s*月\|７\_s*月\|文\_s*月\|4\_s*月\|４\_s*[分月]\|竹\_s*[篦刀]\|羊\_s*[齒歯]\|爲\_s*\%([留難置果送極手兼合業]\|ん\_s*方\|來\_s*り\|納\_s*め\)\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|素\_s*[魚人面]\|不\_s*[忍知]\|注\_s*連\|軍\_s*鶏\|髑\_s*髏\|三\_s*\%(味\|鞭\_s*酒\)\|吃\_s*逆\|差\_s*[別異]\|叉\_s*手\|輸\_s*[出贏]\|卒\_s*去\|B\_s*r\|隼\_s*[朗郎]\|笋\_s*[干羹]\|参\_s*差\|財\_s*産\|枌\_s*所\|縦\_s*容\|睫\_s*毛\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|連\_s*枷\|枳\_s*殻\|機\_s*関\|落\_s*葉\_s*松\|凵\_s*繞\|檻\_s*車\|顴\_s*骨\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|山\_s*\%(海\_s*経\|梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|破\_s*片\|脚\_s*気\|旗\_s*魚\|鍛\_s*[治冶]\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|長\_s*[月官]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*[沫白]\|曾\_s*て\|曽\_s*て\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|蟷\_s*螂\|螳\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|瑕\_s*[瑾疵]\|東\_s*\%([風雲]\|海\_s*林\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|気\_s*[質触]\|(\_s*株\_s*)\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|契\_s*経\|中\_s*央\_s*処\_s*理\_s*装\_s*置\|伊\_s*藤\_s*忠\_s*テ\_s*ク\_s*ノ\_s*サ\_s*イ\_s*エ\_s*ン\_s*ス\|分\_s*類\|ス\_s*リ\_s*ー\_s*ズ\|範\_s*疇\|ト\_s*ラ\_s*ン\_s*プ\|水\_s*[鶏母夫手晶]\|複\_s*雑\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|サ\_s*\%(ン\_s*チ\_s*ー\_s*ム\|エ\_s*ラ\|イ\_s*\%(ト\_s*カ\_s*イ\_s*ン\|ラ\_s*ス\|ク\_s*\%([ルロ]\|リ\_s*\%(ン\|ッ\_s*ク\)\)\|ボ\_s*\%(ウ\_s*ズ\|ー\_s*グ\)\|バ\_s*\%(ー\|ネ\_s*テ\_s*ィ\_s*\%(ッ\_s*ク\|ク\_s*ス\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ダ\_s*ー\|フ\_s*ァ\_s*ー\|ネ\_s*リ\_s*ア\)\|ー\_s*\%(テ\_s*ィ\_s*フ\_s*ィ\_s*ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|ク\_s*ル\|カ\_s*\%(ス\|ム\_s*ス\_s*ク\_s*\%(ラ\_s*イ\_s*ブ\|リ\_s*プ\_s*シ\_s*ョ\_s*ン\)\)\|キ\_s*\%(ュ\_s*\%(ラ\_s*ー\|レ\_s*ー\_s*\%(タ\_s*ー\|シ\_s*ョ\_s*ン\)\)\|ッ\_s*ト\)\)\)\|マ\_s*ド\_s*ラ\_s*ス\|茶\_s*筅\|ケ\_s*\%([月アイ]\|フ\_s*ェ\_s*ウ\_s*ス\|プ\_s*ス\_s*ト\_s*ラ\_s*[ムル]\|チ\_s*ャ\_s*ッ\_s*プ\|ン\_s*\%(タ\_s*ウ\_s*\%(リ\|ロ\_s*ス\)\|ブ\_s*リ\_s*ッ\_s*ジ\)\|ー\_s*\%([キジブプスン]\|ク\_s*ウ\_s*ォ\_s*ー\_s*ク\|ソ\_s*ン\|タ\_s*リ\_s*ン\_s*グ\|パ\_s*\%(ー\|ビ\_s*リ\_s*テ\_s*ィ\)\|シ\_s*ン\_s*グ\|リ\_s*ー\)\|ル\_s*\%(ト\|ベ\_s*ロ\_s*ス\|テ\_s*ィ\_s*ッ\_s*ク\|ビ\_s*\%(ム\|ー\_s*ニ\)\)\|ミ\_s*\%(カ\_s*ル\|ス\_s*ト\)\)\|キ\_s*\%(ヤ\_s*ノ\_s*ン\|プ\_s*ロ\_s*ス\|ケ\_s*ロ\|ュ\_s*\%([イーア]\|ヴ\_s*ェ\|ビ\_s*\%(ズ\_s*ム\|ス\_s*ム\)\|ロ\_s*\%(ス\|ッ\_s*ト\)\|レ\_s*ー\_s*タ\_s*ー\|ラ\_s*ソ\_s*ー\|リ\_s*\%(ー\|ウ\_s*ム\|ア\_s*ス\|オ\_s*シ\_s*テ\_s*ィ\)\)\|ア\_s*\%(ラ\|ー\_s*ラ\|ン\_s*テ\_s*ィ\)\|チ\_s*ン\|ト\_s*サ\_s*ン\|メ\_s*ラ\|マ\_s*イ\_s*ラ\|ッ\_s*カ\|レ\_s*ー\_s*ト\|ャ\_s*\%([ドパスブンラ]\|デ\_s*\%(ィ\|ラ\_s*ッ\_s*ク\)\|ビ\_s*\%([アンネ]\|テ\_s*\%(ィ\|ー\_s*シ\_s*ョ\_s*ン\)\)\|ベ\_s*ツ\|バ\_s*\%(リ\_s*[エア]\|レ\_s*ー\)\|ト\_s*ル\|シ\_s*ー\|サ\_s*リ\_s*ン\|タ\_s*ピ\_s*ラ\|ピ\_s*\%(ト\_s*ル\|タ\_s*\%(ル\|リ\_s*ズ\_s*ム\)\)\|プ\_s*\%(ラ\|シ\_s*ョ\_s*ン\|テ\_s*ン\|チ\_s*ャ\)\|セ\_s*\%(イ\|ロ\_s*ー\_s*ル\)\|ッ\_s*\%([ツトチプ]\|サ\_s*バ\|ス\_s*ル\|シ\_s*\%(ュ\|ン\_s*グ\|ャ\_s*\%(ー\|ブ\_s*ル\)\)\)\|ニ\_s*\%(オ\_s*ン\|ス\_s*タ\_s*ー\)\|ナ\_s*ル\|ノ\_s*\%(ン\|ー\_s*ラ\|ピ\_s*ー\)\|ミ\_s*ソ\_s*ー\_s*ル\|メ\_s*\%(ル\|ロ\_s*\%(ン\|ッ\_s*ト\)\)\|ロ\_s*\%(ル\|ウ\_s*ェ\_s*イ\|リ\_s*ン\|ラ\_s*イ\_s*[ンナ]\|ッ\_s*ト\)\|レ\_s*ッ\_s*ト\|リ\_s*\%([コーア]\|バ\_s*ー\|ブ\_s*レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ッ\_s*ジ\|ン\_s*グ\)\|ズ\_s*ム\)\|リ\_s*\%(コ\|ス\_s*ト\|シ\_s*タ\_s*ン\)\)\|総\_s*角\|チ\_s*\%([タリンマア]\|ワ\_s*ワ\|ラ\_s*ー\|ル\_s*ド\|ム\_s*ニ\_s*ー\|コ\_s*リ\|ッ\_s*\%([プク]\|テ\_s*リ\_s*オ\|タ\_s*ゴ\_s*ン\)\|キ\_s*\%(ン\|ー\_s*タ\)\|ュ\_s*\%(ア\_s*ブ\_s*ル\|ー\_s*イ\_s*ン\_s*ガ\_s*ム\)\|ー\_s*\%([フトプクズ]\|パ\_s*ー\|タ\_s*ー\)\|ェ\_s*\%([ロスカコアン]\|ザ\_s*\%(レ\|ー\_s*レ\)\|ル\_s*\%(ニ\_s*ー\|シ\_s*ー\|ノ\_s*ブ\_s*イ\_s*リ\)\|リ\_s*\%(ー\|ス\_s*ト\|ッ\_s*シ\_s*ュ\|モ\_s*ヤ\)\|レ\_s*\%(ス\_s*タ\|ン\_s*コ\_s*フ\)\|ビ\_s*チ\_s*ェ\_s*フ\|ダ\_s*ー\|チ\_s*ェ\_s*ン\|ッ\_s*\%([トクカ]\|キ\_s*ン\_s*グ\)\|イ\_s*\%([スン]\|ニ\_s*ー\|サ\_s*ー\|シ\_s*ン\_s*グ\)\|ー\_s*\%(ン\|ザ\_s*レ\|ホ\_s*フ\)\)\|ャ\_s*\%([オフドインコリウ]\|ツ\_s*ネ\|ク\_s*ラ\|プ\_s*タ\_s*ー\|パ\_s*テ\_s*ィ\|ペ\_s*\%(ル\|ッ\_s*ク\)\|チ\_s*ャ\|ネ\_s*\%(ル\|ラ\_s*ー\|リ\_s*ン\_s*グ\)\|ッ\_s*\%([クト]\|ピ\_s*ー\|プ\_s*\%(マ\_s*ン\|リ\_s*ン\)\)\|タ\_s*\%(レ\_s*[イー]\|リ\_s*ン\_s*グ\)\|ル\_s*マ\_s*ー\_s*ス\|レ\_s*ン\_s*ジ\|モ\_s*ロ\|ー\_s*\%([チタトムジ]\|ビ\_s*ル\|ミ\_s*\%(ー\|ン\_s*グ\)\|リ\_s*ー\|ル\_s*\%([ズス]\|ト\_s*ン\)\)\|ラ\_s*ン\_s*ゴ\)\|ョ\_s*\%([ンコ]\|イ\_s*ス\|ム\_s*ス\_s*キ\_s*ー\|ー\_s*\%(ク\|サ\_s*ー\|カ\_s*ー\|キ\_s*ン\_s*グ\)\|ゴ\_s*リ\|ッ\_s*\%(プ\|ピ\_s*ー\|パ\_s*ー\)\|リ\_s*ソ\)\)\|座\_s*標\|喜\_s*劇\|互\_s*換\|共\_s*\%(通\|産\_s*主\_s*義\_s*者\)\|継\_s*続\|C\_s*\%([srfdDeRoa]\|言\_s*語\|型\_s*肝\_s*炎\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|ソ\_s*ン\_s*グ\)\|タ\_s*イ\_s*プ\|T\_s*\%(ス\_s*キ\_s*ャ\_s*ン\|R\_s*L\_s*キ\_s*ー\)\|シ\_s*ェ\_s*ル\|S\_s*\%(V\_s*フ\_s*ァ\_s*イ\_s*ル\|チ\_s*ュ\_s*ー\_s*ナ\|ア\_s*ン\_s*テ\_s*ナ\)\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|コ\_s*ン\_s*パ\_s*イ\_s*ラ\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*カ\_s*メ\_s*ラ\)\|ド\_s*ラ\_s*イ\_s*ブ\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|ラ\_s*ン\_s*ク\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*キ\_s*ー\)\)\|ツ\_s*\%(ァ\_s*ー\|ィ\_s*リ\_s*ル\|ェ\_s*\%(ー\|ル\_s*ニ\_s*ー\|ラ\_s*ン\)\)\|炭\_s*素\|Ｃ\_s*\%([型ｍ]\|Ｍ\_s*ソ\_s*ン\_s*グ\|タ\_s*イ\_s*プ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|ｄ\_s*Ｓ\|Ｄ\_s*−\_s*Ｒ\_s*Ｏ\_s*Ｍ\|ド\_s*ラ\_s*イ\_s*ブ\|＋\_s*＋\|ラ\_s*ン\_s*ク\|Ｏ\_s*2\|ｏ\_s*Ｃ\_s*\%(ｏ\|Ｏ\_s*ス\_s*ト\_s*ア\)\|言\_s*語\)\)',
-      \ 'd' : '\%([共吃巴鑼錚鶏鳥響嫩緞丼呑曇貪鈍肭遠蚌溝鄰隣塢床処所年時鯲鰍鰌得徳讀獨髑毒読僮働萄桐閙ゞ嫐橈儂陶耨撓通鐃藤々恫瞳憧鬧⇔≡撞慟導〃仝洞堂瞠獰艟胴銅童動同道何弩怒退呶度堵奴解留融録取駑孥努戸止土ど瓰竕凸竍籵瓧禰泥捏溺寺鈿佃甸黏沺畋淀棯澱臀傳殿電照でヅ鶴辛強妻綱勤伝包筒做造作尽机月冢塚遣疲使突吊付漬津詰図積釣連づヂ中近力地痔持ぢ種棚倒濃彩逹畳諾゛濁玉默球魂騙谷館舘点岳嶽竹高凧蛸怛妲獺奪脱廼迺弟岱臺餒梯戴平内醍橙］［題＞≧第台代大鱈頼便誰樽懶怠灘斷椴黙旦煖彈暖談段断檀団團壇弾男抱舵橢炊佗堕荼拿打娜蛇楕陏駄唾拏雫沱立儺柁鴕溜妥朶陀墮駝出垂惰懦建兌澑田騨だｄ直◎．丶、，‥\.・…＄“”↓†‡―┤達℃°独ド÷◇◆ダジДデΔδд∂d]\|ｯ\_s*\%(ﾄ\_s*ﾞ\|ﾃ\_s*ﾞ\|ﾂ\_s*ﾞ\|ﾁ\_s*ﾞ\|ﾀ\_s*ﾞ\)\|ッ\_s*[ドデヅヂダ]\|っ\_s*[どでづぢだ]\|ﾄ\_s*ﾞ\|都\_s*々\_s*逸\|褞\_s*袍\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|満\_s*天\_s*星\|豆\_s*腐\|如\_s*何\|ﾃ\_s*ﾞ\|刑\_s*事\|粘\_s*葉\_s*装\|手\_s*間\|木\_s*偶\|丁\_s*[稚抹]\|蝸\_s*牛\|ﾂ\_s*ﾞ\|頭\_s*[腦痛]\|ﾁ\_s*ﾞ\|調\_s*子\|茶\_s*碗\|知\_s*恵\|忸\_s*怩\|ﾀ\_s*ﾞ\|忠\_s*幸\|壁\_s*蝨\|伊\_s*達\|山\_s*車\|韃\_s*靼\|提\_s*婆\_s*達\_s*多\|太\_s*\%([刀宰鼓]\|平\_s*広\|上\_s*天\_s*皇\|政\_s*\%(官\|大\_s*臣\)\)\|乃\_s*[公毅]\|体\_s*操\|葮\_s*竹\|演\_s*\%(し\_s*物\|繹\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\)\|コ\_s*ロ\_s*ン\_s*ビ\_s*ア\|ズ\_s*\%(ロ\_s*ー\_s*ス\|ッ\_s*ク\)\|イ\_s*ル\_s*カ\|医\_s*者\|博\_s*士\|文\_s*書\|行\_s*列\_s*式\|発\_s*見\_s*す\_s*る\|ハ\_s*ー\_s*グ\|拒\_s*否\_s*さ\_s*れ\_s*た\|破\_s*壊\_s*\%(者\|す\_s*る\)\|消\_s*滅\_s*子\|記\_s*述\_s*子\|Ｄ\_s*\%(論\|タ\_s*イ\_s*プ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|Ｃ\_s*ブ\_s*ラ\_s*ン\_s*ド\|ｙ\_s*ｌ\_s*ａ\_s*ｎ\|ラ\_s*ン\_s*ク\|ａ\_s*ｉ\_s*ｓ\_s*ｙ\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\)\|十\_s*進\_s*数\|ゼ\_s*ッ\_s*ケ\_s*ン\|復\_s*号\_s*化\|省\_s*略\|金\_s*剛\_s*石\|辞\_s*書\|D\_s*\%(b\|タ\_s*イ\_s*プ\|T\_s*\%(E\|P\_s*ソ\_s*フ\_s*ト\|M\_s*ソ\_s*フ\_s*ト\)\|M\_s*A\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|C\_s*\%(カ\_s*ー\_s*ド\|ブ\_s*ラ\_s*ン\_s*ド\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|サ\_s*ー\_s*バ\)\|H\_s*C\_s*P\_s*\%(サ\_s*ー\_s*バ\|ク\_s*ラ\_s*イ\_s*ア\_s*ン\_s*ト\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|ラ\_s*ン\_s*ク\|V\_s*D\_s*\%(ボ\_s*ッ\_s*ク\_s*ス\|シ\_s*ョ\_s*ッ\_s*プ\|ケ\_s*ー\_s*ス\|デ\_s*ッ\_s*キ\|ド\_s*ラ\_s*イ\_s*ブ\|オ\_s*ー\_s*デ\_s*ィ\_s*オ\|プ\_s*レ\_s*\%(ー\_s*ヤ\_s*ー\|イ\_s*ヤ\_s*ー\)\|ラ\_s*ッ\_s*ク\|レ\_s*コ\_s*ー\_s*ダ\_s*ー\|マ\_s*ル\_s*チ\|ビ\_s*デ\_s*オ\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*キ\_s*ー\)\|I\_s*\%(P\_s*ス\_s*イ\_s*ッ\_s*チ\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
-      \ 'e' : '\%([ｴ瘧腮偉鰓衿撰襟掾圜鹽垣檐媛爰捐￥覃黶篶湲蜒讌簷櫞悁渊轅渕閼魘薗艷鳶鴛焉嫣宛閻衍臙閹槐⌒援筵淹厭寃淵掩烟嚥圓沿宴蜿奄袁煙艶焔炎怨鉛園苑偃冤延婉遠堰燕演塩円縁刔刳抉猿狗描択鰕箙蛯蝦狄貊胡戎夷乢靨鉞噎戉咽粤桟悦閲謁奕伯懌亦蜴掖繹越役驛疫易益腋駅液殪纓裔曵頴洩瓔潁贏珱衡娃翳營瑩咏楹塋蠑瀛睿泳縊榮瑛暎曳盈郢影詠穎嬰鋭叡映営栄永衞衛得絵荏懷畫枝江繪衣猥慧惠獲回依會重柄杖餌榎画恵笑会囘選え━─┳┬┯┰┸┷┻┴Фф＝⇔≡∈∋РрМмｅН→英∃式！ΗηсСлЛΕЭεэエe]\|A\_s*\%([面判型級]\|V\_s*\%(機\_s*器\|女\_s*優\)\|B\_s*\%(型\|C\_s*順\)\)\|Ａ\_s*\%([面判型級]\|Ｖ\_s*\%(機\_s*器\|女\_s*優\)\|Ｂ\_s*型\)\|M\_s*サ\_s*イ\_s*ズ\|Ｍ\_s*サ\_s*イ\_s*ズ\|豪\_s*物\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\)\|L\_s*\%(サ\_s*イ\_s*ズ\|L\_s*\%(サ\_s*イ\_s*ズ\|教\_s*室\)\)\|羨\_s*道\|豌\_s*豆\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|似\_s*\%(非\|而\_s*非\)\|桧\_s*原\_s*湖\|烏\_s*帽\_s*子\|吉\_s*方\|胞\_s*衣\|淮\_s*南\_s*子\|埃\_s*及\|干\_s*支\|岐\_s*路\|支\_s*繞\|壊\_s*[疽死]\|葡\_s*萄\|蛭\_s*子\|愛\_s*\%([理莉媛]\|知\_s*川\)\|N\_s*極\| \_s*n\_s* \_s*角\_s*形\|Ｎ\_s*\%([個極響]\|次\_s*元\|Ｈ\_s*Ｋ\_s*ホ\_s*ー\_s*ル\)\|斉\_s*魚\|兄\_s*鼓\|ヱ\_s*ス\_s*ビ\_s*ー\_s*食\_s*品\|Ｓ\_s*\%([波字席極]\|サ\_s*イ\_s*ズ\|Ｎ\_s*比\|Ｆ\_s*小\_s*説\)\|S\_s*\%([式極]\|サ\_s*イ\_s*ズ\|N\_s*比\|F\_s*小\_s*説\)\|穢\_s*[多土]\|X\_s*\%([軸脚]\|O\_s*醤\|染\_s*色\_s*体\)\|Ｘ\_s*\%([軸脚線]\|染\_s*色\_s*体\)\|海\_s*\%(老\|鷂\_s*魚\)\|帝\_s*都\_s*高\_s*速\_s*度\_s*交\_s*通\_s*営\_s*団\|ワ\_s*ー\_s*ク\_s*ス\_s*テ\_s*ー\_s*シ\_s*ョ\_s*ン\|欧\_s*\%(州\|羅\_s*巴\)\|歐\_s*\%(州\|羅\_s*巴\)\|ヨ\_s*ー\_s*ロ\_s*\%(ピ\_s*ア\_s*ン\|ッ\_s*パ\)\|ユ\_s*\%(ア\_s*ン\|ウ\_s*ロ\_s*ピ\_s*ウ\_s*ム\|リ\_s*イ\_s*カ\|ー\_s*\%(ロ\|ノ\_s*ス\|ニ\_s*ス\|ジ\_s*\%(ン\|ー\_s*ン\)\|ド\_s*ラ\|レ\_s*カ\|ラ\_s*\%(ス\|シ\_s*ア\)\|フ\_s*\%(ラ\_s*テ\_s*ス\|ォ\_s*\%(リ\_s*ア\|ニ\_s*ア\_s*ム\)\)\|ク\_s*リ\_s*ッ\_s*ド\|カ\_s*リ\)\)\|編\_s*集\|強\_s*調\|電\_s*子\_s*メ\_s*\%(イ\_s*ル\|ー\_s*ル\)\|発\_s*展\|評\_s*価\_s*す\_s*る\|符\_s*号\_s*化\|百\_s*科\_s*事\_s*典\|カ\_s*プ\_s*セ\_s*ル\_s*化\|オ\_s*\%(ー\|イ\_s*\%(ラ\_s*ー\|ゲ\_s*ン\)\)\|実\_s*行\|拡\_s*張\|例\_s*外\|感\_s*嘆\_s*符\|Ｅ\_s*\%(Ｐ\_s*Ｏ\|ド\_s*ラ\_s*イ\_s*ブ\|Ｄ\_s*ベ\_s*ー\_s*タ\|ｍ\_s*ａ\_s*ｃ\_s*ｓ\|カ\_s*ッ\_s*プ\|ａ\_s*ｓ\_s*ｔ\|ｘ\_s*ｅ\_s*ｒ\_s*ｃ\_s*ｉ\_s*ｓ\_s*ｅ\|タ\_s*イ\_s*プ\)\|ア\_s*\%([ンイ]\|ニ\_s*ド\|ー\_s*\%([マスル]\|ウ\_s*ィ\_s*ン\|ラ\_s*ン\|ニ\_s*ー\|ネ\_s*ス\_s*ト\|ミ\_s*ン\|シ\_s*ー\|リ\_s*ー\)\)\|設\_s*立\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*コ\_s*ー\_s*ド\|P\_s*レ\_s*コ\_s*ー\_s*ド\|ド\_s*ラ\_s*イ\_s*ブ\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|メ\_s*ー\_s*ル\|-\_s*m\_s*a\_s*i\_s*l\|カ\_s*ッ\_s*プ\|コ\_s*マ\_s*ー\_s*ス\|N\_s*T\_s*E\_s*R\_s*キ\_s*ー\|タ\_s*イ\_s*プ\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*キ\_s*ー\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|イ\_s*\%([ブヴアラー]\|ジ\_s*ェ\_s*ク\_s*ト\|フ\_s*ェ\_s*ク\_s*[トタ]\|コ\_s*\%(ー\_s*ル\|ラ\_s*イ\_s*[ズザ]\)\|プ\_s*シ\_s*ロ\_s*ン\|ミ\_s*ュ\_s*レ\_s*\%(ー\_s*[トタ]\|イ\_s*タ\)\|ベ\_s*ン\_s*\%(ト\|タ\_s*ー\)\|ノ\_s*ッ\_s*ク\|ネ\_s*ー\_s*ブ\_s*ル\|ギ\_s*リ\_s*ス\|ン\_s*グ\_s*\%(ラ\_s*ン\_s*ド\|リ\_s*ッ\_s*シ\_s*ュ\)\|ッ\_s*チ\|ヤ\_s*\%(ー\|リ\_s*ン\_s*グ\|フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|グ\_s*ジ\_s*\%(ッ\_s*ト\|ス\_s*ト\)\|ク\_s*\%(ス\|ア\_s*リ\_s*テ\_s*ィ\)\|ス\_s*フ\_s*ァ\_s*ハ\_s*ン\|リ\_s*[ヤア]\|レ\_s*\%(ー\_s*\%(ス\|ザ\_s*ー\|サ\_s*ー\)\|イ\_s*\%(ン\|ザ\_s*ー\|サ\_s*ー\)\|ブ\_s*ン\)\)\|ウ\_s*\%(ー\|ジ\_s*ェ\_s*ー\_s*ヌ\)\)',
-      \ 'f' : '\%([梺麓冬汾枌濆′吩賁刎氛雰糞褌忿墳吻紛焚扮分粉舊旧顫揮故震篩奮隹古衾襖贅燻筆鰒総惣總絃房閼鬱塞鞴章郁史艦簡札耽鰾吭笛文罧節苳蕗淦舩艙舷舟船肥太懷懐≦≠≫＜＞≧≪渊淵渕縁葢盖再弍蓋双藤潭蒸鯊鱶楓殕瘋封諷黻怫祓彿髴拂憤恚慍二払沸拒防蔔輹愎蝠茯箙腓⊃⊇膨脹嚢梟袋含⊂⊆袱覆輻腹幅復馥服副複福誣孚普俯更膚腐坿狂履不増拊鯆布怖赴桴巫傅婦付訃賻振負蜉罘老附吹生経觸夫俘父臥践咐敷踏斧溥阜葺深仆譜符麩匐腑榑芙賦殖冨触孵麸柎府舗噴鋪降蹈風觝埠拭鮒郛伏俛經歩苻斑畉扶趺芬呎ﾌ飜翻ふｆ鉄♀∀¶富⌒金佛仏偽誤♭弗浮FФΦφфフf]\|ｯ\_s*ﾌ\|ッ\_s*フ\|っ\_s*ふ\|鞦\_s*韆\|睾\_s*丸\|陰\_s*嚢\|乱\_s*吹\|相\_s*応\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|回\_s*回\_s*教\|書\_s*司\|図\_s*書\_s*寮\|海\_s*蘿\|補\_s*\%(任\|陀\_s*[洛落]\)\|雲\_s*脂\|頭\_s*垢\|鳧\_s*鐘\|菜\_s*蕗\|款\_s*冬\|蒲\_s*団\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|釜\_s*[中山]\|雙\_s*葉\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|２\_s*[人つ日]\|宿\_s*酔\|2\_s*\%([人つ日]\|通\_s*り\)\|□\_s*□\_s*□\|△\_s*△\_s*△\|×\_s*×\_s*×\|○\_s*○\_s*○\|帛\_s*紗\|河\_s*豚\|比\_s*律\_s*賓\|I\_s*r\_s*o\_s*n\|極\_s*東\_s*放\_s*送\|論\_s*理\_s*式\|形\_s*式\|ホ\_s*\%(ワ\_s*イ\_s*エ\|イ\_s*ル\|ル\_s*\%(マ\_s*\%(ン\_s*ト\|リ\_s*ン\)\|ム\_s*ア\_s*\%(ミ\_s*ド\|ル\_s*デ\_s*ヒ\_s*ド\)\)\)\|一\_s*杯\|関\_s*数\|機\_s*能\|汎\_s*関\_s*数\|修\_s*正\|ヒ\_s*\%(レ\|ュ\_s*ー\_s*[ズム]\)\|１\_s*\%(／\_s*ｆ\_s*ゆ\_s*ら\_s*ぎ\|ｓ\_s*ｔ\)\|第\_s*1\_s*要\_s*素\|失\_s*敗\|ハ\_s*\%(エ\|ン\_s*ブ\_s*ル\|ロ\_s*ン\)\|柔\_s*軟\_s*な\|Ｆ\_s*\%(１\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ａ\_s*\%(ｘ\|ｍ\_s*ｅ\)\|ｌ\_s*ａ\_s*ｖ\_s*ｏ\_s*ｒ\)\|周\_s*波\_s*数\|エ\_s*フ\)',
-      \ 'g' : '\%([頃殺米諢魂權艮勤権鮴好蓙応駒若亊事琴毎如鏝埖込塵氷聲肥声腰拵心恋戀国石獄濠盒噛嗷敖軣哈壕熬刧遨拷囂轟毫傲鼇郷劫≡号豪剛梧后冴後吾寤宕珸茣児伍誤５極醐碁檎牾蜈唔篌庫娯悟忤呉期齬5互超五晤越子炬護兒瑚午沍ご〓郤鬩戟屐隙檄闃鷁撃激劇皃黥貎霓麑倪囈猊迎鯨芸藝齧囓蘖呟愿監芫痃广彦軒舷眩源儼衒絃弦験言諺現限幻玄減原蹴偈毛睨觧解実下拐夏げ靴腐種草口薬糞癖茱胡萸串嵎藕遇宮寓隅偶黒栗倉鞍蔵位昏麕羣郡群軍苦周包車狂食颶壷暮愚弘虞倶麌禺具惧壺組狗ぐ衣君嫌裂際牛崟憖斤垠岑吟銀圄禦圉馭魚嶷閠玉漁繞堯尭御曉嶢澆翹痙蟯驍僥仰業暁凝行謔瘧虐逆気義偽技切妓巍犠誼宜伎祁疑萓礒羲僞城蟻斬決擬沂議儀嶬艤着木曦犧欺戲魏祇戯ぎ川巛乾革皮側通殻辛絡柄烏鴉頷嚴阮鳫厳貫嵒偐巖岸厂⊃贋龕強翫岩鴈丸雁玩癌元願眼巌含頑上髮紙神髪鐘金係歸皈肯帰返潟方固語刀難型形鰹歹垳顔顏鎌窯蟇釜蒲蟹傘笠重號垣樫頭月合諤樂鍔壑鄂斈學齶萼愕嶽咢鰐額岳顎楽学既礙涯剴乂垓葢劾盖愾磑睚漑崕亥崖啀艾駭皚該咳階孩芥碍害鎧街凱慨概蓋骸外代峩狩我ヶ鵞駕訝変刈掛牙娥替畫駆ケ俄哦借呀果臥雅買蛾訛換河峨莪書芽貸衙画ヵ伽賀勝餓鵝が≫＞ｇ瓦≧ガゴχΕΗΣυΙΛαΨζρΒΝιΦφτλΠονψωΚΔΡδΤβΘΟπεΧΑΞσθηκΖΜξμΥΩギグゲгΓγГg]\|ｯ\_s*\%(ｺ\_s*ﾞ\|ｹ\_s*ﾞ\|ｸ\_s*ﾞ\|ｷ\_s*ﾞ\|ｶ\_s*ﾞ\)\|ッ\_s*[ゴゲグギガ]\|っ\_s*[ごげぐぎが]\|ｺ\_s*ﾞ\|小\_s*屋\|蒙\_s*御\_s*免\|巨\_s*頭\_s*鯨\|欣\_s*求\|独\_s*楽\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|瞽\_s*女\|歩\_s*行\_s*虫\|向\_s*拝\|皐\_s*月\|穀\_s*潰\|寄\_s*居\_s*虫\|降\_s*魔\|格\_s*\%([間縁]\|天\_s*井\)\|恒\_s*河\_s*沙\|江\_s*\%([津湖商州]\|談\_s*抄\)\|豆\_s*[油汁]\|ｹ\_s*ﾞ\|蚰\_s*蜒\|景\_s*色\|化\_s*粧\|鴃\_s*舌\|稽\_s*古\|懸\_s*魚\|還\_s*[向俗]\|拳\_s*[万固骨]\|喧\_s*嘩\|顕\_s*界\|ｸ\_s*ﾞ\|救\_s*世\_s*菩\_s*薩\|工\_s*合\|供\_s*[奉祭香進]\|紅\_s*蓮\|ｷ\_s*ﾞ\|毬\_s*杖\|岐\_s*\%([南阜]\|セ\_s*ン\)\|棋\_s*将\_s*谷\|求\_s*\%([法道肥]\|不\_s*得\_s*苦\|聞\_s*持\_s*法\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|希\_s*臘\|杏\_s*葉\|餃\_s*子\|刑\_s*部\|ｶ\_s*ﾞ\|搦\_s*み\|鑑\_s*真\|仮\_s*名\|蝦\_s*[蟆蟇]\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|鉤\_s*状\_s*部\|菓\_s*子\|甲\_s*斐\|会\_s*社\|ヌ\_s*ー\|Ｇ\_s*\%(Ｏ\_s*Ｒ\_s*Ｏ\|Ｂ\_s*ｙ\_s*ｔ\_s*ｅ\|メ\_s*ン\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ス\_s*ポ\_s*ッ\_s*ト\|パ\_s*ン\|ｎ\_s*ｕ\_s*ｓ\)\|ニ\_s*ュ\_s*ー\_s*ズ\|ノ\_s*ー\_s*ム\|総\_s*司\_s*令\_s*部\|連\_s*合\_s*国\_s*軍\_s*総\_s*司\_s*令\_s*部\|ヒ\_s*ル\|ク\_s*ッ\_s*パ\|硝\_s*子\|ハ\_s*ボ\_s*ロ\_s*ー\_s*ネ\|瞿\_s*曇\|エ\_s*ー\_s*テ\_s*ボ\_s*リ\|ヨ\_s*ー\_s*テ\_s*ボ\_s*リ\|イ\_s*ェ\_s*\%(ー\_s*テ\_s*ボ\_s*リ\|テ\_s*ボ\_s*リ\)\|得\_s*る\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|メ\_s*ン\|C\_s*L\|c\_s*c\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ス\_s*ポ\_s*ッ\_s*ト\|パ\_s*ン\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(フ\_s*ァ\_s*イ\_s*ル\|ア\_s*ニ\_s*メ\)\)\|U\_s*I\|N\_s*U\|O\_s*サ\_s*イ\_s*ン\|E\_s*T\_s*メ\_s*ソ\_s*ッ\_s*ド\)\|ヘ\_s*\%(ラ\_s*ル\_s*ド\|ル\_s*マ\_s*ン\)\|ド\_s*イ\_s*ツ\|成\_s*吉\_s*思\_s*汗\|ゼ\_s*\%(ラ\_s*\%(チ\_s*ン\|ニ\_s*ウ\_s*ム\)\|ム\_s*ク\_s*リ\_s*ッ\_s*プ\|ノ\_s*ア\|ン\_s*ト\_s*ル\_s*マ\_s*ン\|ネ\_s*\%(コ\_s*ン\|ラ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\)\|大\_s*\%(蚊\|学\_s*院\_s*生\)\|ジ\_s*\%([ムルジグノナオンー]\|プ\_s*シ\_s*ー\|ア\_s*ン\|イ\_s*ド\|ッ\_s*ド\|タ\_s*ン\|ゼ\_s*ル\|リ\_s*ア\_s*ン\|レ\_s*ッ\_s*ト\|ゴ\_s*ロ\|ラ\_s*\%(フ\|ル\_s*\%(ド\|デ\_s*ィ\_s*ー\_s*ノ\)\)\|ロ\_s*\%(ー\|ン\_s*ド\)\|バ\_s*ン\_s*シ\_s*ー\|ブ\_s*\%(リ\|ラ\_s*ル\_s*タ\_s*ル\)\|ベ\_s*\%(ル\_s*ナ\_s*ウ\|レ\_s*リ\_s*ン\)\|ネ\_s*ッ\_s*ト\|ョ\_s*\%(ッ\_s*ト\|ヴ\_s*ァ\_s*ン\_s*[ニナ]\|バ\_s*ン\_s*[ニナ]\|コ\_s*\%(ー\_s*ソ\|ン\_s*ダ\)\|ル\_s*\%(ジ\|ダ\_s*ー\_s*ノ\)\|ー\_s*\%(ジ\|ゼ\_s*ッ\_s*ト\)\)\|ャ\_s*\%(ン\|イ\_s*\%(ロ\|ル\_s*ズ\|ア\_s*ン\_s*[ツト]\)\|コ\_s*\%(モ\|メ\_s*ッ\_s*テ\_s*ィ\)\|ー\_s*マ\_s*ン\)\|ニ\_s*ー\|ュ\_s*\%([レネ]\|ゼ\_s*ッ\_s*ペ\|リ\_s*\%(ア\|ー\_s*ニ\|エ\_s*ッ\_s*タ\)\|ヌ\_s*\%(ヴ\_s*ィ\_s*エ\_s*ー\_s*ヴ\|ビ\_s*エ\_s*ー\_s*ブ\)\)\|ェ\_s*\%([リルフムマネ]\|ス\_s*チ\_s*ャ\_s*ー\|ロ\_s*ニ\_s*モ\|ラ\_s*\%(ー\_s*[トルド]\|ル\_s*\%(ド\|デ\_s*ィ\_s*ン\|ダ\_s*イ\_s*ン\)\)\|ミ\_s*ニ\|ニ\_s*ー\|ノ\_s*\%([アバ]\|ヴ\_s*ァ\|ワ\_s*ー\_s*ズ\|サ\_s*イ\_s*ド\)\|ン\_s*\%(マ\|ト\_s*\%(ル\|リ\_s*[ィー]\)\|ダ\_s*ー\)\)\)\)',
-      \ 'h' : '\%([ﾎ洞袰亡滅幌濠壕畚笨略艢檣炎焔仄朖朗塊程施滸殆幾缶熱解屠榾螢蛍骨細本※＊糒恣縦擅星戟戈桙綻祠誇埃矛鉾堀頬褓鴇枋峯磅鞄峰垉篷勹皰朴抔怦棒泙棚堋呆豐麭膀舫弸蔀袍苞葬琺寳炮鵬寶繃鋒魴髣逢朋烹鳳彗箒俸焙蓬烽幇抱崩訪泡澎彷縫捧萌萠彭包胞倣邦飽庖疱奉豊硼報砲宝攴攵瀑蹼樮北哺欲譽餔保抛浦誉掘脯賞黼恍堡輔穗襃葆彫穂畝吼舖耄葡褒惚咆埔哮捕逋ほﾍ謙遜篦廰廳貶胼諞篇駢褊蝙翩變∂遍返騙編扁変暼丿諛諂隔凹臍巳蛇蒂蔕瓸竡粨癖躄甓闢璧劈碧壁竝餅娉塀病閇聘坪嬖幤箆蔽并陛屏炳斃瓶幣弊併敝閉並屁折邉舳辺歴圧戸減邊へﾌ梺麓冬♭汾枌濆′吩賁氛雰糞褌忿墳吻紛焚扮分粉舊旧顫揮故震篩奮隹古衾襖贅燻鰒陰総惣總絃房閼鬱塞章郁艦簡補札耽鰾吭笛芬呎文罧節苳蕗淦舩艙舷舟船蒲懷懐≦≫＞≧≪渊淵渕縁葢盖弍蓋双B藤潭蒸鱶楓殕瘋封諷黻怫彿髴佛憤恚慍仏F弗沸Φφ拒防蔔輹愎蝠茯箙⊃⊇嚢梟袋含⊂⊆袱覆輻復馥副複福誣孚普俯更腐坿狂不増拊鯆怖赴桴巫傅婦付訃賻振負蜉罘附吹経觸夫俘父臥践咐敷踏斧溥阜葺深仆譜符麩匐榑芙賦殖冨触孵麸柎府舗噴鋪降蹈風觝埠拭鮒郛伏俛經歩富苻畉扶趺ふﾋ鶸禀蘋彬斌嬪繽殯賓擯牝貧頻瀕稟品葫怯晝飜蒜蛭昼綬胙紐鰭∝片衡鮃閃鵯辟百媛姫尋擴仭太仞展宥絋拡拓拾祐恕紘煕泰熙寛洋弘宏啓裕浩廣広冰雹俵飃凭冫髟彪驫飆馮殍飄豹漂驃慓剽嫖兵票憑評標平表燧老拈捫撚捻歪籤籖柊魃旱秀跪膝蜩羆佗攣−低隙閑暇雛髯鬚髭¬蹄潛濳潜顰密窃鬻提瓢蠡瓠匏央恒壽廂尚寿久蟆率痙蟇丙丁孤史女獨独稘斎斉均倫準等≠單偏単他仁瞳人1１柆蔆拉杓柄犇◇◆菱醢醤曾蘖彦酷漬浸鶲額聖肱肘熈芒光膕控皹皸響罅僻鰉逼疋蹕畢匹篳棺柩弼櫃謐坤未羊筆必養襞饑「＜【（←『左臂轡曳灯緋朏砒火日蜚妣費狒匕泌杼庇悲樋退脾挽痺卑贔紕牽避引菲檜被碑匪裨斐秘豼霏蓖丕批妃髀干昜彼秕氷鄙飛比否碾疲梭披桧魅惹俾鞴冷譬貔乾肥罷痞索扉暃毘轢皮陳鞁祕ひﾊ布鱧釖鉤蝟梁鍼磔針禳肚腑腸孕原拂祓払遼請温玄腹陽遙悠東遥治春頓鮠捷鶻駿疾囃林隼鈑膰磐樊潘泛畔蟠釆拌笵胖絆氾坂范凡燔楾洪瘢翻板攀゜大伴煩槃袢斑判範藩繙蕃版搬叛班阪般販犯汎帆頒反侍鯊櫨祝？硲間劇激勵烈励速蝿蠅省飯勢彈外弭筈辱逸育毓齦浮阻難掵憚幅巾柞母翅圃旛旙将側旌幟傍働鰰機叩疥畠幡籏畑旗斜鴿再鳩開秦跣膚肌裸弾薑椒壹甫馨壱弌哉一創元始鋼芳夾剪鋏螯挾挟脛萩餞贐離塙英蕚萼衄衂縹譚咄放噺話洟甚鼻華花赱迸奔枦觜艀婢梯燥箸柱走橋匣凾箪筐□繁方運匚筥箱函陌栢魄膊柏亳珀狛佰粕璞蘗岶愽擘箔舶泊搏迫帛拍圖諮測企秤謀量計図儚捗袴伯博墓髮秡癶釟溌肇廿二初椀蓮８♪鉢蜂發髪服半法醗薄白八発霈盃睥擺湃孛裴琲埴碚牌吠拜坏珮旆入沛榛杯悖―廢腓誹徘稗癈肺俳憊輩背鷂胚廃排拝敗灰配蛤濱浜吐食霽恥菠帚杷垪跛耻巴笆履脹葉爆矧帶這撥破嵌霸捌早把刎馳填生簸跳派禿碆羽果覇映晴陂端剥腫匍着穿葩爬歯膨坡佩慙芭刄菷怕榮齒刃播愧暎叭栄玻掃張貼刷羞頗琶はｈ━─┘┛┸┷┻┴┓┐┳┬┯┰┨┫┤┥┼╋╂┿波‐フ★☆非ヒホヘハh]\|ｯ\_s*[ﾎﾍﾌﾋﾊ]\|ッ\_s*[ホヘフヒハ]\|っ\_s*[ほへふひは]\|寄\_s*生\|珠\_s*鶏\|混\_s*一\_s*色\|紅\_s*[幇中]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|微\_s*[酔笑]\|子\_s*規\|時\_s*鳥\|蜀\_s*魂\|杜\_s*[宇鵑]\|上\_s*枝\|鬼\_s*灯\|酸\_s*漿\|叢\_s*祠\|和\_s*了\|鮑\_s*魚\|謗\_s*法\|黒\_s*子\|部\_s*屋\|竹\_s*\%(畚\|麦\_s*魚\)\|綜\_s*麻\|巻\_s*子\|下\_s*手\|糸\_s*瓜\|霹\_s*靂\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|鞦\_s*韆\|睾\_s*丸\|乱\_s*吹\|相\_s*応\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|回\_s*\%(鍋\_s*肉\|回\_s*教\)\|書\_s*司\|頭\_s*垢\|鳧\_s*鐘\|菜\_s*蕗\|款\_s*冬\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|釜\_s*[中山]\|雙\_s*葉\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|宿\_s*酔\|△\_s*△\_s*△\|×\_s*×\_s*×\|○\_s*○\_s*○\|河\_s*\%(豚\|底\_s*撈\_s*魚\)\|神\_s*[庫籬]\|肩\_s*巾\|領\_s*巾\|素\_s*見\|曹\_s*白\_s*魚\|枚\_s*[田方]\|敬\_s*昌\|幸\_s*展\|容\_s*靖\|晃\_s*道\|欧\_s*子\|宙\_s*子\|祥\_s*加\|終\_s*日\|翡\_s*翠\|曽\_s*祖\_s*父\|豪\_s*将\|偉\_s*紀\|周\_s*[行男]\|茅\_s*蜩\|向\_s*日\_s*葵\|七\_s*宗\|桶\_s*坂\|永\_s*和\|蟾\_s*蜍\|抽\_s*\%([斗出]\|き\_s*出\_s*し\)\|告\_s*天\_s*子\|雲\_s*[脂雀]\|為\_s*人\|緊\_s*[と々]\|鎮\_s*火\_s*\%(祭\|の\_s*祭\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|粃\_s*糠\_s*疹\|只\_s*管\|直\_s*[向走垂隠]\|常\_s*陸\|鹿\_s*尾\_s*菜\|撲\_s*り\_s*倒\|同\_s*胞\|赦\_s*い\|青\_s*春\|哈\_s*爾\_s*浜\|美\_s*佳\|流\_s*行\|勇\_s*[樹人]\|韓\_s*流\|漢\_s*堡\|汗\_s*国\|盤\_s*陀\|R\_s*S\_s*I\|蔓\_s*延\|蝦\_s*虎\_s*魚\|沙\_s*魚\|馬\_s*銜\|狭\_s*間\|南\_s*風\|延\_s*\%(縄\|い\_s*て\)\|義\_s*母\|旅\_s*籠\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|黄\_s*[酒櫨]\|土\_s*[方生師]\|嘔\_s*[吐気]\|支\_s*倉\|長\_s*谷\|接\_s*ぎ\_s*合\|纏\_s*頭\|煙\_s*火\|麻\_s*疹\|階\_s*[上子]\|嘴\_s*\%(細\_s*鴉\|太\_s*鴉\)\|学\_s*胤\|2\_s*\%([人つ日]\|通\_s*り\|0\_s*日\)\|２\_s*\%([人つ日]\|０\_s*[歳日]\)\|淡\_s*竹\|8\_s*月\|客\_s*家\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|海\_s*\%([鞘永蘿星牙]\|拉\_s*爾\|底\_s*撈\_s*月\)\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|色\_s*調\|呼\_s*和\_s*浩\_s*特\|ウ\_s*ー\_s*ゴ\|ユ\_s*\%(ー\|ペ\_s*ー\_s*ル\|ベ\_s*ー\_s*ル\|イ\_s*ス\_s*マ\_s*ン\_s*ス\|ゴ\_s*ー\|グ\_s*ノ\_s*ー\|マ\_s*ニ\_s*\%(テ\|ス\_s*[トム]\)\)\|現\_s*代\|十\_s*六\_s*進\_s*数\|高\_s*さ\|香\_s*港\|イ\_s*\%(ダ\_s*ル\_s*ゴ\|ス\_s*パ\_s*ニ\_s*ア\|レ\_s*ー\_s*ル\|エ\_s*ロ\)\|Ｈ\_s*\%(ｚ\|カ\_s*ッ\_s*プ\|ｏ\_s*ｂ\_s*ｂ\_s*ｉ\_s*ｔ\|ｉ\_s*\%(８\|Ｂ\_s*ａ\_s*ｎ\_s*ｄ\)\)\|オ\_s*\%([ラー]\|ナ\_s*ー\|ノ\_s*レ\|ン\_s*フ\_s*ル\_s*ー\_s*ル\|ネ\_s*\%(ス\_s*\%(ト\|テ\_s*ィ\)\|ゲ\_s*ル\)\|テ\_s*ル\|ル\_s*ガ\_s*ー\|マ\_s*ー\_s*ジ\_s*ュ\)\|ア\_s*\%(ン\_s*\%(リ\|ベ\_s*ー\_s*ル\)\|ネ\_s*ス\_s*ト\|ワ\_s*ー\|ダ\_s*マ\_s*ー\_s*ル\|シ\_s*ェ\_s*ッ\_s*ト\|ビ\_s*タ\_s*シ\_s*オ\_s*ン\|ー\_s*\%(ネ\_s*ス\_s*ト\|ノ\_s*ン\_s*ク\_s*ー\_s*ル\)\)\|エ\_s*\%(デ\_s*ィ\|ン\_s*リ\_s*ケ\|レ\_s*\%(ナ\|ー\_s*ヌ\)\|ロ\_s*イ\_s*ー\_s*ズ\|ク\_s*ト\_s*ル\|ル\_s*\%(ゲ\_s*ラ\|ヴ\_s*ェ\|メ\_s*ス\|マ\_s*ン\|ミ\_s*\%(ッ\_s*ト\|ー\_s*ト\)\|ブ\_s*ラ\_s*ン\|ナ\_s*ン\_s*デ\_s*ス\|キ\_s*ュ\_s*ー\_s*ル\)\|ノ\_s*ク\|ッ\_s*チ\|イ\_s*チ\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|カ\_s*ッ\_s*プ\|T\_s*\%(M\_s*L\_s*フ\_s*ァ\_s*イ\_s*ル\|T\_s*P\_s*サ\_s*ー\_s*バ\)\|D\_s*D\_s*レ\_s*コ\_s*ー\_s*ダ\_s*ー\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|水\_s*[銀平素]\)',
-      \ 'i' : '\%([ｲΗη賤鄙卑苟嫌弥薯妹藷芋夢艷鑪鈩彩鱗色鯆忽綺貸甍応答愈圦杁霪隱蚓寅氤酳胤飮韵尹茵贇蔭婬湮堙廴音飲慇韻咽淫殞姻隕院允殷隠陰窟巌巖頌祝鰛鰮鰯岩磐円￥鼾歪弑弋抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗嘶鰍電引躄誘動忿≦鵤錨碇怒霆雷霹凧桴筏魚S菴庵彌雖家尿荊棘茨祈祷命猯豕古伍乙鎰鴪聿軼樹慈悼愴慯労格到至傷鼬頂戴病徒致鈑痛板柞砂沙些聊潔諍烈功諫勳勲勇漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息挑縷絲厭營営愛幼稚緒遑暇糸弌壹肆莓苺櫟著市碑鐓礎甃臀弩石犧牲犠池溢Y佚壱1１燠鬻礇毓粥的戦戰軍幾郁育一稲否飯洟位違居姨猗斎偽噫逝医鑄痍委囲云圍ゐ挿炒彙要熨饐醫言矮往詒威懿如僞忌彜煎逶緯韋唯莞淹胃善生恚彝惟以活易蔚為猪衣已倚幃斐移鮪将可偉畏五夷李渭怡貽癒依逸井慰行爲胆射詑矣頤熬萎良凍出椅率好揖肄痿鋳謂帷亥苡意維遺鰄異去堰尉容囗い氷Йй⇒→⊂⊃▼▽伊ｉ印入∞吋∈∋∫∬∩ＩイИΙιи私i]\|E\_s*メ\_s*ー\_s*ル\|灼\_s*然\|祖\_s*谷\|湯\_s*文\_s*字\|文\_s*身\|郎\_s*[女子]\|刺\_s*[青草]\|蕁\_s*麻\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*青\|況\_s*ん\_s*や\|所\_s*謂\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%(蘭\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|夜\_s*来\_s*香\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|小\_s*魚\|鯨\_s*魚\|細\_s*小\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|和\_s*泉\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|気\_s*吹\|指\_s*宿\|拠\_s*所\|従\_s*[妹姉弟兄]\|公\_s*孫\_s*樹\|鴨\_s*脚\_s*樹\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|檪\_s*本\|巫\_s*子\|神\_s*巫\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|許\_s*[婚嫁]\|<\_s*=\_s*=\_s*>\|必\_s*要\_s*十\_s*分\_s*条\_s*件\|ヤ\_s*ン\|日\_s*本\_s*ア\_s*イ\_s*・\_s*ビ\_s*ー\_s*・\_s*エ\_s*ム\_s*株\_s*式\_s*会\_s*社\|国\_s*際\_s*\%(基\_s*督\_s*教\_s*大\_s*学\|標\_s*準\_s*化\_s*機\_s*構\)\|逆\_s*離\_s*散\_s*フ\_s*ー\_s*リ\_s*エ\_s*変\_s*換\|識\_s*別\_s*子\|即\_s*興\_s*曲\|な\_s*ら\_s*ば\|項\_s*目\|逐\_s*次\_s*型\|誤\_s*っ\_s*た\|無\_s*\%(花\_s*果\|効\_s*な\)\|帰\_s*納\_s*法\|字\_s*下\_s*げ\|不\_s*\%([可如足]\|充\_s*分\)\|具\_s*体\_s*化\|情\_s*報\|導\_s*入\|整\_s*数\|完\_s*全\|ヨ\_s*\%(ア\_s*ン\|シ\_s*フ\|ー\_s*ド\|ウ\_s*素\)\|I\_s*\%([rPn]\|R\_s*Q\|カ\_s*ッ\_s*プ\|C\_s*\%(タ\_s*グ\|チ\_s*ッ\_s*プ\|カ\_s*ー\_s*ド\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(番\_s*号\|コ\_s*ー\_s*ド\)\|A\_s*バ\_s*ス\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(カ\_s*ー\_s*ド\|E\_s*\%(ド\_s*ラ\_s*イ\_s*ブ\|デ\_s*バ\_s*イ\_s*ス\|ケ\_s*ー\_s*ブ\_s*ル\|コ\_s*ン\_s*ト\_s*ロ\_s*ー\_s*ラ\)\)\|タ\_s*ー\_s*ン\|T\_s*\%(シ\_s*ス\_s*テ\_s*ム\|バ\_s*ブ\_s*ル\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|ア\_s*\%(イ\|ー\_s*\%(ヴ\_s*ィ\_s*ン\|ビ\_s*ン\)\|ン\_s*\%(プ\_s*ロ\_s*ン\_s*プ\_s*\%(チ\_s*ュ\|テ\_s*ュ\)\|デ\_s*パ\_s*ン\_s*ダ\_s*ン\|フ\_s*ォ\_s*ル\_s*\%(メ\_s*ル\|マ\_s*テ\_s*ィ\_s*ー\_s*ク\)\)\)\)',
-      \ 'j' : '\%([塩嶋縞島嶌橲衄衂宍竺舳忸軸舌喰食直凝實昵実印尻稔仭糂贐潯儘仞盡刄臣侭恁進訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敘恕耡汝莇杼茹敍蜍洳舒縟辱褥蓐溽所抒鋤徐序絮叙助釀淨疂絛繞壌諚孃瀞襄仍蟐拯疉讓聶驤生帖仗躡穰乘塲靜繩禳蕘壤遶星滌茸嬲疊如剩娘嬢錠静醸縄女尉饒丈成擾穣烝嫋丞盛場杖條条蒸貞状攘剰畳冗定浄乗情城上常譲濡得戍就嬬鷲竪讐讎懦愀咒聚隼詢徇笋凖盾楯筍篤蓴惇洵淳閏諄恂馴旬荀潤循醇巡遵順准殉純準襦誦需戌朮孰宿塾珠熟恤術述孺呪豎儒綬樹受授壽鞣狃澀揉廿拾縱中從糅从戎澁蹂神汁獸絨縦渋柔什充十獣従住銃重岻除士染時怩至児冶璽只畤侍孳轜耳示次寿辭粫司二祀邇而慈峙爺以地塒珥迩痔死敷恃蒔磁瓷仁字尓焦膩柱似嗣子亊路史餌兒滋仕爾辞弍自茲持寺事知醤鮭搦着惹尺鉐雀寂若弱蛇闍者邪戯麝じｊ│┃├┝┣┠┏┌．еЕ治Яя日юЮёЁЙジйj]\|ｯ\_s*ｼ\_s*ﾞ\|ッ\_s*ジ\|っ\_s*じ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|祖\_s*父\_s*\%(さ\_s*ん\|祖\_s*母\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|↑\_s*↓\_s*←\_s*→\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｼ\_s*ﾞ\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|三\_s*味\_s*線\|雑\_s*魚\|著\_s*語\|杓\_s*子\|共\_s*同\_s*企\_s*業\_s*体\|ゼ\_s*リ\_s*ー\|エ\_s*\%(ホ\_s*バ\|リ\_s*コ\|レ\_s*ミ\_s*ヤ\|ル\_s*サ\_s*レ\_s*ム\|ッ\_s*サ\_s*イ\)\|ヘ\_s*\%(レ\_s*ス\|ス\_s*ス\)\|ヒ\_s*メ\_s*ネ\_s*ス\|チ\_s*ゲ\|北\_s*陸\_s*先\_s*端\_s*\%(大\|科\_s*学\_s*技\_s*術\_s*大\_s*学\_s*院\_s*大\_s*学\)\|ハ\_s*\%(イ\_s*メ\|ラ\_s*ペ\_s*ー\_s*ニ\_s*ョ\)\|碧\_s*玉\|ヤ\_s*\%([リンニナー]\|イ\_s*ル\|エ\_s*ル\|ル\_s*ノ\|レ\_s*ド\|ヌ\_s*\%(ス\|シ\_s*ュ\)\|ス\_s*パ\_s*ー\_s*ス\|コ\_s*[ビブ]\|ッ\_s*ケ\)\|フ\_s*\%(ァ\_s*[ンナ]\|リ\_s*[オア]\)\|J\_s*\%(R\_s*東\_s*日\_s*本\|\.\_s*S\_s*\.\_s*\%(バ\_s*ッ\_s*ハ\|B\_s*a\_s*c\_s*h\)\|リ\_s*ー\_s*グ\|カ\_s*ッ\_s*プ\|C\_s*B\_s*カ\_s*ー\_s*ド\|-\_s*P\_s*O\_s*P\|ポ\_s*ッ\_s*プ\|P\_s*\%(G\_s*フ\_s*ァ\_s*イ\_s*ル\|E\_s*G\_s*フ\_s*ァ\_s*イ\_s*ル\)\|I\_s*S\_s*\%(マ\_s*ー\_s*ク\|コ\_s*ー\_s*ド\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*コ\_s*ー\_s*ド\|V\_s*A\_s*\%(ス\_s*ク\_s*リ\_s*プ\_s*ト\|ア\_s*プ\_s*レ\_s*ッ\_s*ト\)\)\|U\_s*N\_s*E\_s*T\)\|ズ\_s*ボ\_s*ン\|Ｊ\_s*\%(２\|−\_s*Ｗ\_s*Ａ\_s*Ｖ\_s*Ｅ\|リ\_s*ー\_s*グ\|カ\_s*ッ\_s*プ\|ポ\_s*ッ\_s*プ\|Ｉ\_s*Ｃ\_s*Ｃ\_s*出\_s*版\|Ｕ\_s*\%(Ｓ\|Ｎ\_s*Ｋ\_s*Ｏ\)\|ｕ\_s*ｓ\)\|ユ\_s*\%([ハリダノ]\|ル\_s*ゲ\_s*ン\|ー\_s*\%([リノ]\|ゲ\_s*ン\_s*ト\|デ\_s*ィ\_s*ッ\_s*ト\)\|ン\_s*\%(グ\|カ\_s*ー\|ケ\_s*ル\)\|ピ\_s*テ\_s*ル\|ッ\_s*[カシ]\)\|イ\_s*\%(エ\_s*\%([ナス]\|ン\_s*\%(ス\|セ\_s*ン\)\|ズ\_s*ス\)\|ェ\_s*\%(ナ\|ン\_s*\%(ス\|セ\_s*ン\|ゼ\_s*ン\)\|ー\_s*ガ\_s*ー\|ル\_s*\%(ク\|サ\_s*レ\_s*ム\)\)\)\|ホ\_s*\%([タセ]\|ル\_s*ヘ\|ホ\_s*バ\|ア\_s*\%(ン\|キ\_s*ン\)\)\|ヨ\_s*\%([ブナ]\|ル\_s*\%(グ\|ダ\_s*ン\)\|エ\_s*ル\|ア\_s*\%(ヒ\_s*ム\|キ\_s*ム\)\|ゼ\_s*フ\|ー\_s*\%([トド]\|デ\_s*ル\|ゼ\_s*フ\)\|シ\_s*\%(フ\|ュ\_s*ア\)\|セ\_s*フ\|ハ\_s*[ナンネ]\)\)',
-      \ 'k' : '\%([ｺ怖旃之惟怺薦米暦轉殺壼鶤袞鯤坤狠艮琿悃很漿棍魂菎滾梱溷痕渾墾恨懇根梢杪王泥裔樸鞐熟枹醴聲声蛩凍溢零錯苔箏亊判斷諺理断盡悉尽辞詞殊事壽寿鯒礫鯉齣狛腓昆瘤鮗谺応應答茲是爰試志心凩兀笏惚榾輿甑腰拵拗鐺鏝昿仰慌袷塙頏絖冦耗亙峺衝晄覯糠匣逅閧扛湊羔礦爻壙盍洸鬨浤凰閤窖缸寇岡傚湟汞洽崗鮫伉訌誥冓敲磽倖簧鏗椌搆肓鍠矼砿犒淆呷鵁皐黌遘昴槹蚣肱肴熕胱猴扣杲蛤縞狎畊昊餃哽幌鱇峇嫦鎬隍恆倥徨啌吭釦闔藁亘絋棡遑紘稾鴿詬哮困靠皋惶紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘蝗酵嚆犢稿亢哄睾慷郊岬肛項巷鑛洪佼狡昂叩勾喉滉糀晃剛晧曠宏控恍侯港皓坑皎耿膏江絞膠虹巧鴻鉱衡浩厚幸耕弘綱抗購攻講恒溝薨鋼航行肯荒高皇光好槲梏谷釛尅斛轂哭石告酷穀冴虎觚壷痼胯鼓児漉糊媚古娘冱混粉請辜湖虍放葫捏此鈷痩鴣瞽詁呼箍小錮蠱蛄粐滬估雇故沽転倒漕罟餬超込凅誇懲琥扈袴焦蝴呱乕踰弧越子孤菰跨壺楜股肥凝女戸恋兒怙瑚戀夸皷滸濾瓠濃乎仔こｹ峻欅獸謇鵑愃搴劒俔儉險瞼慊圈幵釼顯剱椦黔暄劔涓臉妍劵歉獻縣蜷綣檢鉉虔愆娟權甄惓諠騫験慳捲倦遣羂嶮蹇鹸狷譴腱驗軒憲繭謙圏険硯倹献犬絢顕券劍剣見権研拳眷牽県建烟鑷言獣蓋涜吝削畩閲検貶健桁嗾竭獗偈譎碣蕨尻頡抉襭亅刔杰厥訐歇訣孑頁纈蹶桀穴傑結血煢蹊黥詣攜綮鮭絅盻挈瓊夐冂笄枅奚兮迥畦彑醯徑剄冏勍檠憬挂憇匸逕繼惠慧謦鷄系┓├┃┣┿━┻┷┸─┫┝┳┬┼┯┥╋┨┛│┠┰┏┤┴╂罫痙奎脛谿溪螢蛍渓閨憩圭携硅恵刑継勁珪計啓蹴毛褻異けｸ姑配椚橡檪櫪栩椡椪湫箜櫟含纐柵婚屎糞癖潛潜鵠凹窪縊跟頚軛珞頸首諄鞋履窟轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬樟楠梳櫛串釧與与挫籖鯀鯨籤隈熊艸嚔藾叢鏈腐鎖種Ξξ臭楔草圀邦國国髭漱嗽吻嘴唇脣梔腔φ粂裙勳熏皹桾皸醺崑燻訓勲葷委詳钁精鍬咥銜桑某暝峅昏冥眛罔鮓比闇位鞍藏暗倉廚厨涅曇蜘佝栗包俥車梍枢畔鐵玄蔵黒食孔桍窶暮焼懼駒苦区眩吁繰庫垢紅呉倶枸劬煦口瞿工吼怐喰貢惧區組句狗酌絎嶇衢刳くｷ段痍疵紲絆傷築鱚嚴稷黍帛後碪砧絹兆萌刻鞫椈掬辟君牙蘗檗迄訖狐屹詰佶拮吃鞠橘菊喫．＆⌒¬★！÷≠♪∫％±・。仝●｜―￥Ц△‡｀←¢£‰◎＋￣〒☆ヽゞ、▽◇↓≒＼；″°∝≦々℃∵†○´゛‥♭＜＃〇□‐＿Å∞：▲ヾ♂？＾，〓‖▼…〃¶゜＠≫§∴′ゝ／＞♀∨＝≧ー−≪＄♯↑■¨≡〆◆∽煙蚶更衣細后妃楸蕈茸乙雉轢杵軋岸桔汚穢北樵際裂燦煌雲嫌胆竏粁瓩浄淳澄潔清雰錐蛬吉霧檮桐箘鈞檎襟忻箟掀磬噤听瑾懃覲釁芹衿饉釿衾斤蒟径窘擒巾菌公禽筋錦欣僅琴均禁緊謹欽近勤嘘踞據苣擧渠秬鉅舉筥慶倨距歔遽鋸醵拠拒去勗蕀洫亟跼旭局挙許居巨虚轎繦羌姜篋蕎陜恊竸荊筴徼峽劫恟況棘竅僵亰狹頃筺梗誑刧襁烱洶抂卿鍄炯經竟廾况孝亨跫敬筐梟饗矯矜挾校挟拱嬌杏鞏響向興匈嚮享警競喬怯兄彊僑兢莢狂橋供郷兇驕凶叫夾匡侠狭恐経疆協境強胸驚脅共恭今教玖鬮歙舊疚笈邱赳摎恷岌貅９扱皀烋樛蚯逑厳胡翕朽泣穹糾糺及躬汲臼窮灸弓宮久柩究給丘求鳩級球休救急旧吸九基欹寄貴跂徠聞覊猗櫃煕既弃氣詭嬉效切妓跪虧卉稘尋冀暉唏姫伐喟伎畸効熙癸噐極祁匱馗旡其碁剞畿規希綺燬騎饑逵樹忌朞騏城聽棄悸肌生几季記僖紀斬決槻期起箕聴鰭崎餽倚幃瞶利晞欷毅危屓熈着汽木飢酒愾熹諱淇器羇机企麾訊著剪稀来圻來鬼揆奇羈禧譏棋黄憙己驥鑽决毀掎曁竒窺喜碕祈耆饋揮愧棊幾气徽消截岐祺麒覬嵜杞軌きｶ糜癢粥痒麹輕骨業軽鰔鰈餉通瓶龜甕亀鴈獵鳫殯猟雁釀鳧鳬髢鴨躱巛側厠廁磧瓦獺翡裘皮紮→搦苧碓柄枳體軆躰躯体鴉犂烏機絡空唐榧茅揀坎澗扞莟丱拑盥嫺鑵蒄瞰淦稈康繝懽憾骭戡奐啣厂鐶讙澣羮寰羹嫻杆鸛歡豢歛罕酣陷皖篏捍瀚勸撼驩卷樌潤觀橄涵渙凵堪巫覡鉋萱簪舘艱咸翰柬悍駻燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹顴緘桓款箝諌諫轗旱坩侃鰥　館莞橇韓患灌勧菅簡奸刊柑肝看桿干緩寒嵌廣広竿貫巻敢漢環間陥喚閑監喊歓甘寛管慣完艦乾幹官観壁椛屍姓庇鞄芳蔓鯑一勘⊃影陰蔭景＊棧梯筧庚辛┘柧┐┌門廉脚癩乞∪川合’）〈《‘“”｝｛》〉囓柁旗鮖悴舵鰍鍛梶錺餝飾篭籠還歸卻皈孵省顧楓却帰反返督髮帋守祇韮裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀模象仇固硬傍難容忝辱頑形方旁型肩風幽滓翳微掠綛纃絣緕擦糟鎹粕轄戞劼猾瞎恰蛞∧∩蠍擔濶筈剋蝎曷羯喝餓聒鞨黠刮蘰鬘桂闊括嘗捷豁渇担滑堅鰹割戛活暈疽鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿關掲罹抱踵嬶嚊拘関係貌顏郁薫顔母感釡罐窰鴎框叺構喧竃竈釜缶蒲鎌數数槝栢膳傅瑕畏賢橿姦樫爨炊圍喞託囲鈎『鉤「』」限鍵傾禿蕪鏑頭齧気被兜敵適哉必要鼎鬲彜彝叶片悲哀愛鋺蛇鉄蜩神奏楫裹磆餅徒褐糧粮膈覺∠埆蠖貉幗隱擴寉骼癨壑咯椁嚇茖愨槨膕掴覈殼穫狢霍礁恪擱匿撹攪喀廓較郭］】【〔〕［殻挌劃閣格隠覚矍革獲馘攫核鶴拡客隔角確蠏壞畍丐獪褂恠喙峡夬觧械揩醢匯廨誡誨嵬櫂隗茴徊迴枴懈价椢榿囘蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧契皆界疥魁偕改繪貝胛絵甲快灰槐晦懐介回塊解階廻戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡和代茄缺飼嫁華堝變狩上訶加架何啝火日菓欠苅繋稼ヶ个噛譁科跏舸賭禍支変窩課花交刈渦嚼掛呵替葭柯畫駆嘩崋化霞蝌迦顆価馨家借蝦罅駈斯賈嘉易果戈廈哥買闕且克墟靴訛驅換踝描軻嗅價嗄可彼夥香歌河珂鹿個痂書假荷耶笳咼藉糅舁搗渮袈下萪貸厦禾貨咬寡箇卦苛譌枷掻過画ヵ黴遐兼醸翔仮佳蚊懸伽賀淅勝涸苟蝸謌夏枯暇珈かｋ京節┗└※хХ忽コ汗〜功（株Kク×金窯χキカΚКΧкケκk]\|ｯ\_s*[ｺｹｸｷｶ]\|ッ\_s*[コケクキカ]\|っ\_s*[子こけくきか]\|蟀\_s*谷\|焜\_s*炉\|前\_s*妻\|嫡\_s*妻\|二\_s*合\_s*半\|秋\_s*桜\|牛\_s*尾\_s*魚\|庶\_s*幾\|独\_s*楽\|特\_s*牛\|粫\_s*門\|甦\_s*生\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|外\_s*連\_s*味\|螻\_s*蛄\|罌\_s*粟\|滅\_s*紫\|S\_s*i\|莎\_s*草\|百\_s*[濟済]\|9\_s*[日月]\|秧\_s*鶏\|釉\_s*掛\|典\_s*薬\_s*寮\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|群\_s*衆\|慈\_s*姑\|c\_s*r\_s*e\_s*s\_s*c\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|仁\_s*彦\|啄\_s*木\_s*鳥\|X\_s*e\|如\_s*月\|私\_s*市\|昨\_s*日\|素\_s*地\|布\_s*地\|欺\_s*罔\|聖\_s*[之子美]\|沈\_s*菜\|蟋\_s*蟀\|螽\_s*斯\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|菫\_s*青\_s*石\|槿\_s*花\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*l\_s*e\_s*s\)\)\|裾\_s*礁\|脇\_s*[侍息]\|姉\_s*[妹弟]\|頬\_s*[骨筋]\|毬\_s*果\|舅\_s*姑\|厩\_s*\%([肥舎]\|務\_s*員\)\|廐\_s*舎\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|氈\_s*瓜\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|為\_s*替\|連\_s*枷\|身\_s*体\|落\_s*葉\_s*松\|随\_s*神\|檻\_s*車\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|千\_s*典\|山\_s*\%(梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|蜻\_s*蛉\|破\_s*片\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|槭\_s*樹\|長\_s*[月官]\|主\_s*[紀計神]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*白\|春\_s*日\|C\_s*\%([ormfda]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|曾\_s*て\|曽\_s*て\|松\_s*魚\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|蟷\_s*螂\|螳\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|水\_s*[鶏母夫手]\|東\_s*\%(風\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|(\_s*株\_s*)\|称\_s*子\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|ノ\_s*\%([ブウ]\|ー\_s*ン\|ッ\_s*\%([トク]\|テ\_s*ィ\_s*ン\_s*グ\|カ\_s*ー\|キ\_s*ン\_s*グ\)\)\|ナ\_s*\%(ッ\_s*\%(ク\|プ\_s*\%(サ\_s*ッ\_s*ク\|ザ\_s*ッ\_s*ク\)\)\|レ\_s*ッ\_s*ジ\|イ\_s*[フトツ]\)\|ニ\_s*\%(ー\|ッ\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ホ\_s*\%(ー\_s*\%(ミ\_s*ー\|メ\_s*イ\)\|メ\_s*イ\_s*ニ\)\|フ\_s*\%(ビ\_s*ラ\_s*イ\|ル\_s*シ\_s*チ\_s*ョ\_s*フ\)\|ハ\_s*\%(ン\|ラ\_s*シ\_s*ョ\_s*ー\|ー\_s*ン\|バ\_s*ロ\_s*フ\_s*ス\_s*ク\|ル\_s*ツ\_s*ー\_s*ム\|チ\_s*ャ\_s*ト\_s*ゥ\_s*リ\_s*ア\_s*ン\)\|Ｋ\_s*\%([点ｇｍ]\|カ\_s*ッ\_s*プ\|ｎ\_s*ｏ\_s*ｃ\_s*ｋ\_s*Ｏ\_s*ｕ\_s*ｔ\|ｅ\_s*ｎ\_s*ｗ\_s*ｏ\_s*ｏ\_s*ｄ\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-      \ 'l' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁ＜≪ｌ￣＿≦李左←¬⊃∃∀∨ル∧レラлΛ£Лλl]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|液\_s*晶\|最\_s*小\_s*2\_s*乗\_s*法\|\.\_s*\.\_s*\.\|拉\_s*薩\|聯\_s*想\|補\_s*題\|檸\_s*檬\|手\_s*紙\|学\_s*習\|施\_s*錠\|局\_s*所\|論\_s*理\|ロ\_s*\%([キイアロリブボトメウスコゴグー]\|ペ\_s*ス\|ワ\_s*ー\_s*ル\|エ\_s*ベ\|ヨ\_s*ラ\|フ\_s*ト\|ル\_s*カ\|ベ\_s*リ\_s*ア\|ビ\_s*\%(ー\|ン\_s*グ\|イ\_s*\%(ス\_s*ト\|ン\_s*グ\)\)\|テ\_s*ィ\|サ\_s*ン\_s*\%(ジ\_s*ェ\_s*ル\_s*ス\|ゼ\_s*ル\_s*ス\)\|ニ\_s*ー\|ク\_s*リ\_s*ア\_s*ン\|ッ\_s*\%([ジタテトク]\|キ\_s*\%(ン\_s*グ\|ー\_s*ド\)\|カ\_s*ー\)\|カ\_s*ー\_s*ル\|ケ\_s*ー\_s*\%([トタル]\|シ\_s*ョ\_s*ン\)\|ガ\_s*ー\|ギ\_s*ン\_s*グ\|ジ\_s*\%(ー\|テ\_s*ッ\_s*ク\|ス\_s*テ\_s*ィ\_s*\%(ク\|ッ\_s*ク\)\|カ\_s*ル\|ク\_s*ー\_s*ル\|ッ\_s*[トク]\)\|ラ\_s*ン\|ン\_s*\%([ゴグダ]\|ボ\_s*\%(ク\|ッ\_s*ク\)\|バ\_s*ル\_s*デ\_s*ィ\|ズ\_s*デ\_s*ー\_s*ル\|リ\_s*[ィー]\|ジ\_s*ン\|ド\_s*ン\)\|レ\_s*\%(ア\_s*ル\|ッ\_s*タ\|ー\_s*ヌ\|イ\_s*ン\|ン\_s*\%([ソス]\|ツ\_s*ォ\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\|Ｕ\_s*Ｎ\_s*Ａ\|ｕ\_s*\%(ｎ\_s*ａ\|ｃ\_s*\%(ｉ\_s*ｄ\|ｋ\_s*ｙ\)\)\|ｉ\_s*\%(ａ\_s*ｒ\|ｓ\_s*ｐ\|ｔ\_s*ｅ\)\|ｏ\_s*ｆ\_s*ｔ\|A\_s*Ｔ\_s*E\_s*Ｘ\|ａ\_s*\%(ｗ\_s*ｓ\_s*ｏ\_s*ｎ\|Ｔ\_s*ｅ\_s*Ｘ\|ｓ\_s*ｅ\_s*ｒ\_s*Ｗ\_s*ｒ\_s*ｉ\_s*ｔ\_s*ｅ\_s*ｒ\)\)\|L\_s*\%([DP]\|サ\_s*イ\_s*ズ\|L\_s*サ\_s*イ\_s*ズ\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*ラ\_s*イ\_s*ト\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|研\_s*究\_s*室\|エ\_s*ル\|リ\_s*\%([ィセズザサスダポルラリマナノンヌブアー]\|ャ\_s*マ\|ヤ\_s*ド\_s*ロ\|ヨ\_s*ン\|ゾ\_s*チ\_s*ー\_s*ム\|コ\_s*\%(リ\_s*ス\|ピ\_s*ン\)\|ク\_s*ー\_s*ド\|カ\_s*\%(ー\|オ\_s*ン\)\|ジ\_s*[ンー]\|デ\_s*[ィル]\|ド\_s*カ\_s*イ\_s*ン\|プ\_s*ト\_s*ン\|パ\_s*ー\_s*ゼ\|グ\_s*\%(ニ\_s*ン\|ナ\_s*ン\)\|フ\_s*\%([エト]\|タ\_s*ー\|テ\_s*ィ\_s*ン\_s*グ\)\|テ\_s*ラ\_s*[ルシ]\|チ\_s*ウ\_s*ム\|ソ\_s*\%(ソ\_s*ー\_s*ム\|グ\_s*ラ\_s*フ\_s*ィ\)\|タ\_s*ー\|ト\_s*\%([レル]\|マ\_s*ス\|ア\_s*ニ\_s*ア\|グ\_s*ラ\_s*フ\|バ\_s*ル\_s*ス\_s*キ\_s*ー\)\|オ\_s*\%(タ\_s*ー\_s*ル\|ネ\_s*ル\)\|ミ\_s*\%(テ\_s*ッ\_s*ド\|ッ\_s*[タト]\)\|モ\_s*\%(ー\_s*ジ\_s*ュ\|ネ\_s*ン\|ン\_s*チ\_s*ェ\_s*ッ\_s*ロ\)\|ム\_s*ジ\_s*ン\|キ\_s*\%(ッ\_s*ド\|ュ\_s*ー\_s*ル\|テ\_s*ン\_s*\%(ス\_s*タ\_s*イ\_s*ン\|シ\_s*ュ\_s*タ\_s*イ\_s*ン\)\)\|エ\_s*\%(ゾ\_s*ン\|ー\_s*ジ\_s*ュ\)\|ヒ\_s*テ\_s*ン\_s*シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ネ\_s*\%([アン]\|ッ\_s*ト\|ー\_s*ジ\_s*ュ\)\|ニ\_s*ア\|ベ\_s*\%([ロラ]\|リ\_s*ア\|レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ル\_s*テ\)\|ビ\_s*\%([アー]\|ド\_s*ー\|ン\_s*グ\)\|ュ\_s*\%([スー]\|ブ\_s*リ\_s*ャ\_s*ー\_s*ナ\|リ\_s*ュ\|ド\_s*ミ\_s*ラ\|ク\_s*サ\_s*ン\_s*ブ\_s*ー\_s*ル\|ッ\_s*ク\|シ\_s*ア\_s*ン\|ミ\_s*エ\_s*ー\_s*ル\)\|ロ\_s*\%(イ\|ン\_s*グ\_s*ウ\_s*ェ\)\|ヴ\_s*\%(ィ\_s*ン\_s*グ\_s*ス\_s*ト\_s*ン\|ァ\_s*\%(プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\)\|バ\_s*\%(テ\_s*ィ\|タ\_s*リ\_s*ア\_s*\%(ン\|ニ\_s*ズ\_s*ム\)\|プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\|ッ\_s*\%([ドピプタクチト]\|ス\_s*ン\)\)\)',
-      \ 'm' : '\%([ﾓ脆醪師諸催靄舫腿銛杜森聞捫匁紋問翫玩擡齎靠凭鵙鴃縺悶樅籾椛楓蛻潛濳艾潜殯黐餠用糯餅桃者懶專専物尤勿畚戻許悖故旧下乖求礎素基本元綟捩文默沐杢黙耗檬网莽芒罔耄朦魍艨濛曚矇亡蒙毛孟猛網糢保若望揉燃洩貰藻漏以模母裳楙姆摸茂持喪もﾒ麪緜眄緬麺門棉綿面蓍珎珍♀娶貭粧妾牝瞽盲娚暈繞萌慈惠恵萠暝謎溟滅姪瞑盟酩銘鳴瑪賞睨奴雌芽碼召女減めﾑ羣榁室簇邨屯連邑叢村紫梅葎宜憤毳槿葮椋酬報尨骸躯旨難睦酷麥麦対邀百迎昔空虚鞅宗棟胸掬娘結笞鞭徒蠧蝕蠹蟲蓆寧筵席莚虫毟貉狢豸貪聟壻婿霧向无無謀武鵡夢群牟梦六剥毋噎蒸咽務矛むﾐ渠霙溝妊澪薨岑嶺峰峯亂紊淫婬濫妄猥乱※＊◇■簔穣簑蓑醜儖慘短惨幹研耳壥廛店操陵鶚崎岬巫尊詔勅敕＞」砌汀頻→』】右翠碧緑認幣蹊径倫導途通路道瞠鬟髻湖自蹼蛟瑞癸禊晦漲源鏖港湊南瞶櫁謐水調貢密甕帝蜜覩幸脉脈韭韮竓粍瓱榠螟茗名妙命冥都宮罠閔皆眠明民看彌稔靡觀盈診箕三観美充深壬實視御魅味巳己身弥みﾏ毬鞠紕蝮麿転稀賓客檀繭黛眉巡囘周防衞衛護守荳菽豆．・。°◯圓槫゜）（丸謾鰻縵鬘懣幡幔蹣蔓瞞卍饅漫滿慢迄笆貧幻瞼蔟疎眩回廻儲申設招繚統纒的蟶孫弯彎籬擬免猿純亮信実委罷圸壗侭飯儘継随髷任蒭芻耙紛鮪見猯塗斈學眦眥眼俎愛学斑斗枡鱒桝舛升萬蠱呪薪槙槇牧窗悗惑円窓襠甼区街町前複亦俣叉跨全瞬木胯股又鍖枕膜幕瑁詣参參妹眛哩迷枚米賄賂埋昧邁毎沫抹奉靺枩秣祀纏祭睫末大太秀勝柾弄優成盛將松匡鉞賢希将誠昌征政正雅仁媽散茉馬在増混交間放摩負枉益敗眞待未麼撒巻魔蒔俟坐嘛舞捲目磨痲先墹真満播万曲卷雑まｍ光月♪♭♯ム¬⌒÷⊃≠∫∠±⊇⇔∃∇√∧≒∩∬∋∝≦∵Δ⇒∞⊂⊆⊥∀≫∴×∨≧≪≡∂∈∽∪♂曼麻●◎○〇モ〒′−マ最ミメМΜμm]\|ｯ\_s*[ﾓﾒﾑﾐﾏ]\|ッ\_s*[モメムミマ]\|っ\_s*[もめむみま]\|双\_s*\%([手墨親]\|向\_s*き\|差\_s*し\)\|蜀\_s*黍\|唐\_s*土\_s*\%(書\|文\_s*字\)\|両\_s*\%([角親刃]\|差\_s*し\)\|楊\_s*梅\_s*皮\|主\_s*水\|旺\_s*角\|紅\_s*[絹染葉]\|強\_s*請\|虎\_s*落\|痘\_s*瘡\|莫\_s*斯\_s*科\|固\_s*よ\_s*り\|一\_s*徳\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|惘\_s*然\|乙\_s*張\|赤\_s*目\_s*魚\|針\_s*孔\|妻\_s*[君合沼]\|墨\_s*西\_s*哥\|鍍\_s*金\|繍\_s*眼\_s*児\|夫\_s*婦\|乳\_s*母\|布\_s*の\_s*子\|没\_s*\%([薬後入却有]\|義\_s*道\|食\_s*子\)\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|浮\_s*腫\|６\_s*日\|6\_s*日\|崇\_s*田\|刀\_s*背\|襁\_s*褓\|零\_s*余\_s*子\|蜈\_s*蚣\|産\_s*霊\|息\_s*子\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|蚯\_s*蚓\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|山\_s*陵\|雎\_s*鳩\|親\_s*王\|嬰\_s*児\|亨\_s*治\|陸\_s*奥\|皇\_s*[子女國]\|3\_s*[つ日]\|３\_s*[つ日]\|角\_s*[鴟髪子]\|七\_s*寸\|鳩\_s*尾\|鷦\_s*鷯\|孤\_s*児\|凝\_s*視\|兎\_s*唇\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|神\_s*[子輿酒]\|苗\_s*字\|海\_s*[雲蘊布藻蜂松山]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|土\_s*[龍竜産]\|京\_s*都\|横\_s*浜\_s*マ\_s*リ\_s*ノ\_s*ス\|肉\_s*刺\|忠\_s*実\|翻\_s*\%(筋\_s*斗\|車\_s*魚\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|不\_s*\%(味\|見\_s*[点転]\)\|兇\_s*々\|凶\_s*鳥\|澗\_s*潟\|勾\_s*玉\|禍\_s*[々禍事言]\|況\_s*し\|澳\_s*門\|苧\_s*麻\|茅\_s*台\_s*酒\|丈\_s*夫\|倍\_s*達\|微\_s*[塵妙睡]\|燐\_s*寸\|驀\_s*地\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|豫\_s*て\|陪\_s*臣\|売\_s*僧\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|理\_s*[之元]\|允\_s*彦\|祐\_s*史\|晶\_s*子\|公\_s*[美則輝]\|斉\_s*加\_s*年\|方\_s*夫\|多\_s*言\_s*語\_s*化\|ニ\_s*ー\_s*モ\_s*ニ\_s*ッ\_s*ク\|単\_s*量\_s*体\|会\_s*議\|和\_s*布\_s*[刈蕪]\|中\_s*間\_s*子\|薄\_s*荷\_s*脳\|行\_s*[幸列]\|写\_s*像\|日\_s*\%(米\_s*相\_s*互\_s*防\_s*衛\_s*援\_s*助\_s*協\_s*定\|本\_s*製\)\|Ｍ\_s*\%(Ｈ\_s*ｚ\|サ\_s*イ\_s*ズ\|Ｓ\_s*−\_s*Ｄ\_s*Ｏ\_s*Ｓ\|Ｌ\_s*サ\_s*イ\_s*ズ\|ｒ\_s*．\|ｂ\_s*ｐ\_s*ｓ\|ｃ\_s*Ｃ\_s*ａ\_s*ｒ\_s*ｔ\_s*ｈ\_s*ｙ\|ｏ\_s*ｔ\_s*ｉ\_s*ｆ\|ａ\_s*ｃ\)\|計\_s*算\_s*機\|手\_s*紙\|ザ\_s*ッ\_s*ヘ\_s*ル\_s*＝\_s*マ\_s*ゾ\_s*ッ\_s*ホ\|嗜\_s*虐\_s*的\_s*趣\_s*味\|被\_s*虐\_s*\%(趣\_s*味\|淫\_s*乱\_s*症\)\|修\_s*士\|仮\_s*面\|移\_s*送\|M\_s*\%([dngtOo式]\|X\_s*テ\_s*レ\_s*ビ\|サ\_s*イ\_s*ズ\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*サ\_s*イ\_s*ズ\|P\_s*3\_s*プ\_s*レ\_s*\%(ー\_s*ヤ\_s*ー\|イ\_s*ヤ\_s*ー\)\|D\_s*\%(プ\_s*レ\_s*ー\_s*ヤ\_s*ー\|レ\_s*コ\_s*ー\_s*ダ\_s*ー\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*ア\_s*ド\_s*レ\_s*ス\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\|e\_s*d\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|エ\_s*ム\)',
-      \ 'n' : '\%([ﾝンんﾉ麕咒燧烽詛呪孔伯朔雅悳弼教糊典規矩憲範宜紀哲修惟允亘攵展順暢信則法後罵吭咽喉鑿蚤々湾宣曰覘臨稀望覗殘遺残鋸芒禾騰幟昇登上檐簷軒逸遁王瑙衲曩碯皇腦嚢膿能脳農除延熨廼退埜野飲載乘飮之伸嚥述乗呑−濃陳のﾈ塒姉濘檸嚀聹侫寧佞鼡鼠拗猫嫉妬希願捏熱労犒葱狙閨睡棔眠稔然棯懇拈撚燃念年涅粘値根捻嶺祢錬寝袮捩音練禰煉子寢ねﾇ絖垈饅帛幣鵺主蛻拭温布沼盜偸窃盗抽擢緯糠額濡脱怒縫抜奴拔貫塗ぬﾆ楡蒻潦鷄鶏瀑庭繞獰女尿韭薤眈睨韮姙刄儿蒜葫刃忍∀妊認任人乳擔蜷担濁賑握俄鳰臭匂沸錵贄僞偐贋偽柔靤如苦膠霓滲虹躙廿《》◎∬』『悪憎兄螺鰊鯡錦西入新肉‖岻逃児弐二邇２貳迩煮貮迯仁尼似荷2弍丹にﾅ靡抔嫐嬲鯆屶釶鉈泥薺詰若慨歎嘆抛毆擲撲殴慰治癒等猶直泪波邉辺邊鍋浪某棘棗懷懐夏擦梨情懶譌艶訛鉛鮠癜鯰韲鱠膾憖怠鈍腥捺凖擬准準謎洋涙宥傾灘詠霖眺痼存乍流轅永和梛椥渚長莫毋勿半・媒仲中７斜七蔑乃尚内繩畷縄苗滑鞣惱悩就哉也斉形業徳娚垂喃∵楠尓爾汝男軟難何倣枹均柞双肄列⊃⇒→楢習竝茄啾納無那拿舐娜做涕投馴南熟並儺生凪鳴為綯奈嘗哭嚶爲狎薙萎菜魚慣泣亡失痿撫啼な┘┛│┃┨┫┤┥├┝┣┠┼╋╂┿成＃∋∇名┗└ｎ日≒ニネ¬〜≠ナヌノΝНнνn]\|帳\_s*面\|狼\_s*[烟煙]\|惚\_s*気\|暖\_s*[簾気]\|礼\_s*江\|功\_s*晶\|祈\_s*子\|訓\_s*子\|賀\_s*子\|式\_s*部\_s*省\|記\_s*代\|倫\_s*[明子宗]\|敬\_s*之\|賭\_s*弓\|誠\_s*也\|敦\_s*子\|悦\_s*旦\|祝\_s*[女詞]\|仰\_s*け\_s*反\|盧\_s*泰\_s*愚\|逆\_s*上\|凌\_s*霄\_s*花\|姐\_s*さ\_s*ん\|杜\_s*松\|強\_s*請\|合\_s*歓\|微\_s*温\|零\_s*余\_s*子\|酸\_s*漿\|鐃\_s*鉢\|鰾\_s*膠\|I\_s*I\_s*部\|耳\_s*根\|面\_s*皰\| \_s*2\_s* \_s*次\_s*曲\_s*面\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|莞\_s*爾\|P\_s*b\|L\_s*e\_s*a\_s*d\|海\_s*[苔鼠]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|雪\_s*崩\|竹\_s*節\_s*虫\|7\_s*[日個]\|地\_s*震\|行\_s*[木方]\|大\_s*\%(蒜\|理\_s*石\)\|蛞\_s*蝓\|弱\_s*竹\|追\_s*儺\|済\_s*\%(し\_s*崩\|り\_s*物\)\|可\_s*成\|平\_s*城\|不\_s*成\|空\_s*リ\_s*ス\_s*ト\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|紐\_s*育\|フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|ヤ\_s*ー\_s*ノ\_s*ッ\_s*シ\_s*ュ\_s*・\_s*フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|オ\_s*ラ\_s*ン\_s*ダ\|ア\_s*メ\_s*リ\_s*カ\_s*ネ\_s*ッ\_s*ト\_s*ワ\_s*ー\_s*ク\|番\_s*号\|節\_s*点\|Ｎ\_s*\%([点Ｏ]\|ク\_s*ィ\_s*ー\_s*ン\|\.\_s*Ｙ\_s*\.\|ｉ\_s*ｆ\_s*ｔ\_s*ｙ\|Ｉ\_s*Ｆ\_s*Ｔ\_s*Ｙ\|ａ\_s*\%(ｖ\_s*ｉ\|ｔ\_s*ｕ\_s*ｒ\_s*ｅ\)\|ｅ\_s*\%(Ｘ\_s*Ｔ\|ｍ\_s*ａ\_s*ｃ\_s*ｓ\|ｗ\_s*−\_s*Ｊ\_s*ｅ\_s*ｒ\_s*ｓ\_s*ｅ\_s*ｙ\|Ｗ\_s*Ｓ\|ｕ\_s*ｒ\_s*ａ\_s*ｌ\)\|Ｅ\_s*\%(ｍ\_s*ａ\_s*ｃ\_s*ｓ\|Ｔ\_s*ｔ\_s*ａ\_s*ｌ\_s*ｋ\)\|ｏ\_s*\%(．\|ё\_s*ｌ\)\)\|夜\_s*想\_s*曲\|諾\_s*威\|正\_s*常\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*ワ\_s*ー\_s*ド\|H\_s*K\_s*\%(ホ\_s*ー\_s*ル\|ラ\_s*ジ\_s*オ\)\|T\_s*T\|Y\_s*ダ\_s*ウ\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|窒\_s*素\|エ\_s*ヌ\)',
-      \ 'o' : '\%([ｵ俺游泳指妖在畢檻澱氈拇親愚疎颪卸念錘惟慮赴徐趣俤羈主想表重面隱瘟園Å怨♀妾温恩鈍悍臣覺溺朦朧思覚榲現朮桶踴威嚇戯縅棘駭愕驚躍踊傲奢驕嚴厳遣痴瘧怒行怠蒹補荻獺懼惧怐虞畏恐襲甥笈及綬葹仝ヾ〃ゝヽゞ々同唖繦襁鴦鴛教几忍筬收兎抑稚長幼治理収修遲檍納後遅賻饋諡贈送憶袵臆拜拝冒犯岳崗峻阜侵奇陵女陸丘岡欄斧自己各戦鬼衰劣囮頤訪貶乙♂漢音弟阿脅怯首夥誘屋膃億穩穏煽煕熈燠熾諚掟興隠沖毆姶澳秧浤凰徃枉罌殃翁鴬泓奧嚶墺悒泱閘瓮襖蓊惶鸚懊媼嫗鴎怏鏖謳旺凹鴨櫻欒樗楝殴朷甌汪横往鞅歐嘔陷陥遠奄蓋夛応果應掩蔽概欧公邑麋薤被仰扇皇狼弁鵬鴻鳳黄奥多衽覆粱凡鰲頁王居央郎措擱堕尾置麻朗怖悪追帶折塢負墜織老汚生勇小嗚夫惜起唹落男推将穂壓淤御緒墮逐下牡捺雄降桜押圧苧帯於終乎おｏ大◎∞和∝♪∨∪開оОο○ωΟオΩo]\|濠\_s*太\_s*剌\_s*利\|父\_s*[娘子]\|母\_s*[子娘屋]\|万\_s*年\_s*青\|本\_s*懸\_s*魚\|玩\_s*具\|沢\_s*瀉\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|厭\_s*離\|乳\_s*母\_s*日\_s*傘\|陰\_s*[陽地]\|飲\_s*[食酒]\|慍\_s*色\|婦\_s*系\_s*図\|手\_s*術\|螻\_s*蛄\|十\_s*八\_s*番\|鉄\_s*漿\|海\_s*髪\_s*海\_s*苔\|虎\_s*魚\|花\_s*魁\|美\_s*味\|含\_s*羞\_s*草\|白\_s*粉\|渡\_s*島\|通\_s*事\|訳\_s*語\|晩\_s*[稲生]\|可\_s*笑\|惡\_s*寒\|傍\_s*[目惚見]\|叔\_s*[父母]\|伯\_s*[父母]\|姨\_s*捨\|少\_s*女\|侠\_s*気\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|霊\_s*屋\|蝌\_s*蚪\|飫\_s*肥\|佩\_s*物\|良\_s*人\|纓\_s*田\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|鷹\_s*揚\|椀\_s*飯\_s*振\_s*\%(舞\|る\_s*舞\)\|相\_s*知\|鶯\_s*語\|近\_s*江\|零\_s*落\|越\_s*[生訴知智度]\|彼\_s*方\|祖\_s*[神父母]\|車\_s*前\|従\_s*祖\_s*[母父]\|青\_s*[梅海木]\|太\_s*\%(田\|安\_s*万\_s*侶\|上\_s*天\_s*皇\)\|巨\_s*頭\|逢\_s*[魔瀬隈坂]\|そ\_s*の\_s*他\|承\_s*知\_s*し\_s*ま\_s*し\_s*た\_s*\.\|烏\_s*[滸龍]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|立\_s*石\_s*電\_s*機\|職\_s*業\|楕\_s*円\|ウ\_s*\%(ィ\|ー\_s*\%(ズ\|ロ\_s*ン\)\|ロ\_s*ボ\_s*ロ\_s*ス\)\|出\_s*力\|ア\_s*\%(ワ\|ザ\_s*ー\|ウ\_s*\%([チト]\|タ\_s*ー\)\)\|基\_s*本\_s*ソ\_s*フ\_s*ト\_s*ウ\_s*ェ\_s*ア\|一\_s*\%(昨\_s*[年日]\|対\_s*一\)\|ワ\_s*ン\|ま\_s*た\_s*は\|論\_s*理\_s*和\|聖\_s*譚\_s*曲\|水\_s*中\_s*酸\_s*素\_s*破\_s*壊\_s*剤\|蛋\_s*白\_s*石\|最\_s*適\_s*化\|Ｏ\_s*\%([脚型]\|Ｒ\_s*Ｅ\|\.\_s*Ｋ\_s*\.\|Ｓ\_s*９\|リ\_s*ン\_s*グ\|ｐ\_s*ｅ\_s*ｎ\_s*\%(Ｌ\_s*ｏ\_s*ｏ\_s*ｋ\|Ｗ\_s*ｉ\_s*ｎ\_s*ｄ\_s*ｏ\_s*ｗ\_s*ｓ\)\)\|歌\_s*劇\|演\_s*算\_s*子\|操\_s*作\|酸\_s*素\|O\_s*\%([型脚sS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*ク\_s*リ\_s*ー\_s*ナ\_s*ー\|C\_s*R\_s*ソ\_s*フ\_s*ト\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|リ\_s*ン\_s*グ\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
-      \ 'p' : '\%([本磅椪烹砲法方報舖舗歩ぽ併閉閇蔽×遍編片邉篇辺邊屁ぺ幅服風分腐布符泌匹俵憑票品筒平日犯版搬幇板払腹發発走箱拍朴駮泊博愽包放配盃敗牌杯八破羽波播張ぱｐ鉛Ψψぴ±＋ぷΦφ├┣∝北┴‰．％£〒・点プポ頁）（∂¶‖ペパПΠп燐πピp]\|ｯ\_s*\%(ﾎ\_s*ﾟ\|ﾍ\_s*ﾟ\|ﾌ\_s*ﾟ\|ﾋ\_s*ﾟ\|ﾊ\_s*ﾟ\)\|ッ\_s*[ポペプピパ]\|っ\_s*[ぽぺぷぴぱ]\|ﾎ\_s*ﾟ\|先\_s*斗\_s*町\|ﾍ\_s*ﾟ\|祕\_s*[露魯]\|ﾌ\_s*ﾟ\|釜\_s*山\|普\_s*魯\_s*西\|ﾋ\_s*ﾟ\|皮\_s*蛋\|光\_s*一\|ﾊ\_s*ﾟ\|麺\_s*麭\|巴\_s*\%(里\|奈\_s*馬\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|排\_s*骨\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|白\_s*[板酒金]\|シ\_s*\%(ュ\_s*ー\_s*ド\|ロ\_s*シ\_s*ビ\_s*ン\)\|サ\_s*\%(ー\_s*ム\|イ\_s*\%([ズクケコ]\|ロ\_s*シ\_s*ビ\_s*ン\|リ\_s*ウ\_s*ム\|キ\_s*ッ\_s*ク\)\)\|+\_s*α\|ホ\_s*\%(ン\|ス\_s*ゲ\_s*ン\)\|ヒ\_s*ロ\_s*ポ\_s*ン\|比\_s*\%(布\|律\_s*賓\)\|フ\_s*\%(リ\_s*ジ\_s*ア\_s*ン\|レ\_s*\%(イ\_s*ジ\_s*ン\_s*グ\|ー\_s*\%(ズ\|ジ\_s*ン\_s*グ\)\)\|タ\_s*レ\_s*イ\_s*ン\|ォ\_s*\%([ーンノト]\|ボ\_s*ス\|ビ\_s*ア\|ス\_s*フ\_s*ァ\_s*ー\|ニ\_s*ー\)\|ァ\_s*\%(イ\|ラ\_s*オ\|ー\_s*\%([ジマ]\|ミ\_s*ン\_s*グ\)\|ン\_s*\%(ト\_s*ム\|タ\_s*ズ\_s*[ムマ]\)\|ル\_s*[ツス]\|レ\_s*ノ\_s*プ\_s*シ\_s*ス\)\|ィ\_s*\%([ロル]\|ジ\_s*\%(ッ\_s*ク\_s*ス\|カ\_s*ル\)\|ー\_s*ビ\_s*ー\|ッ\_s*シ\_s*ン\_s*グ\|レ\_s*モ\_s*ン\|ラ\_s*デ\_s*ル\_s*フ\_s*ィ\_s*ア\|リ\_s*\%([スーアパ]\|ッ\_s*[プパ]\|ピ\_s*\%(ン\|ー\_s*ヌ\)\)\)\|ェ\_s*\%(ー\_s*\%([ベズ]\|ジ\_s*ン\_s*グ\)\|イ\_s*ズ\|ロ\_s*モ\_s*ン\|ニ\_s*\%(ル\|ッ\_s*ク\_s*ス\|キ\_s*ア\|ー\_s*ル\)\|ノ\_s*\%(キ\_s*シ\|ー\_s*ル\)\)\)\|述\_s*語\|証\_s*明\|タ\_s*ン\_s*パ\_s*ク\_s*質\|処\_s*理\|手\_s*続\_s*き\|進\_s*行\|算\_s*譜\|利\_s*潤\|南\_s*瓜\|宣\_s*伝\|公\_s*告\|真\_s*珠\|Ｐ\_s*\%(波\|Ｌ\_s*法\|Ｃ\_s*\%(／\_s*Ａ\_s*Ｔ\|９\_s*８\|モ\_s*デ\_s*ル\)\|ｏ\_s*ｓ\_s*ｔ\_s*Ｓ\_s*ｃ\_s*ｒ\_s*ｉ\_s*ｐ\_s*ｔ\|Ｓ\_s*．\|．\_s*Ｓ\_s*．\|ｉ\_s*ｔ\_s*Ｉ\_s*ｎ\_s*ｎ\|ｒ\_s*ｏ\_s*\%(ｌ\_s*ｏ\_s*ｇ\|ｔ\_s*ｅ\_s*ｏ\_s*ｎ\)\|ｅ\_s*ｒ\_s*\%(ｌ\|ｉ\_s*ｏ\_s*ｄ\)\)\|永\_s*続\|カ\_s*リ\_s*ウ\_s*ム\|葡\_s*萄\_s*牙\|重\_s*合\_s*体\|多\_s*相\_s*型\|バ\_s*テ\_s*レ\_s*ン\|貼\_s*り\_s*付\_s*け\|論\_s*文\|偏\_s*執\_s*[狂病]\|引\_s*数\|リ\_s*ン\|P\_s*\%([umdCaor]\|K\_s*戦\|D\_s*F\_s*フ\_s*ァ\_s*イ\_s*ル\|コ\_s*ー\_s*ド\|タ\_s*イ\_s*ル\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*・\_s*S\)\|I\_s*C\_s*マ\_s*イ\_s*コ\_s*ン\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*ボ\_s*ト\_s*ル\|O\_s*S\_s*\%(シ\_s*ス\_s*テ\_s*ム\|I\_s*X\|T\_s*メ\_s*ソ\_s*ッ\_s*ド\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\)',
-      \ 'q' : '\%([配椚橡檪櫪栩椡椪椢湫櫟含纐柵婚屎糞癖潛潜鵠裹凹窪馘括縊踵跟頚軛珞頸首諄鞋履窟寛狐轡覆靴沓碎砕管条降件頽崩屑葛釘莖茎陸杙株杭掘崛倔鶏鐃藥擽薬樟楠髪酒梳櫛串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖種Ξξ臭日茸菌楔草圀邦國国髭漱嗽吻嘴喙唇脣蛇梔腔φ劫刧　空粂裙勳熏皹桾皸醺下薫燻訓勲葷君委詳钁精企鍬加咥銜桑塊某暝晦峅競昏冥眛罔鮓較比闇位鞍藏暗倉廚厨涅々〃ゝヽゞ仝ヾ曇雲蜘栗狂包俥車曲廓郭梍枢踝畔鉄鐵★●■玄蔵黒拘食徠久孔桍窶暮焼懼駒柧苦朽区眩吁繰庫垢駆鉤紅呉倶駈汲宮枸劬矩煦驅口９瞿工悔供功吼怐喰玖貢九惧来來區組奇句狗鳩酌絎嶇躯衢屈刳ｸくｑ‘“’”♪ケ？ク¶q]\|ｯ\_s*ｸ\|ッ\_s*ク\|っ\_s*く\|姑\_s*娘\|箜\_s*篌\|救\_s*世\|莎\_s*草\|傀\_s*儡\|被\_s*下\_s*度\|百\_s*[濟済]\|果\_s*物\|恭\_s*敬\|9\_s*月\|長\_s*月\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|天\_s*鼠\_s*矢\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|山\_s*梔\_s*子\|崑\_s*央\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|c\_s*r\_s*e\_s*s\_s*c\|海\_s*月\|水\_s*[鶏母]\|内\_s*蔵\_s*助\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|公\_s*\%([家方卿界美事文]\|出\_s*挙\)\|佝\_s*僂\_s*病\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|胡\_s*桃\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ｑ\_s*＆\_s*Ａ\|珠\_s*穆\_s*朗\_s*瑪\|チ\_s*ョ\_s*モ\_s*ラ\_s*ン\_s*マ\|Q\_s*\%(I\_s*C\|R\_s*コ\_s*ー\_s*ド\|C\_s*サ\_s*ー\_s*ク\_s*ル\|U\_s*O\_s*カ\_s*ー\_s*ド\)\|『\_s*』\|コ\_s*\%(ー\_s*ラ\_s*ン\|ン\_s*テ\_s*ィ\_s*フ\_s*ァ\_s*イ\_s*ア\)\|問\_s*合\_s*せ\|カ\_s*\%(ザ\_s*ン\|タ\_s*ー\_s*ル\|ス\_s*バ\|ー\_s*ヌ\_s*ー\_s*ン\|ナ\_s*ー\_s*ト\|ダ\_s*フ\_s*ィ\|リ\_s*テ\|ド\_s*リ\_s*ー\_s*[ルユ]\|ル\_s*\%(チ\_s*[エェ]\|テ\_s*\%(ィ\_s*エ\|ッ\_s*ト\)\)\|ン\_s*タ\_s*[ムスン]\)\|質\_s*問\|キ\_s*\%(ト\|ブ\_s*ラ\|ホ\_s*ー\_s*テ\|ハ\_s*ー\_s*ダ\|ル\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\|ー\_s*ン\|ノ\_s*ン\|ッ\_s*シ\_s*ュ\|ュ\_s*\%(ー\|エ\_s*リ\)\)\)',
-      \ 'r' : '\%([ﾛ崘侖崙堽栄論漉祿轆碌肋勒麓禄鹿６録蘢滝潦榔簍柆鑞弄咾瑯焜朖螂螻樓隴哢實臈槞僂瓏勞薐琅朧壟撈臘郎瘻廊牢浪蝋癆聾楼篭籠狼漏朗蘆顱炉髏爐櫨蕗賂艪瀘臚枦輅鹵廬櫓轤鷺驢艫櫚滷ろﾚ洌鴒聆蛎糲綟儷蛉砺苓唳勵〇澪犁齡蠡囹齢黎羚戻禮祈隸茘麗隷玲伶癘励零冷例冽劣烈裂列癧轣檪櫪靂鬲瀝礫轢歴瀲鎌縺嗹漣鏈匳斂濂戀奩輦簾櫺∧聨憐恋蓮煉錬攣練聯廉連れﾙ♪路盧泪壘縲瘰誄涙羸塁累類鏤屡縷褸婁陋璢るﾘ犂篥葎率慄栗淕勠六戮陸律擽畧暦掠略鏐鉚窿餾畄旒瀏苙霤瑠嶐澑瘤嚠笠榴溜硫琉留立柳粒劉隆流痳鈴麟P懍躪藺鄰棆醂菻廩躙淪厘凜霖琳悋綸淋禀稟凛鱗倫吝隣林燐臨侶絽踉梠膂虜呂慮仂力緑裲鐐椋靈魎崚鬣嶺獵楞怜暸倆繆粮廖兩蓼鷯粱輌凉輛燎瞭聊陵令梁糧諒霊龍凌遼漁亮寮⇔涼繚撩綾療量竜菱僚領喨了稜寥両料閭旅離吏履裡璃理釐痢裏俐俚莅漓利驪李哩梨詈悧罹浬籬里莉りﾗΛλ亂儖攬覧臠覽瀾欒襴婪繿欖檻籃巒嬾纜襤懶爛藍鸞卵濫闌嵐欄乱蘭労剌溂老埓埒猟薤辣喇樂珞犖絡駱酪烙楽落洛徠蕾賚醴罍櫑擂儡耒籟莱磊癩來礼雷頼来們裸等鑼邏蘿拉螺騾良らｒ右→ТбуЖВоЙЗЪжзИУЯвяшфКСлЁХпОЦЭЧФЫЩъ魯Бы露ШйхМкПгдмцНЛёаиэетАГчЬюЕЮсьнщД輪根√羅ロ々ラルレリРρΡрr]\|ｯ\_s*[ﾛﾚﾙﾘﾗ]\|ッ\_s*[ロレルリラ]\|っ\_s*[ろれるりら]\|鱸\_s*魚\|芦\_s*[有花]\|濾\_s*[胞過紙]\|6\_s*[時月]\|水\_s*無\_s*月\|檸\_s*檬\|坩\_s*堝\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|鯉\_s*[魚城]\|二\_s*\%(索\|翻\_s*縛\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*ケ\_s*ー\_s*ブ\_s*ル\)\|海\_s*獺\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|関\_s*係\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\|数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|京\_s*都\_s*大\_s*学\_s*数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|東\_s*北\_s*大\_s*\%(学\_s*電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|通\_s*研\)\|限\_s*定\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|範\_s*囲\|規\_s*則\|紅\_s*玉\|要\_s*求\|検\_s*索\|復\_s*帰\|返\_s*[事信]\|拒\_s*否\|反\_s*射\_s*鏡\|参\_s*\%(考\_s*文\_s*献\|照\_s*型\)\|Ｒ\_s*\%(Ｉ\_s*Ｎ\_s*Ａ\|＆\_s*Ｄ\|Ｓ\_s*−\_s*２\_s*３\_s*２\_s*Ｃ\|ｕ\_s*ｍ\_s*ｂ\_s*ｌ\_s*ｅ\|ｅ\_s*ｎ\_s*ｏ\)\|機\_s*能\_s*回\_s*復\_s*訓\_s*練\|再\_s*帰\_s*的\|認\_s*識\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*リ\_s*ー\_s*ダ\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*睡\_s*眠\|T\_s*U\_s*R\_s*N\_s*キ\_s*ー\|A\_s*D\_s*M\_s*E\)\)\|正\_s*規\_s*表\_s*現\|ア\_s*ー\_s*ル\)',
-      \ 's' : '\%([ｿ似杣灌傍峙毓育具供備害底苑薗園儲酘貮埆妬埣讒譏詆誹謗濡外猝率喞熄仄息足促束測側燥偬雙帚艘箒諍滝嗽剏湊蔟赱鯵抓嫂贈樔屮壯愡葱澡瀧艚勦歃叟裝竈梍蚤甑搶笊窗薮奘崢槽筝菷弉輳爭掫竃譟箱髞嗾懆瘡孀窓踪匝噪遭艙爪糟莊倉淙曹匆怱繰宋漕簇槍躁鎗箏綜喪痩藻艸葬壮操掻掃奏蹌滄争草層創蒼叢僧走惣送叛乖抑諳某橇轌艝鱒邨巽噂拵忖蹲樽孫遜存尊損囎祚租酥措踈鼡阻詛礎疏疎其蘓齟胙副鼠噌反愬蔬沿祖塑姐訴爼逸組俎徂粗麁疽甦沮咀想そｾ芹鬩旃錢刋箭羶潛筌孅阡栫舩氈纎濺舛甎銛簽湶茜槧巛吮癬籤倩痊孱擶贍纖仟磚燹揃綫喘涎荐饌槫濳沾籖筅蟾牋苫專翦亘鐫僣韆箋僊殱殲闡釧賎餞羨顫甅竰糎¢陝踐銓閃潺遷銑栴川剪煽譫僉瞻践跣栓疝詮銭穿戰僭繊腺泉嬋擅淺鮮専潜扇蘚船浅線撰宣洗煎戦千忙伜倅逼蝉旋屑鱈薛椄絏洩卩泄紲攝緤褻浙竊℃窃拙摂接節楔關磧蓆晰威裼績蹐迹蹠跖跡瘠藉勣籍淅晢夕鶺潟碩惜析関席隻甥韲嘶菁瀞晟貰擠睛筬淒婿撕牲齏情萋穽躋掣腥逝惺旌蜻整靖誓制晴攻瀬急勢世競畆丗糶畝堰脊せｽ鯣鋭坐座李既已昴術辷全滑皇脛臑裾双英村選優営寸漱雪濯薦啌勸啜勧芒薄煤賺鼈捩筋頗亮丞甫輔佑祐介助蘇裔陶曽乃曾即則淳漁篶鑾凉漫硯雀涼鱸鮓鮨遊椙犁耒犂篦隙尽末眇縋管菅廢頽廃窘救掬尠寡粭糘菫速純鈴炭角墨隅】【鄒數陬雛芻菘嵩崇趨樞∃∵¬⌒∀÷≠Δ≫⇒∴×∨≧∫∠∇±≪∧∞≒⇔∩∂∈∬∋∝枢錘帥粹騅陲捶忰悴邃瘁翆萃榱隹誰醉遂膵燧彗綏錐穂炊翠⊥H吹粋推水酔睡棲統耡総漉饐住空寿籔醋簾棄直鋤巣栖剥磨梳擂澂掏總剃好過拗澄吸喫据壽透ｼ埀謐蘂蕋蕊痺褥茵鵐蔀鷸鴫霑入蔵嶌縞嶋島凋澀沫澁渋縛暫屡荵凌鎬忍簧慕舖↓襪健認啝随從从．舌扱罔虐Θθ秕粃椎椣卓尿貎肉臠猪榻黙蜆楙誠茂成繁重惻鋪陣頻閾櫁樒鹽汐潮瑟蛭疾櫛隲隰嫉蟋漆躾膝失室沒鎭沈滴雫賤鎮靜顰尓爾聢確併◇◆鹿貭叱征質卯滋撓科品鬼鍜錏錣痼凝而拉設萎栞襞吝咳爲什導怪汁験記徴著印○〇』銀城代『報調蝨濕湿七僕楚笞霜臀退斥尻冩寫舍者卸柘炙暹諜喋煮這謝鯱奢赦捨瀉妁鑠嚼抉蹟勺決釋皙爍昔斫蜥刳芍酌爵折癪笏赤灼綽石尺借赭写鷓積舎車斜釈社洙麈殳蛛娶株娵諏鬚侏繻銖卒槭蹙俶倏菽叔蓿粥戚肅淑夙粛縮取殊趣珠恤卆蟀出洲泅楸綉溲遒酬鷲駲楫緝嗅葺穐蹤繍螽讐甃萩楢逎讎鰍售岫收驟舅囚姑蓚鞦脩輯醜習羞酋聚舟秀祝袖啾拾蒐収執衆愁襲就臭蹴週終褶州宗椶棕守朱撞種修周手首狩須儁惷悛雋皴墫蕣順蠢舜旬竣峻駿逡筍春瞬俊蓁畛矧縉蔘鷏齔嗔忱譛袗譖娠疹哂脣簪怎晉鷆臻甄槙寢岑瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵辛薪晨辰震宸森眞愼伸慎寝晋身進深審親臣鍼心宍信神薯墅杵岨且藷黍苜渚砠狙嶼處胥蜍苴曙背塩緒枌雎蔗庶処所書暑奬簫浹橸舂艢廂陞炒鍬庠獎梢璋將厰邵摺淞訟樅筱燮橡餉愴韶誚峭甞姓敞聲懾稍嘗腫政顳枩慯殤秤湫礁井星廠剿妝霎蛸劭觴愀升鬆樵鷦嶂醤従慫逍倡竦爿墻牆薔笙樟装肖菖≦＜湘誦聳檣稱声裳）（蒋蕉嘯慴精霄鈔粧彰鏘悚蕭悄瀟哨焦憔匠鍾償瘴漿頌詔沼妾請衝唱薑庄渉奨娼床牀椒抄荘翔鉦宵傷踵銷召賞猩症昭燒猖昌少尚松晶憧紹捷象承證正笑将称焼照勝招章詳消鐘証硝掌省商昇昃禝稷寔矚謖餝稙軾嗇屬穡拭属燭贖色飾囑嘱織蝕式喰蜀殖諸初埴植食職笶姉徙誣氏思染飼祗時弑滲梔摯肢詩咨祉泗輜厶屍強貲若至師舐咫只紙施誌呰示締厮啻次賜熾趾駟漬笥贄此司如沚尸髭肆閉祀鷙諡枝篩豕滓巵始妛及弛絲浸閇斯翅緊帋揣伺為糸駛痣矢死敷恃茨旨沁嘴蚩試釶俟瓷觜廝緇祠梓址詞之使獅志歯紫雌姿柿諮占絞視嗣識子四恣阯侈幟卮凍史領竢市巳祇齒資謚耆覗脂芝痴粢孜錙耜齎自屎茲岐嗤砥仔しｻ杓寤雨鮫清鞘莢騷觸触鰆椹爽騒澤沢濬掠新攫杷渫浚更士桾申白素讚戔蒜驂芟鑚爨汕潸斬餐嶄纉攅慘粲蠶跚衫彡杉秋桑…≡簒纂鯢燦珊繖棧刪卅參鑽蚕算傘３贊▼▽3参賛O散惨産酸嘸摩遉樣彷碍妨様山漣蔑貶垂鮭叫仙寞鏥寥皺淋鯆生虱鯖捌偖扨偵宿禎貞定哘誘蝎蠍授皿祥桟匙簓障囁私篠支捧笹逧迫讃鐸蛹宛真尖碕嵜前崎魁峺遮哢囀候侍核実俚説了暁達逹哲諭慧敏叡聰訓知郷恵智聡悟理杆里小棹竿紮刹箚扎皐撮搜寒捜相主盛觚柧盞盃杯榮栄倒肴魚阪界堺境酒泝逆賢坂榊猿麾挟鷺拶撒擦颯先数察薩刷札晒霽濟纔釵綵切崔砦顋樶凄靫洒衰寨悽犲碎腮哉摧灑責偲殺縡淬倖豺呵苛幸猜塞蔡栽儕采齊財臍截載孥宰済齋犀際災柴賽菜採砕妻債斎斉祭催才細鰓裁歳最埼捉縒筴簀柞辟窄咋册齪筰槊酢嘖朔柵遡溯鑿索搾昨炸冊策錯櫻桜注曝瑳冴磋搓槎刺覺莎作挿嗟紗嵯覚做削冱寂叉荒茶渣左再早避咲査嵳褪挫佐然唆蹉鎖裂醒瑣嗄螫娑砂割蓑狭狹扠些差梭射銹沙下冷捺簑插点止提柤錆乍去裟詐さ√錫す／仕指製西　┓┐〆□■Шш上＃♯щЩ添∪日ｓ⊂⊆⊃⊇文静★＊☆標嗜青三聖土彩▲△悉署〜∽’‘┏┌集＼探§″性セサシソスΣсСσ秒s]\|ｯ\_s*[ｿｾｽｼｻ]\|ッ\_s*[ソセスシサ]\|っ\_s*[そせすしさ]\|遽\_s*走\|蕎\_s*麦\|内\_s*障\|彼\_s*杵\|諷\_s*歌\|幾\_s*許\|錚\_s*[錚々]\|十\_s*\%(路\|露\_s*盤\)\|冬\_s*青\|微\_s*風\|虚\_s*言\|宙\_s*組\|夫\_s*[夫々]\|返\_s*田\|傴\_s*僂\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|c\_s*e\_s*n\_s*t\_s*i\|妹\_s*尾\|嘲\_s*笑\|海\_s*象\|蒸\_s*[籠篭]\|魑\_s*魅\|凡\_s*て\|典\_s*侍\|季\_s*雄\|天\_s*[皇蛾]\|蘿\_s*蔔\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|夊\_s*繞\|隧\_s*道\|Ｃ\_s*\%(型\|言\_s*語\)\|老\_s*舗\|望\_s*潮\|飛\_s*沫\|L\_s*a\_s*\%(m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|桎\_s*梏\|柳\_s*葉\_s*魚\|衣\_s*魚\|蠹\_s*魚\|汚\_s*点\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|閑\_s*[谷か]\|云\_s*[々云]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|7\_s*月\|７\_s*月\|4\_s*月\|４\_s*[分月]\|羊\_s*[齒歯]\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|不\_s*[忍知]\|後\_s*\%([輪口志目]\|込\_s*み\)\|軍\_s*鶏\|香\_s*菜\|吃\_s*逆\|蝦\_s*蛄\|輸\_s*[出贏]\|隼\_s*[朗郎]\|笋\_s*[干羹]\|縦\_s*容\|睫\_s*毛\|翡\_s*翠\|東\_s*\%(雲\|海\_s*林\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|髑\_s*髏\|匣\_s*鉢\|復\_s*習\|百\_s*日\_s*紅\|胡\_s*孫\_s*眼\|←\_s*→\|霰\_s*弾\|弥\_s*生\|懺\_s*\%(法\|悔\_s*懺\_s*悔\)\|流\_s*[離石]\|蠑\_s*螺\|覇\_s*王\_s*樹\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|言\_s*語\|D\_s*店\|型\_s*肝\_s*炎\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|竹\_s*[篦刀筒]\|大\_s*角\_s*豆\|防\_s*人\|曩\_s*に\|向\_s*坂\|一\_s*昨\_s*\%(々\_s*[年日]\|昨\_s*[年日]\)\|實\_s*藤\|甘\_s*藷\|五\_s*月\|月\_s*代\|匂\_s*坂\|税\_s*所\|雑\_s*賀\|骰\_s*子\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|瑞\_s*[典西]\|B\_s*\%(r\|シ\_s*ェ\_s*ル\)\|拡\_s*張\_s*子\|部\_s*分\|置\_s*換\|ア\_s*ン\_s*チ\_s*モ\_s*ン\|構\_s*造\_s*体\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|加\_s*\%(之\|虐\_s*\%(趣\_s*味\|淫\_s*乱\_s*症\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|珪\_s*素\|ケ\_s*イ\_s*素\|計\_s*測\_s*自\_s*動\_s*制\_s*御\_s*学\_s*会\|ネ\_s*ッ\_s*ト\_s*サ\_s*ー\_s*ビ\_s*ス\|ザ\_s*\%(ッ\_s*ク\|ク\_s*セ\_s*ン\|ビ\_s*ー\_s*ネ\|ウ\_s*バ\_s*ー\|ワ\_s*ー\_s*ク\_s*ラ\_s*ウ\_s*ト\|ム\_s*ザ\|ル\_s*ツ\|イ\_s*\%([ルン]\|ラ\_s*ー\|デ\_s*ル\)\|ー\_s*\%([ルラ]\|メ\_s*ン\)\)\|意\_s*味\|ゼ\_s*ミ\|ナ\_s*ト\_s*リ\_s*ウ\_s*ム\|ゾ\_s*\%(ル\|ン\_s*デ\|ー\_s*\%(ム\|リ\_s*ン\_s*ゲ\_s*ン\)\|フ\_s*ィ\_s*ー\)\|ジ\_s*\%(ム\|ー\_s*\%([グク]\|メ\_s*ン\_s*[スズ]\)\|グ\_s*ム\_s*ン\_s*ト\|ン\_s*\%(メ\_s*ル\|グ\_s*シ\_s*ュ\_s*ピ\_s*ー\_s*ル\|テ\_s*ー\_s*ゼ\)\)\|Ｓ\_s*\%([席式]\|サ\_s*イ\_s*ズ\|Ｓ\_s*サ\_s*イ\_s*ズ\|ｍ\_s*ａ\_s*ｌ\_s*ｌ\_s*ｔ\_s*ａ\_s*ｌ\_s*ｋ\|ｐ\_s*ａ\_s*ｉ\_s*ｎ\|ｃ\_s*ｏ\_s*ｔ\_s*ｃ\_s*ｈ\|Ｕ\_s*Ｎ\|ｕ\_s*\%(ｎ\|ｐ\_s*ｅ\_s*ｒ\_s*Ａ\_s*ｓ\_s*ｃ\_s*ｉ\_s*ｉ\)\|Ｉ\_s*Ｃ\_s*Ｐ\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|−\_s*ｅ\_s*ｘ\_s*ｐ\_s*ｒ\_s*ｅ\_s*ｓ\_s*ｓ\_s*ｉ\_s*ｏ\_s*ｎ\|Ｏ\_s*Ｎ\_s*Ｙ\_s* \_s*Ｎ\_s*Ｅ\_s*Ｗ\_s*Ｓ\|ｏ\_s*ｌ\_s*ａ\_s*ｒ\_s*ｉ\_s*ｓ\|ｙ\_s*ｓ\_s*Ｖ\)\|エ\_s*ス\|S\_s*\%([nrgmce式]\|G\_s*M\_s*L\|サ\_s*イ\_s*ズ\|S\_s*サ\_s*イ\_s*ズ\|F\_s*マ\_s*ガ\_s*ジ\_s*ン\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(プ\_s*レ\_s*イ\|ク\_s*ラ\_s*ブ\)\|P\_s*\%(レ\_s*コ\_s*ー\_s*ド\|A\_s*C\_s*E\_s*キ\_s*ー\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*キ\_s*ー\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\|硫\_s*黄\)',
-      \ 't' : '\%([ﾄ乕囚寅虎瀞侶靹舮供纜燭艫朋倶鞆讐讎輩伴共友巴惇沌團団暾丼飩遯燉遁豚禽鷄酉砦塞擒俘虜豐恍惚枢乏塒迚科咎篷笘攴苫鶏伽唱稱鄰隣朿棘刺整鎖處処所床享鴟鵄扉鳶嫁訥刻秋穐晨鴇鬨斎頓幄幃帷柮杤栃閼軣轟屆届咄吶凸駿祀世暁壽繁稔寿豊歳俊利敏年牘悳犢黷慝匿督徳涜∃得特儻釖盜沓納道宕嶝涛萄嶋鬧縢帑塘搨棠樋籘閙梼罩叨夲盪酘兜溏朸稻鞜荅鞳桶黨綯迯鬥擣礑櫂剳淌纛諮棹陦檮磴蘯橦抖榻嶌竇档潼吋鐙亠篤滕讀逗螳蟷稲■鼕幢滔掏當峠読饕疼淘濤籐董悼棟搭痘套＝豆燈桃韜統遠騰橈冬討祷骰藤灯島橙凍刀陶糖謄唐投答等桐鍍研鎔外採盗杜荼覩人摂脱屠賭蠧圖秉觧堵兔礪疾執蚪閇熔登畄砺解睹十菟砿溶獲渡留融泊蠹穫飛磨梳妬説録冨取問途莵汢戸図止翔兎跿富塗砥肚とﾃ瑛晃輝衒寺忝壥靦巓霑殄、鷏躔諂廛碾沾，鷆腆囀槙轉‥：．輾填甜奠顛纒癲恬殿纏展覘篆添梃輦咥垤餮屮銕鐡耋姪跌輟迭逖荻俶廸狄鏑糴笛覿擲迪滴轍的哲敵撤剔徹鐵鉄楴嚏幀鵜羝睇汀棣騁酲柢叮嚔酊掟遉觝釘詆渟眤碵弟碇剃蹄邸締梯悌訂程底偵遞廷逓牴抵呈艇鄭涕啼庭定低照弖てﾂ模幹劈聾辛列貫面汁液露冷錘舶紡系艷艶寉鉉絃橡劒釼剱劔劍剣弦蔓敦鶴幣兵鉗噤鶫償桓恆典恒常夙勉務努勤拙拐抓倹嬬撮詳審爪褄妻募角晦瞑螺円呟礫具粒辻辟罪捉把閊捕寮曹首阜丘元司官柄仕掴遣攫搏疲使窄莟蕾局壷壺坪綱繋壌蝪培霾戊己伝傳鐔翼翅鍔燕唾續約皷鼓続葛綴番栂槌縋弊費序潰終墜遂鎚椎追做殲捏殱繕傍旁創造作熟机佃蹲拒欟坏鴾槻月障砲裹躑榴謹慎愼恙筒包堤痛衝尾突尽支攣就次付椄漬點津附浸繼撞憑盡継嗣搗詰積接通告連つﾁ吃釁巷岐衢粽粡因杠契鵆児交腟帙膣些蟄N窒斉秩父捷矗筑築逐盟税力親邇誓迩近苣尖縮鏤塵趁碪珎鎭亭抻朕狆跛闖鴆砧椿枕鎮陳珍沈賃杖找摘茶嫡着豬儲杼潴紵竚瀦躇箸墸苧緒樗楮⊥躅陟猪捗稙飭敕勅著佻髫鼎迢膓萇脹樢吊漲趙鵈輙雕鬯聽廰窕楪挺輒齠悵塚疔糶澂廳蔦晁昶甼誂微凋帖掉停諜跳眺貼鐇澄提喋頭銚ー蝶暢帳丁牒重逃鳥張弔懲肇徴嘲兆釣聴彫潮町頂調貂庁腸超挑朝丶黜綢儔廚丑※惆肘籌寵鍮冢晝蟲胄冑紬稠酎紐鑄冲沖偸宙虫］｝｛［厨誅鋳紂仲註駐柱注衷籀昼抽中治池岻恥散躓置耻血値夊輊遲笞千稚黹馳家蜘禿穉地魑黐乳智癡致薙褫茅踟緻痴夂知遅ちﾀ便党屯架椽榱樽弛蕩膤鰔鱈盥戯俵袂保躊為樣様爲袒慱彖壇覃膽疸亶靼憺餤緞憚擔褝啗檀綻攤槫站酖殫毯猯潭鄲襌賺椴摶湍湯澹†‡蛋耽W旦痰啖坦眈反C歎嘆誕胆箪譚担淡鍛短單貪探単覊栲妙戲訊攜携尋訪比畴疇類民髱樂娯恃頼愉楽喩例譬滾激斃仆垰嵶殕倒嫋旅貍狸賛敲称讃蹈踏祟湛鬪斗戰闘戦彳佇叩疂疉疊畳箍鏨違互耕畊畉掌店棚到炭辿撻闥斬燵韃巽辰＋援佐扶相輔佑弼助襷髻椨誑胤種塔龍竜糺糜爛漂維伊是理禎直貞惟忠匡徒唯只窘嗜慥確胝鱆鮹凧蛸誥嶽哮茸英豪威毅猛笋筍酣雄健丈斌武靈彈珪承賚珠霊魂卵偶適環弾球玉丹謀莨束縱｜盾鬣奉楯蓼縦竪城質達館忽橘舘瀑薪滝瀧峪溪渓谿谷任尭宇亨臣集昂楼小剛恭岳洪喬嵩尚孚崇尊敬孝隆貴鷹竹篁簟寶財高寳宝但柝拆倬鈬濯魄擢擇柘戳啅鐸澤綰畜企啄磔匠巧択沢逞琢蓄度宅託卓謫托拓紿軆隶殆黛帶替靆抬體躰滯碓平駘擡逮腿当怠玳諦岱鯛對颱袋戴堆態頽苔滞待代帝貸隊褪胎帯体泰退大対矯食埀断炊闌佗長強焚岔給蛇夛足賜揉閉立發躱詫太経貯起薫耐溜絶発手它朶多他勃詑垂誰撓斷裁咤点汰建堪澑田截逹侘經たｔЦц〜天時×型火土→都吐東上噸瓲│┃台表第木スジ∴Θθザ正ツ¨転透▲△▼▽トチ・…試端タТ├┸┳┨┫┝┬〒┷τ┯┤┣┻Τテ┥┰т┠┴t]\|ｯ\_s*[ﾄﾃﾂﾁﾀ]\|ッ\_s*[トテツチタ]\|っ\_s*[とてつちた]\|門\_s*渡\_s*り\|薯\_s*蕷\|船\_s*尾\_s*座\|公\_s*[暁明]\|倫\_s*[子明]\|邑\_s*中\|蜻\_s*蛉\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|蜷\_s*局\|跡\_s*[絶切]\|蜥\_s*蜴\|舎\_s*人\|馴\_s*鹿\|野\_s*老\|瓊\_s*脂\|永\_s*[遠久]\|宿\_s*直\|朱\_s*鷺\|左\_s*見\_s*右\_s*見\|朽\_s*木\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|独\_s*鈷\|季\_s*[衣道栄]\|聡\_s*[明徳]\|祈\_s*年\_s*祭\|淑\_s*[夫子]\|洞\_s*爺\|光\_s*男\|晧\_s*史\|紅\_s*娘\|瓢\_s*虫\|F\_s*e\|I\_s*r\_s*o\_s*n\|劇\_s*村\|滌\_s*除\|２\_s*×\_s*４\|石\_s*\%(蕗\|竜\_s*子\)\|心\_s*[太算]\|自\_s*\%(摸\|模\_s*和\)\|氷\_s*柱\|倩\_s*々\|黴\_s*雨\|入\_s*梅\|梅\_s*雨\|再\_s*見\|備\_s*に\|悉\_s*に\|旋\_s*[風毛]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(日\|0\_s*日\)\|１\_s*\%(日\|０\_s*日\)\|朔\_s*日\|美\_s*人\_s*局\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|字\_s*\%(牌\|一\_s*色\)\|少\_s*と\|義\_s*父\|主\_s*[殿税]\|周\_s*夫\|睦\_s*子\|渠\_s*睦\_s*子\|萵\_s*苣\|身\_s*柱\|似\_s*指\|清\_s*\%(老\_s*頭\|一\_s*色\)\|青\_s*\%([幇島]\|梗\_s*菜\|椒\_s*肉\_s*絲\)\|全\_s*帯\|昌\_s*洙\|江\_s*蘇\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|焼\_s*豚\|叉\_s*焼\|察\_s*哈\_s*爾\|餃\_s*子\|雑\_s*砕\|炒\_s*[麺飯]\|北\_s*谷\|甘\_s*露\_s*子\|錯\_s*和\|総\_s*角\|一\_s*[日寸]\|植\_s*字\|金\_s*魚\_s*蝨\|魚\_s*[屋蝨]\|草\_s*石\_s*蚕\|春\_s*\%(麗\|宮\_s*坊\)\|九\_s*\%(十\_s*九\|連\_s*宝\_s*[燈灯]\)\|揺\_s*蕩\|容\_s*易\|白\_s*痴\|猶\_s*豫\|蜑\_s*民\|段\_s*銭\|蒲\_s*公\_s*英\|騨\_s*州\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|仮\_s*令\|打\_s*[擲坐]\|七\_s*\%(夕\|対\_s*子\)\|活\_s*計\|方\_s*便\|無\_s*料\|黄\_s*\%(昏\|蜀\_s*葵\)\|胼\_s*胝\|章\_s*魚\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|壮\_s*聡\|煙\_s*草\|殺\_s*陣\|賢\_s*明\|性\_s*質\|怱\_s*ち\|亢\_s*ぶ\|堂\_s*子\|学\_s*聡\|能\_s*[文之]\|内\_s*匠\|松\_s*明\|奈\_s*子\|幇\_s*間\|切\_s*符\|デ\_s*ィ\_s*ス\|３\_s*ｒ\_s*ｄ\|閾\_s*値\|ソ\_s*\%(ー\_s*[トンプ]\|ロ\_s*ー\)\|ヘ\_s*ー\_s*グ\|ゼ\_s*[インムア]\|セ\_s*\%(オ\|ル\_s*マ\|ロ\_s*\%(ン\|ニ\_s*ア\_s*ス\)\|ラ\_s*ピ\_s*\%(ー\|ス\_s*ト\)\)\|シ\_s*\%(ン\|ッ\_s*ク\|ス\_s*ル\|ア\_s*タ\_s*ー\|ソ\_s*ー\_s*ラ\_s*ス\|オ\_s*ド\_s*ア\|ー\_s*[フタ]\)\|サ\_s*\%([イム]\|ミ\_s*ン\_s*グ\|ウ\_s*ザ\_s*ン\_s*ド\|ラ\_s*ブ\_s*レ\_s*ッ\_s*ド\|ー\_s*\%([ドモ]\|テ\_s*ィ\|ス\_s*ト\_s*ン\|ズ\_s*デ\_s*[イーィ]\|マ\_s*ル\)\|ッ\_s*チ\_s*ャ\_s*ー\|ン\_s*\%(ク\|ダ\_s*ー\|キ\_s*ュ\_s*ー\)\|リ\_s*ド\_s*マ\_s*イ\_s*ド\)\|ポ\_s*リ\_s*ペ\_s*プ\_s*チ\_s*ド\|三\_s*\%(和\_s*土\|連\_s*文\_s*字\)\|\\\_s*T\_s*e\_s*X\|教\_s*科\_s*書\|文\_s*字\_s*列\|用\_s*語\|Ｔ\_s*\%([字ｉ]\|細\_s*胞\|Ｋ\_s*８\_s*０\|ゾ\_s*ー\_s*ン\|バ\_s*ッ\_s*ク\|シ\_s*ャ\_s*ツ\|Ｖ\_s*\%(ニ\_s*ュ\_s*ー\_s*ス\|ゲ\_s*ー\_s*ム\|ド\_s*ラ\_s*マ\|ア\_s*ニ\_s*メ\)\|Ｃ\_s*Ｐ\_s*／\_s*Ｉ\_s*Ｐ\|ａ\_s*ｇ\|ｒ\_s*ｕ\_s*ｅ\_s*Ｔ\_s*ｙ\_s*ｐ\_s*ｅ\|E\_s*Ｘ\|ｅ\_s*[Ｘｌ]\)\|T\_s*\%([bc字mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|ゾ\_s*ー\_s*ン\|X\_s*T\_s*フ\_s*ァ\_s*イ\_s*ル\|シ\_s*ャ\_s*ツ\|バ\_s*ッ\_s*ク\|V\_s*\%(ニ\_s*ュ\_s*ー\_s*ス\|ゲ\_s*ー\_s*ム\|ド\_s*ラ\_s*マ\|モ\_s*ニ\_s*タ\|ア\_s*ニ\_s*メ\|シ\_s*ョ\_s*ッ\_s*ピ\_s*ン\_s*グ\)\|C\_s*P\|コ\_s*ー\_s*ド\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*キ\_s*ー\)\|E\_s*L\)\|電\_s*\%([視話]\|気\_s*通\_s*信\_s*研\_s*究\_s*所\)\)',
-      \ 'u' : '\%([ｳ孳蛤礼敬恭洞鱗愛潤騒煩粳漆閏患慯悄騷恙愁呻楳梅嫐釉噂耘吽褞曇黄紜云繧慍薀蘊暈運錙怏麗羨卦憾怨恨占卜末嬉心裏浦糶瓜汝己畴畆畦疇畝踈疎宜諾奪姥腕莵兔驢鑿穿嗽魘唸促令項頷訴獺鷽嘯嘘蠕蠢動覘窺伺海台萼唱詠謌唄宴讌転詩謠謡謳疑歌葎鯏鴬鶯ヱゑゐヰ鶉疼堆踞蹲渦舂臼碓羅薄食筌槽朮肯凵魚巧茨廐廏厩鰻午甘秣孫餞馬旨冩遷寫蔚暎噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆雲氏上後喪艮丑潮牛裡鬱中欝袿梁家内禹憂埋挧撃雨打宇得植請鵜熟績嫗攴有夘受茹泛生討羽胡右紆傴盂饂承菟飢烏攵于射倦芋賣卯享搏失齲撲兎売産膿迂浮うｕ¨↑∪υウUуУΥu]\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蠎\_s*蛇\|蟒\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|楽\_s*官\|雅\_s*楽\_s*[頭寮]\|干\_s*莉\|維\_s*納\|太\_s*秦\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|イ\_s*ギ\_s*リ\_s*ス\|オ\_s*マ\_s*ル\|識\_s*別\_s*不\_s*能\|共\_s*\%(用\_s*体\|有\_s*体\)\|ア\_s*\%([スン]\|グ\_s*リ\_s*ー\|ー\_s*\%(シ\_s*ュ\_s*ラ\|ジ\_s*ェ\_s*ン\_s*ト\|バ\_s*ン\)\|ル\_s*テ\_s*ィ\_s*メ\_s*ッ\_s*ト\|ポ\_s*ン\|ッ\_s*\%(プ\|パ\_s*ー\|シ\_s*ャ\_s*ー\)\)\|単\_s*\%(位\|一\_s*化\)\|Ｕ\_s*\%(ボ\_s*ー\_s*ト\|タ\_s*ー\_s*ン\|ネ\_s*ッ\_s*ク\|Ｎ\_s*Ｉ\_s*Ｘ\_s*\%(フ\_s*ェ\_s*ア\_s*ー\|マ\_s*ガ\_s*ジ\_s*ン\)\)\|ユ\_s*\%([タニー]\|ト\_s*\%(リ\_s*ロ\|レ\_s*ヒ\_s*ト\)\|リ\_s*\%(ア\|シ\_s*ー\_s*ズ\)\|プ\_s*シ\_s*ロ\_s*ン\|ネ\_s*ス\_s*コ\|ナ\_s*\%(カ\_s*イ\_s*ト\|イ\_s*テ\_s*ッ\_s*ド\)\|ビ\_s*キ\_s*\%(タ\_s*ス\|ノ\_s*ン\)\)\)',
-      \ 'v' : '\%([ｖ：├値⊥版Вв↓∨ヴv]\|ｯ\_s*ｳ\_s*ﾞ\|ッ\_s*ヴ\|っ\_s*ヴ\|ｳ\_s*ﾞ\|チ\_s*ェ\_s*ロ\|ヰ\_s*タ\| \_s*ビ\_s*ク\_s*ト\_s*ー\_s*ル\|視\_s*覚\|仮\_s*想\|ニ\_s*ス\|変\_s*数\|恒\_s*真\|ワ\_s*\%(デ\_s*ィ\_s*ム\|ギ\_s*ナ\|ニ\_s*ス\|セ\_s*リ\_s*ン\|ク\_s*チ\_s*ン\|ル\_s*キ\_s*ュ\_s*ー\_s*レ\|レ\_s*リ\_s*ー\|ー\_s*ニ\_s*ャ\)\|Ｖ\_s*\%(ｃ\|ゾ\_s*ー\_s*ン\|サ\_s*イ\_s*ン\|ネ\_s*ッ\_s*ク\|ゴ\_s*ー\_s*ル\|シ\_s*ネ\|リ\_s*ー\_s*グ\|ｉ\_s*ｅ\_s*ｗ\|ａ\_s*ｌ\_s*ｕ\_s*ｅ\|ｏ\_s*ｌ\_s*ｋ\_s*ｌ\)\|語\_s*彙\|ボ\_s*\%(ス\_s*ト\_s*ー\_s*ク\|ン\_s*ゴ\_s*レ\|ル\_s*\%([ガボトタ]\|テ\_s*\%(ッ\_s*ク\_s*ス\|ー\_s*[ジル]\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ラ\_s*ン\_s*\%(チ\|テ\_s*ィ\_s*ア\|タ\_s*リ\_s*ー\)\|レ\_s*ー\|コ\_s*ー\_s*ダ\|ー\_s*\%([ントグ]\|ル\_s*ト\|ド\_s*ビ\_s*\%(ル\|リ\_s*ア\_s*ン\)\|パ\_s*ル\|ダ\_s*フ\_s*ォ\_s*ン\|カ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\|キ\_s*ャ\_s*ブ\_s*ラ\_s*リ\|イ\_s*\%([ドス]\|ジ\_s*ャ\_s*ー\|シ\_s*ン\_s*グ\)\)\|ヘ\_s*ッ\_s*ト\|冗\_s*長\_s*な\|垂\_s*直\|フ\_s*\%(ァ\_s*\%(ン\|ド\_s*ー\_s*ツ\)\|ォ\_s*\%(ン\|ル\_s*\%(ク\|カ\_s*ー\)\)\|ェ\_s*ル\_s*メ\_s*ー\_s*ル\)\|ウ\_s*\%(ラ\_s*\%(デ\_s*ィ\_s*ミ\_s*ー\_s*ル\|ジ\_s*\%(ミ\_s*ー\_s*ル\|ー\_s*ミ\_s*ル\|オ\_s*ス\_s*ト\_s*\%(ク\|ッ\_s*ク\)\)\)\|ィ\_s*\%(ン\_s*ナ\|ル\_s*ス\)\|ォ\_s*ッ\_s*カ\|イ\_s*\%(ル\_s*ス\|ン\_s*ナ\_s*ー\)\|ェ\_s*\%(ル\_s*ギ\_s*リ\_s*ウ\_s*ス\|ヌ\_s*ス\)\)\|ビ\_s*\%([アラブバスザ]\|ガ\_s*ー\|ハ\_s*ー\_s*ラ\|タ\_s*ミ\_s*ン\|レ\_s*\%(ッ\_s*ジ\|ロ\_s*イ\)\|ビ\_s*\%(ア\_s*ン\|ッ\_s*ド\)\|ッ\_s*\%(ク\|キ\_s*ー\)\|セ\_s*ン\_s*テ\|ク\_s*\%(タ\_s*ー\|ト\_s*\%(ル\|リ\_s*[ーア]\)\)\|シ\_s*\%(ャ\_s*ス\|ソ\_s*ワ\_s*ー\_s*ズ\)\|ン\_s*\%([チス]\|ソ\_s*ン\|テ\_s*ー\_s*ジ\|セ\_s*ン\_s*ト\)\|ネ\_s*\%(ガ\_s*ー\|グ\_s*レ\_s*ッ\_s*ト\)\|ニ\_s*\%([ール]\|リ\_s*デ\_s*ン\)\|ュ\_s*ー\|エ\_s*ン\_s*チ\_s*ャ\_s*ン\|ジ\_s*\%(ャ\|ッ\_s*ト\|タ\_s*ー\|ョ\_s*\%(ン\|ナ\_s*リ\_s*ー\)\|ュ\_s*ア\_s*\%(ル\|ラ\_s*イ\_s*\%(ズ\|ゼ\_s*ー\_s*シ\_s*ョ\_s*ン\)\)\)\|ダ\_s*ル\|デ\_s*オ\|ル\_s*\%(ゴ\|ヌ\_s*ー\_s*ブ\)\|オ\_s*ラ\|リ\_s*ジ\_s*ア\_s*ン\|ィ\_s*ー\_s*ナ\_s*ス\|ー\_s*\%(ボ\|ル\_s*ス\|ク\_s*ル\|ナ\_s*ス\)\)\|ベ\_s*\%([ガラン]\|ト\_s*ナ\_s*ム\|イ\_s*ダ\_s*ー\|ー\_s*\%(ル\|ダ\_s*ー\)\|テ\_s*ラ\_s*ン\|ッ\_s*セ\_s*ル\|ス\_s*\%([トタパ]\|ビ\_s*オ\)\|ク\_s*\%(タ\|ト\_s*ル\)\|ジ\_s*タ\_s*\%(ブ\_s*ル\|リ\_s*ア\_s*ン\)\|リ\_s*\%([ィー]\|フ\_s*ァ\_s*イ\|サ\_s*イ\_s*ン\)\|ロ\_s*\%(ナ\|シ\_s*テ\_s*ィ\|ー\_s*ナ\|ニ\_s*[カク]\)\|ル\_s*\%(デ\|ベ\_s*ッ\_s*ト\|ダ\_s*ン\|レ\_s*ー\_s*ヌ\|サ\_s*\%(ー\_s*チ\|イ\_s*ユ\)\|モ\_s*ッ\_s*ト\)\|ノ\_s*ム\|ニ\_s*[スヤア]\|ネ\_s*\%(シ\_s*ャ\_s*ン\|ツ\_s*ィ\_s*ア\|チ\_s*ア\|ズ\_s*エ\_s*ラ\)\)\|バ\_s*\%([ルン]\|イ\_s*\%([アブンオ]\|パ\_s*ー\|タ\_s*\%(ル\|リ\_s*テ\_s*ィ\)\|キ\_s*ン\_s*グ\|ザ\_s*ー\|シ\_s*ャ\)\|ッ\_s*ト\|チ\_s*カ\_s*ン\|ギ\_s*ナ\|ガ\_s*ボ\_s*ン\_s*ド\|ラ\_s*\%(ナ\_s*シ\|エ\_s*テ\_s*ィ\)\|サ\_s*ロ\|ス\_s*\%(コ\|ケ\_s*ス\)\|カ\_s*ン\_s*ス\|ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|キ\_s*ュ\_s*ー\_s*ム\|ウ\_s*チ\_s*ャ\_s*ー\|リ\_s*\%(ン\|エ\_s*ー\_s*シ\_s*ョ\_s*ン\|ュ\_s*ー\|ア\_s*\%(ブ\_s*ル\|ン\_s*ト\)\|ッ\_s*ド\|デ\_s*ー\_s*シ\_s*ョ\_s*ン\)\|ヌ\_s*ア\_s*ツ\|ニ\_s*\%(ラ\|ー\_s*ユ\)\|レ\_s*\%([ラー]\|ロ\_s*ン\|リ\_s*ー\|ン\_s*\%(シ\_s*ア\|チ\_s*ノ\|タ\_s*イ\_s*ン\)\)\|ー\_s*\%([ゴグ]\|チ\_s*ャ\_s*ル\|リ\_s*ト\_s*ゥ\_s*ー\_s*ド\|バ\_s*ル\|ボ\_s*ス\|ベ\_s*ナ\|テ\_s*ィ\_s*カ\_s*ル\|サ\_s*ス\|ジ\_s*\%(ン\|ニ\_s*ア\|ョ\_s*ン\)\|ノ\_s*ン\|ニ\_s*ア\|モ\_s*ン\_s*ト\|ミ\_s*\%(リ\_s*オ\_s*ン\|キ\_s*ュ\_s*ラ\_s*イ\_s*ト\)\)\|ナ\_s*\%(キ\_s*ュ\_s*ラ\_s*ー\|ジ\_s*ウ\_s*ム\)\)\|ブ\_s*\%(イ\|ラ\_s*\%(ド\|ッ\_s*ド\)\|ー\_s*ド\_s*ゥ\_s*ー\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|ゾ\_s*ー\_s*ン\|サ\_s*イ\_s*ン\|ネ\_s*ッ\_s*ク\|ゴ\_s*ー\_s*ル\|J\_s*E\_s*-\_s*β\|シ\_s*ネ\|リ\_s*ー\_s*グ\|I\_s*S\_s*A\_s*カ\_s*ー\_s*ド\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\)',
-      \ 'w' : '\%([ｦヲ女翁尾汚小惜男緒牡雄をｳ孳蛤礼敬恭洞鱗愛潤騒粳漆閏慯悄騷恙愁呻楳梅嫐釉噂耘吽褞曇紜云繧慍薀蘊暈運錙怏麗羨U卦憾怨恨占卜末嬉心裏浦糶瓜汝己υΥ畴畆畦疇畝踈疎宜諾奪姥莵兔驢鑿穿嗽魘唸促令項頷訴獺鷽嘯嘘蠕蠢動覘窺伺台萼唱詠謌唄宴讌転詩謠謡謳疑歌葎鯏鴬鶯ヱゑ鶉疼堆踞蹲渦舂臼碓羅薄食筌槽朮肯凵魚巧茨廐廏厩鰻午甘秣孫餞馬旨冩遷寫蔚暎噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆氏↑上後喪艮丑潮牛裡鬱中欝袿梁家内禹憂埋挧撃雨打宇得植請鵜熟績嫗攴有夘受茹泛生討胡右紆傴盂饂承菟飢烏攵于射倦芋賣卯享搏失齲撲兎売産膿迂浮うヰ居ゐﾜ叫喚÷惡悪原稿嗤妾蕨童藁鞋笑灣萬豌綰万弯彎椀雲腕碗湾横往黄皇羂罠纔毫微僅患煩術伎厄禍災態業技佗王鰐忘掖弁腋譯緜腸亙道渉航弥亘棉渡綿私薈隈賄淮脇矮猥歪轍海蟠儂∪觧解頒判訣別稚若或枠惑鷲和環吾杷啝湧我涌輪破分把萵詫訳羽沸倭割話侘琶わｗ幅水∧波ウワw]\|ｯ\_s*[ｦヱｳヰﾜ]\|ッ\_s*[ヲヱウヰワ]\|っ\_s*[をゑうゐわ]\|乎\_s*古\_s*止\_s*点\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蠎\_s*蛇\|蟒\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|楽\_s*官\|雅\_s*楽\_s*[頭寮]\|干\_s*莉\|維\_s*納\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|草\_s*鞋\|（\_s*笑\_s*）\|(\_s*笑\_s*)\|戦\_s*慄\|俳\_s*優\|勿\_s*忘\_s*草\|早\_s*[生稲]\|山\_s*葵\|戯\_s*奴\|度\_s*会\|Y\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|Ｙ\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|華\_s*盛\_s*頓\|裙\_s*蔕\_s*菜\|理\_s*[由解]\|公\_s*魚\|病\_s*葉\|大\_s*東\_s*亜\_s*戰\_s*爭\|太\_s*\%(秦\|平\_s*洋\_s*戦\_s*争\)\|歐\_s*州\_s*大\_s*戰\|第\_s*\%(二\_s*次\_s*世\_s*界\_s*大\_s*戦\|一\_s*次\_s*世\_s*界\_s*大\_s*戦\)\|ブ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ロ\_s*ン\_s*グ\|レ\_s*\%(ン\|イ\_s*ス\|ッ\_s*カ\_s*ー\|ス\_s*\%(ラ\_s*ー\|リ\_s*ン\_s*グ\)\)\|リ\_s*\%(ー\_s*ス\|ン\_s*ク\_s*ル\|ス\_s*ト\)\|書\_s*き\_s*込\_s*み\|ラ\_s*\%(ッ\_s*\%([プパ]\|ピ\_s*ン\_s*グ\)\|イ\_s*\%([タト]\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ボ\_s*ル\_s*フ\|フ\_s*\%([ムー]\|ァ\_s*イ\_s*ル\|ィ\_s*\%(ー\_s*ト\|ッ\_s*チ\)\)\|ホ\_s*\%(エ\_s*[イーア]\|ー\_s*ル\|イ\_s*\%(ー\_s*\%(ル\|ラ\_s*ー\)\|ッ\_s*\%(プ\|ス\_s*ル\|パ\_s*ー\|ト\_s*\%(ニ\_s*ー\|マ\_s*ン\)\)\)\|ワ\_s*\%(イ\|ッ\_s*[トツ]\)\)\|ベ\_s*ル\_s*ナ\_s*ー\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(ブ\_s*ラ\_s*ウ\_s*ザ\|マ\_s*ガ\_s*ジ\_s*ン\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(ペ\_s*ー\_s*ジ\|ラ\_s*ジ\_s*オ\|コ\_s*ミ\_s*ッ\_s*ク\|サ\_s*\%(イ\_s*ト\|ー\_s*\%(バ\|ビ\_s*ス\)\)\|ド\_s*ラ\_s*マ\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*フ\_s*ァ\_s*イ\_s*ル\)\|警\_s*告\|Ｗ\_s*\%(杯\|ｎ\_s*ｎ\|ｉ\_s*ｎ\_s*ｋ\|ａ\_s*ｒ\_s*ｅ\)\|バ\_s*ル\_s*タ\_s*ー\|ヴ\_s*\%(ュ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ォ\_s*ル\_s*フ\|ィ\_s*\%([ーム]\|ル\_s*\%(ム\|ヘ\_s*ル\_s*ム\)\)\|ェ\_s*\%(ン\_s*ダ\_s*ー\_s*ス\|ル\_s*ナ\_s*ー\|ー\_s*バ\_s*ー\|イ\_s*ユ\)\|ァ\_s*\%(イ\_s*[ンス]\|ー\_s*グ\_s*ナ\_s*ー\|ン\_s*ダ\|ル\_s*\%(タ\_s*ー\|キ\_s*ュ\_s*ー\_s*レ\)\)\)\|ダ\_s*ブ\_s*リ\_s*ュ\_s*ー\|タ\_s*ン\_s*グ\_s*ス\_s*テ\_s*ン\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-      \ 'x' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁｘхХΞ×ξx]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|シ\_s*ロ\_s*\%(ホ\_s*ン\|フ\_s*ォ\_s*ン\)\|Ｘ\_s*\%([軸線]\|デ\_s*[イー]\|ｖ\_s*ｉ\_s*ｅ\_s*ｗ\|Ｓ\_s*サ\_s*イ\_s*ズ\|Ｌ\_s*\%(ｉ\_s*ｓ\_s*ｐ\|サ\_s*イ\_s*ズ\)\|ウ\_s*ィ\_s*ン\_s*ド\_s*ウ\|端\_s*末\)\|X\_s*\%([軸線]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|デ\_s*[イー]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*サ\_s*イ\_s*ズ\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|サ\_s*イ\_s*ズ\)\|e\_s*n\_s*o\_s*n\)\|ジ\_s*オ\_s*ン\|ゼ\_s*\%(ビ\_s*ウ\_s*ス\|ロ\_s*\%(ッ\_s*ク\_s*ス\|グ\_s*ラ\_s*フ\_s*ィ\)\)\|ハ\_s*ビ\_s*エ\_s*ル\|ザ\_s*\%(ン\|ビ\_s*エ\_s*ル\)\|キ\_s*\%(シ\_s*\%(ロ\|レ\_s*ン\|リ\_s*ト\_s*ー\_s*ル\)\|セ\_s*ノ\_s*ン\|サ\_s*ン\_s*\%(チ\_s*ン\|タ\_s*ン\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|ク\_s*\%(シ\_s*ー\|ロ\_s*ス\_s*ポ\_s*ス\_s*ト\|セ\_s*\%(ナ\_s*キ\_s*ス\|ノ\_s*フ\_s*ォ\_s*ン\)\|ザ\_s*ヴ\_s*ィ\_s*エ\|サ\_s*\%(イ\|ン\_s*\%(ト\_s*ス\|チ\_s*ッ\_s*ペ\|テ\_s*ィ\_s*ッ\_s*ペ\)\)\|リ\_s*ス\_s*マ\_s*ス\)\|エ\_s*\%(ク\_s*ス\|ッ\_s*ク\_s*ス\)\)',
-      \ 'y' : '\%([ﾖ艾蒿蓬娵嫁齡齢據頼弱憙歓鎧万萬過便婚汚涎捩翊緘峪杙慾欲翌翼抑米比裝粧装澱淀縦誼祥葭悦宜克純圭禎葦慶禧美淑芳喜吉義瘍樣踴榕踊燿謠廱姚慂曄瀁瑶恙蓉遙怏雍痒珱陶孕漾昜暘甬幺癢泱癰窰慵穃鷹瓔煬邀遥拗擁瑤窯徭膺窈殀曜耀庸夭揚葉蛹腰羊熔杳沃壅様妖用溶佯謡陽洋嘉宵蘇蘓甦辟奸横豫代除譽歟喚預読誉蕷輿攀余縒呼避４世譱詠丗能予撚憑餘畭酔醉與飫舁四訓選与讀よﾕ潤赦弛緩聴岼閖梦努纈∴故濯檠穰豐豊倖志裄之幸雪趾梼讓譲牀縁紫浴床俑犹蚰酉莠邑攸黝熊尢蝣蕕猷悒囿佳尤佑〒右郵涌祐侑游猶湧融宥夕幽悠釉友雄憂有臾渝瘉愉征諭徃遊揺逾覦茹揄由蝓兪淘結輸諛搖揃弓楡瑜踰柚油喩汰腴ゆｲΗη賤鄙卑苟嫌妹湯藷芋夢艷鑪鈩彩鱗色鯆忽綺貸甍応答愈圦杁霪隱蚓寅氤酳胤飮韵尹茵贇蔭婬湮堙吋廴I音慇韻咽淫殞姻隕院允殷隠陰窟巌巖頌祝鰛鰮鰯岩磐鼾歪弑弋抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗印嘶鰍電引躄誘動忿≦鵤錨碇怒霆雷霹凧桴筏Ιι魚菴庵雖尿荊棘茨祈祷命猯豕古伍乙鎰鴪聿軼樹慈悼愴慯労格到至傷鼬頂戴徒致鈑痛板柞砂沙些聊潔諍烈功諫勳勲勇漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息指挑拠縷絲厭營営愛幼緒遑暇糸Ｉ弌壹肆莓苺櫟著市碑鐓礎甃臀弩石犧牲犠池溢佚壱1１燠鬻礇毓粥的戦戰軍幾郁一稲許否飯洟位違居姨猗斎偽噫逝医鑄痍委囲云圍ゐ挿炒彙要熨饐醫言矮往詒威懿入如僞忌彜煎逶緯韋唯莞淹胃善生恚彝惟以活蔚為猪衣倚幃斐移鮪将可偉畏五夷李渭怡貽癒依逸井慰行伊爲胆射詑矣頤熬萎良凍出椅率好揖肄痿鋳謂帷亥苡意維遺鰄異去堰容囗いﾔ稚稍飲鎗鑓槍孀寡鰥Я碼傭雇闇敗吝薮藪殕脂寄宿櫓軈軅簗梁S漸鋏刃灸和柔軟窶鱧奴僕萢優柳喧宅館舘輩族鏃龠檪≒譯籥鑰蜴繹藥葯扼益厄疫躍約役訳薬疚疾岾楊谺邪薯犲豺〈《》〉山壥邸廛豢養社鑢育廉寧尉裕恭泰易休保康安靖笶八熄演谷焼彌冶⇔也輻破辭埜痩野屋家病椰爺已矢燒⇒灼妬耶遣瘠哉罷夜殺止揶辞弥やｙеЕ円￥←↓↑→ёЁ━─ユヤヨЙυYイЫыйΥy]\|ｯ\_s*[ﾖﾕｲﾔ]\|ッ\_s*[ヨユイヤ]\|っ\_s*[よゆいや]\|欧\_s*羅\_s*巴\|歐\_s*羅\_s*巴\|尸\_s*童\|蹌\_s*踉\|蹣\_s*跚\|終\_s*夜\|4\_s*\%([項者つ日]\|番\_s*目\|種\_s*類\)\|他\_s*所\|仁\_s*史\|隆\_s*克\|尚\_s*武\|孝\_s*高\|悌\_s*也\|賀\_s*[子悟]\|彬\_s*伯\|栄\_s*伸\|宗\_s*生\|新\_s*生\|昌\_s*[美男]\|暢\_s*[子一]\|永\_s*沈\|８\_s*日\|8\_s*日\|黄\_s*泉\|左\_s*手\|百\_s*合\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|Ｕ\_s*\%(字\|タ\_s*ー\_s*ン\)\|鞦\_s*韆\|強\_s*請\|梅\_s*桃\|桜\_s*桃\|靫\_s*負\|宙\_s*美\|礼\_s*暁\|温\_s*\%(雄\|泉\_s*津\)\|長\_s*庚\|昨\_s*夜\|又\_s*木\|木\_s*綿\|E\_s*\%(u\|メ\_s*ー\_s*ル\)\|祖\_s*谷\|文\_s*身\|郎\_s*[女子]\|刺\_s*[青草]\|蕁\_s*麻\|U\_s*\%(字\|タ\_s*ー\_s*ン\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*[向青]\|況\_s*ん\_s*や\|所\_s*[以縁謂]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%([一桃蘭]\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|小\_s*魚\|鯨\_s*魚\|細\_s*小\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|気\_s*吹\|従\_s*[妹姉弟兄]\|公\_s*孫\_s*樹\|鴨\_s*脚\_s*樹\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|巫\_s*子\|神\_s*巫\|無\_s*花\_s*果\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|不\_s*[可如]\|守\_s*宮\|燕\_s*龍\_s*茶\|両\_s*班\|流\_s*鏑\_s*馬\|柵\_s*原\|箭\_s*[田内]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|自\_s*棄\|火\_s*傷\|徐\_s*ら\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|天\_s*蚕\|倭\_s*絵\|日\_s*本\_s*武\_s*尊\|大\_s*和\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|香\_s*具\_s*師\|玄\_s*孫\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|妥\_s*子\|寿\_s*[詞男]\|Ｙ\_s*\%([談軸]\|シ\_s*ャ\_s*ツ\)\|エ\_s*\%(ホ\_s*バ\|フ\_s*ゲ\_s*ニ\_s*ー\|レ\_s*ヴ\_s*ァ\_s*ン\|ニ\_s*セ\_s*イ\|ー\_s*ル\)\|ワ\_s*イ\)',
-      \ 'z' : '\%([空損存揃園薗底足束續屬∈∋賊続粟族俗属僧慥噌梍賍臟臧贓憎像臓贈象増造添初曾反沿曽ぞ譱然苒繕禪薇千蠕∀髯禅善漸冉前全關関蝉膳錢銭絶勢噬説筮贅脆税是攻責ぜ狡詰桷寸喘鮨附◆髓蘂膸蕋惴蕊隧隋隨瑞髄随豆廚圖付津頭酢厨好図逗鶴刷ず塩嶋縞島嶌橲衄衂宍竺舳忸軸舌祖喰食直凝日實昵印闍者鮭邪蛇麝搦着惹尺鉐雀寂若弱尻稔仭糂贐潯儘仞盡刄臣侭恁進訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敘恕耡汝莇杼茹敍蜍洳舒縟辱褥蓐溽所抒鋤徐序絮叙助釀淨疂絛繞壌諚孃瀞襄仍蟐拯疉讓聶驤生帖仗躡穰乘塲靜繩禳蕘壤遶星滌茸嬲疊如醤剩娘嬢錠静醸縄女尉饒丈成擾穣烝嫋丞場杖條条蒸貞状攘剰畳冗定浄乗情城上常譲濡得戍就嬬鷲竪讐讎懦愀咒聚隼詢徇笋凖盾楯筍篤蓴惇洵淳閏諄恂馴旬荀潤循醇巡遵順准殉純準襦誦需戌朮孰宿塾珠熟恤術述孺呪豎儒綬樹受授壽鞣狃澀揉廿拾縱中從糅从戎澁蹂神汁獸絨縦渋柔什充十獣従住銃重岻治除士染時怩至児冶璽只畤侍孳轜耳示次寿辭粫司二祀邇而慈峙爺以地塒珥迩痔死敷恃蒔磁瓷仁字尓焦膩柱似嗣子亊路史餌兒滋仕爾辞弍自茲持寺事知じ騒沢澤猿笊晒曝皿鮫山算参鏨慘竄懴殘塹巉懺嶄讒惨暫慚慙斬残実笹酒坂盛三崎嵜桜榴雜襍棹竿雑濟才西斉済劑戝剤材財罪在冴覚左咲挫藏裂醒坐蔵差冷座戯ざｚ→↑ЬьЪъ↓←Жжズゾ零〇〒ザジゼзζЗΖz]\|ｯ\_s*\%(ｿ\_s*ﾞ\|ｾ\_s*ﾞ\|ｽ\_s*ﾞ\|ｼ\_s*ﾞ\|ｻ\_s*ﾞ\)\|ッ\_s*[ゾゼズジザ]\|っ\_s*[ぞぜずじざ]\|ｿ\_s*ﾞ\|簇\_s*生\|双\_s*紙\|草\_s*[履紙子]\|ｾ\_s*ﾞ\|台\_s*詞\|０\_s*次\|発\_s*条\|撥\_s*条\|發\_s*条\|世\_s*阿\_s*弥\|ｽ\_s*ﾞ\|相\_s*撲\|木\_s*菟\|修\_s*法\|杜\_s*撰\|調\_s*所\|徒\_s*[罪刑]\|螟\_s*虫\|芋\_s*茎\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|ｼ\_s*ﾞ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|J\_s*\%(I\_s*S\_s*コ\_s*ー\_s*ド\|ポ\_s*ッ\_s*プ\|R\_s*東\_s*日\_s*本\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|著\_s*語\|杓\_s*子\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|Ｊ\_s*\%(リ\_s*ー\_s*グ\|ポ\_s*ッ\_s*プ\|Ｕ\_s*Ｎ\_s*Ｋ\_s*Ｏ\)\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｻ\_s*ﾞ\|搾\_s*菜\|蜊\_s*蛄\|粗\_s*目\|槧\_s*本\|散\_s*切\_s*り\|沙\_s*汰\|石\_s*榴\|柘\_s*榴\|細\_s*工\|亜\_s*鉛\|サ\_s*\%(モ\_s*ラ\|ン\_s*ポ\_s*ー\_s*ニ\_s*ャ\|ラ\_s*ゴ\_s*サ\)\|Z\_s*\%([r軸]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|ガ\_s*ン\_s*ダ\_s*ム\|バ\_s*ッ\_s*フ\_s*ァ\|I\_s*P\_s*フ\_s*ァ\_s*イ\_s*ル\)\|シ\_s*\%(タ\_s*ー\_s*ル\|オ\_s*\%(ン\|ニ\_s*\%(ス\_s*ト\|ズ\_s*ム\)\)\)\|Ｚ\_s*\%([旗軸]\|変\_s*換\|ｉ\_s*ｇ\_s*ｇ\_s*ｙ\)\|チ\_s*\%(ク\_s*ル\_s*ス\|ア\_s*ノ\_s*ー\_s*ゼ\|ュ\_s*ー\_s*リ\_s*\%(ヒ\|ッ\_s*ヒ\)\|ャ\_s*ル\_s*ダ\_s*ッ\_s*シ\_s*ュ\|ゴ\_s*イ\_s*ネ\_s*ル\_s*ワ\_s*イ\_s*ゼ\_s*ン\)\|ツ\_s*\%(ァ\_s*\%(ラ\_s*ト\_s*ゥ\_s*ス\_s*ト\_s*ラ\|イ\_s*ト\)\|ェ\_s*\%(ナ\_s*ー\|ッ\_s*ペ\_s*リ\_s*ン\|ル\_s*マ\_s*ッ\_s*ト\)\|ィ\_s*\%(ク\_s*ル\_s*ス\|タ\_s*ー\|ー\_s*グ\_s*ラ\_s*ー\|ン\_s*\%(バ\_s*ロ\_s*ン\|マ\_s*ー\_s*マ\_s*ン\)\|ゴ\_s*イ\_s*ネ\_s*ル\)\)\)',
-      \ 'A' : '\%([ｱ餅母渉恤閔憐慌遽蚫鰒鮑袷淡∃主衽袵歩垤蟻麁凡塔蘭露著表霰非諍抗更検革改現競爭争洗殿鉱予豫粗嵐禮恠妖彪殺絢怪綺肖彩漢過謝謬誤礼操綾飴菴黯罨鱇鮟餡行闇按諳晏鞍暗鶩鬚鰓顎喘発肋豈嫂兄崇騰県購贖网罔咫與鼎中新邉邊辺恰頭價価値游遊畔畦堋杏梓与袙衵憬孔坑案侮窖強貴讐讎徒仇黶痣欺鮮字糾嘲薊姐姉曙炮焙炙蜚薹膏脂油危鐙虻泡蹟能痕踪跡東預聚輯纂遏蒐乢軋誂羹壓惇集陸敦暑淳篤熱扱暖温遖斡私圧焦汗央奥奧媼桜櫻塰蜑餘遍普周剰蔗余尼雨甘天凹押樗楝溢艶庵鰺網戯簣鯵味堊渥軛圷憧欠踵幄握芥齷厚漁鯏蜊蕣淺麻浅晰龝煥晢呆朖啓亮晄鑑滉昜旭聡光亨陽洸璋顯輝昿曠諦朗哲顕彬晶賈章商穐彰晃晧昭秋噫瞹穢阨埃欸姶隘文粟曖鮎藹饗靉挨間相哀葭趾朝晨愛跛蹇跫脚蘆葦芦鐐桎足淦赫燈赧紅旃朱茜藜銅赭閼曉暁垢皹皸絳灯證暴証赤呷扇黝榮碧葵蒼煽仰青穴和或哇婀当上阿編吾在併明開韲悪荒襾痾浴唖有挙遭逢嗚敢褪娃安厭充該彼擧會飫倦合亞揚椏宛遇飽惡當あ藍金＠＆&∧∩論∠銀会∀空域⇔←↓⇒→↑⌒後Ц亜米¨´｀＾’〜≒ＡαÅΑアаАA]\|厦\_s*門\|廈\_s*門\|沫\_s*雪\|食\_s*蟻\_s*獣\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|浣\_s*熊\|菖\_s*蒲\|豆\_s*汁\|蛙\_s*鳴\_s*蝉\_s*噪\|塩\_s*梅\|家\_s*鴨\|趺\_s*坐\|Z\_s*\%(n\|i\_s*n\_s*c\)\|浮\_s*子\|痘\_s*痕\|窪\_s*地\|糠\_s*蝦\|醤\_s*蝦\|信\_s*天\_s*翁\|左\_s*沢\|雅\_s*典\|校\_s*倉\|小\_s*豆\|四\_s*阿\|鴉\_s*\%(片\|鷺\_s*合\_s*戦\_s*物\_s*語\)\|渾\_s*名\|綽\_s*名\|化\_s*野\|翌\_s*檜\|飛\_s*[魚鳥]\|総\_s*角\|木\_s*通\|通\_s*草\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|花\_s*鶏\|我\_s*\%(妻\|孫\_s*子\)\|数\_s*多\|奄\_s*美\|灰\_s*汁\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|胡\_s*[床坐座葱]\|日\_s*明\|碩\_s*宏\|祥\_s*[仁彦]\|蜻\_s*蛉\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|生\_s*憎\|匕\_s*首\|英\_s*\%([保田]\|虞\_s*湾\|賀\_s*保\)\|靄\_s*[靄々]\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(電\_s*話\|ア\_s*ド\_s*レ\_s*ス\)\|D\_s*カ\_s*ー\_s*ド\|C\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|Ｉ\_s*\%(Ｐ\_s*電\_s*話\|Ｃ\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|走\_s*目\|鹹\_s*草\|馬\_s*酔\_s*木\|海\_s*[豹人女士部驢]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|褐\_s*毛\_s*和\_s*種\|石\_s*蓴\|白\_s*馬\|水\_s*[黽馬綿]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|ト\_s*リ\_s*プ\_s*ル\_s*A\|公\_s*理\| \_s*ア\_s*ク\_s*シ\_s*ア\_s*ム\|ヒ\_s*素\|砒\_s*素\|京\_s*都\_s*高\_s*度\_s*技\_s*術\_s*研\_s*究\_s*所\|代\_s*入\|遺\_s*産\|抽\_s*象\|G\_s*o\_s*l\_s*d\|自\_s*動\_s*\%(現\_s*金\_s*取\_s*り\_s*扱\_s*い\_s*機\|預\_s*貯\_s*金\_s*機\)\|属\_s*性\|何\_s*か\|か\_s*つ\|お\_s*よ\_s*び\|セ\_s*ン\_s*ト\_s*キ\_s*ッ\_s*ツ\_s*ネ\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|使\_s*用\_s*可\_s*能\|利\_s*用\_s*可\_s*能\|算\_s*法\|割\_s*り\_s*当\_s*て\|オ\_s*\%(レ\|ギ\_s*ュ\_s*ス\_s*タ\_s*ン\|ド\_s*レ\_s*イ\|ン\_s*グ\_s*ス\_s*ト\_s*ロ\_s*ー\_s*ム\|ル\_s*\%(ト\_s*キ\_s*ー\|タ\_s*\%([ーナ]\|ネ\_s*\%(ー\_s*ト\|イ\_s*ト\)\)\)\|ー\_s*\%([クガサトラル]\|ニ\_s*ン\_s*グ\|キ\_s*シ\_s*ン\|ブ\_s*リ\_s*ー\|バ\_s*ー\_s*ド\|ベ\_s*ル\_s*ジ\_s*ュ\|ギ\_s*ュ\_s*ス\_s*\%(ト\|タ\_s*ン\)\|ゾ\_s*ン\_s*ヌ\|ス\_s*\%(チ\_s*ン\|テ\_s*ィ\_s*ン\|タ\_s*ー\|ト\_s*\%(リ\_s*ア\|ラ\_s*リ\_s*ア\)\)\|ド\_s*リ\_s*ー\|ジ\_s*\%([ェー]\|オ\_s*ロ\_s*ジ\)\|デ\_s*ィ\_s*\%(オ\|エ\_s*ン\_s*ス\|シ\_s*ョ\_s*ン\|ト\_s*リ\_s*ア\_s*ム\)\|タ\_s*ム\|ソ\_s*\%(リ\_s*テ\_s*ィ\|ラ\_s*イ\_s*ズ\)\|セ\_s*ン\_s*テ\_s*ィ\_s*ッ\_s*ク\|ロ\_s*ラ\)\)\|配\_s*列\|バ\_s*イ\_s*ト\|ハ\_s*ル\_s*マ\_s*ゲ\_s*ド\_s*ン\|引\_s*数\|人\_s*工\_s*\%(現\_s*実\_s*感\|知\_s*能\)\|イ\_s*\%(ー\_s*ジ\_s*ス\|オ\_s*ン\|ソ\_s*ッ\_s*プ\)\|マ\_s*ル\_s*ド\_s*ゥ\_s*ー\_s*ク\|紫\_s*\%(陽\_s*花\|水\_s*晶\|石\_s*英\)\|付\_s*録\|応\_s*用\|エ\_s*\%([ニメアイー]\|ッ\_s*チ\|ン\_s*\%(ド\_s*ラ\_s*ン\|ジ\_s*ェ\_s*\%(ル\|リ\_s*ッ\_s*ク\)\|ゼ\_s*ル\)\|リ\_s*ア\|オ\_s*リ\_s*ア\|ス\_s*テ\|プ\_s*ロ\_s*ン\)\)',
-      \ 'B' : '\%([鯔鰡堀本凡盆煩梵骨凹歿鈕釦沒渤没穆睦濮樸目攴攵朴木僕墨卜牧星抱肪鵬冐氓鋩旄瑁袤儚蟒鉾貌旁网茆牟蒡甍胞謗蠎虻髦黽卯懋榜眸罔乏惘妨帽昴忙剖冒忘茅膀妄尨厖膨貿防紡滂茫望亡傍某謀暈拇保墓暮菩簿誉掘募姥謨模母干彫呆慕坊姆牡乾褒惚戊ぼ冖覓幎汨巾羃冪紅鼈瞥韈蔑塀抃遍辧瓣卞汳宀湎采辯辨辮眄冕勉娩弁邉可辺邊べ船房笛淵縁渊渕斑鞭樗椈太袋深蓋葢盖豚節勿佛物震勃蚋風鰤馼蚊聞文誣無蒲撃打不錻武振分蕪奉吹侮葺毋舞悔憮部廡嘸葡撲撫拭伏歩ぶ米謐人匹浸額鐚跛！広開繆別謬泯旻梹罎岷緡紊檳頻壜愍瓶鬢閔憫敏貧便帛辟百闢白杪″緲憑票猫鋲屏渺眇平錨苗秒描廟病尾火日媚靡糒枇贔未引琵瀰嵋備縻糜弾美眉弭濔比寐毘麋微び早速林尿針腹拂散払祓原塙蠻旛旙鑁鷭幡悗挽判棒絆版輓蕃板播礬阪坂磐番盤晩萬蛮万箱蠅芒挟伴蜂桴枹鉢撥働畠畑糞屎鼻花端離話V魅許秤筏罸魃拔閥橋走箸柱寞藐貘獏暴漠瀑麥縛博駁莫驀爆楳憊狽霾唄吠杯賣苺培煤黴貝焙賠買売陪倍梅媒跋伐末幕曝抜罰庭馬葉婆罵這化馳羽塲晴歯場芭刄刃張貼ば“仏□■⊥下底×｜‖−＼∵麦ボバ］［｛｝ＢブビБΒбβベB]\|ｯ\_s*\%(ﾎ\_s*ﾞ\|ﾍ\_s*ﾞ\|ﾌ\_s*ﾞ\|ﾋ\_s*ﾞ\|ﾊ\_s*ﾞ\)\|ッ\_s*[ボベブビバ]\|っ\_s*[ぼべぶびば]\|ﾎ\_s*ﾞ\|小\_s*火\|襤\_s*褸\|孟\_s*買\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|南\_s*瓜\|耄\_s*耋\|孑\_s*孑\|包\_s*丁\|ﾍ\_s*ﾞ\|袂\_s*別\|箆\_s*棒\|篦\_s*棒\|胼\_s*胝\|ﾌ\_s*ﾞ\|補\_s*任\|毒\_s*島\|醜\_s*[女男]\|山\_s*毛\_s*欅\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|布\_s*団\|茯\_s*苓\|Ｖ\_s*\%(字\|ネ\_s*ッ\_s*ク\|シ\_s*ネ\_s*マ\)\|附\_s*子\|付\_s*子\|鞦\_s*韆\|豊\_s*[前後]\|ﾋ\_s*ﾞ\|魚\_s*[籠篭]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|彌\_s*縫\|弥\_s*[漫縫]\|吃\_s*驚\|天\_s*鵞\_s*絨\|緬\_s*甸\|賓\_s*頭\_s*盧\|編\_s*木\|柏\_s*槙\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|兵\_s*[衛法]\|表\_s*紙\|拍\_s*[板子]\|ﾊ\_s*ﾞ\|囃\_s*子\|巴\_s*爾\_s*幹\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|薔\_s*薇\|蟠\_s*踞\|鈑\_s*金\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|発\_s*条\|祖\_s*母\_s*さ\_s*ん\|梯\_s*子\|伯\_s*\%([林楽労]\|剌\_s*西\_s*爾\)\|莪\_s*原\|蝗\_s*虫\|飛\_s*[車蝗]\|掲\_s*示\_s*板\|プ\_s*ル\_s*コ\_s*ギ\|作\_s*業\_s*域\|オ\_s*ー\_s*ト\_s*バ\_s*イ\|基\_s*[礎底]\|フ\_s*ァ\_s*ゴ\_s*ッ\_s*ト\|背\_s*景\|北\_s*京\|ペ\_s*\%(キ\_s*ン\|テ\_s*ル\_s*ギ\_s*ウ\_s*ス\)\|臭\_s*素\|イ\_s*ギ\_s*リ\_s*ス\|ホ\_s*ウ\_s*素\|硼\_s*素\)',
-      \ 'C' : '\%([ｺ恐怖惟怺※米暦轉頃壼鶤袞鯤坤狠艮獻琿悃很建棍魂菎蒟滾梱溷献痕渾墾恨懇根杪王挙泥裔樸鞐熟枹醴蛩蹊徑径溢毀零錯苔拒箏亊判斷諺理断盡尽辞琴言異事今壽寿鯒冀希礫鯉拱齣狛細腓昆拳瘤鮗兄近谺応應答是爰凩兀惚榾忽輿甑腰拵拗鐺鏝昿仰慌桁袷塙頏絖冦耗亙峺效晄覯糠匣逅閧扛湊羔礦爻壙盍洸鬨浤凰閤窖缸寇岡頁傚湟汞洽崗鮫伉訌誥冓敲磽鏗椌搆肓鍠矼砿犒淆呷鵁皐黌遘昴槹蚣肱肴熕胱猴扣杲蛤狎畊昊餃哽幌鱇峇嫦烋隍恆倥徨啌吭釦闔藁絋棡遑紘稾鴿詬哮困靠皋惶紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘后蝗酵嚆犢稿亢哄睾慷梗笄郊効岬肛項巷鑛洪佼狡昂叩勾喉滉糀晃剛晧曠宏控恍侯煌港皓坑皎耿膏向江膠虹巧鴻鉱衡浩興厚耕弘綱抗購講恒溝薨鋼航孝更校行肯荒高皇光好槲梏谷釛尅斛棘轂哭詰告刻酷穀⌒冴虎觚壷胯鼓児漉糊媚古娘冱虚混粉辜湖虍放葫捏鈷痩鴣瞽詁箍錮蠱蛄粐滬估雇故沽転倒漕罟餬拠超込凅誇懲琥扈袴木蝴呱乕踰弧越孤菰跨壺楜黄股肥己女戸恋兒怙瑚戀夸皷滸濾瓠去濃乎杞こｾ芹鬩旃錢刋箭羶筌孅阡栫舩纎濺舛甎銛簽湶茜槧吮薦癬斬倩痊孱擶贍纖仟磚燹揃綫喘涎荐饌槫濳沾筅蟾牋苫專翦亘鐫僣韆箋僊殱殲闡賎餞羨顫甅竰糎陝踐銓閃∨潺遷銑栴剪煽譫僉瞻践跣栓疝詮銭穿尠戰僭繊腺泉嬋仙擅淺鮮専扇蘚船浅線撰宣洗選煎戦尖先忙伜倅逼狭狹蝉旋鱈薛椄絏洩卩啜泄紲攝緤§渫刹褻浙竊截窃殺説拙摂節切蓆晰威裼績蹐迹蹠跖跡螫瘠勣籍晢夕鶺雪寂∫∬碩惜析席隻甥韲嘶犀菁瀞晟貰擠睛筬淒醒齊婿撕牲齏情萋穽躋歳栖棲掣腥逝惺斉臍旌悽整凄靖製晴迫塞攻瀬急勢世畆丗糶畝堰脊せｸ配椚檪櫪栩椡椪箜櫟含纐婚糞癖潛潜鵠凹窪縊跟頚軛珞頸諄鞋履窟狐轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬楠誓梳串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖Ξξ茸菌楔草圀邦國国漱嗽吻腔φ劫刧粂裙勳熏皹桾皸醺崑燻訓勲葷君委钁企咥銜桑某暝峅昏冥眛鮓比闇位鞍藏暗倉廚厨涅々〃ゝヽゞ仝ヾ公曇雲蜘佝栗狂包胡俥梍枢畔鐵★玄黒徠久孔桍窶暮懼駒苦朽区眩吁繰庫垢紅呉汲宮枸劬煦口９瞿工供吼怐玖貢九惧来來區組奇句狗鳩絎嶇衢くｼ埀謐Σσ蘂蕋蕊痺褥茵鵐蔀鷸鴫霑入責蔵嶌了縞嶋島凋搾澀澁渋縛暫屡柴荵凌鎬忍簧慕舖↓襪認從从．舌扱罔虐Θθ秕粃椎椣尿貎肉臠猪衣榻黙蜆恵楙誠茂成繁惻鋪陣頻閾櫁樒鹽汐潮瑟蛭疾櫛隲隰嫉蟋悉漆躾膝失室沒鎭沈滴雫賤鎮靜静顰尓爾聢乍併然◇□■◆倖幸貭叱征質柵卯滋撓品鬼鍜錏錣痼凝而拉設垂萎栞襞吝咳什導汁験記徴著印☆〇銀城報調蝨虱白濕湿標七僕楚笞霜臀退斥尻後冩寫舍者砂卸柘炙＃♯暹諜喋煮這西娑沙謝紗鯱奢赦洒捨鮭瀉妁鑠抉蹟勺炸決釋皙爍昔斫蜥刳芍酌爵折癪笏赤灼綽杓石尺赭写鷓積遮舎車射斜釈社洙麈殳蛛娶娵諏鬚侏繻銖蹙俶倏菽叔蓿戚肅淑夙粛宿縮殊趣珠恤卆蟀出洲泅楸綉溲遒酬鷲駲緝葺穐蹤繍螽讐甃萩楢逎讎售岫收驟舅囚姑蓚皺鞦銹脩輯醜習羞酋聚舟秀祝袖啾拾蒐収執衆愁就臭蹴週終褶州宗集秋椶棕朱撞種修周手首酒須儁惷悛濬雋皴墫蕣順蠢舜旬浚竣峻駿逡筍瞬俊蓁畛矧縉蔘鷏齔嗔忱譛袗譖娠疹哂脣怎晉鷆臻甄槙寢岑瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵薪晨辰震宸森眞愼伸慎寝晋進深審親臣鍼申心宍信真新薯墅杵岨藷黍苜渚砠狙嶼處胥蜍苴曙背緒雎蔗庶処署所暑奬簫浹橸舂艢廂陞炒鍬庠獎梢璋將厰邵摺淞訟樅筱篠燮橡愴韶咲誚峭甞鯖敞聲懾稍腫政顳枩慯殤秤湫井星廠剿妝霎蛸劭觴愀升錆鬆樵囁鷦嶂醤青従慫逍倡竦爿薔笙樟装肖菖≦＜湘誦聳檣稱声裳蒋蕉嘯慴盛精霄清鈔粧彰鏘悚蕭悄瀟哨焦憔匠鍾償瘴鞘漿頌詔沼妾請唱薑庄渉障奨娼床牀椒抄聖荘宵傷性相生銷召賞猩症昭燒猖昌少尚晶憧紹祥承證笑将焼照招章詳消証硝掌商昇小昃禝稷寔矚謖觸稙軾嗇屬穡拭属燭贖囑嘱織蝕式喰蜀殖諸初触埴植食職嗜笶姉士徙誣氏思染祗時弑滲梔摯肢詩咨祉刺泗輜厶強貲若至師舐咫只施誌呰匙示指締厮啻次賜熾趾駟漬笥贄此司如沚尸髭肆祀鷙諡枝篩豕巵始妛及弛絲浸閇翅緊揣伺糸駛痣矢衰死敷恃茨旨沁嘴蚩試釶俟瓷觜廝緇祠梓址詞之使獅志歯紫雌姿諮占絞視嗣識四恣阯侈幟卮凍史領竢市巳齒偲資止謚耆覗脂芝痴粢孜仕錙耜齎自屎茲岐〆嗤砥知私仔しｶ糜癢粥痒麹輕骨業軽鰔鰈餉通瓶龜甕亀鴈獵鳫殯K猟雁釀鳧鳬髢氈鴨躱巛側厠廁磧瓦獺翡為裘皮〜紮→搦苧碓柄體軆躰躯身体鴉犂烏絡空唐榧茅揀坎澗扞莟丱拑盥嫺鑵蒄瞰淦稈康繝懽憾骭戡奐啣厂鐶讙澣羮寰羹嫻杆鸛歡豢歛罕酣陷皖篏捍瀚勸撼驩卷樌潤觀橄涵渙堪巫覡鉋随萱簪舘艱咸翰柬悍駻燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹緘桓款箝諌諫轗旱坩侃鰥　館莞橇韓患灌勧菅奸刊柑肝看桿干緩寒嵌廣広竿貫巻敢漢環間陥喚閑監喊歓甘寛管慣完汗艦乾幹官観壁椛屍姓庇鞄芳蔓千鯑一勘蜻⊃影陰蔭景＊棧梯筧庚辛柧門廉癩乞Κ川κ合’）〈《‘“”｝｛》〉囓柁鮖悴舵鰍梶錺餝飾篭籠還歸卻皈孵省顧槭楓却帰反返督髮帋守祇韮主裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀模象仇固硬傍難容忝辱頑形方旁型肩風幽滓翳微掠綛纃絣緕擦糟鎹粕春轄戞劼猾瞎恰蛞∧蠍擔濶筈剋蝎曷羯喝餓聒鞨黠刮蘰鬘桂闊括嘗捷豁渇担滑松堅鰹功割戛活暈疽鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿關掲罹抱踵嬶嚊拘関係貌顏郁薫顔母感釡罐窰鴎框叺喧竃竈窯釜缶蒲鎌數数槝栢膳傅畏賢橿姦樫爨炊圍喞託囲鈎『鉤「』」限鍵（傾禿蕪鏑頭齧被兜敵適哉必要称鼎鬲彜彝叶片悲哀愛鋺蛇鉄蜩神奏金楫裹磆餅徒褐糧粮膈覺∠埆蠖貉幗隱擴寉骼癨壑咯椁嚇茖愨槨膕掴覈殼穫狢霍礁恪擱匿撹攪喀廓較郭］】【〔〕［殻挌劃閣格隠覚矍革獲馘攫核鶴拡客隔角確蠏壞畍丐獪褂恠喙峡夬觧械揩醢匯廨誡誨嵬櫂隗茴徊迴枴懈价椢榿囘蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧皆界疥魁偕改繪貝胛絵甲快灰槐晦懐介回塊解階廻戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡和代茄缺飼嫁華堝變狩上訶架何啝火日菓欠苅繋稼ヶ个噛譁科跏舸賭禍支窩課花刈渦嚼掛呵替葭柯畫駆嘩崋化霞蝌迦顆価馨家借蝦罅駈斯賈嘉易果戈廈哥買闕且克墟靴訛驅換踝描軻嗅價嗄可彼夥香歌河珂鹿個痂書假荷耶笳咼藉糅舁搗渮袈下萪貸厦禾貨咬寡箇卦苛譌枷掻過画ヵ黴遐兼醸翔仮佳蚊懸伽賀淅勝涸苟蝸謌夏枯暇か・…塩閉倶錫呼∩取籐加交бТуЖоВЙЗзжЪЯУИвяшфлСКрпХЁОЭРФЫЩъБыШйхМкПгдмцНЛёаиэетАГЬюЕЮсьнщД♪┼╋×╂┿○●◎銅∪χΧ子чЧ株Ц珈、，色ク衝競構簡制≡変接カ┐┘┗┏┓┌┛└正コ¢シ℃セＣC]\|ｯ\_s*[ｺｾｸｼｶ]\|ッ\_s*[コセクシカ]\|っ\_s*[子こせくしか]\|焜\_s*炉\|嫡\_s*妻\|二\_s*合\_s*半\|牛\_s*尾\_s*魚\|巨\_s*勢\|独\_s*楽\|居\_s*士\|特\_s*牛\|粫\_s*門\|甦\_s*生\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|傴\_s*僂\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|懺\_s*法\|前\_s*[妻栽]\|妹\_s*尾\|嘲\_s*笑\|儕\_s*輩\|斎\_s*次\|済\_s*[民々済]\|蒸\_s*[籠篭]\|救\_s*世\|莎\_s*草\|百\_s*[濟済]\|恭\_s*敬\|9\_s*[日月]\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|探\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|老\_s*舗\|望\_s*潮\|健\_s*か\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|卓\_s*袱\|桎\_s*梏\|柳\_s*葉\_s*魚\|蠹\_s*魚\|汚\_s*点\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|云\_s*[々云]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|7\_s*月\|７\_s*月\|文\_s*月\|4\_s*月\|４\_s*[分月]\|竹\_s*[篦刀]\|羊\_s*[齒歯]\|爲\_s*\%([留難置果送極手兼合業]\|ん\_s*方\|來\_s*り\|納\_s*め\)\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|素\_s*[魚人面]\|不\_s*[忍知]\|注\_s*連\|軍\_s*鶏\|髑\_s*髏\|三\_s*\%(味\|鞭\_s*酒\)\|吃\_s*逆\|差\_s*[別異]\|叉\_s*手\|輸\_s*[出贏]\|卒\_s*去\|B\_s*r\|隼\_s*[朗郎]\|笋\_s*[干羹]\|参\_s*差\|財\_s*産\|枌\_s*所\|縦\_s*容\|睫\_s*毛\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|S\_s*\%([eg]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|連\_s*枷\|枳\_s*殻\|機\_s*関\|落\_s*葉\_s*松\|凵\_s*繞\|檻\_s*車\|顴\_s*骨\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|山\_s*\%(海\_s*経\|梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|破\_s*片\|脚\_s*気\|旗\_s*魚\|鍛\_s*[治冶]\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|長\_s*[月官]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*[沫白]\|曾\_s*て\|曽\_s*て\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|蟷\_s*螂\|螳\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|瑕\_s*[瑾疵]\|東\_s*\%([風雲]\|海\_s*林\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|気\_s*[質触]\|(\_s*株\_s*)\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|契\_s*経\|中\_s*央\_s*処\_s*理\_s*装\_s*置\|伊\_s*藤\_s*忠\_s*テ\_s*ク\_s*ノ\_s*サ\_s*イ\_s*エ\_s*ン\_s*ス\|分\_s*類\|ス\_s*リ\_s*ー\_s*ズ\|範\_s*疇\|ト\_s*ラ\_s*ン\_s*プ\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|水\_s*[鶏母夫手晶]\|複\_s*雑\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|サ\_s*\%(ン\_s*チ\_s*ー\_s*ム\|エ\_s*ラ\|イ\_s*\%(ト\_s*カ\_s*イ\_s*ン\|ラ\_s*ス\|ク\_s*\%([ルロ]\|リ\_s*\%(ン\|ッ\_s*ク\)\)\|ボ\_s*\%(ウ\_s*ズ\|ー\_s*グ\)\|バ\_s*\%(ー\|ネ\_s*テ\_s*ィ\_s*\%(ッ\_s*ク\|ク\_s*ス\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ダ\_s*ー\|フ\_s*ァ\_s*ー\|ネ\_s*リ\_s*ア\)\|ー\_s*\%(テ\_s*ィ\_s*フ\_s*ィ\_s*ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|ク\_s*ル\|カ\_s*\%(ス\|ム\_s*ス\_s*ク\_s*\%(ラ\_s*イ\_s*ブ\|リ\_s*プ\_s*シ\_s*ョ\_s*ン\)\)\|キ\_s*\%(ュ\_s*\%(ラ\_s*ー\|レ\_s*ー\_s*\%(タ\_s*ー\|シ\_s*ョ\_s*ン\)\)\|ッ\_s*ト\)\)\)\|マ\_s*ド\_s*ラ\_s*ス\|茶\_s*筅\|ケ\_s*\%([月アイ]\|フ\_s*ェ\_s*ウ\_s*ス\|プ\_s*ス\_s*ト\_s*ラ\_s*[ムル]\|チ\_s*ャ\_s*ッ\_s*プ\|ン\_s*\%(タ\_s*ウ\_s*\%(リ\|ロ\_s*ス\)\|ブ\_s*リ\_s*ッ\_s*ジ\)\|ー\_s*\%([キジブプスン]\|ク\_s*ウ\_s*ォ\_s*ー\_s*ク\|ソ\_s*ン\|タ\_s*リ\_s*ン\_s*グ\|パ\_s*\%(ー\|ビ\_s*リ\_s*テ\_s*ィ\)\|シ\_s*ン\_s*グ\|リ\_s*ー\)\|ル\_s*\%(ト\|ベ\_s*ロ\_s*ス\|テ\_s*ィ\_s*ッ\_s*ク\|ビ\_s*\%(ム\|ー\_s*ニ\)\)\|ミ\_s*\%(カ\_s*ル\|ス\_s*ト\)\)\|キ\_s*\%(ヤ\_s*ノ\_s*ン\|プ\_s*ロ\_s*ス\|ケ\_s*ロ\|ュ\_s*\%([イーア]\|ヴ\_s*ェ\|ビ\_s*\%(ズ\_s*ム\|ス\_s*ム\)\|ロ\_s*\%(ス\|ッ\_s*ト\)\|レ\_s*ー\_s*タ\_s*ー\|ラ\_s*ソ\_s*ー\|リ\_s*\%(ー\|ウ\_s*ム\|ア\_s*ス\|オ\_s*シ\_s*テ\_s*ィ\)\)\|ア\_s*\%(ラ\|ー\_s*ラ\|ン\_s*テ\_s*ィ\)\|チ\_s*ン\|ト\_s*サ\_s*ン\|メ\_s*ラ\|マ\_s*イ\_s*ラ\|ッ\_s*カ\|レ\_s*ー\_s*ト\|ャ\_s*\%([ドパスブンラ]\|デ\_s*\%(ィ\|ラ\_s*ッ\_s*ク\)\|ビ\_s*\%([アンネ]\|テ\_s*\%(ィ\|ー\_s*シ\_s*ョ\_s*ン\)\)\|ベ\_s*ツ\|バ\_s*\%(リ\_s*[エア]\|レ\_s*ー\)\|ト\_s*ル\|シ\_s*ー\|サ\_s*リ\_s*ン\|タ\_s*ピ\_s*ラ\|ピ\_s*\%(ト\_s*ル\|タ\_s*\%(ル\|リ\_s*ズ\_s*ム\)\)\|プ\_s*\%(ラ\|シ\_s*ョ\_s*ン\|テ\_s*ン\|チ\_s*ャ\)\|セ\_s*\%(イ\|ロ\_s*ー\_s*ル\)\|ッ\_s*\%([ツトチプ]\|サ\_s*バ\|ス\_s*ル\|シ\_s*\%(ュ\|ン\_s*グ\|ャ\_s*\%(ー\|ブ\_s*ル\)\)\)\|ニ\_s*\%(オ\_s*ン\|ス\_s*タ\_s*ー\)\|ナ\_s*ル\|ノ\_s*\%(ン\|ー\_s*ラ\|ピ\_s*ー\)\|ミ\_s*ソ\_s*ー\_s*ル\|メ\_s*\%(ル\|ロ\_s*\%(ン\|ッ\_s*ト\)\)\|ロ\_s*\%(ル\|ウ\_s*ェ\_s*イ\|リ\_s*ン\|ラ\_s*イ\_s*[ンナ]\|ッ\_s*ト\)\|レ\_s*ッ\_s*ト\|リ\_s*\%([コーア]\|バ\_s*ー\|ブ\_s*レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ッ\_s*ジ\|ン\_s*グ\)\|ズ\_s*ム\)\|リ\_s*\%(コ\|ス\_s*ト\|シ\_s*タ\_s*ン\)\)\|総\_s*角\|チ\_s*\%([タリンマア]\|ワ\_s*ワ\|ラ\_s*ー\|ル\_s*ド\|ム\_s*ニ\_s*ー\|コ\_s*リ\|ッ\_s*\%([プク]\|テ\_s*リ\_s*オ\|タ\_s*ゴ\_s*ン\)\|キ\_s*\%(ン\|ー\_s*タ\)\|ュ\_s*\%(ア\_s*ブ\_s*ル\|ー\_s*イ\_s*ン\_s*ガ\_s*ム\)\|ー\_s*\%([フトプクズ]\|パ\_s*ー\|タ\_s*ー\)\|ェ\_s*\%([ロスカコアン]\|ザ\_s*\%(レ\|ー\_s*レ\)\|ル\_s*\%(ニ\_s*ー\|シ\_s*ー\|ノ\_s*ブ\_s*イ\_s*リ\)\|リ\_s*\%(ー\|ス\_s*ト\|ッ\_s*シ\_s*ュ\|モ\_s*ヤ\)\|レ\_s*\%(ス\_s*タ\|ン\_s*コ\_s*フ\)\|ビ\_s*チ\_s*ェ\_s*フ\|ダ\_s*ー\|チ\_s*ェ\_s*ン\|ッ\_s*\%([トクカ]\|キ\_s*ン\_s*グ\)\|イ\_s*\%([スン]\|ニ\_s*ー\|サ\_s*ー\|シ\_s*ン\_s*グ\)\|ー\_s*\%(ン\|ザ\_s*レ\|ホ\_s*フ\)\)\|ャ\_s*\%([オフドインコリウ]\|ツ\_s*ネ\|ク\_s*ラ\|プ\_s*タ\_s*ー\|パ\_s*テ\_s*ィ\|ペ\_s*\%(ル\|ッ\_s*ク\)\|チ\_s*ャ\|ネ\_s*\%(ル\|ラ\_s*ー\|リ\_s*ン\_s*グ\)\|ッ\_s*\%([クト]\|ピ\_s*ー\|プ\_s*\%(マ\_s*ン\|リ\_s*ン\)\)\|タ\_s*\%(レ\_s*[イー]\|リ\_s*ン\_s*グ\)\|ル\_s*マ\_s*ー\_s*ス\|レ\_s*ン\_s*ジ\|モ\_s*ロ\|ー\_s*\%([チタトムジ]\|ビ\_s*ル\|ミ\_s*\%(ー\|ン\_s*グ\)\|リ\_s*ー\|ル\_s*\%([ズス]\|ト\_s*ン\)\)\|ラ\_s*ン\_s*ゴ\)\|ョ\_s*\%([ンコ]\|イ\_s*ス\|ム\_s*ス\_s*キ\_s*ー\|ー\_s*\%(ク\|サ\_s*ー\|カ\_s*ー\|キ\_s*ン\_s*グ\)\|ゴ\_s*リ\|ッ\_s*\%(プ\|ピ\_s*ー\|パ\_s*ー\)\|リ\_s*ソ\)\)\|座\_s*標\|喜\_s*劇\|互\_s*換\|共\_s*\%(通\|産\_s*主\_s*義\_s*者\)\|継\_s*続\|ツ\_s*\%(ァ\_s*ー\|ィ\_s*リ\_s*ル\|ェ\_s*\%(ー\|ル\_s*ニ\_s*ー\|ラ\_s*ン\)\)\|炭\_s*素\)',
-      \ 'D' : '\%([共吃巴鑼錚鶏鳥響嫩緞丼呑曇貪鈍肭遠蚌溝鄰隣塢床処所年時鯲鰍鰌得徳讀獨髑毒読僮働萄桐閙ゞ嫐橈儂陶耨撓通鐃藤々恫瞳憧鬧⇔≡撞慟導〃仝洞堂瞠獰艟胴銅童動同道何弩怒退呶度堵奴解留融録取駑孥努戸止土ど瓰竕凸竍籵瓧禰泥捏溺寺鈿佃甸黏沺畋淀棯澱臀傳殿電照でヅ鶴辛強妻綱勤伝包筒做造作尽机月冢塚遣疲使突吊付漬津詰図積釣連づヂ中近力地痔持ぢ種棚倒濃彩逹畳諾゛濁玉默球魂騙谷館舘点岳嶽竹高凧蛸怛妲獺奪脱廼迺弟岱臺餒梯戴平内醍橙］［題＞≧第台代大鱈頼便誰樽懶怠灘斷椴黙旦煖彈暖談段断檀団團壇弾男抱舵橢炊佗堕荼拿打娜蛇楕陏駄唾拏雫沱立儺柁鴕溜妥朶陀墮駝出垂惰懦建兌澑田騨だ直◎．丶、，‥\.・…＄“”↓†‡―┤達℃°独Ｄド÷◇◆ダジДデΔδд∂D]\|ｯ\_s*\%(ﾄ\_s*ﾞ\|ﾃ\_s*ﾞ\|ﾂ\_s*ﾞ\|ﾁ\_s*ﾞ\|ﾀ\_s*ﾞ\)\|ッ\_s*[ドデヅヂダ]\|っ\_s*[どでづぢだ]\|ﾄ\_s*ﾞ\|都\_s*々\_s*逸\|褞\_s*袍\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|満\_s*天\_s*星\|豆\_s*腐\|如\_s*何\|ﾃ\_s*ﾞ\|刑\_s*事\|粘\_s*葉\_s*装\|手\_s*間\|木\_s*偶\|丁\_s*[稚抹]\|蝸\_s*牛\|ﾂ\_s*ﾞ\|頭\_s*[腦痛]\|ﾁ\_s*ﾞ\|調\_s*子\|茶\_s*碗\|知\_s*恵\|忸\_s*怩\|ﾀ\_s*ﾞ\|忠\_s*幸\|壁\_s*蝨\|伊\_s*達\|山\_s*車\|韃\_s*靼\|提\_s*婆\_s*達\_s*多\|太\_s*\%([刀宰鼓]\|平\_s*広\|上\_s*天\_s*皇\|政\_s*\%(官\|大\_s*臣\)\)\|乃\_s*[公毅]\|体\_s*操\|葮\_s*竹\|演\_s*\%(し\_s*物\|繹\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\)\|コ\_s*ロ\_s*ン\_s*ビ\_s*ア\|ズ\_s*\%(ロ\_s*ー\_s*ス\|ッ\_s*ク\)\|イ\_s*ル\_s*カ\|医\_s*者\|博\_s*士\|文\_s*書\|行\_s*列\_s*式\|発\_s*見\_s*す\_s*る\|ハ\_s*ー\_s*グ\|拒\_s*否\_s*さ\_s*れ\_s*た\|破\_s*壊\_s*\%(者\|す\_s*る\)\|消\_s*滅\_s*子\|記\_s*述\_s*子\|十\_s*進\_s*数\|ゼ\_s*ッ\_s*ケ\_s*ン\|復\_s*号\_s*化\|省\_s*略\|金\_s*剛\_s*石\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|辞\_s*書\)',
-      \ 'E' : '\%([ｴ瘧腮偉鰓衿撰襟掾圜鹽垣檐媛爰捐￥覃黶篶湲蜒讌簷櫞悁渊轅渕閼魘薗艷鳶鴛焉嫣宛閻衍臙閹槐⌒援筵淹厭寃淵掩烟嚥圓沿宴蜿奄袁煙艶焔炎怨鉛園苑偃冤延婉遠堰燕演塩円縁刔刳抉猿狗描択鰕箙蛯蝦狄貊胡戎夷乢靨鉞噎戉咽粤桟悦閲謁奕伯懌亦蜴掖繹越役驛疫易益腋駅液殪纓裔曵頴洩瓔潁贏珱衡娃翳營瑩咏楹塋蠑瀛睿泳縊榮瑛暎曳盈郢影詠穎嬰鋭叡映営栄永衞衛得絵荏懷畫枝江繪衣猥慧惠獲回依會重柄杖餌榎画恵笑会囘選え━─┳┬┯┰┸┷┻┴Фф＝⇔≡∈∋РрМмН→英∃式！ΗηＥсСлЛΕЭεэエE]\|A\_s*\%([面判型級]\|V\_s*\%(機\_s*器\|女\_s*優\)\|B\_s*\%(型\|C\_s*順\)\)\|Ａ\_s*\%([面判型級]\|Ｖ\_s*\%(機\_s*器\|女\_s*優\)\|Ｂ\_s*型\)\|M\_s*サ\_s*イ\_s*ズ\|Ｍ\_s*サ\_s*イ\_s*ズ\|豪\_s*物\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\)\|L\_s*\%(サ\_s*イ\_s*ズ\|L\_s*\%(サ\_s*イ\_s*ズ\|教\_s*室\)\)\|羨\_s*道\|豌\_s*豆\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|似\_s*\%(非\|而\_s*非\)\|桧\_s*原\_s*湖\|烏\_s*帽\_s*子\|吉\_s*方\|胞\_s*衣\|淮\_s*南\_s*子\|埃\_s*及\|干\_s*支\|岐\_s*路\|支\_s*繞\|壊\_s*[疽死]\|葡\_s*萄\|蛭\_s*子\|愛\_s*\%([理莉媛]\|知\_s*川\)\|N\_s*極\| \_s*n\_s* \_s*角\_s*形\|Ｎ\_s*\%([個極響]\|次\_s*元\|Ｈ\_s*Ｋ\_s*ホ\_s*ー\_s*ル\)\|斉\_s*魚\|兄\_s*鼓\|ヱ\_s*ス\_s*ビ\_s*ー\_s*食\_s*品\|Ｓ\_s*\%([波字席極]\|サ\_s*イ\_s*ズ\|Ｎ\_s*比\|Ｆ\_s*小\_s*説\)\|S\_s*\%([式極]\|サ\_s*イ\_s*ズ\|N\_s*比\|F\_s*小\_s*説\)\|穢\_s*[多土]\|X\_s*\%([軸脚]\|O\_s*醤\|染\_s*色\_s*体\)\|Ｘ\_s*\%([軸脚線]\|染\_s*色\_s*体\)\|海\_s*\%(老\|鷂\_s*魚\)\|帝\_s*都\_s*高\_s*速\_s*度\_s*交\_s*通\_s*営\_s*団\|ワ\_s*ー\_s*ク\_s*ス\_s*テ\_s*ー\_s*シ\_s*ョ\_s*ン\|欧\_s*\%(州\|羅\_s*巴\)\|歐\_s*\%(州\|羅\_s*巴\)\|ヨ\_s*ー\_s*ロ\_s*\%(ピ\_s*ア\_s*ン\|ッ\_s*パ\)\|ユ\_s*\%(ア\_s*ン\|ウ\_s*ロ\_s*ピ\_s*ウ\_s*ム\|リ\_s*イ\_s*カ\|ー\_s*\%(ロ\|ノ\_s*ス\|ニ\_s*ス\|ジ\_s*\%(ン\|ー\_s*ン\)\|ド\_s*ラ\|レ\_s*カ\|ラ\_s*\%(ス\|シ\_s*ア\)\|フ\_s*\%(ラ\_s*テ\_s*ス\|ォ\_s*\%(リ\_s*ア\|ニ\_s*ア\_s*ム\)\)\|ク\_s*リ\_s*ッ\_s*ド\|カ\_s*リ\)\)\|編\_s*集\|強\_s*調\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\|電\_s*子\_s*メ\_s*\%(イ\_s*ル\|ー\_s*ル\)\|発\_s*展\|評\_s*価\_s*す\_s*る\|符\_s*号\_s*化\|百\_s*科\_s*事\_s*典\|カ\_s*プ\_s*セ\_s*ル\_s*化\|オ\_s*\%(ー\|イ\_s*\%(ラ\_s*ー\|ゲ\_s*ン\)\)\|実\_s*行\|拡\_s*張\|例\_s*外\|感\_s*嘆\_s*符\|ア\_s*\%([ンイ]\|ニ\_s*ド\|ー\_s*\%([マスル]\|ウ\_s*ィ\_s*ン\|ラ\_s*ン\|ニ\_s*ー\|ネ\_s*ス\_s*ト\|ミ\_s*ン\|シ\_s*ー\|リ\_s*ー\)\)\|設\_s*立\|e\_s*\%(x\_s*a\|コ\_s*マ\_s*ー\_s*ス\|ラ\_s*ー\_s*ニ\_s*ン\_s*グ\)\|イ\_s*\%([ブヴアラー]\|ジ\_s*ェ\_s*ク\_s*ト\|フ\_s*ェ\_s*ク\_s*[トタ]\|コ\_s*\%(ー\_s*ル\|ラ\_s*イ\_s*[ズザ]\)\|プ\_s*シ\_s*ロ\_s*ン\|ミ\_s*ュ\_s*レ\_s*\%(ー\_s*[トタ]\|イ\_s*タ\)\|ベ\_s*ン\_s*\%(ト\|タ\_s*ー\)\|ノ\_s*ッ\_s*ク\|ネ\_s*ー\_s*ブ\_s*ル\|ギ\_s*リ\_s*ス\|ン\_s*グ\_s*\%(ラ\_s*ン\_s*ド\|リ\_s*ッ\_s*シ\_s*ュ\)\|ッ\_s*チ\|ヤ\_s*\%(ー\|リ\_s*ン\_s*グ\|フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|グ\_s*ジ\_s*\%(ッ\_s*ト\|ス\_s*ト\)\|ク\_s*\%(ス\|ア\_s*リ\_s*テ\_s*ィ\)\|ス\_s*フ\_s*ァ\_s*ハ\_s*ン\|リ\_s*[ヤア]\|レ\_s*\%(ー\_s*\%(ス\|ザ\_s*ー\|サ\_s*ー\)\|イ\_s*\%(ン\|ザ\_s*ー\|サ\_s*ー\)\|ブ\_s*ン\)\)\|ウ\_s*\%(ー\|ジ\_s*ェ\_s*ー\_s*ヌ\)\)',
-      \ 'F' : '\%([梺麓冬汾枌濆′吩賁刎氛雰糞褌忿墳吻紛焚扮分粉舊旧顫揮故震篩奮隹古衾襖贅燻筆鰒総惣總絃房閼鬱塞鞴章郁史艦簡札耽鰾吭笛文罧節苳蕗淦舩艙舷舟船肥太懷懐≦≠≫＜＞≧≪渊淵渕縁葢盖再弍蓋双藤潭蒸鯊鱶楓殕瘋封諷黻怫祓彿髴拂憤恚慍二払沸拒防蔔輹愎蝠茯箙腓⊃⊇膨脹嚢梟袋含⊂⊆袱覆輻腹幅復馥服副複福誣孚普俯更膚腐坿狂履不増拊鯆布怖赴桴巫傅婦付訃賻振負蜉罘老附吹生経觸夫俘父臥践咐敷踏斧溥阜葺深仆譜符麩匐腑榑芙賦殖冨触孵麸柎府舗噴鋪降蹈風觝埠拭鮒郛伏俛經歩苻斑畉扶趺芬呎ﾌ飜翻ふ鉄♀∀¶富⌒金佛仏偽誤Ｆ♭弗浮ФΦφфフF]\|ｯ\_s*ﾌ\|ッ\_s*フ\|っ\_s*ふ\|鞦\_s*韆\|睾\_s*丸\|陰\_s*嚢\|乱\_s*吹\|相\_s*応\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|回\_s*回\_s*教\|書\_s*司\|図\_s*書\_s*寮\|海\_s*蘿\|補\_s*\%(任\|陀\_s*[洛落]\)\|雲\_s*脂\|頭\_s*垢\|鳧\_s*鐘\|菜\_s*蕗\|款\_s*冬\|蒲\_s*団\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|釜\_s*[中山]\|雙\_s*葉\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|２\_s*[人つ日]\|宿\_s*酔\|2\_s*\%([人つ日]\|通\_s*り\)\|□\_s*□\_s*□\|△\_s*△\_s*△\|×\_s*×\_s*×\|○\_s*○\_s*○\|帛\_s*紗\|河\_s*豚\|比\_s*律\_s*賓\|I\_s*r\_s*o\_s*n\|極\_s*東\_s*放\_s*送\|論\_s*理\_s*式\|形\_s*式\|ホ\_s*\%(ワ\_s*イ\_s*エ\|イ\_s*ル\|ル\_s*\%(マ\_s*\%(ン\_s*ト\|リ\_s*ン\)\|ム\_s*ア\_s*\%(ミ\_s*ド\|ル\_s*デ\_s*ヒ\_s*ド\)\)\)\|一\_s*杯\|関\_s*数\|機\_s*能\|汎\_s*関\_s*数\|修\_s*正\|ヒ\_s*\%(レ\|ュ\_s*ー\_s*[ズム]\)\|１\_s*\%(／\_s*ｆ\_s*ゆ\_s*ら\_s*ぎ\|ｓ\_s*ｔ\)\|第\_s*1\_s*要\_s*素\|失\_s*敗\|ハ\_s*\%(エ\|ン\_s*ブ\_s*ル\|ロ\_s*ン\)\|柔\_s*軟\_s*な\|周\_s*波\_s*数\|エ\_s*フ\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
-      \ 'G' : '\%([頃殺米諢魂權艮勤権鮴好蓙応駒若亊事琴毎如鏝埖込塵氷聲肥声腰拵心恋戀国石獄濠盒噛嗷敖軣哈壕熬刧遨拷囂轟毫傲鼇郷劫≡号豪剛梧后冴後吾寤宕珸茣児伍誤５極醐碁檎牾蜈唔篌庫娯悟忤呉期齬5互超五晤越子炬護兒瑚午沍ご〓郤鬩戟屐隙檄闃鷁撃激劇皃黥貎霓麑倪囈猊迎鯨芸藝齧囓蘖呟愿監芫痃广彦軒舷眩源儼衒絃弦験言諺現限幻玄減原蹴偈毛睨觧解実下拐夏げ靴腐種草口薬糞癖茱胡萸串嵎藕遇宮寓隅偶黒栗倉鞍蔵位昏麕羣郡群軍苦周包車狂食颶壷暮愚弘虞倶麌禺具惧壺組狗ぐ衣君嫌裂際牛崟憖斤垠岑吟銀圄禦圉馭魚嶷閠玉漁繞堯尭御曉嶢澆翹痙蟯驍僥仰業暁凝行謔瘧虐逆気義偽技切妓巍犠誼宜伎祁疑萓礒羲僞城蟻斬決擬沂議儀嶬艤着木曦犧欺戲魏祇戯ぎ川巛乾革皮側通殻辛絡柄烏鴉頷嚴阮鳫厳貫嵒偐巖岸厂⊃贋龕強翫岩鴈丸雁玩癌元願眼巌含頑上髮紙神髪鐘金係歸皈肯帰返潟方固語刀難型形鰹歹垳顔顏鎌窯蟇釜蒲蟹傘笠重號垣樫頭月合諤樂鍔壑鄂斈學齶萼愕嶽咢鰐額岳顎楽学既礙涯剴乂垓葢劾盖愾磑睚漑崕亥崖啀艾駭皚該咳階孩芥碍害鎧街凱慨概蓋骸外代峩狩我ヶ鵞駕訝変刈掛牙娥替畫駆ケ俄哦借呀果臥雅買蛾訛換河峨莪書芽貸衙画ヵ伽賀勝餓鵝が≫＞Ｇ瓦≧ガゴχΕΗΣυΙΛαΨζρΒΝιΦφτλΠονψωΚΔΡδΤβΘΟπεΧΑΞσθηκΖΜξμΥΩギグゲгΓγГG]\|ｯ\_s*\%(ｺ\_s*ﾞ\|ｹ\_s*ﾞ\|ｸ\_s*ﾞ\|ｷ\_s*ﾞ\|ｶ\_s*ﾞ\)\|ッ\_s*[ゴゲグギガ]\|っ\_s*[ごげぐぎが]\|ｺ\_s*ﾞ\|小\_s*屋\|蒙\_s*御\_s*免\|巨\_s*頭\_s*鯨\|欣\_s*求\|独\_s*楽\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|瞽\_s*女\|歩\_s*行\_s*虫\|向\_s*拝\|皐\_s*月\|穀\_s*潰\|寄\_s*居\_s*虫\|降\_s*魔\|格\_s*\%([間縁]\|天\_s*井\)\|恒\_s*河\_s*沙\|江\_s*\%([津湖商州]\|談\_s*抄\)\|豆\_s*[油汁]\|ｹ\_s*ﾞ\|蚰\_s*蜒\|景\_s*色\|化\_s*粧\|鴃\_s*舌\|稽\_s*古\|懸\_s*魚\|還\_s*[向俗]\|拳\_s*[万固骨]\|喧\_s*嘩\|顕\_s*界\|ｸ\_s*ﾞ\|救\_s*世\_s*菩\_s*薩\|工\_s*合\|供\_s*[奉祭香進]\|紅\_s*蓮\|ｷ\_s*ﾞ\|毬\_s*杖\|岐\_s*\%([南阜]\|セ\_s*ン\)\|棋\_s*将\_s*谷\|求\_s*\%([法道肥]\|不\_s*得\_s*苦\|聞\_s*持\_s*法\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|希\_s*臘\|杏\_s*葉\|餃\_s*子\|刑\_s*部\|ｶ\_s*ﾞ\|搦\_s*み\|鑑\_s*真\|仮\_s*名\|蝦\_s*[蟆蟇]\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|鉤\_s*状\_s*部\|菓\_s*子\|甲\_s*斐\|会\_s*社\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|ヌ\_s*ー\|ニ\_s*ュ\_s*ー\_s*ズ\|ｇ\_s*ｎ\_s*ｕ\_s*ｓ\|ノ\_s*ー\_s*ム\|総\_s*司\_s*令\_s*部\|連\_s*合\_s*国\_s*軍\_s*総\_s*司\_s*令\_s*部\|ヒ\_s*ル\|ク\_s*ッ\_s*パ\|硝\_s*子\|ハ\_s*ボ\_s*ロ\_s*ー\_s*ネ\|瞿\_s*曇\|エ\_s*ー\_s*テ\_s*ボ\_s*リ\|ヨ\_s*ー\_s*テ\_s*ボ\_s*リ\|イ\_s*ェ\_s*\%(ー\_s*テ\_s*ボ\_s*リ\|テ\_s*ボ\_s*リ\)\|得\_s*る\|ヘ\_s*\%(ラ\_s*ル\_s*ド\|ル\_s*マ\_s*ン\)\|ド\_s*イ\_s*ツ\|成\_s*吉\_s*思\_s*汗\|ゼ\_s*\%(ラ\_s*\%(チ\_s*ン\|ニ\_s*ウ\_s*ム\)\|ム\_s*ク\_s*リ\_s*ッ\_s*プ\|ノ\_s*ア\|ン\_s*ト\_s*ル\_s*マ\_s*ン\|ネ\_s*\%(コ\_s*ン\|ラ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\)\|大\_s*\%(蚊\|学\_s*院\_s*生\)\|ジ\_s*\%([ムルジグノナオンー]\|プ\_s*シ\_s*ー\|ア\_s*ン\|イ\_s*ド\|ッ\_s*ド\|タ\_s*ン\|ゼ\_s*ル\|リ\_s*ア\_s*ン\|レ\_s*ッ\_s*ト\|ゴ\_s*ロ\|ラ\_s*\%(フ\|ル\_s*\%(ド\|デ\_s*ィ\_s*ー\_s*ノ\)\)\|ロ\_s*\%(ー\|ン\_s*ド\)\|バ\_s*ン\_s*シ\_s*ー\|ブ\_s*\%(リ\|ラ\_s*ル\_s*タ\_s*ル\)\|ベ\_s*\%(ル\_s*ナ\_s*ウ\|レ\_s*リ\_s*ン\)\|ネ\_s*ッ\_s*ト\|ョ\_s*\%(ッ\_s*ト\|ヴ\_s*ァ\_s*ン\_s*[ニナ]\|バ\_s*ン\_s*[ニナ]\|コ\_s*\%(ー\_s*ソ\|ン\_s*ダ\)\|ル\_s*\%(ジ\|ダ\_s*ー\_s*ノ\)\|ー\_s*\%(ジ\|ゼ\_s*ッ\_s*ト\)\)\|ャ\_s*\%(ン\|イ\_s*\%(ロ\|ル\_s*ズ\|ア\_s*ン\_s*[ツト]\)\|コ\_s*\%(モ\|メ\_s*ッ\_s*テ\_s*ィ\)\|ー\_s*マ\_s*ン\)\|ニ\_s*ー\|ュ\_s*\%([レネ]\|ゼ\_s*ッ\_s*ペ\|リ\_s*\%(ア\|ー\_s*ニ\|エ\_s*ッ\_s*タ\)\|ヌ\_s*\%(ヴ\_s*ィ\_s*エ\_s*ー\_s*ヴ\|ビ\_s*エ\_s*ー\_s*ブ\)\)\|ェ\_s*\%([リルフムマネ]\|ス\_s*チ\_s*ャ\_s*ー\|ロ\_s*ニ\_s*モ\|ラ\_s*\%(ー\_s*[トルド]\|ル\_s*\%(ド\|デ\_s*ィ\_s*ン\|ダ\_s*イ\_s*ン\)\)\|ミ\_s*ニ\|ニ\_s*ー\|ノ\_s*\%([アバ]\|ヴ\_s*ァ\|ワ\_s*ー\_s*ズ\|サ\_s*イ\_s*ド\)\|ン\_s*\%(マ\|ト\_s*\%(ル\|リ\_s*[ィー]\)\|ダ\_s*ー\)\)\)\)',
-      \ 'H' : '\%([ﾎ洞袰亡滅幌濠壕畚笨略艢檣炎焔仄朖朗塊程施滸殆幾缶熱解屠榾螢蛍骨細本※＊糒恣縦擅星戟戈桙綻祠誇埃矛鉾堀頬褓鴇枋峯磅鞄峰垉篷勹皰朴抔怦棒泙棚堋呆豐麭膀舫弸蔀袍苞葬琺寳炮鵬寶繃鋒魴髣逢朋烹鳳彗箒俸焙蓬烽幇抱崩訪泡澎彷縫捧萌萠彭包胞倣邦飽庖疱奉豊硼報砲宝攴攵瀑蹼樮北哺欲譽餔保抛浦誉掘脯賞黼恍堡輔穗襃葆彫穂畝吼舖耄葡褒惚咆埔哮捕逋ほﾍ謙遜篦廰廳貶胼諞篇駢褊蝙翩變∂遍返騙編扁変暼丿諛諂隔凹臍巳蛇蒂蔕瓸竡粨癖躄甓闢璧劈碧壁竝餅娉塀病閇聘坪嬖幤箆蔽并陛屏炳斃瓶幣弊併敝閉並屁折邉舳辺歴圧戸減邊へﾌ梺麓冬♭汾枌濆′吩賁氛雰糞褌忿墳吻紛焚扮分粉舊旧顫揮故震篩奮隹古衾襖贅燻鰒陰総惣總絃房閼鬱塞章郁艦簡補札耽鰾吭笛芬呎文罧節苳蕗淦舩艙舷舟船蒲懷懐≦≫＞≧≪渊淵渕縁葢盖弍蓋双B藤潭蒸鱶楓殕瘋封諷黻怫彿髴佛憤恚慍仏F弗沸Φφ拒防蔔輹愎蝠茯箙⊃⊇嚢梟袋含⊂⊆袱覆輻復馥副複福誣孚普俯更腐坿狂不増拊鯆怖赴桴巫傅婦付訃賻振負蜉罘附吹経觸夫俘父臥践咐敷踏斧溥阜葺深仆譜符麩匐榑芙賦殖冨触孵麸柎府舗噴鋪降蹈風觝埠拭鮒郛伏俛經歩富苻畉扶趺ふﾋ鶸禀蘋彬斌嬪繽殯賓擯牝貧頻瀕稟品葫怯晝飜蒜蛭昼綬胙紐鰭∝片衡鮃閃鵯辟百媛姫尋擴仭太仞展宥絋拡拓拾祐恕紘煕泰熙寛洋弘宏啓裕浩廣広冰雹俵飃凭冫髟彪驫飆馮殍飄豹漂驃慓剽嫖兵票憑評標平表燧老拈捫撚捻歪籤籖柊魃旱秀跪膝蜩羆佗攣−低隙閑暇雛髯鬚髭¬蹄潛濳潜顰密窃鬻提瓢蠡瓠匏央恒壽廂尚寿久蟆率痙蟇丙丁孤史女獨独稘斎斉均倫準等≠單偏単他仁瞳人1１柆蔆拉杓柄犇◇◆菱醢醤曾蘖彦酷漬浸鶲額聖肱肘熈芒光膕控皹皸響罅僻鰉逼疋蹕畢匹篳棺柩弼櫃謐坤未羊筆必養襞饑「＜【（←『左臂轡曳灯緋朏砒火日蜚妣費狒匕泌杼庇悲樋退脾挽痺卑贔紕牽避引菲檜被碑匪裨斐秘豼霏蓖丕批妃髀干昜彼秕氷鄙飛比否碾疲梭披桧魅惹俾鞴冷譬貔乾肥罷痞索扉暃毘轢皮陳鞁祕ひﾊ布鱧釖鉤蝟梁鍼磔針禳肚腑腸孕原拂祓払遼請温玄腹陽遙悠東遥治春頓鮠捷鶻駿疾囃林隼鈑膰磐樊潘泛畔蟠釆拌笵胖絆氾坂范凡燔楾洪瘢翻板攀゜大伴煩槃袢斑判範藩繙蕃版搬叛班阪般販犯汎帆頒反侍鯊櫨祝？硲間劇激勵烈励速蝿蠅省飯勢彈外弭筈辱逸育毓齦浮阻難掵憚幅巾柞母翅圃旛旙将側旌幟傍働鰰機叩疥畠幡籏畑旗斜鴿再鳩開秦跣膚肌裸弾薑椒壹甫馨壱弌哉一創元始鋼芳夾剪鋏螯挾挟脛萩餞贐離塙英蕚萼衄衂縹譚咄放噺話洟甚鼻華花赱迸奔枦觜艀婢梯燥箸柱走橋匣凾箪筐□繁方運匚筥箱函陌栢魄膊柏亳珀狛佰粕璞蘗岶愽擘箔舶泊搏迫帛拍圖諮測企秤謀量計図儚捗袴伯博墓髮秡癶釟溌肇廿二初椀蓮８♪鉢蜂發髪服半法醗薄白八発霈盃睥擺湃孛裴琲埴碚牌吠拜坏珮旆入沛榛杯悖―廢腓誹徘稗癈肺俳憊輩背鷂胚廃排拝敗灰配蛤濱浜吐食霽恥菠帚杷垪跛耻巴笆履脹葉爆矧帶這撥破嵌霸捌早把刎馳填生簸跳派禿碆羽果覇映晴陂端剥腫匍着穿葩爬歯膨坡佩慙芭刄菷怕榮齒刃播愧暎叭栄玻掃張貼刷羞頗琶は━─┘┛┸┷┻┴┓┐┳┬┯┰┨┫┤┥┼╋╂┿波‐フ★☆非ＨヒホヘハH]\|ｯ\_s*[ﾎﾍﾌﾋﾊ]\|ッ\_s*[ホヘフヒハ]\|っ\_s*[ほへふひは]\|寄\_s*生\|珠\_s*鶏\|混\_s*一\_s*色\|紅\_s*[幇中]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|微\_s*[酔笑]\|子\_s*規\|時\_s*鳥\|蜀\_s*魂\|杜\_s*[宇鵑]\|上\_s*枝\|鬼\_s*灯\|酸\_s*漿\|叢\_s*祠\|和\_s*了\|鮑\_s*魚\|謗\_s*法\|黒\_s*子\|部\_s*屋\|竹\_s*\%(畚\|麦\_s*魚\)\|綜\_s*麻\|巻\_s*子\|下\_s*手\|糸\_s*瓜\|h\_s*e\_s*c\_s*t\_s*o\|霹\_s*靂\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|鞦\_s*韆\|睾\_s*丸\|乱\_s*吹\|相\_s*応\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|回\_s*\%(鍋\_s*肉\|回\_s*教\)\|書\_s*司\|頭\_s*垢\|鳧\_s*鐘\|菜\_s*蕗\|款\_s*冬\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|釜\_s*[中山]\|雙\_s*葉\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|宿\_s*酔\|△\_s*△\_s*△\|×\_s*×\_s*×\|○\_s*○\_s*○\|河\_s*\%(豚\|底\_s*撈\_s*魚\)\|神\_s*[庫籬]\|肩\_s*巾\|領\_s*巾\|素\_s*見\|曹\_s*白\_s*魚\|枚\_s*[田方]\|敬\_s*昌\|幸\_s*展\|容\_s*靖\|晃\_s*道\|欧\_s*子\|宙\_s*子\|祥\_s*加\|終\_s*日\|翡\_s*翠\|曽\_s*祖\_s*父\|豪\_s*将\|偉\_s*紀\|周\_s*[行男]\|茅\_s*蜩\|向\_s*日\_s*葵\|七\_s*宗\|桶\_s*坂\|永\_s*和\|蟾\_s*蜍\|抽\_s*\%([斗出]\|き\_s*出\_s*し\)\|告\_s*天\_s*子\|雲\_s*[脂雀]\|為\_s*人\|緊\_s*[と々]\|鎮\_s*火\_s*\%(祭\|の\_s*祭\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|粃\_s*糠\_s*疹\|只\_s*管\|直\_s*[向走垂隠]\|常\_s*陸\|鹿\_s*尾\_s*菜\|撲\_s*り\_s*倒\|同\_s*胞\|赦\_s*い\|青\_s*春\|哈\_s*爾\_s*浜\|美\_s*佳\|流\_s*行\|勇\_s*[樹人]\|韓\_s*流\|漢\_s*堡\|汗\_s*国\|盤\_s*陀\|R\_s*S\_s*I\|蔓\_s*延\|蝦\_s*虎\_s*魚\|沙\_s*魚\|馬\_s*銜\|狭\_s*間\|南\_s*風\|延\_s*\%(縄\|い\_s*て\)\|義\_s*母\|旅\_s*籠\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|黄\_s*[酒櫨]\|土\_s*[方生師]\|嘔\_s*[吐気]\|支\_s*倉\|長\_s*谷\|接\_s*ぎ\_s*合\|纏\_s*頭\|煙\_s*火\|麻\_s*疹\|階\_s*[上子]\|嘴\_s*\%(細\_s*鴉\|太\_s*鴉\)\|学\_s*胤\|2\_s*\%([人つ日]\|通\_s*り\|0\_s*日\)\|２\_s*\%([人つ日]\|０\_s*[歳日]\)\|淡\_s*竹\|8\_s*月\|客\_s*家\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|海\_s*\%([鞘永蘿星牙]\|拉\_s*爾\|底\_s*撈\_s*月\)\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|色\_s*調\|呼\_s*和\_s*浩\_s*特\|ウ\_s*ー\_s*ゴ\|ユ\_s*\%(ー\|ペ\_s*ー\_s*ル\|ベ\_s*ー\_s*ル\|イ\_s*ス\_s*マ\_s*ン\_s*ス\|ゴ\_s*ー\|グ\_s*ノ\_s*ー\|マ\_s*ニ\_s*\%(テ\|ス\_s*[トム]\)\)\|現\_s*代\|十\_s*六\_s*進\_s*数\|高\_s*さ\|香\_s*港\|イ\_s*\%(ダ\_s*ル\_s*ゴ\|ス\_s*パ\_s*ニ\_s*ア\|レ\_s*ー\_s*ル\|エ\_s*ロ\)\|オ\_s*\%([ラー]\|ナ\_s*ー\|ノ\_s*レ\|ン\_s*フ\_s*ル\_s*ー\_s*ル\|ネ\_s*\%(ス\_s*\%(ト\|テ\_s*ィ\)\|ゲ\_s*ル\)\|テ\_s*ル\|ル\_s*ガ\_s*ー\|マ\_s*ー\_s*ジ\_s*ュ\)\|ア\_s*\%(ン\_s*\%(リ\|ベ\_s*ー\_s*ル\)\|ネ\_s*ス\_s*ト\|ワ\_s*ー\|ダ\_s*マ\_s*ー\_s*ル\|シ\_s*ェ\_s*ッ\_s*ト\|ビ\_s*タ\_s*シ\_s*オ\_s*ン\|ー\_s*\%(ネ\_s*ス\_s*ト\|ノ\_s*ン\_s*ク\_s*ー\_s*ル\)\)\|エ\_s*\%(デ\_s*ィ\|ン\_s*リ\_s*ケ\|レ\_s*\%(ナ\|ー\_s*ヌ\)\|ロ\_s*イ\_s*ー\_s*ズ\|ク\_s*ト\_s*ル\|ル\_s*\%(ゲ\_s*ラ\|ヴ\_s*ェ\|メ\_s*ス\|マ\_s*ン\|ミ\_s*\%(ッ\_s*ト\|ー\_s*ト\)\|ブ\_s*ラ\_s*ン\|ナ\_s*ン\_s*デ\_s*ス\|キ\_s*ュ\_s*ー\_s*ル\)\|ノ\_s*ク\|ッ\_s*チ\|イ\_s*チ\)\|水\_s*[銀平素]\)',
-      \ 'I' : '\%([ｲΗη賤鄙卑苟嫌弥薯妹藷芋夢艷鑪鈩彩鱗色鯆忽綺貸甍応答愈圦杁霪隱蚓寅氤酳胤飮韵尹茵贇蔭婬湮堙廴音飲慇韻咽淫殞姻隕院允殷隠陰窟巌巖頌祝鰛鰮鰯岩磐円￥鼾歪弑弋抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗嘶鰍電引躄誘動忿≦鵤錨碇怒霆雷霹凧桴筏魚S菴庵彌雖家尿荊棘茨祈祷命猯豕古伍乙鎰鴪聿軼樹慈悼愴慯労格到至傷鼬頂戴病徒致鈑痛板柞砂沙些聊潔諍烈功諫勳勲勇漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息挑縷絲厭營営愛幼稚緒遑暇糸弌壹肆莓苺櫟著市碑鐓礎甃臀弩石犧牲犠池溢Y佚壱1１燠鬻礇毓粥的戦戰軍幾郁育一稲否飯洟位違居姨猗斎偽噫逝医鑄痍委囲云圍ゐ挿炒彙要熨饐醫言矮往詒威懿如僞忌彜煎逶緯韋唯莞淹胃善生恚彝惟以活易蔚為猪衣已倚幃斐移鮪将可偉畏五夷李渭怡貽癒依逸井慰行爲胆射詑矣頤熬萎良凍出椅率好揖肄痿鋳謂帷亥苡意維遺鰄異去堰尉容囗い氷Йй⇒→⊂⊃▼▽伊印入∞吋∈∋∫∬∩ＩイИΙιи私I]\|E\_s*メ\_s*ー\_s*ル\|灼\_s*然\|祖\_s*谷\|湯\_s*文\_s*字\|文\_s*身\|郎\_s*[女子]\|刺\_s*[青草]\|蕁\_s*麻\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*青\|況\_s*ん\_s*や\|所\_s*謂\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%(蘭\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|夜\_s*来\_s*香\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|小\_s*魚\|鯨\_s*魚\|細\_s*小\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|和\_s*泉\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|気\_s*吹\|指\_s*宿\|拠\_s*所\|従\_s*[妹姉弟兄]\|公\_s*孫\_s*樹\|鴨\_s*脚\_s*樹\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|檪\_s*本\|巫\_s*子\|神\_s*巫\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|許\_s*[婚嫁]\|<\_s*=\_s*=\_s*>\|必\_s*要\_s*十\_s*分\_s*条\_s*件\|ヤ\_s*ン\|日\_s*本\_s*ア\_s*イ\_s*・\_s*ビ\_s*ー\_s*・\_s*エ\_s*ム\_s*株\_s*式\_s*会\_s*社\|国\_s*際\_s*\%(基\_s*督\_s*教\_s*大\_s*学\|標\_s*準\_s*化\_s*機\_s*構\)\|逆\_s*離\_s*散\_s*フ\_s*ー\_s*リ\_s*エ\_s*変\_s*換\|識\_s*別\_s*子\|即\_s*興\_s*曲\|な\_s*ら\_s*ば\|項\_s*目\|逐\_s*次\_s*型\|ｉ\_s*ノ\_s*ー\_s*ド\|i\_s*\%(ア\_s*プ\_s*リ\|P\_s*o\_s*d\|モ\_s*ー\_s*ド\|M\_s*a\_s*c\|ノ\_s*ー\_s*ド\)\|誤\_s*っ\_s*た\|無\_s*\%(花\_s*果\|効\_s*な\)\|帰\_s*納\_s*法\|字\_s*下\_s*げ\|不\_s*\%([可如足]\|充\_s*分\)\|具\_s*体\_s*化\|情\_s*報\|導\_s*入\|整\_s*数\|完\_s*全\|ヨ\_s*\%(ア\_s*ン\|シ\_s*フ\|ー\_s*ド\|ウ\_s*素\)\|ア\_s*\%(イ\|ー\_s*\%(ヴ\_s*ィ\_s*ン\|ビ\_s*ン\)\|ン\_s*\%(プ\_s*ロ\_s*ン\_s*プ\_s*\%(チ\_s*ュ\|テ\_s*ュ\)\|デ\_s*パ\_s*ン\_s*ダ\_s*ン\|フ\_s*ォ\_s*ル\_s*\%(メ\_s*ル\|マ\_s*テ\_s*ィ\_s*ー\_s*ク\)\)\)\)',
-      \ 'J' : '\%([塩嶋縞島嶌橲衄衂宍竺舳忸軸舌喰食直凝實昵実印尻稔仭糂贐潯儘仞盡刄臣侭恁進訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敘恕耡汝莇杼茹敍蜍洳舒縟辱褥蓐溽所抒鋤徐序絮叙助釀淨疂絛繞壌諚孃瀞襄仍蟐拯疉讓聶驤生帖仗躡穰乘塲靜繩禳蕘壤遶星滌茸嬲疊如剩娘嬢錠静醸縄女尉饒丈成擾穣烝嫋丞盛場杖條条蒸貞状攘剰畳冗定浄乗情城上常譲濡得戍就嬬鷲竪讐讎懦愀咒聚隼詢徇笋凖盾楯筍篤蓴惇洵淳閏諄恂馴旬荀潤循醇巡遵順准殉純準襦誦需戌朮孰宿塾珠熟恤術述孺呪豎儒綬樹受授壽鞣狃澀揉廿拾縱中從糅从戎澁蹂神汁獸絨縦渋柔什充十獣従住銃重岻除士染時怩至児冶璽只畤侍孳轜耳示次寿辭粫司二祀邇而慈峙爺以地塒珥迩痔死敷恃蒔磁瓷仁字尓焦膩柱似嗣子亊路史餌兒滋仕爾辞弍自茲持寺事知醤鮭搦着惹尺鉐雀寂若弱蛇闍者邪戯麝じ│┃├┝┣┠┏┌．еЕ治Яя日юЮＪёЁЙジйJ]\|ｯ\_s*ｼ\_s*ﾞ\|ッ\_s*ジ\|っ\_s*じ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|祖\_s*父\_s*\%(さ\_s*ん\|祖\_s*母\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|↑\_s*↓\_s*←\_s*→\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｼ\_s*ﾞ\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|三\_s*味\_s*線\|雑\_s*魚\|著\_s*語\|杓\_s*子\|共\_s*同\_s*企\_s*業\_s*体\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|ゼ\_s*リ\_s*ー\|エ\_s*\%(ホ\_s*バ\|リ\_s*コ\|レ\_s*ミ\_s*ヤ\|ル\_s*サ\_s*レ\_s*ム\|ッ\_s*サ\_s*イ\)\|ヘ\_s*\%(レ\_s*ス\|ス\_s*ス\)\|ヒ\_s*メ\_s*ネ\_s*ス\|チ\_s*ゲ\|北\_s*陸\_s*先\_s*端\_s*\%(大\|科\_s*学\_s*技\_s*術\_s*大\_s*学\_s*院\_s*大\_s*学\)\|ハ\_s*\%(イ\_s*メ\|ラ\_s*ペ\_s*ー\_s*ニ\_s*ョ\)\|碧\_s*玉\|ヤ\_s*\%([リンニナー]\|イ\_s*ル\|エ\_s*ル\|ル\_s*ノ\|レ\_s*ド\|ヌ\_s*\%(ス\|シ\_s*ュ\)\|ス\_s*パ\_s*ー\_s*ス\|コ\_s*[ビブ]\|ッ\_s*ケ\)\|フ\_s*\%(ァ\_s*[ンナ]\|リ\_s*[オア]\)\|ズ\_s*ボ\_s*ン\|ユ\_s*\%([ハリダノ]\|ル\_s*ゲ\_s*ン\|ー\_s*\%([リノ]\|ゲ\_s*ン\_s*ト\|デ\_s*ィ\_s*ッ\_s*ト\)\|ン\_s*\%(グ\|カ\_s*ー\|ケ\_s*ル\)\|ピ\_s*テ\_s*ル\|ッ\_s*[カシ]\)\|イ\_s*\%(エ\_s*\%([ナス]\|ン\_s*\%(ス\|セ\_s*ン\)\|ズ\_s*ス\)\|ェ\_s*\%(ナ\|ン\_s*\%(ス\|セ\_s*ン\|ゼ\_s*ン\)\|ー\_s*ガ\_s*ー\|ル\_s*\%(ク\|サ\_s*レ\_s*ム\)\)\)\|ホ\_s*\%([タセ]\|ル\_s*ヘ\|ホ\_s*バ\|ア\_s*\%(ン\|キ\_s*ン\)\)\|ヨ\_s*\%([ブナ]\|ル\_s*\%(グ\|ダ\_s*ン\)\|エ\_s*ル\|ア\_s*\%(ヒ\_s*ム\|キ\_s*ム\)\|ゼ\_s*フ\|ー\_s*\%([トド]\|デ\_s*ル\|ゼ\_s*フ\)\|シ\_s*\%(フ\|ュ\_s*ア\)\|セ\_s*フ\|ハ\_s*[ナンネ]\)\)',
-      \ 'K' : '\%([ｺ怖旃之惟怺薦米暦轉殺壼鶤袞鯤坤狠艮琿悃很漿棍魂菎滾梱溷痕渾墾恨懇根梢杪王泥裔樸鞐熟枹醴聲声蛩凍溢零錯苔箏亊判斷諺理断盡悉尽辞詞殊事壽寿鯒礫鯉齣狛腓昆瘤鮗谺応應答茲是爰試志心凩兀笏惚榾輿甑腰拵拗鐺鏝昿仰慌袷塙頏絖冦耗亙峺衝晄覯糠匣逅閧扛湊羔礦爻壙盍洸鬨浤凰閤窖缸寇岡傚湟汞洽崗鮫伉訌誥冓敲磽倖簧鏗椌搆肓鍠矼砿犒淆呷鵁皐黌遘昴槹蚣肱肴熕胱猴扣杲蛤縞狎畊昊餃哽幌鱇峇嫦鎬隍恆倥徨啌吭釦闔藁亘絋棡遑紘稾鴿詬哮困靠皋惶紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘蝗酵嚆犢稿亢哄睾慷郊岬肛項巷鑛洪佼狡昂叩勾喉滉糀晃剛晧曠宏控恍侯港皓坑皎耿膏江絞膠虹巧鴻鉱衡浩厚幸耕弘綱抗購攻講恒溝薨鋼航行肯荒高皇光好槲梏谷釛尅斛轂哭石告酷穀冴虎觚壷痼胯鼓児漉糊媚古娘冱混粉請辜湖虍放葫捏此鈷痩鴣瞽詁呼箍小錮蠱蛄粐滬估雇故沽転倒漕罟餬超込凅誇懲琥扈袴焦蝴呱乕踰弧越子孤菰跨壺楜股肥凝女戸恋兒怙瑚戀夸皷滸濾瓠濃乎仔こｹ峻欅獸謇鵑愃搴劒俔儉險瞼慊圈幵釼顯剱椦黔暄劔涓臉妍劵歉獻縣蜷綣檢鉉虔愆娟權甄惓諠騫験慳捲倦遣羂嶮蹇鹸狷譴腱驗軒憲繭謙圏険硯倹献犬絢顕券劍剣見権研拳眷牽県建烟鑷言獣蓋涜吝削畩閲検貶健桁嗾竭獗偈譎碣蕨尻頡抉襭亅刔杰厥訐歇訣孑頁纈蹶桀穴傑結血煢蹊黥詣攜綮鮭絅盻挈瓊夐冂笄枅奚兮迥畦彑醯徑剄冏勍檠憬挂憇匸逕繼惠慧謦鷄系┓├┃┣┿━┻┷┸─┫┝┳┬┼┯┥╋┨┛│┠┰┏┤┴╂罫痙奎脛谿溪螢蛍渓閨憩圭携硅恵刑継勁珪計啓蹴毛褻異けｸ姑配椚橡檪櫪栩椡椪湫箜櫟含纐柵婚屎糞癖潛潜鵠凹窪縊跟頚軛珞頸首諄鞋履窟轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬樟楠梳櫛串釧與与挫籖鯀鯨籤隈熊艸嚔藾叢鏈腐鎖種Ξξ臭楔草圀邦國国髭漱嗽吻嘴唇脣梔腔φ粂裙勳熏皹桾皸醺崑燻訓勲葷委詳钁精鍬咥銜桑某暝峅昏冥眛罔鮓比闇位鞍藏暗倉廚厨涅曇蜘佝栗包俥車梍枢畔鐵玄蔵黒食孔桍窶暮焼懼駒苦区眩吁繰庫垢紅呉倶枸劬煦口瞿工吼怐喰貢惧區組句狗酌絎嶇衢刳くｷ段痍疵紲絆傷築鱚嚴稷黍帛後碪砧絹兆萌刻鞫椈掬辟君牙蘗檗迄訖狐屹詰佶拮吃鞠橘菊喫．＆⌒¬★！÷≠♪∫％±・。仝●｜―￥Ц△‡｀←¢£‰◎＋￣〒☆ヽゞ、▽◇↓≒＼；″°∝≦々℃∵†○´゛‥♭＜＃〇□‐＿Å∞：▲ヾ♂？＾，〓‖▼…〃¶゜＠≫§∴′ゝ／＞♀∨＝≧ー−≪＄♯↑■¨≡〆◆∽煙蚶更衣細后妃楸蕈茸乙雉轢杵軋岸桔汚穢北樵際裂燦煌雲嫌胆竏粁瓩浄淳澄潔清雰錐蛬吉霧檮桐箘鈞檎襟忻箟掀磬噤听瑾懃覲釁芹衿饉釿衾斤蒟径窘擒巾菌公禽筋錦欣僅琴均禁緊謹欽近勤嘘踞據苣擧渠秬鉅舉筥慶倨距歔遽鋸醵拠拒去勗蕀洫亟跼旭局挙許居巨虚轎繦羌姜篋蕎陜恊竸荊筴徼峽劫恟況棘竅僵亰狹頃筺梗誑刧襁烱洶抂卿鍄炯經竟廾况孝亨跫敬筐梟饗矯矜挾校挟拱嬌杏鞏響向興匈嚮享警競喬怯兄彊僑兢莢狂橋供郷兇驕凶叫夾匡侠狭恐経疆協境強胸驚脅共恭今教玖鬮歙舊疚笈邱赳摎恷岌貅９扱皀烋樛蚯逑厳胡翕朽泣穹糾糺及躬汲臼窮灸弓宮久柩究給丘求鳩級球休救急旧吸九基欹寄貴跂徠聞覊猗櫃煕既弃氣詭嬉效切妓跪虧卉稘尋冀暉唏姫伐喟伎畸効熙癸噐極祁匱馗旡其碁剞畿規希綺燬騎饑逵樹忌朞騏城聽棄悸肌生几季記僖紀斬決槻期起箕聴鰭崎餽倚幃瞶利晞欷毅危屓熈着汽木飢酒愾熹諱淇器羇机企麾訊著剪稀来圻來鬼揆奇羈禧譏棋黄憙己驥鑽决毀掎曁竒窺喜碕祈耆饋揮愧棊幾气徽消截岐祺麒覬嵜杞軌きｶ糜癢粥痒麹輕骨業軽鰔鰈餉通瓶龜甕亀鴈獵鳫殯猟雁釀鳧鳬髢鴨躱巛側厠廁磧瓦獺翡裘皮紮→搦苧碓柄枳體軆躰躯体鴉犂烏機絡空唐榧茅揀坎澗扞莟丱拑盥嫺鑵蒄瞰淦稈康繝懽憾骭戡奐啣厂鐶讙澣羮寰羹嫻杆鸛歡豢歛罕酣陷皖篏捍瀚勸撼驩卷樌潤觀橄涵渙凵堪巫覡鉋萱簪舘艱咸翰柬悍駻燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹顴緘桓款箝諌諫轗旱坩侃鰥　館莞橇韓患灌勧菅簡奸刊柑肝看桿干緩寒嵌廣広竿貫巻敢漢環間陥喚閑監喊歓甘寛管慣完艦乾幹官観壁椛屍姓庇鞄芳蔓鯑一勘⊃影陰蔭景＊棧梯筧庚辛┘柧┐┌門廉脚癩乞∪川合’）〈《‘“”｝｛》〉囓柁旗鮖悴舵鰍鍛梶錺餝飾篭籠還歸卻皈孵省顧楓却帰反返督髮帋守祇韮裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀模象仇固硬傍難容忝辱頑形方旁型肩風幽滓翳微掠綛纃絣緕擦糟鎹粕轄戞劼猾瞎恰蛞∧∩蠍擔濶筈剋蝎曷羯喝餓聒鞨黠刮蘰鬘桂闊括嘗捷豁渇担滑堅鰹割戛活暈疽鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿關掲罹抱踵嬶嚊拘関係貌顏郁薫顔母感釡罐窰鴎框叺構喧竃竈釜缶蒲鎌數数槝栢膳傅瑕畏賢橿姦樫爨炊圍喞託囲鈎『鉤「』」限鍵傾禿蕪鏑頭齧気被兜敵適哉必要鼎鬲彜彝叶片悲哀愛鋺蛇鉄蜩神奏楫裹磆餅徒褐糧粮膈覺∠埆蠖貉幗隱擴寉骼癨壑咯椁嚇茖愨槨膕掴覈殼穫狢霍礁恪擱匿撹攪喀廓較郭］】【〔〕［殻挌劃閣格隠覚矍革獲馘攫核鶴拡客隔角確蠏壞畍丐獪褂恠喙峡夬觧械揩醢匯廨誡誨嵬櫂隗茴徊迴枴懈价椢榿囘蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧契皆界疥魁偕改繪貝胛絵甲快灰槐晦懐介回塊解階廻戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡和代茄缺飼嫁華堝變狩上訶加架何啝火日菓欠苅繋稼ヶ个噛譁科跏舸賭禍支変窩課花交刈渦嚼掛呵替葭柯畫駆嘩崋化霞蝌迦顆価馨家借蝦罅駈斯賈嘉易果戈廈哥買闕且克墟靴訛驅換踝描軻嗅價嗄可彼夥香歌河珂鹿個痂書假荷耶笳咼藉糅舁搗渮袈下萪貸厦禾貨咬寡箇卦苛譌枷掻過画ヵ黴遐兼醸翔仮佳蚊懸伽賀淅勝涸苟蝸謌夏枯暇珈か京節┗└※хХ忽コ汗〜功（株Ｋク×金窯χキカΚКΧкケκK]\|ｯ\_s*[ｺｹｸｷｶ]\|ッ\_s*[コケクキカ]\|っ\_s*[子こけくきか]\|蟀\_s*谷\|焜\_s*炉\|前\_s*妻\|嫡\_s*妻\|二\_s*合\_s*半\|秋\_s*桜\|牛\_s*尾\_s*魚\|庶\_s*幾\|独\_s*楽\|特\_s*牛\|粫\_s*門\|甦\_s*生\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|外\_s*連\_s*味\|螻\_s*蛄\|罌\_s*粟\|滅\_s*紫\|S\_s*i\|莎\_s*草\|百\_s*[濟済]\|9\_s*[日月]\|秧\_s*鶏\|釉\_s*掛\|典\_s*薬\_s*寮\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|群\_s*衆\|慈\_s*姑\|c\_s*r\_s*e\_s*s\_s*c\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|仁\_s*彦\|啄\_s*木\_s*鳥\|X\_s*e\|如\_s*月\|私\_s*市\|昨\_s*日\|素\_s*地\|布\_s*地\|欺\_s*罔\|k\_s*i\_s*l\_s*o\|聖\_s*[之子美]\|沈\_s*菜\|蟋\_s*蟀\|螽\_s*斯\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|菫\_s*青\_s*石\|槿\_s*花\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*l\_s*e\_s*s\)\)\|裾\_s*礁\|脇\_s*[侍息]\|姉\_s*[妹弟]\|頬\_s*[骨筋]\|毬\_s*果\|舅\_s*姑\|厩\_s*\%([肥舎]\|務\_s*員\)\|廐\_s*舎\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|氈\_s*瓜\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|為\_s*替\|連\_s*枷\|身\_s*体\|落\_s*葉\_s*松\|随\_s*神\|檻\_s*車\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|千\_s*典\|山\_s*\%(梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|蜻\_s*蛉\|破\_s*片\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|槭\_s*樹\|長\_s*[月官]\|主\_s*[紀計神]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*白\|春\_s*日\|C\_s*\%([ormfda]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|曾\_s*て\|曽\_s*て\|松\_s*魚\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|蟷\_s*螂\|螳\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|水\_s*[鶏母夫手]\|東\_s*\%(風\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|(\_s*株\_s*)\|称\_s*子\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|ノ\_s*\%([ブウ]\|ー\_s*ン\|ッ\_s*\%([トク]\|テ\_s*ィ\_s*ン\_s*グ\|カ\_s*ー\|キ\_s*ン\_s*グ\)\)\|ナ\_s*\%(ッ\_s*\%(ク\|プ\_s*\%(サ\_s*ッ\_s*ク\|ザ\_s*ッ\_s*ク\)\)\|レ\_s*ッ\_s*ジ\|イ\_s*[フトツ]\)\|ニ\_s*\%(ー\|ッ\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ホ\_s*\%(ー\_s*\%(ミ\_s*ー\|メ\_s*イ\)\|メ\_s*イ\_s*ニ\)\|フ\_s*\%(ビ\_s*ラ\_s*イ\|ル\_s*シ\_s*チ\_s*ョ\_s*フ\)\|ハ\_s*\%(ン\|ラ\_s*シ\_s*ョ\_s*ー\|ー\_s*ン\|バ\_s*ロ\_s*フ\_s*ス\_s*ク\|ル\_s*ツ\_s*ー\_s*ム\|チ\_s*ャ\_s*ト\_s*ゥ\_s*リ\_s*ア\_s*ン\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
-      \ 'L' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁ＜≪￣＿≦李左←¬⊃∃∀∨ルＬ∧レラлΛ£ЛλL]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|液\_s*晶\|最\_s*小\_s*2\_s*乗\_s*法\|\.\_s*\.\_s*\.\|拉\_s*薩\|l\_s*-\_s*メ\_s*ン\_s*ト\_s*ー\_s*ル\|ｌ\_s*ｉ\_s*ｓ\_s*ｐ\_s*ｅ\_s*ｒ\|聯\_s*想\|補\_s*題\|檸\_s*檬\|手\_s*紙\|学\_s*習\|施\_s*錠\|局\_s*所\|論\_s*理\|ロ\_s*\%([キイアロリブボトメウスコゴグー]\|ペ\_s*ス\|ワ\_s*ー\_s*ル\|エ\_s*ベ\|ヨ\_s*ラ\|フ\_s*ト\|ル\_s*カ\|ベ\_s*リ\_s*ア\|ビ\_s*\%(ー\|ン\_s*グ\|イ\_s*\%(ス\_s*ト\|ン\_s*グ\)\)\|テ\_s*ィ\|サ\_s*ン\_s*\%(ジ\_s*ェ\_s*ル\_s*ス\|ゼ\_s*ル\_s*ス\)\|ニ\_s*ー\|ク\_s*リ\_s*ア\_s*ン\|ッ\_s*\%([ジタテトク]\|キ\_s*\%(ン\_s*グ\|ー\_s*ド\)\|カ\_s*ー\)\|カ\_s*ー\_s*ル\|ケ\_s*ー\_s*\%([トタル]\|シ\_s*ョ\_s*ン\)\|ガ\_s*ー\|ギ\_s*ン\_s*グ\|ジ\_s*\%(ー\|テ\_s*ッ\_s*ク\|ス\_s*テ\_s*ィ\_s*\%(ク\|ッ\_s*ク\)\|カ\_s*ル\|ク\_s*ー\_s*ル\|ッ\_s*[トク]\)\|ラ\_s*ン\|ン\_s*\%([ゴグダ]\|ボ\_s*\%(ク\|ッ\_s*ク\)\|バ\_s*ル\_s*デ\_s*ィ\|ズ\_s*デ\_s*ー\_s*ル\|リ\_s*[ィー]\|ジ\_s*ン\|ド\_s*ン\)\|レ\_s*\%(ア\_s*ル\|ッ\_s*タ\|ー\_s*ヌ\|イ\_s*ン\|ン\_s*\%([ソス]\|ツ\_s*ォ\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|研\_s*究\_s*室\|エ\_s*ル\|リ\_s*\%([ィセズザサスダポルラリマナノンヌブアー]\|ャ\_s*マ\|ヤ\_s*ド\_s*ロ\|ヨ\_s*ン\|ゾ\_s*チ\_s*ー\_s*ム\|コ\_s*\%(リ\_s*ス\|ピ\_s*ン\)\|ク\_s*ー\_s*ド\|カ\_s*\%(ー\|オ\_s*ン\)\|ジ\_s*[ンー]\|デ\_s*[ィル]\|ド\_s*カ\_s*イ\_s*ン\|プ\_s*ト\_s*ン\|パ\_s*ー\_s*ゼ\|グ\_s*\%(ニ\_s*ン\|ナ\_s*ン\)\|フ\_s*\%([エト]\|タ\_s*ー\|テ\_s*ィ\_s*ン\_s*グ\)\|テ\_s*ラ\_s*[ルシ]\|チ\_s*ウ\_s*ム\|ソ\_s*\%(ソ\_s*ー\_s*ム\|グ\_s*ラ\_s*フ\_s*ィ\)\|タ\_s*ー\|ト\_s*\%([レル]\|マ\_s*ス\|ア\_s*ニ\_s*ア\|グ\_s*ラ\_s*フ\|バ\_s*ル\_s*ス\_s*キ\_s*ー\)\|オ\_s*\%(タ\_s*ー\_s*ル\|ネ\_s*ル\)\|ミ\_s*\%(テ\_s*ッ\_s*ド\|ッ\_s*[タト]\)\|モ\_s*\%(ー\_s*ジ\_s*ュ\|ネ\_s*ン\|ン\_s*チ\_s*ェ\_s*ッ\_s*ロ\)\|ム\_s*ジ\_s*ン\|キ\_s*\%(ッ\_s*ド\|ュ\_s*ー\_s*ル\|テ\_s*ン\_s*\%(ス\_s*タ\_s*イ\_s*ン\|シ\_s*ュ\_s*タ\_s*イ\_s*ン\)\)\|エ\_s*\%(ゾ\_s*ン\|ー\_s*ジ\_s*ュ\)\|ヒ\_s*テ\_s*ン\_s*シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ネ\_s*\%([アン]\|ッ\_s*ト\|ー\_s*ジ\_s*ュ\)\|ニ\_s*ア\|ベ\_s*\%([ロラ]\|リ\_s*ア\|レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ル\_s*テ\)\|ビ\_s*\%([アー]\|ド\_s*ー\|ン\_s*グ\)\|ュ\_s*\%([スー]\|ブ\_s*リ\_s*ャ\_s*ー\_s*ナ\|リ\_s*ュ\|ド\_s*ミ\_s*ラ\|ク\_s*サ\_s*ン\_s*ブ\_s*ー\_s*ル\|ッ\_s*ク\|シ\_s*ア\_s*ン\|ミ\_s*エ\_s*ー\_s*ル\)\|ロ\_s*\%(イ\|ン\_s*グ\_s*ウ\_s*ェ\)\|ヴ\_s*\%(ィ\_s*ン\_s*グ\_s*ス\_s*ト\_s*ン\|ァ\_s*\%(プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\)\|バ\_s*\%(テ\_s*ィ\|タ\_s*リ\_s*ア\_s*\%(ン\|ニ\_s*ズ\_s*ム\)\|プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\|ッ\_s*\%([ドピプタクチト]\|ス\_s*ン\)\)\)',
-      \ 'M' : '\%([ﾓ脆醪師諸催靄舫腿銛杜森聞捫匁紋問翫玩擡齎靠凭鵙鴃縺悶樅籾椛楓蛻潛濳艾潜殯黐餠用糯餅桃者懶專専物尤勿畚戻許悖故旧下乖求礎素基本元綟捩文默沐杢黙耗檬网莽芒罔耄朦魍艨濛曚矇亡蒙毛孟猛網糢保若望揉燃洩貰藻漏以模母裳楙姆摸茂持喪もﾒ麪緜眄緬麺門棉綿面蓍珎珍♀娶貭粧妾牝瞽盲娚暈繞萌慈惠恵萠暝謎溟滅姪瞑盟酩銘鳴瑪賞睨奴雌芽碼召女減めﾑ羣榁室簇邨屯連邑叢村紫梅葎宜憤毳槿葮椋酬報尨骸躯旨難睦酷麥麦対邀百迎昔空虚鞅宗棟胸掬娘結笞鞭徒蠧蝕蠹蟲蓆寧筵席莚虫毟貉狢豸貪聟壻婿霧向无無謀武鵡夢群牟梦六剥毋噎蒸咽務矛むﾐ渠霙溝妊澪薨岑嶺峰峯亂紊淫婬濫妄猥乱※＊◇■簔穣簑蓑醜儖慘短惨幹研耳壥廛店操陵鶚崎岬巫尊詔勅敕＞」砌汀頻→』】右翠碧緑認幣蹊径倫導途通路道瞠鬟髻湖自蹼蛟瑞癸禊晦漲源鏖港湊南瞶櫁謐水調貢密甕帝蜜覩幸脉脈韭韮竓粍瓱榠螟茗名妙命冥都宮罠閔皆眠明民看彌稔靡觀盈診箕三観美充深壬實視御魅味巳己身弥みﾏ毬鞠紕蝮麿転稀賓客檀繭黛眉巡囘周防衞衛護守荳菽豆．・。°◯圓槫゜）（丸謾鰻縵鬘懣幡幔蹣蔓瞞卍饅漫滿慢迄笆貧幻瞼蔟疎眩回廻儲申設招繚統纒的蟶孫弯彎籬擬免猿純亮信実委罷圸壗侭飯儘継随髷任蒭芻耙紛鮪見猯塗斈學眦眥眼俎愛学斑斗枡鱒桝舛升萬蠱呪薪槙槇牧窗悗惑円窓襠甼区街町前複亦俣叉跨全瞬木胯股又鍖枕膜幕瑁詣参參妹眛哩迷枚米賄賂埋昧邁毎沫抹奉靺枩秣祀纏祭睫末大太秀勝柾弄優成盛將松匡鉞賢希将誠昌征政正雅仁媽散茉馬在増混交間放摩負枉益敗眞待未麼撒巻魔蒔俟坐嘛舞捲目磨痲先墹真満播万曲卷雑ま光月♪♭♯ム¬⌒÷⊃≠∫∠±⊇⇔∃∇√∧≒∩∬∋∝≦∵Δ⇒∞⊂⊆⊥∀≫∴×∨≧≪≡∂∈∽∪♂曼麻●◎○〇モＭ〒′−マ最ミメМΜμM]\|ｯ\_s*[ﾓﾒﾑﾐﾏ]\|ッ\_s*[モメムミマ]\|っ\_s*[もめむみま]\|双\_s*\%([手墨親]\|向\_s*き\|差\_s*し\)\|蜀\_s*黍\|唐\_s*土\_s*\%(書\|文\_s*字\)\|両\_s*\%([角親刃]\|差\_s*し\)\|楊\_s*梅\_s*皮\|主\_s*水\|旺\_s*角\|紅\_s*[絹染葉]\|強\_s*請\|虎\_s*落\|痘\_s*瘡\|莫\_s*斯\_s*科\|固\_s*よ\_s*り\|一\_s*徳\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|惘\_s*然\|乙\_s*張\|赤\_s*目\_s*魚\|針\_s*孔\|妻\_s*[君合沼]\|墨\_s*西\_s*哥\|鍍\_s*金\|繍\_s*眼\_s*児\|夫\_s*婦\|乳\_s*母\|布\_s*の\_s*子\|没\_s*\%([薬後入却有]\|義\_s*道\|食\_s*子\)\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|浮\_s*腫\|６\_s*日\|6\_s*日\|崇\_s*田\|刀\_s*背\|襁\_s*褓\|零\_s*余\_s*子\|蜈\_s*蚣\|産\_s*霊\|息\_s*子\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|蚯\_s*蚓\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|山\_s*陵\|雎\_s*鳩\|親\_s*王\|嬰\_s*児\|亨\_s*治\|陸\_s*奥\|皇\_s*[子女國]\|3\_s*[つ日]\|３\_s*[つ日]\|角\_s*[鴟髪子]\|七\_s*寸\|鳩\_s*尾\|鷦\_s*鷯\|孤\_s*児\|凝\_s*視\|兎\_s*唇\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|神\_s*[子輿酒]\|苗\_s*字\|海\_s*[雲蘊布藻蜂松山]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|土\_s*[龍竜産]\|京\_s*都\|横\_s*浜\_s*マ\_s*リ\_s*ノ\_s*ス\|肉\_s*刺\|忠\_s*実\|翻\_s*\%(筋\_s*斗\|車\_s*魚\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|不\_s*\%(味\|見\_s*[点転]\)\|兇\_s*々\|凶\_s*鳥\|澗\_s*潟\|勾\_s*玉\|禍\_s*[々禍事言]\|況\_s*し\|澳\_s*門\|苧\_s*麻\|茅\_s*台\_s*酒\|丈\_s*夫\|倍\_s*達\|微\_s*[塵妙睡]\|燐\_s*寸\|驀\_s*地\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|豫\_s*て\|陪\_s*臣\|売\_s*僧\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|理\_s*[之元]\|允\_s*彦\|祐\_s*史\|晶\_s*子\|公\_s*[美則輝]\|斉\_s*加\_s*年\|方\_s*夫\|多\_s*言\_s*語\_s*化\|ｍ\_s*-\_s*Ｒ\_s*Ｎ\_s*Ａ\|ニ\_s*ー\_s*モ\_s*ニ\_s*ッ\_s*ク\|単\_s*量\_s*体\|会\_s*議\|和\_s*布\_s*[刈蕪]\|中\_s*間\_s*子\|薄\_s*荷\_s*脳\|行\_s*[幸列]\|写\_s*像\|日\_s*\%(米\_s*相\_s*互\_s*防\_s*衛\_s*援\_s*助\_s*協\_s*定\|本\_s*製\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*フ\_s*ァ\_s*イ\_s*ル\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|計\_s*算\_s*機\|手\_s*紙\|ザ\_s*ッ\_s*ヘ\_s*ル\_s*＝\_s*マ\_s*ゾ\_s*ッ\_s*ホ\|嗜\_s*虐\_s*的\_s*趣\_s*味\|被\_s*虐\_s*\%(趣\_s*味\|淫\_s*乱\_s*症\)\|修\_s*士\|仮\_s*面\|移\_s*送\|エ\_s*ム\)',
-      \ 'N' : '\%([ﾉ麕咒燧烽詛呪孔伯朔雅悳弼教糊典規矩憲範宜紀哲修惟允亘攵展順暢信則法後罵吭咽喉鑿蚤々湾宣曰覘臨稀望覗殘遺残鋸芒禾騰幟昇登上檐簷軒逸遁王瑙衲曩碯皇腦嚢膿能脳農除延熨廼退埜野飲載乘飮之伸嚥述乗呑−濃陳のﾈ塒姉濘檸嚀聹侫寧佞鼡鼠拗猫嫉妬希願捏熱労犒葱狙閨睡棔眠稔然棯懇拈撚燃念年涅粘値根捻嶺祢錬寝袮捩音練禰煉子寢ねﾇ絖垈饅帛幣鵺主蛻拭温布沼盜偸窃盗抽擢緯糠額濡脱怒縫抜奴拔貫塗ぬﾆ楡蒻潦鷄鶏瀑庭繞獰女尿韭薤眈睨韮姙刄儿蒜葫刃忍∀妊認任人乳擔蜷担濁賑握俄鳰臭匂沸錵贄僞偐贋偽柔靤如苦膠霓滲虹躙廿《》◎∬』『悪憎兄螺鰊鯡錦西入新肉‖岻逃児弐二邇２貳迩煮貮迯仁尼似荷2弍丹にﾅ靡抔嫐嬲鯆屶釶鉈泥薺詰若慨歎嘆抛毆擲撲殴慰治癒等猶直泪波邉辺邊鍋浪某棘棗懷懐夏擦梨情懶譌艶訛鉛鮠癜鯰韲鱠膾憖怠鈍腥捺凖擬准準謎洋涙宥傾灘詠霖眺痼存乍流轅永和梛椥渚長莫毋勿半・媒仲中７斜七蔑乃尚内繩畷縄苗滑鞣惱悩就哉也斉形業徳娚垂喃∵楠尓爾汝男軟難何倣枹均柞双肄列⊃⇒→楢習竝茄啾納無那拿舐娜做涕投馴南熟並儺生凪鳴為綯奈嘗哭嚶爲狎薙萎菜魚慣泣亡失痿撫啼な┘┛│┃┨┫┤┥├┝┣┠┼╋╂┿成＃∋∇名┗└日≒ニネＮ¬〜≠ナヌノΝНнνN]\|ｯ\_s*[ﾉﾈﾇﾆﾅ]\|ッ\_s*[ノネヌニナ]\|っ\_s*[のねぬにな]\|帳\_s*面\|狼\_s*[烟煙]\|惚\_s*気\|暖\_s*[簾気]\|礼\_s*江\|功\_s*晶\|祈\_s*子\|訓\_s*子\|賀\_s*子\|式\_s*部\_s*省\|記\_s*代\|倫\_s*[明子宗]\|敬\_s*之\|賭\_s*弓\|誠\_s*也\|敦\_s*子\|悦\_s*旦\|祝\_s*[女詞]\|仰\_s*け\_s*反\|盧\_s*泰\_s*愚\|逆\_s*上\|凌\_s*霄\_s*花\|姐\_s*さ\_s*ん\|杜\_s*松\|強\_s*請\|合\_s*歓\|微\_s*温\|零\_s*余\_s*子\|酸\_s*漿\|鐃\_s*鉢\|鰾\_s*膠\|I\_s*I\_s*部\|耳\_s*根\|面\_s*皰\| \_s*2\_s* \_s*次\_s*曲\_s*面\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|莞\_s*爾\|P\_s*b\|L\_s*e\_s*a\_s*d\|海\_s*[苔鼠]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|雪\_s*崩\|竹\_s*節\_s*虫\|7\_s*[日個]\|地\_s*震\|行\_s*[木方]\|大\_s*\%(蒜\|理\_s*石\)\|蛞\_s*蝓\|弱\_s*竹\|追\_s*儺\|済\_s*\%(し\_s*崩\|り\_s*物\)\|可\_s*成\|平\_s*城\|不\_s*成\|空\_s*リ\_s*ス\_s*ト\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|ｎ\_s*\%(個\|次\_s*元\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\)\|紐\_s*育\|フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|ヤ\_s*ー\_s*ノ\_s*ッ\_s*シ\_s*ュ\_s*・\_s*フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|オ\_s*ラ\_s*ン\_s*ダ\|ア\_s*メ\_s*リ\_s*カ\_s*ネ\_s*ッ\_s*ト\_s*ワ\_s*ー\_s*ク\|番\_s*号\|節\_s*点\|夜\_s*想\_s*曲\|n\_s*\%(次\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|諾\_s*威\|正\_s*常\|窒\_s*素\|エ\_s*ヌ\)',
-      \ 'O' : '\%([ｵ俺游泳指妖在畢檻澱氈拇親愚疎颪卸念錘惟慮赴徐趣俤羈主想表重面隱瘟園Å怨♀妾温恩鈍悍臣覺溺朦朧思覚榲現朮桶踴威嚇戯縅棘駭愕驚躍踊傲奢驕嚴厳遣痴瘧怒行怠蒹補荻獺懼惧怐虞畏恐襲甥笈及綬葹仝ヾ〃ゝヽゞ々同唖繦襁鴦鴛教几忍筬收兎抑稚長幼治理収修遲檍納後遅賻饋諡贈送憶袵臆拜拝冒犯岳崗峻阜侵奇陵女陸丘岡欄斧自己各戦鬼衰劣囮頤訪貶乙♂漢音弟阿脅怯首夥誘屋膃億穩穏煽煕熈燠熾諚掟興隠沖毆姶澳秧浤凰徃枉罌殃翁鴬泓奧嚶墺悒泱閘瓮襖蓊惶鸚懊媼嫗鴎怏鏖謳旺凹鴨櫻欒樗楝殴朷甌汪横往鞅歐嘔陷陥遠奄蓋夛応果應掩蔽概欧公邑麋薤被仰扇皇狼弁鵬鴻鳳黄奥多衽覆粱凡鰲頁王居央郎措擱堕尾置麻朗怖悪追帶折塢負墜織老汚生勇小嗚夫惜起唹落男推将穂壓淤御緒墮逐下牡捺雄降桜押圧苧帯於終乎お大◎∞和∝♪∨∪開ＯоОο○ωΟオΩO]\|濠\_s*太\_s*剌\_s*利\|父\_s*[娘子]\|母\_s*[子娘屋]\|万\_s*年\_s*青\|本\_s*懸\_s*魚\|玩\_s*具\|沢\_s*瀉\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|厭\_s*離\|乳\_s*母\_s*日\_s*傘\|陰\_s*[陽地]\|飲\_s*[食酒]\|慍\_s*色\|婦\_s*系\_s*図\|手\_s*術\|螻\_s*蛄\|十\_s*八\_s*番\|鉄\_s*漿\|海\_s*髪\_s*海\_s*苔\|虎\_s*魚\|花\_s*魁\|美\_s*味\|含\_s*羞\_s*草\|白\_s*粉\|渡\_s*島\|通\_s*事\|訳\_s*語\|晩\_s*[稲生]\|可\_s*笑\|惡\_s*寒\|傍\_s*[目惚見]\|叔\_s*[父母]\|伯\_s*[父母]\|姨\_s*捨\|少\_s*女\|侠\_s*気\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|霊\_s*屋\|蝌\_s*蚪\|飫\_s*肥\|佩\_s*物\|良\_s*人\|纓\_s*田\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|鷹\_s*揚\|椀\_s*飯\_s*振\_s*\%(舞\|る\_s*舞\)\|相\_s*知\|鶯\_s*語\|近\_s*江\|零\_s*落\|越\_s*[生訴知智度]\|彼\_s*方\|祖\_s*[神父母]\|車\_s*前\|従\_s*祖\_s*[母父]\|青\_s*[梅海木]\|太\_s*\%(田\|安\_s*万\_s*侶\|上\_s*天\_s*皇\)\|巨\_s*頭\|逢\_s*[魔瀬隈坂]\|そ\_s*の\_s*他\|承\_s*知\_s*し\_s*ま\_s*し\_s*た\_s*\.\|烏\_s*[滸龍]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|立\_s*石\_s*電\_s*機\|職\_s*業\|楕\_s*円\|ウ\_s*\%(ィ\|ー\_s*\%(ズ\|ロ\_s*ン\)\|ロ\_s*ボ\_s*ロ\_s*ス\)\|出\_s*力\|ア\_s*\%(ワ\|ザ\_s*ー\|ウ\_s*\%([チト]\|タ\_s*ー\)\)\|基\_s*本\_s*ソ\_s*フ\_s*ト\_s*ウ\_s*ェ\_s*ア\|一\_s*\%(昨\_s*[年日]\|対\_s*一\)\|ワ\_s*ン\|ま\_s*た\_s*は\|論\_s*理\_s*和\|聖\_s*譚\_s*曲\|水\_s*中\_s*酸\_s*素\_s*破\_s*壊\_s*剤\|蛋\_s*白\_s*石\|最\_s*適\_s*化\|歌\_s*劇\|演\_s*算\_s*子\|操\_s*作\|酸\_s*素\)',
-      \ 'P' : '\%([本磅椪烹砲法方報舖舗歩ぽ併閉閇蔽×遍編片邉篇辺邊屁ぺ幅服風分腐布符泌匹俵憑票品筒平日犯版搬幇板払腹發発走箱拍朴駮泊博愽包放配盃敗牌杯八破羽波播張ぱ鉛Ψψぴ±＋ぷΦφ├┣∝北┴‰．Ｐ％£〒・点プポ頁）（∂¶‖ペパПΠп燐πピP]\|ｯ\_s*\%(ﾎ\_s*ﾟ\|ﾍ\_s*ﾟ\|ﾌ\_s*ﾟ\|ﾋ\_s*ﾟ\|ﾊ\_s*ﾟ\)\|ッ\_s*[ポペプピパ]\|っ\_s*[ぽぺぷぴぱ]\|ﾎ\_s*ﾟ\|先\_s*斗\_s*町\|ﾍ\_s*ﾟ\|祕\_s*[露魯]\|ﾌ\_s*ﾟ\|釜\_s*山\|普\_s*魯\_s*西\|ﾋ\_s*ﾟ\|皮\_s*蛋\|光\_s*一\|ﾊ\_s*ﾟ\|麺\_s*麭\|巴\_s*\%(里\|奈\_s*馬\)\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|排\_s*骨\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|白\_s*[板酒金]\|シ\_s*\%(ュ\_s*ー\_s*ド\|ロ\_s*シ\_s*ビ\_s*ン\)\|サ\_s*\%(ー\_s*ム\|イ\_s*\%([ズクケコ]\|ロ\_s*シ\_s*ビ\_s*ン\|リ\_s*ウ\_s*ム\|キ\_s*ッ\_s*ク\)\)\|+\_s*α\|ホ\_s*\%(ン\|ス\_s*ゲ\_s*ン\)\|ヒ\_s*ロ\_s*ポ\_s*ン\|比\_s*\%(布\|律\_s*賓\)\|フ\_s*\%(リ\_s*ジ\_s*ア\_s*ン\|レ\_s*\%(イ\_s*ジ\_s*ン\_s*グ\|ー\_s*\%(ズ\|ジ\_s*ン\_s*グ\)\)\|タ\_s*レ\_s*イ\_s*ン\|ォ\_s*\%([ーンノト]\|ボ\_s*ス\|ビ\_s*ア\|ス\_s*フ\_s*ァ\_s*ー\|ニ\_s*ー\)\|ァ\_s*\%(イ\|ラ\_s*オ\|ー\_s*\%([ジマ]\|ミ\_s*ン\_s*グ\)\|ン\_s*\%(ト\_s*ム\|タ\_s*ズ\_s*[ムマ]\)\|ル\_s*[ツス]\|レ\_s*ノ\_s*プ\_s*シ\_s*ス\)\|ィ\_s*\%([ロル]\|ジ\_s*\%(ッ\_s*ク\_s*ス\|カ\_s*ル\)\|ー\_s*ビ\_s*ー\|ッ\_s*シ\_s*ン\_s*グ\|レ\_s*モ\_s*ン\|ラ\_s*デ\_s*ル\_s*フ\_s*ィ\_s*ア\|リ\_s*\%([スーアパ]\|ッ\_s*[プパ]\|ピ\_s*\%(ン\|ー\_s*ヌ\)\)\)\|ェ\_s*\%(ー\_s*\%([ベズ]\|ジ\_s*ン\_s*グ\)\|イ\_s*ズ\|ロ\_s*モ\_s*ン\|ニ\_s*\%(ル\|ッ\_s*ク\_s*ス\|キ\_s*ア\|ー\_s*ル\)\|ノ\_s*\%(キ\_s*シ\|ー\_s*ル\)\)\)\|述\_s*語\|証\_s*明\|タ\_s*ン\_s*パ\_s*ク\_s*質\|処\_s*理\|手\_s*続\_s*き\|進\_s*行\|算\_s*譜\|利\_s*潤\|南\_s*瓜\|宣\_s*伝\|公\_s*告\|真\_s*珠\|永\_s*続\|カ\_s*リ\_s*ウ\_s*ム\|葡\_s*萄\_s*牙\|重\_s*合\_s*体\|多\_s*相\_s*型\|バ\_s*テ\_s*レ\_s*ン\|貼\_s*り\_s*付\_s*け\|論\_s*文\|偏\_s*執\_s*[狂病]\|引\_s*数\|リ\_s*ン\|p\_s*\%(T\_s*e\_s*X\|H\_s*メ\_s*ー\_s*タ\|e\_s*\%(t\_s*a\|r\_s*l\_s*ス\_s*ク\_s*リ\_s*プ\_s*ト\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\)',
-      \ 'Q' : '\%([配椚橡檪櫪栩椡椪椢湫櫟含纐柵婚屎糞癖潛潜鵠裹凹窪馘括縊踵跟頚軛珞頸首諄鞋履窟寛狐轡覆靴沓碎砕管条降件頽崩屑葛釘莖茎陸杙株杭掘崛倔鶏鐃藥擽薬樟楠髪酒梳櫛串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖種Ξξ臭日茸菌楔草圀邦國国髭漱嗽吻嘴喙唇脣蛇梔腔φ劫刧　空粂裙勳熏皹桾皸醺下薫燻訓勲葷君委詳钁精企鍬加咥銜桑塊某暝晦峅競昏冥眛罔鮓較比闇位鞍藏暗倉廚厨涅々〃ゝヽゞ仝ヾ曇雲蜘栗狂包俥車曲廓郭梍枢踝畔鉄鐵★●■玄蔵黒拘食徠久孔桍窶暮焼懼駒柧苦朽区眩吁繰庫垢駆鉤紅呉倶駈汲宮枸劬矩煦驅口９瞿工悔供功吼怐喰玖貢九惧来來區組奇句狗鳩酌絎嶇躯衢屈刳ｸくＱ‘“’”♪ケ？ク¶Q]\|ｯ\_s*ｸ\|ッ\_s*ク\|っ\_s*く\|姑\_s*娘\|箜\_s*篌\|救\_s*世\|莎\_s*草\|傀\_s*儡\|被\_s*下\_s*度\|百\_s*[濟済]\|果\_s*物\|恭\_s*敬\|9\_s*月\|長\_s*月\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|天\_s*鼠\_s*矢\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|山\_s*梔\_s*子\|崑\_s*央\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|c\_s*r\_s*e\_s*s\_s*c\|海\_s*月\|水\_s*[鶏母]\|内\_s*蔵\_s*助\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|公\_s*\%([家方卿界美事文]\|出\_s*挙\)\|佝\_s*僂\_s*病\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|胡\_s*桃\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|珠\_s*穆\_s*朗\_s*瑪\|チ\_s*ョ\_s*モ\_s*ラ\_s*ン\_s*マ\|『\_s*』\|コ\_s*\%(ー\_s*ラ\_s*ン\|ン\_s*テ\_s*ィ\_s*フ\_s*ァ\_s*イ\_s*ア\)\|問\_s*合\_s*せ\|カ\_s*\%(ザ\_s*ン\|タ\_s*ー\_s*ル\|ス\_s*バ\|ー\_s*ヌ\_s*ー\_s*ン\|ナ\_s*ー\_s*ト\|ダ\_s*フ\_s*ィ\|リ\_s*テ\|ド\_s*リ\_s*ー\_s*[ルユ]\|ル\_s*\%(チ\_s*[エェ]\|テ\_s*\%(ィ\_s*エ\|ッ\_s*ト\)\)\|ン\_s*タ\_s*[ムスン]\)\|質\_s*問\|キ\_s*\%(ト\|ブ\_s*ラ\|ホ\_s*ー\_s*テ\|ハ\_s*ー\_s*ダ\|ル\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\|ー\_s*ン\|ノ\_s*ン\|ッ\_s*シ\_s*ュ\|ュ\_s*\%(ー\|エ\_s*リ\)\)\)',
-      \ 'R' : '\%([ﾛ崘侖崙堽栄論漉祿轆碌肋勒麓禄鹿６録蘢滝潦榔簍柆鑞弄咾瑯焜朖螂螻樓隴哢實臈槞僂瓏勞薐琅朧壟撈臘郎瘻廊牢浪蝋癆聾楼篭籠狼漏朗蘆顱炉髏爐櫨蕗賂艪瀘臚枦輅鹵廬櫓轤鷺驢艫櫚滷ろﾚ洌鴒聆蛎糲綟儷蛉砺苓唳勵〇澪犁齡蠡囹齢黎羚戻禮祈隸茘麗隷玲伶癘励零冷例冽劣烈裂列癧轣檪櫪靂鬲瀝礫轢歴瀲鎌縺嗹漣鏈匳斂濂戀奩輦簾櫺∧聨憐恋蓮煉錬攣練聯廉連れﾙ♪路盧泪壘縲瘰誄涙羸塁累類鏤屡縷褸婁陋璢るﾘ犂篥葎率慄栗淕勠六戮陸律擽畧暦掠略鏐鉚窿餾畄旒瀏苙霤瑠嶐澑瘤嚠笠榴溜硫琉留立柳粒劉隆流痳鈴麟P懍躪藺鄰棆醂菻廩躙淪厘凜霖琳悋綸淋禀稟凛鱗倫吝隣林燐臨侶絽踉梠膂虜呂慮仂力緑裲鐐椋靈魎崚鬣嶺獵楞怜暸倆繆粮廖兩蓼鷯粱輌凉輛燎瞭聊陵令梁糧諒霊龍凌遼漁亮寮⇔涼繚撩綾療量竜菱僚領喨了稜寥両料閭旅離吏履裡璃理釐痢裏俐俚莅漓利驪李哩梨詈悧罹浬籬里莉りﾗΛλ亂儖攬覧臠覽瀾欒襴婪繿欖檻籃巒嬾纜襤懶爛藍鸞卵濫闌嵐欄乱蘭労剌溂老埓埒猟薤辣喇樂珞犖絡駱酪烙楽落洛徠蕾賚醴罍櫑擂儡耒籟莱磊癩來礼雷頼来們裸等鑼邏蘿拉螺騾良ら右→ТбуЖВоЙЗЪжзИУЯвяшфКСлЁХпОЦЭЧФЫЩъ魯Бы露ШйхМкПгдмцНЛёаиэетАГчЬюЕЮсьнщД輪根√羅ロ々ＲラルレリРρΡрR]\|ｯ\_s*[ﾛﾚﾙﾘﾗ]\|ッ\_s*[ロレルリラ]\|っ\_s*[ろれるりら]\|鱸\_s*魚\|芦\_s*[有花]\|濾\_s*[胞過紙]\|6\_s*[時月]\|水\_s*無\_s*月\|檸\_s*檬\|坩\_s*堝\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|鯉\_s*[魚城]\|二\_s*\%(索\|翻\_s*縛\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*ケ\_s*ー\_s*ブ\_s*ル\)\|海\_s*獺\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|関\_s*係\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\|数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|京\_s*都\_s*大\_s*学\_s*数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|東\_s*北\_s*大\_s*\%(学\_s*電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|通\_s*研\)\|限\_s*定\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|範\_s*囲\|規\_s*則\|紅\_s*玉\|r\_s*u\_s*b\_s*y\_s*ス\_s*ク\_s*リ\_s*プ\_s*ト\|要\_s*求\|検\_s*索\|復\_s*帰\|返\_s*[事信]\|拒\_s*否\|反\_s*射\_s*鏡\|参\_s*\%(考\_s*文\_s*献\|照\_s*型\)\|機\_s*能\_s*回\_s*復\_s*訓\_s*練\|再\_s*帰\_s*的\|認\_s*識\|正\_s*規\_s*表\_s*現\|ア\_s*ー\_s*ル\)',
-      \ 'S' : '\%([ｿ似杣灌傍峙毓育具供備害底苑薗園儲酘貮埆妬埣讒譏詆誹謗濡外猝率喞熄仄息足促束測側燥偬雙帚艘箒諍滝嗽剏湊蔟赱鯵抓嫂贈樔屮壯愡葱澡瀧艚勦歃叟裝竈梍蚤甑搶笊窗薮奘崢槽筝菷弉輳爭掫竃譟箱髞嗾懆瘡孀窓踪匝噪遭艙爪糟莊倉淙曹匆怱繰宋漕簇槍躁鎗箏綜喪痩藻艸葬壮操掻掃奏蹌滄争草層創蒼叢僧走惣送叛乖抑諳某橇轌艝鱒邨巽噂拵忖蹲樽孫遜存尊損囎祚租酥措踈鼡阻詛礎疏疎其蘓齟胙副鼠噌反愬蔬沿祖塑姐訴爼逸組俎徂粗麁疽甦沮咀想そｾ芹鬩旃錢刋箭羶潛筌孅阡栫舩氈纎濺舛甎銛簽湶茜槧巛吮癬籤倩痊孱擶贍纖仟磚燹揃綫喘涎荐饌槫濳沾籖筅蟾牋苫專翦亘鐫僣韆箋僊殱殲闡釧賎餞羨顫甅竰糎¢陝踐銓閃潺遷銑栴川剪煽譫僉瞻践跣栓疝詮銭穿戰僭繊腺泉嬋擅淺鮮専潜扇蘚船浅線撰宣洗煎戦千忙伜倅逼蝉旋屑鱈薛椄絏洩卩泄紲攝緤褻浙竊℃窃拙摂接節楔關磧蓆晰威裼績蹐迹蹠跖跡瘠藉勣籍淅晢夕鶺潟碩惜析関席隻甥韲嘶菁瀞晟貰擠睛筬淒婿撕牲齏情萋穽躋掣腥逝惺旌蜻整靖誓制晴攻瀬急勢世競畆丗糶畝堰脊せｽ鯣鋭坐座李既已昴術辷全滑皇脛臑裾双英村選優営寸漱雪濯薦啌勸啜勧芒薄煤賺鼈捩筋頗亮丞甫輔佑祐介助蘇裔陶曽乃曾即則淳漁篶鑾凉漫硯雀涼鱸鮓鮨遊椙犁耒犂篦隙尽末眇縋管菅廢頽廃窘救掬尠寡粭糘菫速純鈴炭角墨隅】【鄒數陬雛芻菘嵩崇趨樞∃∵¬⌒∀÷≠Δ≫⇒∴×∨≧∫∠∇±≪∧∞≒⇔∩∂∈∬∋∝枢錘帥粹騅陲捶忰悴邃瘁翆萃榱隹誰醉遂膵燧彗綏錐穂炊翠⊥H吹粋推水酔睡棲統耡総漉饐住空寿籔醋簾棄直鋤巣栖剥磨梳擂澂掏總剃好過拗澄吸喫据壽透ｼ埀謐蘂蕋蕊痺褥茵鵐蔀鷸鴫霑入蔵嶌縞嶋島凋澀沫澁渋縛暫屡荵凌鎬忍簧慕舖↓襪健認啝随從从．舌扱罔虐Θθ秕粃椎椣卓尿貎肉臠猪榻黙蜆楙誠茂成繁重惻鋪陣頻閾櫁樒鹽汐潮瑟蛭疾櫛隲隰嫉蟋漆躾膝失室沒鎭沈滴雫賤鎮靜顰尓爾聢確併◇◆鹿貭叱征質卯滋撓科品鬼鍜錏錣痼凝而拉設萎栞襞吝咳爲什導怪汁験記徴著印○〇』銀城代『報調蝨濕湿七僕楚笞霜臀退斥尻冩寫舍者卸柘炙暹諜喋煮這謝鯱奢赦捨瀉妁鑠嚼抉蹟勺決釋皙爍昔斫蜥刳芍酌爵折癪笏赤灼綽石尺借赭写鷓積舎車斜釈社洙麈殳蛛娶株娵諏鬚侏繻銖卒槭蹙俶倏菽叔蓿粥戚肅淑夙粛縮取殊趣珠恤卆蟀出洲泅楸綉溲遒酬鷲駲楫緝嗅葺穐蹤繍螽讐甃萩楢逎讎鰍售岫收驟舅囚姑蓚鞦脩輯醜習羞酋聚舟秀祝袖啾拾蒐収執衆愁襲就臭蹴週終褶州宗椶棕守朱撞種修周手首狩須儁惷悛雋皴墫蕣順蠢舜旬竣峻駿逡筍春瞬俊蓁畛矧縉蔘鷏齔嗔忱譛袗譖娠疹哂脣簪怎晉鷆臻甄槙寢岑瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵辛薪晨辰震宸森眞愼伸慎寝晋身進深審親臣鍼心宍信神薯墅杵岨且藷黍苜渚砠狙嶼處胥蜍苴曙背塩緒枌雎蔗庶処所書暑奬簫浹橸舂艢廂陞炒鍬庠獎梢璋將厰邵摺淞訟樅筱燮橡餉愴韶誚峭甞姓敞聲懾稍嘗腫政顳枩慯殤秤湫礁井星廠剿妝霎蛸劭觴愀升鬆樵鷦嶂醤従慫逍倡竦爿墻牆薔笙樟装肖菖≦＜湘誦聳檣稱声裳）（蒋蕉嘯慴精霄鈔粧彰鏘悚蕭悄瀟哨焦憔匠鍾償瘴漿頌詔沼妾請衝唱薑庄渉奨娼床牀椒抄荘翔鉦宵傷踵銷召賞猩症昭燒猖昌少尚松晶憧紹捷象承證正笑将称焼照勝招章詳消鐘証硝掌省商昇昃禝稷寔矚謖餝稙軾嗇屬穡拭属燭贖色飾囑嘱織蝕式喰蜀殖諸初埴植食職笶姉徙誣氏思染飼祗時弑滲梔摯肢詩咨祉泗輜厶屍強貲若至師舐咫只紙施誌呰示締厮啻次賜熾趾駟漬笥贄此司如沚尸髭肆閉祀鷙諡枝篩豕滓巵始妛及弛絲浸閇斯翅緊帋揣伺為糸駛痣矢死敷恃茨旨沁嘴蚩試釶俟瓷觜廝緇祠梓址詞之使獅志歯紫雌姿柿諮占絞視嗣識子四恣阯侈幟卮凍史領竢市巳祇齒資謚耆覗脂芝痴粢孜錙耜齎自屎茲岐嗤砥仔しｻ杓寤雨鮫清鞘莢騷觸触鰆椹爽騒澤沢濬掠新攫杷渫浚更士桾申白素讚戔蒜驂芟鑚爨汕潸斬餐嶄纉攅慘粲蠶跚衫彡杉秋桑…≡簒纂鯢燦珊繖棧刪卅參鑽蚕算傘３贊▼▽3参賛O散惨産酸嘸摩遉樣彷碍妨様山漣蔑貶垂鮭叫仙寞鏥寥皺淋鯆生虱鯖捌偖扨偵宿禎貞定哘誘蝎蠍授皿祥桟匙簓障囁私篠支捧笹逧迫讃鐸蛹宛真尖碕嵜前崎魁峺遮哢囀候侍核実俚説了暁達逹哲諭慧敏叡聰訓知郷恵智聡悟理杆里小棹竿紮刹箚扎皐撮搜寒捜相主盛觚柧盞盃杯榮栄倒肴魚阪界堺境酒泝逆賢坂榊猿麾挟鷺拶撒擦颯先数察薩刷札晒霽濟纔釵綵切崔砦顋樶凄靫洒衰寨悽犲碎腮哉摧灑責偲殺縡淬倖豺呵苛幸猜塞蔡栽儕采齊財臍截載孥宰済齋犀際災柴賽菜採砕妻債斎斉祭催才細鰓裁歳最埼捉縒筴簀柞辟窄咋册齪筰槊酢嘖朔柵遡溯鑿索搾昨炸冊策錯櫻桜注曝瑳冴磋搓槎刺覺莎作挿嗟紗嵯覚做削冱寂叉荒茶渣左再早避咲査嵳褪挫佐然唆蹉鎖裂醒瑣嗄螫娑砂割蓑狭狹扠些差梭射銹沙下冷捺簑插点止提柤錆乍去裟詐さ√錫す／仕指製西　┓┐〆□■Шш上＃♯щЩ添∪日⊂⊆⊃⊇文静★＊☆標嗜青三聖土彩▲△悉署〜∽’‘┏┌集＼探§″性セサＳシソスΣсСσ秒S]\|ｯ\_s*[ｿｾｽｼｻ]\|ッ\_s*[ソセスシサ]\|っ\_s*[そせすしさ]\|遽\_s*走\|蕎\_s*麦\|内\_s*障\|彼\_s*杵\|諷\_s*歌\|幾\_s*許\|錚\_s*[錚々]\|十\_s*\%(路\|露\_s*盤\)\|冬\_s*青\|微\_s*風\|虚\_s*言\|宙\_s*組\|夫\_s*[夫々]\|返\_s*田\|傴\_s*僂\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|c\_s*e\_s*n\_s*t\_s*i\|妹\_s*尾\|嘲\_s*笑\|海\_s*象\|蒸\_s*[籠篭]\|魑\_s*魅\|凡\_s*て\|典\_s*侍\|季\_s*雄\|天\_s*[皇蛾]\|蘿\_s*蔔\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|夊\_s*繞\|隧\_s*道\|Ｃ\_s*\%(型\|言\_s*語\)\|老\_s*舗\|望\_s*潮\|飛\_s*沫\|L\_s*a\_s*\%(m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|桎\_s*梏\|柳\_s*葉\_s*魚\|衣\_s*魚\|蠹\_s*魚\|汚\_s*点\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|閑\_s*[谷か]\|云\_s*[々云]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|7\_s*月\|７\_s*月\|4\_s*月\|４\_s*[分月]\|羊\_s*[齒歯]\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|不\_s*[忍知]\|後\_s*\%([輪口志目]\|込\_s*み\)\|軍\_s*鶏\|香\_s*菜\|吃\_s*逆\|蝦\_s*蛄\|輸\_s*[出贏]\|隼\_s*[朗郎]\|笋\_s*[干羹]\|縦\_s*容\|睫\_s*毛\|翡\_s*翠\|東\_s*\%(雲\|海\_s*林\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|髑\_s*髏\|匣\_s*鉢\|復\_s*習\|百\_s*日\_s*紅\|胡\_s*孫\_s*眼\|←\_s*→\|霰\_s*弾\|弥\_s*生\|懺\_s*\%(法\|悔\_s*懺\_s*悔\)\|流\_s*[離石]\|蠑\_s*螺\|覇\_s*王\_s*樹\|C\_s*\%([se]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|言\_s*語\|D\_s*店\|型\_s*肝\_s*炎\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|竹\_s*[篦刀筒]\|大\_s*角\_s*豆\|防\_s*人\|曩\_s*に\|向\_s*坂\|一\_s*昨\_s*\%(々\_s*[年日]\|昨\_s*[年日]\)\|實\_s*藤\|甘\_s*藷\|五\_s*月\|月\_s*代\|匂\_s*坂\|税\_s*所\|雑\_s*賀\|骰\_s*子\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|瑞\_s*[典西]\|B\_s*\%(r\|シ\_s*ェ\_s*ル\)\|拡\_s*張\_s*子\|ｓ\_s*ｕ\_s*ｎ\|部\_s*分\|置\_s*換\|ア\_s*ン\_s*チ\_s*モ\_s*ン\|構\_s*造\_s*体\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|加\_s*\%(之\|虐\_s*\%(趣\_s*味\|淫\_s*乱\_s*症\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|珪\_s*素\|ケ\_s*イ\_s*素\|計\_s*測\_s*自\_s*動\_s*制\_s*御\_s*学\_s*会\|ネ\_s*ッ\_s*ト\_s*サ\_s*ー\_s*ビ\_s*ス\|ザ\_s*\%(ッ\_s*ク\|ク\_s*セ\_s*ン\|ビ\_s*ー\_s*ネ\|ウ\_s*バ\_s*ー\|ワ\_s*ー\_s*ク\_s*ラ\_s*ウ\_s*ト\|ム\_s*ザ\|ル\_s*ツ\|イ\_s*\%([ルン]\|ラ\_s*ー\|デ\_s*ル\)\|ー\_s*\%([ルラ]\|メ\_s*ン\)\)\|意\_s*味\|ゼ\_s*ミ\|ナ\_s*ト\_s*リ\_s*ウ\_s*ム\|ゾ\_s*\%(ル\|ン\_s*デ\|ー\_s*\%(ム\|リ\_s*ン\_s*ゲ\_s*ン\)\|フ\_s*ィ\_s*ー\)\|ジ\_s*\%(ム\|ー\_s*\%([グク]\|メ\_s*ン\_s*[スズ]\)\|グ\_s*ム\_s*ン\_s*ト\|ン\_s*\%(メ\_s*ル\|グ\_s*シ\_s*ュ\_s*ピ\_s*ー\_s*ル\|テ\_s*ー\_s*ゼ\)\)\|エ\_s*ス\|硫\_s*黄\)',
-      \ 'T' : '\%([ﾄ乕囚寅虎瀞侶靹舮供纜燭艫朋倶鞆讐讎輩伴共友巴惇沌團団暾丼飩遯燉遁豚禽鷄酉砦塞擒俘虜豐恍惚枢乏塒迚科咎篷笘攴苫鶏伽唱稱鄰隣朿棘刺整鎖處処所床享鴟鵄扉鳶嫁訥刻秋穐晨鴇鬨斎頓幄幃帷柮杤栃閼軣轟屆届咄吶凸駿祀世暁壽繁稔寿豊歳俊利敏年牘悳犢黷慝匿督徳涜∃得特儻釖盜沓納道宕嶝涛萄嶋鬧縢帑塘搨棠樋籘閙梼罩叨夲盪酘兜溏朸稻鞜荅鞳桶黨綯迯鬥擣礑櫂剳淌纛諮棹陦檮磴蘯橦抖榻嶌竇档潼吋鐙亠篤滕讀逗螳蟷稲■鼕幢滔掏當峠読饕疼淘濤籐董悼棟搭痘套＝豆燈桃韜統遠騰橈冬討祷骰藤灯島橙凍刀陶糖謄唐投答等桐鍍研鎔外採盗杜荼覩人摂脱屠賭蠧圖秉觧堵兔礪疾執蚪閇熔登畄砺解睹十菟砿溶獲渡留融泊蠹穫飛磨梳妬説録冨取問途莵汢戸図止翔兎跿富塗砥肚とﾃ瑛晃輝衒寺忝壥靦巓霑殄、鷏躔諂廛碾沾，鷆腆囀槙轉‥：．輾填甜奠顛纒癲恬殿纏展覘篆添梃輦咥垤餮屮銕鐡耋姪跌輟迭逖荻俶廸狄鏑糴笛覿擲迪滴轍的哲敵撤剔徹鐵鉄楴嚏幀鵜羝睇汀棣騁酲柢叮嚔酊掟遉觝釘詆渟眤碵弟碇剃蹄邸締梯悌訂程底偵遞廷逓牴抵呈艇鄭涕啼庭定低照弖てﾂ模幹劈聾辛列貫面汁液露冷錘舶紡系艷艶寉鉉絃橡劒釼剱劔劍剣弦蔓敦鶴幣兵鉗噤鶫償桓恆典恒常夙勉務努勤拙拐抓倹嬬撮詳審爪褄妻募角晦瞑螺円呟礫具粒辻辟罪捉把閊捕寮曹首阜丘元司官柄仕掴遣攫搏疲使窄莟蕾局壷壺坪綱繋壌蝪培霾戊己伝傳鐔翼翅鍔燕唾續約皷鼓続葛綴番栂槌縋弊費序潰終墜遂鎚椎追做殲捏殱繕傍旁創造作熟机佃蹲拒欟坏鴾槻月障砲裹躑榴謹慎愼恙筒包堤痛衝尾突尽支攣就次付椄漬點津附浸繼撞憑盡継嗣搗詰積接通告連つﾁ吃釁巷岐衢粽粡因杠契鵆児交腟帙膣些蟄N窒斉秩父捷矗筑築逐盟税力親邇誓迩近苣尖縮鏤塵趁碪珎鎭亭抻朕狆跛闖鴆砧椿枕鎮陳珍沈賃杖找摘茶嫡着豬儲杼潴紵竚瀦躇箸墸苧緒樗楮⊥躅陟猪捗稙飭敕勅著佻髫鼎迢膓萇脹樢吊漲趙鵈輙雕鬯聽廰窕楪挺輒齠悵塚疔糶澂廳蔦晁昶甼誂微凋帖掉停諜跳眺貼鐇澄提喋頭銚ー蝶暢帳丁牒重逃鳥張弔懲肇徴嘲兆釣聴彫潮町頂調貂庁腸超挑朝丶黜綢儔廚丑※惆肘籌寵鍮冢晝蟲胄冑紬稠酎紐鑄冲沖偸宙虫］｝｛［厨誅鋳紂仲註駐柱注衷籀昼抽中治池岻恥散躓置耻血値夊輊遲笞千稚黹馳家蜘禿穉地魑黐乳智癡致薙褫茅踟緻痴夂知遅ちﾀ便党屯架椽榱樽弛蕩膤鰔鱈盥戯俵袂保躊為樣様爲袒慱彖壇覃膽疸亶靼憺餤緞憚擔褝啗檀綻攤槫站酖殫毯猯潭鄲襌賺椴摶湍湯澹†‡蛋耽W旦痰啖坦眈反C歎嘆誕胆箪譚担淡鍛短單貪探単覊栲妙戲訊攜携尋訪比畴疇類民髱樂娯恃頼愉楽喩例譬滾激斃仆垰嵶殕倒嫋旅貍狸賛敲称讃蹈踏祟湛鬪斗戰闘戦彳佇叩疂疉疊畳箍鏨違互耕畊畉掌店棚到炭辿撻闥斬燵韃巽辰＋援佐扶相輔佑弼助襷髻椨誑胤種塔龍竜糺糜爛漂維伊是理禎直貞惟忠匡徒唯只窘嗜慥確胝鱆鮹凧蛸誥嶽哮茸英豪威毅猛笋筍酣雄健丈斌武靈彈珪承賚珠霊魂卵偶適環弾球玉丹謀莨束縱｜盾鬣奉楯蓼縦竪城質達館忽橘舘瀑薪滝瀧峪溪渓谿谷任尭宇亨臣集昂楼小剛恭岳洪喬嵩尚孚崇尊敬孝隆貴鷹竹篁簟寶財高寳宝但柝拆倬鈬濯魄擢擇柘戳啅鐸澤綰畜企啄磔匠巧択沢逞琢蓄度宅託卓謫托拓紿軆隶殆黛帶替靆抬體躰滯碓平駘擡逮腿当怠玳諦岱鯛對颱袋戴堆態頽苔滞待代帝貸隊褪胎帯体泰退大対矯食埀断炊闌佗長強焚岔給蛇夛足賜揉閉立發躱詫太経貯起薫耐溜絶発手它朶多他勃詑垂誰撓斷裁咤点汰建堪澑田截逹侘經たЦц〜天時×型火土→都吐東上噸瓲│┃台表第木スジ∴Θθザ正ツ¨転透▲△▼▽トチ・…試端タＴТ├┸┳┨┫┝┬〒┷τ┯┤┣┻Τテ┥┰т┠┴T]\|ｯ\_s*[ﾄﾃﾂﾁﾀ]\|ッ\_s*[トテツチタ]\|っ\_s*[とてつちた]\|門\_s*渡\_s*り\|薯\_s*蕷\|船\_s*尾\_s*座\|公\_s*[暁明]\|倫\_s*[子明]\|邑\_s*中\|蜻\_s*蛉\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|蜷\_s*局\|跡\_s*[絶切]\|蜥\_s*蜴\|舎\_s*人\|馴\_s*鹿\|野\_s*老\|瓊\_s*脂\|永\_s*[遠久]\|宿\_s*直\|朱\_s*鷺\|左\_s*見\_s*右\_s*見\|朽\_s*木\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|独\_s*鈷\|季\_s*[衣道栄]\|聡\_s*[明徳]\|祈\_s*年\_s*祭\|淑\_s*[夫子]\|洞\_s*爺\|光\_s*男\|晧\_s*史\|紅\_s*娘\|瓢\_s*虫\|F\_s*e\|I\_s*r\_s*o\_s*n\|劇\_s*村\|滌\_s*除\|２\_s*×\_s*４\|石\_s*\%(蕗\|竜\_s*子\)\|心\_s*[太算]\|自\_s*\%(摸\|模\_s*和\)\|氷\_s*柱\|倩\_s*々\|黴\_s*雨\|入\_s*梅\|梅\_s*雨\|再\_s*見\|備\_s*に\|悉\_s*に\|旋\_s*[風毛]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|1\_s*\%(日\|0\_s*日\)\|１\_s*\%(日\|０\_s*日\)\|朔\_s*日\|美\_s*人\_s*局\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|字\_s*\%(牌\|一\_s*色\)\|少\_s*と\|義\_s*父\|主\_s*[殿税]\|周\_s*夫\|睦\_s*子\|渠\_s*睦\_s*子\|萵\_s*苣\|身\_s*柱\|似\_s*指\|清\_s*\%(老\_s*頭\|一\_s*色\)\|青\_s*\%([幇島]\|梗\_s*菜\|椒\_s*肉\_s*絲\)\|全\_s*帯\|昌\_s*洙\|江\_s*蘇\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|焼\_s*豚\|叉\_s*焼\|察\_s*哈\_s*爾\|餃\_s*子\|雑\_s*砕\|炒\_s*[麺飯]\|北\_s*谷\|甘\_s*露\_s*子\|錯\_s*和\|総\_s*角\|一\_s*[日寸]\|植\_s*字\|金\_s*魚\_s*蝨\|魚\_s*[屋蝨]\|草\_s*石\_s*蚕\|春\_s*\%(麗\|宮\_s*坊\)\|九\_s*\%(十\_s*九\|連\_s*宝\_s*[燈灯]\)\|揺\_s*蕩\|容\_s*易\|白\_s*痴\|猶\_s*豫\|蜑\_s*民\|段\_s*銭\|蒲\_s*公\_s*英\|騨\_s*州\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|仮\_s*令\|打\_s*[擲坐]\|七\_s*\%(夕\|対\_s*子\)\|活\_s*計\|方\_s*便\|無\_s*料\|黄\_s*\%(昏\|蜀\_s*葵\)\|胼\_s*胝\|章\_s*魚\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|壮\_s*聡\|煙\_s*草\|殺\_s*陣\|賢\_s*明\|性\_s*質\|怱\_s*ち\|亢\_s*ぶ\|堂\_s*子\|学\_s*聡\|能\_s*[文之]\|内\_s*匠\|松\_s*明\|奈\_s*子\|幇\_s*間\|切\_s*符\|デ\_s*ィ\_s*ス\|３\_s*ｒ\_s*ｄ\|閾\_s*値\|ソ\_s*\%(ー\_s*[トンプ]\|ロ\_s*ー\)\|ヘ\_s*ー\_s*グ\|ゼ\_s*[インムア]\|セ\_s*\%(オ\|ル\_s*マ\|ロ\_s*\%(ン\|ニ\_s*ア\_s*ス\)\|ラ\_s*ピ\_s*\%(ー\|ス\_s*ト\)\)\|シ\_s*\%(ン\|ッ\_s*ク\|ス\_s*ル\|ア\_s*タ\_s*ー\|ソ\_s*ー\_s*ラ\_s*ス\|オ\_s*ド\_s*ア\|ー\_s*[フタ]\)\|サ\_s*\%([イム]\|ミ\_s*ン\_s*グ\|ウ\_s*ザ\_s*ン\_s*ド\|ラ\_s*ブ\_s*レ\_s*ッ\_s*ド\|ー\_s*\%([ドモ]\|テ\_s*ィ\|ス\_s*ト\_s*ン\|ズ\_s*デ\_s*[イーィ]\|マ\_s*ル\)\|ッ\_s*チ\_s*ャ\_s*ー\|ン\_s*\%(ク\|ダ\_s*ー\|キ\_s*ュ\_s*ー\)\|リ\_s*ド\_s*マ\_s*イ\_s*ド\)\|ポ\_s*リ\_s*ペ\_s*プ\_s*チ\_s*ド\|三\_s*\%(和\_s*土\|連\_s*文\_s*字\)\|\\\_s*T\_s*e\_s*X\|教\_s*科\_s*書\|文\_s*字\_s*列\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|用\_s*語\|電\_s*\%([視話]\|気\_s*通\_s*信\_s*研\_s*究\_s*所\)\)',
-      \ 'U' : '\%([ｳ孳蛤礼敬恭洞鱗愛潤騒煩粳漆閏患慯悄騷恙愁呻楳梅嫐釉噂耘吽褞曇黄紜云繧慍薀蘊暈運錙怏麗羨卦憾怨恨占卜末嬉心裏浦糶瓜汝己畴畆畦疇畝踈疎宜諾奪姥腕莵兔驢鑿穿嗽魘唸促令項頷訴獺鷽嘯嘘蠕蠢動覘窺伺海台萼唱詠謌唄宴讌転詩謠謡謳疑歌葎鯏鴬鶯ヱゑゐヰ鶉疼堆踞蹲渦舂臼碓羅薄食筌槽朮肯凵魚巧茨廐廏厩鰻午甘秣孫餞馬旨冩遷寫蔚暎噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆雲氏上後喪艮丑潮牛裡鬱中欝袿梁家内禹憂埋挧撃雨打宇得植請鵜熟績嫗攴有夘受茹泛生討羽胡右紆傴盂饂承菟飢烏攵于射倦芋賣卯享搏失齲撲兎売産膿迂浮う¨↑∪ＵυウуУΥU]\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蠎\_s*蛇\|蟒\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|楽\_s*官\|雅\_s*楽\_s*[頭寮]\|干\_s*莉\|維\_s*納\|太\_s*秦\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|イ\_s*ギ\_s*リ\_s*ス\|オ\_s*マ\_s*ル\|識\_s*別\_s*不\_s*能\|共\_s*\%(用\_s*体\|有\_s*体\)\|ア\_s*\%([スン]\|グ\_s*リ\_s*ー\|ー\_s*\%(シ\_s*ュ\_s*ラ\|ジ\_s*ェ\_s*ン\_s*ト\|バ\_s*ン\)\|ル\_s*テ\_s*ィ\_s*メ\_s*ッ\_s*ト\|ポ\_s*ン\|ッ\_s*\%(プ\|パ\_s*ー\|シ\_s*ャ\_s*ー\)\)\|単\_s*\%(位\|一\_s*化\)\|ユ\_s*\%([タニー]\|ト\_s*\%(リ\_s*ロ\|レ\_s*ヒ\_s*ト\)\|リ\_s*\%(ア\|シ\_s*ー\_s*ズ\)\|プ\_s*シ\_s*ロ\_s*ン\|ネ\_s*ス\_s*コ\|ナ\_s*\%(カ\_s*イ\_s*ト\|イ\_s*テ\_s*ッ\_s*ド\)\|ビ\_s*キ\_s*\%(タ\_s*ス\|ノ\_s*ン\)\)\)',
-      \ 'V' : '\%([：├値Ｖ⊥版Вв↓∨ヴV]\|ｯ\_s*ｳ\_s*ﾞ\|ッ\_s*ヴ\|っ\_s*ヴ\|ｳ\_s*ﾞ\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|ｖ\_s*ｓ\_s*．\|チ\_s*ェ\_s*ロ\|ヰ\_s*タ\| \_s*ビ\_s*ク\_s*ト\_s*ー\_s*ル\|視\_s*覚\|仮\_s*想\|ニ\_s*ス\|変\_s*数\|恒\_s*真\|ワ\_s*\%(デ\_s*ィ\_s*ム\|ギ\_s*ナ\|ニ\_s*ス\|セ\_s*リ\_s*ン\|ク\_s*チ\_s*ン\|ル\_s*キ\_s*ュ\_s*ー\_s*レ\|レ\_s*リ\_s*ー\|ー\_s*ニ\_s*ャ\)\|語\_s*彙\|ボ\_s*\%(ス\_s*ト\_s*ー\_s*ク\|ン\_s*ゴ\_s*レ\|ル\_s*\%([ガボトタ]\|テ\_s*\%(ッ\_s*ク\_s*ス\|ー\_s*[ジル]\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ラ\_s*ン\_s*\%(チ\|テ\_s*ィ\_s*ア\|タ\_s*リ\_s*ー\)\|レ\_s*ー\|コ\_s*ー\_s*ダ\|ー\_s*\%([ントグ]\|ル\_s*ト\|ド\_s*ビ\_s*\%(ル\|リ\_s*ア\_s*ン\)\|パ\_s*ル\|ダ\_s*フ\_s*ォ\_s*ン\|カ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\|キ\_s*ャ\_s*ブ\_s*ラ\_s*リ\|イ\_s*\%([ドス]\|ジ\_s*ャ\_s*ー\|シ\_s*ン\_s*グ\)\)\|ヘ\_s*ッ\_s*ト\|冗\_s*長\_s*な\|垂\_s*直\|フ\_s*\%(ァ\_s*\%(ン\|ド\_s*ー\_s*ツ\)\|ォ\_s*\%(ン\|ル\_s*\%(ク\|カ\_s*ー\)\)\|ェ\_s*ル\_s*メ\_s*ー\_s*ル\)\|ウ\_s*\%(ラ\_s*\%(デ\_s*ィ\_s*ミ\_s*ー\_s*ル\|ジ\_s*\%(ミ\_s*ー\_s*ル\|ー\_s*ミ\_s*ル\|オ\_s*ス\_s*ト\_s*\%(ク\|ッ\_s*ク\)\)\)\|ィ\_s*\%(ン\_s*ナ\|ル\_s*ス\)\|ォ\_s*ッ\_s*カ\|イ\_s*\%(ル\_s*ス\|ン\_s*ナ\_s*ー\)\|ェ\_s*\%(ル\_s*ギ\_s*リ\_s*ウ\_s*ス\|ヌ\_s*ス\)\)\|ビ\_s*\%([アラブバスザ]\|ガ\_s*ー\|ハ\_s*ー\_s*ラ\|タ\_s*ミ\_s*ン\|レ\_s*\%(ッ\_s*ジ\|ロ\_s*イ\)\|ビ\_s*\%(ア\_s*ン\|ッ\_s*ド\)\|ッ\_s*\%(ク\|キ\_s*ー\)\|セ\_s*ン\_s*テ\|ク\_s*\%(タ\_s*ー\|ト\_s*\%(ル\|リ\_s*[ーア]\)\)\|シ\_s*\%(ャ\_s*ス\|ソ\_s*ワ\_s*ー\_s*ズ\)\|ン\_s*\%([チス]\|ソ\_s*ン\|テ\_s*ー\_s*ジ\|セ\_s*ン\_s*ト\)\|ネ\_s*\%(ガ\_s*ー\|グ\_s*レ\_s*ッ\_s*ト\)\|ニ\_s*\%([ール]\|リ\_s*デ\_s*ン\)\|ュ\_s*ー\|エ\_s*ン\_s*チ\_s*ャ\_s*ン\|ジ\_s*\%(ャ\|ッ\_s*ト\|タ\_s*ー\|ョ\_s*\%(ン\|ナ\_s*リ\_s*ー\)\|ュ\_s*ア\_s*\%(ル\|ラ\_s*イ\_s*\%(ズ\|ゼ\_s*ー\_s*シ\_s*ョ\_s*ン\)\)\)\|ダ\_s*ル\|デ\_s*オ\|ル\_s*\%(ゴ\|ヌ\_s*ー\_s*ブ\)\|オ\_s*ラ\|リ\_s*ジ\_s*ア\_s*ン\|ィ\_s*ー\_s*ナ\_s*ス\|ー\_s*\%(ボ\|ル\_s*ス\|ク\_s*ル\|ナ\_s*ス\)\)\|ベ\_s*\%([ガラン]\|ト\_s*ナ\_s*ム\|イ\_s*ダ\_s*ー\|ー\_s*\%(ル\|ダ\_s*ー\)\|テ\_s*ラ\_s*ン\|ッ\_s*セ\_s*ル\|ス\_s*\%([トタパ]\|ビ\_s*オ\)\|ク\_s*\%(タ\|ト\_s*ル\)\|ジ\_s*タ\_s*\%(ブ\_s*ル\|リ\_s*ア\_s*ン\)\|リ\_s*\%([ィー]\|フ\_s*ァ\_s*イ\|サ\_s*イ\_s*ン\)\|ロ\_s*\%(ナ\|シ\_s*テ\_s*ィ\|ー\_s*ナ\|ニ\_s*[カク]\)\|ル\_s*\%(デ\|ベ\_s*ッ\_s*ト\|ダ\_s*ン\|レ\_s*ー\_s*ヌ\|サ\_s*\%(ー\_s*チ\|イ\_s*ユ\)\|モ\_s*ッ\_s*ト\)\|ノ\_s*ム\|ニ\_s*[スヤア]\|ネ\_s*\%(シ\_s*ャ\_s*ン\|ツ\_s*ィ\_s*ア\|チ\_s*ア\|ズ\_s*エ\_s*ラ\)\)\|バ\_s*\%([ルン]\|イ\_s*\%([アブンオ]\|パ\_s*ー\|タ\_s*\%(ル\|リ\_s*テ\_s*ィ\)\|キ\_s*ン\_s*グ\|ザ\_s*ー\|シ\_s*ャ\)\|ッ\_s*ト\|チ\_s*カ\_s*ン\|ギ\_s*ナ\|ガ\_s*ボ\_s*ン\_s*ド\|ラ\_s*\%(ナ\_s*シ\|エ\_s*テ\_s*ィ\)\|サ\_s*ロ\|ス\_s*\%(コ\|ケ\_s*ス\)\|カ\_s*ン\_s*ス\|ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|キ\_s*ュ\_s*ー\_s*ム\|ウ\_s*チ\_s*ャ\_s*ー\|リ\_s*\%(ン\|エ\_s*ー\_s*シ\_s*ョ\_s*ン\|ュ\_s*ー\|ア\_s*\%(ブ\_s*ル\|ン\_s*ト\)\|ッ\_s*ド\|デ\_s*ー\_s*シ\_s*ョ\_s*ン\)\|ヌ\_s*ア\_s*ツ\|ニ\_s*\%(ラ\|ー\_s*ユ\)\|レ\_s*\%([ラー]\|ロ\_s*ン\|リ\_s*ー\|ン\_s*\%(シ\_s*ア\|チ\_s*ノ\|タ\_s*イ\_s*ン\)\)\|ー\_s*\%([ゴグ]\|チ\_s*ャ\_s*ル\|リ\_s*ト\_s*ゥ\_s*ー\_s*ド\|バ\_s*ル\|ボ\_s*ス\|ベ\_s*ナ\|テ\_s*ィ\_s*カ\_s*ル\|サ\_s*ス\|ジ\_s*\%(ン\|ニ\_s*ア\|ョ\_s*ン\)\|ノ\_s*ン\|ニ\_s*ア\|モ\_s*ン\_s*ト\|ミ\_s*\%(リ\_s*オ\_s*ン\|キ\_s*ュ\_s*ラ\_s*イ\_s*ト\)\)\|ナ\_s*\%(キ\_s*ュ\_s*ラ\_s*ー\|ジ\_s*ウ\_s*ム\)\)\|ブ\_s*\%(イ\|ラ\_s*\%(ド\|ッ\_s*ド\)\|ー\_s*ド\_s*ゥ\_s*ー\)\)',
-      \ 'W' : '\%([ｦヲ女翁尾汚小惜男緒牡雄をｳ孳蛤礼敬恭洞鱗愛潤騒粳漆閏慯悄騷恙愁呻楳梅嫐釉噂耘吽褞曇紜云繧慍薀蘊暈運錙怏麗羨U卦憾怨恨占卜末嬉心裏浦糶瓜汝己υΥ畴畆畦疇畝踈疎宜諾奪姥莵兔驢鑿穿嗽魘唸促令項頷訴獺鷽嘯嘘蠕蠢動覘窺伺台萼唱詠謌唄宴讌転詩謠謡謳疑歌葎鯏鴬鶯ヱゑ鶉疼堆踞蹲渦舂臼碓羅薄食筌槽朮肯凵魚巧茨廐廏厩鰻午甘秣孫餞馬旨冩遷寫蔚暎噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆氏↑上後喪艮丑潮牛裡鬱中欝袿梁家内禹憂埋挧撃雨打宇得植請鵜熟績嫗攴有夘受茹泛生討胡右紆傴盂饂承菟飢烏攵于射倦芋賣卯享搏失齲撲兎売産膿迂浮うヰ居ゐﾜ叫喚÷惡悪原稿嗤妾蕨童藁鞋笑灣萬豌綰万弯彎椀雲腕碗湾横往黄皇羂罠纔毫微僅患煩術伎厄禍災態業技佗王鰐忘掖弁腋譯緜腸亙道渉航弥亘棉渡綿私薈隈賄淮脇矮猥歪轍海蟠儂∪觧解頒判訣別稚若或枠惑鷲和環吾杷啝湧我涌輪破分把萵詫訳羽沸倭割話侘琶わ幅水∧波ＷウワW]\|ｯ\_s*[ｦヱｳヰﾜ]\|ッ\_s*[ヲヱウヰワ]\|っ\_s*[をゑうゐわ]\|乎\_s*古\_s*止\_s*点\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蠎\_s*蛇\|蟒\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|楽\_s*官\|雅\_s*楽\_s*[頭寮]\|干\_s*莉\|維\_s*納\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|草\_s*鞋\|（\_s*笑\_s*）\|(\_s*笑\_s*)\|戦\_s*慄\|俳\_s*優\|勿\_s*忘\_s*草\|早\_s*[生稲]\|山\_s*葵\|戯\_s*奴\|度\_s*会\|Y\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|Ｙ\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|華\_s*盛\_s*頓\|裙\_s*蔕\_s*菜\|理\_s*[由解]\|公\_s*魚\|病\_s*葉\|大\_s*東\_s*亜\_s*戰\_s*爭\|太\_s*\%(秦\|平\_s*洋\_s*戦\_s*争\)\|歐\_s*州\_s*大\_s*戰\|第\_s*\%(二\_s*次\_s*世\_s*界\_s*大\_s*戦\|一\_s*次\_s*世\_s*界\_s*大\_s*戦\)\|ブ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ロ\_s*ン\_s*グ\|レ\_s*\%(ン\|イ\_s*ス\|ッ\_s*カ\_s*ー\|ス\_s*\%(ラ\_s*ー\|リ\_s*ン\_s*グ\)\)\|リ\_s*\%(ー\_s*ス\|ン\_s*ク\_s*ル\|ス\_s*ト\)\|書\_s*き\_s*込\_s*み\|ラ\_s*\%(ッ\_s*\%([プパ]\|ピ\_s*ン\_s*グ\)\|イ\_s*\%([タト]\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ボ\_s*ル\_s*フ\|フ\_s*\%([ムー]\|ァ\_s*イ\_s*ル\|ィ\_s*\%(ー\_s*ト\|ッ\_s*チ\)\)\|ホ\_s*\%(エ\_s*[イーア]\|ー\_s*ル\|イ\_s*\%(ー\_s*\%(ル\|ラ\_s*ー\)\|ッ\_s*\%(プ\|ス\_s*ル\|パ\_s*ー\|ト\_s*\%(ニ\_s*ー\|マ\_s*ン\)\)\)\|ワ\_s*\%(イ\|ッ\_s*[トツ]\)\)\|ベ\_s*ル\_s*ナ\_s*ー\|w\_s*e\_s*b\_s*サ\_s*\%(イ\_s*ト\|ー\_s*\%(バ\|ビ\_s*ス\)\)\|警\_s*告\|バ\_s*ル\_s*タ\_s*ー\|ヴ\_s*\%(ュ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ォ\_s*ル\_s*フ\|ィ\_s*\%([ーム]\|ル\_s*\%(ム\|ヘ\_s*ル\_s*ム\)\)\|ェ\_s*\%(ン\_s*ダ\_s*ー\_s*ス\|ル\_s*ナ\_s*ー\|ー\_s*バ\_s*ー\|イ\_s*ユ\)\|ァ\_s*\%(イ\_s*[ンス]\|ー\_s*グ\_s*ナ\_s*ー\|ン\_s*ダ\|ル\_s*\%(タ\_s*ー\|キ\_s*ュ\_s*ー\_s*レ\)\)\)\|ダ\_s*ブ\_s*リ\_s*ュ\_s*ー\|タ\_s*ン\_s*グ\_s*ス\_s*テ\_s*ン\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\)',
-      \ 'X' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁＸхХΞ×ξX]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|シ\_s*ロ\_s*\%(ホ\_s*ン\|フ\_s*ォ\_s*ン\)\|ジ\_s*オ\_s*ン\|ゼ\_s*\%(ビ\_s*ウ\_s*ス\|ロ\_s*\%(ッ\_s*ク\_s*ス\|グ\_s*ラ\_s*フ\_s*ィ\)\)\|ハ\_s*ビ\_s*エ\_s*ル\|ザ\_s*\%(ン\|ビ\_s*エ\_s*ル\)\|キ\_s*\%(シ\_s*\%(ロ\|レ\_s*ン\|リ\_s*ト\_s*ー\_s*ル\)\|セ\_s*ノ\_s*ン\|サ\_s*ン\_s*\%(チ\_s*ン\|タ\_s*ン\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|ク\_s*\%(シ\_s*ー\|ロ\_s*ス\_s*ポ\_s*ス\_s*ト\|セ\_s*\%(ナ\_s*キ\_s*ス\|ノ\_s*フ\_s*ォ\_s*ン\)\|ザ\_s*ヴ\_s*ィ\_s*エ\|サ\_s*\%(イ\|ン\_s*\%(ト\_s*ス\|チ\_s*ッ\_s*ペ\|テ\_s*ィ\_s*ッ\_s*ペ\)\)\|リ\_s*ス\_s*マ\_s*ス\)\|エ\_s*\%(ク\_s*ス\|ッ\_s*ク\_s*ス\)\)',
-      \ 'Y' : '\%([ﾖ艾蒿蓬娵嫁齡齢據頼弱憙歓鎧万萬過便婚汚涎捩翊緘峪杙慾欲翌翼抑米比裝粧装澱淀縦誼祥葭悦宜克純圭禎葦慶禧美淑芳喜吉義瘍樣踴榕踊燿謠廱姚慂曄瀁瑶恙蓉遙怏雍痒珱陶孕漾昜暘甬幺癢泱癰窰慵穃鷹瓔煬邀遥拗擁瑤窯徭膺窈殀曜耀庸夭揚葉蛹腰羊熔杳沃壅様妖用溶佯謡陽洋嘉宵蘇蘓甦辟奸横豫代除譽歟喚預読誉蕷輿攀余縒呼避４世譱詠丗能予撚憑餘畭酔醉與飫舁四訓選与讀よﾕ潤赦弛緩聴岼閖梦努纈∴故濯檠穰豐豊倖志裄之幸雪趾梼讓譲牀縁紫浴床俑犹蚰酉莠邑攸黝熊尢蝣蕕猷悒囿佳尤佑〒右郵涌祐侑游猶湧融宥夕幽悠釉友雄憂有臾渝瘉愉征諭徃遊揺逾覦茹揄由蝓兪淘結輸諛搖揃弓楡瑜踰柚油喩汰腴ゆｲΗη賤鄙卑苟嫌妹湯藷芋夢艷鑪鈩彩鱗色鯆忽綺貸甍応答愈圦杁霪隱蚓寅氤酳胤飮韵尹茵贇蔭婬湮堙吋廴I音慇韻咽淫殞姻隕院允殷隠陰窟巌巖頌祝鰛鰮鰯岩磐鼾歪弑弋抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗印嘶鰍電引躄誘動忿≦鵤錨碇怒霆雷霹凧桴筏Ιι魚菴庵雖尿荊棘茨祈祷命猯豕古伍乙鎰鴪聿軼樹慈悼愴慯労格到至傷鼬頂戴徒致鈑痛板柞砂沙些聊潔諍烈功諫勳勲勇漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息指挑拠縷絲厭營営愛幼緒遑暇糸Ｉ弌壹肆莓苺櫟著市碑鐓礎甃臀弩石犧牲犠池溢佚壱1１燠鬻礇毓粥的戦戰軍幾郁一稲許否飯洟位違居姨猗斎偽噫逝医鑄痍委囲云圍ゐ挿炒彙要熨饐醫言矮往詒威懿入如僞忌彜煎逶緯韋唯莞淹胃善生恚彝惟以活蔚為猪衣倚幃斐移鮪将可偉畏五夷李渭怡貽癒依逸井慰行伊爲胆射詑矣頤熬萎良凍出椅率好揖肄痿鋳謂帷亥苡意維遺鰄異去堰容囗いﾔ稚稍飲鎗鑓槍孀寡鰥Я碼傭雇闇敗吝薮藪殕脂寄宿櫓軈軅簗梁S漸鋏刃灸和柔軟窶鱧奴僕萢優柳喧宅館舘輩族鏃龠檪≒譯籥鑰蜴繹藥葯扼益厄疫躍約役訳薬疚疾岾楊谺邪薯犲豺〈《》〉山壥邸廛豢養社鑢育廉寧尉裕恭泰易休保康安靖笶八熄演谷焼彌冶⇔也輻破辭埜痩野屋家病椰爺已矢燒⇒灼妬耶遣瘠哉罷夜殺止揶辞弥やＹеЕ円￥←↓↑→ёЁ━─ユヤヨЙυイЫыйΥY]\|ｯ\_s*[ﾖﾕｲﾔ]\|ッ\_s*[ヨユイヤ]\|っ\_s*[よゆいや]\|欧\_s*羅\_s*巴\|歐\_s*羅\_s*巴\|尸\_s*童\|蹌\_s*踉\|蹣\_s*跚\|終\_s*夜\|4\_s*\%([項者つ日]\|番\_s*目\|種\_s*類\)\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|他\_s*所\|仁\_s*史\|隆\_s*克\|尚\_s*武\|孝\_s*高\|悌\_s*也\|賀\_s*[子悟]\|彬\_s*伯\|栄\_s*伸\|宗\_s*生\|新\_s*生\|昌\_s*[美男]\|暢\_s*[子一]\|永\_s*沈\|８\_s*日\|8\_s*日\|黄\_s*泉\|左\_s*手\|百\_s*合\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|Ｕ\_s*\%(字\|タ\_s*ー\_s*ン\)\|鞦\_s*韆\|強\_s*請\|梅\_s*桃\|桜\_s*桃\|靫\_s*負\|宙\_s*美\|礼\_s*暁\|温\_s*\%(雄\|泉\_s*津\)\|長\_s*庚\|昨\_s*夜\|又\_s*木\|木\_s*綿\|E\_s*\%(u\|メ\_s*ー\_s*ル\)\|祖\_s*谷\|文\_s*身\|郎\_s*[女子]\|刺\_s*[青草]\|蕁\_s*麻\|U\_s*\%(字\|タ\_s*ー\_s*ン\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*[向青]\|況\_s*ん\_s*や\|所\_s*[以縁謂]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%([一桃蘭]\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|小\_s*魚\|鯨\_s*魚\|細\_s*小\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|気\_s*吹\|従\_s*[妹姉弟兄]\|公\_s*孫\_s*樹\|鴨\_s*脚\_s*樹\|G\_s*\%(l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|巫\_s*子\|神\_s*巫\|無\_s*花\_s*果\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|不\_s*[可如]\|守\_s*宮\|燕\_s*龍\_s*茶\|両\_s*班\|流\_s*鏑\_s*馬\|柵\_s*原\|箭\_s*[田内]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|自\_s*棄\|火\_s*傷\|徐\_s*ら\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|天\_s*蚕\|倭\_s*絵\|日\_s*本\_s*武\_s*尊\|大\_s*和\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|香\_s*具\_s*師\|玄\_s*孫\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\)\|妥\_s*子\|寿\_s*[詞男]\|エ\_s*\%(ホ\_s*バ\|フ\_s*ゲ\_s*ニ\_s*ー\|レ\_s*ヴ\_s*ァ\_s*ン\|ニ\_s*セ\_s*イ\|ー\_s*ル\)\|ワ\_s*イ\)',
-      \ 'Z' : '\%([空損存揃園薗底足束續屬∈∋賊続粟族俗属僧慥噌梍賍臟臧贓憎像臓贈象増造添初曾反沿曽ぞ譱然苒繕禪薇千蠕∀髯禅善漸冉前全關関蝉膳錢銭絶勢噬説筮贅脆税是攻責ぜ狡詰桷寸喘鮨附◆髓蘂膸蕋惴蕊隧隋隨瑞髄随豆廚圖付津頭酢厨好図逗鶴刷ず塩嶋縞島嶌橲衄衂宍竺舳忸軸舌祖喰食直凝日實昵印闍者鮭邪蛇麝搦着惹尺鉐雀寂若弱尻稔仭糂贐潯儘仞盡刄臣侭恁進訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敘恕耡汝莇杼茹敍蜍洳舒縟辱褥蓐溽所抒鋤徐序絮叙助釀淨疂絛繞壌諚孃瀞襄仍蟐拯疉讓聶驤生帖仗躡穰乘塲靜繩禳蕘壤遶星滌茸嬲疊如醤剩娘嬢錠静醸縄女尉饒丈成擾穣烝嫋丞場杖條条蒸貞状攘剰畳冗定浄乗情城上常譲濡得戍就嬬鷲竪讐讎懦愀咒聚隼詢徇笋凖盾楯筍篤蓴惇洵淳閏諄恂馴旬荀潤循醇巡遵順准殉純準襦誦需戌朮孰宿塾珠熟恤術述孺呪豎儒綬樹受授壽鞣狃澀揉廿拾縱中從糅从戎澁蹂神汁獸絨縦渋柔什充十獣従住銃重岻治除士染時怩至児冶璽只畤侍孳轜耳示次寿辭粫司二祀邇而慈峙爺以地塒珥迩痔死敷恃蒔磁瓷仁字尓焦膩柱似嗣子亊路史餌兒滋仕爾辞弍自茲持寺事知じ騒沢澤猿笊晒曝皿鮫山算参鏨慘竄懴殘塹巉懺嶄讒惨暫慚慙斬残実笹酒坂盛三崎嵜桜榴雜襍棹竿雑濟才西斉済劑戝剤材財罪在冴覚左咲挫藏裂醒坐蔵差冷座戯ざ→↑ЬьЪъ↓←Жжズゾ零〇〒ザＺジゼзζЗΖZ]\|ｯ\_s*\%(ｿ\_s*ﾞ\|ｾ\_s*ﾞ\|ｽ\_s*ﾞ\|ｼ\_s*ﾞ\|ｻ\_s*ﾞ\)\|ッ\_s*[ゾゼズジザ]\|っ\_s*[ぞぜずじざ]\|ｿ\_s*ﾞ\|簇\_s*生\|双\_s*紙\|草\_s*[履紙子]\|ｾ\_s*ﾞ\|台\_s*詞\|０\_s*次\|発\_s*条\|撥\_s*条\|發\_s*条\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|世\_s*阿\_s*弥\|ｽ\_s*ﾞ\|相\_s*撲\|木\_s*菟\|修\_s*法\|杜\_s*撰\|調\_s*所\|徒\_s*[罪刑]\|螟\_s*虫\|芋\_s*茎\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|ｼ\_s*ﾞ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|J\_s*\%(I\_s*S\_s*コ\_s*ー\_s*ド\|ポ\_s*ッ\_s*プ\|R\_s*東\_s*日\_s*本\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|著\_s*語\|杓\_s*子\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|Ｊ\_s*\%(リ\_s*ー\_s*グ\|ポ\_s*ッ\_s*プ\|Ｕ\_s*Ｎ\_s*Ｋ\_s*Ｏ\)\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｻ\_s*ﾞ\|搾\_s*菜\|蜊\_s*蛄\|粗\_s*目\|槧\_s*本\|散\_s*切\_s*り\|沙\_s*汰\|石\_s*榴\|柘\_s*榴\|細\_s*工\|亜\_s*鉛\|サ\_s*\%(モ\_s*ラ\|ン\_s*ポ\_s*ー\_s*ニ\_s*ャ\|ラ\_s*ゴ\_s*サ\)\|シ\_s*\%(タ\_s*ー\_s*ル\|オ\_s*\%(ン\|ニ\_s*\%(ス\_s*ト\|ズ\_s*ム\)\)\)\|チ\_s*\%(ク\_s*ル\_s*ス\|ア\_s*ノ\_s*ー\_s*ゼ\|ュ\_s*ー\_s*リ\_s*\%(ヒ\|ッ\_s*ヒ\)\|ャ\_s*ル\_s*ダ\_s*ッ\_s*シ\_s*ュ\|ゴ\_s*イ\_s*ネ\_s*ル\_s*ワ\_s*イ\_s*ゼ\_s*ン\)\|ツ\_s*\%(ァ\_s*\%(ラ\_s*ト\_s*ゥ\_s*ス\_s*ト\_s*ラ\|イ\_s*ト\)\|ェ\_s*\%(ナ\_s*ー\|ッ\_s*ペ\_s*リ\_s*ン\|ル\_s*マ\_s*ッ\_s*ト\)\|ィ\_s*\%(ク\_s*ル\_s*ス\|タ\_s*ー\|ー\_s*グ\_s*ラ\_s*ー\|ン\_s*\%(バ\_s*ロ\_s*ン\|マ\_s*ー\_s*マ\_s*ン\)\|ゴ\_s*イ\_s*ネ\_s*ル\)\)\)',
-    \ }
-endfunction
diff --git a/bundle/easymotion/autoload/EasyMotion/sticky_table.vim b/bundle/easymotion/autoload/EasyMotion/sticky_table.vim
deleted file mode 100755
index 7e962c8..0000000
--- a/bundle/easymotion/autoload/EasyMotion/sticky_table.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-" Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-"
-let EasyMotion#sticky_table#us = {
-      \',' : '<', '.' : '>', '/' : '?',
-      \'1' : '!', '2' : '@', '3' : '#', '4' : '$', '5' : '%',
-      \'6' : '^', '7' : '&', '8' : '*', '9' : '(', '0' : ')', '-' : '_', '=' : '+',
-      \';' : ':', '[' : '{', ']' : '}', '`' : '~', "'" : "\"", '\' : '|',
-      \}
-
-let EasyMotion#sticky_table#jp = {
-      \',' : '<', '.' : '>', '/' : '?',
-      \'1' : '!', '2' : '"', '3' : '#', '4' : '$', '5' : '%',
-      \'6' : '&', '7' : "'", '8' : '(', '9' : ')', '0' : '_', '-' : '=', '^' : '~',
-      \';' : '+', ':' : '*', '[' : '{', ']' : '}', '@' : '`', '\' : '|',
-      \}
-
-" Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/autoload/vital.vim b/bundle/easymotion/autoload/vital.vim
deleted file mode 100755
index 1004dfc..0000000
--- a/bundle/easymotion/autoload/vital.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-function! vital#of(name) abort
-  let files = globpath(&runtimepath, 'autoload/vital/' . a:name . '.vital')
-  let file = split(files, "\n")
-  if empty(file)
-    throw 'vital: version file not found: ' . a:name
-  endif
-  let ver = readfile(file[0], 'b')
-  if empty(ver)
-    throw 'vital: invalid version file: ' . a:name
-  endif
-  return vital#_{substitute(ver[0], '\W', '', 'g')}#new()
-endfunction
diff --git a/bundle/easymotion/autoload/vital/_easymotion.vim b/bundle/easymotion/autoload/vital/_easymotion.vim
deleted file mode 100755
index a08013a..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion.vim
+++ /dev/null
@@ -1,304 +0,0 @@
-let s:self_version = expand('<sfile>:t:r')
-
-" Note: The extra argument to globpath() was added in Patch 7.2.051.
-let s:globpath_third_arg = v:version > 702 || v:version == 702 && has('patch51')
-
-let s:loaded = {}
-
-function! s:import(name, ...) abort
-  let target = {}
-  let functions = []
-  for a in a:000
-    if type(a) == type({})
-      let target = a
-    elseif type(a) == type([])
-      let functions = a
-    endif
-    unlet a
-  endfor
-  let module = s:_import(a:name)
-  if empty(functions)
-    call extend(target, module, 'keep')
-  else
-    for f in functions
-      if has_key(module, f) && !has_key(target, f)
-        let target[f] = module[f]
-      endif
-    endfor
-  endif
-  return target
-endfunction
-
-function! s:load(...) dict abort
-  for arg in a:000
-    let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg]
-    let target = split(join(as, ''), '\W\+')
-    let dict = self
-    while 1 <= len(target)
-      let ns = remove(target, 0)
-      if !has_key(dict, ns)
-        let dict[ns] = {}
-      endif
-      if type(dict[ns]) == type({})
-        let dict = dict[ns]
-      else
-        unlet dict
-        break
-      endif
-    endwhile
-
-    if exists('dict')
-      call extend(dict, s:_import(name))
-    endif
-    unlet arg
-  endfor
-  return self
-endfunction
-
-function! s:unload() abort
-  let s:loaded = {}
-endfunction
-
-function! s:exists(name) abort
-  return s:_get_module_path(a:name) !=# ''
-endfunction
-
-function! s:search(pattern) abort
-  let paths = s:_vital_files(a:pattern)
-  let modules = sort(map(paths, 's:_file2module(v:val)'))
-  return s:_uniq(modules)
-endfunction
-
-function! s:expand_modules(entry, all) abort
-  if type(a:entry) == type([])
-    let candidates = s:_concat(map(copy(a:entry), 's:search(v:val)'))
-    if empty(candidates)
-      throw printf('vital: Any of module %s is not found', string(a:entry))
-    endif
-    if eval(join(map(copy(candidates), 'has_key(a:all, v:val)'), '+'))
-      let modules = []
-    else
-      let modules = [candidates[0]]
-    endif
-  else
-    let modules = s:search(a:entry)
-    if empty(modules)
-      throw printf('vital: Module %s is not found', a:entry)
-    endif
-  endif
-  call filter(modules, '!has_key(a:all, v:val)')
-  for module in modules
-    let a:all[module] = 1
-  endfor
-  return modules
-endfunction
-
-function! s:_import(name) abort
-  if type(a:name) == type(0)
-    return s:_build_module(a:name)
-  endif
-  let path = s:_get_module_path(a:name)
-  if path ==# ''
-    throw 'vital: module not found: ' . a:name
-  endif
-  let sid = s:_get_sid_by_script(path)
-  if !sid
-    try
-      execute 'source' fnameescape(path)
-    catch /^Vim\%((\a\+)\)\?:E484/
-      throw 'vital: module not found: ' . a:name
-    catch /^Vim\%((\a\+)\)\?:E127/
-      " Ignore.
-    endtry
-
-    let sid = s:_get_sid_by_script(path)
-  endif
-  return s:_build_module(sid)
-endfunction
-
-function! s:_get_module_path(name) abort
-  if s:_is_absolute_path(a:name) && filereadable(a:name)
-    return a:name
-  endif
-  if a:name ==# ''
-    let paths = [s:self_file]
-  elseif a:name =~# '\v^\u\w*%(\.\u\w*)*$'
-    let paths = s:_vital_files(a:name)
-  else
-    throw 'vital: Invalid module name: ' . a:name
-  endif
-
-  call filter(paths, 'filereadable(expand(v:val, 1))')
-  let path = get(paths, 0, '')
-  return path !=# '' ? path : ''
-endfunction
-
-function! s:_get_sid_by_script(path) abort
-  let path = s:_unify_path(a:path)
-  for line in filter(split(s:_redir('scriptnames'), "\n"),
-  \                  'stridx(v:val, s:self_version) > 0')
-    let list = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$')
-    if !empty(list) && s:_unify_path(list[2]) ==# path
-      return list[1] - 0
-    endif
-  endfor
-  return 0
-endfunction
-
-function! s:_file2module(file) abort
-  let filename = fnamemodify(a:file, ':p:gs?[\\/]\+?/?')
-  let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$')
-  return join(split(tail, '[\\/]\+'), '.')
-endfunction
-
-if filereadable(expand('<sfile>:r') . '.VIM')
-  " resolve() is slow, so we cache results.
-  let s:_unify_path_cache = {}
-  " Note: On windows, vim can't expand path names from 8.3 formats.
-  " So if getting full path via <sfile> and $HOME was set as 8.3 format,
-  " vital load duplicated scripts. Below's :~ avoid this issue.
-  function! s:_unify_path(path) abort
-    if has_key(s:_unify_path_cache, a:path)
-      return s:_unify_path_cache[a:path]
-    endif
-    let value = tolower(fnamemodify(resolve(fnamemodify(
-    \                   a:path, ':p')), ':~:gs?[\\/]\+?/?'))
-    let s:_unify_path_cache[a:path] = value
-    return value
-  endfunction
-else
-  function! s:_unify_path(path) abort
-    return resolve(fnamemodify(a:path, ':p:gs?[\\/]\+?/?'))
-  endfunction
-endif
-
-if s:globpath_third_arg
-  function! s:_runtime_files(path) abort
-    return split(globpath(&runtimepath, a:path, 1), "\n")
-  endfunction
-else
-  function! s:_runtime_files(path) abort
-    return split(globpath(&runtimepath, a:path), "\n")
-  endfunction
-endif
-
-let s:_vital_files_cache_runtimepath = ''
-let s:_vital_files_cache = []
-function! s:_vital_files(pattern) abort
-  if s:_vital_files_cache_runtimepath !=# &runtimepath
-    let path = printf('autoload/vital/%s/**/*.vim', s:self_version)
-    let s:_vital_files_cache = s:_runtime_files(path)
-    let mod = ':p:gs?[\\/]\+?/?'
-    call map(s:_vital_files_cache, 'fnamemodify(v:val, mod)')
-    let s:_vital_files_cache_runtimepath = &runtimepath
-  endif
-  let target = substitute(a:pattern, '\.', '/', 'g')
-  let target = substitute(target, '\*', '[^/]*', 'g')
-  let regexp = printf('autoload/vital/%s/%s.vim', s:self_version, target)
-  return filter(copy(s:_vital_files_cache), 'v:val =~# regexp')
-endfunction
-
-" Copy from System.Filepath
-if has('win16') || has('win32') || has('win64')
-  function! s:_is_absolute_path(path) abort
-    return a:path =~? '^[a-z]:[/\\]'
-  endfunction
-else
-  function! s:_is_absolute_path(path) abort
-    return a:path[0] ==# '/'
-  endfunction
-endif
-
-function! s:_build_module(sid) abort
-  if has_key(s:loaded, a:sid)
-    return copy(s:loaded[a:sid])
-  endif
-  let functions = s:_get_functions(a:sid)
-
-  let prefix = '<SNR>' . a:sid . '_'
-  let module = {}
-  for func in functions
-    let module[func] = function(prefix . func)
-  endfor
-  if has_key(module, '_vital_loaded')
-    let V = vital#{s:self_version}#new()
-    if has_key(module, '_vital_depends')
-      let all = {}
-      let modules =
-      \     s:_concat(map(module._vital_depends(),
-      \                   's:expand_modules(v:val, all)'))
-      call call(V.load, modules, V)
-    endif
-    try
-      call module._vital_loaded(V)
-    catch
-      " FIXME: Show an error message for debug.
-    endtry
-  endif
-  if !get(g:, 'vital_debug', 0)
-    call filter(module, 'v:key =~# "^\\a"')
-  endif
-  let s:loaded[a:sid] = module
-  return copy(module)
-endfunction
-
-if exists('+regexpengine')
-  function! s:_get_functions(sid) abort
-    let funcs = s:_redir(printf("function /\\%%#=2^\<SNR>%d_", a:sid))
-    let map_pat = '<SNR>' . a:sid . '_\zs\w\+'
-    return map(split(funcs, "\n"), 'matchstr(v:val, map_pat)')
-  endfunction
-else
-  function! s:_get_functions(sid) abort
-    let prefix = '<SNR>' . a:sid . '_'
-    let funcs = s:_redir('function')
-    let filter_pat = '^\s*function ' . prefix
-    let map_pat = prefix . '\zs\w\+'
-    return map(filter(split(funcs, "\n"),
-    \          'stridx(v:val, prefix) > 0 && v:val =~# filter_pat'),
-    \          'matchstr(v:val, map_pat)')
-  endfunction
-endif
-
-if exists('*uniq')
-  function! s:_uniq(list) abort
-    return uniq(a:list)
-  endfunction
-else
-  function! s:_uniq(list) abort
-    let i = len(a:list) - 1
-    while 0 < i
-      if a:list[i] ==# a:list[i - 1]
-        call remove(a:list, i)
-        let i -= 2
-      else
-        let i -= 1
-      endif
-    endwhile
-    return a:list
-  endfunction
-endif
-
-function! s:_concat(lists) abort
-  let result_list = []
-  for list in a:lists
-    let result_list += list
-  endfor
-  return result_list
-endfunction
-
-function! s:_redir(cmd) abort
-  let [save_verbose, save_verbosefile] = [&verbose, &verbosefile]
-  set verbose=0 verbosefile=
-  redir => res
-    silent! execute a:cmd
-  redir END
-  let [&verbose, &verbosefile] = [save_verbose, save_verbosefile]
-  return res
-endfunction
-
-function! vital#{s:self_version}#new() abort
-  return s:_import('')
-endfunction
-
-let s:self_file = s:_unify_path(expand('<sfile>'))
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Data/List.vim b/bundle/easymotion/autoload/vital/_easymotion/Data/List.vim
deleted file mode 100755
index 1b42dbf..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Data/List.vim
+++ /dev/null
@@ -1,432 +0,0 @@
-" Utilities for list.
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! s:pop(list) abort
-  return remove(a:list, -1)
-endfunction
-
-function! s:push(list, val) abort
-  call add(a:list, a:val)
-  return a:list
-endfunction
-
-function! s:shift(list) abort
-  return remove(a:list, 0)
-endfunction
-
-function! s:unshift(list, val) abort
-  return insert(a:list, a:val)
-endfunction
-
-function! s:cons(x, xs) abort
-  return [a:x] + a:xs
-endfunction
-
-function! s:conj(xs, x) abort
-  return a:xs + [a:x]
-endfunction
-
-" Removes duplicates from a list.
-function! s:uniq(list) abort
-  return s:uniq_by(a:list, 'v:val')
-endfunction
-
-" Removes duplicates from a list.
-function! s:uniq_by(list, f) abort
-  let list = map(copy(a:list), printf('[v:val, %s]', a:f))
-  let i = 0
-  let seen = {}
-  while i < len(list)
-    let key = string(list[i][1])
-    if has_key(seen, key)
-      call remove(list, i)
-    else
-      let seen[key] = 1
-      let i += 1
-    endif
-  endwhile
-  return map(list, 'v:val[0]')
-endfunction
-
-function! s:clear(list) abort
-  if !empty(a:list)
-    unlet! a:list[0 : len(a:list) - 1]
-  endif
-  return a:list
-endfunction
-
-" Concatenates a list of lists.
-" XXX: Should we verify the input?
-function! s:concat(list) abort
-  let memo = []
-  for Value in a:list
-    let memo += Value
-  endfor
-  return memo
-endfunction
-
-" Take each elements from lists to a new list.
-function! s:flatten(list, ...) abort
-  let limit = a:0 > 0 ? a:1 : -1
-  let memo = []
-  if limit == 0
-    return a:list
-  endif
-  let limit -= 1
-  for Value in a:list
-    let memo +=
-          \ type(Value) == type([]) ?
-          \   s:flatten(Value, limit) :
-          \   [Value]
-    unlet! Value
-  endfor
-  return memo
-endfunction
-
-" Sorts a list with expression to compare each two values.
-" a:a and a:b can be used in {expr}.
-function! s:sort(list, expr) abort
-  if type(a:expr) == type(function('function'))
-    return sort(a:list, a:expr)
-  endif
-  let s:expr = a:expr
-  return sort(a:list, 's:_compare')
-endfunction
-
-function! s:_compare(a, b) abort
-  return eval(s:expr)
-endfunction
-
-" Sorts a list using a set of keys generated by mapping the values in the list
-" through the given expr.
-" v:val is used in {expr}
-function! s:sort_by(list, expr) abort
-  let pairs = map(a:list, printf('[v:val, %s]', a:expr))
-  return map(s:sort(pairs,
-  \      'a:a[1] ==# a:b[1] ? 0 : a:a[1] ># a:b[1] ? 1 : -1'), 'v:val[0]')
-endfunction
-
-" Returns a maximum value in {list} through given {expr}.
-" Returns 0 if {list} is empty.
-" v:val is used in {expr}
-function! s:max_by(list, expr) abort
-  if empty(a:list)
-    return 0
-  endif
-  let list = map(copy(a:list), a:expr)
-  return a:list[index(list, max(list))]
-endfunction
-
-" Returns a minimum value in {list} through given {expr}.
-" Returns 0 if {list} is empty.
-" v:val is used in {expr}
-" FIXME: -0x80000000 == 0x80000000
-function! s:min_by(list, expr) abort
-  return s:max_by(a:list, '-(' . a:expr . ')')
-endfunction
-
-" Returns List of character sequence between [a:from, a:to]
-" e.g.: s:char_range('a', 'c') returns ['a', 'b', 'c']
-function! s:char_range(from, to) abort
-  return map(
-  \   range(char2nr(a:from), char2nr(a:to)),
-  \   'nr2char(v:val)'
-  \)
-endfunction
-
-" Returns true if a:list has a:value.
-" Returns false otherwise.
-function! s:has(list, value) abort
-  return index(a:list, a:value) isnot -1
-endfunction
-
-" Returns true if a:list[a:index] exists.
-" Returns false otherwise.
-" NOTE: Returns false when a:index is negative number.
-function! s:has_index(list, index) abort
-  " Return true when negative index?
-  " let index = a:index >= 0 ? a:index : len(a:list) + a:index
-  return 0 <= a:index && a:index < len(a:list)
-endfunction
-
-" similar to Haskell's Data.List.span
-function! s:span(f, xs) abort
-  let border = len(a:xs)
-  for i in range(len(a:xs))
-    if !eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
-      let border = i
-      break
-    endif
-  endfor
-  return border == 0 ? [[], copy(a:xs)] : [a:xs[: border - 1], a:xs[border :]]
-endfunction
-
-" similar to Haskell's Data.List.break
-function! s:break(f, xs) abort
-  return s:span(printf('!(%s)', a:f), a:xs)
-endfunction
-
-" similar to Haskell's Data.List.takeWhile
-function! s:take_while(f, xs) abort
-  return s:span(a:f, a:xs)[0]
-endfunction
-
-" similar to Haskell's Data.List.partition
-function! s:partition(f, xs) abort
-  return [filter(copy(a:xs), a:f), filter(copy(a:xs), '!(' . a:f . ')')]
-endfunction
-
-" similar to Haskell's Prelude.all
-function! s:all(f, xs) abort
-  return !s:any(printf('!(%s)', a:f), a:xs)
-endfunction
-
-" similar to Haskell's Prelude.any
-function! s:any(f, xs) abort
-  return !empty(filter(map(copy(a:xs), a:f), 'v:val'))
-endfunction
-
-" similar to Haskell's Prelude.and
-function! s:and(xs) abort
-  return s:all('v:val', a:xs)
-endfunction
-
-" similar to Haskell's Prelude.or
-function! s:or(xs) abort
-  return s:any('v:val', a:xs)
-endfunction
-
-function! s:map_accum(expr, xs, init) abort
-  let memo = []
-  let init = a:init
-  for x in a:xs
-    let expr = substitute(a:expr, 'v:memo', init, 'g')
-    let expr = substitute(expr, 'v:val', x, 'g')
-    let [tmp, init] = eval(expr)
-    call add(memo, tmp)
-  endfor
-  return memo
-endfunction
-
-" similar to Haskell's Prelude.foldl
-function! s:foldl(f, init, xs) abort
-  let memo = a:init
-  for x in a:xs
-    let expr = substitute(a:f, 'v:val', string(x), 'g')
-    let expr = substitute(expr, 'v:memo', string(memo), 'g')
-    unlet memo
-    let memo = eval(expr)
-  endfor
-  return memo
-endfunction
-
-" similar to Haskell's Prelude.foldl1
-function! s:foldl1(f, xs) abort
-  if len(a:xs) == 0
-    throw 'foldl1'
-  endif
-  return s:foldl(a:f, a:xs[0], a:xs[1:])
-endfunction
-
-" similar to Haskell's Prelude.foldr
-function! s:foldr(f, init, xs) abort
-  return s:foldl(a:f, a:init, reverse(copy(a:xs)))
-endfunction
-
-" similar to Haskell's Prelude.fold11
-function! s:foldr1(f, xs) abort
-  if len(a:xs) == 0
-    throw 'foldr1'
-  endif
-  return s:foldr(a:f, a:xs[-1], a:xs[0:-2])
-endfunction
-
-" similar to python's zip()
-function! s:zip(...) abort
-  return map(range(min(map(copy(a:000), 'len(v:val)'))), "map(copy(a:000), 'v:val['.v:val.']')")
-endfunction
-
-" similar to zip(), but goes until the longer one.
-function! s:zip_fill(xs, ys, filler) abort
-  if empty(a:xs) && empty(a:ys)
-    return []
-  elseif empty(a:ys)
-    return s:cons([a:xs[0], a:filler], s:zip_fill(a:xs[1 :], [], a:filler))
-  elseif empty(a:xs)
-    return s:cons([a:filler, a:ys[0]], s:zip_fill([], a:ys[1 :], a:filler))
-  else
-    return s:cons([a:xs[0], a:ys[0]], s:zip_fill(a:xs[1 :], a:ys[1: ], a:filler))
-  endif
-endfunction
-
-" Inspired by Ruby's with_index method.
-function! s:with_index(list, ...) abort
-  let base = a:0 > 0 ? a:1 : 0
-  return s:zip(a:list, range(base, len(a:list)+base-1))
-endfunction
-
-" similar to Ruby's detect or Haskell's find.
-" TODO spec and doc
-function! s:find(list, default, f) abort
-  for x in a:list
-    if eval(substitute(a:f, 'v:val', string(x), 'g'))
-      return x
-    endif
-  endfor
-  return a:default
-endfunction
-
-" Returns the index of the first element which satisfies the given expr.
-function! s:find_index(xs, f, ...) abort
-  let len = len(a:xs)
-  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : 0
-  let default = a:0 > 1 ? a:2 : -1
-  if start >=# len || start < 0
-    return default
-  endif
-  for i in range(start, len - 1)
-    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
-      return i
-    endif
-  endfor
-  return default
-endfunction
-
-" Returns the index of the last element which satisfies the given expr.
-function! s:find_last_index(xs, f, ...) abort
-  let len = len(a:xs)
-  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : len - 1
-  let default = a:0 > 1 ? a:2 : -1
-  if start >=# len || start < 0
-    return default
-  endif
-  for i in range(start, 0, -1)
-    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
-      return i
-    endif
-  endfor
-  return default
-endfunction
-
-" Similar to find_index but returns the list of indices satisfying the given expr.
-function! s:find_indices(xs, f, ...) abort
-  let len = len(a:xs)
-  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : 0
-  let result = []
-  if start >=# len || start < 0
-    return result
-  endif
-  for i in range(start, len - 1)
-    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
-      call add(result, i)
-    endif
-  endfor
-  return result
-endfunction
-
-" Return non-zero if a:list1 and a:list2 have any common item(s).
-" Return zero otherwise.
-function! s:has_common_items(list1, list2) abort
-  return !empty(filter(copy(a:list1), 'index(a:list2, v:val) isnot -1'))
-endfunction
-
-" similar to Ruby's group_by.
-function! s:group_by(xs, f) abort
-  let result = {}
-  let list = map(copy(a:xs), printf('[v:val, %s]', a:f))
-  for x in list
-    let Val = x[0]
-    let key = type(x[1]) !=# type('') ? string(x[1]) : x[1]
-    if has_key(result, key)
-      call add(result[key], Val)
-    else
-      let result[key] = [Val]
-    endif
-    unlet Val
-  endfor
-  return result
-endfunction
-
-function! s:_default_compare(a, b) abort
-  return a:a <# a:b ? -1 : a:a ># a:b ? 1 : 0
-endfunction
-
-function! s:binary_search(list, value, ...) abort
-  let Predicate = a:0 >= 1 ? a:1 : 's:_default_compare'
-  let dic = a:0 >= 2 ? a:2 : {}
-  let start = 0
-  let end = len(a:list) - 1
-
-  while 1
-    if start > end
-      return -1
-    endif
-
-    let middle = (start + end) / 2
-
-    let compared = call(Predicate, [a:value, a:list[middle]], dic)
-
-    if compared < 0
-      let end = middle - 1
-    elseif compared > 0
-      let start = middle + 1
-    else
-      return middle
-    endif
-  endwhile
-endfunction
-
-function! s:product(lists) abort
-  let result = [[]]
-  for pool in a:lists
-    let tmp = []
-    for x in result
-      let tmp += map(copy(pool), 'x + [v:val]')
-    endfor
-    let result = tmp
-  endfor
-  return result
-endfunction
-
-function! s:permutations(list, ...) abort
-  if a:0 > 1
-    throw 'vital: Data.List: too many arguments'
-  endif
-  let r = a:0 == 1 ? a:1 : len(a:list)
-  if r > len(a:list)
-    return []
-  elseif r < 0
-    throw 'vital: Data.List: {r} must be non-negative integer'
-  endif
-  let n = len(a:list)
-  let result = []
-  for indices in s:product(map(range(r), 'range(n)'))
-    if len(s:uniq(indices)) == r
-      call add(result, map(indices, 'a:list[v:val]'))
-    endif
-  endfor
-  return result
-endfunction
-
-function! s:combinations(list, r) abort
-  if a:r > len(a:list)
-    return []
-  elseif a:r < 0
-    throw 'vital: Data:List: {r} must be non-negative integer'
-  endif
-  let n = len(a:list)
-  let result = []
-  for indices in s:permutations(range(n), a:r)
-    if s:sort(copy(indices), 'a:a - a:b') == indices
-      call add(result, map(indices, 'a:list[v:val]'))
-    endif
-  endfor
-  return result
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
deleted file mode 100755
index d14514d..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
+++ /dev/null
@@ -1,520 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:V = a:V
-	let s:String  = s:V.import("Over.String")
-	let s:Signals = s:V.import("Over.Signals")
-	let s:Input = s:V.import("Over.Input")
-	let s:Module = s:V.import("Over.Commandline.Modules")
-	let s:base.variables.modules = s:Signals.make()
-	function! s:base.variables.modules.get_slot(val)
-		return a:val.slot.module
-	endfunction
-endfunction
-
-
-function! s:_vital_depends()
-	return [
-\		"Over.String",
-\		"Over.Signals",
-\		"Over.Input",
-\		"Over.Commandline.Modules",
-\	]
-endfunction
-
-
-function! s:make(...)
-	let result = deepcopy(s:base)
-	call result.set_prompt(get(a:, 1, ":"))
-	call result.connect(result, "_")
-	return result
-endfunction
-
-
-function! s:make_plain()
-	return deepcopy(s:base)
-endfunction
-
-
-let s:base = {
-\	"line" : {},
-\	"variables" : {
-\		"prompt" : "",
-\		"char" : "",
-\		"input" : "",
-\		"tap_key" : "",
-\		"exit" : 0,
-\		"keymapping" : {},
-\		"suffix" : "",
-\	},
-\	"highlights" : {
-\		"prompt" : "NONE",
-\		"cursor" : "VitalOverCommandLineCursor",
-\		"cursor_on" : "VitalOverCommandLineCursorOn",
-\		"cursor_insert" : "VitalOverCommandLineOnCursor",
-\	},
-\}
-
-if exists("s:Signals")
-	let s:base.variables.modules = s:Signals.make()
-	function! s:base.variables.modules.get_slot(val)
-		return a:val.slot.module
-	endfunction
-endif
-
-
-function! s:base.getline()
-	return self.line.str()
-endfunction
-
-
-function! s:base.setline(line)
-	return self.line.set(a:line)
-endfunction
-
-
-function! s:base.char()
-	return self.variables.char
-endfunction
-
-
-function! s:base.setchar(char, ...)
-	" 1 の場合は既に設定されていても上書きする
-	" 0 の場合は既に設定されていれば上書きしない
-	let overwrite = get(a:, 1, 1)
-	if overwrite || self.variables.input == self.char()
-		let self.variables.input = a:char
-	endif
-endfunction
-
-
-function! s:base.getpos()
-	return self.line.pos()
-endfunction
-
-
-function! s:base.setpos(pos)
-	return self.line.set_pos(a:pos)
-endfunction
-
-
-function! s:base.tap_keyinput(key)
-	let self.variables.tap_key = a:key
-endfunction
-
-
-function! s:base.untap_keyinput(key)
-	if self.variables.tap_key == a:key
-		let self.variables.tap_key = ""
-		return 1
-	endif
-endfunction
-
-
-function! s:base.get_tap_key()
-	return self.variables.tap_key
-endfunction
-
-
-function! s:base.is_input(key, ...)
-	let prekey = get(a:, 1, "")
-	return self.get_tap_key() == prekey
-\		&& self.char() == a:key
-" \		&& self.char() == (prekey . a:key)
-endfunction
-
-
-function! s:base.input_key()
-	return self.variables.input_key
-endfunction
-
-
-function! s:base.set_prompt(prompt)
-	let self.variables.prompt = a:prompt
-endfunction
-
-
-function! s:base.get_prompt()
-	return self.variables.prompt
-endfunction
-
-
-function! s:base.set_suffix(str)
-	let self.variables.suffix = a:str
-endfunction
-
-
-function! s:base.get_suffix()
-	return self.variables.suffix
-endfunction
-
-
-function! s:base.insert(word, ...)
-	if a:0
-		call self.line.set(a:1)
-	endif
-	call self.line.input(a:word)
-endfunction
-
-function! s:base.forward()
-	return self.line.forward()
-endfunction
-
-function! s:base.backward()
-	return self.line.backward()
-endfunction
-
-
-function! s:base.backward_word(...)
-	let pat = get(a:, 1, '\k\+\s*\|.')
-	return matchstr(self.backward(), '\%(' . pat . '\)$')
-endfunction
-
-
-function! s:base.connect(module, ...)
-	if type(a:module) == type("")
-		return call(self.connect, [s:Module.make(a:module)] + a:000, self)
-	endif
-	if empty(a:module)
-		return
-	endif
-	let name = a:0 > 0 ? a:1 : a:module.name
-	let slot = self.variables.modules.find_first_by("get(v:val.slot, 'name', '') == " . string(name))
-	if empty(slot)
-		call self.variables.modules.connect({ "name" : name, "module" : a:module })
-	else
-		let slot.slot.module = a:module
-	endif
-" 	let self.variables.modules[name] = a:module
-endfunction
-
-
-function! s:base.disconnect(name)
-	return self.variables.modules.disconnect_by(
-\		"get(v:val.slot, 'name', '') == " . string(a:name)
-\	)
-" 	unlet self.variables.modules[a:name]
-endfunction
-
-
-function! s:base.get_module(name)
-	let slot = self.variables.modules.find_first_by("get(v:val.slot, 'name', '') == " . string(a:name))
-	return empty(slot) ? {} : slot.slot.module
-endfunction
-
-
-function! s:base.callevent(event)
-	call self.variables.modules.sort_by("has_key(v:val.slot.module, 'priority') ? v:val.slot.module.priority('" . a:event . "') : 0")
-	return self.variables.modules.call(a:event, [self])
-" 	call map(filter(copy(self.variables.modules), "has_key(v:val, a:event)"), "v:val." . a:event . "(self)")
-endfunction
-
-
-function! s:base.cmap(lhs, rhs)
-	let self.variables.keymapping[a:lhs] = a:rhs
-endfunction
-
-
-function! s:base.cnoremap(lhs, rhs)
-	let self.variables.keymapping[a:lhs] = {
-\		"key"     : a:rhs,
-\		"noremap" : 1,
-\	}
-endfunction
-
-
-function! s:base.cunmap(lhs)
-	unlet self.variables.keymapping[a:lhs]
-endfunction
-
-
-function! s:base.keymapping()
-	return {}
-endfunction
-
-
-function! s:base.execute(...)
-	let command = get(a:, 1, self.getline())
-	call self._execute(command)
-" 	execute self.getline()
-endfunction
-
-
-function! s:base.draw()
-	call self.callevent("on_draw_pre")
-	call self.callevent("on_draw")
-endfunction
-
-
-function! s:base.exit(...)
-	let self.variables.exit = 1
-	let self.variables.exit_code = get(a:, 1, 0)
-endfunction
-
-
-function! s:base.enable_keymapping()
-	let self.variables.enable_keymapping = 1
-endfunction
-
-
-function! s:base.disable_keymapping()
-	let self.variables.enable_keymapping = 0
-endfunction
-
-
-function! s:base.is_enable_keymapping()
-	return self.variables.enable_keymapping
-endfunction
-
-" function! s:base.cancel()
-" 	call self.exit(1)
-" 	call self._on_cancel()
-" endfunction
-
-
-function! s:base.exit_code()
-	return self.variables.exit_code
-endfunction
-
-
-function! s:base.hl_cursor_on()
-	if exists("self.variables.old_guicursor")
-		set guicursor&
-		let &guicursor = self.variables.old_guicursor
-		unlet self.variables.old_guicursor
-	endif
-
-	if exists("self.variables.old_t_ve")
-		let &t_ve = self.variables.old_t_ve
-		unlet self.variables.old_t_ve
-	endif
-endfunction
-
-
-function! s:base.hl_cursor_off()
-	if exists("self.variables.old_t_ve")
-		return
-	endif
-
-	let self.variables.old_guicursor = &guicursor
-	set guicursor=n:block-NONE
-	let self.variables.old_t_ve = &t_ve
-	set t_ve=
-endfunction
-
-
-function! s:base.start(...)
-	let exit_code = call(self._main, a:000, self)
-	return exit_code
-endfunction
-
-
-function! s:base.__empty(...)
-endfunction
-
-
-function! s:base.get(...)
-	let Old_execute = self.execute
-	let self.execute = self.__empty
-	try
-		let exit_code = call(self.start, a:000, self)
-		if exit_code == 0
-			return self.getline()
-		endif
-	finally
-		let self.execute = Old_execute
-	endtry
-	return ""
-endfunction
-
-
-function! s:base.input_key_stack()
-	return self.variables.input_key_stack
-endfunction
-
-
-function! s:base.input_key_stack_string()
-	return join(self.variables.input_key_stack, "")
-endfunction
-
-
-function! s:base.set_input_key_stack(stack)
-	let self.variables.input_key_stack = a:stack
-	return self.variables.input_key_stack
-endfunction
-
-
-function! s:base._init_variables()
-	let self.variables.tap_key = ""
-	let self.variables.char = ""
-	let self.variables.input = ""
-	let self.variables.exit = 0
-	let self.variables.exit_code = 1
-	let self.variables.enable_keymapping = 1
-	let self.variables.input_key_stack = []
-	let self.line = deepcopy(s:String.make())
-endfunction
-
-
-function! s:base._init()
-	call self._init_variables()
-	call self.hl_cursor_off()
-	if !hlexists(self.highlights.cursor)
-		execute "highlight link " . self.highlights.cursor . " Cursor"
-	endif
-	if !hlexists(self.highlights.cursor_on)
-		execute "highlight link " . self.highlights.cursor_on . " " . self.highlights.cursor
-	endif
-	if !hlexists(self.highlights.cursor_insert)
-		execute "highlight " . self.highlights.cursor_insert . " cterm=underline term=underline gui=underline"
-	endif
-endfunction
-
-
-function! s:base._execute(command)
-	call self.callevent("on_execute_pre")
-	try
-		execute a:command
-	catch
-		echohl ErrorMsg
-		echom matchstr(v:exception, 'Vim\((\w*)\)\?:\zs.*\ze')
-		echohl None
-		call self.callevent("on_execute_failed")
-	finally
-		call self.callevent("on_execute")
-	endtry
-endfunction
-
-
-function! s:base._input_char(char)
-	let char = a:char
-	let self.variables.input_key = char
-	let self.variables.char = char
-	call self.setchar(self.variables.char)
-	call self.callevent("on_char_pre")
-	call self.insert(self.variables.input)
-	call self.callevent("on_char")
-endfunction
-
-
-function! s:base._input(input, ...)
-	let self.variables.input_key = a:input
-	if self.is_enable_keymapping()
-		let key = s:_unmap(self._get_keymapping(), a:input)
-	else
-		let key = a:input
-	endif
-	if key == ""
-		return
-	endif
-
-	call self.set_input_key_stack(s:String.split_by_keys(key))
-	while !(empty(self.input_key_stack()) || self._is_exit())
-		call self._input_char(remove(self.input_key_stack(), 0))
-	endwhile
-endfunction
-
-
-function! s:base._update()
-" 	call self.callevent("on_update")
-" 	if !getchar(1)
-" 		continue
-" 	endif
-"
-" 	call self._input(s:getchar(0))
-" 	call self.draw()
-
-	call self.callevent("on_update")
-	call self._input(s:Input.getchar())
-	if self._is_exit()
-		return -1
-	endif
-	call self.draw()
-endfunction
-
-
-function! s:base._main(...)
-	try
-		call self._init()
-		call self.callevent("on_enter")
-
-		call self._input(get(a:, 1, ""))
-		call self.draw()
-		while !self._is_exit()
-			try
-				if self._update()
-					break
-				endif
-			catch
-				call self.callevent("on_exception")
-			endtry
-		endwhile
-	catch
-		echohl ErrorMsg | echom v:throwpoint . " " . v:exception | echohl None
-		let self.variables.exit_code = -1
-	finally
-		call self._finish()
-		call self.callevent("on_leave")
-	endtry
-	return self.exit_code()
-endfunction
-
-
-function! s:base._finish()
-	call self.hl_cursor_on()
-endfunction
-
-
-function! s:base._is_exit()
-	return self.variables.exit
-endfunction
-
-
-function! s:_as_key_config(config)
-	let base = {
-\		"noremap" : 0,
-\		"lock"    : 0,
-\	}
-	return type(a:config) == type({}) ? extend(base, a:config)
-\		 : extend(base, {
-\		 	"key" : a:config,
-\		 })
-endfunction
-
-
-function! s:_unmap(mapping, key)
-	let keys = s:String.split_by_keys(a:key)
-	if len(keys) > 1
-		return join(map(keys, 's:_unmap(a:mapping, v:val)'), '')
-	endif
-	if !has_key(a:mapping, a:key)
-		return a:key
-	endif
-	let rhs  = s:_as_key_config(a:mapping[a:key])
-	let next = s:_as_key_config(get(a:mapping, rhs.key, {}))
-	if rhs.noremap && next.lock == 0
-		return rhs.key
-	endif
-	return s:_unmap(a:mapping, rhs.key)
-endfunction
-
-
-function! s:base._get_keymapping()
-	let result = {}
-" 	for module in values(self.variables.modules)
-	for module in self.variables.modules.slots()
-		if has_key(module, "keymapping")
-			if module isnot self
-				call extend(result, module.keymapping(self))
-			endif
-		endif
-	endfor
-	return extend(extend(result, self.variables.keymapping), self.keymapping())
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
deleted file mode 100755
index e7ee4b5..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:V = a:V
-endfunction
-
-
-function! s:get(name)
-	if exists("s:" . a:name)
-		return s:{a:name}
-	endif
-	let s:{a:name} = s:V.import('Over.Commandline.Modules.' . a:name)
-	return s:{a:name}
-endfunction
-
-
-function! s:make(name, ...)
-	let module = s:get(a:name)
-	return call(module.make, a:000, module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
deleted file mode 100755
index 071ba45..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
+++ /dev/null
@@ -1,159 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_uniq(list)
-	let dict = {}
-	for _ in a:list
-		let dict[_] = 0
-	endfor
-	return keys(dict)
-endfunction
-
-
-let s:module = {
-\	"name" : "BufferComplete",
-\}
-
-
-function! s:_buffer_complete()
-	return sort(s:_uniq(filter(split(join(getline(1, '$')), '\W'), '!empty(v:val)')), 1)
-endfunction
-
-
-function! s:_parse_line(line)
-	let keyword = matchstr(a:line, '\zs\w\+\ze$')
-	let pos = strchars(a:line) - strchars(keyword)
-	return [pos, keyword]
-endfunction
-
-
-function! s:_as_statusline(list, count)
-	if empty(a:list)
-		return
-	endif
-	let hl_none = "%#StatusLine#"
-	let hl_select = "%#StatusLineNC#"
-	let tail = " > "
-	let result = a:list[0]
-	let pos = 0
-	for i in range(1, len(a:list)-1)
-		if strdisplaywidth(result . " " . a:list[i]) > &columns - len(tail)
-			if a:count < i
-				break
-			else
-				let pos = -i
-			endif
-			let result = a:list[i]
-		else
-			let result .= (" " . a:list[i])
-		endif
-		if a:count == i
-			let pos = pos + i
-		endif
-	endfor
-	return join(map(split(result, " "), 'v:key == pos ? hl_select . v:val . hl_none : v:val'))
-endfunction
-
-
-function! s:module.get_complete_words()
-	return s:_buffer_complete()
-endfunction
-
-
-function! s:module.complete(cmdline)
-	call s:_finish()
-	let s:old_statusline = &statusline
-
-	let backward = a:cmdline.backward()
-	let [pos, keyword] = s:_parse_line(backward)
-
-	if !exists("s:complete")
-		let s:complete = self.get_complete_words()
-	endif
-	let s:complete_list = filter(copy(s:complete), 'v:val =~ ''^''.keyword')
-	if empty(s:complete_list)
-		return -1
-	endif
-
-	if pos == 0
-		let backward = ""
-	else
-		let backward = join(split(backward, '\zs')[ : pos-1 ], "")
-	endif
-	let s:line = backward . a:cmdline.forward()
-	let s:pos = pos
-	call a:cmdline.setline(s:line)
-
-	let s:count = 0
-endfunction
-
-
-function! s:_finish()
-	if exists("s:old_statusline")
-		let &statusline = s:old_statusline
-		unlet s:old_statusline
-		redrawstatus
-	endif
-endfunction
-
-
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("<Over>(buffer-complete)")
-		if self.complete(a:cmdline) == -1
-			call s:_finish()
-			call a:cmdline.setchar('')
-			return
-		endif
-		call a:cmdline.setchar('')
-		call a:cmdline.tap_keyinput("Completion")
-" 	elseif a:cmdline.is_input("\<Tab>", "Completion")
-	elseif a:cmdline.is_input("<Over>(buffer-complete)", "Completion")
-\		|| a:cmdline.is_input("\<Right>", "Completion")
-		call a:cmdline.setchar('')
-		let s:count += 1
-		if s:count >= len(s:complete_list)
-			let s:count = 0
-		endif
-	elseif a:cmdline.is_input("\<Left>", "Completion")
-		call a:cmdline.setchar('')
-		let s:count -= 1
-		if s:count < 0
-			let s:count = len(s:complete_list) - 1
-		endif
-	else
-		if a:cmdline.untap_keyinput("Completion")
-			call a:cmdline.callevent("on_char_pre")
-		endif
-		call s:_finish()
-		return
-	endif
-	call a:cmdline.setline(s:line)
-	call a:cmdline.insert(s:complete_list[s:count], s:pos)
-	if len(s:complete_list) > 1
-		let &statusline = s:_as_statusline(s:complete_list, s:count)
-		redrawstatus
-	endif
-	if len(s:complete_list) == 1
-		call a:cmdline.untap_keyinput("Completion")
-	endif
-endfunction
-
-
-function! s:module.on_draw_pre(...)
-" 	redrawstatus
-endfunction
-
-
-function! s:module.on_leave(cmdline)
-	call s:_finish()
-	unlet! s:complete
-endfunction
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
deleted file mode 100755
index 4f276a1..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "Cancel"
-\}
-
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("\<Esc>")
-\	|| a:cmdline.is_input("\<C-c>")
-" 		call a:cmdline.cancel()
-		call a:cmdline.exit(1)
-		call a:cmdline.setchar("")
-	endif
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
deleted file mode 100755
index fb27800..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-let s:module = {
-\	"name" : "CursorMove"
-\}
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("\<Right>")
-		call a:cmdline.line.next()
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<Left>")
-		call a:cmdline.line.prev()
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-b>")
-\		|| a:cmdline.is_input("\<Home>")
-		call a:cmdline.setline(0)
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-e>")
-\		|| a:cmdline.is_input("\<End>")
-		call a:cmdline.setline(a:cmdline.line.length())
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-Left>")
-\		|| a:cmdline.is_input("\<S-Left>")
-		call a:cmdline.setline(strridx(a:cmdline.backward()[:-2], ' ') + 1)
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-Right>")
-\		|| a:cmdline.is_input("\<S-Right>")
-		let p = stridx(a:cmdline.forward()[1:], ' ')
-		call a:cmdline.setline(p != -1 ? a:cmdline.line.pos() + p + 2 : a:cmdline.line.length())
-		call a:cmdline.setchar('')
-	endif
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
deleted file mode 100755
index 690020b..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-let s:module = {
-\	"name" : "Delete",
-\}
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("\<C-h>")
-\	|| a:cmdline.is_input("\<BS>")
-		if a:cmdline.line.length() == 0
-			return a:cmdline.exit(1)
-		else
-			call a:cmdline.line.remove_prev()
-			call a:cmdline.setchar('')
-		endif
-	elseif a:cmdline.is_input("\<Del>")
-		call a:cmdline.line.remove_pos()
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-w>")
-		let word = a:cmdline.backward_word()
-		let backward = a:cmdline.backward()[ : -strlen(word)-1 ]
-		call a:cmdline.setline(backward . a:cmdline.line.pos_word() . a:cmdline.forward())
-		call a:cmdline.setline(strchars(backward))
-		call a:cmdline.setchar('')
-	elseif a:cmdline.is_input("\<C-u>")
-		call a:cmdline.setline(a:cmdline.line.pos_word() . a:cmdline.forward())
-		call a:cmdline.setline(0)
-		call a:cmdline.setchar('')
-	endif
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
deleted file mode 100755
index 93ca06f..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-let s:cache_command = {}
-function! s:doautocmd_user(prefix, command)
-	let group =  a:prefix . "-vital-over-commandline-doautocmd-dummy"
-	if !has_key(s:cache_command, a:command)
-		execute "autocmd " . group
-\			. " User " . a:command." silent! execute ''"
-
-		if v:version > 703 || v:version == 703 && has("patch438")
-			let s:cache_command[a:command] = "doautocmd <nomodeline> User " . a:command
-		else
-			let s:cache_command[a:command] = "doautocmd User " . a:command
-		endif
-	endif
-
-	execute s:cache_command[a:command]
-endfunction
-
-let s:hooks = [
-\	"enter",
-\	"leave",
-\	"char",
-\	"char_pre",
-\	"draw",
-\	"draw_pre",
-\	"execute_pre",
-\	"execute_failed",
-\	"execute",
-\	"exception",
-\]
-
-let s:hooks_camel = [
-\	"Enter",
-\	"Leave",
-\	"Char",
-\	"CharPre",
-\	"Draw",
-\	"DrawPre",
-\	"ExecutePre",
-\	"ExecuteFailed",
-\	"Execute",
-\	"Exception",
-\]
-
-
-let s:module = {
-\	"name" : "Doautocmd",
-\}
-
-
-for s:i in range(len(s:hooks))
-	execute join([
-\		"function! s:module.on_" . s:hooks[s:i] . "(...)",
-\		"	call s:doautocmd_user(self.prefix, self.prefix . " . string(s:hooks_camel[s:i]) . ")",
-\		"endfunction",
-\	], "\n")
-endfor
-
-
-function! s:make(prefix)
-	execute "augroup " a:prefix . "-vital-over-commandline-doautocmd-dummy"
-		autocmd!
-	augroup END
-
-	let module = deepcopy(s:module)
-	let module.prefix = a:prefix
-	return module
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
deleted file mode 100755
index 7e57887..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
+++ /dev/null
@@ -1,140 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "DrawCommandline"
-\}
-
-let s:cmdheight = {}
-
-function! s:cmdheight.save()
-	if has_key(self, "value")
-		return
-	endif
-	let self.value = &cmdheight
-endfunction
-
-function! s:cmdheight.restore()
-	if has_key(self, "value")
-		let &cmdheight = self.value
-		unlet self.value
-	endif
-endfunction
-
-
-function! s:cmdheight.get()
-	return self.value
-endfunction
-
-
-function! s:suffix(left, suffix)
-	let left_len = strdisplaywidth(a:left)
-	let len = &columns - left_len % &columns
-	let len = len + (&columns * (strdisplaywidth(a:suffix) > (len - 1))) - 1
-	return repeat(" ", len - strdisplaywidth(a:suffix)) . a:suffix
-" 	return printf("%" . len . "S", a:suffix)
-endfunction
-
-
-let s:old_width = 0
-function! s:_redraw(cmdline)
-	let left = a:cmdline.get_prompt() . a:cmdline.getline() . (empty(a:cmdline.line.pos_word()) ? " " : "")
-	let width = len(left) + 1
-
-	if a:cmdline.get_suffix() != ""
-		let width += len(s:suffix(left, a:cmdline.get_suffix())) - 1
-	endif
-
-	if &columns >= width && &columns <= s:old_width && s:old_width >= width
-		redraw
-		normal! :
-	elseif &columns <= width
-		normal! :
-	else
-		redraw
-	endif
-	let s:old_width = width
-
-	call s:cmdheight.save()
-	let height = max([(width - 1) / (&columns) + 1, s:cmdheight.get()])
-	if height > &cmdheight || &cmdheight > height
-		let &cmdheight = height
-		redraw
-	endif
-endfunction
-
-
-function! s:_as_echon(str)
-	return "echon " . strtrans(string(a:str))
-endfunction
-
-
-function! s:module.on_draw_pre(cmdline)
-	if empty(a:cmdline.line.pos_word())
-		let cursor = "echohl " . a:cmdline.highlights.cursor . " | echon ' '"
-	else
-		let cursor = "echohl " . a:cmdline.highlights.cursor_on . " | " . s:_as_echon(a:cmdline.line.pos_word())
-	endif
-	let suffix = ""
-	if	a:cmdline.get_suffix() != ""
-		let suffix = s:_as_echon(s:suffix(a:cmdline.get_prompt() . a:cmdline.getline() . repeat(" ", empty(a:cmdline.line.pos_word())), a:cmdline.get_suffix()))
-	endif
-	let self.draw_command  = join([
-\		"echohl " . a:cmdline.highlights.prompt,
-\		s:_as_echon(a:cmdline.get_prompt()),
-\		"echohl NONE",
-\		s:_as_echon(a:cmdline.backward()),
-\		cursor,
-\		"echohl NONE",
-\		s:_as_echon(a:cmdline.forward()),
-\		suffix,
-\	], " | ")
-
-	call s:_redraw(a:cmdline)
-endfunction
-
-
-function! s:_echon(expr)
-	echon strtrans(a:expr)
-endfunction
-
-
-function! s:module.on_draw(cmdline)
-	execute self.draw_command
-" 	execute "echohl" a:cmdline.highlights.prompt
-" 	call s:echon(a:cmdline.get_prompt())
-" 	echohl NONE
-" 	call s:echon(a:cmdline.backward())
-" 	if empty(a:cmdline.line.pos_word())
-" 		execute "echohl" a:cmdline.highlights.cursor
-" 		call s:echon(' ')
-" 	else
-" 		execute "echohl" a:cmdline.highlights.cursor_on
-" 		call s:echon(a:cmdline.line.pos_word())
-" 	endif
-" 	echohl NONE
-" 	call s:echon(a:cmdline.forward())
-" 	if	a:cmdline.get_suffix() != ""
-" 		call s:echon(s:suffix(a:cmdline.get_prompt() . a:cmdline.getline() . repeat(" ", empty(a:cmdline.line.pos_word())), a:cmdline.get_suffix()))
-" 	endif
-endfunction
-
-
-function! s:module.on_execute_pre(...)
-	call s:cmdheight.restore()
-endfunction
-
-
-function! s:module.on_leave(...)
-	call s:cmdheight.restore()
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
deleted file mode 100755
index 08e3bbd..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "ExceptionExit",
-\}
-
-
-function! s:module.on_exception(cmdline)
-	call a:cmdline.exit(-1)
-endfunction
-
-
-function! s:make(...)
-	let result = deepcopy(s:module)
-	let result.exit_code = get(a:, 1, 0)
-	return result
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
deleted file mode 100755
index ed97fbb..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "ExceptionMessage",
-\}
-
-
-function! s:module.on_exception(cmdline)
-	let self.exception  = v:exception
-	let self.throwpoint = v:throwpoint
-endfunction
-
-
-function! s:module.on_draw_pre(cmdline)
-	if has_key(self, "exception")
-		call self.message(a:cmdline)
-		unlet self.exception
-	endif
-endfunction
-
-function! s:module.message(...)
-	echohl ErrorMsg
-	execute self.command string(self.prefix . self.throwpoint . " " . self.exception)
-	echohl None
-endfunction
-
-
-function! s:module.on_leave(cmdline)
-	if has_key(self, "exception")
-		call self.message(a:cmdline)
-		unlet self.exception
-	endif
-endfunction
-
-function! s:make(...)
-	let result = deepcopy(s:module)
-	let result.prefix = get(a:, 1, "vital-over:")
-	let result.command = get(a:, 2, "echo")
-	return result
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
deleted file mode 100755
index eb2638c..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "Exit",
-\	"exit_code" : 0
-\}
-
-
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("<Over>(exit)")
-		call a:cmdline.setchar("")
-		call a:cmdline.exit(self.exit_code)
-	endif
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
deleted file mode 100755
index 14b272d..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "History",
-\	"mode" : "cmd",
-\}
-
-function! s:module.histories()
-	return map(range(1, &history), 'histget(self.mode, v:val * -1)')
-endfunction
-
-function! s:_should_match_cmdline(cmdline)
-	return a:cmdline.is_input("\<Up>")
-\		|| a:cmdline.is_input("\<Down>")
-endfunction
-
-function! s:_reset()
-	let s:cmdhist = []
-	let s:count = 0
-	let s:is_match_mode = 0 " <Up>/<Down>: true, <C-n>/<C-p>: false
-endfunction
-
-function! s:module.on_enter(...)
-	call s:_reset()
-endfunction
-
-function! s:module.on_char_pre(cmdline)
-	if !a:cmdline.is_input("\<Up>") && !a:cmdline.is_input("\<Down>")
-	\	&& !a:cmdline.is_input("\<C-p>") && !a:cmdline.is_input("\<C-n>")
-		call s:_reset()
-		return
-	else
-		if s:count == 0 && empty(s:cmdhist)
-		\	|| s:is_match_mode != s:_should_match_cmdline(a:cmdline)
-			let cmdline = '^' . a:cmdline.getline()
-			let s:is_match_mode = s:_should_match_cmdline(a:cmdline)
-			let s:cmdhist = [a:cmdline.getline()] + (s:is_match_mode ?
-			\	filter(self.histories(), 'v:val =~ cmdline') : self.histories())
-		endif
-	endif
-	call a:cmdline.setchar("")
-	if a:cmdline.is_input("\<Down>") || a:cmdline.is_input("\<C-n>")
-		let s:count = max([s:count - 1, 0])
-	endif
-	if a:cmdline.is_input("\<Up>") || a:cmdline.is_input("\<C-p>")
-		let s:count = min([s:count + 1, len(s:cmdhist)])
-	endif
-	call a:cmdline.setline(get(s:cmdhist, s:count, a:cmdline.getline()))
-endfunction
-
-function! s:make(...)
-	let module = deepcopy(s:module)
-	let module.mode = get(a:, 1, "cmd")
-	return module
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
deleted file mode 100755
index 73207b8..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
+++ /dev/null
@@ -1,149 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:V = a:V
-	let s:String  = s:V.import("Over.String")
-endfunction
-
-
-function! s:_vital_depends()
-	return [
-\		"Over.String",
-\	]
-endfunction
-
-
-function! s:to_string(expr)
-	return type(a:expr) == type("") ? a:expr : string(a:expr)
-endfunction
-
-
-function! s:input(cmdline)
-	let CR_index = index(a:cmdline.input_key_stack(), "\<CR>")
-	if CR_index != -1
-		let input = a:cmdline.input_key_stack_string()
-		let input = input[ : CR_index-1]
-		call a:cmdline.set_input_key_stack(a:cmdline.input_key_stack()[CR_index+1 : ])
-		return eval(input)
-	endif
-
-	let input_text = ""
-	if !empty(a:cmdline.input_key_stack())
-		let input_text = a:cmdline.input_key_stack_string()
-		call a:cmdline.set_input_key_stack([])
-	endif
-
-	call a:cmdline.hl_cursor_on()
-	try
-		redraw
-		let input = input("=", input_text, "expression")
-		if !empty(input)
-			let input = s:to_string(eval(input))
-		endif
-	catch
-		return ""
-	finally
-		call a:cmdline.hl_cursor_off()
-	endtry
-	return input
-endfunction
-
-
-let s:module = {
-\	"name" : "InsertRegister"
-\}
-
-
-
-function! s:module.reset()
-	let self.cword = expand("<cword>")
-	let self.cWORD = expand("<cWORD>")
-	let self.cfile = expand("<cfile>")
-endfunction
-
-function! s:module.on_enter(...)
-	call self.reset()
-" 	let self.prefix_key = ""
-endfunction
-
-
-function! s:get_cmdline_cword(backward, cword)
-" 	let backward = matchstr(a:backward, '.\{-}\zs\k\+$')
-	let backward = a:backward
-	if &incsearch == 0 || a:cword == "" || a:backward == "" || s:String.index(a:cword, backward) != 0
-		return a:cword
-	endif
-	return a:cword[len(backward) : ]
-endfunction
-
-
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("\<C-r>")
-		call a:cmdline.setchar('"')
-		let self.prefix_key = a:cmdline.input_key()
-		let self.old_line = a:cmdline.getline()
-		let self.old_pos  = a:cmdline.getpos()
-		return
-	elseif exists("self.prefix_key")
-\		&& a:cmdline.get_tap_key() == self.prefix_key
-		call a:cmdline.setline(self.old_line)
-		call a:cmdline.setpos(self.old_pos)
-		let char = a:cmdline.input_key()
-		if char =~ '^[0-9a-zA-z.%#:/"\-*+]$'
-			let register = tr(getreg(char), "\n", "\r")
-			call a:cmdline.setchar(register)
-		elseif char == "="
-			call a:cmdline.setchar(s:input(a:cmdline))
-		elseif char == "\<C-w>"
-			call a:cmdline.setchar(s:get_cmdline_cword(a:cmdline.backward_word(), self.cword))
-		elseif char == "\<C-a>"
-			call a:cmdline.setchar(self.cWORD)
-		elseif char == "\<C-f>"
-			call a:cmdline.setchar(self.cfile)
-		elseif char == "\<C-r>"
-			call a:cmdline.setchar('"')
-		else
-			call a:cmdline.setchar("")
-		endif
-" 		elseif a:cmdline.is_input('=', self.prefix_key)
-" 			call a:cmdline.setchar(s:input(a:cmdline))
-" 		elseif a:cmdline.is_input("\<C-w>", self.prefix_key)
-" 			call a:cmdline.setchar(self.cword)
-" 		elseif a:cmdline.is_input("\<C-a>", self.prefix_key)
-" 			call a:cmdline.setchar(self.cWORD)
-" 		elseif a:cmdline.is_input("\<C-f>", self.prefix_key)
-" 			call a:cmdline.setchar(self.cfile)
-" 		elseif a:cmdline.is_input("\<C-r>", self.prefix_key)
-" 			call a:cmdline.setchar('"')
-" 		else
-" 			call a:cmdline.setchar("")
-" 		endif
-	endif
-endfunction
-
-
-function! s:module.on_char(cmdline)
-	if a:cmdline.is_input("\<C-r>")
-		call a:cmdline.tap_keyinput(self.prefix_key)
-		call a:cmdline.disable_keymapping()
-		call a:cmdline.setpos(a:cmdline.getpos()-1)
-	else
-		if exists("self.prefix_key")
-			call a:cmdline.untap_keyinput(self.prefix_key)
-			call a:cmdline.enable_keymapping()
-			unlet! self.prefix_key
-		endif
-	endif
-endfunction
-
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
deleted file mode 100755
index a0acf93..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
+++ /dev/null
@@ -1,118 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:Keymapping = a:V.import("Over.Keymapping")
-endfunction
-
-
-function! s:_vital_depends()
-	return [
-\		"Over.Keymapping",
-\	]
-endfunction
-
-
-let s:emacs = {
-\	"name" : "KeyMapping_emacs_like"
-\}
-
-function! s:emacs.keymapping(cmdline)
-	return {
-\		"\<C-f>" : {
-\			"key" : "\<Right>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-b>" : {
-\			"key" : "\<Left>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-n>" : {
-\			"key" : "\<Down>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-p>" : {
-\			"key" : "\<Up>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-a>" : {
-\			"key" : "\<Home>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-e>" : {
-\			"key" : "\<End>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<C-d>" : {
-\			"key" : "\<Del>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<A-d>" : {
-\			"key" : "\<C-w>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<A-b>" : {
-\			"key" : "\<S-Left>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\		"\<A-f>" : {
-\			"key" : "\<S-Right>",
-\			"noremap" : 1,
-\			"lock" : 1,
-\		},
-\	}
-endfunction
-
-
-function! s:make_emacs()
-	return deepcopy(s:emacs)
-endfunction
-
-
-let s:vim_cmdline_mapping = {
-\	"name" : "KeyMapping_vim_cmdline_mapping",
-\	"_cmaps" : {}
-\}
-
-function! s:_auto_cmap()
-	let cmaps = {}
-	let cmap_info = s:Keymapping.cmap_rhss(0, 1)
-	" vital-over currently doesn't support <expr> nor <buffer> mappings
-	for c in filter(cmap_info, "v:val['expr'] ==# 0 && v:val['buffer'] ==# 0")
-		let cmaps[s:Keymapping.escape_key(c['lhs'])] = {
-		\   'noremap' : c['noremap'],
-		\   'key' : s:Keymapping.escape_key(c['rhs']),
-		\ }
-	endfor
-	return cmaps
-endfunction
-
-
-function! s:vim_cmdline_mapping.on_enter(cmdline)
-	let self._cmaps = s:_auto_cmap()
-endfunction
-
-
-function! s:vim_cmdline_mapping.keymapping(cmdline)
-	return self._cmaps
-endfunction
-
-function! s:make_vim_cmdline_mapping()
-	return deepcopy(s:vim_cmdline_mapping)
-endfunction
-
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
deleted file mode 100755
index 64d2b65..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:module = {
-\	"name" : "NoInsert",
-\	"chars" : []
-\}
-
-
-function! s:module.is_no_insert(char)
-	return index(self.chars, a:char) >= 0
-endfunction
-
-
-function! s:module.on_char_pre(cmdline)
-	if self.is_no_insert(a:cmdline.char())
-\	&& a:cmdline.char() == a:cmdline.variables.input
-		call a:cmdline.setchar("", 0)
-	endif
-endfunction
-
-
-function! s:make(chars)
-	let module = deepcopy(s:module)
-	let module.chars = type(a:chars) == type([]) ? a:chars : [a:chars]
-	return module
-endfunction
-
-
-function! s:make_special_chars()
-	let module = s:make([])
-	function! module.is_no_insert(char)
-		return char2nr(a:char) == 128 || char2nr(a:char) < 27
-	endfunction
-	return module
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
deleted file mode 100755
index 6b1a99b..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-let s:module = {
-\	"name" : "Paste"
-\}
-
-function! s:module.on_char_pre(cmdline)
-	if a:cmdline.is_input("<Over>(paste)")
-		let register = v:register == "" ? '"' : v:register
-		call a:cmdline.insert(tr(getreg("*"), "\n", "\r"))
-		call a:cmdline.setchar('')
-	endif
-endfunction
-
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
deleted file mode 100755
index 480ed21..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-let s:module = {
-\	"name" : "Redraw",
-\}
-
-function! s:module.on_execute_pre(cmdline)
-	call self.redraw(a:cmdline)
-endfunction
-
-function! s:module.on_enter(...)
-	let self.is_execute = 0
-endfunction
-
-function! s:module.on_execute(...)
-	let self.is_execute = 1
-endfunction
-
-function! s:module.on_execute_failed(...)
-	let self.is_execute = 0
-endfunction
-
-function! s:module.on_leave(cmdline)
-	if self.is_execute == 0 && a:cmdline.exit_code() != -1
-		call self.redraw(a:cmdline)
-	endif
-endfunction
-
-
-" function! s:module.on_draw_pre(cmdline)
-" 	call self.redraw(a:cmdline)
-" endfunction
-
-
-function! s:module.redraw(cmdline)
-	redraw
-	" Workaround for the :set cedit=<C-c>
-	" https://github.com/osyo-manga/vital-over/issues/52
-	" https://github.com/Lokaltog/vim-easymotion/issues/177#issuecomment-53663431
-	if &cedit != "<C-c>"
-\	||(v:version >= 704 && has("patch441"))
-		normal! :
-	else
-		execute "normal! :\<Esc>"
-	endif
-endfunction
-
-function! s:make()
-	return deepcopy(s:module)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Input.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Input.vim
deleted file mode 100755
index f162b77..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Input.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:getchar(...)
-	let mode = get(a:, 1, 0)
-	while 1
-		" Workaround for https://github.com/osyo-manga/vital-over/issues/53
-		try
-			let char = call("getchar", a:000)
-		catch /^Vim:Interrupt$/
-			let char = 3 " <C-c>
-		endtry
-		" Workaround for the <expr> mappings
-		if string(char) !=# "\x80\xfd`"
-			return mode == 1 ? !!char
-\				 : type(char) == type(0) ? nr2char(char) : char
-		endif
-	endwhile
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Keymapping.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
deleted file mode 100755
index d5b1ec3..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:capture(cmd)
-	let verbose_save = &verbose
-	let &verbose = 0
-	try
-		redir => result
-		execute "silent!" a:cmd
-		redir END
-	finally
-		let &verbose = verbose_save
-	endtry
-	return result
-endfunction
-
-
-function! s:escape_key(key)
-	execute 'let result = "' . substitute(escape(a:key, '\"'), '\(<.\{-}>\)', '\\\1', 'g') . '"'
-	return result
-endfunction
-
-
-function! s:parse_mapping_lhs(map, mode)
-	return matchstr(a:map, a:mode . '\s\+\zs\S\{-}\ze\s\+')
-endfunction
-
-
-function! s:lhss(mode)
-	let maps = s:capture(a:mode . "map")
-	return filter(map(split(maps, "\n"), "s:parse_mapping_lhs(v:val, a:mode)"), 'v:val =~ ''\S\+''')
-endfunction
-
-
-function! s:rhss(mode, ...)
-	let abbr = get(a:, 1, 0)
-	let dict = get(a:, 2, 0)
-	return map(s:lhss(a:mode), "maparg(v:val, a:mode, abbr, dict)")
-endfunction
-
-
-function! s:cmap_lhss()
-	return s:lhss("c")
-endfunction
-
-
-function! s:cmap_rhss(...)
-	return call("s:rhss", ["c"] + a:000)
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/Signals.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/Signals.vim
deleted file mode 100755
index 41cae27..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/Signals.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:V = a:V
-	let s:L = s:V.import("Data.List")
-endfunction
-
-
-function! s:_vital_depends()
-	return ["Data.List"]
-endfunction
-
-
-let s:base = {
-\	"variables" : {
-\		"slots" : [],
-\		"counter" : 0,
-\	}
-\}
-
-
-function! s:base.connect(slot)
-	let self.variables.counter += 1
-	let slot = { "id" : self.variables.counter, "slot" : a:slot }
-	call add(self.variables.slots, slot)
-	return slot
-endfunction
-
-
-function! s:base.disconnect(slot)
-	if empty(a:slot)
-		return -1
-	endif
-	for i in range(len(self.variables.slots))
-		if self.variables.slots[i].id == a:slot.id
-			unlet self.variables.slots[i]
-			return
-		endif
-	endfor
-	return -1
-endfunction
-
-
-function! s:base.disconnect_by(expr)
-	return self.disconnect(self.find_first_by(a:expr))
-endfunction
-
-
-function! s:call(list, func, ...)
-	let args = get(a:, 1, [])
-	let def = get(a:, 2, 0)
-	return map(copy(a:list), "has_key(v:val, a:func) ? call(v:val.".a:func.", args, v:val) : def")
-endfunction
-
-function! s:base.call(func, ...)
-	return call("s:call", [self.slots(), a:func] + a:000)
-endfunction
-
-
-function! s:base.find_by(expr)
-	return filter(copy(self.variables.slots), a:expr)
-endfunction
-
-
-function! s:base.find_first_by(expr)
-	return get(self.find_by(a:expr), 0, {})
-endfunction
-
-
-function! s:base.sort_by(expr)
-	let self.variables.slots = s:L.sort_by(self.variables.slots, a:expr)
-endfunction
-
-
-function! s:base.get_slot(val)
-	return a:val.slot
-endfunction
-
-
-function! s:base.slots()
-	return map(copy(self.variables.slots), "self.get_slot(v:val)")
-endfunction
-
-
-" function! s:base.dict()
-" 	let result = {}
-" 	for _ in self.variables.slots
-" 		let result[_.id] = _.value
-" 	endfor
-" 	return result
-" endfunction
-
-
-function! s:make()
-	let result = deepcopy(s:base)
-	return result
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/_easymotion/Over/String.vim b/bundle/easymotion/autoload/vital/_easymotion/Over/String.vim
deleted file mode 100755
index e315237..0000000
--- a/bundle/easymotion/autoload/vital/_easymotion/Over/String.vim
+++ /dev/null
@@ -1,277 +0,0 @@
-scriptencoding utf-8
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! s:_vital_loaded(V)
-	let s:V = a:V
-	let s:List = s:V.import("Data.List")
-endfunction
-
-
-function! s:_vital_depends()
-	return [
-\		"Data.List",
-\	]
-endfunction
-
-
-function! s:_clamp(x, max, min)
-	return min([max([a:x, a:max]), a:min])
-endfunction
-
-
-let s:base = {}
-
-function! s:base.set(item)
-	return type(a:item) == type("") ? self.set_str(a:item)
-\		 : type(a:item) == type(0)  ? self.set_pos(a:item)
-\		 : self
-endfunction
-
-function! s:base.str()
-	return join(self.list, "")
-endfunction
-
-function! s:base.set_pos(pos)
-	let self.col = s:_clamp(a:pos, 0, self.length())
-	return self
-endfunction
-
-function! s:base.backward()
-	return self.col > 0 ? join(self.list[ : self.col-1], '') : ""
-endfunction
-
-function! s:base.forward()
-	return join(self.list[self.col+1 : ], '')
-endfunction
-
-function! s:base.pos_word()
-	return get(self.list, self.col, "")
-endfunction
-
-function! s:base.set_str(str)
-	let self.list = split(a:str, '\zs')
-	let self.col  = strchars(a:str)
-	return self
-endfunction
-
-function! s:base.pos()
-	return self.col
-endfunction
-
-function! s:base.input(str)
-	call extend(self.list, split(a:str, '\zs'), self.col)
-	let self.col += len(split(a:str, '\zs'))
-	return self
-endfunction
-
-function! s:base.length()
-	return len(self.list)
-endfunction
-
-function! s:base.next()
-	return self.set_pos(self.col + 1)
-endfunction
-
-function! s:base.prev()
-	return self.set_pos(self.col - 1)
-endfunction
-
-function! s:base.remove(index)
-	if a:index < 0 || self.length() <= a:index
-		return self
-	endif
-	unlet self.list[a:index]
-	if a:index < self.col
-		call self.set(self.col - 1)
-	endif
-	return self
-endfunction
-
-function! s:base.remove_pos()
-	return self.remove(self.col)
-endfunction
-
-function! s:base.remove_prev()
-	return self.remove(self.col - 1)
-endfunction
-
-function! s:base.remove_next()
-	return self.remove(self.col + 1)
-endfunction
-
-
-function! s:make(...)
-	let default = get(a:, 1, "")
-	let result = deepcopy(s:base)
-	call result.set(default)
-	return result
-endfunction
-
-
-function! s:_split(str, pat)
-	let pat = (exists("+regexpengine") ? '\%#=2' : '') . a:pat
-	let list = split(a:str,  pat . '\zs')
-	return s:List.flatten(map(list, 'v:val == a:pat ? a:pat : v:val =~ pat . ''$'' ? split(v:val, pat) + [a:pat] : v:val'))
-endfunction
-
-
-function! s:_split_keystring(str, pats, ...)
-	if a:str =~ '^<Over>(.\{-})$'
-\	|| a:str =~ "^\<Plug>(.\\{-})$"
-		return [a:str]
-	endif
-	let pats = a:pats
-	let index = get(a:, 1, 0)
-	if !exists("+regexpengine")
-\	|| index > len(pats)
-\	|| len(filter(copy(pats), 'a:str =~ ''\%#=2'' . v:val')) == 0
-		if len(filter(copy(pats), 'a:str ==# v:val')) == 0
-			return split(a:str, '\zs')
-		else
-			return [a:str]
-		endif
-	endif
-	if len(filter(copy(pats), 'a:str == v:val')) == 1
-		return [a:str]
-	endif
-
-	let result = []
-	let pat = pats[index]
-	let list = s:_split(a:str, pat)
-	let result += eval(join(map(list, "s:_split_keystring(v:val, pats, index+1)"), "+"))
-	return result
-endfunction
-
-
-let s:special_keys = [
-\	"\<BS>",
-\	"\<Down>",
-\	"\<Up>",
-\	"\<Left>",
-\	"\<Right>",
-\	"\<Home>",
-\	"\<End>",
-\	"\<Insert>",
-\	"\<Delete>",
-\	"\<PageUp>",
-\	"\<PageDown>",
-\	"\<F1>",
-\	"\<F2>",
-\	"\<F3>",
-\	"\<F4>",
-\	"\<F5>",
-\	"\<F6>",
-\	"\<F7>",
-\	"\<F8>",
-\	"\<F9>",
-\	"\<F10>",
-\	"\<F11>",
-\	"\<F12>",
-\	"\<A-BS>",
-\	"\<A-Down>",
-\	"\<A-Up>",
-\	"\<A-Left>",
-\	"\<A-Right>",
-\	"\<A-Home>",
-\	"\<A-End>",
-\	"\<A-Insert>",
-\	"\<A-Delete>",
-\	"\<A-PageUp>",
-\	"\<A-PageDown>",
-\	"\<A-F1>",
-\	"\<A-F2>",
-\	"\<A-F3>",
-\	"\<A-F4>",
-\	"\<A-F5>",
-\	"\<A-F6>",
-\	"\<A-F7>",
-\	"\<A-F8>",
-\	"\<A-F9>",
-\	"\<A-F10>",
-\	"\<A-F11>",
-\	"\<A-F12>",
-\	"\<A-Tab>",
-\	"\<C-BS>",
-\	"\<C-Down>",
-\	"\<C-Up>",
-\	"\<C-Left>",
-\	"\<C-Right>",
-\	"\<C-Home>",
-\	"\<C-End>",
-\	"\<C-Insert>",
-\	"\<C-Delete>",
-\	"\<C-PageUp>",
-\	"\<C-PageDown>",
-\	"\<C-Tab>",
-\	"\<C-F1>",
-\	"\<C-F2>",
-\	"\<C-F3>",
-\	"\<C-F4>",
-\	"\<C-F5>",
-\	"\<C-F6>",
-\	"\<C-F7>",
-\	"\<C-F8>",
-\	"\<C-F9>",
-\	"\<C-F10>",
-\	"\<C-F11>",
-\	"\<C-F12>",
-\	"\<S-Down>",
-\	"\<S-Up>",
-\	"\<S-Left>",
-\	"\<S-Right>",
-\	"\<S-Home>",
-\	"\<S-Insert>",
-\	"\<S-PageUp>",
-\	"\<S-PageDown>",
-\	"\<S-F1>",
-\	"\<S-F2>",
-\	"\<S-F3>",
-\	"\<S-F4>",
-\	"\<S-F5>",
-\	"\<S-F6>",
-\	"\<S-F7>",
-\	"\<S-F8>",
-\	"\<S-F9>",
-\	"\<S-F10>",
-\	"\<S-F11>",
-\	"\<S-F12>",
-\	"\<S-Tab>",
-\]
-" Issues #45
-" \	"\<S-End>",
-" \	"\<S-Delete>",
-
-
-" Workaround
-" https://github.com/osyo-manga/vital-over/pull/63
-" http://lingr.com/room/vim/archives/2014/10/29#message-20492403
-if exists("+regexpengine")
-	function! s:_split_keystring(str, ...)
-		return split(a:str, '\%#=2' . "\\m\\%(" . get(a:, 1, '') . "\x80\xfc.\\%(\x80..\\|.\\)\\zs\\|\x80..\\zs\\|.\\zs\\)")
-	endfunction
-
-	function! s:split_by_keys(str)
-		return s:_split_keystring(a:str, "\\%(\<Plug>\\|<Over>\\)(.\\{-})\\zs\\|")
-	endfunction
-else
-	function! s:split_by_keys(str)
-		return s:_split_keystring(a:str, s:special_keys)
-	endfunction
-endif
-
-
-function! s:index(haystack, needle, ...)
-	let start = get(a:, 1, 0)
-	let ignorecase = get(a:, 2, &ignorecase)
-	if ignorecase
-		return stridx(tolower(a:haystack), tolower(a:needle), start)
-	else
-		return stridx(a:haystack, a:needle, start)
-	endif
-endfunction
-
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/bundle/easymotion/autoload/vital/easymotion.vital b/bundle/easymotion/autoload/vital/easymotion.vital
deleted file mode 100755
index 4dc36d3..0000000
--- a/bundle/easymotion/autoload/vital/easymotion.vital
+++ /dev/null
@@ -1,19 +0,0 @@
-easymotion
-651a023
-
-Over.Commandline.Base
-Over.Commandline.Modules.Cancel
-Over.Commandline.Modules.BufferComplete
-Over.Commandline.Modules.Paste
-Over.Commandline.Modules.KeyMapping
-Over.Commandline.Modules.Doautocmd
-Over.Commandline.Modules.CursorMove
-Over.Commandline.Modules.Delete
-Over.Commandline.Modules.Redraw
-Over.Commandline.Modules.InsertRegister
-Over.Commandline.Modules.History
-Over.Commandline.Modules.NoInsert
-Over.Commandline.Modules.Exit
-Over.Commandline.Modules.DrawCommandline
-Over.Commandline.Modules.ExceptionMessage
-Over.Commandline.Modules.ExceptionExit
diff --git a/bundle/easymotion/doc/easymotion.txt b/bundle/easymotion/doc/easymotion.txt
deleted file mode 100755
index 52f81af..0000000
--- a/bundle/easymotion/doc/easymotion.txt
+++ /dev/null
@@ -1,1158 +0,0 @@
-*easymotion.txt*	Version 2.1
-
-
-            ______                  __  ___       __  _
-           / ____/____ ________  __/  |/  /____  / /_(_)____  ____
-          / __/  / __ `/ ___/ / / / /|_/ // __ \/ __/ // __ \/ __ \
-         / /___ / /_/ (__  ) /_/ / /  / // /_/ / /_/ // /_/ / / / /
-        /_____/ \__,_/____/\__, /_/  /_/ \____/\__/_/ \____/_/ /_/
-                          /____/
-                                  - Vim motions on speed!
-
-
-==============================================================================
-CONTENTS                                                 *easymotion-contents*
-
-    Introduction ....................... |easymotion-introduction|
-    Usage .............................. |easymotion-usage|
-       Default mappings ................ |easymotion-default-mappings|
-       More mappings ................... |easymotion-more-mappings|
-    Requirements ....................... |easymotion-requirements|
-    Configuration ...................... |easymotion-configuration|
-       EasyMotion_keys ................. |EasyMotion_keys|
-       EasyMotion_do_shade ............. |EasyMotion_do_shade|
-       EasyMotion_do_mapping ........... |EasyMotion_do_mapping|
-       EasyMotion_grouping ............. |EasyMotion_grouping|
-       EasyMotion_smartcase ............ |EasyMotion_smartcase|
-       EasyMotion_smartsign ............ |EasyMotion_smartsign|
-       EasyMotion_use_migemo ........... |EasyMotion_use_migemo|
-       EasyMotion_use_upper  ........... |EasyMotion_use_upper|
-       EasyMotion_enter_jump_first ..... |EasyMotion_enter_jump_first|
-       EasyMotion_prompt ............... |EasyMotion_prompt|
-       EasyMotion_highlight ............ |EasyMotion_highlight|
-       EasyMotion_add_search_history ... |EasyMotion_add_search_history|
-       EasyMotion_off_screen_search .... |EasyMotion_off_screen_search|
-       EasyMotion_disable_two_key_combo. |EasyMotion_disable_two_key_combo|
-       Custom highlighting ............. |easymotion-custom-hl|
-       Custom mappings ................. |easymotion-custom-mappings|
-           Leader key .................. |easymotion-leader-key|
-           Custom keys ................. |easymotion-custom-keys|
-    License ............................ |easymotion-license|
-    Known bugs ......................... |easymotion-known-bugs|
-    Contributing ....................... |easymotion-contributing|
-    Credits ............................ |easymotion-credits|
-
-==============================================================================
-Introduction                               *easymotion* *easymotion-introduction*
-
-EasyMotion provides a much simpler way to use some motions in vim. It takes
-the <number> out of <number>w or <number>f{char} by highlighting all possible
-choices and allowing you to press one key to jump directly to the target.
-
-When one of the available motions is triggered, all visible text preceding or
-following the cursor is faded, and motion targets are highlighted.
-
-==============================================================================
-Usage                                                        *easymotion-usage*
-
-EasyMotion is triggered by one of the provided mappings (see
-|easymotion-default-mappings| for details).
-
-Example: >
-
-    <cursor>Lorem ipsum dolor sit amet.
-
-Type <Leader><Leader>w to trigger the word motion |w|. See
-|easymotion-leader-key| for details about the leader key. When the
-motion is triggered, the text is updated (no braces are actually added,
-the text is highlighted in red by default): >
-
-    <cursor>Lorem {a}psum {b}olor {c}it {d}met.
-
-Press "c" to jump to the beginning of the word "sit": >
-
-    Lorem ipsum dolor <cursor>sit amet.
-
-Similarly, if you're looking for an "o", you can use the |f| motion.
-Type <Leader><Leader>fo, and all "o" characters are highlighted: >
-
-    <cursor>L{a}rem ipsum d{b}l{c}r sit amet.
-
-Press "b" to jump to the second "o": >
-
-    Lorem ipsum d<cursor>olor sit amet.
-
-And that's it!
-
-------------------------------------------------------------------------------
-Default mappings                                  *easymotion-default-mappings*
-
-The default configuration defines the following mappings in normal,
-visual and operator-pending mode if |g:EasyMotion_do_mapping| is on:
-
-Note: The default leader has been changed to <Leader><Leader> to avoid
-      conflicts with other plugins you may have installed
-
-    Default Mapping      | Details
-    ---------------------|----------------------------------------------
-    <Leader>f{char}      | Find {char} to the right. See |f|.
-    <Leader>F{char}      | Find {char} to the left. See |F|.
-    <Leader>t{char}      | Till before the {char} to the right. See |t|.
-    <Leader>T{char}      | Till after the {char} to the left. See |T|.
-    <Leader>w            | Beginning of word forward. See |w|.
-    <Leader>W            | Beginning of WORD forward. See |W|.
-    <Leader>b            | Beginning of word backward. See |b|.
-    <Leader>B            | Beginning of WORD backward. See |B|.
-    <Leader>e            | End of word forward. See |e|.
-    <Leader>E            | End of WORD forward. See |E|.
-    <Leader>ge           | End of word backward. See |ge|.
-    <Leader>gE           | End of WORD backward. See |gE|.
-    <Leader>j            | Line downward. See |j|.
-    <Leader>k            | Line upward. See |k|.
-    <Leader>n            | Jump to latest "/" or "?" forward. See |n|.
-    <Leader>N            | Jump to latest "/" or "?" backward. See |N|.
-    <Leader>s            | Find(Search) {char} forward and backward.
-                         | See |f| and |F|.
-
-See |easymotion-leader-key| and |mapleader| for details about the leader key.
-See |easymotion-custom-mappings| for customizing the default mappings.
-
-EasyMotion <Plug> table                                *easymotion-plug-table*
-
-    <Plug> Mapping Table | Default
-    ---------------------|----------------------------------------------
-    <Plug>(easymotion-f) | <Leader>f{char}
-    <Plug>(easymotion-F) | <Leader>F{char}
-    <Plug>(easymotion-t) | <Leader>t{char}
-    <Plug>(easymotion-T) | <Leader>T{char}
-    <Plug>(easymotion-w) | <Leader>w
-    <Plug>(easymotion-W) | <Leader>W
-    <Plug>(easymotion-b) | <Leader>b
-    <Plug>(easymotion-B) | <Leader>B
-    <Plug>(easymotion-e) | <Leader>e
-    <Plug>(easymotion-E) | <Leader>E
-    <Plug>(easymotion-ge)| <Leader>ge
-    <Plug>(easymotion-gE)| <Leader>gE
-    <Plug>(easymotion-j) | <Leader>j
-    <Plug>(easymotion-k) | <Leader>k
-    <Plug>(easymotion-n) | <Leader>n
-    <Plug>(easymotion-N) | <Leader>N
-    <Plug>(easymotion-s) | <Leader>s
-
-    More <Plug> Mapping Table         | (No assignment by default)
-    ----------------------------------|---------------------------------
-    <Plug>(easymotion-bd-f)           | See |<Plug>(easymotion-s)|
-    <Plug>(easymotion-bd-t)           | See |<Plug>(easymotion-bd-t)|
-    <Plug>(easymotion-bd-w)           | See |<Plug>(easymotion-bd-w)|
-    <Plug>(easymotion-bd-W)           | See |<Plug>(easymotion-bd-W)|
-    <Plug>(easymotion-bd-e)           | See |<Plug>(easymotion-bd-e)|
-    <Plug>(easymotion-bd-E)           | See |<Plug>(easymotion-bd-E)|
-    <Plug>(easymotion-bd-jk)          | See |<Plug>(easymotion-bd-jk)|
-    <Plug>(easymotion-bd-n)           | See |<Plug>(easymotion-bd-n)|
-    <Plug>(easymotion-jumptoanywhere) | See |<Plug>(easymotion-jumptoanywhere)|
-    <Plug>(easymotion-repeat)         | See |<Plug>(easymotion-repeat)|
-    <Plug>(easymotion-next)           | See |<Plug>(easymotion-next)|
-    <Plug>(easymotion-prev)           | See |<Plug>(easymotion-prev)|
-    <Plug>(easymotion-sol-j)          | See |<Plug>(easymotion-sol-j)|
-    <Plug>(easymotion-sol-k)          | See |<Plug>(easymotion-sol-k)|
-    <Plug>(easymotion-eol-j)          | See |<Plug>(easymotion-eol-j)|
-    <Plug>(easymotion-eol-k)          | See |<Plug>(easymotion-eol-k)|
-    <Plug>(easymotion-iskeyword-w)    | See |<Plug>(easymotion-iskeyword-w)|
-    <Plug>(easymotion-iskeyword-b)    | See |<Plug>(easymotion-iskeyword-b)|
-    <Plug>(easymotion-iskeyword-bd-w) | See |<Plug>(easymotion-iskeyword-bd-w)|
-    <Plug>(easymotion-iskeyword-e)    | See |<Plug>(easymotion-iskeyword-e)|
-    <Plug>(easymotion-iskeyword-ge)   | See |<Plug>(easymotion-iskeyword-ge)|
-    <Plug>(easymotion-iskeyword-bd-e) | See |<Plug>(easymotion-iskeyword-bd-e)|
-    <Plug>(easymotion-vim-n)          | See |<Plug>(easymotion-vim-n)|
-    <Plug>(easymotion-vim-N)          | See |<Plug>(easymotion-vim-N)|
-                                      |
-    Within Line Motion                | See |easymotion-within-line|
-    ----------------------------------|---------------------------------
-    <Plug>(easymotion-sl)             | See |<Plug>(easymotion-sl)|
-    <Plug>(easymotion-fl)             | See |<Plug>(easymotion-fl)|
-    <Plug>(easymotion-Fl)             | See |<Plug>(easymotion-Fl)|
-    <Plug>(easymotion-bd-fl)          | See |<Plug>(easymotion-sl)|
-    <Plug>(easymotion-tl)             | See |<Plug>(easymotion-tl)|
-    <Plug>(easymotion-Tl)             | See |<Plug>(easymotion-Tl)|
-    <Plug>(easymotion-bd-tl)          | See |<Plug>(easymotion-bd-tl)|
-    <Plug>(easymotion-wl)             | See |<Plug>(easymotion-wl)|
-    <Plug>(easymotion-bl)             | See |<Plug>(easymotion-bl)|
-    <Plug>(easymotion-bd-wl)          | See |<Plug>(easymotion-bd-wl)|
-    <Plug>(easymotion-el)             | See |<Plug>(easymotion-el)|
-    <Plug>(easymotion-gel)            | See |<Plug>(easymotion-gel)|
-    <Plug>(easymotion-bd-el)          | See |<Plug>(easymotion-bd-el)|
-    <Plug>(easymotion-lineforward)    | See |<Plug>(easymotion-lineforward)|
-    <Plug>(easymotion-linebackward)   | See |<Plug>(easymotion-linebackward)|
-    <Plug>(easymotion-lineanywhere)   | See |<Plug>(easymotion-lineanywhere)|
-                                      |
-    Multi Input Find Motion           | See |easymotion-multi-input|
-    ----------------------------------|---------------------------------
-    <Plug>(easymotion-s2)             | See |<Plug>(easymotion-s2)|
-    <Plug>(easymotion-f2)             | See |<Plug>(easymotion-f2)|
-    <Plug>(easymotion-F2)             | See |<Plug>(easymotion-F2)|
-    <Plug>(easymotion-bd-f2)          | See |<Plug>(easymotion-s2)|
-    <Plug>(easymotion-t2)             | See |<Plug>(easymotion-t2)|
-    <Plug>(easymotion-T2)             | See |<Plug>(easymotion-T2)|
-    <Plug>(easymotion-bd-t2)          | See |<Plug>(easymotion-bd-t2)|
-                                      |
-    <Plug>(easymotion-sl2)            | See |<Plug>(easymotion-sl2)|
-    <Plug>(easymotion-fl2)            | See |<Plug>(easymotion-fl2)|
-    <Plug>(easymotion-Fl2)            | See |<Plug>(easymotion-Fl2)|
-    <Plug>(easymotion-tl2)            | See |<Plug>(easymotion-tl2)|
-    <Plug>(easymotion-Tl2)            | See |<Plug>(easymotion-Tl2)|
-                                      |
-    <Plug>(easymotion-sn)             | See |<Plug>(easymotion-sn)|
-    <Plug>(easymotion-fn)             | See |<Plug>(easymotion-fn)|
-    <Plug>(easymotion-Fn)             | See |<Plug>(easymotion-Fn)|
-    <Plug>(easymotion-bd-fn)          | See |<Plug>(easymotion-sn)|
-    <Plug>(easymotion-tn)             | See |<Plug>(easymotion-tn)|
-    <Plug>(easymotion-Tn)             | See |<Plug>(easymotion-Tn)|
-    <Plug>(easymotion-bd-tn)          | See |<Plug>(easymotion-bd-tn)|
-                                      |
-    <Plug>(easymotion-sln)            | See |<Plug>(easymotion-sln)|
-    <Plug>(easymotion-fln)            | See |<Plug>(easymotion-fln)|
-    <Plug>(easymotion-Fln)            | See |<Plug>(easymotion-Fln)|
-    <Plug>(easymotion-bd-fln)         | See |<Plug>(easymotion-sln)|
-    <Plug>(easymotion-tln)            | See |<Plug>(easymotion-tln)|
-    <Plug>(easymotion-Tln)            | See |<Plug>(easymotion-Tln)|
-    <Plug>(easymotion-bd-tln)         | See |<Plug>(easymotion-bd-tln)|
-
-
-------------------------------------------------------------------------------
-More mappings                                        *easymotion-more-mappings*
-
-These mappings are not mapped by Default.
-
-Bidirection ~
-
-    Note: bd is short for bidirectional
-
-<Plug>(easymotion-s)                                    *<Plug>(easymotion-s)*
-                                                     *<Plug>(easymotion-bd-f)*
-                Find {char} to bidirection(forward and backward at the same
-                time.) See |f| & |F|.
-
-<Plug>(easymotion-bd-t)                               *<Plug>(easymotion-bd-t)*
-                Till before & after the {char}. See |t| & |T|.
-
-<Plug>(easymotion-bd-w)                               *<Plug>(easymotion-bd-w)*
-                Beginning of word forward and backward. See |w| & |b|.
-
-<Plug>(easymotion-bd-W)                               *<Plug>(easymotion-bd-W)*
-                Beginning of WORD forward and backward. See |W| & |B|.
-
-<Plug>(easymotion-bd-e)                               *<Plug>(easymotion-bd-e)*
-                End of word forward and backward. See |e| & |ge|.
-
-<Plug>(easymotion-bd-E)                               *<Plug>(easymotion-bd-E)*
-                End of WORD forward and backward. See |e| & |ge|.
-
-<Plug>(easymotion-bd-jk)                             *<Plug>(easymotion-bd-jk)*
-                Line downward and upward. See |j| & |k|.
-
-<Plug>(easymotion-bd-n)                               *<Plug>(easymotion-bd-n)*
-                Jump to latest "/" or "?" forward. See |n| & |N|.
-
-Jump To Anywhere ~
-
-<Plug>(easymotion-jumptoanywhere)           *<Plug>(easymotion-jumptoanywhere)*
-                JumpToAnywhere motion!
-                Default: Beginning and End of word, Camelcase, after '_',
-                and after '#'.
-                You can modify this motion behavior by vimrc
-
-    |g:EasyMotion_re_anywhere|:                        *g:EasyMotion_re_anywhere*
->
-    let g:EasyMotion_re_anywhere = '\v' .
-        \       '(<.|^$)' . '|' .
-        \       '(.>|^$)' . '|' .
-        \       '(\l)\zs(\u)' . '|' .
-        \       '(_\zs.)' . '|' .
-        \       '(#\zs.)'
-<
-    Modified example:
->
-    let g:EasyMotion_re_anywhere = '\v' .
-        \       '(<.|^)' . '|' .
-        \       '(<.|.$)' . '|' .
-        \       '(\l)\zs(\u)' . '|' .
-<
-Repeat ~
-
-<Plug>(easymotion-repeat)                           *<Plug>(easymotion-repeat)*
-        Repeat last motion!
-
-        Repeat last motion type including input target character.
-        Nothing will happen when previous motion doesn't exist.
-
-        Last Find Motion~
-            With a Find motion (e.g. |<Plug>(easymotion-s)| ), type `<CR>`
-            without input characters to invoke the last find motion. This does
-            not repeat the motion type (e.g. other word motion,
-            <Plug>(easymotion-j) etc...) only input characters.
-
-<Plug>(easymotion-next)                               *<Plug>(easymotion-next)*
-<Plug>(easymotion-prev)                               *<Plug>(easymotion-prev)*
-
-        Jump to next/previous match. This is the only motion that can move to
-        off-screen locations. With set |'wrapscan'| enabled, this motion will
-        also wrap around the end of the file. During this motion, matched
-        text is highlighted. If you don't want highlighting, set
-        |g:EasyMotion_move_highlight| to 0.
-
-        Example:
->
-            nmap <Leader>; <Plug>(easymotion-next)
-            nmap <Leader>, <Plug>(easymotion-prev)
-<
-        This feature is inspired by and based on vim-sneak. vim-sneak can be
-        downloaded here: https://github.com/justinmk/vim-sneak
-
-EasyMotion dot repeat~
-                                    *easymotion-dotrepeat* *easymotion-textobjct*
-
-        This feature requires tpope/vim-repeat
-        https://github.com/tpope/vim-repeat
-
-        All motions support '.' repeat.
-
-        Example:
->
-        " vimrc:
-        omap z <Plug>(easymotion-t)
-        let g:EasyMotion_keys='hklyuiopnm,qwertzxcvbasdgjf;'
-<
-        Text sample:
->
-        {cursor}Lorem ipsum dolor sit ame*t*, consectetur adipisicing eli*t*,
-        sed do eiusmod tempor
-<
-        type `dzt` and type first target marker(in this case, `h`)
->
-        {cursor}*t*, consectetur adipisicing eli*t,* sed do eiusmod tempor
-<
-        from here type '`.`' and you get:
->
-        *t,* sed do eiusmod tempor
-<
-
-JK Motion ~
-                                                         *easymotion-jk-motion*
-
-JK motion option                    *<Plug>(easymotion-j)* *<Plug>(easymotion-k)*
-                                                    *g:EasyMotion_startofline*
-
-        The default behavior of the |j| and |k| is to move your cursor to the
-        start of the line. Set this option to 0 to force the cursor to stay in
-        the same column If you want to use both movements as separate
-        mappings, set |'g:EasyMotion_startofline'| to 0 and map
-        |<Plug>(easymotion-sol-j)| & |<Plug>(easymotion-sol-k)| to the start
-        of line mapping:
->
-        let g:EasyMotion_startofline = 0 # keep cursor colum JK motion
-        map <Leader>J <Plug>(easymotion-sol-j)
-        map <Leader>K <Plug>(easymotion-sol-k)
-<
-Default: 1
-
-Start of Line JK motion     *<Plug>(easymotion-sol-j)* *<Plug>(easymotion-sol-k)*
-                                                 *<Plug>(easymotion-sol-bd-jk)*
-
-        Start of line J/K motion
-        Example:
->
-        map <Leader>J <Plug>(easymotion-sol-j)
-        map <Leader>K <Plug>(easymotion-sol-k)
-<
-End of Line JK motion       *<Plug>(easymotion-eol-j)* *<Plug>(easymotion-eol-k)*
-                                                 *<Plug>(easymotion-eol-bd-jk)*
-
-        End of line J/K motion
-        Example:
->
-        map <Leader>J <Plug>(easymotion-eol-j)
-        map <Leader>K <Plug>(easymotion-eol-K)
-<
-
-iskeyword compatible word motions           *<Plug>(easymotion-iskeyword-w)*
-                                            *<Plug>(easymotion-iskeyword-b)*
-                                            *<Plug>(easymotion-iskeyword-bd-w)*
-                                            *<Plug>(easymotion-iskeyword-e)*
-                                            *<Plug>(easymotion-iskeyword-ge)*
-                                            *<Plug>(easymotion-iskeyword-bd-e)*
-        Default word motions which EasyMotion provide is not completely
-        compatible with |iskeyword| options. But if you make default word
-        motion completely compatible with it, there will be so many targets
-        that they maybe annoy you, so provide |iskeyword| compatible word
-        motions with another |<Plug>| mappings.
-
-        Example:
->
-        map <Leader>w <Plug>(easymotion-iskeyword-w)
-        map <Leader>b <Plug>(easymotion-iskeyword-b)
-<
-        NOTE: Within line motions are compatible with |iskeyword| by default.
-
-Search motion respect previous direction
-
-    <Plug>(easymotion-vim-n)                         *<Plug>(easymotion-vim-n)*
-    <Plug>(easymotion-vim-N)                         *<Plug>(easymotion-vim-N)*
-
-    This is vim compatible |n| & |N| easymotion. Unlike |<Plug>(easymotion-n)|
-    and |<Plug>(easymotion-N)| 's direction is always forward or backward,
-    these motions consider previous search direction. 
-
-Within line motion ~
-                                                       *easymotion-within-line*
-
-<Plug>(easymotion-sl)                                   *<Plug>(easymotion-sl)*
-                                                     *<Plug>(easymotion-bd-fl)*
-                This function is same as |<Plug>(easymotion-s)|, except the range
-                is limited to the current cursor line.
-
-<Plug>(easymotion-fl)                                   *<Plug>(easymotion-fl)*
-                This function is same as |<Plug>(easymotion-f)|, except the range
-                is limited to the current cursor line.
-
-<Plug>(easymotion-Fl)                                   *<Plug>(easymotion-Fl)*
-                This function is same as |<Plug>(easymotion-F)|, except the range
-                is limited to the current cursor line.
-
-<Plug>(easymotion-tl)                                   *<Plug>(easymotion-tl)*
-                This function is same as |<Plug>(easymotion-t)|, except the
-                range is limited to the current cursor line.
-
-<Plug>(easymotion-Tl)                                   *<Plug>(easymotion-Tl)*
-                This function is same as |<Plug>(easymotion-T)|, except the
-                range is limited to the current cursor line.
-
-<Plug>(easymotion-bd-tl)                             *<Plug>(easymotion-bd-tl)*
-                This function is same as |<Plug>(easymotion-bd-t)|, except the
-                range is limited to the current cursor line.
-
-<Plug>(easymotion-wl)                                   *<Plug>(easymotion-wl)*
-                This function is same as |<Plug>(easymotion-iskeyword-w)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-bl)                                   *<Plug>(easymotion-bl)*
-                This function is same as |<Plug>(easymotion-iskeyword-b)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-bd-wl)                             *<Plug>(easymotion-bd-wl)*
-                This function is same as |<Plug>(easymotion-iskeyword-bd-w)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-el)                                   *<Plug>(easymotion-el)*
-                This function is same as |<Plug>(easymotion-iskeyword-e)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-gel)                                 *<Plug>(easymotion-gel)*
-                This function is same as |<Plug>(easymotion-iskeyword-ge)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-bd-el)                             *<Plug>(easymotion-bd-el)*
-                This function is same as |<Plug>(easymotion-iskeyword-bd-e)|,
-                except the range is limited to the current cursor line.
-
-<Plug>(easymotion-lineforward)                 *<Plug>(easymotion-lineforward)*
-                This function is similar to
-                |<Plug>(easymotion-jumptoanywhere)|, except the range is
-                limited to the current cursor line in the forward direction.
-
-<Plug>(easymotion-linebackward)               *<Plug>(easymotion-linebackward)*
-                This function is similar to
-                |<Plug>(easymotion-jumptoanywhere)|, except the range is
-                limited to the current cursor line in the backward direction.
-
-<Plug>(easymotion-lineanywhere)               *<Plug>(easymotion-lineanywhere)*
-                This function is same as |<Plug>(easymotion-jumptoanywhere)|,
-                but limited to within the current cursor line.
-
-                You can customize the behavior of this function in your
-                vimrc.
-
-    |g:EasyMotion_re_line_anywhere|:             *g:EasyMotion_re_line_anywhere*
-
-    Default:
->
-    let g:EasyMotion_re_line_anywhere = '\v' .
-        \       '(<.|^$)' . '|' .
-        \       '(.>|^$)' . '|' .
-        \       '(\l)\zs(\u)' . '|' .
-        \       '(_\zs.)' . '|' .
-        \       '(#\zs.)'
-<
-    Modified example:
->
-    let g:EasyMotion_re_line_anywhere = '\v' .
-        \       '(<.|^)' . '|' .
-        \       '(>.|.$)' . '|' .
-        \       '(\l)\zs(\u)' . '|' .
-
-Multi Input Find Motion!~
-                                                       *easymotion-multi-input*
-                                                           *easymotion-two-key*
-                                                           *easymotion-{find}n*
-                                                   *<Plug>(easymotion-{find}n)*
-                                                   *<Plug>(easymotion-{find}2)*
-
-EasyMotion provide another find motion by multi input target.
-
-Example:
->
-    nmap s         <Plug>(easymotion-s2)
-    xmap s         <Plug>(easymotion-s2)
-    omap z         <Plug>(easymotion-s2)
-    nmap <Leader>s <Plug>(easymotion-sn)
-    xmap <Leader>s <Plug>(easymotion-sn)
-    omap <Leader>z <Plug>(easymotion-sn)
-<
-If you like typing two or more characters as targets, similar to vim-smalls
-or vim-seek/vim-sneak, |EasyMotion| also provide this feature. With the above
-keymapping,
-
-    Invoke EasyMotion by two character:
-
-    s{char}{char} (Type s{char}<CR> to use just one {char} is also allowed)
-
-    And you can use as many target characters as you like:
-
-    <Leader>s{char}{char}{char}...<CR>
-
-    You can use <C-h> to delete while typing, and Vim's default |n| & |N|
-    keymappings works after this motion(|<Plug>(easymotion-sn)|) to move next or
-    previous matches.
-
-    Note: the 'n' key motion provides incremental highlighting. If you don't
-          want to highlight incrementally, set |g:EasyMotion_inc_highlight|
-          to 0.
->
-    let g:EasyMotion_inc_highlight = 0
-<
-All Find motions (s,f,F,t,T,sl,fl,Fl,tl,Tl, see below) support this feature!
-(|l| means within line motion)
-
-    *<Plug>(easymotion-sn)* *<Plug>(easymotion-fn)* *<Plug>(easymotion-Fn)*
-    *<Plug>(easymotion-tn)* *<Plug>(easymotion-Tn)* *<Plug>(easymotion-bd-tn)*
-    *<Plug>(easymotion-sln)* *<Plug>(easymotion-fln)* *<Plug>(easymotion-Fln)*
-    *<Plug>(easymotion-tln)* *<Plug>(easymotion-Tln)* *<Plug>(easymotion-bd-tln)*
-
-
-    *<Plug>(easymotion-s2)* *<Plug>(easymotion-f2)* *<Plug>(easymotion-F2)*
-    *<Plug>(easymotion-t2)* *<Plug>(easymotion-T2)* *<Plug>(easymotion-bd-t2)*
-    *<Plug>(easymotion-sl2)* *<Plug>(easymotion-fl2)* *<Plug>(easymotion-Fl2)*
-    *<Plug>(easymotion-tl2)* *<Plug>(easymotion-Tl2)* *<Plug>(easymotion-bd-tl2)*
-
-Find Motion Command Line~
-                                                      *easymotion-command-line*
-    EasyMotion has own command line for find motions, especially for
-    'n' key motion(e.g. |<Plug>(easymotion-sn)|). This command is inspired
-    by over.vim and actually uses over.vim's library. over.vim can be
-    downloaded here:
-
-        https://github.com/osyo-manga/vim-over
-
-        Library: https://github.com/osyo-manga/vital-over
-
-    Note: These settings are experimental. They may be changed in the near
-    future.
-
-    Default Command Line Mappings~
-    Most default mappings work the same as the default command line mappings
-    of Vim. See |cmdline.txt|
-
-    Key Mappings            | Details
-    ----------------------- |----------------------------------------------
-    <CR>                    | Execute EasyMotion.
-    <ESC> or <C-c>          | Cancel
-    <Right> or <C-f>        | Cursor right
-    <Left> or <C-b>         | Cursor left
-    <Home> or <C-a>         | cursor to beginning of command-line
-    <End> or <C-e>          | cursor to end of command-line
-    <BS>  or <C-h>          | Delete one character
-    <C-d>                   | Delete one character at the cursor pos
-    <C-w>                   | Delete the word before the cursor
-    <C-u>                   | Delete all entered characters before the cursor
-    <Up> or <C-p>           | Recall older (previous) search from history
-    <Down> or <C-n>         | Recall more recent (next) search from history
-    <C-r> {0-9a-z"%#:-=.}   | Insert Register. See |c_Ctrl-R|
-    <C-r><C-w>              | Insert the Word under cursor
-    <C-r><C-a>              | Insert the |WORD| under cursor
-    <C-r><C-f>              | Insert the Filename under cursor
-    ------------------------|---------------------------------------
-    <Over>(paste)           | Paste yanked text to the command line
-                            |   Default: <C-v>
-    <Over>(buffer-complete) | Completion of buffer text Default: <C-l>
-    *<Over>(em-scroll-f)*     | Scroll window forward & jump to the next match
-                            |   Default: <Tab>
-    *<Over>(em-scroll-b)*     | Scroll window backward & jump to previous match
-                            |   Default: <S-Tab>
-    *<Over>(em-jumpback)*     | Jump back original cursor position like <C-o>
-                            |   Default: <C-o>
-    *<Over>(em-openallfold)*  | Open all fold
-                            |   Default: <C-z>
-
-    Customize Command Line Mappings~
-                                                         *EMCommandLineNoreMap*
-
-    You can use |EMCommandLineNoreMap| (like |cnoremap|) to customize find
-    motion command line key mappings in your vimrc. This mapping is always
-    nonrecursive, so you should map to |<Over>(em-scroll-f)| and not <Tab>.
-
-    Example:
->
-    " == EM is short for EasyMotion
-    " Enter by <Space> to excute faster & easily
-    EMCommandLineNoreMap <Space> <CR>
-    EMCommandLineNoreMap <C-j> <Space>
-    " Enter by `;` to excute faster & easily
-    EMCommandLineNoreMap ; <CR>
-    EMCommandLineNoreMap <C-j> ;
-    " Buffer Completion with Ctrl-D
-    EMCommandLineNoreMap <C-d> <Over>(buffer-complete)
-<
-                                                             *EMCommandLineMap*
-                                                           *EMCommandLineUnMap*
-    EasyMotion also provide |EMCommandLineMap| (like |cmap|) and
-    |EMCommandLineUnMap| (like |cunmap|), but you probably don't need
-    these commands because there is no case where it should require
-    recursive mappings.
-
-    Note(again): These settings, especially the keymappings are
-    __EXPERIMENTAL__. They could be changed in the near future. However, they
-    work well and are very useful, so I've released them anyway for now.
-
-------------------------------------------------------------------------------
-2.3 Special mappings                              *easymotion-special-mappings*
-
-The default configuration defines the following mappings in visual and
-operator-pending mode if |g:EasyMotion_do_special_mapping| is on:
->
-        let g:EasyMotion_do_special_mapping = 1
-<
-Default: 0
-
-    Special Mapping      | Details
-    ---------------------|----------------------------------------------
-    {operator}<Leader>l  | Select, yank, paste, delete, or other operation of
-                         | lines. See |<Plug>(easymotion-special-l)|.
-    {operator}<Leader>p  | Select, yank, paste, delete, or other operation of
-                         | phrase. See |<Plug>(easymotion-special-p)|.
-
-Or you can map them yourself
-
-    <Plug> Mapping Table         | Details
-    -----------------------------|--------------------------------------
-    <Plug>(easymotion-special-l) | See |<Plug>(easymotion-special-l)|
-    <Plug>(easymotion-special-p) | See |<Plug>(easymotion-special-p)|
-
-
-See |easymotion-leader-key| and |mapleader| for details about the leader key.
-
-==============================================================================
-Requirements                                          *easymotion-requirements*
-
-EasyMotion needs at least vim 7.3 to run without problems.
-Active development and testing is done with vim 7.4 starting from the 2.0
-release of EasyMotion.
-
-Vi-compatible mode must be disabled.
-
-If your vim version is causing you problems with using this plugin, feel free
-to open an issue on github!
-
-Link: https://github.com/Lokaltog/vim-easymotion/issues
-
-==============================================================================
-Configuration                                        *easymotion-configuration*
-
-EasyMotion will work fine without any configuration, but you can override the
-default behavior by setting configuration variables globally in your |vimrc|
-file.
-
-Example (this will change the target keys and disable shading): >
-
-    let g:EasyMotion_keys = '1234567890'
-    let g:EasyMotion_do_shade = 0
-
-------------------------------------------------------------------------------
-EasyMotion_keys                                               *EasyMotion_keys*
-                                                            *g:EasyMotion_keys*
-
-Set the keys to be used for motion targets. You can have as many (or few)
-keys as you want. It's recommended to add as many keys as you are comfortable
-typing, because here's a lower chance that the motion targets will be grouped
-if many keys are available. However, this has its limits; most people find it
-easier to type 2 lowercase keys than to chord a key with shift, so you may
-want to leave out keys that are harder to type, like capital letters.
-EasyMotion also uses the last keys to group targets, so it's recommended to
-set the last keys to ones that are easier to type, like `f`,`j`,`;`, etc.
-
-Default: 'asdghklqwertyuiopzxcvbnmfj;'
-
-Example:
->
-    " Lower a-z
-    let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyz'
-    " a-z & A-Z
-    'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-    " a-z & A-Z & 0-9
-    'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-    " qwerty
-    'asdfghjkl;qwertyuiopzxcvbnm'
-    " You can use non-ascii, multibyte key characters as well
-    'asdfghjkl;qwertyuiopzxcvbnmèòàùì'
-<
-
-------------------------------------------------------------------------------
-EasyMotion_do_shade                                       *EasyMotion_do_shade*
-                                                        *g:EasyMotion_do_shade*
-
-The default behavior is to shade the text following the cursor (forward
-motions), preceding the cursor (backward motions), or on either side of the
-cursor (bidirectional motions) to make the motion targets more visible. Set
-this option to 0 if you want to disable text shading.
-
-Default: 1
-
-------------------------------------------------------------------------------
-EasyMotion_do_mapping                                   *EasyMotion_do_mapping*
-                                                      *g:EasyMotion_do_mapping*
-
-Set this option to 0 if you want to disable the default mappings. See
-|easymotion-default-mappings| for details about the default mappings.
-
-Note: If you disable this option, you'll have to map the motions yourself.
-      See |easymotion-custom-mappings| for customizing the default mappings.
-
-Default: 1
-
-------------------------------------------------------------------------------
-EasyMotion_grouping                                       *EasyMotion_grouping*
-                                                        *g:EasyMotion_grouping*
-
-When there are too many possible targets on the screen, the results have to be
-grouped. This configuration option lets you change which grouping algorithm
-you want to use. There are two grouping algorithms available:
-
-    *  Single-key priority (value: 1)
-       -------------------
-
-       This algorithm prioritizes single-key jumps for the targets closest to
-       the cursor and only groups the last jump targets to maximize the amount
-       of single-key jumps.
-
-       This algorithm works recursively and will work with as few keys as two.
-
-       Example (with |EasyMotion_keys| = "abcdef"): >
-
-       x x x x x x x x x
-<
-       The |w| motion is triggered: >
-
-       a b c d e f f f f
-       ^ ^ ^ ^ ^           Direct jump to target
-                 ^ ^ ^ ^   Enter group "f"
-<
-    *  Original (value: 2)
-       --------
-
-       This is the original algorithm which always groups all targets if there
-       are too many possible motion targets.
-
-       Example (with |EasyMotion_keys| = "abcdef"): >
-
-       x x x x x x x x x
-<
-       The |w| motion is triggered: >
-
-       a a a a a a b b b
-       ^ ^ ^ ^ ^ ^         Enter group "a"
-                   ^ ^ ^   Enter group "b"
-
-Default: 1
-
-------------------------------------------------------------------------------
-Smartcase                                                *EasyMotion_smartcase*
-                                                       *g:EasyMotion_smartcase*
-
-Matching target keys by smartcase. You can type target keys more lazily.
-
-Add following description in your vimrc: >
-
-    let g:EasyMotion_smartcase = 1
-
-Default:0
-
-------------------------------------------------------------------------------
-Smartsign                                                *EasyMotion_smartsign*
-                                                *g:EasyMotion_use_smartsign_us*
-                                                *g:EasyMotion_use_smartsign_ja*
-
-Matching signs target keys by smartcase like. E.g. type '1' and it matches
-both '1' and '!' in Find motion.
-
-This feature depends on your keyboard layout, so you must choose which
-keyboard layout you use.
-
-How to discriminate:
-    Shift-2 = @ -> US layout
-    Shift-2 = " -> JP layout
-
->
-    let g:EasyMotion_use_smartsign_us = 1
-<
-    or
->
-    let g:EasyMotion_use_smartsign_jp = 1
-<
-
-Default: 0
-
-------------------------------------------------------------------------------
-Migemo                                                  *EasyMotion_use_migemo*
-                                                      *g:EasyMotion_use_migemo*
-
-|Easymotion| can match multibyte Japanese character with alphabetical input.
-For example, '<Leader><Leader>fa' can search 'あ'. This feature doesn't
-require |cmigemo| because |Easymotion| already includes basic regex patterns
-generated by cmigemo.
-
-See http://0xcc.net/migemo/ if you want to know more about migemo.
-
-Add following line to your vimrc to enable this option: >
-
-    let g:EasyMotion_use_migemo = 1
-
-Default:0
-
-This feature is based on rhysd(@Linda_pp)'s clever-f script,
-which can be downloaded here:
-
-https://github.com/rhysd/clever-f.vim
-
-------------------------------------------------------------------------------
-Show target key by upper letter                          *EasyMotion_use_upper*
-                                                       *g:EasyMotion_use_upper*
-
-With this option enabled, |Easymotion| will shows target labels with
-uppercase letters, but allow you to type it in lowercase and have Easymotion
-automatically convert it uppercase.
-
-This feature improve targets' readability.
-
-Example: >
-
-    <cursor>Lorem ipsum dolor sit amet.
-
-Type <Leader><Leader>w and the text is updated: >
-
-    <cursor>Lorem {A}psum {B}olor {C}it {D}met.
-
-Press "c" (<- lowercase!) to jump to the beginning of the word "sit": >
-
-    Lorem ipsum dolor <cursor>sit amet.
-
-Add following description in your vimrc to enable this: >
-
-    let g:EasyMotion_use_upper = 1
-    let g:EasyMotion_keys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ;'
-
-Default:0
-
-Note: Make sure |g:EasyMotion_keys| doesn't include lowercase
-
-This feature is inspired by t9md's vim-smalls, which can be downloaded here:
-
-https://github.com/t9md/vim-smalls
-
-------------------------------------------------------------------------------
- Jump to first match by Enter or Space            *EasyMotion_enter_jump_first*
-                                                *g:EasyMotion_enter_jump_first*
-                                                  *EasyMotion_space_jump_first*
-                                                *g:EasyMotion_space_jump_first*
-
-Type Enter or Space key and jump to first match (first letter of
-|g:EasyMotion_keys| ).
-
-Set this option to 1 if you want to enable this feature.
-
-Example:
->
-    let g:EasyMotion_enter_jump_first = 1
-    let g:EasyMotion_space_jump_first = 1
-<
-Default: 0
-
-
-Customize command line prompt                               *EasyMotion_prompt*
-                                                          *g:EasyMotion_prompt*
-
-    Use this command to customize the command line prompt message in find
-    motion. `{n}` is how many characters you type, and if {n} == 1 `(s)` will
-    be ignored.
-
-Sample:
->
-    let g:EasyMotion_prompt = '{n}>>> '
-<
-Default:
->
-    let g:EasyMotion_prompt = 'Search for {n} character(s): '
-<
-    This message will be:
-        |<Plug>(easymotion-s)|  -> 'Search for 1 character: '
-        |<Plug>(easymotion-s2)| -> 'Search for 2 characters: '
-        |<Plug>(easymotion-sn)| -> 'Search for characters: '
-
-Customize highlight behavior                             *EasyMotion_highlight*
-                                                   *g:EasyMotion_inc_highlight*
-
-    Using the 'n' key find motion (e.g. |<Plug>(easymotion-sn)|), EasyMotion
-    by default incrementally highlights matched text. If you don't want this
-    feature, set this option to 0
->
-    let g:EasyMotion_inc_highlight = 0
-<
-    Default: 1
-
-                                                  *g:EasyMotion_move_highlight*
-
-    By default, when using |<Plug>(easymotion-next)| and/or
-    |<Plug>(easymotion-prev)|, EasyMotion highlights matched text until the
-    cursor moves, enters insert mode, or leaves the buffer. If you don't want
-    this feature, set this option to 0.
->
-    let g:EasyMotion_move_highlight = 0
-<
-    Default: 1
-
-                                               *g:EasyMotion_landing_highlight*
-
-    If you want to keep highlights temporarily after EasyMotion
-    jumps to a destination (with timing set to
-    |g:EasyMotion_move_highlight|), set this option to 0.
->
-    let g:EasyMotion_landing_highlight = 1
-<
-    Default: 0
-
-EasyMotion_add_search_history                 *g:EasyMotion_add_search_history*
-
-    If you set this option to 1, the 'n' key find motion will add the
-    inputted pattern to vim default search history. If you want to disable
-    this feature, set this value to 0.
->
-    let g:EasyMotion_add_search_history = 0
-<
-    Default: 1
-
-EasyMotion_off_screen_search                   *g:EasyMotion_off_screen_search*
-
-    If you set this option to 1, the 'n' key find motion will search patterns
-    even outside of the current screen range. If you want to disable this
-    feature, set this value to 0.
->
-    let g:EasyMotion_off_screen_search = 0
-<
-    Default: 1
-
-EasyMotion_disable_two_key_combo           *g:EasyMotion_disable_two_key_combo*
-
-    If you set this option to 1, you can disable the two key combo feature.
->
-    let g:EasyMotion_disable_two_key_combo = 1
-<
-    Default: 0
-
-------------------------------------------------------------------------------
-Custom highlighting                                      *easymotion-custom-hl*
-
-The default EasyMotion configuration uses two highlighting groups that link
-to groups with default values. The highlighting groups are:
-
-    * EasyMotionTarget
-
-      Highlights motion targets, the default value is bold red
-
-    * EasyMotionTarget2First
-    * EasyMotionTarget2Second
-
-      Highlights motion targets, when target is two keys
-
-    * EasyMotionShade
-
-      Highlights shaded text, the default value is dark gray
-
-There are two ways to override the default colors:
-
-   1) Set the highlighting in your color scheme
-
-      This will only affect a single color scheme. The default red/gray colors
-      will be used if you change the color scheme to one that doesn't assign
-      any EasyMotion colors.
-
-      Example: >
-
-          hi EasyMotionTarget ctermbg=none ctermfg=green
-          hi EasyMotionShade  ctermbg=none ctermfg=blue
-
-          hi EasyMotionTarget2First ctermbg=none ctermfg=red
-          hi EasyMotionTarget2Second ctermbg=none ctermfg=lightred
-<
-   2) Set the highlighting in your vimrc
-
-      This is ideal if you want to link the colors to highlighting groups that
-      are available in almost every color scheme, e.g. |ErrorMsg| (usually
-      bright red) and Comment (usually faded). You can be sure that the
-      color scheme's colors will be used instead of the default red/gray
-      if you choose this option.
-
-      Example: >
-
-          hi link EasyMotionTarget ErrorMsg
-          hi link EasyMotionShade  Comment
-
-          hi link EasyMotionTarget2First MatchParen
-          hi link EasyMotionTarget2Second MatchParen
-<
-
-Use CSApprox                                        *EasyMotion_force_csapprox*
-                                                  *g:EasyMotion_force_csapprox*
-    if you install CSApprox & want to use gui color for EasyMotion, set this
-    option to 1.
->
-    let g:EasyMotion_force_csapprox = 1
-<
-    Default: 0
-
-------------------------------------------------------------------------------
-Custom mappings                                    *easymotion-custom-mappings*
-
-EasyMotion allows you to customize all default mappings to avoid conflicts
-with existing mappings. It is possible to change the default leader key
-of all mappings to another key or sequence. It is also possible to fine
-tune the plugin to your need by changing every single sequence.
-
-Leader key                        *EasyMotion_leader_key* *easymotion-leader-key*
-                                                    *<Plug>(easymotion-prefix)*
-
-The default leader key can be changed with the |<Plug>(easymotion-prefix)|
-
-Set this keymapping to the key sequence to use as the prefix of the mappings
-described in |easymotion-default-mappings|.
-
-Note: The default leader key has been changed to '<Leader><Leader>' to
-avoid conflicts with other plugins. You can revert to the original
-leader by setting this keymapping in your vimrc: >
-
-    map <Leader> <Plug>(easymotion-prefix)
-<
-Default: '<Leader><Leader>'
-
-Custom Keys                                            *easymotion-custom-keys*
-
-All custom mappings follow the same format: >
-
-    <Plug>(easymotion-{motion})
-<
-Example: >
-
-    map s <Plug>(easymotion-s)
-    map _f <Plug>(easymotion-f)
-    map <C-T> <Plug>(easymotion-T)
-<
-See |easymotion-plug-table| for a table of motions that can be mapped
-and their default values.
-
-==============================================================================
-License                                                    *easymotion-license*
-
-License: MIT license
-
-Copyright (c) 2014 Kim Silkebækken, haya14busa
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-==============================================================================
-Known bugs                                              *easymotion-known-bugs*
-
-See: https://github.com/Lokaltog/vim-easymotion/issues
-
-Pull Requests are welcome! :)
-
-==============================================================================
-Contributing                                          *easymotion-contributing*
-
-If you experience any bugs or have feature requests, please open an issue on
-GitHub. Fork the source repository on GitHub and send a pull request if you
-have any code improvements.
-
-Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-        haya14busa <hayabusa1419@gmail.com> (since version 2.0)
-Source repository: https://github.com/Lokaltog/vim-easymotion
-
-
-==============================================================================
-Credits                                                    *easymotion-credits*
-
-- Ben Boeckel: ge and WORD motions
-- Drew Neil: operator-pending mappings
-- Rob O'Dwyer: customizable mappings without giving up all defaults
-- Michel D'Hooge: customizable leader
-- Maxime Bourget: search motion, improved JK motion behavior
-- Kearn Holliday: fix jumplist issues
-- Shougo Matsushita: fix CSApprox issue
-- supasorn: two key combos and bidirectional motion
-- mtth: startofline(keep column)
-- bootleq: fixed bufname bug
-- mattn: fix multibyte handling
-- yuex: fix visual mode selection bug (o command)
-
-and more!: https://github.com/Lokaltog/vim-easymotion/graphs/contributors
-
-EasyMotion is based on Bartlomiej Podolak's great PreciseJump script, which
-can be downloaded here:
-
-http://www.vim.org/scripts/script.php?script_id=3437
-
-Special Thanks for other plugins and the authors:~
-Migemo feature:
-    - Author: rhysd(@Linda_pp)
-    - https://github.com/rhysd/clever-f.vim
-Show uppercase feature:
-    - Author: t9md
-    - https://github.com/t9md/vim-smalls
-Find motion command line:
-    - Author: osyo-manga
-    - https://github.com/osyo-manga/vim-over
-    - Library: https://github.com/osyo-manga/vital-over
-2-key find motion:
-    - Authors: goldfeld & justinmk
-    - https://github.com/goldfeld/vim-seek
-    - https://github.com/justinmk/vim-sneak
-Next/Previous motion:
-    - Author: justinmk
-    - https://github.com/justinmk/vim-sneak
-Dot repeat feature:
-    - Author: tpope
-    - https://github.com/tpope/vim-repeat
-
-==============================================================================
-vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/bundle/easymotion/plugin/EasyMotion.vim b/bundle/easymotion/plugin/EasyMotion.vim
deleted file mode 100755
index 40bf160..0000000
--- a/bundle/easymotion/plugin/EasyMotion.vim
+++ /dev/null
@@ -1,346 +0,0 @@
-scriptencoding utf-8
-" EasyMotion - Vim motions on speed!
-"
-" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-"         haya14busa <hayabusa1419@gmail.com>
-" Source: https://github.com/Lokaltog/vim-easymotion
-" == Script initialization {{{
-if expand("%:p") ==# expand("<sfile>:p")
-  unlet! g:EasyMotion_loaded
-endif
-if exists('g:EasyMotion_loaded') || &compatible || version < 703
-    finish
-endif
-
-let g:EasyMotion_loaded = 1
-" }}}
-
-" == Saving 'cpoptions' {{{
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-" == Default configuration {{{
-" -- Option ------------------------------ {{{
-let g:EasyMotion_keys               = get(g:,
-    \ 'EasyMotion_keys', 'asdghklqwertyuiopzxcvbnmfj;')
-    " \ 'EasyMotion_keys', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-let g:EasyMotion_do_mapping         = get(g: , 'EasyMotion_do_mapping'         , 1)
-let g:EasyMotion_do_shade           = get(g: , 'EasyMotion_do_shade'           , 1)
-let g:EasyMotion_grouping           = get(g: , 'EasyMotion_grouping'           , 1)
-let g:EasyMotion_startofline        = get(g: , 'EasyMotion_startofline'        , 1)
-let g:EasyMotion_smartcase          = get(g: , 'EasyMotion_smartcase'          , 0)
-let g:EasyMotion_skipfoldedline     = get(g: , 'EasyMotion_skipfoldedline'     , 1)
-let g:EasyMotion_use_migemo         = get(g: , 'EasyMotion_use_migemo'         , 0)
-let g:EasyMotion_use_upper          = get(g: , 'EasyMotion_use_upper'          , 0)
-let g:EasyMotion_enter_jump_first   = get(g: , 'EasyMotion_enter_jump_first'   , 0)
-let g:EasyMotion_space_jump_first   = get(g: , 'EasyMotion_space_jump_first'   , 0)
-let g:EasyMotion_inc_highlight      = get(g: , 'EasyMotion_inc_highlight'      , 1)
-let g:EasyMotion_move_highlight     = get(g: , 'EasyMotion_move_highlight'     , 1)
-let g:EasyMotion_landing_highlight  = get(g: , 'EasyMotion_landing_highlight'  , 0)
-let g:EasyMotion_cursor_highlight   = get(g: , 'EasyMotion_cursor_highlight'   , 1)
-let g:EasyMotion_use_regexp         = get(g: , 'EasyMotion_use_regexp'         , 1)
-let g:EasyMotion_add_search_history = get(g: , 'EasyMotion_add_search_history' , 1)
-let g:EasyMotion_off_screen_search  = get(g: , 'EasyMotion_off_screen_search'  , 1)
-let g:EasyMotion_force_csapprox     = get(g: , 'EasyMotion_force_csapprox'     , 0)
-let g:EasyMotion_show_prompt        = get(g: , 'EasyMotion_show_prompt'        , 1)
-let g:EasyMotion_prompt             =
-    \ get(g: , 'EasyMotion_prompt' , 'Search for {n} character(s): ')
-let g:EasyMotion_command_line_key_mappings =
-    \ get(g: , 'EasyMotion_command_line_key_mappings' , {})
-let g:EasyMotion_disable_two_key_combo     =
-    \ get(g: , 'EasyMotion_disable_two_key_combo' , 0)
-
-"}}}
-
-" }}}
-
-" == <Plug> Mapping {{{
-" Note: bd is short for bidirectional
-"       l is short for (within) line
-
-function! s:find_motion_map_helper(motions) "{{{
-    for [name, dict] in items(a:motions)
-        silent exec 'noremap  <silent><Plug>(easymotion-'.name.')' .
-            \ '      :<C-u>call EasyMotion#'. dict.fnc .'('. dict.cnt .',0,'. dict.direction .')<CR>'
-        silent exec 'xnoremap <silent><Plug>(easymotion-'.name.')' .
-            \ ' <Esc>:<C-u>call EasyMotion#'. dict.fnc .'('. dict.cnt .',1,'. dict.direction .')<CR>'
-    " Example:
-    " noremap  <silent><Plug>(easymotion-f2) :<C-u>call EasyMotion#S(2,1,0)<CR>
-    " xnoremap <silent><Plug>(easymotion-f2) <Esc>:<C-u>call EasyMotion#S(2,1,0)<CR>
-    endfor
-endfunction "}}}
-" Find Motion: {{{
-call s:find_motion_map_helper({
-    \ 'f'      : {'fnc' : 'S' , 'cnt' : 1, 'direction'  : 0},
-    \ 'F'      : {'fnc' : 'S' , 'cnt' : 1, 'direction'  : 1},
-    \ 's'      : {'fnc' : 'S' , 'cnt' : 1, 'direction'  : 2},
-    \ 'bd-f'   : {'fnc' : 'S' , 'cnt' : 1, 'direction'  : 2},
-    \ 't'      : {'fnc' : 'T' , 'cnt' : 1, 'direction'  : 0},
-    \ 'T'      : {'fnc' : 'T' , 'cnt' : 1, 'direction'  : 1},
-    \ 'bd-t'   : {'fnc' : 'T' , 'cnt' : 1, 'direction'  : 2},
-    \ 'fl'     : {'fnc' : 'SL', 'cnt' : 1, 'direction'  : 0},
-    \ 'Fl'     : {'fnc' : 'SL', 'cnt' : 1, 'direction'  : 1},
-    \ 'sl'     : {'fnc' : 'SL', 'cnt' : 1, 'direction'  : 2},
-    \ 'bd-fl'  : {'fnc' : 'SL', 'cnt' : 1, 'direction'  : 2},
-    \ 'tl'     : {'fnc' : 'TL', 'cnt' : 1, 'direction'  : 0},
-    \ 'Tl'     : {'fnc' : 'TL', 'cnt' : 1, 'direction'  : 1},
-    \ 'bd-tl'  : {'fnc' : 'TL', 'cnt' : 1, 'direction'  : 2},
-    \
-    \ 'f2'     : {'fnc' : 'S' , 'cnt' : 2, 'direction'  : 0},
-    \ 'F2'     : {'fnc' : 'S' , 'cnt' : 2, 'direction'  : 1},
-    \ 's2'     : {'fnc' : 'S' , 'cnt' : 2, 'direction'  : 2},
-    \ 'bd-f2'  : {'fnc' : 'S' , 'cnt' : 2, 'direction'  : 2},
-    \ 't2'     : {'fnc' : 'T' , 'cnt' : 2, 'direction'  : 0},
-    \ 'T2'     : {'fnc' : 'T' , 'cnt' : 2, 'direction'  : 1},
-    \ 'bd-t2'  : {'fnc' : 'T' , 'cnt' : 2, 'direction'  : 2},
-    \ 'fl2'    : {'fnc' : 'SL', 'cnt' : 2, 'direction'  : 0},
-    \ 'Fl2'    : {'fnc' : 'SL', 'cnt' : 2, 'direction'  : 1},
-    \ 'sl2'    : {'fnc' : 'SL', 'cnt' : 2, 'direction'  : 2},
-    \ 'bd-fl2' : {'fnc' : 'SL', 'cnt' : 2, 'direction'  : 2},
-    \ 'tl2'    : {'fnc' : 'TL', 'cnt' : 2, 'direction'  : 0},
-    \ 'Tl2'    : {'fnc' : 'TL', 'cnt' : 2, 'direction'  : 1},
-    \ 'bd-tl2' : {'fnc' : 'TL', 'cnt' : 2, 'direction'  : 2},
-    \
-    \ 'fn'     : {'fnc' : 'S' , 'cnt' : -1, 'direction' : 0},
-    \ 'Fn'     : {'fnc' : 'S' , 'cnt' : -1, 'direction' : 1},
-    \ 'sn'     : {'fnc' : 'S' , 'cnt' : -1, 'direction' : 2},
-    \ 'bd-fn'  : {'fnc' : 'S' , 'cnt' : -1, 'direction' : 2},
-    \ 'tn'     : {'fnc' : 'T' , 'cnt' : -1, 'direction' : 0},
-    \ 'Tn'     : {'fnc' : 'T' , 'cnt' : -1, 'direction' : 1},
-    \ 'bd-tn'  : {'fnc' : 'T' , 'cnt' : -1, 'direction' : 2},
-    \ 'fln'    : {'fnc' : 'SL', 'cnt' : -1, 'direction' : 0},
-    \ 'Fln'    : {'fnc' : 'SL', 'cnt' : -1, 'direction' : 1},
-    \ 'sln'    : {'fnc' : 'SL', 'cnt' : -1, 'direction' : 2},
-    \ 'bd-fln' : {'fnc' : 'SL', 'cnt' : -1, 'direction' : 2},
-    \ 'tln'    : {'fnc' : 'TL', 'cnt' : -1, 'direction' : 0},
-    \ 'Tln'    : {'fnc' : 'TL', 'cnt' : -1, 'direction' : 1},
-    \ 'bd-tln' : {'fnc' : 'TL', 'cnt' : -1, 'direction' : 2},
-    \ })
-"}}}
-
-" -- Word Motion {{{
-" Word: {{{
-noremap  <silent><Plug>(easymotion-w)          :<C-u>call EasyMotion#WB(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-w)     <Esc>:<C-u>call EasyMotion#WB(1,0)<CR>
-noremap  <silent><Plug>(easymotion-b)          :<C-u>call EasyMotion#WB(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-b)     <Esc>:<C-u>call EasyMotion#WB(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-w)       :<C-u>call EasyMotion#WB(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-w)  <Esc>:<C-u>call EasyMotion#WB(1,2)<CR>
-"}}}
-
-" WORD: {{{
-noremap  <silent><Plug>(easymotion-W)         :<C-u>call EasyMotion#WBW(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-W)    <Esc>:<C-u>call EasyMotion#WBW(1,0)<CR>
-noremap  <silent><Plug>(easymotion-B)         :<C-u>call EasyMotion#WBW(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-B)    <Esc>:<C-u>call EasyMotion#WBW(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-W)      :<C-u>call EasyMotion#WBW(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-W) <Esc>:<C-u>call EasyMotion#WBW(1,2)<CR>
-"}}}
-
-" iskeyword {{{
-noremap  <silent><Plug>(easymotion-iskeyword-w)         :<C-u>call EasyMotion#WBK(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-w)    <Esc>:<C-u>call EasyMotion#WBK(1,0)<CR>
-noremap  <silent><Plug>(easymotion-iskeyword-b)         :<C-u>call EasyMotion#WBK(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-b)    <Esc>:<C-u>call EasyMotion#WBK(1,1)<CR>
-noremap  <silent><Plug>(easymotion-iskeyword-bd-w)      :<C-u>call EasyMotion#WBK(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-bd-w) <Esc>:<C-u>call EasyMotion#WBK(1,2)<CR>
-" }}}
-
-" End Word: {{{
-noremap  <silent><Plug>(easymotion-e)         :<C-u>call EasyMotion#E(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-e)    <Esc>:<C-u>call EasyMotion#E(1,0)<CR>
-noremap  <silent><Plug>(easymotion-ge)        :<C-u>call EasyMotion#E(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-ge)   <Esc>:<C-u>call EasyMotion#E(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-e)      :<C-u>call EasyMotion#E(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-e) <Esc>:<C-u>call EasyMotion#E(1,2)<CR>
-"}}}
-
-" END WORD: {{{
-noremap  <silent><Plug>(easymotion-E)         :<C-u>call EasyMotion#EW(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-E)    <Esc>:<C-u>call EasyMotion#EW(1,0)<CR>
-noremap  <silent><Plug>(easymotion-gE)        :<C-u>call EasyMotion#EW(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-gE)   <Esc>:<C-u>call EasyMotion#EW(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-E)      :<C-u>call EasyMotion#EW(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-E) <Esc>:<C-u>call EasyMotion#EW(1,2)<CR>
-"}}}
-
-" iskeyword End: {{{
-noremap  <silent><Plug>(easymotion-iskeyword-e)         :<C-u>call EasyMotion#EK(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-e)    <Esc>:<C-u>call EasyMotion#EK(1,0)<CR>
-noremap  <silent><Plug>(easymotion-iskeyword-ge)        :<C-u>call EasyMotion#EK(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-ge)   <Esc>:<C-u>call EasyMotion#EK(1,1)<CR>
-noremap  <silent><Plug>(easymotion-iskeyword-bd-e)      :<C-u>call EasyMotion#EK(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-iskeyword-bd-e) <Esc>:<C-u>call EasyMotion#EK(1,2)<CR>
-"}}}
-"}}}
-
-" -- JK Motion {{{
-noremap  <silent><Plug>(easymotion-j)          :<C-u>call EasyMotion#JK(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-j)     <Esc>:<C-u>call EasyMotion#JK(1,0)<CR>
-noremap  <silent><Plug>(easymotion-k)          :<C-u>call EasyMotion#JK(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-k)     <Esc>:<C-u>call EasyMotion#JK(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-jk)      :<C-u>call EasyMotion#JK(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-jk) <Esc>:<C-u>call EasyMotion#JK(1,2)<CR>
-
-" Start of Line JK {{{
-noremap  <silent><Plug>(easymotion-sol-j)          :<C-u>call EasyMotion#Sol(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-sol-j)     <Esc>:<C-u>call EasyMotion#Sol(1,0)<CR>
-noremap  <silent><Plug>(easymotion-sol-k)          :<C-u>call EasyMotion#Sol(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-sol-k)     <Esc>:<C-u>call EasyMotion#Sol(1,1)<CR>
-noremap  <silent><Plug>(easymotion-sol-bd-jk)      :<C-u>call EasyMotion#Sol(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-sol-bd-jk) <Esc>:<C-u>call EasyMotion#Sol(1,2)<CR>
-"}}}
-
-" End of Line JK {{{
-noremap  <silent><Plug>(easymotion-eol-j)          :<C-u>call EasyMotion#Eol(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-eol-j)     <Esc>:<C-u>call EasyMotion#Eol(1,0)<CR>
-noremap  <silent><Plug>(easymotion-eol-k)          :<C-u>call EasyMotion#Eol(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-eol-k)     <Esc>:<C-u>call EasyMotion#Eol(1,1)<CR>
-noremap  <silent><Plug>(easymotion-eol-bd-jk)      :<C-u>call EasyMotion#Eol(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-eol-bd-jk) <Esc>:<C-u>call EasyMotion#Eol(1,2)<CR>
-"}}}
-
-"}}}
-
-" -- Search Motion {{{
-noremap  <silent><Plug>(easymotion-n)         :<C-u>call EasyMotion#Search(0,0,0)<CR>
-xnoremap <silent><Plug>(easymotion-n)    <Esc>:<C-u>call EasyMotion#Search(1,0,0)<CR>
-noremap  <silent><Plug>(easymotion-N)         :<C-u>call EasyMotion#Search(0,1,0)<CR>
-xnoremap <silent><Plug>(easymotion-N)    <Esc>:<C-u>call EasyMotion#Search(1,1,0)<CR>
-
-noremap  <silent><Plug>(easymotion-vim-n)      :<C-u>call EasyMotion#Search(0,0,1)<CR>
-xnoremap <silent><Plug>(easymotion-vim-n) <Esc>:<C-u>call EasyMotion#Search(1,0,1)<CR>
-noremap  <silent><Plug>(easymotion-vim-N)      :<C-u>call EasyMotion#Search(0,1,1)<CR>
-xnoremap <silent><Plug>(easymotion-vim-N) <Esc>:<C-u>call EasyMotion#Search(1,1,1)<CR>
-
-noremap  <silent><Plug>(easymotion-bd-n)      :<C-u>call EasyMotion#Search(0,2,0)<CR>
-xnoremap <silent><Plug>(easymotion-bd-n) <Esc>:<C-u>call EasyMotion#Search(1,2,0)<CR>
-"}}}
-
-" -- Jump To Anywhere Motion {{{
-noremap  <silent><Plug>(easymotion-jumptoanywhere)
-    \      :<C-u>call EasyMotion#JumpToAnywhere(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-jumptoanywhere)
-    \ <Esc>:<C-u>call EasyMotion#JumpToAnywhere(1,2)<CR>
-"}}}
-
-" -- Repeat Motion {{{
-noremap  <silent><Plug>(easymotion-repeat)
-    \      :<C-u>call EasyMotion#Repeat(0)<CR>
-xnoremap <silent><Plug>(easymotion-repeat)
-    \ <Esc>:<C-u>call EasyMotion#Repeat(1)<CR>
-
-noremap  <silent><Plug>(easymotion-dotrepeat)
-    \      :<C-u>call EasyMotion#DotRepeat()<CR>
-"}}}
-
-" -- Next,Previous Motion {{{
-noremap  <silent><Plug>(easymotion-next)
-    \      :<C-u>call EasyMotion#NextPrevious(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-next)
-    \      :<C-u>call EasyMotion#NextPrevious(1,0)<CR>
-
-noremap  <silent><Plug>(easymotion-prev)
-    \      :<C-u>call EasyMotion#NextPrevious(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-prev)
-    \      :<C-u>call EasyMotion#NextPrevious(1,1)<CR>
-"}}}
-
-" -- Line Motion {{{
-" Word Line: {{{
-noremap  <silent><Plug>(easymotion-wl)         :<C-u>call EasyMotion#WBL(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-wl)    <Esc>:<C-u>call EasyMotion#WBL(1,0)<CR>
-noremap  <silent><Plug>(easymotion-bl)         :<C-u>call EasyMotion#WBL(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-bl)    <Esc>:<C-u>call EasyMotion#WBL(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-wl)      :<C-u>call EasyMotion#WBL(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-wl) <Esc>:<C-u>call EasyMotion#WBL(1,2)<CR>
-"}}}
-
-" End Word Line: {{{
-noremap  <silent><Plug>(easymotion-el)         :<C-u>call EasyMotion#EL(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-el)    <Esc>:<C-u>call EasyMotion#EL(1,0)<CR>
-noremap  <silent><Plug>(easymotion-gel)        :<C-u>call EasyMotion#EL(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-gel)   <Esc>:<C-u>call EasyMotion#EL(1,1)<CR>
-noremap  <silent><Plug>(easymotion-bd-el)      :<C-u>call EasyMotion#EL(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-bd-el) <Esc>:<C-u>call EasyMotion#EL(1,2)<CR>
-"}}}
-
-" LineAnywhere Line: {{{
-noremap  <silent><Plug>(easymotion-lineforward)
-    \      :<C-u>call EasyMotion#LineAnywhere(0,0)<CR>
-xnoremap <silent><Plug>(easymotion-lineforward)
-    \ <Esc>:<C-u>call EasyMotion#LineAnywhere(1,0)<CR>
-
-noremap  <silent><Plug>(easymotion-linebackward)
-    \      :<C-u>call EasyMotion#LineAnywhere(0,1)<CR>
-xnoremap <silent><Plug>(easymotion-linebackward)
-    \ <Esc>:<C-u>call EasyMotion#LineAnywhere(1,1)<CR>
-
-noremap  <silent><Plug>(easymotion-lineanywhere)
-    \      :<C-u>call EasyMotion#LineAnywhere(0,2)<CR>
-xnoremap <silent><Plug>(easymotion-lineanywhere)
-    \ <Esc>:<C-u>call EasyMotion#LineAnywhere(1,2)<CR>
-
-"}}}
-"}}}
-
-noremap  <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(0)<CR>
-xnoremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(1)<CR>
-
-" }}}
-
-" == Default key mapping {{{
-if g:EasyMotion_do_mapping == 1
-    " Prepare Prefix: {{{
-    if exists('g:EasyMotion_leader_key')
-        exec 'map ' . g:EasyMotion_leader_key . ' <Plug>(easymotion-prefix)'
-    else
-        if !hasmapto('<Plug>(easymotion-prefix)')
-            map <Leader><Leader> <Plug>(easymotion-prefix)
-        endif
-    endif
-    "}}}
-
-    function! s:default_mapping(motions, do_mapping) "{{{
-        for motion in a:motions
-            " Mapping {{{
-            if exists('g:EasyMotion_mapping_' . motion)
-                " Backward compatible mapping [deprecated]
-                silent exec 'map <silent> ' .
-                    \ eval('g:EasyMotion_mapping_' . motion) . ' <Plug>(easymotion-' . motion . ')'
-            elseif a:do_mapping
-                    \ && !hasmapto('<Plug>(easymotion-' . motion . ')')
-                    \ && empty(maparg('<Plug>(easymotion-prefix)' . motion, 'nov'))
-
-                " Do mapping
-                silent exec 'map <silent> ' .
-                    \'<Plug>(easymotion-prefix)' . motion . ' <Plug>(easymotion-' . motion . ')'
-            endif "}}}
-        endfor
-    endfunction "}}}
-
-    " Default Mapping:
-    call s:default_mapping(
-        \ ['f', 'F', 's', 't', 'T',
-        \  'w', 'W', 'b', 'B', 'e', 'E', 'ge', 'gE',
-        \  'j', 'k', 'n', 'N'], g:EasyMotion_do_mapping)
-endif "}}}
-
-" == CommandLine Mapping {{{
-command! -nargs=*
-\   EMCommandLineNoreMap
-\   call EasyMotion#command_line#cnoremap([<f-args>])
-command! -nargs=*
-\   EMCommandLineMap
-\   call EasyMotion#command_line#cmap([<f-args>])
-command! -nargs=1
-\   EMCommandLineUnMap
-\   call EasyMotion#command_line#cunmap(<f-args>)
-"}}}
-
-" == Restore 'cpoptions' {{{
-let &cpo = s:save_cpo
-unlet s:save_cpo
-" }}}
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/t/easymotion_spec.vim b/bundle/easymotion/t/easymotion_spec.vim
deleted file mode 100755
index 8924eca..0000000
--- a/bundle/easymotion/t/easymotion_spec.vim
+++ /dev/null
@@ -1,1437 +0,0 @@
-"=============================================================================
-" FILE: t/easymotion_spec.vim
-" AUTHOR: haya14busa
-" Test: https://github.com/kana/vim-vspec
-" Refer: https://github.com/rhysd/clever-f.vim
-" Description: EasyMotion test with vim-vspec
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-
-" Avoid source test files {{{
-if expand("%:p") ==# expand("<sfile>:p")
-  finish
-endif
-"}}}
-
-let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
-execute 'set' 'rtp +=./'.s:root_dir
-runtime! plugin/EasyMotion.vim
-
-" Default settings {{{
-describe 'Default settings'
-    it 'provide default <Plug> mappings for find motion'
-        " Find Motion: {{{
-        " s
-        Expect maparg('<Plug>(easymotion-s)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-s)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-s)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,2)<CR>'
-        " f
-        Expect maparg('<Plug>(easymotion-f)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-f)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-f)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,0)<CR>'
-        " F
-        Expect maparg('<Plug>(easymotion-F)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-F)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-F)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,1)<CR>'
-        " bd-f
-        Expect maparg('<Plug>(easymotion-bd-f)', 'n') ==# maparg('<Plug>(easymotion-s)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-f)', 'o') ==# maparg('<Plug>(easymotion-s)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-f)', 'v') ==# maparg('<Plug>(easymotion-s)', 'v')
-        " t
-        Expect maparg('<Plug>(easymotion-t)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-t)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-t)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,0)<CR>'
-        " T
-        Expect maparg('<Plug>(easymotion-T)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-T)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-T)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,1)<CR>'
-        " bd-t
-        Expect maparg('<Plug>(easymotion-bd-t)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-t)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-t)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,2)<CR>'
-        " sl
-        Expect maparg('<Plug>(easymotion-sl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,2)<CR>'
-        " fl
-        Expect maparg('<Plug>(easymotion-fl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,0)<CR>'
-        " Fl
-        Expect maparg('<Plug>(easymotion-Fl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,1)<CR>'
-        " bd-fl
-        Expect maparg('<Plug>(easymotion-bd-fl)', 'n') ==# maparg('<Plug>(easymotion-sl)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-fl)', 'o') ==# maparg('<Plug>(easymotion-sl)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-fl)', 'v') ==# maparg('<Plug>(easymotion-sl)', 'v')
-        " tl
-        Expect maparg('<Plug>(easymotion-tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,0)<CR>'
-        " Tl
-        Expect maparg('<Plug>(easymotion-Tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,1)<CR>'
-        " bd-tl
-        Expect maparg('<Plug>(easymotion-bd-tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,2)<CR>'
-        "}}}
-
-        " Two Char Find Motion: {{{
-        " s2
-        Expect maparg('<Plug>(easymotion-s2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-s2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-s2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,2)<CR>'
-        " f2
-        Expect maparg('<Plug>(easymotion-f2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-f2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-f2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,0)<CR>'
-        " F2
-        Expect maparg('<Plug>(easymotion-F2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-F2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-F2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,1)<CR>'
-        " bd-f2
-        Expect maparg('<Plug>(easymotion-bd-f2)', 'n') ==# maparg('<Plug>(easymotion-s2)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-f2)', 'o') ==# maparg('<Plug>(easymotion-s2)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-f2)', 'v') ==# maparg('<Plug>(easymotion-s2)', 'v')
-        " t2
-        Expect maparg('<Plug>(easymotion-t2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-t2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-t2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,0)<CR>'
-        " T2
-        Expect maparg('<Plug>(easymotion-T2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-T2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-T2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,1)<CR>'
-        " sl2
-        Expect maparg('<Plug>(easymotion-sl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,2)<CR>'
-        " bd-t2
-        Expect maparg('<Plug>(easymotion-bd-t2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-t2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-t2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,2)<CR>'
-        " fl2
-        Expect maparg('<Plug>(easymotion-fl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,0)<CR>'
-        " Fl2
-        Expect maparg('<Plug>(easymotion-Fl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,1)<CR>'
-        " bd-fl2
-        Expect maparg('<Plug>(easymotion-bd-fl2)', 'n') ==# maparg('<Plug>(easymotion-sl2)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-fl2)', 'o') ==# maparg('<Plug>(easymotion-sl2)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-fl2)', 'v') ==# maparg('<Plug>(easymotion-sl2)', 'v')
-        " tl2
-        Expect maparg('<Plug>(easymotion-tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,0)<CR>'
-        " Tl2
-        Expect maparg('<Plug>(easymotion-Tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,1)<CR>'
-        " bd-tl2
-        Expect maparg('<Plug>(easymotion-bd-tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,2)<CR>'
-        "}}}
-
-        " Multi Char Find Motion: {{{
-        " sn
-        Expect maparg('<Plug>(easymotion-sn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,2)<CR>'
-        " fn
-        Expect maparg('<Plug>(easymotion-fn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,0)<CR>'
-        " Fn
-        Expect maparg('<Plug>(easymotion-Fn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,1)<CR>'
-        " bd-fn
-        Expect maparg('<Plug>(easymotion-bd-fn)', 'n') ==# maparg('<Plug>(easymotion-sn)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-fn)', 'o') ==# maparg('<Plug>(easymotion-sn)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-fn)', 'v') ==# maparg('<Plug>(easymotion-sn)', 'v')
-        " tn
-        Expect maparg('<Plug>(easymotion-tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,0)<CR>'
-        " Tn
-        Expect maparg('<Plug>(easymotion-Tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,1)<CR>'
-        " bd-tn
-        Expect maparg('<Plug>(easymotion-bd-tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,2)<CR>'
-        " sln
-        Expect maparg('<Plug>(easymotion-sln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,2)<CR>'
-        " fln
-        Expect maparg('<Plug>(easymotion-fln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-fln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,0)<CR>'
-        " Fln
-        Expect maparg('<Plug>(easymotion-Fln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Fln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,1)<CR>'
-        " bd-fln
-        Expect maparg('<Plug>(easymotion-bd-fln)', 'n') ==# maparg('<Plug>(easymotion-sln)', 'n')
-        Expect maparg('<Plug>(easymotion-bd-fln)', 'o') ==# maparg('<Plug>(easymotion-sln)', 'o')
-        Expect maparg('<Plug>(easymotion-bd-fln)', 'v') ==# maparg('<Plug>(easymotion-sln)', 'v')
-        " tln
-        Expect maparg('<Plug>(easymotion-tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,0)<CR>'
-        " Tln
-        Expect maparg('<Plug>(easymotion-Tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-Tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,1)<CR>'
-        " bd-tln
-        Expect maparg('<Plug>(easymotion-bd-tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,2)<CR>'
-        "}}}
-    end
-
-    it 'provide default <Plug> mappings for regrex motion'
-        "(is_visual, direction)
-        " direction:
-        "   - 0: forward
-        "   - 1: backward
-        "   - 2: bi-direction
-        " Word Motion: {{{
-        Expect maparg('<Plug>(easymotion-w)', 'n') ==# ':<C-U>call EasyMotion#WB(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-w)', 'o') ==# ':<C-U>call EasyMotion#WB(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-b)', 'n') ==# ':<C-U>call EasyMotion#WB(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-b)', 'o') ==# ':<C-U>call EasyMotion#WB(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-b)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-w)', 'n') ==# ':<C-U>call EasyMotion#WB(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-w)', 'o') ==# ':<C-U>call EasyMotion#WB(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,2)<CR>'
-        " }}}
-
-        " WORD Motion: {{{
-        Expect maparg('<Plug>(easymotion-W)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-W)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-W)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-B)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-B)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-B)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-W)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-W)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-W)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,2)<CR>'
-        " }}}
-
-        " Word Motion IsKeyWord: {{{
-        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,2)<CR>'
-        " }}}
-
-        " End Of Word Motion: {{{
-        Expect maparg('<Plug>(easymotion-e)', 'n')    ==# ':<C-U>call EasyMotion#E(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-e)', 'o')    ==# ':<C-U>call EasyMotion#E(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-e)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#E(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-ge)', 'n')   ==# ':<C-U>call EasyMotion#E(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-ge)', 'o')   ==# ':<C-U>call EasyMotion#E(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-ge)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#E(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-e)', 'n') ==# ':<C-U>call EasyMotion#E(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-e)', 'o') ==# ':<C-U>call EasyMotion#E(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-e)', 'v') ==# '<Esc>:<C-U>call EasyMotion#E(1,2)<CR>'
-        " }}}
-
-        " END OF WORD Motion: {{{
-        Expect maparg('<Plug>(easymotion-E)', 'n')    ==# ':<C-U>call EasyMotion#EW(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-E)', 'o')    ==# ':<C-U>call EasyMotion#EW(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-E)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EW(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-gE)', 'n')   ==# ':<C-U>call EasyMotion#EW(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-gE)', 'o')   ==# ':<C-U>call EasyMotion#EW(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-gE)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EW(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-E)', 'n') ==# ':<C-U>call EasyMotion#EW(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-E)', 'o') ==# ':<C-U>call EasyMotion#EW(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-E)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EW(1,2)<CR>'
-        " }}}
-
-        " End Of Word Motion IsKeyWord: {{{
-        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'n')    ==# ':<C-U>call EasyMotion#EK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'o')    ==# ':<C-U>call EasyMotion#EK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EK(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'n')   ==# ':<C-U>call EasyMotion#EK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'o')   ==# ':<C-U>call EasyMotion#EK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EK(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'n') ==# ':<C-U>call EasyMotion#EK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'o') ==# ':<C-U>call EasyMotion#EK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EK(1,2)<CR>'
-        " }}}
-
-        " JK Motion: {{{
-        " default
-        Expect maparg('<Plug>(easymotion-j)', 'n') ==# ':<C-U>call EasyMotion#JK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-j)', 'o') ==# ':<C-U>call EasyMotion#JK(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-k)', 'n') ==# ':<C-U>call EasyMotion#JK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-k)', 'o') ==# ':<C-U>call EasyMotion#JK(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#JK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#JK(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,2)<CR>'
-        " start of line
-        Expect maparg('<Plug>(easymotion-sol-j)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-j)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-k)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-k)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,2)<CR>'
-        " end of line
-        Expect maparg('<Plug>(easymotion-eol-j)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-j)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-k)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-k)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,2)<CR>'
-        " }}}
-
-        " Search Motion: {{{
-        Expect maparg('<Plug>(easymotion-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-N)', 'n') ==# ':<C-U>call EasyMotion#Search(0,1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-N)', 'o') ==# ':<C-U>call EasyMotion#Search(0,1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-N)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,2,0)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,2,0)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,2,0)<CR>'
-
-        " respect previous direction
-        Expect maparg('<Plug>(easymotion-vim-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-vim-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-vim-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-vim-N)', 'n') ==# ':<C-U>call EasyMotion#Search(0,1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-vim-N)', 'o') ==# ':<C-U>call EasyMotion#Search(0,1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-vim-N)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,1,1)<CR>'
-        " }}}
-
-        " JumpToAnywhere Motion: {{{
-        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'n')
-            \ ==# ':<C-U>call EasyMotion#JumpToAnywhere(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'o')
-            \ ==# ':<C-U>call EasyMotion#JumpToAnywhere(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'v')
-            \ ==# '<Esc>:<C-U>call EasyMotion#JumpToAnywhere(1,2)<CR>'
-        " }}}
-
-        " Repeat Motion: {{{
-        " (is_visual)
-        Expect maparg('<Plug>(easymotion-repeat)', 'n')
-            \ ==# ':<C-U>call EasyMotion#Repeat(0)<CR>'
-        Expect maparg('<Plug>(easymotion-repeat)', 'o')
-            \ ==# ':<C-U>call EasyMotion#Repeat(0)<CR>'
-        Expect maparg('<Plug>(easymotion-repeat)', 'v')
-            \ ==# '<Esc>:<C-U>call EasyMotion#Repeat(1)<CR>'
-        Expect maparg('<Plug>(easymotion-dotrepeat)', 'n')
-            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
-        Expect maparg('<Plug>(easymotion-dotrepeat)', 'o')
-            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
-        Expect maparg('<Plug>(easymotion-dotrepeat)', 'v')
-            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
-        " }}}
-
-        " Next, Previous motion {{{
-        Expect maparg('<Plug>(easymotion-next)', 'n')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-next)', 'o')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-next)', 'v')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(1,0)<CR>'
-
-        Expect maparg('<Plug>(easymotion-prev)', 'n')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-prev)', 'o')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-prev)', 'v')
-            \ ==# ':<C-U>call EasyMotion#NextPrevious(1,1)<CR>'
-        " }}}
-
-        " Line Motion: {{{
-        " word
-        Expect maparg('<Plug>(easymotion-wl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-wl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-wl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-bl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-wl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-wl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-wl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,2)<CR>'
-        " end of word
-        Expect maparg('<Plug>(easymotion-el)', 'n')    ==# ':<C-U>call EasyMotion#EL(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-el)', 'o')    ==# ':<C-U>call EasyMotion#EL(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-el)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EL(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-gel)', 'n')   ==# ':<C-U>call EasyMotion#EL(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-gel)', 'o')   ==# ':<C-U>call EasyMotion#EL(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-gel)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EL(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-el)', 'n') ==# ':<C-U>call EasyMotion#EL(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-el)', 'o') ==# ':<C-U>call EasyMotion#EL(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-bd-el)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EL(1,2)<CR>'
-        " LineAnywhere
-        Expect maparg('<Plug>(easymotion-lineforward)', 'n')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-lineforward)', 'o')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,0)<CR>'
-        Expect maparg('<Plug>(easymotion-lineforward)', 'v')
-            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,0)<CR>'
-        Expect maparg('<Plug>(easymotion-linebackward)', 'n')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-linebackward)', 'o')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,1)<CR>'
-        Expect maparg('<Plug>(easymotion-linebackward)', 'v')
-            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,1)<CR>'
-        Expect maparg('<Plug>(easymotion-lineanywhere)', 'n')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-lineanywhere)', 'o')
-            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,2)<CR>'
-        Expect maparg('<Plug>(easymotion-lineanywhere)', 'v')
-            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,2)<CR>'
-        " }}}
-
-        " Activate {{{
-        Expect maparg('<Plug>(easymotion-activate)', 'n')
-            \ ==# ':<C-U>call EasyMotion#activate(0)<CR>'
-        Expect maparg('<Plug>(easymotion-activate)', 'o')
-            \ ==# ':<C-U>call EasyMotion#activate(0)<CR>'
-        Expect maparg('<Plug>(easymotion-activate)', 'v')
-            \ ==# ':<C-U>call EasyMotion#activate(1)<CR>'
-        " }}}
-    end
-
-    it 'provide autoload functions'
-        try
-            " load autoload functions
-            runtime autoload/EasyMotion.vim
-            runtime autoload/EasyMotion/helper.vim
-            runtime autoload/EasyMotion/cmigemo.vim
-            runtime autoload/EasyMotion/init.vim
-            runtime autoload/EasyMotion/sticky_table.vim
-        catch
-        endtry
-        " autoload/EasyMotion.vim {{{
-        Expect exists('*EasyMotion#hoge') ==# 0
-        Expect exists('*EasyMotion#S') ==# 1
-        Expect exists('*EasyMotion#T') ==# 1
-        Expect exists('*EasyMotion#WB') ==# 1
-        Expect exists('*EasyMotion#WBW') ==# 1
-        Expect exists('*EasyMotion#E') ==# 1
-        Expect exists('*EasyMotion#EW') ==# 1
-        Expect exists('*EasyMotion#JK') ==# 1
-        Expect exists('*EasyMotion#Sol') ==# 1
-        Expect exists('*EasyMotion#Eol') ==# 1
-        Expect exists('*EasyMotion#Search') ==# 1
-        Expect exists('*EasyMotion#JumpToAnywhere') ==# 1
-        Expect exists('*EasyMotion#SL') ==# 1
-        Expect exists('*EasyMotion#TL') ==# 1
-        Expect exists('*EasyMotion#WBL') ==# 1
-        Expect exists('*EasyMotion#EL') ==# 1
-        Expect exists('*EasyMotion#LineAnywhere') ==# 1
-        Expect exists('*EasyMotion#Repeat') ==# 1
-        Expect exists('*EasyMotion#NextPrevious') ==# 1
-        Expect exists('*EasyMotion#DotRepeat') ==# 1
-        "}}}
-    end
-
-    it 'provide variables to customize EasyMotion'
-        " Option {{{
-        Expect g:EasyMotion_keys ==# 'asdghklqwertyuiopzxcvbnmfj;'
-        " Expect g:EasyMotion_keys ==# 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        Expect g:EasyMotion_do_mapping         ==# 1
-        Expect g:EasyMotion_do_shade           ==# 1
-        Expect g:EasyMotion_grouping           ==# 1
-        Expect g:EasyMotion_startofline        ==# 1
-        Expect g:EasyMotion_smartcase          ==# 0
-        Expect g:EasyMotion_skipfoldedline     ==# 1
-        Expect g:EasyMotion_use_migemo         ==# 0
-        Expect g:EasyMotion_use_upper          ==# 0
-        Expect g:EasyMotion_enter_jump_first   ==# 0
-        Expect g:EasyMotion_space_jump_first   ==# 0
-        Expect g:EasyMotion_show_prompt        ==# 1
-        Expect g:EasyMotion_inc_highlight      ==# 1
-        Expect g:EasyMotion_move_highlight     ==# 1
-        Expect g:EasyMotion_landing_highlight  ==# 0
-        Expect g:EasyMotion_cursor_highlight   ==# 1
-        Expect g:EasyMotion_use_regexp         ==# 1
-        Expect g:EasyMotion_add_search_history ==# 1
-        Expect g:EasyMotion_off_screen_search  ==# 1
-        Expect g:EasyMotion_prompt             ==# 'Search for {n} character(s): '
-        Expect g:EasyMotion_command_line_key_mappings ==# {}
-        Expect g:EasyMotion_force_csapprox ==# 0
-        Expect g:EasyMotion_disable_two_key_combo ==# 0
-        " }}}
-
-        " highlight {{{
-        Expect g:EasyMotion_hl_group_target ==# 'EasyMotionTarget'
-        Expect g:EasyMotion_hl2_first_group_target ==# 'EasyMotionTarget2First'
-        Expect g:EasyMotion_hl2_second_group_target ==# 'EasyMotionTarget2Second'
-        Expect g:EasyMotion_hl_group_shade ==# 'EasyMotionShade'
-        " }}}
-    end
-end
-"}}}
-
-function! AddLine(str)
-    put! =a:str
-endfunction
-
-function! CursorPos()
-    return [line('.'), col('.'), getline('.')[col('.')-1]]
-endfunction
-
-" s, f, F, t and T mappings {{{
-describe 's, f, F, t and T mappings'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('poge huga hiyo poyo')
-    end
-
-    after
-        close!
-    end
-
-    " s {{{
-    it 'provide improved forward search like builtin f & F'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal sha
-        Expect CursorPos() == [l,6,'h']
-        Expect CursorPos() != [l,1,'h']
-
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal shb
-        Expect CursorPos() == [l,11,'h']
-
-        normal sh
-        Expect CursorPos() == [l,6,'h']
-
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,19,'o']
-
-        normal spc
-        Expect CursorPos() == [l,19,'o']
-
-        normal spb
-        Expect CursorPos() == [l,1,'p']
-    end
-    "}}}
-    " f {{{
-    it 'provide improved backward search like builtin f'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-
-        normal fha
-        Expect CursorPos() == [l,6,'h']
-        Expect CursorPos() != [l,1,'h']
-
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal fhb
-        Expect CursorPos() == [l,11,'h']
-
-        normal fh
-        Expect CursorPos() == [l,11,'h']
-
-    end
-    " "}}}
-    " F {{{
-    it 'provide improved backward search like builtin F'
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,19,'o']
-
-        normal Fpa
-        Expect CursorPos() == [l,16,'p']
-
-        normal! $
-        normal Fpc
-        Expect CursorPos() == [l,19,'o']
-
-        normal Fpb
-        Expect CursorPos() == [l,1,'p']
-    end
-    " "}}}
-    " t {{{
-    it 'provide t mapping like builtin t'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        Expect CursorPos() != [l,10,'a']
-
-        normal tha
-        Expect CursorPos() == [l,5,' ']
-
-        normal! 0
-        normal thb
-        Expect CursorPos() == [l,10,' ']
-
-        normal! 0
-        normal thc
-        Expect CursorPos() == [l,1,'p']
-    end
-    " }}}
-    " T {{{
-    it 'provide T mapping like builtin T'
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,19,'o']
-        Expect CursorPos() != [l,18,'a']
-
-        normal Toa
-        Expect CursorPos() == [l,18,'y']
-
-        normal! $
-        normal Tob
-        Expect CursorPos() == [l,15,' ']
-
-        normal Toa
-        Expect CursorPos() == [l,3,'g']
-
-        normal! $
-        normal Tod
-        Expect CursorPos() == [l,19,'o']
-
-        normal Toc
-        Expect CursorPos() == [l,3,'g']
-    end
-    "}}}
-    " visual
-    it 'have different context in normal mode and visual mode'
-        let l = line('.')
-        Expect CursorPos() == [l, 1, 'p']
-
-        normal foa
-        Expect CursorPos() == [l, 2, 'o']
-
-        normal vfha
-        Expect CursorPos() == [l, 6, 'h']
-
-        normal fha
-        Expect CursorPos() == [l, 11, 'h']
-
-        normal! d
-        Expect getline('.') == "piyo poyo"
-        Expect CursorPos() == [l, 2, 'i']
-
-        normal! dfpa
-        Expect getline('.') == "poyo"
-        Expect CursorPos() == [l, 2, 'o']
-    end
-end
-"}}}
-
-" a non-existent char {{{
-describe 'a non-existent char'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('poge huga hiyo poyo')
-    end
-
-    after
-        close!
-    end
-
-    " makes no change {{{
-    it 'makes no change'
-        normal! 0
-        let origin = CursorPos()
-
-        normal fd
-        Expect CursorPos() == origin
-        normal f1
-        Expect CursorPos() == origin
-        normal f)
-        Expect CursorPos() == origin
-        normal f^
-        Expect CursorPos() == origin
-        normal fm
-        Expect CursorPos() == origin
-    end
-    "}}}
-end
-"}}}
-
-" when target is in other line, s, f and F mappings {{{
-describe 'when target is in other line, s, f and F mappings'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('foo bar baz')         " L2
-        call AddLine('poge huga hiyo poyo') " L1
-        "            '1234567890123456789'
-        normal! gg0
-    end
-
-    after
-        close!
-    end
-
-    " move cursor forward across lines {{{
-    it 'move cursor forward & backward across lines'
-        normal! 0
-        let l = line('.')
-        Expect col('.') == 1
-
-        normal saa
-        Expect CursorPos() == [l, 9, 'a']
-
-        normal saa
-        Expect CursorPos() == [l+1, 6, 'a']
-
-        normal sob
-        Expect CursorPos() == [l+1, 2, 'o']
-
-        normal! gg0
-        let l = line('.')
-        Expect col('.') == 1
-
-        normal faa
-        Expect CursorPos() == [l, 9, 'a']
-
-        normal faa
-        Expect CursorPos() == [l+1, 6, 'a']
-
-        normal faa
-        Expect CursorPos() == [l+1, 10, 'a']
-
-        normal Faa
-        Expect CursorPos() == [l+1, 6, 'a']
-
-        normal Faa
-        Expect CursorPos() == [l, 9, 'a']
-    end
-    " }}}
-end
-"}}}
-
-" Multibyte characters {{{
-describe 'Multibyte characters'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('ビムかわいいよzビムx')
-        call AddLine('foo bar baz')
-        normal! gg
-    end
-
-    after
-        close!
-    end
-
-    " is supported "{{{
-    it 'is supported'
-        normal! gg0
-        let l = line('.')
-
-        normal fza
-        Expect CursorPos() == [l, 11, 'z']
-        Expect CursorPos() != [l, 1, '2']
-
-        normal fz
-        Expect CursorPos() == [l+1, 22, 'z']
-
-        normal! h
-        normal fxa
-        Expect CursorPos() == [l+1, 29, 'x']
-    end
-    " }}}
-
-end
-"}}}
-
-" EasyMotion#helper#include_multibyte_char {{{
-describe 'EasyMotion#helper#include_multibyte_char'
-
-    it 'return true when the argument includes multibyte char'
-        Expect EasyMotion#helper#include_multibyte_char("あいうえお") ==# 1
-        Expect EasyMotion#helper#include_multibyte_char("aiueoあ") ==# 1
-        Expect EasyMotion#helper#include_multibyte_char("１２3ABC４5") ==# 1
-    end
-
-    it 'return false when the argument does not include multibyte char'
-        Expect EasyMotion#helper#include_multibyte_char("aiueo") ==# 0
-        Expect EasyMotion#helper#include_multibyte_char("this_is_a_pen.") ==# 0
-        Expect EasyMotion#helper#include_multibyte_char("!#$%&'()'") ==# 0
-        Expect EasyMotion#helper#include_multibyte_char("") ==# 0
-    end
-
-end
-"}}}
-
-" migemo support {{{
-describe 'migemo support'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_use_migemo = 1
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('はー，ビムかわいいよビム')
-        normal! gg0
-    end
-
-    after
-        close!
-        let g:clever_f_use_migemo = 0
-    end
-
-    " makes f and F mapping match multibyte characters {{{
-    it 'makes f and F mapping match multibyte characters'
-        normal fba
-        Expect col('.') == 10
-        normal fb
-        Expect col('.') == 31
-        normal Fb
-        Expect col('.') == 10
-        normal $
-        normal Fba
-        Expect col('.') == 31
-        normal Fb
-        Expect col('.') == 10
-    end
-    " }}}
-
-    " makes t and T mapping match multibyte characters {{{
-    it 'makes t and T mapping match multibyte characters'
-        normal tba
-        Expect col('.') == 7
-        normal tb
-        Expect col('.') == 28
-        normal Tb
-        Expect col('.') == 13
-        normal $
-        normal Tba
-        Expect col('.') == 13
-        normal tb
-        Expect col('.') == 28
-    end
-    " }}}
-
-end
-"}}}
-
-" g:EasyMotion_smartcase {{{
-describe 'g:EasyMotion_smartcase'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('poHe huga Hiyo hoyo: poyo();')
-                      1234567890123456789012345678
-        normal! gg0
-        let g:EasyMotion_smartcase = 1
-    end
-
-    after
-        close!
-        let g:EasyMotion_smartcase = 0
-    end
-
-    " makes f smart case {{{
-    it 'makes f smart case'
-        normal fha
-        Expect col('.') == 3
-        normal fha
-        Expect col('.') == 6
-        normal fha
-        Expect col('.') == 11
-        normal fh
-        Expect col('.') == 16
-        normal Fha
-        Expect col('.') == 11
-
-        normal! 0
-        normal fHa
-        Expect col('.') == 3
-        normal fH
-        Expect col('.') == 11
-        normal fHa
-        Expect col('.') == 11
-        normal FH
-        Expect col('.') == 3
-    end
-    "}}}
-
-    " makes t smart case {{{
-    it 'makes t smart case'
-        normal! $
-        normal Tha
-        Expect col('.') == 17
-        normal Tha
-        Expect col('.') == 12
-        normal Tha
-        Expect col('.') == 7
-        normal Th
-        Expect col('.') == 4
-        normal tha
-        Expect col('.') == 5
-
-        normal! $
-        normal THa
-        Expect col('.') == 12
-        normal TH
-        Expect col('.') == 4
-        normal tH
-        Expect col('.') == 10
-    end
-    " }}}
-
-    " makes no effect on searching signs {{{
-    it 'makes no effect on searching signs'
-        normal! 0
-        normal f;
-        Expect col('.') == 28
-        normal! 0
-        normal f:
-        Expect col('.') == 20
-        normal f:
-        Expect col('.') == 20
-    end
-    " }}}
-end
-"}}}
-
-" g:EasyMotion_smartsign {{{
-describe 'g:EasyMotion_smartsign'
-
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map f <Plug>(easymotion-f)
-        map F <Plug>(easymotion-F)
-        map t <Plug>(easymotion-t)
-        map T <Plug>(easymotion-T)
-        call EasyMotion#init()
-        call AddLine('poHe huga Hiyo hoyo: poyo();')
-        "             1234567890123456789012345678
-        normal! gg0
-        let g:EasyMotion_smartcase = 1
-        let g:EasyMotion_use_smartsign_us = 1
-    end
-
-    after
-        close!
-        let g:EasyMotion_smartcase = 0
-        let g:EasyMotion_use_smartsign_us = 0
-    end
-
-    " makes f smart sign {{{
-    it 'makes f smart case'
-        normal! 0
-        normal f;
-        Expect col('.') == 1
-        normal f;a
-        Expect col('.') == 20
-        normal f;
-        Expect col('.') == 28
-
-        normal! 0
-        normal f:
-        Expect col('.') == 20
-        normal f:
-        Expect col('.') == 20
-    end
-    "}}}
-
-    " makes t,T smart sign {{{
-    it 'makes t,T smart case'
-        normal! 0
-        normal t;
-        Expect col('.') == 1
-        normal t;a
-        Expect col('.') == 19
-        normal t;
-        Expect col('.') == 27
-        normal! $
-        Expect col('.') == 28
-        normal T;
-        Expect col('.') == 21
-    end
-    "}}}
-end
-"}}}
-
-" Next & Previous {{{
-describe '<Plug>(easymotion-next) & <Plug>(easymotion-prev)'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        map ; <Plug>(easymotion-next)
-        map , <Plug>(easymotion-prev)
-        set wrapscan
-        call EasyMotion#init()
-        call AddLine('poge huga hiyo poyo')
-        "             1234567890123456789
-    end
-
-    after
-        close!
-    end
-
-    " provide next & previous motion to replace `;`, `,` {{{
-    it 'provide next & previous motion to replace `;`, `,`'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal sha
-        Expect CursorPos() == [l,6,'h']
-
-        normal ;
-        Expect CursorPos() == [l,11,'h']
-
-        normal ,
-        Expect CursorPos() == [l,6,'h']
-
-        " wrapscan
-        normal ,
-        Expect CursorPos() == [l,11,'h']
-        normal ;
-        Expect CursorPos() == [l,6,'h']
-
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,19,'o']
-
-        normal ,
-        Expect CursorPos() == [l,11,'h']
-
-    end
-    "}}}
-
-    " next & previous motion count {{{
-    it 'next & previous motion count'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal sha
-        Expect CursorPos() == [l,6,'h']
-
-        normal ;
-        Expect CursorPos() == [l,11,'h']
-
-        normal 2,
-        Expect CursorPos() == [l,11,'h']
-
-        " wrapscan
-        normal 4,
-        Expect CursorPos() == [l,11,'h']
-        normal 3;
-        Expect CursorPos() == [l,6,'h']
-
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,19,'o']
-
-        normal ,
-        Expect CursorPos() == [l,11,'h']
-
-    end
-    "}}}
-end
-"}}}
-
-" Jumplist {{{
-describe 'EasyMotion is jump motion'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map s <Plug>(easymotion-s)
-        call EasyMotion#init()
-        call AddLine('poge huga hiyo poyo')
-        "             1234567890123456789
-    end
-
-    after
-        close!
-    end
-
-    " <C-o> could jump back to previous location {{{
-    it '<C-o> could jump back to previous location'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal sha
-        Expect CursorPos() == [l,6,'h']
-
-        exec "normal! \<C-o>"
-        Expect CursorPos() == [l,1,'p']
-
-        normal! ``
-        Expect CursorPos() == [l,6,'h']
-        normal! ``
-        Expect CursorPos() == [l,1,'p']
-        normal! ``
-        Expect CursorPos() == [l,6,'h']
-
-        normal! $
-        Expect CursorPos() == [l,19,'o']
-        normal spa
-        Expect CursorPos() == [l,16,'p']
-        exec "normal! \<C-o>"
-        Expect CursorPos() == [l,19,'o']
-    end
-    "}}}
-end
-"}}}
-
-" Regexp {{{
-describe 'EasyMotion regexp'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_use_regexp = 1
-        map s <Plug>(easymotion-sn)
-        call EasyMotion#init()
-        call AddLine('poge1 2huga 3hiyo 4poyo')
-        "             12345678901234567890123
-    end
-
-    after
-        let g:EasyMotion_use_regexp = 0
-        close!
-    end
-
-    " <C-o> could jump back to previous location {{{
-    it 'provide regexp motion'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        exe "normal s\\d\<CR>a"
-        Expect CursorPos() == [l,5,'1']
-
-        normal! 0
-        Expect CursorPos() == [l,1,'p']
-        exe "normal s\\d\<CR>c"
-        Expect CursorPos() == [l,13,'3']
-
-        exe "normal s\$\<CR>a"
-        Expect CursorPos() == [l,23,'o']
-
-        exe "normal s\^\<CR>b"
-        Expect CursorPos() == [l,1,'p']
-    end
-    "}}}
-end
-"}}}
-
-" bi-directional t motion {{{
-describe 'bi-directional t motion'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_use_regexp = 1
-        map t <Plug>(easymotion-bd-t)
-        call EasyMotion#init()
-        call AddLine('poge1 2huga 3hiyo 4poyo')
-        "             12345678901234567890123
-    end
-
-    after
-        let g:EasyMotion_use_regexp = 0
-        close!
-    end
-
-    " provide bidirectional motion with one key mapping {{{
-    it 'provide bidirectional motion with one key mapping'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal thb
-        Expect CursorPos() == [l,13,'3']
-
-        normal! h
-        Expect CursorPos() == [l,12,' ']
-
-        normal thb
-        Expect CursorPos() == [l,9,'u']
-
-    end
-    "}}}
-end
-"}}}
-
-" off-screen search {{{
-describe 'off-screen search'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_off_screen_search = 1
-        map s/ <Plug>(easymotion-sn)
-        map f/ <Plug>(easymotion-fn)
-        map F/ <Plug>(easymotion-Fn)
-        map t/ <Plug>(easymotion-tn)
-        map T/ <Plug>(easymotion-Tn)
-        call EasyMotion#init()
-        call AddLine('deco-chan deco-chan')
-        call AddLine('vim')
-        for i in range(50)
-            call AddLine('poge1 2huga 3hiyo 4poyo')
-        endfor
-        "             12345678901234567890123
-    end
-
-    after
-        let g:EasyMotion_off_screen_search = 0
-        close!
-    end
-
-    " provide search with off-screen range {{{
-    it 'provide search with off-screen range'
-        normal! gg0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-
-        exec "normal s/vim\<CR>"
-        Expect CursorPos() == [51,1,'v']
-
-        normal! gg0
-        exec "normal f/im\<CR>"
-        Expect CursorPos() == [51,2,'i']
-
-        set wrapscan
-        Expect &wrapscan == 1
-        normal! gg0
-        exec "normal F/im\<CR>"
-        Expect CursorPos() == [51,2,'i']
-
-        " Cancel
-        normal! gg0
-        exec "normal s/vim\<Esc>"
-        Expect CursorPos() == [l,1,'p']
-
-        " Label
-        normal! gg0
-        exec "normal s/deco-chan\<CR>\<Esc>"
-        Expect CursorPos() == [l,1,'p']
-
-        normal! gg0
-        exec "normal s/deco-chan\<CR>a"
-        Expect CursorPos() == [52,1,'d']
-
-        normal! gg0
-        exec "normal s/deco-chan\<CR>b"
-        Expect CursorPos() == [52,11,'d']
-
-        normal! gg0
-        exec "normal t/chan\<CR>a"
-        Expect CursorPos() == [52,5,'-']
-
-        normal! gg0
-        exec "normal t/chan\<CR>b"
-        Expect CursorPos() == [52,15,'-']
-
-    end
-    "}}}
-end
-
-describe 'dot notoff-screen search'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_off_screen_search = 0
-        map s/ <Plug>(easymotion-sn)
-        call EasyMotion#init()
-        call AddLine('deco-chan deco-chan')
-        call AddLine('vim')
-        for i in range(50)
-            call AddLine('poge1 2huga 3hiyo 4poyo')
-        endfor
-        "             12345678901234567890123
-    end
-
-    after
-        close!
-    end
-
-    " provide search with off-screen range {{{
-    it 'provide search with off-screen range'
-        normal! gg0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-
-        exec "normal s/vim\<CR>"
-        Expect CursorPos() != [51,1,'v']
-        Expect CursorPos() == [l,1,'p']
-    end
-    "}}}
-end
-"}}}
-
-" off-screen search scroll {{{
-describe 'off-screen search scroll'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        let g:EasyMotion_off_screen_search = 1
-        map / <Plug>(easymotion-sn)
-        call EasyMotion#init()
-        call AddLine('deco-chan deco-chan')
-        call AddLine('vim')
-        for i in range(500)
-            call AddLine('poge1 2huga 3hiyo 4poyo')
-        endfor
-        call AddLine('deco-chan deco-chan')
-        "             12345678901234567890123
-    end
-
-    after
-        let g:EasyMotion_off_screen_search = 0
-        close!
-    end
-
-    " provide scroll {{{
-    it 'provide scroll'
-        normal! gg0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'d']
-
-        normal! gg0
-        exec "normal /deco-chan\<CR>"
-        Expect CursorPos() == [l,11,'d']
-
-        normal! gg0
-        exec "normal /deco-chan\<Tab>\<CR>a"
-        Expect CursorPos() == [503,1,'d']
-
-    end
-    "}}}
-end
-"}}}
-
-"Word motion {{{
-describe 'Word motion'
-    before
-        new
-        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        map w <Plug>(easymotion-w)
-        map b <Plug>(easymotion-b)
-        map <Leader>w <Plug>(easymotion-iskeyword-w)
-        map <Leader>b <Plug>(easymotion-iskeyword-b)
-        call EasyMotion#init()
-        call AddLine('vim vim vim')
-        call AddLine('poge1 2huga 3hiyo 4poyo 5:test')
-        "             12345678901234567890123
-        " 0        1         2         3
-        " 123456789012345678901234567890
-        " poge1 2huga 3hiyo 4poyo 5:test
-        " vim vim vim
-    end
-
-    after
-        close!
-    end
-
-    " Default word motion {{
-    it 'Default word motion'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'p']
-        normal wc
-        Expect CursorPos() == [l,19,'4']
-
-        normal bb
-        Expect CursorPos() == [l,7,'2']
-
-        normal! 0
-        Expect CursorPos() == [l,1,'p']
-
-        normal wh
-        Expect CursorPos() == [2,9,'v']
-        normal bh
-        Expect CursorPos() == [l,1,'p']
-    end
-    "}}}
-end
-"}}}
-
-" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/bundle/easymotion/t/operator_pending_spec.vim b/bundle/easymotion/t/operator_pending_spec.vim
deleted file mode 100755
index 80a0999..0000000
--- a/bundle/easymotion/t/operator_pending_spec.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-"=============================================================================
-" FILE: t/operator_pending_spec.vim
-" AUTHOR: haya14busa
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-
-" Avoid source test files {{{
-if expand("%:p") ==# expand("<sfile>:p")
-  finish
-endif
-"}}}
-
-" Setup {{{
-let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
-execute 'set' 'rtp +=./'.s:root_dir
-runtime! plugin/EasyMotion.vim
-"}}}
-
-" Functions for Test {{{
-function! AddLine(str)
-    put! =a:str
-endfunction
-
-function! CursorPos()
-    return [line('.'), col('.'), getline('.')[col('.')-1]]
-endfunction
-"}}}
-
-
-" NOTE:
-"   I cannot test inclusive motion because mode() doesn't works well with
-"   vim-vspec
-
-" word motions {{{
-describe 'word motions'
-    before
-        new
-        let g:EasyMotion_keys = '123456789'
-        omap f <Plug>(easymotion-f)
-        omap w <Plug>(easymotion-w)
-        omap b <Plug>(easymotion-b)
-        call EasyMotion#init()
-        call AddLine('vim deco vim deco vim deco')
-        "             123456789012345678901234567890
-    end
-
-    after
-        close!
-    end
-
-    it '<Plug>(easymotion-w)'
-        " Default position
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,'v']
-
-        normal dw1
-        Expect CursorPos() == [l,1,'d']
-        normal! u
-        normal! 0
-        Expect CursorPos() == [l,1,'v']
-
-        normal dw2
-        Expect CursorPos() == [l,1,'v']
-        normal! 0
-        normal! u
-        normal! 0
-        Expect CursorPos() == [l,1,'v']
-    end
-
-    it '<Plug>(easymotion-b)'
-        " Default position
-        normal! $
-        let l = line('.')
-        Expect CursorPos() == [l,26,'o']
-
-        normal db1
-        Expect CursorPos() == [l,23,'o']
-        normal! u
-        normal! $
-        Expect CursorPos() == [l,26,'o']
-
-        normal db2
-        Expect CursorPos() == [l,19,'o']
-        normal! u
-        normal! $
-        Expect CursorPos() == [l,26,'o']
-    end
-end
-"}}}
-
diff --git a/bundle/easymotion/t/smartsign_spec.vim b/bundle/easymotion/t/smartsign_spec.vim
deleted file mode 100755
index 20fbb05..0000000
--- a/bundle/easymotion/t/smartsign_spec.vim
+++ /dev/null
@@ -1,575 +0,0 @@
-"=============================================================================
-" FILE: t/smartsign_spec.vim
-" AUTHOR: haya14busa
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-
-" Test for `smartsign` feature for find motions
-
-" Avoid source test files {{{
-if expand("%:p") ==# expand("<sfile>:p")
-  finish
-endif
-"}}}
-
-" Setup {{{
-let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
-execute 'set' 'rtp +=./'.s:root_dir
-runtime! plugin/EasyMotion.vim
-"}}}
-
-" Functions for Test {{{
-function! AddLine(str)
-    put! =a:str
-endfunction
-
-function! CursorPos()
-    return [line('.'), col('.'), getline('.')[col('.')-1]]
-endfunction
-"}}}
-
-" Smartsign configulation {{{
-describe 'Smartsign configulation'
-    it 'provide default dictionary'
-        let smartdict_us = g:EasyMotion#sticky_table#us
-        let smartdict_jp = g:EasyMotion#sticky_table#jp
-        Expect smartdict_us !=# {}
-        Expect smartdict_jp !=# {}
-    end
-end
-"}}}
-
-" Basic Smartsign feature with 1-key findmotions with US layout {{{
-describe 'Basic Smartsign feature with 1-key findmotions with US layout'
-    before
-        new
-        let g:EasyMotion_keys = '123456789'
-        let g:EasyMotion_use_smartsign_us = 1
-        map s <Plug>(easymotion-s)
-        call EasyMotion#init()
-        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
-        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
-        call AddLine(' ,< .> /?')
-        "             123456789012345678901234567890
-        "                      1         2         3
-        "
-        " ',' : '<', '.' : '>', '/' : '?',
-        " '1' : '!', '2' : '@', '3' : '#', '4' : '$', '5' : '%',
-        " '6' : '^', '7' : '&', '8' : '*', '9' : '(', '0' : ')', '-' : '_', '=' : '+',
-        " ';' : ':', '[' : '{', ']' : '}', '`' : '~', "'" : "\"", '\' : '|',
-    end
-
-    after
-        close!
-    end
-
-    it 'works well for all sign as a target char'
-        " Default position
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-
-        " ,<
-        normal s,1
-        Expect CursorPos() == [l,2,',']
-        normal! 0
-        normal s,2
-        Expect CursorPos() == [l,3,'<']
-        normal! 0
-        normal s<1
-        Expect CursorPos() == [l,3,'<']
-        normal! 0
-        normal s,3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-
-        " .>
-        normal s.1
-        Expect CursorPos() == [l,5,'.']
-        normal! 0
-        normal s.2
-        Expect CursorPos() == [l,6,'>']
-        normal! 0
-        normal s>1
-        Expect CursorPos() == [l,6,'>']
-        normal! 0
-        normal s.3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-
-        " /?
-        normal s/1
-        Expect CursorPos() == [l,8,'/']
-        normal! 0
-        normal s/2
-        Expect CursorPos() == [l,9,'?']
-        normal! 0
-        normal s?1
-        Expect CursorPos() == [l,9,'?']
-        normal! 0
-        normal s/3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-
-        " 1!
-        normal s11
-        Expect CursorPos() == [l+1,2,'1']
-        normal! 0
-        normal s12
-        Expect CursorPos() == [l+1,3,'!']
-        normal! 0
-        normal s!1
-        Expect CursorPos() == [l+1,3,'!']
-        normal! 0
-        normal s13
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 2@
-        normal s21
-        Expect CursorPos() == [l+1,5,'2']
-        normal! 0
-        normal s22
-        Expect CursorPos() == [l+1,6,'@']
-        normal! 0
-        normal s@1
-        Expect CursorPos() == [l+1,6,'@']
-        normal! 0
-        normal s23
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 3#
-        normal s31
-        Expect CursorPos() == [l+1,8,'3']
-        normal! 0
-        normal s32
-        Expect CursorPos() == [l+1,9,'#']
-        normal! 0
-        normal s#1
-        Expect CursorPos() == [l+1,9,'#']
-        normal! 0
-        normal s33
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 4$
-        normal s41
-        Expect CursorPos() == [l+1,11,'4']
-        normal! 0
-        normal s42
-        Expect CursorPos() == [l+1,12,'$']
-        normal! 0
-        normal s$1
-        Expect CursorPos() == [l+1,12,'$']
-        normal! 0
-        normal s43
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 5%
-        normal s51
-        Expect CursorPos() == [l+1,14,'5']
-        normal! 0
-        normal s52
-        Expect CursorPos() == [l+1,15,'%']
-        normal! 0
-        normal s%1
-        Expect CursorPos() == [l+1,15,'%']
-        normal! 0
-        normal s53
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 6^
-        normal s61
-        Expect CursorPos() == [l+1,17,'6']
-        normal! 0
-        normal s62
-        Expect CursorPos() == [l+1,18,'^']
-        normal! 0
-        normal s^1
-        Expect CursorPos() == [l+1,18,'^']
-        normal! 0
-        normal s63
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 7&
-        normal s71
-        Expect CursorPos() == [l+1,20,'7']
-        normal! 0
-        normal s72
-        Expect CursorPos() == [l+1,21,'&']
-        normal! 0
-        normal s&1
-        Expect CursorPos() == [l+1,21,'&']
-        normal! 0
-        normal s73
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 8*
-        normal s81
-        Expect CursorPos() == [l+1,23,'8']
-        normal! 0
-        normal s82
-        Expect CursorPos() == [l+1,24,'*']
-        normal! 0
-        normal s*1
-        Expect CursorPos() == [l+1,24,'*']
-        normal! 0
-        normal s83
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 9(
-        normal s91
-        Expect CursorPos() == [l+1,26,'9']
-        normal! 0
-        normal s92
-        Expect CursorPos() == [l+1,27,'(']
-        normal! 0
-        normal s(1
-        Expect CursorPos() == [l+1,27,'(']
-        normal! 0
-        normal s93
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " 0)
-        normal s01
-        Expect CursorPos() == [l+1,29,'0']
-        normal! 0
-        normal s02
-        Expect CursorPos() == [l+1,30,')']
-        normal! 0
-        normal s)1
-        Expect CursorPos() == [l+1,30,')']
-        normal! 0
-        normal s03
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-
-        " -_
-        normal s-1
-        Expect CursorPos() == [l+2,2,'-']
-        normal! 0
-        normal s-2
-        Expect CursorPos() == [l+2,3,'_']
-        normal! 0
-        normal s_1
-        Expect CursorPos() == [l+2,3,'_']
-        normal! 0
-        normal s-3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " =+
-        normal s=1
-        Expect CursorPos() == [l+2,5,'=']
-        normal! 0
-        normal s=2
-        Expect CursorPos() == [l+2,6,'+']
-        normal! 0
-        normal s+1
-        Expect CursorPos() == [l+2,6,'+']
-        normal! 0
-        normal s=3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " ;:
-        normal s;1
-        Expect CursorPos() == [l+2,8,';']
-        normal! 0
-        normal s;2
-        Expect CursorPos() == [l+2,9,':']
-        normal! 0
-        normal s:1
-        Expect CursorPos() == [l+2,9,':']
-        normal! 0
-        normal s;3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " [{
-        normal s[1
-        Expect CursorPos() == [l+2,11,'[']
-        normal! 0
-        normal s[2
-        Expect CursorPos() == [l+2,12,'{']
-        normal! 0
-        normal s{1
-        Expect CursorPos() == [l+2,12,'{']
-        normal! 0
-        normal s[3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " ]}
-        normal s]1
-        Expect CursorPos() == [l+2,14,']']
-        normal! 0
-        normal s]2
-        Expect CursorPos() == [l+2,15,'}']
-        normal! 0
-        normal s}1
-        Expect CursorPos() == [l+2,15,'}']
-        normal! 0
-        normal s]3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " `~
-        normal s`1
-        Expect CursorPos() == [l+2,17,'`']
-        normal! 0
-        normal s`2
-        Expect CursorPos() == [l+2,18,'~']
-        normal! 0
-        normal s~1
-        Expect CursorPos() == [l+2,18,'~']
-        normal! 0
-        normal s`3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " '"
-        normal s'1
-        Expect CursorPos() == [l+2,20,'''']
-        normal! 0
-        normal s'2
-        Expect CursorPos() == [l+2,21,'"']
-        normal! 0
-        normal s"1
-        Expect CursorPos() == [l+2,21,'"']
-        normal! 0
-        normal s'3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-
-        " \|
-        normal s\1
-        Expect CursorPos() == [l+2,23,'\']
-        normal! 0
-        normal s\2
-        Expect CursorPos() == [l+2,24,'|']
-        normal! 0
-        normal s|1
-        Expect CursorPos() == [l+2,24,'|']
-        normal! 0
-        normal s\3
-        Expect CursorPos() == [l+2,1,' ']
-        normal! 0
-    end
-end
-"}}}
-
-" Smartsign with 2-key find motions with US layout {{{
-describe 'Smartsign with 2-key find motions with US layout'
-    before
-        new
-        let g:EasyMotion_keys = '123456789'
-        let g:EasyMotion_use_smartsign_us = 1
-        map s <Plug>(easymotion-s2)
-        call EasyMotion#init()
-        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
-        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
-        call AddLine(' ,< .> /?')
-        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
-        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
-        call AddLine(' ,< .> /?')
-        "             123456789012345678901234567890
-        "                      1         2         3
-    end
-
-    after
-        close!
-    end
-
-    it 'works well'
-        " Default position
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-
-        " ,<
-        normal s,,1
-        Expect CursorPos() == [l,2,',']
-        normal! 0
-        Expect CursorPos() == [l,1,' ']
-        normal s,,3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal s, 1
-        Expect CursorPos() == [l,3,'<']
-        normal! 0
-        normal s<<1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal s,<1
-        Expect CursorPos() == [l,2,',']
-        normal! 0
-        normal s<,1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-    end
-    it ': s,,3'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-        normal s,,3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-    end
-
-    it 'escape * asterisc #151'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-        normal s1*22
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal s8*1
-        Expect CursorPos() == [l+1,23,'8']
-        normal! 0
-        normal s881
-        Expect CursorPos() == [l+1,23,'8']
-        normal! 0
-        normal s**1
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-        normal s*81
-        Expect CursorPos() == [l+1,1,' ']
-        normal! 0
-    end
-end
-"}}}
-
-" Smartsign with 2-key find motions with JP layout {{{
-describe 'Smartsign with 2-key find motions with JP layout'
-    before
-        new
-        let g:EasyMotion_keys = '123456789'
-        let g:EasyMotion_use_smartsign_jp = 1
-        map s <Plug>(easymotion-s2)
-        call EasyMotion#init()
-        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
-        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
-        call AddLine(' ,< .> /?')
-        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
-        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
-        call AddLine(' ,< .> /?')
-        "             123456789012345678901234567890
-        "                      1         2         3
-        "
-        "',' : '<', '.' : '>', '/' : '?',
-        "'1' : '!', '2' : '"', '3' : '#', '4' : '$', '5' : '%',
-        "'6' : '&', '7' : "'", '8' : '(', '9' : ')', '0' : '_', '-' : '=', '^' : '~',
-        "';' : '+', ':' : '*', '[' : '{', ']' : '}', '@' : '`', '\' : '|',
-        "
-    end
-
-    after
-        close!
-    end
-
-    it 'works well'
-        " Default position
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-
-        " ,<
-        normal s,,1
-        Expect CursorPos() == [l,2,',']
-        normal! 0
-        Expect CursorPos() == [l,1,' ']
-        normal s,,3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal s, 1
-        Expect CursorPos() == [l,3,'<']
-        normal! 0
-        normal s<<1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal s,<1
-        Expect CursorPos() == [l,2,',']
-        normal! 0
-        normal s<,1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-    end
-    it ': s,,3'
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-        normal s,,3
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-    end
-end
-"}}}
-
-" Smartsign with n-key find search motions {{{
-describe 'Smartsign with n-key find search motions'
-    before
-        new
-        let g:EasyMotion_keys = '123456789'
-        let g:EasyMotion_use_smartsign_jp = 1
-        map / <Plug>(easymotion-sn)
-        call EasyMotion#init()
-        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
-        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
-        call AddLine(' ,< .> /?')
-        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
-        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
-        call AddLine(' ,< .> /?')
-    end
-
-    after
-        close!
-    end
-
-    it 'do not work'
-        " Default position
-        normal! 0
-        let l = line('.')
-        Expect CursorPos() == [l,1,' ']
-
-        " ,<
-        normal /,,1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-        normal /,<1
-        Expect CursorPos() == [l,1,' ']
-        normal! 0
-    end
-end
-"}}}
-
-" __END__  {{{
-" vim: expandtab softtabstop=4 shiftwidth=4
-" vim: foldmethod=marker
-" }}}
diff --git a/bundle/elixir/.travis.yml b/bundle/elixir/.travis.yml
deleted file mode 100755
index 3e67b0c..0000000
--- a/bundle/elixir/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-before_install: sudo apt-get install vim-gtk
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-script: "bundle exec rspec --color -f d"
diff --git a/bundle/elixir/Gemfile b/bundle/elixir/Gemfile
deleted file mode 100755
index c543a5d..0000000
--- a/bundle/elixir/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'http://rubygems.org/'
-
-gem 'rspec'
-gem 'vimrunner'
diff --git a/bundle/elixir/Gemfile.lock b/bundle/elixir/Gemfile.lock
deleted file mode 100755
index 8d4d64f..0000000
--- a/bundle/elixir/Gemfile.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    vimrunner (0.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rspec
-  vimrunner
diff --git a/bundle/elixir/README.md b/bundle/elixir/README.md
deleted file mode 100755
index 7ed3b46..0000000
--- a/bundle/elixir/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim-elixir
-
-[![Build Status](https://travis-ci.org/elixir-lang/vim-elixir.png?branch=master)](https://travis-ci.org/elixir-lang/vim-elixir)
-
-This project contains some Vim configuration files to work with [Elixir](http://elixir-lang.org).
-
-So far it's included:
-
-* Syntax highlighting
-
-* Filetype detection
-
-* Auto indentation
-
-## Install
-
-* Copy the files to your `~/.vim` directory.
-
-* If you use vim-pathogen you can clone this repo into `~/.vim/bundle`
-
-## Snippets
-
-If you are looking for snipmate snippets take a look at: [elixir-snippets](https://github.com/carlosgaldino/elixir-snippets)
diff --git a/bundle/elixir/compiler/exunit.vim b/bundle/elixir/compiler/exunit.vim
deleted file mode 100755
index 2c9fb29..0000000
--- a/bundle/elixir/compiler/exunit.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-" Vim compiler file
-" Language:     ExUnit
-" Maintainer:   Rein Henrichs <rein.henrichs@gmail.com>
-" URL:          https://github.com/elixir-lang/vim-elixir
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "exunit"
-
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-CompilerSet makeprg=mix\ test
-CompilerSet errorformat=%A\ \ %.)\ %m(%.%#),%C\ \ \ \ \ **%m,%C\ \ \ \ \ \ \ %m,%Z\ \ \ \ \ at\ %f:%l,%-G%.%#
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: nowrap sw=2 sts=2 ts=8:
diff --git a/bundle/elixir/ftdetect/elixir.vim b/bundle/elixir/ftdetect/elixir.vim
deleted file mode 100755
index df413e1..0000000
--- a/bundle/elixir/ftdetect/elixir.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-au BufRead,BufNewFile *.ex,*.exs set filetype=elixir
-au FileType elixir setl sw=2 sts=2 et iskeyword+=!,?
diff --git a/bundle/elixir/ftplugin/elixir.vim b/bundle/elixir/ftplugin/elixir.vim
deleted file mode 100755
index 5571fcf..0000000
--- a/bundle/elixir/ftplugin/elixir.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-" Vim filetype plugin
-" Language:    Elixir
-" Maintainer:  Carlos Galdino <carloshsgaldino@gmail.com>
-" URL:         https://github.com/elixir-lang/vim-elixir
-
-if (exists("b:did_ftplugin"))
-  finish
-endif
-let b:did_ftplugin = 1
-
-
-" Matchit support
-if exists("loaded_matchit") && !exists("b:match_words")
-  let b:match_ignorecase = 0
-
-  let b:match_words = '\<\%(do\|fn\)\:\@!\>' .
-        \ ':' .
-        \ '\<\%(else\|elsif\|catch\|after\|rescue\)\:\@!\>' .
-        \ ':' .
-        \ '\:\@<!\<end\>' .
-        \ ',{:},\[:\],(:)'
-endif
-
-setlocal comments=:#
-setlocal commentstring=#\ %s
diff --git a/bundle/elixir/indent/elixir.vim b/bundle/elixir/indent/elixir.vim
deleted file mode 100755
index fababe4..0000000
--- a/bundle/elixir/indent/elixir.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-" Vim indent file
-" Language: Elixir
-" Maintainer: Carlos Galdino <carloshsgaldino@gmail.com>
-" Last Change: 2013 Apr 24
-
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal nosmartindent
-
-setlocal indentexpr=GetElixirIndent()
-setlocal indentkeys+==end,=else:,=match:,=elsif:,=catch:,=after:,=rescue:
-
-if exists("*GetElixirIndent")
-  finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:skip_syntax  = '\%(Comment\|String\)$'
-let s:block_skip   = "synIDattr(synID(line('.'),col('.'),1),'name') =~? '" . s:skip_syntax . "'"
-let s:block_start  = 'do\|fn'
-let s:block_middle = 'else\|match\|elsif\|catch\|after\|rescue'
-let s:block_end    = 'end'
-let s:arrow        = '^.*->$'
-let s:pipeline     = '^\s*|>.*$'
-
-let s:indent_keywords   = '\<\%(' . s:block_start . '\|' . s:block_middle . '\)$' . '\|' . s:arrow
-let s:deindent_keywords = '^\s*\<\%(' . s:block_end . '\|' . s:block_middle . '\)\>' . '\|' . s:arrow
-
-function! GetElixirIndent()
-  let lnum = prevnonblank(v:lnum - 1)
-  let ind  = indent(lnum)
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  " TODO: Remove these 2 lines
-  " I don't know why, but for the test on spec/indent/lists_spec.rb:24.
-  " Vim is making some mess on parsing the syntax of 'end', it is being
-  " recognized as 'elixirString' when should be recognized as 'elixirBlock'.
-  " This forces vim to sync the syntax.
-  call synID(v:lnum, 1, 1)
-  syntax sync fromstart
-
-  if synIDattr(synID(v:lnum, 1, 1), "name") !~ s:skip_syntax
-    let current_line = getline(v:lnum)
-    let last_line = getline(lnum)
-
-    let splited_line = split(last_line, '\zs')
-    let opened_symbol = 0
-    let opened_symbol += count(splited_line, '[') - count(splited_line, ']')
-    let opened_symbol += count(splited_line, '{') - count(splited_line, '}')
-
-    let ind += opened_symbol * &sw
-
-    if current_line =~ '^\s*\(\]\|}\)'
-      let ind -= &sw
-    endif
-
-    if last_line =~ s:indent_keywords
-      let ind += &sw
-    endif
-
-    " if line starts with pipeline
-    " and last line is an attribution
-    " indents pipeline in same level as attribution
-    if current_line =~ s:pipeline &&
-          \ last_line =~ '^[^=]\+=.\+$'
-      let b:old_ind = ind
-      let ind = float2nr(matchend(last_line, '=\s*[^ ]') / &sw) * &sw
-    endif
-
-    " if last line starts with pipeline
-    " and current line doesn't start with pipeline
-    " returns the indentation before the pipeline
-    if last_line =~ s:pipeline &&
-          \ current_line !~ s:pipeline
-      let ind = b:old_ind
-    endif
-
-    if current_line =~ s:deindent_keywords
-      let bslnum = searchpair( '\<\%(' . s:block_start . '\):\@!\>',
-            \ '\<\%(' . s:block_middle . '\):\@!\>\zs',
-            \ '\<:\@<!' . s:block_end . '\>\zs',
-            \ 'nbW',
-            \ s:block_skip )
-
-      let ind = indent(bslnum)
-    endif
-
-    " indent case statements '->'
-    if current_line =~ s:arrow
-      let ind += &sw
-    endif
-  endif
-
-  return ind
-endfunction
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/bundle/elixir/spec/indent/anonymous_functions_spec.rb b/bundle/elixir/spec/indent/anonymous_functions_spec.rb
deleted file mode 100755
index e3dd40f..0000000
--- a/bundle/elixir/spec/indent/anonymous_functions_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  context "single body functions inside do block" do
-    it "is declared with fn syntax" do
-      assert_correct_indenting <<-EOF
-        def do
-          some_func = fn  x -> x end
-        end
-      EOF
-    end
-
-    it "is declared with function syntax" do
-      assert_correct_indenting <<-EOF
-        def do
-          some_func = function do x -> x end
-        end
-      EOF
-    end
-
-    it "spans in multiple lines" do
-      assert_correct_indenting <<-EOF
-        def test do
-          assert_raise Queue.Empty, fn ->
-            Q.new |> Q.deq!
-          end
-        end
-      EOF
-    end
-
-    it "spans in multiple lines inside parentheses" do
-      assert_correct_indenting <<-EOF
-        defmodule Test do
-          def lol do
-            Enum.map([1,2,3], fn x ->
-              x * 3
-            end)
-          end
-        end
-      EOF
-    end
-  end
-
-  context "multiple body functions declaring" do
-    it "it with fn syntax" do
-      assert_correct_indenting <<-EOF
-        fizzbuzz = fn
-          0, 0, _ -> "FizzBuzz"
-          0, _, _ -> "Fizz"
-          _, 0, _ -> "Buzz"
-          _, _, x -> x
-        end
-      EOF
-    end
-
-    it "it with function syntax" do
-      assert_correct_indenting <<-EOF
-        fizzbuzz = function do
-          0, 0, _ -> "FizzBuzz"
-          0, _, _ -> "Fizz"
-          _, 0, _ -> "Buzz"
-          _, _, x -> x
-        end
-      EOF
-    end
-  end
-end
diff --git a/bundle/elixir/spec/indent/blocks_spec.rb b/bundle/elixir/spec/indent/blocks_spec.rb
deleted file mode 100755
index cbc0c82..0000000
--- a/bundle/elixir/spec/indent/blocks_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  specify "'do' indenting" do
-    assert_correct_indenting <<-EOF
-      do
-        something
-      end
-    EOF
-  end
-
-  it "does not consider :end as end" do
-    assert_correct_indenting <<-EOF
-      defmodule Test do
-        def lol do
-          IO.inspect :end
-        end
-      end
-    EOF
-  end
-
-  it "does not consider do: as the start of a block" do
-    assert_correct_indenting <<-EOF
-      def f do
-        if true do: 42
-      end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/case_spec.rb b/bundle/elixir/spec/indent/case_spec.rb
deleted file mode 100755
index e0df5d6..0000000
--- a/bundle/elixir/spec/indent/case_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  specify "case statements" do
-    assert_correct_indenting <<-EOF
-      case some_function do
-        :ok ->
-          :ok
-        { :error, :message } ->
-          { :error, :message }
-      end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/cond_spec.rb b/bundle/elixir/spec/indent/cond_spec.rb
deleted file mode 100755
index d3534d1..0000000
--- a/bundle/elixir/spec/indent/cond_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  it "conditional" do
-    assert_correct_indenting <<-EOF
-      cond do
-        foo -> 1
-        bar -> 2
-      end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/documentation_spec.rb b/bundle/elixir/spec/indent/documentation_spec.rb
deleted file mode 100755
index 72d0c7d..0000000
--- a/bundle/elixir/spec/indent/documentation_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  context "documentation" do
-    it "with end keyword" do
-      assert_correct_indenting <<-EOF
-        defmodule Test do
-          @doc """
-          end
-          """
-        end
-      EOF
-    end
-  end
-end
diff --git a/bundle/elixir/spec/indent/if_spec.rb b/bundle/elixir/spec/indent/if_spec.rb
deleted file mode 100755
index 0d0970a..0000000
--- a/bundle/elixir/spec/indent/if_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  it "if-clauses" do
-    assert_correct_indenting <<-EOF
-      if foo do
-        bar
-      end
-    EOF
-  end
-
-  it "if-else-clauses" do
-    assert_correct_indenting <<-EOF
-      if foo do
-        bar
-      else
-        baz
-      end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/lists_spec.rb b/bundle/elixir/spec/indent/lists_spec.rb
deleted file mode 100755
index 895c07f..0000000
--- a/bundle/elixir/spec/indent/lists_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  specify "lists" do
-    assert_correct_indenting <<-EOF
-      def example do
-        [ :foo,
-          :bar,
-          :baz ]
-      end
-    EOF
-  end
-
-  specify "keyword list" do
-    assert_correct_indenting <<-EOF
-      def project do
-        [ name: "mix",
-          version: "0.1.0",
-          deps: deps ]
-      end
-    EOF
-  end
-
-  specify "keyword" do
-    assert_correct_indenting <<-EOF
-      def config do
-        [ name:
-          "John" ]
-      end
-    EOF
-  end
-
-  specify "list of tuples" do
-    assert_correct_indenting <<-EOF
-    def test do
-      [ { :cowboy, github: "extend/cowboy" },
-        { :dynamo, "0.1.0-dev", github: "elixir-lang/dynamo" },
-        { :ecto, github: "elixir-lang/ecto" },
-        { :pgsql, github: "semiocast/pgsql" } ]
-    end
-    EOF
-  end
-
-  specify "list of lists" do
-    assert_correct_indenting <<-EOF
-    def test do
-      [ [:a, :b, :c],
-        [:d, :e, :f] ]
-    end
-    EOF
-  end
-
-  specify "complex list" do
-    assert_correct_indenting <<-EOF
-    def test do
-      [ app: :first,
-        version: "0.0.1",
-        dynamos: [First.Dynamo],
-        compilers: [:elixir, :dynamo, :ecto, :app],
-        env: [prod: [compile_path: "ebin"]],
-        compile_path: "tmp/first/ebin",
-        deps: deps ]
-    end
-    EOF
-  end
-
-  specify "lists with break line after square brackets" do
-    assert_correct_indenting <<-EOF
-    def project do
-      deps: [
-        { :bar, path: "deps/umbrella/apps/bar" },
-        { :umbrella, path: "deps/umbrella" }
-      ]
-    end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/pipeline_spec.rb b/bundle/elixir/spec/indent/pipeline_spec.rb
deleted file mode 100755
index 26db511..0000000
--- a/bundle/elixir/spec/indent/pipeline_spec.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  it "using multiline pipeline" do
-    assert_correct_indenting <<-EOF
-    "a,b,c,d"
-    |> String.split(",")
-    |> Enum.reverse
-    EOF
-  end
-
-  it "attribuition using multline pipeline operator" do
-    assert_correct_indenting <<-EOF
-    [ h | t ] = "a,b,c,d"
-                |> String.split(",")
-                |> Enum.reverse
-    EOF
-  end
-
-  it "function with pipeline operator" do
-    assert_correct_indenting <<-EOF
-    def test do
-      [ h | t ] = "a,b,c,d"
-                  |> String.split(",")
-                  |> Enum.reverse
-
-      { :ok, h }
-    end
-    EOF
-  end
-
-  it "pipeline operator with block open" do
-    assert_correct_indenting <<-EOF
-    def test do
-      "a,b,c,d"
-      |> String.split(",")
-      |> Enum.first
-      |> case do
-        "a" -> "A"
-        _ -> "Z"
-      end
-    end
-    EOF
-  end
-
-  it "using a record with pipeline" do
-    assert_correct_indenting <<-EOF
-    defrecord RECORD, field_a: nil, field_b: nil
-
-    rec = RECORD.new
-          |> IO.inspect
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/indent/tuples_spec.rb b/bundle/elixir/spec/indent/tuples_spec.rb
deleted file mode 100755
index 5464704..0000000
--- a/bundle/elixir/spec/indent/tuples_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe "Indenting" do
-  specify "multiline tuple" do
-    assert_correct_indenting <<-EOF
-    def xpto do
-      { :a,
-        :b,
-        :c }
-    end
-    EOF
-  end
-
-  specify "tuples with break line after square brackets" do
-    assert_correct_indenting <<-EOF
-    def method do
-      {
-        :bar,
-        path: "deps/umbrella/apps/bar"
-      }
-    end
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/spec_helper.rb b/bundle/elixir/spec/spec_helper.rb
deleted file mode 100755
index ab86908..0000000
--- a/bundle/elixir/spec/spec_helper.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-require 'tmpdir'
-require 'vimrunner'
-
-module Support
-  def assert_correct_indenting(string)
-    content = write_file(string)
-
-    @vim.edit file
-    # remove all indentation
-    @vim.normal 'ggVG999<<'
-    # force vim to indent the file
-    @vim.normal 'gg=G'
-    @vim.write
-
-    read_file.should eq(content)
-  end
-
-  def assert_correct_syntax(syntax, cursor, string)
-    write_file(string)
-
-    @vim.edit file
-    @vim.search cursor
-
-    cursor_syntax_stack.should include(syntax)
-  end
-
-  def assert_incorrect_syntax(type, cursor, string)
-    write_file(string)
-
-    @vim.edit file
-    @vim.search cursor
-
-    cursor_syntax_stack.should_not include(type)
-  end
-
-  private
-
-  def write_file(string)
-    content = file_content(string)
-    File.open file, 'w' do |f|
-      f.write content
-    end
-
-    content
-  end
-
-  def file_content(string)
-    whitespace = string.scan(/^\s*/).first
-    string.split("\n").map { |line|
-      line.gsub(/^#{whitespace}/, '')
-    }.join("\n").strip
-  end
-
-  def cursor_syntax_stack
-    @vim.echo <<-EOF
-      map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
-    EOF
-  end
-
-  def read_file
-    IO.read(file).strip
-  end
-
-  def file; 'test.exs'; end
-end
-
-RSpec.configure do |config|
-  include Support
-
-  config.before(:suite) do
-    VIM = Vimrunner.start_gvim
-    VIM.prepend_runtimepath(File.expand_path('../..', __FILE__))
-    VIM.command('runtime ftdetect/elixir.vim')
-  end
-
-  config.after(:suite) do
-    VIM.kill
-  end
-
-  config.around(:each) do |example|
-    @vim = VIM
-
-    # cd into a temporary directory for every example.
-    Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        @vim.command("cd #{dir}")
-        example.call
-      end
-    end
-  end
-end
diff --git a/bundle/elixir/spec/syntax/default_argument_spec.rb b/bundle/elixir/spec/syntax/default_argument_spec.rb
deleted file mode 100755
index ec69a3e..0000000
--- a/bundle/elixir/spec/syntax/default_argument_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe "Default argument syntax" do
-  it "default argument" do
-    assert_correct_syntax 'elixirOperator', '\\', <<-'EOF'
-      def foo(bar \\ :baz)
-    EOF
-
-    assert_correct_syntax 'elixirOperator', '\/', <<-EOF
-      def foo(bar // :baz)
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/syntax/heredoc_spec.rb b/bundle/elixir/spec/syntax/heredoc_spec.rb
deleted file mode 100755
index eb50a4f..0000000
--- a/bundle/elixir/spec/syntax/heredoc_spec.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe "Heredoc syntax" do
-  describe "binary" do
-    it "with multiline content" do
-      assert_correct_syntax 'elixirDocString', 'foo', <<-EOF
-        @doc """
-        foo
-        """
-      EOF
-    end
-
-    it "escapes quotes unless only preceded by whitespace" do
-      assert_correct_syntax 'elixirDocString', %q(^\s*\zs"""), <<-EOF
-        @doc """
-        foo """
-        """
-      EOF
-    end
-
-    it "does not include content on initial line", focus: true do
-      assert_correct_syntax 'elixirNumber', '0', <<-EOF
-        String.at """, 0
-        foo
-        end
-      EOF
-    end
-
-    it "with interpolation" do
-      assert_correct_syntax 'elixirInterpolation', 'bar', <<-EOF
-        @doc """
-        foo \#{bar}
-        """
-      EOF
-    end
-  end
-
-  describe "character list" do
-    it "with multiline content" do
-      assert_correct_syntax 'elixirDocString', 'foo', <<-EOF
-        @doc """
-        foo
-        """
-      EOF
-    end
-
-    it "escapes quotes unless only preceded by whitespace" do
-      assert_correct_syntax 'elixirDocString', %q(^\s*\zs'''), <<-EOF
-        @doc '''
-        foo '''
-        '''
-      EOF
-    end
-
-    it "with interpolation" do
-      assert_correct_syntax 'elixirInterpolation', 'bar', <<-EOF
-        @doc '''
-        foo \#{bar}
-        '''
-      EOF
-    end
-  end
-end
diff --git a/bundle/elixir/spec/syntax/records_spec.rb b/bundle/elixir/spec/syntax/records_spec.rb
deleted file mode 100755
index b68814a..0000000
--- a/bundle/elixir/spec/syntax/records_spec.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe "Record syntax" do
-  it "private record symbol" do
-    assert_correct_syntax 'elixirSymbol', ':user', <<-EOF
-      defrecordp :user, name: "José", age: 25
-    EOF
-  end
-end
diff --git a/bundle/elixir/spec/syntax/sigil_spec.rb b/bundle/elixir/spec/syntax/sigil_spec.rb
deleted file mode 100755
index ef68304..0000000
--- a/bundle/elixir/spec/syntax/sigil_spec.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-describe "Sigil syntax" do
-  describe "upper case" do
-    it "string" do
-      assert_correct_syntax 'elixirDelimiter', 'S', '~S(string)'
-      assert_correct_syntax 'elixirSigil', 'foo', '~S(string)'
-    end
-
-    it "character list" do
-      assert_correct_syntax 'elixirDelimiter', 'C', '~C(charlist)'
-      assert_correct_syntax 'elixirSigil', 'charlist', '~C(charlist)'
-    end
-
-    it "regular expression" do
-      assert_correct_syntax 'elixirDelimiter', 'R', '~R(regex)'
-      assert_correct_syntax 'elixirSigil', 'regex', '~R(regex)'
-    end
-
-    it "list of words" do
-      assert_correct_syntax 'elixirDelimiter', 'W', '~W(list of words)'
-      assert_correct_syntax 'elixirSigil', 'list', '~W(list of words)'
-    end
-
-    it "delimited with parans" do
-      assert_correct_syntax 'elixirDelimiter', '(', '~S(foo bar)'
-      assert_correct_syntax 'elixirDelimiter', ')', '~S(foo bar)'
-    end
-
-    it "delimited with braces" do
-      assert_correct_syntax 'elixirDelimiter', '{', '~S{foo bar}'
-      assert_correct_syntax 'elixirDelimiter', '}', '~S{foo bar}'
-    end
-
-    it "delimited with brackets" do
-      assert_correct_syntax 'elixirDelimiter', '[', '~S[foo bar]'
-      assert_correct_syntax 'elixirDelimiter', ']', '~S[foo bar]'
-    end
-
-    it "escapes double quotes unless only preceded by whitespace" do
-      assert_correct_syntax 'elixirDelimiter', %q(^\s*\zs"""), <<-EOF
-        ~r"""
-        foo """
-        """
-      EOF
-    end
-
-    it "escapes single quotes unless only preceded by whitespace" do
-      assert_correct_syntax 'elixirDelimiter', %q(^\s*\zs'''), <<-EOF
-        ~r'''
-        foo '''
-        '''
-      EOF
-    end
-
-    it "without escapes" do
-      assert_incorrect_syntax 'elixirRegexEscape', '\\', '~S(foo \n bar)'
-    end
-
-    it "without interpolation" do
-      assert_incorrect_syntax 'elixirInterpolation', 'bar', '~S(foo #{bar})'
-    end
-
-    it "without escaped parans" do
-      assert_incorrect_syntax 'elixirRegexEscapePunctuation', '( ', '~S(\( )'
-    end
-  end
-
-  describe "lower case" do
-    it "string" do
-      assert_correct_syntax 'elixirDelimiter', 's', '~s(string)'
-      assert_correct_syntax 'elixirSigil', 'foo', '~s(string)'
-    end
-
-    it "character list" do
-      assert_correct_syntax 'elixirDelimiter', 'c', '~c(charlist)'
-      assert_correct_syntax 'elixirSigil', 'charlist', '~c(charlist)'
-    end
-
-    it "regular expression" do
-      assert_correct_syntax 'elixirDelimiter', 'r', '~r(regex)'
-      assert_correct_syntax 'elixirSigil', 'regex', '~r(regex)'
-    end
-
-    it "list of words" do
-      assert_correct_syntax 'elixirDelimiter', 'w', '~w(list of words)'
-      assert_correct_syntax 'elixirSigil', 'list', '~w(list of words)'
-    end
-
-    it "with escapes" do
-      assert_correct_syntax 'elixirRegexEscape', '\\', '~s(foo \n bar)'
-    end
-
-    it "with interpolation" do
-      assert_correct_syntax 'elixirInterpolation', 'bar', '~s(foo #{bar})'
-    end
-
-    it "with escaped parans" do
-      assert_correct_syntax 'elixirRegexEscapePunctuation', '( ', '~s(\( )'
-    end
-  end
-
-  describe "old syntax" do
-    it "string" do
-      assert_correct_syntax 'elixirDelimiter', 's', '%s(string)'
-      assert_correct_syntax 'elixirSigil', 'foo', '%s(string)'
-    end
-  end
-end
diff --git a/bundle/elixir/spec/syntax/variable_spec.rb b/bundle/elixir/spec/syntax/variable_spec.rb
deleted file mode 100755
index 2877e7f..0000000
--- a/bundle/elixir/spec/syntax/variable_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe "Variable syntax" do
-  it "unused" do
-    assert_correct_syntax 'elixirUnusedVariable', '_from', <<-EOF
-      def handle_call(:pop, _from, [h|stack]) do
-        { :reply, h, stack }
-      end
-    EOF
-  end
-end
diff --git a/bundle/elixir/syntax/elixir.vim b/bundle/elixir/syntax/elixir.vim
deleted file mode 100755
index ff58d55..0000000
--- a/bundle/elixir/syntax/elixir.vim
+++ /dev/null
@@ -1,166 +0,0 @@
-" Vim syntax file
-" Language: Elixir
-" Maintainer: Carlos Galdino <carloshsgaldino@gmail.com>
-" Last Change: 2013 Apr 24
-
-if exists("b:current_syntax")
-  finish
-endif
-
-" syncing starts 2000 lines before top line so docstrings don't screw things up
-syn sync minlines=2000
-
-syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments
-
-syn match elixirComment '#.*' contains=elixirTodo
-syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
-
-syn keyword elixirKeyword is_atom is_binary is_bitstring is_boolean is_float is_function is_integer is_list is_number is_pid is_port is_record is_reference is_tuple is_exception
-syn keyword elixirKeyword case cond bc lc inlist inbits if unless try receive
-syn keyword elixirKeyword exit raise throw after rescue catch else do end
-syn keyword elixirKeyword quote unquote super
-syn match   elixirKeyword '\<\%(->\)\>\s*'
-
-syn keyword elixirInclude import require alias use
-
-syn keyword elixirOperator and not or when xor in
-syn match elixirOperator '%=\|\*=\|\*\*=\|+=\|-=\|\^=\|||='
-syn match elixirOperator "\%(<=>\|<\%(<\|=\)\@!\|>\%(<\|=\|>\)\@!\|<=\|>=\|===\|==\|=\~\|!=\|!\~\|\s?[ \t]\@=\)"
-syn match elixirOperator "!+[ \t]\@=\|&&\|||\|\^\|\*\|+\|-\|/"
-syn match elixirOperator "|\|++\|--\|\*\*\|\/\/\|\\\\\|<-\|<>\|<<\|>>\|=\|\.\|::"
-
-syn match elixirSymbol '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
-syn match elixirSymbol '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)'
-syn match elixirSymbol "\%([a-zA-Z_]\w*\([?!]\)\?\):\(:\)\@!"
-
-syn keyword elixirName nil
-syn match   elixirName '\<[A-Z]\w*\>'
-
-syn match elixirUnusedVariable '\<_\w*\>'
-
-syn keyword elixirBoolean true false
-
-syn match elixirVariable '@[a-zA-Z_]\w*\|&\d'
-
-syn keyword elixirPseudoVariable __FILE__ __DIR__ __MODULE__ __ENV__ __CALLER__
-
-syn match elixirNumber '\<\d\(_\?\d\)*\(\.[^[:space:][:digit:]]\@!\(_\?\d\)*\)\?\([eE][-+]\?\d\(_\?\d\)*\)\?\>'
-syn match elixirNumber '\<0[xX][0-9A-Fa-f]\+\>'
-syn match elixirNumber '\<0[bB][01]\+\>'
-
-syn match elixirRegexEscape            "\\\\\|\\[aAbBcdDefGhHnrsStvVwW]\|\\\d\{3}\|\\x[0-9a-fA-F]\{2}" contained
-syn match elixirRegexEscapePunctuation "?\|\\.\|*\|\\\[\|\\\]\|+\|\\^\|\\\$\|\\|\|\\(\|\\)\|\\{\|\\}" contained
-syn match elixirRegexQuantifier        "[*?+][?+]\=" contained display
-syn match elixirRegexQuantifier        "{\d\+\%(,\d*\)\=}?\=" contained display
-syn match elixirRegexCharClass         "\[:\(alnum\|alpha\|ascii\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|word\|xdigit\):\]" contained display
-
-syn region elixirRegex matchgroup=elixirDelimiter start="%r/" end="/[uiomxfr]*" skip="\\\\" contains=@elixirRegexSpecial
-
-syn cluster elixirRegexSpecial    contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
-syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass
-
-syn region elixirString        matchgroup=elixirDelimiter start="'" end="'" skip="\\'"
-syn region elixirString        matchgroup=elixirDelimiter start='"' end='"' skip='\\"' contains=@elixirStringContained
-syn region elixirInterpolation matchgroup=elixirDelimiter start="#{" end="}" contained contains=ALLBUT,elixirComment,@elixirNotTop
-
-syn region elixirDocStringStart matchgroup=elixirDocString start=+"""+ end=+$+ oneline contains=ALLBUT,@elixirNotTop
-syn region elixirDocStringStart matchgroup=elixirDocString start=+'''+ end=+$+ oneline contains=ALLBUT,@elixirNotTop
-syn region elixirDocString     start=+\z("""\)+ end=+^\s*\zs\z1+ contains=elixirDocStringStart,elixirTodo,elixirInterpolation fold keepend
-syn region elixirDocString     start=+\z('''\)+ end=+^\s*\zs\z1+ contains=elixirDocStringStart,elixirTodo,elixirInterpolation fold keepend
-
-syn match elixirSymbolInterpolated ':\("\)\@=' contains=elixirString
-syn match elixirString             "\(\w\)\@<!?\%(\\\(x\d{1,2}\|\h{1,2}\h\@!\>\|0[0-7]{0,2}[0-7]\@!\>\|[^x0MC]\)\|(\\[MC]-)+\w\|[^\s\\]\)"
-
-syn region elixirBlock              matchgroup=elixirKeyword start="\<do\>\(:\)\@!" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
-syn region elixirAnonymousFunction  matchgroup=elixirKeyword start="\<fn\>"         end="\<end\>" contains=ALLBUT,@elixirNotTop fold
-
-syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirSymbol,elixirPseudoVariable,elixirName,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirSymbolInterpolated,elixirRegex,elixirString,elixirDelimiter
-
-syn match elixirDelimEscape "\\[(<{\[)>}\]]" transparent display contained contains=NONE
-
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~]\z([~`!@#$%^&*_\-+|\:;"',.?/]\)"        end="\z1" skip="\\\\\|\\\z1" fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][SCRW]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][SCRW]\={"                              end="}"   skip="\\\\\|\\}"   contains=elixirDelimEscape fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][SCRW]\=<"                              end=">"   skip="\\\\\|\\>"   contains=elixirDelimEscape fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][SCRW]\=\["                             end="\]"  skip="\\\\\|\\\]"  contains=elixirDelimEscape fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][SCRW]\=("                              end=")"   skip="\\\\\|\\)"   contains=elixirDelimEscape fold
-
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][scrw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][scrw]{"                                end="}"   skip="\\\\\|\\}"   fold contains=@elixirStringContained,elixirRegexEscapePunctuation
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][scrw]<"                                end=">"   skip="\\\\\|\\>"   fold contains=@elixirStringContained,elixirRegexEscapePunctuation
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][scrw]\["                               end="\]"  skip="\\\\\|\\\]"  fold contains=@elixirStringContained,elixirRegexEscapePunctuation
-syn region elixirSigil matchgroup=elixirDelimiter start="[%~][scrw]("                                end=")"   skip="\\\\\|\\)"   fold contains=@elixirStringContained,elixirRegexEscapePunctuation
-
-" Sigils surrounded with docString
-syn region elixirSigil matchgroup=elixirDelimiter start=+[%~][SCRWscrw]\z("""\)+ end=+^\s*\zs\z1+ skip=+\\"+ fold
-syn region elixirSigil matchgroup=elixirDelimiter start=+[%~][SCRWscrw]\z('''\)+ end=+^\s*\zs\z1+ skip=+\\'+ fold
-
-" Defines
-syn keyword elixirDefine              def            nextgroup=elixirFunctionDeclaration    skipwhite skipnl
-syn keyword elixirDefine              def            nextgroup=elixirFunctionDeclaration    skipwhite skipnl
-syn keyword elixirPrivateDefine       defp           nextgroup=elixirFunctionDeclaration    skipwhite skipnl
-syn keyword elixirModuleDefine        defmodule      nextgroup=elixirModuleDeclaration      skipwhite skipnl
-syn keyword elixirProtocolDefine      defprotocol    nextgroup=elixirProtocolDeclaration    skipwhite skipnl
-syn keyword elixirImplDefine          defimpl        nextgroup=elixirImplDeclaration        skipwhite skipnl
-syn keyword elixirRecordDefine        defrecord      nextgroup=elixirRecordDeclaration      skipwhite skipnl
-syn keyword elixirPrivateRecordDefine defrecordp     nextgroup=elixirRecordDeclaration      skipwhite skipnl
-syn keyword elixirMacroDefine         defmacro       nextgroup=elixirMacroDeclaration       skipwhite skipnl
-syn keyword elixirPrivateMacroDefine  defmacrop      nextgroup=elixirMacroDeclaration       skipwhite skipnl
-syn keyword elixirDelegateDefine      defdelegate    nextgroup=elixirDelegateDeclaration    skipwhite skipnl
-syn keyword elixirOverridableDefine   defoverridable nextgroup=elixirOverridableDeclaration skipwhite skipnl
-syn keyword elixirExceptionDefine     defexception   nextgroup=elixirExceptionDeclaration   skipwhite skipnl
-syn keyword elixirCallbackDefine      defcallback    nextgroup=elixirCallbackDeclaration    skipwhite skipnl
-
-" Declarations
-syn match  elixirModuleDeclaration      "[^[:space:];#<]\+"        contained contains=elixirName nextgroup=elixirBlock     skipwhite skipnl
-syn match  elixirFunctionDeclaration    "[^[:space:];#<,()\[\]]\+" contained                     nextgroup=elixirArguments skipwhite skipnl
-syn match  elixirProtocolDeclaration    "[^[:space:];#<]\+"        contained contains=elixirName                           skipwhite skipnl
-syn match  elixirImplDeclaration        "[^[:space:];#<]\+"        contained contains=elixirName                           skipwhite skipnl
-syn match  elixirRecordDeclaration      "[^[:space:];#<]\+"        contained contains=elixirName,elixirSymbol              skipwhite skipnl
-syn match  elixirMacroDeclaration       "[^[:space:];#<,()\[\]]\+" contained                     nextgroup=elixirArguments skipwhite skipnl
-syn match  elixirDelegateDeclaration    "[^[:space:];#<,()\[\]]\+" contained contains=elixirFunctionDeclaration            skipwhite skipnl
-syn region elixirDelegateDeclaration    start='\['     end='\]'    contained contains=elixirFunctionDeclaration            skipwhite skipnl
-syn match  elixirOverridableDeclaration "[^[:space:];#<]\+"        contained contains=elixirName                           skipwhite skipnl
-syn match  elixirExceptionDeclaration   "[^[:space:];#<]\+"        contained contains=elixirName                           skipwhite skipnl
-syn match  elixirCallbackDeclaration    "[^[:space:];#<,()\[\]]\+" contained contains=elixirFunctionDeclaration            skipwhite skipnl
-
-syn cluster elixirDeclaration contains=elixirFunctionDeclaration,elixirModuleDeclaration,elixirProtocolDeclaration,elixirImplDeclaration,elixirRecordDeclaration,elixirMacroDeclaration,elixirDelegateDeclaration,elixirOverridableDeclaration,elixirExceptionDeclaration,elixirCallbackDeclaration
-
-hi def link elixirDefine                 Define
-hi def link elixirPrivateDefine          Define
-hi def link elixirModuleDefine           Define
-hi def link elixirProtocolDefine         Define
-hi def link elixirImplDefine             Define
-hi def link elixirRecordDefine           Define
-hi def link elixirPrivateRecordDefine    Define
-hi def link elixirMacroDefine            Define
-hi def link elixirPrivateMacroDefine     Define
-hi def link elixirDelegateDefine         Define
-hi def link elixirOverridableDefine      Define
-hi def link elixirExceptionDefine        Define
-hi def link elixirCallbackDefine         Define
-hi def link elixirFunctionDeclaration    Function
-hi def link elixirMacroDeclaration       Macro
-hi def link elixirInclude                Include
-hi def link elixirComment                Comment
-hi def link elixirTodo                   Todo
-hi def link elixirKeyword                Keyword
-hi def link elixirOperator               Operator
-hi def link elixirSymbol                 Constant
-hi def link elixirPseudoVariable         Constant
-hi def link elixirName                   Type
-hi def link elixirBoolean                Boolean
-hi def link elixirVariable               Identifier
-hi def link elixirUnusedVariable         Comment
-hi def link elixirNumber                 Number
-hi def link elixirDocString              String
-hi def link elixirSymbolInterpolated     elixirSymbol
-hi def link elixirRegex                  elixirString
-hi def link elixirRegexEscape            elixirSpecial
-hi def link elixirRegexEscapePunctuation elixirSpecial
-hi def link elixirRegexCharClass         elixirSpecial
-hi def link elixirRegexQuantifier        elixirSpecial
-hi def link elixirSpecial                Special
-hi def link elixirString                 String
-hi def link elixirSigil                  String
-hi def link elixirDelimiter              Delimiter
diff --git a/bundle/fugitive/CONTRIBUTING.markdown b/bundle/fugitive/CONTRIBUTING.markdown
deleted file mode 100755
index e651dca..0000000
--- a/bundle/fugitive/CONTRIBUTING.markdown
+++ /dev/null
@@ -1,18 +0,0 @@
-Before reporting a bug, you should try stripping down your Vim configuration
-and removing other plugins.  The sad truth about VimScript is that it is
-fraught with incompatibilities waiting to happen.  I'm happy to work around
-them where I can, but it's up to you to isolate the conflict.
-
-Fugitive is particularly prone to regressions due to Git version issues,
-platform issues, and interactions with other plugins.  I end up bisecting a
-lot more than other projects, and thus I'm especially meticulous here about
-maintaining a clean, readable, history.  Squash and force push any requested
-changes to a pull request.  And if your [commit message
-sucks](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
-I'm not going to accept it.  Period.
-
-Beyond that, don't be shy about asking before patching.  What takes you hours
-might take me minutes simply because I have both domain knowledge and a
-perverse knowledge of VimScript so vast that many would consider it a symptom
-of mental illness.  On the flip side, some ideas I'll reject no matter how
-good the implementation is.  "Send a patch" is an edge case answer in my book.
diff --git a/bundle/fugitive/README.markdown b/bundle/fugitive/README.markdown
deleted file mode 100755
index 71b8bc4..0000000
--- a/bundle/fugitive/README.markdown
+++ /dev/null
@@ -1,118 +0,0 @@
-# fugitive.vim
-
-I'm not going to lie to you; fugitive.vim may very well be the best
-Git wrapper of all time.  Check out these features:
-
-View any blob, tree, commit, or tag in the repository with `:Gedit` (and
-`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...).  Edit a file in the index and
-write to it to stage the changes.  Use `:Gdiff` to bring up the staged
-version of the file side by side with the working tree version and use
-Vim's diff handling capabilities to stage a subset of the file's
-changes.
-
-Bring up the output of `git status` with `:Gstatus`.  Press `-` to
-`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`.  And guess
-what `:Gcommit` does!
-
-`:Gblame` brings up an interactive vertical split with `git blame`
-output.  Press enter on a line to edit the commit where the line
-changed, or `o` to open it in a split.  When you're done, use `:Gedit`
-in the historic buffer to go back to the work tree version.
-
-`:Gmove` does a `git mv` on a file and simultaneously renames the
-buffer.  `:Gremove` does a `git rm` on a file and simultaneously deletes
-the buffer.
-
-Use `:Ggrep` to search the work tree (or any arbitrary commit) with
-`git grep`, skipping over that which is not tracked in the repository.
-`:Glog` loads all previous revisions of a file into the quickfix list so
-you can iterate over them and watch the file evolve!
-
-`:Gread` is a variant of `git checkout -- filename` that operates on the
-buffer rather than the filename.  This means you can use `u` to undo it
-and you never get any warnings about the file changing outside Vim.
-`:Gwrite` writes to both the work tree and index versions of a file,
-making it like `git add` when called from a work tree file and like
-`git checkout` when called from the index or a blob in history.
-
-Use `:Gbrowse` to open the current file on GitHub, with optional line
-range (try it in visual mode!).  If your current repository isn't on
-GitHub, `git instaweb` will be spun up instead.
-
-Add `%{fugitive#statusline()}` to `'statusline'` to get an indicator
-with the current branch in (surprise!) your statusline.
-
-Last but not least, there's `:Git` for running any arbitrary command,
-and `Git!` to open the output of a command in a temp file.
-
-## Screencasts
-
-* [A complement to command line git](http://vimcasts.org/e/31)
-* [Working with the git index](http://vimcasts.org/e/32)
-* [Resolving merge conflicts with vimdiff](http://vimcasts.org/e/33)
-* [Browsing the git object database](http://vimcasts.org/e/34)
-* [Exploring the history of a git repository](http://vimcasts.org/e/35)
-
-## Installation
-
-If you don't have a preferred installation method, one option is to install
-[pathogen.vim](https://github.com/tpope/vim-pathogen), and then copy
-and paste:
-
-    cd ~/.vim/bundle
-    git clone git://github.com/tpope/vim-fugitive.git
-    vim -u NONE -c "helptags vim-fugitive/doc" -c q
-
-If your Vim version is below 7.2, I recommend also installing
-[vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
-other Git niceties.
-
-## FAQ
-
-> I installed the plugin and started Vim.  Why don't any of the commands
-> exist?
-
-Fugitive cares about the current file, not the current working
-directory.  Edit a file from the repository.
-
-> I opened a new tab.  Why don't any of the commands exist?
-
-Fugitive cares about the current file, not the current working
-directory.  Edit a file from the repository.
-
-> Why is `:Gbrowse` not using the right browser?
-
-`:Gbrowse` delegates to `git web--browse`, which is less than perfect
-when it comes to finding the right browser.  You can tell it the correct
-browser to use with `git config --global web.browser ...`.  On OS X, for
-example, you might want to set this to `open`.  See `git web--browse --help`
-for details.
-
-> Here's a patch that automatically opens the quickfix window after
-> `:Ggrep`.
-
-This is a great example of why I recommend asking before patching.
-There are valid arguments to be made both for and against automatically
-opening the quickfix window.  Whenever I have to make an arbitrary
-decision like this, I ask what Vim would do.  And Vim does not open a
-quickfix window after `:grep`.
-
-Luckily, it's easy to implement the desired behavior without changing
-fugitive.vim.  The following autocommand will cause the quickfix window
-to open after any grep invocation:
-
-    autocmd QuickFixCmdPost *grep* cwindow
-
-## Self-Promotion
-
-Like fugitive.vim? Follow the repository on
-[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
-[vim.org](http://www.vim.org/scripts/script.php?script_id=2975).  And if
-you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
-[Twitter](http://twitter.com/tpope) and
-[GitHub](https://github.com/tpope).
-
-## License
-
-Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
-See `:help license`.
diff --git a/bundle/fugitive/doc/fugitive.txt b/bundle/fugitive/doc/fugitive.txt
deleted file mode 100755
index 0d186bf..0000000
--- a/bundle/fugitive/doc/fugitive.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-*fugitive.txt*  A Git wrapper so awesome, it should be illegal
-
-Author:  Tim Pope <http://tpo.pe/>
-License: Same terms as Vim itself (see |license|)
-
-This plugin is only available if 'compatible' is not set.
-
-INTRODUCTION                                    *fugitive*
-
-Whenever you edit a file from a Git repository, a set of commands is defined
-that serve as a gateway to Git.
-
-COMMANDS                                        *fugitive-commands*
-
-These commands are local to the buffers in which they work (generally, buffers
-that are part of Git repositories).
-
-                                                *fugitive-:Git*
-:Git [args]             Run an arbitrary git command. Similar to :!git [args]
-                        but chdir to the repository tree first.
-
-                                                *fugitive-:Git!*
-:Git! [args]            Like |:Git|, but capture the output into a temp file,
-                        and edit that temp file.
-
-                                                *fugitive-:Gcd*
-:Gcd [directory]        |:cd| relative to the repository.
-
-                                                *fugitive-:Glcd*
-:Glcd [directory]       |:lcd| relative to the repository.
-
-                                                *fugitive-:Gstatus*
-:Gstatus                Bring up the output of git-status in the preview
-                        window.  The following maps, which work on the cursor
-                        line file where sensible, are provided:
-
-                        g?    show this help
-                        <C-N> next file
-                        <C-P> previous file
-                        <CR>  |:Gedit|
-                        -     |:Git| add
-                        -     |:Git| reset (staged files)
-                        cA    |:Gcommit| --amend --reuse-message=HEAD
-                        ca    |:Gcommit| --amend
-                        cc    |:Gcommit|
-                        cva   |:Gcommit| --amend --verbose
-                        cvc   |:Gcommit| --verbose
-                        D     |:Gdiff|
-                        ds    |:Gsdiff|
-                        dp    |:Git!| diff (p for patch; use :Gw to apply)
-                        dp    |:Git| add --intent-to-add (untracked files)
-                        dv    |:Gvdiff|
-                        O     |:Gtabedit|
-                        o     |:Gsplit|
-                        p     |:Git| add --patch
-                        p     |:Git| reset --patch (staged files)
-                        q     close status
-                        r     reload status
-                        S     |:Gvsplit|
-
-                                                *fugitive-:Gcommit*
-:Gcommit [args]         A wrapper around git-commit.  If there is nothing
-                        to commit, |:Gstatus| is called instead.  Unless the
-                        arguments given would skip the invocation of an editor
-                        (e.g., -m), a split window will be used to obtain a
-                        commit message, or a new tab if -v is given.  Write
-                        and close that window (:wq or |:Gwrite|) to finish the
-                        commit.  Unlike when running the actual git-commit
-                        command, it is possible (but unadvisable) to alter the
-                        index with commands like git-add and git-reset while a
-                        commit message is pending.
-
-                                                *fugitive-:Gmerge*
-:Gmerge [args]          Calls git-merge and loads errors and conflicted files
-                        into the quickfix list.  Opens a |:Gcommit| style
-                        split window for the commit message if the merge
-                        succeeds.  If called during a merge conflict, the
-                        conflicted files from the current index are loaded
-                        into the quickfix list.
-
-                                                *fugitive-:Gpull*
-:Gpull [args]           Like |:Gmerge|, but for git-pull.
-
-                                                *fugitive-:Gpush*
-:Gpush [args]           Invoke git-push, load the results into the quickfix
-                        list, and invoke |:cwindow| to reveal any errors.
-                        |:Dispatch| is used if available for asynchronous
-                        invocation.
-
-                                                *fugitive-:Gfetch*
-:Gfetch [args]          Like |:Gpush|, but for git-fetch.
-
-                                                *fugitive-:Ggrep*
-:Ggrep [args]           |:grep| with git-grep as 'grepprg'.
-
-                                                *fugitive-:Glgrep*
-:Glgrep [args]          |:lgrep| with git-grep as 'grepprg'.
-
-                                                *fugitive-:Glog*
-:Glog [args]            Load all previous revisions of the current file into
-                        the quickfix list.  Additional git-log arguments can
-                        be given (for example, --reverse).  If "--" appears as
-                        an argument, no file specific filtering is done, and
-                        previous commits rather than previous file revisions
-                        are loaded.
-
-:{range}Glog [args]     Use git-log -L to load previous revisions of the given
-                        range of the current file into the quickfix list.  The
-                        cursor is positioned on the first line of the first
-                        diff hunk for each commit.
-
-                                                *fugitive-:Gllog*
-:Gllog [args]           Like |:Glog|, but use the location list instead of the
-                        quickfix list.
-
-                                        *fugitive-:Gedit* *fugitive-:Ge*
-:Gedit [revision]       |:edit| a |fugitive-revision|.
-
-                                                *fugitive-:Gsplit*
-:Gsplit [revision]      |:split| a |fugitive-revision|.
-
-                                                *fugitive-:Gvsplit*
-:Gvsplit [revision]     |:vsplit| a |fugitive-revision|.
-
-                                                *fugitive-:Gtabedit*
-:Gtabedit [revision]    |:tabedit| a |fugitive-revision|.
-
-                                                *fugitive-:Gpedit*
-:Gpedit [revision]      |:pedit| a |fugitive-revision|.
-
-:Gsplit! [args]                 *fugitive-:Gsplit!* *fugitive-:Gvsplit!*
-:Gvsplit! [args]                *fugitive-:Gtabedit!* *fugitive-:Gpedit!*
-:Gtabedit! [args]       Like |:Git!|, but open the resulting temp file in a
-:Gpedit! [args]         split, tab, or preview window.
-
-                                                *fugitive-:Gread*
-:Gread [revision]       Empty the buffer and |:read| a |fugitive-revision|.
-                        When the argument is omitted, this is similar to
-                        git-checkout on a work tree file or git-add on a stage
-                        file, but without writing anything to disk.
-
-:{range}Gread [revision]
-                        |:read| in a |fugitive-revision| after {range}.
-
-                                                *fugitive-:Gread!*
-:Gread! [args]          Empty the buffer and |:read| the output of a Git
-                        command.  For example, :Gread! show HEAD:%.
-
-:{range}Gread! [args]  |:read| the output of a Git command after {range}.
-
-                                        *fugitive-:Gw* *fugitive-:Gwrite*
-:Gwrite                 Write to the current file's path and stage the results.
-                        When run in a work tree file, it is effectively git
-                        add.  Elsewhere, it is effectively git-checkout.  A
-                        great deal of effort is expended to behave sensibly
-                        when the work tree or index version of the file is
-                        open in another buffer.
-
-:Gwrite {path}          You can give |:Gwrite| an explicit path of where in
-                        the work tree to write.  You can also give a path like
-                        :0:foo.txt or even :0 to write to just that stage in
-                        the index.
-
-                                                *fugitive-:Gwq*
-:Gwq [path]             Like |:Gwrite| followed by |:quit| if the write
-                        succeeded.
-
-:Gwq! [path]            Like |:Gwrite|! followed by |:quit|! if the write
-                        succeeded.
-
-                                                *fugitive-:Gdiff*
-:Gdiff [revision]       Perform a |vimdiff| against the current file in the
-                        given revision.  With no argument, the version in the
-                        index is used (which means a three-way diff during a
-                        merge conflict, making it a git-mergetool
-                        alternative).  The newer of the two files is placed
-                        to the right or bottom, depending on 'diffopt' and
-                        the width of the window relative to 'textwidth'.  Use
-                        |do| and |dp| and write to the index file to simulate
-                        "git add --patch".
-
-                                                *fugitive-:Gsdiff*
-:Gsdiff [revision]      Like |:Gdiff|, but always split horizontally.
-
-                                                *fugitive-:Gvdiff*
-:Gvdiff [revision]      Like |:Gdiff|, but always split vertically.
-
-                                                *fugitive-:Gmove*
-:Gmove {destination}    Wrapper around git-mv that renames the buffer
-                        afterward.  The destination is relative to the current
-                        directory except when started with a /, in which case
-                        it is relative to the work tree.  Add a ! to pass -f.
-
-                                                *fugitive-:Gremove*
-:Gremove                Wrapper around git-rm that deletes the buffer
-                        afterward.  When invoked in an index file, --cached is
-                        passed.  Add a ! to pass -f and forcefully discard the
-                        buffer.
-
-                                                *fugitive-:Gblame*
-:Gblame [flags]         Run git-blame on the file and open the results in a
-                        scroll bound vertical split.  You can give any of
-                        ltfnsewMC as flags and they will be passed along to
-                        git-blame.  The following maps, which work on the
-                        cursor line commit where sensible, are provided:
-
-                        g?    show this help
-                        A     resize to end of author column
-                        C     resize to end of commit column
-                        D     resize to end of date/time column
-                        q     close blame and return to blamed window
-                        gq    q, then |:Gedit| to return to work tree version
-                        <CR>  q, then open commit
-                        o     open commit in horizontal split
-                        O     open commit in new tab
-                        -     reblame at commit
-                        ~     reblame at [count]th first grandparent
-                        P     reblame at [count]th parent (like HEAD^[count])
-
-:[range]Gblame [flags]  Run git-blame on the given range.
-
-                                                *fugitive-:Gbrowse*
-:[range]Gbrowse         If the remote for the current branch is on GitHub,
-                        open the current file, blob, tree, commit, or tag
-                        (with git-web--browse) on GitHub.  Otherwise, open the
-                        current file, blob, tree, commit, or tag in
-                        git-instaweb (if you have issues, verify you can run
-                        "git instaweb" from a terminal).  If a range is given,
-                        it is appropriately appended to the URL as an anchor.
-
-                        To use with GitHub FI, point g:fugitive_github_domains
-                        at a list of domains:
->
-                        let g:fugitive_github_domains = ['https://example.com/']
-~
-:[range]Gbrowse!        Like :Gbrowse, but put the URL on the clipboard rather
-                        than opening it.
-
-:[range]Gbrowse {revision}
-                        Like :Gbrowse, but for a given |fugitive-revision|.  A
-                        useful value here is -, which ties the URL to the
-                        latest commit rather than a volatile branch.
-
-:[range]Gbrowse [...]@{remote}
-                        Force using the given remote rather than the remote
-                        for the current branch.  The remote is used to
-                        determine which GitHub repository to link to.
-
-MAPPINGS                                        *fugitive-mappings*
-
-These maps are available everywhere.
-
-                                                *fugitive-c_CTRL-R_CTRL-G*
-<C-R><C-G>              On the command line, recall the path to the current
-                        object (that is, a representation of the object
-                        recognized by |:Gedit|).
-
-                                                *fugitive-y_CTRL-G*
-["x]y<C-G>              Yank the commit SHA and path to the current object.
-
-These maps are available in Git objects.
-
-                                                *fugitive-<CR>*
-<CR>                    Jump to the revision under the cursor.
-
-                                                *fugitive-o*
-o                       Jump to the revision under the cursor in a new split.
-
-                                                *fugitive-S*
-S                       Jump to the revision under the cursor in a new
-                        vertical split.
-
-                                                *fugitive-O*
-O                       Jump to the revision under the cursor in a new tab.
-
-                                                *fugitive--*
--                       Go to the tree containing the current tree or blob.
-
-                                                *fugitive-~*
-~                       Go to the current file in the [count]th first
-                        ancestor.
-
-                                                *fugitive-P*
-P                       Go to the current file in the [count]th parent.
-
-                                                *fugitive-C*
-C                       Go to the commit containing the current file.
-
-                                                *fugitive-.*
-.                       Start a |:| command line with the current revision
-                        prepopulated at the end of the line.
-
-                                                *fugitive-a*
-a                       Show the current tag, commit, or tree in an alternate
-                        format.
-
-SPECIFYING REVISIONS                            *fugitive-revision*
-
-Fugitive revisions are similar to Git revisions as defined in the "SPECIFYING
-REVISIONS" section in the git-rev-parse man page.  For commands that accept an
-optional revision, the default is the file in the index for work tree files
-and the work tree file for everything else.  Example revisions follow.
-
-Revision        Meaning ~
-HEAD            .git/HEAD
-master          .git/refs/heads/master
-HEAD^{}         The commit referenced by HEAD
-HEAD^           The parent of the commit referenced by HEAD
-HEAD:           The tree referenced by HEAD
-/HEAD           The file named HEAD in the work tree
-Makefile        The file named Makefile in the work tree
-HEAD^:Makefile  The file named Makefile in the parent of HEAD
-:Makefile       The file named Makefile in the index (writable)
--               The current file in HEAD
-^               The current file in the previous commit
-~3              The current file 3 commits ago
-:               .git/index (Same as |:Gstatus|)
-:0              The current file in the index
-:1              The current file's common ancestor during a conflict
-:2              The current file in the target branch during a conflict
-:3              The current file in the merged branch during a conflict
-:/foo           The most recent commit with "foo" in the message
-
-STATUSLINE                                      *fugitive-statusline*
-
-                                                *fugitive#statusline()*
-Add %{fugitive#statusline()} to your statusline to get an indicator including
-the current branch and the currently edited file's commit.  If you don't have
-a statusline, this one matches the default when 'ruler' is set:
->
-    set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
-<
-                                                *fugitive#head(...)*
-Use fugitive#head() to return the name of the current branch. If the current
-HEAD is detached, fugitive#head() will return the empty string, unless the
-optional argument is given, in which case the hash of the current commit will
-be truncated to the given number of characters.
-
-ABOUT                                           *fugitive-about*
-
-Grab the latest version or report a bug on GitHub:
-
-http://github.com/tpope/vim-fugitive
-
- vim:tw=78:et:ft=help:norl:
diff --git a/bundle/fugitive/plugin/fugitive.vim b/bundle/fugitive/plugin/fugitive.vim
deleted file mode 100755
index c880351..0000000
--- a/bundle/fugitive/plugin/fugitive.vim
+++ /dev/null
@@ -1,2930 +0,0 @@
-" fugitive.vim - A Git wrapper so awesome, it should be illegal
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      2.2
-" GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
-
-if exists('g:loaded_fugitive') || &cp
-  finish
-endif
-let g:loaded_fugitive = 1
-
-if !exists('g:fugitive_git_executable')
-  let g:fugitive_git_executable = 'git'
-endif
-
-" Section: Utility
-
-function! s:function(name) abort
-  return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),''))
-endfunction
-
-function! s:sub(str,pat,rep) abort
-  return substitute(a:str,'\v\C'.a:pat,a:rep,'')
-endfunction
-
-function! s:gsub(str,pat,rep) abort
-  return substitute(a:str,'\v\C'.a:pat,a:rep,'g')
-endfunction
-
-function! s:winshell() abort
-  return &shell =~? 'cmd' || exists('+shellslash') && !&shellslash
-endfunction
-
-function! s:shellesc(arg) abort
-  if a:arg =~ '^[A-Za-z0-9_/.-]\+$'
-    return a:arg
-  elseif s:winshell()
-    return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"'
-  else
-    return shellescape(a:arg)
-  endif
-endfunction
-
-function! s:fnameescape(file) abort
-  if exists('*fnameescape')
-    return fnameescape(a:file)
-  else
-    return escape(a:file," \t\n*?[{`$\\%#'\"|!<")
-  endif
-endfunction
-
-function! s:throw(string) abort
-  let v:errmsg = 'fugitive: '.a:string
-  throw v:errmsg
-endfunction
-
-function! s:warn(str) abort
-  echohl WarningMsg
-  echomsg a:str
-  echohl None
-  let v:warningmsg = a:str
-endfunction
-
-function! s:shellslash(path) abort
-  if s:winshell()
-    return s:gsub(a:path,'\\','/')
-  else
-    return a:path
-  endif
-endfunction
-
-let s:git_versions = {}
-
-function! fugitive#git_version(...) abort
-  if !has_key(s:git_versions, g:fugitive_git_executable)
-    let s:git_versions[g:fugitive_git_executable] = matchstr(system(g:fugitive_git_executable.' --version'), "\\S\\+\n")
-  endif
-  return s:git_versions[g:fugitive_git_executable]
-endfunction
-
-function! s:recall() abort
-  let rev = s:sub(s:buffer().rev(), '^/', '')
-  if rev ==# ':'
-    return matchstr(getline('.'),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*')
-  elseif s:buffer().type('tree')
-    let file = matchstr(getline('.'), '\t\zs.*')
-    if empty(file) && line('.') > 2
-      let file = s:sub(getline('.'), '/$', '')
-    endif
-    if !empty(file) && rev !~# ':$'
-      return rev . '/' . file
-    else
-      return rev . file
-    endif
-  endif
-  return rev
-endfunction
-
-function! s:add_methods(namespace, method_names) abort
-  for name in a:method_names
-    let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name)
-  endfor
-endfunction
-
-let s:commands = []
-function! s:command(definition) abort
-  let s:commands += [a:definition]
-endfunction
-
-function! s:define_commands() abort
-  for command in s:commands
-    exe 'command! -buffer '.command
-  endfor
-endfunction
-
-augroup fugitive_utility
-  autocmd!
-  autocmd User Fugitive call s:define_commands()
-augroup END
-
-let s:abstract_prototype = {}
-
-" Section: Initialization
-
-function! fugitive#is_git_dir(path) abort
-  let path = s:sub(a:path, '[\/]$', '') . '/'
-  return isdirectory(path.'objects') && isdirectory(path.'refs') && getfsize(path.'HEAD') > 10
-endfunction
-
-function! fugitive#extract_git_dir(path) abort
-  if s:shellslash(a:path) =~# '^fugitive://.*//'
-    return matchstr(s:shellslash(a:path), '\C^fugitive://\zs.\{-\}\ze//')
-  endif
-  let root = s:shellslash(simplify(fnamemodify(a:path, ':p:s?[\/]$??')))
-  let previous = ""
-  while root !=# previous
-    if root =~# '\v^//%([^/]+/?)?$'
-      " This is for accessing network shares from Cygwin Vim. There won't be
-      " any git directory called //.git or //serverName/.git so let's avoid
-      " checking for them since such checks are extremely slow.
-      break
-    endif
-    if index(split($GIT_CEILING_DIRECTORIES, ':'), root) >= 0
-      break
-    endif
-    if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
-      return $GIT_DIR
-    endif
-    if fugitive#is_git_dir($GIT_DIR)
-      " Ensure that we've cached the worktree
-      call s:configured_tree($GIT_DIR)
-      if has_key(s:dir_for_worktree, root)
-        return s:dir_for_worktree[root]
-      endif
-    endif
-    let dir = s:sub(root, '[\/]$', '') . '/.git'
-    let type = getftype(dir)
-    if type ==# 'dir' && fugitive#is_git_dir(dir)
-      return dir
-    elseif type ==# 'link' && fugitive#is_git_dir(dir)
-      return resolve(dir)
-    elseif type !=# '' && filereadable(dir)
-      let line = get(readfile(dir, '', 1), 0, '')
-      if line =~# '^gitdir: \.' && fugitive#is_git_dir(root.'/'.line[8:-1])
-        return simplify(root.'/'.line[8:-1])
-      elseif line =~# '^gitdir: ' && fugitive#is_git_dir(line[8:-1])
-        return line[8:-1]
-      endif
-    elseif fugitive#is_git_dir(root)
-      return root
-    endif
-    let previous = root
-    let root = fnamemodify(root, ':h')
-  endwhile
-  return ''
-endfunction
-
-function! fugitive#detect(path) abort
-  if exists('b:git_dir') && (b:git_dir ==# '' || b:git_dir =~# '/$')
-    unlet b:git_dir
-  endif
-  if !exists('b:git_dir')
-    let dir = fugitive#extract_git_dir(a:path)
-    if dir !=# ''
-      let b:git_dir = dir
-    endif
-  endif
-  if exists('b:git_dir')
-    if exists('#User#FugitiveBoot')
-      try
-        let [save_mls, &modelines] = [&mls, 0]
-        doautocmd User FugitiveBoot
-      finally
-        let &mls = save_mls
-      endtry
-    endif
-    cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
-    nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
-    let buffer = fugitive#buffer()
-    if expand('%:p') =~# '//'
-      call buffer.setvar('&path', s:sub(buffer.getvar('&path'), '^\.%(,|$)', ''))
-    endif
-    if stridx(buffer.getvar('&tags'), escape(b:git_dir, ', ')) == -1
-      if filereadable(b:git_dir.'/tags')
-        call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags'))
-      endif
-      if &filetype !=# '' && filereadable(b:git_dir.'/'.&filetype.'.tags')
-        call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
-      endif
-    endif
-    try
-      let [save_mls, &modelines] = [&mls, 0]
-      doautocmd User Fugitive
-    finally
-      let &mls = save_mls
-    endtry
-  endif
-endfunction
-
-augroup fugitive
-  autocmd!
-  autocmd BufNewFile,BufReadPost * call fugitive#detect(expand('<amatch>:p'))
-  autocmd FileType           netrw call fugitive#detect(expand('%:p'))
-  autocmd User NERDTreeInit,NERDTreeNewRoot call fugitive#detect(b:NERDTreeRoot.path.str())
-  autocmd VimEnter * if expand('<amatch>')==''|call fugitive#detect(getcwd())|endif
-  autocmd CmdWinEnter * call fugitive#detect(expand('#:p'))
-  autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
-augroup END
-
-" Section: Repository
-
-let s:repo_prototype = {}
-let s:repos = {}
-let s:worktree_for_dir = {}
-let s:dir_for_worktree = {}
-
-function! s:repo(...) abort
-  let dir = a:0 ? a:1 : (exists('b:git_dir') && b:git_dir !=# '' ? b:git_dir : fugitive#extract_git_dir(expand('%:p')))
-  if dir !=# ''
-    if has_key(s:repos, dir)
-      let repo = get(s:repos, dir)
-    else
-      let repo = {'git_dir': dir}
-      let s:repos[dir] = repo
-    endif
-    return extend(extend(repo, s:repo_prototype, 'keep'), s:abstract_prototype, 'keep')
-  endif
-  call s:throw('not a git repository: '.expand('%:p'))
-endfunction
-
-function! fugitive#repo(...) abort
-  return call('s:repo', a:000)
-endfunction
-
-function! s:repo_dir(...) dict abort
-  return join([self.git_dir]+a:000,'/')
-endfunction
-
-function! s:configured_tree(git_dir) abort
-  if !has_key(s:worktree_for_dir, a:git_dir)
-    let s:worktree_for_dir[a:git_dir] = ''
-    let config_file = a:git_dir . '/config'
-    if filereadable(config_file)
-      let config = readfile(config_file,'',10)
-      call filter(config,'v:val =~# "^\\s*worktree *="')
-      if len(config) == 1
-        let s:worktree_for_dir[a:git_dir] = matchstr(config[0], '= *\zs.*')
-        let s:dir_for_worktree[s:worktree_for_dir[a:git_dir]] = a:git_dir
-      endif
-    endif
-  endif
-  if s:worktree_for_dir[a:git_dir] =~# '^\.'
-    return simplify(a:git_dir . '/' . s:worktree_for_dir[a:git_dir])
-  else
-    return s:worktree_for_dir[a:git_dir]
-  endif
-endfunction
-
-function! s:repo_tree(...) dict abort
-  if self.dir() =~# '/\.git$'
-    let dir = self.dir()[0:-6]
-  else
-    let dir = s:configured_tree(self.git_dir)
-  endif
-  if dir ==# ''
-    call s:throw('no work tree')
-  else
-    return join([dir]+a:000,'/')
-  endif
-endfunction
-
-function! s:repo_bare() dict abort
-  if self.dir() =~# '/\.git$'
-    return 0
-  else
-    return s:configured_tree(self.git_dir) ==# ''
-  endif
-endfunction
-
-function! s:repo_translate(spec) dict abort
-  if a:spec ==# '.' || a:spec ==# '/.'
-    return self.bare() ? self.dir() : self.tree()
-  elseif a:spec =~# '^/\=\.git$' && self.bare()
-    return self.dir()
-  elseif a:spec =~# '^/\=\.git/'
-    return self.dir(s:sub(a:spec, '^/=\.git/', ''))
-  elseif a:spec =~# '^/'
-    return self.tree().a:spec
-  elseif a:spec =~# '^:[0-3]:'
-    return 'fugitive://'.self.dir().'//'.a:spec[1].'/'.a:spec[3:-1]
-  elseif a:spec ==# ':'
-    if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(self.dir())] ==# self.dir('') && filereadable($GIT_INDEX_FILE)
-      return fnamemodify($GIT_INDEX_FILE,':p')
-    else
-      return self.dir('index')
-    endif
-  elseif a:spec =~# '^:/'
-    let ref = self.rev_parse(matchstr(a:spec,'.[^:]*'))
-    return 'fugitive://'.self.dir().'//'.ref
-  elseif a:spec =~# '^:'
-    return 'fugitive://'.self.dir().'//0/'.a:spec[1:-1]
-  elseif a:spec =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(self.dir(a:spec))
-    return self.dir(a:spec)
-  elseif filereadable(self.dir('refs/'.a:spec))
-    return self.dir('refs/'.a:spec)
-  elseif filereadable(self.dir('refs/tags/'.a:spec))
-    return self.dir('refs/tags/'.a:spec)
-  elseif filereadable(self.dir('refs/heads/'.a:spec))
-    return self.dir('refs/heads/'.a:spec)
-  elseif filereadable(self.dir('refs/remotes/'.a:spec))
-    return self.dir('refs/remotes/'.a:spec)
-  elseif filereadable(self.dir('refs/remotes/'.a:spec.'/HEAD'))
-    return self.dir('refs/remotes/'.a:spec,'/HEAD')
-  else
-    try
-      let ref = self.rev_parse(matchstr(a:spec,'[^:]*'))
-      let path = s:sub(matchstr(a:spec,':.*'),'^:','/')
-      return 'fugitive://'.self.dir().'//'.ref.path
-    catch /^fugitive:/
-      return self.tree(a:spec)
-    endtry
-  endif
-endfunction
-
-function! s:repo_head(...) dict abort
-    let head = s:repo().head_ref()
-
-    if head =~# '^ref: '
-      let branch = s:sub(head,'^ref: %(refs/%(heads/|remotes/|tags/)=)=','')
-    elseif head =~# '^\x\{40\}$'
-      " truncate hash to a:1 characters if we're in detached head mode
-      let len = a:0 ? a:1 : 0
-      let branch = len ? head[0:len-1] : ''
-    else
-      return ''
-    endif
-
-    return branch
-endfunction
-
-call s:add_methods('repo',['dir','tree','bare','translate','head'])
-
-function! s:repo_git_command(...) dict abort
-  let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir)
-  return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
-endfunction
-
-function! s:repo_git_chomp(...) dict abort
-  return s:sub(system(call(self.git_command,a:000,self)),'\n$','')
-endfunction
-
-function! s:repo_git_chomp_in_tree(...) dict abort
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd.'`=s:repo().tree()`'
-    return call(s:repo().git_chomp, a:000, s:repo())
-  finally
-    execute cd.'`=dir`'
-  endtry
-endfunction
-
-function! s:repo_rev_parse(rev) dict abort
-  let hash = self.git_chomp('rev-parse','--verify',a:rev)
-  if hash =~ '\<\x\{40\}$'
-    return matchstr(hash,'\<\x\{40\}$')
-  endif
-  call s:throw('rev-parse '.a:rev.': '.hash)
-endfunction
-
-call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
-
-function! s:repo_dirglob(base) dict abort
-  let base = s:sub(a:base,'^/','')
-  let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*/')),"\n")
-  call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]')
-  return matches
-endfunction
-
-function! s:repo_superglob(base) dict abort
-  if a:base =~# '^/' || a:base !~# ':'
-    let results = []
-    if a:base !~# '^/'
-      let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"]
-      let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n"))
-      call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
-      let results += heads
-    endif
-    if !self.bare()
-      let base = s:sub(a:base,'^/','')
-      let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*')),"\n")
-      call map(matches,'s:shellslash(v:val)')
-      call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val')
-      call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]')
-      let results += matches
-    endif
-    return results
-
-  elseif a:base =~# '^:'
-    let entries = split(self.git_chomp('ls-files','--stage'),"\n")
-    call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")')
-    if a:base !~# '^:[0-3]\%(:\|$\)'
-      call filter(entries,'v:val[1] == "0"')
-      call map(entries,'v:val[2:-1]')
-    endif
-    call filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
-    return entries
-
-  else
-    let tree = matchstr(a:base,'.*[:/]')
-    let entries = split(self.git_chomp('ls-tree',tree),"\n")
-    call map(entries,'s:sub(v:val,"^04.*\\zs$","/")')
-    call map(entries,'tree.s:sub(v:val,".*\t","")')
-    return filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
-  endif
-endfunction
-
-call s:add_methods('repo',['dirglob','superglob'])
-
-function! s:repo_config(conf) dict abort
-  return matchstr(system(s:repo().git_command('config').' '.a:conf),"[^\r\n]*")
-endfun
-
-function! s:repo_user() dict abort
-  let username = s:repo().config('user.name')
-  let useremail = s:repo().config('user.email')
-  return username.' <'.useremail.'>'
-endfun
-
-function! s:repo_aliases() dict abort
-  if !has_key(self,'_aliases')
-    let self._aliases = {}
-    for line in split(self.git_chomp('config','--get-regexp','^alias[.]'),"\n")
-      let self._aliases[matchstr(line,'\.\zs\S\+')] = matchstr(line,' \zs.*')
-    endfor
-  endif
-  return self._aliases
-endfunction
-
-call s:add_methods('repo',['config', 'user', 'aliases'])
-
-function! s:repo_keywordprg() dict abort
-  let args = ' --git-dir='.escape(self.dir(),"\\\"' ")
-  if has('gui_running') && !has('win32')
-    return g:fugitive_git_executable . ' --no-pager' . args . ' log -1'
-  else
-    return g:fugitive_git_executable . args . ' show'
-  endif
-endfunction
-
-call s:add_methods('repo',['keywordprg'])
-
-" Section: Buffer
-
-let s:buffer_prototype = {}
-
-function! s:buffer(...) abort
-  let buffer = {'#': bufnr(a:0 ? a:1 : '%')}
-  call extend(extend(buffer,s:buffer_prototype,'keep'),s:abstract_prototype,'keep')
-  if buffer.getvar('git_dir') !=# ''
-    return buffer
-  endif
-  call s:throw('not a git repository: '.expand('%:p'))
-endfunction
-
-function! fugitive#buffer(...) abort
-  return s:buffer(a:0 ? a:1 : '%')
-endfunction
-
-function! s:buffer_getvar(var) dict abort
-  return getbufvar(self['#'],a:var)
-endfunction
-
-function! s:buffer_setvar(var,value) dict abort
-  return setbufvar(self['#'],a:var,a:value)
-endfunction
-
-function! s:buffer_getline(lnum) dict abort
-  return get(getbufline(self['#'], a:lnum), 0, '')
-endfunction
-
-function! s:buffer_repo() dict abort
-  return s:repo(self.getvar('git_dir'))
-endfunction
-
-function! s:buffer_type(...) dict abort
-  if self.getvar('fugitive_type') != ''
-    let type = self.getvar('fugitive_type')
-  elseif fnamemodify(self.spec(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$'
-    let type = 'head'
-  elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == ''
-    let type = 'tree'
-  elseif self.getline(1) =~ '^\d\{6\} \w\{4\} \x\{40\}\>\t'
-    let type = 'tree'
-  elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t'
-    let type = 'index'
-  elseif isdirectory(self.spec())
-    let type = 'directory'
-  elseif self.spec() == ''
-    let type = 'null'
-  else
-    let type = 'file'
-  endif
-  if a:0
-    return !empty(filter(copy(a:000),'v:val ==# type'))
-  else
-    return type
-  endif
-endfunction
-
-if has('win32')
-
-  function! s:buffer_spec() dict abort
-    let bufname = bufname(self['#'])
-    let retval = ''
-    for i in split(bufname,'[^:]\zs\\')
-      let retval = fnamemodify((retval==''?'':retval.'\').i,':.')
-    endfor
-    return s:shellslash(fnamemodify(retval,':p'))
-  endfunction
-
-else
-
-  function! s:buffer_spec() dict abort
-    let bufname = bufname(self['#'])
-    return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p'))
-  endfunction
-
-endif
-
-function! s:buffer_name() dict abort
-  return self.spec()
-endfunction
-
-function! s:buffer_commit() dict abort
-  return matchstr(self.spec(),'^fugitive://.\{-\}//\zs\w*')
-endfunction
-
-function! s:buffer_path(...) dict abort
-  let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
-  if rev != ''
-    let rev = s:sub(rev,'\w*','')
-  elseif self.spec()[0 : len(self.repo().dir())] ==# self.repo().dir() . '/'
-    let rev = '/.git'.self.spec()[strlen(self.repo().dir()) : -1]
-  elseif !self.repo().bare() && self.spec()[0 : len(self.repo().tree())] ==# self.repo().tree() . '/'
-    let rev = self.spec()[strlen(self.repo().tree()) : -1]
-  endif
-  return s:sub(s:sub(rev,'.\zs/$',''),'^/',a:0 ? a:1 : '')
-endfunction
-
-function! s:buffer_rev() dict abort
-  let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
-  if rev =~ '^\x/'
-    return ':'.rev[0].':'.rev[2:-1]
-  elseif rev =~ '.'
-    return s:sub(rev,'/',':')
-  elseif self.spec() =~ '\.git/index$'
-    return ':'
-  elseif self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
-    return self.spec()[strlen(self.repo().dir())+1 : -1]
-  else
-    return self.path('/')
-  endif
-endfunction
-
-function! s:buffer_sha1() dict abort
-  if self.spec() =~ '^fugitive://' || self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
-    return self.repo().rev_parse(self.rev())
-  else
-    return ''
-  endif
-endfunction
-
-function! s:buffer_expand(rev) dict abort
-  if a:rev =~# '^:[0-3]$'
-    let file = a:rev.self.path(':')
-  elseif a:rev =~# '^[-:]/$'
-    let file = '/'.self.path()
-  elseif a:rev =~# '^-'
-    let file = 'HEAD^{}'.a:rev[1:-1].self.path(':')
-  elseif a:rev =~# '^@{'
-    let file = 'HEAD'.a:rev.self.path(':')
-  elseif a:rev =~# '^[~^]'
-    let commit = s:sub(self.commit(),'^\d=$','HEAD')
-    let file = commit.a:rev.self.path(':')
-  else
-    let file = a:rev
-  endif
-  return s:sub(s:sub(file,'\%$',self.path()),'\.\@<=/$','')
-endfunction
-
-function! s:buffer_containing_commit() dict abort
-  if self.commit() =~# '^\d$'
-    return ':'
-  elseif self.commit() =~# '.'
-    return self.commit()
-  else
-    return 'HEAD'
-  endif
-endfunction
-
-function! s:buffer_up(...) dict abort
-  let rev = self.rev()
-  let c = a:0 ? a:1 : 1
-  while c
-    if rev =~# '^[/:]$'
-      let rev = 'HEAD'
-    elseif rev =~# '^:'
-      let rev = ':'
-    elseif rev =~# '^refs/[^^~:]*$\|^[^^~:]*HEAD$'
-      let rev .= '^{}'
-    elseif rev =~# '^/\|:.*/'
-      let rev = s:sub(rev, '.*\zs/.*', '')
-    elseif rev =~# ':.'
-      let rev = matchstr(rev, '^[^:]*:')
-    elseif rev =~# ':$'
-      let rev = rev[0:-2]
-    else
-      return rev.'~'.c
-    endif
-    let c -= 1
-  endwhile
-  return rev
-endfunction
-
-call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit','up'])
-
-" Section: Git
-
-call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,<q-args>)")
-
-function! s:ExecuteInTree(cmd) abort
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd.'`=s:repo().tree()`'
-    execute a:cmd
-  finally
-    execute cd.'`=dir`'
-  endtry
-endfunction
-
-function! s:Git(bang, args) abort
-  if a:bang
-    return s:Edit('edit', 1, a:args)
-  endif
-  let git = g:fugitive_git_executable
-  if has('gui_running') && !has('win32')
-    let git .= ' --no-pager'
-  endif
-  let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
-  call s:ExecuteInTree('!'.git.' '.args)
-  call fugitive#reload_status()
-  return matchstr(a:args, '\v\C\\@<!%(\\\\)*\|\zs.*')
-endfunction
-
-function! fugitive#git_commands() abort
-  if !exists('s:exec_path')
-    let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
-  endif
-  return map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")')
-endfunction
-
-function! s:GitComplete(A, L, P) abort
-  if strpart(a:L, 0, a:P) !~# ' [[:alnum:]-]\+ '
-    let cmds = fugitive#git_commands()
-    return filter(sort(cmds+keys(s:repo().aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A')
-  else
-    return s:repo().superglob(a:A)
-  endif
-endfunction
-
-" Section: Gcd, Glcd
-
-function! s:DirComplete(A,L,P) abort
-  let matches = s:repo().dirglob(a:A)
-  return matches
-endfunction
-
-call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd  :cd<bang>  `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
-call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :lcd<bang> `=s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>)`")
-
-" Section: Gstatus
-
-call s:command("-bar Gstatus :execute s:Status()")
-augroup fugitive_status
-  autocmd!
-  if !has('win32')
-    autocmd FocusGained,ShellCmdPost * call fugitive#reload_status()
-  endif
-augroup END
-
-function! s:Status() abort
-  try
-    Gpedit :
-    wincmd P
-    setlocal foldmethod=syntax foldlevel=1
-    nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-  return ''
-endfunction
-
-function! fugitive#reload_status() abort
-  if exists('s:reloading_status')
-    return
-  endif
-  try
-    let s:reloading_status = 1
-    let mytab = tabpagenr()
-    for tab in [mytab] + range(1,tabpagenr('$'))
-      for winnr in range(1,tabpagewinnr(tab,'$'))
-        if getbufvar(tabpagebuflist(tab)[winnr-1],'fugitive_type') ==# 'index'
-          execute 'tabnext '.tab
-          if winnr != winnr()
-            execute winnr.'wincmd w'
-            let restorewinnr = 1
-          endif
-          try
-            if !&modified
-              call s:BufReadIndex()
-            endif
-          finally
-            if exists('restorewinnr')
-              wincmd p
-            endif
-            execute 'tabnext '.mytab
-          endtry
-        endif
-      endfor
-    endfor
-  finally
-    unlet! s:reloading_status
-  endtry
-endfunction
-
-function! s:stage_info(lnum) abort
-  let filename = matchstr(getline(a:lnum),'^#\t\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
-  let lnum = a:lnum
-  if has('multi_byte_encoding')
-    let colon = '\%(:\|\%uff1a\)'
-  else
-    let colon = ':'
-  endif
-  while lnum && getline(lnum) !~# colon.'$'
-    let lnum -= 1
-  endwhile
-  if !lnum
-    return ['', '']
-  elseif (getline(lnum+1) =~# '^# .*\<git \%(reset\|rm --cached\) ' && getline(lnum+2) ==# '#') || getline(lnum) ==# '# Changes to be committed:'
-    return [matchstr(filename, colon.' *\zs.*'), 'staged']
-  elseif (getline(lnum+1) =~# '^# .*\<git add ' && getline(lnum+2) ==# '#' && getline(lnum+3) !~# colon.'  ') || getline(lnum) ==# '# Untracked files:'
-    return [filename, 'untracked']
-  elseif getline(lnum+2) =~# '^# .*\<git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
-    return [matchstr(filename, colon.' *\zs.*'), 'unstaged']
-  elseif getline(lnum+2) =~# '^# .*\<git \%(add\|rm\)' || getline(lnum) ==# '# Unmerged paths:'
-    return [matchstr(filename, colon.' *\zs.*'), 'unmerged']
-  else
-    return ['', 'unknown']
-  endif
-endfunction
-
-function! s:StageNext(count) abort
-  for i in range(a:count)
-    call search('^#\t.*','W')
-  endfor
-  return '.'
-endfunction
-
-function! s:StagePrevious(count) abort
-  if line('.') == 1 && exists(':CtrlP') && get(g:, 'ctrl_p_map') =~? '^<c-p>$'
-    return 'CtrlP '.fnameescape(s:repo().tree())
-  else
-    for i in range(a:count)
-      call search('^#\t.*','Wbe')
-    endfor
-    return '.'
-  endif
-endfunction
-
-function! s:StageReloadSeek(target,lnum1,lnum2) abort
-  let jump = a:target
-  let f = matchstr(getline(a:lnum1-1),'^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*')
-  if f !=# '' | let jump = f | endif
-  let f = matchstr(getline(a:lnum2+1),'^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*')
-  if f !=# '' | let jump = f | endif
-  silent! edit!
-  1
-  redraw
-  call search('^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\V'.jump.'\%( ([^()[:digit:]]\+)\)\=\$','W')
-endfunction
-
-function! s:StageUndo() abort
-  let [filename, section] = s:stage_info(line('.'))
-  if empty(filename)
-    return ''
-  endif
-  let repo = s:repo()
-  let hash = repo.git_chomp('hash-object', '-w', filename)
-  if !empty(hash)
-    if section ==# 'untracked'
-      call delete(s:repo().tree(filename))
-    elseif section ==# 'unstaged'
-      call repo.git_chomp_in_tree('checkout', '--', filename)
-    else
-      call repo.git_chomp_in_tree('checkout', 'HEAD', '--', filename)
-    endif
-    call s:StageReloadSeek(filename, line('.'), line('.'))
-    let @" = hash
-    return 'checktime|redraw|echomsg ' .
-          \ string('To restore, :Git cat-file blob '.hash[0:6].' > '.filename)
-  endif
-endfunction
-
-function! s:StageDiff(diff) abort
-  let [filename, section] = s:stage_info(line('.'))
-  if filename ==# '' && section ==# 'staged'
-    return 'Git! diff --no-ext-diff --cached'
-  elseif filename ==# ''
-    return 'Git! diff --no-ext-diff'
-  elseif filename =~# ' -> '
-    let [old, new] = split(filename,' -> ')
-    execute 'Gedit '.s:fnameescape(':0:'.new)
-    return a:diff.' HEAD:'.s:fnameescape(old)
-  elseif section ==# 'staged'
-    execute 'Gedit '.s:fnameescape(':0:'.filename)
-    return a:diff.' -'
-  else
-    execute 'Gedit '.s:fnameescape('/'.filename)
-    return a:diff
-  endif
-endfunction
-
-function! s:StageDiffEdit() abort
-  let [filename, section] = s:stage_info(line('.'))
-  let arg = (filename ==# '' ? '.' : filename)
-  if section ==# 'staged'
-    return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg)
-  elseif section ==# 'untracked'
-    let repo = s:repo()
-    call repo.git_chomp_in_tree('add','--intent-to-add',arg)
-    if arg ==# '.'
-      silent! edit!
-      1
-      if !search('^# .*:\n#.*\n# .*"git checkout \|^# Changes not staged for commit:$','W')
-        call search('^# .*:$','W')
-      endif
-    else
-      call s:StageReloadSeek(arg,line('.'),line('.'))
-    endif
-    return ''
-  else
-    return 'Git! diff --no-ext-diff '.s:shellesc(arg)
-  endif
-endfunction
-
-function! s:StageToggle(lnum1,lnum2) abort
-  if a:lnum1 == 1 && a:lnum2 == 1
-    return 'Gedit /.git|call search("^index$", "wc")'
-  endif
-  try
-    let output = ''
-    for lnum in range(a:lnum1,a:lnum2)
-      let [filename, section] = s:stage_info(lnum)
-      let repo = s:repo()
-      if getline('.') =~# '^# .*:$'
-        if section ==# 'staged'
-          call repo.git_chomp_in_tree('reset','-q')
-          silent! edit!
-          1
-          if !search('^# .*:\n# .*"git add .*\n#\n\|^# Untracked files:$','W')
-            call search('^# .*:$','W')
-          endif
-          return ''
-        elseif section ==# 'unstaged'
-          call repo.git_chomp_in_tree('add','-u')
-          silent! edit!
-          1
-          if !search('^# .*:\n# .*"git add .*\n#\n\|^# Untracked files:$','W')
-            call search('^# .*:$','W')
-          endif
-          return ''
-        else
-          call repo.git_chomp_in_tree('add','.')
-          silent! edit!
-          1
-          call search('^# .*:$','W')
-          return ''
-        endif
-      endif
-      if filename ==# ''
-        continue
-      endif
-      execute lnum
-      if filename =~ ' -> '
-        let cmd = ['mv','--'] + reverse(split(filename,' -> '))
-        let filename = cmd[-1]
-      elseif section ==# 'staged'
-        let cmd = ['reset','-q','--',filename]
-      elseif getline(lnum) =~# '^#\tdeleted:'
-        let cmd = ['rm','--',filename]
-      elseif getline(lnum) =~# '^#\tmodified:'
-        let cmd = ['add','--',filename]
-      else
-        let cmd = ['add','-A','--',filename]
-      endif
-      if !exists('first_filename')
-        let first_filename = filename
-      endif
-      let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n"
-    endfor
-    if exists('first_filename')
-      call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2)
-    endif
-    echo s:sub(s:gsub(output,'\n+','\n'),'\n$','')
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-  return 'checktime'
-endfunction
-
-function! s:StagePatch(lnum1,lnum2) abort
-  let add = []
-  let reset = []
-
-  for lnum in range(a:lnum1,a:lnum2)
-    let [filename, section] = s:stage_info(lnum)
-    if getline('.') =~# '^# .*:$' && section ==# 'staged'
-      return 'Git reset --patch'
-    elseif getline('.') =~# '^# .*:$' && section ==# 'unstaged'
-      return 'Git add --patch'
-    elseif getline('.') =~# '^# .*:$' && section ==# 'untracked'
-      return 'Git add -N .'
-    elseif filename ==# ''
-      continue
-    endif
-    if !exists('first_filename')
-      let first_filename = filename
-    endif
-    execute lnum
-    if filename =~ ' -> '
-      let reset += [split(filename,' -> ')[1]]
-    elseif section ==# 'staged'
-      let reset += [filename]
-    elseif getline(lnum) !~# '^#\tdeleted:'
-      let add += [filename]
-    endif
-  endfor
-  try
-    if !empty(add)
-      execute "Git add --patch -- ".join(map(add,'s:shellesc(v:val)'))
-    endif
-    if !empty(reset)
-      execute "Git reset --patch -- ".join(map(add,'s:shellesc(v:val)'))
-    endif
-    if exists('first_filename')
-      silent! edit!
-      1
-      redraw
-      call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( ([^()[:digit:]]\+)\)\=\$','W')
-    endif
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-  return 'checktime'
-endfunction
-
-" Section: Gcommit
-
-call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit(<q-args>)")
-
-function! s:Commit(args, ...) abort
-  let repo = a:0 ? a:1 : s:repo()
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  let msgfile = repo.dir('COMMIT_EDITMSG')
-  let outfile = tempname()
-  let errorfile = tempname()
-  try
-    try
-      execute cd.s:fnameescape(repo.tree())
-      if s:winshell()
-        let command = ''
-        let old_editor = $GIT_EDITOR
-        let $GIT_EDITOR = 'false'
-      else
-        let command = 'env GIT_EDITOR=false '
-      endif
-      let command .= repo.git_command('commit').' '.a:args
-      if &shell =~# 'csh'
-        noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile
-      elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>'
-        noautocmd execute '!'.command.' 2> '.errorfile
-      else
-        noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile
-      endif
-    finally
-      execute cd.'`=dir`'
-    endtry
-    if !has('gui_running')
-      redraw!
-    endif
-    if !v:shell_error
-      if filereadable(outfile)
-        for line in readfile(outfile)
-          echo line
-        endfor
-      endif
-      return ''
-    else
-      let errors = readfile(errorfile)
-      let error = get(errors,-2,get(errors,-1,'!'))
-      if error =~# 'false''\=\.$'
-        let args = a:args
-        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|--patch|--signoff)%($| )','')
-        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-c|--reedit-message|--reuse-message|-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','')
-        let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))')
-        let args = s:sub(args, '\ze -- |$', ' --no-edit --no-interactive --no-signoff')
-        let args = '-F '.s:shellesc(msgfile).' '.args
-        if args !~# '\%(^\| \)--cleanup\>'
-          let args = '--cleanup=strip '.args
-        endif
-        if bufname('%') == '' && line('$') == 1 && getline(1) == '' && !&mod
-          execute 'keepalt edit '.s:fnameescape(msgfile)
-        elseif a:args =~# '\%(^\| \)-\%(-verbose\|\w*v\)\>'
-          execute 'keepalt tabedit '.s:fnameescape(msgfile)
-        elseif s:buffer().type() ==# 'index'
-          execute 'keepalt edit '.s:fnameescape(msgfile)
-          execute (search('^#','n')+1).'wincmd+'
-          setlocal nopreviewwindow
-        else
-          execute 'keepalt split '.s:fnameescape(msgfile)
-        endif
-        let b:fugitive_commit_arguments = args
-        setlocal bufhidden=wipe filetype=gitcommit
-        return '1'
-      elseif error ==# '!'
-        return s:Status()
-      else
-        call s:throw(error)
-      endif
-    endif
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  finally
-    if exists('old_editor')
-      let $GIT_EDITOR = old_editor
-    endif
-    call delete(outfile)
-    call delete(errorfile)
-    call fugitive#reload_status()
-  endtry
-endfunction
-
-function! s:CommitComplete(A,L,P) abort
-  if a:A =~ '^-' || type(a:A) == type(0) " a:A is 0 on :Gcommit -<Tab>
-    let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--template=', '--untracked-files', '--verbose']
-    return filter(args,'v:val[0 : strlen(a:A)-1] ==# a:A')
-  else
-    return s:repo().superglob(a:A)
-  endif
-endfunction
-
-function! s:FinishCommit() abort
-  let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments')
-  if !empty(args)
-    call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','')
-    return s:Commit(args, s:repo(getbufvar(+expand('<abuf>'),'git_dir')))
-  endif
-  return ''
-endfunction
-
-" Section: Gmerge, Gpull
-
-call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Gmerge " .
-      \ "execute s:Merge('merge', <bang>0, <q-args>)")
-call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpull " .
-      \ "execute s:Merge('pull --progress', <bang>0, <q-args>)")
-
-function! s:RevisionComplete(A, L, P) abort
-  return s:repo().git_chomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes')
-        \ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD"
-endfunction
-
-function! s:RemoteComplete(A, L, P) abort
-  let remote = matchstr(a:L, ' \zs\S\+\ze ')
-  if !empty(remote)
-    let matches = split(s:repo().git_chomp('ls-remote', remote), "\n")
-    call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
-    call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")')
-  else
-    let matches = split(s:repo().git_chomp('remote'), "\n")
-  endif
-  return join(matches, "\n")
-endfunction
-
-function! fugitive#cwindow() abort
-  if &buftype == 'quickfix'
-    cwindow
-  else
-    botright cwindow
-    if &buftype == 'quickfix'
-      wincmd p
-    endif
-  endif
-endfunction
-
-let s:common_efm = ''
-      \ . '%+Egit:%.%#,'
-      \ . '%+Eusage:%.%#,'
-      \ . '%+Eerror:%.%#,'
-      \ . '%+Efatal:%.%#,'
-      \ . '%-G%.%#%\e[K%.%#,'
-      \ . '%-G%.%#%\r%.%\+'
-
-function! s:Merge(cmd, bang, args) abort
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
-  let cwd = getcwd()
-  let [mp, efm] = [&l:mp, &l:efm]
-  let had_merge_msg = filereadable(s:repo().dir('MERGE_MSG'))
-  try
-    let &l:errorformat = ''
-          \ . '%-Gerror:%.%#false''.,'
-          \ . '%-G%.%# ''git commit'' %.%#,'
-          \ . '%+Emerge:%.%#,'
-          \ . s:common_efm . ','
-          \ . '%+ECannot %.%#: You have unstaged changes.,'
-          \ . '%+ECannot %.%#: Your index contains uncommitted changes.,'
-          \ . '%+EThere is no tracking information for the current branch.,'
-          \ . '%+EYou are not currently on a branch. Please specify which,'
-          \ . 'CONFLICT (%m): %f deleted in %.%#,'
-          \ . 'CONFLICT (%m): Merge conflict in %f,'
-          \ . 'CONFLICT (%m): Rename \"%f\"->%.%#,'
-          \ . 'CONFLICT (%m): Rename %.%#->%f %.%#,'
-          \ . 'CONFLICT (%m): There is a directory with name %f in %.%#,'
-          \ . '%+ECONFLICT %.%#,'
-          \ . '%+EKONFLIKT %.%#,'
-          \ . '%+ECONFLIT %.%#,'
-          \ . "%+EXUNG \u0110\u1ed8T %.%#,"
-          \ . "%+E\u51b2\u7a81 %.%#,"
-          \ . 'U%\t%f'
-    if a:cmd =~# '^merge' && empty(a:args) &&
-          \ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) ||
-          \  !empty(s:repo().git_chomp('diff-files', '--diff-filter=U')))
-      let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
-    else
-      let &l:makeprg = s:sub(g:fugitive_git_executable.' -c core.editor=false '.
-            \ a:cmd . (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' ? '' : ' --edit') . ' ' . a:args,
-            \ ' *$', '')
-    endif
-    if !empty($GIT_EDITOR)
-      let old_editor = $GIT_EDITOR
-      let $GIT_EDITOR = 'false'
-    endif
-    execute cd fnameescape(s:repo().tree())
-    silent noautocmd make!
-  catch /^Vim\%((\a\+)\)\=:E211/
-    let err = v:exception
-  finally
-    redraw!
-    let [&l:mp, &l:efm] = [mp, efm]
-    if exists('old_editor')
-      let $GIT_EDITOR = old_editor
-    endif
-    execute cd fnameescape(cwd)
-  endtry
-  call fugitive#reload_status()
-  if empty(filter(getqflist(),'v:val.valid'))
-    if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG'))
-      cclose
-      return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG'))
-    endif
-  endif
-  let qflist = getqflist()
-  let found = 0
-  for e in qflist
-    if !empty(e.bufnr)
-      let found = 1
-      let e.pattern = '^<<<<<<<'
-    endif
-  endfor
-  call fugitive#cwindow()
-  if found
-    call setqflist(qflist, 'r')
-    if !a:bang
-      return 'cfirst'
-    endif
-  endif
-  return exists('err') ? 'echoerr '.string(err) : ''
-endfunction
-
-" Section: Ggrep, Glog
-
-if !exists('g:fugitive_summary_format')
-  let g:fugitive_summary_format = '%s'
-endif
-
-call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Ggrep :execute s:Grep('grep',<bang>0,<q-args>)")
-call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Glgrep :execute s:Grep('lgrep',<bang>0,<q-args>)")
-call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Glog :call s:Log('grep<bang>',<line1>,<count>,<f-args>)")
-call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<bang>',<line1>,<count>,<f-args>)")
-
-function! s:Grep(cmd,bang,arg) abort
-  let grepprg = &grepprg
-  let grepformat = &grepformat
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd.'`=s:repo().tree()`'
-    let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n')
-    let &grepformat = '%f:%l:%m'
-    exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|')
-    let list = a:cmd =~# '^l' ? getloclist(0) : getqflist()
-    for entry in list
-      if bufname(entry.bufnr) =~ ':'
-        let entry.filename = s:repo().translate(bufname(entry.bufnr))
-        unlet! entry.bufnr
-        let changed = 1
-      elseif a:arg =~# '\%(^\| \)--cached\>'
-        let entry.filename = s:repo().translate(':0:'.bufname(entry.bufnr))
-        unlet! entry.bufnr
-        let changed = 1
-      endif
-    endfor
-    if a:cmd =~# '^l' && exists('changed')
-      call setloclist(0, list, 'r')
-    elseif exists('changed')
-      call setqflist(list, 'r')
-    endif
-    if !a:bang && !empty(list)
-      return (a:cmd =~# '^l' ? 'l' : 'c').'first'.matchstr(a:arg,'\v\C[''" ]\zs\|.*')
-    else
-      return matchstr(a:arg,'\v\C[''" ]\|\zs.*')
-    endif
-  finally
-    let &grepprg = grepprg
-    let &grepformat = grepformat
-    execute cd.'`=dir`'
-  endtry
-endfunction
-
-function! s:Log(cmd, line1, line2, ...) abort
-  let path = s:buffer().path('/')
-  if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1
-    let path = ''
-  endif
-  let cmd = ['--no-pager', 'log', '--no-color']
-  let cmd += ['--pretty=format:fugitive://'.s:repo().dir().'//%H'.path.'::'.g:fugitive_summary_format]
-  if empty(filter(a:000[0 : index(a:000,'--')],'v:val !~# "^-"'))
-    if s:buffer().commit() =~# '\x\{40\}'
-      let cmd += [s:buffer().commit()]
-    elseif s:buffer().path() =~# '^\.git/refs/\|^\.git/.*HEAD$'
-      let cmd += [s:buffer().path()[5:-1]]
-    endif
-  end
-  let cmd += map(copy(a:000),'s:sub(v:val,"^\\%(%(:\\w)*)","\\=fnamemodify(s:buffer().path(),submatch(1))")')
-  if path =~# '/.'
-    if a:line2
-      let cmd += ['-L', a:line1 . ',' . a:line2 . ':' . path[1:-1]]
-    else
-      let cmd += ['--', path[1:-1]]
-    endif
-  endif
-  let grepformat = &grepformat
-  let grepprg = &grepprg
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-  let dir = getcwd()
-  try
-    execute cd.'`=s:repo().tree()`'
-    let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#')
-    let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#'
-    exe a:cmd
-  finally
-    let &grepformat = grepformat
-    let &grepprg = grepprg
-    execute cd.'`=dir`'
-  endtry
-endfunction
-
-" Section: Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread
-
-function! s:Edit(cmd,bang,...) abort
-  let buffer = s:buffer()
-  if a:cmd !~# 'read'
-    if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
-      wincmd p
-      if &diff
-        let mywinnr = winnr()
-        for winnr in range(winnr('$'),1,-1)
-          if winnr != mywinnr && getwinvar(winnr,'&diff')
-            execute winnr.'wincmd w'
-            close
-            if winnr('$') > 1
-              wincmd p
-            endif
-          endif
-        endfor
-      endif
-    endif
-  endif
-
-  if a:bang
-    let arglist = map(copy(a:000), 's:gsub(v:val, ''\\@<!%(\\\\)*\zs[%#]'', ''\=s:buffer().expand(submatch(0))'')')
-    let args = join(arglist, ' ')
-    if a:cmd =~# 'read'
-      let git = buffer.repo().git_command()
-      let last = line('$')
-      silent call s:ExecuteInTree((a:cmd ==# 'read' ? '$read' : a:cmd).'!'.git.' --no-pager '.args)
-      if a:cmd ==# 'read'
-        silent execute '1,'.last.'delete_'
-      endif
-      call fugitive#reload_status()
-      diffupdate
-      return 'redraw|echo '.string(':!'.git.' '.args)
-    else
-      let temp = resolve(tempname())
-      let s:temp_files[tolower(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist }
-      silent execute a:cmd.' '.temp
-      if a:cmd =~# 'pedit'
-        wincmd P
-      endif
-      let echo = s:Edit('read',1,args)
-      silent write!
-      setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>>
-      if getline(1) !~# '^diff '
-        setlocal readonly nomodifiable
-      endif
-      if a:cmd =~# 'pedit'
-        wincmd p
-      endif
-      return echo
-    endif
-    return ''
-  endif
-
-  if a:0 && a:1 == ''
-    return ''
-  elseif a:0
-    let file = buffer.expand(join(a:000, ' '))
-  elseif expand('%') ==# ''
-    let file = ':'
-  elseif buffer.commit() ==# '' && buffer.path('/') !~# '^/.git\>'
-    let file = buffer.path(':')
-  else
-    let file = buffer.path('/')
-  endif
-  try
-    let file = buffer.repo().translate(file)
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-  if a:cmd ==# 'read'
-    return 'silent %delete_|read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.')
-  else
-    return a:cmd.' '.s:fnameescape(file)
-  endif
-endfunction
-
-function! s:EditComplete(A,L,P) abort
-  return map(s:repo().superglob(a:A), 'fnameescape(v:val)')
-endfunction
-
-function! s:EditRunComplete(A,L,P) abort
-  if a:L =~# '^\w\+!'
-    return s:GitComplete(a:A,a:L,a:P)
-  else
-    return s:repo().superglob(a:A)
-  endif
-endfunction
-
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Ge       :execute s:Edit('edit<bang>',0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gedit    :execute s:Edit('edit<bang>',0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gpedit   :execute s:Edit('pedit',<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gsplit   :execute s:Edit('split',<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gvsplit  :execute s:Edit('vsplit',<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gtabedit :execute s:Edit('tabedit',<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -count -complete=customlist,s:EditRunComplete Gread :execute s:Edit((!<count> && <line1> ? '' : <count>).'read',<bang>0,<f-args>)")
-
-" Section: Gwrite, Gwq
-
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwrite :execute s:Write(<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gw :execute s:Write(<bang>0,<f-args>)")
-call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwq :execute s:Wq(<bang>0,<f-args>)")
-
-function! s:Write(force,...) abort
-  if exists('b:fugitive_commit_arguments')
-    return 'write|bdelete'
-  elseif expand('%:t') == 'COMMIT_EDITMSG' && $GIT_INDEX_FILE != ''
-    return 'wq'
-  elseif s:buffer().type() == 'index'
-    return 'Gcommit'
-  elseif s:buffer().path() ==# '' && getline(4) =~# '^+++ '
-    let filename = getline(4)[6:-1]
-    setlocal buftype=
-    silent write
-    setlocal buftype=nowrite
-    if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6]
-      let err = s:repo().git_chomp('apply','--cached','--reverse',s:buffer().spec())
-    else
-      let err = s:repo().git_chomp('apply','--cached',s:buffer().spec())
-    endif
-    if err !=# ''
-      let v:errmsg = split(err,"\n")[0]
-      return 'echoerr v:errmsg'
-    elseif a:force
-      return 'bdelete'
-    else
-      return 'Gedit '.fnameescape(filename)
-    endif
-  endif
-  let mytab = tabpagenr()
-  let mybufnr = bufnr('')
-  let path = a:0 ? join(a:000, ' ') : s:buffer().path()
-  if path =~# '^:\d\>'
-    return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:repo().translate(s:buffer().expand(path)))
-  endif
-  let always_permitted = (s:buffer().path() ==# path && s:buffer().commit() =~# '^0\=$')
-  if !always_permitted && !a:force && s:repo().git_chomp_in_tree('diff','--name-status','HEAD','--',path) . s:repo().git_chomp_in_tree('ls-files','--others','--',path) !=# ''
-    let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)'
-    return 'echoerr v:errmsg'
-  endif
-  let file = s:repo().translate(path)
-  let treebufnr = 0
-  for nr in range(1,bufnr('$'))
-    if fnamemodify(bufname(nr),':p') ==# file
-      let treebufnr = nr
-    endif
-  endfor
-
-  if treebufnr > 0 && treebufnr != bufnr('')
-    let temp = tempname()
-    silent execute '%write '.temp
-    for tab in [mytab] + range(1,tabpagenr('$'))
-      for winnr in range(1,tabpagewinnr(tab,'$'))
-        if tabpagebuflist(tab)[winnr-1] == treebufnr
-          execute 'tabnext '.tab
-          if winnr != winnr()
-            execute winnr.'wincmd w'
-            let restorewinnr = 1
-          endif
-          try
-            let lnum = line('.')
-            let last = line('$')
-            silent execute '$read '.temp
-            silent execute '1,'.last.'delete_'
-            silent write!
-            silent execute lnum
-            let did = 1
-          finally
-            if exists('restorewinnr')
-              wincmd p
-            endif
-            execute 'tabnext '.mytab
-          endtry
-        endif
-      endfor
-    endfor
-    if !exists('did')
-      call writefile(readfile(temp,'b'),file,'b')
-    endif
-  else
-    execute 'write! '.s:fnameescape(s:repo().translate(path))
-  endif
-
-  if a:force
-    let error = s:repo().git_chomp_in_tree('add', '--force', '--', path)
-  else
-    let error = s:repo().git_chomp_in_tree('add', '--', path)
-  endif
-  if v:shell_error
-    let v:errmsg = 'fugitive: '.error
-    return 'echoerr v:errmsg'
-  endif
-  if s:buffer().path() ==# path && s:buffer().commit() =~# '^\d$'
-    set nomodified
-  endif
-
-  let one = s:repo().translate(':1:'.path)
-  let two = s:repo().translate(':2:'.path)
-  let three = s:repo().translate(':3:'.path)
-  for nr in range(1,bufnr('$'))
-    let name = fnamemodify(bufname(nr), ':p')
-    if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three)
-      execute nr.'bdelete'
-    endif
-  endfor
-
-  unlet! restorewinnr
-  let zero = s:repo().translate(':0:'.path)
-  for tab in range(1,tabpagenr('$'))
-    for winnr in range(1,tabpagewinnr(tab,'$'))
-      let bufnr = tabpagebuflist(tab)[winnr-1]
-      let bufname = fnamemodify(bufname(bufnr), ':p')
-      if bufname ==# zero && bufnr != mybufnr
-        execute 'tabnext '.tab
-        if winnr != winnr()
-          execute winnr.'wincmd w'
-          let restorewinnr = 1
-        endif
-        try
-          let lnum = line('.')
-          let last = line('$')
-          silent execute '$read '.s:fnameescape(file)
-          silent execute '1,'.last.'delete_'
-          silent execute lnum
-          set nomodified
-          diffupdate
-        finally
-          if exists('restorewinnr')
-            wincmd p
-          endif
-          execute 'tabnext '.mytab
-        endtry
-        break
-      endif
-    endfor
-  endfor
-  call fugitive#reload_status()
-  return 'checktime'
-endfunction
-
-function! s:Wq(force,...) abort
-  let bang = a:force ? '!' : ''
-  if exists('b:fugitive_commit_arguments')
-    return 'wq'.bang
-  endif
-  let result = call(s:function('s:Write'),[a:force]+a:000)
-  if result =~# '^\%(write\|wq\|echoerr\)'
-    return s:sub(result,'^write','wq')
-  else
-    return result.'|quit'.bang
-  endif
-endfunction
-
-augroup fugitive_commit
-  autocmd!
-  autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
-augroup END
-
-" Section: Gpush, Gfetch
-
-call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpush  execute s:Dispatch('<bang>', 'push '.<q-args>)")
-call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gfetch execute s:Dispatch('<bang>', 'fetch '.<q-args>)")
-
-function! s:Dispatch(bang, args)
-  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
-  let cwd = getcwd()
-  let [mp, efm, cc] = [&l:mp, &l:efm, get(b:, 'current_compiler', '')]
-  try
-    let b:current_compiler = 'git'
-    let &l:errorformat = s:common_efm
-    let &l:makeprg = g:fugitive_git_executable . ' ' . a:args
-    execute cd fnameescape(s:repo().tree())
-    if exists(':Make') == 2
-      noautocmd Make
-    else
-      silent noautocmd make!
-      redraw!
-      return 'call fugitive#cwindow()'
-    endif
-    return ''
-  finally
-    let [&l:mp, &l:efm, b:current_compiler] = [mp, efm, cc]
-    if empty(cc) | unlet! b:current_compiler | endif
-    execute cd fnameescape(cwd)
-  endtry
-endfunction
-
-" Section: Gdiff
-
-call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff('',<f-args>)")
-call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<f-args>)")
-call s:command("-bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<f-args>)")
-
-augroup fugitive_diff
-  autocmd!
-  autocmd BufWinLeave *
-        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 2 |
-        \   call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) |
-        \ endif
-  autocmd BufWinEnter *
-        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 1 |
-        \   call s:diffoff() |
-        \ endif
-augroup END
-
-function! s:can_diffoff(buf) abort
-  return getwinvar(bufwinnr(a:buf), '&diff') &&
-        \ !empty(getbufvar(a:buf, 'git_dir')) &&
-        \ !empty(getwinvar(bufwinnr(a:buf), 'fugitive_diff_restore'))
-endfunction
-
-function! fugitive#can_diffoff(buf) abort
-  return s:can_diffoff(a:buf)
-endfunction
-
-function! s:diff_modifier(count) abort
-  let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+')
-  if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical'
-    return 'keepalt '
-  elseif &diffopt =~# 'vertical'
-    return 'keepalt vert '
-  elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc))
-    return 'keepalt '
-  else
-    return 'keepalt vert '
-  endif
-endfunction
-
-function! s:diff_window_count() abort
-  let c = 0
-  for nr in range(1,winnr('$'))
-    let c += getwinvar(nr,'&diff')
-  endfor
-  return c
-endfunction
-
-function! s:diff_restore() abort
-  let restore = 'setlocal nodiff noscrollbind'
-        \ . ' scrollopt=' . &l:scrollopt
-        \ . (&l:wrap ? ' wrap' : ' nowrap')
-        \ . ' foldlevel=999'
-        \ . ' foldmethod=' . &l:foldmethod
-        \ . ' foldcolumn=' . &l:foldcolumn
-        \ . ' foldlevel=' . &l:foldlevel
-        \ . (&l:foldenable ? ' foldenable' : ' nofoldenable')
-  if has('cursorbind')
-    let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind'
-  endif
-  return restore
-endfunction
-
-function! s:diffthis() abort
-  if !&diff
-    let w:fugitive_diff_restore = s:diff_restore()
-    diffthis
-  endif
-endfunction
-
-function! s:diffoff() abort
-  if exists('w:fugitive_diff_restore')
-    execute w:fugitive_diff_restore
-    unlet w:fugitive_diff_restore
-  else
-    diffoff
-  endif
-endfunction
-
-function! s:diffoff_all(dir) abort
-  for nr in range(1,winnr('$'))
-    if getwinvar(nr,'&diff')
-      if nr != winnr()
-        execute nr.'wincmd w'
-        let restorewinnr = 1
-      endif
-      if exists('b:git_dir') && b:git_dir ==# a:dir
-        call s:diffoff()
-      endif
-    endif
-  endfor
-endfunction
-
-function! s:buffer_compare_age(commit) dict abort
-  let scores = {':0': 1, ':1': 2, ':2': 3, ':': 4, ':3': 5}
-  let my_score    = get(scores,':'.self.commit(),0)
-  let their_score = get(scores,':'.a:commit,0)
-  if my_score || their_score
-    return my_score < their_score ? -1 : my_score != their_score
-  elseif self.commit() ==# a:commit
-    return 0
-  endif
-  let base = self.repo().git_chomp('merge-base',self.commit(),a:commit)
-  if base ==# self.commit()
-    return -1
-  elseif base ==# a:commit
-    return 1
-  endif
-  let my_time    = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',self.commit())
-  let their_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:commit)
-  return my_time < their_time ? -1 : my_time != their_time
-endfunction
-
-call s:add_methods('buffer',['compare_age'])
-
-function! s:Diff(vert,...) abort
-  let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert
-  if exists(':DiffGitCached')
-    return 'DiffGitCached'
-  elseif (!a:0 || a:1 == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
-    let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
-    let nr = bufnr('')
-    execute 'leftabove '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`'
-    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
-    call s:diffthis()
-    wincmd p
-    execute 'rightbelow '.vert.'split `=fugitive#buffer().repo().translate(s:buffer().expand('':3''))`'
-    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
-    call s:diffthis()
-    wincmd p
-    call s:diffthis()
-    return ''
-  elseif a:0
-    let arg = join(a:000, ' ')
-    if arg ==# ''
-      return ''
-    elseif arg ==# '/'
-      let file = s:buffer().path('/')
-    elseif arg ==# ':'
-      let file = s:buffer().path(':0:')
-    elseif arg =~# '^:/.'
-      try
-        let file = s:repo().rev_parse(arg).s:buffer().path(':')
-      catch /^fugitive:/
-        return 'echoerr v:errmsg'
-      endtry
-    else
-      let file = s:buffer().expand(arg)
-    endif
-    if file !~# ':' && file !~# '^/' && s:repo().git_chomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$'
-      let file = file.s:buffer().path(':')
-    endif
-  else
-    let file = s:buffer().path(s:buffer().commit() == '' ? ':0:' : '/')
-  endif
-  try
-    let spec = s:repo().translate(file)
-    let commit = matchstr(spec,'\C[^:/]//\zs\x\+')
-    let restore = s:diff_restore()
-    if exists('+cursorbind')
-      setlocal cursorbind
-    endif
-    let w:fugitive_diff_restore = restore
-    if s:buffer().compare_age(commit) < 0
-      execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec)
-    else
-      execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
-    endif
-    let w:fugitive_diff_restore = restore
-    let winnr = winnr()
-    if getwinvar('#', '&diff')
-      wincmd p
-      call feedkeys("\<C-W>p", 'n')
-    endif
-    return ''
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-" Section: Gmove, Gremove
-
-function! s:Move(force,destination) abort
-  if a:destination =~# '^/'
-    let destination = a:destination[1:-1]
-  else
-    let destination = s:shellslash(fnamemodify(s:sub(a:destination,'[%#]%(:\w)*','\=expand(submatch(0))'),':p'))
-    if destination[0:strlen(s:repo().tree())] ==# s:repo().tree('')
-      let destination = destination[strlen(s:repo().tree('')):-1]
-    endif
-  endif
-  if isdirectory(s:buffer().spec())
-    " Work around Vim parser idiosyncrasy
-    let discarded = s:buffer().setvar('&swapfile',0)
-  endif
-  let message = call(s:repo().git_chomp_in_tree,['mv']+(a:force ? ['-f'] : [])+['--', s:buffer().path(), destination], s:repo())
-  if v:shell_error
-    let v:errmsg = 'fugitive: '.message
-    return 'echoerr v:errmsg'
-  endif
-  let destination = s:repo().tree(destination)
-  if isdirectory(destination)
-    let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.')
-  endif
-  call fugitive#reload_status()
-  if s:buffer().commit() == ''
-    if isdirectory(destination)
-      return 'keepalt edit '.s:fnameescape(destination)
-    else
-      return 'keepalt saveas! '.s:fnameescape(destination)
-    endif
-  else
-    return 'file '.s:fnameescape(s:repo().translate(':0:'.destination))
-  endif
-endfunction
-
-function! s:MoveComplete(A,L,P) abort
-  if a:A =~ '^/'
-    return s:repo().superglob(a:A)
-  else
-    let matches = split(glob(a:A.'*'),"\n")
-    call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val')
-    return matches
-  endif
-endfunction
-
-function! s:Remove(force) abort
-  if s:buffer().commit() ==# ''
-    let cmd = ['rm']
-  elseif s:buffer().commit() ==# '0'
-    let cmd = ['rm','--cached']
-  else
-    let v:errmsg = 'fugitive: rm not supported here'
-    return 'echoerr v:errmsg'
-  endif
-  if a:force
-    let cmd += ['--force']
-  endif
-  let message = call(s:repo().git_chomp_in_tree,cmd+['--',s:buffer().path()],s:repo())
-  if v:shell_error
-    let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)')
-    return 'echoerr '.string(v:errmsg)
-  else
-    call fugitive#reload_status()
-    return 'bdelete'.(a:force ? '!' : '')
-  endif
-endfunction
-
-augroup fugitive_remove
-  autocmd!
-  autocmd User Fugitive if s:buffer().commit() =~# '^0\=$' |
-        \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:MoveComplete Gmove :execute s:Move(<bang>0,<q-args>)" |
-        \ exe "command! -buffer -bar -bang Gremove :execute s:Remove(<bang>0)" |
-        \ endif
-augroup END
-
-" Section: Gblame
-
-augroup fugitive_blame
-  autocmd!
-  autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame
-  autocmd FileType fugitiveblame setlocal nomodeline | if exists('b:git_dir') | let &l:keywordprg = s:repo().keywordprg() | endif
-  autocmd Syntax fugitiveblame call s:BlameSyntax()
-  autocmd User Fugitive if s:buffer().type('file', 'blob') | exe "command! -buffer -bar -bang -range=0 -nargs=* Gblame :execute s:Blame(<bang>0,<line1>,<line2>,<count>,[<f-args>])" | endif
-  autocmd ColorScheme,GUIEnter * call s:RehighlightBlame()
-augroup END
-
-function! s:linechars(pattern) abort
-  let chars = strlen(s:gsub(matchstr(getline('.'), a:pattern), '.', '.'))
-  if exists('*synconcealed') && &conceallevel > 1
-    for col in range(1, chars)
-      let chars -= synconcealed(line('.'), col)[0]
-    endfor
-  endif
-  return chars
-endfunction
-
-function! s:Blame(bang,line1,line2,count,args) abort
-  if exists('b:fugitive_blamed_bufnr')
-    return 'bdelete'
-  endif
-  try
-    if s:buffer().path() == ''
-      call s:throw('file or blob required')
-    endif
-    if filter(copy(a:args),'v:val !~# "^\\%(--root\|--show-name\\|-\\=\\%([ltfnsew]\\|[MC]\\d*\\)\\+\\)$"') != []
-      call s:throw('unsupported option')
-    endif
-    call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")')
-    let cmd = ['--no-pager', 'blame', '--show-number'] + a:args
-    if s:buffer().commit() =~# '\D\|..'
-      let cmd += [s:buffer().commit()]
-    else
-      let cmd += ['--contents', '-']
-    endif
-    let cmd += ['--', s:buffer().path()]
-    let basecmd = escape(call(s:repo().git_command,cmd,s:repo()),'!')
-    try
-      let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-      if !s:repo().bare()
-        let dir = getcwd()
-        execute cd.'`=s:repo().tree()`'
-      endif
-      if a:count
-        execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g')
-      else
-        let error = resolve(tempname())
-        let temp = error.'.fugitiveblame'
-        if &shell =~# 'csh'
-          silent! execute '%write !('.basecmd.' > '.temp.') >& '.error
-        else
-          silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error
-        endif
-        if exists('l:dir')
-          execute cd.'`=dir`'
-          unlet dir
-        endif
-        if v:shell_error
-          call s:throw(join(readfile(error),"\n"))
-        endif
-        for winnr in range(winnr('$'),1,-1)
-          call setwinvar(winnr, '&scrollbind', 0)
-          if exists('+cursorbind')
-            call setwinvar(winnr, '&cursorbind', 0)
-          endif
-          if getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr')
-            execute winbufnr(winnr).'bdelete'
-          endif
-        endfor
-        let bufnr = bufnr('')
-        let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)'
-        if exists('+cursorbind')
-          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)'
-        endif
-        if &l:wrap
-          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&wrap",1)'
-        endif
-        if &l:foldenable
-          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&foldenable",1)'
-        endif
-        setlocal scrollbind nowrap nofoldenable
-        if exists('+cursorbind')
-          setlocal cursorbind
-        endif
-        let top = line('w0') + &scrolloff
-        let current = line('.')
-        let s:temp_files[tolower(temp)] = { 'dir': s:repo().dir(), 'args': cmd }
-        exe 'keepalt leftabove vsplit '.temp
-        let b:fugitive_blamed_bufnr = bufnr
-        let w:fugitive_leave = restore
-        let b:fugitive_blame_arguments = join(a:args,' ')
-        execute top
-        normal! zt
-        execute current
-        if exists('+cursorbind')
-          setlocal cursorbind
-        endif
-        setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth filetype=fugitiveblame
-        if exists('+concealcursor')
-          setlocal concealcursor=nc conceallevel=2
-        endif
-        if exists('+relativenumber')
-          setlocal norelativenumber
-        endif
-        execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1)
-        nnoremap <buffer> <silent> <F1> :help fugitive-:Gblame<CR>
-        nnoremap <buffer> <silent> g?   :help fugitive-:Gblame<CR>
-        nnoremap <buffer> <silent> q    :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete','^-1','','')<CR>
-        nnoremap <buffer> <silent> gq   :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete<Bar>if expand("%:p") =~# "^fugitive:[\\/][\\/]"<Bar>Gedit<Bar>endif','^-1','','')<CR>
-        nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR>
-        nnoremap <buffer> <silent> -    :<C-U>exe <SID>BlameJump('')<CR>
-        nnoremap <buffer> <silent> P    :<C-U>exe <SID>BlameJump('^'.v:count1)<CR>
-        nnoremap <buffer> <silent> ~    :<C-U>exe <SID>BlameJump('~'.v:count1)<CR>
-        nnoremap <buffer> <silent> i    :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR>
-        nnoremap <buffer> <silent> o    :<C-U>exe <SID>BlameCommit((&splitbelow ? "botright" : "topleft")." split")<CR>
-        nnoremap <buffer> <silent> O    :<C-U>exe <SID>BlameCommit("tabedit")<CR>
-        nnoremap <buffer> <silent> A    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze [0-9:/+-][0-9:/+ -]* \d\+)')+1+v:count)<CR>
-        nnoremap <buffer> <silent> C    :<C-u>exe "vertical resize ".(<SID>linechars('^\S\+')+1+v:count)<CR>
-        nnoremap <buffer> <silent> D    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze\d\ze\s\+\d\+)')+1-v:count)<CR>
-        redraw
-        syncbind
-      endif
-    finally
-      if exists('l:dir')
-        execute cd.'`=dir`'
-      endif
-    endtry
-    return ''
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-function! s:BlameCommit(cmd) abort
-  let cmd = s:Edit(a:cmd, 0, matchstr(getline('.'),'\x\+'))
-  if cmd =~# '^echoerr'
-    return cmd
-  endif
-  let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]')
-  let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
-  if path ==# ''
-    let path = s:buffer(b:fugitive_blamed_bufnr).path()
-  endif
-  execute cmd
-  if search('^diff .* b/\M'.escape(path,'\').'$','W')
-    call search('^+++')
-    let head = line('.')
-    while search('^@@ \|^diff ') && getline('.') =~# '^@@ '
-      let top = +matchstr(getline('.'),' +\zs\d\+')
-      let len = +matchstr(getline('.'),' +\d\+,\zs\d\+')
-      if lnum >= top && lnum <= top + len
-        let offset = lnum - top
-        if &scrolloff
-          +
-          normal! zt
-        else
-          normal! zt
-          +
-        endif
-        while offset > 0 && line('.') < line('$')
-          +
-          if getline('.') =~# '^[ +]'
-            let offset -= 1
-          endif
-        endwhile
-        return 'normal! zv'
-      endif
-    endwhile
-    execute head
-    normal! zt
-  endif
-  return ''
-endfunction
-
-function! s:BlameJump(suffix) abort
-  let commit = matchstr(getline('.'),'^\^\=\zs\x\+')
-  if commit =~# '^0\+$'
-    let commit = ':0'
-  endif
-  let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]')
-  let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
-  if path ==# ''
-    let path = s:buffer(b:fugitive_blamed_bufnr).path()
-  endif
-  let args = b:fugitive_blame_arguments
-  let offset = line('.') - line('w0')
-  let bufnr = bufnr('%')
-  let winnr = bufwinnr(b:fugitive_blamed_bufnr)
-  if winnr > 0
-    exe winnr.'wincmd w'
-  endif
-  execute s:Edit('edit', 0, commit.a:suffix.':'.path)
-  execute lnum
-  if winnr > 0
-    exe bufnr.'bdelete'
-  endif
-  execute 'Gblame '.args
-  execute lnum
-  let delta = line('.') - line('w0') - offset
-  if delta > 0
-    execute 'normal! '.delta."\<C-E>"
-  elseif delta < 0
-    execute 'normal! '.(-delta)."\<C-Y>"
-  endif
-  syncbind
-  return ''
-endfunction
-
-let s:hash_colors = {}
-
-function! s:BlameSyntax() abort
-  let b:current_syntax = 'fugitiveblame'
-  let conceal = has('conceal') ? ' conceal' : ''
-  let arg = exists('b:fugitive_blame_arguments') ? b:fugitive_blame_arguments : ''
-  syn match FugitiveblameBoundary "^\^"
-  syn match FugitiveblameBlank                      "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,fugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite
-  syn match FugitiveblameHash       "\%(^\^\=\)\@<=\x\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite
-  syn match FugitiveblameUncommitted "\%(^\^\=\)\@<=0\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite
-  syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%( \d\+\)\@<=)" contained keepend oneline
-  syn match FugitiveblameTime "[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%( \+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation
-  exec 'syn match FugitiveblameLineNumber         " *\d\+)\@=" contained containedin=FugitiveblameAnnotation'.conceal
-  exec 'syn match FugitiveblameOriginalFile       " \%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite'.(arg =~# 'f' ? '' : conceal)
-  exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite'.(arg =~# 'n' ? '' : conceal)
-  exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite'.(arg =~# 'n' ? '' : conceal)
-  syn match FugitiveblameShort              " \d\+)" contained contains=FugitiveblameLineNumber
-  syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation
-  hi def link FugitiveblameBoundary           Keyword
-  hi def link FugitiveblameHash               Identifier
-  hi def link FugitiveblameUncommitted        Ignore
-  hi def link FugitiveblameTime               PreProc
-  hi def link FugitiveblameLineNumber         Number
-  hi def link FugitiveblameOriginalFile       String
-  hi def link FugitiveblameOriginalLineNumber Float
-  hi def link FugitiveblameShort              FugitiveblameDelimiter
-  hi def link FugitiveblameDelimiter          Delimiter
-  hi def link FugitiveblameNotCommittedYet    Comment
-  let seen = {}
-  for lnum in range(1, line('$'))
-    let hash = matchstr(getline(lnum), '^\^\=\zs\x\{6\}')
-    if hash ==# '' || hash ==# '000000' || has_key(seen, hash)
-      continue
-    endif
-    let seen[hash] = 1
-    if &t_Co > 16 && exists('g:CSApprox_loaded')
-          \ && empty(get(s:hash_colors, hash))
-      let [s, r, g, b; __] = map(matchlist(hash, '\(\x\x\)\(\x\x\)\(\x\x\)'), 'str2nr(v:val,16)')
-      let color = csapprox#per_component#Approximate(r, g, b)
-      if color == 16 && &background ==# 'dark'
-        let color = 8
-      endif
-      let s:hash_colors[hash] = ' ctermfg='.color
-    else
-      let s:hash_colors[hash] = ''
-    endif
-    exe 'syn match FugitiveblameHash'.hash.'       "\%(^\^\=\)\@<='.hash.'\x\{1,34\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite'
-  endfor
-  call s:RehighlightBlame()
-endfunction
-
-function! s:RehighlightBlame() abort
-  for [hash, cterm] in items(s:hash_colors)
-    if !empty(cterm) || has('gui_running')
-      exe 'hi FugitiveblameHash'.hash.' guifg=#'.hash.get(s:hash_colors, hash, '')
-    else
-      exe 'hi link FugitiveblameHash'.hash.' Identifier'
-    endif
-  endfor
-endfunction
-
-" Section: Gbrowse
-
-call s:command("-bar -bang -range -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)")
-
-function! s:Browse(bang,line1,count,...) abort
-  try
-    let rev = a:0 ? substitute(join(a:000, ' '),'@[[:alnum:]_-]*\%(://.\{-\}\)\=$','','') : ''
-    if rev ==# ''
-      let expanded = s:buffer().rev()
-    elseif rev ==# ':'
-      let expanded = s:buffer().path('/')
-    else
-      let expanded = s:buffer().expand(rev)
-    endif
-    let full = s:repo().translate(expanded)
-    let commit = ''
-    if full =~# '^fugitive://'
-      let commit = matchstr(full,'://.*//\zs\w\+')
-      let path = matchstr(full,'://.*//\w\+\zs/.*')
-      if commit =~ '..'
-        let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':'))
-      else
-        let type = 'blob'
-      endif
-      let path = path[1:-1]
-    elseif s:repo().bare()
-      let path = '.git/' . full[strlen(s:repo().dir())+1:-1]
-      let type = ''
-    else
-      let path = full[strlen(s:repo().tree())+1:-1]
-      if path =~# '^\.git/'
-        let type = ''
-      elseif isdirectory(full)
-        let type = 'tree'
-      else
-        let type = 'blob'
-      endif
-    endif
-    if path =~# '^\.git/.*HEAD' && filereadable(s:repo().dir(path[5:-1]))
-      let body = readfile(s:repo().dir(path[5:-1]))[0]
-      if body =~# '^\x\{40\}$'
-        let commit = body
-        let type = 'commit'
-        let path = ''
-      elseif body =~# '^ref: refs/'
-        let path = '.git/' . matchstr(body,'ref: \zs.*')
-      endif
-    endif
-
-    if a:0 && join(a:000, ' ') =~# '@[[:alnum:]_-]*\%(://.\{-\}\)\=$'
-      let remote = matchstr(join(a:000, ' '),'@\zs[[:alnum:]_-]\+\%(://.\{-\}\)\=$')
-    elseif path =~# '^\.git/refs/remotes/.'
-      let remote = matchstr(path,'^\.git/refs/remotes/\zs[^/]\+')
-    else
-      let remote = 'origin'
-      let branch = matchstr(rev,'^[[:alnum:]/._-]\+\ze[:^~@]')
-      if branch ==# '' && path =~# '^\.git/refs/\w\+/'
-        let branch = s:sub(path,'^\.git/refs/\w+/','')
-      endif
-      if filereadable(s:repo().dir('refs/remotes/'.branch))
-        let remote = matchstr(branch,'[^/]\+')
-        let rev = rev[strlen(remote)+1:-1]
-      else
-        if branch ==# ''
-          let branch = matchstr(s:repo().head_ref(),'\<refs/heads/\zs.*')
-        endif
-        if branch != ''
-          let remote = s:repo().git_chomp('config','branch.'.branch.'.remote')
-          if remote =~# '^\.\=$'
-            let remote = 'origin'
-          elseif rev[0:strlen(branch)-1] ==# branch && rev[strlen(branch)] =~# '[:^~@]'
-            let rev = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1] . rev[strlen(branch):-1]
-          endif
-        endif
-      endif
-    endif
-
-    let raw = s:repo().git_chomp('config','remote.'.remote.'.url')
-    if raw ==# ''
-      let raw = remote
-    endif
-
-    for Handler in g:fugitive_browse_handlers
-      let url = call(Handler, [{
-            \ 'repo': s:repo(),
-            \ 'remote': raw,
-            \ 'revision': rev,
-            \ 'commit': commit,
-            \ 'path': path,
-            \ 'type': type,
-            \ 'line1': a:count > 0 ? a:line1 : 0,
-            \ 'line2': a:count > 0 ? a:count : 0}])
-      if !empty(url)
-        break
-      endif
-    endfor
-
-    if empty(url)
-      call s:throw("Instaweb failed to start and '".remote."' is not a supported remote")
-    endif
-
-    if a:bang
-      if has('clipboard')
-        let @* = url
-      endif
-      return 'echomsg '.string(url)
-    elseif exists(':Browse') == 2
-      return 'echomsg '.string(url).'|Browse '.url
-    else
-      return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)'
-    endif
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-function! s:github_url(http://github.com/opts,%20...) abort
-  if a:0 || type(a:opts) != type({})
-    return ''
-  endif
-  let domain_pattern = 'github\.com'
-  let domains = exists('g:fugitive_github_domains') ? g:fugitive_github_domains : []
-  for domain in domains
-    let domain_pattern .= '\|' . escape(split(domain, '://')[-1], '.')
-  endfor
-  let repo = matchstr(get(a:opts, 'remote'), '^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
-  if repo ==# ''
-    return ''
-  endif
-  let path = a:opts.path
-  if index(domains, 'http://' . matchstr(repo, '^[^:/]*')) >= 0
-    let root = 'http://' . s:sub(repo,':','/')
-  else
-    let root = 'https://' . s:sub(repo,':','/')
-  endif
-  if path =~# '^\.git/refs/heads/'
-    let branch = a:opts.repo.git_chomp('config','branch.'.path[16:-1].'.merge')[11:-1]
-    if branch ==# ''
-      return root . '/commits/' . path[16:-1]
-    else
-      return root . '/commits/' . branch
-    endif
-  elseif path =~# '^\.git/refs/.'
-    return root . '/commits/' . matchstr(path,'[^/]\+$')
-  elseif path =~# '.git/\%(config$\|hooks\>\)'
-    return root . '/admin'
-  elseif path =~# '^\.git\>'
-    return root
-  endif
-  if a:opts.revision =~# '^[[:alnum:]._-]\+:'
-    let commit = matchstr(a:opts.revision,'^[^:]*')
-  elseif a:opts.commit =~# '^\d\=$'
-    let local = matchstr(a:opts.repo.head_ref(),'\<refs/heads/\zs.*')
-    let commit = a:opts.repo.git_chomp('config','branch.'.local.'.merge')[11:-1]
-    if commit ==# ''
-      let commit = local
-    endif
-  else
-    let commit = a:opts.commit
-  endif
-  if a:opts.type == 'tree'
-    let url = s:sub(root . '/tree/' . commit . '/' . path,'/$','')
-  elseif a:opts.type == 'blob'
-    let url = root . '/blob/' . commit . '/' . path
-    if get(a:opts, 'line2') && a:opts.line1 == a:opts.line2
-      let url .= '#L' . a:opts.line1
-    elseif get(a:opts, 'line2')
-      let url .= '#L' . a:opts.line1 . '-' . a:opts.line2
-    endif
-  elseif a:opts.type == 'tag'
-    let commit = matchstr(getline(3),'^tag \zs.*')
-    let url = root . '/tree/' . commit
-  else
-    let url = root . '/commit/' . commit
-  endif
-  return url
-endfunction
-
-function! s:instaweb_url(http://github.com/opts) abort
-  let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
-  if output =~# 'http://'
-    let root = matchstr(output,'http://.*/').'/?p='.fnamemodify(a:opts.repo.dir(),':t')
-  else
-    return ''
-  endif
-  if a:opts.path =~# '^\.git/refs/.'
-    return root . ';a=shortlog;h=' . matchstr(a:opts.path,'^\.git/\zs.*')
-  elseif a:opts.path =~# '^\.git\>'
-    return root
-  endif
-  let url = root
-  if a:opts.commit =~# '^\x\{40\}$'
-    if a:opts.type ==# 'commit'
-      let url .= ';a=commit'
-    endif
-    let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path))
-  else
-    if a:opts.type ==# 'blob'
-      let tmp = tempname()
-      silent execute 'write !'.a:opts.repo.git_command('hash-object','-w','--stdin').' > '.tmp
-      let url .= ';h=' . readfile(tmp)[0]
-    else
-      try
-        let url .= ';h=' . a:opts.repo.rev_parse((a:opts.commit == '' ? 'HEAD' : ':' . a:opts.commit) . ':' . a:opts.path)
-      catch /^fugitive:/
-        call s:throw('fugitive: cannot browse uncommitted file')
-      endtry
-    endif
-    let root .= ';hb=' . matchstr(a:opts.repo.head_ref(),'[^ ]\+$')
-  endif
-  if a:opts.path !=# ''
-    let url .= ';f=' . a:opts.path
-  endif
-  if get(a:opts, 'line1')
-    let url .= '#l' . a:opts.line1
-  endif
-  return url
-endfunction
-
-if !exists('g:fugitive_browse_handlers')
-  let g:fugitive_browse_handlers = []
-endif
-
-call extend(g:fugitive_browse_handlers,
-      \ [s:function('s:github_url'), s:function('s:instaweb_url')])
-
-" Section: File access
-
-function! s:ReplaceCmd(cmd,...) abort
-  let fn = expand('%:p')
-  let tmp = tempname()
-  let prefix = ''
-  try
-    if a:0 && a:1 != ''
-      if s:winshell()
-        let old_index = $GIT_INDEX_FILE
-        let $GIT_INDEX_FILE = a:1
-      else
-        let prefix = 'env GIT_INDEX_FILE='.s:shellesc(a:1).' '
-      endif
-    endif
-    if s:winshell()
-      let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
-      call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').' > '.tmp.'"')
-    else
-      call system(' ('.prefix.a:cmd.' > '.tmp.') ')
-    endif
-  finally
-    if exists('old_index')
-      let $GIT_INDEX_FILE = old_index
-    endif
-  endtry
-  silent exe 'keepalt file '.tmp
-  try
-    silent edit!
-  finally
-    try
-      silent exe 'keepalt file '.s:fnameescape(fn)
-    catch /^Vim\%((\a\+)\)\=:E302/
-    endtry
-    call delete(tmp)
-    if fnamemodify(bufname('$'), ':p') ==# tmp
-      silent execute 'bwipeout '.bufnr('$')
-    endif
-    silent exe 'doau BufReadPost '.s:fnameescape(fn)
-  endtry
-endfunction
-
-function! s:BufReadIndex() abort
-  if !exists('b:fugitive_display_format')
-    let b:fugitive_display_format = filereadable(expand('%').'.lock')
-  endif
-  let b:fugitive_display_format = b:fugitive_display_format % 2
-  let b:fugitive_type = 'index'
-  try
-    let b:git_dir = s:repo().dir()
-    setlocal noro ma nomodeline
-    if fnamemodify($GIT_INDEX_FILE !=# '' ? $GIT_INDEX_FILE : b:git_dir . '/index', ':p') ==# expand('%:p')
-      let index = ''
-    else
-      let index = expand('%:p')
-    endif
-    if b:fugitive_display_format
-      call s:ReplaceCmd(s:repo().git_command('ls-files','--stage'),index)
-      set ft=git nospell
-    else
-      let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-      let dir = getcwd()
-      if fugitive#git_version() =~# '^0\|^1\.[1-7]\.'
-        let cmd = s:repo().git_command('status')
-      else
-        let cmd = s:repo().git_command(
-              \ '-c', 'status.displayCommentPrefix=true',
-              \ '-c', 'color.status=false',
-              \ '-c', 'status.short=false',
-              \ 'status')
-      endif
-      try
-        execute cd.'`=s:repo().tree()`'
-        call s:ReplaceCmd(cmd, index)
-      finally
-        execute cd.'`=dir`'
-      endtry
-      set ft=gitcommit
-      set foldtext=fugitive#foldtext()
-    endif
-    setlocal ro noma nomod noswapfile
-    if &bufhidden ==# ''
-      setlocal bufhidden=delete
-    endif
-    call s:JumpInit()
-    nunmap   <buffer>          P
-    nunmap   <buffer>          ~
-    nnoremap <buffer> <silent> <C-N> :<C-U>execute <SID>StageNext(v:count1)<CR>
-    nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>StagePrevious(v:count1)<CR>
-    nnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line('.'),line('.')+v:count1-1)<CR>
-    xnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line("'<"),line("'>"))<CR>
-    nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += 1<Bar>exe <SID>BufReadIndex()<CR>
-    nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= 1<Bar>exe <SID>BufReadIndex()<CR>
-    nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>
-    nnoremap <buffer> <silent> cA :<C-U>Gcommit --amend --reuse-message=HEAD<CR>
-    nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR>
-    nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR>
-    nnoremap <buffer> <silent> cva :<C-U>Gcommit --amend --verbose<CR>
-    nnoremap <buffer> <silent> cvc :<C-U>Gcommit --verbose<CR>
-    nnoremap <buffer> <silent> D :<C-U>execute <SID>StageDiff('Gdiff')<CR>
-    nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gdiff')<CR>
-    nnoremap <buffer> <silent> dh :<C-U>execute <SID>StageDiff('Gsdiff')<CR>
-    nnoremap <buffer> <silent> ds :<C-U>execute <SID>StageDiff('Gsdiff')<CR>
-    nnoremap <buffer> <silent> dp :<C-U>execute <SID>StageDiffEdit()<CR>
-    nnoremap <buffer> <silent> dv :<C-U>execute <SID>StageDiff('Gvdiff')<CR>
-    nnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>
-    xnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
-    nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
-    nnoremap <buffer> <silent> r :<C-U>edit<CR>
-    nnoremap <buffer> <silent> R :<C-U>edit<CR>
-    nnoremap <buffer> <silent> U :<C-U>execute <SID>StageUndo()<CR>
-    nnoremap <buffer> <silent> g?   :help fugitive-:Gstatus<CR>
-    nnoremap <buffer> <silent> <F1> :help fugitive-:Gstatus<CR>
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-function! s:FileRead() abort
-  try
-    let repo = s:repo(fugitive#extract_git_dir(expand('<amatch>')))
-    let path = s:sub(s:sub(matchstr(expand('<amatch>'),'fugitive://.\{-\}//\zs.*'),'/',':'),'^\d:',':&')
-    let hash = repo.rev_parse(path)
-    if path =~ '^:'
-      let type = 'blob'
-    else
-      let type = repo.git_chomp('cat-file','-t',hash)
-    endif
-    " TODO: use count, if possible
-    return "read !".escape(repo.git_command('cat-file',type,hash),'%#\')
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-function! s:BufReadIndexFile() abort
-  try
-    let b:fugitive_type = 'blob'
-    let b:git_dir = s:repo().dir()
-    try
-      call s:ReplaceCmd(s:repo().git_command('cat-file','blob',s:buffer().sha1()))
-    finally
-      if &bufhidden ==# ''
-        setlocal bufhidden=delete
-      endif
-      setlocal noswapfile
-    endtry
-    return ''
-  catch /^fugitive: rev-parse/
-    silent exe 'doau BufNewFile '.s:fnameescape(expand('%:p'))
-    return ''
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-function! s:BufWriteIndexFile() abort
-  let tmp = tempname()
-  try
-    let path = matchstr(expand('<amatch>'),'//\d/\zs.*')
-    let stage = matchstr(expand('<amatch>'),'//\zs\d')
-    silent execute 'write !'.s:repo().git_command('hash-object','-w','--stdin').' > '.tmp
-    let sha1 = readfile(tmp)[0]
-    let old_mode = matchstr(s:repo().git_chomp('ls-files','--stage',path),'^\d\+')
-    if old_mode == ''
-      let old_mode = executable(s:repo().tree(path)) ? '100755' : '100644'
-    endif
-    let info = old_mode.' '.sha1.' '.stage."\t".path
-    call writefile([info],tmp)
-    if s:winshell()
-      let error = system('type '.s:gsub(tmp,'/','\\').'|'.s:repo().git_command('update-index','--index-info'))
-    else
-      let error = system(s:repo().git_command('update-index','--index-info').' < '.tmp)
-    endif
-    if v:shell_error == 0
-      setlocal nomodified
-      if exists('#BufWritePost')
-        execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
-      endif
-      call fugitive#reload_status()
-      return ''
-    else
-      return 'echoerr '.string('fugitive: '.error)
-    endif
-  finally
-    call delete(tmp)
-  endtry
-endfunction
-
-function! s:BufReadObject() abort
-  try
-    setlocal noro ma
-    let b:git_dir = s:repo().dir()
-    let hash = s:buffer().sha1()
-    if !exists("b:fugitive_type")
-      let b:fugitive_type = s:repo().git_chomp('cat-file','-t',hash)
-    endif
-    if b:fugitive_type !~# '^\%(tag\|commit\|tree\|blob\)$'
-      return "echoerr 'fugitive: unrecognized git type'"
-    endif
-    let firstline = getline('.')
-    if !exists('b:fugitive_display_format') && b:fugitive_type != 'blob'
-      let b:fugitive_display_format = +getbufvar('#','fugitive_display_format')
-    endif
-
-    if b:fugitive_type !=# 'blob'
-      setlocal nomodeline
-    endif
-
-    let pos = getpos('.')
-    silent keepjumps %delete_
-    setlocal endofline
-
-    try
-      if b:fugitive_type ==# 'tree'
-        let b:fugitive_display_format = b:fugitive_display_format % 2
-        if b:fugitive_display_format
-          call s:ReplaceCmd(s:repo().git_command('ls-tree',hash))
-        else
-          call s:ReplaceCmd(s:repo().git_command('show','--no-color',hash))
-        endif
-      elseif b:fugitive_type ==# 'tag'
-        let b:fugitive_display_format = b:fugitive_display_format % 2
-        if b:fugitive_display_format
-          call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
-        else
-          call s:ReplaceCmd(s:repo().git_command('cat-file','-p',hash))
-        endif
-      elseif b:fugitive_type ==# 'commit'
-        let b:fugitive_display_format = b:fugitive_display_format % 2
-        if b:fugitive_display_format
-          call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
-        else
-          call s:ReplaceCmd(s:repo().git_command('show','--no-color','--pretty=format:tree %T%nparent %P%nauthor %an <%ae> %ad%ncommitter %cn <%ce> %cd%nencoding %e%n%n%s%n%n%b',hash))
-          keepjumps call search('^parent ')
-          if getline('.') ==# 'parent '
-            silent keepjumps delete_
-          else
-            silent keepjumps s/\%(^parent\)\@<! /\rparent /ge
-          endif
-          keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
-          if lnum
-            silent keepjumps delete_
-          end
-          keepjumps 1
-        endif
-      elseif b:fugitive_type ==# 'blob'
-        call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
-        setlocal nomodeline
-      endif
-    finally
-      keepjumps call setpos('.',pos)
-      setlocal ro noma nomod noswapfile
-      if &bufhidden ==# ''
-        setlocal bufhidden=delete
-      endif
-      if b:fugitive_type !=# 'blob'
-        setlocal filetype=git foldmethod=syntax
-        nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += v:count1<Bar>exe <SID>BufReadObject()<CR>
-        nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= v:count1<Bar>exe <SID>BufReadObject()<CR>
-      else
-        call s:JumpInit()
-      endif
-    endtry
-
-    return ''
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-augroup fugitive_files
-  autocmd!
-  autocmd BufReadCmd  index{,.lock}
-        \ if fugitive#is_git_dir(expand('<amatch>:p:h')) |
-        \   exe s:BufReadIndex() |
-        \ elseif filereadable(expand('<amatch>')) |
-        \   read <amatch> |
-        \   1delete |
-        \ endif
-  autocmd FileReadCmd fugitive://**//[0-3]/**          exe s:FileRead()
-  autocmd BufReadCmd  fugitive://**//[0-3]/**          exe s:BufReadIndexFile()
-  autocmd BufWriteCmd fugitive://**//[0-3]/**          exe s:BufWriteIndexFile()
-  autocmd BufReadCmd  fugitive://**//[0-9a-f][0-9a-f]* exe s:BufReadObject()
-  autocmd FileReadCmd fugitive://**//[0-9a-f][0-9a-f]* exe s:FileRead()
-  autocmd FileType git
-        \ if exists('b:git_dir') |
-        \  call s:JumpInit() |
-        \ endif
-augroup END
-
-" Section: Temp files
-
-if !exists('s:temp_files')
-  let s:temp_files = {}
-endif
-
-augroup fugitive_temp
-  autocmd!
-  autocmd BufNewFile,BufReadPost *
-        \ if has_key(s:temp_files,tolower(expand('<afile>:p'))) |
-        \   let b:git_dir = s:temp_files[tolower(expand('<afile>:p'))].dir |
-        \   let b:git_type = 'temp' |
-        \   let b:git_args = s:temp_files[tolower(expand('<afile>:p'))].args |
-        \   call fugitive#detect(expand('<afile>:p')) |
-        \   setlocal bufhidden=delete nobuflisted |
-        \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
-        \ endif
-augroup END
-
-" Section: Go to file
-
-function! s:JumpInit() abort
-  nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
-  if !&modifiable
-    nnoremap <buffer> <silent> o     :<C-U>exe <SID>GF("split")<CR>
-    nnoremap <buffer> <silent> S     :<C-U>exe <SID>GF("vsplit")<CR>
-    nnoremap <buffer> <silent> O     :<C-U>exe <SID>GF("tabedit")<CR>
-    nnoremap <buffer> <silent> -     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().up(v:count1))<Bar> if fugitive#buffer().type('tree')<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR>
-    nnoremap <buffer> <silent> P     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().commit().'^'.v:count1.<SID>buffer().path(':'))<CR>
-    nnoremap <buffer> <silent> ~     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().commit().'~'.v:count1.<SID>buffer().path(':'))<CR>
-    nnoremap <buffer> <silent> C     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer> <silent> cc    :<C-U>exe <SID>Edit('edit',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer> <silent> co    :<C-U>exe <SID>Edit('split',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer> <silent> cS    :<C-U>exe <SID>Edit('vsplit',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer> <silent> cO    :<C-U>exe <SID>Edit('tabedit',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer> <silent> cP    :<C-U>exe <SID>Edit('pedit',0,<SID>buffer().containing_commit())<CR>
-    nnoremap <buffer>          .     : <C-R>=fnameescape(<SID>recall())<CR><Home>
-  endif
-endfunction
-
-function! s:GF(mode) abort
-  try
-    let buffer = s:buffer()
-    let myhash = buffer.sha1()
-    if myhash ==# '' && getline(1) =~# '^\%(commit\|tag\) \w'
-      let myhash = matchstr(getline(1),'^\w\+ \zs\S\+')
-    endif
-
-    if buffer.type('tree')
-      let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
-      if showtree && line('.') == 1
-        return ""
-      elseif showtree && line('.') > 2
-        return s:Edit(a:mode,0,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$',''))
-      elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t'
-        return s:Edit(a:mode,0,buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$',''))
-      endif
-
-    elseif buffer.type('blob')
-      let ref = expand("<cfile>")
-      try
-        let sha1 = buffer.repo().rev_parse(ref)
-      catch /^fugitive:/
-      endtry
-      if exists('sha1')
-        return s:Edit(a:mode,0,ref)
-      endif
-
-    else
-
-      " Index
-      if getline('.') =~# '^\d\{6\} \x\{40\} \d\t'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':')
-        return s:Edit(a:mode,0,file)
-
-      elseif getline('.') =~# '^#\trenamed:.* -> '
-        let file = '/'.matchstr(getline('.'),' -> \zs.*')
-        return s:Edit(a:mode,0,file)
-      elseif getline('.') =~# '^#\t[[:alpha:] ]\+: *.'
-        let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
-        return s:Edit(a:mode,0,file)
-      elseif getline('.') =~# '^#\t.'
-        let file = '/'.matchstr(getline('.'),'#\t\zs.*')
-        return s:Edit(a:mode,0,file)
-      elseif getline('.') =~# ': needs merge$'
-        let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$')
-        return s:Edit(a:mode,0,file).'|Gdiff'
-
-      elseif getline('.') ==# '# Not currently on any branch.'
-        return s:Edit(a:mode,0,'HEAD')
-      elseif getline('.') =~# '^# On branch '
-        let file = 'refs/heads/'.getline('.')[12:]
-        return s:Edit(a:mode,0,file)
-      elseif getline('.') =~# "^# Your branch .*'"
-        let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'")
-        return s:Edit(a:mode,0,file)
-      endif
-
-      let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
-
-      if getline('.') =~# '^ref: '
-        let ref = strpart(getline('.'),5)
-
-      elseif getline('.') =~# '^commit \x\{40\}\>'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        return s:Edit(a:mode,0,ref)
-
-      elseif getline('.') =~# '^parent \x\{40\}\>'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        let line = line('.')
-        let parent = 0
-        while getline(line) =~# '^parent '
-          let parent += 1
-          let line -= 1
-        endwhile
-        return s:Edit(a:mode,0,ref)
-
-      elseif getline('.') =~ '^tree \x\{40\}$'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        if s:repo().rev_parse(myhash.':') == ref
-          let ref = myhash.':'
-        endif
-        return s:Edit(a:mode,0,ref)
-
-      elseif getline('.') =~# '^object \x\{40\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        let type = matchstr(getline(line('.')+1),'type \zs.*')
-
-      elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$'
-        return ''
-
-      elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>'
-        let ref = matchstr(getline('.'),'\x\{40\}')
-        echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*')
-
-      elseif getline('.') =~# '^[+-]\{3\} [ab/]'
-        let ref = getline('.')[4:]
-
-      elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW')
-        let type = getline('.')[0]
-        let lnum = line('.') - 1
-        let offset = -1
-        while getline(lnum) !~# '^@@ -\d\+,\d\+ +\d\+,'
-          if getline(lnum) =~# '^[ '.type.']'
-            let offset += 1
-          endif
-          let lnum -= 1
-        endwhile
-        let offset += matchstr(getline(lnum), type.'\zs\d\+')
-        let ref = getline(search('^'.type.'\{3\} [ab]/','bnW'))[4:-1]
-        let dcmd = '+'.offset.'|normal! zv'
-        let dref = ''
-
-      elseif getline('.') =~# '^rename from '
-        let ref = 'a/'.getline('.')[12:]
-      elseif getline('.') =~# '^rename to '
-        let ref = 'b/'.getline('.')[10:]
-
-      elseif getline('.') =~# '^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)'
-        let dref = matchstr(getline('.'),'\Cdiff --git \zs\%(a/.*\|/dev/null\)\ze \%(b/.*\|/dev/null\)')
-        let ref = matchstr(getline('.'),'\Cdiff --git \%(a/.*\|/dev/null\) \zs\%(b/.*\|/dev/null\)')
-        let dcmd = 'Gdiff'
-
-      elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%(a/.*\|/dev/null\) \%(b/.*\|/dev/null\)'
-        let line = getline(line('.')-1)
-        let dref = matchstr(line,'\Cdiff --git \zs\%(a/.*\|/dev/null\)\ze \%(b/.*\|/dev/null\)')
-        let ref = matchstr(line,'\Cdiff --git \%(a/.*\|/dev/null\) \zs\%(b/.*\|/dev/null\)')
-        let dcmd = 'Gdiff!'
-
-      elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$'
-        let ref = getline('.')
-
-      elseif expand('<cword>') =~# '^\x\{7,40\}\>'
-        return s:Edit(a:mode,0,expand('<cword>'))
-
-      else
-        let ref = ''
-      endif
-
-      if myhash ==# ''
-        let ref = s:sub(ref,'^a/','HEAD:')
-        let ref = s:sub(ref,'^b/',':0:')
-        if exists('dref')
-          let dref = s:sub(dref,'^a/','HEAD:')
-        endif
-      else
-        let ref = s:sub(ref,'^a/',myhash.'^:')
-        let ref = s:sub(ref,'^b/',myhash.':')
-        if exists('dref')
-          let dref = s:sub(dref,'^a/',myhash.'^:')
-        endif
-      endif
-
-      if ref ==# '/dev/null'
-        " Empty blob
-        let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
-      endif
-
-      if exists('dref')
-        return s:Edit(a:mode,0,ref) . '|'.dcmd.' '.s:fnameescape(dref)
-      elseif ref != ""
-        return s:Edit(a:mode,0,ref)
-      endif
-
-    endif
-    return ''
-  catch /^fugitive:/
-    return 'echoerr v:errmsg'
-  endtry
-endfunction
-
-" Section: Statusline
-
-function! s:repo_head_ref() dict abort
-  if !filereadable(self.dir('HEAD'))
-    return ''
-  endif
-  return readfile(self.dir('HEAD'))[0]
-endfunction
-
-call s:add_methods('repo',['head_ref'])
-
-function! fugitive#statusline(...) abort
-  if !exists('b:git_dir')
-    return ''
-  endif
-  let status = ''
-  if s:buffer().commit() != ''
-    let status .= ':' . s:buffer().commit()[0:7]
-  endif
-  let status .= '('.fugitive#head(7).')'
-  if &statusline =~# '%[MRHWY]' && &statusline !~# '%[mrhwy]'
-    return ',GIT'.status
-  else
-    return '[Git'.status.']'
-  endif
-endfunction
-
-function! fugitive#head(...) abort
-  if !exists('b:git_dir')
-    return ''
-  endif
-
-  return s:repo().head(a:0 ? a:1 : 0)
-endfunction
-
-" Section: Folding
-
-function! fugitive#foldtext() abort
-  if &foldmethod !=# 'syntax'
-    return foldtext()
-  elseif getline(v:foldstart) =~# '^diff '
-    let [add, remove] = [-1, -1]
-    let filename = ''
-    for lnum in range(v:foldstart, v:foldend)
-      if filename ==# '' && getline(lnum) =~# '^[+-]\{3\} [abciow12]/'
-        let filename = getline(lnum)[6:-1]
-      endif
-      if getline(lnum) =~# '^+'
-        let add += 1
-      elseif getline(lnum) =~# '^-'
-        let remove += 1
-      elseif getline(lnum) =~# '^Binary '
-        let binary = 1
-      endif
-    endfor
-    if filename ==# ''
-      let filename = matchstr(getline(v:foldstart), '^diff .\{-\} a/\zs.*\ze b/')
-    endif
-    if filename ==# ''
-      let filename = getline(v:foldstart)[5:-1]
-    endif
-    if exists('binary')
-      return 'Binary: '.filename
-    else
-      return (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename
-    endif
-  elseif getline(v:foldstart) =~# '^# .*:$'
-    let lines = getline(v:foldstart, v:foldend)
-    call filter(lines, 'v:val =~# "^#\t"')
-    cal map(lines,'s:sub(v:val, "^#\t%(modified: +|renamed: +)=", "")')
-    cal map(lines,'s:sub(v:val, "^([[:alpha:] ]+): +(.*)", "\\2 (\\1)")')
-    return getline(v:foldstart).' '.join(lines, ', ')
-  endif
-  return foldtext()
-endfunction
-
-augroup fugitive_foldtext
-  autocmd!
-  autocmd User Fugitive
-        \ if &filetype =~# '^git\%(commit\)\=$' && &foldtext ==# 'foldtext()' |
-        \    set foldtext=fugitive#foldtext() |
-        \ endif
-augroup END
diff --git a/bundle/javascript/CONTRIBUTING.md b/bundle/javascript/CONTRIBUTING.md
deleted file mode 100755
index c47cbc8..0000000
--- a/bundle/javascript/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-## Contributing
-
-This project uses the [git
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
-development. There's [a handy git module for git
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
-the price of admission is 1 pull request. Please follow the general code style
-guides (read the code) and in your pull request explain the reason for the
-proposed change and how it is valuable.
-
-## Pull Requests
-
-Please make your pull requests against the `develop` branch; we stage changes
-for testing there to avoid unexpected breakages for our users. :)
-
-## Bug report
-
-Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
diff --git a/bundle/javascript/README.md b/bundle/javascript/README.md
deleted file mode 100755
index 1cc50ae..0000000
--- a/bundle/javascript/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# vim-javascript v0.10.0
-
-JavaScript bundle for vim, this bundle provides syntax and indent plugins.
-
-## A Quick Note on Regexes
-
-Vim 7.4 was released recently, and unfortunately broke how this plugin
-handles regexes. There was no real easy way for us to fix this unless we
-completely rewrote how regexes work.
-
-Good News: There was a recent update to Vim 7.4 that fixes this issue.
-
-Make sure you are at least using Vim 7.4, with patches 1-7.
-
-If you are stuck on an older version of Vim 7.4 with no way to update,
-then simply perform the following commands to fix your current buffer:
-
-```
-:set regexpengine=1
-:syntax enable
-```
-
-## Installation
-
-### Install with [Vundle](https://github.com/gmarik/vundle)
-
-Add to vimrc:
-
-    Plugin 'pangloss/vim-javascript'
-
-And install it:
-
-    :so ~/.vimrc
-    :PluginInstall
-
-### Install with [pathogen](https://github.com/tpope/vim-pathogen)
-
-      cd ~/.vim/bundle
-      git clone https://github.com/pangloss/vim-javascript.git
-
-## Configuration
-
-The following variables control certain syntax highlighting features. You can
-add them to your `.vimrc` to enable/disable their features.
-
-#### javascript_enable_domhtmlcss
-
-Enables HTML/CSS syntax highlighting in your JavaScript file.
-
-Default Value: 0
-
-#### b:javascript_fold
-
-Enables JavaScript code folding.
-
-Default Value: 1
-
-
-#### javascript_ignore_javaScriptdoc
-
-Disables JSDoc syntax highlighting
-
-Default Value: 0
-
-#### Concealing Characters
-
-You can customize concealing characters by defining one or more of the following
-variables:
-
-    let g:javascript_conceal_function   = "ƒ"
-    let g:javascript_conceal_null       = "ø"
-    let g:javascript_conceal_this       = "@"
-    let g:javascript_conceal_return     = "⇚"
-    let g:javascript_conceal_undefined  = "¿"
-    let g:javascript_conceal_NaN        = "ℕ"
-    let g:javascript_conceal_prototype  = "¶"
-    let g:javascript_conceal_static     = "•"
-    let g:javascript_conceal_super      = "Ω"
-
-## Contributing
-
-This project uses the [git
-flow](http://nvie.com/posts/a-successful-git-branching-model/) model for
-development. There's [a handy git module for git
-flow](//github.com/nvie/gitflow). If you'd like to be added as a contributor,
-the price of admission is 1 pull request. Please follow the general code style
-guides (read the code) and in your pull request explain the reason for the
-proposed change and how it is valuable.
-
-## Bug report
-
-Report a bug on [GitHub Issues](https://github.com/pangloss/vim-javascript/issues).
diff --git a/bundle/javascript/ftdetect/javascript.vim b/bundle/javascript/ftdetect/javascript.vim
deleted file mode 100755
index 036b352..0000000
--- a/bundle/javascript/ftdetect/javascript.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-au BufNewFile,BufRead *.js setf javascript
-au BufNewFile,BufRead *.jsm setf javascript
-au BufNewFile,BufRead Jakefile setf javascript
-
-fun! s:SelectJavascript()
-  if getline(1) =~# '^#!.*/bin/env\s\+node\>'
-    set ft=javascript
-  endif
-endfun
-au BufNewFile,BufRead * call s:SelectJavascript()
diff --git a/bundle/javascript/ftplugin/javascript.vim b/bundle/javascript/ftplugin/javascript.vim
deleted file mode 100755
index 9e2fc9b..0000000
--- a/bundle/javascript/ftplugin/javascript.vim
+++ /dev/null
@@ -1 +0,0 @@
-setlocal suffixesadd+=.js
diff --git a/bundle/javascript/indent/javascript.vim b/bundle/javascript/indent/javascript.vim
deleted file mode 100755
index 0f526db..0000000
--- a/bundle/javascript/indent/javascript.vim
+++ /dev/null
@@ -1,529 +0,0 @@
-" Vim indent file
-" Language: Javascript
-" Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
-
-" 0. Initialization {{{1
-" =================
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal nosmartindent
-
-" Now, set up our indentation expression and keys that trigger it.
-setlocal indentexpr=GetJavascriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
-setlocal indentkeys=0{,0},0),0],0\,:,!^F,o,O,e
-
-" Only define the function once.
-if exists("*GetJavascriptIndent")
-  finish
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" 1. Variables {{{1
-" ============
-
-let s:js_keywords = '^\s*\(break\|catch\|const\|continue\|debugger\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
-let s:expr_case = '^\s*\(case\s\+[^\:]*\|default\)\s*:\s*'
-" Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|regex\|comment\c'
-
-" Regex of syntax group names that are strings.
-let s:syng_string = 'regex\c'
-
-" Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'comment\c'
-
-" Regex of syntax group names that are line comment.
-let s:syng_linecom = 'linecomment\c'
-
-" Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
-
-let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
-
-" Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=].*,\)' . s:line_term
-
-" Regex that defines continuation lines.
-" TODO: this needs to deal with if ...: and so on
-let s:msl_regex = s:continuation_regex.'|'.s:expr_case
-
-let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
-
-" Regex that defines blocks.
-let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
-
-let s:var_stmt = '^\s*(const\|let\|var)'
-
-let s:comma_first = '^\s*,'
-let s:comma_last = ',\s*$'
-
-let s:ternary = '^\s\+[?|:]'
-let s:ternary_q = '^\s\+?'
-
-let s:case_indent = &sw
-let s:case_indent_after = &sw
-let m = matchlist(&cinoptions, ':\(.\)')
-if (len(m) > 2)
-    let s:case_indent = m[1]
-endif
-let m = matchlist(&cinoptions, '=\(.\)')
-if (len(m) > 2)
-    let s:case_indent_after = m[1]
-endif
-" 2. Auxiliary Functions {{{1
-" ======================
-
-" Check if the character at lnum:col is inside a string, comment, or is ascii.
-function s:IsInStringOrComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
-endfunction
-
-" Check if the character at lnum:col is inside a string.
-function s:IsInString(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
-endfunction
-
-" Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInMultilineComment(lnum, col)
-  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
-endfunction
-
-" Check if the character at lnum:col is a line comment.
-function s:IsLineComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
-endfunction
-
-" Find line above 'lnum' that isn't empty, in a comment, or in a string.
-function s:PrevNonBlankNonString(lnum)
-  let in_block = 0
-  let lnum = prevnonblank(a:lnum)
-  while lnum > 0
-    " Go in and out of blocks comments as necessary.
-    " If the line isn't empty (with opt. comment) or in a string, end search.
-    let line = getline(lnum)
-    if line =~ '/\*'
-      if in_block
-        let in_block = 0
-      else
-        break
-      endif
-    elseif !in_block && line =~ '\*/'
-      let in_block = 1
-    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
-      break
-    endif
-    let lnum = prevnonblank(lnum - 1)
-  endwhile
-  return lnum
-endfunction
-
-" Find line above 'lnum' that started the continuation 'lnum' may be part of.
-function s:GetMSL(lnum, in_one_line_scope)
-  " Start on the line we're at and use its indent.
-  let msl = a:lnum
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  while lnum > 0
-    " If we have a continuation line, or we're in a string, use line as MSL.
-    " Otherwise, terminate search as we have found our MSL already.
-    let line = getline(lnum)
-    let col = match(line, s:msl_regex) + 1
-    if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
-      let msl = lnum
-    else
-      " Don't use lines that are part of a one line scope as msl unless the
-      " flag in_one_line_scope is set to 1
-      "
-      if a:in_one_line_scope
-        break
-      end
-      let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
-      if msl_one_line == 0
-        break
-      endif
-    endif
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-  endwhile
-  return msl
-endfunction
-
-function s:RemoveTrailingComments(content)
-  let single = '\/\/\(.*\)\s*$'
-  let multi = '\/\*\(.*\)\*\/\s*$'
-  return substitute(substitute(a:content, single, '', ''), multi, '', '')
-endfunction
-
-" Find if the string is inside var statement (but not the first string)
-function s:InMultiVarStatement(lnum)
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-
-"  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
-
-  " loop through previous expressions to find a var statement
-  while lnum > 0
-    let line = getline(lnum)
-
-    " if the line is a js keyword
-    if (line =~ s:js_keywords)
-      " check if the line is a var stmt
-      " if the line has a comma first or comma last then we can assume that we
-      " are in a multiple var statement
-      if (line =~ s:var_stmt)
-        return lnum
-      endif
-
-      " other js keywords, not a var
-      return 0
-    endif
-
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-  endwhile
-
-  " beginning of program, not a var
-  return 0
-endfunction
-
-" Find line above with beginning of the var statement or returns 0 if it's not
-" this statement
-function s:GetVarIndent(lnum)
-  let lvar = s:InMultiVarStatement(a:lnum)
-  let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
-
-  if lvar
-    let line = s:RemoveTrailingComments(getline(prev_lnum))
-
-    " if the previous line doesn't end in a comma, return to regular indent
-    if (line !~ s:comma_last)
-      return indent(prev_lnum) - &sw
-    else
-      return indent(lvar) + &sw
-    endif
-  endif
-
-  return -1
-endfunction
-
-
-" Check if line 'lnum' has more opening brackets than closing ones.
-function s:LineHasOpeningBrackets(lnum)
-  let open_0 = 0
-  let open_2 = 0
-  let open_4 = 0
-  let line = getline(a:lnum)
-  let pos = match(line, '[][(){}]', 0)
-  while pos != -1
-    if !s:IsInStringOrComment(a:lnum, pos + 1)
-      let idx = stridx('(){}[]', line[pos])
-      if idx % 2 == 0
-        let open_{idx} = open_{idx} + 1
-      else
-        let open_{idx - 1} = open_{idx - 1} - 1
-      endif
-    endif
-    let pos = match(line, '[][(){}]', pos + 1)
-  endwhile
-  return (open_0 > 0) . (open_2 > 0) . (open_4 > 0)
-endfunction
-
-function s:Match(lnum, regex)
-  let col = match(getline(a:lnum), a:regex) + 1
-  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
-endfunction
-
-function s:IndentWithContinuation(lnum, ind, width)
-  " Set up variables to use and search for MSL to the previous line.
-  let p_lnum = a:lnum
-  let lnum = s:GetMSL(a:lnum, 1)
-  let line = getline(lnum)
-
-  " If the previous line wasn't a MSL and is continuation return its indent.
-  " TODO: the || s:IsInString() thing worries me a bit.
-  if p_lnum != lnum
-    if s:Match(p_lnum,s:continuation_regex)||s:IsInString(p_lnum,strlen(line))
-      return a:ind
-    endif
-  endif
-
-  " Set up more variables now that we know we aren't continuation bound.
-  let msl_ind = indent(lnum)
-
-  " If the previous line ended with [*+/.-=], start a continuation that
-  " indents an extra level.
-  if s:Match(lnum, s:continuation_regex)
-    if lnum == p_lnum
-      return msl_ind + a:width
-    else
-      return msl_ind
-    endif
-  endif
-
-  return a:ind
-endfunction
-
-function s:InOneLineScope(lnum)
-  let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0 && s:Match(msl, s:one_line_scope_regex)
-    return msl
-  endif
-  return 0
-endfunction
-
-function s:ExitingOneLineScope(lnum)
-  let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0
-    " if the current line is in a one line scope ..
-    if s:Match(msl, s:one_line_scope_regex)
-      return 0
-    else
-      let prev_msl = s:GetMSL(msl - 1, 1)
-      if s:Match(prev_msl, s:one_line_scope_regex)
-        return prev_msl
-      endif
-    endif
-  endif
-  return 0
-endfunction
-
-" 3. GetJavascriptIndent Function {{{1
-" =========================
-
-function GetJavascriptIndent()
-  " 3.1. Setup {{{2
-  " ----------
-
-  " Set up variables for restoring position in file.  Could use v:lnum here.
-  let vcol = col('.')
-
-  " 3.2. Work on the current line {{{2
-  " -----------------------------
-
-  let ind = -1
-  " Get the current line.
-  let line = getline(v:lnum)
-  " previous nonblank line number
-  let prevline = prevnonblank(v:lnum - 1)
-
-  if (line =~ s:expr_case)
-    if (getline(prevline) =~ s:expr_case)
-      return indent(prevline)
-    else
-      if (getline(prevline) =~ s:block_regex)
-        return indent(prevline) + s:case_indent
-      else
-        return indent(prevline) - s:case_indent_after
-      endif
-    endif
-  endif
-  " If we got a closing bracket on an empty line, find its match and indent
-  " according to it.  For parentheses we indent to its column - 1, for the
-  " others we indent to the containing line's MSL's level.  Return -1 if fail.
-  let col = matchend(line, '^\s*[],})]')
-  if col > 0 && !s:IsInStringOrComment(v:lnum, col)
-    call cursor(v:lnum, col)
-
-    let lvar = s:InMultiVarStatement(v:lnum)
-    if lvar
-      let prevline_contents = s:RemoveTrailingComments(getline(prevline))
-
-      " check for comma first
-      if (line[col - 1] =~ ',')
-        " if the previous line ends in comma or semicolon don't indent
-        if (prevline_contents =~ '[;,]\s*$')
-          return indent(s:GetMSL(line('.'), 0))
-        " get previous line indent, if it's comma first return prevline indent
-        elseif (prevline_contents =~ s:comma_first)
-          return indent(prevline)
-        " otherwise we indent 1 level
-        else
-          return indent(lvar) + &sw
-        endif
-      endif
-    endif
-
-
-    let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
-    if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
-      if line[col-1]==')' && col('.') != col('$') - 1
-        let ind = virtcol('.')-1
-      else
-        let ind = indent(s:GetMSL(line('.'), 0))
-      endif
-    endif
-    return ind
-  endif
-
-  " If the line is comma first, dedent 1 level
-  if (getline(prevline) =~ s:comma_first)
-    return indent(prevline) - &sw
-  endif
-  if (getline(prevline) =~ s:expr_case)
-    return indent(prevline) + s:case_indent_after
-  endif
-
-  if (line =~ s:ternary)
-    if (getline(prevline) =~ s:ternary_q)
-      return indent(prevline)
-    else
-      return indent(prevline) + &sw
-    endif
-  endif
-
-  " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
-    return cindent(v:lnum)
-  endif
-
-  " Check for multiple var assignments
-"  let var_indent = s:GetVarIndent(v:lnum)
-"  if var_indent >= 0
-"    return var_indent
-"  endif
-
-  " 3.3. Work on the previous line. {{{2
-  " -------------------------------
-
-  " If the line is empty and the previous nonblank line was a multi-line
-  " comment, use that comment's indent. Deduct one char to account for the
-  " space in ' */'.
-  if line =~ '^\s*$' && s:IsInMultilineComment(prevline, 1)
-    return indent(prevline) - 1
-  endif
-
-  " Find a non-blank, non-multi-line string line above the current line.
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
-
-  " If the line is empty and inside a string, use the previous line.
-  if line =~ '^\s*$' && lnum != prevline
-    return indent(prevnonblank(v:lnum))
-  endif
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-
-  " If the previous line ended with a block opening, add a level of indent.
-  if s:Match(lnum, s:block_regex)
-    if (line =~ s:expr_case)
-      return indent(s:GetMSL(lnum, 0)) + &sw/2
-    else
-      return indent(s:GetMSL(lnum, 0)) + &sw
-    endif
-  endif
-
-  " Set up variables for current line.
-  let line = getline(lnum)
-  let ind = indent(lnum)
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if line =~ '[[({]'
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-      if col('.') + 1 == col('$')
-        return ind + &sw
-      else
-        return virtcol('.')
-      endif
-    elseif counts[1] == '1' || counts[2] == '1'
-      return ind + &sw
-    else
-      call cursor(v:lnum, vcol)
-    end
-  endif
-
-  " 3.4. Work on the MSL line. {{{2
-  " --------------------------
-
-  let ind_con = ind
-  let ind = s:IndentWithContinuation(lnum, ind_con, &sw)
-
-  " }}}2
-  "
-  "
-  let ols = s:InOneLineScope(lnum)
-  if ols > 0
-    let ind = ind + &sw
-  else
-    let ols = s:ExitingOneLineScope(lnum)
-    while ols > 0 && ind > 0
-      let ind = ind - &sw
-      let ols = s:InOneLineScope(ols - 1)
-    endwhile
-  endif
-
-  return ind
-endfunction
-
-" }}}1
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-function! Fixedgq(lnum, count)
-    let l:tw = &tw ? &tw : 80;
-
-    let l:count = a:count
-    let l:first_char = indent(a:lnum) + 1
-
-    if mode() == 'i' " gq was not pressed, but tw was set
-        return 1
-    endif
-
-    " This gq is only meant to do code with strings, not comments
-    if s:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(a:lnum, l:first_char)
-        return 1
-    endif
-
-    if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
-        return 1
-    endif
-
-    " Put all the lines on one line and do normal spliting after that
-    if l:count > 1
-        while l:count > 1
-            let l:count -= 1
-            normal J
-        endwhile
-    endif
-
-    let l:winview = winsaveview()
-
-    call cursor(a:lnum, l:tw + 1)
-    let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-    call cursor(a:lnum, l:tw + 1)
-    let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
-
-    " No need for special treatment, normal gq handles edgecases better
-    if breakpoint[1] == orig_breakpoint[1]
-        call winrestview(l:winview)
-        return 1
-    endif
-
-    " Try breaking after string
-    if breakpoint[1] <= indent(a:lnum)
-        call cursor(a:lnum, l:tw + 1)
-        let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
-    endif
-
-
-    if breakpoint[1] != 0
-        call feedkeys("r\<CR>")
-    else
-        let l:count = l:count - 1
-    endif
-
-    " run gq on new lines
-    if l:count == 1
-        call feedkeys("gqq")
-    endif
-
-    return 0
-endfunction
diff --git a/bundle/javascript/syntax/javascript.vim b/bundle/javascript/syntax/javascript.vim
deleted file mode 100755
index d49cd02..0000000
--- a/bundle/javascript/syntax/javascript.vim
+++ /dev/null
@@ -1,336 +0,0 @@
-" Vim syntax file
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = 'javascript'
-endif
-
-if !exists('g:javascript_conceal')
-  let g:javascript_conceal = 0
-endif
-
-"" Drop fold if it is set but VIM doesn't support it.
-let b:javascript_fold='true'
-if version < 600    " Don't support the old version
-  unlet! b:javascript_fold
-endif
-
-"" dollar sign is permittd anywhere in an identifier
-setlocal iskeyword+=$
-
-syntax sync fromstart
-
-syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
-
-"" Program Keywords
-syntax keyword jsStorageClass   const var let
-syntax keyword jsOperator       delete instanceof typeof void new in
-syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
-syntax keyword jsBooleanTrue    true
-syntax keyword jsBooleanFalse   false
-syntax keyword jsModules        import export contained
-syntax keyword jsModuleWords    default from as contained
-syntax keyword jsOf             of contained
-syntax keyword jsArgsObj        arguments
-
-syntax region jsImportContainer      start="^\s\?import \?" end=";\|$" contains=jsModules,jsModuleWords,jsLineComment,jsComment,jsStringS,jsStringD,jsTemplateString,jsNoise,jsBlock
-
-syntax region jsExportContainer      start="^\s\?export \?" end="$" contains=jsModules,jsModuleWords,jsComment,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsClass,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsAssignmentExpr,jsArgsObj,jsBlock
-
-"" JavaScript comments
-syntax keyword jsCommentTodo    TODO FIXME XXX TBD contained
-syntax region  jsLineComment    start=+\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell
-syntax region  jsEnvComment     start="\%^#!" end="$" display
-syntax region  jsLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend contains=jsCommentTodo,@Spell fold
-syntax region  jsCvsTag         start="\$\cid:" end="\$" oneline contained
-syntax region  jsComment        start="/\*"  end="\*/" contains=jsCommentTodo,jsCvsTag,@Spell fold
-
-"" JSDoc / JSDoc Toolkit
-if !exists("javascript_ignore_javaScriptdoc")
-  syntax case ignore
-
-  "" syntax coloring for javadoc comments (HTML)
-  "syntax include @javaHtml <sfile>:p:h/html.vim
-  "unlet b:current_syntax
-
-  syntax region jsBlockComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
-
-  " tags containing a param
-  syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|file\|fires\|kind\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" nextgroup=jsDocParam skipwhite
-  " tags containing type and param
-  syntax match  jsDocTags         contained "@\(arg\|argument\|param\|property\|prop\)\>" nextgroup=jsDocType skipwhite
-  " tags containing type but no param
-  syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" nextgroup=jsDocTypeNoParam skipwhite
-  " tags containing references
-  syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" nextgroup=jsDocSeeTag skipwhite
-  " other tags (no extra syntax)
-  syntax match  jsDocTags         contained "@\(abstract\|access\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
-
-  syntax region jsDocType         start="{" end="}" oneline contained nextgroup=jsDocParam skipwhite
-  syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
-  syntax region jsDocTypeNoParam  start="{" end="}" oneline contained
-  syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-  syntax match  jsDocParam        contained "\%(#\|\"\|{\|}\|\w\|\.\|:\|\/\|\[\|]\|=\)\+"
-  syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
-
-  syntax case match
-endif   "" JSDoc end
-
-syntax case match
-
-"" Syntax in the JavaScript code
-syntax match   jsFuncCall         /\k\+\%(\s*(\)\@=/
-syntax match   jsSpecial          "\v\\%(0|\\x\x\{2\}\|\\u\x\{4\}\|\c[A-Z]|.)" contained
-syntax match   jsTemplateVar      "\${.\{-}}" contained
-syntax region  jsStringD          start=+"+  skip=+\\\("\|$\)+  end=+"\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsStringS          start=+'+  skip=+\\\('\|$\)+  end=+'\|$+  contains=jsSpecial,@htmlPreproc,@Spell
-syntax region  jsTemplateString   start=+`+  skip=+\\\(`\|$\)+  end=+`+     contains=jsTemplateVar,jsSpecial,@htmlPreproc
-syntax region  jsTaggedTemplate   start=/\k\+\(\(\n\|\s\)\+\)\?`/ end=+`+ contains=jsTemplateString keepend
-syntax region  jsRegexpCharClass  start=+\[+ skip=+\\.+ end=+\]+ contained
-syntax match   jsRegexpBoundary   "\v%(\<@![\^$]|\\[bB])" contained
-syntax match   jsRegexpBackRef    "\v\\[1-9][0-9]*" contained
-syntax match   jsRegexpQuantifier "\v\\@<!%([?*+]|\{\d+%(,|,\d+)?})\??" contained
-syntax match   jsRegexpOr         "\v\<@!\|" contained
-syntax match   jsRegexpMod        "\v\(@<=\?[:=!>]" contained
-syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
-syntax region  jsRegexpGroup      start="\\\@<!(" skip="\\.\|\[\(\\.\|[^]]\)*\]" end="\\\@<!)" contained contains=jsRegexpCharClass,@jsRegexpSpecial keepend
-syntax region  jsRegexpString     start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]"']\|\d\|\w\)\s*\)\@<!\)/\(\*\|/\)\@!+ skip=+\\.\|\[\(\\.\|[^]]\)*\]+ end=+/[gimy]\{,4}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial,@htmlPreproc oneline keepend
-syntax match   jsNumber           /\<-\=\d\+\(L\|[eE][+-]\=\d\+\)\=\>\|\<0[xX]\x\+\>/
-syntax keyword jsNumber           Infinity
-syntax match   jsFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey        /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey contained
-syntax match   jsFunctionKey      /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained
-syntax match   jsDecorator        "@" display contains=jsDecoratorFunction nextgroup=jsDecoratorFunction skipwhite
-syntax match   jsDecoratorFunction "[a-zA-Z_][a-zA-Z0-9_.]*" display contained nextgroup=jsFunc skipwhite
-
-syntax match   jsAssignmentExpr     /\v%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\(>\)\@!/ contains=jsFuncAssignExpr,jsAssignExpIdent,jsPrototype,jsOperator,jsThis,jsNoise,jsArgsObj
-syntax match   jsAssignExpIdent     /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
-syntax match   jsFuncAssignExpr     /\v%(%([a-zA-Z_$]\k*\.)*[a-zA-Z_$]\k*\s*\=\s*){-1,}\ze%(function\s*\*?\s*\()/ contains=jsFuncAssignObjChain,jsFuncAssignIdent,jsFunction,jsPrototype,jsOperator,jsThis,jsArgsObj contained
-syntax match   jsFuncAssignObjChain /\v%([a-zA-Z_$]\k*\.)+/ contains=jsPrototype,jsNoise contained
-syntax match   jsFuncAssignIdent    /\v[a-zA-Z_$]\k*\ze%(\s*\=)/ contained
-
-exe 'syntax keyword jsNull      null      '.(exists('g:javascript_conceal_null')        ? 'conceal cchar='.g:javascript_conceal_null        : '')
-exe 'syntax keyword jsReturn    return    '.(exists('g:javascript_conceal_return')      ? 'conceal cchar='.g:javascript_conceal_return      : '')
-exe 'syntax keyword jsUndefined undefined '.(exists('g:javascript_conceal_undefined')   ? 'conceal cchar='.g:javascript_conceal_undefined   : '')
-exe 'syntax keyword jsNan       NaN       '.(exists('g:javascript_conceal_NaN')         ? 'conceal cchar='.g:javascript_conceal_NaN         : '')
-exe 'syntax keyword jsPrototype prototype '.(exists('g:javascript_conceal_prototype')   ? 'conceal cchar='.g:javascript_conceal_prototype   : '')
-exe 'syntax keyword jsThis      this      '.(exists('g:javascript_conceal_this')        ? 'conceal cchar='.g:javascript_conceal_this        : '')
-exe 'syntax keyword jsStatic    static    '.(exists('g:javascript_conceal_static')      ? 'conceal cchar='.g:javascript_conceal_static      : '')
-exe 'syntax keyword jsSuper     super     '.(exists('g:javascript_conceal_super')       ? 'conceal cchar='.g:javascript_conceal_super       : '')
-
-"" Statement Keywords
-syntax keyword jsStatement      break continue with
-syntax keyword jsConditional    if else switch
-syntax keyword jsRepeat         do while for
-syntax keyword jsLabel          case default
-syntax keyword jsKeyword        yield
-syntax keyword jsClass          extends class
-syntax keyword jsException      try catch throw finally
-syntax keyword jsAsyncKeyword   async await
-
-syntax keyword jsGlobalObjects   Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set RegExp String Proxy Promise ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Intl JSON Math console document window
-syntax match   jsGlobalObjects  /\%(Intl\.\)\@<=\(Collator\|DateTimeFormat\|NumberFormat\)/
-
-syntax keyword jsExceptions     Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
-
-syntax keyword jsBuiltins       decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
-
-syntax keyword jsFutureKeys     abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient debugger implements protected volatile double public
-
-"" DOM/HTML/CSS specified things
-
-" DOM2 Objects
-syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
-syntax keyword jsExceptions     DOMException
-
-" DOM2 CONSTANT
-syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
-syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
-
-" HTML events and internal variables
-syntax case ignore
-syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
-syntax case match
-
-" Follow stuff should be highligh within a special context
-" While it can't be handled with context depended with Regex based highlight
-" So, turn it off by default
-if exists("javascript_enable_domhtmlcss")
-
-    " DOM2 things
-    syntax match jsDomElemAttrs     contained /\%(nodeName\|nodeValue\|nodeType\|parentNode\|childNodes\|firstChild\|lastChild\|previousSibling\|nextSibling\|attributes\|ownerDocument\|namespaceURI\|prefix\|localName\|tagName\)\>/
-    syntax match jsDomElemFuncs     contained /\%(insertBefore\|replaceChild\|removeChild\|appendChild\|hasChildNodes\|cloneNode\|normalize\|isSupported\|hasAttributes\|getAttribute\|setAttribute\|removeAttribute\|getAttributeNode\|setAttributeNode\|removeAttributeNode\|getElementsByTagName\|getAttributeNS\|setAttributeNS\|removeAttributeNS\|getAttributeNodeNS\|setAttributeNodeNS\|getElementsByTagNameNS\|hasAttribute\|hasAttributeNS\)\>/ nextgroup=jsParen skipwhite
-    " HTML things
-    syntax match jsHtmlElemAttrs    contained /\%(className\|clientHeight\|clientLeft\|clientTop\|clientWidth\|dir\|id\|innerHTML\|lang\|length\|offsetHeight\|offsetLeft\|offsetParent\|offsetTop\|offsetWidth\|scrollHeight\|scrollLeft\|scrollTop\|scrollWidth\|style\|tabIndex\|title\)\>/
-    syntax match jsHtmlElemFuncs    contained /\%(blur\|click\|focus\|scrollIntoView\|addEventListener\|dispatchEvent\|removeEventListener\|item\)\>/ nextgroup=jsParen skipwhite
-
-    " CSS Styles in JavaScript
-    syntax keyword jsCssStyles      contained color font fontFamily fontSize fontSizeAdjust fontStretch fontStyle fontVariant fontWeight letterSpacing lineBreak lineHeight quotes rubyAlign rubyOverhang rubyPosition
-    syntax keyword jsCssStyles      contained textAlign textAlignLast textAutospace textDecoration textIndent textJustify textJustifyTrim textKashidaSpace textOverflowW6 textShadow textTransform textUnderlinePosition
-    syntax keyword jsCssStyles      contained unicodeBidi whiteSpace wordBreak wordSpacing wordWrap writingMode
-    syntax keyword jsCssStyles      contained bottom height left position right top width zIndex
-    syntax keyword jsCssStyles      contained border borderBottom borderLeft borderRight borderTop borderBottomColor borderLeftColor borderTopColor borderBottomStyle borderLeftStyle borderRightStyle borderTopStyle borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderColor borderStyle borderWidth borderCollapse borderSpacing captionSide emptyCells tableLayout
-    syntax keyword jsCssStyles      contained margin marginBottom marginLeft marginRight marginTop outline outlineColor outlineStyle outlineWidth padding paddingBottom paddingLeft paddingRight paddingTop
-    syntax keyword jsCssStyles      contained listStyle listStyleImage listStylePosition listStyleType
-    syntax keyword jsCssStyles      contained background backgroundAttachment backgroundColor backgroundImage gackgroundPosition backgroundPositionX backgroundPositionY backgroundRepeat
-    syntax keyword jsCssStyles      contained clear clip clipBottom clipLeft clipRight clipTop content counterIncrement counterReset cssFloat cursor direction display filter layoutGrid layoutGridChar layoutGridLine layoutGridMode layoutGridType
-    syntax keyword jsCssStyles      contained marks maxHeight maxWidth minHeight minWidth opacity MozOpacity overflow overflowX overflowY verticalAlign visibility zoom cssText
-    syntax keyword jsCssStyles      contained scrollbar3dLightColor scrollbarArrowColor scrollbarBaseColor scrollbarDarkShadowColor scrollbarFaceColor scrollbarHighlightColor scrollbarShadowColor scrollbarTrackColor
-
-    " Highlight ways
-    syntax match jsDotNotation      "\." nextgroup=jsPrototype,jsDomElemAttrs,jsDomElemFuncs,jsHtmlElemAttrs,jsHtmlElemFuncs
-    syntax match jsDotNotation      "\.style\." nextgroup=jsCssStyles
-
-endif "DOM/HTML/CSS
-
-"" end DOM/HTML/CSS specified things
-
-"" Code blocks
-syntax cluster jsExpression contains=jsComment,jsLineComment,jsBlockComment,jsTaggedTemplate,jsTemplateString,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsStatic,jsSuper,jsOperator,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins,jsNoise,jsCommonJS,jsAssignmentExpr,jsImportContainer,jsExportContainer,jsClass,jsArgsObj,jsDecorator,jsAsyncKeyword
-syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsReturn,jsStatement,jsTernaryIf,jsException
-syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc fold
-syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsOf,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc fold
-syntax region  jsBlock      matchgroup=jsBraces       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,jsObjectKey,@htmlPreproc fold
-syntax region  jsFuncBlock  matchgroup=jsFuncBraces   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained fold
-syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression,jsTernaryIf
-
-"" catch errors caused by wrong parenthesis
-syntax match   jsParensError    ")\|}\|\]"
-syntax match   jsParensErrA     contained "\]"
-syntax match   jsParensErrB     contained ")"
-syntax match   jsParensErrC     contained "}"
-
-if main_syntax == "javascript"
-  syntax sync clear
-  syntax sync ccomment jsComment minlines=200
-  syntax sync match jsHighlight grouphere jsBlock /{/
-endif
-
-exe 'syntax match jsFunction /\<function\>/ nextgroup=jsGenerator,jsFuncName,jsFuncArgs skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
-
-syntax match   jsGenerator      contained '\*' nextgroup=jsFuncName skipwhite
-syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
-syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas,jsFuncArgRest,jsAssignmentExpr nextgroup=jsFuncBlock keepend skipwhite skipempty
-syntax match   jsFuncArgCommas  contained ','
-syntax match   jsFuncArgRest    contained /\%(\.\.\.[a-zA-Z_$][0-9a-zA-Z_$]*\))/
-
-syntax match jsArrowFunction /=>/
-
-" 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_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFuncArgRest          Special
-  HiLink jsComment              Comment
-  HiLink jsLineComment          Comment
-  HiLink jsEnvComment           PreProc
-  HiLink jsBlockComment         Comment
-  HiLink jsCommentTodo          Todo
-  HiLink jsCvsTag               Function
-  HiLink jsDocTags              Special
-  HiLink jsDocSeeTag            Function
-  HiLink jsDocType              Type
-  HiLink jsDocTypeNoParam       Type
-  HiLink jsDocParam             Label
-  HiLink jsStringS              String
-  HiLink jsStringD              String
-  HiLink jsTemplateString       String
-  HiLink jsTaggedTemplate       StorageClass
-  HiLink jsTernaryIfOperator    Conditional
-  HiLink jsRegexpString         String
-  HiLink jsRegexpBoundary       SpecialChar
-  HiLink jsRegexpQuantifier     SpecialChar
-  HiLink jsRegexpOr             Conditional
-  HiLink jsRegexpMod            SpecialChar
-  HiLink jsRegexpBackRef        SpecialChar
-  HiLink jsRegexpGroup          jsRegexpString
-  HiLink jsRegexpCharClass      Character
-  HiLink jsCharacter            Character
-  HiLink jsPrototype            Special
-  HiLink jsConditional          Conditional
-  HiLink jsBranch               Conditional
-  HiLink jsLabel                Label
-  HiLink jsReturn               Statement
-  HiLink jsRepeat               Repeat
-  HiLink jsStatement            Statement
-  HiLink jsException            Exception
-  HiLink jsKeyword              Keyword
-  HiLink jsAsyncKeyword         Keyword
-  HiLink jsArrowFunction        Type
-  HiLink jsFunction             Type
-  HiLink jsGenerator            jsFunction
-  HiLink jsFuncName             Function
-  HiLink jsArgsObj              Special
-  HiLink jsError                Error
-  HiLink jsParensError          Error
-  HiLink jsParensErrA           Error
-  HiLink jsParensErrB           Error
-  HiLink jsParensErrC           Error
-  HiLink jsOperator             Operator
-  HiLink jsOf                   Operator
-  HiLink jsStorageClass         StorageClass
-  HiLink jsClass                Structure
-  HiLink jsThis                 Special
-  HiLink jsStatic               Special
-  HiLink jsSuper                Special
-  HiLink jsNan                  Number
-  HiLink jsNull                 Type
-  HiLink jsUndefined            Type
-  HiLink jsNumber               Number
-  HiLink jsFloat                Float
-  HiLink jsBooleanTrue          Boolean
-  HiLink jsBooleanFalse         Boolean
-  HiLink jsNoise                Noise
-  HiLink jsBrackets             Noise
-  HiLink jsParens               Noise
-  HiLink jsBraces               Noise
-  HiLink jsFuncBraces           Noise
-  HiLink jsFuncParens           Noise
-  HiLink jsSpecial              Special
-  HiLink jsTemplateVar          Special
-  HiLink jsGlobalObjects        Special
-  HiLink jsExceptions           Special
-  HiLink jsFutureKeys           Special
-  HiLink jsBuiltins             Special
-  HiLink jsModules              Include
-  HiLink jsModuleWords          Include
-  HiLink jsDecorator            Special
-
-  HiLink jsDomErrNo             Constant
-  HiLink jsDomNodeConsts        Constant
-  HiLink jsDomElemAttrs         Label
-  HiLink jsDomElemFuncs         PreProc
-
-  HiLink jsHtmlEvents           Special
-  HiLink jsHtmlElemAttrs        Label
-  HiLink jsHtmlElemFuncs        PreProc
-
-  HiLink jsCssStyles            Label
-
-  delcommand HiLink
-endif
-
-" Define the htmlJavaScript for HTML syntax html.vim
-syntax cluster  htmlJavaScript       contains=@jsAll,jsBracket,jsParen,jsBlock
-syntax cluster  javaScriptExpression contains=@jsAll,jsBracket,jsParen,jsBlock,@htmlPreproc
-
-" Vim's default html.vim highlights all javascript as 'Special'
-hi! def link javaScript              NONE
-
-let b:current_syntax = "javascript"
-if main_syntax == 'javascript'
-  unlet main_syntax
-endif
diff --git a/bundle/jst/LICENSE b/bundle/jst/LICENSE
deleted file mode 100755
index 7f4bc6f..0000000
--- a/bundle/jst/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2011 by Brian Collins
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/bundle/jst/README b/bundle/jst/README
deleted file mode 100755
index 5281201..0000000
--- a/bundle/jst/README
+++ /dev/null
@@ -1,4 +0,0 @@
-A vim plugin for highlighting and indenting JST/EJS syntax. Based on the eruby syntax from vim-ruby.
-Probably not 100% correct (especially indentation), but it works for most cases I've tried.
-
-This plugin may require the vim-javascript plugin ( available here: https://github.com/pangloss/vim-javascript )
diff --git a/bundle/jst/ftdetect/jst.vim b/bundle/jst/ftdetect/jst.vim
deleted file mode 100755
index ecc2577..0000000
--- a/bundle/jst/ftdetect/jst.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-au BufNewFile,BufRead *.ejs set filetype=jst
-au BufNewFile,BufRead *.jst set filetype=jst
-au BufNewFile,BufRead *.djs set filetype=jst
-au BufNewFile,BufRead *.hamljs set filetype=jst
-au BufNewFile,BufRead *.ect set filetype=jst
diff --git a/bundle/jst/indent/jst.vim b/bundle/jst/indent/jst.vim
deleted file mode 100755
index c916274..0000000
--- a/bundle/jst/indent/jst.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-if exists("b:did_indent")
-  finish
-endif
-
-runtime! indent/javascript.vim
-unlet! b:did_indent
-setlocal indentexpr=
-
-if exists("b:jst_subtype")
-  exe "runtime! indent/".b:jst_subtype.".vim"
-else
-  runtime! indent/html.vim
-endif
-unlet! b:did_indent
-
-if &l:indentexpr == ''
-  if &l:cindent
-    let &l:indentexpr = 'cindent(v:lnum)'
-  else
-    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
-  endif
-endif
-let b:jst_subtype_indentexpr = &l:indentexpr
-
-let b:did_indent = 1
-
-setlocal indentexpr=GetJstIndent()
-setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
-
-" Only define the function once.
-if exists("*GetJstIndent")
-  finish
-endif
-
-function! GetJstIndent(...)
-  if a:0 && a:1 == '.'
-    let v:lnum = line('.')
-  elseif a:0 && a:1 =~ '^\d'
-    let v:lnum = a:1
-  endif
-  let vcol = col('.')
-  call cursor(v:lnum,1)
-  let injavascript = searchpair('<%','','%>','W')
-  call cursor(v:lnum,vcol)
-  if injavascript && getline(v:lnum) !~ '^<%\|^\s*[-=]\=%>'
-    let ind = GetJavascriptIndent()
-  else
-    exe "let ind = ".b:jst_subtype_indentexpr
-  endif
-  let lnum = prevnonblank(v:lnum-1)
-  let line = getline(lnum)
-  let cline = getline(v:lnum)
-  if cline =~# '^\s*<%[-=]\=\s*\%(}.\{-\}\)\s*\%([-=]\=%>\|$\)'
-    let ind = ind - &sw
-  endif
-  if line =~# '\S\s*<%[-=]\=\s*\%(}\).\{-\}\s*\%([-=]\=%>\|$\)'
-    let ind = ind - &sw
-  endif
-  if line =~# '\%({\|\<do\)\%(\s*|[^|]*|\)\=\s*[-=]\=%>'
-    let ind = ind + &sw
-  endif
-  if line =~# '^\s*<%[=#-]\=\s*$' && cline !~# '^\s*end\>'
-    let ind = ind + &sw
-  endif
-  if line !~# '^\s*<%' && line =~# '%>\s*$'
-    let ind = ind - &sw
-  endif
-  if cline =~# '^\s*[-=]\=%>\s*$'
-    let ind = ind - &sw
-  endif
-  return ind
-endfunction
-
-" vim:set sw=2 sts=2 ts=8 noet:
-
diff --git a/bundle/jst/syntax/jst.vim b/bundle/jst/syntax/jst.vim
deleted file mode 100755
index 8c43c52..0000000
--- a/bundle/jst/syntax/jst.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-if exists("b:current_syntax")
-  finish
-endif
-
-if !exists("main_syntax")
-  let main_syntax = 'jst'
-endif
-
-if !exists("g:jst_default_subtype")
-  let g:jst_default_subtype = "html"
-endif
-
-if &filetype =~ '^jst\.'
-  let b:jst_subtype = matchstr(&filetype,'^jst\.\zs\w\+')
-elseif !exists("b:jst_subtype") && main_syntax == 'jst'
-  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
-  let b:jst_subtype = matchstr(s:lines,'jst_subtype=\zs\w\+')
-  if b:jst_subtype == ''
-    let b:jst_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.jst\)\+$','',''),'\.\zs\w\+$')
-  endif
-  if b:jst_subtype == 'rhtml'
-    let b:jst_subtype = 'html'
-  elseif b:jst_subtype == 'hamljs'
-    let b:jst_subtype = 'haml'
-  elseif b:jst_subtype == 'ejs'
-    let b:jst_subtype = 'html'
-  elseif b:jst_subtype == 'ect'
-    let b:jst_subtype = 'html'
-  elseif b:jst_subtype == 'djs'
-    let b:jst_subtype = 'html'
-  elseif b:jst_subtype == 'rb'
-    let b:jst_subtype = 'ruby'
-  elseif b:jst_subtype == 'yml'
-    let b:jst_subtype = 'yaml'
-  elseif b:jst_subtype == 'js'
-    let b:jst_subtype = 'javascript'
-  elseif b:jst_subtype == 'txt'
-    " Conventional; not a real file type
-    let b:jst_subtype = 'text'
-  elseif b:jst_subtype == ''
-    let b:jst_subtype = g:jst_default_subtype
-  endif
-endif
-
-if !exists("b:jst_nest_level")
-  let b:jst_nest_level = strlen(substitute(substitute(substitute(expand("%:t"),'@','','g'),'\c\.\%(erb\|rhtml\)\>','@','g'),'[^@]','','g'))
-endif
-if !b:jst_nest_level
-  let b:jst_nest_level = 1
-endif
-
-if exists("b:jst_subtype") && b:jst_subtype != ''
-  exe "runtime! syntax/".b:jst_subtype.".vim"
-  unlet! b:current_syntax
-endif
-
-syn include @jsTop syntax/javascript.vim
-
-syn cluster jstRegions contains=jstOneLiner,jstBlock,jstExpression,jstComment
-
-exe 'syn region  jstOneLiner   matchgroup=jstDelimiter start="^%\{1,'.b:jst_nest_level.'\}%\@!"    end="$"     contains=@jsTop	     containedin=ALLBUT,@jstRegions keepend oneline'
-exe 'syn region  jstBlock      matchgroup=jstDelimiter start="<%\{1,'.b:jst_nest_level.'\}%\@!-\=" end="[=-]\=%\@<!%\{1,'.b:jst_nest_level.'\}>" contains=@jsTop  containedin=ALLBUT,@jstRegions keepend'
-exe 'syn region  jstExpression matchgroup=jstDelimiter start="<%\{1,'.b:jst_nest_level.'\}=\{1,4}" end="[=-]\=%\@<!%\{1,'.b:jst_nest_level.'\}>" contains=@jsTop  containedin=ALLBUT,@jstRegions keepend'
-exe 'syn region  jstComment    matchgroup=jstDelimiter start="<%\{1,'.b:jst_nest_level.'\}#"       end="%\@<!%\{1,'.b:jst_nest_level.'\}>" contains=jsTodo,@Spell containedin=ALLBUT,@jstRegions keepend'
-
-" Define the default highlighting.
-
-hi def link jstDelimiter		PreProc
-hi def link jstComment		Comment
-
-let b:current_syntax = 'jst'
-
-if main_syntax == 'jst'
-  unlet main_syntax
-endif
-
-set commentstring=<!--%s-->
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 1
-  let b:match_words = '<:>,' .
-  \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
-  \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
-  \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" vim: nowrap sw=2 sts=2 ts=8:
diff --git a/bundle/jsx/README.md b/bundle/jsx/README.md
deleted file mode 100644
index 9362651..0000000
--- a/bundle/jsx/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-vim-jsx
-=======
-
-Syntax highlighting and indenting for JSX.  JSX is a JavaScript syntax
-transformer which translates inline XML document fragments into JavaScript
-objects.  It was developed by Facebook alongside [React][1].
-
-This bundle requires pangloss's [vim-javascript][2] syntax highlighting.
-
-Vim support for inline XML in JS is remarkably similar to the same for PHP,
-which you can find [here][3].
-
-Usage
------
-
-By default, JSX syntax highlighting and indenting will be enabled only for
-files with the `.jsx` extension.  If you would like JSX in `.js` files, add
-
-    let g:jsx_ext_required = 0
-
-to your .vimrc or somewhere in your include path.  If you wish to restrict JSX
-to files with the pre-v0.12 `@jsx React.DOM` pragma, add
-
-    let g:jsx_pragma_required = 1
-
-to your .vimrc or somewhere in your include path.
-
-Installation
-------------
-
-### Pathogen
-
-The recommended installation method is via [Pathogen][4].  Then simply execute
-
-    cd ~/.vim/bundle
-    git clone https://github.com/mxw/vim-jsx.git
-
-### Manual Installation
-
-If you have no `~/.vim/after` directory, you can download the tarball or zip
-and copy the contents to `~/.vim`.
-
-If you have existing `~/.vim/after` files, copy the syntax and indent files
-directly into their respective destinations.  If you have existing after syntax
-or indent files for Javascript, you'll probably want to do something like
-
-    mkdir -p ~/.vim/after/syntax/javascript
-    cp path/to/vim-jsx/after/syntax/javascript.vim ~/.vim/after/syntax/javascript/javascript.vim
-    mkdir -p ~/.vim/after/indent/javascript
-    cp path/to/vim-jsx/after/indent/javascript.vim ~/.vim/after/indent/javascript/javascript.vim
-
-
-[1]: http://facebook.github.io/react/           "React"
-[2]: https://github.com/pangloss/vim-javascript "pangloss: vim-javascript"
-[3]: https://github.com/mxw/vim-xhp             "mxw: vim-xhp"
-[4]: https://github.com/tpope/vim-pathogen      "tpope: vim-pathogen"
diff --git a/bundle/jsx/after/ftdetect/javascript.vim b/bundle/jsx/after/ftdetect/javascript.vim
deleted file mode 100644
index 7cd1f9d..0000000
--- a/bundle/jsx/after/ftdetect/javascript.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim ftdetect file
-"
-" Language: JSX (JavaScript)
-" Maintainer: Max Wang <mxawng@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-autocmd BufNewFile,BufRead *.jsx let b:jsx_ext_found = 1
-autocmd BufNewFile,BufRead *.jsx set filetype=javascript
diff --git a/bundle/jsx/after/ftplugin/javascript.vim b/bundle/jsx/after/ftplugin/javascript.vim
deleted file mode 100644
index 1a8da4d..0000000
--- a/bundle/jsx/after/ftplugin/javascript.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim ftplugin file
-"
-" Language: JSX (JavaScript)
-" Maintainer: Max Wang <mxawng@gmail.com>
-" Depends: pangloss/vim-javascript
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" modified from html.vim
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
diff --git a/bundle/jsx/after/indent/javascript.vim b/bundle/jsx/after/indent/javascript.vim
deleted file mode 100644
index d0b4d4e..0000000
--- a/bundle/jsx/after/indent/javascript.vim
+++ /dev/null
@@ -1,98 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim indent file
-"
-" Language: JSX (JavaScript)
-" Maintainer: Max Wang <mxawng@gmail.com>
-" Depends: pangloss/vim-javascript
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" Do nothing if we don't find the @jsx pragma (and we care).
-exec 'source '.fnameescape(expand('<sfile>:p:h:h').'/jsx-config.vim')
-if g:jsx_pragma_required && !b:jsx_pragma_found | finish | endif
-
-" Do nothing if we don't have the .jsx extension (and we care).
-if g:jsx_ext_required && !exists('b:jsx_ext_found') | finish | endif
-
-" Prologue; load in XML indentation.
-if exists('b:did_indent')
-  let s:did_indent=b:did_indent
-  unlet b:did_indent
-endif
-exe 'runtime! indent/xml.vim'
-if exists('s:did_indent')
-  let b:did_indent=s:did_indent
-endif
-
-setlocal indentexpr=GetJsxIndent()
-
-" JS indentkeys
-setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
-" XML indentkeys
-setlocal indentkeys+=*<Return>,<>>,<<>,/
-
-" Self-closing tag regex.
-let s:sctag = '^\s*\/>\s*;\='
-
-" Get all syntax types at the beginning of a given line.
-fu! SynSOL(lnum)
-  return map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
-endfu
-
-" Get all syntax types at the end of a given line.
-fu! SynEOL(lnum)
-  let lnum = prevnonblank(a:lnum)
-  let col = strlen(getline(lnum))
-  return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
-endfu
-
-" Check if a syntax attribute is XMLish.
-fu! SynAttrXMLish(synattr)
-  return a:synattr =~ "^xml" || a:synattr =~ "^jsx"
-endfu
-
-" Check if a synstack is XMLish (i.e., has an XMLish last attribute).
-fu! SynXMLish(syns)
-  return SynAttrXMLish(get(a:syns, -1))
-endfu
-
-" Check if a synstack has any XMLish attribute.
-fu! SynXMLishAny(syns)
-  for synattr in a:syns
-    if SynAttrXMLish(synattr)
-      return 1
-    endif
-  endfor
-  return 0
-endfu
-
-" Check if a synstack denotes the end of a JSX block.
-fu! SynJSXBlockEnd(syns)
-  return get(a:syns, -1) == 'jsBraces' && SynAttrXMLish(get(a:syns, -2))
-endfu
-
-" Cleverly mix JS and XML indentation.
-fu! GetJsxIndent()
-  let cursyn  = SynSOL(v:lnum)
-  let prevsyn = SynEOL(v:lnum - 1)
-
-  " Use XML indenting if the syntax at the end of the previous line was either
-  " JSX or was the closing brace of a jsBlock whose parent syntax was JSX.
-  if (SynXMLish(prevsyn) || SynJSXBlockEnd(prevsyn)) && SynXMLishAny(cursyn)
-    let ind = XmlIndentGet(v:lnum, 0)
-
-    " Align '/>' with '<' for multiline self-closing tags.
-    if getline(v:lnum) =~? s:sctag
-      let ind = ind - &sw
-    endif
-
-    " Then correct the indentation of any JSX following '/>'.
-    if getline(v:lnum - 1) =~? s:sctag
-      let ind = ind + &sw
-    endif
-  else
-    let ind = GetJavascriptIndent()
-  endif
-
-  return ind
-endfu
diff --git a/bundle/jsx/after/jsx-config.vim b/bundle/jsx/after/jsx-config.vim
deleted file mode 100644
index a1d4cbe..0000000
--- a/bundle/jsx/after/jsx-config.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vimscript file
-"
-" Set up a bunch of configuration variables.
-"
-" Also check (if desired) whether or not the @jsx pragma is correctly included
-" in '%'.  Set the result in b:jsx_pragma_found.
-"
-" Language: JSX (JavaScript)
-" Maintainer: Max Wang <mxawng@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" Only check once.
-if exists('b:jsx_pragma_found')
-  finish
-endif
-
-" Whether the .jsx extension is required to enable JSX syntax/indent.
-if !exists('g:jsx_ext_required')
-  let g:jsx_ext_required = 1
-endif
-
-" Whether the @jsx pragma is required to enable JSX syntax/indent.
-if !exists('g:jsx_pragma_required')
-  let g:jsx_pragma_required = 0
-endif
-if !g:jsx_pragma_required | finish | endif
-
-" Look for the @jsx pragma.  It must be included in a docblock comment before
-" anything else in the file (except whitespace).
-let s:jsx_pragma_pattern = '\%^\_s*\/\*\*\%(\_.\%(\*\/\)\@!\)*@jsx\_.\{-}\*\/'
-let b:jsx_pragma_found = search(s:jsx_pragma_pattern, 'npw')
diff --git a/bundle/jsx/after/syntax/javascript.vim b/bundle/jsx/after/syntax/javascript.vim
deleted file mode 100644
index 5bebc94..0000000
--- a/bundle/jsx/after/syntax/javascript.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim syntax file
-"
-" Language: JSX (JavaScript)
-" Maintainer: Max Wang <mxawng@gmail.com>
-" Depends: pangloss/vim-javascript
-"
-" CREDITS: Inspired by Facebook.
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" Do nothing if we don't find the @jsx pragma (and we care).
-exec 'source '.fnameescape(expand('<sfile>:p:h:h').'/jsx-config.vim')
-if g:jsx_pragma_required && !b:jsx_pragma_found | finish | endif
-
-" Do nothing if we don't have the .jsx extension (and we care).
-if g:jsx_ext_required && !exists('b:jsx_ext_found') | finish | endif
-
-" Prologue; load in XML syntax.
-if exists('b:current_syntax')
-  let s:current_syntax=b:current_syntax
-  unlet b:current_syntax
-endif
-syn include @XMLSyntax syntax/xml.vim
-if exists('s:current_syntax')
-  let b:current_syntax=s:current_syntax
-endif
-
-" Highlight JSX regions as XML; recursively match.
-syn region jsxRegion contains=@XMLSyntax,jsxRegion,jsBlock,jsStringD,jsStringS
-  \ start=+<\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
-  \ skip=+<!--\_.\{-}-->+
-  \ end=+</\z1\_\s\{-}>+
-  \ end=+/>+
-  \ keepend
-  \ extend
-
-" JSX attributes should color as JS.  Note the trivial end pattern; we let
-" jsBlock take care of ending the region.
-syn region xmlString contained start=+{+ end=++ contains=jsBlock
-
-" Add jsxRegion to the lowest-level JS syntax cluster.
-syn cluster jsExpression add=jsxRegion
diff --git a/bundle/l9/.hg_archival.txt b/bundle/l9/.hg_archival.txt
deleted file mode 100644
index 2aa4d3f..0000000
--- a/bundle/l9/.hg_archival.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-repo: 4d5305d0e643bf0b1deca1e9270d2db044d07b2d
-node: 3bb534a720fa762aa01d2df2d5d41bd3c4122169
-branch: default
-latesttag: 1.1
-latesttagdistance: 2
diff --git a/bundle/l9/.hgtags b/bundle/l9/.hgtags
deleted file mode 100644
index 2d251b1..0000000
--- a/bundle/l9/.hgtags
+++ /dev/null
@@ -1,3 +0,0 @@
-f6420a42fc69dd7fc08aa5426c4b3fb10e78020d 1.0
-f6f3e9bae8770abb41259d42ab65721f6915fe22 1.0.1
-c3f242518bd4b8131a2c277a7f8c492b56375dff 1.1
diff --git a/bundle/l9/autoload/l9.vim b/bundle/l9/autoload/l9.vim
deleted file mode 100644
index b6a0ae7..0000000
--- a/bundle/l9/autoload/l9.vim
+++ /dev/null
@@ -1,570 +0,0 @@
-"=============================================================================
-" Copyright (c) 2009-2010 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if exists('g:loaded_autoload_l9')
-  finish
-endif
-let g:loaded_autoload_l9 = 1
-
-" }}}1
-"=============================================================================
-" COMPATIBILITY TEST {{{1
-
-"
-let s:L9_VERSION_CURRENT  = 101
-let s:L9_VERSION_PASSABLE = 101
-
-" returns true if given version is compatible.
-function l9#isCompatible(ver)
-  return 
-endfunction
-
-let s:VERSION_FACTOR = str2float('0.01')
-
-" returns false if the caller script should finish.
-" a:vimVersion: if 0, don't check vim version
-" a:l9Version: same rule as v:version
-function l9#guardScriptLoading(path, vimVersion, l9Version, exprs)
-  let loadedVarName = 'g:loaded_' . substitute(a:path, '\W', '_', 'g')
-  if exists(loadedVarName)
-    return 0
-  elseif a:vimVersion > 0 && a:vimVersion > v:version
-    echoerr a:path . ' requires Vim version ' . string(a:vimVersion * s:VERSION_FACTOR)
-    return 0
-  elseif a:l9Version > 0 && (a:l9Version > s:L9_VERSION_CURRENT ||
-        \                    a:l9Version < s:L9_VERSION_PASSABLE)
-    echoerr a:path . ' requires L9 library version ' . string(a:l9Version * s:VERSION_FACTOR)
-    return 0
-  endif
-  for expr in a:exprs
-    if !eval(expr)
-      echoerr a:path . ' requires: ' . expr
-      return 0
-    endif
-  endfor
-  let {loadedVarName} = 1
-  return 1
-endfunction
-
-" 
-function l9#getVersion()
-  return s:L9_VERSION_CURRENT
-endfunction
-
-" }}}1
-"=============================================================================
-" LIST {{{1
-
-" Removes duplicates (unstable)
-" This function doesn't change the list of argument.
-function l9#unique(items)
-  let sorted = sort(a:items)
-  if len(sorted) < 2
-    return sorted
-  endif
-  let last = remove(sorted, 0)
-  let result = [last]
-  for item in sorted
-    if item != last
-      call add(result, item)
-      let last = item
-    endif
-  endfor
-  return result
-endfunction
-
-" Removes duplicates (stable)
-" This function doesn't change the list of argument.
-function l9#uniqueStably(items)
-  let result = []
-  for item in a:items
-    if count(result, item, &ignorecase) == 0
-      call add(result, item)
-    endif
-  endfor
-  return result
-endfunction
-
-" [ [0], [1,2], [3] ] -> [ 0, 1, 2, 3 ]
-" This function doesn't change the list of argument.
-function l9#concat(items)
-  let result = []
-  for l in a:items
-    let result += l
-  endfor
-  return result
-endfunction
-
-" [ [0,1,2], [3,4], [5,6,7,8] ] -> [ [0,3,5],[1,4,6] ]
-" This function doesn't change the list of argument.
-function l9#zip(items)
-  let result = []
-  for i in range(min(map(copy(a:items), 'len(v:val)')))
-    call add(result, map(copy(a:items), 'v:val[i]'))
-  endfor
-  return result
-endfunction
-
-" filter() with the maximum number of items
-" This function doesn't change the list of argument.
-function l9#filterWithLimit(items, expr, limit)
-  if a:limit <= 0
-    return filter(copy(a:items), a:expr)
-  endif
-  let result = []
-  let stride = a:limit * 3 / 2 " x1.5
-  for i in range(0, len(a:items) - 1, stride)
-    let result += filter(a:items[i : i + stride - 1], a:expr)
-    if len(result) >= a:limit
-      return remove(result, 0, a:limit - 1)
-    endif
-  endfor
-  return result
-endfunction
-
-" Removes if a:expr is evaluated as non-zero and returns removed items.
-" This function change the list of argument.
-function l9#removeIf(items, expr)
-  let removed = filter(copy(a:items), a:expr)
-  call filter(a:items, '!( ' . a:expr . ')')
-  return removed
-endfunction
-
-" }}}1
-"=============================================================================
-" NUMERIC {{{1
-
-" }}}1
-"=============================================================================
-" STRING {{{1
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function l9#snipHead(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  return a:mask . a:str[-a:len + len(a:mask):]
-endfunction
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function l9#snipTail(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  return a:str[:a:len - 1 - len(a:mask)] . a:mask
-endfunction
-
-" Snips a:str and add a:mask if the length of a:str is more than a:len
-function l9#snipMid(str, len, mask)
-  if a:len >= len(a:str)
-    return a:str
-  elseif a:len <= len(a:mask)
-    return a:mask
-  endif
-  let len_head = (a:len - len(a:mask)) / 2
-  let len_tail = a:len - len(a:mask) - len_head
-  return  (len_head > 0 ? a:str[: len_head - 1] : '') . a:mask .
-        \ (len_tail > 0 ? a:str[-len_tail :] : '')
-endfunction
-
-"
-function l9#hash224(str)
-  let a = 0x00000800 " shift 11 bit (if unsigned)
-  let b = 0x001fffff " extract 11 bit (if unsigned)
-  let nHash = 7
-  let hashes = repeat([0], nHash)
-  for i in range(len(a:str))
-    let iHash = i % nHash
-    let hashes[iHash] = hashes[iHash] * a + hashes[iHash] / b
-    let hashes[iHash] += char2nr(a:str[i])
-  endfor
-  return join(map(hashes, 'printf("%08x", v:val)'), '')
-endfunction
-
-" wildcard -> regexp
-function l9#convertWildcardToRegexp(expr)
-  let re = escape(a:expr, '\')
-  for [pat, sub] in [ [ '*', '\\.\\*' ], [ '?', '\\.' ], [ '[', '\\[' ], ]
-    let re = substitute(re, pat, sub, 'g')
-  endfor
-  return '\V' . re
-endfunction
-
-" }}}1
-"=============================================================================
-" LINES {{{1
-
-" Removes from the line matching with a:begin first to the line matching with
-" a:end next and returns removed lines.
-" If matching range is not found, returns []
-function l9#removeLinesBetween(lines, begin, end)
-  for i in range(len(a:lines) - 1)
-    if a:lines[i] =~ a:begin
-      break
-    endif
-  endfor
-  for j in range(i + 1, len(a:lines) - 1)
-    if a:lines[j] =~ a:end
-      let g:l0 += [a:lines[i : j]]
-      return remove(a:lines, i, j)
-    endif
-  endfor
-  return []
-endfunction
-
-" }}}1
-"=============================================================================
-" PATH {{{1
-
-" returns the path separator charactor.
-function l9#getPathSeparator()
-  return (!&shellslash && (has('win32') || has('win64')) ? '\' : '/')
-endfunction
-
-" [ 'a', 'b/', '/c' ] -> 'a/b/c'
-function l9#concatPaths(paths)
-  let result = ''
-  for p in a:paths
-    if empty(p)
-      continue
-    elseif empty(result)
-      let result = p
-    else
-      let result = substitute(result, '[/\\]$', '', '') . l9#getPathSeparator()
-            \    . substitute(p, '^[/\\]', '', '')
-    endif
-  endfor
-  return result
-endfunction
-
-" path: '/a/b/c/d', dir: '/a/b' => 'c/d'
-function l9#modifyPathRelativeToDir(path, dir)
-  let pathFull = fnamemodify(a:path, ':p')
-  let dirFull = fnamemodify(a:dir, ':p')
-  if len(pathFull) < len(dirFull) || pathFull[:len(dirFull) - 1] !=# dirFull
-    return pathFull
-  endif
-  return pathFull[len(dirFull):]
-endfunction
-
-" }}}1
-"=============================================================================
-" FILE {{{1
-
-" Almost same as readfile().
-function l9#readFile(...)
-  let args = copy(a:000)
-  let args[0] = expand(args[0])
-  try
-    return call('readfile', args)
-  catch
-  endtry
-  return []
-endfunction
-
-" Almost same as writefile().
-function l9#writeFile(...)
-  let args = copy(a:000)
-  let args[1] = expand(args[1])
-  let dir = fnamemodify(args[1], ':h')
-  try
-    if !isdirectory(dir)
-      call mkdir(dir, 'p')
-    endif
-    return call('writefile', args)
-  catch
-  endtry
-  return -1 " -1 is error code.
-endfunction
-
-" }}}1
-"=============================================================================
-" BUFFER {{{1
-
-" :wall/:wall! wrapper. Useful for writing readonly buffers.
-function l9#writeAll()
-  try
-    silent update " NOTE: avoiding a problem with a buftype=acwrite buffer.
-    silent wall
-  catch /^Vim/ " E45, E505
-    if l9#inputHl('Question', v:exception . "\nWrite readonly files? (Y/N) : ", 'Y') ==? 'y'
-      redraw
-      :wall!
-    endif
-  endtry
-endfunction
-
-" Loads given files with :edit command
-function l9#loadFilesToBuffers(files)
-  for file in filter(copy(a:files), '!bufloaded(v:val)')
-    execute 'edit ' . fnameescape(file)
-    if !exists('bufNrFirst')
-      let bufNrFirst = bufnr('%')
-    endif
-  endfor
-  if exists('bufNrFirst')
-    execute bufNrFirst . 'buffer'
-  endif
-endfunction
-
-" Deletes all buffers except given files with :bdelete command
-function l9#deleteAllBuffersExcept(files)
-  let bufNrExcepts = map(copy(a:files), 'bufnr("^" . v:val . "$")')
-  for bufNr in filter(range(1, bufnr('$')), 'bufloaded(v:val)')
-    if count(bufNrExcepts, bufNr) == 0
-      execute bufNr . 'bdelete'
-    endif
-  endfor
-endfunction
-
-" }}}1
-"=============================================================================
-" WINDOW {{{1
-
-" move current window to next tabpage.
-function l9#shiftWinNextTabpage()
-  if tabpagenr('$') < 2
-    return
-  endif
-  let bufnr = bufnr('%')
-  tabnext
-  execute bufnr . 'sbuffer'
-  tabprevious
-  if winnr('$') > 1
-    close
-    tabnext
-  else
-    close " if tabpage is closed, next tabpage will become current
-  endif
-endfunction
-
-" move current window to previous tabpage.
-function l9#shiftWinPrevTabpage()
-  if tabpagenr('$') < 2
-    return
-  endif
-  let bufnr = bufnr('%')
-  tabprevious
-  execute bufnr . 'sbuffer'
-  tabnext
-  close
-  tabprevious
-endfunction
-
-" move to a window containing specified buffer.
-" returns 0 if the buffer is not found.
-function l9#moveToBufferWindowInCurrentTabpage(bufNr)
-  if bufnr('%') == a:bufNr
-    return 1
-  elseif count(tabpagebuflist(), a:bufNr) == 0
-    return 0
-  endif
-  execute bufwinnr(a:bufNr) . 'wincmd w'
-  return 1
-endfunction
-
-" returns 0 if the buffer is not found.
-function s:moveToOtherTabpageOpeningBuffer(bufNr)
-  for tabNr in range(1, tabpagenr('$'))
-    if tabNr != tabpagenr() && count(tabpagebuflist(tabNr), a:bufNr) > 0
-      execute 'tabnext ' . tabNr
-      return 1
-    endif
-  endfor
-  return 0
-endfunction
-
-" move to a window containing specified buffer.
-" returns 0 if the buffer is not found.
-function l9#moveToBufferWindowInOtherTabpage(bufNr)
-  if !s:moveToOtherTabpageOpeningBuffer(a:bufNr)
-    return 0
-  endif
-  return l9#moveToBufferWindowInCurrentTabpage(a:bufNr)
-endfunction
-
-" }}}1
-"=============================================================================
-" COMMAND LINE {{{1
-
-" echo/echomsg with highlighting.
-function l9#echoHl(hl, msg, prefix, addingHistory)
-  let echoCmd = (a:addingHistory ? 'echomsg' : 'echo')
-  execute "echohl " . a:hl
-  try
-    for l in (type(a:msg) == type([]) ? a:msg : split(a:msg, "\n"))
-      execute echoCmd . ' a:prefix . l'
-    endfor
-  finally
-    echohl None
-  endtry
-endfunction
-
-" input() with highlighting.
-" This function can take list as {completion} argument.
-function l9#inputHl(hl, ...)
-  execute "echohl " . a:hl
-  try
-    let args = copy(a:000)
-    if len(args) > 2 && type(args[2]) == type([])
-      let s:candidatesForInputHl = args[2]
-      let args[2] = 'custom,l9#completeForInputHl'
-    endif
-    let s = call('input', args)
-    unlet! s:candidatesForInputHl
-  finally
-    echohl None
-  endtry
-  redraw " needed to show following echo to next line.
-  return s
-endfunction
-
-" only called by l9#inputHl() for completion.
-function l9#completeForInputHl(lead, line, pos)
-  return join(s:candidatesForInputHl, "\n")
-endfunction
-
-" }}}1
-"=============================================================================
-" VISUAL MODE {{{1
-
-" returns last selected text in Visual mode.
-function l9#getSelectedText()
-  let reg_ = [@", getregtype('"')]
-  let regA = [@a, getregtype('a')]
-  if mode() =~# "[vV\<C-v>]"
-    silent normal! "aygv
-  else
-    let pos = getpos('.')
-    silent normal! gv"ay
-    call setpos('.', pos)
-  endif
-  let text = @a
-  call setreg('"', reg_[0], reg_[1])
-  call setreg('a', regA[0], regA[1])
-  return text
-endfunction
-
-
-" }}}1
-"=============================================================================
-" EVAL {{{1
-
-" loads given text as Vim script with :source command
-function l9#loadScript(text)
-  let lines = (type(a:text) == type([]) ? a:text : split(a:text, "\n"))
-  let fname = tempname()
-  call writefile(lines, fname)
-  source `=fname`
-  call delete(fname)
-endfunction
-
-
-" }}}1
-"=============================================================================
-" VARIABLES {{{1
-
-" 
-function l9#defineVariableDefault(name, default)
-  if !exists(a:name)
-    let {a:name} = a:default
-  endif
-endfunction
-
-" }}}1
-"=============================================================================
-" GREP {{{1
-
-" Execute :vimgrep and opens the quickfix window if matches are found.
-"
-" a:pattern: search pattern. If ommitted, last search pattern (@/) is used.
-" a:files: List of files
-function l9#grepFiles(pattern, files)
-  let target = join(map(a:files, 'escape(v:val, " ")'), ' ')
-  let pattern = (a:pattern[0] ==# '/' ? a:pattern[1:] : a:pattern)
-  let pattern = (empty(pattern)  ? @/ : pattern)
-  try
-    execute printf('vimgrep/%s/j %s', pattern, target)
-  catch /^Vim/
-    call setqflist([])
-  endtry
-  call l9#quickfix#sort()
-  call l9#quickfix#openIfNotEmpty(1, 0)
-endfunction
-
-" Execute :vimgrep for buffers using l9#grepFiles()
-" See also: :L9GrepBuffer :L9GrepBufferAll
-function l9#grepBuffers(pattern, bufNrs)
-  let files = map(filter(a:bufNrs, 'bufloaded(v:val)'), 'bufname(v:val)')
-  call l9#grepFiles(a:pattern, files)
-endfunction
-
-" }}}1
-"=============================================================================
-" SIGN {{{1
-
-" Highlights lines using :sign define and :sign place.
-" 
-" a:linehl, a:text, a:texthl: See |signs|. Ignored if empty string.
-" a:locations: List of [{buffer number}, {line number}] for highlighting
-function l9#placeSign(linehl, text, texthl, locations)
-  let argLinehl = (empty(a:linehl) ? '' : 'linehl=' . a:linehl)
-  let argText = (empty(a:text) ? '' : 'text=' . a:text)
-  let argTexthl = (empty(a:texthl) ? '' : 'texthl=' . a:texthl)
-  let name = 'l9--' . a:linehl . '--' . a:text . '--' . a:texthl
-  execute printf('sign define %s linehl=%s text=%s texthl=%s',
-        \        name, a:linehl, a:text, a:texthl)
-  for [bufNr, lnum] in a:locations
-    execute printf('sign place 1 line=%d name=%s buffer=%d', lnum, name, bufNr)
-  endfor
-endfunction
-
-" }}}1
-"=============================================================================
-" NOTIFY EXTERNALLY {{{1
-
-" Notify a message using an external program.
-" Currently supports Balloonly, Screen, and Tmux.
-function l9#notifyExternally(msg)
-  return     l9#notifyBalloonly(a:msg)
-        \ || l9#notifyScreen(a:msg)
-        \ || l9#notifyTmux(a:msg)
-endfunction
-
-"
-function l9#notifyBalloonly(msg)
-  if !(has('win32') || has('win64')) || !executable(g:l9_balloonly)
-    return 0
-  endif
-  execute 'silent !start ' . shellescape(g:l9_balloonly) . ' 4000 "l9" ' . shellescape(a:msg)
-  return 1
-endfunction
-
-"
-function l9#notifyScreen(msg)
-  if !has('unix') || has('gui_running') || $WINDOW !~ '\d' || !executable('screen')
-    return 0
-  endif
-  call system('screen -X wall ' . shellescape('l9: ' . a:msg))
-  return 1
-endfunction
-
-"
-function l9#notifyTmux(msg)
-  if !has('unix') || has('gui_running') || empty($TMUX) || !executable('tmux')
-    return 0
-  endif
-  call system('tmux display-message ' . shellescape('l9: ' . a:msg))
-  return 1
-endfunction
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
diff --git a/bundle/l9/autoload/l9/async.py b/bundle/l9/autoload/l9/async.py
deleted file mode 100644
index eeb0cc3..0000000
--- a/bundle/l9/autoload/l9/async.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import with_statement
-import vim
-import os
-import subprocess
-import threading
-import Queue
-
-
-class Asyncer:
-
-    def __init__(self):
-        self._workers = {}
-
-    def execute(self, var_key, var_command, var_cwd, var_input, var_appends):
-        key     = vim.eval(var_key)
-        command = vim.eval(var_command)
-        cwd     = vim.eval(var_cwd)
-        input   = vim.eval(var_input)
-        appends = vim.eval(var_appends)
-        if key not in self._workers:
-            self._workers[key] = Worker()
-            self._workers[key].start()
-        self._workers[key].put(Executor(command, cwd, input, appends))
-
-    def print_output(self, var_key):
-        key = vim.eval(var_key)
-        if key not in self._workers:
-            return
-        for l in self._workers[key].copy_outputs():
-            print l,
-
-    def print_worker_keys(self):
-        for k in self._workers.keys():
-            print k
-
-    def print_active_worker_keys(self):
-        for k in self._workers.keys():
-            print k
-
-
-class Worker(threading.Thread):
-
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self._queue = Queue.Queue()
-        self._lines = []
-        self._lock = threading.Lock()
-
-    def run(self):
-        while True:
-            self._queue.get().execute(self)
-            self._queue.task_done()
-
-    def put(self, executor):
-        self._queue.put(executor)
-
-    def clear_outputs(self):
-        with self._lock:
-            self._lines = []
-
-    def record_output(self, line):
-        with self._lock:
-            self._lines.append(line)
-
-    def copy_outputs(self):
-        with self._lock:
-            return self._lines[:]
-
-
-class Executor:
-
-    def __init__(self, command, cwd, input, appends):
-      self._command = command
-      self._cwd = cwd
-      self._input = input
-      self._appends = appends
-
-    def execute(self, worker):
-        if not self._appends:
-            worker.clear_outputs()
-        os.chdir(self._cwd)
-        p = subprocess.Popen(self._command, shell=True, stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        p.stdin.write(self._input)
-        line = p.stdout.readline()
-        while line:
-            worker.record_output(line)
-            line = p.stdout.readline()
-
-
diff --git a/bundle/l9/autoload/l9/async.vim b/bundle/l9/autoload/l9/async.vim
deleted file mode 100644
index fa66e9f..0000000
--- a/bundle/l9/autoload/l9/async.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"=============================================================================
-" Copyright (C) 2009-2010 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if !l9#guardScriptLoading(expand('<sfile>:p'), 0, 0, ['has("python")'])
-  finish
-endif
-
-" }}}1
-"=============================================================================
-" ASYNC EXECUTE {{{1
-
-"
-function s:checkKey(key)
-  if a:key =~ '\n' || a:key !~ '\S'
-    throw "Asyncer: Invalid key: " . a:key
-  endif
-endfunction
-
-" 
-function l9#async#execute(key, cmd, cwd, input, appends)
-  call s:checkKey(a:key)
-  python asyncer.execute('a:key', 'a:cmd', 'a:cwd', 'a:input', 'a:appends')
-endfunction
-
-"
-function l9#async#read(key)
-  call s:checkKey(a:key)
-  redir => result
-  silent python asyncer.print_output('a:key')
-  redir END
-  " NOTE: "\n" is somehow inserted by redir.
-  return (result[0] ==# "\n" ? result[1:] : result)
-endfunction
-
-"
-function l9#async#listWorkers()
-  redir => result
-  silent python asyncer.print_worker_keys()
-  redir END
-  return split(result, "\n")
-endfunction
-
-"
-function l9#async#listActiveWorkers()
-  redir => result
-  silent python asyncer.print_active_worker_keys()
-  redir END
-  return split(result, "\n")
-endfunction
-
-" }}}1
-"=============================================================================
-" INITIALIZATION {{{1
-
-let s:ASYNC_PY_PATH = fnamemodify(expand('<sfile>:p:h'), ':p') . 'async.py'
-
-pyfile `=s:ASYNC_PY_PATH`
-python asyncer = Asyncer()
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
-
-
diff --git a/bundle/l9/autoload/l9/quickfix.vim b/bundle/l9/autoload/l9/quickfix.vim
deleted file mode 100644
index 1758b39..0000000
--- a/bundle/l9/autoload/l9/quickfix.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-"=============================================================================
-" Copyright (C) 2009-2010 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if !l9#guardScriptLoading(expand('<sfile>:p'), 0, 0, [])
-  finish
-endif
-
-" }}}1
-"=============================================================================
-" QUICKFIX {{{1
-
-" Returns non-zero if quickfix window is opened.
-function l9#quickfix#isWindowOpened()
-  return count(map(range(1, winnr('$')), 'getwinvar(v:val, "&buftype")'), 'quickfix') > 0
-endfunction
-
-" Opens quickfix window if quickfix is not empty, and echo the number of errors.
-"
-" a:onlyRecognized: if non-zero, opens only if quickfix has recognized errors.
-" a:holdCursor: if non-zero, the cursor won't move to quickfix window.
-function l9#quickfix#openIfNotEmpty(onlyRecognized, holdCursor)
-  let numErrors = len(filter(getqflist(), 'v:val.valid'))
-  let numOthers = len(getqflist()) - numErrors
-  if numErrors > 0 || (!a:onlyRecognized && numOthers > 0)
-    copen
-    if a:holdCursor
-      wincmd p
-    endif
-  else
-    cclose
-  endif
-  redraw
-  if numOthers > 0
-    echo printf('Quickfix: %d(+%d)', numErrors, numOthers)
-  else
-    echo printf('Quickfix: %d', numErrors)
-  endif
-endfunction
-
-" Toggles Quickfix window
-function l9#quickfix#toggleWindow()
-  if l9#quickfix#isWindowOpened()
-    cclose
-  else
-    call l9#quickfix#openIfNotEmpty(0, 0)
-  endif
-endfunction
-
-" Creates quickfix list form given lines and opens the quickfix window if
-" errors exists.
-"
-" a:lines: 
-" a:jump: if non-zero, jump to the first error.
-function l9#quickfix#setMakeResult(lines)
-  cexpr a:lines
-  call l9#quickfix#openIfNotEmpty(0, 1)
-endfunction
-
-" Compares quickfix entries for sorting.
-function l9#quickfix#compareEntries(e0, e1)
-  if     a:e0.bufnr != a:e1.bufnr
-    let i0 = bufname(a:e0.bufnr)
-    let i1 = bufname(a:e1.bufnr)
-  elseif a:e0.lnum != a:e1.lnum
-    let i0 = a:e0.lnum
-    let i1 = a:e1.lnum
-  elseif a:e0.col != a:e1.col
-    let i0 = a:e0.col
-    let i1 = a:e1.col
-  else
-    return 0
-  endif
-  return (i0 > i1 ? +1 : -1)
-endfunction
-
-" Sorts quickfix
-function l9#quickfix#sort()
-  call setqflist(sort(getqflist(), 'l9#quickfix#compareEntries'), 'r')
-endfunction
-
-" Highlights Quickfix lines by :sign.
-" Inspired by errormarker plugin.
-" 
-" You can customize the highlighting via L9ErrorLine and L9WarningLine
-" highlight groups.
-function l9#quickfix#placeSign()
-  let warnings = []
-  let errors = []
-  for e in filter(getqflist(), 'v:val.valid')
-    let warning = (e.type ==? 'w' || e.text =~? '^\s*warning:')
-    call add((warning ? warnings : errors), [e.bufnr, e.lnum])
-  endfor
-  sign unplace *
-  call l9#placeSign('L9WarningLine', '>>', '', warnings)
-  call l9#placeSign('L9ErrorLine', '>>', '', errors)
-endfunction
-
-highlight default L9ErrorLine   ctermfg=white ctermbg=52 guibg=#5F0000
-highlight default L9WarningLine ctermfg=white ctermbg=17 guibg=#00005F
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
-
diff --git a/bundle/l9/autoload/l9/tempbuffer.vim b/bundle/l9/autoload/l9/tempbuffer.vim
deleted file mode 100644
index 6f11a78..0000000
--- a/bundle/l9/autoload/l9/tempbuffer.vim
+++ /dev/null
@@ -1,112 +0,0 @@
-"=============================================================================
-" Copyright (C) 2009-2010 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if !l9#guardScriptLoading(expand('<sfile>:p'), 0, 0, [])
-  finish
-endif
-
-" }}}1
-"=============================================================================
-" TEMPORARY BUFFER {{{1
-
-" each key is a buffer name.
-let s:dataMap = {}
-
-"
-function s:onBufDelete(bufname)
-  if exists('s:dataMap[a:bufname].listener.onClose')
-    call s:dataMap[a:bufname].listener.onClose(s:dataMap[a:bufname].written)
-  endif
-  if bufnr('%') == s:dataMap[a:bufname].bufNr && winnr('#') != 0
-    " if winnr('#') returns 0, "wincmd p" causes ringing the bell.
-    wincmd p
-  endif
-endfunction
-
-"
-function s:onBufWriteCmd(bufname)
-  if !exists('s:dataMap[a:bufname].listener.onWrite') ||
-        \ s:dataMap[a:bufname].listener.onWrite(getline(1, '$'))
-    setlocal nomodified
-    let s:dataMap[a:bufname].written = 1
-    call l9#tempbuffer#close(a:bufname)
-  else
-  endif
-endfunction
-
-" a:bufname:
-" a:height: Window height. If 0, default height is used.
-"           If less than 0, the window becomes full-screen. 
-" a:listener:
-"   a:listener.onClose(written)
-function l9#tempbuffer#openScratch(bufname, filetype, lines, topleft, vertical, height, listener)
-  let openCmdPrefix = (a:topleft ? 'topleft ' : '')
-        \           . (a:vertical ? 'vertical ' : '')
-        \           . (a:height > 0 ? a:height : '')
-  if !exists('s:dataMap[a:bufname]') || !bufexists(s:dataMap[a:bufname].bufNr)
-    execute openCmdPrefix . 'new'
-  else
-    call l9#tempbuffer#close(a:bufname)
-    execute openCmdPrefix . 'split'
-    execute 'silent ' . s:dataMap[a:bufname].bufNr . 'buffer'
-  endif
-  if a:height < 0
-    only
-  endif
-  setlocal buflisted noswapfile bufhidden=delete modifiable noreadonly buftype=nofile
-  let &l:filetype = a:filetype
-  silent file `=a:bufname`
-  call setline(1, a:lines)
-  setlocal nomodified
-  augroup L9TempBuffer
-    autocmd! * <buffer>
-    execute printf('autocmd BufDelete   <buffer>        call s:onBufDelete  (%s)', string(a:bufname))
-    execute printf('autocmd BufWriteCmd <buffer> nested call s:onBufWriteCmd(%s)', string(a:bufname))
-  augroup END
-  let s:dataMap[a:bufname] = {
-        \   'bufNr': bufnr('%'),
-        \   'written': 0,
-        \   'listener': a:listener,
-        \ }
-endfunction
-
-"
-function l9#tempbuffer#openReadOnly(bufname, filetype, lines, topleft, vertical, height, listener)
-  call l9#tempbuffer#openScratch(a:bufname, a:filetype, a:lines, a:topleft, a:vertical, a:height, a:listener)
-  setlocal nomodifiable readonly
-endfunction
-
-" a:listener:
-"   a:listener.onClose(written)
-"   a:listener.onWrite(lines)
-function l9#tempbuffer#openWritable(bufname, filetype, lines, topleft, vertical, height, listener)
-  call l9#tempbuffer#openScratch(a:bufname, a:filetype, a:lines, a:topleft, a:vertical, a:height, a:listener)
-  setlocal buftype=acwrite
-endfunction
-
-" makes specified temp buffer current.
-function l9#tempbuffer#moveTo(bufname)
-  return l9#moveToBufferWindowInCurrentTabpage(s:dataMap[a:bufname].bufNr) ||
-        \ l9#moveToBufferWindowInOtherTabpage(s:dataMap[a:bufname].bufNr)
-endfunction
-
-"
-function l9#tempbuffer#close(bufname)
-  if !l9#tempbuffer#isOpen(a:bufname)
-    return
-  endif
-  execute printf('%dbdelete!', s:dataMap[a:bufname].bufNr)
-endfunction
-
-"
-function l9#tempbuffer#isOpen(bufname)
-  return exists('s:dataMap[a:bufname]') && bufloaded(s:dataMap[a:bufname].bufNr)
-endfunction
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
-
diff --git a/bundle/l9/autoload/l9/tempvariables.vim b/bundle/l9/autoload/l9/tempvariables.vim
deleted file mode 100644
index ee847ee..0000000
--- a/bundle/l9/autoload/l9/tempvariables.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-"=============================================================================
-" Copyright (C) 2010 Takeshi NISHIDA
-"
-"=============================================================================
-" LOAD GUARD {{{1
-
-if !l9#guardScriptLoading(expand('<sfile>:p'), 0, 0, [])
-  finish
-endif
-
-" }}}1
-"=============================================================================
-" TEMPORARY VARIABLES {{{1
-
-"
-let s:origMap = {}
-
-" set temporary variables
-function l9#tempvariables#set(group, name, value)
-  if !exists('s:origMap[a:group]')
-    let s:origMap[a:group] = {}
-  endif
-  if !exists('s:origMap[a:group][a:name]')
-    let s:origMap[a:group][a:name] = eval(a:name)
-  endif
-  execute 'let ' . a:name . ' = a:value'
-endfunction
-
-" set temporary variables
-function l9#tempvariables#setList(group, variables)
-  for [name, value] in a:variables
-    call l9#tempvariables#set(a:group, name, value)
-    unlet value " to avoid E706
-  endfor
-endfunction
-
-" get temporary variables
-function l9#tempvariables#getList(group)
-  if !exists('s:origMap[a:group]')
-    return []
-  endif
-  return map(keys(s:origMap[a:group]), '[v:val, eval(v:val)]')
-endfunction
-
-" restore original variables and clean up.
-function l9#tempvariables#end(group)
-  if !exists('s:origMap[a:group]')
-    return
-  endif
-  for [name, value] in items(s:origMap[a:group])
-    execute 'let ' . name . ' = value'
-    unlet value " to avoid E706
-  endfor
-  unlet s:origMap[a:group]
-endfunction
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
-
diff --git a/bundle/l9/doc/l9.jax b/bundle/l9/doc/l9.jax
deleted file mode 100644
index c84d45f..0000000
--- a/bundle/l9/doc/l9.jax
+++ /dev/null
@@ -1,55 +0,0 @@
-*l9.txt*        Vimスクリプトライブラリ
-
-        Copyright (c) 2009-2010 Takeshi NISHIDA
-
-l9                                                                        *l9*
-
-概要                            |l9-introduction|
-インストール                    |l9-installation|
-使い方                          |l9-usage|
-CHANGELOG                       |l9-changelog|
-あばうと                        |l9-about|
-
-==============================================================================
-概要                                                         *l9-introduction*
-
-l9はVimスクリプトの関数やコマンドを提供するライブラリです。
-
-
-==============================================================================
- インストール                                                *l9-installation*
-
-ZIPファイルをランタイムディレクトリに展開します。
-
-以下のようにファイルが配置されるはずです。
->
-        <your runtime directory>/plugin/l9.vim
-        <your runtime directory>/doc/l9.txt
-        ...
-<
-もしランタイムディレクトリが多数のプラグインでごちゃごちゃになるのが嫌なら、各
-プラグインを個別のディレクトリに配置し、そのディレクトリのパスを 'runtimepath'
-に追加してください。アンインストールも楽になります。
-
-その後、ヘルプを有効にするためにタグファイルを更新してください。詳しくは
-|add-local-help|を参照してください。
-
-==============================================================================
-使い方                                                              *l9-usage*
-
-ソースコードを参照してください。
-
-==============================================================================
-あばうと                                   *l9-about* *l9-contact* *l9-author*
-
-作者:       Takeshi NISHIDA <ns9tks@DELETE-ME.gmail.com>
-ライセンス: MIT Licence
-URL:        http://www.vim.org/scripts/script.php?script_id=3252
-            http://bitbucket.org/ns9tks/vim-l9/
-
-バグや要望など ~
-
-こちらへどうぞ: http://bitbucket.org/ns9tks/vim-l9/issues/
-
-==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/bundle/l9/doc/l9.txt b/bundle/l9/doc/l9.txt
deleted file mode 100644
index c2906e6..0000000
--- a/bundle/l9/doc/l9.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-*l9.txt*        Vim-script library
-
-        Copyright (c) 2009-2010 Takeshi NISHIDA
-
-l9                                                                        *l9*
-
-INTRODUCTION                    |l9-introduction|
-INSTALLATION                    |l9-installation|
-USAGE                           |l9-usage|
-CHANGELOG                       |l9-changelog|
-ABOUT                           |l9-about|
-
-==============================================================================
-INTRODUCTION                                                 *l9-introduction*
-
-l9 is a Vim-script library, which provides some utility functions and commands
-for programming in Vim.
-
-==============================================================================
- INSTALLATION                                                *l9-installation*
-
-Put all files into your runtime directory. If you have the zip file, extract
-it to your runtime directory.
-
-You should place the files as follows:
->
-        <your runtime directory>/plugin/l9.vim
-        <your runtime directory>/doc/l9.txt
-        ...
-<
-If you are disgusted to make your runtime directory confused with a lot of
-plugins, put each of the plugins into a directory individually and just add
-the directory path to 'runtimepath'. It's easy to uninstall plugins.
-
-Then update your help tags files to enable help for this plugin. See
-|add-local-help| for details.
-
-==============================================================================
-USAGE                                                               *l9-usage*
-
-See source code.
-
-==============================================================================
-CHANGELOG                                                       *l9-changelog*
-
-1.1:
-  - Added l9#zip()
-  - Added l9#tempvariables#getList()
-  - Changed l9#guardScriptLoading()
-  - Removed l9#tempvariables#swap()
-
-1.0.1:
-  - Fixed a bug that floating point numbers weren't evaluated correctly and
-    caused errors on some non-English locales.
-
-1.0:
-  - First release.
-
-
-==============================================================================
-ABOUT                                      *l9-about* *l9-contact* *l9-author*
-
-Author:  Takeshi NISHIDA <ns9tks@DELETE-ME.gmail.com>
-Licence: MIT Licence
-URL:     http://www.vim.org/scripts/script.php?script_id=3252
-         http://bitbucket.org/ns9tks/vim-l9/
-
-Bugs/Issues/Suggestions/Improvements ~
-
-Please submit to http://bitbucket.org/ns9tks/vim-l9/issues/ .
-
-==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/bundle/l9/plugin/l9.vim b/bundle/l9/plugin/l9.vim
deleted file mode 100644
index 03613e4..0000000
--- a/bundle/l9/plugin/l9.vim
+++ /dev/null
@@ -1,108 +0,0 @@
-"=============================================================================
-" Copyright (C) 2009-2010 Takeshi NISHIDA
-"
-" GetLatestVimScripts: 3252 1 :AutoInstall: L9
-"=============================================================================
-" LOAD GUARD {{{1
-
-if !l9#guardScriptLoading(expand('<sfile>:p'), 702, 0, [])
-  finish
-endif
-
-" }}}1
-"=============================================================================
-" OPTIONS: {{{1
-
-call l9#defineVariableDefault('g:l9_balloonly', 'balloonly.exe')
-
-" }}}1
-"=============================================================================
-" ASSERTION: {{{1
-
-" This command has effect only if $L9_DEBUG is non-zero.
-" Used as follows:
-"   L9Assert a:i > 0
-" This command can't interpret script-local variables directly.
-"   NG: L9Assert s:a == 1
-"   OK: execute 'L9Assert ' . s:a . ' == 1'
-"
-if $L9_DEBUG
-  command -nargs=* L9Assert call eval((<args>) ? 0 : s:handleFailedAssersion(<q-args>))
-
-  function s:handleFailedAssersion(expr)
-    echoerr '[L9Assert] Assersion failure: ' . a:expr
-    if input('[L9Assert] Continue? (Y/N) ', 'Y') !=? 'Y'
-      throw 'L9Assert ' . a:expr
-    endif
-  endfunction
-
-else
-  command -nargs=* L9Assert :
-endif
-
-" }}}1
-"=============================================================================
-" TIMER: {{{1
-
-" These commands have effect only if $L9_TIMER is non-zero.
-" Used as follows:
-"   L9Timer foo
-"     ... (1)
-"   L9Timer bar
-"     ... (2)
-"   L9TimerStop
-"     ...
-"   L9TimerDump  <- shows each elapsed time of (1) and (2)
-"
-if $L9_TIMER
-  command -nargs=1 L9Timer call s:timerBegin(<q-args>)
-  command -nargs=0 L9TimerStop call s:timerStop()
-  command -nargs=0 L9TimerDump call s:timerDump()
-
-  let s:timerData = []
-  let s:timerTagMaxLen = 0
-
-  function s:timerBegin(tag)
-    L9TimerStop
-    let s:timerCurrent = {'tag': strftime('%c ') . a:tag . ' ', 'time': reltime()}
-    let s:timerTagMaxLen = max([len(s:timerCurrent.tag), s:timerTagMaxLen])
-  endfunction
-
-  function s:timerStop()
-    if !exists('s:timerCurrent')
-      return
-    endif
-    let s:timerCurrent.time = reltimestr(reltime(s:timerCurrent.time))
-    call add(s:timerData, s:timerCurrent)
-    unlet s:timerCurrent
-  endfunction
-
-  function s:timerDump()
-    L9TimerStop
-    let lines = map(s:timerData, 'v:val.tag . repeat(" ", s:timerTagMaxLen - len(v:val.tag)) . v:val.time')
-    call l9#tempbuffer#openReadOnly('[l9-timer]', '', lines, 0, 0, 0, {})
-    let s:timerData = []
-    let s:timerTagMaxLen = 0
-  endfunction
-
-else
-  command -nargs=1 L9Timer :
-  command -nargs=0 L9TimerStop :
-  command -nargs=0 L9TimerDump :
-endif
-
-" }}}1
-"=============================================================================
-" GREP BUFFER: {{{1
-
-" Grep for current buffer by l9#grepBuffers()
-" Used as :L9GrepBuffer/pattern
-command -nargs=? L9GrepBuffer    call l9#grepBuffers(<q-args>, [bufnr('%')])
-
-" Grep for all buffers by l9#grepBuffers()
-" Used as :L9GrepBufferAll/pattern
-command -nargs=? L9GrepBufferAll call l9#grepBuffers(<q-args>, range(1, bufnr('$')))
-
-" }}}1
-"=============================================================================
-" vim: set fdm=marker:
diff --git a/bundle/less/.gitignore b/bundle/less/.gitignore
deleted file mode 100644
index 1377554..0000000
--- a/bundle/less/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.swp
diff --git a/bundle/less/README.md b/bundle/less/README.md
deleted file mode 100644
index 697ad12..0000000
--- a/bundle/less/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# VIM-LESS
-
-This vim bundle adds syntax highlighting, indenting and autocompletion for the dynamic stylesheet language [LESS](http://lesscss.org).
-
-This bundle is compatible with [vim-css-color](https://github.com/skammer/vim-css-color),
-[vim-css3-syntax](https://github.com/hail2u/vim-css3-syntax) and possibly other plugins that place code
-in `after/syntax/css.vim` or `after/syntax/css/*.vim`.
-
-![vim-less with vim-css-color and vim-css3-syntax (colorscheme solarized)](https://github.com/lenniboy/vim-less/raw/master/screenshot.png)
-
-
-## Installing and Using
-
-- Install [pathogen](http://www.vim.org/scripts/script.php?script_id=2332) into `~/.vim/autoload/` and add the
-   following line to your `~/.vimrc`:
-
-        call pathogen#infect()
-
-- Make a clone of the `vim-less` repository:
-
-        $ mkdir -p ~/.vim/bundle
-        $ cd ~/.vim/bundle
-        $ git clone https://github.com/groenewege/vim-less
-
-- OR use [vundle](https://github.com/gmarik/vundle), adding this line to your `~/.vimrc`:
-
-        Bundle 'groenewege/vim-less'
-
-- OR use git submodules:
-
-        $ git submodule add https://github.com/groenewege/vim-less.git bundle/vim-less
-        $ git submodule init
-
-
-### Map
-.less to .css , lessc is required.
-
-    nnoremap ,m :w <BAR> !lessc % > %:t:r.css<CR><space>
-
-
-## Credits
-
-Inspiration from [vim-haml](https://github.com/tpope/vim-haml),
-[scss-syntax.vim](https://github.com/cakebaker/scss-syntax.vim) and
-[vim-less](https://github.com/lunaru/vim-less)
-
-## License ##
-
-MIT : [groenewege.mit-license.org](http://groenewege.mit-license.org/)
diff --git a/bundle/less/ftdetect/less.vim b/bundle/less/ftdetect/less.vim
deleted file mode 100644
index f1cb1d7..0000000
--- a/bundle/less/ftdetect/less.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufNewFile,BufRead *.less setf less
diff --git a/bundle/less/ftplugin/less.vim b/bundle/less/ftplugin/less.vim
deleted file mode 100644
index b6eaf6a..0000000
--- a/bundle/less/ftplugin/less.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-" Vim filetype plugin
-" Language:	    LessCSS
-" Author:	    Tim Pope <vimNOSPAM@tpope.org>
-" Maintainer:   Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change:  2011 Sep 30
-
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
-
-setlocal iskeyword+=-
-setlocal commentstring=//\ %s
-setlocal define=^\\s*\\%(@mixin\\\|=\\)
-setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
-setlocal omnifunc=csscomplete#CompleteCSS
-setlocal suffixesadd=.less
-setlocal comments=s1:/*,mb:*,ex:*/
-
-let &l:include = '^\s*@import\s\+\%(url(http://github.com/)\=["'']\='
-
-" vim:set sw=2:
diff --git a/bundle/less/indent/less.vim b/bundle/less/indent/less.vim
deleted file mode 100644
index fea8846..0000000
--- a/bundle/less/indent/less.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" Vim indent file
-" Language:	    LessCSS
-" Maintainer:	Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change:	2011 Sep 26
-
-if exists("b:did_indent")
-  finish
-endif
-
-runtime! indent/css.vim
-
diff --git a/bundle/less/screenshot.png b/bundle/less/screenshot.png
deleted file mode 100644
index ce25624..0000000
Binary files a/bundle/less/screenshot.png and /dev/null differ
diff --git a/bundle/less/syntax/less.vim b/bundle/less/syntax/less.vim
deleted file mode 100644
index fa5a247..0000000
--- a/bundle/less/syntax/less.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-if exists("b:current_syntax")
-  finish
-endif
-
-runtime! syntax/css.vim
-runtime! after/syntax/css.vim
-" load files from vim-css3-syntax plugin (https://github.com/hail2u/vim-css3-syntax)
-runtime! after/syntax/css/*.vim
-
-syn case ignore
-
-syn region lessDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssTagName,cssPseudoClass,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,lessDefinition,lessComment,lessClassChar,lessVariable,lessMixinChar,lessAmpersandChar,lessFunction,lessNestedSelector,@cssColors fold
-
-syn match lessVariable "@[[:alnum:]_-]\+" contained
-syn match lessVariable "@[[:alnum:]_-]\+" nextgroup=lessVariableAssignment skipwhite
-syn match lessVariableAssignment ":" contained nextgroup=lessVariableValue skipwhite
-syn match lessVariableValue ".*;"me=e-1 contained contains=lessVariable,lessOperator,lessDefault,cssValue.*,@cssColors "me=e-1 means that the last char of the pattern is not highlighted
-
-syn match lessOperator "+" contained
-syn match lessOperator "-" contained
-syn match lessOperator "/" contained
-syn match lessOperator "*" contained
-
-syn match lessNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,lessAmpersandChar,lessVariable,lessMixinChar,lessFunction,lessNestedProperty
-syn match lessNestedProperty "[[:alnum:]]\+:"me=e-1 contained
-
-syn match lessDefault "!default" contained
-
-syn match lessMixinChar "\.[[:alnum:]_-]\@=" contained nextgroup=lessClass
-syn match lessAmpersandChar "&" contained nextgroup=lessClass,cssPseudoClass
-syn match lessClass "[[:alnum:]_-]\+" contained
-
-" functions {{{
-
-" string functions
-syn keyword lessFunction escape e % containedin=cssDefinition contained
-" misc functions
-syn keyword lessFunction color unit containedin=cssDefinition contained
-" math functions
-syn keyword lessFunction ceil floor percentage round containedin=cssDefinition contained
-" color definition
-syn keyword lessFunction rgb rgba argb hsl hsla hsv hsva containedin=cssDefinition contained
-" color channel information
-syn keyword lessFunction hue saturation lightness red green blue alpha luma containedin=cssDefinition contained
-" color operations
-syn keyword lessFunction saturate desaturate lighten darken fadein fadeout fade spin mix greyscale contrast containedin=cssDefinition contained
-" color blending
-syn keyword lessFunction multiply screen overlay softlight hardlight difference exclusion average negation containedin=cssDefinition contained
-
-" }}}
-
-syn match lessComment "//.*$" contains=@Spell
-
-hi def link lessVariable Special
-hi def link lessVariableValue Constant
-hi def link lessDefault Special
-hi def link lessComment Comment
-hi def link lessFunction Function
-hi def link lessMixinChar Special
-hi def link lessAmpersandChar Special
-hi def link lessNestedProperty Type
-hi def link lessClass PreProc
-
-let b:current_syntax = "less"
diff --git a/bundle/misc/.gitignore b/bundle/misc/.gitignore
deleted file mode 100755
index 926ccaa..0000000
--- a/bundle/misc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-doc/tags
diff --git a/bundle/misc/INSTALL.md b/bundle/misc/INSTALL.md
deleted file mode 100755
index 2020f3d..0000000
--- a/bundle/misc/INSTALL.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Installation instructions
-
-There are two ways to install the vim-misc plug-in and it's up to you which you prefer, both options are explained below. Please note that below are generic installation instructions while some Vim plug-ins may have external dependencies, please refer to the plug-in's [readme](README.md) for details.
-
-## Installation using a ZIP archive
-
-Unzip the most recent ZIP archive of the [vim-misc](http://peterodding.com/code/vim/downloads/misc.zip) plug-in inside your Vim profile directory (usually this is `~/.vim` on UNIX and `%USERPROFILE%\vimfiles` on Windows), restart Vim and execute the command `:helptags ~/.vim/doc` (use `:helptags ~\vimfiles\doc` instead on Windows).
-
-If you get warnings about overwriting existing files while unpacking the ZIP archive you probably don't need to worry about this because it's most likely caused by files like `README.md`, `INSTALL.md` and `addon-info.json`. If these files bother you then you can remove them after unpacking the ZIP archive, they are not required to use the plug-in.
-
-## Installation using a Vim plug-in manager
-
-If you prefer you can also use [Pathogen](http://www.vim.org/scripts/script.php?script_id=2332), [Vundle](https://github.com/gmarik/vundle) or a similar tool to install and update the [vim-misc](https://github.com/xolox/vim-misc) plug-in using a local clone of the git repository. This takes a bit of work to set up the first time but it makes updating much easier, and it keeps each plug-in in its own directory which helps to keep your Vim profile uncluttered.
diff --git a/bundle/misc/README.md b/bundle/misc/README.md
deleted file mode 100755
index 937d7c9..0000000
--- a/bundle/misc/README.md
+++ /dev/null
@@ -1,1015 +0,0 @@
-# Miscellaneous auto-load Vim scripts
-
-The vim-misc plug-in contains Vim scripts that are used by most of the [Vim
-plug-ins I've written] [plugins] yet don't really belong with any single one of
-the plug-ins. Basically it's an extended standard library of Vim script
-functions that I wrote during the development of my Vim profile and plug-ins.
-
-In the past these scripts were bundled with each plug-in, however that turned
-out to be a maintenance nightmare for me. That's why the miscellaneous scripts
-are now a proper plug-in with their own page on Vim Online.
-
-Because the miscellaneous scripts are no longer bundled with my Vim plug-ins,
-users are now required to install the miscellaneous scripts separately. This is
-unfortunate for users who are upgrading from a previous release that did bundle
-the miscellaneous scripts, but I don't see any way around this. Sorry!
-
-## Installation
-
-Please refer to the [installation instructions] [howto-install] on GitHub.
-
-## Function documentation
-
-Below is the documentation for the functions included in the miscellaneous
-scripts. Anyone is free to use these functions in their own Vim profile and/or
-plug-ins. I care about backwards compatibility so won't break it without a good
-reason to do so.
-
-For those who are curious: The function descriptions given below were extracted
-from the source code of the miscellaneous scripts using the Python module
-`vimdoctool.py` included in [vim-tools] [].
-
-<!-- Start of generated documentation -->
-
-The documentation of the 95 functions below was extracted from
-19 Vim scripts on April  1, 2015 at 23:39.
-
-### Asynchronous Vim script evaluation
-
-The `xolox#misc#async#call()` function builds on top of `xolox#misc#os#exec()`
-to support asynchronous evaluation of Vim scripts. The first (and for now
-only) use case is my [vim-easytags][] plug-in which has a bunch of
-conflicting requirements:
-
-1. I want the [vim-easytags][] plug-in to be as portable as possible.
-   Ideally everything is implemented in Vim script because that's the only
-   thing I can rely on to be available for all potential users of the
-   plug-in!
-
-2. Because of point one I've been forced to implement tags file reading,
-   parsing, (fold case) sorting and writing in Vim script. This is fine for
-   small tags files but once they grow to a couple of megabytes it becomes
-   annoying because Vim is unresponsive during tags file updates (key
-   presses are fortunately buffered due to Vim's input model but that
-   doesn't make it a nice user experience :-).
-
-3. I could (and did in the past) come up with all sorts of hacks to speed
-   things up without switching away from Vim script, but none of them are
-   going to solve the fundamental problem that Vim's unresponsive hiccups
-   become longer as tags files grow larger.
-
-By now it should be clear where this is heading: _Why not handle tags file
-updates in a Vim process that runs in the background without blocking the
-Vim process that the user is interacting with?_ It turns out that there are
-quite a few details to take care of, but with those out of the way, it might
-just work! I'm actually hoping to make asynchronous updates the default mode
-in [vim-easytags][]. This means I need this functionality to be as
-portable and robust as possible.
-
-**Status:** This code has seen little testing so I wouldn't trust it too
-much just yet. On the other hand, as I said, my intention is to make this
-functionality as portable and robust as possible. You be the judge :-).
-
-[vim-easytags]: http://peterodding.com/code/vim/easytags/
-
-#### The `xolox#misc#async#call()` function
-
-Call a Vim script function asynchronously by starting a hidden Vim process
-in the background. Once the function returns the hidden Vim process
-terminates itself. This function takes a single argument which is a
-dictionary with the following key/value pairs:
-
- - **function** (required): The name of the Vim function to call inside
-   the child process (a string). I suggest using an [autoload][] function
-   for this, see below.
-
- - **arguments** (optional): A list of arguments to pass to the function.
-   This list is serialized to a string using [string()][] and deserialized
-   using [eval()][].
-
- - **callback** (optional): The name of a Vim function to call in the
-   parent process when the child process has completed (a string).
-
- - **clientserver** (optional): If this is true (1) the child process will
-   notify the parent process when it has finished (the default is true).
-   This works using Vim's client/server support which is not always
-   available. As a fall back Vim's [CursorHold][] automatic command is
-   also supported (although the effect is not quite as instantaneous :-).
-
-This functionality is experimental and non trivial to use, so consider
-yourself warned :-).
-
-**Limitations**
-
-I'm making this functionality available in [vim-misc][] because I think it
-can be useful to other plug-ins, however if you are going to use it you
-should be aware of the following limitations:
-
- - Because of the use of multiple processes this functionality is only
-   suitable for 'heavy' tasks.
-
- - The function arguments are serialized to a string which is passed to
-   the hidden Vim process as a command line argument, so the amount of
-   data you can pass will be limited by your operating environment.
-
- - The hidden Vim process is explicitly isolated from the user in several
-   ways (see below for more details). This is to make sure that the hidden
-   Vim processes are fast and don't clobber the user's editing sessions in
-   any way.
-
-**Changes to how Vim normally works**
-
-You have to be aware that the hidden Vim process is initialized in a
-specific way that is very different from your regular Vim editing
-sessions:
-
- - Your [vimrc][] file is ignored using the `-u NONE` command line option.
-
- - Your [gvimrc][] file (if you even knew it existed ;-) is ignored using
-   the `-U NONE` command line option.
-
- - Plug-in loading is skipped using the `--noplugin` command line option.
-
- - Swap files (see [swap-file][]) are disabled using the `-n` command line
-   option. This makes sure asynchronous Vim processes don't disturb the
-   user's editing session.
-
- - Your [viminfo][] file is ignored using the `-i NONE` command line
-   option. Just like with swap files this makes sure asynchronous Vim
-   processes don't disturb the user's editing session.
-
- - No-compatible mode is enabled using the `-N` command line option
-   (usually the existence of your vimrc script would have achieved the
-   same effect but since we disable loading of your vimrc we need to spell
-   things out for Vim).
-
-**Use an auto-load function**
-
-The function you want to call is identified by its name which has to be
-defined, but I just explained above that all regular initialization is
-disabled for asynchronous Vim processes, so what gives? The answer is to
-use an [autoload][] function. This should work fine because the
-asynchronous Vim process 'inherits' the value of the ['runtimepath'][]
-option from your editing session.
-
-['runtimepath']: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath'
-[autoload]: http://vimdoc.sourceforge.net/htmldoc/eval.html#autoload
-[CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-[eval()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#eval()
-[gvimrc]: http://vimdoc.sourceforge.net/htmldoc/gui.html#gvimrc
-[string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-[swap-file]: http://vimdoc.sourceforge.net/htmldoc/recover.html#swap-file
-[vim-misc]: http://peterodding.com/code/vim/misc/
-[viminfo]: http://vimdoc.sourceforge.net/htmldoc/starting.html#viminfo
-[vimrc]: http://vimdoc.sourceforge.net/htmldoc/starting.html#vimrc
-
-#### The `xolox#misc#async#inside_child()` function
-
-Entry point inside the hidden Vim process that runs in the background.
-Invoked indirectly by `xolox#misc#async#call()` because it runs a command
-similar to the following:
-
-    vim --cmd 'call xolox#misc#async#inside_child(...)'
-
-This function is responsible for calling the user defined function,
-capturing exceptions and reporting the results back to the parent Vim
-process using Vim's client/server support or a temporary file.
-
-#### The `xolox#misc#async#callback_to_parent()` function
-
-When Vim was compiled with client/server support this function (in the
-parent process) will be called by `xolox#misc#async#inside_child()` (in
-the child process) after the user defined function has returned. This
-enables more or less instant callbacks after running an asynchronous
-function.
-
-#### The `xolox#misc#async#periodic_callback()` function
-
-When client/server support is not being used the vim-misc plug-in
-improvises: It uses Vim's [CursorHold][] event to periodically check if an
-asynchronous process has written its results to one of the expected
-temporary files. If a response is found the temporary file is read and
-deleted and then `xolox#misc#async#callback_to_parent()` is called to
-process the response.
-
-[CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-
-### Handling of special buffers
-
-The functions defined here make it easier to deal with special Vim buffers
-that contain text generated by a Vim plug-in. For example my [vim-notes
-plug-in] [vim-notes] generates several such buffers:
-
-- [:RecentNotes] [RecentNotes] lists recently modified notes
-- [:ShowTaggedNotes] [ShowTaggedNotes] lists notes grouped by tags
-- etc.
-
-Because the text in these buffers is generated, Vim shouldn't bother with
-swap files and it should never prompt the user whether to save changes to
-the generated text.
-
-[vim-notes]: http://peterodding.com/code/vim/notes/
-[RecentNotes]: http://peterodding.com/code/vim/notes/#recentnotes_command
-[ShowTaggedNotes]: http://peterodding.com/code/vim/notes/#showtaggednotes_command
-
-#### The `xolox#misc#buffer#is_empty()` function
-
-Checks if the current buffer is an empty, unchanged buffer which can be
-reused. Returns 1 if an empty buffer is found, 0 otherwise.
-
-#### The `xolox#misc#buffer#prepare()` function
-
-Open a special buffer, i.e. a buffer that will hold generated contents,
-not directly edited by the user. The buffer can be customized by passing a
-dictionary with the following key/value pairs as the first argument:
-
-- **name** (required): The base name of the buffer (i.e. the base name of
-  the file loaded in the buffer, even though it isn't really a file and
-  nothing is really 'loaded' :-)
-- **path** (required): The pathname of the buffer. May be relevant if
-  [:lcd] [lcd] or ['autochdir'] [acd] is being used.
-
-[lcd]: http://vimdoc.sourceforge.net/htmldoc/editing.html#:lcd
-[acd]: http://vimdoc.sourceforge.net/htmldoc/options.html#'autochdir'
-
-#### The `xolox#misc#buffer#lock()` function
-
-Lock a special buffer so that its contents can no longer be edited.
-
-#### The `xolox#misc#buffer#unlock()` function
-
-Unlock a special buffer so that its content can be updated.
-
-### Tab completion for user defined commands
-
-#### The `xolox#misc#complete#keywords()` function
-
-This function can be used to perform keyword completion for user defined
-Vim commands based on the contents of the current buffer. Here's an
-example of how you would use it:
-
-    :command -nargs=* -complete=customlist,xolox#misc#complete#keywords MyCmd call s:MyCmd(<f-args>)
-
-### Rate limiting for Vim's CursorHold event
-
-Several of my Vim plug-ins (e.g. [vim-easytags][], [vim-notes][] and
-[vim-session][]) use Vim's [CursorHold][] and [CursorHoldI][] events to
-perform periodic tasks when the user doesn't press any keys for a couple of
-seconds. These events by default fire after four seconds, this is
-configurable using Vim's ['updatetime'][] option. The problem that this
-script solves is that there are Vim plug-ins which set the ['updatetime'][]
-option to unreasonably low values, thereby breaking my Vim plug-ins and
-probably a lot of other Vim plug-ins out there. When users complain about
-this I can tell them that another Vim plug-in is to blame, but users don't
-care for the difference, their Vim is broken! So I implemented a workaround.
-This script enables registration of [CursorHold][] event handlers with a
-configurable interval (expressed in seconds). The event handlers will be
-called no more than once every interval.
-
-['updatetime']: http://vimdoc.sourceforge.net/htmldoc/options.html#'updatetime'
-[CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-[CursorHoldI]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHoldI
-[vim-easytags]: http://peterodding.com/code/vim/easytags/
-[vim-notes]: http://peterodding.com/code/vim/notes/
-[vim-session]: http://peterodding.com/code/vim/session/
-
-#### The `xolox#misc#cursorhold#register()` function
-
-Register a [CursorHold][] event handler with a custom interval. This
-function takes a single argument which is a dictionary with the following
-fields:
-
- - **function** (required): The name of the event handler function (a
-   string).
-
- - **arguments** (optional): A list of arguments to pass to the event
-   handler function (defaults to an empty list).
-
- - **interval** (optional): The number of seconds between calls to the
-   event handler (defaults to 4).
-
-#### The `xolox#misc#cursorhold#autocmd()` function
-
-The 'top level event handler' that's called by Vim whenever the
-[CursorHold][] or [CursorHoldI][] event fires. It iterates through the
-event handlers registered using `xolox#misc#cursorhold#register()` and
-calls each event handler at the appropriate interval, keeping track of
-the time when each event handler was last run.
-
-### String escaping functions
-
-#### The `xolox#misc#escape#pattern()` function
-
-Takes a single string argument and converts it into a [:substitute]
-[subcmd] / [substitute()] [subfun] pattern string that matches the given
-string literally.
-
-[subfun]: http://vimdoc.sourceforge.net/htmldoc/eval.html#substitute()
-[subcmd]: http://vimdoc.sourceforge.net/htmldoc/change.html#:substitute
-
-#### The `xolox#misc#escape#substitute()` function
-
-Takes a single string argument and converts it into a [:substitute]
-[subcmd] / [substitute()] [subfun] replacement string that inserts the
-given string literally.
-
-#### The `xolox#misc#escape#shell()` function
-
-Takes a single string argument and converts it into a quoted command line
-argument.
-
-I was going to add a long rant here about Vim's ['shellslash' option]
-[shellslash], but really, it won't make any difference. Let's just suffice
-to say that I have yet to encounter a single person out there who uses
-this option for its intended purpose (running a UNIX style shell on
-Microsoft Windows).
-
-[shellslash]: http://vimdoc.sourceforge.net/htmldoc/options.html#'shellslash'
-
-### Human friendly string formatting for Vim
-
-#### The `xolox#misc#format#pluralize()` function
-
-Concatenate a counter (the first argument, expected to be an integer) with
-a singular or plural label (the second and third arguments, both expected
-to be strings).
-
-#### The `xolox#misc#format#timestamp()` function
-
-Format a time stamp (a string containing a formatted floating point
-number) into a human friendly format, for example 70 seconds is phrased as
-"1 minute and 10 seconds".
-
-### List handling functions
-
-#### The `xolox#misc#list#unique()` function
-
-Remove duplicate values from the given list in-place (preserves order).
-
-#### The `xolox#misc#list#binsert()` function
-
-Performs in-place binary insertion, which depending on your use case can
-be more efficient than calling Vim's [sort()] [sort] function after each
-insertion (in cases where a single, final sort is not an option). Expects
-three arguments:
-
-1. A list
-2. A value to insert
-3. 1 (true) when case should be ignored, 0 (false) otherwise
-
-[sort]: http://vimdoc.sourceforge.net/htmldoc/eval.html#sort()
-
-### Functions to interact with the user
-
-#### The `xolox#misc#msg#info()` function
-
-Show a formatted informational message to the user.
-
-This function has the same argument handling as Vim's [printf()] []
-function with one notable difference: Any arguments which are not numbers
-or strings are coerced to strings using Vim's [string()] [] function.
-
-In the case of `xolox#misc#msg#info()`, automatic string coercion simply
-makes the function a bit easier to use.
-
-The messages emitted by this function have no highlighting. Previously
-these messages were highlighted using the [Title group] [hl-title], but it
-was pointed out in [pull request 16] [pr-16] that this group shouldn't be
-used for informational messages because it is meant for titles and because
-of this some color schemes use colors that stand out quite a bit, causing
-the informational messages to look like errors.
-
-[hl-title]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-Title
-[pr-16]: https://github.com/xolox/vim-misc/pull/16
-[printf()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#printf()
-[string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-
-#### The `xolox#misc#msg#warn()` function
-
-Show a formatted warning message to the user.
-
-This function has the same argument handling as the
-`xolox#misc#msg#info()` function.
-
-#### The `xolox#misc#msg#debug()` function
-
-Show a formatted debugging message to the user, *if the user has enabled
-increased verbosity by setting Vim's ['verbose'] [] option to one
-(1) or higher*.
-
-This function has the same argument handling as the
-`xolox#misc#msg#info()` function.
-
-In the case of `xolox#misc#msg#debug()`, automatic string coercion
-provides lazy evaluation in the sense that complex data structures are
-only converted to strings when the user has enabled increased verbosity.
-
-['verbose']: http://vimdoc.sourceforge.net/htmldoc/options.html#'verbose'
-
-### Integration between Vim and its environment
-
-#### The `xolox#misc#open#file()` function
-
-Given a pathname or URL as the first argument, this opens the file with
-the program associated with the file type. So for example a text file
-might open in Vim, an `*.html` file would probably open in your web
-browser and a media file would open in a media player.
-
-This should work on Windows, Mac OS X and most Linux distributions. If
-this fails to find a file association, you can pass one or more external
-commands to try as additional arguments. For example:
-
-    :call xolox#misc#open#file('/path/to/my/file', 'firefox', 'google-chrome')
-
-This generally shouldn't be necessary but it might come in handy now and
-then.
-
-#### The `xolox#misc#open#url()` function
-
-Given a URL as the first argument, this opens the URL in your preferred or
-best available web browser:
-
-- In GUI environments a graphical web browser will open (or a new tab will
-  be created in an existing window)
-- In console Vim without a GUI environment, when you have any of `lynx`,
-  `links` or `w3m` installed it will launch a command line web browser in
-  front of Vim (temporarily suspending Vim)
-
-### Vim and plug-in option handling
-
-#### The `xolox#misc#option#get()` function
-
-Expects one or two arguments: 1. The name of a variable and 2. the default
-value if the variable does not exist.
-
-Returns the value of the variable from a buffer local variable, global
-variable or the default value, depending on which is defined.
-
-This is used by some of my Vim plug-ins for option handling, so that users
-can customize options for specific buffers.
-
-#### The `xolox#misc#option#split()` function
-
-Given a multi-value Vim option like ['runtimepath'] [rtp] this returns a
-list of strings. For example:
-
-    :echo xolox#misc#option#split(&runtimepath)
-    ['/home/peter/Projects/Vim/misc',
-     '/home/peter/Projects/Vim/colorscheme-switcher',
-     '/home/peter/Projects/Vim/easytags',
-     ...]
-
-[rtp]: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath'
-
-#### The `xolox#misc#option#join()` function
-
-Given a list of strings like the ones returned by
-`xolox#misc#option#split()`, this joins the strings together into a
-single value that can be used to set a Vim option.
-
-#### The `xolox#misc#option#split_tags()` function
-
-Customized version of `xolox#misc#option#split()` with specialized
-handling for Vim's ['tags' option] [tags].
-
-[tags]: http://vimdoc.sourceforge.net/htmldoc/options.html#'tags'
-
-#### The `xolox#misc#option#join_tags()` function
-
-Customized version of `xolox#misc#option#join()` with specialized
-handling for Vim's ['tags' option] [tags].
-
-#### The `xolox#misc#option#eval_tags()` function
-
-Evaluate Vim's ['tags' option] [tags] without looking at the file
-system, i.e. this will report tags files that don't exist yet. Expects
-the value of the ['tags' option] [tags] as the first argument. If the
-optional second argument is 1 (true) only the first match is returned,
-otherwise (so by default) a list with all matches is returned.
-
-### Operating system interfaces
-
-#### The `xolox#misc#os#is_mac()` function
-
-Returns 1 (true) when on Mac OS X, 0 (false) otherwise. You would expect
-this to simply check the Vim feature list, but for some obscure reason the
-`/usr/bin/vim` included in Mac OS X (verified on version 10.7.5) returns 0
-(false) in response to `has('mac')`, so we check the output of `uname`
-to avoid false negatives.
-
-#### The `xolox#misc#os#is_win()` function
-
-Returns 1 (true) when on Microsoft Windows, 0 (false) otherwise.
-
-#### The `xolox#misc#os#find_vim()` function
-
-Returns the program name of Vim as a string. On Windows and UNIX this just
-[v:progname] [] as an absolute pathname while on Mac OS X there is
-some special magic to find MacVim's executable even though it's usually
-not on the executable search path. If you want, you can override the
-value returned from this function by setting the global variable
-`g:xolox#misc#os#vim_progname`.
-
-By default the choice of console Vim vs graphical Vim is made based on
-the value of [v:progname] [], but if you have a preference you can pass
-the string `vim` or `gvim` as the first and only argument.
-
-[v:progname]: http://vimdoc.sourceforge.net/htmldoc/eval.html#v:progname
-
-#### The `xolox#misc#os#exec()` function
-
-Execute an external command (hiding the console on Microsoft Windows when
-my [vim-shell plug-in] [vim-shell] is installed).
-
-Expects a dictionary with the following key/value pairs as the first
-argument:
-
-- **command** (required): The command line to execute
-- **async** (optional): set this to 1 (true) to execute the command in the
-  background (asynchronously)
-- **stdin** (optional): a string or list of strings with the input for the
-  external command
-- **check** (optional): set this to 0 (false) to disable checking of the
-  exit code of the external command (by default an exception will be
-  raised when the command fails)
-
-Returns a dictionary with one or more of the following key/value pairs:
-
-- **command** (always available): the generated command line that was used
-  to run the external command
-- **exit_code** (only in synchronous mode): the exit status of the
-  external command (an integer, zero on success)
-- **stdout** (only in synchronous mode): the output of the command on the
-  standard output stream (a list of strings, one for each line)
-- **stderr** (only in synchronous mode): the output of the command on the
-  standard error stream (as a list of strings, one for each line)
-
-[vim-shell]: http://peterodding.com/code/vim/shell/
-
-#### The `xolox#misc#os#can_use_dll()` function
-
-If a) we're on Microsoft Windows, b) the vim-shell plug-in is installed
-and c) the compiled DLL included in vim-shell works, we can use the
-vim-shell plug-in to execute external commands! Returns 1 (true)
-if we can use the DLL, 0 (false) otherwise.
-
-### Pathname manipulation functions
-
-#### The `xolox#misc#path#which()` function
-
-Scan the executable search path (`$PATH`) for one or more external
-programs. Expects one or more string arguments with program names. Returns
-a list with the absolute pathnames of all found programs. Here's an
-example:
-
-    :echo xolox#misc#path#which('gvim', 'vim')
-    ['/usr/local/bin/gvim',
-     '/usr/bin/gvim',
-     '/usr/local/bin/vim',
-     '/usr/bin/vim']
-
-#### The `xolox#misc#path#split()` function
-
-Split a pathname (the first and only argument) into a list of pathname
-components.
-
-On Windows, pathnames starting with two slashes or backslashes are UNC
-paths where the leading slashes are significant... In this case we split
-like this:
-
-- Input: `'//server/share/directory'`
-- Result: `['//server', 'share', 'directory']`
-
-Everything except Windows is treated like UNIX until someone has a better
-suggestion :-). In this case we split like this:
-
-- Input: `'/foo/bar/baz'`
-- Result: `['/', 'foo', 'bar', 'baz']`
-
-To join a list of pathname components back into a single pathname string,
-use the `xolox#misc#path#join()` function.
-
-#### The `xolox#misc#path#join()` function
-
-Join a list of pathname components (the first and only argument) into a
-single pathname string. This is the counterpart to the
-`xolox#misc#path#split()` function and it expects a list of pathname
-components as returned by `xolox#misc#path#split()`.
-
-#### The `xolox#misc#path#directory_separator()` function
-
-Find the preferred directory separator for the platform and settings.
-
-#### The `xolox#misc#path#absolute()` function
-
-Canonicalize and resolve a pathname, *regardless of whether it exists*.
-This is intended to support string comparison to determine whether two
-pathnames point to the same directory or file.
-
-#### The `xolox#misc#path#relative()` function
-
-Make an absolute pathname (the first argument) relative to a directory
-(the second argument).
-
-#### The `xolox#misc#path#merge()` function
-
-Join a directory pathname and filename into a single pathname.
-
-#### The `xolox#misc#path#commonprefix()` function
-
-Find the common prefix of path components in a list of pathnames.
-
-#### The `xolox#misc#path#starts_with()` function
-
-Check whether the first pathname starts with the second pathname (expected
-to be a directory). This does not perform a regular string comparison;
-first it normalizes both pathnames, then it splits them into their
-pathname segments and then it compares the segments.
-
-#### The `xolox#misc#path#encode()` function
-
-Encode a pathname so it can be used as a filename. This uses URL encoding
-to encode special characters.
-
-#### The `xolox#misc#path#decode()` function
-
-Decode a pathname previously encoded with `xolox#misc#path#encode()`.
-
-#### The `xolox#misc#path#is_relative()` function
-
-Returns true (1) when the pathname given as the first argument is
-relative, false (0) otherwise.
-
-#### The `xolox#misc#path#tempdir()` function
-
-Create a temporary directory and return the pathname of the directory.
-
-### Manipulation of UNIX file permissions
-
-Vim's [writefile()][] function cannot set file permissions for newly created
-files and although Vim script has a function to get file permissions (see
-[getfperm()][]) there is no equivalent for changing a file's permissions.
-
-This omission breaks the otherwise very useful idiom of updating a file by
-writing its new contents to a temporary file and then renaming the temporary
-file into place (which is as close as you're going to get to atomically
-updating a file's contents on UNIX) because the file's permissions will not
-be preserved!
-
-**Here's a practical example:** My [vim-easytags][] plug-in writes tags file
-updates to a temporary file and renames the temporary file into place. When
-I use `sudo -s` on Ubuntu Linux it preserves my environment variables so my
-`~/.vimrc` and the [vim-easytags][] plug-in are still loaded. Now when a
-tags file is written the file becomes owned by root (my effective user id in
-the `sudo` session). Once I leave the `sudo` session I can no longer update
-my tags file because it's now owned by root … ಠ_ಠ
-
-[getfperm()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#getfperm()
-[vim-easytags]: http://peterodding.com/code/vim/easytags/
-[writefile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#writefile()
-
-#### The `xolox#misc#perm#update()` function
-
-Atomically update a file's contents while preserving the owner, group and
-mode. The first argument is the pathname of the file to update (a string).
-The second argument is the list of lines to be written to the file. Writes
-the new contents to a temporary file and renames the temporary file into
-place, thereby preventing readers from reading a partially written file.
-Returns 1 if the file is successfully updated, 0 otherwise.
-
-Note that if `xolox#misc#perm#get()` and `xolox#misc#perm#set()` cannot be
-used to preserve the file owner/group/mode the file is still updated using
-a rename (for compatibility with non-UNIX systems and incompatible
-`/usr/bin/stat` implementations) so in that case you can still lose the
-file's owner/group/mode.
-
-#### The `xolox#misc#perm#get()` function
-
-Get the owner, group and permissions of the pathname given as the first
-argument. Returns an opaque value which you can later pass to
-`xolox#misc#perm#set()`.
-
-#### The `xolox#misc#perm#set()` function
-
-Set the permissions (the second argument) of the pathname given as the
-first argument. Expects a permissions value created by
-`xolox#misc#perm#get()`.
-
-### Persist/recall Vim values from/to files
-
-Vim's [string()][] function can be used to serialize Vim script values like
-numbers, strings, lists, dictionaries and composites of them to a string
-which can later be evaluated using the [eval()][] function to turn it back
-into the original value. This Vim script provides functions to use these
-functions to persist and recall Vim values from/to files. This is very
-useful for communication between (possibly concurrent) Vim processes.
-
-#### The `xolox#misc#persist#load()` function
-
-Read a Vim value like a number, string, list or dictionary from a file
-using [readfile()][] and [eval()][]. The first argument is the filename of
-the file to read (a string). The optional second argument specifies the
-default value which is returned when the file can't be loaded. This
-function returns the loaded value or the default value (which itself
-defaults to the integer 0).
-
-[eval()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#eval()
-[readfile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#readfile()
-
-#### The `xolox#misc#persist#save()` function
-
-Write a Vim value like a number, string, list or dictionary to a file
-using [string()][] and [writefile()][]. The first argument is the filename
-of the file to write (a string) and the second argument is the value to
-write (any value).
-
-This function writes the serialized value to an intermediate file which is
-then renamed into place atomically. This avoids issues with concurrent
-processes where for example a producer has written a partial file which is
-read by a consumer before the file is complete. In this case the consumer
-would read a corrupt value. The rename trick avoids this problem.
-
-[string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-[writefile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#writefile()
-
-### String handling
-
-#### The `xolox#misc#str#slug()` function
-
-Convert a string to a "slug" - something that can be safely used in
-filenames and URLs without worrying about quoting/escaping of special
-characters.
-
-#### The `xolox#misc#str#ucfirst()` function
-
-Uppercase the first character in a string (the first argument).
-
-#### The `xolox#misc#str#unescape()` function
-
-Remove back slash escapes from a string (the first argument).
-
-#### The `xolox#misc#str#compact()` function
-
-Compact whitespace in a string (the first argument).
-
-#### The `xolox#misc#str#trim()` function
-
-Trim all whitespace from the start and end of a string (the first
-argument).
-
-#### The `xolox#misc#str#indent()` function
-
-Indent all lines in a multi-line string (the first argument) with a
-specific number of *space characters* (the second argument, an integer).
-
-#### The `xolox#misc#str#dedent()` function
-
-Remove common whitespace from a multi line string.
-
-### Test runner & infrastructure for Vim plug-ins
-
-The Vim auto-load script `autoload/xolox/misc/test.vim` contains
-infrastructure that can be used to run an automated Vim plug-in test suite.
-It provides a framework for running test functions, keeping track of the
-test status, making assertions and reporting test results to the user.
-
-#### The `xolox#misc#test#reset()` function
-
-Reset counters for executed tests and passed/failed assertions.
-
-#### The `xolox#misc#test#summarize()` function
-
-Print a summary of test results, to be interpreted interactively.
-
-#### The `xolox#misc#test#wrap()` function
-
-Call a function in a try/catch block and prevent exceptions from bubbling.
-The name of the function should be passed as the first and only argument;
-it should be a string containing the name of a Vim auto-load function.
-
-#### The `xolox#misc#test#passed()` function
-
-Record a test which succeeded.
-
-#### The `xolox#misc#test#failed()` function
-
-Record a test which failed.
-
-#### The `xolox#misc#test#assert_true()` function
-
-Check whether an expression is true.
-
-#### The `xolox#misc#test#assert_equals()` function
-
-Check whether two values are the same.
-
-#### The `xolox#misc#test#assert_same_type()` function
-
-Check whether two values are of the same type.
-
-### Tests for the miscellaneous Vim scripts
-
-The Vim auto-load script `autoload/xolox/misc/tests.vim` contains the
-automated test suite of the miscellaneous Vim scripts. Right now the
-coverage is not very high yet, but this will improve over time.
-
-#### The `xolox#misc#tests#run()` function
-
-Run the automated test suite of the miscellaneous Vim scripts. To be used
-interactively. Intended to be safe to execute irrespective of context.
-
-#### The `xolox#misc#tests#pattern_escaping()` function
-
-Test escaping of regular expression patterns with
-`xolox#misc#escape#pattern()`.
-
-#### The `xolox#misc#tests#substitute_escaping()` function
-
-Test escaping of substitution strings with
-`xolox#misc#escape#substitute()`.
-
-#### The `xolox#misc#tests#shell_escaping()` function
-
-Test escaping of shell arguments with `xolox#misc#escape#shell()`.
-
-#### The `xolox#misc#tests#making_a_list_unique()` function
-
-Test removing of duplicate values from lists with
-`xolox#misc#list#unique()`.
-
-#### The `xolox#misc#tests#binary_insertion()` function
-
-Test the binary insertion algorithm implemented in
-`xolox#misc#list#binsert()`.
-
-#### The `xolox#misc#tests#getting_configuration_options()` function
-
-Test getting of scoped plug-in configuration "options" with
-`xolox#misc#option#get()`.
-
-#### The `xolox#misc#tests#splitting_of_multi_valued_options()` function
-
-Test splitting of multi-valued Vim options with
-`xolox#misc#option#split()`.
-
-#### The `xolox#misc#tests#joining_of_multi_valued_options()` function
-
-Test joining of multi-valued Vim options with `xolox#misc#option#join()`.
-
-#### The `xolox#misc#tests#finding_vim_on_the_search_path()` function
-
-Test looking up Vim's executable on the search path using [v:progname] []
-with `xolox#misc#os#find_vim()`.
-
-[v:progname]: http://vimdoc.sourceforge.net/htmldoc/eval.html#v:progname
-
-#### The `xolox#misc#tests#synchronous_command_execution()` function
-
-Test basic functionality of synchronous command execution with
-`xolox#misc#os#exec()`.
-
-#### The `xolox#misc#tests#synchronous_command_execution_with_stderr()` function
-
-Test basic functionality of synchronous command execution with
-`xolox#misc#os#exec()` including the standard error stream (not available
-on Windows when vim-shell is not installed).
-
-#### The `xolox#misc#tests#synchronous_command_execution_with_raising_of_errors()` function
-
-Test raising of errors during synchronous command execution with
-`xolox#misc#os#exec()`.
-
-#### The `xolox#misc#tests#synchronous_command_execution_without_raising_errors()` function
-
-Test synchronous command execution without raising of errors with
-`xolox#misc#os#exec()`.
-
-#### The `xolox#misc#tests#asynchronous_command_execution()` function
-
-Test the basic functionality of asynchronous command execution with
-`xolox#misc#os#exec()`. This runs the external command `mkdir` and tests
-that the side effect of creating the directory takes place. This might
-seem like a peculiar choice, but it's one of the few 100% portable
-commands (Windows + UNIX) that doesn't involve input/output streams.
-
-#### The `xolox#misc#tests#string_case_transformation()` function
-
-Test string case transformation with `xolox#misc#str#ucfirst()`.
-
-#### The `xolox#misc#tests#string_whitespace_compaction()` function
-
-Test compaction of whitespace in strings with `xolox#misc#str#compact()`.
-
-#### The `xolox#misc#tests#string_whitespace_trimming()` function
-
-Test trimming of whitespace in strings with `xolox#misc#str#trim()`.
-
-#### The `xolox#misc#tests#multiline_string_dedent()` function
-
-Test dedenting of multi-line strings with `xolox#misc#str#dedent()`.
-
-#### The `xolox#misc#tests#version_string_parsing()` function
-
-Test parsing of version strings with `xolox#misc#version#parse()`.
-
-#### The `xolox#misc#tests#version_string_comparison()` function
-
-Test comparison of version strings with `xolox#misc#version#at_least()`.
-
-### Timing of long during operations
-
-#### The `xolox#misc#timer#resumable()` function
-
-Create a resumable timer object. This returns an object (a dictionary with
-functions) with the following "methods":
-
- - `start()` instructs the timer object to start counting elapsed time
-   (when a timer object is created it is not automatically started).
-
- - `stop()` instructs the timer object to stop counting elapsed time.
-   This adds the time elapsed since `start()` was last called to the
-   total elapsed time. This method will raise an error if called out of
-   sequence.
-
- - `format()` takes the total elapsed time and reports it as a string
-   containing a formatted floating point number.
-
-Timer objects are meant to accurately time short running operations so
-they're dependent on Vim's [reltime()][] and [reltimestr()][] functions.
-In order to make it possible to use timer objects in my Vim plug-ins
-unconditionally there's a fall back to [localtime()][] when [reltime()][]
-is not available. In this mode the timer objects are not very useful but
-at least they shouldn't raise errors.
-
-[localtime()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#localtime()
-[reltime()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#reltime()
-[reltimestr()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#reltimestr()
-
-#### The `xolox#misc#timer#start()` function
-
-Start a timer. This returns a list which can later be passed to
-`xolox#misc#timer#stop()`.
-
-#### The `xolox#misc#timer#stop()` function
-
-Show a formatted debugging message to the user, if the user has enabled
-increased verbosity by setting Vim's ['verbose'] [verbose] option to one
-(1) or higher.
-
-This function has the same argument handling as Vim's [printf()] [printf]
-function with one difference: At the point where you want the elapsed time
-to be embedded, you write `%s` and you pass the list returned by
-`xolox#misc#timer#start()` as an argument.
-
-[verbose]: http://vimdoc.sourceforge.net/htmldoc/options.html#'verbose'
-[printf]: http://vimdoc.sourceforge.net/htmldoc/eval.html#printf()
-
-#### The `xolox#misc#timer#force()` function
-
-Show a formatted message to the user. This function has the same argument
-handling as Vim's [printf()] [printf] function with one difference: At the
-point where you want the elapsed time to be embedded, you write `%s` and
-you pass the list returned by `xolox#misc#timer#start()` as an argument.
-
-#### The `xolox#misc#timer#convert()` function
-
-Convert the value returned by `xolox#misc#timer#start()` to a string
-representation of the elapsed time since `xolox#misc#timer#start()` was
-called. Other values are returned unmodified (this allows using it with
-Vim's [map()][] function).
-
-[map()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#map()
-
-### Version string handling
-
-#### The `xolox#misc#version#parse()` function
-
-Convert a version string to a list of integers.
-
-#### The `xolox#misc#version#at_least()` function
-
-Check whether the second version string is equal to or greater than the
-first version string. Returns 1 (true) when it is, 0 (false) otherwise.
-
-<!-- End of generated documentation -->
-
-## Contact
-
-If you have questions, bug reports, suggestions, etc. please open an issue or
-pull request on [GitHub] []. Download links and documentation can be found on
-the plug-in's [homepage] []. If you like the script please vote for it on
-[Vim Online] [].
-
-## License
-
-This software is licensed under the [MIT license] [].
-© 2015 Peter Odding &lt;<peter@peterodding.com>&gt;.
-
-
-[GitHub]: http://github.com/xolox/vim-misc
-[homepage]: http://peterodding.com/code/vim/misc
-[MIT license]: http://en.wikipedia.org/wiki/MIT_License
-[plugins]: http://peterodding.com/code/vim/
-[Vim Online]: http://www.vim.org/scripts/script.php?script_id=4597
-[vim-tools]: http://peterodding.com/code/vim/tools/
-[howto-install]: https://github.com/xolox/vim-misc/blob/master/INSTALL.md
diff --git a/bundle/misc/addon-info.json b/bundle/misc/addon-info.json
deleted file mode 100755
index 934bcf7..0000000
--- a/bundle/misc/addon-info.json
+++ /dev/null
@@ -1 +0,0 @@
-{"vim_script_nr": 4597, "dependencies": {}, "homepage": "http://peterodding.com/code/vim/misc", "name": "vim-misc"}
\ No newline at end of file
diff --git a/bundle/misc/autoload/xolox/misc.vim b/bundle/misc/autoload/xolox/misc.vim
deleted file mode 100755
index 0b9f5ff..0000000
--- a/bundle/misc/autoload/xolox/misc.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" The version of my miscellaneous scripts.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: April 28, 2015
-" URL: http://peterodding.com/code/vim/misc/
-
-let g:xolox#misc#version = '1.17.5'
diff --git a/bundle/misc/autoload/xolox/misc/async.vim b/bundle/misc/autoload/xolox/misc/async.vim
deleted file mode 100755
index 294a3a1..0000000
--- a/bundle/misc/autoload/xolox/misc/async.vim
+++ /dev/null
@@ -1,261 +0,0 @@
-" Asynchronous Vim script evaluation.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: September 17, 2014
-" URL: http://peterodding.com/code/vim/misc/
-"
-" The `xolox#misc#async#call()` function builds on top of `xolox#misc#os#exec()`
-" to support asynchronous evaluation of Vim scripts. The first (and for now
-" only) use case is my [vim-easytags][] plug-in which has a bunch of
-" conflicting requirements:
-"
-" 1. I want the [vim-easytags][] plug-in to be as portable as possible.
-"    Ideally everything is implemented in Vim script because that's the only
-"    thing I can rely on to be available for all potential users of the
-"    plug-in!
-"
-" 2. Because of point one I've been forced to implement tags file reading,
-"    parsing, (fold case) sorting and writing in Vim script. This is fine for
-"    small tags files but once they grow to a couple of megabytes it becomes
-"    annoying because Vim is unresponsive during tags file updates (key
-"    presses are fortunately buffered due to Vim's input model but that
-"    doesn't make it a nice user experience :-).
-"
-" 3. I could (and did in the past) come up with all sorts of hacks to speed
-"    things up without switching away from Vim script, but none of them are
-"    going to solve the fundamental problem that Vim's unresponsive hiccups
-"    become longer as tags files grow larger.
-"
-" By now it should be clear where this is heading: _Why not handle tags file
-" updates in a Vim process that runs in the background without blocking the
-" Vim process that the user is interacting with?_ It turns out that there are
-" quite a few details to take care of, but with those out of the way, it might
-" just work! I'm actually hoping to make asynchronous updates the default mode
-" in [vim-easytags][]. This means I need this functionality to be as
-" portable and robust as possible.
-"
-" **Status:** This code has seen little testing so I wouldn't trust it too
-" much just yet. On the other hand, as I said, my intention is to make this
-" functionality as portable and robust as possible. You be the judge :-).
-"
-" [vim-easytags]: http://peterodding.com/code/vim/easytags/
-
-if !exists('g:xolox#misc#async#counter')
-  " Increasing integer number used to match asynchronous responses to the
-  " requests that generated them.
-  let g:xolox#misc#async#counter = 1
-endif
-
-if !exists('g:xolox#misc#async#requests')
-  " Queue of asynchronous requests that haven't received a response yet.
-  let g:xolox#misc#async#requests = {}
-endif
-
-function! xolox#misc#async#call(options) " {{{1
-  " Call a Vim script function asynchronously by starting a hidden Vim process
-  " in the background. Once the function returns the hidden Vim process
-  " terminates itself. This function takes a single argument which is a
-  " dictionary with the following key/value pairs:
-  "
-  "  - **function** (required): The name of the Vim function to call inside
-  "    the child process (a string). I suggest using an [autoload][] function
-  "    for this, see below.
-  "
-  "  - **arguments** (optional): A list of arguments to pass to the function.
-  "    This list is serialized to a string using [string()][] and deserialized
-  "    using [eval()][].
-  "
-  "  - **callback** (optional): The name of a Vim function to call in the
-  "    parent process when the child process has completed (a string).
-  "
-  "  - **clientserver** (optional): If this is true (1) the child process will
-  "    notify the parent process when it has finished (the default is true).
-  "    This works using Vim's client/server support which is not always
-  "    available. As a fall back Vim's [CursorHold][] automatic command is
-  "    also supported (although the effect is not quite as instantaneous :-).
-  "
-  " This functionality is experimental and non trivial to use, so consider
-  " yourself warned :-).
-  "
-  " **Limitations**
-  "
-  " I'm making this functionality available in [vim-misc][] because I think it
-  " can be useful to other plug-ins, however if you are going to use it you
-  " should be aware of the following limitations:
-  "
-  "  - Because of the use of multiple processes this functionality is only
-  "    suitable for 'heavy' tasks.
-  "
-  "  - The function arguments are serialized to a string which is passed to
-  "    the hidden Vim process as a command line argument, so the amount of
-  "    data you can pass will be limited by your operating environment.
-  "
-  "  - The hidden Vim process is explicitly isolated from the user in several
-  "    ways (see below for more details). This is to make sure that the hidden
-  "    Vim processes are fast and don't clobber the user's editing sessions in
-  "    any way.
-  "
-  " **Changes to how Vim normally works**
-  "
-  " You have to be aware that the hidden Vim process is initialized in a
-  " specific way that is very different from your regular Vim editing
-  " sessions:
-  "
-  "  - Your [vimrc][] file is ignored using the `-u NONE` command line option.
-  "
-  "  - Your [gvimrc][] file (if you even knew it existed ;-) is ignored using
-  "    the `-U NONE` command line option.
-  "
-  "  - Plug-in loading is skipped using the `--noplugin` command line option.
-  "
-  "  - Swap files (see [swap-file][]) are disabled using the `-n` command line
-  "    option. This makes sure asynchronous Vim processes don't disturb the
-  "    user's editing session.
-  "
-  "  - Your [viminfo][] file is ignored using the `-i NONE` command line
-  "    option. Just like with swap files this makes sure asynchronous Vim
-  "    processes don't disturb the user's editing session.
-  "
-  "  - No-compatible mode is enabled using the `-N` command line option
-  "    (usually the existence of your vimrc script would have achieved the
-  "    same effect but since we disable loading of your vimrc we need to spell
-  "    things out for Vim).
-  "
-  " **Use an auto-load function**
-  "
-  " The function you want to call is identified by its name which has to be
-  " defined, but I just explained above that all regular initialization is
-  " disabled for asynchronous Vim processes, so what gives? The answer is to
-  " use an [autoload][] function. This should work fine because the
-  " asynchronous Vim process 'inherits' the value of the ['runtimepath'][]
-  " option from your editing session.
-  "
-  " ['runtimepath']: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath'
-  " [autoload]: http://vimdoc.sourceforge.net/htmldoc/eval.html#autoload
-  " [CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-  " [eval()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#eval()
-  " [gvimrc]: http://vimdoc.sourceforge.net/htmldoc/gui.html#gvimrc
-  " [string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-  " [swap-file]: http://vimdoc.sourceforge.net/htmldoc/recover.html#swap-file
-  " [vim-misc]: http://peterodding.com/code/vim/misc/
-  " [viminfo]: http://vimdoc.sourceforge.net/htmldoc/starting.html#viminfo
-  " [vimrc]: http://vimdoc.sourceforge.net/htmldoc/starting.html#vimrc
-  let unique_number = g:xolox#misc#async#counter
-  let g:xolox#misc#async#counter += 1
-  let request = {'function': a:options['function']}
-  let request['arguments'] = get(a:options, 'arguments', [])
-  let request['starttime'] = xolox#misc#timer#start()
-  let request['number'] = unique_number
-  let callback = get(a:options, 'callback')
-  if !empty(callback)
-    let request['callback'] = callback
-  endif
-  if get(a:options, 'clientserver', 1) && !empty(v:servername)
-    let request['servername'] = v:servername
-  else
-    let temporary_file = tempname()
-    let request['temporary_file'] = temporary_file
-  endif
-  let vim_command = printf('let &rtp = %s | call xolox#misc#async#inside_child(%s)', string(&rtp), string(request))
-  call xolox#misc#msg#debug("vim-misc %s: Generated asynchronous Vim command #%i: %s", g:xolox#misc#version, unique_number, vim_command)
-  let quoted_program = xolox#misc#escape#shell(xolox#misc#os#find_vim('vim'))
-  let quoted_command = xolox#misc#escape#shell(vim_command)
-  let shell_command = printf('%s -u NONE -U NONE --noplugin -n -N -i NONE --cmd %s', quoted_program, quoted_command)
-  call xolox#misc#msg#debug("vim-misc %s: Generated asynchronous shell command #%i: %s", g:xolox#misc#version, unique_number, shell_command)
-  call xolox#misc#os#exec({'command': shell_command, 'async': 1})
-  let g:xolox#misc#async#requests[unique_number] = request
-endfunction
-
-function! xolox#misc#async#inside_child(request) " {{{1
-  " Entry point inside the hidden Vim process that runs in the background.
-  " Invoked indirectly by `xolox#misc#async#call()` because it runs a command
-  " similar to the following:
-  "
-  "     vim --cmd 'call xolox#misc#async#inside_child(...)'
-  "
-  " This function is responsible for calling the user defined function,
-  " capturing exceptions and reporting the results back to the parent Vim
-  " process using Vim's client/server support or a temporary file.
-  try
-    let response = {'number': a:request['number']}
-    let starttime = xolox#misc#timer#start()
-    try
-      " Call the user defined function and store its result.
-      let response['result'] = call(a:request['function'], a:request['arguments'])
-    catch
-      " Intercept errors raised by the user defined function.
-      let response['exception'] = v:exception
-      let response['throwpoint'] = v:throwpoint
-    endtry
-    " Record the elapsed time.
-    let response['elapsed_time'] = xolox#misc#timer#convert(starttime)
-    " Communicate the results back to the master Vim process.
-    let servername = get(a:request, 'servername', '')
-    if !empty(servername)
-      " Actively notify the parent process using Vim's client/server support?
-      call remote_expr(servername, printf('xolox#misc#async#callback_to_parent(%s)', string(response)))
-    else
-      " 'Passively' notify the parent process by creating the expected
-      " temporary file.
-      call xolox#misc#persist#save(a:request['temporary_file'], response)
-    endif
-  finally
-    " Make sure we terminate this hidden Vim process.
-    quitall!
-  endtry
-endfunction
-
-function! xolox#misc#async#callback_to_parent(response) " {{{1
-  " When Vim was compiled with client/server support this function (in the
-  " parent process) will be called by `xolox#misc#async#inside_child()` (in
-  " the child process) after the user defined function has returned. This
-  " enables more or less instant callbacks after running an asynchronous
-  " function.
-  let unique_number = a:response['number']
-  let request = g:xolox#misc#async#requests[unique_number]
-  call xolox#misc#timer#stop("vim-misc %s: Processing asynchronous callback #%i after %s ..", g:xolox#misc#version, unique_number, request['starttime'])
-  call remove(g:xolox#misc#async#requests, unique_number)
-  let callback = get(request, 'callback')
-  if !empty(callback)
-    call call(callback, [a:response])
-  endif
-endfunction
-
-function! xolox#misc#async#periodic_callback() " {{{1
-  " When client/server support is not being used the vim-misc plug-in
-  " improvises: It uses Vim's [CursorHold][] event to periodically check if an
-  " asynchronous process has written its results to one of the expected
-  " temporary files. If a response is found the temporary file is read and
-  " deleted and then `xolox#misc#async#callback_to_parent()` is called to
-  " process the response.
-  "
-  " [CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-  if !empty(g:xolox#misc#async#requests)
-    let num_processed = 0
-    call xolox#misc#msg#debug("vim-misc %s: Checking for asynchronous responses (%i responses not yet received) ..", g:xolox#misc#version, len(g:xolox#misc#async#requests))
-    for unique_number in sort(keys(g:xolox#misc#async#requests))
-      let request = g:xolox#misc#async#requests[unique_number]
-      let temporary_file = get(request, 'temporary_file', '')
-      if !empty(temporary_file) && getfsize(temporary_file) > 0
-        try
-          call xolox#misc#msg#debug("vim-misc %s: Found asynchronous response by %s in %s ..", g:xolox#misc#version, request['function'], temporary_file)
-          call xolox#misc#async#callback_to_parent(xolox#misc#persist#load(temporary_file))
-          let num_processed += 1
-        finally
-          call delete(temporary_file)
-        endtry
-      endif
-    endfor
-    call xolox#misc#msg#debug("vim-misc %s: Processed %i asynchronous responses (%i responses not yet received).", g:xolox#misc#version, num_processed, len(g:xolox#misc#async#requests))
-  endif
-endfunction
-
-" }}}1
-
-" The interval in the options below is set to one (1) although the default
-" value for &updatetime is four seconds. Because vim-misc never modifies
-" &updatetime the interval will effectively default to four seconds unless the
-" user has set &updatetime to a lower value themselves.
-call xolox#misc#cursorhold#register({'function': 'xolox#misc#async#periodic_callback', 'interval': 1})
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/buffer.vim b/bundle/misc/autoload/xolox/misc/buffer.vim
deleted file mode 100755
index 01dca6e..0000000
--- a/bundle/misc/autoload/xolox/misc/buffer.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" Handling of special buffers
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: May 19, 2013
-" URL: http://peterodding.com/code/vim/misc/
-"
-" The functions defined here make it easier to deal with special Vim buffers
-" that contain text generated by a Vim plug-in. For example my [vim-notes
-" plug-in] [vim-notes] generates several such buffers:
-"
-" - [:RecentNotes] [RecentNotes] lists recently modified notes
-" - [:ShowTaggedNotes] [ShowTaggedNotes] lists notes grouped by tags
-" - etc.
-"
-" Because the text in these buffers is generated, Vim shouldn't bother with
-" swap files and it should never prompt the user whether to save changes to
-" the generated text.
-"
-" [vim-notes]: http://peterodding.com/code/vim/notes/
-" [RecentNotes]: http://peterodding.com/code/vim/notes/#recentnotes_command
-" [ShowTaggedNotes]: http://peterodding.com/code/vim/notes/#showtaggednotes_command
-
-function! xolox#misc#buffer#is_empty() " {{{1
-  " Checks if the current buffer is an empty, unchanged buffer which can be
-  " reused. Returns 1 if an empty buffer is found, 0 otherwise.
-  return !&modified && expand('%') == '' && line('$') <= 1 && getline(1) == ''
-endfunction
-
-function! xolox#misc#buffer#prepare(...) " {{{1
-  " Open a special buffer, i.e. a buffer that will hold generated contents,
-  " not directly edited by the user. The buffer can be customized by passing a
-  " dictionary with the following key/value pairs as the first argument:
-  "
-  " - **name** (required): The base name of the buffer (i.e. the base name of
-  "   the file loaded in the buffer, even though it isn't really a file and
-  "   nothing is really 'loaded' :-)
-  " - **path** (required): The pathname of the buffer. May be relevant if
-  "   [:lcd] [lcd] or ['autochdir'] [acd] is being used.
-  "
-  " [lcd]: http://vimdoc.sourceforge.net/htmldoc/editing.html#:lcd
-  " [acd]: http://vimdoc.sourceforge.net/htmldoc/options.html#'autochdir'
-  if a:0 == 1 && type(a:1) == type('')
-    " Backwards compatibility with old interface.
-    let options = {'name': a:1, 'path': a:1}
-  elseif type(a:1) == type({})
-    let options = a:1
-  else
-    throw "Invalid arguments"
-  endif
-  let winnr = 1
-  let found = 0
-  for bufnr in tabpagebuflist()
-    if xolox#misc#path#equals(options['path'], bufname(bufnr))
-      execute winnr . 'wincmd w'
-      let found = 1
-      break
-    else
-      let winnr += 1
-    endif
-  endfor
-  if !(found || xolox#misc#buffer#is_empty())
-    vsplit
-  endif
-  silent execute 'edit' fnameescape(options['path'])
-  lcd " clear working directory
-  setlocal buftype=nofile bufhidden=hide noswapfile
-  let &l:statusline = '[' . options['name'] . ']'
-  call xolox#misc#buffer#unlock()
-  silent %delete
-endfunction
-
-function! xolox#misc#buffer#lock() " {{{1
-  " Lock a special buffer so that its contents can no longer be edited.
-  setlocal readonly nomodifiable nomodified
-endfunction
-
-function! xolox#misc#buffer#unlock() " {{{1
-  " Unlock a special buffer so that its content can be updated.
-  setlocal noreadonly modifiable
-endfunction
diff --git a/bundle/misc/autoload/xolox/misc/complete.vim b/bundle/misc/autoload/xolox/misc/complete.vim
deleted file mode 100755
index e3818d4..0000000
--- a/bundle/misc/autoload/xolox/misc/complete.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Tab completion for user defined commands.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: July 9, 2014
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#complete#keywords(arglead, cmdline, cursorpos)
-  " This function can be used to perform keyword completion for user defined
-  " Vim commands based on the contents of the current buffer. Here's an
-  " example of how you would use it:
-  "
-  "     :command -nargs=* -complete=customlist,xolox#misc#complete#keywords MyCmd call s:MyCmd(<f-args>)
-  let words = {}
-  for line in getline(1, '$')
-    for word in split(line, '\W\+')
-      let words[word] = 1
-    endfor
-  endfor
-  let arguments = [keys(filter(words, 'v:key =~# a:arglead'))]
-  if &ignorecase
-    call add(arguments, 1)
-  endif
-  return call('sort', arguments)
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/cursorhold.vim b/bundle/misc/autoload/xolox/misc/cursorhold.vim
deleted file mode 100755
index cbbde1f..0000000
--- a/bundle/misc/autoload/xolox/misc/cursorhold.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Rate limiting for Vim's CursorHold event.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 22, 2014
-" URL: http://peterodding.com/code/vim/misc/
-"
-" Several of my Vim plug-ins (e.g. [vim-easytags][], [vim-notes][] and
-" [vim-session][]) use Vim's [CursorHold][] and [CursorHoldI][] events to
-" perform periodic tasks when the user doesn't press any keys for a couple of
-" seconds. These events by default fire after four seconds, this is
-" configurable using Vim's ['updatetime'][] option. The problem that this
-" script solves is that there are Vim plug-ins which set the ['updatetime'][]
-" option to unreasonably low values, thereby breaking my Vim plug-ins and
-" probably a lot of other Vim plug-ins out there. When users complain about
-" this I can tell them that another Vim plug-in is to blame, but users don't
-" care for the difference, their Vim is broken! So I implemented a workaround.
-" This script enables registration of [CursorHold][] event handlers with a
-" configurable interval (expressed in seconds). The event handlers will be
-" called no more than once every interval.
-"
-" ['updatetime']: http://vimdoc.sourceforge.net/htmldoc/options.html#'updatetime'
-" [CursorHold]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHold
-" [CursorHoldI]: http://vimdoc.sourceforge.net/htmldoc/autocmd.html#CursorHoldI
-" [vim-easytags]: http://peterodding.com/code/vim/easytags/
-" [vim-notes]: http://peterodding.com/code/vim/notes/
-" [vim-session]: http://peterodding.com/code/vim/session/
-
-if !exists('g:xolox#misc#cursorhold#handlers')
-  let g:xolox#misc#cursorhold#handlers = []
-endif
-
-function! xolox#misc#cursorhold#register(options)
-  " Register a [CursorHold][] event handler with a custom interval. This
-  " function takes a single argument which is a dictionary with the following
-  " fields:
-  "
-  "  - **function** (required): The name of the event handler function (a
-  "    string).
-  "
-  "  - **arguments** (optional): A list of arguments to pass to the event
-  "    handler function (defaults to an empty list).
-  "
-  "  - **interval** (optional): The number of seconds between calls to the
-  "    event handler (defaults to 4).
-  call add(g:xolox#misc#cursorhold#handlers, copy(a:options))
-endfunction
-
-function! xolox#misc#cursorhold#autocmd()
-  " The 'top level event handler' that's called by Vim whenever the
-  " [CursorHold][] or [CursorHoldI][] event fires. It iterates through the
-  " event handlers registered using `xolox#misc#cursorhold#register()` and
-  " calls each event handler at the appropriate interval, keeping track of
-  " the time when each event handler was last run.
-  for handler in g:xolox#misc#cursorhold#handlers
-    let function = handler['function']
-    let last_run = get(handler, 'last_run', 0)
-    let interval = get(handler, 'interval', 4)
-    call xolox#misc#msg#debug("vim-misc %s: Checking handler %s with interval %i and last run %i ..", g:xolox#misc#version, function, interval, last_run)
-    " Rate limit in case &updatetime is set (very) low.
-    let time_until_next_run = (last_run + interval) - localtime()
-    if time_until_next_run > 0
-      call xolox#misc#msg#debug("vim-misc %s: Rate limiting handler %s (time until next run: %i seconds).", g:xolox#misc#version, function, time_until_next_run)
-    else
-      call xolox#misc#msg#debug("vim-misc %s: Running handler %s ..", g:xolox#misc#version, function)
-      call call(function, get(handler, 'arguments', []))
-      let handler['last_run'] = localtime()
-    endif
-  endfor
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/escape.vim b/bundle/misc/autoload/xolox/misc/escape.vim
deleted file mode 100755
index 29a16ca..0000000
--- a/bundle/misc/autoload/xolox/misc/escape.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" String escaping functions.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: May 19, 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#escape#pattern(string) " {{{1
-  " Takes a single string argument and converts it into a [:substitute]
-  " [subcmd] / [substitute()] [subfun] pattern string that matches the given
-  " string literally.
-  "
-  " [subfun]: http://vimdoc.sourceforge.net/htmldoc/eval.html#substitute()
-  " [subcmd]: http://vimdoc.sourceforge.net/htmldoc/change.html#:substitute
-  if type(a:string) == type('')
-    let string = escape(a:string, '^$.*\~[]')
-    return substitute(string, '\n', '\\n', 'g')
-  endif
-  return ''
-endfunction
-
-function! xolox#misc#escape#substitute(string) " {{{1
-  " Takes a single string argument and converts it into a [:substitute]
-  " [subcmd] / [substitute()] [subfun] replacement string that inserts the
-  " given string literally.
-  if type(a:string) == type('')
-    let string = escape(a:string, '\&~%')
-    return substitute(string, '\n', '\\r', 'g')
-  endif
-  return ''
-endfunction
-
-function! xolox#misc#escape#shell(string) " {{{1
-  " Takes a single string argument and converts it into a quoted command line
-  " argument.
-  "
-  " I was going to add a long rant here about Vim's ['shellslash' option]
-  " [shellslash], but really, it won't make any difference. Let's just suffice
-  " to say that I have yet to encounter a single person out there who uses
-  " this option for its intended purpose (running a UNIX style shell on
-  " Microsoft Windows).
-  "
-  " [shellslash]: http://vimdoc.sourceforge.net/htmldoc/options.html#'shellslash'
-  if xolox#misc#os#is_win()
-    try
-      let ssl_save = &shellslash
-      set noshellslash
-      return shellescape(a:string)
-    finally
-      let &shellslash = ssl_save
-    endtry
-  else
-    return shellescape(a:string)
-  endif
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/format.vim b/bundle/misc/autoload/xolox/misc/format.vim
deleted file mode 100755
index 44f7b54..0000000
--- a/bundle/misc/autoload/xolox/misc/format.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" Human friendly string formatting for Vim.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 2, 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#format#pluralize(count, singular, plural) " {{{1
-  " Concatenate a counter (the first argument, expected to be an integer) with
-  " a singular or plural label (the second and third arguments, both expected
-  " to be strings).
-  if a:count == 0
-    return printf('no %s', a:plural)
-  else
-    return printf('%i %s', a:count, a:count == 1 ? a:singular : a:plural)
-  endif
-endfunction
-
-function! xolox#misc#format#timestamp(ts) " {{{1
-  " Format a time stamp (a string containing a formatted floating point
-  " number) into a human friendly format, for example 70 seconds is phrased as
-  " "1 minute and 10 seconds".
-  let seconds = a:ts + 0
-  " Fast common case with extra precision from reltime().
-  if seconds < 5
-    let extract = matchstr(a:ts, '^\d\+\(\.0*[1-9][1-9]\?\)\?')
-    if extract =~ '[123456789]'
-      return extract . ' second' . (extract != '1' ? 's' : '')
-    endif
-  endif
-  " Generic but slow code.
-  let result = []
-  for [name, size] in [['day', 60 * 60 * 24], ['hour', 60 * 60], ['minute', 60], ['second', 1]]
-    if seconds >= size
-      let counter = seconds / size
-      let seconds = seconds % size
-      let suffix = counter != 1 ? 's' : ''
-      call add(result, printf('%i %s%s', counter, name, suffix))
-    endif
-  endfor
-  " Format the resulting text?
-  if len(result) == 1
-    return result[0]
-  else
-    return join(result[0:-2], ', ') . ' and ' . result[-1]
-  endif
-endfunction
diff --git a/bundle/misc/autoload/xolox/misc/list.vim b/bundle/misc/autoload/xolox/misc/list.vim
deleted file mode 100755
index 548592a..0000000
--- a/bundle/misc/autoload/xolox/misc/list.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" List handling functions.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 2, 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#list#unique(list) " {{{1
-  " Remove duplicate values from the given list in-place (preserves order).
-  call reverse(a:list)
-  call filter(a:list, 'count(a:list, v:val) == 1')
-  return reverse(a:list)
-endfunction
-
-function! xolox#misc#list#binsert(list, value, ...) " {{{1
-  " Performs in-place binary insertion, which depending on your use case can
-  " be more efficient than calling Vim's [sort()] [sort] function after each
-  " insertion (in cases where a single, final sort is not an option). Expects
-  " three arguments:
-  "
-  " 1. A list
-  " 2. A value to insert
-  " 3. 1 (true) when case should be ignored, 0 (false) otherwise
-  "
-  " [sort]: http://vimdoc.sourceforge.net/htmldoc/eval.html#sort()
-  let idx = s:binsert_r(a:list, 0, len(a:list), a:value, exists('a:1') && a:1)
-  return insert(a:list, a:value, idx)
-endfunction
-
-function! s:binsert_r(list, low, high, value, ignorecase)
-  let mid = a:low + (a:high - a:low) / 2
-  if a:low == a:high
-    return a:low
-  elseif a:ignorecase ? a:value >? a:list[mid] : a:value > a:list[mid]
-    return s:binsert_r(a:list, mid + 1, a:high, a:value, a:ignorecase)
-  elseif a:ignorecase ? a:value <? a:list[mid] : a:value < a:list[mid]
-    return s:binsert_r(a:list, a:low, mid, a:value, a:ignorecase)
-  else
-    return mid
-  endif
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/msg.vim b/bundle/misc/autoload/xolox/misc/msg.vim
deleted file mode 100755
index 8568ab5..0000000
--- a/bundle/misc/autoload/xolox/misc/msg.vim
+++ /dev/null
@@ -1,129 +0,0 @@
-" Functions to interact with the user.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: March 15, 2015
-" URL: http://peterodding.com/code/vim/misc/
-
-if !exists('g:xolox_message_buffer')
-  " For when I lose my :messages history :-\
-  let g:xolox_message_buffer = 100
-endif
-
-if !exists('g:xolox_messages')
-  let g:xolox_messages = []
-endif
-
-function! xolox#misc#msg#info(...) " {{{1
-  " Show a formatted informational message to the user.
-  "
-  " This function has the same argument handling as Vim's [printf()] []
-  " function with one notable difference: Any arguments which are not numbers
-  " or strings are coerced to strings using Vim's [string()] [] function.
-  "
-  " In the case of `xolox#misc#msg#info()`, automatic string coercion simply
-  " makes the function a bit easier to use.
-  "
-  " The messages emitted by this function have no highlighting. Previously
-  " these messages were highlighted using the [Title group] [hl-title], but it
-  " was pointed out in [pull request 16] [pr-16] that this group shouldn't be
-  " used for informational messages because it is meant for titles and because
-  " of this some color schemes use colors that stand out quite a bit, causing
-  " the informational messages to look like errors.
-  "
-  " [hl-title]: http://vimdoc.sourceforge.net/htmldoc/syntax.html#hl-Title
-  " [pr-16]: https://github.com/xolox/vim-misc/pull/16
-  " [printf()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#printf()
-  " [string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-  call s:show_message('None', a:000)
-endfunction
-
-function! xolox#misc#msg#warn(...) " {{{1
-  " Show a formatted warning message to the user.
-  "
-  " This function has the same argument handling as the
-  " `xolox#misc#msg#info()` function.
-  call s:show_message('WarningMsg', a:000)
-endfunction
-
-function! xolox#misc#msg#debug(...) " {{{1
-  " Show a formatted debugging message to the user, *if the user has enabled
-  " increased verbosity by setting Vim's ['verbose'] [] option to one
-  " (1) or higher*.
-  "
-  " This function has the same argument handling as the
-  " `xolox#misc#msg#info()` function.
-  "
-  " In the case of `xolox#misc#msg#debug()`, automatic string coercion
-  " provides lazy evaluation in the sense that complex data structures are
-  " only converted to strings when the user has enabled increased verbosity.
-  "
-  " ['verbose']: http://vimdoc.sourceforge.net/htmldoc/options.html#'verbose'
-  if &vbs >= 1
-    call s:show_message('Question', a:000)
-  endif
-endfunction
-
-function! s:show_message(hlgroup, args) " {{{1
-  " The implementation of info() and warn().
-  let nargs = len(a:args)
-  if nargs == 1
-    let message = a:args[0]
-  elseif nargs >= 2
-    let args = map(copy(a:args), 's:coerce_argument(v:val)')
-    let message = call('printf', args)
-  endif
-  if exists('message')
-    try
-      " Temporarily disable Vim's |hit-enter| prompt and mode display.
-      if !exists('s:more_save')
-        let s:more_save = &more
-        let s:ruler_save = &ruler
-        let s:smd_save = &showmode
-      endif
-      set nomore noshowmode
-      if winnr('$') == 1 | set noruler | endif
-      augroup PluginXoloxHideMode
-        autocmd! CursorHold,CursorHoldI * call s:clear_message()
-      augroup END
-      execute 'echohl' a:hlgroup
-      " Redraw to avoid the |hit-enter| prompt. We use :silent to avoid issues
-      " like this one: https://github.com/xolox/vim-easytags/issues/69.
-      silent! redraw
-      for line in split(message, "\n")
-        echomsg line
-      endfor
-      if g:xolox_message_buffer > 0
-        call add(g:xolox_messages, message)
-        if len(g:xolox_messages) > g:xolox_message_buffer
-          call remove(g:xolox_messages, 0)
-        endif
-      endif
-    finally
-      " Always clear message highlighting, even when interrupted by Ctrl-C.
-      echohl none
-    endtry
-  endif
-endfunction
-
-function! s:coerce_argument(value) " {{{1
-  " Callback to coerce printf() arguments into strings.
-  let value_type = type(a:value)
-  if value_type != type(0) && value_type != type('')
-    return string(a:value)
-  else
-    return a:value
-  endif
-endfunction
-
-function! s:clear_message() " {{{1
-  " Callback to clear message after some time has passed.
-  echo ''
-  let &more = s:more_save
-  let &showmode = s:smd_save
-  let &ruler = s:ruler_save
-  unlet s:more_save s:ruler_save s:smd_save
-  autocmd! PluginXoloxHideMode
-  augroup! PluginXoloxHideMode
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/open.vim b/bundle/misc/autoload/xolox/misc/open.vim
deleted file mode 100755
index ff0b5e2..0000000
--- a/bundle/misc/autoload/xolox/misc/open.vim
+++ /dev/null
@@ -1,100 +0,0 @@
-" Integration between Vim and its environment.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 19, 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-let s:enoimpl = "vim-misc %s: %s() hasn't been implemented for your platform! If you have suggestions, please get in touch at https://github.com/xolox/vim-misc/issues"
-let s:handlers = ['gnome-open', 'kde-open', 'exo-open', 'xdg-open', 'cygstart']
-
-function! xolox#misc#open#file(location, ...) " {{{1
-  " Given a pathname or URL as the first argument, this opens the file with
-  " the program associated with the file type. So for example a text file
-  " might open in Vim, an `*.html` file would probably open in your web
-  " browser and a media file would open in a media player.
-  "
-  " This should work on Windows, Mac OS X and most Linux distributions. If
-  " this fails to find a file association, you can pass one or more external
-  " commands to try as additional arguments. For example:
-  "
-  "     :call xolox#misc#open#file('/path/to/my/file', 'firefox', 'google-chrome')
-  "
-  " This generally shouldn't be necessary but it might come in handy now and
-  " then.
-  if xolox#misc#os#is_win()
-    try
-      call xolox#shell#open_with_windows_shell(a:location)
-    catch /^Vim\%((\a\+)\)\=:E117/
-      let command = '!start CMD /C START "" %s'
-      silent execute printf(command, xolox#misc#escape#shell(a:location))
-    endtry
-    return
-  elseif xolox#misc#os#is_mac()
-    call xolox#misc#msg#debug("vim-misc %s: Detected Mac OS X, using 'open' command to open %s ..", g:xolox#misc#version, string(a:location))
-    let cmd = 'open ' . shellescape(a:location) . ' 2>&1'
-    call s:handle_error(cmd, system(cmd))
-    return
-  else
-    for handler in s:handlers + a:000
-      if executable(handler)
-        call xolox#misc#msg#debug("vim-misc %s: Using '%s' to open '%s'.", g:xolox#misc#version, handler, a:location)
-        let cmd = shellescape(handler) . ' ' . shellescape(a:location) . ' 2>&1'
-        call s:handle_error(cmd, system(cmd))
-        return
-      endif
-    endfor
-  endif
-  throw printf(s:enoimpl, g:xolox#misc#version, 'xolox#misc#open#file')
-endfunction
-
-function! xolox#misc#open#http://github.com/url(url) " {{{1
-  " Given a URL as the first argument, this opens the URL in your preferred or
-  " best available web browser:
-  "
-  " - In GUI environments a graphical web browser will open (or a new tab will
-  "   be created in an existing window)
-  " - In console Vim without a GUI environment, when you have any of `lynx`,
-  "   `links` or `w3m` installed it will launch a command line web browser in
-  "   front of Vim (temporarily suspending Vim)
-  let url = a:url
-  if url !~ '^\w\+://'
-    call xolox#misc#msg#debug("vim-misc %s: The URL %s doesn't contain a scheme, improvising ..", g:xolox#misc#version, string(url))
-    if url !~ '@'
-      call xolox#misc#msg#debug("vim-misc %s: Defaulting to http:// URL scheme ..", g:xolox#misc#version)
-      let url = 'http://' . url
-    elseif url !~ '^mailto:'
-      call xolox#misc#msg#debug("vim-misc %s: Defaulting to mailto: URL scheme ..", g:xolox#misc#version)
-      let url = 'mailto:' . url
-    endif
-  endif
-  let on_unix = has('unix')
-  let not_on_mac = !xolox#misc#os#is_mac()
-  let no_gui_available = (has('gui_running') == 0 && $DISPLAY == '')
-  if on_unix && not_on_mac && no_gui_available
-    call xolox#misc#msg#debug("vim-misc %s: Using command line web browser because no GUI seems to be available ..", g:xolox#misc#version)
-    for browser in ['lynx', 'links', 'w3m']
-      call xolox#misc#msg#debug("vim-misc %s: Checking whether %s command line web browser is installed ..", g:xolox#misc#version, string(browser))
-      if executable(browser)
-        call xolox#misc#msg#debug("vim-misc %s: Found %s, using it to open %s ..", g:xolox#misc#version, string(browser), string(url))
-        execute '!' . browser fnameescape(url)
-        call s:handle_error(browser . ' ' . url, '')
-        return
-      endif
-    endfor
-  endif
-  call xolox#misc#msg#debug("vim-misc %s: Defaulting to GUI web browser to open %s ..", g:xolox#misc#version, string(url))
-  call xolox#misc#open#file(url, 'firefox', 'google-chrome')
-endfunction
-
-function! s:handle_error(cmd, output) " {{{1
-  if v:shell_error
-    let message = "vim-misc %s: Failed to execute program! (command line: %s%s)"
-    let output = strtrans(xolox#misc#str#trim(a:output))
-    if output != ''
-      let output = ", output: " . string(output)
-    endif
-    throw printf(message, g:xolox#misc#version, a:cmd, output)
-  endif
-endfunction
-
-" vim: et ts=2 sw=2 fdm=marker
diff --git a/bundle/misc/autoload/xolox/misc/option.vim b/bundle/misc/autoload/xolox/misc/option.vim
deleted file mode 100755
index 47c5f24..0000000
--- a/bundle/misc/autoload/xolox/misc/option.vim
+++ /dev/null
@@ -1,116 +0,0 @@
-" Vim and plug-in option handling.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: April 1, 2015
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#option#get(name, ...) " {{{1
-  " Expects one or two arguments: 1. The name of a variable and 2. the default
-  " value if the variable does not exist.
-  "
-  " Returns the value of the variable from a buffer local variable, global
-  " variable or the default value, depending on which is defined.
-  "
-  " This is used by some of my Vim plug-ins for option handling, so that users
-  " can customize options for specific buffers.
-  if exists('b:' . a:name)
-    " Buffer local variable.
-    return eval('b:' . a:name)
-  elseif exists('g:' . a:name)
-    " Global variable.
-    return eval('g:' . a:name)
-  elseif exists('a:1')
-    " Default value.
-    return a:1
-  endif
-endfunction
-
-function! xolox#misc#option#split(value) " {{{1
-  " Given a multi-value Vim option like ['runtimepath'] [rtp] this returns a
-  " list of strings. For example:
-  "
-  "     :echo xolox#misc#option#split(&runtimepath)
-  "     ['/home/peter/Projects/Vim/misc',
-  "      '/home/peter/Projects/Vim/colorscheme-switcher',
-  "      '/home/peter/Projects/Vim/easytags',
-  "      ...]
-  "
-  " [rtp]: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath'
-  let values = split(a:value, '[^\\]\zs,')
-  return map(values, 's:unescape(v:val)')
-endfunction
-
-function! s:unescape(s)
-  return substitute(a:s, '\\\([\\,]\)', '\1', 'g')
-endfunction
-
-function! xolox#misc#option#join(values) " {{{1
-  " Given a list of strings like the ones returned by
-  " `xolox#misc#option#split()`, this joins the strings together into a
-  " single value that can be used to set a Vim option.
-  let values = copy(a:values)
-  call map(values, 's:escape(v:val)')
-  return join(values, ',')
-endfunction
-
-function! s:escape(s)
-  return escape(a:s, ',\')
-endfunction
-
-function! xolox#misc#option#split_tags(value) " {{{1
-  " Customized version of `xolox#misc#option#split()` with specialized
-  " handling for Vim's ['tags' option] [tags].
-  "
-  " [tags]: http://vimdoc.sourceforge.net/htmldoc/options.html#'tags'
-  let values = split(a:value, '[^\\]\zs,')
-  return map(values, 's:unescape_tags(v:val)')
-endfunction
-
-function! s:unescape_tags(s)
-  return substitute(a:s, '\\\([\\, ]\)', '\1', 'g')
-endfunction
-
-function! xolox#misc#option#join_tags(values) " {{{1
-  " Customized version of `xolox#misc#option#join()` with specialized
-  " handling for Vim's ['tags' option] [tags].
-  let values = copy(a:values)
-  call map(values, 's:escape_tags(v:val)')
-  return join(values, ',')
-endfunction
-
-function! s:escape_tags(s)
-  return escape(a:s, ', ')
-endfunction
-
-function! xolox#misc#option#eval_tags(value, ...) " {{{1
-  " Evaluate Vim's ['tags' option] [tags] without looking at the file
-  " system, i.e. this will report tags files that don't exist yet. Expects
-  " the value of the ['tags' option] [tags] as the first argument. If the
-  " optional second argument is 1 (true) only the first match is returned,
-  " otherwise (so by default) a list with all matches is returned.
-  let pathnames = []
-  let first_only = exists('a:1') ? a:1 : 0
-  for pattern in xolox#misc#option#split_tags(a:value)
-    " Make buffer relative pathnames absolute.
-    if pattern =~ '^\./'
-      let suffix = matchstr(pattern, '^./\zs.*$')
-      let directory = (&cpoptions =~# 'd') ? getcwd() : expand('%:p:h')
-      let pattern = xolox#misc#path#merge(directory, suffix)
-    endif
-    " Make working directory relative pathnames absolute.
-    if xolox#misc#path#is_relative(pattern)
-      let pattern = xolox#misc#path#merge(getcwd(), pattern)
-    endif
-    " Ignore the trailing `;' for recursive upwards searching because we
-    " always want the most specific pathname available.
-    let pattern = substitute(pattern, ';$', '', '')
-    " Expand the pattern.
-    call extend(pathnames, split(expand(pattern), "\n"))
-    if first_only && !empty(pathnames)
-      return pathnames[0]
-    endif
-  endfor
-  return first_only ? '' : pathnames
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/os.vim b/bundle/misc/autoload/xolox/misc/os.vim
deleted file mode 100755
index ea96116..0000000
--- a/bundle/misc/autoload/xolox/misc/os.vim
+++ /dev/null
@@ -1,271 +0,0 @@
-" Operating system interfaces.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June , 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#os#is_mac() " {{{1
-  " Returns 1 (true) when on Mac OS X, 0 (false) otherwise. You would expect
-  " this to simply check the Vim feature list, but for some obscure reason the
-  " `/usr/bin/vim` included in Mac OS X (verified on version 10.7.5) returns 0
-  " (false) in response to `has('mac')`, so we check the output of `uname`
-  " to avoid false negatives.
-  if !exists('s:is_mac')
-    " By default we assume we are *not* on Mac OS X.
-    let s:is_mac = 0
-    if has('mac') || has('macunix') || has('gui_mac')
-      " If Vim's feature list indicates we are on Mac OS X, we have our answer :-).
-      let s:is_mac = 1
-    elseif !xolox#misc#os#is_win()
-      " Otherwise we check the output of `uname' to avoid false negatives.
-      let result = xolox#misc#os#exec({'command': 'uname', 'check': 0})
-      if result['exit_code'] == 0 && get(result['stdout'], 0, '') == 'Darwin'
-        let s:is_mac = 1
-      endif
-    endif
-  endif
-  return s:is_mac
-endfunction
-
-function! xolox#misc#os#is_win() " {{{1
-  " Returns 1 (true) when on Microsoft Windows, 0 (false) otherwise.
-  return has('win16') || has('win32') || has('win64')
-endfunction
-
-function! xolox#misc#os#find_vim(...) " {{{1
-  " Returns the program name of Vim as a string. On Windows and UNIX this just
-  " [v:progname] [] as an absolute pathname while on Mac OS X there is
-  " some special magic to find MacVim's executable even though it's usually
-  " not on the executable search path. If you want, you can override the
-  " value returned from this function by setting the global variable
-  " `g:xolox#misc#os#vim_progname`.
-  "
-  " By default the choice of console Vim vs graphical Vim is made based on
-  " the value of [v:progname] [], but if you have a preference you can pass
-  " the string `vim` or `gvim` as the first and only argument.
-  "
-  " [v:progname]: http://vimdoc.sourceforge.net/htmldoc/eval.html#v:progname
-  if exists('a:1')
-    let program_name = a:1
-  else
-    let program_name = v:progname
-  endif
-  if exists('g:xolox#misc#os#vim_progname')
-    let pathname = g:xolox#misc#os#vim_progname
-  else
-    let pathname = ''
-  endif
-  if empty(pathname) && xolox#misc#os#is_mac()
-    " Special handling for Mac OS X where MacVim is usually not on the $PATH.
-    " This always returns the "Vim" executable and not "MacVim" (regardless of
-    " the caller's preference) because "MacVim" has funky dock magic going on.
-    call xolox#misc#msg#debug("vim-misc %s: Trying MacVim workaround to find Vim executable ..", g:xolox#misc#version)
-    let segments = xolox#misc#path#split($VIMRUNTIME)
-    if segments[-3:] == ['Resources', 'vim', 'runtime']
-      let pathname = xolox#misc#path#join(segments[0:-4] + ['MacOS', 'Vim'])
-      call xolox#misc#msg#debug("vim-misc %s: The MacVim workaround resulted in the Vim executable %s.", g:xolox#misc#version, string(pathname))
-    endif
-  endif
-  if empty(pathname)
-    " Default logic.
-    call xolox#misc#msg#debug("vim-misc %s: Looking for Vim executable named %s on search path ..", g:xolox#misc#version, string(program_name))
-    let candidates = xolox#misc#path#which(program_name)
-    if !empty(candidates)
-      call xolox#misc#msg#debug("vim-misc %s: Found %i candidate(s) on search path: %s.", g:xolox#misc#version, len(candidates), string(candidates))
-      let pathname = candidates[0]
-    endif
-  endif
-  call xolox#misc#msg#debug("vim-misc %s: Reporting Vim executable %s.", g:xolox#misc#version, string(pathname))
-  return pathname
-endfunction
-
-function! xolox#misc#os#exec(options) " {{{1
-  " Execute an external command (hiding the console on Microsoft Windows when
-  " my [vim-shell plug-in] [vim-shell] is installed).
-  "
-  " Expects a dictionary with the following key/value pairs as the first
-  " argument:
-  "
-  " - **command** (required): The command line to execute
-  " - **async** (optional): set this to 1 (true) to execute the command in the
-  "   background (asynchronously)
-  " - **stdin** (optional): a string or list of strings with the input for the
-  "   external command
-  " - **check** (optional): set this to 0 (false) to disable checking of the
-  "   exit code of the external command (by default an exception will be
-  "   raised when the command fails)
-  "
-  " Returns a dictionary with one or more of the following key/value pairs:
-  "
-  " - **command** (always available): the generated command line that was used
-  "   to run the external command
-  " - **exit_code** (only in synchronous mode): the exit status of the
-  "   external command (an integer, zero on success)
-  " - **stdout** (only in synchronous mode): the output of the command on the
-  "   standard output stream (a list of strings, one for each line)
-  " - **stderr** (only in synchronous mode): the output of the command on the
-  "   standard error stream (as a list of strings, one for each line)
-  "
-  " [vim-shell]: http://peterodding.com/code/vim/shell/
-  try
-
-    " Unpack the options.
-    let cmd = a:options['command']
-    let async = get(a:options, 'async', 0)
-
-    " We need to know in a couple of places whether we are on Windows.
-    let is_win = xolox#misc#os#is_win()
-
-    " Use vim-shell so we don't pop up a console window on Windows? If the
-    " caller specifically asks us *not* to use vim-shell, we'll respect that
-    " choice; this is very useful for automated tests :-).
-    if get(a:options, 'use_dll', 1) == 0
-      let use_dll = 0
-    else
-      let use_dll = xolox#misc#os#can_use_dll()
-    endif
-
-    " Decide whether to redirect the standard output and standard error
-    " streams to temporary files.
-    let redirect_output = !async && (use_dll || !is_win)
-
-    " Write the input for the external command to a temporary file?
-    if has_key(a:options, 'stdin') && use_dll
-      let tempin = tempname()
-      if type(a:options['stdin']) == type([])
-        let lines = a:options['stdin']
-      else
-        let lines = split(a:options['stdin'], "\n")
-      endif
-      call writefile(lines, tempin)
-      let cmd .= ' < ' . xolox#misc#escape#shell(tempin)
-    endif
-
-    " Redirect the standard output and/or standard error streams of the
-    " external process to temporary files? (only in synchronous mode)
-    if redirect_output
-      let tempout = tempname()
-      let temperr = tempname()
-      let cmd = printf('(%s) 1>%s 2>%s', cmd, xolox#misc#escape#shell(tempout), xolox#misc#escape#shell(temperr))
-    endif
-
-    " Use vim-shell or system() to execute the external command?
-    if use_dll
-      call xolox#misc#msg#debug("vim-misc %s: Executing external command using compiled DLL: %s", g:xolox#misc#version, cmd)
-      let exit_code = xolox#shell#execute_with_dll(cmd, async)
-    else
-
-      " Enable asynchronous mode (very platform specific).
-      if async
-        if is_win
-          let cmd = printf('start /b %s', cmd)
-        elseif has('unix')
-          let cmd = printf('(%s) &', cmd)
-        else
-          call xolox#misc#msg#warn("vim-misc %s: I don't know how to execute the command %s asynchronously on your platform! Falling back to synchronous mode...", g:xolox#misc#version, cmd)
-        endif
-      endif
-
-      " On UNIX we explicitly execute the command line using 'sh' instead of
-      " the default shell, because we assume that standard output and standard
-      " error can be redirected separately, but (t)csh does not support this
-      " (and it might be the default shell).
-      if has('unix')
-        call xolox#misc#msg#debug("vim-misc %s: Generated shell expression: %s", g:xolox#misc#version, cmd)
-        let cmd = printf('sh -c %s', xolox#misc#escape#shell(cmd))
-      endif
-
-      " Let the user know what's happening (in case they're interested).
-      if async && is_win
-        call xolox#misc#msg#debug("vim-misc %s: Executing external command using !start command: %s", g:xolox#misc#version, cmd)
-        silent execute '!' . cmd
-      else
-        call xolox#misc#msg#debug("vim-misc %s: Executing external command using system() function: %s", g:xolox#misc#version, cmd)
-        let arguments = [cmd]
-        if has_key(a:options, 'stdin')
-          if type(a:options['stdin']) == type([])
-            call add(arguments, join(a:options['stdin'], "\n"))
-          else
-            call add(arguments, a:options['stdin'])
-          endif
-        endif
-        let stdout = call('system', arguments)
-        let exit_code = v:shell_error
-      endif
-
-    endif
-
-    " Return the results as a dictionary with one or more key/value pairs.
-    let result = {'command': cmd}
-    if !async
-      let result['exit_code'] = exit_code
-      " Get the standard output of the command.
-      if redirect_output
-        let result['stdout'] = s:readfile(tempout, 'standard output', a:options['command'])
-      elseif exists('stdout')
-        let result['stdout'] = split(stdout, "\n")
-      else
-        let result['stdout'] = []
-      endif
-      " Get the standard error of the command.
-      if exists('temperr')
-        let result['stderr'] = s:readfile(temperr, 'standard error', a:options['command'])
-      else
-        let result['stderr'] = []
-      endif
-      " If we just executed a synchronous command and the caller didn't
-      " specifically ask us *not* to check the exit code of the external
-      " command, we'll do so now. The idea here is that it should be easy
-      " to 'do the right thing'.
-      if get(a:options, 'check', 1) && exit_code != 0
-        " Prepare an error message with enough details so the user can investigate.
-        let msg = printf("vim-misc %s: External command failed with exit code %d!", g:xolox#misc#version, result['exit_code'])
-        let msg .= printf("\nCommand line: %s", result['command'])
-        " If the external command reported an error, we'll include it in our message.
-        if !empty(result['stderr'])
-          " This is where we would normally expect to find an error message.
-          let msg .= printf("\nOutput on standard output stream:\n%s", join(result['stderr'], "\n"))
-        elseif !empty(result['stdout'])
-          " Exuberant Ctags on Windows XP reports errors on standard output :-x.
-          let msg .= printf("\nOutput on standard error stream:\n%s", join(result['stdout'], "\n"))
-        endif
-        throw msg
-      endif
-    endif
-    return result
-
-  finally
-    " Cleanup any temporary files we created.
-    for name in ['tempin', 'tempout', 'temperr']
-      if exists(name)
-        call delete({name})
-      endif
-    endfor
-  endtry
-
-endfunction
-
-function! xolox#misc#os#can_use_dll() " {{{1
-  " If a) we're on Microsoft Windows, b) the vim-shell plug-in is installed
-  " and c) the compiled DLL included in vim-shell works, we can use the
-  " vim-shell plug-in to execute external commands! Returns 1 (true)
-  " if we can use the DLL, 0 (false) otherwise.
-  let can_use_dll = 0
-  try
-    let can_use_dll = xolox#shell#can_use_dll()
-  catch /^Vim\%((\a\+)\)\=:E117/
-    " Silence E117.
-  endtry
-  return can_use_dll
-endfunction
-
-function! s:readfile(fname, label, cmd) " {{{1
-  try
-    return readfile(a:fname)
-  catch
-    call xolox#misc#msg#warn("vim-misc %s: Failed to read temporary file (%s) with %s of external command: %s! (external command: %s)", g:xolox#misc#version, a:fname, a:label, v:exception, a:cmd)
-    return []
-  endtry
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/path.vim b/bundle/misc/autoload/xolox/misc/path.vim
deleted file mode 100755
index 6ff5589..0000000
--- a/bundle/misc/autoload/xolox/misc/path.vim
+++ /dev/null
@@ -1,278 +0,0 @@
-" Pathname manipulation functions.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: July 7, 2014
-" URL: http://peterodding.com/code/vim/misc/
-
-let s:windows_compatible = xolox#misc#os#is_win()
-
-function! xolox#misc#path#which(...) " {{{1
-  " Scan the executable search path (`$PATH`) for one or more external
-  " programs. Expects one or more string arguments with program names. Returns
-  " a list with the absolute pathnames of all found programs. Here's an
-  " example:
-  "
-  "     :echo xolox#misc#path#which('gvim', 'vim')
-  "     ['/usr/local/bin/gvim',
-  "      '/usr/bin/gvim',
-  "      '/usr/local/bin/vim',
-  "      '/usr/bin/vim']
-  let extensions = s:windows_compatible ? split($PATHEXT, ';') : ['']
-  let matches = []
-  let checked = {}
-  for program in a:000
-    for directory in split($PATH, s:windows_compatible ? ';' : ':')
-      let directory = xolox#misc#path#absolute(directory)
-      if isdirectory(directory)
-        let found = 0
-        for extension in extensions
-          let path = xolox#misc#path#merge(directory, program . extension)
-          if executable(path)
-            call add(matches, path)
-            let found = 1
-          endif
-        endfor
-        if s:windows_compatible && ! found
-          " Maybe the extension is already contained in program; try without
-          " $PATHEXT.
-          let path = xolox#misc#path#merge(directory, program)
-          if executable(path)
-            call add(matches, path)
-          endif
-        endif
-      endif
-    endfor
-  endfor
-  return xolox#misc#list#unique(matches)
-endfunction
-
-function! xolox#misc#path#split(path) " {{{1
-  " Split a pathname (the first and only argument) into a list of pathname
-  " components.
-  "
-  " On Windows, pathnames starting with two slashes or backslashes are UNC
-  " paths where the leading slashes are significant... In this case we split
-  " like this:
-  "
-  " - Input: `'//server/share/directory'`
-  " - Result: `['//server', 'share', 'directory']`
-  "
-  " Everything except Windows is treated like UNIX until someone has a better
-  " suggestion :-). In this case we split like this:
-  "
-  " - Input: `'/foo/bar/baz'`
-  " - Result: `['/', 'foo', 'bar', 'baz']`
-  "
-  " To join a list of pathname components back into a single pathname string,
-  " use the `xolox#misc#path#join()` function.
-  if type(a:path) == type('')
-    if s:windows_compatible
-      if a:path =~ '^[\/][\/]'
-        " UNC pathname.
-        return split(a:path, '\%>2c[\/]\+')
-      else
-        " If it's not a UNC pathname we can simply split on slashes and
-        " backslashes, although we should preserve a leading slash (which
-        " denotes a pathname that is 'absolute to the current drive').
-        let absolute = (a:path =~ '^[\/]')
-        let segments = split(a:path, '[\/]\+')
-        return absolute ? insert(segments, a:path[0]) : segments
-      endif
-    else
-      " Everything else is treated as UNIX.
-      let absolute = (a:path =~ '^/')
-      let segments = split(a:path, '/\+')
-      return absolute ? insert(segments, '/') : segments
-    endif
-  endif
-  return []
-endfunction
-
-function! xolox#misc#path#join(parts) " {{{1
-  " Join a list of pathname components (the first and only argument) into a
-  " single pathname string. This is the counterpart to the
-  " `xolox#misc#path#split()` function and it expects a list of pathname
-  " components as returned by `xolox#misc#path#split()`.
-  if type(a:parts) == type([])
-    if s:windows_compatible
-      return join(a:parts, xolox#misc#path#directory_separator())
-    elseif get(a:parts, 0) == '/'
-      " Absolute path on UNIX (non-Windows).
-      return '/' . join(a:parts[1:], '/')
-    else
-      " Relative path on UNIX (non-Windows).
-      return join(a:parts, '/')
-    endif
-  endif
-  return ''
-endfunction
-
-function! xolox#misc#path#directory_separator() " {{{1
-  " Find the preferred directory separator for the platform and settings.
-  return exists('+shellslash') && &shellslash ? '/' : '\'
-endfunction
-
-function! xolox#misc#path#absolute(path) " {{{1
-  " Canonicalize and resolve a pathname, *regardless of whether it exists*.
-  " This is intended to support string comparison to determine whether two
-  " pathnames point to the same directory or file.
-  if type(a:path) == type('')
-    let path = a:path
-    " Make the pathname absolute.
-    if path =~ '^\~'
-      " Expand ~ to $HOME.
-      let path = $HOME . '/' . path[1:]
-    elseif xolox#misc#path#is_relative(path)
-      " Make relative pathnames absolute.
-      let path = getcwd() . '/' . path
-    endif
-    " Resolve symbolic links to find the canonical pathname. In my tests this
-    " also removes all symbolic pathname segments (`.' and `..'), even when
-    " the pathname does not exist. Also there used to be a bug in resolve()
-    " where it wouldn't resolve pathnames ending in a directory separator.
-    " Since it's not much trouble to work around, that's what we do.
-    let path = resolve(substitute(path, s:windows_compatible ? '[\/]\+$' : '/\+$', '', ''))
-    " Normalize directory separators (especially relevant on Windows).
-    let parts = xolox#misc#path#split(path)
-    if s:windows_compatible && parts[0] =~ '^[\/][\/]'
-      " Also normalize the two leading "directory separators" (I'm not
-      " sure what else to call them :-) in Windows UNC pathnames.
-      let parts[0] = repeat(xolox#misc#path#directory_separator(), 2) . parts[0][2:]
-    elseif s:windows_compatible && parts[0] =~ '^[\/]$'
-      " If a pathname is relative to the current drive we should add
-      " the drive letter in order to make the pathname absolute.
-      let parts[0] = matchstr(getcwd(), '^\a:')
-    endif
-    return xolox#misc#path#join(parts)
-  endif
-  return ''
-endfunction
-
-function! xolox#misc#path#relative(path, base) " {{{1
-  " Make an absolute pathname (the first argument) relative to a directory
-  " (the second argument).
-  let path = xolox#misc#path#split(a:path)
-  let base = xolox#misc#path#split(a:base)
-  while path != [] && base != [] && path[0] == base[0]
-    call remove(path, 0)
-    call remove(base, 0)
-  endwhile
-  let distance = repeat(['..'], len(base))
-  return xolox#misc#path#join(distance + path)
-endfunction
-
-function! xolox#misc#path#merge(parent, child, ...) " {{{1
-  " Join a directory pathname and filename into a single pathname.
-  if type(a:parent) == type('') && type(a:child) == type('')
-    " TODO Use xolox#misc#path#is_relative()?
-    if s:windows_compatible
-      let parent = substitute(a:parent, '[\\/]\+$', '', '')
-      let child = substitute(a:child, '^[\\/]\+', '', '')
-      return parent . '\' . child
-    else
-      let parent = substitute(a:parent, '/\+$', '', '')
-      let child = substitute(a:child, '^/\+', '', '')
-      return parent . '/' . child
-    endif
-  endif
-  return ''
-endfunction
-
-function! xolox#misc#path#commonprefix(paths) " {{{1
-  " Find the common prefix of path components in a list of pathnames.
-  let common = xolox#misc#path#split(a:paths[0])
-  for path in a:paths
-    let index = 0
-    for segment in xolox#misc#path#split(path)
-      if len(common) <= index
-        break
-      elseif common[index] != segment
-        call remove(common, index, -1)
-        break
-      endif
-      let index += 1
-    endfor
-  endfor
-  return xolox#misc#path#join(common)
-endfunction
-
-function! xolox#misc#path#starts_with(a, b) " {{{1
-  " Check whether the first pathname starts with the second pathname (expected
-  " to be a directory). This does not perform a regular string comparison;
-  " first it normalizes both pathnames, then it splits them into their
-  " pathname segments and then it compares the segments.
-  let a = xolox#misc#path#split(xolox#misc#path#absolute(a:a))
-  let b = xolox#misc#path#split(xolox#misc#path#absolute(a:b))
-  return a[0 : len(b) - 1] == b
-endfunction
-
-function! xolox#misc#path#encode(path) " {{{1
-  " Encode a pathname so it can be used as a filename. This uses URL encoding
-  " to encode special characters.
-  if s:windows_compatible
-    let mask = '[*|\\/:"<>?%]'
-  elseif xolox#misc#os#is_mac()
-    let mask = '[\\/%:]'
-  else
-    let mask = '[\\/%]'
-  endif
-  return substitute(a:path, mask, '\=printf("%%%x", char2nr(submatch(0)))', 'g')
-endfunction
-
-function! xolox#misc#path#decode(encoded_path) " {{{1
-  " Decode a pathname previously encoded with `xolox#misc#path#encode()`.
-  return substitute(a:encoded_path, '%\(\x\x\?\)', '\=nr2char("0x" . submatch(1))', 'g')
-endfunction
-
-" xolox#misc#path#equals(a, b) - Check whether two pathnames point to the same file. {{{1
-
-if s:windows_compatible
-  function! xolox#misc#path#equals(a, b)
-    return a:a ==? a:b || xolox#misc#path#absolute(a:a) ==? xolox#misc#path#absolute(a:b)
-  endfunction
-else
-  function! xolox#misc#path#equals(a, b)
-    return a:a ==# a:b || xolox#misc#path#absolute(a:a) ==# xolox#misc#path#absolute(a:b)
-  endfunction
-endif
-
-function! xolox#misc#path#is_relative(path) " {{{1
-  " Returns true (1) when the pathname given as the first argument is
-  " relative, false (0) otherwise.
-  if a:path =~ '^\w\+://'
-    return 0
-  elseif s:windows_compatible
-    return a:path !~ '^\(\w:\|[\\/]\)'
-  else
-    return a:path !~ '^/'
-  endif
-endfunction
-
-function! xolox#misc#path#tempdir() " {{{1
-  " Create a temporary directory and return the pathname of the directory.
-  if !exists('s:tempdir_counter')
-    let s:tempdir_counter = 1
-  endif
-  if exists('*mkdir')
-    if s:windows_compatible
-      let template = $TMP . '\vim_tempdir_'
-    elseif filewritable('/tmp') == 2
-      let template = '/tmp/vim_tempdir_'
-    endif
-  endif
-  if !exists('template')
-    throw "xolox#misc#path#tempdir() hasn't been implemented on your platform!"
-  endif
-  while 1
-    let directory = template . s:tempdir_counter
-    try
-      call mkdir(directory, '', 0700)
-      return directory
-    catch /^Vim\%((\a\+)\)\=:E739/
-      " Keep looking for a non-existing directory.
-    endtry
-    let s:tempdir_counter += 1
-  endwhile
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/perm.vim b/bundle/misc/autoload/xolox/misc/perm.vim
deleted file mode 100755
index 851a74d..0000000
--- a/bundle/misc/autoload/xolox/misc/perm.vim
+++ /dev/null
@@ -1,100 +0,0 @@
-" Manipulation of UNIX file permissions.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 30, 2014
-" URL: http://peterodding.com/code/vim/misc/
-"
-" Vim's [writefile()][] function cannot set file permissions for newly created
-" files and although Vim script has a function to get file permissions (see
-" [getfperm()][]) there is no equivalent for changing a file's permissions.
-"
-" This omission breaks the otherwise very useful idiom of updating a file by
-" writing its new contents to a temporary file and then renaming the temporary
-" file into place (which is as close as you're going to get to atomically
-" updating a file's contents on UNIX) because the file's permissions will not
-" be preserved!
-"
-" **Here's a practical example:** My [vim-easytags][] plug-in writes tags file
-" updates to a temporary file and renames the temporary file into place. When
-" I use `sudo -s` on Ubuntu Linux it preserves my environment variables so my
-" `~/.vimrc` and the [vim-easytags][] plug-in are still loaded. Now when a
-" tags file is written the file becomes owned by root (my effective user id in
-" the `sudo` session). Once I leave the `sudo` session I can no longer update
-" my tags file because it's now owned by root … ಠ_ಠ
-"
-" [getfperm()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#getfperm()
-" [vim-easytags]: http://peterodding.com/code/vim/easytags/
-" [writefile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#writefile()
-
-function! xolox#misc#perm#update(fname, contents)
-  " Atomically update a file's contents while preserving the owner, group and
-  " mode. The first argument is the pathname of the file to update (a string).
-  " The second argument is the list of lines to be written to the file. Writes
-  " the new contents to a temporary file and renames the temporary file into
-  " place, thereby preventing readers from reading a partially written file.
-  " Returns 1 if the file is successfully updated, 0 otherwise.
-  "
-  " Note that if `xolox#misc#perm#get()` and `xolox#misc#perm#set()` cannot be
-  " used to preserve the file owner/group/mode the file is still updated using
-  " a rename (for compatibility with non-UNIX systems and incompatible
-  " `/usr/bin/stat` implementations) so in that case you can still lose the
-  " file's owner/group/mode.
-  let starttime = xolox#misc#timer#start()
-  let temporary_file = printf('%s.tmp', a:fname)
-  call xolox#misc#msg#debug("vim-misc %s: Writing new contents of %s to temporary file %s ..", g:xolox#misc#version, a:fname, temporary_file)
-  if writefile(a:contents, temporary_file) == 0
-    call xolox#misc#perm#set(temporary_file, xolox#misc#perm#get(a:fname))
-    call xolox#misc#msg#debug("vim-misc %s: Replacing %s with %s ..", g:xolox#misc#version, a:fname, temporary_file)
-    if rename(temporary_file, a:fname) == 0
-      call xolox#misc#timer#stop("vim-misc %s: Successfully updated %s using atomic rename in %s.", g:xolox#misc#version, a:fname, starttime)
-      return 1
-    endif
-  endif
-  if filereadable(temporary_file)
-    call delete(temporary_file)
-  endif
-  return 0
-endfunction
-
-function! xolox#misc#perm#get(fname)
-  " Get the owner, group and permissions of the pathname given as the first
-  " argument. Returns an opaque value which you can later pass to
-  " `xolox#misc#perm#set()`.
-  let pathname = xolox#misc#path#absolute(a:fname)
-  if filereadable(pathname)
-    let command = printf('stat --format %s %s', '%U:%G:%a', shellescape(pathname))
-    let result = xolox#misc#os#exec({'command': command, 'check': 0})
-    if result['exit_code'] == 0 && len(result['stdout']) >= 1
-      let tokens = split(result['stdout'][0], ':')
-      if len(tokens) == 3
-        let [owner, group, mode] = tokens
-        let mode = '0' . mode
-        call xolox#misc#msg#debug("vim-misc %s: File %s has owner %s, group %s, mode %s.", g:xolox#misc#version, pathname, owner, group, mode)
-        return [owner, group, mode]
-      endif
-    endif
-  endif
-  return []
-endfunction
-
-function! xolox#misc#perm#set(fname, perms)
-  " Set the permissions (the second argument) of the pathname given as the
-  " first argument. Expects a permissions value created by
-  " `xolox#misc#perm#get()`.
-  if !empty(a:perms)
-    let pathname = xolox#misc#path#absolute(a:fname)
-    let [owner, group, mode] = a:perms
-    if s:run('chown %s:%s %s', owner, group, pathname) && s:run('chmod %s %s', mode, pathname)
-      call xolox#misc#msg#debug("vim-misc %s: Successfully set %s owner to %s, group to %s and permissions to %s.", g:xolox#misc#version, pathname, owner, group, mode)
-      return 1
-    endif
-  endif
-  return 0
-endfunction
-
-function! s:run(command, ...)
-  let args = map(copy(a:000), 'shellescape(v:val)')
-  call insert(args, a:command, 0)
-  let result = xolox#misc#os#exec({'command': call('printf', args), 'check': 0})
-  return result['exit_code'] == 0
-endfunction
diff --git a/bundle/misc/autoload/xolox/misc/persist.vim b/bundle/misc/autoload/xolox/misc/persist.vim
deleted file mode 100755
index 5b628fb..0000000
--- a/bundle/misc/autoload/xolox/misc/persist.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" Persist/recall Vim values from/to files.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 30, 2014
-" URL: http://peterodding.com/code/vim/misc/
-"
-" Vim's [string()][] function can be used to serialize Vim script values like
-" numbers, strings, lists, dictionaries and composites of them to a string
-" which can later be evaluated using the [eval()][] function to turn it back
-" into the original value. This Vim script provides functions to use these
-" functions to persist and recall Vim values from/to files. This is very
-" useful for communication between (possibly concurrent) Vim processes.
-
-function! xolox#misc#persist#load(filename, ...) " {{{1
-  " Read a Vim value like a number, string, list or dictionary from a file
-  " using [readfile()][] and [eval()][]. The first argument is the filename of
-  " the file to read (a string). The optional second argument specifies the
-  " default value which is returned when the file can't be loaded. This
-  " function returns the loaded value or the default value (which itself
-  " defaults to the integer 0).
-  "
-  " [eval()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#eval()
-  " [readfile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#readfile()
-  let default_value = exists('a:1') ? a:1 : 0
-  try
-    let lines = readfile(a:filename)
-    return eval(join(lines, "\n"))
-  catch
-    return default_value
-  endtry
-endfunction
-
-function! xolox#misc#persist#save(filename, value) " {{{1
-  " Write a Vim value like a number, string, list or dictionary to a file
-  " using [string()][] and [writefile()][]. The first argument is the filename
-  " of the file to write (a string) and the second argument is the value to
-  " write (any value).
-  "
-  " This function writes the serialized value to an intermediate file which is
-  " then renamed into place atomically. This avoids issues with concurrent
-  " processes where for example a producer has written a partial file which is
-  " read by a consumer before the file is complete. In this case the consumer
-  " would read a corrupt value. The rename trick avoids this problem.
-  "
-  " [string()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#string()
-  " [writefile()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#writefile()
-  return xolox#misc#perm#update(a:filename, split(string(a:value), "\n"))
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/str.vim b/bundle/misc/autoload/xolox/misc/str.vim
deleted file mode 100755
index edcab13..0000000
--- a/bundle/misc/autoload/xolox/misc/str.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-" String handling.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: September 17, 2014
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#str#slug(s) " {{{1
-  " Convert a string to a "slug" - something that can be safely used in
-  " filenames and URLs without worrying about quoting/escaping of special
-  " characters.
-  return join(split(tolower(a:s), '\W\+'), '-')
-endfunction
-
-function! xolox#misc#str#ucfirst(s) " {{{1
-  " Uppercase the first character in a string (the first argument).
-  return substitute(a:s, '^.', '\U\0', '')
-endfunction
-
-function! xolox#misc#str#unescape(s) " {{{1
-  " Remove back slash escapes from a string (the first argument).
-  return substitute(a:s, '\\\(\_.\)', '\1', 'g')
-endfunction
-
-function! xolox#misc#str#compact(s) " {{{1
-  " Compact whitespace in a string (the first argument).
-  return join(split(a:s), " ")
-endfunction
-
-function! xolox#misc#str#trim(s) " {{{1
-  " Trim all whitespace from the start and end of a string (the first
-  " argument).
-  return substitute(a:s, '^\_s*\(.\{-}\)\_s*$', '\1', '')
-endfunction
-
-function! xolox#misc#str#indent(text, num_spaces) " {{{1
-  " Indent all lines in a multi-line string (the first argument) with a
-  " specific number of *space characters* (the second argument, an integer).
-  let lines = split(a:text, "\n")
-  let indent = repeat(' ', a:num_spaces)
-  let [idx, limit] = [0, len(lines)]
-  while idx < limit
-    if lines[idx] =~ '\S'
-      let lines[idx] = indent . lines[idx]
-    endif
-    let idx += 1
-  endwhile
-  return join(lines, "\n")
-endfunction
-
-function! xolox#misc#str#dedent(text) " {{{1
-  " Remove common whitespace from a multi line string.
-  let lines = split(a:text, "\n")
-  " First we need to determine the common indentation of all non-empty lines.
-  for line in lines
-    if line =~ '\S'
-      let indent = matchstr(line, '^\s*')
-      if !exists('common_indent')
-        let common_indent = indent
-      elseif len(indent) < len(common_indent)
-        let common_indent = indent
-      endif
-    endif
-  endfor
-  " Now we will strip the common indentation.
-  let [idx, limit] = [0, len(lines)]
-  let pattern = '^' . common_indent
-  while idx < limit
-    let lines[idx] = substitute(lines[idx], pattern, '', '')
-    let idx += 1
-  endwhile
-  return join(lines, "\n")
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/test.vim b/bundle/misc/autoload/xolox/misc/test.vim
deleted file mode 100755
index df4d465..0000000
--- a/bundle/misc/autoload/xolox/misc/test.vim
+++ /dev/null
@@ -1,125 +0,0 @@
-" Test runner & infrastructure for Vim plug-ins.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 2, 2013
-" URL: http://peterodding.com/code/vim/misc/
-"
-" The Vim auto-load script `autoload/xolox/misc/test.vim` contains
-" infrastructure that can be used to run an automated Vim plug-in test suite.
-" It provides a framework for running test functions, keeping track of the
-" test status, making assertions and reporting test results to the user.
-
-" The process handling tests cannot use the built-in "echo" command from the
-" Windows shell because it has way too much idiosyncrasies for me to put up
-" with. Seriously. Instead I'm using an "echo.exe" from the UnxUtils project.
-if xolox#misc#os#is_win()
-  let g:xolox#misc#test#echo = xolox#misc#escape#shell(xolox#misc#path#merge(expand('<sfile>:p:h'), 'echo.exe'))
-else
-  let g:xolox#misc#test#echo = 'echo'
-endif
-
-function! xolox#misc#test#reset() " {{{1
-  " Reset counters for executed tests and passed/failed assertions.
-  let s:num_executed = 0
-  let s:num_passed = 0
-  let s:num_failed = 0
-  let s:tests_started_at = xolox#misc#timer#start()
-endfunction
-
-function! xolox#misc#test#summarize() " {{{1
-  " Print a summary of test results, to be interpreted interactively.
-  call s:delimit_output()
-  call xolox#misc#timer#force("Took %s to run %s: %s passed, %s failed.",
-        \ s:tests_started_at,
-        \ xolox#misc#format#pluralize(s:num_executed, 'test', 'tests'),
-        \ xolox#misc#format#pluralize(s:num_passed, 'assertion', 'assertions'),
-        \ xolox#misc#format#pluralize(s:num_failed, 'assertion', 'assertions'))
-endfunction
-
-function! xolox#misc#test#wrap(function) " {{{1
-  " Call a function in a try/catch block and prevent exceptions from bubbling.
-  " The name of the function should be passed as the first and only argument;
-  " it should be a string containing the name of a Vim auto-load function.
-  let num_failed = s:num_failed
-  try
-    if s:num_passed + s:num_failed > 0
-      call s:delimit_output()
-    endif
-    let test_name = split(a:function, '#')[-1]
-    let test_name = substitute(test_name, '_', ' ', 'g')
-    let test_name = substitute(test_name, '^.', '\U\0', '')
-    call xolox#misc#msg#info("Running test #%i: %s", s:num_executed + 1, test_name)
-    call call(a:function, [])
-  catch
-    call xolox#misc#msg#warn("Test %s raised exception:", a:function)
-    call xolox#misc#msg#warn("%s", v:exception)
-    call xolox#misc#msg#warn("(at %s)", v:throwpoint)
-    if num_failed == s:num_failed
-      " Make sure exceptions are counted as failures, but don't inflate the
-      " number of failed assertions when it's not needed (it can produce
-      " confusing test output).
-      call xolox#misc#test#failed()
-    endif
-  endtry
-  let s:num_executed += 1
-endfunction
-
-function! xolox#misc#test#passed() " {{{1
-  " Record a test which succeeded.
-  let s:num_passed += 1
-  call s:print_feedback()
-endfunction
-
-function! xolox#misc#test#failed() " {{{1
-  " Record a test which failed.
-  let s:num_failed += 1
-  call s:print_feedback()
-endfunction
-
-function! s:delimit_output() " {{{1
-  " Print a delimiter between output of tests.
-  call xolox#misc#msg#info("%s", repeat("-", 40))
-endfunction
-
-function! s:print_feedback() " {{{1
-  " Let the user know the status of the test suite.
-  call xolox#misc#msg#info("Test status: %s passed, %s failed ..",
-        \ xolox#misc#format#pluralize(s:num_passed, 'assertion', 'assertions'),
-        \ xolox#misc#format#pluralize(s:num_failed, 'assertion', 'assertions'))
-endfunction
-
-function! xolox#misc#test#assert_true(expr) " {{{1
-  " Check whether an expression is true.
-  if a:expr
-    call xolox#misc#test#passed()
-  else
-    call xolox#misc#test#failed()
-    let msg = "Expected value to be true, got %s instead"
-    throw printf(msg, string(a:expr))
-  endif
-endfunction
-
-function! xolox#misc#test#assert_equals(expected, received) " {{{1
-  " Check whether two values are the same.
-  call xolox#misc#test#assert_same_type(a:expected, a:received)
-  if a:expected == a:received
-    call xolox#misc#test#passed()
-  else
-    call xolox#misc#test#failed()
-    let msg = "Expected value %s, received value %s!"
-    throw printf(msg, string(a:expected), string(a:received))
-  endif
-endfunction
-
-function! xolox#misc#test#assert_same_type(expected, received) " {{{1
-  " Check whether two values are of the same type.
-  if type(a:expected) == type(a:received)
-    call xolox#misc#test#passed()
-  else
-    call xolox#misc#test#failed()
-    let msg = "Expected value of same type as %s, got value %s!"
-    throw printf(msg, string(a:expected), string(a:received))
-  endif
-endfunction
-
-call xolox#misc#test#reset()
diff --git a/bundle/misc/autoload/xolox/misc/tests.vim b/bundle/misc/autoload/xolox/misc/tests.vim
deleted file mode 100755
index f3af1cb..0000000
--- a/bundle/misc/autoload/xolox/misc/tests.vim
+++ /dev/null
@@ -1,301 +0,0 @@
-" Tests for the miscellaneous Vim scripts.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June , 2013
-" URL: http://peterodding.com/code/vim/misc/
-"
-" The Vim auto-load script `autoload/xolox/misc/tests.vim` contains the
-" automated test suite of the miscellaneous Vim scripts. Right now the
-" coverage is not very high yet, but this will improve over time.
-
-let s:use_dll = 0
-let s:can_use_dll = xolox#misc#os#can_use_dll()
-
-function! xolox#misc#tests#run() " {{{1
-  " Run the automated test suite of the miscellaneous Vim scripts. To be used
-  " interactively. Intended to be safe to execute irrespective of context.
-  call xolox#misc#test#reset()
-  " Run the tests.
-  call s:test_string_escaping()
-  call s:test_list_handling()
-  call s:test_option_handling()
-  call s:test_command_execution()
-  call s:test_string_handling()
-  call s:test_version_handling()
-  " Report a short summary to the user.
-  call xolox#misc#test#summarize()
-endfunction
-
-function! s:wrap_exec_test(function)
-  " Wrapper for tests that use xolox#misc#os#exec(). If we're on Windows and
-  " the vim-shell plug-in is installed, the test will be run twice: Once with
-  " vim-shell disabled and once with vim-shell enabled. This makes sure that
-  " all code paths are tested as much as possible.
-  call xolox#misc#msg#debug("vim-misc %s: Temporarily disabling vim-shell so we can test vim-misc ..", g:xolox#misc#version)
-  let s:use_dll = 0
-  call xolox#misc#test#wrap(a:function)
-  if s:can_use_dll
-    call xolox#misc#msg#debug("vim-misc %s: Re-enabling vim-shell so we can test that as well ..", g:xolox#misc#version)
-    let s:use_dll = 1
-    call xolox#misc#test#wrap(a:function)
-  endif
-endfunction
-
-" Tests for autoload/xolox/misc/escape.vim {{{1
-
-function! s:test_string_escaping()
-  call xolox#misc#test#wrap('xolox#misc#tests#pattern_escaping')
-  call xolox#misc#test#wrap('xolox#misc#tests#substitute_escaping')
-  call s:wrap_exec_test('xolox#misc#tests#shell_escaping')
-endfunction
-
-function! xolox#misc#tests#pattern_escaping() " {{{2
-  " Test escaping of regular expression patterns with
-  " `xolox#misc#escape#pattern()`.
-  call xolox#misc#test#assert_equals('foo [qux] baz', substitute('foo [bar] baz', xolox#misc#escape#pattern('[bar]'), '[qux]', 'g'))
-  call xolox#misc#test#assert_equals('also very nasty', substitute('also ~ nasty', xolox#misc#escape#pattern('~'), 'very', 'g'))
-endfunction
-
-function! xolox#misc#tests#substitute_escaping() " {{{2
-  " Test escaping of substitution strings with
-  " `xolox#misc#escape#substitute()`.
-  call xolox#misc#test#assert_equals('nasty & tricky stuff', substitute('tricky stuff', 'tricky', xolox#misc#escape#substitute('nasty & tricky'), 'g'))
-endfunction
-
-function! xolox#misc#tests#shell_escaping() " {{{2
-  " Test escaping of shell arguments with `xolox#misc#escape#shell()`.
-  let expected_value = 'this < is > a | very " scary ^ string '' indeed'
-  let result = xolox#misc#os#exec({'command': g:xolox#misc#test#echo . ' ' . xolox#misc#escape#shell(expected_value), 'use_dll': s:use_dll})
-  call xolox#misc#test#assert_equals(0, result['exit_code'])
-  call xolox#misc#test#assert_equals(0, result['exit_code'])
-  call xolox#misc#test#assert_same_type([], result['stdout'])
-  call xolox#misc#test#assert_equals(1, len(result['stdout']))
-  " XXX On Windows using system() there's a trailing space I can't explain.
-  " However the point of this test was to show that all characters pass
-  " through unharmed, so for now I'll just ignore the space :-)
-  call xolox#misc#test#assert_equals(expected_value, xolox#misc#str#trim(result['stdout'][0]))
-endfunction
-
-" Tests for autoload/xolox/misc/list.vim {{{1
-
-function! s:test_list_handling()
-  call xolox#misc#test#wrap('xolox#misc#tests#making_a_list_unique')
-  call xolox#misc#test#wrap('xolox#misc#tests#binary_insertion')
-endfunction
-
-function! xolox#misc#tests#making_a_list_unique() " {{{2
-  " Test removing of duplicate values from lists with
-  " `xolox#misc#list#unique()`.
-  call xolox#misc#test#assert_equals([1, 2, 3, 4, 5], xolox#misc#list#unique([1, 1, 2, 3, 3, 4, 5, 5]))
-  " Should work for strings just as well. And it should preserve order.
-  call xolox#misc#test#assert_equals(['a', 'b', 'c'], xolox#misc#list#unique(['a', 'a', 'b', 'b', 'c']))
-  " Just to make sure that lists without duplicate values pass through unharmed.
-  call xolox#misc#test#assert_equals([1, 2, 3, 4, 5], xolox#misc#list#unique([1, 2, 3, 4, 5]))
-endfunction
-
-function! xolox#misc#tests#binary_insertion() " {{{2
-  " Test the binary insertion algorithm implemented in
-  " `xolox#misc#list#binsert()`.
-  let list = ['a', 'B', 'e']
-  " Insert 'c' (should end up between 'B' and 'e').
-  call xolox#misc#list#binsert(list, 'c', 1)
-  call xolox#misc#test#assert_equals(['a', 'B', 'c', 'e'], list)
-  " Insert 'D' (should end up between 'c' and 'e').
-  call xolox#misc#list#binsert(list, 'D', 1)
-  call xolox#misc#test#assert_equals(['a', 'B', 'c', 'D', 'e'], list)
-  " Insert 'f' (should end up after 'e', at the end).
-  call xolox#misc#list#binsert(list, 'f', 1)
-  call xolox#misc#test#assert_equals(['a', 'B', 'c', 'D', 'e', 'f'], list)
-endfunction
-
-" Tests for autoload/xolox/misc/option.vim {{{1
-
-function! s:test_option_handling()
-  call xolox#misc#test#wrap('xolox#misc#tests#getting_configuration_options')
-  call xolox#misc#test#wrap('xolox#misc#tests#splitting_of_multi_valued_options')
-  call xolox#misc#test#wrap('xolox#misc#tests#joining_of_multi_valued_options')
-endfunction
-
-function! xolox#misc#tests#getting_configuration_options() " {{{2
-  " Test getting of scoped plug-in configuration "options" with
-  " `xolox#misc#option#get()`.
-  let magic_name = 'a_variable_that_none_would_use'
-  call xolox#misc#test#assert_equals(0, xolox#misc#option#get(magic_name))
-  " Test custom default values.
-  call xolox#misc#test#assert_equals([], xolox#misc#option#get(magic_name, []))
-  " Set the option as a global variable.
-  let global_value = 'global variable'
-  let g:{magic_name} = global_value
-  call xolox#misc#test#assert_equals(global_value, xolox#misc#option#get(magic_name))
-  " Set the option as a buffer local variable, thereby shadowing the global.
-  let local_value = 'buffer local variable'
-  let b:{magic_name} = local_value
-  call xolox#misc#test#assert_equals(local_value, xolox#misc#option#get(magic_name))
-  " Sanity check that it's possible to unshadow as well.
-  unlet b:{magic_name}
-  call xolox#misc#test#assert_equals(global_value, xolox#misc#option#get(magic_name))
-  " Cleanup after ourselves.
-  unlet g:{magic_name}
-  call xolox#misc#test#assert_equals(0, xolox#misc#option#get(magic_name))
-endfunction
-
-function! xolox#misc#tests#splitting_of_multi_valued_options() " {{{2
-  " Test splitting of multi-valued Vim options with
-  " `xolox#misc#option#split()`.
-  call xolox#misc#test#assert_equals([], xolox#misc#option#split(''))
-  call xolox#misc#test#assert_equals(['just one value'], xolox#misc#option#split('just one value'))
-  call xolox#misc#test#assert_equals(['value 1', 'value 2'], xolox#misc#option#split('value 1,value 2'))
-  call xolox#misc#test#assert_equals(['value 1', 'value 2', 'tricky,value'], xolox#misc#option#split('value 1,value 2,tricky\,value'))
-endfunction
-
-function! xolox#misc#tests#joining_of_multi_valued_options() " {{{2
-  " Test joining of multi-valued Vim options with `xolox#misc#option#join()`.
-  call xolox#misc#test#assert_equals('', xolox#misc#option#join([]))
-  call xolox#misc#test#assert_equals('just one value', xolox#misc#option#join(['just one value']))
-  call xolox#misc#test#assert_equals('value 1,value 2', xolox#misc#option#join(['value 1', 'value 2']))
-  call xolox#misc#test#assert_equals('value 1,value 2,tricky\,value', xolox#misc#option#join(['value 1', 'value 2', 'tricky,value']))
-endfunction
-
-" Tests for autoload/xolox/misc/os.vim {{{1
-
-function! s:test_command_execution()
-  call xolox#misc#test#wrap('xolox#misc#tests#finding_vim_on_the_search_path')
-  call s:wrap_exec_test('xolox#misc#tests#synchronous_command_execution')
-  call s:wrap_exec_test('xolox#misc#tests#synchronous_command_execution_with_stderr')
-  call s:wrap_exec_test('xolox#misc#tests#synchronous_command_execution_with_raising_of_errors')
-  call s:wrap_exec_test('xolox#misc#tests#synchronous_command_execution_without_raising_errors')
-  call s:wrap_exec_test('xolox#misc#tests#asynchronous_command_execution')
-endfunction
-
-function! xolox#misc#tests#finding_vim_on_the_search_path() " {{{2
-  " Test looking up Vim's executable on the search path using [v:progname] []
-  " with `xolox#misc#os#find_vim()`.
-  "
-  " [v:progname]: http://vimdoc.sourceforge.net/htmldoc/eval.html#v:progname
-  let pathname = xolox#misc#os#find_vim()
-  call xolox#misc#test#assert_same_type('', pathname)
-  call xolox#misc#test#assert_true(executable(pathname))
-endfunction
-
-function! xolox#misc#tests#synchronous_command_execution() " {{{2
-  " Test basic functionality of synchronous command execution with
-  " `xolox#misc#os#exec()`.
-  let result = xolox#misc#os#exec({'command': printf('%s output', g:xolox#misc#test#echo), 'use_dll': s:use_dll})
-  call xolox#misc#test#assert_same_type({}, result)
-  call xolox#misc#test#assert_equals(0, result['exit_code'])
-  call xolox#misc#test#assert_equals(['output'], result['stdout'])
-endfunction
-
-function! xolox#misc#tests#synchronous_command_execution_with_stderr() " {{{2
-  " Test basic functionality of synchronous command execution with
-  " `xolox#misc#os#exec()` including the standard error stream (not available
-  " on Windows when vim-shell is not installed).
-  if !(xolox#misc#os#is_win() && !s:use_dll)
-    let result = xolox#misc#os#exec({'command': printf('%s output && %s errors >&2', g:xolox#misc#test#echo, g:xolox#misc#test#echo), 'use_dll': s:use_dll})
-    call xolox#misc#test#assert_same_type({}, result)
-    call xolox#misc#test#assert_equals(0, result['exit_code'])
-    call xolox#misc#test#assert_equals(['output'], result['stdout'])
-    call xolox#misc#test#assert_equals(['errors'], result['stderr'])
-  endif
-endfunction
-
-function! xolox#misc#tests#synchronous_command_execution_with_raising_of_errors() " {{{2
-  " Test raising of errors during synchronous command execution with
-  " `xolox#misc#os#exec()`.
-  try
-    call xolox#misc#os#exec({'command': 'exit 1', 'use_dll': s:use_dll})
-    call xolox#misc#test#assert_true(0)
-  catch
-    call xolox#misc#test#assert_true(1)
-  endtry
-endfunction
-
-function! xolox#misc#tests#synchronous_command_execution_without_raising_errors() " {{{2
-  " Test synchronous command execution without raising of errors with
-  " `xolox#misc#os#exec()`.
-  try
-    let result = xolox#misc#os#exec({'command': 'exit 42', 'check': 0, 'use_dll': s:use_dll})
-    call xolox#misc#test#assert_true(1)
-    call xolox#misc#test#assert_equals(42, result['exit_code'])
-  catch
-    call xolox#misc#test#assert_true(0)
-  endtry
-endfunction
-
-function! xolox#misc#tests#asynchronous_command_execution() " {{{2
-  " Test the basic functionality of asynchronous command execution with
-  " `xolox#misc#os#exec()`. This runs the external command `mkdir` and tests
-  " that the side effect of creating the directory takes place. This might
-  " seem like a peculiar choice, but it's one of the few 100% portable
-  " commands (Windows + UNIX) that doesn't involve input/output streams.
-  let temporary_directory = xolox#misc#path#tempdir()
-  let random_name = printf('%i', localtime())
-  let expected_directory = xolox#misc#path#merge(temporary_directory, random_name)
-  let command = 'mkdir ' . xolox#misc#escape#shell(expected_directory)
-  let result = xolox#misc#os#exec({'command': command, 'async': 1, 'use_dll': s:use_dll})
-  call xolox#misc#test#assert_same_type({}, result)
-  " Make sure the command is really executed.
-  let timeout = localtime() + 30
-  while !isdirectory(expected_directory) && localtime() < timeout
-    sleep 500 m
-  endwhile
-  call xolox#misc#test#assert_true(isdirectory(expected_directory))
-endfunction
-
-" Tests for autoload/xolox/misc/str.vim {{{1
-
-function! s:test_string_handling()
-  call xolox#misc#test#wrap('xolox#misc#tests#string_case_transformation')
-  call xolox#misc#test#wrap('xolox#misc#tests#string_whitespace_compaction')
-  call xolox#misc#test#wrap('xolox#misc#tests#string_whitespace_trimming')
-  call xolox#misc#test#wrap('xolox#misc#tests#multiline_string_dedent')
-endfunction
-
-function! xolox#misc#tests#string_case_transformation()
-  " Test string case transformation with `xolox#misc#str#ucfirst()`.
-  call xolox#misc#test#assert_equals('Foo', xolox#misc#str#ucfirst('foo'))
-  call xolox#misc#test#assert_equals('BAR', xolox#misc#str#ucfirst('BAR'))
-endfunction
-
-function! xolox#misc#tests#string_whitespace_compaction()
-  " Test compaction of whitespace in strings with `xolox#misc#str#compact()`.
-  call xolox#misc#test#assert_equals('foo bar baz', xolox#misc#str#compact(' foo bar  baz  '))
-  call xolox#misc#test#assert_equals('test', xolox#misc#str#compact("\ntest "))
-endfunction
-
-function! xolox#misc#tests#string_whitespace_trimming()
-  " Test trimming of whitespace in strings with `xolox#misc#str#trim()`.
-  call xolox#misc#test#assert_equals('foo bar  baz', xolox#misc#str#trim("\nfoo bar  baz "))
-endfunction
-
-function! xolox#misc#tests#multiline_string_dedent()
-  " Test dedenting of multi-line strings with `xolox#misc#str#dedent()`.
-  call xolox#misc#test#assert_equals('test', xolox#misc#str#dedent('  test'))
-  call xolox#misc#test#assert_equals("1\n\n2", xolox#misc#str#dedent(" 1\n\n 2"))
-  call xolox#misc#test#assert_equals("1\n\n 2", xolox#misc#str#dedent(" 1\n\n  2"))
-endfunction
-
-" Tests for autoload/xolox/misc/version.vim {{{1
-
-function! s:test_version_handling()
-  call xolox#misc#test#wrap('xolox#misc#tests#version_string_parsing')
-  call xolox#misc#test#wrap('xolox#misc#tests#version_string_comparison')
-endfunction
-
-function! xolox#misc#tests#version_string_parsing() " {{{2
-  " Test parsing of version strings with `xolox#misc#version#parse()`.
-  call xolox#misc#test#assert_equals([1], xolox#misc#version#parse('1'))
-  call xolox#misc#test#assert_equals([1, 5], xolox#misc#version#parse('1.5'))
-  call xolox#misc#test#assert_equals([1, 22, 3333, 44444, 55555], xolox#misc#version#parse('1.22.3333.44444.55555'))
-  call xolox#misc#test#assert_equals([1, 5], xolox#misc#version#parse('1x.5y'))
-endfunction
-
-function! xolox#misc#tests#version_string_comparison() " {{{2
-  " Test comparison of version strings with `xolox#misc#version#at_least()`.
-  call xolox#misc#test#assert_true(xolox#misc#version#at_least('1', '1'))
-  call xolox#misc#test#assert_true(!xolox#misc#version#at_least('1', '0'))
-  call xolox#misc#test#assert_true(xolox#misc#version#at_least('1', '2'))
-  call xolox#misc#test#assert_true(xolox#misc#version#at_least('1.2.3', '1.2.3'))
-  call xolox#misc#test#assert_true(!xolox#misc#version#at_least('1.2.3', '1.2'))
-  call xolox#misc#test#assert_true(xolox#misc#version#at_least('1.2.3', '1.2.4'))
-endfunction
diff --git a/bundle/misc/autoload/xolox/misc/timer.vim b/bundle/misc/autoload/xolox/misc/timer.vim
deleted file mode 100755
index e97a186..0000000
--- a/bundle/misc/autoload/xolox/misc/timer.vim
+++ /dev/null
@@ -1,130 +0,0 @@
-" Timing of long during operations.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: July 19, 2014
-" URL: http://peterodding.com/code/vim/misc/
-
-if !exists('g:timer_enabled')
-  let g:timer_enabled = 0
-endif
-
-if !exists('g:timer_verbosity')
-  let g:timer_verbosity = 1
-endif
-
-let s:has_reltime = has('reltime')
-let s:unique_marker = 'xolox#misc#timer#value'
-
-function! xolox#misc#timer#resumable() " {{{1
-  " Create a resumable timer object. This returns an object (a dictionary with
-  " functions) with the following "methods":
-  "
-  "  - `start()` instructs the timer object to start counting elapsed time
-  "    (when a timer object is created it is not automatically started).
-  "
-  "  - `stop()` instructs the timer object to stop counting elapsed time.
-  "    This adds the time elapsed since `start()` was last called to the
-  "    total elapsed time. This method will raise an error if called out of
-  "    sequence.
-  "
-  "  - `format()` takes the total elapsed time and reports it as a string
-  "    containing a formatted floating point number.
-  "
-  " Timer objects are meant to accurately time short running operations so
-  " they're dependent on Vim's [reltime()][] and [reltimestr()][] functions.
-  " In order to make it possible to use timer objects in my Vim plug-ins
-  " unconditionally there's a fall back to [localtime()][] when [reltime()][]
-  " is not available. In this mode the timer objects are not very useful but
-  " at least they shouldn't raise errors.
-  "
-  " [localtime()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#localtime()
-  " [reltime()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#reltime()
-  " [reltimestr()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#reltimestr()
-  let object = {'total': [0, 0]}
-  function object.start() dict
-    if s:has_reltime
-      let self.current = reltime()
-    else
-      let self.current = localtime()
-    endif
-  endfunction
-  function object.stop() dict
-    if empty(get(self, 'current'))
-      throw "timer.stop() called on a timer that was never started!"
-    endif
-    if s:has_reltime
-      let elapsed_time_string = xolox#misc#str#trim(reltimestr(reltime(self.current)))
-      " This is a bit silly (converting to a string and then parsing that) but
-      " the value of reltime() is documented as being platform specific...
-      let [seconds, microseconds] = split(elapsed_time_string, '\.')
-      let self.total[0] += substitute(seconds, '^0*', '', '')
-      let self.total[1] += substitute(microseconds, '^0*', '', '')
-      let self.current = []
-    else
-      let self.total[0] += localtime() - self.current
-      let self.current = 0
-    endif
-  endfunction
-  function object.format() dict
-    let seconds = self.total[0]
-    let microseconds = self.total[1]
-    if microseconds >= 1000000
-      let additional_seconds = microseconds / 1000000
-      let seconds += additional_seconds
-      let microseconds -= additional_seconds * 1000000
-    endif
-    return printf('%i.%06i', seconds, microseconds)
-  endfunction
-  return object
-endfunction
-
-function! xolox#misc#timer#start() " {{{1
-  " Start a timer. This returns a list which can later be passed to
-  " `xolox#misc#timer#stop()`.
-  return [s:unique_marker, s:has_reltime ? reltime() : localtime()]
-endfunction
-
-function! xolox#misc#timer#stop(...) " {{{1
-  " Show a formatted debugging message to the user, if the user has enabled
-  " increased verbosity by setting Vim's ['verbose'] [verbose] option to one
-  " (1) or higher.
-  "
-  " This function has the same argument handling as Vim's [printf()] [printf]
-  " function with one difference: At the point where you want the elapsed time
-  " to be embedded, you write `%s` and you pass the list returned by
-  " `xolox#misc#timer#start()` as an argument.
-  "
-  " [verbose]: http://vimdoc.sourceforge.net/htmldoc/options.html#'verbose'
-  " [printf]: http://vimdoc.sourceforge.net/htmldoc/eval.html#printf()
-  if (g:timer_enabled || &verbose >= g:timer_verbosity)
-    call call('xolox#misc#msg#info', map(copy(a:000), 'xolox#misc#timer#convert(v:val)'))
-  endif
-endfunction
-
-function! xolox#misc#timer#force(...) " {{{1
-  " Show a formatted message to the user. This function has the same argument
-  " handling as Vim's [printf()] [printf] function with one difference: At the
-  " point where you want the elapsed time to be embedded, you write `%s` and
-  " you pass the list returned by `xolox#misc#timer#start()` as an argument.
-  call call('xolox#misc#msg#info', map(copy(a:000), 'xolox#misc#timer#convert(v:val)'))
-endfunction
-
-function! xolox#misc#timer#convert(value) " {{{1
-  " Convert the value returned by `xolox#misc#timer#start()` to a string
-  " representation of the elapsed time since `xolox#misc#timer#start()` was
-  " called. Other values are returned unmodified (this allows using it with
-  " Vim's [map()][] function).
-  "
-  " [map()]: http://vimdoc.sourceforge.net/htmldoc/eval.html#map()
-  if type(a:value) == type([]) && len(a:value) == 2 && a:value[0] == s:unique_marker
-    if s:has_reltime
-      let ts = xolox#misc#str#trim(reltimestr(reltime(a:value[1])))
-    else
-      let ts = localtime() - a:value[1]
-    endif
-    return xolox#misc#format#timestamp(ts)
-  endif
-  return a:value
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/autoload/xolox/misc/version.vim b/bundle/misc/autoload/xolox/misc/version.vim
deleted file mode 100755
index 0f3ad67..0000000
--- a/bundle/misc/autoload/xolox/misc/version.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-" Version string handling.
-"
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 22, 2013
-" URL: http://peterodding.com/code/vim/misc/
-
-function! xolox#misc#version#parse(version_string)
-  " Convert a version string to a list of integers.
-  let result = map(split(a:version_string, '\.'), 'v:val + 0')
-  call xolox#misc#msg#debug("vim-misc %s: Parsed version string %s into %s.", g:xolox#misc#version, string(a:version_string), string(result))
-  return result
-endfunction
-
-function! xolox#misc#version#at_least(expected_version, available_version)
-  " Check whether the second version string is equal to or greater than the
-  " first version string. Returns 1 (true) when it is, 0 (false) otherwise.
-  let expected_version = xolox#misc#version#parse(a:expected_version)
-  let available_version = xolox#misc#version#parse(a:available_version)
-  for idx in range(max([len(expected_version), len(available_version)]))
-    let expected_number = get(expected_version, idx, 0)
-    let available_number = get(available_version, idx, 0)
-    if available_number > expected_number
-      call xolox#misc#msg#debug("vim-misc %s: Available version (%s) is higher than expected version (%s).", g:xolox#misc#version, a:available_version, a:expected_version)
-      return 1
-    elseif available_number < expected_number
-      call xolox#misc#msg#debug("vim-misc %s: Available version (%s) is lower than expected version (%s).", g:xolox#misc#version, a:available_version, a:expected_version)
-      return 0
-    endif
-  endfor
-  call xolox#misc#msg#debug("vim-misc %s: Available version (%s) is equal to expected version (%s).", g:xolox#misc#version, a:available_version, a:expected_version)
-  return 1
-endfunction
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/misc/doc/misc.txt b/bundle/misc/doc/misc.txt
deleted file mode 100755
index 3476c46..0000000
--- a/bundle/misc/doc/misc.txt
+++ /dev/null
@@ -1,1204 +0,0 @@
-*misc.txt*  Miscellaneous auto-load Vim scripts
-
-===============================================================================
-Contents ~
-
- 1. Introduction                                            |misc-introduction|
- 2. Installation                                            |misc-installation|
- 3. Function documentation                        |misc-function-documentation|
-  1. Asynchronous Vim script evaluation |misc-asynchronous-vim-script-evaluation|
-   1. The |xolox#misc#async#call()| function
-   2. The |xolox#misc#async#inside_child()| function
-   3. The |xolox#misc#async#callback_to_parent()| function
-   4. The |xolox#misc#async#periodic_callback()| function
-  2. Handling of special buffers             |misc-handling-of-special-buffers|
-   1. The |xolox#misc#buffer#is_empty()| function
-   2. The |xolox#misc#buffer#prepare()| function
-   3. The |xolox#misc#buffer#lock()| function
-   4. The |xolox#misc#buffer#unlock()| function
-  3. Tab completion for user defined commands |misc-tab-completion-for-user-defined-commands|
-   1. The |xolox#misc#complete#keywords()| function
-  4. Rate limiting for Vim's CursorHold event |misc-rate-limiting-for-vims-cursorhold-event|
-   1. The |xolox#misc#cursorhold#register()| function
-   2. The |xolox#misc#cursorhold#autocmd()| function
-  5. String escaping functions                 |misc-string-escaping-functions|
-   1. The |xolox#misc#escape#pattern()| function
-   2. The |xolox#misc#escape#substitute()| function
-   3. The |xolox#misc#escape#shell()| function
-  6. Human friendly string formatting for Vim |misc-human-friendly-string-formatting-for-vim|
-   1. The |xolox#misc#format#pluralize()| function
-   2. The |xolox#misc#format#timestamp()| function
-  7. List handling functions                     |misc-list-handling-functions|
-   1. The |xolox#misc#list#unique()| function
-   2. The |xolox#misc#list#binsert()| function
-  8. Functions to interact with the user |misc-functions-to-interact-with-user|
-   1. The |xolox#misc#msg#info()| function
-   2. The |xolox#misc#msg#warn()| function
-   3. The |xolox#misc#msg#debug()| function
-  9. Integration between Vim and its environment |misc-integration-between-vim-its-environment|
-   1. The |xolox#misc#open#file()| function
-   2. The |xolox#misc#open#url()| function
-  10. Vim and plug-in option handling        |misc-vim-plug-in-option-handling|
-   1. The |xolox#misc#option#get()| function
-   2. The |xolox#misc#option#split()| function
-   3. The |xolox#misc#option#join()| function
-   4. The |xolox#misc#option#split_tags()| function
-   5. The |xolox#misc#option#join_tags()| function
-   6. The |xolox#misc#option#eval_tags()| function
-  11. Operating system interfaces            |misc-operating-system-interfaces|
-   1. The |xolox#misc#os#is_mac()| function
-   2. The |xolox#misc#os#is_win()| function
-   3. The |xolox#misc#os#find_vim()| function
-   4. The |xolox#misc#os#exec()| function
-   5. The |xolox#misc#os#can_use_dll()| function
-  12. Pathname manipulation functions    |misc-pathname-manipulation-functions|
-   1. The |xolox#misc#path#which()| function
-   2. The |xolox#misc#path#split()| function
-   3. The |xolox#misc#path#join()| function
-   4. The |xolox#misc#path#directory_separator()| function
-   5. The |xolox#misc#path#absolute()| function
-   6. The |xolox#misc#path#relative()| function
-   7. The |xolox#misc#path#merge()| function
-   8. The |xolox#misc#path#commonprefix()| function
-   9. The |xolox#misc#path#starts_with()| function
-   10. The |xolox#misc#path#encode()| function
-   11. The |xolox#misc#path#decode()| function
-   12. The |xolox#misc#path#is_relative()| function
-   13. The |xolox#misc#path#tempdir()| function
-  13. Manipulation of UNIX file permissions |misc-manipulation-of-unix-file-permissions|
-   1. The |xolox#misc#perm#update()| function
-   2. The |xolox#misc#perm#get()| function
-   3. The |xolox#misc#perm#set()| function
-  14. Persist/recall Vim values from/to files |misc-persist-recall-vim-values-from-to-files|
-   1. The |xolox#misc#persist#load()| function
-   2. The |xolox#misc#persist#save()| function
-  15. String handling                                    |misc-string-handling|
-   1. The |xolox#misc#str#slug()| function
-   2. The |xolox#misc#str#ucfirst()| function
-   3. The |xolox#misc#str#unescape()| function
-   4. The |xolox#misc#str#compact()| function
-   5. The |xolox#misc#str#trim()| function
-   6. The |xolox#misc#str#indent()| function
-   7. The |xolox#misc#str#dedent()| function
-  16. Test runner & infrastructure for Vim plug-ins |misc-test-runner-infrastructure-for-vim-plug-ins|
-   1. The |xolox#misc#test#reset()| function
-   2. The |xolox#misc#test#summarize()| function
-   3. The |xolox#misc#test#wrap()| function
-   4. The |xolox#misc#test#passed()| function
-   5. The |xolox#misc#test#failed()| function
-   6. The |xolox#misc#test#assert_true()| function
-   7. The |xolox#misc#test#assert_equals()| function
-   8. The |xolox#misc#test#assert_same_type()| function
-  17. Tests for the miscellaneous Vim scripts |tests-for-miscellaneous-vim-scripts|
-   1. The |xolox#misc#tests#run()| function
-   2. The |xolox#misc#tests#pattern_escaping()| function
-   3. The |xolox#misc#tests#substitute_escaping()| function
-   4. The |xolox#misc#tests#shell_escaping()| function
-   5. The |xolox#misc#tests#making_a_list_unique()| function
-   6. The |xolox#misc#tests#binary_insertion()| function
-   7. The |xolox#misc#tests#getting_configuration_options()| function
-   8. The |xolox#misc#tests#splitting_of_multi_valued_options()| function
-   9. The |xolox#misc#tests#joining_of_multi_valued_options()| function
-   10. The |xolox#misc#tests#finding_vim_on_the_search_path()| function
-   11. The |xolox#misc#tests#synchronous_command_execution()| function
-   12. The |xolox#misc#tests#synchronous_command_execution_with_stderr()| function
-   13. The |xolox#misc#tests#synchronous_command_execution_with_raising_of_errors()|
-function
-   14. The |xolox#misc#tests#synchronous_command_execution_without_raising_errors()|
-function
-   15. The |xolox#misc#tests#asynchronous_command_execution()| function
-   16. The |xolox#misc#tests#string_case_transformation()| function
-   17. The |xolox#misc#tests#string_whitespace_compaction()| function
-   18. The |xolox#misc#tests#string_whitespace_trimming()| function
-   19. The |xolox#misc#tests#multiline_string_dedent()| function
-   20. The |xolox#misc#tests#version_string_parsing()| function
-   21. The |xolox#misc#tests#version_string_comparison()| function
-  18. Timing of long during operations  |misc-timing-of-long-during-operations|
-   1. The |xolox#misc#timer#resumable()| function
-   2. The |xolox#misc#timer#start()| function
-   3. The |xolox#misc#timer#stop()| function
-   4. The |xolox#misc#timer#force()| function
-   5. The |xolox#misc#timer#convert()| function
-  19. Version string handling                    |misc-version-string-handling|
-   1. The |xolox#misc#version#parse()| function
-   2. The |xolox#misc#version#at_least()| function
- 4. Contact                                                      |misc-contact|
- 5. License                                                      |misc-license|
- 6. References                                                |misc-references|
-
-===============================================================================
-                                                            *misc-introduction*
-Introduction ~
-
-The vim-misc plug-in contains Vim scripts that are used by most of the Vim
-plug-ins I've written [1] yet don't really belong with any single one of the
-plug-ins. Basically it's an extended standard library of Vim script functions
-that I wrote during the development of my Vim profile and plug-ins.
-
-In the past these scripts were bundled with each plug-in, however that turned
-out to be a maintenance nightmare for me. That's why the miscellaneous scripts
-are now a proper plug-in with their own page on Vim Online.
-
-Because the miscellaneous scripts are no longer bundled with my Vim plug-ins,
-users are now required to install the miscellaneous scripts separately. This is
-unfortunate for users who are upgrading from a previous release that did bundle
-the miscellaneous scripts, but I don't see any way around this. Sorry!
-
-===============================================================================
-                                                            *misc-installation*
-Installation ~
-
-Please refer to the installation instructions [2] on GitHub.
-
-===============================================================================
-                                                  *misc-function-documentation*
-Function documentation ~
-
-Below is the documentation for the functions included in the miscellaneous
-scripts. Anyone is free to use these functions in their own Vim profile and/or
-plug-ins. I care about backwards compatibility so won't break it without a good
-reason to do so.
-
-For those who are curious: The function descriptions given below were extracted
-from the source code of the miscellaneous scripts using the Python module
-'vimdoctool.py' included in vim-tools [3].
-
-The documentation of the 95 functions below was extracted from 19 Vim scripts
-on April 1, 2015 at 23:39.
-
--------------------------------------------------------------------------------
-                                      *misc-asynchronous-vim-script-evaluation*
-Asynchronous Vim script evaluation ~
-
-The |xolox#misc#async#call()| function builds on top of |xolox#misc#os#exec()|
-to support asynchronous evaluation of Vim scripts. The first (and for now only)
-use case is my vim-easytags [4] plug-in which has a bunch of conflicting
-requirements:
-
-1. I want the vim-easytags [4] plug-in to be as portable as possible.
-   Ideally everything is implemented in Vim script because that's the only
-   thing I can rely on to be available for all potential users of the plug-
-   in!
-
-2. Because of point one I've been forced to implement tags file reading,
-   parsing, (fold case) sorting and writing in Vim script. This is fine for
-   small tags files but once they grow to a couple of megabytes it becomes
-   annoying because Vim is unresponsive during tags file updates (key
-   presses are fortunately buffered due to Vim's input model but that
-   doesn't make it a nice user experience :-).
-
-3. I could (and did in the past) come up with all sorts of hacks to speed
-   things up without switching away from Vim script, but none of them are
-   going to solve the fundamental problem that Vim's unresponsive hiccups
-   become longer as tags files grow larger.
-
-By now it should be clear where this is heading: _Why not handle tags file
-updates in a Vim process that runs in the background without blocking the Vim
-process that the user is interacting with?_ It turns out that there are quite a
-few details to take care of, but with those out of the way, it might just work!
-I'm actually hoping to make asynchronous updates the default mode in vim-
-easytags [4]. This means I need this functionality to be as portable and robust
-as possible.
-
-**Status:** This code has seen little testing so I wouldn't trust it too much
-just yet. On the other hand, as I said, my intention is to make this
-functionality as portable and robust as possible. You be the judge :-).
-
--------------------------------------------------------------------------------
-The *xolox#misc#async#call()* function
-
-Call a Vim script function asynchronously by starting a hidden Vim process in
-the background. Once the function returns the hidden Vim process terminates
-itself. This function takes a single argument which is a dictionary with the
-following key/value pairs:
-
-- **function** (required): The name of the Vim function to call inside the
-  child process (a string). I suggest using an |autoload| function for this,
-  see below.
-
-- **arguments** (optional): A list of arguments to pass to the function. This
-  list is serialized to a string using |string()| and deserialized using
-  |eval()|.
-
-- **callback** (optional): The name of a Vim function to call in the parent
-  process when the child process has completed (a string).
-
-- **clientserver** (optional): If this is true (1) the child process will
-  notify the parent process when it has finished (the default is true). This
-  works using Vim's client/server support which is not always available. As a
-  fall back Vim's |CursorHold| automatic command is also supported (although
-  the effect is not quite as instantaneous :-).
-
-This functionality is experimental and non trivial to use, so consider yourself
-warned :-).
-
-**Limitations**
-
-I'm making this functionality available in vim-misc [5] because I think it can
-be useful to other plug-ins, however if you are going to use it you should be
-aware of the following limitations:
-
-- Because of the use of multiple processes this functionality is only
-  suitable for 'heavy' tasks.
-
-- The function arguments are serialized to a string which is passed to the
-  hidden Vim process as a command line argument, so the amount of data you
-  can pass will be limited by your operating environment.
-
-- The hidden Vim process is explicitly isolated from the user in several ways
-  (see below for more details). This is to make sure that the hidden Vim
-  processes are fast and don't clobber the user's editing sessions in any
-  way.
-
-**Changes to how Vim normally works**
-
-You have to be aware that the hidden Vim process is initialized in a specific
-way that is very different from your regular Vim editing sessions:
-
-- Your |vimrc| file is ignored using the '-u NONE' command line option.
-
-- Your |gvimrc| file (if you even knew it existed ;-) is ignored using the
-  '-U NONE' command line option.
-
-- Plug-in loading is skipped using the '--noplugin' command line option.
-
-- Swap files (see |swap-file|) are disabled using the '-n' command line
-  option. This makes sure asynchronous Vim processes don't disturb the user's
-  editing session.
-
-- Your |viminfo| file is ignored using the '-i NONE' command line option.
-  Just like with swap files this makes sure asynchronous Vim processes don't
-  disturb the user's editing session.
-
-- No-compatible mode is enabled using the '-N' command line option (usually
-  the existence of your vimrc script would have achieved the same effect but
-  since we disable loading of your vimrc we need to spell things out for
-  Vim).
-
-**Use an auto-load function**
-
-The function you want to call is identified by its name which has to be
-defined, but I just explained above that all regular initialization is disabled
-for asynchronous Vim processes, so what gives? The answer is to use an
-|autoload| function. This should work fine because the asynchronous Vim process
-'inherits' the value of the |'runtimepath'| option from your editing session.
-
--------------------------------------------------------------------------------
-The *xolox#misc#async#inside_child()* function
-
-Entry point inside the hidden Vim process that runs in the background. Invoked
-indirectly by |xolox#misc#async#call()| because it runs a command similar to
-the following:
->
-  vim --cmd 'call xolox#misc#async#inside_child(...)'
-<
-This function is responsible for calling the user defined function, capturing
-exceptions and reporting the results back to the parent Vim process using Vim's
-client/server support or a temporary file.
-
--------------------------------------------------------------------------------
-The *xolox#misc#async#callback_to_parent()* function
-
-When Vim was compiled with client/server support this function (in the parent
-process) will be called by |xolox#misc#async#inside_child()| (in the child
-process) after the user defined function has returned. This enables more or
-less instant callbacks after running an asynchronous function.
-
--------------------------------------------------------------------------------
-The *xolox#misc#async#periodic_callback()* function
-
-When client/server support is not being used the vim-misc plug-in improvises:
-It uses Vim's |CursorHold| event to periodically check if an asynchronous
-process has written its results to one of the expected temporary files. If a
-response is found the temporary file is read and deleted and then
-|xolox#misc#async#callback_to_parent()| is called to process the response.
-
--------------------------------------------------------------------------------
-                                             *misc-handling-of-special-buffers*
-Handling of special buffers ~
-
-The functions defined here make it easier to deal with special Vim buffers that
-contain text generated by a Vim plug-in. For example my vim-notes plug-in [6]
-generates several such buffers:
-
-- :RecentNotes [7] lists recently modified notes
-- :ShowTaggedNotes [8] lists notes grouped by tags
-- etc.
-
-Because the text in these buffers is generated, Vim shouldn't bother with swap
-files and it should never prompt the user whether to save changes to the
-generated text.
-
--------------------------------------------------------------------------------
-The *xolox#misc#buffer#is_empty()* function
-
-Checks if the current buffer is an empty, unchanged buffer which can be reused.
-Returns 1 if an empty buffer is found, 0 otherwise.
-
--------------------------------------------------------------------------------
-The *xolox#misc#buffer#prepare()* function
-
-Open a special buffer, i.e. a buffer that will hold generated contents, not
-directly edited by the user. The buffer can be customized by passing a
-dictionary with the following key/value pairs as the first argument:
-
-- **name** (required): The base name of the buffer (i.e. the base name of the
-  file loaded in the buffer, even though it isn't really a file and nothing
-  is really 'loaded' :-)
-
-- **path** (required): The pathname of the buffer. May be relevant if |:lcd|
-  or |'autochdir'| is being used.
-
--------------------------------------------------------------------------------
-The *xolox#misc#buffer#lock()* function
-
-Lock a special buffer so that its contents can no longer be edited.
-
--------------------------------------------------------------------------------
-The *xolox#misc#buffer#unlock()* function
-
-Unlock a special buffer so that its content can be updated.
-
--------------------------------------------------------------------------------
-                                *misc-tab-completion-for-user-defined-commands*
-Tab completion for user defined commands ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#complete#keywords()* function
-
-This function can be used to perform keyword completion for user defined Vim
-commands based on the contents of the current buffer. Here's an example of how
-you would use it:
->
-  :command -nargs=* -complete=customlist,xolox#misc#complete#keywords MyCmd call s:MyCmd(<f-args>)
-<
--------------------------------------------------------------------------------
-                                 *misc-rate-limiting-for-vims-cursorhold-event*
-Rate limiting for Vim's CursorHold event ~
-
-Several of my Vim plug-ins (e.g. vim-easytags [4], vim-notes [6] and vim-
-session [9]) use Vim's |CursorHold| and |CursorHoldI| events to perform
-periodic tasks when the user doesn't press any keys for a couple of seconds.
-These events by default fire after four seconds, this is configurable using
-Vim's |'updatetime'| option. The problem that this script solves is that there
-are Vim plug-ins which set the |'updatetime'| option to unreasonably low
-values, thereby breaking my Vim plug-ins and probably a lot of other Vim plug-
-ins out there. When users complain about this I can tell them that another Vim
-plug-in is to blame, but users don't care for the difference, their Vim is
-broken! So I implemented a workaround. This script enables registration of
-|CursorHold| event handlers with a configurable interval (expressed in
-seconds). The event handlers will be called no more than once every interval.
-
--------------------------------------------------------------------------------
-The *xolox#misc#cursorhold#register()* function
-
-Register a |CursorHold| event handler with a custom interval. This function
-takes a single argument which is a dictionary with the following fields:
-
-- **function** (required): The name of the event handler function (a string).
-
-- **arguments** (optional): A list of arguments to pass to the event handler
-  function (defaults to an empty list).
-
-- **interval** (optional): The number of seconds between calls to the event
-  handler (defaults to 4).
-
--------------------------------------------------------------------------------
-The *xolox#misc#cursorhold#autocmd()* function
-
-The 'top level event handler' that's called by Vim whenever the |CursorHold| or
-|CursorHoldI| event fires. It iterates through the event handlers registered
-using |xolox#misc#cursorhold#register()| and calls each event handler at the
-appropriate interval, keeping track of the time when each event handler was
-last run.
-
--------------------------------------------------------------------------------
-                                               *misc-string-escaping-functions*
-String escaping functions ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#escape#pattern()* function
-
-Takes a single string argument and converts it into a |:substitute| /
-|substitute()| pattern string that matches the given string literally.
-
--------------------------------------------------------------------------------
-The *xolox#misc#escape#substitute()* function
-
-Takes a single string argument and converts it into a |:substitute| /
-|substitute()| replacement string that inserts the given string literally.
-
--------------------------------------------------------------------------------
-The *xolox#misc#escape#shell()* function
-
-Takes a single string argument and converts it into a quoted command line
-argument.
-
-I was going to add a long rant here about Vim's |'shellslash'| option, but
-really, it won't make any difference. Let's just suffice to say that I have yet
-to encounter a single person out there who uses this option for its intended
-purpose (running a UNIX style shell on Microsoft Windows).
-
--------------------------------------------------------------------------------
-                                *misc-human-friendly-string-formatting-for-vim*
-Human friendly string formatting for Vim ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#format#pluralize()* function
-
-Concatenate a counter (the first argument, expected to be an integer) with a
-singular or plural label (the second and third arguments, both expected to be
-strings).
-
--------------------------------------------------------------------------------
-The *xolox#misc#format#timestamp()* function
-
-Format a time stamp (a string containing a formatted floating point number)
-into a human friendly format, for example 70 seconds is phrased as "1 minute
-and 10 seconds".
-
--------------------------------------------------------------------------------
-                                                 *misc-list-handling-functions*
-List handling functions ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#list#unique()* function
-
-Remove duplicate values from the given list in-place (preserves order).
-
--------------------------------------------------------------------------------
-The *xolox#misc#list#binsert()* function
-
-Performs in-place binary insertion, which depending on your use case can be
-more efficient than calling Vim's |sort()| function after each insertion (in
-cases where a single, final sort is not an option). Expects three arguments:
-
-1. A list
-2. A value to insert
-3. 1 (true) when case should be ignored, 0 (false) otherwise
-
--------------------------------------------------------------------------------
-                                         *misc-functions-to-interact-with-user*
-Functions to interact with the user ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#msg#info()* function
-
-Show a formatted informational message to the user.
-
-This function has the same argument handling as Vim's |printf()| function with
-one notable difference: Any arguments which are not numbers or strings are
-coerced to strings using Vim's |string()| function.
-
-In the case of |xolox#misc#msg#info()|, automatic string coercion simply makes
-the function a bit easier to use.
-
-The messages emitted by this function have no highlighting. Previously these
-messages were highlighted using the Title group (see |hl-Title|), but it was
-pointed out in pull request 16 [10] that this group shouldn't be used for
-informational messages because it is meant for titles and because of this some
-color schemes use colors that stand out quite a bit, causing the informational
-messages to look like errors.
-
--------------------------------------------------------------------------------
-The *xolox#misc#msg#warn()* function
-
-Show a formatted warning message to the user.
-
-This function has the same argument handling as the |xolox#misc#msg#info()|
-function.
-
--------------------------------------------------------------------------------
-The *xolox#misc#msg#debug()* function
-
-Show a formatted debugging message to the user, _if the user has enabled
-increased verbosity by setting Vim's |'verbose'| option to one (1) or higher_.
-
-This function has the same argument handling as the |xolox#misc#msg#info()|
-function.
-
-In the case of |xolox#misc#msg#debug()|, automatic string coercion provides
-lazy evaluation in the sense that complex data structures are only converted to
-strings when the user has enabled increased verbosity.
-
--------------------------------------------------------------------------------
-                                 *misc-integration-between-vim-its-environment*
-Integration between Vim and its environment ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#open#file()* function
-
-Given a pathname or URL as the first argument, this opens the file with the
-program associated with the file type. So for example a text file might open in
-Vim, an '*.html' file would probably open in your web browser and a media file
-would open in a media player.
-
-This should work on Windows, Mac OS X and most Linux distributions. If this
-fails to find a file association, you can pass one or more external commands to
-try as additional arguments. For example:
->
-  :call xolox#misc#open#file('/path/to/my/file', 'firefox', 'google-chrome')
-<
-This generally shouldn't be necessary but it might come in handy now and then.
-
--------------------------------------------------------------------------------
-The *xolox#misc#open#url()* function
-
-Given a URL as the first argument, this opens the URL in your preferred or best
-available web browser:
-
-- In GUI environments a graphical web browser will open (or a new tab will be
-  created in an existing window)
-
-- In console Vim without a GUI environment, when you have any of 'lynx',
-  'links' or 'w3m' installed it will launch a command line web browser in
-  front of Vim (temporarily suspending Vim)
-
--------------------------------------------------------------------------------
-                                             *misc-vim-plug-in-option-handling*
-Vim and plug-in option handling ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#option#get()* function
-
-Expects one or two arguments: 1. The name of a variable and 2. the default
-value if the variable does not exist.
-
-Returns the value of the variable from a buffer local variable, global variable
-or the default value, depending on which is defined.
-
-This is used by some of my Vim plug-ins for option handling, so that users can
-customize options for specific buffers.
-
--------------------------------------------------------------------------------
-The *xolox#misc#option#split()* function
-
-Given a multi-value Vim option like |'runtimepath'| this returns a list of
-strings. For example:
->
-  :echo xolox#misc#option#split(&runtimepath)
-  ['/home/peter/Projects/Vim/misc',
-   '/home/peter/Projects/Vim/colorscheme-switcher',
-   '/home/peter/Projects/Vim/easytags',
-   ...]
-<
--------------------------------------------------------------------------------
-The *xolox#misc#option#join()* function
-
-Given a list of strings like the ones returned by |xolox#misc#option#split()|,
-this joins the strings together into a single value that can be used to set a
-Vim option.
-
--------------------------------------------------------------------------------
-The *xolox#misc#option#split_tags()* function
-
-Customized version of |xolox#misc#option#split()| with specialized handling for
-Vim's |'tags'| option.
-
--------------------------------------------------------------------------------
-The *xolox#misc#option#join_tags()* function
-
-Customized version of |xolox#misc#option#join()| with specialized handling for
-Vim's |'tags'| option.
-
--------------------------------------------------------------------------------
-The *xolox#misc#option#eval_tags()* function
-
-Evaluate Vim's |'tags'| option without looking at the file system, i.e. this
-will report tags files that don't exist yet. Expects the value of the |'tags'|
-option as the first argument. If the optional second argument is 1 (true) only
-the first match is returned, otherwise (so by default) a list with all matches
-is returned.
-
--------------------------------------------------------------------------------
-                                             *misc-operating-system-interfaces*
-Operating system interfaces ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#os#is_mac()* function
-
-Returns 1 (true) when on Mac OS X, 0 (false) otherwise. You would expect this
-to simply check the Vim feature list, but for some obscure reason the
-'/usr/bin/vim' included in Mac OS X (verified on version 10.7.5) returns 0
-(false) in response to "has('mac')", so we check the output of 'uname' to avoid
-false negatives.
-
--------------------------------------------------------------------------------
-The *xolox#misc#os#is_win()* function
-
-Returns 1 (true) when on Microsoft Windows, 0 (false) otherwise.
-
--------------------------------------------------------------------------------
-The *xolox#misc#os#find_vim()* function
-
-Returns the program name of Vim as a string. On Windows and UNIX this just
-|v:progname| as an absolute pathname while on Mac OS X there is some special
-magic to find MacVim's executable even though it's usually not on the
-executable search path. If you want, you can override the value returned from
-this function by setting the global variable 'g:xolox#misc#os#vim_progname'.
-
-By default the choice of console Vim vs graphical Vim is made based on the
-value of |v:progname|, but if you have a preference you can pass the string
-'vim' or 'gvim' as the first and only argument.
-
--------------------------------------------------------------------------------
-The *xolox#misc#os#exec()* function
-
-Execute an external command (hiding the console on Microsoft Windows when my
-vim-shell plug-in [11] is installed).
-
-Expects a dictionary with the following key/value pairs as the first argument:
-
-- **command** (required): The command line to execute
-
-- **async** (optional): set this to 1 (true) to execute the command in the
-  background (asynchronously)
-
-- **stdin** (optional): a string or list of strings with the input for the
-  external command
-
-- **check** (optional): set this to 0 (false) to disable checking of the exit
-  code of the external command (by default an exception will be raised when
-  the command fails)
-
-Returns a dictionary with one or more of the following key/value pairs:
-
-- **command** (always available): the generated command line that was used to
-  run the external command
-
-- **exit_code** (only in synchronous mode): the exit status of the external
-  command (an integer, zero on success)
-
-- **stdout** (only in synchronous mode): the output of the command on the
-  standard output stream (a list of strings, one for each line)
-
-- **stderr** (only in synchronous mode): the output of the command on the
-  standard error stream (as a list of strings, one for each line)
-
--------------------------------------------------------------------------------
-The *xolox#misc#os#can_use_dll()* function
-
-If a) we're on Microsoft Windows, b) the vim-shell plug-in is installed and c)
-the compiled DLL included in vim-shell works, we can use the vim-shell plug-in
-to execute external commands! Returns 1 (true) if we can use the DLL, 0 (false)
-otherwise.
-
--------------------------------------------------------------------------------
-                                         *misc-pathname-manipulation-functions*
-Pathname manipulation functions ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#which()* function
-
-Scan the executable search path ('$PATH') for one or more external programs.
-Expects one or more string arguments with program names. Returns a list with
-the absolute pathnames of all found programs. Here's an example:
->
-  :echo xolox#misc#path#which('gvim', 'vim')
-  ['/usr/local/bin/gvim',
-   '/usr/bin/gvim',
-   '/usr/local/bin/vim',
-   '/usr/bin/vim']
-<
--------------------------------------------------------------------------------
-The *xolox#misc#path#split()* function
-
-Split a pathname (the first and only argument) into a list of pathname
-components.
-
-On Windows, pathnames starting with two slashes or backslashes are UNC paths
-where the leading slashes are significant... In this case we split like this:
-
-- Input: "'//server/share/directory'"
-- Result: "['//server', 'share', 'directory']"
-
-Everything except Windows is treated like UNIX until someone has a better
-suggestion :-). In this case we split like this:
-
-- Input: "'/foo/bar/baz'"
-- Result: "['/', 'foo', 'bar', 'baz']"
-
-To join a list of pathname components back into a single pathname string, use
-the |xolox#misc#path#join()| function.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#join()* function
-
-Join a list of pathname components (the first and only argument) into a single
-pathname string. This is the counterpart to the |xolox#misc#path#split()|
-function and it expects a list of pathname components as returned by
-|xolox#misc#path#split()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#directory_separator()* function
-
-Find the preferred directory separator for the platform and settings.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#absolute()* function
-
-Canonicalize and resolve a pathname, _regardless of whether it exists_. This is
-intended to support string comparison to determine whether two pathnames point
-to the same directory or file.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#relative()* function
-
-Make an absolute pathname (the first argument) relative to a directory (the
-second argument).
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#merge()* function
-
-Join a directory pathname and filename into a single pathname.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#commonprefix()* function
-
-Find the common prefix of path components in a list of pathnames.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#starts_with()* function
-
-Check whether the first pathname starts with the second pathname (expected to
-be a directory). This does not perform a regular string comparison; first it
-normalizes both pathnames, then it splits them into their pathname segments and
-then it compares the segments.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#encode()* function
-
-Encode a pathname so it can be used as a filename. This uses URL encoding to
-encode special characters.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#decode()* function
-
-Decode a pathname previously encoded with |xolox#misc#path#encode()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#is_relative()* function
-
-Returns true (1) when the pathname given as the first argument is relative,
-false (0) otherwise.
-
--------------------------------------------------------------------------------
-The *xolox#misc#path#tempdir()* function
-
-Create a temporary directory and return the pathname of the directory.
-
--------------------------------------------------------------------------------
-                                   *misc-manipulation-of-unix-file-permissions*
-Manipulation of UNIX file permissions ~
-
-Vim's |writefile()| function cannot set file permissions for newly created
-files and although Vim script has a function to get file permissions (see
-|getfperm()|) there is no equivalent for changing a file's permissions.
-
-This omission breaks the otherwise very useful idiom of updating a file by
-writing its new contents to a temporary file and then renaming the temporary
-file into place (which is as close as you're going to get to atomically
-updating a file's contents on UNIX) because the file's permissions will not be
-preserved!
-
-**Here's a practical example:** My vim-easytags [4] plug-in writes tags file
-updates to a temporary file and renames the temporary file into place. When I
-use 'sudo -s' on Ubuntu Linux it preserves my environment variables so my
-'~/.vimrc' and the vim-easytags [4] plug-in are still loaded. Now when a tags
-file is written the file becomes owned by root (my effective user id in the
-'sudo' session). Once I leave the 'sudo' session I can no longer update my tags
-file because it's now owned by root … ಠ_ಠ
-
--------------------------------------------------------------------------------
-The *xolox#misc#perm#update()* function
-
-Atomically update a file's contents while preserving the owner, group and mode.
-The first argument is the pathname of the file to update (a string). The second
-argument is the list of lines to be written to the file. Writes the new
-contents to a temporary file and renames the temporary file into place, thereby
-preventing readers from reading a partially written file. Returns 1 if the file
-is successfully updated, 0 otherwise.
-
-Note that if |xolox#misc#perm#get()| and |xolox#misc#perm#set()| cannot be used
-to preserve the file owner/group/mode the file is still updated using a rename
-(for compatibility with non-UNIX systems and incompatible '/usr/bin/stat'
-implementations) so in that case you can still lose the file's
-owner/group/mode.
-
--------------------------------------------------------------------------------
-The *xolox#misc#perm#get()* function
-
-Get the owner, group and permissions of the pathname given as the first
-argument. Returns an opaque value which you can later pass to
-|xolox#misc#perm#set()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#perm#set()* function
-
-Set the permissions (the second argument) of the pathname given as the first
-argument. Expects a permissions value created by |xolox#misc#perm#get()|.
-
--------------------------------------------------------------------------------
-                                 *misc-persist-recall-vim-values-from-to-files*
-Persist/recall Vim values from/to files ~
-
-Vim's |string()| function can be used to serialize Vim script values like
-numbers, strings, lists, dictionaries and composites of them to a string which
-can later be evaluated using the |eval()| function to turn it back into the
-original value. This Vim script provides functions to use these functions to
-persist and recall Vim values from/to files. This is very useful for
-communication between (possibly concurrent) Vim processes.
-
--------------------------------------------------------------------------------
-The *xolox#misc#persist#load()* function
-
-Read a Vim value like a number, string, list or dictionary from a file using
-|readfile()| and |eval()|. The first argument is the filename of the file to
-read (a string). The optional second argument specifies the default value which
-is returned when the file can't be loaded. This function returns the loaded
-value or the default value (which itself defaults to the integer 0).
-
--------------------------------------------------------------------------------
-The *xolox#misc#persist#save()* function
-
-Write a Vim value like a number, string, list or dictionary to a file using
-|string()| and |writefile()|. The first argument is the filename of the file to
-write (a string) and the second argument is the value to write (any value).
-
-This function writes the serialized value to an intermediate file which is then
-renamed into place atomically. This avoids issues with concurrent processes
-where for example a producer has written a partial file which is read by a
-consumer before the file is complete. In this case the consumer would read a
-corrupt value. The rename trick avoids this problem.
-
--------------------------------------------------------------------------------
-                                                         *misc-string-handling*
-String handling ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#slug()* function
-
-Convert a string to a "slug" - something that can be safely used in filenames
-and URLs without worrying about quoting/escaping of special characters.
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#ucfirst()* function
-
-Uppercase the first character in a string (the first argument).
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#unescape()* function
-
-Remove back slash escapes from a string (the first argument).
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#compact()* function
-
-Compact whitespace in a string (the first argument).
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#trim()* function
-
-Trim all whitespace from the start and end of a string (the first argument).
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#indent()* function
-
-Indent all lines in a multi-line string (the first argument) with a specific
-number of _space characters_ (the second argument, an integer).
-
--------------------------------------------------------------------------------
-The *xolox#misc#str#dedent()* function
-
-Remove common whitespace from a multi line string.
-
--------------------------------------------------------------------------------
-                             *misc-test-runner-infrastructure-for-vim-plug-ins*
-Test runner & infrastructure for Vim plug-ins ~
-
-The Vim auto-load script 'autoload/xolox/misc/test.vim' contains infrastructure
-that can be used to run an automated Vim plug-in test suite. It provides a
-framework for running test functions, keeping track of the test status, making
-assertions and reporting test results to the user.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#reset()* function
-
-Reset counters for executed tests and passed/failed assertions.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#summarize()* function
-
-Print a summary of test results, to be interpreted interactively.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#wrap()* function
-
-Call a function in a try/catch block and prevent exceptions from bubbling. The
-name of the function should be passed as the first and only argument; it should
-be a string containing the name of a Vim auto-load function.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#passed()* function
-
-Record a test which succeeded.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#failed()* function
-
-Record a test which failed.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#assert_true()* function
-
-Check whether an expression is true.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#assert_equals()* function
-
-Check whether two values are the same.
-
--------------------------------------------------------------------------------
-The *xolox#misc#test#assert_same_type()* function
-
-Check whether two values are of the same type.
-
--------------------------------------------------------------------------------
-                                          *tests-for-miscellaneous-vim-scripts*
-Tests for the miscellaneous Vim scripts ~
-
-The Vim auto-load script 'autoload/xolox/misc/tests.vim' contains the automated
-test suite of the miscellaneous Vim scripts. Right now the coverage is not very
-high yet, but this will improve over time.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#run()* function
-
-Run the automated test suite of the miscellaneous Vim scripts. To be used
-interactively. Intended to be safe to execute irrespective of context.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#pattern_escaping()* function
-
-Test escaping of regular expression patterns with
-|xolox#misc#escape#pattern()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#substitute_escaping()* function
-
-Test escaping of substitution strings with |xolox#misc#escape#substitute()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#shell_escaping()* function
-
-Test escaping of shell arguments with |xolox#misc#escape#shell()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#making_a_list_unique()* function
-
-Test removing of duplicate values from lists with |xolox#misc#list#unique()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#binary_insertion()* function
-
-Test the binary insertion algorithm implemented in |xolox#misc#list#binsert()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#getting_configuration_options()* function
-
-Test getting of scoped plug-in configuration "options" with
-|xolox#misc#option#get()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#splitting_of_multi_valued_options()* function
-
-Test splitting of multi-valued Vim options with |xolox#misc#option#split()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#joining_of_multi_valued_options()* function
-
-Test joining of multi-valued Vim options with |xolox#misc#option#join()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#finding_vim_on_the_search_path()* function
-
-Test looking up Vim's executable on the search path using |v:progname| with
-|xolox#misc#os#find_vim()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#synchronous_command_execution()* function
-
-Test basic functionality of synchronous command execution with
-|xolox#misc#os#exec()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#synchronous_command_execution_with_stderr()* function
-
-Test basic functionality of synchronous command execution with
-|xolox#misc#os#exec()| including the standard error stream (not available on
-Windows when vim-shell is not installed).
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#synchronous_command_execution_with_raising_of_errors()*
-function
-
-Test raising of errors during synchronous command execution with
-|xolox#misc#os#exec()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#synchronous_command_execution_without_raising_errors()*
-function
-
-Test synchronous command execution without raising of errors with
-|xolox#misc#os#exec()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#asynchronous_command_execution()* function
-
-Test the basic functionality of asynchronous command execution with
-|xolox#misc#os#exec()|. This runs the external command 'mkdir' and tests that
-the side effect of creating the directory takes place. This might seem like a
-peculiar choice, but it's one of the few 100% portable commands (Windows +
-UNIX) that doesn't involve input/output streams.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#string_case_transformation()* function
-
-Test string case transformation with |xolox#misc#str#ucfirst()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#string_whitespace_compaction()* function
-
-Test compaction of whitespace in strings with |xolox#misc#str#compact()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#string_whitespace_trimming()* function
-
-Test trimming of whitespace in strings with |xolox#misc#str#trim()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#multiline_string_dedent()* function
-
-Test dedenting of multi-line strings with |xolox#misc#str#dedent()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#version_string_parsing()* function
-
-Test parsing of version strings with |xolox#misc#version#parse()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#tests#version_string_comparison()* function
-
-Test comparison of version strings with |xolox#misc#version#at_least()|.
-
--------------------------------------------------------------------------------
-                                        *misc-timing-of-long-during-operations*
-Timing of long during operations ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#timer#resumable()* function
-
-Create a resumable timer object. This returns an object (a dictionary with
-functions) with the following "methods":
-
-- 'start()' instructs the timer object to start counting elapsed time (when a
-  timer object is created it is not automatically started).
-
-- 'stop()' instructs the timer object to stop counting elapsed time. This
-  adds the time elapsed since 'start()' was last called to the total elapsed
-  time. This method will raise an error if called out of sequence.
-
-- 'format()' takes the total elapsed time and reports it as a string
-  containing a formatted floating point number.
-
-Timer objects are meant to accurately time short running operations so they're
-dependent on Vim's |reltime()| and |reltimestr()| functions. In order to make
-it possible to use timer objects in my Vim plug-ins unconditionally there's a
-fall back to |localtime()| when |reltime()| is not available. In this mode the
-timer objects are not very useful but at least they shouldn't raise errors.
-
--------------------------------------------------------------------------------
-The *xolox#misc#timer#start()* function
-
-Start a timer. This returns a list which can later be passed to
-|xolox#misc#timer#stop()|.
-
--------------------------------------------------------------------------------
-The *xolox#misc#timer#stop()* function
-
-Show a formatted debugging message to the user, if the user has enabled
-increased verbosity by setting Vim's |'verbose'| option to one (1) or higher.
-
-This function has the same argument handling as Vim's |printf()| function with
-one difference: At the point where you want the elapsed time to be embedded,
-you write '%s' and you pass the list returned by |xolox#misc#timer#start()| as
-an argument.
-
--------------------------------------------------------------------------------
-The *xolox#misc#timer#force()* function
-
-Show a formatted message to the user. This function has the same argument
-handling as Vim's |printf()| function with one difference: At the point where
-you want the elapsed time to be embedded, you write '%s' and you pass the list
-returned by |xolox#misc#timer#start()| as an argument.
-
--------------------------------------------------------------------------------
-The *xolox#misc#timer#convert()* function
-
-Convert the value returned by |xolox#misc#timer#start()| to a string
-representation of the elapsed time since |xolox#misc#timer#start()| was called.
-Other values are returned unmodified (this allows using it with Vim's |map()|
-function).
-
--------------------------------------------------------------------------------
-                                                 *misc-version-string-handling*
-Version string handling ~
-
--------------------------------------------------------------------------------
-The *xolox#misc#version#parse()* function
-
-Convert a version string to a list of integers.
-
--------------------------------------------------------------------------------
-The *xolox#misc#version#at_least()* function
-
-Check whether the second version string is equal to or greater than the first
-version string. Returns 1 (true) when it is, 0 (false) otherwise.
-
-===============================================================================
-                                                                 *misc-contact*
-Contact ~
-
-If you have questions, bug reports, suggestions, etc. please open an issue or
-pull request on GitHub [12]. Download links and documentation can be found on
-the plug-in's homepage [13]. If you like the script please vote for it on Vim
-Online [14].
-
-===============================================================================
-                                                                 *misc-license*
-License ~
-
-This software is licensed under the MIT license [15]. © 2015 Peter Odding
-<peter@peterodding.com>.
-
-===============================================================================
-                                                              *misc-references*
-References ~
-
-[1] http://peterodding.com/code/vim/
-[2] https://github.com/xolox/vim-misc/blob/master/INSTALL.md
-[3] http://peterodding.com/code/vim/tools/
-[4] http://peterodding.com/code/vim/easytags/
-[5] http://peterodding.com/code/vim/misc/
-[6] http://peterodding.com/code/vim/notes/
-[7] http://peterodding.com/code/vim/notes/#recentnotes_command
-[8] http://peterodding.com/code/vim/notes/#showtaggednotes_command
-[9] http://peterodding.com/code/vim/session/
-[10] https://github.com/xolox/vim-misc/pull/16
-[11] http://peterodding.com/code/vim/shell/
-[12] http://github.com/xolox/vim-misc
-[13] http://peterodding.com/code/vim/misc
-[14] http://www.vim.org/scripts/script.php?script_id=4597
-[15] http://en.wikipedia.org/wiki/MIT_License
-
-vim: ft=help
diff --git a/bundle/misc/plugin/xolox/misc.vim b/bundle/misc/plugin/xolox/misc.vim
deleted file mode 100755
index af65d55..0000000
--- a/bundle/misc/plugin/xolox/misc.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Vim plug-in
-" Author: Peter Odding <peter@peterodding.com>
-" Last Change: June 21, 2014
-" URL: http://peterodding.com/code/vim/misc/
-
-" Don't source the plug-in when it's already been loaded or &compatible is set.
-if &cp || exists('g:loaded_xolox_misc')
-  finish
-endif
-
-" Automatic commands used by the vim-misc plug-in.
-augroup PluginXoloxMisc
-  autocmd! CursorHold,CursorHoldI * call xolox#misc#cursorhold#autocmd()
-augroup END
-
-" Make sure the plug-in is only loaded once.
-let g:loaded_xolox_misc = 1
-
-" vim: ts=2 sw=2 et
diff --git a/bundle/nerdcommenter/doc/NERD_commenter.txt b/bundle/nerdcommenter/doc/NERD_commenter.txt
deleted file mode 100644
index 5309f61..0000000
--- a/bundle/nerdcommenter/doc/NERD_commenter.txt
+++ /dev/null
@@ -1,988 +0,0 @@
-*NERD_commenter.txt*         Plugin for commenting code
-
-
-                        NERD COMMENTER REFERENCE MANUAL~
-
-
-
-
-
-==============================================================================
-CONTENTS                                               *NERDCommenterContents*
-
-    1.Intro...................................|NERDCommenter|
-    2.Installation............................|NERDComInstallation|
-    3.Functionality provided..................|NERDComFunctionality|
-        3.1 Functionality Summary.............|NERDComFunctionalitySummary|
-        3.2 Functionality Details.............|NERDComFunctionalityDetails|
-            3.2.1 Comment map.................|NERDComComment|
-            3.2.2 Nested comment map..........|NERDComNestedComment|
-            3.2.3 Toggle comment map..........|NERDComToggleComment|
-            3.2.4 Minimal comment map.........|NERDComMinimalComment|
-            3.2.5 Invert comment map..........|NERDComInvertComment|
-            3.2.6 Sexy comment map............|NERDComSexyComment|
-            3.2.7 Yank comment map............|NERDComYankComment|
-            3.2.8 Comment to EOL map..........|NERDComEOLComment|
-            3.2.9 Append com to line map......|NERDComAppendComment|
-            3.2.10 Insert comment map.........|NERDComInsertComment|
-            3.2.11 Use alternate delims map...|NERDComAltDelim|
-            3.2.12 Comment aligned maps.......|NERDComAlignedComment|
-            3.2.13 Uncomment line map.........|NERDComUncommentLine|
-        3.4 Sexy Comments.....................|NERDComSexyComments|
-        3.5 The NERDComment function..........|NERDComNERDComment|
-    4.Options.................................|NERDComOptions|
-        4.1 Options summary...................|NERDComOptionsSummary|
-        4.2 Options details...................|NERDComOptionsDetails|
-        4.3 Default delimiter Options.........|NERDComDefaultDelims|
-    5. Customising key mappings...............|NERDComMappings|
-    6. Issues with the script.................|NERDComIssues|
-        6.1 Delimiter detection heuristics....|NERDComHeuristics|
-        6.2 Nesting issues....................|NERDComNesting|
-    7.About..     ............................|NERDComAbout|
-    8.Changelog...............................|NERDComChangelog|
-    9.Credits.................................|NERDComCredits|
-    10.License................................|NERDComLicense|
-
-==============================================================================
-1. Intro                                                       *NERDCommenter*
-
-The NERD commenter provides many different commenting operations and styles
-which are invoked via key mappings and a menu. These operations are available
-for most filetypes.
-
-There are also options that allow to tweak the commenting engine to your
-taste.
-
-==============================================================================
-2. Installation                                          *NERDComInstallation*
-
-The NERD Commenter requires Vim 7 or higher.
-
-Extract the plugin files in your ~/.vim (*nix) or ~/vimfiles (Windows). You
-should have 2 files: >
-    plugin/NERD_commenter.vim
-    doc/NERD_commenter.txt
-<
-Next, to finish installing the help file run: >
-    :helptags ~/.vim/doc
-<
-See |add-local-help| for more details.
-
-Make sure that you have filetype plugins enabled, as the script makes use of
-|'commentstring'| where possible (which is usually set in a filetype plugin).
-See |filetype-plugin-on| for details, but basically, stick this in your vimrc >
-    filetype plugin on
-<
-
-==============================================================================
-3. Functionality provided                               *NERDComFunctionality*
-
-------------------------------------------------------------------------------
-3.1 Functionality summary                        *NERDComFunctionalitySummary*
-
-The following key mappings are provided by default (there is also a menu
-with items corresponding to all the mappings below):
-
-[count]<leader>cc |NERDComComment|
-Comment out the current line or text selected in visual mode.
-
-
-[count]<leader>cn |NERDComNestedComment|
-Same as <leader>cc but forces nesting.
-
-
-[count]<leader>c<space> |NERDComToggleComment|
-Toggles the comment state of the selected line(s). If the topmost selected
-line is commented, all selected lines are uncommented and vice versa.
-
-
-[count]<leader>cm |NERDComMinimalComment|
-Comments the given lines using only one set of multipart delimiters.
-
-
-[count]<leader>ci |NERDComInvertComment|
-Toggles the comment state of the selected line(s) individually.
-
-
-[count]<leader>cs |NERDComSexyComment|
-Comments out the selected lines ``sexily''
-
-
-[count]<leader>cy |NERDComYankComment|
-Same as <leader>cc except that the commented line(s) are yanked first.
-
-
-<leader>c$ |NERDComEOLComment|
-Comments the current line from the cursor to the end of line.
-
-
-<leader>cA |NERDComAppendComment|
-Adds comment delimiters to the end of line and goes into insert mode between
-them.
-
-
-|NERDComInsertComment|
-Adds comment delimiters at the current cursor position and inserts between.
-Disabled by default.
-
-
-<leader>ca |NERDComAltDelim|
-Switches to the alternative set of delimiters.
-
-
-[count]<leader>cl
-[count]<leader>cb    |NERDComAlignedComment|
-Same as |NERDComComment| except that the delimiters are aligned down the
-left side (<leader>cl) or both sides (<leader>cb).
-
-
-[count]<leader>cu |NERDComUncommentLine|
-Uncomments the selected line(s).
-
-------------------------------------------------------------------------------
-3.2 Functionality details                        *NERDComFunctionalityDetails*
-
-------------------------------------------------------------------------------
-3.2.1 Comment map                                             *NERDComComment*
-
-Default mapping: [count]<leader>cc
-Mapped to: <plug>NERDCommenterComment
-Applicable modes: normal visual visual-line visual-block.
-
-
-Comments out the current line. If multiple lines are selected in visual-line
-mode, they are all commented out.  If some text is selected in visual or
-visual-block mode then the script will try to comment out the exact text that
-is selected using multi-part delimiters if they are available.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-------------------------------------------------------------------------------
-3.2.2 Nested comment map                                *NERDComNestedComment*
-
-Default mapping: [count]<leader>cn
-Mapped to: <plug>NERDCommenterNest
-Applicable modes: normal visual visual-line visual-block.
-
-Performs nested commenting.  Works the same as <leader>cc except that if a line
-is already commented then it will be commented again.
-
-If |'NERDUsePlaceHolders'| is set then the previous comment delimiters will
-be replaced by place-holder delimiters if needed.  Otherwise the nested
-comment will only be added if the current commenting delimiters have no right
-delimiter (to avoid syntax errors)
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-Related options:
-|'NERDDefaultNesting'|
-
-------------------------------------------------------------------------------
-3.2.3 Toggle comment map                                *NERDComToggleComment*
-
-Default mapping: [count]<leader>c<space>
-Mapped to: <plug>NERDCommenterToggle
-Applicable modes: normal visual-line.
-
-Toggles commenting of the lines selected. The behaviour of this mapping
-depends on whether the first line selected is commented or not.  If so, all
-selected lines are uncommented and vice versa.
-
-With this mapping, a line is only considered to be commented if it starts with
-a left delimiter.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-------------------------------------------------------------------------------
-3.2.4 Minimal comment map                              *NERDComMinimalComment*
-
-Default mapping: [count]<leader>cm
-Mapped to: <plug>NERDCommenterMinimal
-Applicable modes: normal visual-line.
-
-Comments the selected lines using one set of multipart delimiters if possible.
-
-For example: if you are programming in c and you select 5 lines and press
-<leader>cm then a '/*' will be placed at the start of the top line and a '*/'
-will be placed at the end of the last line.
-
-Sets of multipart comment delimiters that are between the top and bottom
-selected lines are replaced with place holders (see |'NERDLPlace'|) if
-|'NERDUsePlaceHolders'| is set for the current filetype. If it is not, then
-the comment will be aborted if place holders are required to prevent illegal
-syntax.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-------------------------------------------------------------------------------
-3.2.5 Invert comment map                                *NERDComInvertComment*
-
-Default mapping: <leader>ci
-Mapped to: <plug>NERDCommenterInvert
-Applicable modes: normal visual-line.
-
-Inverts the commented state of each selected line. If the a selected line is
-commented then it is uncommented and vice versa. Each line is examined and
-commented/uncommented individually.
-
-With this mapping, a line is only considered to be commented if it starts with
-a left delimiter.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-------------------------------------------------------------------------------
-3.2.6 Sexy comment map                                    *NERDComSexyComment*
-
-Default mapping: [count]<leader>cs
-Mapped to: <plug>NERDCommenterSexy
-Applicable modes: normal, visual-line.
-
-Comments the selected line(s) ``sexily''... see |NERDComSexyComments| for
-a description of what sexy comments are. Can only be done on filetypes for
-which there is at least one set of multipart comment delimiters specified.
-
-Sexy comments cannot be nested and lines inside a sexy comment cannot be
-commented again.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-Related options:
-|'NERDCompactSexyComs'|
-
-------------------------------------------------------------------------------
-3.2.7 Yank comment map                                    *NERDComYankComment*
-
-Default mapping: [count]<leader>cy
-Mapped to: <plug>NERDCommenterYank
-Applicable modes: normal visual visual-line visual-block.
-
-Same as <leader>cc except that it yanks the line(s) that are commented first.
-
-------------------------------------------------------------------------------
-3.2.8 Comment to EOL map                                   *NERDComEOLComment*
-
-Default mapping: <leader>c$
-Mapped to: <plug>NERDCommenterToEOL
-Applicable modes: normal.
-
-Comments the current line from the current cursor position up to the end of
-the line.
-
-------------------------------------------------------------------------------
-3.2.9 Append com to line map                            *NERDComAppendComment*
-
-Default mapping: <leader>cA
-Mapped to: <plug>NERDCommenterAppend
-Applicable modes: normal.
-
-Appends comment delimiters to the end of the current line and goes
-to insert mode between the new delimiters.
-
-------------------------------------------------------------------------------
-3.2.10 Insert comment map                               *NERDComInsertComment*
-
-Default mapping: disabled by default.
-Map it to: <plug>NERDCommenterInInsert
-Applicable modes: insert.
-
-Adds comment delimiters at the current cursor position and inserts
-between them.
-
-NOTE: prior to version 2.1.17 this was mapped to ctrl-c. To restore this
-mapping add >
-    let NERDComInsertMap='<c-c>'
-<
-to your vimrc.
-
-------------------------------------------------------------------------------
-3.2.11 Use alternate delims map                              *NERDComAltDelim*
-
-Default mapping: <leader>ca
-Mapped to: <plug>NERDCommenterAltDelims
-Applicable modes: normal.
-
-Changes to the alternative commenting style if one is available. For example,
-if the user is editing a c++ file using // comments and they hit <leader>ca
-then they will be switched over to /**/ comments.
-
-See also |NERDComDefaultDelims|
-
-------------------------------------------------------------------------------
-3.2.12 Comment aligned maps                            *NERDComAlignedComment*
-
-Default mappings: [count]<leader>cl   [count]<leader>cb
-Mapped to: <plug>NERDCommenterAlignLeft
-           <plug>NERDCommenterAlignBoth
-Applicable modes: normal visual-line.
-
-Same as <leader>cc except that the comment delimiters are aligned on the left
-side or both sides respectively. These comments are always nested if the
-line(s) are already commented.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-------------------------------------------------------------------------------
-3.2.13 Uncomment line map                               *NERDComUncommentLine*
-
-Default mapping: [count]<leader>cu
-Mapped to: <plug>NERDCommenterUncomment
-Applicable modes: normal visual visual-line visual-block.
-
-Uncomments the current line. If multiple lines are selected in
-visual mode then they are all uncommented.
-
-When uncommenting, if the line contains multiple sets of delimiters then the
-``outtermost'' pair of delimiters will be removed.
-
-The script uses a set of heurisics to distinguish ``real'' delimiters from
-``fake'' ones when uncommenting. See |NERDComIssues| for details.
-
-If a [count] is given in normal mode, the mapping works as though that many
-lines were selected in visual-line mode.
-
-Related  options:
-|'NERDRemoveAltComs'|
-|'NERDRemoveExtraSpaces'|
-
-------------------------------------------------------------------------------
-3.3 Sexy Comments                                        *NERDComSexyComments*
-These are comments that use one set of multipart comment delimiters as well as
-one other marker symbol. For example: >
-    /*
-     * This is a c style sexy comment
-     * So there!
-     */
-
-    /* This is a c style sexy comment
-     * So there!
-     * But this one is ``compact'' style */
-<
-Here the multipart delimiters are /* and */ and the marker is *.
-
-------------------------------------------------------------------------------
-3.4 The NERDComment function                             *NERDComNERDComment*
-
-All of the NERD commenter mappings and menu items invoke a single function
-which delegates the commenting work to other functions. This function is
-public and has the prototype: >
-    function! NERDComment(isVisual, type)
-<
-The arguments to this function are simple:
-    - isVisual: if you wish to do any kind of visual comment then set this to
-      1 and the function will use the '< and '> marks to find the comment
-      boundries. If set to 0 then the function will operate on the current
-      line.
-    - type: is used to specify what type of commenting operation is to be
-      performed, and it can be one of the following: "sexy", "invert",
-      "minimal", "toggle", "alignLeft", "alignBoth", "norm", "nested",
-      "toEOL", "append", "insert", "uncomment", "yank"
-
-For example, if you typed >
-    :call NERDComment(1, 'sexy')
-<
-then the script would do a sexy comment on the last visual selection.
-
-
-==============================================================================
-4. Options                                                    *NERDComOptions*
-
-------------------------------------------------------------------------------
-4.1 Options summary                                    *NERDComOptionsSummary*
-
-|'loaded_nerd_comments'|              Turns off the script.
-|'NERDAllowAnyVisualDelims'|          Allows multipart alternative delims to
-                                      be used when commenting in
-                                      visual/visual-block mode.
-|'NERDBlockComIgnoreEmpty'|           Forces right delims to be placed when
-                                      doing visual-block comments.
-|'NERDCommentWholeLinesInVMode'|      Changes behaviour of visual comments.
-|'NERDCreateDefaultMappings'|         Turn the default mappings on/off.
-|'NERDDefaultNesting'|                Tells the script to use nested comments
-                                      by default.
-|'NERDMenuMode'|                      Specifies how the NERD commenter menu
-                                      will appear (if at all).
-|'NERDLPlace'|                        Specifies what to use as the left
-                                      delimiter placeholder when nesting
-                                      comments.
-|'NERDUsePlaceHolders'|               Specifies which filetypes may use
-                                      placeholders when nesting comments.
-|'NERDRemoveAltComs'|                 Tells the script whether to remove
-                                      alternative comment delimiters when
-                                      uncommenting.
-|'NERDRemoveExtraSpaces'|             Tells the script to always remove the
-                                      extra spaces when uncommenting
-                                      (regardless of whether NERDSpaceDelims
-                                      is set)
-|'NERDRPlace'|                        Specifies what to use as the right
-                                      delimiter placeholder when nesting
-                                      comments.
-|'NERDSpaceDelims'|                   Specifies whether to add extra spaces
-                                      around delimiters when commenting, and
-                                      whether to remove them when
-                                      uncommenting.
-|'NERDCompactSexyComs'|               Specifies whether to use the compact
-                                      style sexy comments.
-
-------------------------------------------------------------------------------
-4.3 Options details                                    *NERDComOptionsDetails*
-
-To enable any of the below options you should put the given line in your
-~/.vimrc
-
-                                                       *'loaded_nerd_comments'*
-If this script is driving you insane you can turn it off by setting this
-option >
-    let loaded_nerd_comments=1
-<
-------------------------------------------------------------------------------
-                                                    *'NERDAllowAnyVisualDelims'*
-Values: 0 or 1.
-Default: 1.
-
-If set to 1 then, when doing a visual or visual-block comment (but not a
-visual-line comment), the script will choose the right delimiters to use for
-the comment. This means either using the current delimiters if they are
-multipart or using the alternative delimiters if THEY are multipart.  For
-example if we are editing the following java code: >
-    float foo = 1221;
-    float bar = 324;
-    System.out.println(foo * bar);
-<
-If we are using // comments and select the "foo" and "bar" in visual-block
-mode, as shown left below (where '|'s are used to represent the visual-block
-boundary), and comment it then the script will use the alternative delims as
-shown on the right: >
-
-    float |foo| = 1221;                   float /*foo*/ = 1221;
-    float |bar| = 324;                    float /*bar*/ = 324;
-    System.out.println(foo * bar);        System.out.println(foo * bar);
-<
-------------------------------------------------------------------------------
-                                                     *'NERDBlockComIgnoreEmpty'*
-Values: 0 or 1.
-Default: 1.
-
-This option  affects visual-block mode commenting. If this option is turned
-on, lines that begin outside the right boundary of the selection block will be
-ignored.
-
-For example, if you are commenting this chunk of c code in visual-block mode
-(where the '|'s are used to represent the visual-block boundary) >
-    #include <sys/types.h>
-    #include <unistd.h>
-    #include <stdio.h>
-   |int| main(){
-   |   | printf("SUCK THIS\n");
-   |   | while(1){
-   |   |     fork();
-   |   | }
-   |}  |
-<
-If NERDBlockComIgnoreEmpty=0 then this code will become: >
-    #include <sys/types.h>
-    #include <unistd.h>
-    #include <stdio.h>
-    /*int*/ main(){
-    /*   */ printf("SUCK THIS\n");
-    /*   */ while(1){
-    /*   */     fork();
-    /*   */ }
-    /*}  */
-<
-Otherwise, the code block would become: >
-    #include <sys/types.h>
-    #include <unistd.h>
-    #include <stdio.h>
-    /*int*/ main(){
-    printf("SUCK THIS\n");
-    while(1){
-        fork();
-    }
-    /*}  */
-<
-------------------------------------------------------------------------------
-                                                *'NERDCommentWholeLinesInVMode'*
-Values: 0, 1 or 2.
-Default: 0.
-
-By default the script tries to comment out exactly what is selected in visual
-mode (v). For example if you select and comment the following c code (using |
-to represent the visual boundary): >
-    in|t foo = 3;
-    int bar =| 9;
-    int baz = foo + bar;
-<
-This will result in: >
-    in/*t foo = 3;*/
-    /*int bar =*/ 9;
-    int baz = foo + bar;
-<
-But some people prefer it if the whole lines are commented like: >
-    /*int foo = 3;*/
-    /*int bar = 9;*/
-    int baz = foo + bar;
-<
-If you prefer the second option then stick this line in your vimrc: >
-    let NERDCommentWholeLinesInVMode=1
-<
-
-If the filetype you are editing only has no multipart delimiters (for example
-a shell script) and you hadnt set this option then the above would become >
-    in#t foo = 3;
-    #int bar = 9;
-<
-(where # is the comment delimiter) as this is the closest the script can
-come to commenting out exactly what was selected. If you prefer for whole
-lines to be commented out when there is no multipart delimiters but the EXACT
-text that was selected to be commented out if there IS multipart delimiters
-then stick the following line in your vimrc: >
-    let NERDCommentWholeLinesInVMode=2
-<
-
-Note that this option does not affect the behaviour of commenting in
-|visual-block| mode.
-
-------------------------------------------------------------------------------
-                                                *'NERDCreateDefaultMappings'*
-Values: 0 or 1.
-Default: 1.
-
-If set to 0, none of the default mappings will be created.
-
-See also |NERDComMappings|.
-
-------------------------------------------------------------------------------
-                                                           *'NERDRemoveAltComs'*
-Values: 0 or 1.
-Default: 1.
-
-When uncommenting a line (for a filetype with an alternative commenting style)
-this option tells the script whether to look for, and remove, comment
-delimiters of the alternative style.
-
-For example, if you are editing a c++ file using // style comments and you go
-<leader>cu on this line: >
-    /* This is a c++ comment baby! */
-<
-It will not be uncommented if the NERDRemoveAltComs is set to 0.
-
-------------------------------------------------------------------------------
-                                                       *'NERDRemoveExtraSpaces'*
-Values: 0 or 1.
-Default: 1.
-
-By default, the NERD commenter will remove spaces around comment delimiters if
-either:
-1. |'NERDSpaceDelims'| is set to 1.
-2. NERDRemoveExtraSpaces is set to 1.
-
-This means that if we have the following lines in a c code file: >
-    /* int foo = 5; */
-    /* int bar = 10; */
-    int baz = foo + bar
-<
-If either of the above conditions hold then if these lines are uncommented
-they will become: >
-    int foo = 5;
-    int bar = 10;
-    int baz = foo + bar
-<
-Otherwise they would become: >
-     int foo = 5;
-     int bar = 10;
-    int baz = foo + bar
-<
-If you want the spaces to be removed only if |'NERDSpaceDelims'| is set then
-set NERDRemoveExtraSpaces to 0.
-
-------------------------------------------------------------------------------
-                                                                  *'NERDLPlace'*
-                                                                  *'NERDRPlace'*
-Values: arbitrary string.
-Default:
-    NERDLPlace: "[>"
-    NERDRPlace: "<]"
-
-These options are used to control the strings used as place-holder delimiters.
-Place holder delimiters are used when performing nested commenting when the
-filetype supports commenting styles with both left and right delimiters.
-To set these options use lines like: >
-    let NERDLPlace="FOO"
-    let NERDRPlace="BAR"
-<
-Following the above example, if we have line of c code: >
-    /* int horse */
-<
-and we comment it with <leader>cn it will be changed to: >
-    /*FOO int horse BAR*/
-<
-When we uncomment this line it will go back to what it was.
-
-------------------------------------------------------------------------------
-                                                                *'NERDMenuMode'*
-Values: 0, 1, 2, 3.
-Default: 3
-
-This option can take 4 values:
-    "0": Turns the menu off.
-    "1": Turns the 'comment' menu on with no menu shortcut.
-    "2": Turns the 'comment 'menu on with <alt>-c as the shortcut.
-    "3": Turns the 'Plugin -> comment' menu on with <alt>-c as the shortcut.
-
-------------------------------------------------------------------------------
-                                                         *'NERDUsePlaceHolders'*
-Values: 0 or 1.
-Default 1.
-
-This option is used to specify whether place-holder delimiters should be used
-when creating a nested comment.
-
-------------------------------------------------------------------------------
-                                                             *'NERDSpaceDelims'*
-Values: 0 or 1.
-Default 0.
-
-Some people prefer a space after the left delimiter and before the right
-delimiter like this: >
-    /* int foo=2; */
-<
-as opposed to this: >
-    /*int foo=2;*/
-<
-If you want spaces to be added then set NERDSpaceDelims to 1 in your vimrc.
-
-See also |'NERDRemoveExtraSpaces'|.
-
-------------------------------------------------------------------------------
-                                                         *'NERDCompactSexyComs'*
-Values: 0 or 1.
-Default 0.
-
-Some people may want their sexy comments to be like this: >
-    /* Hi There!
-     * This is a sexy comment
-     * in c */
-<
-As opposed to like this: >
-    /*
-     * Hi There!
-     * This is a sexy comment
-     * in c
-     */
-<
-If this option is set to 1 then the top style will be used.
-
-------------------------------------------------------------------------------
-                                                          *'NERDDefaultNesting'*
-Values: 0 or 1.
-Default 1.
-
-When this option is set to 1, comments are nested automatically. That is, if
-you hit <leader>cc on a line that is already commented it will be commented
-again.
-
-------------------------------------------------------------------------------
-3.3 Default delimiter customisation                     *NERDComDefaultDelims*
-
-If you want the NERD commenter to use the alternative delimiters for a
-specific filetype by default then put a line of this form into your vimrc: >
-    let NERD_<filetype>_alt_style=1
-<
-Example: java uses // style comments by default, but you want it to default to
-/* */ style comments instead. You would put this line in your vimrc: >
-    let NERD_java_alt_style=1
-<
-
-See |NERDComAltDelim| for switching commenting styles at runtime.
-
-==============================================================================
-5. Key mapping customisation                                *NERDComMappings*
-
-To change a mapping just map another key combo to the internal <plug> mapping.
-For example, to remap the |NERDComComment| mapping to ",omg" you would put
-this line in your vimrc: >
-    map ,omg <plug>NERDCommenterComment
-<
-This will stop the corresponding default mappings from being created.
-
-See the help for the mapping in question to see which <plug> mapping to
-map to.
-
-See also |'NERDCreateDefaultMappings'|.
-
-==============================================================================
-6. Issues with the script                                      *NERDComIssues*
-
-
-------------------------------------------------------------------------------
-6.1 Delimiter detection heuristics                         *NERDComHeuristics*
-
-Heuristics are used to distinguish the real comment delimiters
-
-Because we have comment mappings that place delimiters in the middle of lines,
-removing comment delimiters is a bit tricky. This is because if comment
-delimiters appear in a line doesnt mean they really ARE delimiters. For
-example, Java uses // comments but the line >
-    System.out.println("//");
-<
-clearly contains no real comment delimiters.
-
-To distinguish between ``real'' comment delimiters and ``fake'' ones we use a
-set of heuristics. For example, one such heuristic states that any comment
-delimiter that has an odd number of non-escaped " characters both preceding
-and following it on the line is not a comment because it is probably part of a
-string. These heuristics, while usually pretty accurate, will not work for all
-cases.
-
-------------------------------------------------------------------------------
-6.2 Nesting issues                                            *NERDComNesting*
-
-If we have some line of code like this: >
-    /*int foo */ = /*5 + 9;*/
-<
-This will not be uncommented legally. The NERD commenter will remove the
-"outter most" delimiters so the line will become: >
-    int foo */ = /*5 + 9;
-<
-which almost certainly will not be what you want. Nested sets of comments will
-uncomment fine though. Eg: >
-    /*int/* foo =*/ 5 + 9;*/
-<
-will become: >
-    int/* foo =*/ 5 + 9;
-<
-(Note that in the above examples I have deliberately not used place holders
-for simplicity)
-
-==============================================================================
-7. About                                                        *NERDComAbout*
-
-The author of the NERD commenter is Martyzillatron --- the half robot, half
-dinosaur bastard son of Megatron and Godzilla. He enjoys destroying
-metropolises and eating tourist busses.
-
-Drop him a line at martin_grenfell at msn.com. He would love to hear from you.
-its a lonely life being the worlds premier terror machine. How would you feel
-if your face looked like a toaster and a t-rex put together? :(
-
-The latest stable versions can be found at
-    http://www.vim.org/scripts/script.php?script_id=1218
-
-The latest dev versions are on github
-    http://github.com/scrooloose/nerdcommenter
-
-==============================================================================
-8. Changelog                                                *NERDComChangelog*
-
-2.3.0
-    - remove all filetypes which have a &commentstring in the standard vim
-      runtime for vim > 7.0 unless the script stores an alternate set of
-      delimiters
-    - make the script complain if the user doesnt have filetype plugins enabled
-    - use <leader> instead of comma to start the default mappings
-    - fix a couple of bugs with sexy comments - thanks to Tim Smart
-    - lots of refactoring
-
-2.2.2
-    - remove the NERDShutup option and the message is suppresses, this makes
-      the plugin silently rely on &commentstring for unknown filetypes.
-    - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and
-      udevrules. Thanks to Thilo Six.
-    - match filetypes case insensitively
-    - add support for mp (metapost), thanks to Andrey Skvortsov.
-    - add support for htmlcheetah, thanks to Simon Hengel.
-    - add support for javacc, thanks to Matt Tolton.
-    - make <%# %> the default delims for eruby, thanks to tpope.
-    - add support for javascript.jquery, thanks to Ivan Devat.
-    - add support for cucumber and pdf. Fix sass and railslog delims,
-      thanks to tpope
-
-2.2.1
-    - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
-    - fix automake comments, thanks to Elias Pipping
-    - make haml comments default to -# with / as the alternative delimiter,
-      thanks to tpope
-    - add support for actionscript and processing thanks to Edwin Benavides
-    - add support for ps1 (powershell), thanks to Jason Mills
-    - add support for hostsaccess, thanks to Thomas Rowe
-    - add support for CVScommit
-    - add support for asciidoc, git and gitrebase. Thanks to Simon Ruderich.
-    - use # for gitcommit comments, thanks to Simon Ruderich.
-    - add support for mako and genshi, thanks to Keitheis.
-    - add support for conkyrc, thanks to David
-    - add support for SVNannotate, thanks to Miguel Jaque Barbero.
-    - add support for sieve, thanks to Stefan Walk
-    - add support for objj, thanks to Adam Thorsen.
-
-2.2.0
-    - rewrote the mappings system to be more "standard".
-      - removed all the mapping options. Now, mappings to <plug> mappings are
-        used
-      - see :help NERDComMappings, and :help NERDCreateDefaultMappings for
-        more info
-    - remove "prepend comments" and "right aligned comments".
-    - add support for applescript, calbire, man, SVNcommit, potwiki, txt2tags and SVNinfo.
-      Thanks to nicothakis, timberke, sgronblo, mntnoe, Bernhard Grotz, John
-      O'Shea, François and Giacomo Mariani respectively.
-    - bugfix for haskell delimiters. Thanks to mntnoe.
-2.1.18
-    - add support for llvm. Thanks to nicothakis.
-    - add support for xquery. Thanks to Phillip Kovalev.
-2.1.17
-    - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
-    - add support for mailcap. Thanks to Pascal Brueckner.
-    - add support for stata. Thanks to Jerónimo Carballo.
-    - applied a patch from ewfalor to fix an error in the help file with the
-      NERDMapleader doc
-    - disable the insert mode ctrl-c mapping by default, see :help
-      NERDComInsertComment if you wish to restore it
-
-==============================================================================
-9. Credits                                                    *NERDComCredits*
-
-Thanks to the follow people for suggestions and patches:
-
-Nick Brettell
-Matthew Hawkins
-Mathieu Clabaut
-Greg Searle
-Nguyen
-Litchi
-Jorge Scandaliaris
-Shufeng Zheng
-Martin Stubenschrott
-Markus Erlmann
-Brent Rice
-Richard Willis
-Igor Prischepoff
-Harry
-David Bourgeois
-Eike Von Seggern
-Torsten Blix
-Alexander Bosecke
-Stefano Zacchiroli
-Norick Chen
-Joseph Barker
-Gary Church
-Tim Carey-Smith
-Markus Klinik
-Anders
-Seth Mason
-James Hales
-Heptite
-Cheng Fang
-Yongwei Wu
-David Miani
-Jeremy Hinegardner
-Marco
-Ingo Karkat
-Zhang Shuhan
-tpope
-Ben Schmidt
-David Fishburn
-Erik Falor
-JaGoTerr
-Elias Pipping
-mntnoe
-Mark S.
-
-
-Thanks to the following people for sending me new filetypes to support:
-
-The hackers                         The filetypes~
-Sam R                               verilog
-Jonathan                            Derque context, plaintext and mail
-Vigil                               fetchmail
-Michael Brunner                     kconfig
-Antono Vasiljev                     netdict
-Melissa Reid                        omlet
-Ilia N Ternovich                    quickfix
-John O'Shea                         RTF, SVNcommitlog and vcscommit, SVNCommit
-Anders                              occam
-Mark Woodward                       csv
-fREW                                gentoo-package-mask,
-                                    gentoo-package-keywords,
-                                    gentoo-package-use, and vo_base
-Alexey                              verilog_systemverilog, systemverilog
-Lizendir                            fstab
-Michael Böhler                      autoit, autohotkey and docbk
-Aaron Small                         cmake
-Ramiro                              htmldjango and django
-Stefano Zacchiroli                  debcontrol, debchangelog, mkd
-Alex Tarkovsky                      ebuild and eclass
-Jorge Rodrigues                     gams
-Rainer Müller                       Objective C
-Jason Mills                         Groovy, ps1
-Normandie Azucena                   vera
-Florian Apolloner                   ldif
-David Fishburn                      lookupfile
-Niels Aan de Brugh                  rst
-Don Hatlestad                       ahk
-Christophe Benz                     Desktop and xsd
-Eyolf Østrem                        lilypond, bbx and lytex
-Ingo Karkat                         dosbatch
-Nicolas Weber                       markdown, objcpp
-tinoucas                            gentoo-conf-d
-Greg Weber                          D, haml
-Bruce Sherrod                       velocity
-timberke                            cobol, calibre
-Aaron Schaefer                      factor
-Mr X                                asterisk, mplayerconf
-Kuchma Michael                      plsql
-Brett Warneke                       spectre
-Pipp                                lhaskell
-Renald Buter                        scala
-Vladimir Lomov                      asymptote
-Marco                               mrxvtrc, aap
-nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate,
-                                    SVNdiff, gitAnnotate, gitdiff, dtrace
-                                    llvm, applescript
-Chen Xing                           Wikipedia
-Jacobo Diaz                         dakota, patran
-Li Jin                              gentoo-env-d, gentoo-init-d,
-                                    gentoo-make-conf, grub, modconf, sudoers
-SpookeyPeanut                       rib
-Greg Jandl                          pyrex/cython
-Christophe Benz                     services, gitcommit
-A Pontus                            vimperator
-Stromnov                            slice, bzr
-Martin Kustermann                   pamconf
-Indriði Einarsson                   mason
-Chris                               map
-Krzysztof A. Adamski                group
-Pascal Brueckner                    mailcap
-Jerónimo Carballo                   stata
-Phillip Kovalev                     xquery
-Bernhard Grotz                      potwiki
-sgronblo                            man
-François                            txt2tags
-Giacomo Mariani                     SVNinfo
-Matthew Lee Hinman                  newlisp, clojure
-Elias Pipping                       automake
-Edwin Benavides                     actionscript, processing
-Thomas Rowe                         hostsaccess
-Simon Ruderich                      asciidoc, git, gitcommit, gitrebase
-Keitheis                            mako, genshi
-David                               conkyrc
-Miguel Jaque Barbero                SVNannotate
-Stefan Walk                         sieve
-Adam Thorsen                        objj
-Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
-                                    udevconf, udevrules
-Andrey Skvortsov                    mp
-Simon Hengel                        htmlcheetah
-Matt Tolton                         javacc
-Ivan Devat                          javascript.jquery
-tpope                               cucumber,pdf
-==============================================================================
-10. License                                                   *NERDComLicense*
-
-The NERD commenter is released under the wtfpl.
-See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/bundle/nerdcommenter/plugin/NERD_commenter.vim b/bundle/nerdcommenter/plugin/NERD_commenter.vim
deleted file mode 100644
index ef88dd4..0000000
--- a/bundle/nerdcommenter/plugin/NERD_commenter.vim
+++ /dev/null
@@ -1,2790 +0,0 @@
-" ============================================================================
-" File:        NERD_commenter.vim
-" Description: vim global plugin that provides easy code commenting
-" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Version:     2.3.0
-" Last Change: 08th December, 2010
-" License:     This program is free software. It comes without any warranty,
-"              to the extent permitted by applicable law. You can redistribute
-"              it and/or modify it under the terms of the Do What The Fuck You
-"              Want To Public License, Version 2, as published by Sam Hocevar.
-"              See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-" ============================================================================
-
-" Section: script init stuff {{{1
-if exists("loaded_nerd_comments")
-    finish
-endif
-if v:version < 700
-    echoerr "NERDCommenter: this plugin requires vim >= 7. DOWNLOAD IT! You'll thank me later!"
-    finish
-endif
-let loaded_nerd_comments = 1
-
-" Function: s:InitVariable() function {{{2
-" This function is used to initialise a given variable to a given value. The
-" variable is only initialised if it does not exist prior
-"
-" Args:
-"   -var: the name of the var to be initialised
-"   -value: the value to initialise var to
-"
-" Returns:
-"   1 if the var is set, 0 otherwise
-function s:InitVariable(var, value)
-    if !exists(a:var)
-        exec 'let ' . a:var . ' = ' . "'" . a:value . "'"
-        return 1
-    endif
-    return 0
-endfunction
-
-" Section: space string init{{{2
-" When putting spaces after the left delim and before the right we use
-" s:spaceStr for the space char. This way we can make it add anything after
-" the left and before the right by modifying this variable
-let s:spaceStr = ' '
-let s:lenSpaceStr = strlen(s:spaceStr)
-
-" Section: variable init calls {{{2
-call s:InitVariable("g:NERDAllowAnyVisualDelims", 1)
-call s:InitVariable("g:NERDBlockComIgnoreEmpty", 0)
-call s:InitVariable("g:NERDCommentWholeLinesInVMode", 0)
-call s:InitVariable("g:NERDCompactSexyComs", 0)
-call s:InitVariable("g:NERDCreateDefaultMappings", 1)
-call s:InitVariable("g:NERDDefaultNesting", 1)
-call s:InitVariable("g:NERDMenuMode", 3)
-call s:InitVariable("g:NERDLPlace", "[>")
-call s:InitVariable("g:NERDUsePlaceHolders", 1)
-call s:InitVariable("g:NERDRemoveAltComs", 1)
-call s:InitVariable("g:NERDRemoveExtraSpaces", 1)
-call s:InitVariable("g:NERDRPlace", "<]")
-call s:InitVariable("g:NERDSpaceDelims", 0)
-call s:InitVariable("g:NERDDelimiterRequests", 1)
-
-let s:NERDFileNameEscape="[]#*$%'\" ?`!&();<>\\"
-"vf ;;dA:hcs"'A {j^f(lyi(k$p0f{a A }0f{a 'left':jdd^
-
-let s:delimiterMap = {
-    \ 'aap': { 'left': '#' },
-    \ 'abc': { 'left': '%' },
-    \ 'acedb': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'actionscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'ada': { 'left': '--', 'leftAlt': '--  ' },
-    \ 'ahdl': { 'left': '--' },
-    \ 'ahk': { 'left': ';', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'amiga': { 'left': ';' },
-    \ 'aml': { 'left': '/*' },
-    \ 'ampl': { 'left': '#' },
-    \ 'apache': { 'left': '#' },
-    \ 'apachestyle': { 'left': '#' },
-    \ 'asciidoc': { 'left': '//' },
-    \ 'applescript': { 'left': '--', 'leftAlt': '(*', 'rightAlt': '*)' },
-    \ 'asm68k': { 'left': ';' },
-    \ 'asm': { 'left': ';', 'leftAlt': '#' },
-    \ 'asn': { 'left': '--' },
-    \ 'aspvbs': { 'left': '''' },
-    \ 'asterisk': { 'left': ';' },
-    \ 'asy': { 'left': '//' },
-    \ 'atlas': { 'left': 'C', 'right': '$' },
-    \ 'autohotkey': { 'left': ';' },
-    \ 'autoit': { 'left': ';' },
-    \ 'ave': { 'left': "'" },
-    \ 'awk': { 'left': '#' },
-    \ 'basic': { 'left': "'", 'leftAlt': 'REM ' },
-    \ 'bbx': { 'left': '%' },
-    \ 'bc': { 'left': '#' },
-    \ 'bib': { 'left': '%' },
-    \ 'bindzone': { 'left': ';' },
-    \ 'bst': { 'left': '%' },
-    \ 'btm': { 'left': '::' },
-    \ 'caos': { 'left': '*' },
-    \ 'calibre': { 'left': '//' },
-    \ 'catalog': { 'left': '--', 'right': '--' },
-    \ 'c': { 'left': '/*','right': '*/', 'leftAlt': '//' },
-    \ 'cfg': { 'left': '#' },
-    \ 'cg': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'ch': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'cl': { 'left': '#' },
-    \ 'clean': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'clipper': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'clojure': { 'left': ';' },
-    \ 'cmake': { 'left': '#' },
-    \ 'conkyrc': { 'left': '#' },
-    \ 'cpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'crontab': { 'left': '#' },
-    \ 'cs': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'csp': { 'left': '--' },
-    \ 'cterm': { 'left': '*' },
-    \ 'cucumber': { 'left': '#' },
-    \ 'cvs': { 'left': 'CVS:' },
-    \ 'd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'dcl': { 'left': '$!' },
-    \ 'dakota': { 'left': '#' },
-    \ 'debcontrol': { 'left': '#' },
-    \ 'debsources': { 'left': '#' },
-    \ 'def': { 'left': ';' },
-    \ 'desktop': { 'left': '#' },
-    \ 'dhcpd': { 'left': '#' },
-    \ 'diff': { 'left': '#' },
-    \ 'django': { 'left': '<!--','right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
-    \ 'docbk': { 'left': '<!--', 'right': '-->' },
-    \ 'dns': { 'left': ';' },
-    \ 'dosbatch': { 'left': 'REM ', 'leftAlt': '::' },
-    \ 'dosini': { 'left': ';' },
-    \ 'dot': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'dracula': { 'left': ';' },
-    \ 'dsl': { 'left': ';' },
-    \ 'dtml': { 'left': '<dtml-comment>', 'right': '</dtml-comment>' },
-    \ 'dylan': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'ebuild': { 'left': '#' },
-    \ 'ecd': { 'left': '#' },
-    \ 'eclass': { 'left': '#' },
-    \ 'eiffel': { 'left': '--' },
-    \ 'elf': { 'left': "'" },
-    \ 'elmfilt': { 'left': '#' },
-    \ 'erlang': { 'left': '%' },
-    \ 'eruby': { 'left': '<%#', 'right': '%>', 'leftAlt': '<!--', 'rightAlt': '-->' },
-    \ 'expect': { 'left': '#' },
-    \ 'exports': { 'left': '#' },
-    \ 'factor': { 'left': '! ', 'leftAlt': '!# ' },
-    \ 'fgl': { 'left': '#' },
-    \ 'focexec': { 'left': '-*' },
-    \ 'form': { 'left': '*' },
-    \ 'foxpro': { 'left': '*' },
-    \ 'fstab': { 'left': '#' },
-    \ 'fvwm': { 'left': '#' },
-    \ 'fx': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'gams': { 'left': '*' },
-    \ 'gdb': { 'left': '#' },
-    \ 'gdmo': { 'left': '--' },
-    \ 'geek': { 'left': 'GEEK_COMMENT:' },
-    \ 'genshi': { 'left': '<!--','right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
-    \ 'gentoo-conf-d': { 'left': '#' },
-    \ 'gentoo-env-d': { 'left': '#' },
-    \ 'gentoo-init-d': { 'left': '#' },
-    \ 'gentoo-make-conf': { 'left': '#' },
-    \ 'gentoo-package-keywords': { 'left': '#' },
-    \ 'gentoo-package-mask': { 'left': '#' },
-    \ 'gentoo-package-use': { 'left': '#' },
-    \ 'gitcommit': { 'left': '#' },
-    \ 'gitconfig': { 'left': ';' },
-    \ 'gitrebase': { 'left': '#' },
-    \ 'gnuplot': { 'left': '#' },
-    \ 'groovy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'gsp': { 'left': '<%--', 'right': '--%>' },
-    \ 'gtkrc': { 'left': '#' },
-    \ 'haskell': { 'left': '{-','right': '-}', 'leftAlt': '--' },
-    \ 'hb': { 'left': '#' },
-    \ 'h': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'haml': { 'left': '-#', 'leftAlt': '/' },
-    \ 'hercules': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'hog': { 'left': '#' },
-    \ 'hostsaccess': { 'left': '#' },
-    \ 'htmlcheetah': { 'left': '##' },
-    \ 'htmldjango': { 'left': '<!--','right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
-    \ 'htmlos': { 'left': '#', 'right': '/#' },
-    \ 'ia64': { 'left': '#' },
-    \ 'icon': { 'left': '#' },
-    \ 'idlang': { 'left': ';' },
-    \ 'idl': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'inform': { 'left': '!' },
-    \ 'inittab': { 'left': '#' },
-    \ 'ishd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'iss': { 'left': ';' },
-    \ 'ist': { 'left': '%' },
-    \ 'java': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'javacc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'javascript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'javascript.jquery': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'jess': { 'left': ';' },
-    \ 'jgraph': { 'left': '(*', 'right': '*)' },
-    \ 'jproperties': { 'left': '#' },
-    \ 'jsp': { 'left': '<%--', 'right': '--%>' },
-    \ 'kix': { 'left': ';' },
-    \ 'kscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'lace': { 'left': '--' },
-    \ 'ldif': { 'left': '#' },
-    \ 'lilo': { 'left': '#' },
-    \ 'lilypond': { 'left': '%' },
-    \ 'liquid': { 'left': '{%', 'right': '%}' },
-    \ 'lisp': { 'left': ';', 'leftAlt': '#|', 'rightAlt': '|#' },
-    \ 'llvm': { 'left': ';' },
-    \ 'lotos': { 'left': '(*', 'right': '*)' },
-    \ 'lout': { 'left': '#' },
-    \ 'lprolog': { 'left': '%' },
-    \ 'lscript': { 'left': "'" },
-    \ 'lss': { 'left': '#' },
-    \ 'lua': { 'left': '--', 'leftAlt': '--[[', 'rightAlt': ']]' },
-    \ 'lynx': { 'left': '#' },
-    \ 'lytex': { 'left': '%' },
-    \ 'mail': { 'left': '> ' },
-    \ 'mako': { 'left': '##' },
-    \ 'man': { 'left': '."' },
-    \ 'map': { 'left': '%' },
-    \ 'maple': { 'left': '#' },
-    \ 'markdown': { 'left': '<!--', 'right': '-->' },
-    \ 'masm': { 'left': ';' },
-    \ 'mason': { 'left': '<% #', 'right': '%>' },
-    \ 'master': { 'left': '$' },
-    \ 'matlab': { 'left': '%' },
-    \ 'mel': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'mib': { 'left': '--' },
-    \ 'mkd': { 'left': '>' },
-    \ 'mma': { 'left': '(*', 'right': '*)' },
-    \ 'model': { 'left': '$', 'right': '$' },
-    \ 'moduala.': { 'left': '(*', 'right': '*)' },
-    \ 'modula2': { 'left': '(*', 'right': '*)' },
-    \ 'modula3': { 'left': '(*', 'right': '*)' },
-    \ 'monk': { 'left': ';' },
-    \ 'mush': { 'left': '#' },
-    \ 'named': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'nasm': { 'left': ';' },
-    \ 'nastran': { 'left': '$' },
-    \ 'natural': { 'left': '/*' },
-    \ 'ncf': { 'left': ';' },
-    \ 'newlisp': { 'left': ';' },
-    \ 'nroff': { 'left': '\"' },
-    \ 'nsis': { 'left': '#' },
-    \ 'ntp': { 'left': '#' },
-    \ 'objc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'objcpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'objj': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'ocaml': { 'left': '(*', 'right': '*)' },
-    \ 'occam': { 'left': '--' },
-    \ 'omlet': { 'left': '(*', 'right': '*)' },
-    \ 'omnimark': { 'left': ';' },
-    \ 'openroad': { 'left': '//' },
-    \ 'opl': { 'left': "REM" },
-    \ 'ora': { 'left': '#' },
-    \ 'ox': { 'left': '//' },
-    \ 'pascal': { 'left': '{','right': '}', 'leftAlt': '(*', 'rightAlt': '*)' },
-    \ 'patran': { 'left': '$', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'pcap': { 'left': '#' },
-    \ 'pccts': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'pdf': { 'left': '%' },
-    \ 'pfmain': { 'left': '//' },
-    \ 'php': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'pic': { 'left': ';' },
-    \ 'pike': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'pilrc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'pine': { 'left': '#' },
-    \ 'plm': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'plsql': { 'left': '--', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'po': { 'left': '#' },
-    \ 'postscr': { 'left': '%' },
-    \ 'pov': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'povini': { 'left': ';' },
-    \ 'ppd': { 'left': '%' },
-    \ 'ppwiz': { 'left': ';;' },
-    \ 'processing': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'prolog': { 'left': '%', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'ps1': { 'left': '#' },
-    \ 'psf': { 'left': '#' },
-    \ 'ptcap': { 'left': '#' },
-    \ 'python': { 'left': '#' },
-    \ 'radiance': { 'left': '#' },
-    \ 'ratpoison': { 'left': '#' },
-    \ 'r': { 'left': '#' },
-    \ 'rc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'rebol': { 'left': ';' },
-    \ 'registry': { 'left': ';' },
-    \ 'remind': { 'left': '#' },
-    \ 'resolv': { 'left': '#' },
-    \ 'rgb': { 'left': '!' },
-    \ 'rib': { 'left': '#' },
-    \ 'robots': { 'left': '#' },
-    \ 'sa': { 'left': '--' },
-    \ 'samba': { 'left': ';', 'leftAlt': '#' },
-    \ 'sass': { 'left': '//', 'leftAlt': '/*' },
-    \ 'sather': { 'left': '--' },
-    \ 'scala': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'scilab': { 'left': '//' },
-    \ 'scsh': { 'left': ';' },
-    \ 'sed': { 'left': '#' },
-    \ 'sgmldecl': { 'left': '--', 'right': '--' },
-    \ 'sgmllnx': { 'left': '<!--', 'right': '-->' },
-    \ 'sicad': { 'left': '*' },
-    \ 'simula': { 'left': '%', 'leftAlt': '--' },
-    \ 'sinda': { 'left': '$' },
-    \ 'skill': { 'left': ';' },
-    \ 'slang': { 'left': '%' },
-    \ 'slice': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'slrnrc': { 'left': '%' },
-    \ 'sm': { 'left': '#' },
-    \ 'smarty': { 'left': '{*', 'right': '*}' },
-    \ 'smil': { 'left': '<!', 'right': '>' },
-    \ 'smith': { 'left': ';' },
-    \ 'sml': { 'left': '(*', 'right': '*)' },
-    \ 'snnsnet': { 'left': '#' },
-    \ 'snnspat': { 'left': '#' },
-    \ 'snnsres': { 'left': '#' },
-    \ 'snobol4': { 'left': '*' },
-    \ 'spec': { 'left': '#' },
-    \ 'specman': { 'left': '//' },
-    \ 'spectre': { 'left': '//', 'leftAlt': '*' },
-    \ 'spice': { 'left': '$' },
-    \ 'sql': { 'left': '--' },
-    \ 'sqlforms': { 'left': '--' },
-    \ 'sqlj': { 'left': '--' },
-    \ 'sqr': { 'left': '!' },
-    \ 'squid': { 'left': '#' },
-    \ 'st': { 'left': '"' },
-    \ 'stp': { 'left': '--' },
-    \ 'systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'tads': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'tags': { 'left': ';' },
-    \ 'tak': { 'left': '$' },
-    \ 'tasm': { 'left': ';' },
-    \ 'tcl': { 'left': '#' },
-    \ 'texinfo': { 'left': "@c " },
-    \ 'texmf': { 'left': '%' },
-    \ 'tf': { 'left': ';' },
-    \ 'tidy': { 'left': '#' },
-    \ 'tli': { 'left': '#' },
-    \ 'tmux': { 'left': '#' },
-    \ 'trasys': { 'left': "$" },
-    \ 'tsalt': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'tsscl': { 'left': '#' },
-    \ 'tssgm': { 'left': "comment = '", 'right': "'" },
-    \ 'txt2tags': { 'left': '%' },
-    \ 'uc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'uil': { 'left': '!' },
-    \ 'vb': { 'left': "'" },
-    \ 'velocity': { 'left': "##", 'right': "", 'leftAlt': '#*', 'rightAlt': '*#' },
-    \ 'vera': { 'left': '/*','right': '*/', 'leftAlt': '//' },
-    \ 'verilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'verilog_systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
-    \ 'vgrindefs': { 'left': '#' },
-    \ 'vhdl': { 'left': '--' },
-    \ 'vimperator': { 'left': '"' },
-    \ 'virata': { 'left': '%' },
-    \ 'vrml': { 'left': '#' },
-    \ 'vsejcl': { 'left': '/*' },
-    \ 'webmacro': { 'left': '##' },
-    \ 'wget': { 'left': '#' },
-    \ 'Wikipedia': { 'left': '<!--', 'right': '-->' },
-    \ 'winbatch': { 'left': ';' },
-    \ 'wml': { 'left': '#' },
-    \ 'wvdial': { 'left': ';' },
-    \ 'xdefaults': { 'left': '!' },
-    \ 'xkb': { 'left': '//' },
-    \ 'xmath': { 'left': '#' },
-    \ 'xpm2': { 'left': '!' },
-    \ 'xquery': { 'left': '(:', 'right': ':)' },
-    \ 'z8a': { 'left': ';' }
-    \ }
-
-" Section: Comment mapping functions, autocommands and commands {{{1
-" ============================================================================
-" Section: Comment enabler autocommands {{{2
-" ============================================================================
-
-augroup commentEnablers
-
-    "if the user enters a buffer or reads a buffer then we gotta set up
-    "the comment delimiters for that new filetype
-    autocmd BufEnter,BufRead * :call s:SetUpForNewFiletype(&filetype, 0)
-
-    "if the filetype of a buffer changes, force the script to reset the
-    "delims for the buffer
-    autocmd Filetype * :call s:SetUpForNewFiletype(&filetype, 1)
-augroup END
-
-
-" Function: s:SetUpForNewFiletype(filetype) function {{{2
-" This function is responsible for setting up buffer scoped variables for the
-" given filetype.
-"
-" Args:
-"   -filetype: the filetype to set delimiters for
-"   -forceReset: 1 if the delimiters should be reset if they have already be
-"    set for this buffer.
-"
-function s:SetUpForNewFiletype(filetype, forceReset)
-    let b:NERDSexyComMarker = ''
-
-    if has_key(s:delimiterMap, a:filetype)
-        let b:NERDCommenterDelims = s:delimiterMap[a:filetype]
-        for i in ['left', 'leftAlt', 'right', 'rightAlt']
-            if !has_key(b:NERDCommenterDelims, i)
-                let b:NERDCommenterDelims[i] = ''
-            endif
-        endfor
-    else
-        let b:NERDCommenterDelims = s:CreateDelimMapFromCms()
-    endif
-
-endfunction
-
-function s:CreateDelimMapFromCms()
-    return {
-        \ 'left': substitute(&commentstring, '\([^ \t]*\)\s*%s.*', '\1', ''),
-        \ 'right': substitute(&commentstring, '.*%s\s*\(.*\)', '\1', 'g'),
-        \ 'leftAlt': '',
-        \ 'rightAlt': '' }
-endfunction
-
-" Function: s:SwitchToAlternativeDelimiters(printMsgs) function {{{2
-" This function is used to swap the delimiters that are being used to the
-" alternative delimiters for that filetype. For example, if a c++ file is
-" being edited and // comments are being used, after this function is called
-" /**/ comments will be used.
-"
-" Args:
-"   -printMsgs: if this is 1 then a message is echoed to the user telling them
-"    if this function changed the delimiters or not
-function s:SwitchToAlternativeDelimiters(printMsgs)
-    "if both of the alternative delimiters are empty then there is no
-    "alternative comment style so bail out
-    if b:NERDCommenterDelims['leftAlt'] == '' && b:NERDCommenterDelims['rightAlt'] == ''
-        if a:printMsgs
-            call s:NerdEcho("Cannot use alternative delimiters, none are specified", 0)
-        endif
-        return 0
-    endif
-
-    "save the current delimiters
-    let tempLeft = s:Left()
-    let tempRight = s:Right()
-
-    "swap current delimiters for alternative
-    let b:NERDCommenterDelims['left'] = b:NERDCommenterDelims['leftAlt']
-    let b:NERDCommenterDelims['right'] = b:NERDCommenterDelims['rightAlt']
-
-    "set the previously current delimiters to be the new alternative ones
-    let b:NERDCommenterDelims['leftAlt'] = tempLeft
-    let b:NERDCommenterDelims['rightAlt'] = tempRight
-
-    "tell the user what comment delimiters they are now using
-    if a:printMsgs
-        call s:NerdEcho("Now using " . s:Left() . " " . s:Right() . " to delimit comments", 1)
-    endif
-
-    return 1
-endfunction
-
-" Section: Comment delimiter add/removal functions {{{1
-" ============================================================================
-" Function: s:AppendCommentToLine(){{{2
-" This function appends comment delimiters at the EOL and places the cursor in
-" position to start typing the comment
-function s:AppendCommentToLine()
-    let left = s:Left({'space': 1})
-    let right = s:Right({'space': 1})
-
-    " get the len of the right delim
-    let lenRight = strlen(right)
-
-    let isLineEmpty = strlen(getline(".")) == 0
-    let insOrApp = (isLineEmpty==1 ? 'i' : 'A')
-
-    "stick the delimiters down at the end of the line. We have to format the
-    "comment with spaces as appropriate
-    execute ":normal! " . insOrApp . (isLineEmpty ? '' : ' ') . left . right . " "
-
-    " if there is a right delimiter then we gotta move the cursor left
-    " by the len of the right delimiter so we insert between the delimiters
-    if lenRight > 0
-        let leftMoveAmount = lenRight
-        execute ":normal! " . leftMoveAmount . "h"
-    endif
-    startinsert
-endfunction
-
-" Function: s:CommentBlock(top, bottom, lSide, rSide, forceNested ) {{{2
-" This function is used to comment out a region of code. This region is
-" specified as a bounding box by arguments to the function.
-"
-" Args:
-"   -top: the line number for the top line of code in the region
-"   -bottom: the line number for the bottom line of code in the region
-"   -lSide: the column number for the left most column in the region
-"   -rSide: the column number for the right most column in the region
-"   -forceNested: a flag indicating whether comments should be nested
-function s:CommentBlock(top, bottom, lSide, rSide, forceNested )
-    " we need to create local copies of these arguments so we can modify them
-    let top = a:top
-    let bottom = a:bottom
-    let lSide = a:lSide
-    let rSide = a:rSide
-
-    "if the top or bottom line starts with tabs we have to adjust the left and
-    "right boundaries so that they are set as though the tabs were spaces
-    let topline = getline(top)
-    let bottomline = getline(bottom)
-    if s:HasLeadingTabs(topline, bottomline)
-
-        "find out how many tabs are in the top line and adjust the left
-        "boundary accordingly
-        let numTabs = s:NumberOfLeadingTabs(topline)
-        if lSide < numTabs
-            let lSide = &ts * lSide
-        else
-            let lSide = (lSide - numTabs) + (&ts * numTabs)
-        endif
-
-        "find out how many tabs are in the bottom line and adjust the right
-        "boundary accordingly
-        let numTabs = s:NumberOfLeadingTabs(bottomline)
-        let rSide = (rSide - numTabs) + (&ts * numTabs)
-    endif
-
-    "we must check that bottom IS actually below top, if it is not then we
-    "swap top and bottom. Similarly for left and right.
-    if bottom < top
-        let temp = top
-        let top = bottom
-        let bottom = top
-    endif
-    if rSide < lSide
-        let temp = lSide
-        let lSide = rSide
-        let rSide = temp
-    endif
-
-    "if the current delimiters arent multipart then we will switch to the
-    "alternative delims (if THEY are) as the comment will be better and more
-    "accurate with multipart delims
-    let switchedDelims = 0
-    if !s:Multipart() && g:NERDAllowAnyVisualDelims && s:AltMultipart()
-        let switchedDelims = 1
-        call s:SwitchToAlternativeDelimiters(0)
-    endif
-
-    "start the commenting from the top and keep commenting till we reach the
-    "bottom
-    let currentLine=top
-    while currentLine <= bottom
-
-        "check if we are allowed to comment this line
-        if s:CanCommentLine(a:forceNested, currentLine)
-
-            "convert the leading tabs into spaces
-            let theLine = getline(currentLine)
-            let lineHasLeadTabs = s:HasLeadingTabs(theLine)
-            if lineHasLeadTabs
-                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-            endif
-
-            "dont comment lines that begin after the right boundary of the
-            "block unless the user has specified to do so
-            if theLine !~ '^ \{' . rSide . '\}' || !g:NERDBlockComIgnoreEmpty
-
-                "attempt to place the cursor in on the left of the boundary box,
-                "then check if we were successful, if not then we cant comment this
-                "line
-                call setline(currentLine, theLine)
-                if s:CanPlaceCursor(currentLine, lSide)
-
-                    let leftSpaced = s:Left({'space': 1})
-                    let rightSpaced = s:Right({'space': 1})
-
-                    "stick the left delimiter down
-                    let theLine = strpart(theLine, 0, lSide-1) . leftSpaced . strpart(theLine, lSide-1)
-
-                    if s:Multipart()
-                        "stick the right delimiter down
-                        let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced))
-
-                        let firstLeftDelim = s:FindDelimiterIndex(s:Left(), theLine)
-                        let lastRightDelim = s:LastIndexOfDelim(s:Right(), theLine)
-
-                        if firstLeftDelim != -1 && lastRightDelim != -1
-                            let searchStr = strpart(theLine, 0, lastRightDelim)
-                            let searchStr = strpart(searchStr, firstLeftDelim+strlen(s:Left()))
-
-                            "replace the outter most delims in searchStr with
-                            "place-holders
-                            let theLineWithPlaceHolders = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, searchStr)
-
-                            "add the right delimiter onto the line
-                            let theLine = strpart(theLine, 0, firstLeftDelim+strlen(s:Left())) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim)
-                        endif
-                    endif
-                endif
-            endif
-
-            "restore tabs if needed
-            if lineHasLeadTabs
-                let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-            endif
-
-            call setline(currentLine, theLine)
-        endif
-
-        let currentLine = currentLine + 1
-    endwhile
-
-    "if we switched delims then we gotta go back to what they were before
-    if switchedDelims == 1
-        call s:SwitchToAlternativeDelimiters(0)
-    endif
-endfunction
-
-" Function: s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine) {{{2
-" This function comments a range of lines.
-"
-" Args:
-"   -forceNested: a flag indicating whether the called is requesting the comment
-"    to be nested if need be
-"   -align: should be "left" or "both" or "none"
-"   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLines(forceNested, align, firstLine, lastLine)
-    " we need to get the left and right indexes of the leftmost char in the
-    " block of of lines and the right most char so that we can do alignment of
-    " the delimiters if the user has specified
-    let leftAlignIndx = s:LeftMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
-    let rightAlignIndx = s:RightMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
-
-    " gotta add the length of the left delimiter onto the rightAlignIndx cos
-    " we'll be adding a left delim to the line
-    let rightAlignIndx = rightAlignIndx + strlen(s:Left({'space': 1}))
-
-    " now we actually comment the lines. Do it line by line
-    let currentLine = a:firstLine
-    while currentLine <= a:lastLine
-
-        " get the next line, check commentability and convert spaces to tabs
-        let theLine = getline(currentLine)
-        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
-        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        if s:CanCommentLine(a:forceNested, currentLine)
-            "if the user has specified forceNesting then we check to see if we
-            "need to switch delimiters for place-holders
-            if a:forceNested && g:NERDUsePlaceHolders
-                let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
-            endif
-
-            " find out if the line is commented using normal delims and/or
-            " alternate ones
-            let isCommented = s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
-
-            " check if we can comment this line
-            if !isCommented || g:NERDUsePlaceHolders || s:Multipart()
-                if a:align == "left" || a:align == "both"
-                    let theLine = s:AddLeftDelimAligned(s:Left({'space': 1}), theLine, leftAlignIndx)
-                else
-                    let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
-                endif
-                if a:align == "both"
-                    let theLine = s:AddRightDelimAligned(s:Right({'space': 1}), theLine, rightAlignIndx)
-                else
-                    let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
-                endif
-            endif
-        endif
-
-        " restore leading tabs if appropriate
-        if lineHasLeadingTabs
-            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-
-        " we are done with this line
-        call setline(currentLine, theLine)
-        let currentLine = currentLine + 1
-    endwhile
-
-endfunction
-
-" Function: s:CommentLinesMinimal(firstLine, lastLine) {{{2
-" This function comments a range of lines in a minimal style. I
-"
-" Args:
-"   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLinesMinimal(firstLine, lastLine)
-    "check that minimal comments can be done on this filetype
-    if !s:HasMultipartDelims()
-        throw 'NERDCommenter.Delimiters exception: Minimal comments can only be used for filetypes that have multipart delimiters'
-    endif
-
-    "if we need to use place holders for the comment, make sure they are
-    "enabled for this filetype
-    if !g:NERDUsePlaceHolders && s:DoesBlockHaveMultipartDelim(a:firstLine, a:lastLine)
-        throw 'NERDCommenter.Settings exception: Place holders are required but disabled.'
-    endif
-
-    "get the left and right delims to smack on
-    let left = s:GetSexyComLeft(g:NERDSpaceDelims,0)
-    let right = s:GetSexyComRight(g:NERDSpaceDelims,0)
-
-    "make sure all multipart delims on the lines are replaced with
-    "placeholders to prevent illegal syntax
-    let currentLine = a:firstLine
-    while(currentLine <= a:lastLine)
-        let theLine = getline(currentLine)
-        let theLine = s:ReplaceDelims(left, right, g:NERDLPlace, g:NERDRPlace, theLine)
-        call setline(currentLine, theLine)
-        let currentLine = currentLine + 1
-    endwhile
-
-    "add the delim to the top line
-    let theLine = getline(a:firstLine)
-    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
-    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-    let theLine = s:AddLeftDelim(left, theLine)
-    if lineHasLeadingTabs
-        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-    endif
-    call setline(a:firstLine, theLine)
-
-    "add the delim to the bottom line
-    let theLine = getline(a:lastLine)
-    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
-    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-    let theLine = s:AddRightDelim(right, theLine)
-    if lineHasLeadingTabs
-        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-    endif
-    call setline(a:lastLine, theLine)
-endfunction
-
-" Function: s:CommentLinesSexy(topline, bottomline) function {{{2
-" This function is used to comment lines in the 'Sexy' style. eg in c:
-" /*
-"  * This is a sexy comment
-"  */
-" Args:
-"   -topline: the line num of the top line in the sexy comment
-"   -bottomline: the line num of the bottom line in the sexy comment
-function s:CommentLinesSexy(topline, bottomline)
-    let left = s:GetSexyComLeft(0, 0)
-    let right = s:GetSexyComRight(0, 0)
-
-    "check if we can do a sexy comment with the available delimiters
-    if left == -1 || right == -1
-        throw 'NERDCommenter.Delimiters exception: cannot perform sexy comments with available delimiters.'
-    endif
-
-    "make sure the lines arent already commented sexually
-    if !s:CanSexyCommentLines(a:topline, a:bottomline)
-        throw 'NERDCommenter.Nesting exception: cannot nest sexy comments'
-    endif
-
-
-    let sexyComMarker = s:GetSexyComMarker(0,0)
-    let sexyComMarkerSpaced = s:GetSexyComMarker(1,0)
-
-
-    " we jam the comment as far to the right as possible
-    let leftAlignIndx = s:LeftMostIndx(1, 1, a:topline, a:bottomline)
-
-    "check if we should use the compact style i.e that the left/right
-    "delimiters should appear on the first and last lines of the code and not
-    "on separate lines above/below the first/last lines of code
-    if g:NERDCompactSexyComs
-        let spaceString = (g:NERDSpaceDelims ? s:spaceStr : '')
-
-        "comment the top line
-        let theLine = getline(a:topline)
-        let lineHasTabs = s:HasLeadingTabs(theLine)
-        if lineHasTabs
-            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        endif
-        let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
-        let theLine = s:AddLeftDelimAligned(left . spaceString, theLine, leftAlignIndx)
-        if lineHasTabs
-            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-        call setline(a:topline, theLine)
-
-        "comment the bottom line
-        if a:bottomline != a:topline
-            let theLine = getline(a:bottomline)
-            let lineHasTabs = s:HasLeadingTabs(theLine)
-            if lineHasTabs
-                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-            endif
-            let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
-        endif
-        let theLine = s:AddRightDelim(spaceString . right, theLine)
-        if lineHasTabs
-            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-        call setline(a:bottomline, theLine)
-    else
-
-        " add the left delimiter one line above the lines that are to be commented
-        call cursor(a:topline, 1)
-        execute 'normal! O'
-        let theLine = repeat(' ', leftAlignIndx) . left
-
-        " Make sure tabs are respected
-        if !&expandtab
-           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-        call setline(a:topline, theLine)
-
-        " add the right delimiter after bottom line (we have to add 1 cos we moved
-        " the lines down when we added the left delim
-        call cursor(a:bottomline+1, 1)
-        execute 'normal! o'
-        let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . right
-
-        " Make sure tabs are respected
-        if !&expandtab
-           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-        call setline(a:bottomline+2, theLine)
-
-    endif
-
-    " go thru each line adding the sexyComMarker marker to the start of each
-    " line in the appropriate place to align them with the comment delims
-    let currentLine = a:topline+1
-    while currentLine <= a:bottomline + !g:NERDCompactSexyComs
-        " get the line and convert the tabs to spaces
-        let theLine = getline(currentLine)
-        let lineHasTabs = s:HasLeadingTabs(theLine)
-        if lineHasTabs
-            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        endif
-
-        let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
-
-        " add the sexyComMarker
-        let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx)
-
-        if lineHasTabs
-            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-
-
-        " set the line and move onto the next one
-        call setline(currentLine, theLine)
-        let currentLine = currentLine + 1
-    endwhile
-
-endfunction
-
-" Function: s:CommentLinesToggle(forceNested, firstLine, lastLine) {{{2
-" Applies "toggle" commenting to the given range of lines
-"
-" Args:
-"   -forceNested: a flag indicating whether the called is requesting the comment
-"    to be nested if need be
-"   -firstLine/lastLine: the top and bottom lines to comment
-function s:CommentLinesToggle(forceNested, firstLine, lastLine)
-    let currentLine = a:firstLine
-    while currentLine <= a:lastLine
-
-        " get the next line, check commentability and convert spaces to tabs
-        let theLine = getline(currentLine)
-        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
-        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-        if s:CanToggleCommentLine(a:forceNested, currentLine)
-
-            "if the user has specified forceNesting then we check to see if we
-            "need to switch delimiters for place-holders
-            if g:NERDUsePlaceHolders
-                let theLine = s:SwapOutterMultiPartDelimsForPlaceHolders(theLine)
-            endif
-
-            let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
-            let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
-        endif
-
-        " restore leading tabs if appropriate
-        if lineHasLeadingTabs
-            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
-        endif
-
-        " we are done with this line
-        call setline(currentLine, theLine)
-        let currentLine = currentLine + 1
-    endwhile
-
-endfunction
-
-" Function: s:CommentRegion(topline, topCol, bottomLine, bottomCol) function {{{2
-" This function comments chunks of text selected in visual mode.
-" It will comment exactly the text that they have selected.
-" Args:
-"   -topLine: the line num of the top line in the sexy comment
-"   -topCol: top left col for this comment
-"   -bottomline: the line num of the bottom line in the sexy comment
-"   -bottomCol: the bottom right col for this comment
-"   -forceNested: whether the caller wants comments to be nested if the
-"    line(s) are already commented
-function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested)
-
-    "switch delims (if we can) if the current set isnt multipart
-    let switchedDelims = 0
-    if !s:Multipart() && s:AltMultipart() && !g:NERDAllowAnyVisualDelims
-        let switchedDelims = 1
-        call s:SwitchToAlternativeDelimiters(0)
-    endif
-
-    "if there is only one line in the comment then just do it
-    if a:topLine == a:bottomLine
-        call s:CommentBlock(a:topLine, a:bottomLine, a:topCol, a:bottomCol, a:forceNested)
-
-    "there are multiple lines in the comment
-    else
-        "comment the top line
-        call s:CommentBlock(a:topLine, a:topLine, a:topCol, strlen(getline(a:topLine)), a:forceNested)
-
-        "comment out all the lines in the middle of the comment
-        let topOfRange = a:topLine+1
-        let bottomOfRange = a:bottomLine-1
-        if topOfRange <= bottomOfRange
-            call s:CommentLines(a:forceNested, "none", topOfRange, bottomOfRange)
-        endif
-
-        "comment the bottom line
-        let bottom = getline(a:bottomLine)
-        let numLeadingSpacesTabs = strlen(substitute(bottom, '^\([ \t]*\).*$', '\1', ''))
-        call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested)
-
-    endif
-
-    "stick the cursor back on the char it was on before the comment
-    call cursor(a:topLine, a:topCol + strlen(s:Left()) + g:NERDSpaceDelims)
-
-    "if we switched delims then we gotta go back to what they were before
-    if switchedDelims == 1
-        call s:SwitchToAlternativeDelimiters(0)
-    endif
-
-endfunction
-
-" Function: s:InvertComment(firstLine, lastLine) function {{{2
-" Inverts the comments on the lines between and including the given line
-" numbers i.e all commented lines are uncommented and vice versa
-" Args:
-"   -firstLine: the top of the range of lines to be inverted
-"   -lastLine: the bottom of the range of lines to be inverted
-function s:InvertComment(firstLine, lastLine)
-
-    " go thru all lines in the given range
-    let currentLine = a:firstLine
-    while currentLine <= a:lastLine
-        let theLine = getline(currentLine)
-
-        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
-
-        " if the line is commented normally, uncomment it
-        if s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
-            call s:UncommentLines(currentLine, currentLine)
-            let currentLine = currentLine + 1
-
-        " check if the line is commented sexually
-        elseif !empty(sexyComBounds)
-            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
-            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
-
-            "move to the line after last line of the sexy comment
-            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
-            let currentLine = sexyComBounds[1] - (numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved) + 1
-
-        " the line isnt commented
-        else
-            call s:CommentLinesToggle(1, currentLine, currentLine)
-            let currentLine = currentLine + 1
-        endif
-
-    endwhile
-endfunction
-
-" Function: NERDComment(isVisual, type) function {{{2
-" This function is a Wrapper for the main commenting functions
-"
-" Args:
-"   -isVisual: a flag indicating whether the comment is requested in visual
-"    mode or not
-"   -type: the type of commenting requested. Can be 'sexy', 'invert',
-"    'minimal', 'toggle', 'alignLeft', 'alignBoth', 'norm',
-"    'nested', 'toEOL', 'append', 'insert', 'uncomment', 'yank'
-function! NERDComment(isVisual, type) range
-    " we want case sensitivity when commenting
-    let oldIgnoreCase = &ignorecase
-    set noignorecase
-
-    if !exists("g:did_load_ftplugin") || g:did_load_ftplugin != 1
-        call s:NerdEcho("filetype plugins should be enabled. See :help NERDComInstallation and :help :filetype-plugin-on", 0)
-    endif
-
-    if a:isVisual
-        let firstLine = line("'<")
-        let lastLine = line("'>")
-        let firstCol = col("'<")
-        let lastCol = col("'>") - (&selection == 'exclusive' ? 1 : 0)
-    else
-        let firstLine = a:firstline
-        let lastLine = a:lastline
-    endif
-
-    let countWasGiven = (a:isVisual == 0 && firstLine != lastLine)
-
-    let forceNested = (a:type == 'nested' || g:NERDDefaultNesting)
-
-    if a:type == 'norm' || a:type == 'nested'
-        if a:isVisual && visualmode() == ""
-            call s:CommentBlock(firstLine, lastLine, firstCol, lastCol, forceNested)
-        elseif a:isVisual && visualmode() == "v" && (g:NERDCommentWholeLinesInVMode==0 || (g:NERDCommentWholeLinesInVMode==2 && s:HasMultipartDelims()))
-            call s:CommentRegion(firstLine, firstCol, lastLine, lastCol, forceNested)
-        else
-            call s:CommentLines(forceNested, "none", firstLine, lastLine)
-        endif
-
-    elseif a:type == 'alignLeft' || a:type == 'alignBoth'
-        let align = "none"
-        if a:type == "alignLeft"
-            let align = "left"
-        elseif a:type == "alignBoth"
-            let align = "both"
-        endif
-        call s:CommentLines(forceNested, align, firstLine, lastLine)
-
-    elseif a:type == 'invert'
-        call s:InvertComment(firstLine, lastLine)
-
-    elseif a:type == 'sexy'
-        try
-            call s:CommentLinesSexy(firstLine, lastLine)
-        catch /NERDCommenter.Delimiters/
-            call s:CommentLines(forceNested, "none", firstLine, lastLine)
-        catch /NERDCommenter.Nesting/
-            call s:NerdEcho("Sexy comment aborted. Nested sexy cannot be nested", 0)
-        endtry
-
-    elseif a:type == 'toggle'
-        let theLine = getline(firstLine)
-
-        if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
-            call s:UncommentLines(firstLine, lastLine)
-        else
-            call s:CommentLinesToggle(forceNested, firstLine, lastLine)
-        endif
-
-    elseif a:type == 'minimal'
-        try
-            call s:CommentLinesMinimal(firstLine, lastLine)
-        catch /NERDCommenter.Delimiters/
-            call s:NerdEcho("Minimal comments can only be used for filetypes that have multipart delimiters.", 0)
-        catch /NERDCommenter.Settings/
-            call s:NerdEcho("Place holders are required but disabled.", 0)
-        endtry
-
-    elseif a:type == 'toEOL'
-        call s:SaveScreenState()
-        call s:CommentBlock(firstLine, firstLine, col("."), col("$")-1, 1)
-        call s:RestoreScreenState()
-
-    elseif a:type == 'append'
-        call s:AppendCommentToLine()
-
-    elseif a:type == 'insert'
-        call s:PlaceDelimitersAndInsBetween()
-
-    elseif a:type == 'uncomment'
-        call s:UncommentLines(firstLine, lastLine)
-
-    elseif a:type == 'yank'
-        if a:isVisual
-            normal! gvy
-        elseif countWasGiven
-            execute firstLine .','. lastLine .'yank'
-        else
-            normal! yy
-        endif
-        execute firstLine .','. lastLine .'call NERDComment('. a:isVisual .', "norm")'
-    endif
-
-    let &ignorecase = oldIgnoreCase
-endfunction
-
-" Function: s:PlaceDelimitersAndInsBetween() function {{{2
-" This is function is called to place comment delimiters down and place the
-" cursor between them
-function s:PlaceDelimitersAndInsBetween()
-    " get the left and right delimiters without any escape chars in them
-    let left = s:Left({'space': 1})
-    let right = s:Right({'space': 1})
-
-    let theLine = getline(".")
-    let lineHasLeadTabs = s:HasLeadingTabs(theLine) || (theLine =~ '^ *$' && !&expandtab)
-
-    "convert tabs to spaces and adjust the cursors column to take this into
-    "account
-    let untabbedCol = s:UntabbedCol(theLine, col("."))
-    call setline(line("."), s:ConvertLeadingTabsToSpaces(theLine))
-    call cursor(line("."), untabbedCol)
-
-    " get the len of the right delim
-    let lenRight = strlen(right)
-
-    let isDelimOnEOL = col(".") >= strlen(getline("."))
-
-    " if the cursor is in the first col then we gotta insert rather than
-    " append the comment delimiters here
-    let insOrApp = (col(".")==1 ? 'i' : 'a')
-
-    " place the delimiters down. We do it differently depending on whether
-    " there is a left AND right delimiter
-    if lenRight > 0
-        execute ":normal! " . insOrApp . left . right
-        execute ":normal! " . lenRight . "h"
-    else
-        execute ":normal! " . insOrApp . left
-
-        " if we are tacking the delim on the EOL then we gotta add a space
-        " after it cos when we go out of insert mode the cursor will move back
-        " one and the user wont be in position to type the comment.
-        if isDelimOnEOL
-            execute 'normal! a '
-        endif
-    endif
-    normal! l
-
-    "if needed convert spaces back to tabs and adjust the cursors col
-    "accordingly
-    if lineHasLeadTabs
-        let tabbedCol = s:TabbedCol(getline("."), col("."))
-        call setline(line("."), s:ConvertLeadingSpacesToTabs(getline(".")))
-        call cursor(line("."), tabbedCol)
-    endif
-
-    startinsert
-endfunction
-
-" Function: s:RemoveDelimiters(left, right, line) {{{2
-" this function is called to remove the first left comment delimiter and the
-" last right delimiter of the given line.
-"
-" The args left and right must be strings. If there is no right delimiter (as
-" is the case for e.g vim file comments) them the arg right should be ""
-"
-" Args:
-"   -left: the left comment delimiter
-"   -right: the right comment delimiter
-"   -line: the line to remove the delimiters from
-function s:RemoveDelimiters(left, right, line)
-
-    let l:left = a:left
-    let l:right = a:right
-    let lenLeft = strlen(left)
-    let lenRight = strlen(right)
-
-    let delimsSpaced = (g:NERDSpaceDelims || g:NERDRemoveExtraSpaces)
-
-    let line = a:line
-
-    "look for the left delimiter, if we find it, remove it.
-    let leftIndx = s:FindDelimiterIndex(a:left, line)
-    if leftIndx != -1
-        let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+lenLeft)
-
-        "if the user has specified that there is a space after the left delim
-        "then check for the space and remove it if it is there
-        if delimsSpaced && strpart(line, leftIndx, s:lenSpaceStr) == s:spaceStr
-            let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+s:lenSpaceStr)
-        endif
-    endif
-
-    "look for the right delimiter, if we find it, remove it
-    let rightIndx = s:FindDelimiterIndex(a:right, line)
-    if rightIndx != -1
-        let line = strpart(line, 0, rightIndx) . strpart(line, rightIndx+lenRight)
-
-        "if the user has specified that there is a space before the right delim
-        "then check for the space and remove it if it is there
-        if delimsSpaced && strpart(line, rightIndx-s:lenSpaceStr, s:lenSpaceStr) == s:spaceStr && s:Multipart()
-            let line = strpart(line, 0, rightIndx-s:lenSpaceStr) . strpart(line, rightIndx)
-        endif
-    endif
-
-    return line
-endfunction
-
-" Function: s:UncommentLines(topLine, bottomLine) {{{2
-" This function uncomments the given lines
-"
-" Args:
-" topLine: the top line of the visual selection to uncomment
-" bottomLine: the bottom line of the visual selection to uncomment
-function s:UncommentLines(topLine, bottomLine)
-    "make local copies of a:firstline and a:lastline and, if need be, swap
-    "them around if the top line is below the bottom
-    let l:firstline = a:topLine
-    let l:lastline = a:bottomLine
-    if firstline > lastline
-        let firstline = lastline
-        let lastline = a:topLine
-    endif
-
-    "go thru each line uncommenting each line removing sexy comments
-    let currentLine = firstline
-    while currentLine <= lastline
-
-        "check the current line to see if it is part of a sexy comment
-        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
-        if !empty(sexyComBounds)
-
-            "we need to store the num lines in the buf before the comment is
-            "removed so we know how many lines were removed when the sexy com
-            "was removed
-            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
-
-            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
-
-            "move to the line after last line of the sexy comment
-            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
-            let numLinesRemoved = numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved
-            let currentLine = sexyComBounds[1] - numLinesRemoved + 1
-            let lastline = lastline - numLinesRemoved
-
-        "no sexy com was detected so uncomment the line as normal
-        else
-            call s:UncommentLinesNormal(currentLine, currentLine)
-            let currentLine = currentLine + 1
-        endif
-    endwhile
-
-endfunction
-
-" Function: s:UncommentLinesSexy(topline, bottomline) {{{2
-" This function removes all the comment characters associated with the sexy
-" comment spanning the given lines
-" Args:
-"   -topline/bottomline: the top/bottom lines of the sexy comment
-function s:UncommentLinesSexy(topline, bottomline)
-    let left = s:GetSexyComLeft(0,1)
-    let right = s:GetSexyComRight(0,1)
-
-
-    "check if it is even possible for sexy comments to exist with the
-    "available delimiters
-    if left == -1 || right == -1
-        throw 'NERDCommenter.Delimiters exception: cannot uncomment sexy comments with available delimiters.'
-    endif
-
-    let leftUnEsc = s:GetSexyComLeft(0,0)
-    let rightUnEsc = s:GetSexyComRight(0,0)
-
-    let sexyComMarker = s:GetSexyComMarker(0, 1)
-    let sexyComMarkerUnEsc = s:GetSexyComMarker(0, 0)
-
-    "the markerOffset is how far right we need to move the sexyComMarker to
-    "line it up with the end of the left delim
-    let markerOffset = strlen(leftUnEsc)-strlen(sexyComMarkerUnEsc)
-
-    " go thru the intermediate lines of the sexy comment and remove the
-    " sexy comment markers (eg the '*'s on the start of line in a c sexy
-    " comment)
-    let currentLine = a:topline+1
-    while currentLine < a:bottomline
-        let theLine = getline(currentLine)
-
-        " remove the sexy comment marker from the line. We also remove the
-        " space after it if there is one and if appropriate options are set
-        let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
-        if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
-            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
-        else
-            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
-        endif
-
-        let theLine = s:SwapOutterPlaceHoldersForMultiPartDelims(theLine)
-
-        let theLine = s:ConvertLeadingWhiteSpace(theLine)
-
-        " move onto the next line
-        call setline(currentLine, theLine)
-        let currentLine = currentLine + 1
-    endwhile
-
-    " gotta make a copy of a:bottomline cos we modify the position of the
-    " last line  it if we remove the topline
-    let bottomline = a:bottomline
-
-    " get the first line so we can remove the left delim from it
-    let theLine = getline(a:topline)
-
-    " if the first line contains only the left delim then just delete it
-    if theLine =~ '^[ \t]*' . left . '[ \t]*$' && !g:NERDCompactSexyComs
-        call cursor(a:topline, 1)
-        normal! dd
-        let bottomline = bottomline - 1
-
-    " topline contains more than just the left delim
-    else
-
-        " remove the delim. If there is a space after it
-        " then remove this too if appropriate
-        let delimIndx = stridx(theLine, leftUnEsc)
-        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) == s:spaceStr && g:NERDSpaceDelims
-            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc)+s:lenSpaceStr)
-        else
-            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc))
-        endif
-        let theLine = s:SwapOutterPlaceHoldersForMultiPartDelims(theLine)
-        call setline(a:topline, theLine)
-    endif
-
-    " get the last line so we can remove the right delim
-    let theLine = getline(bottomline)
-
-    " if the bottomline contains only the right delim then just delete it
-    if theLine =~ '^[ \t]*' . right . '[ \t]*$'
-        call cursor(bottomline, 1)
-        normal! dd
-
-    " the last line contains more than the right delim
-    else
-        " remove the right delim. If there is a space after it and
-        " if the appropriate options are set then remove this too.
-        let delimIndx = s:LastIndexOfDelim(rightUnEsc, theLine)
-        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
-            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc)+s:lenSpaceStr)
-        else
-            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc))
-        endif
-
-        " if the last line also starts with a sexy comment marker then we
-        " remove this as well
-        if theLine =~ '^[ \t]*' . sexyComMarker
-
-            " remove the sexyComMarker. If there is a space after it then
-            " remove that too
-            let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
-            if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
-                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
-            else
-                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
-            endif
-        endif
-
-        let theLine = s:SwapOutterPlaceHoldersForMultiPartDelims(theLine)
-        call setline(bottomline, theLine)
-    endif
-endfunction
-
-" Function: s:UncommentLineNormal(line) {{{2
-" uncomments the given line and returns the result
-" Args:
-"   -line: the line to uncomment
-function s:UncommentLineNormal(line)
-    let line = a:line
-
-    "get the comment status on the line so we know how it is commented
-    let lineCommentStatus =  s:IsCommentedOuttermost(s:Left(), s:Right(), s:Left({'alt': 1}), s:Right({'alt': 1}), line)
-
-    "it is commented with s:Left() and s:Right() so remove these delims
-    if lineCommentStatus == 1
-        let line = s:RemoveDelimiters(s:Left(), s:Right(), line)
-
-    "it is commented with s:Left({'alt': 1}) and s:Right({'alt': 1}) so remove these delims
-    elseif lineCommentStatus == 2 && g:NERDRemoveAltComs
-        let line = s:RemoveDelimiters(s:Left({'alt': 1}), s:Right({'alt': 1}), line)
-
-    "it is not properly commented with any delims so we check if it has
-    "any random left or right delims on it and remove the outtermost ones
-    else
-        "get the positions of all delim types on the line
-        let indxLeft = s:FindDelimiterIndex(s:Left(), line)
-        let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line)
-        let indxRight = s:FindDelimiterIndex(s:Right(), line)
-        let indxRightAlt = s:FindDelimiterIndex(s:Right({'alt': 1}), line)
-
-        "remove the outter most left comment delim
-        if indxLeft != -1 && (indxLeft < indxLeftAlt || indxLeftAlt == -1)
-            let line = s:RemoveDelimiters(s:Left(), '', line)
-        elseif indxLeftAlt != -1
-            let line = s:RemoveDelimiters(s:Left({'alt': 1}), '', line)
-        endif
-
-        "remove the outter most right comment delim
-        if indxRight != -1 && (indxRight < indxRightAlt || indxRightAlt == -1)
-            let line = s:RemoveDelimiters('', s:Right(), line)
-        elseif indxRightAlt != -1
-            let line = s:RemoveDelimiters('', s:Right({'alt': 1}), line)
-        endif
-    endif
-
-
-    let indxLeft = s:FindDelimiterIndex(s:Left(), line)
-    let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line)
-    let indxLeftPlace = s:FindDelimiterIndex(g:NERDLPlace, line)
-
-    let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line)
-    let indxRightAlt = s:FindDelimiterIndex(s:Right({'alt': 1}), line)
-    let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line)
-
-    let right = s:Right()
-    let left = s:Left()
-    if !s:Multipart()
-        let right = s:Right({'alt': 1})
-        let left = s:Left({'alt': 1})
-    endif
-
-
-    "if there are place-holders on the line then we check to see if they are
-    "the outtermost delimiters on the line. If so then we replace them with
-    "real delimiters
-    if indxLeftPlace != -1
-        if (indxLeftPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
-            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
-        endif
-    elseif indxRightPlace != -1
-        if (indxRightPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
-            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
-        endif
-
-    endif
-
-    let line = s:ConvertLeadingWhiteSpace(line)
-
-    return line
-endfunction
-
-" Function: s:UncommentLinesNormal(topline, bottomline) {{{2
-" This function is called to uncomment lines that arent a sexy comment
-" Args:
-"   -topline/bottomline: the top/bottom line numbers of the comment
-function s:UncommentLinesNormal(topline, bottomline)
-    let currentLine = a:topline
-    while currentLine <= a:bottomline
-        let line = getline(currentLine)
-        call setline(currentLine, s:UncommentLineNormal(line))
-        let currentLine = currentLine + 1
-    endwhile
-endfunction
-
-
-" Section: Other helper functions {{{1
-" ============================================================================
-
-" Function: s:AddLeftDelim(delim, theLine) {{{2
-" Args:
-function s:AddLeftDelim(delim, theLine)
-    return substitute(a:theLine, '^\([ \t]*\)', '\1' . a:delim, '')
-endfunction
-
-" Function: s:AddLeftDelimAligned(delim, theLine) {{{2
-" Args:
-function s:AddLeftDelimAligned(delim, theLine, alignIndx)
-
-    "if the line is not long enough then bung some extra spaces on the front
-    "so we can align the delim properly
-    let theLine = a:theLine
-    if strlen(theLine) < a:alignIndx
-        let theLine = repeat(' ', a:alignIndx - strlen(theLine))
-    endif
-
-    return strpart(theLine, 0, a:alignIndx) . a:delim . strpart(theLine, a:alignIndx)
-endfunction
-
-" Function: s:AddRightDelim(delim, theLine) {{{2
-" Args:
-function s:AddRightDelim(delim, theLine)
-    if a:delim == ''
-        return a:theLine
-    else
-        return substitute(a:theLine, '$', a:delim, '')
-    endif
-endfunction
-
-" Function: s:AddRightDelimAligned(delim, theLine, alignIndx) {{{2
-" Args:
-function s:AddRightDelimAligned(delim, theLine, alignIndx)
-    if a:delim == ""
-        return a:theLine
-    else
-
-        " when we align the right delim we are just adding spaces
-        " so we get a string containing the needed spaces (it
-        " could be empty)
-        let extraSpaces = ''
-        let extraSpaces = repeat(' ', a:alignIndx-strlen(a:theLine))
-
-        " add the right delim
-        return substitute(a:theLine, '$', extraSpaces . a:delim, '')
-    endif
-endfunction
-
-" Function: s:AltMultipart() {{{2
-" returns 1 if the alternative delims are multipart
-function s:AltMultipart()
-    return b:NERDCommenterDelims['rightAlt'] != ''
-endfunction
-
-" Function: s:CanCommentLine(forceNested, line) {{{2
-"This function is used to determine whether the given line can be commented.
-"It returns 1 if it can be and 0 otherwise
-"
-" Args:
-"   -forceNested: a flag indicating whether the caller wants comments to be nested
-"    if the current line is already commented
-"   -lineNum: the line num of the line to check for commentability
-function s:CanCommentLine(forceNested, lineNum)
-    let theLine = getline(a:lineNum)
-
-    " make sure we don't comment lines that are just spaces or tabs or empty.
-    if theLine =~ "^[ \t]*$"
-        return 0
-    endif
-
-    "if the line is part of a sexy comment then just flag it...
-    if s:IsInSexyComment(a:lineNum)
-        return 0
-    endif
-
-    let isCommented = s:IsCommentedNormOrSexy(a:lineNum)
-
-    "if the line isnt commented return true
-    if !isCommented
-        return 1
-    endif
-
-    "if the line is commented but nesting is allowed then return true
-    if a:forceNested && (!s:Multipart() || g:NERDUsePlaceHolders)
-        return 1
-    endif
-
-    return 0
-endfunction
-
-" Function: s:CanPlaceCursor(line, col) {{{2
-" returns 1 if the cursor can be placed exactly in the given position
-function s:CanPlaceCursor(line, col)
-    let c = col(".")
-    let l = line(".")
-    call cursor(a:line, a:col)
-    let success = (line(".") == a:line && col(".") == a:col)
-    call cursor(l,c)
-    return success
-endfunction
-
-" Function: s:CanSexyCommentLines(topline, bottomline) {{{2
-" Return: 1 if the given lines can be commented sexually, 0 otherwise
-function s:CanSexyCommentLines(topline, bottomline)
-    " see if the selected regions have any sexy comments
-    let currentLine = a:topline
-    while(currentLine <= a:bottomline)
-        if s:IsInSexyComment(currentLine)
-            return 0
-        endif
-        let currentLine = currentLine + 1
-    endwhile
-    return 1
-endfunction
-" Function: s:CanToggleCommentLine(forceNested, line) {{{2
-"This function is used to determine whether the given line can be toggle commented.
-"It returns 1 if it can be and 0 otherwise
-"
-" Args:
-"   -lineNum: the line num of the line to check for commentability
-function s:CanToggleCommentLine(forceNested, lineNum)
-    let theLine = getline(a:lineNum)
-    if (s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)) && !a:forceNested
-        return 0
-    endif
-
-    " make sure we don't comment lines that are just spaces or tabs or empty.
-    if theLine =~ "^[ \t]*$"
-        return 0
-    endif
-
-    "if the line is part of a sexy comment then just flag it...
-    if s:IsInSexyComment(a:lineNum)
-        return 0
-    endif
-
-    return 1
-endfunction
-
-" Function: s:ConvertLeadingSpacesToTabs(line) {{{2
-" This function takes a line and converts all leading tabs on that line into
-" spaces
-"
-" Args:
-"   -line: the line whose leading tabs will be converted
-function s:ConvertLeadingSpacesToTabs(line)
-    let toReturn  = a:line
-    while toReturn =~ '^\t*' . s:TabSpace() . '\(.*\)$'
-        let toReturn = substitute(toReturn, '^\(\t*\)' . s:TabSpace() . '\(.*\)$'  ,  '\1\t\2' , "")
-    endwhile
-
-    return toReturn
-endfunction
-
-
-" Function: s:ConvertLeadingTabsToSpaces(line) {{{2
-" This function takes a line and converts all leading spaces on that line into
-" tabs
-"
-" Args:
-"   -line: the line whose leading spaces will be converted
-function s:ConvertLeadingTabsToSpaces(line)
-    let toReturn  = a:line
-    while toReturn =~ '^\( *\)\t'
-        let toReturn = substitute(toReturn, '^\( *\)\t',  '\1' . s:TabSpace() , "")
-    endwhile
-
-    return toReturn
-endfunction
-
-" Function: s:ConvertLeadingWhiteSpace(line) {{{2
-" Converts the leading white space to tabs/spaces depending on &ts
-"
-" Args:
-"   -line: the line to convert
-function s:ConvertLeadingWhiteSpace(line)
-    let toReturn = a:line
-    while toReturn =~ '^ *\t'
-        let toReturn = substitute(toReturn, '^ *\zs\t\ze', s:TabSpace(), "g")
-    endwhile
-
-    if !&expandtab
-        let toReturn = s:ConvertLeadingSpacesToTabs(toReturn)
-    endif
-
-    return toReturn
-endfunction
-
-
-" Function: s:CountNonESCedOccurances(str, searchstr, escChar) {{{2
-" This function counts the number of substrings contained in another string.
-" These substrings are only counted if they are not escaped with escChar
-" Args:
-"   -str: the string to look for searchstr in
-"   -searchstr: the substring to search for in str
-"   -escChar: the escape character which, when preceding an instance of
-"    searchstr, will cause it not to be counted
-function s:CountNonESCedOccurances(str, searchstr, escChar)
-    "get the index of the first occurrence of searchstr
-    let indx = stridx(a:str, a:searchstr)
-
-    "if there is an instance of searchstr in str process it
-    if indx != -1
-        "get the remainder of str after this instance of searchstr is removed
-        let lensearchstr = strlen(a:searchstr)
-        let strLeft = strpart(a:str, indx+lensearchstr)
-
-        "if this instance of searchstr is not escaped, add one to the count
-        "and recurse. If it is escaped, just recurse
-        if !s:IsEscaped(a:str, indx, a:escChar)
-            return 1 + s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
-        else
-            return s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
-        endif
-    endif
-endfunction
-" Function: s:DoesBlockHaveDelim(delim, top, bottom) {{{2
-" Returns 1 if the given block of lines has a delimiter (a:delim) in it
-" Args:
-"   -delim: the comment delimiter to check the block for
-"   -top: the top line number of the block
-"   -bottom: the bottom line number of the block
-function s:DoesBlockHaveDelim(delim, top, bottom)
-    let currentLine = a:top
-    while currentLine < a:bottom
-        let theline = getline(currentLine)
-        if s:FindDelimiterIndex(a:delim, theline) != -1
-            return 1
-        endif
-        let currentLine = currentLine + 1
-    endwhile
-    return 0
-endfunction
-
-" Function: s:DoesBlockHaveMultipartDelim(top, bottom) {{{2
-" Returns 1 if the given block has a >= 1 multipart delimiter in it
-" Args:
-"   -top: the top line number of the block
-"   -bottom: the bottom line number of the block
-function s:DoesBlockHaveMultipartDelim(top, bottom)
-    if s:HasMultipartDelims()
-        if s:Multipart()
-            return s:DoesBlockHaveDelim(s:Left(), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right(), a:top, a:bottom)
-        else
-            return s:DoesBlockHaveDelim(s:Left({'alt': 1}), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right({'alt': 1}), a:top, a:bottom)
-        endif
-    endif
-    return 0
-endfunction
-
-
-" Function: s:Esc(str) {{{2
-" Escapes all the tricky chars in the given string
-function s:Esc(str)
-    let charsToEsc = '*/\."&$+'
-    return escape(a:str, charsToEsc)
-endfunction
-
-" Function: s:FindDelimiterIndex(delimiter, line) {{{2
-" This function is used to get the string index of the input comment delimiter
-" on the input line. If no valid comment delimiter is found in the line then
-" -1 is returned
-" Args:
-"   -delimiter: the delimiter we are looking to find the index of
-"   -line: the line we are looking for delimiter on
-function s:FindDelimiterIndex(delimiter, line)
-
-    "make sure the delimiter isnt empty otherwise we go into an infinite loop.
-    if a:delimiter == ""
-        return -1
-    endif
-
-
-    let l:delimiter = a:delimiter
-    let lenDel = strlen(l:delimiter)
-
-    "get the index of the first occurrence of the delimiter
-    let delIndx = stridx(a:line, l:delimiter)
-
-    "keep looping thru the line till we either find a real comment delimiter
-    "or run off the EOL
-    while delIndx != -1
-
-        "if we are not off the EOL get the str before the possible delimiter
-        "in question and check if it really is a delimiter. If it is, return
-        "its position
-        if delIndx != -1
-            if s:IsDelimValid(l:delimiter, delIndx, a:line)
-                return delIndx
-            endif
-        endif
-
-        "we have not yet found a real comment delimiter so move past the
-        "current one we are lookin at
-        let restOfLine = strpart(a:line, delIndx + lenDel)
-        let distToNextDelim = stridx(restOfLine , l:delimiter)
-
-        "if distToNextDelim is -1 then there is no more potential delimiters
-        "on the line so set delIndx to -1. Otherwise, move along the line by
-        "distToNextDelim
-        if distToNextDelim == -1
-            let delIndx = -1
-        else
-            let delIndx = delIndx + lenDel + distToNextDelim
-        endif
-    endwhile
-
-    "there is no comment delimiter on this line
-    return -1
-endfunction
-
-" Function: s:FindBoundingLinesOfSexyCom(lineNum) {{{2
-" This function takes in a line number and tests whether this line number is
-" the top/bottom/middle line of a sexy comment. If it is then the top/bottom
-" lines of the sexy comment are returned
-" Args:
-"   -lineNum: the line number that is to be tested whether it is the
-"    top/bottom/middle line of a sexy com
-" Returns:
-"   A string that has the top/bottom lines of the sexy comment encoded in it.
-"   The format is 'topline,bottomline'. If a:lineNum turns out not to be the
-"   top/bottom/middle of a sexy comment then -1 is returned
-function s:FindBoundingLinesOfSexyCom(lineNum)
-
-    "find which delimiters to look for as the start/end delims of the comment
-    let left = ''
-    let right = ''
-    if s:Multipart()
-        let left = s:Left({'esc': 1})
-        let right = s:Right({'esc': 1})
-    elseif s:AltMultipart()
-        let left = s:Left({'alt': 1, 'esc': 1})
-        let right = s:Right({'alt': 1, 'esc': 1})
-    else
-        return []
-    endif
-
-    let sexyComMarker = s:GetSexyComMarker(0, 1)
-
-    "initialise the top/bottom line numbers of the sexy comment to -1
-    let top = -1
-    let bottom = -1
-
-    let currentLine = a:lineNum
-    while top == -1 || bottom == -1
-        let theLine = getline(currentLine)
-
-        "check if the current line is the top of the sexy comment
-        if currentLine <= a:lineNum && theLine =~ '^[ \t]*' . left && theLine !~ '.*' . right && currentLine < s:NumLinesInBuf()
-            let top = currentLine
-            let currentLine = a:lineNum
-
-        "check if the current line is the bottom of the sexy comment
-        elseif theLine =~ '^[ \t]*' . right && theLine !~ '.*' . left && currentLine > 1
-            let bottom = currentLine
-
-        "the right delimiter is on the same line as the last sexyComMarker
-        elseif theLine =~ '^[ \t]*' . sexyComMarker . '.*' . right
-            let bottom = currentLine
-
-        "we have not found the top or bottom line so we assume currentLine is an
-        "intermediate line and look to prove otherwise
-        else
-
-            "if the line doesnt start with a sexyComMarker then it is not a sexy
-            "comment
-            if theLine !~ '^[ \t]*' . sexyComMarker
-                return []
-            endif
-
-        endif
-
-        "if top is -1 then we havent found the top yet so keep looking up
-        if top == -1
-            let currentLine = currentLine - 1
-        "if we have found the top line then go down looking for the bottom
-        else
-            let currentLine = currentLine + 1
-        endif
-
-    endwhile
-
-    return [top, bottom]
-endfunction
-
-
-" Function: s:GetSexyComMarker() {{{2
-" Returns the sexy comment marker for the current filetype.
-"
-" C style sexy comments are assumed if possible. If not then the sexy comment
-" marker is the last char of the delimiter pair that has both left and right
-" delims and has the longest left delim
-"
-" Args:
-"   -space: specifies whether the marker is to have a space string after it
-"    (the space string will only be added if NERDSpaceDelims is set)
-"   -esc: specifies whether the tricky chars in the marker are to be ESCed
-function s:GetSexyComMarker(space, esc)
-    let sexyComMarker = b:NERDSexyComMarker
-
-    "if there is no hardcoded marker then we find one
-    if sexyComMarker == ''
-
-        "if the filetype has c style comments then use standard c sexy
-        "comments
-        if s:HasCStyleComments()
-            let sexyComMarker = '*'
-        else
-            "find a comment marker by getting the longest available left delim
-            "(that has a corresponding right delim) and taking the last char
-            let lenLeft = strlen(s:Left())
-            let lenLeftAlt = strlen(s:Left({'alt': 1}))
-            let left = ''
-            let right = ''
-            if s:Multipart() && lenLeft >= lenLeftAlt
-                let left = s:Left()
-            elseif s:AltMultipart()
-                let left = s:Left({'alt': 1})
-            else
-                return -1
-            endif
-
-            "get the last char of left
-            let sexyComMarker = strpart(left, strlen(left)-1)
-        endif
-    endif
-
-    if a:space && g:NERDSpaceDelims
-        let sexyComMarker = sexyComMarker . s:spaceStr
-    endif
-
-    if a:esc
-        let sexyComMarker = s:Esc(sexyComMarker)
-    endif
-
-    return sexyComMarker
-endfunction
-
-" Function: s:GetSexyComLeft(space, esc) {{{2
-" Returns the left delimiter for sexy comments for this filetype or -1 if
-" there is none. C style sexy comments are used if possible
-" Args:
-"   -space: specifies if the delim has a space string on the end
-"   (the space string will only be added if NERDSpaceDelims is set)
-"   -esc: specifies whether the tricky chars in the string are ESCed
-function s:GetSexyComLeft(space, esc)
-    let lenLeft = strlen(s:Left())
-    let lenLeftAlt = strlen(s:Left({'alt': 1}))
-    let left = ''
-
-    "assume c style sexy comments if possible
-    if s:HasCStyleComments()
-        let left = '/*'
-    else
-        "grab the longest left delim that has a right
-        if s:Multipart() && lenLeft >= lenLeftAlt
-            let left = s:Left()
-        elseif s:AltMultipart()
-            let left = s:Left({'alt': 1})
-        else
-            return -1
-        endif
-    endif
-
-    if a:space && g:NERDSpaceDelims
-        let left = left . s:spaceStr
-    endif
-
-    if a:esc
-        let left = s:Esc(left)
-    endif
-
-    return left
-endfunction
-
-" Function: s:GetSexyComRight(space, esc) {{{2
-" Returns the right delimiter for sexy comments for this filetype or -1 if
-" there is none. C style sexy comments are used if possible.
-" Args:
-"   -space: specifies if the delim has a space string on the start
-"   (the space string will only be added if NERDSpaceDelims
-"   is specified for the current filetype)
-"   -esc: specifies whether the tricky chars in the string are ESCed
-function s:GetSexyComRight(space, esc)
-    let lenLeft = strlen(s:Left())
-    let lenLeftAlt = strlen(s:Left({'alt': 1}))
-    let right = ''
-
-    "assume c style sexy comments if possible
-    if s:HasCStyleComments()
-        let right = '*/'
-    else
-        "grab the right delim that pairs with the longest left delim
-        if s:Multipart() && lenLeft >= lenLeftAlt
-            let right = s:Right()
-        elseif s:AltMultipart()
-            let right = s:Right({'alt': 1})
-        else
-            return -1
-        endif
-    endif
-
-    if a:space && g:NERDSpaceDelims
-        let right = s:spaceStr . right
-    endif
-
-    if a:esc
-        let right = s:Esc(right)
-    endif
-
-    return right
-endfunction
-
-" Function: s:HasMultipartDelims() {{{2
-" Returns 1 iff the current filetype has at least one set of multipart delims
-function s:HasMultipartDelims()
-    return s:Multipart() || s:AltMultipart()
-endfunction
-
-" Function: s:HasLeadingTabs(...) {{{2
-" Returns 1 if any of the given strings have leading tabs
-function s:HasLeadingTabs(...)
-    for s in a:000
-        if s =~ '^\t.*'
-            return 1
-        end
-    endfor
-    return 0
-endfunction
-" Function: s:HasCStyleComments() {{{2
-" Returns 1 iff the current filetype has c style comment delimiters
-function s:HasCStyleComments()
-    return (s:Left() == '/*' && s:Right() == '*/') || (s:Left({'alt': 1}) == '/*' && s:Right({'alt': 1}) == '*/')
-endfunction
-
-" Function: s:IsCommentedNormOrSexy(lineNum) {{{2
-"This function is used to determine whether the given line is commented with
-"either set of delimiters or if it is part of a sexy comment
-"
-" Args:
-"   -lineNum: the line number of the line to check
-function s:IsCommentedNormOrSexy(lineNum)
-    let theLine = getline(a:lineNum)
-
-    "if the line is commented normally return 1
-    if s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
-        return 1
-    endif
-
-    "if the line is part of a sexy comment return 1
-    if s:IsInSexyComment(a:lineNum)
-        return 1
-    endif
-    return 0
-endfunction
-
-" Function: s:IsCommented(left, right, line) {{{2
-"This function is used to determine whether the given line is commented with
-"the given delimiters
-"
-" Args:
-"   -line: the line that to check if commented
-"   -left/right: the left and right delimiters to check for
-function s:IsCommented(left, right, line)
-    "if the line isnt commented return true
-    if s:FindDelimiterIndex(a:left, a:line) != -1 && (s:FindDelimiterIndex(a:right, a:line) != -1 || !s:Multipart())
-        return 1
-    endif
-    return 0
-endfunction
-
-" Function: s:IsCommentedFromStartOfLine(left, line) {{{2
-"This function is used to determine whether the given line is commented with
-"the given delimiters at the start of the line i.e the left delimiter is the
-"first thing on the line (apart from spaces\tabs)
-"
-" Args:
-"   -line: the line that to check if commented
-"   -left: the left delimiter to check for
-function s:IsCommentedFromStartOfLine(left, line)
-    let theLine = s:ConvertLeadingTabsToSpaces(a:line)
-    let numSpaces = strlen(substitute(theLine, '^\( *\).*$', '\1', ''))
-    let delimIndx = s:FindDelimiterIndex(a:left, theLine)
-    return delimIndx == numSpaces
-endfunction
-
-" Function: s:IsCommentedOuttermost(left, right, leftAlt, rightAlt, line) {{{2
-" Finds the type of the outtermost delims on the line
-"
-" Args:
-"   -line: the line that to check if the outtermost comments on it are
-"    left/right
-"   -left/right: the left and right delimiters to check for
-"   -leftAlt/rightAlt: the left and right alternative delimiters to check for
-"
-" Returns:
-"   0 if the line is not commented with either set of delims
-"   1 if the line is commented with the left/right delim set
-"   2 if the line is commented with the leftAlt/rightAlt delim set
-function s:IsCommentedOuttermost(left, right, leftAlt, rightAlt, line)
-    "get the first positions of the left delims and the last positions of the
-    "right delims
-    let indxLeft = s:FindDelimiterIndex(a:left, a:line)
-    let indxLeftAlt = s:FindDelimiterIndex(a:leftAlt, a:line)
-    let indxRight = s:LastIndexOfDelim(a:right, a:line)
-    let indxRightAlt = s:LastIndexOfDelim(a:rightAlt, a:line)
-
-    "check if the line has a left delim before a leftAlt delim
-    if (indxLeft <= indxLeftAlt || indxLeftAlt == -1) && indxLeft != -1
-        "check if the line has a right delim after any rightAlt delim
-        if (indxRight > indxRightAlt && indxRight > indxLeft) || !s:Multipart()
-            return 1
-        endif
-
-        "check if the line has a leftAlt delim before a left delim
-    elseif (indxLeftAlt <= indxLeft || indxLeft == -1) && indxLeftAlt != -1
-        "check if the line has a rightAlt delim after any right delim
-        if (indxRightAlt > indxRight && indxRightAlt > indxLeftAlt) || !s:AltMultipart()
-            return 2
-        endif
-    else
-        return 0
-    endif
-
-    return 0
-
-endfunction
-
-
-" Function: s:IsDelimValid(delimiter, delIndx, line) {{{2
-" This function is responsible for determining whether a given instance of a
-" comment delimiter is a real delimiter or not. For example, in java the
-" // string is a comment delimiter but in the line:
-"               System.out.println("//");
-" it does not count as a comment delimiter. This function is responsible for
-" distinguishing between such cases. It does so by applying a set of
-" heuristics that are not fool proof but should work most of the time.
-"
-" Args:
-"   -delimiter: the delimiter we are validating
-"   -delIndx: the position of delimiter in line
-"   -line: the line that delimiter occurs in
-"
-" Returns:
-" 0 if the given delimiter is not a real delimiter (as far as we can tell) ,
-" 1 otherwise
-function s:IsDelimValid(delimiter, delIndx, line)
-    "get the delimiter without the escchars
-    let l:delimiter = a:delimiter
-
-    "get the strings before and after the delimiter
-    let preComStr = strpart(a:line, 0, a:delIndx)
-    let postComStr = strpart(a:line, a:delIndx+strlen(delimiter))
-
-    "to check if the delimiter is real, make sure it isnt preceded by
-    "an odd number of quotes and followed by the same (which would indicate
-    "that it is part of a string and therefore is not a comment)
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '"', "\\"))
-        return 0
-    endif
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "'", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "'", "\\"))
-        return 0
-    endif
-    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "`", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "`", "\\"))
-        return 0
-    endif
-
-
-    "if the comment delimiter is escaped, assume it isnt a real delimiter
-    if s:IsEscaped(a:line, a:delIndx, "\\")
-        return 0
-    endif
-
-    "vim comments are so fuckin stupid!! Why the hell do they have comment
-    "delimiters that are used elsewhere in the syntax?!?! We need to check
-    "some conditions especially for vim
-    if &filetype == "vim"
-        if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\"))
-            return 0
-        endif
-
-        "if the delimiter is on the very first char of the line or is the
-        "first non-tab/space char on the line then it is a valid comment delimiter
-        if a:delIndx == 0 || a:line =~ "^[ \t]\\{" . a:delIndx . "\\}\".*$"
-            return 1
-        endif
-
-        let numLeftParen =s:CountNonESCedOccurances(preComStr, "(", "\\")
-        let numRightParen =s:CountNonESCedOccurances(preComStr, ")", "\\")
-
-        "if the quote is inside brackets then assume it isnt a comment
-        if numLeftParen > numRightParen
-            return 0
-        endif
-
-        "if the line has an even num of unescaped "'s then we can assume that
-        "any given " is not a comment delimiter
-        if s:IsNumEven(s:CountNonESCedOccurances(a:line, "\"", "\\"))
-            return 0
-        endif
-    endif
-
-    return 1
-
-endfunction
-
-" Function: s:IsNumEven(num) {{{2
-" A small function the returns 1 if the input number is even and 0 otherwise
-" Args:
-"   -num: the number to check
-function s:IsNumEven(num)
-    return (a:num % 2) == 0
-endfunction
-
-" Function: s:IsEscaped(str, indx, escChar) {{{2
-" This function takes a string, an index into that string and an esc char and
-" returns 1 if the char at the index is escaped (i.e if it is preceded by an
-" odd number of esc chars)
-" Args:
-"   -str: the string to check
-"   -indx: the index into str that we want to check
-"   -escChar: the escape char the char at indx may be ESCed with
-function s:IsEscaped(str, indx, escChar)
-    "initialise numEscChars to 0 and look at the char before indx
-    let numEscChars = 0
-    let curIndx = a:indx-1
-
-    "keep going back thru str until we either reach the start of the str or
-    "run out of esc chars
-    while curIndx >= 0 && strpart(a:str, curIndx, 1) == a:escChar
-
-        "we have found another esc char so add one to the count and move left
-        "one char
-        let numEscChars  = numEscChars + 1
-        let curIndx = curIndx - 1
-
-    endwhile
-
-    "if there is an odd num of esc chars directly before the char at indx then
-    "the char at indx is escaped
-    return !s:IsNumEven(numEscChars)
-endfunction
-
-" Function: s:IsInSexyComment(line) {{{2
-" returns 1 if the given line number is part of a sexy comment
-function s:IsInSexyComment(line)
-    return !empty(s:FindBoundingLinesOfSexyCom(a:line))
-endfunction
-
-" Function: s:IsSexyComment(topline, bottomline) {{{2
-" This function takes in 2 line numbers and returns 1 if the lines between and
-" including the given line numbers are a sexy comment. It returns 0 otherwise.
-" Args:
-"   -topline: the line that the possible sexy comment starts on
-"   -bottomline: the line that the possible sexy comment stops on
-function s:IsSexyComment(topline, bottomline)
-
-    "get the delim set that would be used for a sexy comment
-    let left = ''
-    let right = ''
-    if s:Multipart()
-        let left = s:Left()
-        let right = s:Right()
-    elseif s:AltMultipart()
-        let left = s:Left({'alt': 1})
-        let right = s:Right({'alt': 1})
-    else
-        return 0
-    endif
-
-    "swap the top and bottom line numbers around if need be
-    let topline = a:topline
-    let bottomline = a:bottomline
-    if bottomline < topline
-        topline = bottomline
-        bottomline = a:topline
-    endif
-
-    "if there is < 2 lines in the comment it cannot be sexy
-    if (bottomline - topline) <= 0
-        return 0
-    endif
-
-    "if the top line doesnt begin with a left delim then the comment isnt sexy
-    if getline(a:topline) !~ '^[ \t]*' . left
-        return 0
-    endif
-
-    "if there is a right delim on the top line then this isnt a sexy comment
-    if s:FindDelimiterIndex(right, getline(a:topline)) != -1
-        return 0
-    endif
-
-    "if there is a left delim on the bottom line then this isnt a sexy comment
-    if s:FindDelimiterIndex(left, getline(a:bottomline)) != -1
-        return 0
-    endif
-
-    "if the bottom line doesnt begin with a right delim then the comment isnt
-    "sexy
-    if getline(a:bottomline) !~ '^.*' . right . '$'
-        return 0
-    endif
-
-    let sexyComMarker = s:GetSexyComMarker(0, 1)
-
-    "check each of the intermediate lines to make sure they start with a
-    "sexyComMarker
-    let currentLine = a:topline+1
-    while currentLine < a:bottomline
-        let theLine = getline(currentLine)
-
-        if theLine !~ '^[ \t]*' . sexyComMarker
-            return 0
-        endif
-
-        "if there is a right delim in an intermediate line then the block isnt
-        "a sexy comment
-        if s:FindDelimiterIndex(right, theLine) != -1
-            return 0
-        endif
-
-        let currentLine = currentLine + 1
-    endwhile
-
-    "we have not found anything to suggest that this isnt a sexy comment so
-    return 1
-
-endfunction
-
-" Function: s:LastIndexOfDelim(delim, str) {{{2
-" This function takes a string and a delimiter and returns the last index of
-" that delimiter in string
-" Args:
-"   -delim: the delimiter to look for
-"   -str: the string to look for delim in
-function s:LastIndexOfDelim(delim, str)
-    let delim = a:delim
-    let lenDelim = strlen(delim)
-
-    "set index to the first occurrence of delim. If there is no occurrence then
-    "bail
-    let indx = s:FindDelimiterIndex(delim, a:str)
-    if indx == -1
-        return -1
-    endif
-
-    "keep moving to the next instance of delim in str till there is none left
-    while 1
-
-        "search for the next delim after the previous one
-        let searchStr = strpart(a:str, indx+lenDelim)
-        let indx2 = s:FindDelimiterIndex(delim, searchStr)
-
-        "if we find a delim update indx to record the position of it, if we
-        "dont find another delim then indx is the last one so break out of
-        "this loop
-        if indx2 != -1
-            let indx = indx + indx2 + lenDelim
-        else
-            break
-        endif
-    endwhile
-
-    return indx
-
-endfunction
-
-" Function: s:Left(...) {{{2
-" returns left delimiter data
-function s:Left(...)
-    let params = a:0 ? a:1 : {}
-
-    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['leftAlt'] : b:NERDCommenterDelims['left'] 
-
-    if delim == ''
-        return ''
-    endif
-
-    if has_key(params, 'space') && g:NERDSpaceDelims
-        let delim = delim . s:spaceStr
-    endif
-
-    if has_key(params, 'esc')
-        let delim = s:Esc(delim)
-    endif
-
-    return delim
-endfunction
-
-" Function: s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
-" This function takes in 2 line numbers and returns the index of the left most
-" char (that is not a space or a tab) on all of these lines.
-" Args:
-"   -countCommentedLines: 1 if lines that are commented are to be checked as
-"    well. 0 otherwise
-"   -countEmptyLines: 1 if empty lines are to be counted in the search
-"   -topline: the top line to be checked
-"   -bottomline: the bottom line to be checked
-function s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
-
-    " declare the left most index as an extreme value
-    let leftMostIndx = 1000
-
-    " go thru the block line by line updating leftMostIndx
-    let currentLine = a:topline
-    while currentLine <= a:bottomline
-
-        " get the next line and if it is allowed to be commented, or is not
-        " commented, check it
-        let theLine = getline(currentLine)
-        if a:countEmptyLines || theLine !~ '^[ \t]*$'
-            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
-                " convert spaces to tabs and get the number of leading spaces for
-                " this line and update leftMostIndx if need be
-                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-                let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') )
-                if leadSpaceOfLine < leftMostIndx
-                    let leftMostIndx = leadSpaceOfLine
-                endif
-            endif
-        endif
-
-        " move on to the next line
-        let currentLine = currentLine + 1
-    endwhile
-
-    if leftMostIndx == 1000
-        return 0
-    else
-        return leftMostIndx
-    endif
-endfunction
-
-" Function: s:Multipart() {{{2
-" returns 1 if the current delims are multipart
-function s:Multipart()
-    return s:Right() != ''
-endfunction
-
-" Function: s:NerdEcho(msg, typeOfMsg) {{{2
-" Args:
-"   -msg: the message to echo
-"   -typeOfMsg: 0 = warning message
-"               1 = normal message
-function s:NerdEcho(msg, typeOfMsg)
-    if a:typeOfMsg == 0
-        echohl WarningMsg
-        echom 'NERDCommenter:' . a:msg
-        echohl None
-    elseif a:typeOfMsg == 1
-        echom 'NERDCommenter:' . a:msg
-    endif
-endfunction
-
-" Function: s:NumberOfLeadingTabs(s) {{{2
-" returns the number of leading tabs in the given string
-function s:NumberOfLeadingTabs(s)
-    return strlen(substitute(a:s, '^\(\t*\).*$', '\1', ""))
-endfunction
-
-" Function: s:NumLinesInBuf() {{{2
-" Returns the number of lines in the current buffer
-function s:NumLinesInBuf()
-    return line('$')
-endfunction
-
-" Function: s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str) {{{2
-" This function takes in a string, 2 delimiters in that string and 2 strings
-" to replace these delimiters with.
-"
-" Args:
-"   -toReplace1: the first delimiter to replace
-"   -toReplace2: the second delimiter to replace
-"   -replacor1: the string to replace toReplace1 with
-"   -replacor2: the string to replace toReplace2 with
-"   -str: the string that the delimiters to be replaced are in
-function s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str)
-    let line = s:ReplaceLeftMostDelim(a:toReplace1, a:replacor1, a:str)
-    let line = s:ReplaceRightMostDelim(a:toReplace2, a:replacor2, line)
-    return line
-endfunction
-
-" Function: s:ReplaceLeftMostDelim(toReplace, replacor, str) {{{2
-" This function takes a string and a delimiter and replaces the left most
-" occurrence of this delimiter in the string with a given string
-"
-" Args:
-"   -toReplace: the delimiter in str that is to be replaced
-"   -replacor: the string to replace toReplace with
-"   -str: the string that contains toReplace
-function s:ReplaceLeftMostDelim(toReplace, replacor, str)
-    let toReplace = a:toReplace
-    let replacor = a:replacor
-    "get the left most occurrence of toReplace
-    let indxToReplace = s:FindDelimiterIndex(toReplace, a:str)
-
-    "if there IS an occurrence of toReplace in str then replace it and return
-    "the resulting string
-    if indxToReplace != -1
-        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
-        return line
-    endif
-
-    return a:str
-endfunction
-
-" Function: s:ReplaceRightMostDelim(toReplace, replacor, str) {{{2
-" This function takes a string and a delimiter and replaces the right most
-" occurrence of this delimiter in the string with a given string
-"
-" Args:
-"   -toReplace: the delimiter in str that is to be replaced
-"   -replacor: the string to replace toReplace with
-"   -str: the string that contains toReplace
-"
-function s:ReplaceRightMostDelim(toReplace, replacor, str)
-    let toReplace = a:toReplace
-    let replacor = a:replacor
-    let lenToReplace = strlen(toReplace)
-
-    "get the index of the last delim in str
-    let indxToReplace = s:LastIndexOfDelim(toReplace, a:str)
-
-    "if there IS a delimiter in str, replace it and return the result
-    let line = a:str
-    if indxToReplace != -1
-        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
-    endif
-    return line
-endfunction
-
-"FUNCTION: s:RestoreScreenState() {{{2
-"
-"Sets the screen state back to what it was when s:SaveScreenState was last
-"called.
-"
-function s:RestoreScreenState()
-    if !exists("t:NERDComOldTopLine") || !exists("t:NERDComOldPos")
-        throw 'NERDCommenter exception: cannot restore screen'
-    endif
-
-    call cursor(t:NERDComOldTopLine, 0)
-    normal! zt
-    call setpos(".", t:NERDComOldPos)
-endfunction
-
-" Function: s:Right(...) {{{2
-" returns right delimiter data
-function s:Right(...)
-    let params = a:0 ? a:1 : {}
-
-    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['rightAlt'] : b:NERDCommenterDelims['right'] 
-
-    if delim == ''
-        return ''
-    endif
-
-    if has_key(params, 'space') && g:NERDSpaceDelims
-        let delim = s:spaceStr . delim
-    endif
-
-    if has_key(params, 'esc')
-        let delim = s:Esc(delim)
-    endif
-
-    return delim
-endfunction
-
-" Function: s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
-" This function takes in 2 line numbers and returns the index of the right most
-" char on all of these lines.
-" Args:
-"   -countCommentedLines: 1 if lines that are commented are to be checked as
-"    well. 0 otherwise
-"   -countEmptyLines: 1 if empty lines are to be counted in the search
-"   -topline: the top line to be checked
-"   -bottomline: the bottom line to be checked
-function s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
-    let rightMostIndx = -1
-
-    " go thru the block line by line updating rightMostIndx
-    let currentLine = a:topline
-    while currentLine <= a:bottomline
-
-        " get the next line and see if it is commentable, otherwise it doesnt
-        " count
-        let theLine = getline(currentLine)
-        if a:countEmptyLines || theLine !~ '^[ \t]*$'
-
-            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
-
-                " update rightMostIndx if need be
-                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
-                let lineLen = strlen(theLine)
-                if lineLen > rightMostIndx
-                    let rightMostIndx = lineLen
-                endif
-            endif
-        endif
-
-        " move on to the next line
-        let currentLine = currentLine + 1
-    endwhile
-
-    return rightMostIndx
-endfunction
-
-"FUNCTION: s:SaveScreenState() {{{2
-"Saves the current cursor position in the current buffer and the window
-"scroll position
-function s:SaveScreenState()
-    let t:NERDComOldPos = getpos(".")
-    let t:NERDComOldTopLine = line("w0")
-endfunction
-
-" Function: s:SwapOutterMultiPartDelimsForPlaceHolders(line) {{{2
-" This function takes a line and swaps the outter most multi-part delims for
-" place holders
-" Args:
-"   -line: the line to swap the delims in
-"
-function s:SwapOutterMultiPartDelimsForPlaceHolders(line)
-    " find out if the line is commented using normal delims and/or
-    " alternate ones
-    let isCommented = s:IsCommented(s:Left(), s:Right(), a:line)
-    let isCommentedAlt = s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), a:line)
-
-    let line2 = a:line
-
-    "if the line is commented and there is a right delimiter, replace
-    "the delims with place-holders
-    if isCommented && s:Multipart()
-        let line2 = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, a:line)
-
-    "similarly if the line is commented with the alternative
-    "delimiters
-    elseif isCommentedAlt && s:AltMultipart()
-        let line2 = s:ReplaceDelims(s:Left({'alt': 1}), s:Right({'alt': 1}), g:NERDLPlace, g:NERDRPlace, a:line)
-    endif
-
-    return line2
-endfunction
-
-" Function: s:SwapOutterPlaceHoldersForMultiPartDelims(line) {{{2
-" This function takes a line and swaps the outtermost place holders for
-" multi-part delims
-" Args:
-"   -line: the line to swap the delims in
-"
-function s:SwapOutterPlaceHoldersForMultiPartDelims(line)
-    let left = ''
-    let right = ''
-    if s:Multipart()
-        let left = s:Left()
-        let right = s:Right()
-    elseif s:AltMultipart()
-        let left = s:Left({'alt': 1})
-        let right = s:Right({'alt': 1})
-    endif
-
-    let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, a:line)
-    return line
-endfunction
-" Function: s:TabbedCol(line, col) {{{2
-" Gets the col number for given line and existing col number. The new col
-" number is the col number when all leading spaces are converted to tabs
-" Args:
-"   -line:the line to get the rel col for
-"   -col: the abs col
-function s:TabbedCol(line, col)
-    let lineTruncated = strpart(a:line, 0, a:col)
-    let lineSpacesToTabs = substitute(lineTruncated, s:TabSpace(), '\t', 'g')
-    return strlen(lineSpacesToTabs)
-endfunction
-"FUNCTION: s:TabSpace() {{{2
-"returns a string of spaces equal in length to &tabstop
-function s:TabSpace()
-    let tabSpace = ""
-    let spacesPerTab = &tabstop
-    while spacesPerTab > 0
-        let tabSpace = tabSpace . " "
-        let spacesPerTab = spacesPerTab - 1
-    endwhile
-    return tabSpace
-endfunction
-
-" Function: s:UnEsc(str, escChar) {{{2
-" This function removes all the escape chars from a string
-" Args:
-"   -str: the string to remove esc chars from
-"   -escChar: the escape char to be removed
-function s:UnEsc(str, escChar)
-    return substitute(a:str, a:escChar, "", "g")
-endfunction
-
-" Function: s:UntabbedCol(line, col) {{{2
-" Takes a line and a col and returns the absolute column of col taking into
-" account that a tab is worth 3 or 4 (or whatever) spaces.
-" Args:
-"   -line:the line to get the abs col for
-"   -col: the col that doesnt take into account tabs
-function s:UntabbedCol(line, col)
-    let lineTruncated = strpart(a:line, 0, a:col)
-    let lineTabsToSpaces = substitute(lineTruncated, '\t', s:TabSpace(), 'g')
-    return strlen(lineTabsToSpaces)
-endfunction
-" Section: Comment mapping setup {{{1
-" ===========================================================================
-
-" switch to/from alternative delimiters
-nnoremap <plug>NERDCommenterAltDelims :call <SID>SwitchToAlternativeDelimiters(1)<cr>
-
-" comment out lines
-nnoremap <silent> <plug>NERDCommenterComment :call NERDComment(0, "norm")<cr>
-vnoremap <silent> <plug>NERDCommenterComment <ESC>:call NERDComment(1, "norm")<cr>
-
-" toggle comments
-nnoremap <silent> <plug>NERDCommenterToggle :call NERDComment(0, "toggle")<cr>
-vnoremap <silent> <plug>NERDCommenterToggle <ESC>:call NERDComment(1, "toggle")<cr>
-
-" minimal comments
-nnoremap <silent> <plug>NERDCommenterMinimal :call NERDComment(0, "minimal")<cr>
-vnoremap <silent> <plug>NERDCommenterMinimal <ESC>:call NERDComment(1, "minimal")<cr>
-
-" sexy comments
-nnoremap <silent> <plug>NERDCommenterSexy :call NERDComment(0, "sexy")<CR>
-vnoremap <silent> <plug>NERDCommenterSexy <ESC>:call NERDComment(1, "sexy")<CR>
-
-" invert comments
-nnoremap <silent> <plug>NERDCommenterInvert :call NERDComment(0, "invert")<CR>
-vnoremap <silent> <plug>NERDCommenterInvert <ESC>:call NERDComment(1, "invert")<CR>
-
-" yank then comment
-nmap <silent> <plug>NERDCommenterYank :call NERDComment(0, "yank")<CR>
-vmap <silent> <plug>NERDCommenterYank <ESC>:call NERDComment(1, "yank")<CR>
-
-" left aligned comments
-nnoremap <silent> <plug>NERDCommenterAlignLeft :call NERDComment(0, "alignLeft")<cr>
-vnoremap <silent> <plug>NERDCommenterAlignLeft <ESC>:call NERDComment(1, "alignLeft")<cr>
-
-" left and right aligned comments
-nnoremap <silent> <plug>NERDCommenterAlignBoth :call NERDComment(0, "alignBoth")<cr>
-vnoremap <silent> <plug>NERDCommenterAlignBoth <ESC>:call NERDComment(1, "alignBoth")<cr>
-
-" nested comments
-nnoremap <silent> <plug>NERDCommenterNest :call NERDComment(0, "nested")<cr>
-vnoremap <silent> <plug>NERDCommenterNest <ESC>:call NERDComment(1, "nested")<cr>
-
-" uncomment
-nnoremap <silent> <plug>NERDCommenterUncomment :call NERDComment(0, "uncomment")<cr>
-vnoremap <silent> <plug>NERDCommenterUncomment :call NERDComment(1, "uncomment")<cr>
-
-" comment till the end of the line
-nnoremap <silent> <plug>NERDCommenterToEOL :call NERDComment(0, "toEOL")<cr>
-
-" append comments
-nmap <silent> <plug>NERDCommenterAppend :call NERDComment(0, "append")<cr>
-
-" insert comments
-inoremap <silent> <plug>NERDCommenterInInsert <SPACE><BS><ESC>:call NERDComment(0, "insert")<CR>
-
-
-function! s:CreateMaps(target, combo)
-    if !hasmapto(a:target, 'n')
-        exec 'nmap ' . a:combo . ' ' . a:target
-    endif
-
-    if !hasmapto(a:target, 'v')
-        exec 'vmap ' . a:combo . ' ' . a:target
-    endif
-endfunction
-
-if g:NERDCreateDefaultMappings
-    call s:CreateMaps('<plug>NERDCommenterComment',    '<leader>cc')
-    call s:CreateMaps('<plug>NERDCommenterToggle',     '<leader>c<space>')
-    call s:CreateMaps('<plug>NERDCommenterMinimal',    '<leader>cm')
-    call s:CreateMaps('<plug>NERDCommenterSexy',       '<leader>cs')
-    call s:CreateMaps('<plug>NERDCommenterInvert',     '<leader>ci')
-    call s:CreateMaps('<plug>NERDCommenterYank',       '<leader>cy')
-    call s:CreateMaps('<plug>NERDCommenterAlignLeft',  '<leader>cl')
-    call s:CreateMaps('<plug>NERDCommenterAlignBoth',  '<leader>cb')
-    call s:CreateMaps('<plug>NERDCommenterNest',       '<leader>cn')
-    call s:CreateMaps('<plug>NERDCommenterUncomment',  '<leader>cu')
-    call s:CreateMaps('<plug>NERDCommenterToEOL',      '<leader>c$')
-    call s:CreateMaps('<plug>NERDCommenterAppend',     '<leader>cA')
-
-    if !hasmapto('<plug>NERDCommenterAltDelims', 'n')
-        nmap <leader>ca <plug>NERDCommenterAltDelims
-    endif
-endif
-
-
-
-" Section: Menu item setup {{{1
-" ===========================================================================
-"check if the user wants the menu to be displayed
-if g:NERDMenuMode != 0
-
-    let menuRoot = ""
-    if g:NERDMenuMode == 1
-        let menuRoot = 'comment'
-    elseif g:NERDMenuMode == 2
-        let menuRoot = '&comment'
-    elseif g:NERDMenuMode == 3
-        let menuRoot = '&Plugin.&comment'
-    endif
-
-    function! s:CreateMenuItems(target, desc, root)
-        exec 'nmenu <silent> ' . a:root . '.' . a:desc . ' ' . a:target
-        exec 'vmenu <silent> ' . a:root . '.' . a:desc . ' ' . a:target
-    endfunction
-    call s:CreateMenuItems("<plug>NERDCommenterComment",    'Comment', menuRoot)
-    call s:CreateMenuItems("<plug>NERDCommenterToggle",     'Toggle', menuRoot)
-    call s:CreateMenuItems('<plug>NERDCommenterMinimal',    'Minimal', menuRoot)
-    call s:CreateMenuItems('<plug>NERDCommenterNest',       'Nested', menuRoot)
-    exec 'nmenu <silent> '. menuRoot .'.To\ EOL <plug>NERDCommenterToEOL'
-    call s:CreateMenuItems('<plug>NERDCommenterInvert',     'Invert', menuRoot)
-    call s:CreateMenuItems('<plug>NERDCommenterSexy',       'Sexy', menuRoot)
-    call s:CreateMenuItems('<plug>NERDCommenterYank',       'Yank\ then\ comment', menuRoot)
-    exec 'nmenu <silent> '. menuRoot .'.Append <plug>NERDCommenterAppend'
-    exec 'menu <silent> '. menuRoot .'.-Sep-    :'
-    call s:CreateMenuItems('<plug>NERDCommenterAlignLeft',  'Left\ aligned', menuRoot)
-    call s:CreateMenuItems('<plug>NERDCommenterAlignBoth',  'Left\ and\ right\ aligned', menuRoot)
-    exec 'menu <silent> '. menuRoot .'.-Sep2-    :'
-    call s:CreateMenuItems('<plug>NERDCommenterUncomment',  'Uncomment', menuRoot)
-    exec 'nmenu <silent> '. menuRoot .'.Switch\ Delimiters <plug>NERDCommenterAltDelims'
-    exec 'imenu <silent> '. menuRoot .'.Insert\ Comment\ Here <plug>NERDCommenterInInsert'
-    exec 'menu <silent> '. menuRoot .'.-Sep3-    :'
-    exec 'menu <silent>'. menuRoot .'.Help :help NERDCommenterContents<CR>'
-endif
-" vim: set foldmethod=marker :
diff --git a/bundle/nerdtree/README.markdown b/bundle/nerdtree/README.markdown
deleted file mode 100755
index 9dacf68..0000000
--- a/bundle/nerdtree/README.markdown
+++ /dev/null
@@ -1,111 +0,0 @@
-The NERD Tree
-=============
-
-Intro
------
-
-The NERD tree allows you to explore your filesystem and to open files and
-directories. It presents the filesystem to you in the form of a tree which you
-manipulate with the keyboard and/or mouse. It also allows you to perform
-simple filesystem operations.
-
-The following features and functionality are provided by the NERD tree:
-
-  * Files and directories are displayed in a hierarchical tree structure
-  * Different highlighting is provided for the following types of nodes:
-    * files
-    * directories
-    * sym-links
-    * windows .lnk files
-    * read-only files
-    * executable files
-  * Many (customisable) mappings are provided to manipulate the tree:
-    * Mappings to open/close/explore directory nodes
-    * Mappings to open files in new/existing windows/tabs
-    * Mappings to change the current root of the tree
-    * Mappings to navigate around the tree
-    * ...
-  * Directories and files can be bookmarked.
-  * Most NERD tree navigation can also be done with the mouse
-  * Filtering of tree content (can be toggled at runtime)
-    * custom file filters to prevent e.g. vim backup files being displayed
-    * optional displaying of hidden files (. files)
-    * files can be "turned off" so that only directories are displayed
-  * The position and size of the NERD tree window can be customised
-  * The order in which the nodes in the tree are listed can be customised.
-  * A model of your filesystem is created/maintained as you explore it. This
-    has several advantages:
-    * All filesystem information is cached and is only re-read on demand
-    * If you revisit a part of the tree that you left earlier in your
-      session, the directory nodes will be opened/closed as you left them
-  * The script remembers the cursor position and window position in the NERD
-    tree so you can toggle it off (or just close the tree window) and then
-    reopen it (with NERDTreeToggle) the NERD tree window will appear exactly
-    as you left it
-  * You can have a separate NERD tree for each tab, share trees across tabs,
-    or a mix of both.
-  * By default the script overrides the default file browser (netrw), so if
-    you :edit a directory a (slightly modified) NERD tree will appear in the
-    current window
-  * A programmable menu system is provided (simulates right clicking on a node)
-    * one default menu plugin is provided to perform basic filesystem
-      operations (create/delete/move/copy files/directories)
-  * There's an API for adding your own keymappings
-
-Installation
-------------
-
-[pathogen.vim](https://github.com/tpope/vim-pathogen) is the recommended way to install nerdtree.
-
-    cd ~/.vim/bundle
-    git clone https://github.com/scrooloose/nerdtree.git
-
-Then reload vim, run `:Helptags`, and check out `:help NERD_tree.txt`.
-
-
-Faq
----
-
-__Q. Can I have the nerdtree on every tab automatically?__
-
-A. Nope. If this is something you want then chances are you aren't using tabs
-   and buffers as they were intended to be used. Read this
-   http://stackoverflow.com/questions/102384/using-vims-tabs-like-buffers
-
-   If you are interested in this behaviour then consider [vim-nerdtree-tabs](https://github.com/jistr/vim-nerdtree-tabs)
-
-__Q. How can I open a NERDTree automatically when vim starts up?__
-
-A. Stick this in your vimrc: `autocmd vimenter * NERDTree`
-
-__Q. How can I open a NERDTree automatically when vim starts up if no files were specified?__
-
-A. Stick this in your vimrc
-
-    autocmd StdinReadPre * let s:std_in=1
-    autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
-
-__Q. How can I map a specific key or shortcut to open NERDTree?__
-
-A. Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want): `map <C-n> :NERDTreeToggle<CR>`
-
-__Q. How can I close vim if the only window left open is a NERDTree?__
-
-A. Stick this in your vimrc:
-
-   `autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif`
-
-
-Changelog
----------
-
-4.2.0 (2011-12-28)
-
- * Add NERDTreeDirArrows option to make the UI use pretty arrow chars instead of the old +~| chars to define the tree structure (sickill)
- * shift the syntax highlighting out into its own syntax file (gnap) * add some mac specific options to the filesystem menu - for macvim only (andersonfreitas)
- * Add NERDTreeMinimalUI option to remove some non functional parts of the nerdtree ui (camthompson)
- * tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the new behaviour (benjamingeiger)
- * if no name is given to :Bookmark, make it default to the name of the target file/dir (minyoung)
- * use 'file' completion when doing copying, create, and move operations (EvanDotPro)
- * lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
-
diff --git a/bundle/nerdtree/autoload/nerdtree.vim b/bundle/nerdtree/autoload/nerdtree.vim
deleted file mode 100755
index d4128ef..0000000
--- a/bundle/nerdtree/autoload/nerdtree.vim
+++ /dev/null
@@ -1,407 +0,0 @@
-if exists("g:loaded_nerdtree_autoload")
-    finish
-endif
-let g:loaded_nerdtree_autoload = 1
-
-function! nerdtree#version()
-    return '4.2.0'
-endfunction
-
-" SECTION: General Functions {{{1
-"============================================================
-
-"FUNCTION: nerdtree#checkForBrowse(dir) {{{2
-"inits a secondary nerd tree in the current buffer if appropriate
-function! nerdtree#checkForBrowse(dir)
-    if a:dir != '' && isdirectory(a:dir)
-        call g:NERDTreeCreator.CreateSecondary(a:dir)
-    endif
-endfunction
-
-" FUNCTION: nerdtree#completeBookmarks(A,L,P) {{{2
-" completion function for the bookmark commands
-function! nerdtree#completeBookmarks(A,L,P)
-    return filter(g:NERDTreeBookmark.BookmarkNames(), 'v:val =~# "^' . a:A . '"')
-endfunction
-
-"FUNCTION: nerdtree#compareBookmarks(dir) {{{2
-function! nerdtree#compareBookmarks(first, second)
-    return a:first.compareTo(a:second)
-endfunction
-
-"FUNCTION: nerdtree#compareNodes(dir) {{{2
-function! nerdtree#compareNodes(n1, n2)
-    return a:n1.path.compareTo(a:n2.path)
-endfunction
-
-" FUNCTION: nerdtree#deprecated(func, [msg]) {{{2
-" Issue a deprecation warning for a:func. If a second arg is given, use this
-" as the deprecation message
-function! nerdtree#deprecated(func, ...)
-    let msg = a:0 ? a:func . ' ' . a:1 : a:func . ' is deprecated'
-
-    if !exists('s:deprecationWarnings')
-        let s:deprecationWarnings = {}
-    endif
-    if !has_key(s:deprecationWarnings, a:func)
-        let s:deprecationWarnings[a:func] = 1
-        echomsg msg
-    endif
-endfunction
-
-" FUNCTION: nerdtree#exec(cmd) {{{2
-" same as :exec cmd  but eventignore=all is set for the duration
-function! nerdtree#exec(cmd)
-    let old_ei = &ei
-    set ei=all
-    exec a:cmd
-    let &ei = old_ei
-endfunction
-
-" FUNCTION: nerdtree#has_opt(options, name) {{{2
-function! nerdtree#has_opt(options, name)
-    return has_key(a:options, a:name) && a:options[a:name] == 1
-endfunction
-
-" FUNCTION: nerdtree#loadClassFiles() {{{2
-function! nerdtree#loadClassFiles()
-    runtime lib/nerdtree/path.vim
-    runtime lib/nerdtree/menu_controller.vim
-    runtime lib/nerdtree/menu_item.vim
-    runtime lib/nerdtree/key_map.vim
-    runtime lib/nerdtree/bookmark.vim
-    runtime lib/nerdtree/tree_file_node.vim
-    runtime lib/nerdtree/tree_dir_node.vim
-    runtime lib/nerdtree/opener.vim
-    runtime lib/nerdtree/creator.vim
-    runtime lib/nerdtree/flag_set.vim
-    runtime lib/nerdtree/nerdtree.vim
-    runtime lib/nerdtree/ui.vim
-    runtime lib/nerdtree/event.vim
-    runtime lib/nerdtree/notifier.vim
-endfunction
-
-" FUNCTION: nerdtree#postSourceActions() {{{2
-function! nerdtree#postSourceActions()
-    call g:NERDTreeBookmark.CacheBookmarks(1)
-    call nerdtree#ui_glue#createDefaultBindings()
-
-    "load all nerdtree plugins
-    runtime! nerdtree_plugin/**/*.vim
-endfunction
-
-"FUNCTION: nerdtree#runningWindows(dir) {{{2
-function! nerdtree#runningWindows()
-    return has("win16") || has("win32") || has("win64")
-endfunction
-
-"FUNCTION: nerdtree#treeMarkupReg(dir) {{{2
-function! nerdtree#treeMarkupReg()
-    if g:NERDTreeDirArrows
-        return '^\([▾▸] \| \+[▾▸] \| \+\)'
-    endif
-
-    return '^[ `|]*[\-+~]'
-endfunction
-
-"FUNCTION: nerdtree#treeUpDirLine(dir) {{{2
-function! nerdtree#treeUpDirLine()
-    return '.. (up a dir)'
-endfunction
-
-"FUNCTION: nerdtree#treeWid(dir) {{{2
-function! nerdtree#treeWid()
-    return 2
-endfunction
-
-" SECTION: View Functions {{{1
-"============================================================
-
-"FUNCTION: nerdtree#closeTree() {{{2
-"Closes the primary NERD tree window for this tab
-function! nerdtree#closeTree()
-    if !nerdtree#isTreeOpen()
-        throw "NERDTree.NoTreeFoundError: no NERDTree is open"
-    endif
-
-    if winnr("$") != 1
-        if winnr() == nerdtree#getTreeWinNum()
-            call nerdtree#exec("wincmd p")
-            let bufnr = bufnr("")
-            call nerdtree#exec("wincmd p")
-        else
-            let bufnr = bufnr("")
-        endif
-
-        call nerdtree#exec(nerdtree#getTreeWinNum() . " wincmd w")
-        close
-        call nerdtree#exec(bufwinnr(bufnr) . " wincmd w")
-    else
-        close
-    endif
-endfunction
-
-"FUNCTION: nerdtree#closeTreeIfOpen() {{{2
-"Closes the NERD tree window if it is open
-function! nerdtree#closeTreeIfOpen()
-   if nerdtree#isTreeOpen()
-      call nerdtree#closeTree()
-   endif
-endfunction
-
-"FUNCTION: nerdtree#closeTreeIfQuitOnOpen() {{{2
-"Closes the NERD tree window if the close on open option is set
-function! nerdtree#closeTreeIfQuitOnOpen()
-    if g:NERDTreeQuitOnOpen && nerdtree#isTreeOpen()
-        call nerdtree#closeTree()
-    endif
-endfunction
-
-"FUNCTION: nerdtree#dumpHelp  {{{2
-"prints out the quick help
-function! nerdtree#dumpHelp()
-    let old_h = @h
-    if b:treeShowHelp ==# 1
-        let @h=   "\" NERD tree (" . nerdtree#version() . ") quickhelp~\n"
-        let @h=@h."\" ============================\n"
-        let @h=@h."\" File node mappings~\n"
-        let @h=@h."\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n"
-        let @h=@h."\" <CR>,\n"
-        if b:NERDTreeType ==# "primary"
-            let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in prev window\n"
-        else
-            let @h=@h."\" ". g:NERDTreeMapActivateNode .": open in current window\n"
-        endif
-        if b:NERDTreeType ==# "primary"
-            let @h=@h."\" ". g:NERDTreeMapPreview .": preview\n"
-        endif
-        let @h=@h."\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
-        let @h=@h."\" middle-click,\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenSplit .": open split\n"
-        let @h=@h."\" ". g:NERDTreeMapPreviewSplit .": preview split\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenVSplit .": open vsplit\n"
-        let @h=@h."\" ". g:NERDTreeMapPreviewVSplit .": preview vsplit\n"
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Directory node mappings~\n"
-        let @h=@h."\" ". (g:NERDTreeMouseMode ==# 1 ? "double" : "single") ."-click,\n"
-        let @h=@h."\" ". g:NERDTreeMapActivateNode .": open & close node\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenRecursively .": recursively open node\n"
-        let @h=@h."\" ". g:NERDTreeMapCloseDir .": close parent of node\n"
-        let @h=@h."\" ". g:NERDTreeMapCloseChildren .": close all child nodes of\n"
-        let @h=@h."\"    current node recursively\n"
-        let @h=@h."\" middle-click,\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenExpl.": explore selected dir\n"
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Bookmark table mappings~\n"
-        let @h=@h."\" double-click,\n"
-        let @h=@h."\" ". g:NERDTreeMapActivateNode .": open bookmark\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
-        let @h=@h."\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
-        let @h=@h."\" ". g:NERDTreeMapDeleteBookmark .": delete bookmark\n"
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Tree navigation mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpRoot .": go to root\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpParent .": go to parent\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpFirstChild  .": go to first child\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpLastChild   .": go to last child\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpNextSibling .": go to next sibling\n"
-        let @h=@h."\" ". g:NERDTreeMapJumpPrevSibling .": go to prev sibling\n"
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Filesystem mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapChangeRoot .": change tree root to the\n"
-        let @h=@h."\"    selected dir\n"
-        let @h=@h."\" ". g:NERDTreeMapUpdir .": move tree root up a dir\n"
-        let @h=@h."\" ". g:NERDTreeMapUpdirKeepOpen .": move tree root up a dir\n"
-        let @h=@h."\"    but leave old root open\n"
-        let @h=@h."\" ". g:NERDTreeMapRefresh .": refresh cursor dir\n"
-        let @h=@h."\" ". g:NERDTreeMapRefreshRoot .": refresh current root\n"
-        let @h=@h."\" ". g:NERDTreeMapMenu .": Show menu\n"
-        let @h=@h."\" ". g:NERDTreeMapChdir .":change the CWD to the\n"
-        let @h=@h."\"    selected dir\n"
-        let @h=@h."\" ". g:NERDTreeMapCWD .":change tree root to CWD\n"
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Tree filtering mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (b:NERDTreeShowHidden ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFilters .": file filters (" . (b:NERDTreeIgnoreEnabled ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleFiles .": files (" . (b:NERDTreeShowFiles ? "on" : "off") . ")\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (b:NERDTreeShowBookmarks ? "on" : "off") . ")\n"
-
-        "add quickhelp entries for each custom key map
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Custom mappings~\n"
-        for i in g:NERDTreeKeyMap.All()
-            if !empty(i.quickhelpText)
-                let @h=@h."\" ". i.key .": ". i.quickhelpText ."\n"
-            endif
-        endfor
-
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Other mappings~\n"
-        let @h=@h."\" ". g:NERDTreeMapQuit .": Close the NERDTree window\n"
-        let @h=@h."\" ". g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n"
-        let @h=@h."\"    the NERDTree window\n"
-        let @h=@h."\" ". g:NERDTreeMapHelp .": toggle help\n"
-        let @h=@h."\"\n\" ----------------------------\n"
-        let @h=@h."\" Bookmark commands~\n"
-        let @h=@h."\" :Bookmark [<name>]\n"
-        let @h=@h."\" :BookmarkToRoot <name>\n"
-        let @h=@h."\" :RevealBookmark <name>\n"
-        let @h=@h."\" :OpenBookmark <name>\n"
-        let @h=@h."\" :ClearBookmarks [<names>]\n"
-        let @h=@h."\" :ClearAllBookmarks\n"
-        silent! put h
-    elseif g:NERDTreeMinimalUI == 0
-        let @h="\" Press ". g:NERDTreeMapHelp ." for help\n"
-        silent! put h
-    endif
-
-    let @h = old_h
-endfunction
-
-"FUNCTION: nerdtree#echo  {{{2
-"A wrapper for :echo. Appends 'NERDTree:' on the front of all messages
-"
-"Args:
-"msg: the message to echo
-function! nerdtree#echo(msg)
-    redraw
-    echomsg "NERDTree: " . a:msg
-endfunction
-
-"FUNCTION: nerdtree#echoError {{{2
-"Wrapper for nerdtree#echo, sets the message type to errormsg for this message
-"Args:
-"msg: the message to echo
-function! nerdtree#echoError(msg)
-    echohl errormsg
-    call nerdtree#echo(a:msg)
-    echohl normal
-endfunction
-
-"FUNCTION: nerdtree#echoWarning {{{2
-"Wrapper for nerdtree#echo, sets the message type to warningmsg for this message
-"Args:
-"msg: the message to echo
-function! nerdtree#echoWarning(msg)
-    echohl warningmsg
-    call nerdtree#echo(a:msg)
-    echohl normal
-endfunction
-
-"FUNCTION: nerdtree#getTreeWinNum() {{{2
-"gets the nerd tree window number for this tab
-function! nerdtree#getTreeWinNum()
-    if exists("t:NERDTreeBufName")
-        return bufwinnr(t:NERDTreeBufName)
-    else
-        return -1
-    endif
-endfunction
-
-"FUNCTION: nerdtree#isTreeOpen() {{{2
-function! nerdtree#isTreeOpen()
-    return nerdtree#getTreeWinNum() != -1
-endfunction
-
-"FUNCTION: nerdtree#putCursorOnBookmarkTable(){{{2
-"Places the cursor at the top of the bookmarks table
-function! nerdtree#putCursorOnBookmarkTable()
-    if !b:NERDTreeShowBookmarks
-        throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active"
-    endif
-
-    if g:NERDTreeMinimalUI
-        return cursor(1, 2)
-    endif
-
-    let rootNodeLine = b:NERDTree.ui.getRootLineNum()
-
-    let line = 1
-    while getline(line) !~# '^>-\+Bookmarks-\+$'
-        let line = line + 1
-        if line >= rootNodeLine
-            throw "NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table"
-        endif
-    endwhile
-    call cursor(line, 2)
-endfunction
-
-"FUNCTION: nerdtree#putCursorInTreeWin(){{{2
-"Places the cursor in the nerd tree window
-function! nerdtree#putCursorInTreeWin()
-    if !nerdtree#isTreeOpen()
-        throw "NERDTree.InvalidOperationError: cant put cursor in NERD tree window, no window exists"
-    endif
-
-    call nerdtree#exec(nerdtree#getTreeWinNum() . "wincmd w")
-endfunction
-
-"FUNCTION: nerdtree#renderBookmarks {{{2
-function! nerdtree#renderBookmarks()
-
-    if g:NERDTreeMinimalUI == 0
-        call setline(line(".")+1, ">----------Bookmarks----------")
-        call cursor(line(".")+1, col("."))
-    endif
-
-    for i in g:NERDTreeBookmark.Bookmarks()
-        call setline(line(".")+1, i.str())
-        call cursor(line(".")+1, col("."))
-    endfor
-
-    call setline(line(".")+1, '')
-    call cursor(line(".")+1, col("."))
-endfunction
-
-"FUNCTION: nerdtree#renderView {{{2
-function! nerdtree#renderView()
-    call b:NERDTree.render()
-endfunction
-"
-"FUNCTION: nerdtree#stripMarkupFromLine(line, removeLeadingSpaces){{{2
-"returns the given line with all the tree parts stripped off
-"
-"Args:
-"line: the subject line
-"removeLeadingSpaces: 1 if leading spaces are to be removed (leading spaces =
-"any spaces before the actual text of the node)
-function! nerdtree#stripMarkupFromLine(line, removeLeadingSpaces)
-    let line = a:line
-    "remove the tree parts and the leading space
-    let line = substitute (line, nerdtree#treeMarkupReg(),"","")
-
-    "strip off any read only flag
-    let line = substitute (line, ' \[RO\]', "","")
-
-    "strip off any bookmark flags
-    let line = substitute (line, ' {[^}]*}', "","")
-
-    "strip off any executable flags
-    let line = substitute (line, '*\ze\($\| \)', "","")
-
-    "strip off any generic flags
-    let line = substitute (line, '\[[^]]*\]', "","")
-
-    let wasdir = 0
-    if line =~# '/$'
-        let wasdir = 1
-    endif
-    let line = substitute (line,' -> .*',"","") " remove link to
-    if wasdir ==# 1
-        let line = substitute (line, '/\?$', '/', "")
-    endif
-
-    if a:removeLeadingSpaces
-        let line = substitute (line, '^ *', '', '')
-    endif
-
-    return line
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/autoload/nerdtree/ui_glue.vim b/bundle/nerdtree/autoload/nerdtree/ui_glue.vim
deleted file mode 100755
index 8607389..0000000
--- a/bundle/nerdtree/autoload/nerdtree/ui_glue.vim
+++ /dev/null
@@ -1,644 +0,0 @@
-if exists("g:loaded_nerdtree_ui_glue_autoload")
-    finish
-endif
-let g:loaded_nerdtree_ui_glue_autoload = 1
-
-" FUNCTION: nerdtree#ui_glue#createDefaultBindings() {{{1
-function! nerdtree#ui_glue#createDefaultBindings()
-    let s = '<SNR>' . s:SID() . '_'
-
-    call NERDTreeAddKeyMap({ 'key': '<MiddleRelease>', 'scope': "all", 'callback': s."handleMiddleMouse" })
-    call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': "all", 'callback': s."handleLeftClick" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "DirNode", 'callback': s."activateDirNode" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "FileNode", 'callback': s."activateFileNode" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "Bookmark", 'callback': s."activateBookmark" })
-    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "all", 'callback': s."activateAll" })
-
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "DirNode", 'callback': s."activateDirNode" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "FileNode", 'callback': s."activateFileNode" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "Bookmark", 'callback': s."activateBookmark" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "all", 'callback': s."activateAll" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Node", 'callback': s."openHSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Node", 'callback': s."openVSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Bookmark", 'callback': s."openHSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Bookmark", 'callback': s."openVSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Node", 'callback': s."previewNodeCurrent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Node", 'callback': s."previewNodeVSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Node", 'callback': s."previewNodeHSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Bookmark", 'callback': s."previewNodeCurrent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Bookmark", 'callback': s."previewNodeVSplit" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Bookmark", 'callback': s."previewNodeHSplit" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': "DirNode", 'callback': s."openNodeRecursively" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': "all", 'callback': s."upDirCurrentRootClosed" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': "all", 'callback': s."upDirCurrentRootOpen" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': "Node", 'callback': s."chRoot" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': "Node", 'callback': s."chCwd" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#ui_glue#chRootCwd" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': "all", 'callback': s."displayHelp" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': "all", 'callback': s."toggleZoom" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': "all", 'callback': s."toggleShowHidden" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': "all", 'callback': s."toggleIgnoreFilter" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': "all", 'callback': s."toggleShowFiles" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': "all", 'callback': s."toggleShowBookmarks" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': "Node", 'callback': s."closeCurrentDir" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': "DirNode", 'callback': s."closeChildren" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': "Node", 'callback': s."showMenu" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': "Node", 'callback': s."jumpToParent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': "Node", 'callback': s."jumpToFirstChild" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': "Node", 'callback': s."jumpToLastChild" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': "all", 'callback': s."jumpToRoot" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': "Node", 'callback': s."jumpToNextSibling" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': "Node", 'callback': s."jumpToPrevSibling" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Node", 'callback': s."openInNewTab" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Node", 'callback': s."openInNewTabSilent" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Bookmark", 'callback': s."openInNewTab" })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Bookmark", 'callback': s."openInNewTabSilent" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "DirNode", 'callback': s."openExplorer" })
-
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': "Bookmark", 'callback': s."deleteBookmark" })
-endfunction
-
-
-"SECTION: Interface bindings {{{1
-"============================================================
-
-"FUNCTION: s:activateAll() {{{1
-"handle the user activating the updir line
-function! s:activateAll()
-    if getline(".") ==# nerdtree#treeUpDirLine()
-        return nerdtree#ui_glue#upDir(0)
-    endif
-endfunction
-
-"FUNCTION: s:activateDirNode() {{{1
-"handle the user activating a tree node
-function! s:activateDirNode(node)
-    call a:node.activate({'reuse': 1})
-endfunction
-
-"FUNCTION: s:activateFileNode() {{{1
-"handle the user activating a tree node
-function! s:activateFileNode(node)
-    call a:node.activate({'reuse': 1, 'where': 'p'})
-endfunction
-
-"FUNCTION: s:activateBookmark() {{{1
-"handle the user activating a bookmark
-function! s:activateBookmark(bm)
-    call a:bm.activate(!a:bm.path.isDirectory ? {'where': 'p'} : {})
-endfunction
-
-" FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
-" Associate the current node with the given name
-function! nerdtree#ui_glue#bookmarkNode(...)
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    if currentNode != {}
-        let name = a:1
-        if empty(name)
-            let name = currentNode.path.getLastPathComponent(0)
-        endif
-        try
-            call currentNode.bookmark(name)
-            call b:NERDTree.render()
-        catch /^NERDTree.IllegalBookmarkNameError/
-            call nerdtree#echo("bookmark names must not contain spaces")
-        endtry
-    else
-        call nerdtree#echo("select a node first")
-    endif
-endfunction
-
-" FUNCTION: s:chCwd(node) {{{1
-function! s:chCwd(node)
-    try
-        call a:node.path.changeToDir()
-    catch /^NERDTree.PathChangeError/
-        call nerdtree#echoWarning("could not change cwd")
-    endtry
-endfunction
-
-" FUNCTION: s:chRoot(node) {{{1
-" changes the current root to the selected one
-function! s:chRoot(node)
-    call a:node.makeRoot()
-    call b:NERDTree.render()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
-endfunction
-
-" FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
-" changes the current root to CWD
-function! nerdtree#ui_glue#chRootCwd()
-    try
-        let cwd = g:NERDTreePath.New(getcwd())
-    catch /^NERDTree.InvalidArgumentsError/
-        call nerdtree#echo("current directory does not exist.")
-        return
-    endtry
-    if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
-       return
-    endif
-    call s:chRoot(g:NERDTreeDirNode.New(cwd))
-endfunction
-
-" FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
-function! nerdtree#ui_glue#clearBookmarks(bookmarks)
-    if a:bookmarks ==# ''
-        let currentNode = g:NERDTreeFileNode.GetSelected()
-        if currentNode != {}
-            call currentNode.clearBookmarks()
-        endif
-    else
-        for name in split(a:bookmarks, ' ')
-            let bookmark = g:NERDTreeBookmark.BookmarkFor(name)
-            call bookmark.delete()
-        endfor
-    endif
-    call b:NERDTree.render()
-endfunction
-
-" FUNCTION: s:closeChildren(node) {{{1
-" closes all childnodes of the current node
-function! s:closeChildren(node)
-    call a:node.closeChildren()
-    call b:NERDTree.render()
-    call a:node.putCursorHere(0, 0)
-endfunction
-
-" FUNCTION: s:closeCurrentDir(node) {{{1
-" closes the parent dir of the current node
-function! s:closeCurrentDir(node)
-    let parent = a:node.parent
-    if parent ==# {} || parent.isRoot()
-        call nerdtree#echo("cannot close tree root")
-    else
-        while g:NERDTreeCascadeOpenSingleChildDir && !parent.parent.isRoot()
-            if parent.parent.getVisibleChildCount() == 1
-                call parent.close()
-                let parent = parent.parent
-            else
-                break
-            endif
-        endwhile
-        call parent.close()
-        call b:NERDTree.render()
-        call parent.putCursorHere(0, 0)
-    endif
-endfunction
-
-" FUNCTION: s:closeTreeWindow() {{{1
-" close the tree window
-function! s:closeTreeWindow()
-    if b:NERDTreeType ==# "secondary" && b:NERDTreePreviousBuf != -1
-        exec "buffer " . b:NERDTreePreviousBuf
-    else
-        if winnr("$") > 1
-            call nerdtree#closeTree()
-        else
-            call nerdtree#echo("Cannot close last window")
-        endif
-    endif
-endfunction
-
-" FUNCTION: s:deleteBookmark(bm) {{{1
-" if the cursor is on a bookmark, prompt to delete
-function! s:deleteBookmark(bm)
-    echo  "Are you sure you wish to delete the bookmark:\n\"" . a:bm.name . "\" (yN):"
-
-    if  nr2char(getchar()) ==# 'y'
-        try
-            call a:bm.delete()
-            call b:NERDTree.render()
-            redraw
-        catch /^NERDTree/
-            call nerdtree#echoWarning("Could not remove bookmark")
-        endtry
-    else
-        call nerdtree#echo("delete aborted" )
-    endif
-
-endfunction
-
-" FUNCTION: s:displayHelp() {{{1
-" toggles the help display
-function! s:displayHelp()
-    let b:treeShowHelp = b:treeShowHelp ? 0 : 1
-    call b:NERDTree.render()
-    call b:NERDTree.ui.centerView()
-endfunction
-
-" FUNCTION: s:findAndRevealPath() {{{1
-function! s:findAndRevealPath()
-    try
-        let p = g:NERDTreePath.New(expand("%:p"))
-    catch /^NERDTree.InvalidArgumentsError/
-        call nerdtree#echo("no file for the current buffer")
-        return
-    endtry
-
-    if p.isUnixHiddenPath()
-        let showhidden=g:NERDTreeShowHidden
-        let g:NERDTreeShowHidden = 1
-    endif
-
-    if !g:NERDTree.ExistsForTab()
-        try
-            let cwd = g:NERDTreePath.New(getcwd())
-        catch /^NERDTree.InvalidArgumentsError/
-            call nerdtree#echo("current directory does not exist.")
-            let cwd = p.getParent()
-        endtry
-
-        if p.isUnder(cwd)
-            call g:NERDTreeCreator.CreatePrimary(cwd.str())
-        else
-            call g:NERDTreeCreator.CreatePrimary(p.getParent().str())
-        endif
-    else
-        if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
-            if !nerdtree#isTreeOpen()
-                call g:NERDTreeCreator.TogglePrimary('')
-            else
-                call nerdtree#putCursorInTreeWin()
-            endif
-            let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-            call s:chRoot(g:NERDTreeDirNode.New(p.getParent()))
-        else
-            if !nerdtree#isTreeOpen()
-                call g:NERDTreeCreator.TogglePrimary("")
-            endif
-        endif
-    endif
-    call nerdtree#putCursorInTreeWin()
-    call b:NERDTreeRoot.reveal(p)
-
-    if p.isUnixHiddenFile()
-        let g:NERDTreeShowHidden = showhidden
-    endif
-endfunction
-
-"FUNCTION: s:handleLeftClick() {{{1
-"Checks if the click should open the current node
-function! s:handleLeftClick()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    if currentNode != {}
-
-        "the dir arrows are multibyte chars, and vim's string functions only
-        "deal with single bytes - so split the line up with the hack below and
-        "take the line substring manually
-        let line = split(getline(line(".")), '\zs')
-        let startToCur = ""
-        for i in range(0,len(line)-1)
-            let startToCur .= line[i]
-        endfor
-
-        if currentNode.path.isDirectory
-            if startToCur =~# nerdtree#treeMarkupReg() && startToCur =~# '[+~▾▸] \?$'
-                call currentNode.activate()
-                return
-            endif
-        endif
-
-        if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3
-            let char = strpart(startToCur, strlen(startToCur)-1, 1)
-            if char !~# nerdtree#treeMarkupReg()
-                if currentNode.path.isDirectory
-                    call currentNode.activate()
-                else
-                    call currentNode.activate({'reuse': 1, 'where': 'p'})
-                endif
-                return
-            endif
-        endif
-    endif
-endfunction
-
-" FUNCTION: s:handleMiddleMouse() {{{1
-function! s:handleMiddleMouse()
-    let curNode = g:NERDTreeFileNode.GetSelected()
-    if curNode ==# {}
-        call nerdtree#echo("Put the cursor on a node first" )
-        return
-    endif
-
-    if curNode.path.isDirectory
-        call nerdtree#openExplorer(curNode)
-    else
-        call curNode.open({'where': 'h'})
-    endif
-endfunction
-
-" FUNCTION: s:jumpToChild(direction) {{{2
-" Args:
-" direction: 0 if going to first child, 1 if going to last
-function! s:jumpToChild(currentNode, direction)
-    if a:currentNode.isRoot()
-        return nerdtree#echo("cannot jump to " . (a:direction ? "last" : "first") .  " child")
-    end
-    let dirNode = a:currentNode.parent
-    let childNodes = dirNode.getVisibleChildren()
-
-    let targetNode = childNodes[0]
-    if a:direction
-        let targetNode = childNodes[len(childNodes) - 1]
-    endif
-
-    if targetNode.equals(a:currentNode)
-        let siblingDir = a:currentNode.parent.findOpenDirSiblingWithVisibleChildren(a:direction)
-        if siblingDir != {}
-            let indx = a:direction ? siblingDir.getVisibleChildCount()-1 : 0
-            let targetNode = siblingDir.getChildByIndex(indx, 1)
-        endif
-    endif
-
-    call targetNode.putCursorHere(1, 0)
-
-    call b:NERDTree.ui.centerView()
-endfunction
-
-
-" FUNCTION: nerdtree#ui_glue#invokeKeyMap(key) {{{1
-"this is needed since I cant figure out how to invoke dict functions from a
-"key map
-function! nerdtree#ui_glue#invokeKeyMap(key)
-    call g:NERDTreeKeyMap.Invoke(a:key)
-endfunction
-
-" FUNCTION: s:jumpToFirstChild() {{{1
-" wrapper for the jump to child method
-function! s:jumpToFirstChild(node)
-    call s:jumpToChild(a:node, 0)
-endfunction
-
-" FUNCTION: s:jumpToLastChild() {{{1
-" wrapper for the jump to child method
-function! s:jumpToLastChild(node)
-    call s:jumpToChild(a:node, 1)
-endfunction
-
-" FUNCTION: s:jumpToParent(node) {{{1
-" moves the cursor to the parent of the current node
-function! s:jumpToParent(node)
-    if !empty(a:node.parent)
-        call a:node.parent.putCursorHere(1, 0)
-        call b:NERDTree.ui.centerView()
-    else
-        call nerdtree#echo("cannot jump to parent")
-    endif
-endfunction
-
-" FUNCTION: s:jumpToRoot() {{{1
-" moves the cursor to the root node
-function! s:jumpToRoot()
-    call b:NERDTreeRoot.putCursorHere(1, 0)
-    call b:NERDTree.ui.centerView()
-endfunction
-
-" FUNCTION: s:jumpToNextSibling(node) {{{1
-function! s:jumpToNextSibling(node)
-    call s:jumpToSibling(a:node, 1)
-endfunction
-
-" FUNCTION: s:jumpToPrevSibling(node) {{{1
-function! s:jumpToPrevSibling(node)
-    call s:jumpToSibling(a:node, 0)
-endfunction
-
-" FUNCTION: s:jumpToSibling(currentNode, forward) {{{2
-" moves the cursor to the sibling of the current node in the given direction
-"
-" Args:
-" forward: 1 if the cursor should move to the next sibling, 0 if it should
-" move back to the previous sibling
-function! s:jumpToSibling(currentNode, forward)
-    let sibling = a:currentNode.findSibling(a:forward)
-
-    if !empty(sibling)
-        call sibling.putCursorHere(1, 0)
-        call b:NERDTree.ui.centerView()
-    endif
-endfunction
-
-" FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
-" put the cursor on the given bookmark and, if its a file, open it
-function! nerdtree#ui_glue#openBookmark(name)
-    try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
-        call targetNode.putCursorHere(0, 1)
-        redraw!
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-        call nerdtree#echo("note - target node is not cached")
-        let bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
-        let targetNode = g:NERDTreeFileNode.New(bookmark.path)
-    endtry
-    if targetNode.path.isDirectory
-        call targetNode.openExplorer()
-    else
-        call targetNode.open({'where': 'p'})
-    endif
-endfunction
-
-" FUNCTION: s:openHSplit(target) {{{1
-function! s:openHSplit(target)
-    call a:target.activate({'where': 'h'})
-endfunction
-
-" FUNCTION: s:openVSplit(target) {{{1
-function! s:openVSplit(target)
-    call a:target.activate({'where': 'v'})
-endfunction
-
-" FUNCTION: s:openExplorer(node) {{{1
-function! s:openExplorer(node)
-    call a:node.openExplorer()
-endfunction
-
-" FUNCTION: s:openInNewTab(target) {{{1
-function! s:openInNewTab(target)
-    call a:target.activate({'where': 't'})
-endfunction
-
-" FUNCTION: s:openInNewTabSilent(target) {{{1
-function! s:openInNewTabSilent(target)
-    call a:target.activate({'where': 't', 'stay': 1})
-endfunction
-
-" FUNCTION: s:openNodeRecursively(node) {{{1
-function! s:openNodeRecursively(node)
-    call nerdtree#echo("Recursively opening node. Please wait...")
-    call a:node.openRecursively()
-    call b:NERDTree.render()
-    redraw
-    call nerdtree#echo("Recursively opening node. Please wait... DONE")
-endfunction
-
-"FUNCTION: s:previewNodeCurrent(node) {{{1
-function! s:previewNodeCurrent(node)
-    call a:node.open({'stay': 1, 'where': 'p', 'keepopen': 1})
-endfunction
-
-"FUNCTION: s:previewNodeHSplit(node) {{{1
-function! s:previewNodeHSplit(node)
-    call a:node.open({'stay': 1, 'where': 'h', 'keepopen': 1})
-endfunction
-
-"FUNCTION: s:previewNodeVSplit(node) {{{1
-function! s:previewNodeVSplit(node)
-    call a:node.open({'stay': 1, 'where': 'v', 'keepopen': 1})
-endfunction
-
-" FUNCTION: nerdtree#ui_glue#revealBookmark(name) {{{1
-" put the cursor on the node associate with the given name
-function! nerdtree#ui_glue#revealBookmark(name)
-    try
-        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0)
-        call targetNode.putCursorHere(0, 1)
-    catch /^NERDTree.BookmarkNotFoundError/
-        call nerdtree#echo("Bookmark isnt cached under the current root")
-    endtry
-endfunction
-
-" FUNCTION: s:refreshRoot() {{{1
-" Reloads the current root. All nodes below this will be lost and the root dir
-" will be reloaded.
-function! s:refreshRoot()
-    call nerdtree#echo("Refreshing the root node. This could take a while...")
-    call b:NERDTreeRoot.refresh()
-    call b:NERDTree.render()
-    redraw
-    call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
-endfunction
-
-" FUNCTION: s:refreshCurrent(node) {{{1
-" refreshes the root for the current node
-function! s:refreshCurrent(node)
-    let node = a:node
-    if !node.path.isDirectory
-        let node = node.parent
-    endif
-
-    call nerdtree#echo("Refreshing node. This could take a while...")
-    call node.refresh()
-    call b:NERDTree.render()
-    redraw
-    call nerdtree#echo("Refreshing node. This could take a while... DONE")
-endfunction
-
-" FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
-function! nerdtree#ui_glue#setupCommands()
-    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreatePrimary('<args>')
-    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.TogglePrimary('<args>')
-    command! -n=0 -bar NERDTreeClose :call nerdtree#closeTreeIfOpen()
-    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
-    command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
-    command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
-    command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
-    command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
-endfunction
-
-" Function: s:SID()   {{{1
-function s:SID()
-    if !exists("s:sid")
-        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
-    endif
-    return s:sid
-endfun
-
-" FUNCTION: s:showMenu(node) {{{1
-function! s:showMenu(node)
-    let mc = g:NERDTreeMenuController.New(g:NERDTreeMenuItem.AllEnabled())
-    call mc.showMenu()
-endfunction
-
-" FUNCTION: s:toggleIgnoreFilter() {{{1
-function! s:toggleIgnoreFilter()
-    call b:NERDTree.ui.toggleIgnoreFilter()
-endfunction
-
-" FUNCTION: s:toggleShowBookmarks() {{{1
-function! s:toggleShowBookmarks()
-    call b:NERDTree.ui.toggleShowBookmarks()
-endfunction
-
-" FUNCTION: s:toggleShowFiles() {{{1
-function! s:toggleShowFiles()
-    call b:NERDTree.ui.toggleShowFiles()
-endfunction
-
-" FUNCTION: s:toggleShowHidden() {{{1
-" toggles the display of hidden files
-function! s:toggleShowHidden()
-    call b:NERDTree.ui.toggleShowHidden()
-endfunction
-
-" FUNCTION: s:toggleZoom() {{{1
-function! s:toggleZoom()
-    call b:NERDTree.ui.toggleZoom()
-endfunction
-
-"FUNCTION: nerdtree#ui_glue#upDir(keepState) {{{1
-"moves the tree up a level
-"
-"Args:
-"keepState: 1 if the current root should be left open when the tree is
-"re-rendered
-function! nerdtree#ui_glue#upDir(keepState)
-    let cwd = b:NERDTreeRoot.path.str({'format': 'UI'})
-    if cwd ==# "/" || cwd =~# '^[^/]..$'
-        call nerdtree#echo("already at top dir")
-    else
-        if !a:keepState
-            call b:NERDTreeRoot.close()
-        endif
-
-        let oldRoot = b:NERDTreeRoot
-
-        if empty(b:NERDTreeRoot.parent)
-            let path = b:NERDTreeRoot.path.getParent()
-            let newRoot = g:NERDTreeDirNode.New(path)
-            call newRoot.open()
-            call newRoot.transplantChild(b:NERDTreeRoot)
-            let b:NERDTreeRoot = newRoot
-        else
-            let b:NERDTreeRoot = b:NERDTreeRoot.parent
-        endif
-
-        if g:NERDTreeChDirMode ==# 2
-            call b:NERDTreeRoot.path.changeToDir()
-        endif
-
-        call b:NERDTree.render()
-        call oldRoot.putCursorHere(0, 0)
-    endif
-endfunction
-
-" FUNCTION: s:upDirCurrentRootOpen() {{{1
-function! s:upDirCurrentRootOpen()
-    call nerdtree#ui_glue#upDir(1)
-endfunction
-
-" FUNCTION: s:upDirCurrentRootClosed() {{{1
-function! s:upDirCurrentRootClosed()
-    call nerdtree#ui_glue#upDir(0)
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/doc/NERD_tree.txt b/bundle/nerdtree/doc/NERD_tree.txt
deleted file mode 100755
index 5d5b3f6..0000000
--- a/bundle/nerdtree/doc/NERD_tree.txt
+++ /dev/null
@@ -1,1379 +0,0 @@
-*NERD_tree.txt*   A tree explorer plugin that owns your momma!
-
-
-
-    omg its ... ~
-
-    ________  ________   _   ____________  ____     __________  ____________~
-   /_  __/ / / / ____/  / | / / ____/ __ \/ __ \   /_  __/ __ \/ ____/ ____/~
-    / / / /_/ / __/    /  |/ / __/ / /_/ / / / /    / / / /_/ / __/ / __/   ~
-   / / / __  / /___   / /|  / /___/ _, _/ /_/ /    / / / _, _/ /___/ /___   ~
-  /_/ /_/ /_/_____/  /_/ |_/_____/_/ |_/_____/    /_/ /_/ |_/_____/_____/   ~
-
-
-                              Reference Manual~
-
-
-
-
-==============================================================================
-CONTENTS                                                   *NERDTree-contents*
-
-    1.Intro...................................|NERDTree|
-    2.Functionality provided..................|NERDTreeFunctionality|
-        2.1.Global commands...................|NERDTreeGlobalCommands|
-        2.2.Bookmarks.........................|NERDTreeBookmarks|
-            2.2.1.The bookmark table..........|NERDTreeBookmarkTable|
-            2.2.2.Bookmark commands...........|NERDTreeBookmarkCommands|
-            2.2.3.Invalid bookmarks...........|NERDTreeInvalidBookmarks|
-        2.3.NERD tree mappings................|NERDTreeMappings|
-        2.4.The NERD tree menu................|NERDTreeMenu|
-    3.Options.................................|NERDTreeOptions|
-        3.1.Option summary....................|NERDTreeOptionSummary|
-        3.2.Option details....................|NERDTreeOptionDetails|
-    4.The NERD tree API.......................|NERDTreeAPI|
-        4.1.Key map API.......................|NERDTreeKeymapAPI|
-        4.2.Menu API..........................|NERDTreeMenuAPI|
-    5.About...................................|NERDTreeAbout|
-    6.Changelog...............................|NERDTreeChangelog|
-    7.Credits.................................|NERDTreeCredits|
-    8.License.................................|NERDTreeLicense|
-
-==============================================================================
-1. Intro                                                            *NERDTree*
-
-What is this "NERD tree"??
-
-The NERD tree allows you to explore your filesystem and to open files and
-directories. It presents the filesystem to you in the form of a tree which you
-manipulate with the keyboard and/or mouse. It also allows you to perform
-simple filesystem operations.
-
-The following features and functionality are provided by the NERD tree:
-    * Files and directories are displayed in a hierarchical tree structure
-    * Different highlighting is provided for the following types of nodes:
-        * files
-        * directories
-        * sym-links
-        * windows .lnk files
-        * read-only files
-        * executable files
-    * Many (customisable) mappings are provided to manipulate the tree:
-        * Mappings to open/close/explore directory nodes
-        * Mappings to open files in new/existing windows/tabs
-        * Mappings to change the current root of the tree
-        * Mappings to navigate around the tree
-        * ...
-    * Directories and files can be bookmarked.
-    * Most NERD tree navigation can also be done with the mouse
-    * Filtering of tree content (can be toggled at runtime)
-        * custom file filters to prevent e.g. vim backup files being displayed
-        * optional displaying of hidden files (. files)
-        * files can be "turned off" so that only directories are displayed
-    * The position and size of the NERD tree window can be customised
-    * The order in which the nodes in the tree are listed can be customised.
-    * A model of your filesystem is created/maintained as you explore it. This
-      has several advantages:
-        * All filesystem information is cached and is only re-read on demand
-        * If you revisit a part of the tree that you left earlier in your
-          session, the directory nodes will be opened/closed as you left them
-    * The script remembers the cursor position and window position in the NERD
-      tree so you can toggle it off (or just close the tree window) and then
-      reopen it (with NERDTreeToggle) the NERD tree window will appear exactly
-      as you left it
-    * You can have a separate NERD tree for each tab, share trees across tabs,
-      or a mix of both.
-    * By default the script overrides the default file browser (netrw), so if
-      you :edit a directory a (slightly modified) NERD tree will appear in the
-      current window
-    * A programmable menu system is provided (simulates right clicking on a
-      node)
-        * one default menu plugin is provided to perform basic filesystem
-          operations (create/delete/move/copy files/directories)
-    * There's an API for adding your own keymappings
-
-
-==============================================================================
-2. Functionality provided                              *NERDTreeFunctionality*
-
-------------------------------------------------------------------------------
-2.1. Global Commands                                  *NERDTreeGlobalCommands*
-
-:NERDTree [<start-directory> | <bookmark>]                         *:NERDTree*
-    Opens a fresh NERD tree. The root of the tree depends on the argument
-    given. There are 3 cases: If no argument is given, the current directory
-    will be used.  If a directory is given, that will be used. If a bookmark
-    name is given, the corresponding directory will be used.  For example: >
-        :NERDTree /home/marty/vim7/src
-        :NERDTree foo   (foo is the name of a bookmark)
-<
-:NERDTreeFromBookmark <bookmark>                       *:NERDTreeFromBookmark*
-    Opens a fresh NERD tree with the root initialized to the dir for
-    <bookmark>.  The only reason to use this command over :NERDTree is for
-    the completion (which is for bookmarks rather than directories).
-
-:NERDTreeToggle [<start-directory> | <bookmark>]             *:NERDTreeToggle*
-    If a NERD tree already exists for this tab, it is reopened and rendered
-    again.  If no NERD tree exists for this tab then this command acts the
-    same as the |:NERDTree| command.
-
-:NERDTreeMirror                                              *:NERDTreeMirror*
-    Shares an existing NERD tree, from another tab, in the current tab.
-    Changes made to one tree are reflected in both as they are actually the
-    same buffer.
-
-    If only one other NERD tree exists, that tree is automatically mirrored. If
-    more than one exists, the script will ask which tree to mirror.
-
-:NERDTreeClose                                                *:NERDTreeClose*
-    Close the NERD tree in this tab.
-
-:NERDTreeFind                                                  *:NERDTreeFind*
-    Find the current file in the tree.
-
-    If not tree exists and the current file is under vim's CWD, then init a
-    tree at the CWD and reveal the file. Otherwise init a tree in the current
-    file's directory.
-
-    In any case, the current file is revealed and the cursor is placed on it.
-
-:NERDTreeCWD                                                    *:NERDTreeCWD*
-    Change tree root to current directory. If no NERD tree exists for this
-    tab, a new tree will be opened.
-
-------------------------------------------------------------------------------
-2.2. Bookmarks                                             *NERDTreeBookmarks*
-
-Bookmarks in the NERD tree are a way to tag files or directories of interest.
-For example, you could use bookmarks to tag all of your project directories.
-
-------------------------------------------------------------------------------
-2.2.1. The Bookmark Table                              *NERDTreeBookmarkTable*
-
-If the bookmark table is active (see |NERDTree-B| and
-|'NERDTreeShowBookmarks'|), it will be rendered above the tree. You can double
-click bookmarks or use the |NERDTree-o| mapping to activate them. See also,
-|NERDTree-t| and |NERDTree-T|
-
-------------------------------------------------------------------------------
-2.2.2. Bookmark commands                            *NERDTreeBookmarkCommands*
-
-Note that the following commands are only available in the NERD tree buffer.
-
-:Bookmark [<name>]
-    Bookmark the current node as <name>. If there is already a <name>
-    bookmark, it is overwritten. <name> must not contain spaces.
-    If <name> is not provided, it defaults to the file or directory name.
-    For directories, a trailing slash is present.
-
-:BookmarkToRoot <bookmark>
-    Make the directory corresponding to <bookmark> the new root. If a treenode
-    corresponding to <bookmark> is already cached somewhere in the tree then
-    the current tree will be used, otherwise a fresh tree will be opened.
-    Note that if <bookmark> points to a file then its parent will be used
-    instead.
-
-:RevealBookmark <bookmark>
-    If the node is cached under the current root then it will be revealed
-    (i.e. directory nodes above it will be opened) and the cursor will be
-    placed on it.
-
-:OpenBookmark <bookmark>
-    <bookmark> must point to a file. The file is opened as though |NERDTree-o|
-    was applied. If the node is cached under the current root then it will be
-    revealed and the cursor will be placed on it.
-
-:ClearBookmarks [<bookmarks>]
-    Remove all the given bookmarks. If no bookmarks are given then remove all
-    bookmarks on the current node.
-
-:ClearAllBookmarks
-    Remove all bookmarks.
-
-:ReadBookmarks
-    Re-read the bookmarks in the |'NERDTreeBookmarksFile'|.
-
-See also |:NERDTree| and |:NERDTreeFromBookmark|.
-
-------------------------------------------------------------------------------
-2.2.3. Invalid Bookmarks                            *NERDTreeInvalidBookmarks*
-
-If invalid bookmarks are detected, the script will issue an error message and
-the invalid bookmarks will become unavailable for use.
-
-These bookmarks will still be stored in the bookmarks file (see
-|'NERDTreeBookmarksFile'|), down the bottom. There will always be a blank line
-after the valid bookmarks but before the invalid ones.
-
-Each line in the bookmarks file represents one bookmark. The proper format is:
-<bookmark name><space><full path to the bookmark location>
-
-After you have corrected any invalid bookmarks, either restart vim, or go
-:ReadBookmarks from the NERD tree window.
-
-------------------------------------------------------------------------------
-2.3. NERD tree Mappings                                     *NERDTreeMappings*
-
-Default  Description~                                             help-tag~
-Key~
-
-o.......Open files, directories and bookmarks....................|NERDTree-o|
-go......Open selected file, but leave cursor in the NERDTree.....|NERDTree-go|
-t.......Open selected node/bookmark in a new tab.................|NERDTree-t|
-T.......Same as 't' but keep the focus on the current tab........|NERDTree-T|
-i.......Open selected file in a split window.....................|NERDTree-i|
-gi......Same as i, but leave the cursor on the NERDTree..........|NERDTree-gi|
-s.......Open selected file in a new vsplit.......................|NERDTree-s|
-gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs|
-O.......Recursively open the selected directory..................|NERDTree-O|
-x.......Close the current nodes parent...........................|NERDTree-x|
-X.......Recursively close all children of the current node.......|NERDTree-X|
-e.......Edit the current dir.....................................|NERDTree-e|
-
-<CR>...............same as |NERDTree-o|.
-double-click.......same as the |NERDTree-o| map.
-middle-click.......same as |NERDTree-i| for files, same as
-                   |NERDTree-e| for dirs.
-
-D.......Delete the current bookmark .............................|NERDTree-D|
-
-P.......Jump to the root node....................................|NERDTree-P|
-p.......Jump to current nodes parent.............................|NERDTree-p|
-K.......Jump up inside directories at the current tree depth.....|NERDTree-K|
-J.......Jump down inside directories at the current tree depth...|NERDTree-J|
-<C-J>...Jump down to the next sibling of the current directory...|NERDTree-C-J|
-<C-K>...Jump up to the previous sibling of the current directory.|NERDTree-C-K|
-
-C.......Change the tree root to the selected dir.................|NERDTree-C|
-u.......Move the tree root up one directory......................|NERDTree-u|
-U.......Same as 'u' except the old root node is left open........|NERDTree-U|
-r.......Recursively refresh the current directory................|NERDTree-r|
-R.......Recursively refresh the current root.....................|NERDTree-R|
-m.......Display the NERD tree menu...............................|NERDTree-m|
-cd......Change the CWD to the dir of the selected node...........|NERDTree-cd|
-CD......Change tree root to the CWD..............................|NERDTree-CD|
-
-I.......Toggle whether hidden files displayed....................|NERDTree-I|
-f.......Toggle whether the file filters are used.................|NERDTree-f|
-F.......Toggle whether files are displayed.......................|NERDTree-F|
-B.......Toggle whether the bookmark table is displayed...........|NERDTree-B|
-
-q.......Close the NERDTree window................................|NERDTree-q|
-A.......Zoom (maximize/minimize) the NERDTree window.............|NERDTree-A|
-?.......Toggle the display of the quick help.....................|NERDTree-?|
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-o*
-Default key: o
-Map option: NERDTreeMapActivateNode
-Applies to: files and directories.
-
-If a file node is selected, it is opened in the previous window.
-
-If a directory is selected it is opened or closed depending on its current
-state.
-
-If a bookmark that links to a directory is selected then that directory
-becomes the new root.
-
-If a bookmark that links to a file is selected then that file is opened in the
-previous window.
-
-------------------------------------------------------------------------------
-                                                                 *NERDTree-go*
-Default key: go
-Map option: None
-Applies to: files.
-
-If a file node is selected, it is opened in the previous window, but the
-cursor does not move.
-
-The key combo for this mapping is always "g" + NERDTreeMapActivateNode (see
-|NERDTree-o|).
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-t*
-Default key: t
-Map option: NERDTreeMapOpenInTab
-Applies to: files and directories.
-
-Opens the selected file in a new tab. If a directory is selected, a fresh
-NERD Tree for that directory is opened in a new tab.
-
-If a bookmark which points to a directory is selected, open a NERD tree for
-that directory in a new tab. If the bookmark points to a file, open that file
-in a new tab.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-T*
-Default key: T
-Map option: NERDTreeMapOpenInTabSilent
-Applies to: files and directories.
-
-The same as |NERDTree-t| except that the focus is kept in the current tab.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-i*
-Default key: i
-Map option: NERDTreeMapOpenSplit
-Applies to: files.
-
-Opens the selected file in a new split window and puts the cursor in the new
-window.
-
-------------------------------------------------------------------------------
-                                                                 *NERDTree-gi*
-Default key: gi
-Map option: None
-Applies to: files.
-
-The same as |NERDTree-i| except that the cursor is not moved.
-
-The key combo for this mapping is always "g" + NERDTreeMapOpenSplit (see
-|NERDTree-i|).
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-s*
-Default key: s
-Map option: NERDTreeMapOpenVSplit
-Applies to: files.
-
-Opens the selected file in a new vertically split window and puts the cursor in
-the new window.
-
-------------------------------------------------------------------------------
-                                                                 *NERDTree-gs*
-Default key: gs
-Map option: None
-Applies to: files.
-
-The same as |NERDTree-s| except that the cursor is not moved.
-
-The key combo for this mapping is always "g" + NERDTreeMapOpenVSplit (see
-|NERDTree-s|).
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-O*
-Default key: O
-Map option: NERDTreeMapOpenRecursively
-Applies to: directories.
-
-Recursively opens the selected directory.
-
-All files and directories are cached, but if a directory would not be
-displayed due to file filters (see |'NERDTreeIgnore'| |NERDTree-f|) or the
-hidden file filter (see |'NERDTreeShowHidden'|) then its contents are not
-cached. This is handy, especially if you have .svn directories.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-x*
-Default key: x
-Map option: NERDTreeMapCloseDir
-Applies to: files and directories.
-
-Closes the parent of the selected node.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-X*
-Default key: X
-Map option: NERDTreeMapCloseChildren
-Applies to: directories.
-
-Recursively closes all children of the selected directory.
-
-Tip: To quickly "reset" the tree, use |NERDTree-P| with this mapping.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-e*
-Default key: e
-Map option: NERDTreeMapOpenExpl
-Applies to: files and directories.
-
-|:edit|s the selected directory, or the selected file's directory. This could
-result in a NERD tree or a netrw being opened, depending on
-|'NERDTreeHijackNetrw'|.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-D*
-Default key: D
-Map option: NERDTreeMapDeleteBookmark
-Applies to: lines in the bookmarks table
-
-Deletes the currently selected bookmark.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-P*
-Default key: P
-Map option: NERDTreeMapJumpRoot
-Applies to: no restrictions.
-
-Jump to the tree root.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-p*
-Default key: p
-Map option: NERDTreeMapJumpParent
-Applies to: files and directories.
-
-Jump to the parent node of the selected node.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-K*
-Default key: K
-Map option: NERDTreeMapJumpFirstChild
-Applies to: files and directories.
-
-Jump to the first child of the current nodes parent.
-
-If the cursor is already on the first node then do the following:
-    * loop back thru the siblings of the current nodes parent until we find an
-      open dir with children
-    * go to the first child of that node
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-J*
-Default key: J
-Map option: NERDTreeMapJumpLastChild
-Applies to: files and directories.
-
-Jump to the last child of the current nodes parent.
-
-If the cursor is already on the last node then do the following:
-    * loop forward thru the siblings of the current nodes parent until we find
-      an open dir with children
-    * go to the last child of that node
-
-------------------------------------------------------------------------------
-                                                                *NERDTree-C-J*
-Default key: <C-J>
-Map option: NERDTreeMapJumpNextSibling
-Applies to: files and directories.
-
-Jump to the next sibling of the selected node.
-
-------------------------------------------------------------------------------
-                                                                *NERDTree-C-K*
-Default key: <C-K>
-Map option: NERDTreeMapJumpPrevSibling
-Applies to: files and directories.
-
-Jump to the previous sibling of the selected node.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-C*
-Default key: C
-Map option: NERDTreeMapChangeRoot
-Applies to: files and directories.
-
-Make the selected directory node the new tree root. If a file is selected, its
-parent is used.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-u*
-Default key: u
-Map option: NERDTreeMapUpdir
-Applies to: no restrictions.
-
-Move the tree root up a dir (like doing a "cd ..").
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-U*
-Default key: U
-Map option: NERDTreeMapUpdirKeepOpen
-Applies to: no restrictions.
-
-Like |NERDTree-u| except that the old tree root is kept open.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-r*
-Default key: r
-Map option: NERDTreeMapRefresh
-Applies to: files and directories.
-
-If a dir is selected, recursively refresh that dir, i.e. scan the filesystem
-for changes and represent them in the tree.
-
-If a file node is selected then the above is done on it's parent.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-R*
-Default key: R
-Map option: NERDTreeMapRefreshRoot
-Applies to: no restrictions.
-
-Recursively refresh the tree root.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-m*
-Default key: m
-Map option: NERDTreeMapMenu
-Applies to: files and directories.
-
-Display the NERD tree menu. See |NERDTreeMenu| for details.
-
-------------------------------------------------------------------------------
-                                                                 *NERDTree-cd*
-Default key: cd
-Map option: NERDTreeMapChdir
-Applies to: files and directories.
-
-Change vims current working directory to that of the selected node.
-
-------------------------------------------------------------------------------
-                                                                 *NERDTree-CD*
-Default key: CD
-Map option: NERDTreeMapCWD
-Applies to: no restrictions.
-
-Change tree root to vims current working directory.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-I*
-Default key: I
-Map option: NERDTreeMapToggleHidden
-Applies to: no restrictions.
-
-Toggles whether hidden files (i.e. "dot files") are displayed.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-f*
-Default key: f
-Map option: NERDTreeMapToggleFilters
-Applies to: no restrictions.
-
-Toggles whether file filters are used. See |'NERDTreeIgnore'| for details.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-F*
-Default key: F
-Map option: NERDTreeMapToggleFiles
-Applies to: no restrictions.
-
-Toggles whether file nodes are displayed.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-B*
-Default key: B
-Map option: NERDTreeMapToggleBookmarks
-Applies to: no restrictions.
-
-Toggles whether the bookmarks table is displayed.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-q*
-Default key: q
-Map option: NERDTreeMapQuit
-Applies to: no restrictions.
-
-Closes the NERDtree window.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-A*
-Default key: A
-Map option: NERDTreeMapToggleZoom
-Applies to: no restrictions.
-
-Maximize (zoom) and minimize the NERDtree window.
-
-------------------------------------------------------------------------------
-                                                                  *NERDTree-?*
-Default key: ?
-Map option: NERDTreeMapHelp
-Applies to: no restrictions.
-
-Toggles whether the quickhelp is displayed.
-
-------------------------------------------------------------------------------
-2.3. The NERD tree menu                                         *NERDTreeMenu*
-
-The NERD tree has a menu that can be programmed via the an API (see
-|NERDTreeMenuAPI|). The idea is to simulate the "right click" menus that most
-file explorers have.
-
-The script comes with two default menu plugins: exec_menuitem.vim and
-fs_menu.vim. fs_menu.vim adds some basic filesystem operations to the menu for
-creating/deleting/moving/copying files and dirs. exec_menuitem.vim provides a
-menu item to execute executable files.
-
-Related tags: |NERDTree-m| |NERDTreeApi|
-
-==============================================================================
-3. Customisation                                             *NERDTreeOptions*
-
-
-------------------------------------------------------------------------------
-3.1. Customisation summary                             *NERDTreeOptionSummary*
-
-The script provides the following options that can customise the behaviour the
-NERD tree. These options should be set in your vimrc.
-
-|'loaded_nerd_tree'|            Turns off the script.
-
-|'NERDTreeAutoCenter'|          Controls whether the NERD tree window centers
-                                when the cursor moves within a specified
-                                distance to the top/bottom of the window.
-
-|'NERDTreeAutoCenterThreshold'| Controls the sensitivity of autocentering.
-
-|'NERDTreeCaseSensitiveSort'|   Tells the NERD tree whether to be case
-                                sensitive or not when sorting nodes.
-
-|'NERDTreeSortHiddenFirst'|     Tells the NERD tree whether to take the dot
-                                at the beginning of the hidden file names
-                                into account when sorting nodes.
-
-|'NERDTreeChDirMode'|           Tells the NERD tree if/when it should change
-                                vim's current working directory.
-
-|'NERDTreeHighlightCursorline'| Tell the NERD tree whether to highlight the
-                                current cursor line.
-
-|'NERDTreeHijackNetrw'|         Tell the NERD tree whether to replace the netrw
-                                autocommands for exploring local directories.
-
-|'NERDTreeIgnore'|              Tells the NERD tree which files to ignore.
-
-|'NERDTreeRespectWildIgnore'|   Tells the NERD tree to respect |'wildignore'|.
-
-|'NERDTreeBookmarksFile'|       Where the bookmarks are stored.
-
-|'NERDTreeBookmarksSort'|       Whether the bookmarks list is sorted on
-                                display.
-
-|'NERDTreeMouseMode'|           Tells the NERD tree how to handle mouse
-                                clicks.
-
-|'NERDTreeQuitOnOpen'|          Closes the tree window after opening a file.
-
-|'NERDTreeShowBookmarks'|       Tells the NERD tree whether to display the
-                                bookmarks table on startup.
-
-|'NERDTreeShowFiles'|           Tells the NERD tree whether to display files
-                                in the tree on startup.
-
-|'NERDTreeShowHidden'|          Tells the NERD tree whether to display hidden
-                                files on startup.
-
-|'NERDTreeShowLineNumbers'|     Tells the NERD tree whether to display line
-                                numbers in the tree window.
-
-|'NERDTreeSortOrder'|           Tell the NERD tree how to sort the nodes in
-                                the tree.
-
-|'NERDTreeStatusline'|          Set a statusline for NERD tree windows.
-
-|'NERDTreeWinPos'|              Tells the script where to put the NERD tree
-                                window.
-
-|'NERDTreeWinSize'|             Sets the window size when the NERD tree is
-                                opened.
-
-|'NERDTreeMinimalUI'|           Disables display of the 'Bookmarks' label and 
-                                'Press ? for help' text.
-
-|'NERDTreeDirArrows'|           Tells the NERD tree to use arrows instead of
-                                + ~ chars when displaying directories.
-
-|'NERDTreeCascadeOpenSingleChildDir'|
-                                Cascade open while selected directory has only
-                                one child that also is a directory.
-
-|'NERDTreeAutoDeleteBuffer'|    Tells the NERD tree to automatically remove 
-                                a buffer when a file is being deleted or renamed
-                                via a context menu command.
-
-------------------------------------------------------------------------------
-3.2. Customisation details                             *NERDTreeOptionDetails*
-
-To enable any of the below options you should put the given line in your
-~/.vimrc
-
-                                                          *'loaded_nerd_tree'*
-If this plugin is making you feel homicidal, it may be a good idea to turn it
-off with this line in your vimrc: >
-    let loaded_nerd_tree=1
-<
-
-------------------------------------------------------------------------------
-                                                        *'NERDTreeAutoCenter'*
-Values: 0 or 1.
-Default: 1
-
-If set to 1, the NERD tree window will center around the cursor if it moves to
-within |'NERDTreeAutoCenterThreshold'| lines of the top/bottom of the window.
-
-This is ONLY done in response to tree navigation mappings,
-i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-C-K| |NERDTree-p|
-|NERDTree-P|
-
-The centering is done with a |zz| operation.
-
-------------------------------------------------------------------------------
-                                               *'NERDTreeAutoCenterThreshold'*
-Values: Any natural number.
-Default: 3
-
-This option controls the "sensitivity" of the NERD tree auto centering. See
-|'NERDTreeAutoCenter'| for details.
-
-------------------------------------------------------------------------------
-                                                 *'NERDTreeCaseSensitiveSort'*
-Values: 0 or 1.
-Default: 0.
-
-By default the NERD tree does not sort nodes case sensitively, i.e. nodes
-could appear like this: >
-    bar.c
-    Baz.c
-    blarg.c
-    boner.c
-    Foo.c
-<
-But, if you set this option to 1 then the case of the nodes will be taken into
-account. The above nodes would then be sorted like this: >
-    Baz.c
-    Foo.c
-    bar.c
-    blarg.c
-    boner.c
-<
-------------------------------------------------------------------------------
-                                                         *'NERDTreeChDirMode'*
-
-Values: 0, 1 or 2.
-Default: 0.
-
-Use this option to tell the script when (if at all) to change the current
-working directory (CWD) for vim.
-
-If it is set to 0 then the CWD is never changed by the NERD tree.
-
-If set to 1 then the CWD is changed when the NERD tree is first loaded to the
-directory it is initialized in. For example, if you start the NERD tree with >
-    :NERDTree /home/marty/foobar
-<
-then the CWD will be changed to /home/marty/foobar and will not be changed
-again unless you init another NERD tree with a similar command.
-
-If the option is set to 2 then it behaves the same as if set to 1 except that
-the CWD is changed whenever the tree root is changed. For example, if the CWD
-is /home/marty/foobar and you make the node for /home/marty/foobar/baz the new
-root then the CWD will become /home/marty/foobar/baz.
-
-------------------------------------------------------------------------------
-                                               *'NERDTreeHighlightCursorline'*
-Values: 0 or 1.
-Default: 1.
-
-If set to 1, the current cursor line in the NERD tree buffer will be
-highlighted. This is done using the |'cursorline'| option.
-
-------------------------------------------------------------------------------
-                                                       *'NERDTreeHijackNetrw'*
-Values: 0 or 1.
-Default: 1.
-
-If set to 1, doing a >
-    :edit <some directory>
-<
-will open up a "secondary" NERD tree instead of a netrw in the target window.
-
-Secondary NERD trees behaves slightly different from a regular trees in the
-following respects:
-    1. 'o' will open the selected file in the same window as the tree,
-       replacing it.
-    2. you can have as many secondary tree as you want in the same tab.
-
-------------------------------------------------------------------------------
-                                                            *'NERDTreeIgnore'*
-Values: a list of regular expressions.
-Default: ['\~$'].
-
-This option is used to specify which files the NERD tree should ignore.  It
-must be a list of regular expressions. When the NERD tree is rendered, any
-files/dirs that match any of the regex's in 'NERDTreeIgnore' wont be
-displayed.
-
-For example if you put the following line in your vimrc: >
-    let NERDTreeIgnore=['\.vim$', '\~$']
-<
-then all files ending in .vim or ~ will be ignored.
-
-There are 2 magic flags that can be appended to the end of each regular
-expression to specify that the regex should match only files or only dirs.
-These flags are "[[dir]]" and "[[file]]". Example: >
-    let NERDTreeIgnore=['.d$[[dir]]', '.o$[[file]]']
-<
-This will cause all dirs ending in ".d" to be ignored and all files ending in
-".o" to be ignored.
-
-Note: to tell the NERD tree not to ignore any files you must use the following
-line: >
-    let NERDTreeIgnore=[]
-<
-
-The file filters can be turned on and off dynamically with the |NERDTree-f|
-mapping.
-
-------------------------------------------------------------------------------
-                                                *'NERDTreeRespectWildIgnore'*
-Values: 0 or 1.
-Default: 0.
-
-If set to 1, the |'wildignore'| setting is respected.
-
-------------------------------------------------------------------------------
-                                                     *'NERDTreeBookmarksFile'*
-Values: a path
-Default: $HOME/.NERDTreeBookmarks
-
-This is where bookmarks are saved. See |NERDTreeBookmarkCommands|.
-
-------------------------------------------------------------------------------
-                                                     *'NERDTreeBookmarksSort'*
-Values: 0 or 1
-Default: 1
-
-If set to 0 then the bookmarks list is not sorted.
-If set to 1 the bookmarks list is sorted.
-
-------------------------------------------------------------------------------
-                                                       *'NERDTreeMouseMode'*
-Values: 1, 2 or 3.
-Default: 1.
-
-If set to 1 then a double click on a node is required to open it.
-If set to 2 then a single click will open directory nodes, while a double
-click will still be required for file nodes.
-If set to 3 then a single click will open any node.
-
-Note: a double click anywhere on a line that a tree node is on will
-activate it, but all single-click activations must be done on name of the node
-itself. For example, if you have the following node: >
-    | | |-application.rb
-<
-then (to single click activate it) you must click somewhere in
-'application.rb'.
-
-------------------------------------------------------------------------------
-                                                        *'NERDTreeQuitOnOpen'*
-
-Values: 0 or 1.
-Default: 0
-
-If set to 1, the NERD tree window will close after opening a file with the
-|NERDTree-o|, |NERDTree-i|, |NERDTree-t| and |NERDTree-T| mappings.
-
-------------------------------------------------------------------------------
-                                                     *'NERDTreeShowBookmarks'*
-Values: 0 or 1.
-Default: 0.
-
-If this option is set to 1 then the bookmarks table will be displayed.
-
-This option can be toggled dynamically, per tree, with the |NERDTree-B|
-mapping.
-
-------------------------------------------------------------------------------
-                                                         *'NERDTreeShowFiles'*
-Values: 0 or 1.
-Default: 1.
-
-If this option is set to 1 then files are displayed in the NERD tree. If it is
-set to 0 then only directories are displayed.
-
-This option can be toggled dynamically, per tree, with the |NERDTree-F|
-mapping and is useful for drastically shrinking the tree when you are
-navigating to a different part of the tree.
-
-------------------------------------------------------------------------------
-                                                        *'NERDTreeShowHidden'*
-Values: 0 or 1.
-Default: 0.
-
-This option tells vim whether to display hidden files by default. This option
-can be dynamically toggled, per tree, with the |NERDTree-I| mapping.  Use one
-of the follow lines to set this option: >
-    let NERDTreeShowHidden=0
-    let NERDTreeShowHidden=1
-<
-
-------------------------------------------------------------------------------
-                                                   *'NERDTreeShowLineNumbers'*
-Values: 0 or 1.
-Default: 0.
-
-This option tells vim whether to display line numbers for the NERD tree
-window.  Use one of the follow lines to set this option: >
-    let NERDTreeShowLineNumbers=0
-    let NERDTreeShowLineNumbers=1
-<
-
-------------------------------------------------------------------------------
-                                                         *'NERDTreeSortOrder'*
-Values: a list of regular expressions.
-Default: ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
-
-This option is set to a list of regular expressions which are used to
-specify the order of nodes under their parent.
-
-For example, if the option is set to: >
-    ['\.vim$', '\.c$', '\.h$', '*', 'foobar']
-<
-then all .vim files will be placed at the top, followed by all .c files then
-all .h files. All files containing the string 'foobar' will be placed at the
-end.  The star is a special flag: it tells the script that every node that
-doesnt match any of the other regexps should be placed here.
-
-If no star is present in 'NERDTreeSortOrder' then one is automatically
-appended to the array.
-
-The regex '\/$' should be used to match directory nodes.
-
-After this sorting is done, the files in each group are sorted alphabetically.
-
-Other examples: >
-    (1) ['*', '\/$']
-    (2) []
-    (3) ['\/$', '\.rb$', '\.php$', '*', '\.swp$',  '\.bak$', '\~$']
-<
-1. Directories will appear last, everything else will appear above.
-2. Everything will simply appear in alphabetical order.
-3. Dirs will appear first, then ruby and php. Swap files, bak files and vim
-   backup files will appear last with everything else preceding them.
-
-------------------------------------------------------------------------------
-                                                        *'NERDTreeStatusline'*
-Values: Any valid statusline setting.
-Default: %{b:NERDTreeRoot.path.strForOS(0)}
-
-Tells the script what to use as the |'statusline'| setting for NERD tree
-windows.
-
-Note that the statusline is set using |:let-&| not |:set| so escaping spaces
-isn't necessary.
-
-Setting this option to -1 will will deactivate it so that your global
-statusline setting is used instead.
-
-------------------------------------------------------------------------------
-                                                            *'NERDTreeWinPos'*
-Values: "left" or "right"
-Default: "left".
-
-This option is used to determine where NERD tree window is placed on the
-screen.
-
-This option makes it possible to use two different explorer plugins
-simultaneously. For example, you could have the taglist plugin on the left of
-the window and the NERD tree on the right.
-
-------------------------------------------------------------------------------
-                                                           *'NERDTreeWinSize'*
-Values: a positive integer.
-Default: 31.
-
-This option is used to change the size of the NERD tree when it is loaded.
-
-------------------------------------------------------------------------------
-                                                         *'NERDTreeMinimalUI'*
-Values: 0 or 1
-Default: 0
-
-This options disables the 'Bookmarks' label 'Press ? for help' text. Use one
-of the following lines to set this option: >
-    let NERDTreeMinimalUI=0
-    let NERDTreeMinimalUI=1
-<
-
-------------------------------------------------------------------------------
-                                                           *'NERDTreeDirArrows'*
-Values: 0 or 1
-Default: 0.
-
-This option is used to change the default look of directory nodes displayed in
-the tree. When set to 0 it shows old-school bars (|), + and ~ chars. If set to
-1 it shows right and down arrows.  Use one of the follow lines to set this
-option: >
-    let NERDTreeDirArrows=0
-    let NERDTreeDirArrows=1
-<
-
-------------------------------------------------------------------------------
-                                          *'NERDTreeCascadeOpenSingleChildDir'*
-Values: 0 or 1
-Default: 1.
-
-When opening dir nodes, this option tells NERDTree to recursively open dirs
-that have only one child which is also a dir. NERDTree will stop when it finds
-a dir that contains anything but another single dir. This option also causes
-the |NERDTree-x| mapping to close dirs in the same manner. This option may be
-useful for Java projects. Use one of the follow lines to set this option: >
-    let NERDTreeCascadeOpenSingleChildDir=0
-    let NERDTreeCascadeOpenSingleChildDir=1
-<
-
-------------------------------------------------------------------------------
-                                          *'NERDTreeAutoDeleteBuffer'*
-Values: 0 or 1
-Default: 0.
-
-When using a context menu to delete or rename a file you may also want to delete
-the buffer which is no more valid. If the option is not set you will see a
-confirmation if you really want to delete an old buffer. If you always press 'y'
-then it worths to set this option to 1. Use one of the follow lines to set this
-option: >
-    let NERDTreeAutoDeleteBuffer=0
-    let NERDTreeAutoDeleteBuffer=1
-<
-
-==============================================================================
-4. The NERD tree API                                             *NERDTreeAPI*
-
-The NERD tree script allows you to add custom key mappings and menu items via
-a set of API calls. Any scripts that use this API should be placed in
-~/.vim/nerdtree_plugin/ (*nix) or ~/vimfiles/nerdtree_plugin (windows).
-
-The script exposes some prototype objects that can be used to manipulate the
-tree and/or get information from it: >
-    g:NERDTreePath
-    g:NERDTreeDirNode
-    g:NERDTreeFileNode
-    g:NERDTreeBookmark
-<
-See the code/comments in NERD_tree.vim to find how to use these objects. The
-following code conventions are used:
-    * class members start with a capital letter
-    * instance members start with a lower case letter
-    * private members start with an underscore
-
-See this blog post for more details:
- http://got-ravings.blogspot.com/2008/09/vim-pr0n-prototype-based-objects.html
-
-------------------------------------------------------------------------------
-4.1. Key map API                                           *NERDTreeKeymapAPI*
-
-NERDTreeAddKeyMap({options})                             *NERDTreeAddKeyMap()*
-    Adds a new keymapping for all NERD tree buffers.
-    {options} must be a dictionary, and must contain the following keys:
-    "key" - the trigger key for the new mapping
-    "callback" - the function the new mapping will be bound to
-    "quickhelpText" - the text that will appear in the quickhelp (see
-    |NERDTree-?|)
-    "override" - if 1 then this new mapping will override whatever previous
-    mapping was defined for the key/scope combo. Useful for overriding the
-    default mappings.
-
-    Additionally, a "scope" argument may be supplied. This constrains the
-    mapping so that it is only activated if the cursor is on a certain object.
-    That object is then passed into the handling method. Possible values are:
-        "FileNode" - a file node
-        "DirNode" - a directory node
-        "Node" - a file or directory node
-        "Bookmark" - A bookmark
-        "all" - the keymap is not constrained to any scope (default). When
-        thei is used, the handling function is not passed any arguments.
-
-
-    Example: >
-        call NERDTreeAddKeyMap({
-               \ 'key': 'foo',
-               \ 'callback': 'NERDTreeCDHandler',
-               \ 'quickhelpText': 'echo full path of current node',
-               \ 'scope': 'DirNode' })
-
-        function! NERDTreeCDHandler(dirnode)
-            call a:dirnode.changeToDir()
-        endfunction
-<
-    This code should sit in a file like ~/.vim/nerdtree_plugin/mymapping.vim.
-    It adds a (redundant) mapping on 'foo' which changes vim's CWD to that of
-    the current dir node. Note this mapping will only fire when the cursor is
-    on a directory node.
-
-------------------------------------------------------------------------------
-4.2. Menu API                                                *NERDTreeMenuAPI*
-
-NERDTreeAddSubmenu({options})                           *NERDTreeAddSubmenu()*
-    Creates and returns a new submenu.
-
-    {options} must be a dictionary and must contain the following keys:
-    "text" - the text of the submenu that the user will see
-    "shortcut" - a shortcut key for the submenu (need not be unique)
-
-    The following keys are optional:
-    "isActiveCallback" - a function that will be called to determine whether
-    this submenu item will be displayed or not. The callback function must return
-    0 or 1.
-    "parent" - the parent submenu of the new submenu (returned from a previous
-    invocation of NERDTreeAddSubmenu()). If this key is left out then the new
-    submenu will sit under the top level menu.
-
-    See below for an example.
-
-NERDTreeAddMenuItem({options})                         *NERDTreeAddMenuItem()*
-    Adds a new menu item to the NERD tree menu (see |NERDTreeMenu|).
-
-    {options} must be a dictionary and must contain the
-    following keys:
-    "text" - the text of the menu item which the user will see
-    "shortcut" - a shortcut key for the menu item (need not be unique)
-    "callback" - the function that will be called when the user activates the
-    menu item.
-
-    The following keys are optional:
-    "isActiveCallback" - a function that will be called to determine whether
-    this menu item will be displayed or not. The callback function must return
-    0 or 1.
-    "parent" - if the menu item belongs under a submenu then this key must be
-    specified. This value for this key will be the object that
-    was returned when the submenu was created with |NERDTreeAddSubmenu()|.
-
-    See below for an example.
-
-NERDTreeAddMenuSeparator([{options}])             *NERDTreeAddMenuSeparator()*
-    Adds a menu separator (a row of dashes).
-
-    {options} is an optional dictionary that may contain the following keys:
-    "isActiveCallback" - see description in |NERDTreeAddMenuItem()|.
-
-Below is an example of the menu API in action. >
-    call NERDTreeAddMenuSeparator()
-
-    call NERDTreeAddMenuItem({
-                \ 'text': 'a (t)op level menu item',
-                \ 'shortcut': 't',
-                \ 'callback': 'SomeFunction' })
-
-    let submenu = NERDTreeAddSubmenu({
-                \ 'text': 'a (s)ub menu',
-                \ 'shortcut': 's' })
-
-    call NERDTreeAddMenuItem({
-                \ 'text': '(n)ested item 1',
-                \ 'shortcut': 'n',
-                \ 'callback': 'SomeFunction',
-                \ 'parent': submenu })
-
-    call NERDTreeAddMenuItem({
-                \ 'text': '(n)ested item 2',
-                \ 'shortcut': 'n',
-                \ 'callback': 'SomeFunction',
-                \ 'parent': submenu })
-<
-This will create the following menu: >
-  --------------------
-  a (t)op level menu item
-  a (s)ub menu
-<
-Where selecting "a (s)ub menu" will lead to a second menu: >
-  (n)ested item 1
-  (n)ested item 2
-<
-When any of the 3 concrete menu items are selected the function "SomeFunction"
-will be called.
-
-------------------------------------------------------------------------------
-NERDTreeRender()                                            *NERDTreeRender()*
-    Re-renders the NERD tree buffer. Useful if you change the state of the
-    tree and you want to it to be reflected in the UI.
-
-==============================================================================
-5. About                                                       *NERDTreeAbout*
-
-The author of the NERD tree is a terrible terrible monster called Martyzilla
-who gobbles up small children with milk and sugar for breakfast.
-
-He can be reached at martin.grenfell at gmail dot com. He would love to hear
-from you, so feel free to send him suggestions and/or comments about this
-plugin.  Don't be shy --- the worst he can do is slaughter you and stuff you in
-the fridge for later ;)
-
-The latest stable versions can be found at
-    http://www.vim.org/scripts/script.php?script_id=1658
-
-The latest dev versions are on github
-    http://github.com/scrooloose/nerdtree
-
-
-==============================================================================
-6. Changelog                                               *NERDTreeChangelog*
-
-Next
-    - add 'scope' argument to the key map API
-    - add NERDTreeCustomIgnoreFilter hook - needs doc
-    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
-
-4.2.0
-    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
-      instead of the old +~| chars to define the tree structure (sickill)
-    - shift the syntax highlighting out into its own syntax file (gnap)
-    - add some mac specific options to the filesystem menu - for macvim
-      only (andersonfreitas)
-    - Add NERDTreeMinimalUI option to remove some non functional parts of the
-      nerdtree ui (camthompson)
-    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
-      new behaviour (benjamingeiger)
-    - if no name is given to :Bookmark, make it default to the name of the
-      target file/dir (minyoung)
-    - use 'file' completion when doing copying, create, and move
-      operations (EvanDotPro)
-    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
-      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
-
-4.1.0
-    features:
-    - NERDTreeFind to reveal the node for the current buffer in the tree,
-      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
-      Doug McInnes) into the script.
-    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
-      Ritter and Rémi Prévost.
-    - truncate the root node if wider than the tree window. Thanks to Victor
-      Gonzalez.
-
-    bugfixes:
-    - really fix window state restoring
-    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
-      jfilip1024, and Chris Chambers
-
-4.0.0
-    - add a new programmable menu system (see :help NERDTreeMenu).
-    - add new APIs to add menus/menu-items to the menu system as well as
-      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
-    - removed the old API functions
-    - added a mapping to maximize/restore the size of nerd tree window, thanks
-      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
-
-    - fix a bug where secondary nerd trees (netrw hijacked trees) and
-      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
-    - fix a bug where the script ignored directories whose name ended in a dot,
-      thanks to Aggelos Orfanakos for the patch.
-    - fix a bug when using the x mapping on the tree root, thanks to Bryan
-      Venteicher for the patch.
-    - fix a bug where the cursor position/window size of the nerd tree buffer
-      wasnt being stored on closing the window, thanks to Richard Hart.
-    - fix a bug where NERDTreeMirror would mirror the wrong tree
-
-3.1.1
-    - fix a bug where a non-listed no-name buffer was getting created every
-      time the tree windows was created, thanks to Derek Wyatt and owen1
-    - make <CR> behave the same as the 'o' mapping
-    - some helptag fixes in the doc, thanks strull
-    - fix a bug when using :set nohidden and opening a file where the previous
-      buf was modified. Thanks iElectric
-    - other minor fixes
-
-3.1.0
-    New features:
-    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
-      NERDTree-gs
-    - make the statusline for the nerd tree window default to something
-      hopefully more useful. See :help 'NERDTreeStatusline'
-    Bugfixes:
-    - make the hijack netrw functionality work when vim is started with "vim
-      <some dir>" (thanks to Alf Mikula for the patch).
-    - fix a bug where the CWD wasnt being changed for some operations even when
-      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
-    - add -bar to all the nerd tree :commands so they can chain with other
-      :commands (thanks to tpope)
-    - fix bugs when ignorecase was set (thanks to nach)
-    - fix a bug with the relative path code (thanks to nach)
-    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
-
-
-3.0.1
-    Bugfixes:
-    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
-      was not set
-    - fix a bug where :NERDTree <path> would fail if <path> was relative and
-      didnt start with a ./ or ../  Thanks to James Kanze.
-    - make the q mapping work with secondary (:e <dir>  style) trees,
-      thanks to jamessan
-    - fix a bunch of small bugs with secondary trees
-
-    More insane refactoring.
-
-3.0.0
-    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
-      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
-    - allow sharing of trees across tabs, see :help :NERDTreeMirror
-    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
-    - change the '<tab>' mapping to 'i'
-    - change the 'H' mapping to 'I'
-    - lots of refactoring
-
-==============================================================================
-7. Credits                                                   *NERDTreeCredits*
-
-Thanks to the following people for testing, bug reports, ideas etc. Without
-you I probably would have got bored of the hacking the NERD tree and
-just downloaded pr0n instead.
-
-    Tim Carey-Smith (halorgium)
-    Vigil
-    Nick Brettell
-    Thomas Scott Urban
-    Terrance Cohen
-    Yegappan Lakshmanan
-    Jason Mills
-    Michael Geddes (frogonwheels)
-    Yu Jun
-    Michael Madsen
-    AOYAMA Shotaro
-    Zhang Weiwu
-    Niels Aan de Brugh
-    Olivier Yiptong
-    Zhang Shuhan
-    Cory Echols
-    Piotr Czachur
-    Yuan Jiang
-    Matan Nassau
-    Maxim Kim
-    Charlton Wang
-    Matt Wozniski (godlygeek)
-    knekk
-    Sean Chou
-    Ryan Penn
-    Simon Peter Nicholls
-    Michael Foobar
-    Tomasz Chomiuk
-    Denis Pokataev
-    Tim Pope (tpope)
-    James Kanze
-    James Vega (jamessan)
-    Frederic Chanal (nach)
-    Alf Mikula
-    Lucas S. Buchala
-    Curtis Harvey
-    Guillaume Duranceau
-    Richard Hart (hates)
-    Doug McInnes
-    Stefan Ritter
-    Rémi Prévost
-    Victor Gonzalez
-    Stephan Baumeister
-    Ricky
-    jfilip1024
-    Chris Chambers
-    Vitaly Bogdanov
-    Patrick O'Loughlin (paddyoloughlin)
-    Cam Thompson (camthompson)
-    Marcin Kulik (sickill)
-    Steve DeWald (sdewald)
-    Ivan Necas (iNecas)
-    George Ang (gnap)
-    Evan Coury (EvanDotPro)
-    Andrew Radev (AndrewRadev)
-    Matt Gauger (mathias)
-    Scott Stevenson (scottstvnsn)
-    Anderson Freitas (andersonfreitas)
-    Kamil K. Lemański (kml)
-    Yehuda Katz (wycats)
-    Min-Young Wu (minyoung)
-    Benjamin Geiger (benjamingeiger)
-
-==============================================================================
-8. License                                                   *NERDTreeLicense*
-
-The NERD tree is released under the wtfpl.
-See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/bundle/nerdtree/lib/nerdtree/bookmark.vim b/bundle/nerdtree/lib/nerdtree/bookmark.vim
deleted file mode 100755
index 6de9be4..0000000
--- a/bundle/nerdtree/lib/nerdtree/bookmark.vim
+++ /dev/null
@@ -1,319 +0,0 @@
-"CLASS: Bookmark
-"============================================================
-let s:Bookmark = {}
-let g:NERDTreeBookmark = s:Bookmark
-
-" FUNCTION: Bookmark.activate() {{{1
-function! s:Bookmark.activate(...)
-    call self.open(a:0 ? a:1 : {})
-endfunction
-
-" FUNCTION: Bookmark.AddBookmark(name, path) {{{1
-" Class method to add a new bookmark to the list, if a previous bookmark exists
-" with the same name, just update the path for that bookmark
-function! s:Bookmark.AddBookmark(name, path)
-    for i in s:Bookmark.Bookmarks()
-        if i.name ==# a:name
-            let i.path = a:path
-            return
-        endif
-    endfor
-    call add(s:Bookmark.Bookmarks(), s:Bookmark.New(a:name, a:path))
-    if g:NERDTreeBookmarksSort ==# 1
-        call s:Bookmark.Sort()
-    endif
-endfunction
-
-" FUNCTION: Bookmark.Bookmarks()   {{{1
-" Class method to get all bookmarks. Lazily initializes the bookmarks global
-" variable
-function! s:Bookmark.Bookmarks()
-    if !exists("g:NERDTreeBookmarks")
-        let g:NERDTreeBookmarks = []
-    endif
-    return g:NERDTreeBookmarks
-endfunction
-
-" FUNCTION: Bookmark.BookmarkExistsFor(name)   {{{1
-" class method that returns 1 if a bookmark with the given name is found, 0
-" otherwise
-function! s:Bookmark.BookmarkExistsFor(name)
-    try
-        call s:Bookmark.BookmarkFor(a:name)
-        return 1
-    catch /^NERDTree.BookmarkNotFoundError/
-        return 0
-    endtry
-endfunction
-
-" FUNCTION: Bookmark.BookmarkFor(name)   {{{1
-" Class method to get the bookmark that has the given name. {} is return if no
-" bookmark is found
-function! s:Bookmark.BookmarkFor(name)
-    for i in s:Bookmark.Bookmarks()
-        if i.name ==# a:name
-            return i
-        endif
-    endfor
-    throw "NERDTree.BookmarkNotFoundError: no bookmark found for name: \"". a:name  .'"'
-endfunction
-
-" FUNCTION: Bookmark.BookmarkNames()   {{{1
-" Class method to return an array of all bookmark names
-function! s:Bookmark.BookmarkNames()
-    let names = []
-    for i in s:Bookmark.Bookmarks()
-        call add(names, i.name)
-    endfor
-    return names
-endfunction
-
-" FUNCTION: Bookmark.CacheBookmarks(silent) {{{1
-" Class method to read all bookmarks from the bookmarks file initialize
-" bookmark objects for each one.
-"
-" Args:
-" silent - dont echo an error msg if invalid bookmarks are found
-function! s:Bookmark.CacheBookmarks(silent)
-    if filereadable(g:NERDTreeBookmarksFile)
-        let g:NERDTreeBookmarks = []
-        let g:NERDTreeInvalidBookmarks = []
-        let bookmarkStrings = readfile(g:NERDTreeBookmarksFile)
-        let invalidBookmarksFound = 0
-        for i in bookmarkStrings
-
-            "ignore blank lines
-            if i != ''
-
-                let name = substitute(i, '^\(.\{-}\) .*$', '\1', '')
-                let path = substitute(i, '^.\{-} \(.*\)$', '\1', '')
-
-                try
-                    let bookmark = s:Bookmark.New(name, g:NERDTreePath.New(path))
-                    call add(g:NERDTreeBookmarks, bookmark)
-                catch /^NERDTree.InvalidArgumentsError/
-                    call add(g:NERDTreeInvalidBookmarks, i)
-                    let invalidBookmarksFound += 1
-                endtry
-            endif
-        endfor
-        if invalidBookmarksFound
-            call s:Bookmark.Write()
-            if !a:silent
-                call nerdtree#echo(invalidBookmarksFound . " invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.")
-            endif
-        endif
-        if g:NERDTreeBookmarksSort ==# 1
-            call s:Bookmark.Sort()
-        endif
-    endif
-endfunction
-
-" FUNCTION: Bookmark.compareTo(otherbookmark) {{{1
-" Compare these two bookmarks for sorting purposes
-function! s:Bookmark.compareTo(otherbookmark)
-    return a:otherbookmark.name < self.name
-endfunction
-" FUNCTION: Bookmark.ClearAll() {{{1
-" Class method to delete all bookmarks.
-function! s:Bookmark.ClearAll()
-    for i in s:Bookmark.Bookmarks()
-        call i.delete()
-    endfor
-    call s:Bookmark.Write()
-endfunction
-
-" FUNCTION: Bookmark.delete() {{{1
-" Delete this bookmark. If the node for this bookmark is under the current
-" root, then recache bookmarks for its Path object
-function! s:Bookmark.delete()
-    let node = {}
-    try
-        let node = self.getNode(1)
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-    endtry
-    call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self))
-    if !empty(node)
-        call node.path.cacheDisplayString()
-    endif
-    call s:Bookmark.Write()
-endfunction
-
-" FUNCTION: Bookmark.getNode(searchFromAbsoluteRoot) {{{1
-" Gets the treenode for this bookmark
-"
-" Args:
-" searchFromAbsoluteRoot: specifies whether we should search from the current
-" tree root, or the highest cached node
-function! s:Bookmark.getNode(searchFromAbsoluteRoot)
-    let searchRoot = a:searchFromAbsoluteRoot ? g:NERDTreeDirNode.AbsoluteTreeRoot() : b:NERDTreeRoot
-    let targetNode = searchRoot.findNode(self.path)
-    if empty(targetNode)
-        throw "NERDTree.BookmarkedNodeNotFoundError: no node was found for bookmark: " . self.name
-    endif
-    return targetNode
-endfunction
-
-" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot) {{{1
-" Class method that finds the bookmark with the given name and returns the
-" treenode for it.
-function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot)
-    let bookmark = s:Bookmark.BookmarkFor(a:name)
-    return bookmark.getNode(a:searchFromAbsoluteRoot)
-endfunction
-
-" FUNCTION: Bookmark.GetSelected() {{{1
-" returns the Bookmark the cursor is over, or {}
-function! s:Bookmark.GetSelected()
-    let line = getline(".")
-    let name = substitute(line, '^>\(.\{-}\) .\+$', '\1', '')
-    if name != line
-        try
-            return s:Bookmark.BookmarkFor(name)
-        catch /^NERDTree.BookmarkNotFoundError/
-            return {}
-        endtry
-    endif
-    return {}
-endfunction
-
-" FUNCTION: Bookmark.InvalidBookmarks()   {{{1
-" Class method to get all invalid bookmark strings read from the bookmarks
-" file
-function! s:Bookmark.InvalidBookmarks()
-    if !exists("g:NERDTreeInvalidBookmarks")
-        let g:NERDTreeInvalidBookmarks = []
-    endif
-    return g:NERDTreeInvalidBookmarks
-endfunction
-
-" FUNCTION: Bookmark.mustExist() {{{1
-function! s:Bookmark.mustExist()
-    if !self.path.exists()
-        call s:Bookmark.CacheBookmarks(1)
-        throw "NERDTree.BookmarkPointsToInvalidLocationError: the bookmark \"".
-            \ self.name ."\" points to a non existing location: \"". self.path.str()
-    endif
-endfunction
-
-" FUNCTION: Bookmark.New(name, path) {{{1
-" Create a new bookmark object with the given name and path object
-function! s:Bookmark.New(name, path)
-    if a:name =~# ' '
-        throw "NERDTree.IllegalBookmarkNameError: illegal name:" . a:name
-    endif
-
-    let newBookmark = copy(self)
-    let newBookmark.name = a:name
-    let newBookmark.path = a:path
-    return newBookmark
-endfunction
-
-" FUNCTION: Bookmark.open([options]) {{{1
-"Args:
-"A dictionary containing the following keys (all optional):
-"  'where': Specifies whether the node should be opened in new split/tab or in
-"           the previous window. Can be either 'v' (vertical split), 'h'
-"           (horizontal split), 't' (new tab) or 'p' (previous window).
-"  'reuse': if a window is displaying the file then jump the cursor there
-"  'keepopen': dont close the tree window
-"  'stay': open the file, but keep the cursor in the tree win
-"
-function! s:Bookmark.open(...)
-    let opts = a:0 ? a:1 : {}
-
-    if self.path.isDirectory && !has_key(opts, 'where')
-        call self.toRoot()
-    else
-        let opener = g:NERDTreeOpener.New(self.path, opts)
-        call opener.open(self)
-    endif
-endfunction
-
-" FUNCTION: Bookmark.openInNewTab(options) {{{1
-" Create a new bookmark object with the given name and path object
-function! s:Bookmark.openInNewTab(options)
-    call nerdtree#deprecated('Bookmark.openInNewTab', 'is deprecated, use open() instead')
-    call self.open(a:options)
-endfunction
-
-" FUNCTION: Bookmark.setPath(path)   {{{1
-" makes this bookmark point to the given path
-function! s:Bookmark.setPath(path)
-    let self.path = a:path
-endfunction
-
-" FUNCTION: Bookmark.Sort()   {{{1
-" Class method that sorts all bookmarks
-function! s:Bookmark.Sort()
-    let CompareFunc = function("nerdtree#compareBookmarks")
-    call sort(s:Bookmark.Bookmarks(), CompareFunc)
-endfunction
-
-" FUNCTION: Bookmark.str()   {{{1
-" Get the string that should be rendered in the view for this bookmark
-function! s:Bookmark.str()
-    let pathStrMaxLen = winwidth(nerdtree#getTreeWinNum()) - 4 - len(self.name)
-    if &nu
-        let pathStrMaxLen = pathStrMaxLen - &numberwidth
-    endif
-
-    let pathStr = self.path.str({'format': 'UI'})
-    if len(pathStr) > pathStrMaxLen
-        let pathStr = '<' . strpart(pathStr, len(pathStr) - pathStrMaxLen)
-    endif
-    return '>' . self.name . ' ' . pathStr
-endfunction
-
-" FUNCTION: Bookmark.toRoot() {{{1
-" Make the node for this bookmark the new tree root
-function! s:Bookmark.toRoot()
-    if self.validate()
-        try
-            let targetNode = self.getNode(1)
-        catch /^NERDTree.BookmarkedNodeNotFoundError/
-            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path)
-        endtry
-        call targetNode.makeRoot()
-        call b:NERDTree.render()
-        call targetNode.putCursorHere(0, 0)
-    endif
-endfunction
-
-" FUNCTION: Bookmark.ToRoot(name) {{{1
-" Make the node for this bookmark the new tree root
-function! s:Bookmark.ToRoot(name)
-    let bookmark = s:Bookmark.BookmarkFor(a:name)
-    call bookmark.toRoot()
-endfunction
-
-" FUNCTION: Bookmark.validate() {{{1
-function! s:Bookmark.validate()
-    if self.path.exists()
-        return 1
-    else
-        call s:Bookmark.CacheBookmarks(1)
-        call b:NERDTree.render()
-        call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.")
-        return 0
-    endif
-endfunction
-
-" FUNCTION: Bookmark.Write()   {{{1
-" Class method to write all bookmarks to the bookmarks file
-function! s:Bookmark.Write()
-    let bookmarkStrings = []
-    for i in s:Bookmark.Bookmarks()
-        call add(bookmarkStrings, i.name . ' ' . i.path.str())
-    endfor
-
-    "add a blank line before the invalid ones
-    call add(bookmarkStrings, "")
-
-    for j in s:Bookmark.InvalidBookmarks()
-        call add(bookmarkStrings, j)
-    endfor
-    call writefile(bookmarkStrings, g:NERDTreeBookmarksFile)
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/creator.vim b/bundle/nerdtree/lib/nerdtree/creator.vim
deleted file mode 100755
index 86f951a..0000000
--- a/bundle/nerdtree/lib/nerdtree/creator.vim
+++ /dev/null
@@ -1,357 +0,0 @@
-"CLASS: Creator
-"Creates primary/secondary/mirror nerdtree windows. Sets up all the window and
-"buffer options and key mappings etc.
-"============================================================
-let s:Creator = {}
-let g:NERDTreeCreator = s:Creator
-
-"FUNCTION: s:Creator._bindMappings() {{{1
-function! s:Creator._bindMappings()
-    "make <cr> do the same as the activate node mapping
-    nnoremap <silent> <buffer> <cr> :call nerdtree#ui_glue#invokeKeyMap(g:NERDTreeMapActivateNode)<cr>
-
-    call g:NERDTreeKeyMap.BindAll()
-
-    command! -buffer -nargs=? Bookmark :call nerdtree#ui_glue#bookmarkNode('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#ui_glue#revealBookmark('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call nerdtree#ui_glue#openBookmark('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#ui_glue#clearBookmarks('<args>')
-    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>')
-    command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
-    command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
-    command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
-endfunction
-
-"FUNCTION: s:Creator._broadcastInitEvent() {{{1
-function! s:Creator._broadcastInitEvent()
-    silent doautocmd User NERDTreeInit
-endfunction
-
-" FUNCTION: s:Creator.BufNamePrefix() {{{2
-function! s:Creator.BufNamePrefix()
-    return 'NERD_tree_'
-endfunction
-
-"FUNCTION: s:Creator.CreatePrimary(a:name) {{{1
-function! s:Creator.CreatePrimary(name)
-    let creator = s:Creator.New()
-    call creator.createPrimary(a:name)
-endfunction
-
-"FUNCTION: s:Creator.createPrimary(a:name) {{{1
-"name: the name of a bookmark or a directory
-function! s:Creator.createPrimary(name)
-    let path = self._pathForString(a:name)
-
-    "if instructed to, then change the vim CWD to the dir the NERDTree is
-    "inited in
-    if g:NERDTreeChDirMode != 0
-        call path.changeToDir()
-    endif
-
-    if g:NERDTree.ExistsForTab()
-        if nerdtree#isTreeOpen()
-            call nerdtree#closeTree()
-        endif
-        unlet t:NERDTreeBufName
-    endif
-
-    call self._createTreeWin()
-    call self._createNERDTree(path)
-    let b:NERDTreeType = "primary"
-    let b:treeShowHelp = 0
-    let b:NERDTreeIgnoreEnabled = 1
-    let b:NERDTreeShowFiles = g:NERDTreeShowFiles
-    let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-    let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
-
-    call b:NERDTree.render()
-    call b:NERDTreeRoot.putCursorHere(0, 0)
-
-    call self._broadcastInitEvent()
-endfunction
-
-"FUNCTION: s:Creator.CreateSecondary(dir) {{{1
-function! s:Creator.CreateSecondary(dir)
-    let creator = s:Creator.New()
-    call creator.createSecondary(a:dir)
-endfunction
-
-"FUNCTION: s:Creator.createSecondary(dir) {{{1
-function! s:Creator.createSecondary(dir)
-    try
-        let path = g:NERDTreePath.New(a:dir)
-    catch /^NERDTree.InvalidArgumentsError/
-        call nerdtree#echo("Invalid directory name:" . a:name)
-        return
-    endtry
-
-    "we want the directory buffer to disappear when we do the :edit below
-    setlocal bufhidden=wipe
-
-    let previousBuf = expand("#")
-
-    "we need a unique name for each secondary tree buffer to ensure they are
-    "all independent
-    exec "silent edit " . self._nextBufferName()
-
-    let b:NERDTreePreviousBuf = bufnr(previousBuf)
-    call self._createNERDTree(path)
-    call self._setCommonBufOptions()
-    let b:NERDTreeType = "secondary"
-
-    call b:NERDTree.render()
-
-    call self._broadcastInitEvent()
-endfunction
-
-" FUNCTION: s:Creator._createNERDTree(path) {{{1
-function! s:Creator._createNERDTree(path)
-    let b:NERDTree = g:NERDTree.New(a:path)
-    "TODO: This is kept for compatability only since many things use
-    "b:NERDTreeRoot instead of the new NERDTree.root
-    "Remove this one day
-    let b:NERDTreeRoot = b:NERDTree.root
-
-    call b:NERDTree.root.open()
-endfunction
-
-" FUNCTION: s:Creator.CreateMirror() {{{1
-function! s:Creator.CreateMirror()
-    let creator = s:Creator.New()
-    call creator.createMirror()
-endfunction
-
-" FUNCTION: s:Creator.createMirror() {{{1
-function! s:Creator.createMirror()
-    "get the names off all the nerd tree buffers
-    let treeBufNames = []
-    for i in range(1, tabpagenr("$"))
-        let nextName = self._tabpagevar(i, 'NERDTreeBufName')
-        if nextName != -1 && (!exists("t:NERDTreeBufName") || nextName != t:NERDTreeBufName)
-            call add(treeBufNames, nextName)
-        endif
-    endfor
-    let treeBufNames = self._uniq(treeBufNames)
-
-    "map the option names (that the user will be prompted with) to the nerd
-    "tree buffer names
-    let options = {}
-    let i = 0
-    while i < len(treeBufNames)
-        let bufName = treeBufNames[i]
-        let treeRoot = getbufvar(bufName, "NERDTreeRoot")
-        let options[i+1 . '. ' . treeRoot.path.str() . '  (buf name: ' . bufName . ')'] = bufName
-        let i = i + 1
-    endwhile
-
-    "work out which tree to mirror, if there is more than 1 then ask the user
-    let bufferName = ''
-    if len(keys(options)) > 1
-        let choices = ["Choose a tree to mirror"]
-        let choices = extend(choices, sort(keys(options)))
-        let choice = inputlist(choices)
-        if choice < 1 || choice > len(options) || choice ==# ''
-            return
-        endif
-
-        let bufferName = options[sort(keys(options))[choice-1]]
-    elseif len(keys(options)) ==# 1
-        let bufferName = values(options)[0]
-    else
-        call nerdtree#echo("No trees to mirror")
-        return
-    endif
-
-    if g:NERDTree.ExistsForTab() && nerdtree#isTreeOpen()
-        call nerdtree#closeTree()
-    endif
-
-    let t:NERDTreeBufName = bufferName
-    call self._createTreeWin()
-    exec 'buffer ' .  bufferName
-    if !&hidden
-        call b:NERDTree.render()
-    endif
-endfunction
-
-"FUNCTION: s:Creator._createTreeWin() {{{1
-"Inits the NERD tree window. ie. opens it, sizes it, sets all the local
-"options etc
-function! s:Creator._createTreeWin()
-    "create the nerd tree window
-    let splitLocation = g:NERDTreeWinPos ==# "left" ? "topleft " : "botright "
-    let splitSize = g:NERDTreeWinSize
-
-    if !exists('t:NERDTreeBufName')
-        let t:NERDTreeBufName = self._nextBufferName()
-        silent! exec splitLocation . 'vertical ' . splitSize . ' new'
-        silent! exec "edit " . t:NERDTreeBufName
-    else
-        silent! exec splitLocation . 'vertical ' . splitSize . ' split'
-        silent! exec "buffer " . t:NERDTreeBufName
-    endif
-
-    setlocal winfixwidth
-    call self._setCommonBufOptions()
-endfunction
-
-"FUNCTION: s:Creator.New() {{{1
-function! s:Creator.New()
-    let newCreator = copy(self)
-    return newCreator
-endfunction
-
-" FUNCTION: s:Creator._nextBufferName() {{{2
-" returns the buffer name for the next nerd tree
-function! s:Creator._nextBufferName()
-    let name = s:Creator.BufNamePrefix() . self._nextBufferNumber()
-    return name
-endfunction
-
-" FUNCTION: s:Creator._nextBufferNumber() {{{2
-" the number to add to the nerd tree buffer name to make the buf name unique
-function! s:Creator._nextBufferNumber()
-    if !exists("s:Creator._NextBufNum")
-        let s:Creator._NextBufNum = 1
-    else
-        let s:Creator._NextBufNum += 1
-    endif
-
-    return s:Creator._NextBufNum
-endfunction
-
-"FUNCTION: s:Creator._pathForString(str) {{{1
-"find a bookmark or adirectory for the given string
-function! s:Creator._pathForString(str)
-    let path = {}
-    if g:NERDTreeBookmark.BookmarkExistsFor(a:str)
-        let path = g:NERDTreeBookmark.BookmarkFor(a:str).path
-    else
-        let dir = a:str ==# '' ? getcwd() : a:str
-
-        "hack to get an absolute path if a relative path is given
-        if dir =~# '^\.'
-            let dir = getcwd() . g:NERDTreePath.Slash() . dir
-        endif
-        let dir = g:NERDTreePath.Resolve(dir)
-
-        try
-            let path = g:NERDTreePath.New(dir)
-        catch /^NERDTree.InvalidArgumentsError/
-            call nerdtree#echo("No bookmark or directory found for: " . a:str)
-            return
-        endtry
-    endif
-    if !path.isDirectory
-        let path = path.getParent()
-    endif
-
-    return path
-endfunction
-
-"FUNCTION: s:Creator._setCommonBufOptions() {{{1
-function! s:Creator._setCommonBufOptions()
-    "throwaway buffer options
-    setlocal noswapfile
-    setlocal buftype=nofile
-    setlocal bufhidden=hide
-    setlocal nowrap
-    setlocal foldcolumn=0
-    setlocal foldmethod=manual
-    setlocal nofoldenable
-    setlocal nobuflisted
-    setlocal nospell
-    if g:NERDTreeShowLineNumbers
-        setlocal nu
-    else
-        setlocal nonu
-        if v:version >= 703
-            setlocal nornu
-        endif
-    endif
-
-    iabc <buffer>
-
-    if g:NERDTreeHighlightCursorline
-        setlocal cursorline
-    endif
-
-    call self._setupStatusline()
-
-    let b:treeShowHelp = 0
-    let b:NERDTreeIgnoreEnabled = 1
-    let b:NERDTreeShowFiles = g:NERDTreeShowFiles
-    let b:NERDTreeShowHidden = g:NERDTreeShowHidden
-    let b:NERDTreeShowBookmarks = g:NERDTreeShowBookmarks
-    call self._bindMappings()
-    setlocal filetype=nerdtree
-endfunction
-
-"FUNCTION: s:Creator._setupStatusline() {{{1
-function! s:Creator._setupStatusline()
-    if g:NERDTreeStatusline != -1
-        let &l:statusline = g:NERDTreeStatusline
-    endif
-endfunction
-
-" FUNCTION: s:Creator._tabpagevar(tabnr, var) {{{1
-function! s:Creator._tabpagevar(tabnr, var)
-    let currentTab = tabpagenr()
-    let old_ei = &ei
-    set ei=all
-
-    exec "tabnext " . a:tabnr
-    let v = -1
-    if exists('t:' . a:var)
-        exec 'let v = t:' . a:var
-    endif
-    exec "tabnext " . currentTab
-
-    let &ei = old_ei
-
-    return v
-endfunction
-
-"FUNCTION: s:Creator.TogglePrimary(dir) {{{1
-function! s:Creator.TogglePrimary(dir)
-    let creator = s:Creator.New()
-    call creator.togglePrimary(a:dir)
-endfunction
-
-"FUNCTION: s:Creator.togglePrimary(dir) {{{1
-"Toggles the NERD tree. I.e the NERD tree is open, it is closed, if it is
-"closed it is restored or initialized (if it doesnt exist)
-"
-"Args:
-"dir: the full path for the root node (is only used if the NERD tree is being
-"initialized.
-function! s:Creator.togglePrimary(dir)
-    if g:NERDTree.ExistsForTab()
-        if !nerdtree#isTreeOpen()
-            call self._createTreeWin()
-            if !&hidden
-                call b:NERDTree.render()
-            endif
-            call b:NERDTree.ui.restoreScreenState()
-        else
-            call nerdtree#closeTree()
-        endif
-    else
-        call self.createPrimary(a:dir)
-    endif
-endfunction
-
-" Function: s:Creator._uniq(list)   {{{1
-" returns a:list without duplicates
-function! s:Creator._uniq(list)
-  let uniqlist = []
-  for elem in a:list
-    if index(uniqlist, elem) ==# -1
-      let uniqlist += [elem]
-    endif
-  endfor
-  return uniqlist
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/key_map.vim b/bundle/nerdtree/lib/nerdtree/key_map.vim
deleted file mode 100755
index 2411406..0000000
--- a/bundle/nerdtree/lib/nerdtree/key_map.vim
+++ /dev/null
@@ -1,159 +0,0 @@
-"CLASS: KeyMap
-"============================================================
-let s:KeyMap = {}
-let g:NERDTreeKeyMap = s:KeyMap
-
-"FUNCTION: KeyMap.All() {{{1
-function! s:KeyMap.All()
-    if !exists("s:keyMaps")
-        let s:keyMaps = []
-    endif
-    return s:keyMaps
-endfunction
-
-"FUNCTION: KeyMap.FindFor(key, scope) {{{1
-function! s:KeyMap.FindFor(key, scope)
-    for i in s:KeyMap.All()
-         if i.key ==# a:key && i.scope ==# a:scope
-            return i
-        endif
-    endfor
-    return {}
-endfunction
-
-"FUNCTION: KeyMap.BindAll() {{{1
-function! s:KeyMap.BindAll()
-    for i in s:KeyMap.All()
-        call i.bind()
-    endfor
-endfunction
-
-"FUNCTION: KeyMap.bind() {{{1
-function! s:KeyMap.bind()
-    " If the key sequence we're trying to map contains any '<>' notation, we
-    " must replace each of the '<' characters with '<lt>' to ensure the string
-    " is not translated into its corresponding keycode during the later part
-    " of the map command below
-    " :he <>
-    let specialNotationRegex = '\m<\([[:alnum:]_-]\+>\)'
-    if self.key =~# specialNotationRegex
-        let keymapInvokeString = substitute(self.key, specialNotationRegex, '<lt>\1', 'g')
-    else
-        let keymapInvokeString = self.key
-    endif
-
-    let premap = self.key == "<LeftRelease>" ? " <LeftRelease>" : " "
-
-    exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>'
-endfunction
-
-"FUNCTION: KeyMap.Remove(key, scope) {{{1
-function! s:KeyMap.Remove(key, scope)
-    let maps = s:KeyMap.All()
-    for i in range(len(maps))
-         if maps[i].key ==# a:key && maps[i].scope ==# a:scope
-            return remove(maps, i)
-        endif
-    endfor
-endfunction
-
-"FUNCTION: KeyMap.invoke() {{{1
-"Call the KeyMaps callback function
-function! s:KeyMap.invoke(...)
-    let Callback = function(self.callback)
-    if a:0
-        call Callback(a:1)
-    else
-        call Callback()
-    endif
-endfunction
-
-"FUNCTION: KeyMap.Invoke() {{{1
-"Find a keymapping for a:key and the current scope invoke it.
-"
-"Scope is determined as follows:
-"   * if the cursor is on a dir node then "DirNode"
-"   * if the cursor is on a file node then "FileNode"
-"   * if the cursor is on a bookmark then "Bookmark"
-"
-"If a keymap has the scope of "all" then it will be called if no other keymap
-"is found for a:key and the scope.
-function! s:KeyMap.Invoke(key)
-
-    "required because clicking the command window below another window still
-    "invokes the <LeftRelease> mapping - but changes the window cursor
-    "is in first
-    "
-    "TODO: remove this check when the vim bug is fixed
-    if !g:NERDTree.ExistsForBuf()
-        return {}
-    endif
-
-    let node = g:NERDTreeFileNode.GetSelected()
-    if !empty(node)
-
-        "try file node
-        if !node.path.isDirectory
-            let km = s:KeyMap.FindFor(a:key, "FileNode")
-            if !empty(km)
-                return km.invoke(node)
-            endif
-        endif
-
-        "try dir node
-        if node.path.isDirectory
-            let km = s:KeyMap.FindFor(a:key, "DirNode")
-            if !empty(km)
-                return km.invoke(node)
-            endif
-        endif
-
-        "try generic node
-        let km = s:KeyMap.FindFor(a:key, "Node")
-        if !empty(km)
-            return km.invoke(node)
-        endif
-
-    endif
-
-    "try bookmark
-    let bm = g:NERDTreeBookmark.GetSelected()
-    if !empty(bm)
-        let km = s:KeyMap.FindFor(a:key, "Bookmark")
-        if !empty(km)
-            return km.invoke(bm)
-        endif
-    endif
-
-    "try all
-    let km = s:KeyMap.FindFor(a:key, "all")
-    if !empty(km)
-        return km.invoke()
-    endif
-endfunction
-
-"FUNCTION: KeyMap.Create(options) {{{1
-function! s:KeyMap.Create(options)
-    let opts = extend({'scope': 'all', 'quickhelpText': ''}, copy(a:options))
-
-    "dont override other mappings unless the 'override' option is given
-    if get(opts, 'override', 0) == 0 && !empty(s:KeyMap.FindFor(opts['key'], opts['scope']))
-        return
-    end
-
-    let newKeyMap = copy(self)
-    let newKeyMap.key = opts['key']
-    let newKeyMap.quickhelpText = opts['quickhelpText']
-    let newKeyMap.callback = opts['callback']
-    let newKeyMap.scope = opts['scope']
-
-    call s:KeyMap.Add(newKeyMap)
-endfunction
-
-"FUNCTION: KeyMap.Add(keymap) {{{1
-function! s:KeyMap.Add(keymap)
-    call s:KeyMap.Remove(a:keymap.key, a:keymap.scope)
-    call add(s:KeyMap.All(), a:keymap)
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/menu_controller.vim b/bundle/nerdtree/lib/nerdtree/menu_controller.vim
deleted file mode 100755
index ae0ee84..0000000
--- a/bundle/nerdtree/lib/nerdtree/menu_controller.vim
+++ /dev/null
@@ -1,180 +0,0 @@
-"CLASS: MenuController
-"============================================================
-let s:MenuController = {}
-let g:NERDTreeMenuController = s:MenuController
-
-"FUNCTION: MenuController.New(menuItems) {{{1
-"create a new menu controller that operates on the given menu items
-function! s:MenuController.New(menuItems)
-    let newMenuController =  copy(self)
-    if a:menuItems[0].isSeparator()
-        let newMenuController.menuItems = a:menuItems[1:-1]
-    else
-        let newMenuController.menuItems = a:menuItems
-    endif
-    return newMenuController
-endfunction
-
-"FUNCTION: MenuController.showMenu() {{{1
-"start the main loop of the menu and get the user to choose/execute a menu
-"item
-function! s:MenuController.showMenu()
-    call self._saveOptions()
-
-    try
-        let self.selection = 0
-
-        let done = 0
-        while !done
-            redraw!
-            call self._echoPrompt()
-            let key = nr2char(getchar())
-            let done = self._handleKeypress(key)
-        endwhile
-    finally
-        call self._restoreOptions()
-    endtry
-
-    if self.selection != -1
-        let m = self._current()
-        call m.execute()
-    endif
-endfunction
-
-"FUNCTION: MenuController._echoPrompt() {{{1
-function! s:MenuController._echoPrompt()
-    echo "NERDTree Menu. Use j/k/enter and the shortcuts indicated"
-    echo "=========================================================="
-
-    for i in range(0, len(self.menuItems)-1)
-        if self.selection == i
-            echo "> " . self.menuItems[i].text
-        else
-            echo "  " . self.menuItems[i].text
-        endif
-    endfor
-endfunction
-
-"FUNCTION: MenuController._current(key) {{{1
-"get the MenuItem that is currently selected
-function! s:MenuController._current()
-    return self.menuItems[self.selection]
-endfunction
-
-"FUNCTION: MenuController._handleKeypress(key) {{{1
-"change the selection (if appropriate) and return 1 if the user has made
-"their choice, 0 otherwise
-function! s:MenuController._handleKeypress(key)
-    if a:key == 'j'
-        call self._cursorDown()
-    elseif a:key == 'k'
-        call self._cursorUp()
-    elseif a:key == nr2char(27) "escape
-        let self.selection = -1
-        return 1
-    elseif a:key == "\r" || a:key == "\n" "enter and ctrl-j
-        return 1
-    else
-        let index = self._nextIndexFor(a:key)
-        if index != -1
-            let self.selection = index
-            if len(self._allIndexesFor(a:key)) == 1
-                return 1
-            endif
-        endif
-    endif
-
-    return 0
-endfunction
-
-"FUNCTION: MenuController._allIndexesFor(shortcut) {{{1
-"get indexes to all menu items with the given shortcut
-function! s:MenuController._allIndexesFor(shortcut)
-    let toReturn = []
-
-    for i in range(0, len(self.menuItems)-1)
-        if self.menuItems[i].shortcut == a:shortcut
-            call add(toReturn, i)
-        endif
-    endfor
-
-    return toReturn
-endfunction
-
-"FUNCTION: MenuController._nextIndexFor(shortcut) {{{1
-"get the index to the next menu item with the given shortcut, starts from the
-"current cursor location and wraps around to the top again if need be
-function! s:MenuController._nextIndexFor(shortcut)
-    for i in range(self.selection+1, len(self.menuItems)-1)
-        if self.menuItems[i].shortcut == a:shortcut
-            return i
-        endif
-    endfor
-
-    for i in range(0, self.selection)
-        if self.menuItems[i].shortcut == a:shortcut
-            return i
-        endif
-    endfor
-
-    return -1
-endfunction
-
-"FUNCTION: MenuController._setCmdheight() {{{1
-"sets &cmdheight to whatever is needed to display the menu
-function! s:MenuController._setCmdheight()
-    let &cmdheight = len(self.menuItems) + 3
-endfunction
-
-"FUNCTION: MenuController._saveOptions() {{{1
-"set any vim options that are required to make the menu work (saving their old
-"values)
-function! s:MenuController._saveOptions()
-    let self._oldLazyredraw = &lazyredraw
-    let self._oldCmdheight = &cmdheight
-    set nolazyredraw
-    call self._setCmdheight()
-endfunction
-
-"FUNCTION: MenuController._restoreOptions() {{{1
-"restore the options we saved in _saveOptions()
-function! s:MenuController._restoreOptions()
-    let &cmdheight = self._oldCmdheight
-    let &lazyredraw = self._oldLazyredraw
-endfunction
-
-"FUNCTION: MenuController._cursorDown() {{{1
-"move the cursor to the next menu item, skipping separators
-function! s:MenuController._cursorDown()
-    let done = 0
-    while !done
-        if self.selection < len(self.menuItems)-1
-            let self.selection += 1
-        else
-            let self.selection = 0
-        endif
-
-        if !self._current().isSeparator()
-            let done = 1
-        endif
-    endwhile
-endfunction
-
-"FUNCTION: MenuController._cursorUp() {{{1
-"move the cursor to the previous menu item, skipping separators
-function! s:MenuController._cursorUp()
-    let done = 0
-    while !done
-        if self.selection > 0
-            let self.selection -= 1
-        else
-            let self.selection = len(self.menuItems)-1
-        endif
-
-        if !self._current().isSeparator()
-            let done = 1
-        endif
-    endwhile
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/nerdtree.vim b/bundle/nerdtree/lib/nerdtree/nerdtree.vim
deleted file mode 100755
index a41490b..0000000
--- a/bundle/nerdtree/lib/nerdtree/nerdtree.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"CLASS: NERDTree
-"============================================================
-let s:NERDTree = {}
-let g:NERDTree = s:NERDTree
-
-" Function: s:NERDTree.ExistsForBuffer()   {{{1
-" Returns 1 if a nerd tree root exists in the current buffer
-function! s:NERDTree.ExistsForBuf()
-    return exists("b:NERDTreeRoot")
-endfunction
-
-" Function: s:NERDTree.ExistsForTab()   {{{1
-" Returns 1 if a nerd tree root exists in the current tab
-function! s:NERDTree.ExistsForTab()
-    return exists("t:NERDTreeBufName")
-endfunction
-
-function! s:NERDTree.ForCurrentBuf()
-    if s:NERDTree.ExistsForBuf()
-        return b:NERDTree
-    else
-        return {}
-    endif
-endfunction
-
-function! s:NERDTree.New(path)
-    let newObj = copy(self)
-    let newObj.ui = g:NERDTreeUI.New(newObj)
-    let newObj.root = g:NERDTreeDirNode.New(a:path)
-
-    return newObj
-endfunction
-
-"FUNCTION: s:NERDTree.render() {{{1
-"A convenience function - since this is called often
-function! s:NERDTree.render()
-    call self.ui.render()
-endfunction
-
diff --git a/bundle/nerdtree/lib/nerdtree/notifier.vim b/bundle/nerdtree/lib/nerdtree/notifier.vim
deleted file mode 100755
index b445f8a..0000000
--- a/bundle/nerdtree/lib/nerdtree/notifier.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-"CLASS: Notifier
-"============================================================
-let s:Notifier = {}
-
-function! s:Notifier.AddListener(event, funcname)
-    let listeners = s:Notifier.GetListenersForEvent(a:event)
-    if listeners == []
-        let listenersMap = s:Notifier.GetListenersMap()
-        let listenersMap[a:event] = listeners
-    endif
-    call add(listeners, a:funcname)
-endfunction
-
-function! s:Notifier.NotifyListeners(event, path, params)
-    let event = g:NERDTreeEvent.New(b:NERDTree, a:path, a:event, a:params)
-
-    for listener in s:Notifier.GetListenersForEvent(a:event)
-        call {listener}(event)
-    endfor
-endfunction
-
-function! s:Notifier.GetListenersMap()
-    if !exists("s:refreshListenersMap")
-        let s:refreshListenersMap = {}
-    endif
-    return s:refreshListenersMap
-endfunction
-
-function! s:Notifier.GetListenersForEvent(name)
-    let listenersMap = s:Notifier.GetListenersMap()
-    return get(listenersMap, a:name, [])
-endfunction
-
-let g:NERDTreePathNotifier = deepcopy(s:Notifier)
-
diff --git a/bundle/nerdtree/lib/nerdtree/opener.vim b/bundle/nerdtree/lib/nerdtree/opener.vim
deleted file mode 100755
index 845e55c..0000000
--- a/bundle/nerdtree/lib/nerdtree/opener.vim
+++ /dev/null
@@ -1,336 +0,0 @@
-"CLASS: Opener
-"============================================================
-let s:Opener = {}
-let g:NERDTreeOpener = s:Opener
-
-"FUNCTION: s:Opener._bufInWindows(bnum){{{1
-"[[STOLEN FROM VTREEEXPLORER.VIM]]
-"Determine the number of windows open to this buffer number.
-"Care of Yegappan Lakshman.  Thanks!
-"
-"Args:
-"bnum: the subject buffers buffer number
-function! s:Opener._bufInWindows(bnum)
-    let cnt = 0
-    let winnum = 1
-    while 1
-        let bufnum = winbufnr(winnum)
-        if bufnum < 0
-            break
-        endif
-        if bufnum ==# a:bnum
-            let cnt = cnt + 1
-        endif
-        let winnum = winnum + 1
-    endwhile
-
-    return cnt
-endfunction
-"FUNCTION: Opener._checkToCloseTree(newtab) {{{1
-"Check the class options and global options (i.e. NERDTreeQuitOnOpen) to see
-"if the tree should be closed now.
-"
-"Args:
-"a:newtab - boolean. If set, only close the tree now if we are opening the
-"target in a new tab. This is needed because we have to close tree before we
-"leave the tab
-function! s:Opener._checkToCloseTree(newtab)
-    if self._keepopen
-        return
-    endif
-
-    if (a:newtab && self._where == 't') || !a:newtab
-        call nerdtree#closeTreeIfQuitOnOpen()
-    endif
-endfunction
-
-
-"FUNCTION: s:Opener._firstUsableWindow(){{{1
-"find the window number of the first normal window
-function! s:Opener._firstUsableWindow()
-    let i = 1
-    while i <= winnr("$")
-        let bnum = winbufnr(i)
-        if bnum != -1 && getbufvar(bnum, '&buftype') ==# ''
-                    \ && !getwinvar(i, '&previewwindow')
-                    \ && (!getbufvar(bnum, '&modified') || &hidden)
-            return i
-        endif
-
-        let i += 1
-    endwhile
-    return -1
-endfunction
-
-"FUNCTION: Opener._gotoTargetWin() {{{1
-function! s:Opener._gotoTargetWin()
-    if b:NERDTreeType ==# "secondary"
-        if self._where == 'v'
-            vsplit
-        elseif self._where == 'h'
-            split
-        elseif self._where == 't'
-            tabnew
-        endif
-    else
-        call self._checkToCloseTree(1)
-
-        if self._where == 'v'
-            call self._newVSplit()
-        elseif self._where == 'h'
-            call self._newSplit()
-        elseif self._where == 't'
-            tabnew
-        elseif self._where == 'p'
-            call self._previousWindow()
-        endif
-
-        call self._checkToCloseTree(0)
-    endif
-endfunction
-
-"FUNCTION: s:Opener._isWindowUsable(winnumber) {{{1
-"Returns 0 if opening a file from the tree in the given window requires it to
-"be split, 1 otherwise
-"
-"Args:
-"winnumber: the number of the window in question
-function! s:Opener._isWindowUsable(winnumber)
-    "gotta split if theres only one window (i.e. the NERD tree)
-    if winnr("$") ==# 1
-        return 0
-    endif
-
-    let oldwinnr = winnr()
-    call nerdtree#exec(a:winnumber . "wincmd p")
-    let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow')
-    let modified = &modified
-    call nerdtree#exec(oldwinnr . "wincmd p")
-
-    "if its a special window e.g. quickfix or another explorer plugin then we
-    "have to split
-    if specialWindow
-        return 0
-    endif
-
-    if &hidden
-        return 1
-    endif
-
-    return !modified || self._bufInWindows(winbufnr(a:winnumber)) >= 2
-endfunction
-
-"FUNCTION: Opener.New(path, opts) {{{1
-"Args:
-"
-"a:path: The path object that is to be opened.
-"
-"a:opts:
-"
-"A dictionary containing the following keys (all optional):
-"  'where': Specifies whether the node should be opened in new split/tab or in
-"           the previous window. Can be either 'v' or 'h' or 't' (for open in
-"           new tab)
-"  'reuse': if a window is displaying the file then jump the cursor there
-"  'keepopen': dont close the tree window
-"  'stay': open the file, but keep the cursor in the tree win
-function! s:Opener.New(path, opts)
-    let newObj = copy(self)
-
-    let newObj._path = a:path
-    let newObj._stay = nerdtree#has_opt(a:opts, 'stay')
-    let newObj._reuse = nerdtree#has_opt(a:opts, 'reuse')
-    let newObj._keepopen = nerdtree#has_opt(a:opts, 'keepopen')
-    let newObj._where = has_key(a:opts, 'where') ? a:opts['where'] : ''
-    let newObj._treetype = b:NERDTreeType
-    call newObj._saveCursorPos()
-
-    return newObj
-endfunction
-
-"FUNCTION: Opener._newSplit() {{{1
-function! s:Opener._newSplit()
-    " Save the user's settings for splitbelow and splitright
-    let savesplitbelow=&splitbelow
-    let savesplitright=&splitright
-
-    " 'there' will be set to a command to move from the split window
-    " back to the explorer window
-    "
-    " 'back' will be set to a command to move from the explorer window
-    " back to the newly split window
-    "
-    " 'right' and 'below' will be set to the settings needed for
-    " splitbelow and splitright IF the explorer is the only window.
-    "
-    let there= g:NERDTreeWinPos ==# "left" ? "wincmd h" : "wincmd l"
-    let back = g:NERDTreeWinPos ==# "left" ? "wincmd l" : "wincmd h"
-    let right= g:NERDTreeWinPos ==# "left"
-    let below=0
-
-    " Attempt to go to adjacent window
-    call nerdtree#exec(back)
-
-    let onlyOneWin = (winnr("$") ==# 1)
-
-    " If no adjacent window, set splitright and splitbelow appropriately
-    if onlyOneWin
-        let &splitright=right
-        let &splitbelow=below
-    else
-        " found adjacent window - invert split direction
-        let &splitright=!right
-        let &splitbelow=!below
-    endif
-
-    let splitMode = onlyOneWin ? "vertical" : ""
-
-    " Open the new window
-    try
-        exec(splitMode." sp ")
-    catch /^Vim\%((\a\+)\)\=:E37/
-        call nerdtree#putCursorInTreeWin()
-        throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified."
-    catch /^Vim\%((\a\+)\)\=:/
-        "do nothing
-    endtry
-
-    "resize the tree window if no other window was open before
-    if onlyOneWin
-        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
-        call nerdtree#exec(there)
-        exec("silent ". splitMode ." resize ". size)
-        call nerdtree#exec('wincmd p')
-    endif
-
-    " Restore splitmode settings
-    let &splitbelow=savesplitbelow
-    let &splitright=savesplitright
-endfunction
-
-"FUNCTION: Opener._newVSplit() {{{1
-function! s:Opener._newVSplit()
-    let winwidth = winwidth(".")
-    if winnr("$")==#1
-        let winwidth = g:NERDTreeWinSize
-    endif
-
-    call nerdtree#exec("wincmd p")
-    vnew
-
-    "resize the nerd tree back to the original size
-    call nerdtree#putCursorInTreeWin()
-    exec("silent vertical resize ". winwidth)
-    call nerdtree#exec('wincmd p')
-endfunction
-
-"FUNCTION: Opener.open(target) {{{1
-function! s:Opener.open(target)
-    if self._path.isDirectory
-        call self._openDirectory(a:target)
-    else
-        call self._openFile()
-    endif
-endfunction
-
-"FUNCTION: Opener._openFile() {{{1
-function! s:Opener._openFile()
-    if self._reuse && self._reuseWindow()
-        return
-    endif
-
-    call self._gotoTargetWin()
-
-    if self._treetype ==# "secondary"
-        call self._path.edit()
-    else
-        call self._path.edit()
-
-
-        if self._stay
-            call self._restoreCursorPos()
-        endif
-    endif
-endfunction
-
-"FUNCTION: Opener._openDirectory(node) {{{1
-function! s:Opener._openDirectory(node)
-    if self._treetype ==# "secondary"
-        call self._gotoTargetWin()
-        call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
-    else
-        call self._gotoTargetWin()
-        if empty(self._where)
-            call a:node.makeRoot()
-            call b:NERDTree.render()
-            call a:node.putCursorHere(0, 0)
-        elseif self._where == 't'
-            call g:NERDTreeCreator.CreatePrimary(a:node.path.str())
-        else
-            call g:NERDTreeCreator.CreateSecondary(a:node.path.str())
-        endif
-    endif
-
-    if self._stay
-        call self._restoreCursorPos()
-    endif
-endfunction
-
-"FUNCTION: Opener._previousWindow() {{{1
-function! s:Opener._previousWindow()
-    if !self._isWindowUsable(winnr("#")) && self._firstUsableWindow() ==# -1
-        call self._newSplit()
-    else
-        try
-            if !self._isWindowUsable(winnr("#"))
-                call nerdtree#exec(self._firstUsableWindow() . "wincmd w")
-            else
-                call nerdtree#exec('wincmd p')
-            endif
-        catch /^Vim\%((\a\+)\)\=:E37/
-            call nerdtree#putCursorInTreeWin()
-            throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified."
-        catch /^Vim\%((\a\+)\)\=:/
-            echo v:exception
-        endtry
-    endif
-endfunction
-
-"FUNCTION: Opener._restoreCursorPos(){{{1
-function! s:Opener._restoreCursorPos()
-    call nerdtree#exec('normal ' . self._tabnr . 'gt')
-    call nerdtree#exec(bufwinnr(self._bufnr) . 'wincmd w')
-endfunction
-
-"FUNCTION: Opener._reuseWindow(){{{1
-"put the cursor in the first window we find for this file
-"
-"return 1 if we were successful
-function! s:Opener._reuseWindow()
-    "check the current tab for the window
-    let winnr = bufwinnr('^' . self._path.str() . '$')
-    if winnr != -1
-        call nerdtree#exec(winnr . "wincmd w")
-        call self._checkToCloseTree(0)
-        return 1
-    else
-        "check other tabs
-        let tabnr = self._path.tabnr()
-        if tabnr
-            call self._checkToCloseTree(1)
-            call nerdtree#exec('normal! ' . tabnr . 'gt')
-            let winnr = bufwinnr('^' . self._path.str() . '$')
-            call nerdtree#exec(winnr . "wincmd w")
-            return 1
-        endif
-    endif
-    return 0
-endfunction
-
-"FUNCTION: Opener._saveCursorPos(){{{1
-function! s:Opener._saveCursorPos()
-    let self._bufnr = bufnr("")
-    let self._tabnr = tabpagenr()
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/path.vim b/bundle/nerdtree/lib/nerdtree/path.vim
deleted file mode 100755
index 5de1dfe..0000000
--- a/bundle/nerdtree/lib/nerdtree/path.vim
+++ /dev/null
@@ -1,764 +0,0 @@
-"we need to use this number many times for sorting... so we calculate it only
-"once here
-let s:NERDTreeSortStarIndex = index(g:NERDTreeSortOrder, '*')
-
-"CLASS: Path
-"============================================================
-let s:Path = {}
-let g:NERDTreePath = s:Path
-
-"FUNCTION: Path.AbsolutePathFor(str) {{{1
-function! s:Path.AbsolutePathFor(str)
-    let prependCWD = 0
-    if nerdtree#runningWindows()
-        let prependCWD = a:str !~# '^.:\(\\\|\/\)' && a:str !~# '^\(\\\\\|\/\/\)'
-    else
-        let prependCWD = a:str !~# '^/'
-    endif
-
-    let toReturn = a:str
-    if prependCWD
-        let toReturn = getcwd() . s:Path.Slash() . a:str
-    endif
-
-    return toReturn
-endfunction
-
-"FUNCTION: Path.bookmarkNames() {{{1
-function! s:Path.bookmarkNames()
-    if !exists("self._bookmarkNames")
-        call self.cacheDisplayString()
-    endif
-    return self._bookmarkNames
-endfunction
-
-"FUNCTION: Path.cacheDisplayString() {{{1
-function! s:Path.cacheDisplayString() abort
-    let self.cachedDisplayString = self.flagSet.renderToString()
-
-    let self.cachedDisplayString .= self.getLastPathComponent(1)
-
-    if self.isExecutable
-        let self.cachedDisplayString = self.cachedDisplayString . '*'
-    endif
-
-    let self._bookmarkNames = []
-    for i in g:NERDTreeBookmark.Bookmarks()
-        if i.path.equals(self)
-            call add(self._bookmarkNames, i.name)
-        endif
-    endfor
-    if !empty(self._bookmarkNames)
-        let self.cachedDisplayString .= ' {' . join(self._bookmarkNames) . '}'
-    endif
-
-    if self.isSymLink
-        let self.cachedDisplayString .=  ' -> ' . self.symLinkDest
-    endif
-
-    if self.isReadOnly
-        let self.cachedDisplayString .=  ' [RO]'
-    endif
-endfunction
-
-"FUNCTION: Path.changeToDir() {{{1
-function! s:Path.changeToDir()
-    let dir = self.str({'format': 'Cd'})
-    if self.isDirectory ==# 0
-        let dir = self.getParent().str({'format': 'Cd'})
-    endif
-
-    try
-        execute "cd " . dir
-        call nerdtree#echo("CWD is now: " . getcwd())
-    catch
-        throw "NERDTree.PathChangeError: cannot change CWD to " . dir
-    endtry
-endfunction
-
-"FUNCTION: Path.compareTo() {{{1
-"
-"Compares this Path to the given path and returns 0 if they are equal, -1 if
-"this Path is "less than" the given path, or 1 if it is "greater".
-"
-"Args:
-"path: the path object to compare this to
-"
-"Return:
-"1, -1 or 0
-function! s:Path.compareTo(path)
-    let thisPath = self.getLastPathComponent(1)
-    let thatPath = a:path.getLastPathComponent(1)
-
-    "if the paths are the same then clearly we return 0
-    if thisPath ==# thatPath
-        return 0
-    endif
-
-    let thisSS = self.getSortOrderIndex()
-    let thatSS = a:path.getSortOrderIndex()
-
-    "compare the sort sequences, if they are different then the return
-    "value is easy
-    if thisSS < thatSS
-        return -1
-    elseif thisSS > thatSS
-        return 1
-    else
-        if !g:NERDTreeSortHiddenFirst
-            let thisPath = substitute(thisPath, '^[._]', '', '')
-            let thatPath = substitute(thatPath, '^[._]', '', '')
-        endif
-        "if the sort sequences are the same then compare the paths
-        "alphabetically
-        let pathCompare = g:NERDTreeCaseSensitiveSort ? thisPath <# thatPath : thisPath <? thatPath
-        if pathCompare
-            return -1
-        else
-            return 1
-        endif
-    endif
-endfunction
-
-"FUNCTION: Path.Create(fullpath) {{{1
-"
-"Factory method.
-"
-"Creates a path object with the given path. The path is also created on the
-"filesystem. If the path already exists, a NERDTree.Path.Exists exception is
-"thrown. If any other errors occur, a NERDTree.Path exception is thrown.
-"
-"Args:
-"fullpath: the full filesystem path to the file/dir to create
-function! s:Path.Create(fullpath)
-    "bail if the a:fullpath already exists
-    if isdirectory(a:fullpath) || filereadable(a:fullpath)
-        throw "NERDTree.CreatePathError: Directory Exists: '" . a:fullpath . "'"
-    endif
-
-    try
-
-        "if it ends with a slash, assume its a dir create it
-        if a:fullpath =~# '\(\\\|\/\)$'
-            "whack the trailing slash off the end if it exists
-            let fullpath = substitute(a:fullpath, '\(\\\|\/\)$', '', '')
-
-            call mkdir(fullpath, 'p')
-
-        "assume its a file and create
-        else
-            call s:Path.createParentDirectories(a:fullpath)
-            call writefile([], a:fullpath)
-        endif
-    catch
-        throw "NERDTree.CreatePathError: Could not create path: '" . a:fullpath . "'"
-    endtry
-
-    return s:Path.New(a:fullpath)
-endfunction
-
-"FUNCTION: Path.copy(dest) {{{1
-"
-"Copies the file/dir represented by this Path to the given location
-"
-"Args:
-"dest: the location to copy this dir/file to
-function! s:Path.copy(dest)
-    if !s:Path.CopyingSupported()
-        throw "NERDTree.CopyingNotSupportedError: Copying is not supported on this OS"
-    endif
-
-    call s:Path.createParentDirectories(a:dest)
-
-    let dest = s:Path.WinToUnixPath(a:dest)
-
-    let cmd = g:NERDTreeCopyCmd . " " . escape(self.str(), self._escChars()) . " " . escape(dest, self._escChars())
-    let success = system(cmd)
-    if success != 0
-        throw "NERDTree.CopyError: Could not copy ''". self.str() ."'' to: '" . a:dest . "'"
-    endif
-endfunction
-
-"FUNCTION: Path.CopyingSupported() {{{1
-"
-"returns 1 if copying is supported for this OS
-function! s:Path.CopyingSupported()
-    return exists('g:NERDTreeCopyCmd')
-endfunction
-
-"FUNCTION: Path.copyingWillOverwrite(dest) {{{1
-"
-"returns 1 if copy this path to the given location will cause files to
-"overwritten
-"
-"Args:
-"dest: the location this path will be copied to
-function! s:Path.copyingWillOverwrite(dest)
-    if filereadable(a:dest)
-        return 1
-    endif
-
-    if isdirectory(a:dest)
-        let path = s:Path.JoinPathStrings(a:dest, self.getLastPathComponent(0))
-        if filereadable(path)
-            return 1
-        endif
-    endif
-endfunction
-
-"FUNCTION: Path.createParentDirectories(path) {{{1
-"
-"create parent directories for this path if needed
-"without throwing any errors is those directories already exist
-"
-"Args:
-"path: full path of the node whose parent directories may need to be created
-function! s:Path.createParentDirectories(path)
-    let dir_path = fnamemodify(a:path, ':h')
-    if !isdirectory(dir_path)
-        call mkdir(dir_path, 'p')
-    endif
-endfunction
-
-"FUNCTION: Path.delete() {{{1
-"
-"Deletes the file represented by this path.
-"Deletion of directories is not supported
-"
-"Throws NERDTree.Path.Deletion exceptions
-function! s:Path.delete()
-    if self.isDirectory
-
-        let cmd = g:NERDTreeRemoveDirCmd . self.str({'escape': 1})
-        let success = system(cmd)
-
-        if v:shell_error != 0
-            throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.str() . "'"
-        endif
-    else
-        let success = delete(self.str())
-        if success != 0
-            throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str() . "'"
-        endif
-    endif
-
-    "delete all bookmarks for this path
-    for i in self.bookmarkNames()
-        let bookmark = g:NERDTreeBookmark.BookmarkFor(i)
-        call bookmark.delete()
-    endfor
-endfunction
-
-"FUNCTION: Path.displayString() {{{1
-"
-"Returns a string that specifies how the path should be represented as a
-"string
-function! s:Path.displayString()
-    if self.cachedDisplayString ==# ""
-        call self.cacheDisplayString()
-    endif
-
-    return self.cachedDisplayString
-endfunction
-
-"FUNCTION: Path.edit() {{{1
-function! s:Path.edit()
-    exec "edit " . self.str({'format': 'Edit'})
-endfunction
-
-"FUNCTION: Path.extractDriveLetter(fullpath) {{{1
-"
-"If running windows, cache the drive letter for this path
-function! s:Path.extractDriveLetter(fullpath)
-    if nerdtree#runningWindows()
-        if a:fullpath =~ '^\(\\\\\|\/\/\)'
-            "For network shares, the 'drive' consists of the first two parts of the path, i.e. \\boxname\share
-            let self.drive = substitute(a:fullpath, '^\(\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\).*', '\1', '')
-            let self.drive = substitute(self.drive, '/', '\', "g")
-        else
-            let self.drive = substitute(a:fullpath, '\(^[a-zA-Z]:\).*', '\1', '')
-        endif
-    else
-        let self.drive = ''
-    endif
-
-endfunction
-
-"FUNCTION: Path.exists() {{{1
-"return 1 if this path points to a location that is readable or is a directory
-function! s:Path.exists()
-    let p = self.str()
-    return filereadable(p) || isdirectory(p)
-endfunction
-
-"FUNCTION: Path._escChars() {{{1
-function! s:Path._escChars()
-    if nerdtree#runningWindows()
-        return " `\|\"#%&,?()\*^<>"
-    endif
-
-    return " \\`\|\"#%&,?()\*^<>[]"
-endfunction
-
-"FUNCTION: Path.getDir() {{{1
-"
-"Returns this path if it is a directory, else this paths parent.
-"
-"Return:
-"a Path object
-function! s:Path.getDir()
-    if self.isDirectory
-        return self
-    else
-        return self.getParent()
-    endif
-endfunction
-
-"FUNCTION: Path.getParent() {{{1
-"
-"Returns a new path object for this paths parent
-"
-"Return:
-"a new Path object
-function! s:Path.getParent()
-    if nerdtree#runningWindows()
-        let path = self.drive . '\' . join(self.pathSegments[0:-2], '\')
-    else
-        let path = '/'. join(self.pathSegments[0:-2], '/')
-    endif
-
-    return s:Path.New(path)
-endfunction
-
-"FUNCTION: Path.getLastPathComponent(dirSlash) {{{1
-"
-"Gets the last part of this path.
-"
-"Args:
-"dirSlash: if 1 then a trailing slash will be added to the returned value for
-"directory nodes.
-function! s:Path.getLastPathComponent(dirSlash)
-    if empty(self.pathSegments)
-        return ''
-    endif
-    let toReturn = self.pathSegments[-1]
-    if a:dirSlash && self.isDirectory
-        let toReturn = toReturn . '/'
-    endif
-    return toReturn
-endfunction
-
-"FUNCTION: Path.getSortOrderIndex() {{{1
-"returns the index of the pattern in g:NERDTreeSortOrder that this path matches
-function! s:Path.getSortOrderIndex()
-    let i = 0
-    while i < len(g:NERDTreeSortOrder)
-        if  self.getLastPathComponent(1) =~# g:NERDTreeSortOrder[i]
-            return i
-        endif
-        let i = i + 1
-    endwhile
-    return s:NERDTreeSortStarIndex
-endfunction
-
-"FUNCTION: Path.isUnixHiddenFile() {{{1
-"check for unix hidden files
-function! s:Path.isUnixHiddenFile()
-    return self.getLastPathComponent(0) =~# '^\.'
-endfunction
-
-"FUNCTION: Path.isUnixHiddenPath() {{{1
-"check for unix path with hidden components
-function! s:Path.isUnixHiddenPath()
-    if self.getLastPathComponent(0) =~# '^\.'
-        return 1
-    else
-        for segment in self.pathSegments
-            if segment =~# '^\.'
-                return 1
-            endif
-        endfor
-        return 0
-    endif
-endfunction
-
-"FUNCTION: Path.ignore() {{{1
-"returns true if this path should be ignored
-function! s:Path.ignore()
-    "filter out the user specified paths to ignore
-    if b:NERDTreeIgnoreEnabled
-        for i in g:NERDTreeIgnore
-            if self._ignorePatternMatches(i)
-                return 1
-            endif
-        endfor
-    endif
-
-    "dont show hidden files unless instructed to
-    if b:NERDTreeShowHidden ==# 0 && self.isUnixHiddenFile()
-        return 1
-    endif
-
-    if b:NERDTreeShowFiles ==# 0 && self.isDirectory ==# 0
-        return 1
-    endif
-
-    if exists("*NERDTreeCustomIgnoreFilter") && NERDTreeCustomIgnoreFilter(self)
-        return 1
-    endif
-
-    return 0
-endfunction
-
-"FUNCTION: Path._ignorePatternMatches(pattern) {{{1
-"returns true if this path matches the given ignore pattern
-function! s:Path._ignorePatternMatches(pattern)
-    let pat = a:pattern
-    if strpart(pat,len(pat)-7) == '[[dir]]'
-        if !self.isDirectory
-            return 0
-        endif
-        let pat = strpart(pat,0, len(pat)-7)
-    elseif strpart(pat,len(pat)-8) == '[[file]]'
-        if self.isDirectory
-            return 0
-        endif
-        let pat = strpart(pat,0, len(pat)-8)
-    endif
-
-    return self.getLastPathComponent(0) =~# pat
-endfunction
-
-"FUNCTION: Path.isUnder(path) {{{1
-"return 1 if this path is somewhere under the given path in the filesystem.
-"
-"a:path should be a dir
-function! s:Path.isUnder(path)
-    if a:path.isDirectory == 0
-        return 0
-    endif
-
-    let this = self.str()
-    let that = a:path.str()
-    return stridx(this, that . s:Path.Slash()) == 0
-endfunction
-
-"FUNCTION: Path.JoinPathStrings(...) {{{1
-function! s:Path.JoinPathStrings(...)
-    let components = []
-    for i in a:000
-        let components = extend(components, split(i, '/'))
-    endfor
-    return '/' . join(components, '/')
-endfunction
-
-"FUNCTION: Path.equals() {{{1
-"
-"Determines whether 2 path objects are "equal".
-"They are equal if the paths they represent are the same
-"
-"Args:
-"path: the other path obj to compare this with
-function! s:Path.equals(path)
-    return self.str() ==# a:path.str()
-endfunction
-
-"FUNCTION: Path.New() {{{1
-"The Constructor for the Path object
-function! s:Path.New(path)
-    let newPath = copy(self)
-
-    call newPath.readInfoFromDisk(s:Path.AbsolutePathFor(a:path))
-
-    let newPath.cachedDisplayString = ""
-    let newPath.flagSet = g:NERDTreeFlagSet.New()
-
-    return newPath
-endfunction
-
-"FUNCTION: Path.Slash() {{{1
-"return the slash to use for the current OS
-function! s:Path.Slash()
-    return nerdtree#runningWindows() ? '\' : '/'
-endfunction
-
-"FUNCTION: Path.Resolve() {{{1
-"Invoke the vim resolve() function and return the result
-"This is necessary because in some versions of vim resolve() removes trailing
-"slashes while in other versions it doesn't.  This always removes the trailing
-"slash
-function! s:Path.Resolve(path)
-    let tmp = resolve(a:path)
-    return tmp =~# '.\+/$' ? substitute(tmp, '/$', '', '') : tmp
-endfunction
-
-"FUNCTION: Path.readInfoFromDisk(fullpath) {{{1
-"
-"
-"Throws NERDTree.Path.InvalidArguments exception.
-function! s:Path.readInfoFromDisk(fullpath)
-    call self.extractDriveLetter(a:fullpath)
-
-    let fullpath = s:Path.WinToUnixPath(a:fullpath)
-
-    if getftype(fullpath) ==# "fifo"
-        throw "NERDTree.InvalidFiletypeError: Cant handle FIFO files: " . a:fullpath
-    endif
-
-    let self.pathSegments = split(fullpath, '/')
-
-    let self.isReadOnly = 0
-    if isdirectory(a:fullpath)
-        let self.isDirectory = 1
-    elseif filereadable(a:fullpath)
-        let self.isDirectory = 0
-        let self.isReadOnly = filewritable(a:fullpath) ==# 0
-    else
-        throw "NERDTree.InvalidArgumentsError: Invalid path = " . a:fullpath
-    endif
-
-    let self.isExecutable = 0
-    if !self.isDirectory
-        let self.isExecutable = getfperm(a:fullpath) =~# 'x'
-    endif
-
-    "grab the last part of the path (minus the trailing slash)
-    let lastPathComponent = self.getLastPathComponent(0)
-
-    "get the path to the new node with the parent dir fully resolved
-    let hardPath = s:Path.Resolve(self.strTrunk()) . '/' . lastPathComponent
-
-    "if  the last part of the path is a symlink then flag it as such
-    let self.isSymLink = (s:Path.Resolve(hardPath) != hardPath)
-    if self.isSymLink
-        let self.symLinkDest = s:Path.Resolve(fullpath)
-
-        "if the link is a dir then slap a / on the end of its dest
-        if isdirectory(self.symLinkDest)
-
-            "we always wanna treat MS windows shortcuts as files for
-            "simplicity
-            if hardPath !~# '\.lnk$'
-
-                let self.symLinkDest = self.symLinkDest . '/'
-            endif
-        endif
-    endif
-endfunction
-
-"FUNCTION: Path.refresh() {{{1
-function! s:Path.refresh()
-    call self.readInfoFromDisk(self.str())
-    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, {})
-    call self.cacheDisplayString()
-endfunction
-
-"FUNCTION: Path.refreshFlags() {{{1
-function! s:Path.refreshFlags()
-    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, {})
-    call self.cacheDisplayString()
-endfunction
-
-"FUNCTION: Path.rename() {{{1
-"
-"Renames this node on the filesystem
-function! s:Path.rename(newPath)
-    if a:newPath ==# ''
-        throw "NERDTree.InvalidArgumentsError: Invalid newPath for renaming = ". a:newPath
-    endif
-
-    let success =  rename(self.str(), a:newPath)
-    if success != 0
-        throw "NERDTree.PathRenameError: Could not rename: '" . self.str() . "'" . 'to:' . a:newPath
-    endif
-    call self.readInfoFromDisk(a:newPath)
-
-    for i in self.bookmarkNames()
-        let b = g:NERDTreeBookmark.BookmarkFor(i)
-        call b.setPath(copy(self))
-    endfor
-    call g:NERDTreeBookmark.Write()
-endfunction
-
-"FUNCTION: Path.str() {{{1
-"
-"Returns a string representation of this Path
-"
-"Takes an optional dictionary param to specify how the output should be
-"formatted.
-"
-"The dict may have the following keys:
-"  'format'
-"  'escape'
-"  'truncateTo'
-"
-"The 'format' key may have a value of:
-"  'Cd' - a string to be used with the :cd command
-"  'Edit' - a string to be used with :e :sp :new :tabedit etc
-"  'UI' - a string used in the NERD tree UI
-"
-"The 'escape' key, if specified will cause the output to be escaped with
-"shellescape()
-"
-"The 'truncateTo' key causes the resulting string to be truncated to the value
-"'truncateTo' maps to. A '<' char will be prepended.
-function! s:Path.str(...)
-    let options = a:0 ? a:1 : {}
-    let toReturn = ""
-
-    if has_key(options, 'format')
-        let format = options['format']
-        if has_key(self, '_strFor' . format)
-            exec 'let toReturn = self._strFor' . format . '()'
-        else
-            raise 'NERDTree.UnknownFormatError: unknown format "'. format .'"'
-        endif
-    else
-        let toReturn = self._str()
-    endif
-
-    if nerdtree#has_opt(options, 'escape')
-        let toReturn = shellescape(toReturn)
-    endif
-
-    if has_key(options, 'truncateTo')
-        let limit = options['truncateTo']
-        if len(toReturn) > limit
-            let toReturn = "<" . strpart(toReturn, len(toReturn) - limit + 1)
-        endif
-    endif
-
-    return toReturn
-endfunction
-
-"FUNCTION: Path._strForUI() {{{1
-function! s:Path._strForUI()
-    let toReturn = '/' . join(self.pathSegments, '/')
-    if self.isDirectory && toReturn != '/'
-        let toReturn  = toReturn . '/'
-    endif
-    return toReturn
-endfunction
-
-"FUNCTION: Path._strForCd() {{{1
-"
-" returns a string that can be used with :cd
-function! s:Path._strForCd()
-    return escape(self.str(), self._escChars())
-endfunction
-
-"FUNCTION: Path._strForEdit() {{{1
-"
-"Return: the string for this path that is suitable to be used with the :edit
-"command
-function! s:Path._strForEdit()
-    let p = escape(self.str({'format': 'UI'}), self._escChars())
-    let cwd = getcwd() . s:Path.Slash()
-
-    "return a relative path if we can
-    let isRelative = 0
-    if nerdtree#runningWindows()
-        let isRelative = stridx(tolower(p), tolower(cwd)) == 0
-    else
-        let isRelative = stridx(p, cwd) == 0
-    endif
-
-    if isRelative
-        let p = strpart(p, strlen(cwd))
-
-        "handle the edge case where the file begins with a + (vim interprets
-        "the +foo in `:e +foo` as an option to :edit)
-        if p[0] == "+"
-            let p = '\' . p
-        endif
-    endif
-
-    if p ==# ''
-        let p = '.'
-    endif
-
-    return p
-endfunction
-
-"FUNCTION: Path._strForGlob() {{{1
-function! s:Path._strForGlob()
-    let lead = s:Path.Slash()
-
-    "if we are running windows then slap a drive letter on the front
-    if nerdtree#runningWindows()
-        let lead = self.drive . '\'
-    endif
-
-    let toReturn = lead . join(self.pathSegments, s:Path.Slash())
-
-    if !nerdtree#runningWindows()
-        let toReturn = escape(toReturn, self._escChars())
-    endif
-    return toReturn
-endfunction
-
-"FUNCTION: Path._str() {{{1
-"
-"Gets the string path for this path object that is appropriate for the OS.
-"EG, in windows c:\foo\bar
-"    in *nix  /foo/bar
-function! s:Path._str()
-    let lead = s:Path.Slash()
-
-    "if we are running windows then slap a drive letter on the front
-    if nerdtree#runningWindows()
-        let lead = self.drive . '\'
-    endif
-
-    return lead . join(self.pathSegments, s:Path.Slash())
-endfunction
-
-"FUNCTION: Path.strTrunk() {{{1
-"Gets the path without the last segment on the end.
-function! s:Path.strTrunk()
-    return self.drive . '/' . join(self.pathSegments[0:-2], '/')
-endfunction
-
-" FUNCTION: Path.tabnr() {{{1
-" return the number of the first tab that is displaying this file
-"
-" return 0 if no tab was found
-function! s:Path.tabnr()
-    let str = self.str()
-    for t in range(tabpagenr('$'))
-        for b in tabpagebuflist(t+1)
-            if str == expand('#' . b . ':p')
-                return t+1
-            endif
-        endfor
-    endfor
-    return 0
-endfunction
-
-"FUNCTION: Path.WinToUnixPath(pathstr){{{1
-"Takes in a windows path and returns the unix equiv
-"
-"A class level method
-"
-"Args:
-"pathstr: the windows path to convert
-function! s:Path.WinToUnixPath(pathstr)
-    if !nerdtree#runningWindows()
-        return a:pathstr
-    endif
-
-    let toReturn = a:pathstr
-
-    "remove the x:\ of the front
-    let toReturn = substitute(toReturn, '^.*:\(\\\|/\)\?', '/', "")
-
-    "remove the \\ network share from the front
-    let toReturn = substitute(toReturn, '^\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\(\\\|\/\)\?', '/', "")
-
-    "convert all \ chars to /
-    let toReturn = substitute(toReturn, '\', '/', "g")
-
-    return toReturn
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim b/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim
deleted file mode 100755
index a24c270..0000000
--- a/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim
+++ /dev/null
@@ -1,543 +0,0 @@
-"CLASS: TreeDirNode
-"A subclass of NERDTreeFileNode.
-"
-"The 'composite' part of the file/dir composite.
-"============================================================
-let s:TreeDirNode = copy(g:NERDTreeFileNode)
-let g:NERDTreeDirNode = s:TreeDirNode
-
-"FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{1
-"class method that returns the highest cached ancestor of the current root
-function! s:TreeDirNode.AbsoluteTreeRoot()
-    let currentNode = b:NERDTreeRoot
-    while currentNode.parent != {}
-        let currentNode = currentNode.parent
-    endwhile
-    return currentNode
-endfunction
-
-"FUNCTION: TreeDirNode.activate([options]) {{{1
-unlet s:TreeDirNode.activate
-function! s:TreeDirNode.activate(...)
-    let opts = a:0 ? a:1 : {}
-    call self.toggleOpen(opts)
-    call b:NERDTree.render()
-    call self.putCursorHere(0, 0)
-endfunction
-
-"FUNCTION: TreeDirNode.addChild(treenode, inOrder) {{{1
-"Adds the given treenode to the list of children for this node
-"
-"Args:
-"-treenode: the node to add
-"-inOrder: 1 if the new node should be inserted in sorted order
-function! s:TreeDirNode.addChild(treenode, inOrder)
-    call add(self.children, a:treenode)
-    let a:treenode.parent = self
-
-    if a:inOrder
-        call self.sortChildren()
-    endif
-endfunction
-
-"FUNCTION: TreeDirNode.close() {{{1
-"Closes this directory
-function! s:TreeDirNode.close()
-    let self.isOpen = 0
-endfunction
-
-"FUNCTION: TreeDirNode.closeChildren() {{{1
-"Closes all the child dir nodes of this node
-function! s:TreeDirNode.closeChildren()
-    for i in self.children
-        if i.path.isDirectory
-            call i.close()
-            call i.closeChildren()
-        endif
-    endfor
-endfunction
-
-"FUNCTION: TreeDirNode.createChild(path, inOrder) {{{1
-"Instantiates a new child node for this node with the given path. The new
-"nodes parent is set to this node.
-"
-"Args:
-"path: a Path object that this node will represent/contain
-"inOrder: 1 if the new node should be inserted in sorted order
-"
-"Returns:
-"the newly created node
-function! s:TreeDirNode.createChild(path, inOrder)
-    let newTreeNode = g:NERDTreeFileNode.New(a:path)
-    call self.addChild(newTreeNode, a:inOrder)
-    return newTreeNode
-endfunction
-
-"FUNCTION: TreeDirNode.findNode(path) {{{1
-"Will find one of the children (recursively) that has the given path
-"
-"Args:
-"path: a path object
-unlet s:TreeDirNode.findNode
-function! s:TreeDirNode.findNode(path)
-    if a:path.equals(self.path)
-        return self
-    endif
-    if stridx(a:path.str(), self.path.str(), 0) ==# -1
-        return {}
-    endif
-
-    if self.path.isDirectory
-        for i in self.children
-            let retVal = i.findNode(a:path)
-            if retVal != {}
-                return retVal
-            endif
-        endfor
-    endif
-    return {}
-endfunction
-
-"FUNCTION: TreeDirNode.getChildCount() {{{1
-"Returns the number of children this node has
-function! s:TreeDirNode.getChildCount()
-    return len(self.children)
-endfunction
-
-"FUNCTION: TreeDirNode.getChild(path) {{{1
-"Returns child node of this node that has the given path or {} if no such node
-"exists.
-"
-"This function doesnt not recurse into child dir nodes
-"
-"Args:
-"path: a path object
-function! s:TreeDirNode.getChild(path)
-    if stridx(a:path.str(), self.path.str(), 0) ==# -1
-        return {}
-    endif
-
-    let index = self.getChildIndex(a:path)
-    if index ==# -1
-        return {}
-    else
-        return self.children[index]
-    endif
-
-endfunction
-
-"FUNCTION: TreeDirNode.getChildByIndex(indx, visible) {{{1
-"returns the child at the given index
-"Args:
-"indx: the index to get the child from
-"visible: 1 if only the visible children array should be used, 0 if all the
-"children should be searched.
-function! s:TreeDirNode.getChildByIndex(indx, visible)
-    let array_to_search = a:visible? self.getVisibleChildren() : self.children
-    if a:indx > len(array_to_search)
-        throw "NERDTree.InvalidArgumentsError: Index is out of bounds."
-    endif
-    return array_to_search[a:indx]
-endfunction
-
-"FUNCTION: TreeDirNode.getChildIndex(path) {{{1
-"Returns the index of the child node of this node that has the given path or
-"-1 if no such node exists.
-"
-"This function doesnt not recurse into child dir nodes
-"
-"Args:
-"path: a path object
-function! s:TreeDirNode.getChildIndex(path)
-    if stridx(a:path.str(), self.path.str(), 0) ==# -1
-        return -1
-    endif
-
-    "do a binary search for the child
-    let a = 0
-    let z = self.getChildCount()
-    while a < z
-        let mid = (a+z)/2
-        let diff = a:path.compareTo(self.children[mid].path)
-
-        if diff ==# -1
-            let z = mid
-        elseif diff ==# 1
-            let a = mid+1
-        else
-            return mid
-        endif
-    endwhile
-    return -1
-endfunction
-
-"FUNCTION: TreeDirNode.GetSelected() {{{1
-"Returns the current node if it is a dir node, or else returns the current
-"nodes parent
-unlet s:TreeDirNode.GetSelected
-function! s:TreeDirNode.GetSelected()
-    let currentDir = g:NERDTreeFileNode.GetSelected()
-    if currentDir != {} && !currentDir.isRoot()
-        if currentDir.path.isDirectory ==# 0
-            let currentDir = currentDir.parent
-        endif
-    endif
-    return currentDir
-endfunction
-
-"FUNCTION: TreeDirNode.getVisibleChildCount() {{{1
-"Returns the number of visible children this node has
-function! s:TreeDirNode.getVisibleChildCount()
-    return len(self.getVisibleChildren())
-endfunction
-
-"FUNCTION: TreeDirNode.getVisibleChildren() {{{1
-"Returns a list of children to display for this node, in the correct order
-"
-"Return:
-"an array of treenodes
-function! s:TreeDirNode.getVisibleChildren()
-    let toReturn = []
-    for i in self.children
-        if i.path.ignore() ==# 0
-            call add(toReturn, i)
-        endif
-    endfor
-    return toReturn
-endfunction
-
-"FUNCTION: TreeDirNode.hasVisibleChildren() {{{1
-"returns 1 if this node has any childre, 0 otherwise..
-function! s:TreeDirNode.hasVisibleChildren()
-    return self.getVisibleChildCount() != 0
-endfunction
-
-"FUNCTION: TreeDirNode._initChildren() {{{1
-"Removes all childen from this node and re-reads them
-"
-"Args:
-"silent: 1 if the function should not echo any "please wait" messages for
-"large directories
-"
-"Return: the number of child nodes read
-function! s:TreeDirNode._initChildren(silent)
-    "remove all the current child nodes
-    let self.children = []
-
-    "get an array of all the files in the nodes dir
-    let dir = self.path
-    let globDir = dir.str({'format': 'Glob'})
-
-    if version >= 703
-        let filesStr = globpath(globDir, '*', !g:NERDTreeRespectWildIgnore) . "\n" . globpath(globDir, '.*', !g:NERDTreeRespectWildIgnore)
-    else
-        let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*')
-    endif
-
-    let files = split(filesStr, "\n")
-
-    if !a:silent && len(files) > g:NERDTreeNotificationThreshold
-        call nerdtree#echo("Please wait, caching a large dir ...")
-    endif
-
-    let invalidFilesFound = 0
-    for i in files
-
-        "filter out the .. and . directories
-        "Note: we must match .. AND ../ cos sometimes the globpath returns
-        "../ for path with strange chars (eg $)
-        if i !~# '\/\.\.\/\?$' && i !~# '\/\.\/\?$'
-
-            "put the next file in a new node and attach it
-            try
-                let path = g:NERDTreePath.New(i)
-                call self.createChild(path, 0)
-                call g:NERDTreePathNotifier.NotifyListeners('init', path, {})
-            catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
-                let invalidFilesFound += 1
-            endtry
-        endif
-    endfor
-
-    call self.sortChildren()
-
-    if !a:silent && len(files) > g:NERDTreeNotificationThreshold
-        call nerdtree#echo("Please wait, caching a large dir ... DONE (". self.getChildCount() ." nodes cached).")
-    endif
-
-    if invalidFilesFound
-        call nerdtree#echoWarning(invalidFilesFound . " file(s) could not be loaded into the NERD tree")
-    endif
-    return self.getChildCount()
-endfunction
-
-"FUNCTION: TreeDirNode.New(path) {{{1
-"Returns a new TreeNode object with the given path and parent
-"
-"Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
-unlet s:TreeDirNode.New
-function! s:TreeDirNode.New(path)
-    if a:path.isDirectory != 1
-        throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object."
-    endif
-
-    let newTreeNode = copy(self)
-    let newTreeNode.path = a:path
-
-    let newTreeNode.isOpen = 0
-    let newTreeNode.children = []
-
-    let newTreeNode.parent = {}
-
-    return newTreeNode
-endfunction
-
-"FUNCTION: TreeDirNode.open([opts]) {{{1
-"Open the dir in the current tree or in a new tree elsewhere.
-"
-"If opening in the current tree, return the number of cached nodes.
-unlet s:TreeDirNode.open
-function! s:TreeDirNode.open(...)
-    let opts = a:0 ? a:1 : {}
-
-    if has_key(opts, 'where') && !empty(opts['where'])
-        let opener = g:NERDTreeOpener.New(self.path, opts)
-        call opener.open(self)
-    else
-        let self.isOpen = 1
-        if self.children ==# []
-            return self._initChildren(0)
-        else
-            return 0
-        endif
-    endif
-endfunction
-
-"FUNCTION: TreeDirNode.openAlong([opts]) {{{1
-"recursive open the dir if it has only one directory child.
-"
-"return the level of opened directories.
-function! s:TreeDirNode.openAlong(...)
-    let opts = a:0 ? a:1 : {}
-    let level = 0
-
-    let node = self
-    while node.path.isDirectory
-        call node.open(opts)
-        let level += 1
-        if node.getVisibleChildCount() == 1
-            let node = node.getChildByIndex(0, 1)
-        else
-            break
-        endif
-    endwhile
-    return level
-endfunction
-
-" FUNCTION: TreeDirNode.openExplorer() {{{1
-" opens an explorer window for this node in the previous window (could be a
-" nerd tree or a netrw)
-function! s:TreeDirNode.openExplorer()
-    call self.open({'where': 'p'})
-endfunction
-
-"FUNCTION: TreeDirNode.openInNewTab(options) {{{1
-unlet s:TreeDirNode.openInNewTab
-function! s:TreeDirNode.openInNewTab(options)
-    call nerdtree#deprecated('TreeDirNode.openInNewTab', 'is deprecated, use open() instead')
-    call self.open({'where': 't'})
-endfunction
-
-"FUNCTION: TreeDirNode._openInNewTab() {{{1
-function! s:TreeDirNode._openInNewTab()
-    tabnew
-    call g:NERDTreeCreator.CreatePrimary(self.path.str())
-endfunction
-
-"FUNCTION: TreeDirNode.openRecursively() {{{1
-"Opens this treenode and all of its children whose paths arent 'ignored'
-"because of the file filters.
-"
-"This method is actually a wrapper for the OpenRecursively2 method which does
-"the work.
-function! s:TreeDirNode.openRecursively()
-    call self._openRecursively2(1)
-endfunction
-
-"FUNCTION: TreeDirNode._openRecursively2() {{{1
-"Opens this all children of this treenode recursively if either:
-"   *they arent filtered by file filters
-"   *a:forceOpen is 1
-"
-"Args:
-"forceOpen: 1 if this node should be opened regardless of file filters
-function! s:TreeDirNode._openRecursively2(forceOpen)
-    if self.path.ignore() ==# 0 || a:forceOpen
-        let self.isOpen = 1
-        if self.children ==# []
-            call self._initChildren(1)
-        endif
-
-        for i in self.children
-            if i.path.isDirectory ==# 1
-                call i._openRecursively2(0)
-            endif
-        endfor
-    endif
-endfunction
-
-"FUNCTION: TreeDirNode.refresh() {{{1
-unlet s:TreeDirNode.refresh
-function! s:TreeDirNode.refresh()
-    call self.path.refresh()
-
-    "if this node was ever opened, refresh its children
-    if self.isOpen || !empty(self.children)
-        "go thru all the files/dirs under this node
-        let newChildNodes = []
-        let invalidFilesFound = 0
-        let dir = self.path
-        let globDir = dir.str({'format': 'Glob'})
-        let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*')
-        let files = split(filesStr, "\n")
-        for i in files
-            "filter out the .. and . directories
-            "Note: we must match .. AND ../ cos sometimes the globpath returns
-            "../ for path with strange chars (eg $)
-            if i !~# '\/\.\.\/\?$' && i !~# '\/\.\/\?$'
-
-                try
-                    "create a new path and see if it exists in this nodes children
-                    let path = g:NERDTreePath.New(i)
-                    let newNode = self.getChild(path)
-                    if newNode != {}
-                        call newNode.refresh()
-                        call add(newChildNodes, newNode)
-
-                    "the node doesnt exist so create it
-                    else
-                        let newNode = g:NERDTreeFileNode.New(path)
-                        let newNode.parent = self
-                        call add(newChildNodes, newNode)
-                    endif
-
-
-                catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
-                    let invalidFilesFound = 1
-                endtry
-            endif
-        endfor
-
-        "swap this nodes children out for the children we just read/refreshed
-        let self.children = newChildNodes
-        call self.sortChildren()
-
-        if invalidFilesFound
-            call nerdtree#echoWarning("some files could not be loaded into the NERD tree")
-        endif
-    endif
-endfunction
-
-"FUNCTION: TreeDirNode.refreshFlags() {{{1
-unlet s:TreeDirNode.refreshFlags
-function! s:TreeDirNode.refreshFlags()
-    call self.path.refreshFlags()
-    for i in self.children
-        call i.refreshFlags()
-    endfor
-endfunction
-
-"FUNCTION: TreeDirNode.refreshDirFlags() {{{1
-function! s:TreeDirNode.refreshDirFlags()
-    call self.path.refreshFlags()
-endfunction
-
-"FUNCTION: TreeDirNode.reveal(path) {{{1
-"reveal the given path, i.e. cache and open all treenodes needed to display it
-"in the UI
-function! s:TreeDirNode.reveal(path)
-    if !a:path.isUnder(self.path)
-        throw "NERDTree.InvalidArgumentsError: " . a:path.str() . " should be under " . self.path.str()
-    endif
-
-    call self.open()
-
-    if self.path.equals(a:path.getParent())
-        let n = self.findNode(a:path)
-        call b:NERDTree.render()
-        call n.putCursorHere(1,0)
-        return
-    endif
-
-    let p = a:path
-    while !p.getParent().equals(self.path)
-        let p = p.getParent()
-    endwhile
-
-    let n = self.findNode(p)
-    call n.reveal(a:path)
-endfunction
-
-"FUNCTION: TreeDirNode.removeChild(treenode) {{{1
-"
-"Removes the given treenode from this nodes set of children
-"
-"Args:
-"treenode: the node to remove
-"
-"Throws a NERDTree.ChildNotFoundError if the given treenode is not found
-function! s:TreeDirNode.removeChild(treenode)
-    for i in range(0, self.getChildCount()-1)
-        if self.children[i].equals(a:treenode)
-            call remove(self.children, i)
-            return
-        endif
-    endfor
-
-    throw "NERDTree.ChildNotFoundError: child node was not found"
-endfunction
-
-"FUNCTION: TreeDirNode.sortChildren() {{{1
-"
-"Sorts the children of this node according to alphabetical order and the
-"directory priority.
-"
-function! s:TreeDirNode.sortChildren()
-    let CompareFunc = function("nerdtree#compareNodes")
-    call sort(self.children, CompareFunc)
-endfunction
-
-"FUNCTION: TreeDirNode.toggleOpen([options]) {{{1
-"Opens this directory if it is closed and vice versa
-function! s:TreeDirNode.toggleOpen(...)
-    let opts = a:0 ? a:1 : {}
-    if self.isOpen ==# 1
-        call self.close()
-    else
-        if g:NERDTreeCascadeOpenSingleChildDir == 0
-            call self.open(opts)
-        else
-            call self.openAlong(opts)
-        endif
-    endif
-endfunction
-
-"FUNCTION: TreeDirNode.transplantChild(newNode) {{{1
-"Replaces the child of this with the given node (where the child node's full
-"path matches a:newNode's fullpath). The search for the matching node is
-"non-recursive
-"
-"Arg:
-"newNode: the node to graft into the tree
-function! s:TreeDirNode.transplantChild(newNode)
-    for i in range(0, self.getChildCount()-1)
-        if self.children[i].equals(a:newNode)
-            let self.children[i] = a:newNode
-            let a:newNode.parent = self
-            break
-        endif
-    endfor
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/tree_file_node.vim b/bundle/nerdtree/lib/nerdtree/tree_file_node.vim
deleted file mode 100755
index b4924d7..0000000
--- a/bundle/nerdtree/lib/nerdtree/tree_file_node.vim
+++ /dev/null
@@ -1,431 +0,0 @@
-"CLASS: TreeFileNode
-"This class is the parent of the TreeDirNode class and is the
-"'Component' part of the composite design pattern between the treenode
-"classes.
-"============================================================
-let s:TreeFileNode = {}
-let g:NERDTreeFileNode = s:TreeFileNode
-
-"FUNCTION: TreeFileNode.activate(...) {{{1
-function! s:TreeFileNode.activate(...)
-    call self.open(a:0 ? a:1 : {})
-endfunction
-
-"FUNCTION: TreeFileNode.bookmark(name) {{{1
-"bookmark this node with a:name
-function! s:TreeFileNode.bookmark(name)
-
-    "if a bookmark exists with the same name and the node is cached then save
-    "it so we can update its display string
-    let oldMarkedNode = {}
-    try
-        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1)
-    catch /^NERDTree.BookmarkNotFoundError/
-    catch /^NERDTree.BookmarkedNodeNotFoundError/
-    endtry
-
-    call g:NERDTreeBookmark.AddBookmark(a:name, self.path)
-    call self.path.cacheDisplayString()
-    call g:NERDTreeBookmark.Write()
-
-    if !empty(oldMarkedNode)
-        call oldMarkedNode.path.cacheDisplayString()
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.cacheParent() {{{1
-"initializes self.parent if it isnt already
-function! s:TreeFileNode.cacheParent()
-    if empty(self.parent)
-        let parentPath = self.path.getParent()
-        if parentPath.equals(self.path)
-            throw "NERDTree.CannotCacheParentError: already at root"
-        endif
-        let self.parent = s:TreeFileNode.New(parentPath)
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.clearBookmarks() {{{1
-function! s:TreeFileNode.clearBookmarks()
-    for i in g:NERDTreeBookmark.Bookmarks()
-        if i.path.equals(self.path)
-            call i.delete()
-        end
-    endfor
-    call self.path.cacheDisplayString()
-endfunction
-
-"FUNCTION: TreeFileNode.copy(dest) {{{1
-function! s:TreeFileNode.copy(dest)
-    call self.path.copy(a:dest)
-    let newPath = g:NERDTreePath.New(a:dest)
-    let parent = b:NERDTreeRoot.findNode(newPath.getParent())
-    if !empty(parent)
-        call parent.refresh()
-        return parent.findNode(newPath)
-    else
-        return {}
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.delete {{{1
-"Removes this node from the tree and calls the Delete method for its path obj
-function! s:TreeFileNode.delete()
-    call self.path.delete()
-    call self.parent.removeChild(self)
-endfunction
-
-"FUNCTION: TreeFileNode.displayString() {{{1
-"
-"Returns a string that specifies how the node should be represented as a
-"string
-"
-"Return:
-"a string that can be used in the view to represent this node
-function! s:TreeFileNode.displayString()
-    return self.path.displayString()
-endfunction
-
-"FUNCTION: TreeFileNode.equals(treenode) {{{1
-"
-"Compares this treenode to the input treenode and returns 1 if they are the
-"same node.
-"
-"Use this method instead of ==  because sometimes when the treenodes contain
-"many children, vim seg faults when doing ==
-"
-"Args:
-"treenode: the other treenode to compare to
-function! s:TreeFileNode.equals(treenode)
-    return self.path.str() ==# a:treenode.path.str()
-endfunction
-
-"FUNCTION: TreeFileNode.findNode(path) {{{1
-"Returns self if this node.path.Equals the given path.
-"Returns {} if not equal.
-"
-"Args:
-"path: the path object to compare against
-function! s:TreeFileNode.findNode(path)
-    if a:path.equals(self.path)
-        return self
-    endif
-    return {}
-endfunction
-
-"FUNCTION: TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction) {{{1
-"
-"Finds the next sibling for this node in the indicated direction. This sibling
-"must be a directory and may/may not have children as specified.
-"
-"Args:
-"direction: 0 if you want to find the previous sibling, 1 for the next sibling
-"
-"Return:
-"a treenode object or {} if no appropriate sibling could be found
-function! s:TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction)
-    "if we have no parent then we can have no siblings
-    if self.parent != {}
-        let nextSibling = self.findSibling(a:direction)
-
-        while nextSibling != {}
-            if nextSibling.path.isDirectory && nextSibling.hasVisibleChildren() && nextSibling.isOpen
-                return nextSibling
-            endif
-            let nextSibling = nextSibling.findSibling(a:direction)
-        endwhile
-    endif
-
-    return {}
-endfunction
-
-"FUNCTION: TreeFileNode.findSibling(direction) {{{1
-"
-"Finds the next sibling for this node in the indicated direction
-"
-"Args:
-"direction: 0 if you want to find the previous sibling, 1 for the next sibling
-"
-"Return:
-"a treenode object or {} if no sibling could be found
-function! s:TreeFileNode.findSibling(direction)
-    "if we have no parent then we can have no siblings
-    if self.parent != {}
-
-        "get the index of this node in its parents children
-        let siblingIndx = self.parent.getChildIndex(self.path)
-
-        if siblingIndx != -1
-            "move a long to the next potential sibling node
-            let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1
-
-            "keep moving along to the next sibling till we find one that is valid
-            let numSiblings = self.parent.getChildCount()
-            while siblingIndx >= 0 && siblingIndx < numSiblings
-
-                "if the next node is not an ignored node (i.e. wont show up in the
-                "view) then return it
-                if self.parent.children[siblingIndx].path.ignore() ==# 0
-                    return self.parent.children[siblingIndx]
-                endif
-
-                "go to next node
-                let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1
-            endwhile
-        endif
-    endif
-
-    return {}
-endfunction
-
-"FUNCTION: TreeFileNode.GetRootForTab(){{{1
-"get the root node for this tab
-function! s:TreeFileNode.GetRootForTab()
-    if g:NERDTree.ExistsForTab()
-        return getbufvar(t:NERDTreeBufName, 'NERDTreeRoot')
-    end
-    return {}
-endfunction
-
-"FUNCTION: TreeFileNode.GetSelected() {{{1
-"gets the treenode that the cursor is currently over
-function! s:TreeFileNode.GetSelected()
-    try
-        let path = b:NERDTree.ui.getPath(line("."))
-        if path ==# {}
-            return {}
-        endif
-        return b:NERDTreeRoot.findNode(path)
-    catch /^NERDTree/
-        return {}
-    endtry
-endfunction
-
-"FUNCTION: TreeFileNode.isVisible() {{{1
-"returns 1 if this node should be visible according to the tree filters and
-"hidden file filters (and their on/off status)
-function! s:TreeFileNode.isVisible()
-    return !self.path.ignore()
-endfunction
-
-"FUNCTION: TreeFileNode.isRoot() {{{1
-"returns 1 if this node is b:NERDTreeRoot
-function! s:TreeFileNode.isRoot()
-    if !g:NERDTree.ExistsForBuf()
-        throw "NERDTree.NoTreeError: No tree exists for the current buffer"
-    endif
-
-    return self.equals(b:NERDTreeRoot)
-endfunction
-
-"FUNCTION: TreeFileNode.makeRoot() {{{1
-"Make this node the root of the tree
-function! s:TreeFileNode.makeRoot()
-    if self.path.isDirectory
-        let b:NERDTreeRoot = self
-    else
-        call self.cacheParent()
-        let b:NERDTreeRoot = self.parent
-    endif
-
-    call b:NERDTreeRoot.open()
-
-    "change dir to the dir of the new root if instructed to
-    if g:NERDTreeChDirMode ==# 2
-        exec "cd " . b:NERDTreeRoot.path.str({'format': 'Edit'})
-    endif
-
-    silent doautocmd User NERDTreeNewRoot
-endfunction
-
-"FUNCTION: TreeFileNode.New(path) {{{1
-"Returns a new TreeNode object with the given path and parent
-"
-"Args:
-"path: a path object representing the full filesystem path to the file/dir that the node represents
-function! s:TreeFileNode.New(path)
-    if a:path.isDirectory
-        return g:NERDTreeDirNode.New(a:path)
-    else
-        let newTreeNode = copy(self)
-        let newTreeNode.path = a:path
-        let newTreeNode.parent = {}
-        return newTreeNode
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.open() {{{1
-function! s:TreeFileNode.open(...)
-    let opts = a:0 ? a:1 : {}
-    let opener = g:NERDTreeOpener.New(self.path, opts)
-    call opener.open(self)
-endfunction
-
-"FUNCTION: TreeFileNode.openSplit() {{{1
-"Open this node in a new window
-function! s:TreeFileNode.openSplit()
-    call nerdtree#deprecated('TreeFileNode.openSplit', 'is deprecated, use .open() instead.')
-    call self.open({'where': 'h'})
-endfunction
-
-"FUNCTION: TreeFileNode.openVSplit() {{{1
-"Open this node in a new vertical window
-function! s:TreeFileNode.openVSplit()
-    call nerdtree#deprecated('TreeFileNode.openVSplit', 'is deprecated, use .open() instead.')
-    call self.open({'where': 'v'})
-endfunction
-
-"FUNCTION: TreeFileNode.openInNewTab(options) {{{1
-function! s:TreeFileNode.openInNewTab(options)
-    echomsg 'TreeFileNode.openInNewTab is deprecated'
-    call self.open(extend({'where': 't'}, a:options))
-endfunction
-
-"FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{1
-"Places the cursor on the line number this node is rendered on
-"
-"Args:
-"isJump: 1 if this cursor movement should be counted as a jump by vim
-"recurseUpward: try to put the cursor on the parent if the this node isnt
-"visible
-function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
-    let ln = b:NERDTree.ui.getLineNum(self)
-    if ln != -1
-        if a:isJump
-            mark '
-        endif
-        call cursor(ln, col("."))
-    else
-        if a:recurseUpward
-            let node = self
-            while node != {} && b:NERDTree.ui.getLineNum(node) ==# -1
-                let node = node.parent
-                call node.open()
-            endwhile
-            call b:NERDTree.render()
-            call node.putCursorHere(a:isJump, 0)
-        endif
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.refresh() {{{1
-function! s:TreeFileNode.refresh()
-    call self.path.refresh()
-endfunction
-
-"FUNCTION: TreeFileNode.refreshFlags() {{{1
-function! s:TreeFileNode.refreshFlags()
-    call self.path.refreshFlags()
-endfunction
-
-"FUNCTION: TreeFileNode.rename() {{{1
-"Calls the rename method for this nodes path obj
-function! s:TreeFileNode.rename(newName)
-    let newName = substitute(a:newName, '\(\\\|\/\)$', '', '')
-    call self.path.rename(newName)
-    call self.parent.removeChild(self)
-
-    let parentPath = self.path.getParent()
-    let newParent = b:NERDTreeRoot.findNode(parentPath)
-
-    if newParent != {}
-        call newParent.createChild(self.path, 1)
-        call newParent.refresh()
-    endif
-endfunction
-
-"FUNCTION: TreeFileNode.renderToString {{{1
-"returns a string representation for this tree to be rendered in the view
-function! s:TreeFileNode.renderToString()
-    return self._renderToString(0, 0, [], self.getChildCount() ==# 1)
-endfunction
-
-"Args:
-"depth: the current depth in the tree for this call
-"drawText: 1 if we should actually draw the line for this node (if 0 then the
-"child nodes are rendered only)
-"vertMap: a binary array that indicates whether a vertical bar should be draw
-"for each depth in the tree
-"isLastChild:true if this curNode is the last child of its parent
-function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
-    let output = ""
-    if a:drawText ==# 1
-
-        let treeParts = ''
-
-        "get all the leading spaces and vertical tree parts for this line
-        if a:depth > 1
-            for j in a:vertMap[0:-2]
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '  '
-                else
-                    if j ==# 1
-                        let treeParts = treeParts . '| '
-                    else
-                        let treeParts = treeParts . '  '
-                    endif
-                endif
-            endfor
-        endif
-
-        "get the last vertical tree part for this line which will be different
-        "if this node is the last child of its parent
-        if !g:NERDTreeDirArrows
-            if a:isLastChild
-                let treeParts = treeParts . '`'
-            else
-                let treeParts = treeParts . '|'
-            endif
-        endif
-
-        "smack the appropriate dir/file symbol on the line before the file/dir
-        "name itself
-        if self.path.isDirectory
-            if self.isOpen
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▾ '
-                else
-                    let treeParts = treeParts . '~'
-                endif
-            else
-                if g:NERDTreeDirArrows
-                    let treeParts = treeParts . '▸ '
-                else
-                    let treeParts = treeParts . '+'
-                endif
-            endif
-        else
-            if g:NERDTreeDirArrows
-                let treeParts = treeParts . '  '
-            else
-                let treeParts = treeParts . '-'
-            endif
-        endif
-        let line = treeParts . self.displayString()
-
-        let output = output . line . "\n"
-    endif
-
-    "if the node is an open dir, draw its children
-    if self.path.isDirectory ==# 1 && self.isOpen ==# 1
-
-        let childNodesToDraw = self.getVisibleChildren()
-        if len(childNodesToDraw) > 0
-
-            "draw all the nodes children except the last
-            let lastIndx = len(childNodesToDraw)-1
-            if lastIndx > 0
-                for i in childNodesToDraw[0:lastIndx-1]
-                    let output = output . i._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 1), 0)
-                endfor
-            endif
-
-            "draw the last child, indicating that it IS the last
-            let output = output . childNodesToDraw[lastIndx]._renderToString(a:depth + 1, 1, add(copy(a:vertMap), 0), 1)
-        endif
-    endif
-
-    return output
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/ui.vim b/bundle/nerdtree/lib/nerdtree/ui.vim
deleted file mode 100755
index ed93d80..0000000
--- a/bundle/nerdtree/lib/nerdtree/ui.vim
+++ /dev/null
@@ -1,332 +0,0 @@
-"CLASS: UI
-"============================================================
-let s:UI = {}
-let g:NERDTreeUI = s:UI
-
-
-function! s:UI.lolcats()
-    echomsg "lolcats"
-endfunction
-
-"FUNCTION: s:UI.centerView() {{{2
-"centers the nerd tree window around the cursor (provided the nerd tree
-"options permit)
-function! s:UI.centerView()
-    if g:NERDTreeAutoCenter
-        let current_line = winline()
-        let lines_to_top = current_line
-        let lines_to_bottom = winheight(nerdtree#getTreeWinNum()) - current_line
-        if lines_to_top < g:NERDTreeAutoCenterThreshold || lines_to_bottom < g:NERDTreeAutoCenterThreshold
-            normal! zz
-        endif
-    endif
-endfunction
-
-"FUNCTION: s:UI.new(nerdtree) {{{1
-function! s:UI.New(nerdtree)
-    let newObj = copy(self)
-    let newObj.nerdtree = a:nerdtree
-    return newObj
-endfunction
-
-"FUNCTION: s:UI.getPath(ln) {{{1
-"Gets the full path to the node that is rendered on the given line number
-"
-"Args:
-"ln: the line number to get the path for
-"
-"Return:
-"A path if a node was selected, {} if nothing is selected.
-"If the 'up a dir' line was selected then the path to the parent of the
-"current root is returned
-function! s:UI.getPath(ln)
-    let line = getline(a:ln)
-
-    let rootLine = self.getRootLineNum()
-
-    "check to see if we have the root node
-    if a:ln == rootLine
-        return b:NERDTreeRoot.path
-    endif
-
-    if !g:NERDTreeDirArrows
-        " in case called from outside the tree
-        if line !~# '^ *[|`▸▾ ]' || line =~# '^$'
-            return {}
-        endif
-    endif
-
-    if line ==# nerdtree#treeUpDirLine()
-        return b:NERDTreeRoot.path.getParent()
-    endif
-
-    let indent = self._indentLevelFor(line)
-
-    "remove the tree parts and the leading space
-    let curFile = nerdtree#stripMarkupFromLine(line, 0)
-
-    let wasdir = 0
-    if curFile =~# '/$'
-        let wasdir = 1
-        let curFile = substitute(curFile, '/\?$', '/', "")
-    endif
-
-    let dir = ""
-    let lnum = a:ln
-    while lnum > 0
-        let lnum = lnum - 1
-        let curLine = getline(lnum)
-        let curLineStripped = nerdtree#stripMarkupFromLine(curLine, 1)
-
-        "have we reached the top of the tree?
-        if lnum == rootLine
-            let dir = b:NERDTreeRoot.path.str({'format': 'UI'}) . dir
-            break
-        endif
-        if curLineStripped =~# '/$'
-            let lpindent = self._indentLevelFor(curLine)
-            if lpindent < indent
-                let indent = indent - 1
-
-                let dir = substitute (curLineStripped,'^\\', "", "") . dir
-                continue
-            endif
-        endif
-    endwhile
-    let curFile = b:NERDTreeRoot.path.drive . dir . curFile
-    let toReturn = g:NERDTreePath.New(curFile)
-    return toReturn
-endfunction
-
-"FUNCTION: s:UI.getLineNum(file_node){{{1
-"returns the line number this node is rendered on, or -1 if it isnt rendered
-function! s:UI.getLineNum(file_node)
-    "if the node is the root then return the root line no.
-    if a:file_node.isRoot()
-        return b:NERDTree.ui.getRootLineNum()
-    endif
-
-    let totalLines = line("$")
-
-    "the path components we have matched so far
-    let pathcomponents = [substitute(b:NERDTreeRoot.path.str({'format': 'UI'}), '/ *$', '', '')]
-    "the index of the component we are searching for
-    let curPathComponent = 1
-
-    let fullpath = a:file_node.path.str({'format': 'UI'})
-
-    let lnum = b:NERDTree.ui.getRootLineNum()
-    while lnum > 0
-        let lnum = lnum + 1
-        "have we reached the bottom of the tree?
-        if lnum ==# totalLines+1
-            return -1
-        endif
-
-        let curLine = getline(lnum)
-
-        let indent = self._indentLevelFor(curLine)
-        if indent ==# curPathComponent
-            let curLine = nerdtree#stripMarkupFromLine(curLine, 1)
-
-            let curPath =  join(pathcomponents, '/') . '/' . curLine
-            if stridx(fullpath, curPath, 0) ==# 0
-                if fullpath ==# curPath || strpart(fullpath, len(curPath)-1,1) ==# '/'
-                    let curLine = substitute(curLine, '/ *$', '', '')
-                    call add(pathcomponents, curLine)
-                    let curPathComponent = curPathComponent + 1
-
-                    if fullpath ==# curPath
-                        return lnum
-                    endif
-                endif
-            endif
-        endif
-    endwhile
-    return -1
-endfunction
-
-
-"FUNCTION: s:UI.getRootLineNum(){{{1
-"gets the line number of the root node
-function! s:UI.getRootLineNum()
-    let rootLine = 1
-    while getline(rootLine) !~# '^\(/\|<\)'
-        let rootLine = rootLine + 1
-    endwhile
-    return rootLine
-endfunction
-
-"FUNCTION: s:UI._indentLevelFor(line) {{{2
-function! s:UI._indentLevelFor(line)
-    let level = match(a:line, '[^ \-+~▸▾`|]') / nerdtree#treeWid()
-    " check if line includes arrows
-    if match(a:line, '[▸▾]') > -1
-        " decrement level as arrow uses 3 ascii chars
-        let level = level - 1
-    endif
-    return level
-endfunction
-
-
-"FUNCTION: s:UI.restoreScreenState() {{{2
-"
-"Sets the screen state back to what it was when nerdtree#saveScreenState was last
-"called.
-"
-"Assumes the cursor is in the NERDTree window
-function! s:UI.restoreScreenState()
-    if !has_key(self, '_screenState')
-        return
-    endif
-    exec("silent vertical resize " . self._screenState['oldWindowSize'])
-
-    let old_scrolloff=&scrolloff
-    let &scrolloff=0
-    call cursor(self._screenState['oldTopLine'], 0)
-    normal! zt
-    call setpos(".", self._screenState['oldPos'])
-    let &scrolloff=old_scrolloff
-endfunction
-
-"FUNCTION: s:UI.saveScreenState() {{{2
-"Saves the current cursor position in the current buffer and the window
-"scroll position
-function! s:UI.saveScreenState()
-    let win = winnr()
-    try
-        call nerdtree#putCursorInTreeWin()
-        let self._screenState = {}
-        let self._screenState['oldPos'] = getpos(".")
-        let self._screenState['oldTopLine'] = line("w0")
-        let self._screenState['oldWindowSize']= winwidth("")
-        call nerdtree#exec(win . "wincmd w")
-    catch /^NERDTree.InvalidOperationError/
-    endtry
-endfunction
-
-"FUNCTION: s:UI.render() {{{2
-function! s:UI.render()
-    setlocal modifiable
-
-    "remember the top line of the buffer and the current line so we can
-    "restore the view exactly how it was
-    let curLine = line(".")
-    let curCol = col(".")
-    let topLine = line("w0")
-
-    "delete all lines in the buffer (being careful not to clobber a register)
-    silent 1,$delete _
-
-    call nerdtree#dumpHelp()
-
-    "delete the blank line before the help and add one after it
-    if g:NERDTreeMinimalUI == 0
-        call setline(line(".")+1, "")
-        call cursor(line(".")+1, col("."))
-    endif
-
-    if b:NERDTreeShowBookmarks
-        call nerdtree#renderBookmarks()
-    endif
-
-    "add the 'up a dir' line
-    if !g:NERDTreeMinimalUI
-        call setline(line(".")+1, nerdtree#treeUpDirLine())
-        call cursor(line(".")+1, col("."))
-    endif
-
-    "draw the header line
-    let header = b:NERDTreeRoot.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
-    call setline(line(".")+1, header)
-    call cursor(line(".")+1, col("."))
-
-    "draw the tree
-    let old_o = @o
-    let @o = b:NERDTreeRoot.renderToString()
-    silent put o
-    let @o = old_o
-
-    "delete the blank line at the top of the buffer
-    silent 1,1delete _
-
-    "restore the view
-    let old_scrolloff=&scrolloff
-    let &scrolloff=0
-    call cursor(topLine, 1)
-    normal! zt
-    call cursor(curLine, curCol)
-    let &scrolloff = old_scrolloff
-
-    setlocal nomodifiable
-endfunction
-
-
-"FUNCTION: UI.renderViewSavingPosition {{{1
-"Renders the tree and ensures the cursor stays on the current node or the
-"current nodes parent if it is no longer available upon re-rendering
-function! s:UI.renderViewSavingPosition()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-
-    "go up the tree till we find a node that will be visible or till we run
-    "out of nodes
-    while currentNode != {} && !currentNode.isVisible() && !currentNode.isRoot()
-        let currentNode = currentNode.parent
-    endwhile
-
-    call b:NERDTree.render()
-
-    if currentNode != {}
-        call currentNode.putCursorHere(0, 0)
-    endif
-endfunction
-
-" FUNCTION: s:UI.toggleIgnoreFilter() {{{1
-" toggles the use of the NERDTreeIgnore option
-function! s:UI.toggleIgnoreFilter()
-    let b:NERDTreeIgnoreEnabled = !b:NERDTreeIgnoreEnabled
-    call b:NERDTree.ui.renderViewSavingPosition()
-    call b:NERDTree.ui.centerView()
-endfunction
-
-" FUNCTION: s:UI.toggleShowBookmarks() {{{1
-" toggles the display of bookmarks
-function! s:UI.toggleShowBookmarks()
-    let b:NERDTreeShowBookmarks = !b:NERDTreeShowBookmarks
-    if b:NERDTreeShowBookmarks
-        call b:NERDTree.render()
-        call nerdtree#putCursorOnBookmarkTable()
-    else
-        call b:NERDTree.ui.renderViewSavingPosition()
-    endif
-    call b:NERDTree.ui.centerView()
-endfunction
-
-" FUNCTION: s:UI.toggleShowFiles() {{{1
-" toggles the display of hidden files
-function! s:UI.toggleShowFiles()
-    let b:NERDTreeShowFiles = !b:NERDTreeShowFiles
-    call b:NERDTree.ui.renderViewSavingPosition()
-    call b:NERDTree.ui.centerView()
-endfunction
-
-" FUNCTION: s:UI.toggleShowHidden() {{{1
-" toggles the display of hidden files
-function! s:UI.toggleShowHidden()
-    let b:NERDTreeShowHidden = !b:NERDTreeShowHidden
-    call b:NERDTree.ui.renderViewSavingPosition()
-    call self.centerView()
-endfunction
-
-" FUNCTION: s:UI.toggleZoom() {{{1
-" zoom (maximize/minimize) the NERDTree window
-function! s:UI.toggleZoom()
-    if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed
-        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
-        exec "silent vertical resize ". size
-        let b:NERDTreeZoomed = 0
-    else
-        exec "vertical resize"
-        let b:NERDTreeZoomed = 1
-    endif
-endfunction
diff --git a/bundle/nerdtree/nerdtree_plugin/fs_menu.vim b/bundle/nerdtree/nerdtree_plugin/fs_menu.vim
deleted file mode 100755
index 4e03f35..0000000
--- a/bundle/nerdtree/nerdtree_plugin/fs_menu.vim
+++ /dev/null
@@ -1,269 +0,0 @@
-" ============================================================================
-" File:        fs_menu.vim
-" Description: plugin for the NERD Tree that provides a file system menu
-" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 17 July, 2009
-" License:     This program is free software. It comes without any warranty,
-"              to the extent permitted by applicable law. You can redistribute
-"              it and/or modify it under the terms of the Do What The Fuck You
-"              Want To Public License, Version 2, as published by Sam Hocevar.
-"              See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-" ============================================================================
-if exists("g:loaded_nerdtree_fs_menu")
-    finish
-endif
-let g:loaded_nerdtree_fs_menu = 1
-
-"Automatically delete the buffer after deleting or renaming a file
-if !exists("g:NERDTreeAutoDeleteBuffer")
-    let g:NERDTreeAutoDeleteBuffer = 0
-endif
-
-call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callback': 'NERDTreeAddNode'})
-call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
-call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
-
-if has("gui_mac") || has("gui_macvim") 
-    call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
-    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
-    call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
-endif
-
-if g:NERDTreePath.CopyingSupported()
-    call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
-endif
-
-"FUNCTION: s:echo(msg){{{1
-function! s:echo(msg)
-    redraw
-    echomsg "NERDTree: " . a:msg
-endfunction
-
-"FUNCTION: s:echoWarning(msg){{{1
-function! s:echoWarning(msg)
-    echohl warningmsg
-    call s:echo(a:msg)
-    echohl normal
-endfunction
-
-"FUNCTION: s:promptToDelBuffer(bufnum, msg){{{1
-"prints out the given msg and, if the user responds by pushing 'y' then the
-"buffer with the given bufnum is deleted
-"
-"Args:
-"bufnum: the buffer that may be deleted
-"msg: a message that will be echoed to the user asking them if they wish to
-"     del the buffer
-function! s:promptToDelBuffer(bufnum, msg)
-    echo a:msg
-    if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
-        " 1. ensure that all windows which display the just deleted filename
-        " now display an empty buffer (so a layout is preserved).
-        " Is not it better to close single tabs with this file only ?
-        let s:originalTabNumber = tabpagenr()
-        let s:originalWindowNumber = winnr()
-        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':enew! ' | endif"
-        exec "tabnext " . s:originalTabNumber
-        exec s:originalWindowNumber . "wincmd w"
-        " 3. We don't need a previous buffer anymore
-        exec "bwipeout! " . a:bufnum
-    endif
-endfunction
-
-"FUNCTION: s:promptToRenameBuffer(bufnum, msg){{{1
-"prints out the given msg and, if the user responds by pushing 'y' then the
-"buffer with the given bufnum is replaced with a new one
-"
-"Args:
-"bufnum: the buffer that may be deleted
-"msg: a message that will be echoed to the user asking them if they wish to
-"     del the buffer
-function! s:promptToRenameBuffer(bufnum, msg, newFileName)
-    echo a:msg
-    if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
-        let quotedFileName = "'" . a:newFileName . "'"
-        " 1. ensure that a new buffer is loaded
-        exec "badd " . quotedFileName
-        " 2. ensure that all windows which display the just deleted filename
-        " display a buffer for a new filename. 
-        let s:originalTabNumber = tabpagenr()
-        let s:originalWindowNumber = winnr()
-        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec \":e! " . quotedFileName . "\" | endif"
-        exec "tabnext " . s:originalTabNumber
-        exec s:originalWindowNumber . "wincmd w"
-        " 3. We don't need a previous buffer anymore
-        exec "bwipeout! " . a:bufnum
-    endif
-endfunction
-"FUNCTION: NERDTreeAddNode(){{{1
-function! NERDTreeAddNode()
-    let curDirNode = g:NERDTreeDirNode.GetSelected()
-
-    let newNodeName = input("Add a childnode\n".
-                          \ "==========================================================\n".
-                          \ "Enter the dir/file name to be created. Dirs end with a '/'\n" .
-                          \ "", curDirNode.path.str() . g:NERDTreePath.Slash(), "file")
-
-    if newNodeName ==# ''
-        call s:echo("Node Creation Aborted.")
-        return
-    endif
-
-    try
-        let newPath = g:NERDTreePath.Create(newNodeName)
-        let parentNode = b:NERDTreeRoot.findNode(newPath.getParent())
-
-        let newTreeNode = g:NERDTreeFileNode.New(newPath)
-        if empty(parentNode)
-            call b:NERDTreeRoot.refresh()
-            call b:NERDTree.render()
-        elseif parentNode.isOpen || !empty(parentNode.children)
-            call parentNode.addChild(newTreeNode, 1)
-            call NERDTreeRender()
-            call newTreeNode.putCursorHere(1, 0)
-        endif
-    catch /^NERDTree/
-        call s:echoWarning("Node Not Created.")
-    endtry
-endfunction
-
-"FUNCTION: NERDTreeMoveNode(){{{1
-function! NERDTreeMoveNode()
-    let curNode = g:NERDTreeFileNode.GetSelected()
-    let newNodePath = input("Rename the current node\n" .
-                          \ "==========================================================\n" .
-                          \ "Enter the new path for the node:                          \n" .
-                          \ "", curNode.path.str(), "file")
-
-    if newNodePath ==# ''
-        call s:echo("Node Renaming Aborted.")
-        return
-    endif
-
-    try
-        let bufnum = bufnr("^".curNode.path.str()."$")
-
-        call curNode.rename(newNodePath)
-        call NERDTreeRender()
-
-        "if the node is open in a buffer, ask the user if they want to
-        "close that buffer
-        if bufnum != -1
-            let prompt = "\nNode renamed.\n\nThe old file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Replace this buffer with a new file? (yN)"
-            call s:promptToRenameBuffer(bufnum,  prompt, newNodePath)
-        endif
-
-        call curNode.putCursorHere(1, 0)
-
-        redraw
-    catch /^NERDTree/
-        call s:echoWarning("Node Not Renamed.")
-    endtry
-endfunction
-
-" FUNCTION: NERDTreeDeleteNode() {{{1
-function! NERDTreeDeleteNode()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    let confirmed = 0
-
-    if currentNode.path.isDirectory
-        let choice =input("Delete the current node\n" .
-                         \ "==========================================================\n" .
-                         \ "STOP! To delete this entire directory, type 'yes'\n" .
-                         \ "" . currentNode.path.str() . ": ")
-        let confirmed = choice ==# 'yes'
-    else
-        echo "Delete the current node\n" .
-           \ "==========================================================\n".
-           \ "Are you sure you wish to delete the node:\n" .
-           \ "" . currentNode.path.str() . " (yN):"
-        let choice = nr2char(getchar())
-        let confirmed = choice ==# 'y'
-    endif
-
-
-    if confirmed
-        try
-            call currentNode.delete()
-            call NERDTreeRender()
-
-            "if the node is open in a buffer, ask the user if they want to
-            "close that buffer
-            let bufnum = bufnr("^".currentNode.path.str()."$")
-            if buflisted(bufnum)
-                let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)"
-                call s:promptToDelBuffer(bufnum, prompt)
-            endif
-
-            redraw
-        catch /^NERDTree/
-            call s:echoWarning("Could not remove node")
-        endtry
-    else
-        call s:echo("delete aborted")
-    endif
-
-endfunction
-
-" FUNCTION: NERDTreeCopyNode() {{{1
-function! NERDTreeCopyNode()
-    let currentNode = g:NERDTreeFileNode.GetSelected()
-    let newNodePath = input("Copy the current node\n" .
-                          \ "==========================================================\n" .
-                          \ "Enter the new path to copy the node to:                   \n" .
-                          \ "", currentNode.path.str(), "file")
-
-    if newNodePath != ""
-        "strip trailing slash
-        let newNodePath = substitute(newNodePath, '\/$', '', '')
-
-        let confirmed = 1
-        if currentNode.path.copyingWillOverwrite(newNodePath)
-            call s:echo("Warning: copying may overwrite files! Continue? (yN)")
-            let choice = nr2char(getchar())
-            let confirmed = choice ==# 'y'
-        endif
-
-        if confirmed
-            try
-                let newNode = currentNode.copy(newNodePath)
-                if empty(newNode)
-                    call b:NERDTreeRoot.refresh()
-                    call b:NERDTree.render()
-                else
-                    call NERDTreeRender()
-                    call newNode.putCursorHere(0, 0)
-                endif
-            catch /^NERDTree/
-                call s:echoWarning("Could not copy node")
-            endtry
-        endif
-    else
-        call s:echo("Copy aborted.")
-    endif
-    redraw
-endfunction
-
-function! NERDTreeQuickLook()
-    let treenode = g:NERDTreeFileNode.GetSelected()
-    if treenode != {}
-        call system("qlmanage -p 2>/dev/null '" . treenode.path.str() . "'")
-    endif
-endfunction
-
-function! NERDTreeRevealInFinder()
-    let treenode = g:NERDTreeFileNode.GetSelected()
-    if treenode != {}
-        let x = system("open -R '" . treenode.path.str() . "'")
-    endif
-endfunction
-
-function! NERDTreeExecuteFile()
-    let treenode = g:NERDTreeFileNode.GetSelected()
-    if treenode != {}
-        let x = system("open '" . treenode.path.str() . "'")
-    endif
-endfunction
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/plugin/NERD_tree.vim b/bundle/nerdtree/plugin/NERD_tree.vim
deleted file mode 100755
index 28fd3ad..0000000
--- a/bundle/nerdtree/plugin/NERD_tree.vim
+++ /dev/null
@@ -1,205 +0,0 @@
-" ============================================================================
-" File:        NERD_tree.vim
-" Description: vim global plugin that provides a nice tree explorer
-" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 28 December, 2011
-" License:     This program is free software. It comes without any warranty,
-"              to the extent permitted by applicable law. You can redistribute
-"              it and/or modify it under the terms of the Do What The Fuck You
-"              Want To Public License, Version 2, as published by Sam Hocevar.
-"              See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-" ============================================================================
-"
-" SECTION: Script init stuff {{{1
-"============================================================
-if exists("loaded_nerd_tree")
-    finish
-endif
-if v:version < 700
-    echoerr "NERDTree: this plugin requires vim >= 7. DOWNLOAD IT! You'll thank me later!"
-    finish
-endif
-let loaded_nerd_tree = 1
-
-"for line continuation - i.e dont want C in &cpo
-let s:old_cpo = &cpo
-set cpo&vim
-
-"Function: s:initVariable() function {{{2
-"This function is used to initialise a given variable to a given value. The
-"variable is only initialised if it does not exist prior
-"
-"Args:
-"var: the name of the var to be initialised
-"value: the value to initialise var to
-"
-"Returns:
-"1 if the var is set, 0 otherwise
-function! s:initVariable(var, value)
-    if !exists(a:var)
-        exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", "g") . "'"
-        return 1
-    endif
-    return 0
-endfunction
-
-"SECTION: Init variable calls and other random constants {{{2
-call s:initVariable("g:NERDTreeAutoCenter", 1)
-call s:initVariable("g:NERDTreeAutoCenterThreshold", 3)
-call s:initVariable("g:NERDTreeCaseSensitiveSort", 0)
-call s:initVariable("g:NERDTreeSortHiddenFirst", 1)
-call s:initVariable("g:NERDTreeChDirMode", 0)
-call s:initVariable("g:NERDTreeMinimalUI", 0)
-if !exists("g:NERDTreeIgnore")
-    let g:NERDTreeIgnore = ['\~$']
-endif
-call s:initVariable("g:NERDTreeBookmarksFile", expand('$HOME') . '/.NERDTreeBookmarks')
-call s:initVariable("g:NERDTreeBookmarksSort", 1)
-call s:initVariable("g:NERDTreeHighlightCursorline", 1)
-call s:initVariable("g:NERDTreeHijackNetrw", 1)
-call s:initVariable("g:NERDTreeMouseMode", 1)
-call s:initVariable("g:NERDTreeNotificationThreshold", 100)
-call s:initVariable("g:NERDTreeQuitOnOpen", 0)
-call s:initVariable("g:NERDTreeRespectWildIgnore", 0)
-call s:initVariable("g:NERDTreeShowBookmarks", 0)
-call s:initVariable("g:NERDTreeShowFiles", 1)
-call s:initVariable("g:NERDTreeShowHidden", 0)
-call s:initVariable("g:NERDTreeShowLineNumbers", 0)
-call s:initVariable("g:NERDTreeSortDirs", 1)
-call s:initVariable("g:NERDTreeDirArrows", !nerdtree#runningWindows())
-call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
-
-if !exists("g:NERDTreeSortOrder")
-    let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
-else
-    "if there isnt a * in the sort sequence then add one
-    if count(g:NERDTreeSortOrder, '*') < 1
-        call add(g:NERDTreeSortOrder, '*')
-    endif
-endif
-
-if !exists('g:NERDTreeStatusline')
-
-    "the exists() crap here is a hack to stop vim spazzing out when
-    "loading a session that was created with an open nerd tree. It spazzes
-    "because it doesnt store b:NERDTreeRoot (its a b: var, and its a hash)
-    let g:NERDTreeStatusline = "%{exists('b:NERDTreeRoot')?b:NERDTreeRoot.path.str():''}"
-
-endif
-call s:initVariable("g:NERDTreeWinPos", "left")
-call s:initVariable("g:NERDTreeWinSize", 31)
-
-"init the shell commands that will be used to copy nodes, and remove dir trees
-"
-"Note: the space after the command is important
-if nerdtree#runningWindows()
-    call s:initVariable("g:NERDTreeRemoveDirCmd", 'rmdir /s /q ')
-else
-    call s:initVariable("g:NERDTreeRemoveDirCmd", 'rm -rf ')
-    call s:initVariable("g:NERDTreeCopyCmd", 'cp -r ')
-endif
-
-
-"SECTION: Init variable calls for key mappings {{{2
-call s:initVariable("g:NERDTreeMapActivateNode", "o")
-call s:initVariable("g:NERDTreeMapChangeRoot", "C")
-call s:initVariable("g:NERDTreeMapChdir", "cd")
-call s:initVariable("g:NERDTreeMapCloseChildren", "X")
-call s:initVariable("g:NERDTreeMapCloseDir", "x")
-call s:initVariable("g:NERDTreeMapDeleteBookmark", "D")
-call s:initVariable("g:NERDTreeMapMenu", "m")
-call s:initVariable("g:NERDTreeMapHelp", "?")
-call s:initVariable("g:NERDTreeMapJumpFirstChild", "K")
-call s:initVariable("g:NERDTreeMapJumpLastChild", "J")
-call s:initVariable("g:NERDTreeMapJumpNextSibling", "<C-j>")
-call s:initVariable("g:NERDTreeMapJumpParent", "p")
-call s:initVariable("g:NERDTreeMapJumpPrevSibling", "<C-k>")
-call s:initVariable("g:NERDTreeMapJumpRoot", "P")
-call s:initVariable("g:NERDTreeMapOpenExpl", "e")
-call s:initVariable("g:NERDTreeMapOpenInTab", "t")
-call s:initVariable("g:NERDTreeMapOpenInTabSilent", "T")
-call s:initVariable("g:NERDTreeMapOpenRecursively", "O")
-call s:initVariable("g:NERDTreeMapOpenSplit", "i")
-call s:initVariable("g:NERDTreeMapOpenVSplit", "s")
-call s:initVariable("g:NERDTreeMapPreview", "g" . NERDTreeMapActivateNode)
-call s:initVariable("g:NERDTreeMapPreviewSplit", "g" . NERDTreeMapOpenSplit)
-call s:initVariable("g:NERDTreeMapPreviewVSplit", "g" . NERDTreeMapOpenVSplit)
-call s:initVariable("g:NERDTreeMapQuit", "q")
-call s:initVariable("g:NERDTreeMapRefresh", "r")
-call s:initVariable("g:NERDTreeMapRefreshRoot", "R")
-call s:initVariable("g:NERDTreeMapToggleBookmarks", "B")
-call s:initVariable("g:NERDTreeMapToggleFiles", "F")
-call s:initVariable("g:NERDTreeMapToggleFilters", "f")
-call s:initVariable("g:NERDTreeMapToggleHidden", "I")
-call s:initVariable("g:NERDTreeMapToggleZoom", "A")
-call s:initVariable("g:NERDTreeMapUpdir", "u")
-call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U")
-call s:initVariable("g:NERDTreeMapCWD", "CD")
-
-"SECTION: Load class files{{{2
-call nerdtree#loadClassFiles()
-
-" SECTION: Commands {{{1
-"============================================================
-call nerdtree#ui_glue#setupCommands()
-
-" SECTION: Auto commands {{{1
-"============================================================
-augroup NERDTree
-    "Save the cursor position whenever we close the nerd tree
-    exec "autocmd BufLeave ". g:NERDTreeCreator.BufNamePrefix() ."* call b:NERDTree.ui.saveScreenState()"
-
-    "disallow insert mode in the NERDTree
-    exec "autocmd BufEnter ". g:NERDTreeCreator.BufNamePrefix() ."* stopinsert"
-augroup END
-
-if g:NERDTreeHijackNetrw
-    augroup NERDTreeHijackNetrw
-        autocmd VimEnter * silent! autocmd! FileExplorer
-        au BufEnter,VimEnter * call nerdtree#checkForBrowse(expand("<amatch>"))
-    augroup END
-endif
-
-" SECTION: Public API {{{1
-"============================================================
-function! NERDTreeAddMenuItem(options)
-    call g:NERDTreeMenuItem.Create(a:options)
-endfunction
-
-function! NERDTreeAddMenuSeparator(...)
-    let opts = a:0 ? a:1 : {}
-    call g:NERDTreeMenuItem.CreateSeparator(opts)
-endfunction
-
-function! NERDTreeAddSubmenu(options)
-    return g:NERDTreeMenuItem.Create(a:options)
-endfunction
-
-function! NERDTreeAddKeyMap(options)
-    call g:NERDTreeKeyMap.Create(a:options)
-endfunction
-
-function! NERDTreeRender()
-    call nerdtree#renderView()
-endfunction
-
-function! NERDTreeFocus()
-    if nerdtree#isTreeOpen()
-        call nerdtree#putCursorInTreeWin()
-    else
-        call g:NERDTreeCreator.TogglePrimary("")
-    endif
-endfunction
-
-function! NERDTreeCWD()
-    call NERDTreeFocus()
-    call nerdtree#ui_glue#chRootCwd()
-endfunction
-" SECTION: Post Source Actions {{{1
-call nerdtree#postSourceActions()
-
-"reset &cpo back to users setting
-let &cpo = s:old_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/syntax/nerdtree.vim b/bundle/nerdtree/syntax/nerdtree.vim
deleted file mode 100755
index 5f7b49c..0000000
--- a/bundle/nerdtree/syntax/nerdtree.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-let s:tree_up_dir_line = '.. (up a dir)'
-syn match NERDTreeIgnore #\~#
-syn match NERDTreeIgnore #\[RO\]#
-
-"highlighting for the .. (up dir) line at the top of the tree
-execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line ."#"
-
-"quickhelp syntax elements
-syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1
-syn match NERDTreeHelpKey #" \{1,2\}[^ ]*,#ms=s+2,me=e-1
-syn match NERDTreeHelpTitle #" .*\~#ms=s+2,me=e-1
-syn match NERDTreeToggleOn #(on)#ms=s+1,he=e-1
-syn match NERDTreeToggleOff #(off)#ms=e-3,me=e-1
-syn match NERDTreeHelpCommand #" :.\{-}\>#hs=s+3
-syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeIgnore,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
-
-"highlighting for sym links
-syn match NERDTreeLinkTarget #->.*# containedin=NERDTreeDir,NERDTreeFile
-syn match NERDTreeLinkFile #.* ->#me=e-3 containedin=NERDTreeFile
-syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
-
-"highlighing for directory nodes and file nodes
-syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
-
-if g:NERDTreeDirArrows
-    syn match NERDTreeClosable #▾# containedin=NERDTreeDir,NERDTreeFile
-    syn match NERDTreeOpenable #▸# containedin=NERDTreeDir,NERDTreeFile
-
-    syn match NERDTreeDir #[^▾▸ ].*/#
-    syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
-    syn match NERDTreeFile  #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
-
-    "highlighting for readonly files
-    syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile
-
-    syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile
-    syn match NERDTreeFlags #\[.\]# containedin=NERDTreeDir
-else
-    "highlighting for the ~/+ symbols for the directory nodes
-    syn match NERDTreeClosable #\~\<#
-    syn match NERDTreeClosable #\~\.#
-    syn match NERDTreeOpenable #+\<#
-    syn match NERDTreeOpenable #+\.#he=e-1
-
-    "highlighting for the tree structural parts
-    syn match NERDTreePart #|#
-    syn match NERDTreePart #`#
-    syn match NERDTreePartFile #[|`]-#hs=s+1 contains=NERDTreePart
-
-    syn match NERDTreeDir #[^-| `].*/# contains=NERDTreeLink,NERDTreeOpenable,NERDTreeClosable
-    syn match NERDTreeExecFile  #[|` ].*\*\($\| \)# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark
-    syn match NERDTreeFile  #|-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
-    syn match NERDTreeFile  #`-.*# contains=NERDTreeLink,NERDTreePart,NERDTreePartFile,NERDTreeBookmark,NERDTreeExecFile
-
-    "highlighting for readonly files
-    syn match NERDTreeRO #|-.*\[RO\]#he=e-5 contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreePart,NERDTreePartFile
-
-    syn match NERDTreeFlags #-\[.\]# containedin=NERDTreeFile,NERDTreePartFile
-    syn match NERDTreeFlags #[+~]\zs\[.\]# containedin=NERDTreeDir
-endif
-
-syn match NERDTreeCWD #^[</].*$#
-
-"highlighting for bookmarks
-syn match NERDTreeBookmark # {.*}#hs=s+1
-
-"highlighting for the bookmarks table
-syn match NERDTreeBookmarksLeader #^>#
-syn match NERDTreeBookmarksHeader #^>-\+Bookmarks-\+$# contains=NERDTreeBookmarksLeader
-syn match NERDTreeBookmarkName #^>.\{-} #he=e-1 contains=NERDTreeBookmarksLeader
-syn match NERDTreeBookmark #^>.*$# contains=NERDTreeBookmarksLeader,NERDTreeBookmarkName,NERDTreeBookmarksHeader
-
-hi def link NERDTreePart Special
-hi def link NERDTreePartFile Type
-hi def link NERDTreeExecFile Title
-hi def link NERDTreeDirSlash Identifier
-
-hi def link NERDTreeBookmarksHeader statement
-hi def link NERDTreeBookmarksLeader ignore
-hi def link NERDTreeBookmarkName Identifier
-hi def link NERDTreeBookmark normal
-
-hi def link NERDTreeHelp String
-hi def link NERDTreeHelpKey Identifier
-hi def link NERDTreeHelpCommand Identifier
-hi def link NERDTreeHelpTitle Macro
-hi def link NERDTreeToggleOn Question
-hi def link NERDTreeToggleOff WarningMsg
-
-hi def link NERDTreeLinkTarget Type
-hi def link NERDTreeLinkFile Macro
-hi def link NERDTreeLinkDir Macro
-
-hi def link NERDTreeDir Directory
-hi def link NERDTreeUp Directory
-hi def link NERDTreeFile Normal
-hi def link NERDTreeCWD Statement
-hi def link NERDTreeOpenable Title
-hi def link NERDTreeClosable Title
-hi def link NERDTreeIgnore ignore
-hi def link NERDTreeRO WarningMsg
-hi def link NERDTreeBookmark Statement
-hi def link NERDTreeFlags Number
-
-hi def link NERDTreeCurrentNode Search
diff --git a/bundle/scala/.gitignore b/bundle/scala/.gitignore
deleted file mode 100644
index 01716d2..0000000
--- a/bundle/scala/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ignore Vim tag files
-tags
-
-# Ignore Vim swap files
-.*.swp
-.*.swo
diff --git a/bundle/scala/.travis.yml b/bundle/scala/.travis.yml
deleted file mode 100644
index c1ac6c5..0000000
--- a/bundle/scala/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-before_install: sudo apt-get install vim-gtk
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-notifications:
-  email:
-    on_success: never
-    on_failure: change
diff --git a/bundle/scala/Gemfile b/bundle/scala/Gemfile
deleted file mode 100644
index 414fd03..0000000
--- a/bundle/scala/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source 'https://rubygems.org/'
-gem 'vimrunner', '0.3.0'
-gem 'rake',      '10.0.4'
-gem 'rspec',     '~> 2.13.0'
-
diff --git a/bundle/scala/Gemfile.lock b/bundle/scala/Gemfile.lock
deleted file mode 100644
index ea5528e..0000000
--- a/bundle/scala/Gemfile.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    rake (0.9.2.2)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake
-  rspec
diff --git a/bundle/scala/LICENSE.TXT b/bundle/scala/LICENSE.TXT
deleted file mode 100644
index 66b0c46..0000000
--- a/bundle/scala/LICENSE.TXT
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "{}"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright {yyyy} {name of copyright owner}
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/bundle/scala/README.md b/bundle/scala/README.md
deleted file mode 100644
index c786a1c..0000000
--- a/bundle/scala/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-vim-scala [![Build Status](https://secure.travis-ci.org/lenniboy/vim-scala.png)](http://travis-ci.org/lenniboy/vim-scala)
-==========
-
-This is a "bundle" for Vim that builds off of the initial Scala plugin modules
-by Stefan Matthias Aust and adds some more "stuff" that I find useful, including
-all of my notes and customizations.
-
-##Installation
-
-You really should be using Tim Pope's [Pathogen](https://github.com/tpope/vim-pathogen) module for Vim (http://tammersaleh.com/posts/the-modern-vim-config-with-pathogen) if you're going to clone this repository because, well... you should.
-
-###Vundle
-Alternatively, you can use [Vundle](https://github.com/gmarik/vundle) to
-manage your plugins.
-
-If you have Vundle installed, simply add the following to your .vimrc:
-
-```vim
-Bundle 'derekwyatt/vim-scala'
-```
-
-and then run
-
-```vim
-:BundleInstall
-```
-
-to install it.
-
-##Sorting of import statements
-    :SortScalaImports
-
-There are different modes for import sorting available. For details, please
-consult the vimdoc help with
-
-    :help :SortScalaImports
diff --git a/bundle/scala/Rakefile b/bundle/scala/Rakefile
deleted file mode 100644
index 7c84562..0000000
--- a/bundle/scala/Rakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new
-
-task :test    => :spec
-task :default => :spec
diff --git a/bundle/scala/after/plugin/help.vim b/bundle/scala/after/plugin/help.vim
deleted file mode 100644
index 785160a..0000000
--- a/bundle/scala/after/plugin/help.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-
-function! FixTOCLine(beginning, colonCol)
-    let l = strlen(a:beginning)
-    let c = 0
-    let dots = ""
-    while c < (a:colonCol - l)
-        let dots = dots . "."
-        let c += 1
-    endwhile
-    return (a:beginning . dots . ":")
-endfunction
-
-function! BuildTOC()
-    let lnum = getpos(".")[1]
-    call append(lnum - 1, "<<<")
-    call append(lnum, ">>>")
-    :g/^\d\+\./co/>>>/-
-    :g/^<<</,/^>>>/s/ {{{\d\s*//
-    :g/^<<</,/^>>>/s/\*/|/g
-    :g/^<<</,/^>>>/s/^\ze\d\.\d\+\./      /
-    :g/^<<</,/^>>>/s/^\ze\d\d\.\d\+\./     /
-    :g/^<<</,/^>>>/s/^\ze\d\.\d\+/    /
-    :g/^<<</,/^>>>/s/^\ze\d\d\.\d\+/   /
-    :g/^<<</,/^>>>/s/^\ze\d\./  /
-    :g/^<<</,/^>>>/s/^\ze\d\d\./ /
-    :g/^\s\+0\. Content/d
-    :g/<<</+,/>>>/-s/^\(.\{-}\)\(\s\+\)\ze |/\=FixTOCLine(submatch(1), 45)/
-    :g/<<</d
-    :g/>>>/d
-endfunction
-
-command! BuildNewTableOfContents silent! call BuildTOC()
-
-function! JustifyCurrentLine()
-    let cline = getline('.')
-    let matches = matchlist(cline, '^\(.*\)\s\+\(\*.*\)$')
-    let st = matches[1]
-    let fin = matches[2]
-    let spcnum = 78 - strlen(st) - strlen(fin)
-    let c = 0
-    let spcs = ""
-    while c < spcnum
-        let spcs = spcs . " "
-        let c = c + 1
-    endwhile
-    let newline = st . spcs . fin
-    :norm dd
-    let lnum = getpos('.')[1]
-    call append(lnum - 1, newline)
-endfunction
diff --git a/bundle/scala/after/syntax/help.vim b/bundle/scala/after/syntax/help.vim
deleted file mode 100644
index b352a1e..0000000
--- a/bundle/scala/after/syntax/help.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-let b:current_syntax = ''
-unlet b:current_syntax
-syntax include @ScalaCode syntax/scala.vim
-if has('conceal')
-  syntax region rgnScala matchgroup=Ignore concealends start='!sc!' end='!/sc!' contains=@ScalaCode
-else
-  syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
-endif
diff --git a/bundle/scala/doc/scala.txt b/bundle/scala/doc/scala.txt
deleted file mode 100644
index d3277b4..0000000
--- a/bundle/scala/doc/scala.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-*scala.txt* Syntax highlighting and helper functions for the Scala language.
-
-INTRODUCTION                                    *scala*
-
-Syntax highlighting and helper functions for the scala language.
-
-COMMANDS                                        *scala-commands*
-
-                                                *:SortScalaImports*
-:SortScalaImports       There are two modes in which this command can operate.
-                        By default it walks all import groups at the top of
-                        the Scala file and orders their lines alphabetically.
-                        A group is a series of lines starting with the
-                        import keyword separated by one or more blank lines.
-
-                        The second, more advanced mode, can be activated by
-                        setting
-
-                          let g:scala_sort_across_groups=1
-
-                        This makes this command include all imports in the
-                        sorting regardless of blank lines in between them and
-                        puts them in three predefined groups instead.
-                        The three groups in which the imports can fall are:
-
-                          1. Scala and Java core
-                          2. Third party libraries
-                          3. First party code (ie. your own)
-
-                        Java and Scala core imports are identified by the
-                        java(x) and scala namespaces.
-                        Everything else that isn't a first party namespace
-                        will be a third party import.
-                        You can define a regex that matches first party
-                        namespaces by setting
-
-                          g:scala_first_party_namespaces
-
-                        For example in a standard Play app this would be
-                        set to
-                          g:scala_first_party_namespaces=
-                             \ '\(controllers\|views\|models\)'
-
-
diff --git a/bundle/scala/ftdetect/scala.vim b/bundle/scala/ftdetect/scala.vim
deleted file mode 100644
index 997a701..0000000
--- a/bundle/scala/ftdetect/scala.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-fun! s:DetectScala()
-    if getline(1) == '#!/usr/bin/env scala'
-        set filetype=scala
-    endif
-endfun
-
-au BufRead,BufNewFile *.scala,*.sbt set filetype=scala
-au BufRead,BufNewFile * call s:DetectScala()
diff --git a/bundle/scala/ftplugin/scala.vim b/bundle/scala/ftplugin/scala.vim
deleted file mode 100644
index 3f0de96..0000000
--- a/bundle/scala/ftplugin/scala.vim
+++ /dev/null
@@ -1,195 +0,0 @@
-setlocal formatoptions+=ro
-setlocal commentstring=//%s
-let &l:include = '^\s*import'
-let &l:includeexpr = 'substitute(v:fname,"\\.","/","g")'
-setlocal path+=src/main/scala,src/test/scala
-setlocal suffixesadd=.scala
-
-set makeprg=sbt\ -Dsbt.log.noformat=true\ compile
-set efm=%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
-       \%W\ %#[warn]\ %f:%l:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
-       \%-G%.%#
-
-if globpath(&rtp, 'plugin/fuf.vim') != ''
-    "
-    " FuzzyFinder stuff
-    "
-    "
-    " SanitizeDirForFuzzyFinder()
-    "
-    " This is really just a convenience function to clean up any stray '/'
-    " characters in the path, should they be there.
-    "
-    function! scala#SanitizeDirForFuzzyFinder(dir)
-        let dir = expand(a:dir)
-        let dir = substitute(dir, '/\+$', '', '')
-        let dir = substitute(dir, '/\+', '/', '')
-
-        return dir
-    endfunction
-
-    "
-    " GetDirForFuzzyFinder()
-    "
-    " Given a directory to start 'from', walk up the hierarchy, looking for a path
-    " that matches the 'addon' you want to see.
-    "
-    " If nothing can be found, then we just return the 'from' so we don't really get
-    " the advantage of a hint, but just let the user start from wherever he was
-    " starting from anyway.
-    "
-    function! scala#GetDirForFuzzyFinder(from, addon)
-        let from = scala#SanitizeDirForFuzzyFinder(a:from)
-        let addon = expand(a:addon)
-        let addon = substitute(addon, '^/\+', '', '')
-        let found = ''
-        " If the addon is right here, then we win
-        if isdirectory(from . '/' . addon)
-            let found = from . '/' . addon
-        else
-            let dirs = split(from, '/')
-        if !has('win32') && !has('win64')
-          let dirs[0] = '/' . dirs[0]
-        endif
-            " Walk up the tree and see if it's anywhere there
-            for n in range(len(dirs) - 1, 0, -1)
-                let path = join(dirs[0:n], '/')
-                if isdirectory(path . '/' . addon)
-                    let found = path . '/' . addon
-                    break
-                endif
-            endfor
-        endif
-        " If we found it, then let's see if we can go deeper
-        "
-        " For example, we may have found component_name/include
-        " but what if that directory only has a single directory
-        " in it, and that subdirectory only has a single directory
-        " in it, etc... ?  This can happen when you're segmenting
-        " by namespace like this:
-        "
-        "    component_name/include/org/vim/CoolClass.h
-        "
-        " You may find yourself always typing '' from the
-        " 'include' directory just to go into 'org/vim' so let's
-        " just eliminate the need to hit the ''.
-        if found != ''
-            let tempfrom = found
-            let globbed = globpath(tempfrom, '*')
-            while len(split(globbed, "\n")) == 1
-                let tempfrom = globbed
-                let globbed = globpath(tempfrom, '*')
-            endwhile
-            let found = scala#SanitizeDirForFuzzyFinder(tempfrom) . '/'
-        else
-            let found = from
-        endif
-
-        return found
-    endfunction
-
-    "
-    " GetTestDirForFuzzyFinder()
-    "
-    " Now overload GetDirForFuzzyFinder() specifically for the test directory (I'm
-    " really only interested in going down into test/src 90% of the time, so let's
-    " hit that 90% and leave the other 10% to couple of extra keystrokes)
-    "
-    function! scala#GetTestDirForFuzzyFinder(from)
-        return scala#GetDirForFuzzyFinder(a:from, 'src/test/scala/')
-    endfunction
-
-    "
-    " GetMainDirForFuzzyFinder()
-    "
-    " Now overload GetDirForFuzzyFinder() specifically for the main directory.
-    "
-    function! scala#GetMainDirForFuzzyFinder(from)
-        return scala#GetDirForFuzzyFinder(a:from, 'src/main/scala/')
-    endfunction
-
-    "
-    " GetRootDirForFuzzyFinder()
-    "
-    " Now overload GetDirForFuzzyFinder() specifically for the root directory.
-    "
-    function! scala#GetRootDirForFuzzyFinder(from)
-        return scala#GetDirForFuzzyFinder(a:from, 'src/../')
-    endfunction
-
-    " If you want to disable the default key mappings, write the following line in
-    " your ~/.vimrc
-    "     let g:scala_use_default_keymappings = 0
-    if get(g:, 'scala_use_default_keymappings', 1)
-      nnoremap <buffer> <silent> <Leader>ft :FufFile <c-r>=scala#GetTestDirForFuzzyFinder('%:p:h')<cr><cr>
-      nnoremap <buffer> <silent> <Leader>fs :FufFile <c-r>=scala#GetMainDirForFuzzyFinder('%:p:h')<cr><cr>
-      nnoremap <buffer> <silent> <Leader>fr :FufFile <c-r>=scala#GetRootDirForFuzzyFinder('%:p:h')<cr><cr>
-    endif
-endif
-
-" If you want to disable the default key mappings, write the following line in
-" your ~/.vimrc
-"     let g:scala_use_default_keymappings = 0
-if get(g:, 'scala_use_default_keymappings', 1)
-    nnoremap <buffer> <Leader>jt :call JustifyCurrentLine()<cr>
-endif
-
-"
-" TagBar
-"
-let g:tagbar_type_scala = {
-    \ 'ctagstype' : 'scala',
-    \ 'kinds'     : [
-      \ 'p:packages:1',
-      \ 'V:values',
-      \ 'v:variables',
-      \ 'T:types',
-      \ 't:traits',
-      \ 'o:objects',
-      \ 'a:aclasses',
-      \ 'c:classes',
-      \ 'r:cclasses',
-      \ 'm:methods'
-    \ ],
-    \ 'sro'        : '.',
-    \ 'kind2scope' : {
-        \ 'T' : 'type',
-        \ 't' : 'trait',
-        \ 'o' : 'object',
-        \ 'a' : 'abstract class',
-        \ 'c' : 'class',
-        \ 'r' : 'case class'
-    \ },
-    \ 'scope2kind' : {
-      \ 'type' : 'T',
-      \ 'trait' : 't',
-      \ 'object' : 'o',
-      \ 'abstract class' : 'a',
-      \ 'class' : 'c',
-      \ 'case class' : 'r'
-    \ }
-\ }
-
-function! s:CreateOrExpression(keywords)
-  return '('.join(a:keywords, '|').')'
-endfunction
-
-function! s:NextSection(backwards)
-  if a:backwards
-    let dir = '?'
-  else
-    let dir = '/'
-  endif
-  let keywords = [ 'def', 'class', 'trait', 'object' ]
-  let keywordsOrExpression = s:CreateOrExpression(keywords)
-
-  let modifiers = [ 'public', 'private', 'private\[\w*\]', 'protected', 'abstract', 'case', 'override', 'implicit', 'final', 'sealed']
-  let modifierOrExpression = s:CreateOrExpression(modifiers)
-
-  let regex = '^ *('.modifierOrExpression.' )* *'.keywordsOrExpression."\r"
-  execute 'silent normal! ' . dir . '\v'.regex
-endfunction
-
-noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
-
-noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
diff --git a/bundle/scala/ftplugin/scala.xpt.vim b/bundle/scala/ftplugin/scala.xpt.vim
deleted file mode 100644
index 09d2b59..0000000
--- a/bundle/scala/ftplugin/scala.xpt.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-
-XPTemplate priority=lang
-
-XPTvar $BRif ' '
-XPTvar $BRel \n
-XPTvar $BRloop ' '
-XPTvar $BRfun ' '
-
-XPTinclude
-    \ _common/personal
-    \ java/java
-
-XPT cake hint=Cake\ Pattern
-XSET trait|def=Some
-XSET derived|def=Real
-trait `trait^Component {
-	trait `trait^ {
-		`body^
-	}
-
-	val `trait^SV('(.)', '\l\1', '')^^: `trait^
-}
-
-trait `derived^`trait^Component extends `trait^Component {
-
-	override lazy val `trait^SV('(.)', '\l\1', '')^^ = new `trait^ {
-		`body2^
-	}
-}
diff --git a/bundle/scala/indent/README b/bundle/scala/indent/README
deleted file mode 100644
index a523d37..0000000
--- a/bundle/scala/indent/README
+++ /dev/null
@@ -1,78 +0,0 @@
-Scala Indent file for Vim
-=========================
-
-You can check 'testfile.scala' in this directory to see what I'm testing
-against.  I'm mostly just trying to fit the major conventions that people would
-code in with Scala, and not all of the possibilities - life's too short for that
-and I'd rather be writing Scala code than Vim indent code.
-
-With that said, if there's something you're passionate about and you want it to
-be properly indented, and you can't hack it in yourself, then feel free to drop
-me a line and we'll fight about it.
-
-You'll see the following comments in 'testfile.scala':
-
-    /**
-     * The following stuff doesn't work, but honestly, it's pretty
-     * pathological stuff... format your code differently.
-     *
-     * ---- 1. ----
-     *
-     *    if (b) 1
-     *    else
-     *      if (c) 2
-     *    else 3
-     *
-     *    Do this instead:
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c) 2
-     *      else 3
-     *    }
-     *    
-     *
-     * ---- 2. ----
-     *
-     *    if (b) 1
-     *    else
-     *      if (c)
-     *        2
-     *        else 3
-     *
-     *    Do this instead:
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c) 2
-     *      else 3
-     *    }
-     *
-     *    or this...
-     *    
-     *    if (b) 1
-     *    else {
-     *      if (c)
-     *        2
-     *      else
-     *        3
-     *    }
-     *
-     * ---- 3. ----
-     *    
-     *    if (b) 1
-     *    else {
-     *      if (c)
-     *        2
-     *        else 3
-     *    }
-     *
-     *    Do the same as in number 2
-     */
-
-In other words, for the forseeable future... do something different to fix the
-cases that don't work. :)
-
-If you've got any questions about what's defined now, you can reach me at
-http://derekwyatt.org.
-
diff --git a/bundle/scala/indent/scala.vim b/bundle/scala/indent/scala.vim
deleted file mode 100644
index f533a51..0000000
--- a/bundle/scala/indent/scala.vim
+++ /dev/null
@@ -1,601 +0,0 @@
-" Vim indent file
-" Language         : Scala (http://scala-lang.org/)
-" Original Author  : Stefan Matthias Aust
-" Modifications by : Derek Wyatt
-" Last Change: 2011 Mar 19 (Derek Wyatt)
-
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetScalaIndent()
-setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
-setlocal autoindent
-setlocal softtabstop=2
-setlocal tabstop=2
-setlocal shiftwidth=2
-setlocal expandtab
-
-if exists("*GetScalaIndent")
-  finish
-endif
-
-let s:defMatcher = '\%(\%(private\|protected\)\%(\[[^\]]*\]\)\?\s\+\|abstract\s\+\|override\s\+\)*\<def\>'
-let s:funcNameMatcher = '\w\+'
-let s:typeSpecMatcher = '\%(\s*\[\_[^\]]*\]\)'
-let s:defArgMatcher = '\%((\_.\{-})\)'
-let s:returnTypeMatcher = '\%(:\s*\w\+' . s:typeSpecMatcher . '\?\)'
-let g:fullDefMatcher = '^\s*' . s:defMatcher . '\s\+' . s:funcNameMatcher . '\s*' . s:typeSpecMatcher . '\?\s*' . s:defArgMatcher . '\?\s*' . s:returnTypeMatcher . '\?\s*[={]'
-
-function! scala#ConditionalConfirm(msg)
-  if 0
-    call confirm(a:msg)
-  endif
-endfunction
-
-function! scala#GetLine(lnum)
-  let line = substitute(getline(a:lnum), '//.*$', '', '')
-  let line = substitute(line, '"\(.\|\\"\)\{-}"', '""', 'g')
-  return line
-endfunction
-
-function! scala#CountBrackets(line, openBracket, closedBracket)
-  let line = substitute(a:line, '"\(.\|\\"\)\{-}"', '', 'g')
-  let open = substitute(line, '[^' . a:openBracket . ']', '', 'g')
-  let close = substitute(line, '[^' . a:closedBracket . ']', '', 'g')
-  return strlen(open) - strlen(close)
-endfunction
-
-function! scala#CountParens(line)
-  return scala#CountBrackets(a:line, '(', ')')
-endfunction
-
-function! scala#CountCurlies(line)
-  return scala#CountBrackets(a:line, '{', '}')
-endfunction
-
-function! scala#LineEndsInIncomplete(line)
-  if a:line =~ '[.,]\s*$'
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! scala#LineIsAClosingXML(line)
-  if a:line =~ '^\s*</\w'
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! scala#LineCompletesXML(lnum, line)
-  let savedpos = getpos('.')
-  call setpos('.', [savedpos[0], a:lnum, 0, savedpos[3]])
-  let tag = substitute(a:line, '^.*</\([^>]*\)>.*$', '\1', '')
-  let [lineNum, colnum] = searchpairpos('<' . tag . '>', '', '</' . tag . '>', 'Wbn')
-  call setpos('.', savedpos)
-  let pline = scala#GetLine(prevnonblank(lineNum - 1))
-  if pline =~ '=\s*$'
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! scala#IsParentCase()
-  let savedpos = getpos('.')
-  call setpos('.', [savedpos[0], savedpos[1], 0, savedpos[3]])
-  let [l, c] = searchpos('^\s*\%(' . s:defMatcher . '\|\%(\<case\>\)\)', 'bnW')
-  let retvalue = -1
-  if l != 0 && search('\%' . l . 'l\s*\<case\>', 'bnW')
-    let retvalue = l
-  endif 
-  call setpos('.', savedpos)
-  return retvalue
-endfunction
-
-function! scala#CurlyMatcher()
-  let matchline = scala#GetLineThatMatchesBracket('{', '}')
-  if scala#CountParens(scala#GetLine(matchline)) < 0
-    let savedpos = getpos('.')
-    call setpos('.', [savedpos[0], matchline, 9999, savedpos[3]])
-    call searchpos('{', 'Wbc')
-    call searchpos(')', 'Wb')
-    let [lnum, colnum] = searchpairpos('(', '', ')', 'Wbn')
-    call setpos('.', savedpos)
-    let line = scala#GetLine(lnum)
-    if line =~ '^\s*' . s:defMatcher
-      return lnum
-    else
-      return matchline
-    endif
-  else
-    return matchline
-  endif
-endfunction
-
-function! scala#GetLineAndColumnThatMatchesCurly()
-  return scala#GetLineAndColumnThatMatchesBracket('{', '}')
-endfunction
-
-function! scala#GetLineAndColumnThatMatchesParen()
-  return scala#GetLineAndColumnThatMatchesBracket('(', ')')
-endfunction
-
-function! scala#GetLineAndColumnThatMatchesBracket(openBracket, closedBracket)
-  let savedpos = getpos('.')
-  let curline = scala#GetLine(line('.'))
-  if curline =~ a:closedBracket . '.*' . a:openBracket . '.*' . a:closedBracket
-    call setpos('.', [savedpos[0], savedpos[1], 0, savedpos[3]])
-    call searchpos(a:closedBracket . '\ze[^' . a:closedBracket . a:openBracket . ']*' . a:openBracket, 'W')
-  else
-    call setpos('.', [savedpos[0], savedpos[1], 9999, savedpos[3]])
-    call searchpos(a:closedBracket, 'Wbc')
-  endif
-  let [lnum, colnum] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbn')
-  call setpos('.', savedpos)
-  return [lnum, colnum]
-endfunction
-
-function! scala#GetLineThatMatchesCurly()
-  return scala#GetLineThatMatchesBracket('{', '}')
-endfunction
-
-function! scala#GetLineThatMatchesParen()
-  return scala#GetLineThatMatchesBracket('(', ')')
-endfunction
-
-function! scala#GetLineThatMatchesBracket(openBracket, closedBracket)
-  let [lnum, colnum] = scala#GetLineAndColumnThatMatchesBracket(a:openBracket, a:closedBracket)
-  return lnum
-endfunction
-
-function! scala#NumberOfBraceGroups(line)
-  let line = substitute(a:line, '[^()]', '', 'g')
-  if strlen(line) == 0
-    return 0
-  endif
-  let line = substitute(line, '^)*', '', 'g')
-  if strlen(line) == 0
-    return 0
-  endif
-  let line = substitute(line, '^(', '', 'g')
-  if strlen(line) == 0
-    return 0
-  endif
-  let c = 1
-  let counter = 0
-  let groupCount = 0
-  while counter < strlen(line)
-    let char = strpart(line, counter, 1)
-    if char == '('
-      let c = c + 1
-    elseif char == ')'
-      let c = c - 1
-    endif
-    if c == 0
-      let groupCount = groupCount + 1
-    endif
-    let counter = counter + 1
-  endwhile
-  return groupCount
-endfunction
-
-function! scala#MatchesIncompleteDefValr(line)
-  if a:line =~ '^\s*\%(' . s:defMatcher . '\|\<va[lr]\>\).*[=({]\s*$'
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! scala#LineIsCompleteIf(line)
-  if scala#CountBrackets(a:line, '{', '}') == 0 &&
-   \ scala#CountBrackets(a:line, '(', ')') == 0 &&
-   \ a:line =~ '^\s*\<if\>\s*([^)]*)\s*\S.*$'
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! scala#LineCompletesIfElse(lnum, line)
-  if a:line =~ '^\s*\%(\<if\>\|\%(}\s*\)\?\<else\>\)'
-    return 0
-  endif
-  let result = search('^\%(\s*\<if\>\s*(.*).*\n\|\s*\<if\>\s*(.*)\s*\n.*\n\)\%(\s*\<else\>\s*\<if\>\s*(.*)\s*\n.*\n\)*\%(\s*\<else\>\s*\n\|\s*\<else\>[^{]*\n\)\?\%' . a:lnum . 'l', 'Wbn')
-  if result != 0 && scala#GetLine(prevnonblank(a:lnum - 1)) !~ '{\s*$'
-    return result
-  endif
-  return 0
-endfunction
-
-function! scala#GetPrevCodeLine(lnum)
-  " This needs to skip comment lines
-  return prevnonblank(a:lnum - 1)
-endfunction
-
-function! scala#InvertBracketType(openBracket, closedBracket)
-  if a:openBracket == '('
-    return [ '{', '}' ]
-  else
-    return [ '(', ')' ]
-  endif
-endfunction
-
-function! scala#Testhelper(lnum, line, openBracket, closedBracket, iteration)
-  let bracketCount = scala#CountBrackets(a:line, a:openBracket, a:closedBracket)
-  " There are more '}' braces than '{' on this line so it may be completing the function definition
-  if bracketCount < 0
-    let [matchedLNum, matchedColNum] = scala#GetLineAndColumnThatMatchesBracket(a:openBracket, a:closedBracket)
-    if matchedLNum == a:lnum
-      return -1
-    endif
-    let matchedLine = scala#GetLine(matchedLNum)
-    if ! scala#MatchesIncompleteDefValr(matchedLine)
-      let bracketLine = substitute(substitute(matchedLine, '\%' . matchedColNum . 'c.*$', '', ''), '[^{}()]', '', 'g')
-      if bracketLine =~ '}$'
-        return scala#Testhelper(matchedLNum, matchedLine, '{', '}', a:iteration + 1)
-      elseif bracketLine =~ ')$'
-        return scala#Testhelper(matchedLNum, matchedLine, '(', ')', a:iteration + 1)
-      else
-        let prevCodeLNum = scala#GetPrevCodeLine(matchedLNum)
-        if scala#MatchesIncompleteDefValr(scala#GetLine(prevCodeLNum))
-          return prevCodeLNum
-        else
-          return -1
-        endif
-      endif
-    else
-      " return indent value instead
-      return matchedLNum
-    endif
-  " There's an equal number of '{' and '}' on this line so it may be a single line function definition
-  elseif bracketCount == 0
-    if a:iteration == 0
-      let otherBracketType = scala#InvertBracketType(a:openBracket, a:closedBracket)
-      return scala#Testhelper(a:lnum, a:line, otherBracketType[0], otherBracketType[1], a:iteration + 1)
-    else
-      let prevCodeLNum = scala#GetPrevCodeLine(a:lnum)
-      let prevCodeLine = scala#GetLine(prevCodeLNum)
-      if scala#MatchesIncompleteDefValr(prevCodeLine) && prevCodeLine !~ '{\s*$'
-        return prevCodeLNum
-      else
-        let possibleIfElse = scala#LineCompletesIfElse(a:lnum, a:line)
-        if possibleIfElse != 0
-          let defValrLine = prevnonblank(possibleIfElse - 1)
-          let possibleDefValr = scala#GetLine(defValrLine)
-          if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
-            return possibleDefValr
-          else
-            return -1
-          endif
-        else
-          return -1
-        endif
-      endif
-    endif
-  else
-    return -1
-  endif
-endfunction
-
-function! scala#Test(lnum, line, openBracket, closedBracket)
-  return scala#Testhelper(a:lnum, a:line, a:openBracket, a:closedBracket, 0)
-endfunction
-
-function! scala#LineCompletesDefValr(lnum, line)
-  let bracketCount = scala#CountBrackets(a:line, '{', '}')
-  if bracketCount < 0
-    let matchedBracket = scala#GetLineThatMatchesBracket('{', '}')
-    if ! scala#MatchesIncompleteDefValr(scala#GetLine(matchedBracket))
-      let possibleDefValr = scala#GetLine(prevnonblank(matchedBracket - 1))
-      if matchedBracket != -1 && scala#MatchesIncompleteDefValr(possibleDefValr)
-        return 1
-      else
-        return 0
-      endif
-    else
-      return 0
-    endif
-  elseif bracketCount == 0
-    let bracketCount = scala#CountBrackets(a:line, '(', ')')
-    if bracketCount < 0
-      let matchedBracket = scala#GetLineThatMatchesBracket('(', ')')
-      if ! scala#MatchesIncompleteDefValr(scala#GetLine(matchedBracket))
-        let possibleDefValr = scala#GetLine(prevnonblank(matchedBracket - 1))
-        if matchedBracket != -1 && scala#MatchesIncompleteDefValr(possibleDefValr)
-          return 1
-        else
-          return 0
-        endif
-      else
-        return 0
-      endif
-    elseif bracketCount == 0
-      let possibleDefValr = scala#GetLine(prevnonblank(a:lnum - 1))
-      if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
-        return 1
-      else
-        let possibleIfElse = scala#LineCompletesIfElse(a:lnum, a:line)
-        if possibleIfElse != 0
-          let possibleDefValr = scala#GetLine(prevnonblank(possibleIfElse - 1))
-          if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
-            return 2
-          else
-            return 0
-          endif
-        else
-          return 0
-        endif
-      endif
-    else
-      return 0
-    endif
-  endif
-endfunction
-
-function! scala#SpecificLineCompletesBrackets(lnum, openBracket, closedBracket)
-  let savedpos = getpos('.')
-  call setpos('.', [savedpos[0], a:lnum, 9999, savedpos[3]])
-  let retv = scala#LineCompletesBrackets(a:openBracket, a:closedBracket)
-  call setpos('.', savedpos)
-
-  return retv
-endfunction
-
-function! scala#LineCompletesBrackets(openBracket, closedBracket)
-  let savedpos = getpos('.')
-  let offline = 0
-  while offline == 0
-    let [lnum, colnum] = searchpos(a:closedBracket, 'Wb')
-    let [lnumA, colnumA] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbn')
-    if lnum != lnumA
-      let [lnumB, colnumB] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbnr')
-      let offline = 1
-    endif
-  endwhile
-  call setpos('.', savedpos)
-  if lnumA == lnumB && colnumA == colnumB
-    return lnumA
-  else
-    return -1
-  endif
-endfunction
-
-function! GetScalaIndent()
-  " Find a non-blank line above the current line.
-  let prevlnum = prevnonblank(v:lnum - 1)
-
-  " Hit the start of the file, use zero indent.
-  if prevlnum == 0
-    return 0
-  endif
-
-  let ind = indent(prevlnum)
-  let originalIndentValue = ind
-  let prevline = scala#GetLine(prevlnum)
-  let curlnum = v:lnum
-  let curline = scala#GetLine(curlnum)
-
-  if prevline =~ '^\s*/\*\*'
-    if prevline =~ '\*/\s*$'
-      return ind
-    else
-      return ind + 1
-    endif
-  endif
-
-  if curline =~ '^\s*\*'
-    return cindent(curlnum)
-  endif
-
-  " If this line starts with a { then make it indent the same as the previous line
-  if curline =~ '^\s*{'
-    call scala#ConditionalConfirm("1")
-    " Unless, of course, the previous one is a { as well
-    if prevline !~ '^\s*{'
-      call scala#ConditionalConfirm("2")
-      return indent(prevlnum)
-    endif
-  endif
-
-  " '.' continuations
-  if curline =~ '^\s*\.'
-    if prevline =~ '^\s*\.'
-      return ind
-    else
-      return ind + &shiftwidth
-    endif
-  endif
-
-  " Indent html literals
-  if prevline !~ '/>\s*$' && prevline =~ '^\s*<[a-zA-Z][^>]*>\s*$'
-    call scala#ConditionalConfirm("3")
-    return ind + &shiftwidth
-  endif
-
-  " assumes curly braces around try-block
-  if curline =~ '^\s*}\s*\<catch\>'
-    return ind - &shiftwidth
-  elseif curline =~ '^\s*\<catch\>'
-    return ind
-  endif
-
-  " Add a 'shiftwidth' after lines that start a block
-  " If 'if', 'for' or 'while' end with ), this is a one-line block
-  " If 'val', 'var', 'def' end with =, this is a one-line block
-  if (prevline =~ '^\s*\<\%(\%(}\?\s*else\s\+\)\?if\|for\|while\)\>.*[)=]\s*$' && scala#NumberOfBraceGroups(prevline) <= 1)
-        \ || prevline =~ '^\s*' . s:defMatcher . '.*=\s*$'
-        \ || prevline =~ '^\s*\<va[lr]\>.*[=]\s*$'
-        \ || prevline =~ '^\s*\%(}\s*\)\?\<else\>\s*$'
-        \ || prevline =~ '=\s*$'
-    call scala#ConditionalConfirm("4")
-    let ind = ind + &shiftwidth
-  elseif prevline =~ '^\s*\<\%(}\?\s*else\s\+\)\?if\>' && curline =~ '^\s*}\?\s*\<else\>'
-    return ind
-  endif
-
-  let lineCompletedBrackets = 0
-  let bracketCount = scala#CountBrackets(prevline, '{', '}')
-  if bracketCount > 0 || prevline =~ '.*{\s*$'
-    call scala#ConditionalConfirm("5b")
-    let ind = ind + &shiftwidth
-  elseif bracketCount < 0
-    call scala#ConditionalConfirm("6b")
-    " if the closing brace actually completes the braces entirely, then we
-    " have to indent to line that started the whole thing
-    let completeLine = scala#LineCompletesBrackets('{', '}')
-    if completeLine != -1
-      call scala#ConditionalConfirm("8b")
-      let prevCompleteLine = scala#GetLine(prevnonblank(completeLine - 1))
-      " However, what actually started this part looks like it was a function
-      " definition, so we need to indent to that line instead.  This is 
-      " actually pretty weak at the moment.
-      if prevCompleteLine =~ '=\s*$'
-        call scala#ConditionalConfirm("9b")
-        let ind = indent(prevnonblank(completeLine - 1))
-      else
-        call scala#ConditionalConfirm("10b")
-        let ind = indent(completeLine)
-      endif
-    else
-      let lineCompletedBrackets = 1
-    endif
-  endif
-
-  if ind == originalIndentValue
-    let bracketCount = scala#CountBrackets(prevline, '(', ')')
-    if bracketCount > 0 || prevline =~ '.*(\s*$'
-      call scala#ConditionalConfirm("5a")
-      let ind = ind + &shiftwidth
-    elseif bracketCount < 0
-      call scala#ConditionalConfirm("6a")
-      " if the closing brace actually completes the braces entirely, then we
-      " have to indent to line that started the whole thing
-      let completeLine = scala#LineCompletesBrackets('(', ')')
-      if completeLine != -1 && prevline !~ '^.*{\s*$'
-        call scala#ConditionalConfirm("8a")
-        let prevCompleteLine = scala#GetLine(prevnonblank(completeLine - 1))
-        " However, what actually started this part looks like it was a function
-        " definition, so we need to indent to that line instead.  This is 
-        " actually pretty weak at the moment.
-        if prevCompleteLine =~ '=\s*$'
-          call scala#ConditionalConfirm("9a")
-          let ind = indent(prevnonblank(completeLine - 1))
-        else
-          call scala#ConditionalConfirm("10a")
-          let ind = indent(completeLine)
-        endif
-      else
-        " This is the only part that's different from from the '{', '}' one below
-        " Yup... some refactoring is necessary at some point.
-        let ind = ind + (bracketCount * &shiftwidth)
-        let lineCompletedBrackets = 1
-      endif
-    endif
-  endif
-
-  if curline =~ '^\s*}\?\s*\<else\>\%(\s\+\<if\>\s*(.*)\)\?\s*{\?\s*$' &&
-   \ ! scala#LineIsCompleteIf(prevline) &&
-   \ prevline !~ '^.*}\s*$'
-    let ind = ind - &shiftwidth
-  endif
-
-  " Subtract a 'shiftwidth' on '}' or html
-  let curCurlyCount = scala#CountCurlies(curline)
-  if curCurlyCount < 0
-    call scala#ConditionalConfirm("14a")
-    let matchline = scala#CurlyMatcher()
-    return indent(matchline)
-  elseif curline =~ '^\s*</[a-zA-Z][^>]*>'
-    call scala#ConditionalConfirm("14c")
-    return ind - &shiftwidth
-  endif
-
-  let prevParenCount = scala#CountParens(prevline)
-  if prevline =~ '^\s*\<for\>.*$' && prevParenCount > 0
-    call scala#ConditionalConfirm("15")
-    let ind = indent(prevlnum) + 5
-  endif
-
-  let prevCurlyCount = scala#CountCurlies(prevline)
-  if prevCurlyCount == 0 && prevline =~ '^.*\%(=>\|⇒\)\s*$' && prevline !~ '^\s*this\s*:.*\%(=>\|⇒\)\s*$' && curline !~ '^\s*\<case\>'
-    call scala#ConditionalConfirm("16")
-    let ind = ind + &shiftwidth
-  endif
-
-  if ind == originalIndentValue && curline =~ '^\s*\<case\>'
-    call scala#ConditionalConfirm("17")
-    let parentCase = scala#IsParentCase()
-    if parentCase != -1
-      call scala#ConditionalConfirm("17a")
-      return indent(parentCase)
-    endif
-  endif
-
-  if prevline =~ '^\s*\*/'
-   \ || prevline =~ '*/\s*$'
-    call scala#ConditionalConfirm("18")
-    let ind = ind - 1
-  endif
-
-  if scala#LineEndsInIncomplete(curline)
-    call scala#ConditionalConfirm("19")
-    return ind
-  endif
-
-  if scala#LineIsAClosingXML(prevline)
-    if scala#LineCompletesXML(prevlnum, prevline)
-      call scala#ConditionalConfirm("20a")
-      return ind - &shiftwidth
-    else
-      call scala#ConditionalConfirm("20b")
-      return ind
-    endif
-  endif
-
-  if ind == originalIndentValue
-    "let indentMultiplier = scala#LineCompletesDefValr(prevlnum, prevline)
-    "if indentMultiplier != 0
-    "  call scala#ConditionalConfirm("19a")
-    "  let ind = ind - (indentMultiplier * &shiftwidth)
-    let defValrLine = scala#Test(prevlnum, prevline, '{', '}')
-    if defValrLine != -1
-      call scala#ConditionalConfirm("21a")
-      let ind = indent(defValrLine)
-    elseif lineCompletedBrackets == 0
-      call scala#ConditionalConfirm("21b")
-      if scala#GetLine(prevnonblank(prevlnum - 1)) =~ '^.*\<else\>\s*\%(//.*\)\?$'
-        call scala#ConditionalConfirm("21c")
-        let ind = ind - &shiftwidth
-      elseif scala#LineCompletesIfElse(prevlnum, prevline)
-        call scala#ConditionalConfirm("21d")
-        let ind = ind - &shiftwidth
-      elseif scala#CountParens(curline) < 0 && curline =~ '^\s*)' && scala#GetLine(scala#GetLineThatMatchesBracket('(', ')')) =~ '.*(\s*$'
-        " Handles situations that look like this:
-        " 
-        "   val a = func(
-        "     10
-        "   )
-        "
-        " or
-        "
-        "   val a = func(
-        "     10
-        "   ).somethingHere()
-        call scala#ConditionalConfirm("21e")
-        let ind = ind - &shiftwidth
-      endif
-    endif
-  endif
-
-  call scala#ConditionalConfirm("returning " . ind)
-
-  return ind
-endfunction
-" vim:set ts=2 sts=2 sw=2:
-" vim600:fdm=marker fdl=1 fdc=0:
diff --git a/bundle/scala/indent/testfile.scala b/bundle/scala/indent/testfile.scala
deleted file mode 100644
index e369210..0000000
--- a/bundle/scala/indent/testfile.scala
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * Commets are here
- */
-class SomeClass {
-  val someval = SomeObject.makeWithSomething
-  var somevar = SomeObject.makeWithSomething
-
-  def someBracedDef = {
-    case ASingleLineCase => a.statement
-
-    case AMultiLineCase =>
-      if (this)
-        then
-      else
-        that
-  }
-
-  def aSingleLineDef = someval + 12
-
-  def main(args: Array[String]) = run(20000, 20000)
-
-  // This
-  def aMultiLineSingleStatementDefWithBraces = {
-    SomeObject.makeWithSomething
-  }
-
-  // This
-  def aMultiLineSingleStatementDefWithNoBraces =
-    new X {
-      def something = 5
-    }
-
-  def aMultiLineSingleStatementDefWithNoBraces =
-    SomeObject.makeWithSomething
-
-  def someFunc = {
-    if (b) 1
-    else {
-      if (b) 2
-      else
-        3
-    }
-  }
-
-  def someOtherFunc =
-    if (this)
-      that
-    else
-      theOther
-
-  def someOtherOtherFunc = {
-    if (b) 1
-    else {
-      if (b) 2
-      else
-        3
-    }
-
-    /**
-     * The following stuff doesn't work, but honestly, it's pretty
-     * pathological stuff... format your code differently.
-     *
-     * ---- 1. ----
-     *
-     *    if (b) 1
-     *    else
-     *      if (c) 2
-     *    else 3 // Should be the same as the above 'if'
-     *
-     *    Do this instead:
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c) 2
-     *      else 3
-     *    }
-     *
-     *
-     * ---- 2. ----
-     *
-     *    if (b) 1
-     *    else
-     *      if (c)
-     *        2
-     *        else 3
-     *
-     *    Do this instead:
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c) 2
-     *      else 3
-     *    }
-     *
-     *    or this...
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c)
-     *        2
-     *      else
-     *        3
-     *    }
-     *
-     * ---- 3. ----
-     *
-     *    if (b) 1
-     *    else {
-     *      if (c)
-     *        2
-     *        else 3
-     *    }
-     *
-     *    Do the same as in number 2
-     */
-
-    if (b) {
-      statement
-    }
-    else
-      thing
-
-    if (b)
-      statement
-
-    bare_statement
-
-    if (b) {
-      statement
-    }
-    else {
-      thing
-      that
-    }
-
-    if (statement(nested statement(another nested statement))) func(statement)
-    if (statement(nested statement(another nested statement))) statement
-
-    if (b) {
-      statement
-      statement
-    } else if (b) {
-      statement
-      statement
-    } else if (c) {
-      statement
-      statement
-    } else
-      dohicky
-
-    if (b) { // comment
-      statement
-      statement
-    } else if (b) { // comment
-      statement
-      statement
-    } else if (c) { // comment
-      statement
-      statement
-    } else // comment
-      dohicky
-
-    if (b)
-      statement
-    else {
-      statement
-      statement
-    }
-
-    val a = if (b) {
-      10
-    } else { statement }
-
-    val a = func(
-      10
-    ).goThere()
-
-    val a = func(
-      10
-    )
-
-    if (b) (statement)
-    else 2
-
-    if (b) 1
-    else 2
-
-    if (b)
-      1
-    else if (b)
-      2
-    else if (b)
-      2
-    else
-      3
-    4
-
-    if (b)
-      1
-    else if (b)
-      2
-    else
-      3
-    4
-  }
-
-  /**
-   * This
-   */
-  def SomeOtherFunc = ...
-
-  /** This */
-  def blah = ...
-
-  def func = {
-    val reply = new Something()
-    some.block {
-      def foo("string", bar("string"))
-      new X {
-        statement
-        statement
-      }
-    }
-    () => goAndDo.something
-  }
-
-  def func(param: Int) = new this.Something.Or.Other(
-    new SillyObject {
-      override def booger() = {
-        statement
-        statement
-      }
-    },
-  otherParam) // comment
-
-  class AnotherSomeClass {
-    this: Actor =>
-    def func = {
-      booger
-    }
-  }
-
-  /**
-   * Pulled this stuff from the fors.scala example file in the source distribution
-   */
-  def findNums(n: Int): Iterable[(Int, Int)] =
-    for (i <- 1 until n;
-         j <- 1 until (i-1);
-         if isPrime(i+j)) yield (i, j)
-
-  val books = List(
-    Elem(prefix, "book", e, scope,
-      Elem(prefix, "title", e, scope,
-        Text("Structure and Interpretation of Computer Programs")),
-      Elem(prefix, "author", e, scope,
-        Text("Abelson, Harald")),
-      Elem(prefix, "author", e, scope,
-        Text("Sussman, Gerald J."))),
-    Elem(prefix, "book", e, scope,
-      Elem(prefix, "title", e, scope,
-        Text("Principles of Compiler Design")),
-      Elem(prefix, "author", e, scope,
-        Text("Aho, Alfred")),
-      Elem(prefix, "author", e, scope,
-        Text("Ullman, Jeffrey"))),
-    Elem(prefix, "book", e, scope,
-      Elem(prefix, "title", e, scope,
-        Text("Programming in Modula-2")),
-      Elem(prefix, "author", e, scope,
-        Text("Wirth, Niklaus")))
-    )
-
-  def mufync(statement): Int = {
-    val x = function(thing)
-    if (statement) func(statement)
-    else func(statement)
-  }
-
-  def SomeOtherFunc = statement
-
-  def receive = {
-    case Something =>
-    case OrOther =>
-      here
-    case There =>
-  }
-
-  def func[A <: B](one: One, two: Two) : ReturnType = ...
-  def func(one: One, two: Two) : ReturnType = ...
-  def func(one: (A, B) => B) : ReturnType = ...
-  def func(one: One, two: Two) = ...
-  def func(one: One, two: Two) = ...
-  def func[A <: B](one: One,
-    two: Two) : ReturnType = ...
-  def func(one: One, two: Two, three: Three, four: Four,
-    five: Five) : ReturnType = ...
-  def func(one: One, two: Two, three: Three, four: Four,
-    five: Five) = ...
-
-  def func = oneliner
-  private def func = oneliner
-  private[thing] def func = oneliner
-  protected def func = oneliner
-  protected[thing] def func = oneliner
-  override def func = oneliner
-  abstract override def func = oneliner
-  override abstract def func = oneliner
-  protected override def func = oneliner
-  protected abstract override def func = oneliner
-  protected override abstract def func = oneliner
-  protected[thing] override def func = oneliner
-  protected[thing] abstract override def func = oneliner
-  protected[thing] override abstract def func = oneliner
-  private override def func = oneliner
-  private abstract override def func = oneliner
-  private override abstract def func = oneliner
-  private[thing] override def func = oneliner
-  private[thing] abstract override def func = oneliner
-  private[thing] override abstract def func = oneliner
-
-  <outertag>
-    <innertag>
-      <in-innertag>
-        Something
-      </in-innertag>
-    </innertag>
-  </outertag>
-
-  val someXML =
-    <outertag>
-      <innertag>
-        <in-innertag>
-          Something
-        </in-innertag>
-      </innertag>
-    </outertag>
-
-  private[somepackage] abstract override def somethingWithDots = {
-    SomeObject.build
-      .withSomething
-      .withSomethingElse
-      .withSomethingElseAgain
-  }
-
-  private def oneLineFunc = actorOf(new Actor {
-    def receive = {
-      case _ => thing
-    }
-  })
-
-  private def oneLineFunc = factory(
-    arg1,
-    arg2,
-    arg3).build
-
-  def someFunction[T <: U](
-    x: Int): SomeType = {
-      val someValue: Option[Int] = {
-        someValue match {
-          some stuff here
-        }
-      }
-  }
-
-  def someFunction[T <: U](
-    x: Int,
-    y: Int,
-    z: Long): SomeType = {
-      val someValue: Option[Int] = {
-        someValue match {
-          some stuff here
-        }
-      }
-  }
-
-  private[this] def followingFunction = oneliner
-
-  val someFunction: List[(Option[T], Option[U])] = TODO
-}
-
diff --git a/bundle/scala/plugin/scala.vim b/bundle/scala/plugin/scala.vim
deleted file mode 100644
index 3a858cd..0000000
--- a/bundle/scala/plugin/scala.vim
+++ /dev/null
@@ -1,132 +0,0 @@
-"
-" Sort imports
-"
-" author: Leonard Ehrenfried <leonard.ehrenfried@gmail.com>
-"
-
-function! SortScalaImports()
-  let save_cursor = getpos(".")
-
-  if exists('g:scala_sort_across_groups') && g:scala_sort_across_groups
-    call s:sortAcrossGroups()
-  else
-    call s:sortInsideGroups()
-  end
-
-  "move cursor to where it was before the function call
-  call setpos('.', save_cursor)
-
-endfunction
-
-" Iterates over _all_ imports and puts them into 3 groups
-"
-" 1. Java/Scala imports like java.util.UUID
-" 2. Third party libraries
-" 3. First party libraries (ie. your own stuff)
-"
-function! s:sortAcrossGroups()
-  let curr = 1
-  let first_line = -1
-  let last_line = -1
-  let trailing_newlines = 0
-  let java_scala_imports = []
-  let first_party_imports = []
-  let third_party_imports = []
-
-  " loop over lines in buffer
-  while curr <= line('$')
-
-    let line = getline(curr)
-
-    if line =~ "^import"
-      if first_line == -1
-        let first_line = curr
-      endif
-
-      if line =~ '^import \(java\(x\)\?\|scala\)\.'
-        call add(java_scala_imports, line)
-      elseif exists('g:scala_first_party_namespaces')
-        let regex = '^import '.g:scala_first_party_namespaces
-        if line =~ regex
-          call add(first_party_imports, line)
-        else
-          call add(third_party_imports, line)
-        endif
-      else
-        call add(third_party_imports, line)
-      endif
-
-      let trailing_newlines = 0
-    elseif empty(line)
-      let trailing_newlines = trailing_newlines + 1
-    elseif first_line != -1
-      let last_line = curr - trailing_newlines - 1
-      " break out when you have found the first non-import, non-empty line
-      break
-    endif
-
-    let curr = curr + 1
-  endwhile
-
-  call cursor(first_line, 0)
-  let to_delete = last_line - first_line
-
-  execute 'd'to_delete
-
-  call s:sortAndPrint(first_party_imports)
-  call s:sortAndPrint(third_party_imports)
-  call s:sortAndPrint(java_scala_imports)
-
-  " remove extra blank line at top
-  execute 'delete'
-
-  call cursor(last_line + 2, 0)
-  if empty(getline(line(".")))
-    execute 'delete'
-  endif
-
-endfunction
-
-function! s:sortInsideGroups()
-  call cursor(1, 1)
-
-  let start = 1
-  let end = 1
-
-  " repeat until we find no more matches
-  while(start > 0 && end > 0)
-    let pos = line(".")
-    " find first line with import
-    let start = search('^import', 'cW')
-    " find next line which starts with an import, ends with a newline
-    " and the next line is not an import
-    " the 'c' flag accepts matches at the current position allowing single line groups
-    let end = search('^\import.*\n\(import\)\@!', 'cW')
-
-    execute start','end'sort i'
-
-    call cursor(end + 1, 0)
-
-    " stop if end is the last line in the file
-    if line("$") == end
-      break
-    endif
-
-  endwhile
-endfunction
-
-function! s:sortAndPrint(imports)
-  if len(a:imports) > 0
-    call sort(a:imports, "s:sortIgnoreCase")
-    call append(line("."), "")
-    call append(line("."), a:imports)
-  endif
-endfunction
-
-" this useless function exists purely so the sort() ignores case
-" this is needed so scalaz/Scalaz appears next to each other
-function! s:sortIgnoreCase(i1, i2)
-  return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
-endfunction
-
-command! SortScalaImports call SortScalaImports()
diff --git a/bundle/scala/spec/fixtures/multiple_newlines.expected.scala b/bundle/scala/spec/fixtures/multiple_newlines.expected.scala
deleted file mode 100644
index 57b8bae..0000000
--- a/bundle/scala/spec/fixtures/multiple_newlines.expected.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.foo
-
-import java.bla
-import scala.horst
-
-import AgentTypes._
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/multiple_newlines.scala b/bundle/scala/spec/fixtures/multiple_newlines.scala
deleted file mode 100644
index 2050982..0000000
--- a/bundle/scala/spec/fixtures/multiple_newlines.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.foo
-
-import AgentTypes._
-import scala.horst
-
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-
-import java.bla
-
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_newline.expected.scala b/bundle/scala/spec/fixtures/no_newline.expected.scala
deleted file mode 100644
index 1470c35..0000000
--- a/bundle/scala/spec/fixtures/no_newline.expected.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.foo
-
-import java.bla
-import scala.horst
-
-import AgentTypes._
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_newline.scala b/bundle/scala/spec/fixtures/no_newline.scala
deleted file mode 100644
index 3ef5746..0000000
--- a/bundle/scala/spec/fixtures/no_newline.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.foo
-
-import java.bla
-import AgentTypes._
-import scala.horst
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_newline_after.expected.scala b/bundle/scala/spec/fixtures/no_newline_after.expected.scala
deleted file mode 100644
index aea5685..0000000
--- a/bundle/scala/spec/fixtures/no_newline_after.expected.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.foo
-
-import java.bla
-import scala.horst
-
-import AgentTypes._
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_newline_after.scala b/bundle/scala/spec/fixtures/no_newline_after.scala
deleted file mode 100644
index fea8cc3..0000000
--- a/bundle/scala/spec/fixtures/no_newline_after.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.foo
-
-import java.bla
-import AgentTypes._
-import scala.horst
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_package.expected.scala b/bundle/scala/spec/fixtures/no_package.expected.scala
deleted file mode 100644
index 6c17141..0000000
--- a/bundle/scala/spec/fixtures/no_package.expected.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-import java.bla
-import scala.horst
-
-import AgentTypes._
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/no_package.scala b/bundle/scala/spec/fixtures/no_package.scala
deleted file mode 100644
index f8c56f6..0000000
--- a/bundle/scala/spec/fixtures/no_package.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-import java.bla
-import AgentTypes._
-import scala.horst
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/vanilla.expected.scala b/bundle/scala/spec/fixtures/vanilla.expected.scala
deleted file mode 100644
index 1470c35..0000000
--- a/bundle/scala/spec/fixtures/vanilla.expected.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.foo
-
-import java.bla
-import scala.horst
-
-import AgentTypes._
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/fixtures/vanilla.scala b/bundle/scala/spec/fixtures/vanilla.scala
deleted file mode 100644
index ecfa2df..0000000
--- a/bundle/scala/spec/fixtures/vanilla.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.foo
-
-import java.bla
-import AgentTypes._
-import scala.horst
-
-import akka.actor.{Actor, ActorLogging, ActorRef, ActorRefFactory, ActorSystem, Props, Stash, Terminated}
-
-class Bar
diff --git a/bundle/scala/spec/import_sorting_spec.rb b/bundle/scala/spec/import_sorting_spec.rb
deleted file mode 100644
index 0560059..0000000
--- a/bundle/scala/spec/import_sorting_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require "spec_helper"
-
-describe ":SortScalaImports" do
-
-  describe "Sorting across groups" do
-    ["vanilla", "no_newline", "no_newline_after", "no_package",
-     "multiple_newlines"].each do |name|
-      it "should sort vanilla file" do
-        actual = sort_fixture_across_groups name
-        expected = expected(name)
-        actual.should eq(expected)
-      end
-    end
-  end
-
-end
diff --git a/bundle/scala/spec/spec_helper.rb b/bundle/scala/spec/spec_helper.rb
deleted file mode 100644
index b997877..0000000
--- a/bundle/scala/spec/spec_helper.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'vimrunner'
-require 'tempfile'
-
-PWD = File.expand_path File.dirname(__FILE__)
-
-RSpec.configure do |config|
-
-  config.before(:suite) do
-    VIM = Vimrunner.start
-    VIM.add_plugin(File.expand_path('../..', __FILE__), 'plugin/scala.vim')
-  end
-
-  config.after(:suite) do
-    VIM.kill
-  end
-end
-
-def sort_fixture_across_groups(name)
-  fixture_path = "#{PWD}/fixtures/#{name}.scala"
-
-  temp_file = Tempfile.new('vim-scala-')
-  temp_file.write File.read(fixture_path)
-  temp_file.rewind
-
-  VIM.edit temp_file.path
-
-  VIM.command "let g:scala_sort_across_groups=1"
-  VIM.command "SortScalaImports"
-  VIM.write
-
-  temp_file.rewind
-  output = temp_file.read
-
-  temp_file.close
-  temp_file.unlink
-
-  output
-end
-
-def expected(name)
-  path = "#{PWD}/fixtures/#{name}.expected.scala"
-  File.read(path)
-end
-
diff --git a/bundle/scala/syntax/scala.vim b/bundle/scala/syntax/scala.vim
deleted file mode 100644
index 97189ae..0000000
--- a/bundle/scala/syntax/scala.vim
+++ /dev/null
@@ -1,180 +0,0 @@
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-scriptencoding utf-8
-
-let b:current_syntax = "scala"
-
-function! s:ContainedGroup()
-  try
-    silent syn list @scala
-    return '@scala'
-  catch /E392/
-    return 'TOP'
-  endtry
-endfunction
-
-syn case match
-syn sync minlines=200 maxlines=1000
-
-syn keyword scalaKeyword catch do else final finally for forSome if
-syn keyword scalaKeyword match return throw try while yield macro
-syn keyword scalaKeyword class trait object extends with nextgroup=scalaInstanceDeclaration skipwhite
-syn keyword scalaKeyword case nextgroup=scalaKeyword,scalaCaseFollowing skipwhite
-syn keyword scalaKeyword val nextgroup=scalaNameDefinition,scalaQuasiQuotes skipwhite
-syn keyword scalaKeyword def var nextgroup=scalaNameDefinition skipwhite
-hi link scalaKeyword Keyword
-
-exe 'syn region scalaBlock start=/{/ end=/}/ contains=' . s:ContainedGroup() . ' fold'
-
-syn keyword scalaAkkaSpecialWord when goto using startWith initialize onTransition stay become unbecome
-hi link scalaAkkaSpecialWord PreProc
-
-syn match scalaSymbol /'[_A-Za-z0-9$]\+/
-hi link scalaSymbol Number
-
-syn match scalaChar /'.'/
-syn match scalaEscapedChar /\\[\\"ntbrf]/
-syn match scalaUnicodeChar /\\u[A-Fa-f0-9]\{4}/
-hi link scalaChar Character
-hi link scalaEscapedChar Function
-hi link scalaUnicodeChar Special
-
-syn match scalaOperator "||"
-syn match scalaOperator "&&"
-hi link scalaOperator Special
-
-syn match scalaNameDefinition /\<[_A-Za-z0-9$]\+\>/ contained nextgroup=scalaPostNameDefinition
-syn match scalaNameDefinition /`[^`]\+`/ contained nextgroup=scalaPostNameDefinition
-syn match scalaPostNameDefinition /\_s*:\_s*/ contained nextgroup=scalaTypeDeclaration
-hi link scalaNameDefinition Function
-
-syn match scalaInstanceDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaInstanceHash
-syn match scalaInstanceDeclaration /`[^`]\+`/ contained
-syn match scalaInstanceHash /#/ contained nextgroup=scalaInstanceDeclaration
-hi link scalaInstanceDeclaration Special
-hi link scalaInstanceHash Type
-
-syn match scalaCapitalWord /\<[A-Z][A-Za-z0-9$]*\>/
-hi link scalaCapitalWord Special
-
-" Handle type declarations specially
-syn region scalaTypeStatement matchgroup=Keyword start=/\<type\_s\+\ze/ end=/$/ contains=scalaTypeTypeDeclaration,scalaSquareBrackets,scalaTypeTypeEquals,scalaTypeStatement
-
-" Ugh... duplication of all the scalaType* stuff to handle special highlighting
-" of `type X =` declarations
-syn match scalaTypeTypeDeclaration /(/ contained nextgroup=scalaTypeTypeExtension,scalaTypeTypeEquals contains=scalaRoundBrackets skipwhite
-syn match scalaTypeTypeDeclaration /\%(⇒\|=>\)\ze/ contained nextgroup=scalaTypeTypeDeclaration contains=scalaTypeTypeExtension skipwhite
-syn match scalaTypeTypeDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeTypeExtension,scalaTypeTypeEquals skipwhite
-syn match scalaTypeTypeEquals /=\ze[^>]/ contained nextgroup=scalaTypeTypePostDeclaration skipwhite
-syn match scalaTypeTypeExtension /)\?\_s*\zs\%(⇒\|=>\|<:\|:>\|=:=\|::\|#\)/ contained nextgroup=scalaTypeTypeDeclaration skipwhite
-syn match scalaTypeTypePostDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeTypePostExtension skipwhite
-syn match scalaTypeTypePostExtension /\%(⇒\|=>\|<:\|:>\|=:=\|::\)/ contained nextgroup=scalaTypeTypePostDeclaration skipwhite
-hi link scalaTypeTypeDeclaration Type
-hi link scalaTypeTypeExtension Keyword
-hi link scalaTypeTypePostDeclaration Special
-hi link scalaTypeTypePostExtension Keyword
-
-syn match scalaTypeDeclaration /(/ contained nextgroup=scalaTypeExtension contains=scalaRoundBrackets skipwhite
-syn match scalaTypeDeclaration /\%(⇒\|=>\)\ze/ contained nextgroup=scalaTypeDeclaration contains=scalaTypeExtension skipwhite
-syn match scalaTypeDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeExtension skipwhite
-syn match scalaTypeExtension /)\?\_s*\zs\%(⇒\|=>\|<:\|:>\|=:=\|::\|#\)/ contained nextgroup=scalaTypeDeclaration skipwhite
-hi link scalaTypeDeclaration Type
-hi link scalaTypeExtension Keyword
-hi link scalaTypePostExtension Keyword
-
-syn match scalaTypeAnnotation /\%([_a-zA-Z0-9$\s]:\_s*\)\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration contains=scalaRoundBrackets
-syn match scalaTypeAnnotation /)\_s*:\_s*\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration
-hi link scalaTypeAnnotation Normal
-
-syn match scalaCaseFollowing /\<[_\.A-Za-z0-9$]\+\>/ contained
-syn match scalaCaseFollowing /`[^`]\+`/ contained
-hi link scalaCaseFollowing Special
-
-syn keyword scalaKeywordModifier abstract override final lazy implicit implicitly private protected sealed null require super
-hi link scalaKeywordModifier Function
-
-syn keyword scalaSpecial this true false package import ne eq
-syn keyword scalaSpecial new nextgroup=scalaInstanceDeclaration skipwhite
-syn match scalaSpecial "\%(=>\|⇒\|<-\|←\|->\|→\)"
-syn match scalaSpecial /`[^`]*`/  " Backtick literals
-hi link scalaSpecial PreProc
-
-syn match scalaStringEmbeddedQuote /\\"/ contained
-syn region scalaString start=/"/ end=/"/ contains=scalaStringEmbeddedQuote,scalaEscapedChar,scalaUnicodeChar
-hi link scalaString String
-hi link scalaStringEmbeddedQuote String
-
-syn region scalaIString matchgroup=Special start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
-syn region scalaTripleIString matchgroup=Special start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
-hi link scalaIString String
-hi link scalaTripleIString String
-
-syn match scalaInterpolation /\$[a-zA-Z0-9_$]\+/ contained
-exe 'syn region scalaInterpolationB matchgroup=scalaInterpolation start=/\${/ end=/}/ contained contains=' . s:ContainedGroup()
-hi link scalaInterpolation Function
-hi link scalaInterpolationB Normal
-
-syn region scalaFString matchgroup=Special start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
-syn match scalaFInterpolation /\$[a-zA-Z0-9_$]\+\(%[-A-Za-z0-9\.]\+\)\?/ contained
-exe 'syn region scalaFInterpolationB matchgroup=scalaFInterpolation start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup()
-hi link scalaFString String
-hi link scalaFInterpolation Function
-hi link scalaFInterpolationB Normal
-
-syn region scalaTripleString start=/"""/ end=/"""\%([^"]\|$\)/ contains=scalaEscapedChar,scalaUnicodeChar
-syn region scalaTripleFString matchgroup=Special start=/f"""/ end=/"""\%([^"]\|$\)/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
-hi link scalaTripleString String
-hi link scalaTripleFString String
-
-syn match scalaNumber /\<0[dDfFlL]\?\>/ " Just a bare 0
-syn match scalaNumber /\<[1-9]\d*[dDfFlL]\?\>/  " A multi-digit number - octal numbers with leading 0's are deprecated in Scala
-syn match scalaNumber /\<0[xX][0-9a-fA-F]\+[dDfFlL]\?\>/ " Hex number
-syn match scalaNumber /\%(\<\d\+\.\d*\|\.\d\+\)\%([eE][-+]\=\d\+\)\=[fFdD]\=/ " exponential notation 1
-syn match scalaNumber /\<\d\+[eE][-+]\=\d\+[fFdD]\=\>/ " exponential notation 2
-syn match scalaNumber /\<\d\+\%([eE][-+]\=\d\+\)\=[fFdD]\>/ " exponential notation 3
-hi link scalaNumber Number
-
-syn region scalaRoundBrackets start="(" end=")" skipwhite contained contains=scalaTypeDeclaration,scalaSquareBrackets,scalaRoundBrackets
-
-syn region scalaSquareBrackets matchgroup=Type start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter
-syn match scalaTypeOperator /[-+=:<>]\+/ contained
-syn match scalaTypeAnnotationParameter /@\<[`_A-Za-z0-9$]\+\>/ contained
-hi link scalaTypeOperator Keyword
-hi link scalaTypeAnnotationParameter Function
-
-syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaCommentCodeBlock,@scalaHtml keepend
-syn match scalaCommentAnnotation "@[_A-Za-z0-9$]\+" contained
-syn match scalaParameterAnnotation "@param" nextgroup=scalaParamAnnotationValue skipwhite contained
-syn match scalaParamAnnotationValue /[`_A-Za-z0-9$]\+/ contained
-syn region scalaDocLinks start="\[\[" end="\]\]" contained
-syn region scalaCommentCodeBlock matchgroup=Keyword start="{{{" end="}}}" contained
-hi link scalaMultilineComment Comment
-hi link scalaDocLinks Function
-hi link scalaParameterAnnotation Function
-hi link scalaParamAnnotationValue Keyword
-hi link scalaCommentAnnotation Function
-hi link scalaCommentCodeBlock String
-
-syn match scalaAnnotation /@\<[`_A-Za-z0-9$]\+\>/
-hi link scalaAnnotation PreProc
-
-syn match scalaTrailingComment "//.*$"
-hi link scalaTrailingComment Comment
-
-syn match scalaAkkaFSM /goto([^)]*)\_s\+\<using\>/ contains=scalaAkkaFSMGotoUsing
-syn match scalaAkkaFSM /stay\_s\+using/
-syn match scalaAkkaFSM /^\s*stay\s*$/
-syn match scalaAkkaFSM /when\ze([^)]*)/
-syn match scalaAkkaFSM /startWith\ze([^)]*)/
-syn match scalaAkkaFSM /initialize\ze()/
-syn match scalaAkkaFSM /onTransition/
-syn match scalaAkkaFSM /onTermination/
-syn match scalaAkkaFSM /whenUnhandled/
-syn match scalaAkkaFSMGotoUsing /\<using\>/
-syn match scalaAkkaFSMGotoUsing /\<goto\>/
-hi link scalaAkkaFSM PreProc
-hi link scalaAkkaFSMGotoUsing PreProc
diff --git a/bundle/scala/syntax/testfile.scala b/bundle/scala/syntax/testfile.scala
deleted file mode 100644
index 59f8616..0000000
--- a/bundle/scala/syntax/testfile.scala
+++ /dev/null
@@ -1,173 +0,0 @@
-package testfile
-import java.something.com
-
-package object SomeObject[A <: B] extends Implicits {
-  type Booger[A] = A => Unit
-  type SomeType = A <: B :> C
-  type SomeOtherType = A ⇒ Thing
-  type Something
-  type Something <: SomethingElse
-  type ParserContext = Context { type PrefixType = Parser }
-  
-  new Something#SomethingElse
-
-  def x: Something#SomethingElse
-
-  def hasFunctionType[A, B <: A, Z](f: A => B, g: (A, B) => Z): Unit = {
-    println("Something")
-  }
-
-  val f: (Int, String) => Unit = (i: Int, s: String) => println(s"$i -- $s")
-  val f: (Int, String) ⇒ Unit = (i: Int, s: String) ⇒ println(s"$i -- $s")
-}
-
-object Test {
-  def test(
-    param1: List[(Int, Int)],
-    param2: List[Int]):
-  List[Int] = {
-    param2 match {
-      case head :: tail => tail
-    }
-  }
-}
-
-case class ACaseClass(param1: Float = 14.23f)
-case object ACaseObject extends Something
-
-def x(): Unit = {
-  case Something(a, b) =>
-  case SomethingElse() =>
-  case SomethingElseElse =>
-}
-
-class ScalaClass(i: Int = 12, b: Trait[A, Trait[B, C]]) extends B with SomeTrait[A, B[String], D] {
-  /**
-   * I forgot comments! [[scala.Option]]
-   *
-   * {{{
-   * scala> This is a REPL line
-   * scala> and this is another one
-   * }}}
-   *
-   * <li></li>
-   *
-   * @param parameter Explanation of the parameter.
-   * @return 
-   */
-  val thing = "A String" // this is a trailing comment
-  val thing = "A String with a \" in it"
-  val intString = "A string with $stuff // and a comment in it"
-  val intString = s"A string /* a comment and */ with $stuff and ${stuff} in it"
-  val intString = s"""A string /* a comment and */ with $stuff and ${stuff} in it"""
-  val intFString = f"A string with $stuff and ${stuff} and ${eval this}%-2.2f and $stuff%2d in it"
-  val intFString = f"""A string with $stuff and ${stuff} and ${eval this}%-2.2f and $stuff%2d in it"""
-  val otherThings = """|This is a string
-                       |that spans multiple lines.
-                       |""".stripMargin
-  val intString = sql"select * from T where id = $id and name = ${name}"
-  val intString = sql"""
-    select * from T
-    where id = $id and name = ${s"$name Jr"} and age > ${age + 10}
-  """
-
-  implicit val somethingImplicit = true
-
-  // Ripped off from Scalaz
-  final def foldMap[B: Monoid](f: A => B = (a: A) => A): B = F.foldMap(self)(f)
-  final def foldRight[B](z: => B)(f: (A, => B) => B): B = F.foldRight(self, z)(f)
-  final def foldLeft[B](z: B)(f: (B, A) => B): B = F.foldLeft(self, z)(f)
-  final def foldRightM[G[_], B](z: => B)(f: (A, => B) => G[B])(implicit M: Monad[G]): G[B] = F.foldRightM(self, z)(f)
-  final def foldLeftM[G[_], B](z: B)(f: (B, A) => G[B])(implicit M: Monad[G]): G[B] = F.foldLeftM(self, z)(f)
-  final def foldr[B](z: => B)(f: A => (=> B) => B): B = F.foldr(self, z)(f)
-  final def foldl[B](z: B)(f: B => A => B): B = F.foldl(self, z)(f)
-  final def foldrM[G[_], B](z: => B)(f: A => ( => B) => G[B])(implicit M: Monad[G]): G[B] = F.foldrM(self, z)(f)
-
-  val aChar = 'a'
-  val anEscapedChar = '\\'
-  val anotherEscapedChar = '\n'
-  val aUnicodeChar = '\u00ab'
-  val aSymbol = 'SomeSymbol
-  def number = 0xAf903adeL
-  def float = 1f
-  def float = 1F
-  def float = 1.1f
-  def float = 1.1F
-  def float = 231.1232f
-  def float = 231.2321F
-  def float = .2f
-  def float = .2F
-  def double = 1d
-  def double = 1D
-  def double = 1.1d
-  def double = 1.1D
-  def double = 231.1232d
-  def double = 231.2321D
-  def double = 231.2321
-  def double = .2d
-  def double = .2
-  def double = .2D
-  def exp = 1.2342e-24
-  def exp = 1e+24
-  var flarf: Int = 12
-  def flooger(x: String): Unit = println(42)
-  private val booger = "Hithere"
-  protected[this] def something[A](y: SomeTrait[A])(implicit shoot: Function[Int, String]): Long = 12
-  private final val do = done
-
-  someVar match {
-    case Flooger(thing, that, matches) =>
-      flender ! Message(hi, there, guys)
-    case '"' => Bah
-  }
-
-  try {
-    whatever
-  } catch {
-    case e: Throwable
-  } finally {
-    at the end
-  }
-
-  while (a == b) {
-  }
-
-  for (x <- somecall) {
-    dothing
-  }
-
-  for {
-    a <- futureCall1
-    b <- futureCall2
-  } yield (a, b)
-
-  protected[package] something = null
-
-  def receive = super.receive
-
-  require(something == true)
-
-  val q"This $is a $string" = something
-
-  q"""return this $thing"""
-  tq"""return this $thing"""
-  tq"return this $thing"
-  cq"""return this $thing"""
-  cq"return this $thing"
-  pq"""return this $thing"""
-  pq"return this $thing"
-
-  val something = s"""bar="foo""""
-  val something = f"""bar="foo""""
-  val something = """bar="foo""""
-
-  def someFunc[A <: B, X =:= Y]
-
-  val soManyEscapes = "\\\"\u0031\n\b\r\f\t" // and a comment
-  val soManyEscapes = """\\\"\u0031\n\b\r\f\t""" // and a comment
-  val soManyEscapes = s"\\\"\u0031\n\b\r\f\t" // and a comment
-  val soManyEscapes = f"\\\"\u0031\n\b\r\f\t" // and a comment
-  val soManyEscapes = s"""\\\"\u0031\n\b\r\f\t""" // and a comment
-  val soManyEscapes = f"""\\\"\u0031\n\b\r\f\t""" // and a comment
-  val soManyEscapes = "\\\"\u0031\n\b\r\f\t" // and a comment
-}
diff --git a/bundle/scss-syntax/Readme.md b/bundle/scss-syntax/Readme.md
deleted file mode 100755
index eb923cd..0000000
--- a/bundle/scss-syntax/Readme.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Vim Syntax File for SCSS (Sassy CSS)
-
-## Installation
-
-I recommend to use a plugin manager like [Vundle](https://github.com/gmarik/vundle) for the installation.
-
-### Vundle
-
-Open your `~/.vimrc` file and add the following line(s):
-
-```vim
-Plugin 'JulesWang/css.vim' " only necessary if your Vim version < 7.4
-Plugin 'cakebaker/scss-syntax.vim'
-```
-
-Afterwards, run `:PluginInstall` in Vim.
-
-### Manual
-
-* Download [scss.vim](https://github.com/cakebaker/scss-syntax.vim/archive/master.zip)
-* Download [css.vim](https://github.com/JulesWang/css.vim/archive/master.zip) (only necessary if your Vim version < 7.4)
-* Copy the content of the folders to the respective folders in `~/.vim/`
-
-## Configuration
-
-Usually no configuration is necessary.
-
-### CSS3
-
-For highlighting CSS elements, this plugin relies on `css.vim` that comes bundled with Vim. Unfortunately, it's support for CSS3 is only rudimentary. To avoid highlighting issues I recommend to install the [vim-css3-syntax](https://github.com/hail2u/vim-css3-syntax) plugin.
-
-### Filetype
-
-In some cases you might want to change the filetype from `scss` to `scss.css`, for example, if you want to use [SnipMate](https://github.com/garbas/vim-snipmate)'s CSS snippets within your SCSS files. In this case, add the following line to your `~/.vimrc` file:
-
-```vim
-au BufRead,BufNewFile *.scss set filetype=scss.css
-```
-
-Please be aware that this setting can cause problems with other plugins as mentioned in [#41](https://github.com/cakebaker/scss-syntax.vim/pull/41).
-
-### Function names starting with a keyword
-
-Function names starting with a keyword (e.g. `baseline-unit()`) are not highlighted correctly by default. It can be fixed by adding the following line to your `~/.vimrc` file:
-
-```vim
-autocmd FileType scss set iskeyword+=-
-```
-
-Please be aware that this setting also affects the behavior of the motion keys.
diff --git a/bundle/scss-syntax/autoload/scss_indent.vim b/bundle/scss-syntax/autoload/scss_indent.vim
deleted file mode 100755
index 2e57ab2..0000000
--- a/bundle/scss-syntax/autoload/scss_indent.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" usage:
-" set indentexpr=scss_indent#GetIndent(v:lnum)
-fun! scss_indent#GetIndent(lnum)
-  " { -> increase indent
-  " } -> decrease indent
-  if a:lnum == 1
-    " start at 0 indentation
-    return 0
-  endif
-
-  " try to find last line ending with { or }
-  " ignoring // comments
-  let regex = '\([{}]\)\%(\/\/.*\)\?$'
-  let nr = search(regex, 'bnW')
-  if nr > 0
-    let last = indent(nr)
-    let m = matchlist(getline(nr), regex)
-    let m_curr = matchlist(getline(a:lnum), regex)
-    echoe string(m).string(m_curr)
-    if !empty(m_curr) && m_curr[1] == '}' && m[1] == '{'
-      " last was open, current is close, use same indent
-      return last
-    elseif !empty(m_curr) && m_curr[1] == '}' && m[1] == '}'
-      " } line and last line was }: decrease
-      return last - &sw
-    endif
-    if m[1] == '{'
-      " line after {: increase indent
-      return last + &sw
-    else
-      " line after } or { - same indent
-      return last
-    endif
-  else
-    return 0
-  endif
-endfun
diff --git a/bundle/scss-syntax/example.scss b/bundle/scss-syntax/example.scss
deleted file mode 100755
index 6b5f9c4..0000000
--- a/bundle/scss-syntax/example.scss
+++ /dev/null
@@ -1,1064 +0,0 @@
-// Nested Rules
-
-#main p {
-  color: #00ff00;
-  width: 97%;
-
-  .redbox {
-    background-color: #ff0000;
-    color: #000000;
-  }
-}
-
-#main {
-  width: 97%;
-
-  p, div {
-    font-size: 2em;
-    a { font-weight: bold; }
-  }
-
-  pre { font-size: 3em; }
-}
-
-// Referencing Parent Selectors: &
-
-a {
-  font-weight: bold;
-  text-decoration: none;
-  &:hover { text-decoration: underline; }
-  body.firefox & { font-weight: normal; }
-}
-
-#main {
-  color: black;
-  a {
-    font-weight: bold;
-    &:hover { color: red; }
-  }
-}
-
-#main {
-  color: black;
-  &-sidebar { border: 1px solid; }
-}
-
-// Nested Properties
-
-.funky {
-  font: {
-    family: fantasy;
-    size: 30em;
-    weight: bold;
-  }
-}
-
-.funky {
-  font: 20px/24px fantasy {
-    weight: bold;
-  }
-}
-
-// Comments: /* */ and //
-
-/* This comment is
- * several lines long.
- * since it uses the CSS comment syntax,
- * it will appear in the CSS output */
-body { color: black; }
-
-// These comments are only one line long each.
-// They won't appear in the CSS output,
-// since they use the single-line comment syntax.
-a { color: green; }
-
-$version: "1.2.3";
-/* This CSS is generated by My Snazzy Framework version #{$version}. */
-
-// Variables: $
-
-$width: 5em;
-
-#main {
-  width: $width;
-}
-
-#main {
-  $width: 5em !global;
-  width: $width;
-}
-
-#sidebar {
-  width: $width;
-}
-
-// Data Types: Strings
-
-@mixin firefox-message($selector) {
-  body.firefox #{$selector}:before {
-    content: "Hi, Firefox users!";
-  }
-}
-
-@include firefox-message(".header");
-
-// Maps
-
-$map: (key1: value1, key2: value2, key3: value3);
-
-// Number Operations
-
-p {
-  font: 10px/8px;             // Plain CSS, no division
-  $width: 1000px;
-  width: $width/2;            // Uses a variable, does division
-  width: round(1.5)/2;        // Uses a function, does division
-  height: (500px/2);          // Uses parentheses, does division
-  margin-left: 5px + 8px/2px; // Uses +, does division
-}
-
-p {
-  $font-size: 12px;
-  $line-height: 30px;
-  font: #{$font-size}/#{$line-height};
-}
-
-// Color Operations
-
-p {
-  color: #010203 + #040506;
-}
-
-p {
-  color: #010203 * 2;
-}
-
-p {
-  color: rgba(255, 0, 0, 0.75) + rgba(0, 255, 0, 0.75);
-}
-
-$translucent-red: rgba(255, 0, 0, 0.5);
-p {
-  color: opacify($translucent-red, 0.3);
-  background-color: transparentize($translucent-red, 0.25);
-}
-
-// String Operations
-
-p {
-  cursor: e + -resize;
-}
-
-p:before {
-  content: "Foo " + Bar;
-  font-family: sans- + "serif";
-}
-
-p {
-  margin: 3px + 4px auto;
-}
-
-p:before {
-  content: "I ate #{5 + 10} pies!";
-}
-
-$value: null;
-p:before {
-  content: "I ate #{$value} pies!";
-}
-
-// Parentheses
-
-p {
-  width: 1em + (2em * 3);
-}
-
-// Functions
-
-p {
-  color: hsl(0, 100%, 50%);
-}
-
-// Keyword Arguments
-
-p {
-  color: hsl($hue: 0, $saturation: 100%, $lightness: 50%);
-}
-
-// Interpolation: #{}
-
-$name: foo;
-$attr: border;
-p.#{$name} {
-  #{$attr}-color: blue;
-}
-
-p {
-  $font-size: 12px;
-  $line-height: 30px;
-  font: #{$font-size}/#{$line-height};
-}
-
-// & in SassScript
-
-.foo.bar .baz.bang, .bip.qux {
-  $selector: &;
-}
-
-@mixin does-parent-exist {
-  @if & {
-    &:hover {
-      color: red;
-    }
-  } @else {
-    a {
-      color: red;
-    }
-  }
-}
-
-// Variable Defaults: !default
-
-$content: "First content";
-$content: "Second content?" !default;
-$new_content: "First time reference" !default;
-
-#main {
-  content: $content;
-  new-content: $new_content;
-}
-
-$content: null;
-$content: "Non-null content" !default;
-
-#main {
-  content: $content;
-}
-
-// @import
-
-@import "http://github.com/foo.scss";
-@import "http://github.com/foo";
-
-@import "http://github.com/foo.css";
-@import "http://github.com/foo" screen;
-@import "http://github.com/service/http://foo.com/bar";
-@import url(http://github.com/foo);
-
-@import "http://github.com/rounded-corners", "text-shadow";
-
-$family: unquote("Droid+Sans");
-@import url("http://fonts.googleapis.com/css?family=#{$family}");
-
-// Partials
-
-@import "http://github.com/colors";
-
-// Nested @import
-
-.example {
-  color: red;
-}
-
-#main {
-  @import "http://github.com/example";
-}
-
-// @media
-
-.sidebar {
-  width: 300px;
-  @media screen and (orientation: landscape) {
-    width: 500px;
-  }
-}
-
-@media screen {
-  .sidebar {
-    @media (orientation: landscape) {
-      width: 500px;
-    }
-  }
-}
-
-$media: screen;
-$feature: -webkit-min-device-pixel-ratio;
-$value: 1.5;
-
-@media #{$media} and ($feature: $value) {
-  .sidebar {
-    width: 500px;
-  }
-}
-
-// @extend
-
-.error {
-  border: 1px #f00;
-  background-color: #fdd;
-}
-.seriousError {
-  @extend .error;
-  border-width: 3px;
-}
-
-.error {
-  border: 1px #f00;
-  background-color: #fdd;
-}
-.error.intrusion {
-  background-image: url("http://github.com/image/hacked.png");
-}
-.seriousError {
-  @extend .error;
-  border-width: 3px;
-}
-
-// Extending Complex Selectors
-
-.hoverlink {
-  @extend a:hover;
-}
-a:hover {
-  text-decoration: underline;
-}
-
-.hoverlink {
-  @extend a:hover;
-}
-.comment a.user:hover {
-  font-weight: bold;
-}
-
-// Multiple Extends
-
-.error {
-  border: 1px #f00;
-  background-color: #fdd;
-}
-.attention {
-  font-size: 3em;
-  background-color: #ff0;
-}
-.seriousError {
-  @extend .error;
-  @extend .attention;
-  border-width: 3px;
-}
-
-// Chaining Extends
-
-.error {
-  border: 1px #f00;
-  background-color: #fdd;
-}
-.seriousError {
-  @extend .error;
-  border-width: 3px;
-}
-.criticalError {
-  @extend .seriousError;
-  position: fixed;
-  top: 10%;
-  bottom: 10%;
-  left: 10%;
-  right: 10%;
-}
-
-// Selector Sequences
-
-#fake-links .link {
-  @extend a;
-}
-
-a {
-  color: blue;
-  &:hover {
-    text-decoration: underline;
-  }
-}
-
-// Merging Selector Sequences
-
-#admin .tabbar a {
-  font-weight: bold;
-}
-#demo .overview .fakelink {
-  @extend a;
-}
-
-#admin .tabbar a {
-  font-weight: bold;
-}
-#admin .overview .fakelink {
-  @extend a;
-}
-
-// @extend-Only Selectors
-
-#context a%extreme {
-  color: blue;
-  font-weight: bold;
-  font-size: 2em;
-}
-
-.notice {
-  @extend %extreme;
-}
-
-// The !optional Flag
-
-a.important {
-  @extend .notice !optional;
-}
-
-// @extend in Directives
-
-@media print {
-  .error {
-    border: 1px #f00;
-    background-color: #fdd;
-  }
-  .seriousError {
-    @extend .error;
-    border-width: 3px;
-  }
-}
-
-// @at-root
-
-.parent {
-  @at-root .child {}
-}
-
-.parent {
-  @at-root {
-    .child1 {}
-    .child2 {}
-  }
-  .step-child {}
-}
-
-@media print {
-  .page {
-    width: 8in;
-    @at-root (without: media) {
-      color: red;
-    }
-  }
-}
-
-// @debug
-
-@debug 10em + 12em;
-
-// @warn
-
-@mixin adjust-location($x, $y) {
-  @if unitless($x) {
-    @warn "Assuming #{$x} to be in pixels";
-    $x: 1px * $x;
-  }
-  @if unitless($y) {
-    @warn "Assuming #{$y} to be in pixels";
-    $y: 1px * $y;
-  }
-  position: relative; left: $x; top: $y;
-}
-
-// @error
-
-@mixin adjust-location($x, $y) {
-  @if unitless($x) {
-    @error "$x may not be unitless, was #{$x}.":
-  }
-  @if unitless($y) {
-    @error "$y may not be unitless, was #{$y}.";
-  }
-  position: relative; left: $x, top: $y;
-}
-
-// @if
-
-p {
-  @if 1 + 1 == 2 { border: 1px solid;  }
-  @if 5 < 3      { border: 2px dotted; }
-  @if null       { border: 3px double; }
-}
-
-$type: monster;
-p {
-  @if $type == ocean {
-    color: blue;
-  } @else if $type == matador {
-    color: red;
-  } @else if $type == monster {
-    color: green;
-  } @else {
-    color: black;
-  }
-}
-
-// @for
-
-@for $i from 1 through 3 {
-  .item-#{$1} { width: 2em * $i; }
-}
-
-@for $i from 1 to 3 {
-  .item-#{$1} { width: 2em * $i; }
-}
-
-// @each
-
-@each $animal in puma, sea-slug, egret, salamander {
-  .#{$animal}-icon {
-    background-image: url('http://github.com/images/#{$animal}.png');
-  }
-}
-
-@each $animal, $color, $cursor in (puma, black, default),
-                                  (sea-slug, blue, pointer),
-                                  (egret, white, move) {
-  .#{$animal}-icon {
-    background-image: url('http://github.com/images/#{$animal}.png');
-    border: 2px solid $color;
-    cursor: $cursor;
-  }
-}
-
-@each $header, $size in (h1: 2em, h2: 1.5em, h3: 1.2em) {
-  #{$header} {
-    font-size: $size;
-  }
-}
-
-// @while
-
-$i: 6;
-@while $1 > 0 {
-  .item-#{$i} { width: 2em * $i; }
-  $i: $1 - 2;
-}
-
-// Defining a Mixin: @mixin
-
-@mixin large-text {
-  font: {
-    family: Arial;
-    size: 20px;
-    weight: bold;
-  }
-  color: #ff0000;
-}
-
-@mixin clearfix {
-  display: inline-block;
-  &:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-  }
-  * html & { height: 1px }
-}
-
-// Including a Mixin: @include
-
-.page-title {
-  @include large-text;
-  padding: 4px;
-  margin-top: 10px;
-}
-
-@mixin silly-links {
-  a {
-    color: blue;
-    background-color: red;
-  }
-}
-
-@include silly-links;
-
-@mixin compound {
-  @include highlighted-background;
-  @include header-text;
-}
-
-@mixin highlighted-background { background-color: #fc0; }
-@mixin header-text { font-size: 20px; }
-
-// Arguments
-
-@mixin sexy-border($color, $width) {
-  border: {
-    color: $color;
-    width: $width;
-    style: dashed;
-  }
-}
-
-p { @include sexy-border(blue, 1in); }
-
-@mixin sexy-border($color, $width: 1in) {
-  border: {
-    color: $color;
-    width: $width;
-    style: dashed;
-  }
-}
-p { @include sexy-border(blue); }
-h1 { @include sexy-border(blue, 2in); }
-
-// Keyword Arguments
-
-p { @include sexy-border($color: blue); }
-h1 { @include sexy-border($color: blue, $width: 2in); }
-
-// Variable Arguments
-
-@mixin box-shadows($shadows...) {
-  -moz-box-shadow: $shadows;
-  -webkit-box-shadow: $shadows;
-  box-shadow: $shadows;
-}
-
-.shadows {
-  @include box-shadow(0px 4px 5px #666, 2px 6px 10px #999);
-}
-
-@mixin colors($text, $background, $border) {
-  color: $text;
-  background-color: $background;
-  border-color: $border;
-}
-
-$values: #ff0000, #00ff00, #0000ff;
-.primary {
-  @include colors($values...);
-}
-
-$value-map: (text: #00ff00, background: #0000ff, border: #ff0000);
-.secondary {
-  @include colors($value-map...);
-}
-
-@mixin wrapped-stylish-mixin($args...) {
-  font-weight: bold;
-  @include stylish-mixin($args...);
-}
-
-.stylish {
-  // The $width argument will get passed on to "stylish-mixin" as a keyword
-  @include wrapped-stylish-mixin(#00ff00, $width: 100px);
-}
-
-// Passing Content Blocks to a Mixin
-
-@mixin apply-to-ie6-only {
-  * html {
-    @content;
-  }
-}
-@include apply-to-ie6-only {
-  #logo {
-    background-image: url(http://github.com/logo.gif);
-  }
-}
-
-// Variable Scope and Content Blocks
-
-$color: white;
-@mixin colors($color: blue) {
-  background-color: $color;
-  @content;
-  border-color: $color;
-}
-.colors {
-  @include colors { color: $color; }
-}
-
-#sidebar {
-  $sidebar-width: 300px;
-  width: $sidebar-width;
-  @include smartphone {
-    width: $sidebar-width / 3;
-  }
-}
-
-// Function Directives
-
-$grid-width: 40px;
-$gutter-width: 10px;
-
-@function grid-width($n) {
-  @return $n * $grid-width + ($n - 1) * $gutter-width;
-}
-
-#sidebar { width: grid-width(5); }
-#sidebar { width: grid-width($n: 5); }
-
-// Styles which were not highlighted correctly in the past
-
-// TODO: todo should be highlighted, ticket #21
-/* TODO: same here */
-
-@import url(http://fonts.googleapis.com/css?family=Vollkorn);  // the // in the url shouldn't be highlighted as comment, ticket #24
-
-.foo {
-  color: green; // issue #3: a comment ending with {}
-}
-
-// Attribute selectors should get highlighted for parent references.
-input {
-    &[type="text"] { } // <-- This should look the same as...
-}
-input[type="text"] { } // <-- this.
-
-$a: $b + $c; // issue #4: variables should be displayed with the same color
-
-@include text-shadow; // issue #23, @include content block
-
-@include breakpoint( $bp-default ) {
-  display: inline-block;
-}
-
-.app-header { // issue #31, functions with hyphens not properly highlighted
-  @include linear-gradient(gray-with-lightness(0.94), #FFF 90%);
-  border-bottom: 1px solid gray-with-lightness(0.95);
-}
-
-.breadcrumb:before { // issue #20, string escaping rendering incorrectly for "\\"
-  content: "\\";
-}
-
-@import "http://github.com/icons/*.png"; // issue #14, don't treat "/*" as the start of a comment
-
-.foo { // issue #5, lines without {} colored incorrectly
-  label.due input[type=text]
-  {
-    padding-right: 25px;
-  }
-}
-
-.funky { // comments after nested properties should be recognized
-  font: {
-    family: fantasy; // a comment
-    size: 30em;      /* another comment */
-    weight: bold;
-  }
-}
-
-.container { // issue #33, multiline comments are not recognized as comments
-  /*height: auto !important;
-  min-height: 100%;*/
-  background: #fff;
-}
-
-.button { // issue #34, functions as params should be recognized as functions
-  background-image: -webkit-linear-gradient(top, bottom, from(#933), to(#944));
-}
-
-.class { // issue #35 a) media block is not recognized
-  @media screen and (min-width: em(480)) {
-    a {
-      @extend .clearfix;
-    }
-  }
-}
-
-.class { // issue #35 b) @extend & @include are not recognized inside media block
-  @media screen and (min-width: em(480)) {
-    @extend .clearfix;
-    @include header-text;
-  }
-}
-
-@media screen and (min-width: em(480)) {
-  // issue #35 c) comment inside media block is not recognized
-  a {
-    @extend .clearfix;
-  }
-}
-
-.foo { // issue #35 d) the two &:nth-child are not highlighted in the same way
-  &:nth-child(3n) {
-    @include bar(#000);
-  }
-  @media screen and (max-width: em(1024)) {
-    &:nth-child(2n) {
-      @include foobar;
-    }
-  }
-}
-
-.gradient { // issue #36, params are not consistently highlighted
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#999999));
-  background-image:  -webkit-gradien(linear, left top, right bottom);
-  background-image:              foo(linear, top left, bottom right);
-  fake-attribute:                foo(linear, left top, right bottom);
-  @include                       foo(linear, left top, left bottom, from(#444444), to(#999999));
-  border:           -webkit-gradient(linear, left top, left bottom, from(#444444), to(#999999));
-
-  background-image: -webkit-linear-gradient(top, #444444, #999999);
-}
-
-.button { // issue #37, only "border" is highlighted in Vim 7.3
-  border-radius: 5px;
-}
-
-.ding { // issue #40, properties without space after them are not highlighted
-  font-size:12px;
-  color:red;
-}
-
-// issue #43
-.rich {
-  .figure[style*="float: left"] {} // <-- this should look the same as...
-  .figure[style*="float:left"] {}  // <-- this
-}
-
-@font-face {  // issue #47 a) syntax within font-face block is not highlighted (plus this comment is not recognized as comment)
-  $a: ('a', 'b');
-
-  @each $b in $a {
-  }
-
-  @debug 10em + 12em;
-  @warn "Warning";
-  @error "Error";
-}
-
-@mixin generate-fontfaces($ffs-info) {  // issue #47 b) "@font-face" is not highlighted
-  @font-face {
-    $a: ('a', 'b');
-
-    @each $b in $a {
-    }
-  }
-}
-
-@function grid-width($n) {  // issue #48: various elements are not highlighted inside @function (plus this comment is not recognized as comment)
-  @debug 10em + 12em;
-  @warn "Warning";
-  @error "Error";
-
-  @if unitless($n) {
-  }
-
-  $a: ('a', 'b');
-
-  @each $b in $a {
-  }
-
-  @for $i from 1 through 3 {
-  }
-
-  @while $n > 0 {
-  }
-}
-
-@function grid-width($n) {  // issue #49: @return and @debug are not highlighted if nested
-  @if unitless($n) {
-    @debug $n;
-    @return $n;
-  }
-  @debug $n;
-  @return $n;
-}
-
-// issue #50 a): not all null values are recognized
-@mixin setup-animation($name: null, $count: null, $duration: null, $delay: null,
-                       $function: null,
-                       $direction: null, $fill: null, $visibility: null) {
-}
-
-// issue #50 b): null is not recognized as function parameter
-@include setup-animation($name:   animation-value($part, "name"),
-                         $count:  animation-value($part, "count", null));
-
-// issue #50 c): function is not highlighted if nested
-@function animation-value($n) {
-  @if $n {
-    @return safe-map-get($n);
-  }
-  @return safe-map-get($n);
-}
-
-// issue #52: ")" inside a string param is mistaken as the end of the function
-@mixin filter($filter-type, $filter-amount) {
-  -webkit-filter: $filter-type+unquote('(#{$filter-amount})');
-  -moz-filter: $filter-type+unquote('(#{$filter-amount})');
-  -ms-filter: $filter-type+unquote('(#{$filter-amount})');
-  -o-filter: $filter-type+unquote('(#{$filter-amount})');
-  filter: $filter-type+unquote('(#{$filter-amount})');
-}
-
-$x: fnA(fnB("b"), "a");
-$x: fnA(fnB('b'), 'a');
-
-// issue #53 a) function is not recognized when params are on multiple lines
-$keyframe-info: map-merge($keyframe-info, (
-  'offset-x': $x,
-  'offset-y': $y,
-));
-
-$keyframe-info: map-merge($keyframe-info, ('offset-x': $x, 'offset-y': $y));
-
-// issue #53 b) multiline map is not recognized
-$m: (
-  'offset-x': $x,
-  'offset-y': $y,
-);
-
-// issue #53 c) boolean values are not recognized
-$a: true;
-$b: false;
-$c: (key1: true, key2: false, key3: null);
-
-// issue #53 d) classes inside pseudo-selectors are not recognized
-html {
-  &:not(.animate-once) {
-  }
-}
-
-// issue #54 a) the highlighting of both ">" should be identical
-html > body.contacts {
-  .content > .panel-wrp {
-  }
-}
-
-// issue #54 b) multiline selector is not recognized if there is a string interpolation
-@mixin apply-page-contacts($ns, $colors) {
-  html##{$ns} > body.contacts
-  > .parts {
-  }
-}
-
-// issue #56: variable inside media block is not highlighted correctly
-@media #{small-only()} {
-  $padding-horiz: 0.4rem;
-}
-
-// issue #57 a) comments inside multi-line map are not recognized
-$breakpoints: (
-  wp-adminbar-mobile: 783px,  // comment not highlighted
-  desktop: 60em,              /* comment not highlighted */
-);
-
-// issue #57 b) comments inside multi-line list are not recognized
-$list: "1",  /* comment not highlighted */
-"2",         // comment not highlighted
-"3";
-
-// issue #59: list is mistaken as a map and the string value is not recognized as a string
-$a: (
-  "string"
-);
-
-// issue #60 a) first comment is not recognized
-@mixin _setup-panel-title( // comment
-  $colors
-) {} // comment
-
-// issue #60 b) indented comment containing a "{" is not recognized
-@mixin m() {
-// { comment
-  // { another comment
-  // yet another comment
-}
-
-// function is not recognized in map
-$m: (key: fn());
-
-// map is not recognized as param
-$m: fn((key: value));
-
-// string with spaces is not recognized as map value
-$m: (key: "string");
-$m: (key: "string with spaces");
-
-// boolean operators are not recognized
-@if $a and $b {}
-@if $a or $b {}
-@if not $a {}
-
-@function fn($a, $b, $c, $d) {
-  @return $a or $b and $c and not $d;
-}
-
-// interpolation is not recognized
-$a: oo;
-$b: fn(f#{$a});
-
-// comment is not recognized
-a {
-  /* a comment */
-}
-
-// multiple extends are not recognized
-.class {
-    @extend .classA, .classB, .classC;
-}
-
-// function with underscores is not recognized
-$a: fn_with_underscores();
-
-// interpolation is not recognized inside function
-@function stringConcatCompassStyle($start,$last) {
-    @return #{$start}-#{$last};
-}
-
-@function stringConcatCompassStyle($start,$last)
-{
-    @return #{$start}-#{$last};
-}
-
-@function fn($x) {
-    @if $x {
-        // string is not recognized
-        @return "string";
-    }
-
-    @return "string";
-}
-
-// null and boolean values are not recognized as parameters
-.foo {
-    @include myMixin(20, null, true, false);
-}
-
-// interpolation is not recognized in pseudo-selector
-$scope: 2;
-div.element:nth-child(#{$scope}n) {}
-
-// URL is not recognized
-.foo {
-  @include wallpaper(url(http://github.com/images/logo.png));
-}
-
-// the exclamation mark of sticky comments should be highlighted
-/*! sticky comment */
-/* ! not a sticky comment */
-
-// params are not recognized if there is whitespace between function name and params
-@function test ($a, $b: $a/2) {
-    @return $b;
-}
-
-// attributes not terminated by a semicolon should be recognized
-a { color: red }
-a { color: red;}
-
-div {
-  height: 10px;
-}
-
-div {
-  a: 10px;
-}
-
-div {
-  foo: 10px;
-}
diff --git a/bundle/scss-syntax/ftdetect/scss.vim b/bundle/scss-syntax/ftdetect/scss.vim
deleted file mode 100755
index dfe8845..0000000
--- a/bundle/scss-syntax/ftdetect/scss.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-au BufRead,BufNewFile *.scss set filetype=scss
-au BufEnter *.scss :syntax sync fromstart
diff --git a/bundle/scss-syntax/ftplugin/scss.vim b/bundle/scss-syntax/ftplugin/scss.vim
deleted file mode 100755
index 915376f..0000000
--- a/bundle/scss-syntax/ftplugin/scss.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-if exists('b:did_indent') && b:did_indent
-  " be kind. allow users to override this. Does it work?
-  finish
-endif
-
-setlocal indentexpr=scss_indent#GetIndent(v:lnum)
-
-" Automatically insert the current comment leader after hitting <Enter>
-" in Insert mode respectively after hitting 'o' or 'O' in Normal mode
-setlocal formatoptions+=ro
-
-" SCSS comments are either /* */ or //
-setlocal comments=s1:/*,mb:*,ex:*/,://
diff --git a/bundle/scss-syntax/plugin-info.txt b/bundle/scss-syntax/plugin-info.txt
deleted file mode 100755
index 4162181..0000000
--- a/bundle/scss-syntax/plugin-info.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name" : "scss-syntax.vim",
-  "version" : "dev",
-  "author" : "Daniel Hofstetter <daniel.hofstetter@42dh.com>",
-  "repository" : {"type": "git", "url": "git://github.com/cakebaker/scss-syntax.vim.git"},
-  "dependencies" : {},
-  "description" : "Vim syntax file for scss (Sassy CSS)"
-}
diff --git a/bundle/scss-syntax/syntax/scss.vim b/bundle/scss-syntax/syntax/scss.vim
deleted file mode 100755
index 6e3c061..0000000
--- a/bundle/scss-syntax/syntax/scss.vim
+++ /dev/null
@@ -1,221 +0,0 @@
-" Vim syntax file
-" Language:    SCSS (Sassy CSS)
-" Author:      Daniel Hofstetter (daniel.hofstetter@42dh.com)
-" URL:         https://github.com/cakebaker/scss-syntax.vim
-" Last Change: 2015-04-22
-" Inspired by the syntax files for sass and css. Thanks to the authors of
-" those files!
-
-if !exists("main_syntax")
-  if exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = 'scss'
-endif
-
-runtime! syntax/css.vim
-runtime! syntax/css/*.vim
-
-syn case ignore
-
-" XXX fix for #20, can be removed once the patch is in vim's css.vim
-syn match cssSpecialCharQQ +\\\\\|\\"+ contained
-syn match cssSpecialCharQ +\\\\\|\\'+ contained
-
-" XXX fix for #37
-if v:version < 704
-  " replace the definition of cssBoxProp with the one from Vim 7.4 to prevent
-  " highlighting issues
-  syn clear cssBoxProp
-  syn match cssBoxProp contained "\<padding\(-\(top\|right\|bottom\|left\)\)\=\>"
-  syn match cssBoxProp contained "\<margin\(-\(top\|right\|bottom\|left\)\)\=\>"
-  syn match cssBoxProp contained "\<overflow\(-\(x\|y\|style\)\)\=\>"
-  syn match cssBoxProp contained "\<rotation\(-point\)\=\>"
-endif
-
-" override @font-face blocks to allow scss elements inside
-syn region cssFontDescriptorBlock contained transparent matchgroup=cssBraces start="{" end="}" contains=cssError,cssUnicodeEscape,cssFontProp,cssFontAttr,cssCommonAttr,cssStringQ,cssStringQQ,cssFontDescriptorProp,cssValue.*,cssFontDescriptorFunction,cssUnicodeRange,cssFontDescriptorAttr,@comment,scssDefinition,scssFunction,scssVariable,@scssControl,scssDebug,scssError,scssWarn
-
-syn region scssDefinition matchgroup=cssBraces start='{' end='}' contains=cssString.*,cssInclude,cssFontDescriptor,scssAtRootStatement,@comment,scssDefinition,scssProperty,scssSelector,scssVariable,scssImport,scssExtend,scssInclude,scssInterpolation,scssFunction,@scssControl,scssWarn,scssError,scssDebug,scssReturn containedin=cssMediaBlock fold
-
-syn match scssSelector _^\zs\([^:@]\|:[^ ]\|['"].*['"]\)\+{\@=_ contained contains=@scssSelectors
-syn match scssSelector "^\s*\zs\([^:@{]\|:[^ ]\|['"].*['"]\)\+\_$" contained contains=@scssSelectors
-" fix for #54 to recognize a multiline selector containing a string interpolation
-syn match scssSelector "^\zs\([^:@]\|:[^ ]\)\+#{.*}[^;{]\+\_$" contained contains=@scssSelectors
-syn cluster scssSelectors contains=@comment,cssSelectorOp,cssTagName,cssPseudoClass,cssAttributeSelector,scssSelectorChar,scssAmpersand,scssInterpolation
-
-syn match scssProperty "\([[:alnum:]-]\)\+\s*\(:\)\@=" contained contains=css.*Prop,cssVendor containedin=cssMediaBlock nextgroup=scssAttribute,scssAttributeWithNestedDefinition
-syn match scssAttribute ":[^;]*\ze\(;\|}\)" contained contains=css.*Attr,cssValue.*,cssColor,cssFunction,cssString.*,cssURL,scssFunction,scssInterpolation,scssVariable
-
-syn match scssAttributeWithNestedDefinition ": [^#]*{\@=" nextgroup=scssNestedDefinition contained contains=css.*Attr,cssValue.*,scssVariable
-syn region scssNestedDefinition matchgroup=cssBraces start="{" end="}" contained contains=@comment,scssProperty,scssNestedProperty
-
-" CSS properties from https://developer.mozilla.org/en-US/docs/Web/CSS/Reference
-" align
-syn keyword scssNestedProperty contained content items self nextgroup=scssAttribute
-" animation
-syn keyword scssNestedProperty contained delay direction duration fill-mode iteration-count name play-state timing-function nextgroup=scssAttribute
-" background
-syn keyword scssNestedProperty contained attachment clip color image origin position repeat size nextgroup=scssAttribute
-" border
-syn keyword scssNestedProperty contained bottom bottom-color bottom-left-radius bottom-right-radius bottom-style bottom-width nextgroup=scssAttribute
-syn keyword scssNestedProperty contained collapse color nextgroup=scssAttribute
-syn keyword scssNestedProperty contained image image-outset image-repeat image-slice image-source image-width nextgroup=scssAttribute
-syn keyword scssNestedProperty contained left left-color left-style left-width nextgroup=scssAttribute
-syn keyword scssNestedProperty contained radius nextgroup=scssAttribute
-syn keyword scssNestedProperty contained right right-color right-style right-width nextgroup=scssAttribute
-syn keyword scssNestedProperty contained spacing style nextgroup=scssAttribute
-syn keyword scssNestedProperty contained top top-color top-left-radius top-right-radius top-style top-width nextgroup=scssAttribute
-syn keyword scssNestedProperty contained width nextgroup=scssAttribute
-" box
-syn keyword scssNestedProperty contained decoration-break shadow sizing nextgroup=scssAttribute
-" break
-syn keyword scssNestedProperty contained after before inside nextgroup=scssAttribute
-" column
-syn keyword scssNestedProperty contained count fill gap rule rule-color rule-style rule-width span width nextgroup=scssAttribute
-" counter
-syn keyword scssNestedProperty contained increment reset nextgroup=scssAttribute
-" flex
-syn keyword scssNestedProperty contained basis direction flow grow shrink wrap nextgroup=scssAttribute
-" font
-syn keyword scssNestedProperty contained family feature-settings kerning language-override size size-adjust stretch style synthesis nextgroup=scssAttribute
-syn keyword scssNestedProperty contained variant variant-alternates variant-caps variant-east-asian variant-ligatures variant-numeric variant-position nextgroup=scssAttribute
-syn keyword scssNestedProperty contained weight nextgroup=scssAttribute
-" image
-syn keyword scssNestedProperty contained rendering resolution orientation nextgroup=scssAttribute
-" list
-syn keyword scssNestedProperty contained style style-image style-position style-type nextgroup=scssAttribute
-" margin/padding
-syn keyword scssNestedProperty contained bottom left right top nextgroup=scssAttribute
-" max/min
-syn keyword scssNestedProperty contained height width nextgroup=scssAttribute
-" nav
-syn keyword scssNestedProperty contained down index left right up nextgroup=scssAttribute
-" object
-syn keyword scssNestedProperty contained fit position nextgroup=scssAttribute
-" outline
-syn keyword scssNestedProperty contained color offset style width nextgroup=scssAttribute
-" overflow
-syn keyword scssNestedProperty contained wrap x y nextgroup=scssAttribute
-" page
-syn keyword scssNestedProperty contained break-after break-before break-inside nextgroup=scssAttribute
-" text
-syn keyword scssNestedProperty contained align align-last combine-horizontal nextgroup=scssAttribute
-syn keyword scssNestedProperty contained decoration decoration-color decoration-line decoration-style nextgroup=scssAttribute
-syn keyword scssNestedProperty contained indent orientation overflow rendering shadow transform underline-position nextgroup=scssAttribute
-" transform
-syn keyword scssNestedProperty contained origin style nextgroup=scssAttribute
-" transition
-syn keyword scssNestedProperty contained delay duration property timing-function nextgroup=scssAttribute
-" unicode
-syn keyword scssNestedProperty contained bidi range nextgroup=scssAttribute
-" word
-syn keyword scssNestedProperty contained break spacing wrap nextgroup=scssAttribute
-
-syn region scssInterpolation matchgroup=scssInterpolationDelimiter start="#{" end="}" contains=cssValue.*,cssColor,cssString.*,scssFunction,scssVariable containedin=cssComment,cssInclude,cssPseudoClassFn,cssPseudoClassLang,cssString.*,cssURL,scssFunction
-
-" ignores the url() function so it can be handled by css.vim
-syn region scssFunction contained matchgroup=scssFunctionName start="\<\(url(http://github.com/)\@!\([[:alnum:]-_]\)\+\s*(" skip=+([^)]*)+ end=")" keepend extend containedin=cssInclude,cssMediaType
-syn match scssParameterList ".*" contained containedin=cssFunction,scssFunction contains=css.*Attr,cssColor,cssString.*,cssValue.*,scssBoolean,scssFunction,scssInterpolation,scssMap,scssNull,scssVariable
-
-syn match scssVariable "$[[:alnum:]_-]\+" containedin=cssFunction,scssFunction,cssInclude,cssMediaBlock,cssMediaType nextgroup=scssVariableAssignment skipwhite
-syn match scssVariableAssignment ":" contained nextgroup=scssVariableValue skipwhite
-syn region scssVariableValue start="" end="\ze[;)]" contained contains=css.*Attr,cssValue.*,cssColor,cssFunction,cssString.*,cssURL,scssBoolean,scssDefault,scssFunction,scssInterpolation,scssNull,scssVariable,scssMap,scssGlobal,scssAmpersand,@comment
-syn match scssGlobal "!global" contained
-
-syn keyword scssNull null contained
-syn keyword scssBoolean true false contained
-syn keyword scssBooleanOp and or not contained
-
-syn match scssMixin "^@mixin" nextgroup=scssMixinName skipwhite
-syn match scssMixinName "[[:alnum:]_-]\+" contained nextgroup=scssDefinition,scssMixinParams
-syn region scssMixinParams contained contains=css.*Attr,cssColor,cssValue.*,cssString.*,cssUrl,@comment,scssBoolean,scssNull,scssVariable,scssFunction start="(" end=")" extend
-syn match scssInclude "@include" nextgroup=scssMixinName skipwhite containedin=cssMediaBlock
-syn match scssContent "@content" contained containedin=scssDefinition
-
-syn match scssFunctionDefinition "^@function" nextgroup=scssFunctionNameWithWhitespace skipwhite
-syn match scssFunctionNameWithWhitespace "[[:alnum:]_-]\+\s*" contained contains=scssFunctionName nextgroup=scssFunctionParams
-syn match scssFunctionName "[[:alnum:]_-]\+" contained
-syn region scssFunctionParams contained start="(" end=")" nextgroup=scssFunctionBody contains=scssVariable skipwhite
-syn region scssFunctionBody contained matchgroup=cssBraces start="{" end="}" contains=cssString.*,cssValue.*,@scssControl,scssBooleanOp,scssComment,scssVariable,scssReturn,scssFunction,scssDebug,scssError,scssWarn,scssDefinition,scssInterpolation fold
-syn match scssReturn "@return" contained
-syn match scssExtend "@extend" nextgroup=scssExtendedSelector skipwhite containedin=cssMediaBlock
-syn match scssExtendedSelector "[^;]\+" contained contains=cssTagName,cssPseudoClass,scssOptional,scssSelectorChar skipwhite
-syn match scssOptional "!optional" contained
-syn match scssImport "@import" nextgroup=scssImportList
-syn match scssImportList "[^;]\+" contained contains=cssString.*,cssMediaType,cssURL
-
-syn match scssSelectorChar "\(#\|\.\|%\)\([[:alnum:]_-]\|#{.*}\)\@=" nextgroup=scssSelectorName containedin=cssMediaBlock,cssPseudoClassFn
-syn match scssSelectorName "\([[:alnum:]_-]\|#{[^}]*}\)\+" contained contains=scssInterpolation
-
-syn match scssAmpersand "&" nextgroup=cssPseudoClass,scssSelectorName containedin=cssMediaBlock
-
-syn match scssDebug "@debug" nextgroup=scssOutput
-syn match scssWarn "@warn" nextgroup=scssOutput
-syn match scssError "@error" nextgroup=scssOutput
-syn match scssOutput "[^;]\+" contained contains=cssValue.*,cssString.*,scssFunction,scssVariable
-syn match scssDefault "!default" contained
-
-syn match scssIf "@\=if" nextgroup=scssCondition
-syn match scssCondition "[^{]\+" contained contains=cssValue.*,cssString.*,scssBoolean,scssBooleanOp,scssFunction,scssNull,scssVariable,scssAmpersand
-syn match scssElse "@else" nextgroup=scssIf
-syn match scssElse "@else\(\s*\({\|$\)\)\@="
-syn match scssWhile "@while" nextgroup=scssCondition
-syn match scssFor "@for\s\+.*from\s\+.*\(to\|through\)\s\+[^{ ]\+" contains=cssValueNumber,scssFunction,scssVariable,scssForKeyword
-syn match scssForKeyword "@for\|from\|to\|through" contained
-syn region scssEach matchgroup=scssEachKeyword start="@each" end="in" contains=scssVariable nextgroup=scssCollection
-syn region scssCollection start=" " end="\ze{" contained contains=scssFunction,scssMap,scssVariable
-syn cluster scssControl contains=scssIf,scssElse,scssWhile,scssFor,scssEach
-
-syn region scssMap matchgroup=scssMapParens start="[^:alpha:]\=\zs(\ze\(\s*\n.*:\|.\+:\)" end=")" contains=@comment,scssMapKey extend
-syn match scssMapKey "[^: ]\+\ze[:]" contained contains=css.*Attr,cssString.*,scssVariable nextgroup=scssMapValue
-syn match scssMapValue "[^,)]\+\ze[,)]" contained contains=cssColor,css.*Prop,cssString.*,cssValueLength,scssBoolean,scssFunction,scssNull,scssVariable
-
-syn region scssAtRootStatement start="@at-root" end="\ze{" contains=@scssSelectors,scssAtRoot
-syn match scssAtRoot "@at-root" contained
-syn match scssAtRoot "(\zswith\(out\)\=\ze:" contained
-
-syn match scssComment "//.*$" contains=@Spell containedin=cssMediaBlock
-syn cluster comment contains=cssComment,scssComment
-syn match scssStickyCommentChar "^\/\*\zs!" contained containedin=cssComment
-syn keyword scssTodo TODO FIXME NOTE OPTIMIZE XXX contained containedin=@comment
-
-hi def link scssNestedProperty cssProp
-hi def link scssVariable  Identifier
-hi def link scssGlobal    Special
-hi def link scssNull      Constant
-hi def link scssBoolean   Constant
-hi def link scssBooleanOp Operator
-hi def link scssMixin     PreProc
-hi def link scssMixinName Function
-hi def link scssContent   PreProc
-hi def link scssFunctionDefinition  PreProc
-hi def link scssFunctionName Function
-hi def link scssReturn    Statement
-hi def link scssInclude   PreProc
-hi def link scssExtend    PreProc
-hi def link scssOptional  Special
-hi def link scssComment   Comment
-hi def link scssStickyCommentChar Special
-hi def link scssSelectorChar Special
-hi def link scssSelectorName Identifier
-hi def link scssAmpersand Character
-hi def link scssDebug     Debug
-hi def link scssWarn      Debug
-hi def link scssError     Debug
-hi def link scssDefault   Special
-hi def link scssIf        Conditional
-hi def link scssElse      Conditional
-hi def link scssWhile     Repeat
-hi def link scssForKeyword  Repeat
-hi def link scssEachKeyword Repeat
-hi def link scssInterpolationDelimiter Delimiter
-hi def link scssImport    Include
-hi def link scssTodo      Todo
-hi def link scssAtRoot    Keyword
-hi def link scssMapParens Delimiter
-
-let b:current_syntax = "scss"
-if main_syntax == 'scss'
-  unlet main_syntax
-endif
diff --git a/bundle/sleuth/.gitignore b/bundle/sleuth/.gitignore
deleted file mode 100644
index 0a56e3f..0000000
--- a/bundle/sleuth/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/doc/tags
diff --git a/bundle/sleuth/README.markdown b/bundle/sleuth/README.markdown
deleted file mode 100644
index b341f7e..0000000
--- a/bundle/sleuth/README.markdown
+++ /dev/null
@@ -1,53 +0,0 @@
-# sleuth.vim
-
-This plugin automatically adjusts `'shiftwidth'` and `'expandtab'`
-heuristically based on the current file, or, in the case the current file is
-new, blank, or otherwise insufficient, by looking at other files of the same
-type in the current and parent directories.  In lieu of adjusting
-`'softtabstop'`, `'smarttab'` is enabled.
-
-Compare to [DetectIndent][].  I wrote this because I wanted something fully
-automatic.  My goal is that by installing this plugin, you can remove all
-indenting related configuration from your vimrc.
-
-[DetectIndent]: http://www.vim.org/scripts/script.php?script_id=1171
-
-## Installation
-
-If you don't have a preferred installation method, I recommend
-installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
-then simply copy and paste:
-
-    cd ~/.vim/bundle
-    git clone git://github.com/tpope/vim-sleuth.git
-
-## Notes
-
-* Searching for other files of the same type continues up the directory
-  hierarchy until a match is found. This means, for example, the indent for
-  the first file in a brand new Ruby project might very well be derived from
-  your `.irbrc`.  I consider this a feature.
-* If your file is consistently indented hard tabs, `'shiftwidth'` will be set
-  to your `'tabstop'`  Otherwise, a `'tabstop'` of 8 is enforced.
-* The algorithm is rolled from scratch, fairly simplistic, and only lightly
-  battle tested.  It's probably not (yet) as good as [DetectIndent][].
-  Let me know what it fails on for you.
-
-## Contributing
-
-See the contribution guidelines for
-[pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
-
-## Self-Promotion
-
-Like sleuth.vim?  Follow the repository on
-[GitHub](https://github.com/tpope/vim-sleuth) and vote for it on
-[vim.org](http://www.vim.org/scripts/script.php?script_id=4375).  And if
-you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
-[Twitter](http://twitter.com/tpope) and
-[GitHub](https://github.com/tpope).
-
-## License
-
-Copyright © Tim Pope.  Distributed under the same terms as Vim itself.
-See `:help license`.
diff --git a/bundle/sleuth/doc/sleuth.txt b/bundle/sleuth/doc/sleuth.txt
deleted file mode 100644
index d79a7fe..0000000
--- a/bundle/sleuth/doc/sleuth.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-*sleuth.txt*  Heuristically set buffer options
-
-Author:  Tim Pope <http://tpo.pe/>
-Repo:    https://github.com/tpope/vim-sleuth
-License: Same terms as Vim itself (see |license|)
-
-This plugin is only available if 'compatible' is not set.
-
-SUMMARY                                         *sleuth*
-
-This plugin automatically adjusts 'shiftwidth' and 'expandtab' heuristically
-based on the current file, or, in the case the current file is new, blank, or
-otherwise insufficient, by looking at other files of the same type in the
-current and parent directories.  In lieu of adjusting 'softtabstop',
-'smarttab' is enabled.
-
- vim:tw=78:et:ft=help:norl:
diff --git a/bundle/sleuth/plugin/sleuth.vim b/bundle/sleuth/plugin/sleuth.vim
deleted file mode 100644
index d08e7f0..0000000
--- a/bundle/sleuth/plugin/sleuth.vim
+++ /dev/null
@@ -1,146 +0,0 @@
-" sleuth.vim - Heuristically set buffer options
-" Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      1.1
-" GetLatestVimScripts: 4375 1 :AutoInstall: sleuth.vim
-
-if exists("g:loaded_sleuth") || v:version < 700 || &cp
-  finish
-endif
-let g:loaded_sleuth = 1
-
-function! s:guess(lines) abort
-  let options = {}
-  let heuristics = {'spaces': 0, 'hard': 0, 'soft': 0}
-  let ccomment = 0
-  let podcomment = 0
-
-  for line in a:lines
-
-    if line =~# '^\s*$'
-      continue
-    endif
-
-    if line =~# '^\s*/\*'
-      let ccomment = 1
-    endif
-    if ccomment
-      if line =~# '\*/'
-        let ccomment = 0
-      endif
-      continue
-    endif
-
-    if line =~# '^=\w'
-      let podcomment = 1
-    endif
-    if podcomment
-      if line =~# '^=\%(end\|cut\)\>'
-        let podcomment = 0
-      endif
-      continue
-    endif
-
-    let softtab = repeat(' ', 4)
-    if line =~# '^\t'
-      let heuristics.hard += 1
-    elseif line =~# '^' . softtab
-      let heuristics.soft += 1
-    endif
-    if line =~# '^  '
-      let heuristics.spaces += 1
-    endif
-    let indent = len(matchstr(substitute(line, '\t', softtab, 'g'), '^ *'))
-    if indent > 1 && get(options, 'shiftwidth', 99) > indent
-      let options.shiftwidth = indent
-    endif
-
-  endfor
-
-  if heuristics.hard && !heuristics.spaces
-    return {'expandtab': 0, 'shiftwidth': &tabstop}
-  elseif heuristics.soft != heuristics.hard
-    let options.expandtab = heuristics.soft > heuristics.hard
-    if heuristics.hard
-      let options.tabstop = 4
-    endif
-  endif
-
-  return options
-endfunction
-
-function! s:patterns_for(type) abort
-  if a:type ==# ''
-    return []
-  endif
-  if !exists('s:patterns')
-    redir => capture
-    silent autocmd BufRead
-    redir END
-    let patterns = {
-          \ 'c': ['*.c'],
-          \ 'html': ['*.html'],
-          \ 'sh': ['*.sh'],
-          \ }
-    let setfpattern = '\s\+\%(setf\%[iletype]\s\+\|set\%[local]\s\+\%(ft\|filetype\)=\|call SetFileTypeSH(["'']\%(ba\|k\)\=\%(sh\)\@=\)'
-    for line in split(capture, "\n")
-      let match = matchlist(line, '^\s*\(\S\+\)\='.setfpattern.'\(\w\+\)')
-      if !empty(match)
-        call extend(patterns, {match[2]: []}, 'keep')
-        call extend(patterns[match[2]], [match[1] ==# '' ? last : match[1]])
-      endif
-      let last = matchstr(line, '\S.*')
-    endfor
-    let s:patterns = patterns
-  endif
-  return copy(get(s:patterns, a:type, []))
-endfunction
-
-function! s:apply_if_ready(options) abort
-  if !has_key(a:options, 'expandtab') || !has_key(a:options, 'shiftwidth')
-    return 0
-  else
-    for [option, value] in items(a:options)
-      call setbufvar('', '&'.option, value)
-    endfor
-    return 1
-  endif
-endfunction
-
-function! s:detect() abort
-  let options = s:guess(getline(1, 1024))
-  if s:apply_if_ready(options)
-    return
-  endif
-  let patterns = s:patterns_for(&filetype)
-  call filter(patterns, 'v:val !~# "/"')
-  let dir = expand('%:p:h')
-  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h')
-    for pattern in patterns
-      for neighbor in split(glob(dir.'/'.pattern), "\n")
-        if neighbor !=# expand('%:p')
-          call extend(options, s:guess(readfile(neighbor, '', 1024)), 'keep')
-        endif
-        if s:apply_if_ready(options)
-          return
-        endif
-      endfor
-    endfor
-    let dir = fnamemodify(dir, ':h')
-  endwhile
-  if has_key(options, 'shiftwidth')
-    return s:apply_if_ready(extend({'expandtab': 1}, options))
-  endif
-endfunction
-
-setglobal smarttab
-
-if !exists('g:did_indent_on')
-  filetype indent on
-endif
-
-augroup sleuth
-  autocmd!
-  autocmd FileType * call s:detect()
-augroup END
-
-" vim:set et sw=2:
diff --git a/bundle/syntastic/.gitignore b/bundle/syntastic/.gitignore
deleted file mode 100644
index cc07c93..0000000
--- a/bundle/syntastic/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*~
-*.swp
-tags
-.DS_Store
diff --git a/bundle/syntastic/CONTRIBUTING.md b/bundle/syntastic/CONTRIBUTING.md
deleted file mode 100644
index 9c78aa3..0000000
--- a/bundle/syntastic/CONTRIBUTING.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# CONTRIBUTING
-- - -
-1\. [Bug reports / GitHub issues](#bugreps)  
-2\. [Submitting a patch](#patches)  
-3\. [General style notes](#generalstyle)  
-4\. [Syntax checker notes](#checkerstyle)  
-- - -
-
-<a name="bugreps"></a>
-
-## 1. Bug reports / GitHub issues
-
-Please note that the preferred channel for posting bug reports is the
-[issue tracker at GitHub][0].  Reports posted elsewhere are less likely
-to be seen by the core team.
-
-When reporting a bug make sure you search the existing GitHub issues
-for the same/similar issues.  If you find one, feel free to add a `+1`
-comment with any additional information that may help us solve the
-issue.
-
-When creating a new issue be sure to state the following:
-
-* steps to reproduce the bug;
-* the version of Vim you are using (run `:ver` to find out);
-* the version of syntastic you are using (see `:SyntasticInfo`).
-
-For syntax checker bugs also state the version of the checker executable
-that you are using.  Adding debugging information is typically useful
-too:
-
-* open a file handled by your checker;
-* set `g:syntastic_debug` to 1 or 3;
-* run the checker;
-* copy the output of `:mes`.
-
-<a name="patches"></a>
-
-## 2. Submitting a patch
-
-Before you consider adding features to syntastic, _please_ spend a few
-minutes (re-)reading the latest version of the [manual][1].  Syntastic
-is changing rapidly at times, and it's quite possible that some features
-you want to add exist already.
-
-To submit a patch:
-
-* fork the [repo][2] on GitHub;
-* make a [topic branch][3] and start hacking;
-* submit a pull request based off your topic branch.
-
-Small, focused patches are preferred.
-
-Large changes to the code should be discussed with the core team first.
-Create an issue and explain your plan and see what we say.
-
-Also, make sure to update the manual whenever applicable.  Nobody can use
-features that aren't documented.
-
-<a name="generalstyle"></a>
-
-## 3. General style notes
-
-Follow the coding conventions/styles used in the syntastic core:
-
-* use 4 space indents;
-* don't use abbreviated keywords - e.g. use `endfunction`, not `endfun`
-(there's always room for more fun!);
-* don't use `l:` prefixes for variables unless actually required (i.e.
-almost never);
-* code for maintainability; we would rather a function be a couple of
-lines longer and have (for example) some [explaining variables][4] to
-aid readability.
-
-<a name="checkerstyle"></a>
-
-## 4. Syntax checker notes
-
-Make sure to read the [guide][5] if you plan to add new syntax checkers.
-
-Use the existing checkers as templates, rather than writing everything
-from scratch.
-
-The preferred style for error format strings is one "clause" per line.
-E.g. (from the `coffee` checker):
-
-```vim
-let errorformat =
-    \ '%E%f:%l:%c: %trror: %m,' .
-    \ 'Syntax%trror: In %f\, %m on line %l,' .
-    \ '%EError: In %f\, Parse error on line %l: %m,' .
-    \ '%EError: In %f\, %m on line %l,' .
-    \ '%W%f(%l): lint warning: %m,' .
-    \ '%W%f(%l): warning: %m,' .
-    \ '%E%f(%l): SyntaxError: %m,' .
-    \ '%-Z%p^,' .
-    \ '%-G%.%#'
-```
-
-[0]: https://github.com/scrooloose/syntastic/issues
-[1]: https://github.com/scrooloose/syntastic/blob/master/doc/syntastic.txt
-[2]: https://github.com/scrooloose/syntastic
-[3]: https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
-[4]: http://www.refactoring.com/catalog/extractVariable.html
-[5]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
diff --git a/bundle/syntastic/README.markdown b/bundle/syntastic/README.markdown
deleted file mode 100644
index ab6627f..0000000
--- a/bundle/syntastic/README.markdown
+++ /dev/null
@@ -1,466 +0,0 @@
-                   ,
-                  / \,,_  .'|
-               ,{{| /}}}}/_.'            _____________________________________________
-              }}}}` '{{'  '.            /                                             \
-            {{{{{    _   ;, \          /            Ladies and Gentlemen,              \
-         ,}}}}}}    /o`\  ` ;)        |                                                |
-        {{{{{{   /           (        |                 this is ...                    |
-        }}}}}}   |            \       |                                                |
-       {{{{{{{{   \            \      |                                                |
-       }}}}}}}}}   '.__      _  |     |    _____             __             __  _      |
-       {{{{{{{{       /`._  (_\ /     |   / ___/__  ______  / /_____ ______/ /_(_)____ |
-        }}}}}}'      |    //___/   --=:   \__ \/ / / / __ \/ __/ __ `/ ___/ __/ / ___/ |
-    jgs `{{{{`       |     '--'       |  ___/ / /_/ / / / / /_/ /_/ (__  ) /_/ / /__   |
-         }}}`                         | /____/\__, /_/ /_/\__/\__,_/____/\__/_/\___/   |
-                                      |      /____/                                    |
-                                      |                                               /
-                                       \_____________________________________________/
-
-
-- - -
-1. [Introduction](#introduction)  
-2. [Installation](#installation)  
-2.1. [Requirements](#requirements)  
-2.2. [Installing syntastic with Pathogen](#installpathogen)  
-3. [Recommended settings](#settings)  
-4. [FAQ](#faq)  
-4.1. [I installed syntastic but it isn't reporting any errors...](#faqinfo)  
-4.2. [The `python` checker complains about syntactically valid Python 3 constructs...](#faqpython3)  
-4.3. [Are there any local checkers for HTML5 that I can use with syntastic?](#faqhtml5)  
-4.4. [The `perl` checker has stopped working...](#faqperl)  
-4.5. [What happened to the `rustc` checker?](#faqrust)  
-4.6. [What happened to the `xcrun` checker?](#faqxcrun)  
-4.7. [I run a checker and the location list is not updated...](#faqloclist)  
-4.7. [I run`:lopen` or `:lwindow` and the error window is empty...](#faqloclist)  
-4.8. [How can I pass additional arguments to a checker?](#faqargs)  
-4.9. [Syntastic supports several checkers for my filetype - how do I tell which one(s) to use?](#faqcheckers)  
-4.10. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
-4.11. [I have enabled multiple checkers for the current filetype.  How can I display all errors from all checkers together?](#faqaggregate)  
-4.12. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
-4.13. [The error window is closed automatically when I :quit the current buffer but not when I :bdelete it?](#faqbdelete)  
-5. [Resources](#otherresources)  
-
-- - -
-
-<a name="introduction"></a>
-
-## 1\. Introduction
-
-Syntastic is a syntax checking plugin for [Vim][13] that runs files through
-external syntax checkers and displays any resulting errors to the user. This
-can be done on demand, or automatically as files are saved. If syntax errors
-are detected, the user is notified and is happy because they didn't have to
-compile their code or execute their script to find them.
-
-At the time of this writing, syntastic has checking plugins for ActionScript,
-Ada, API Blueprint, AppleScript, AsciiDoc, ASM, BEMHTML, Bro, Bourne shell, C,
-C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
-DocBook, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata, GLSL, Go,
-Haml, Haskell, Haxe, Handlebars, HSS, HTML, Jade, Java, JavaScript, JSON, JSX,
-LESS, Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown, MATLAB,
-Mercury, NASM, Nix, Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP,
-gettext Portable Object, OS X and iOS property lists, Puppet, Python, QML, R,
-Racket, Relax NG, reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim,
-SML, Sphinx, SQL, Stylus, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog,
-VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.
-See the [wiki][3] for details about the corresponding supported checkers.
-
-A number of third-party Vim plugins also provide checkers for syntastic,
-for example: [merlin][30], [omnisharp-vim][25], [rust.vim][12],
-[syntastic-extras][26], [syntastic-more][27], [vim-crystal][29],
-[vim-eastwood][28], and [vim-swift][24].
-
-Below is a screenshot showing the methods that Syntastic uses to display syntax
-errors.  Note that, in practise, you will only have a subset of these methods
-enabled.
-
-![Screenshot 1][0]
-
-1. Errors are loaded into the location list for the corresponding window.
-2. When the cursor is on a line containing an error, the error message is echoed in the command window.
-3. Signs are placed beside lines with errors - note that warnings are displayed in a different color.
-4. There is a configurable statusline flag you can include in your statusline config.
-5. Hover the mouse over a line containing an error and the error message is displayed as a balloon.
-6. (not shown) Highlighting errors with syntax highlighting. Erroneous parts of lines can be highlighted.
-
-<a name="installation"></a>
-
-## 2\. Installation
-
-<a name="requirements"></a>
-
-### 2.1\. Requirements
-
-Syntastic itself has rather relaxed requirements: it doesn't have any external
-dependencies, and it needs a version of [Vim][13] compiled with a few common
-features: `autocmd`, `eval`, `file_in_path`, `modify_fname`, `quickfix`,
-`reltime`, and `user_commands`. Not all possible combinations of features that
-include the ones above make equal sense on all operating systems, but Vim
-version 7 or later with the "normal", "big", or "huge" feature sets should be
-fine.
-
-Syntastic should work with any modern plugin managers for Vim, such as
-[NeoBundle][14], [Pathogen][1], [Vim-Addon-Manager][15], [Vim-Plug][16], or
-[Vundle][17]. Instructions for installing syntastic with [Pathogen][1] are
-included below for completeness.
-
-Last but not least: syntastic doesn't know how to do any syntax checks by
-itself. In order to get meaningful results you need to install external
-checkers corresponding to the types of files you use. Please consult the
-[wiki][3] for a list of supported checkers.
-
-<a name="installpathogen"></a>
-
-### 2.2\. Installing syntastic with Pathogen
-
-If you already have [Pathogen][1] working then skip [Step 1](#step1) and go to
-[Step 2](#step2).
-
-<a name="step1"></a>
-
-#### 2.2.1\. Step 1: Install pathogen.vim
-
-First I'll show you how to install Tim Pope's [Pathogen][1] so that it's easy to
-install syntastic.  Do this in your terminal so that you get the `pathogen.vim`
-file and the directories it needs:
-```sh
-mkdir -p ~/.vim/autoload ~/.vim/bundle && \
-curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
-```
-Next you *need* to add this to your `~/.vimrc`:
-```vim
-execute pathogen#infect()
-```
-
-<a name="step2"></a>
-
-#### 2.2.2\. Step 2: Install syntastic as a Pathogen bundle
-
-You now have pathogen installed and can put syntastic into `~/.vim/bundle` like
-this:
-```sh
-cd ~/.vim/bundle && \
-git clone https://github.com/scrooloose/syntastic.git
-```
-Quit vim and start it back up to reload it, then type:
-```vim
-:Helptags
-```
-If you get an error when you do this, then you probably didn't install
-[Pathogen][1] right.  Go back to [Step 1](#step1) and make sure you did the
-following:
-
-1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
-2. Added the `execute pathogen#infect()` line to your `~/.vimrc` file
-3. Did the `git clone` of syntastic inside `~/.vim/bundle`
-4. Have permissions to access all of these directories.
-
-<a name="settings"></a>
-
-## 3\. Recommended settings
-
-Syntastic has numerous options that can be configured, and the defaults
-are not particularly well suitable for new users.  It is recommended
-that you start by adding the following lines to your `vimrc` file, and
-return to them after reading the manual (see `:help syntastic` in Vim):
-```vim
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-```
-
-<a name="faq"></a>
-
-## 4\. FAQ
-
-<a name="faqinfo"></a>
-
-__4.1. Q. I installed syntastic but it isn't reporting any errors...__
-
-A. The most likely reason is that none of the syntax checkers that it requires
-is installed. For example: by default, python requires either `flake8` or
-`pylint` to be installed and in your `$PATH`. To see which executables are
-supported, look at the [wiki][3]. Note that aliases do not work; the actual
-executables must be available in your `$PATH`. Symbolic links are okay though.
-You can see syntastic's idea of available checkers by running `:SyntasticInfo`.
-
-A second probable reason is that none of the available checkers are
-enabled. Syntastic comes preconfigured with a default list of enabled checkers
-per filetype, but this list is kept short in order to prevent slowing down Vim
-or trying to run conflicting checks. The command `:SyntasticInfo` will show you
-which checkers are enabled. You can tell syntastic which checkers (among the
-available ones) you want to run by setting `g:syntastic_<filetype>_checkers` in
-your `vimrc` (see [below](#faqcheckers)).
-
-A third possible reason is that the `$PATH` seen by syntastic might not be same
-as the `$PATH` in your login shell. Syntastic runs checkers using the shell
-pointed to by Vim's `shell` (or by `g:syntastic_shell`, if set), and that's the
-shell you need to configure to set the proper `$PATH` and environment variables
-for your checkers. You can see syntastic's idea of `$PATH` by running
-```vim
-:echo syntastic#util#system('echo "$PATH"')
-```
-on UNIX and Mac OS-X systems, or
-```vim
-:echo syntastic#util#system('echo %PATH%')
-```
-on Windows.
-
-Finally, another reason it could fail is that either the command line options
-or the error output for a syntax checker may have changed. In this case, make
-sure you have the latest version of the syntax checker installed. If it still
-fails then post an [issue][4] - or better yet, create a pull request.
-
-<a name="faqpython3"></a>
-
-__4.2. Q. The `python` checker complains about syntactically valid Python 3 constructs...__
-
-A. Configure the `python` checker to call a Python 3 interpreter rather than
-Python 2, e.g:
-```vim
-let g:syntastic_python_python_exec = '/path/to/python3'
-```
-
-<a name="faqhtml5"></a>
-
-__4.3. Q. Are there any local checkers for HTML5 that I can use with syntastic?__
-
-[HTML Tidy][18] has a fork named [HTML Tidy for HTML5][19].  It's a drop
-in replacement, and syntastic can use it without changes.  Just install it
-somewhere and point `g:syntastic_html_tidy_exec` to its executable:
-```vim
-let g:syntastic_html_tidy_exec = 'tidy5'
-```
-Alternatively, you can install [vnu.jar][21] from the [validator.nu][20]
-project and run it as a [HTTP server][23]:
-```sh
-$ java -Xss512k -cp /path/to/vnu.jar nu.validator.servlet.Main 8888
-```
-Then you can [configure][22] syntastic to use it:
-```vim
-let g:syntastic_html_validator_api = 'http://localhost:8888/'
-```
-
-<a name="faqperl"></a>
-
-__4.4. Q. The `perl` checker has stopped working...__
-
-A. The `perl` checker runs `perl -c` against your file, which in turn
-__executes__ any `BEGIN`, `UNITCHECK`, and `CHECK` blocks, and any `use`
-statements in your file (cf. [perlrun][10]).  This is probably fine if you
-wrote the file yourself, but it's a security problem if you're checking third
-party files.  Since there is currently no way to disable this behaviour while
-still producing useful results, the checker is now disabled by default.  To
-(re-)enable it, make sure the `g:syntastic_perl_checkers` list includes `perl`,
-and set `g:syntastic_enable_perl_checker` to 1 in your `vimrc`:
-```vim
-let g:syntastic_enable_perl_checker = 1
-```
-
-<a name="faqrust"></a>
-
-__4.5. Q. What happened to the `rustc` checker?__
-
-A. It is now part of the [rust.vim][12] plugin.  If you install this plugin the
-checker should be picked up automatically by syntastic.
-
-<a name="faqxcrun"></a>
-
-__4.6. Q. What happened to the `xcrun` checker?__
-
-A. The `xcrun` checker used to have a security problem and it has been removed.
-A better checker for __Swift__ is part of the [vim-swift][24] plugin.  If you
-install this plugin the checker should be picked up automatically by syntastic.
-
-<a name="faqloclist"></a>
-
-__4.7. Q. I run a checker and the location list is not updated...__  
-__4.7. Q. I run`:lopen` or `:lwindow` and the error window is empty...__
-
-A. By default the location list is changed only when you run the `:Errors`
-command, in order to minimise conflicts with other plugins.  If you want the
-location list to always be updated when you run the checkers, add this line to
-your `vimrc`:
-```vim
-let g:syntastic_always_populate_loc_list = 1
-```
-
-<a name="faqargs"></a>
-
-__4.8. Q. How can I pass additional arguments to a checker?__
-
-A. Almost all syntax checkers use the `makeprgBuild()` function. Those checkers
-that do can be configured using global variables. The general form of the
-global `args` variables is `syntastic_<filetype>_<checker>_args`.
-
-So, If you wanted to pass `--my --args --here` to the ruby mri checker you
-would add this line to your `vimrc`:
-```vim
-let g:syntastic_ruby_mri_args = "--my --args --here"
-```
-
-See `:help syntastic-checker-options` for more information.
-
-<a name="faqcheckers"></a>
-
-__4.9. Q. Syntastic supports several checkers for my filetype - how do I tell it
-which one(s) to use?__
-
-A. Stick a line like this in your `vimrc`:
-```vim
-let g:syntastic_<filetype>_checkers = ['<checker-name>']
-```
-
-To see the list of supported checkers for your filetype look at the
-[wiki][3].
-
-e.g. Python has the following checkers, among others: `flake8`, `pyflakes`,
-`pylint` and a native `python` checker.
-
-To tell syntastic to use `pylint`, you would use this setting:
-```vim
-let g:syntastic_python_checkers = ['pylint']
-```
-
-Checkers can be chained together like this:
-```vim
-let g:syntastic_php_checkers = ['php', 'phpcs', 'phpmd']
-```
-
-This is telling syntastic to run the `php` checker first, and if no errors are
-found, run `phpcs`, and then `phpmd`.
-
-You can also run checkers explicitly by calling `:SyntasticCheck <checker>`.
-
-e.g. to run `phpcs` and `phpmd`:
-```vim
-:SyntasticCheck phpcs phpmd
-```
-
-This works for any checkers available for the current filetype, even if they
-aren't listed in `g:syntastic_<filetype>_checkers`.  You can't run checkers for
-"foreign" filetypes though (e.g. you can't run, say, a Python checker if the
-filetype of the current file is `php`).
-
-<a name="faqstyle"></a>
-
-__4.10. Q. What is the difference between syntax checkers and style checkers?__
-
-A. The errors and warnings they produce are highlighted differently and can
-be filtered by different rules, but otherwise the distinction is pretty much
-arbitrary. There is an ongoing effort to keep things consistent, so you can
-_generally_ expect messages produced by syntax checkers to be _mostly_ related
-to syntax, and messages produced by style checkers to be _mostly_ about style.
-But there can be no formal guarantee that, say, a style checker that runs into
-a syntax error wouldn't die with a fatal message, nor that a syntax checker
-wouldn't give you warnings against using some constructs as being bad practice.
-There is also no guarantee that messages marked as "style" are less severe than
-the ones marked as "syntax" (whatever that might mean). And there are even a
-few Frankenstein checkers (for example `flake8` and `pylama`) that, by their
-nature, produce both kinds of messages. Syntastic is not smart enough to be
-able to sort out these things by itself.
-
-In fact it's more useful to look at this from the perspective of filtering
-unwanted messages, rather than as an indicator of severity levels.  The
-distinction between syntax and style is orthogonal to the distinction between
-errors and warnings, and thus you can turn off messages based on level, on
-type, or both.
-
-e.g. To disable all style messages:
-```vim
-let g:syntastic_quiet_messages = { "type": "style" }
-```
-See `:help syntastic_quiet_messages` for details.
-
-<a name="faqaggregate"></a>
-
-__4.11. Q. I have enabled multiple checkers for the current filetype.  How can I
-display all errors from all checkers together?__
-
-A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
-```vim
-let g:syntastic_aggregate_errors = 1
-```
-
-See `:help syntastic-aggregating-errors` for more details.
-
-<a name="faqlnext"></a>
-
-__4.12. Q. How can I jump between the different errors without using the location
-list at the bottom of the window?__
-
-A. Vim provides several built-in commands for this. See `:help :lnext` and
-`:help :lprevious`.
-
-If you use these commands a lot then you may want to add shortcut mappings to
-your `vimrc`, or install something like [unimpaired][2], which provides such
-mappings (among other things).
-
-<a name="faqbdelete"></a>
-
-__4.13. Q. The error window is closed automatically when I :quit the current buffer
-but not when I :bdelete it?__
-
-A. There is no safe way to handle that situation automatically, but you can
-work around it:
-
-```vim
-nnoremap <silent> <C-d> :lclose<CR>:bdelete<CR>
-cabbrev <silent> bd <C-r>=(getcmdtype()==#':' && getcmdpos()==1 ? 'lclose\|bdelete' : 'bd')<CR>
-```
-
-<a name="otherresources"></a>
-
-## 5\. Resources
-
-The preferred place for posting suggestions, reporting bugs, and general
-discussions related to syntastic is the [issue tracker at GitHub][4].
-A guide for writing syntax checkers can be found in the [wiki][11].
-There are also a dedicated [google group][5], and a
-[syntastic tag at StackOverflow][6].
-
-Syntastic aims to provide a common interface to syntax checkers for as many
-languages as possible.  For particular languages, there are, of course, other
-plugins that provide more functionality than syntastic.  You might want to take
-a look at [jedi-vim][7], [python-mode][8], or [YouCompleteMe][9].
-
-[0]: https://github.com/scrooloose/syntastic/raw/master/_assets/screenshot_1.png
-[1]: https://github.com/tpope/vim-pathogen
-[2]: https://github.com/tpope/vim-unimpaired
-[3]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
-[4]: https://github.com/scrooloose/syntastic/issues
-[5]: https://groups.google.com/group/vim-syntastic
-[6]: http://stackoverflow.com/questions/tagged/syntastic
-[7]: https://github.com/davidhalter/jedi-vim
-[8]: https://github.com/klen/python-mode
-[9]: http://valloric.github.io/YouCompleteMe/
-[10]: http://perldoc.perl.org/perlrun.html#*-c*
-[11]: https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
-[12]: https://github.com/rust-lang/rust.vim
-[13]: http://www.vim.org/
-[14]: https://github.com/Shougo/neobundle.vim
-[15]: https://github.com/MarcWeber/vim-addon-manager
-[16]: https://github.com/junegunn/vim-plug/
-[17]: https://github.com/gmarik/Vundle.vim
-[18]: http://tidy.sourceforge.net/
-[19]: http://www.htacg.org/tidy-html5/
-[20]: http://about.validator.nu/
-[21]: https://github.com/validator/validator/releases/latest
-[22]: https://github.com/scrooloose/syntastic/wiki/HTML%3A---validator
-[23]: http://validator.github.io/validator/#standalone
-[24]: https://github.com/kballard/vim-swift
-[25]: https://github.com/OmniSharp/omnisharp-vim
-[26]: https://github.com/myint/syntastic-extras
-[27]: https://github.com/roktas/syntastic-more
-[28]: https://github.com/venantius/vim-eastwood
-[29]: https://github.com/rhysd/vim-crystal
-[30]: https://github.com/the-lambda-church/merlin
-
-<!--
-vim:tw=79:sw=4:
--->
diff --git a/bundle/syntastic/_assets/screenshot_1.png b/bundle/syntastic/_assets/screenshot_1.png
deleted file mode 100644
index c1b69f4..0000000
Binary files a/bundle/syntastic/_assets/screenshot_1.png and /dev/null differ
diff --git a/bundle/syntastic/autoload/syntastic/c.vim b/bundle/syntastic/autoload/syntastic/c.vim
deleted file mode 100644
index e49a29a..0000000
--- a/bundle/syntastic/autoload/syntastic/c.vim
+++ /dev/null
@@ -1,341 +0,0 @@
-if exists('g:loaded_syntastic_c_autoload') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_c_autoload = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Public functions {{{1
-
-" convenience function to determine the 'null device' parameter
-" based on the current operating system
-function! syntastic#c#NullOutput() abort " {{{2
-    let known_os = has('unix') || has('mac') || syntastic#util#isRunningWindows()
-    return known_os ? '-o ' . syntastic#util#DevNull() : ''
-endfunction " }}}2
-
-" read additional compiler flags from the given configuration file
-" the file format and its parsing mechanism is inspired by clang_complete
-function! syntastic#c#ReadConfig(file) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: looking for', a:file)
-
-    " search upwards from the current file's directory
-    let config = syntastic#util#findFileInParent(a:file, expand('%:p:h', 1))
-    if config ==# ''
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file not found')
-        return ''
-    endif
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: config file:', config)
-    if !filereadable(config)
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file unreadable')
-        return ''
-    endif
-
-    " convert filename into absolute path
-    let filepath = fnamemodify(config, ':p:h')
-
-    " try to read config file
-    try
-        let lines = readfile(config)
-    catch /\m^Vim\%((\a\+)\)\=:E48[45]/
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: error reading file')
-        return ''
-    endtry
-
-    " filter out empty lines and comments
-    call filter(lines, 'v:val !~# ''\v^(\s*#|$)''')
-
-    " remove leading and trailing spaces
-    call map(lines, 'substitute(v:val, ''\m^\s\+'', "", "")')
-    call map(lines, 'substitute(v:val, ''\m\s\+$'', "", "")')
-
-    let parameters = []
-    for line in lines
-        let matches = matchstr(line, '\m\C^\s*-I\s*\zs.\+')
-        if matches !=# ''
-            " this one looks like an absolute path
-            if match(matches, '\m^\%(/\|\a:\)') != -1
-                call add(parameters, '-I' . matches)
-            else
-                call add(parameters, '-I' . filepath . syntastic#util#Slash() . matches)
-            endif
-        else
-            call add(parameters, line)
-        endif
-    endfor
-
-    return join(map(parameters, 'syntastic#util#shescape(v:val)'))
-endfunction " }}}2
-
-" GetLocList() for C-like compilers
-function! syntastic#c#GetLocList(filetype, subchecker, options) abort " {{{2
-    try
-        let flags = s:_get_cflags(a:filetype, a:subchecker, a:options)
-    catch /\m\C^Syntastic: skip checks$/
-        return []
-    endtry
-
-    let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
-        \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
-
-    let errorformat = s:_get_checker_var('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
-
-    let postprocess = s:_get_checker_var('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
-        \ ['filterForeignErrors'] : []
-
-    " process makeprg
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': postprocess })
-endfunction " }}}2
-
-" }}}1
-
-" Private functions {{{1
-
-" initialize c/cpp syntax checker handlers
-function! s:_init() abort " {{{2
-    let s:handlers = []
-    let s:cflags = {}
-
-    call s:_registerHandler('\m\<cairo',       's:_checkPackage', ['cairo', 'cairo'])
-    call s:_registerHandler('\m\<freetype',    's:_checkPackage', ['freetype', 'freetype2', 'freetype'])
-    call s:_registerHandler('\m\<glade',       's:_checkPackage', ['glade', 'libglade-2.0', 'libglade'])
-    call s:_registerHandler('\m\<glib',        's:_checkPackage', ['glib', 'glib-2.0', 'glib'])
-    call s:_registerHandler('\m\<gtk',         's:_checkPackage', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
-    call s:_registerHandler('\m\<libsoup',     's:_checkPackage', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
-    call s:_registerHandler('\m\<libxml',      's:_checkPackage', ['libxml', 'libxml-2.0', 'libxml'])
-    call s:_registerHandler('\m\<pango',       's:_checkPackage', ['pango', 'pango'])
-    call s:_registerHandler('\m\<SDL',         's:_checkPackage', ['sdl', 'sdl'])
-    call s:_registerHandler('\m\<opengl',      's:_checkPackage', ['opengl', 'gl'])
-    call s:_registerHandler('\m\<webkit',      's:_checkPackage', ['webkit', 'webkit-1.0'])
-
-    call s:_registerHandler('\m\<php\.h\>',    's:_checkPhp',    [])
-    call s:_registerHandler('\m\<Python\.h\>', 's:_checkPython', [])
-    call s:_registerHandler('\m\<ruby',        's:_checkRuby',   [])
-endfunction " }}}2
-
-" register a handler dictionary object
-function! s:_registerHandler(regex, function, args) abort " {{{2
-    let handler = {}
-    let handler['regex'] = a:regex
-    let handler['func'] = function(a:function)
-    let handler['args'] = a:args
-    call add(s:handlers, handler)
-endfunction " }}}2
-
-" try to find library with 'pkg-config'
-" search possible libraries from first to last given
-" argument until one is found
-function! s:_checkPackage(name, ...) abort " {{{2
-    if executable('pkg-config')
-        if !has_key(s:cflags, a:name)
-            for pkg in a:000
-                let pkg_flags = syntastic#util#system('pkg-config --cflags ' . pkg)
-                " since we cannot necessarily trust the pkg-config exit code
-                " we have to check for an error output as well
-                if v:shell_error == 0 && pkg_flags !~? 'not found'
-                    let pkg_flags = ' ' . substitute(pkg_flags, "\n", '', '')
-                    let s:cflags[a:name] = pkg_flags
-                    return pkg_flags
-                endif
-            endfor
-        else
-            return s:cflags[a:name]
-        endif
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find PHP includes with 'php-config'
-function! s:_checkPhp() abort " {{{2
-    if executable('php-config')
-        if !has_key(s:cflags, 'php')
-            let s:cflags['php'] = syntastic#util#system('php-config --includes')
-            let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
-        endif
-        return s:cflags['php']
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find the python headers with distutils
-function! s:_checkPython() abort " {{{2
-    if executable('python')
-        if !has_key(s:cflags, 'python')
-            let s:cflags['python'] = syntastic#util#system('python -c ''from distutils import ' .
-                \ 'sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())''')
-            let s:cflags['python'] = substitute(s:cflags['python'], "\n", '', '')
-            let s:cflags['python'] = ' -I' . s:cflags['python']
-        endif
-        return s:cflags['python']
-    endif
-    return ''
-endfunction " }}}2
-
-" try to find the ruby headers with 'rbconfig'
-function! s:_checkRuby() abort " {{{2
-    if executable('ruby')
-        if !has_key(s:cflags, 'ruby')
-            let s:cflags['ruby'] = syntastic#util#system('ruby -r rbconfig -e ' .
-                \ '''puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]''')
-            let s:cflags['ruby'] = substitute(s:cflags['ruby'], "\n", '', '')
-            let s:cflags['ruby'] = ' -I' . s:cflags['ruby']
-        endif
-        return s:cflags['ruby']
-    endif
-    return ''
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-" resolve checker-related user variables
-function! s:_get_checker_var(scope, filetype, subchecker, name, default) abort " {{{2
-    let prefix = a:scope . ':' . 'syntastic_'
-    if exists(prefix . a:filetype . '_' . a:subchecker . '_' . a:name)
-        return {a:scope}:syntastic_{a:filetype}_{a:subchecker}_{a:name}
-    elseif exists(prefix . a:filetype . '_' . a:name)
-        return {a:scope}:syntastic_{a:filetype}_{a:name}
-    else
-        return a:default
-    endif
-endfunction " }}}2
-
-" resolve user CFLAGS
-function! s:_get_cflags(ft, ck, opts) abort " {{{2
-    " determine whether to parse header files as well
-    if has_key(a:opts, 'header_names') && expand('%', 1) =~? a:opts['header_names']
-        if s:_get_checker_var('g', a:ft, a:ck, 'check_header', 0)
-            let flags = get(a:opts, 'header_flags', '') . ' -c ' . syntastic#c#NullOutput()
-        else
-            " checking headers when check_header is unset: bail out
-            throw 'Syntastic: skip checks'
-        endif
-    else
-        let flags = get(a:opts, 'main_flags', '')
-    endif
-
-    let flags .= ' ' . s:_get_checker_var('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_get_include_dirs(a:ft)
-
-    " check if the user manually set some cflags
-    let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
-    if b_cflags !=# ''
-        let flags .= ' ' . b_cflags
-    endif
-
-    " add optional config file parameters
-    let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
-    let flags .= ' ' . syntastic#c#ReadConfig(config_file)
-
-    if b_cflags ==# '' && (a:ft ==# 'c' || a:ft ==# 'cpp') && !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
-        " refresh the include file search if desired
-        if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
-            let flags .= ' ' . s:_search_headers()
-        else
-            " search for header includes if not cached already
-            if !exists('b:syntastic_' . a:ft . '_includes')
-                let b:syntastic_{a:ft}_includes = s:_search_headers()
-            endif
-            let flags .= ' ' . b:syntastic_{a:ft}_includes
-        endif
-    endif
-
-    return flags
-endfunction " }}}2
-
-" get the gcc include directory argument depending on the default
-" includes and the optional user-defined 'g:syntastic_c_include_dirs'
-function! s:_get_include_dirs(filetype) abort " {{{2
-    let include_dirs = []
-
-    if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
-                \ (!exists('g:syntastic_'.a:filetype.'_no_default_include_dirs') ||
-                \ !g:syntastic_{a:filetype}_no_default_include_dirs)
-        let include_dirs = copy(s:default_includes)
-    endif
-
-    if exists('g:syntastic_'.a:filetype.'_include_dirs')
-        call extend(include_dirs, g:syntastic_{a:filetype}_include_dirs)
-    endif
-
-    return join(map(syntastic#util#unique(include_dirs), 'syntastic#util#shescape("-I" . v:val)'))
-endfunction " }}}2
-
-" search the first 100 lines for include statements that are
-" given in the handlers dictionary
-function! s:_search_headers() abort " {{{2
-    let includes = ''
-    let files = []
-    let found = []
-    let lines = filter(getline(1, 100), 'v:val =~# ''\m^\s*#\s*include''')
-
-    " search current buffer
-    for line in lines
-        let file = matchstr(line, '\m"\zs\S\+\ze"')
-        if file !=# ''
-            call add(files, file)
-            continue
-        endif
-
-        for handler in s:handlers
-            if line =~# handler['regex']
-                let includes .= call(handler['func'], handler['args'])
-                call add(found, handler['regex'])
-                break
-            endif
-        endfor
-    endfor
-
-    " search included headers
-    for hfile in files
-        if hfile !=# ''
-            let filename = expand('%:p:h', 1) . syntastic#util#Slash() . hfile
-
-            try
-                let lines = readfile(filename, '', 100)
-            catch /\m^Vim\%((\a\+)\)\=:E484/
-                continue
-            endtry
-
-            call filter(lines, 'v:val =~# ''\m^\s*#\s*include''')
-
-            for handler in s:handlers
-                if index(found, handler['regex']) != -1
-                    continue
-                endif
-
-                for line in lines
-                    if line =~# handler['regex']
-                        let includes .= call(handler['func'], handler['args'])
-                        call add(found, handler['regex'])
-                        break
-                    endif
-                endfor
-            endfor
-        endif
-    endfor
-
-    return includes
-endfunction " }}}2
-
-" }}}1
-
-" default include directories
-let s:default_includes = [
-    \ '.',
-    \ '..',
-    \ 'include',
-    \ 'includes',
-    \ '..' . syntastic#util#Slash() . 'include',
-    \ '..' . syntastic#util#Slash() . 'includes' ]
-
-call s:_init()
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/autoload/syntastic/log.vim b/bundle/syntastic/autoload/syntastic/log.vim
deleted file mode 100644
index f3950bc..0000000
--- a/bundle/syntastic/autoload/syntastic/log.vim
+++ /dev/null
@@ -1,211 +0,0 @@
-if exists('g:loaded_syntastic_log_autoload') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_log_autoload = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:one_time_notices_issued = []
-
-" Public functions {{{1
-
-function! syntastic#log#info(msg) abort " {{{2
-    echomsg 'syntastic: info: ' . a:msg
-endfunction " }}}2
-
-function! syntastic#log#warn(msg) abort " {{{2
-    echohl WarningMsg
-    echomsg 'syntastic: warning: ' . a:msg
-    echohl None
-endfunction " }}}2
-
-function! syntastic#log#error(msg) abort " {{{2
-    execute "normal \<Esc>"
-    echohl ErrorMsg
-    echomsg 'syntastic: error: ' . a:msg
-    echohl None
-endfunction " }}}2
-
-function! syntastic#log#oneTimeWarn(msg) abort " {{{2
-    if index(s:one_time_notices_issued, a:msg) >= 0
-        return
-    endif
-
-    call add(s:one_time_notices_issued, a:msg)
-    call syntastic#log#warn(a:msg)
-endfunction " }}}2
-
-" @vimlint(EVL102, 1, l:OLD_VAR)
-function! syntastic#log#deprecationWarn(old, new, ...) abort " {{{2
-    if exists('g:syntastic_' . a:old) && !exists('g:syntastic_' . a:new)
-        let msg = 'variable g:syntastic_' . a:old . ' is deprecated, please use '
-
-        if a:0
-            let OLD_VAR = g:syntastic_{a:old}
-            try
-                let NEW_VAR = eval(a:1)
-                let msg .= 'in its stead: let g:syntastic_' . a:new . ' = ' . string(NEW_VAR)
-                let g:syntastic_{a:new} = NEW_VAR
-            catch
-                let msg .= 'g:syntastic_' . a:new . ' instead'
-            endtry
-        else
-            let msg .= 'g:syntastic_' . a:new . ' instead'
-            let g:syntastic_{a:new} = g:syntastic_{a:old}
-        endif
-
-        call syntastic#log#oneTimeWarn(msg)
-    endif
-endfunction " }}}2
-" @vimlint(EVL102, 0, l:OLD_VAR)
-
-function! syntastic#log#debug(level, msg, ...) abort " {{{2
-    if !s:_isDebugEnabled(a:level)
-        return
-    endif
-
-    let leader = s:_log_timestamp()
-    call s:_logRedirect(1)
-
-    if a:0 > 0
-        " filter out dictionary functions
-        echomsg leader . a:msg . ' ' .
-            \ strtrans(string(type(a:1) == type({}) || type(a:1) == type([]) ?
-            \ filter(copy(a:1), 'type(v:val) != type(function("tr"))') : a:1))
-    else
-        echomsg leader . a:msg
-    endif
-
-    call s:_logRedirect(0)
-endfunction " }}}2
-
-function! syntastic#log#debugShowOptions(level, names) abort " {{{2
-    if !s:_isDebugEnabled(a:level)
-        return
-    endif
-
-    let leader = s:_log_timestamp()
-    call s:_logRedirect(1)
-
-    let vlist = copy(type(a:names) == type('') ? [a:names] : a:names)
-    if !empty(vlist)
-        call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val))) . (s:_is_modified(v:val) ? ' (!)' : '')")
-        echomsg leader . join(vlist, ', ')
-    endif
-    call s:_logRedirect(0)
-endfunction " }}}2
-
-function! syntastic#log#debugShowVariables(level, names) abort " {{{2
-    if !s:_isDebugEnabled(a:level)
-        return
-    endif
-
-    let leader = s:_log_timestamp()
-    call s:_logRedirect(1)
-
-    let vlist = type(a:names) == type('') ? [a:names] : a:names
-    for name in vlist
-        let msg = s:_format_variable(name)
-        if msg !=# ''
-            echomsg leader . msg
-        endif
-    endfor
-
-    call s:_logRedirect(0)
-endfunction " }}}2
-
-function! syntastic#log#debugDump(level) abort " {{{2
-    if !s:_isDebugEnabled(a:level)
-        return
-    endif
-
-    call syntastic#log#debugShowVariables( a:level, sort(keys(g:_SYNTASTIC_DEFAULTS)) )
-endfunction " }}}2
-
-function! syntastic#log#ndebug(level, title, messages) abort " {{{2
-    if s:_isDebugEnabled(a:level)
-        return
-    endif
-
-    call syntastic#log#error(a:title)
-    if type(a:messages) == type([])
-        for msg in a:messages
-            echomsg msg
-        endfor
-    else
-        echomsg a:messages
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Private functions {{{1
-
-function! s:_isDebugEnabled_smart(level) abort " {{{2
-    return and(g:syntastic_debug, a:level)
-endfunction " }}}2
-
-function! s:_isDebugEnabled_dumb(level) abort " {{{2
-    " poor man's bit test for bit N, assuming a:level == 2**N
-    return (g:syntastic_debug / a:level) % 2
-endfunction " }}}2
-
-let s:_isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
-lockvar s:_isDebugEnabled
-
-function! s:_logRedirect(on) abort " {{{2
-    if exists('g:syntastic_debug_file')
-        if a:on
-            try
-                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file, 1))
-            catch /\m^Vim\%((\a\+)\)\=:/
-                silent! redir END
-                unlet g:syntastic_debug_file
-            endtry
-        else
-            silent! redir END
-        endif
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-function! s:_log_timestamp() abort " {{{2
-    return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
-endfunction " }}}2
-
-function! s:_format_variable(name) abort " {{{2
-    let vals = []
-    if exists('g:syntastic_' . a:name)
-        call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
-    endif
-    if exists('b:syntastic_' . a:name)
-        call add(vals, 'b:syntastic_' . a:name . ' = ' . strtrans(string(b:syntastic_{a:name})))
-    endif
-
-    return join(vals, ', ')
-endfunction " }}}2
-
-function! s:_is_modified(name) abort " {{{2
-    if !exists('s:option_defaults')
-        let s:option_defaults = {}
-    endif
-    if !has_key(s:option_defaults, a:name)
-        let opt_save = eval('&' . a:name)
-        execute 'set ' . a:name . '&'
-        let s:option_defaults[a:name] = eval('&' . a:name)
-        execute 'let &' . a:name . ' = ' . string(opt_save)
-    endif
-
-    return s:option_defaults[a:name] !=# eval('&' . a:name)
-endfunction " }}}2
-
-" }}}1
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/autoload/syntastic/postprocess.vim b/bundle/syntastic/autoload/syntastic/postprocess.vim
deleted file mode 100644
index 136fa58..0000000
--- a/bundle/syntastic/autoload/syntastic/postprocess.vim
+++ /dev/null
@@ -1,73 +0,0 @@
-if exists('g:loaded_syntastic_postprocess_autoload') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_postprocess_autoload = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Public functions {{{1
-
-" merge consecutive blanks
-function! syntastic#postprocess#compressWhitespace(errors) abort " {{{2
-    for e in a:errors
-        let e['text'] = substitute(e['text'], "\001", '', 'g')
-        let e['text'] = substitute(e['text'], '\n', ' ', 'g')
-        let e['text'] = substitute(e['text'], '\m\s\{2,}', ' ', 'g')
-        let e['text'] = substitute(e['text'], '\m^\s\+', '', '')
-        let e['text'] = substitute(e['text'], '\m\s\+$', '', '')
-    endfor
-
-    return a:errors
-endfunction " }}}2
-
-" remove spurious CR under Cygwin
-function! syntastic#postprocess#cygwinRemoveCR(errors) abort " {{{2
-    if has('win32unix')
-        for e in a:errors
-            let e['text'] = substitute(e['text'], '\r', '', 'g')
-        endfor
-    endif
-
-    return a:errors
-endfunction " }}}2
-
-" decode XML entities
-function! syntastic#postprocess#decodeXMLEntities(errors) abort " {{{2
-    for e in a:errors
-        let e['text'] = syntastic#util#decodeXMLEntities(e['text'])
-    endfor
-
-    return a:errors
-endfunction " }}}2
-
-" filter out errors referencing other files
-function! syntastic#postprocess#filterForeignErrors(errors) abort " {{{2
-    return filter(copy(a:errors), 'get(v:val, "bufnr") == ' . bufnr(''))
-endfunction " }}}2
-
-" make sure line numbers are not past end of buffers
-" XXX: this loads all referenced buffers in memory
-function! syntastic#postprocess#guards(errors) abort " {{{2
-    let buffers = syntastic#util#unique(map(filter(copy(a:errors), 'v:val["valid"]'), 'str2nr(v:val["bufnr"])'))
-
-    let guards = {}
-    for b in buffers
-        let guards[b] = len(getbufline(b, 1, '$'))
-    endfor
-
-    for e in a:errors
-        if e['valid'] && e['lnum'] > guards[e['bufnr']]
-            let e['lnum'] = guards[e['bufnr']]
-        endif
-    endfor
-
-    return a:errors
-endfunction " }}}2
-
-" }}}1
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/autoload/syntastic/preprocess.vim b/bundle/syntastic/autoload/syntastic/preprocess.vim
deleted file mode 100644
index 13b97a8..0000000
--- a/bundle/syntastic/autoload/syntastic/preprocess.vim
+++ /dev/null
@@ -1,313 +0,0 @@
-if exists('g:loaded_syntastic_preprocess_autoload') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_preprocess_autoload = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Public functions {{{1
-
-function! syntastic#preprocess#cabal(errors) abort " {{{2
-    let out = []
-    let star = 0
-    for err in a:errors
-        if star
-            if err ==# ''
-                let star = 0
-            else
-                let out[-1] .= ' ' . err
-            endif
-        else
-            call add(out, err)
-            if err =~# '\m^*\s'
-                let star = 1
-            endif
-        endif
-    endfor
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#checkstyle(errors) abort " {{{2
-    let out = []
-    let fname = expand('%', 1)
-    for err in a:errors
-        if match(err, '\m<error\>') > -1
-            let line = str2nr(matchstr(err, '\m\<line="\zs\d\+\ze"'))
-            if line == 0
-                continue
-            endif
-
-            let col = str2nr(matchstr(err, '\m\<column="\zs\d\+\ze"'))
-
-            let type = matchstr(err, '\m\<severity="\zs.\ze')
-            if type !~? '^[EW]'
-                let type = 'E'
-            endif
-
-            let message = syntastic#util#decodeXMLEntities(matchstr(err, '\m\<message="\zs[^"]\+\ze"'))
-
-            call add(out, join([fname, type, line, col, message], ':'))
-        elseif match(err, '\m<file name="') > -1
-            let fname = syntastic#util#decodeXMLEntities(matchstr(err, '\v\<file name\="\zs[^"]+\ze"'))
-        endif
-    endfor
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#cppcheck(errors) abort " {{{2
-    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
-endfunction " }}}2
-
-function! syntastic#preprocess#flow(errors) abort " {{{2
-    let idx = 0
-    while idx < len(a:errors) && a:errors[idx][0] !=# '{'
-        let idx += 1
-    endwhile
-    let errs = s:_decode_JSON(join(a:errors[idx :], ''))
-
-    let out = []
-    if type(errs) == type({}) && has_key(errs, 'errors') && type(errs['errors']) == type([])
-        for e in errs['errors']
-            if type(e) == type({}) && has_key(e, 'message') && type(e['message']) == type([]) && len(e['message'])
-                let m = e['message'][0]
-                let t = e['message'][1:]
-
-                try
-                    let msg =
-                        \ m['path'] . ':' .
-                        \ m['line'] . ':' .
-                        \ m['start'] . ':' .
-                        \ (m['line'] ==# m['endline'] && str2nr(m['end']) > 0 ? m['end'] . ':' : '') .
-                        \ ' ' . m['descr']
-
-                    if len(t)
-                        let msg .= ' ' . join(map(t,
-                            \ 'v:val["descr"] . " (" . v:val["path"] . ":" . v:val["line"] . ":" . v:val["start"] . ' .
-                            \ '"," . (v:val["line"] !=# v:val["endline"] ? v:val["endline"] . ":" : "") . ' .
-                            \ 'v:val["end"] . ")"'))
-                    endif
-
-                    let msg = substitute(msg, '\r', '', 'g')
-                    let msg = substitute(msg, '\n', ' ', 'g')
-
-                    call add(out, msg)
-                catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker javascript/flow: unrecognized error format')
-                    let out = []
-                    break
-                endtry
-            else
-                call syntastic#log#warn('checker javascript/flow: unrecognized error format')
-                let out = []
-                break
-            endif
-        endfor
-    else
-        call syntastic#log#warn('checker javascript/flow: unrecognized error format')
-    endif
-
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#iconv(errors) abort " {{{2
-    return
-        \ has('iconv') && &encoding !=# '' && &encoding !=# 'utf-8' ?
-        \       map(a:errors, 'iconv(v:val, "utf-8", &encoding)') :
-        \       a:errors
-endfunction " }}}2
-
-function! syntastic#preprocess#killEmpty(errors) abort " {{{2
-    return filter(copy(a:errors), 'v:val !=# ""')
-endfunction " }}}2
-
-function! syntastic#preprocess#perl(errors) abort " {{{2
-    let out = []
-
-    for e in a:errors
-        let parts = matchlist(e, '\v^(.*)\sat\s(.{-})\sline\s(\d+)(.*)$')
-        if !empty(parts)
-            call add(out, parts[2] . ':' . parts[3] . ':' . parts[1] . parts[4])
-        endif
-    endfor
-
-    return syntastic#util#unique(out)
-endfunction " }}}2
-
-function! syntastic#preprocess#prospector(errors) abort " {{{2
-    let errs = s:_decode_JSON(join(a:errors, ''))
-
-    let out = []
-    if type(errs) == type({}) && has_key(errs, 'messages')
-        if type(errs['messages']) == type([])
-            for e in errs['messages']
-                if type(e) == type({})
-                    try
-                        if e['source'] ==# 'pylint'
-                            let e['location']['character'] += 1
-                        endif
-
-                        let msg =
-                            \ e['location']['path'] . ':' .
-                            \ e['location']['line'] . ':' .
-                            \ e['location']['character'] . ': ' .
-                            \ e['code'] . ' ' .
-                            \ e['message'] . ' ' .
-                            \ '[' . e['source'] . ']'
-
-                        call add(out, msg)
-                    catch /\m^Vim\%((\a\+)\)\=:E716/
-                        call syntastic#log#warn('checker python/prospector: unrecognized error format')
-                        let out = []
-                        break
-                    endtry
-                else
-                    call syntastic#log#warn('checker python/prospector: unrecognized error format')
-                    let out = []
-                    break
-                endif
-            endfor
-        else
-            call syntastic#log#warn('checker python/prospector: unrecognized error format')
-        endif
-    endif
-
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#rparse(errors) abort " {{{2
-    let errlist = copy(a:errors)
-
-    " remove uninteresting lines and handle continuations
-    let i = 0
-    while i < len(errlist)
-        if i > 0 && errlist[i][:1] ==# '  ' && errlist[i] !~# '\m\s\+\^$'
-            let errlist[i-1] .= errlist[i][1:]
-            call remove(errlist, i)
-        elseif errlist[i] !~# '\m^\(Lint:\|Lint checking:\|Error in\) '
-            call remove(errlist, i)
-        else
-            let i += 1
-        endif
-    endwhile
-
-    let out = []
-    let fname = ''
-    for e in errlist
-        if match(e, '\m^Lint: ') == 0
-            let parts = matchlist(e, '\m^Lint: \(.*\): found on lines \([0-9, ]\+\)\(+\(\d\+\) more\)\=')
-            if len(parts) >= 3
-                for line in split(parts[2], '\m,\s*')
-                    call add(out, 'E:' . fname . ':' . line . ': ' . parts[1])
-                endfor
-            endif
-            if len(parts) >= 5 && parts[4] !=# ''
-                call add(out, 'E:' . fname . ':0: ' . parts[1] . ' - ' . parts[4] . ' messages not shown')
-            endif
-        elseif match(e, '\m^Lint checking: ') == 0
-            let fname = matchstr(e, '\m^Lint checking: \zs.*')
-        elseif match(e, '\m^Error in ') == 0
-            call add(out, substitute(e, '\m^Error in .\+ : .\+\ze:\d\+:\d\+: ', 'E:' . fname, ''))
-        endif
-    endfor
-
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#tslint(errors) abort " {{{2
-    return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
-endfunction " }}}2
-
-function! syntastic#preprocess#validator(errors) abort " {{{2
-    let out = []
-    for e in a:errors
-        let parts = matchlist(e, '\v^"([^"]+)"(.+)')
-        if len(parts) >= 3
-            " URL decode, except leave alone any "+"
-            let parts[1] = substitute(parts[1], '\m%\(\x\x\)', '\=nr2char("0x".submatch(1))', 'g')
-            let parts[1] = substitute(parts[1], '\m\\"', '"', 'g')
-            let parts[1] = substitute(parts[1], '\m\\\\', '\\', 'g')
-            call add(out, '"' . parts[1] . '"' . parts[2])
-        endif
-    endfor
-    return out
-endfunction " }}}2
-
-function! syntastic#preprocess#vint(errors) abort " {{{2
-    let errs = s:_decode_JSON(join(a:errors, ''))
-
-    let out = []
-    if type(errs) == type([])
-        for e in errs
-            if type(e) == type({})
-                try
-                    let msg =
-                        \ e['file_path'] . ':' .
-                        \ e['line_number'] . ':' .
-                        \ e['column_number'] . ':' .
-                        \ e['severity'][0] . ': ' .
-                        \ e['description'] . ' (' .
-                        \ e['policy_name'] . ')'
-
-                    call add(out, msg)
-                catch /\m^Vim\%((\a\+)\)\=:E716/
-                    call syntastic#log#warn('checker vim/vint: unrecognized error format')
-                    let out = []
-                    break
-                endtry
-            else
-                call syntastic#log#warn('checker vim/vint: unrecognized error format')
-                let out = []
-                break
-            endif
-        endfor
-    else
-        call syntastic#log#warn('checker vim/vint: unrecognized error format')
-    endif
-
-    return out
-endfunction " }}}2
-
-" }}}1
-
-" Private functions {{{1
-
-" @vimlint(EVL102, 1, l:true)
-" @vimlint(EVL102, 1, l:false)
-" @vimlint(EVL102, 1, l:null)
-function! s:_decode_JSON(json) abort " {{{2
-    if a:json ==# ''
-        return []
-    endif
-
-    " The following is inspired by https://github.com/MarcWeber/vim-addon-manager and
-    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
-    " A hat tip to Marc Weber for this trick
-    if substitute(a:json, '\v\"%(\\.|[^"\\])*\"|true|false|null|[+-]?\d+%(\.\d+%([Ee][+-]?\d+)?)?', '', 'g') !~# "[^,:{}[\\] \t]"
-        " JSON artifacts
-        let true = 1
-        let false = 0
-        let null = ''
-
-        try
-            let object = eval(a:json)
-        catch
-            " malformed JSON
-            let object = ''
-        endtry
-    else
-        let object = ''
-    endif
-
-    return object
-endfunction " }}}2
-" @vimlint(EVL102, 0, l:true)
-" @vimlint(EVL102, 0, l:false)
-" @vimlint(EVL102, 0, l:null)
-
-" }}}1
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/autoload/syntastic/util.vim b/bundle/syntastic/autoload/syntastic/util.vim
deleted file mode 100644
index 844a4ed..0000000
--- a/bundle/syntastic/autoload/syntastic/util.vim
+++ /dev/null
@@ -1,501 +0,0 @@
-if exists('g:loaded_syntastic_util_autoload') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_util_autoload = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Public functions {{{1
-
-function! syntastic#util#isRunningWindows() abort " {{{2
-    return has('win16') || has('win32') || has('win64')
-endfunction " }}}2
-
-function! syntastic#util#DevNull() abort " {{{2
-    if syntastic#util#isRunningWindows()
-        return 'NUL'
-    endif
-    return '/dev/null'
-endfunction " }}}2
-
-" Get directory separator
-function! syntastic#util#Slash() abort " {{{2
-    return (!exists('+shellslash') || &shellslash) ? '/' : '\'
-endfunction " }}}2
-
-function! syntastic#util#CygwinPath(path) abort " {{{2
-    return substitute(syntastic#util#system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
-endfunction " }}}2
-
-function! syntastic#util#system(command) abort " {{{2
-    let old_shell = &shell
-    let old_lc_messages = $LC_MESSAGES
-    let old_lc_all = $LC_ALL
-
-    let &shell = syntastic#util#var('shell')
-    let $LC_MESSAGES = 'C'
-    let $LC_ALL = ''
-
-    let out = system(a:command)
-
-    let $LC_ALL = old_lc_all
-    let $LC_MESSAGES = old_lc_messages
-
-    let &shell = old_shell
-
-    return out
-endfunction " }}}2
-
-" Create a temporary directory
-function! syntastic#util#tmpdir() abort " {{{2
-    let tempdir = ''
-
-    if (has('unix') || has('mac')) && executable('mktemp')
-        " TODO: option "-t" to mktemp(1) is not portable
-        let tmp = $TMPDIR !=# '' ? $TMPDIR : $TMP !=# '' ? $TMP : '/tmp'
-        let out = split(syntastic#util#system('mktemp -q -d ' . tmp . '/vim-syntastic-' . getpid() . '-XXXXXXXX'), "\n")
-        if v:shell_error == 0 && len(out) == 1
-            let tempdir = out[0]
-        endif
-    endif
-
-    if tempdir ==# ''
-        if has('win32') || has('win64')
-            let tempdir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-' . getpid()
-        elseif has('win32unix')
-            let tempdir = syntastic#util#CygwinPath('/tmp/vim-syntastic-'  . getpid())
-        elseif $TMPDIR !=# ''
-            let tempdir = $TMPDIR . '/vim-syntastic-' . getpid()
-        else
-            let tempdir = '/tmp/vim-syntastic-' . getpid()
-        endif
-
-        try
-            call mkdir(tempdir, 'p', 0700)
-        catch /\m^Vim\%((\a\+)\)\=:E739/
-            call syntastic#log#error(v:exception)
-            let tempdir = '.'
-        endtry
-    endif
-
-    return tempdir
-endfunction " }}}2
-
-" Recursively remove a directory
-function! syntastic#util#rmrf(what) abort " {{{2
-    " try to make sure we don't delete directories we didn't create
-    if a:what !~? 'vim-syntastic-'
-        return
-    endif
-
-    if  getftype(a:what) ==# 'dir'
-        if !exists('s:rmrf')
-            let s:rmrf =
-                \ has('unix') || has('mac') ? 'rm -rf' :
-                \ has('win32') || has('win64') ? 'rmdir /S /Q' :
-                \ has('win16') || has('win95') || has('dos16') || has('dos32') ? 'deltree /Y' : ''
-        endif
-
-        if s:rmrf !=# ''
-            silent! call syntastic#util#system(s:rmrf . ' ' . syntastic#util#shescape(a:what))
-        else
-            call s:_rmrf(a:what)
-        endif
-    else
-        silent! call delete(a:what)
-    endif
-endfunction " }}}2
-
-" Search the first 5 lines of the file for a magic number and return a map
-" containing the args and the executable
-"
-" e.g.
-"
-" #!/usr/bin/perl -f -bar
-"
-" returns
-"
-" {'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
-function! syntastic#util#parseShebang() abort " {{{2
-    for lnum in range(1, 5)
-        let line = getline(lnum)
-        if line =~# '^#!'
-            let line = substitute(line, '\v^#!\s*(\S+/env(\s+-\S+)*\s+)?', '', '')
-            let exe = matchstr(line, '\m^\S*\ze')
-            let args = split(matchstr(line, '\m^\S*\zs.*'))
-            return { 'exe': exe, 'args': args }
-        endif
-    endfor
-
-    return { 'exe': '', 'args': [] }
-endfunction " }}}2
-
-" Get the value of a variable.  Allow local variables to override global ones.
-function! syntastic#util#var(name, ...) abort " {{{2
-    return
-        \ exists('b:syntastic_' . a:name) ? b:syntastic_{a:name} :
-        \ exists('g:syntastic_' . a:name) ? g:syntastic_{a:name} :
-        \ a:0 > 0 ? a:1 : ''
-endfunction " }}}2
-
-" Parse a version string.  Return an array of version components.
-function! syntastic#util#parseVersion(version, ...) abort " {{{2
-    return map(split(matchstr( a:version, a:0 ? a:1 : '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.'), 'str2nr(v:val)')
-endfunction " }}}2
-
-" Verify that the 'installed' version is at least the 'required' version.
-"
-" 'installed' and 'required' must be arrays. If they have different lengths,
-" the "missing" elements will be assumed to be 0 for the purposes of checking.
-"
-" See http://semver.org for info about version numbers.
-function! syntastic#util#versionIsAtLeast(installed, required) abort " {{{2
-    return syntastic#util#compareLexi(a:installed, a:required) >= 0
-endfunction " }}}2
-
-" Almost lexicographic comparison of two lists of integers. :) If lists
-" have different lengths, the "missing" elements are assumed to be 0.
-function! syntastic#util#compareLexi(a, b) abort " {{{2
-    for idx in range(max([len(a:a), len(a:b)]))
-        let a_element = str2nr(get(a:a, idx, 0))
-        let b_element = str2nr(get(a:b, idx, 0))
-        if a_element != b_element
-            return a_element > b_element ? 1 : -1
-        endif
-    endfor
-    " still here, thus everything matched
-    return 0
-endfunction " }}}2
-
-" strwidth() was added in Vim 7.3; if it doesn't exist, we use strlen()
-" and hope for the best :)
-let s:_width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
-lockvar s:_width
-
-function! syntastic#util#screenWidth(str, tabstop) abort " {{{2
-    let chunks = split(a:str, "\t", 1)
-    let width = s:_width(chunks[-1])
-    for c in chunks[:-2]
-        let cwidth = s:_width(c)
-        let width += cwidth + a:tabstop - cwidth % a:tabstop
-    endfor
-    return width
-endfunction " }}}2
-
-" Print as much of a:msg as possible without "Press Enter" prompt appearing
-function! syntastic#util#wideMsg(msg) abort " {{{2
-    let old_ruler = &ruler
-    let old_showcmd = &showcmd
-
-    "This is here because it is possible for some error messages to
-    "begin with \n which will cause a "press enter" prompt.
-    let msg = substitute(a:msg, "\n", '', 'g')
-
-    "convert tabs to spaces so that the tabs count towards the window
-    "width as the proper amount of characters
-    let chunks = split(msg, "\t", 1)
-    let msg = join(map(chunks[:-2], 'v:val . repeat(" ", &tabstop - s:_width(v:val) % &tabstop)'), '') . chunks[-1]
-    let msg = strpart(msg, 0, &columns - 1)
-
-    set noruler noshowcmd
-    call syntastic#util#redraw(0)
-
-    echo msg
-
-    let &ruler = old_ruler
-    let &showcmd = old_showcmd
-endfunction " }}}2
-
-" Check whether a buffer is loaded, listed, and not hidden
-function! syntastic#util#bufIsActive(buffer) abort " {{{2
-    " convert to number, or hell breaks loose
-    let buf = str2nr(a:buffer)
-
-    if !bufloaded(buf) || !buflisted(buf)
-        return 0
-    endif
-
-    " get rid of hidden buffers
-    for tab in range(1, tabpagenr('$'))
-        if index(tabpagebuflist(tab), buf) >= 0
-            return 1
-        endif
-    endfor
-
-    return 0
-endfunction " }}}2
-
-" Start in directory a:where and walk up the parent folders until it finds a
-" file named a:what; return path to that file
-function! syntastic#util#findFileInParent(what, where) abort " {{{2
-    let old_suffixesadd = &suffixesadd
-    let &suffixesadd = ''
-    let file = findfile(a:what, escape(a:where, ' ') . ';')
-    let &suffixesadd = old_suffixesadd
-    return file
-endfunction " }}}2
-
-" Start in directory a:where and walk up the parent folders until it finds a
-" file matching a:what; return path to that file
-function! syntastic#util#findGlobInParent(what, where) abort " {{{2
-    let here = fnamemodify(a:where, ':p')
-
-    let root = syntastic#util#Slash()
-    if syntastic#util#isRunningWindows() && here[1] ==# ':'
-        " The drive letter is an ever-green source of fun.  That's because
-        " we don't care about running syntastic on Amiga these days. ;)
-        let root = fnamemodify(root, ':p')
-        let root = here[0] . root[1:]
-    endif
-
-    let old = ''
-    while here !=# ''
-        let p = split(globpath(here, a:what, 1), '\n')
-
-        if !empty(p)
-            return fnamemodify(p[0], ':p')
-        elseif here ==? root || here ==? old
-            break
-        endif
-
-        let old = here
-
-        " we use ':h:h' rather than ':h' since ':p' adds a trailing '/'
-        " if 'here' is a directory
-        let here = fnamemodify(here, ':p:h:h')
-    endwhile
-
-    return ''
-endfunction " }}}2
-
-" Returns unique elements in a list
-function! syntastic#util#unique(list) abort " {{{2
-    let seen = {}
-    let uniques = []
-    for e in a:list
-        if !has_key(seen, e)
-            let seen[e] = 1
-            call add(uniques, e)
-        endif
-    endfor
-    return uniques
-endfunction " }}}2
-
-" A less noisy shellescape()
-function! syntastic#util#shescape(string) abort " {{{2
-    return a:string =~# '\m^[A-Za-z0-9_/.-]\+$' ? a:string : shellescape(a:string)
-endfunction " }}}2
-
-" A less noisy shellescape(expand())
-function! syntastic#util#shexpand(string, ...) abort " {{{2
-    return syntastic#util#shescape(a:0 ? expand(a:string, a:1) : expand(a:string, 1))
-endfunction " }}}2
-
-" Escape arguments
-function! syntastic#util#argsescape(opt) abort " {{{2
-    if type(a:opt) == type('') && a:opt !=# ''
-        return [a:opt]
-    elseif type(a:opt) == type([])
-        return map(copy(a:opt), 'syntastic#util#shescape(v:val)')
-    endif
-
-    return []
-endfunction " }}}2
-
-" Decode XML entities
-function! syntastic#util#decodeXMLEntities(string) abort " {{{2
-    let str = a:string
-    let str = substitute(str, '\m&lt;', '<', 'g')
-    let str = substitute(str, '\m&gt;', '>', 'g')
-    let str = substitute(str, '\m&quot;', '"', 'g')
-    let str = substitute(str, '\m&apos;', "'", 'g')
-    let str = substitute(str, '\m&amp;', '\&', 'g')
-    return str
-endfunction " }}}2
-
-function! syntastic#util#redraw(full) abort " {{{2
-    if a:full
-        redraw!
-    else
-        redraw
-    endif
-endfunction " }}}2
-
-function! syntastic#util#dictFilter(errors, filter) abort " {{{2
-    let rules = s:_translateFilter(a:filter)
-    " call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, "applying filter:", rules)
-    try
-        call filter(a:errors, rules)
-    catch /\m^Vim\%((\a\+)\)\=:E/
-        let msg = matchstr(v:exception, '\m^Vim\%((\a\+)\)\=:\zs.*')
-        call syntastic#log#error('quiet_messages: ' . msg)
-    endtry
-endfunction " }}}2
-
-" Return a [seconds, fractions] list of strings, representing the
-" (hopefully high resolution) time since program start
-function! syntastic#util#stamp() abort " {{{2
-    return split( split(reltimestr(reltime(g:_SYNTASTIC_START)))[0], '\.' )
-endfunction " }}}2
-
-let s:_str2float = function(exists('*str2float') ? 'str2float' : 'str2nr')
-lockvar s:_str2float
-
-function! syntastic#util#str2float(val) abort " {{{2
-    return s:_str2float(a:val)
-endfunction " }}}2
-
-function! syntastic#util#float2str(val) abort " {{{2
-    return s:_float2str(a:val)
-endfunction " }}}2
-
-" Crude printf()-like width formatter.  Handles wide characters.
-function! syntastic#util#wformat(format, str) abort " {{{2
-    if a:format ==# ''
-        return a:str
-    endif
-
- echomsg string(a:format) . ', ' . string(a:str)
-    let specs = matchlist(a:format, '\v^(-?)(0?)(%([1-9]\d*))?%(\.(\d+))?$')
-    if len(specs) < 5
-        return a:str
-    endif
-
-    let flushleft = specs[1] ==# '-'
-    let lpad = specs[2] ==# '0' ? '0' : ' '
-    let minlen = str2nr(specs[3])
-    let maxlen = str2nr(specs[4])
-    let out = substitute(a:str, "\t", ' ', 'g')
-
-    if maxlen && s:_width(out) > maxlen
-        let chars = filter(split(out, '\zs\ze', 1), 'v:val !=# ""')
-        let out = ''
-
-        if flushleft
-            for c in chars
-                if s:_width(out . c) < maxlen
-                    let out .= c
-                else
-                    let out .= &encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '>'
-                    break
-                endif
-            endfor
-        else
-            call reverse(chars)
-            for c in chars
-                if s:_width(c . out) < maxlen
-                    let out = c . out
-                else
-                    let out = (&encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '<') . out
-                    break
-                endif
-            endfor
-        endif
-    endif
-
-    if minlen && s:_width(out) < minlen
-        if flushleft
-            let out .= repeat(' ', minlen - s:_width(out))
-        else
-            let out = repeat(lpad, minlen - s:_width(out)) . out
-        endif
-    endif
-
-    return out
-endfunction " }}}2
-
-" }}}1
-
-" Private functions {{{1
-
-function! s:_translateFilter(filters) abort " {{{2
-    let conditions = []
-    for k in keys(a:filters)
-        if type(a:filters[k]) == type([])
-            call extend(conditions, map(copy(a:filters[k]), 's:_translateElement(k, v:val)'))
-        else
-            call add(conditions, s:_translateElement(k, a:filters[k]))
-        endif
-    endfor
-
-    if conditions == []
-        let conditions = ['1']
-    endif
-    return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
-endfunction " }}}2
-
-function! s:_translateElement(key, term) abort " {{{2
-    let fkey = a:key
-    if fkey[0] ==# '!'
-        let fkey = fkey[1:]
-        let not = 1
-    else
-        let not = 0
-    endif
-
-    if fkey ==? 'level'
-        let op = not ? ' ==? ' : ' !=? '
-        let ret = 'v:val["type"]' . op . string(a:term[0])
-    elseif fkey ==? 'type'
-        if a:term ==? 'style'
-            let op = not ? ' ==? ' : ' !=? '
-            let ret = 'get(v:val, "subtype", "")' . op . '"style"'
-        else
-            let op = not ? '!' : ''
-            let ret = op . 'has_key(v:val, "subtype")'
-        endif
-    elseif fkey ==? 'regex'
-        let op = not ? ' =~? ' : ' !~? '
-        let ret = 'v:val["text"]' . op . string(a:term)
-    elseif fkey ==? 'file' || fkey[:4] ==? 'file:'
-        let op = not ? ' =~# ' : ' !~# '
-        let ret = 'bufname(str2nr(v:val["bufnr"]))'
-        let mod = fkey[4:]
-        if mod !=# ''
-            let ret = 'fnamemodify(' . ret . ', ' . string(mod) . ')'
-        endif
-        let ret .= op . string(a:term)
-    else
-        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(fkey)))
-        let ret = '1'
-    endif
-    return ret
-endfunction " }}}2
-
-function! s:_rmrf(what) abort " {{{2
-    if !exists('s:rmdir')
-        let s:rmdir = syntastic#util#shescape(get(g:, 'netrw_localrmdir', 'rmdir'))
-    endif
-
-    if getftype(a:what) ==# 'dir'
-        if filewritable(a:what) != 2
-            return
-        endif
-
-        for f in split(globpath(a:what, '*', 1), "\n")
-            call s:_rmrf(f)
-        endfor
-        silent! call syntastic#util#system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
-    else
-        silent! call delete(a:what)
-    endif
-endfunction " }}}2
-
-function! s:_float2str_smart(val) abort " {{{2
-    return printf('%.1f', a:val)
-endfunction " }}}2
-
-function! s:_float2str_dumb(val) abort " {{{2
-    return a:val
-endfunction " }}}2
-
-let s:_float2str = function(has('float') ? 's:_float2str_smart' : 's:_float2str_dumb')
-lockvar s:_float2str
-
-" }}}1
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/doc/syntastic.txt b/bundle/syntastic/doc/syntastic.txt
deleted file mode 100644
index 853fd23..0000000
--- a/bundle/syntastic/doc/syntastic.txt
+++ /dev/null
@@ -1,1011 +0,0 @@
-*syntastic.txt*   Syntax checking on the fly has never been so pimp.
-*syntastic*
-
-
-                    It's a bird! It's a plane! ZOMG It's ... ~
-
-                   _____             __             __  _      ~
-                  / ___/__  ______  / /_____ ______/ /_(_)____ ~
-                  \__ \/ / / / __ \/ __/ __ `/ ___/ __/ / ___/ ~
-                 ___/ / /_/ / / / / /_/ /_/ (__  ) /_/ / /__   ~
-                /____/\__, /_/ /_/\__/\__,_/____/\__/_/\___/   ~
-                     /____/                                    ~
-
-
-
-                              Reference Manual~
-
-
-==============================================================================
-CONTENTS                                                  *syntastic-contents*
-
-    1.Intro........................................|syntastic-intro|
-        1.1.Quick start............................|syntastic-quickstart|
-        1.2.Recommended settings...................|syntastic-recommended|
-    2.Functionality provided.......................|syntastic-functionality|
-        2.1.The statusline flag....................|syntastic-statusline-flag|
-        2.2.Error signs............................|syntastic-error-signs|
-        2.3.Error window...........................|syntastic-error-window|
-        2.4.Error highlighting.....................|syntastic-highlighting|
-        2.5.Aggregating errors.....................|syntastic-aggregating-errors|
-        2.6.Filtering errors.......................|syntastic-filtering-errors|
-    3.Commands.....................................|syntastic-commands|
-    4.Global Options...............................|syntastic-global-options|
-    5.Checker Options..............................|syntastic-checker-options|
-        5.1.Choosing which checkers to use.........|syntastic-filetype-checkers|
-        5.2.Choosing the executable................|syntastic-config-exec|
-        5.3.Configuring specific checkers..........|syntastic-config-makeprg|
-        5.4.Sorting errors.........................|syntastic-config-sort|
-    6.Notes........................................|syntastic-notes|
-        6.1.Handling of composite filetypes........|syntastic-composite|
-        6.2.Editing files over network.............|syntastic-netrw|
-        6.3.The 'shellslash' option................|syntastic-shellslash|
-        6.4.Saving Vim sessions....................|syntastic-sessions|
-    7.Compatibility with other software............|syntastic-compatibility|
-        7.1.The csh and tcsh shells................|syntastic-csh|
-        7.2.Eclim..................................|syntastic-eclim|
-        7.3.The fish shell.........................|syntastic-fish|
-        7.4.The fizsh shell........................|syntastic-fizsh|
-        7.5.flagship...............................|syntastic-flagship|
-        7.6.powerline..............................|syntastic-powerline|
-        7.7.The PowerShell shell...................|syntastic-powershell|
-        7.8.python-mode............................|syntastic-pymode|
-        7.9.vim-auto-save..........................|syntastic-vim-auto-save|
-        7.10.vim-go................................|syntastic-vim-go|
-        7.11.vim-virtualenv........................|syntastic-vim-virtualenv|
-        7.12.YouCompleteMe.........................|syntastic-ycm|
-        7.13.The zsh shell and MacVim..............|syntastic-zsh|
-    8.About........................................|syntastic-about|
-    9.License......................................|syntastic-license|
-
-
-==============================================================================
-1. Intro                                                     *syntastic-intro*
-
-Syntastic is a syntax checking plugin that runs files through external syntax
-checkers. This can be done on demand, or automatically as files are saved and
-opened.  If syntax errors are detected, the user is notified and is happy
-because they didn't have to compile their code or execute their script to find
-them.
-
-Syntastic comes in two parts: the syntax checker plugins, and the core. The
-syntax checker plugins are defined on a per-filetype basis where each one wraps
-up an external syntax checking program. The core script delegates off to these
-plugins and uses their output to provide the syntastic functionality.
-
-Take a look at the wiki for a list of supported filetypes and checkers:
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
-
-Note: This doc only deals with using syntastic. To learn how to write syntax
-checker integrations, see the guide on the GitHub wiki:
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checker-Guide
-
-------------------------------------------------------------------------------
-1.1. Quick start                                        *syntastic-quickstart*
-
-Syntastic comes preconfigured with a default list of enabled checkers per
-|filetype|. This list is kept reasonably short to prevent slowing down Vim or
-trying to use conflicting checkers.
-
-You can see the list of checkers available for the current filetype with the
-|:SyntasticInfo| command.
-
-You probably want to override the configured list of checkers for the
-filetypes you use, and also change the arguments passed to specific checkers
-to suit your needs. See |syntastic-checker-options| below for details.
-
-Use |:SyntasticCheck| to manually check right now. Use |:Errors| to open the
-|location-list| window, and |:lclose| to close it. You can clear the error
-list with |:SyntasticReset|, and you can use |:SyntasticToggleMode| to switch
-between active (checking on writing the buffer) and passive (manual) checking.
-
-You don't have to switch focus to the |location-list| window to jump to the
-different errors.  Vim provides several built-in commands for this, for
-example |:lnext| and |:lprevious|.  You may want to add shortcut mappings for
-these commands, or perhaps install a plugin such as Tim Pope's 'unimpaired'
-(see https://github.com/tpope/vim-unimpaired) that provides such mappings.
-
-------------------------------------------------------------------------------
-1.2. Recommended settings                              *syntastic-recommended*
-
-Syntastic has numerous options that can be configured, and the defaults are
-not particularly well suitable for new users. It is recommended that you start
-by adding the following lines to your vimrc, and return to them later as
-needed: >
-    set statusline+=%#warningmsg#
-    set statusline+=%{SyntasticStatuslineFlag()}
-    set statusline+=%*
-
-    let g:syntastic_always_populate_loc_list = 1
-    let g:syntastic_auto_loc_list = 1
-    let g:syntastic_check_on_open = 1
-    let g:syntastic_check_on_wq = 0
-<
-==============================================================================
-2. Functionality provided                            *syntastic-functionality*
-
-Syntax checking can be done automatically or on demand (see
-|'syntastic_mode_map'| and |:SyntasticToggleMode| for configuring this).
-
-When syntax checking is done, the features below can be used to notify the
-user of errors. See |syntastic-global-options| for how to configure and
-activate/deactivate these features.
-
-    * A statusline flag
-    * Signs beside lines with errors
-    * The |location-list| can be populated with the errors for the associated
-      buffer
-    * Erroneous parts of lines can be highlighted (this functionality is only
-      provided by some syntax checkers)
-    * Balloons (if the |+balloon_eval| feature is compiled in) can be used to
-      display error messages for erroneous lines when hovering the mouse over
-      them
-    * Error messages from multiple checkers can be aggregated in a single list
-
-------------------------------------------------------------------------------
-2.1. The statusline flag                           *syntastic-statusline-flag*
-
-To use the statusline flag, this must appear in your |'statusline'| setting >
-    %{SyntasticStatuslineFlag()}
-<
-Something like this could be more useful: >
-    set statusline+=%#warningmsg#
-    set statusline+=%{SyntasticStatuslineFlag()}
-    set statusline+=%*
-<
-When syntax errors are detected a flag will be shown. The content of the flag
-is derived from the |syntastic_stl_format| option.
-
-------------------------------------------------------------------------------
-2.2. Error signs                                       *syntastic-error-signs*
-
-Syntastic uses the |:sign| commands (provided that the |+signs| feature is
-compiled in) to mark lines with errors and warnings in the sign column. To
-enable this feature, use the |'syntastic_enable_signs'| option.
-
-Signs are colored using the Error and Todo syntax highlight groups by default
-(see |group-name|). If you wish to customize the colors for the signs, you
-can use the following groups:
-    SyntasticErrorSign - For syntax errors, links to 'error' by default
-    SyntasticWarningSign - For syntax warnings, links to 'todo' by default
-    SyntasticStyleErrorSign - For style errors, links to 'SyntasticErrorSign'
-                              by default
-    SyntasticStyleWarningSign - For style warnings, links to
-                                'SyntasticWarningSign' by default
-
-Example: >
-    highlight SyntasticErrorSign guifg=white guibg=red
-<
-To set up highlighting for the line where a sign resides, you can use the
-following highlight groups:
-    SyntasticErrorLine
-    SyntasticWarningLine
-    SyntasticStyleErrorLine - Links to 'SyntasticErrorLine' by default
-    SyntasticStyleWarningLine - Links to 'SyntasticWarningLine' by default
-
-Example: >
-    highlight SyntasticErrorLine guibg=#2f0000
-<
-------------------------------------------------------------------------------
-2.3. The error window                                   *syntastic-error-window*
-
-You can use the |:Errors| command to display the errors for the current buffer
-in the |location-list|.
-
-By default syntastic doesn't fill the |location-list| with the errors found by
-the checkers, in order to reduce clashes with other plugins. Consequently, if
-you run |:lopen| or |:lwindow| rather than |:Errors| to open the error window
-you wouldn't see syntastic's list of errors. If you insist on using |:lopen|
-or |:lwindow| you should either run |:SyntasticSetLoclist| after running the
-checks, or set |syntastic_always_populate_loc_list| which tells syntastic to
-update the |location-list| automatically.
-
-------------------------------------------------------------------------------
-2.4. Error highlighting                               *syntastic-highlighting*
-
-Some checkers provide enough information for syntastic to be able to highlight
-errors. By default the SpellBad syntax highlight group is used to color errors,
-and the SpellCap group is used for warnings. If you wish to customize the
-colors for highlighting you can use the following groups:
-    SyntasticError - Links to 'SpellBad' by default
-    SyntasticWarning - Links to 'SpellCap' by default
-    SyntasticStyleError - Links to SyntasticError by default
-    SyntasticStyleWarning - Links to SyntasticWarning by default
-
-Example: >
-    highlight SyntasticError guibg=#2f0000
-<
-------------------------------------------------------------------------------
-2.5. Aggregating errors                         *syntastic-aggregating-errors*
-
-By default, namely if |'syntastic_aggregate_errors'| is unset, syntastic runs
-in turn the checkers corresponding to the filetype of the current file (see
-|syntastic-filetype-checkers|), and stops as soon as a checker reports any
-errors. It then notifies you of the errors using the notification mechanisms
-above. In this mode error lists are always produced by a single checker, and,
-if you open the error window, the name of the checker that generated the errors
-is shown on the statusline of the error window.
-
-If |'syntastic_aggregate_errors'| is set, syntastic runs all checkers that
-apply (still cf. |syntastic-filetype-checkers|), then aggregates errors found
-by all checkers in a single list, and notifies you. In this mode each error
-message is labeled with the name of the checker that generated it, but you can
-disable generation of these labels by turning off '|syntastic_id_checkers|'.
-
-If |'syntastic_sort_aggregated_errors'| is set (which is the default), messages
-in the aggregated list are grouped by file, then sorted by line number, then
-type, then column number.  Otherwise messages produced by the same checker are
-grouped together, and sorting within each group is decided by the variables
-|'syntastic_<filetype>_<checker>_sort'|.
-
-------------------------------------------------------------------------------
-2.6 Filtering errors                              *syntastic-filtering-errors*
-
-You can selectively disable some of the errors found by checkers either
-using |'syntastic_quiet_messages'|, or by specifying a list of patterns in
-|'syntastic_ignore_files'|.
-
-See also: |'syntastic_<filetype>_<checker>_quiet_messages'| and
-|'b:syntastic_skip_checks'|.
-
-==============================================================================
-3. Commands                                               *syntastic-commands*
-
-:Errors                                                              *:Errors*
-
-When errors have been detected, use this command to pop up the |location-list|
-and display the error messages.
-
-Please note that the |:Errors| command overwrites the current location list with
-syntastic's own location list.
-
-:SyntasticToggleMode                                    *:SyntasticToggleMode*
-
-Toggles syntastic between active and passive mode. See |'syntastic_mode_map'|
-for more info.
-
-:SyntasticCheck                                              *:SyntasticCheck*
-
-Manually cause a syntax check to be done.  By default the checkers in the
-|'g:syntastic_<filetype>_checkers'| or |'b:syntastic_checkers'| lists are run,
-cf. |syntastic-filetype-checkers|.  If |'syntastic_aggregate_errors'| is unset
-(which is the default), checking stops the first time a checker reports any
-errors; if |'syntastic_aggregate_errors'| is set, all checkers that apply are
-run in turn, and all errors found are aggregated in a single list.
-
-The command may be followed by a (space separated) list of checkers.  In this
-case |'g:syntastic_<filetype>_checkers'| and |'b:syntastic_checkers'| are
-ignored, and the checkers named by the command's arguments are run instead, in
-the order specified.  The set by |'syntastic_aggregate_errors'| still apply.
-
-Example: >
-    :SyntasticCheck flake8 pylint
-<
-:SyntasticInfo                                                *:SyntasticInfo*
-
-The command takes an optional argument, and outputs information about the
-checkers available for the filetype named by said argument, or for the current
-filetype if no argument was provided.
-
-:SyntasticReset                                              *:SyntasticReset*
-
-Resets the list of errors and turns off all error notifiers.
-
-:SyntasticSetLoclist                                    *:SyntasticSetLoclist*
-
-If |'syntastic_always_populate_loc_list'| is not set, the |location-list| is
-not filled in automatically with the list of errors detected by the checkers.
-This is useful if you run syntastic along with other plugins that use location
-lists. The |:SyntasticSetLoclist| command allows you to stick the errors into
-the location list explicitly.
-
-==============================================================================
-4. Global Options                                   *syntastic-global-options*
-
-                                                   *'syntastic_check_on_open'*
-Default: 0
-If this variable is enabled, syntastic in active mode will run syntax checks
-when buffers are first loaded, as well as on saving: >
-    let g:syntastic_check_on_open = 1
-<
-                                                     *'syntastic_check_on_wq'*
-Default: 1
-In active mode syntax checks are normally run whenever buffers are written to
-disk, even when the writes happen just before quitting Vim.  If you want to
-skip checks when you issue |:wq|, |:x|, and |:ZZ|, set this variable to 0: >
-    let g:syntastic_check_on_wq = 0
-<
-                                                *'syntastic_aggregate_errors'*
-Default: 0
-When enabled, syntastic runs all checkers that apply to the current filetype,
-then aggregates errors found by all checkers and displays them. When disabled,
-syntastic runs each checker in turn, and stops to display the results the first
-time a checker finds any errors. >
-    let g:syntastic_aggregate_errors = 1
-<
-                                                     *'syntastic_id_checkers'*
-Default: 1
-When results from multiple checkers are aggregated in a single error list
-(that is either when |'syntastic_aggregate_errors'| is enabled, or when
-checking a file with a composite filetype), it might not be immediately
-obvious which checker has produced a given error message. This variable
-instructs syntastic to label error messages with the names of the checkers
-that created them. >
-    let g:syntastic_id_checkers = 0
-<
-                                          *'syntastic_sort_aggregated_errors'*
-Default: 1
-By default, when results from multiple checkers are aggregated in a single
-error list (that is either when |'syntastic_aggregate_errors'| is enabled,
-or when checking a file with a composite filetype), errors are grouped by
-file, then sorted by line number, then grouped by type (namely errors take
-precedence over warnings), then they are sorted by column number.  If you want
-to leave messages grouped by checker output, set this variable to 0: >
-    let g:syntastic_sort_aggregated_errors = 0
-<
-                                              *'syntastic_echo_current_error'*
-Default: 1
-If enabled, syntastic will echo current error to the command window. If
-multiple errors are found on the same line, |'syntastic_cursor_columns'| is
-used to decide which one is shown. >
-    let g:syntastic_echo_current_error = 1
-<
-                                                  *'syntastic_cursor_columns'*
-Default: 1
-This option controls which errors are echoed to the command window if
-|'syntastic_echo_current_error'| is set and multiple errors are found on the
-same line. When the option is enabled, the first error corresponding to the
-current column is shown. Otherwise, the first error on the current line is
-echoed, regardless of the cursor position on the current line.
-
-When dealing with very large lists of errors, disabling this option can speed
-up navigation significantly: >
-    let g:syntastic_cursor_column = 0
-<
-                                                    *'syntastic_enable_signs'*
-Default: 1
-Use this option to tell syntastic whether to use the |:sign| interface to mark
-syntax errors: >
-    let g:syntastic_enable_signs = 1
-<
-                     *'syntastic_error_symbol'* *'syntastic_style_error_symbol'*
-                 *'syntastic_warning_symbol'* *'syntastic_style_warning_symbol'*
-Use this option to control what the syntastic |:sign| text contains. Several
-error symbols can be customized:
-    syntastic_error_symbol - For syntax errors, defaults to '>>'
-    syntastic_style_error_symbol - For style errors, defaults to 'S>'
-    syntastic_warning_symbol - For syntax warnings, defaults to '>>'
-    syntastic_style_warning_symbol - For style warnings, defaults to 'S>'
-
-Example: >
-    let g:syntastic_error_symbol = "✗"
-    let g:syntastic_warning_symbol = "⚠"
-<
-                                                 *'syntastic_enable_balloons'*
-Default: 1
-Use this option to tell syntastic whether to display error messages in balloons
-when the mouse is hovered over erroneous lines: >
-    let g:syntastic_enable_balloons = 1
-<
-Note that Vim must be compiled with |+balloon_eval|.
-
-                                             *'syntastic_enable_highlighting'*
-Default: 1
-Use this option to tell syntastic whether to use syntax highlighting to mark
-errors (where possible). Highlighting can be turned off with the following >
-    let g:syntastic_enable_highlighting = 0
-<
-                                        *'syntastic_always_populate_loc_list'*
-Default: 0
-By default syntastic doesn't fill the |location-list| with the errors found
-by the checkers, in order to reduce clashes with other plugins. Enable this
-option to tell syntastic to always stick any detected errors into the
-|location-list|: >
-    let g:syntastic_always_populate_loc_list = 1
-<
-Please note that if |'syntastic_auto_jump'| is set to a non-zero value the
-location list is overwritten with Syntastic's own list when taking a jump,
-regardless of the value of |'syntastic_always_populate_loc_list'|.  The
-location list is also overwritten when running the |:Errors| command.
-
-                                                       *'syntastic_auto_jump'*
-Default: 0
-Enable this option if you want the cursor to jump to the first detected issue
-when saving or opening a file.
-
-When set to 0 the cursor won't jump automatically. >
-    let g:syntastic_auto_jump = 0
-<
-When set to 1 the cursor will always jump to the first issue detected,
-regardless of type. >
-    let g:syntastic_auto_jump = 1
-<
-When set to 2 the cursor will jump to the first issue detected, but only if
-this issue is an error. >
-    let g:syntastic_auto_jump = 2
-<
-When set to 3 the cursor will jump to the first error detected, if any. If
-all issues detected are warnings, the cursor won't jump. >
-    let g:syntastic_auto_jump = 3
-<
-Please note that in either situation taking the jump also has the side effect
-of the location list being overwritten with Syntastic's own location list,
-regardless of the value of |'syntastic_always_populate_loc_list'|.
-
-                                                   *'syntastic_auto_loc_list'*
-Default: 2
-Use this option to tell syntastic to automatically open and/or close the
-|location-list| (see |syntastic-error-window|).
-
-When set to 0 the error window will not be opened or closed automatically. >
-    let g:syntastic_auto_loc_list = 0
-<
-When set to 1 the error window will be automatically opened when errors are
-detected, and closed when none are detected. >
-    let g:syntastic_auto_loc_list = 1
-<
-When set to 2 the error window will be automatically closed when no errors are
-detected, but not opened automatically. >
-    let g:syntastic_auto_loc_list = 2
-<
-                                                 *'syntastic_loc_list_height'*
-Default: 10
-Use this option to specify the height of the location lists that syntastic
-opens. >
-    let g:syntastic_loc_list_height = 5
-<
-                                                    *'syntastic_ignore_files'*
-Default: []
-Use this option to specify files that syntastic should never check.  It's a
-list of |regular-expression| patterns.  The full paths of files (see |::p|) are
-matched against these patterns, and the matches are case-sensitive. Use |\c|
-to specify case-insensitive patterns.  Example: >
-    let g:syntastic_ignore_files = ['\m^/usr/include/', '\m\c\.h$']
-<
-                                                    *'syntastic_filetype_map'*
-Default: {}
-Use this option to map non-standard filetypes to standard ones.  Corresponding
-checkers are mapped accordingly, which allows syntastic to check files with
-non-standard filetypes: >
-    let g:syntastic_filetype_map = {
-        \ "plaintex": "tex",
-        \ "gentoo-metadata": "xml" }
-<
-Composite filetypes can also be mapped to simple types, which disables the
-default behaviour of running both checkers against the input file: >
-    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
-<
-                                                        *'syntastic_mode_map'*
-Default: { "mode": "active",
-           "active_filetypes": [],
-           "passive_filetypes": [] }
-Use this option to fine tune when automatic syntax checking is done (or not
-done).
-
-The option should be set to something like: >
-
-    let g:syntastic_mode_map = {
-        \ "mode": "active",
-        \ "active_filetypes": ["ruby", "php"],
-        \ "passive_filetypes": ["puppet"] }
-<
-"mode" can be mapped to one of two values - "active" or "passive". When set
-to "active", syntastic does automatic checking whenever a buffer is saved or
-initially opened.  When set to "passive" syntastic only checks when the user
-calls |:SyntasticCheck|.
-
-The exceptions to these rules are defined with "active_filetypes" and
-"passive_filetypes". In passive mode, automatic checks are still done for
-filetypes in the "active_filetypes" array (and "passive_filetypes" is
-ignored). In active mode, automatic checks are not done for any filetypes in
-the "passive_filetypes" array ("active_filetypes" is ignored).
-
-If any of "mode", "active_filetypes", or "passive_filetypes" are left
-unspecified, they default to values above.
-
-If local variable |'b:syntastic_mode'| is defined its value takes precedence
-over all calculations involving |'syntastic_mode_map'| for the corresponding
-buffer.
-
-At runtime, the |:SyntasticToggleMode| command can be used to switch between
-active and passive modes.
-
-                                                          *'b:syntastic_mode'*
-Default: unset
-Only the local form |'b:syntastic_mode'| is used. When set to either "active"
-or "passive", it takes precedence over |'syntastic_mode_map'| when deciding
-whether the corresponding buffer should be checked automatically.
-
-                                                  *'syntastic_quiet_messages'*
-Default: {}
-Use this option to filter out some of the messages produced by checkers.  The
-option should be set to something like: >
-    let g:syntastic_quiet_messages = {
-        \ "!level":  "errors",
-        \ "type":    "style",
-        \ "regex":   '\m\[C03\d\d\]',
-        \ "file:p":  ['\m^/usr/include/', '\m\c\.h$'] }
-<
-Each element turns off messages matching the patterns specified by the
-corresponding value. Values are lists, but if a list consist of a single
-element you may omit the brackets (e.g. you may write "style" instead of
-["style"]). Elements with values [] or '' are ignored (this is useful for
-overriding filters, cf. |filter-overrides|).
-
-    "level" - takes one of two values, "warnings" or "errors"
-    "type"  - can be either "syntax" or "style"
-    "regex" - is matched against the messages' text as a case-insensitive
-              |regular-expression|
-    "file"  - is matched against the filenames the messages refer to, as a
-              case-sensitive |regular-expression|.
-
-If a key is prefixed by an exclamation mark "!", the corresponding filter is
-negated (i.e. the above example silences all messages that are NOT errors).
-
-The "file" key may be followed by one or more filename modifiers (see
-|filename-modifiers|). The modifiers are applied to the filenames the messages
-refer to before matching against the value (i.e. in the above example the full
-path of the issues are matched against '\m^/usr/include/' and '\m\c\.h$').
-
-If |'syntastic_id_checkers'| is set, filters are applied before error messages
-are labeled with the names of the checkers that created them.
-
-There are also checker-specific variants of this option, providing finer
-control. They are named |'syntastic_<filetype>_<checker>_quiet_messages'|.
-
-For a particular checker, if both a |'syntastic_quiet_messages'| filter and
-a checker-specific filter are present, they are both applied (to the list of
-errors produced by the said checker). In case of conflicting values for the
-same keys, the values of the checker-specific filters take precedence.
-
-                                                            *filter-overrides*
-Since filter elements with values [] or '' are ignored, you can disable global
-filters for particular checkers, by setting the values of the corresponding
-elements in |'syntastic_<filetype>_<checker>_quiet_messages'| to [] or ''. For
-example, the following setting will silence all warnings, except for the
-ones produced by "pylint": >
-    let g:syntastic_quiet_messages = { "level": "warnings" }
-    let g:syntastic_python_pylint_quiet_messages = { "level" : [] }
-<
-                                                      *'syntastic_stl_format'*
-Default: [Syntax: line:%F (%t)]
-Use this option to control what the syntastic statusline text contains. Several
-magic flags are available to insert information:
-    %e  - number of errors
-    %w  - number of warnings
-    %t  - total number of warnings and errors
-    %ne - filename of file containing first error
-    %nw - filename of file containing first warning
-    %N  - filename of file containing first warning or error
-    %pe - filename with path of file containing first error
-    %pw - filename with path of file containing first warning
-    %P  - filename with path of file containing first warning or error
-    %fe - line number of first error
-    %fw - line number of first warning
-    %F  - line number of first warning or error
-
-These flags accept width and alignment controls similar to the ones used by
-|'statusline'| flags:
-    %-0{minwid}.{maxwid}{flag}
-
-All fields except {flag} are optional. A single percent sign can be given as
-"%%".
-
-Several additional flags are available to hide text under certain conditions:
-    %E{...} - hide the text in the brackets unless there are errors
-    %W{...} - hide the text in the brackets unless there are warnings
-    %B{...} - hide the text in the brackets unless there are both warnings AND
-              errors
-These flags can't be nested.
-
-Example: >
-    let g:syntastic_stl_format = '[%E{Err: %fe #%e}%B{, }%W{Warn: %fw #%w}]'
-<
-If this format is used and the current buffer has 5 errors and 1 warning
-starting on lines 20 and 10 respectively then this would appear on the
-statusline: >
-    [Err: 20 #5, Warn: 10 #1]
-<
-If the buffer had 2 warnings, starting on line 5 then this would appear: >
-    [Warn: 5 #2]
-<
-                                                   *'b:syntastic_skip_checks'*
-Default: unset
-Only the local form |'b:syntastic_skip_checks'| is used. When set to a true
-value, no checks are run against the corresponding buffer. Example: >
-    let b:syntastic_skip_checks = 1
-<
-                                                    *'syntastic_full_redraws'*
-Default: 0 in GUI Vim and MacVim, 1 otherwise
-Controls whether syntastic calls |:redraw| or |:redraw!| for screen redraws.
-Changing it can in principle make screen redraws smoother, but it can also
-cause screen to flicker, or cause ghost characters. Leaving it to the default
-should be safe.
-
-                                                     *'syntastic_exit_checks'*
-Default: 0 when running under "cmd.exe" on Windows, 1 otherwise
-Syntastic attempts to catch abnormal termination conditions from checkers by
-looking at their exit codes. The "cmd.exe" shell on Windows make these checks
-meaningless, by returning 1 to Vim when the checkers exit with non-zero codes.
-The above variable can be used to disable exit code checks in syntastic.
-
-                                                           *'syntastic_shell'*
-Default: Vim's 'shell'
-
-This is the (full path to) the shell syntastic will use to run the checkers.
-On UNIX and Mac OS-X this shell must accept Bourne-compatible syntax for
-file "stdout" and "stderr" redirections ">file" and "2>file".  Examples of
-compatible shells are "zsh", "bash", "ksh", and of course the original Bourne
-"sh".
-
-This shell is independent of Vim's 'shell', and it isn't used for interactive
-operations.  It must take care to initialize all environment variables needed
-by the checkers you're using.  Example: >
-    let g:syntastic_shell = "/bin/sh"
-<
-                                                           *'syntastic_debug'*
-Default: 0
-Set this to the sum of one or more of the following flags to enable
-debugging:
-
-     1 - trace general workflow
-     2 - dump location lists
-     4 - trace notifiers
-     8 - trace autocommands
-    16 - dump options
-    32 - trace running of specific checkers
-
-Example: >
-    let g:syntastic_debug = 1
-<
-Syntastic will then add debugging messages to Vim's |message-history|. You can
-examine these messages with |:mes|.
-
-                                                      *'syntastic_debug_file'*
-Default: unset
-When set, debugging messages are written to the file named by its value, in
-addition to being added to Vim's |message-history|: >
-    let g:syntastic_debug_file = '~/syntastic.log'
-<
-                                                 *'syntastic_extra_filetypes'*
-Default: []
-List of filetypes handled by checkers external to syntastic.  If you have a Vim
-plugin that adds a checker for syntastic, and if the said checker deals with a
-filetype that is unknown to syntastic, you might consider adding that filetype
-to this list: >
-    let g:syntastic_extra_filetypes = [ "make", "gitcommit" ]
-<
-This will allow |:SyntasticInfo| to do proper tab completion for the new
-filetypes.
-
-==============================================================================
-5. Checker Options                                 *syntastic-checker-options*
-
-------------------------------------------------------------------------------
-5.1 Choosing which checkers to use               *syntastic-filetype-checkers*
-
-                                           *'g:syntastic_<filetype>_checkers'*
-You can tell syntastic which checkers to run for a given filetype by setting a
-variable 'g:syntastic_<filetype>_checkers' to a list of checkers, e.g. >
-    let g:syntastic_php_checkers = ["php", "phpcs", "phpmd"]
-<
-                                                      *'b:syntastic_checkers'*
-There is also a per-buffer version of this setting, 'b:syntastic_checkers'.
-When set, it takes precedence over |'g:syntastic_<filetype>_checkers'|.  You can
-use this in an autocmd to configure specific checkers for particular paths: >
-    autocmd FileType python if stridx(expand("%:p"), "/some/path/") == 0 |
-        \ let b:syntastic_checkers = ["pylint"] | endif
-<
-If neither |'g:syntastic_<filetype>_checkers'| nor |'b:syntastic_checkers'|
-is set, a default list of checker is used. Beware however that this list
-deliberately kept minimal, for performance reasons.
-
-Take a look at the wiki to find out what checkers and filetypes are supported
-by syntastic:
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
-
-Use |:SyntasticInfo| to see which checkers are available for a given filetype.
-
-------------------------------------------------------------------------------
-5.2 Choosing the executable                            *syntastic-config-exec*
-
-                                       *'syntastic_<filetype>_<checker>_exec'*
-The executable run by a checker is normally defined automatically, when the
-checker is registered. You can however override it, by setting the variable
-'g:syntastic_<filetype>_<checker>_exec': >
-    let g:syntastic_ruby_mri_exec = '~/bin/ruby2'
-<
-This variable has a local version, 'b:syntastic_<filetype>_<checker>_exec',
-which takes precedence over the global one in the corresponding buffer.
-
-                                                *'b:syntastic_<checker>_exec'*
-And there is also a local variable named 'b:syntastic_<checker>_exec', which
-takes precedence over both 'b:syntastic_<filetype>_<checker>_exec' and
-'g:syntastic_<filetype>_<checker>_exec' in the buffers where it is defined.
-
-------------------------------------------------------------------------------
-5.3 Configuring specific checkers                   *syntastic-config-makeprg*
-
-Most checkers use the 'makeprgBuild()' function and provide many options by
-default - in fact you can customise every part of the command that gets called.
-
-                                   *'syntastic_<filetype>_<checker>_<option>'*
-Checkers that use 'makeprgBuild()' construct a 'makeprg' like this: >
-    let makeprg = self.makeprgBuild({
-                \ "exe": self.getExec(),
-                \ "args": "-a -b -c",
-                \ "post_args": "--more --args",
-                \ "tail": "2>/dev/null" })
-<
-The result is a 'makeprg' of the form: >
-    <exe> <args> <fname> <post_args> <tail>
-<
-All arguments above are optional, and can be overridden by setting global
-variables 'g:syntastic_<filetype>_<checker-name>_<option-name>' - even
-parameters not specified in the call to makeprgBuild(). These variables also
-have local versions 'b:syntastic_<filetype>_<checker-name>_<option-name>',
-which take precedence over the global ones in the corresponding buffers.
-
-If one of these variables has a non-empty default and you want it to be empty,
-you can set it to an empty string, e.g.: >
-    let g:syntastic_javascript_jslint_args = ""
-<
-                                        *'syntastic_<filetype>_<checker>_exe'*
-The 'exe' is normally the same as the 'exec' attribute described above, in
-which case it may be omitted. However, you can use it to add environment
-variables, or to change the way the checker is run. For example this setup
-allows you to run PC-Lint under Wine emulation on Linux: >
-    let  g:syntastic_c_pc_lint_exec = "wine"
-    let  g:syntastic_c_pc_lint_exe = "wine c:/path/to/lint-nt.exe"
-<
-To override the args and the tail: >
-    let g:syntastic_c_pc_lint_args = "-w5 -Iz:/usr/include/linux"
-    let g:syntastic_c_pc_lint_tail = "2>/dev/null"
-<
-The general form of the override options is: >
-    syntastic_<filetype>_<checker>_<option-name>
-<
-For checkers that do not use the 'makeprgBuild()' function you will have to
-look at the source code of the checker in question. If there are specific
-options that can be set, these are usually documented in the wiki:
-
-    https://github.com/scrooloose/syntastic/wiki/Syntax-Checkers
-
-                             *'syntastic_<filetype>_<checker>_quiet_messages'*
-In the same vein, 'g:syntastic_<filetype>_<checker-name>_quiet_messages' can
-be used to restrict message filters to messages produced by specific checkers.
-Example: >
-    let g:syntastic_python_pylama_quiet_messages = {
-        \ "type":  "style",
-        \ "regex": '\m\[C03\d\d\]' }
-<
-See |syntastic_quiet_messages| for the syntax.
-
-------------------------------------------------------------------------------
-5.4 Sorting errors                                     *syntastic-config-sort*
-
-                                       *'syntastic_<filetype>_<checker>_sort'*
-Syntastic may decide to group the errors produced by some checkers by file,
-then sort them by line number, then by type, then by column number. If you'd
-prefer to see the errors in the order in which they are output by the external
-checker you can set the variable |'g:syntastic_<filetype>_<checker>_sort'| to 0.
-
-Alternatively, if syntastic doesn't reorder the errors produced by a checker
-but you'd like it to sort them, you can set the same variable to 1.
-
-There is also a local version |'b:syntastic_<filetype>_<checker>_sort'| of
-this variable, that takes precedence over it in the buffers where it is
-defined.
-
-For aggregated lists (see |syntastic-aggregating-errors|) these variables are
-ignored if |'syntastic_sort_aggregated_errors'| is set (which is the default).
-
-==============================================================================
-6. Notes                                                     *syntastic-notes*
-
-------------------------------------------------------------------------------
-6.1. Handling of composite filetypes                     *syntastic-composite*
-
-Some Vim plugins use composite filetypes, such as "django.python" or
-"handlebars.html". Normally, syntastic deals with this situation by splitting
-the filetype in its simple components, and calling all checkers that apply.
-If this behaviour is not desirable, you can disable it by mapping the
-composite filetypes to simple ones using |'syntastic_filetype_map'|, e.g.: >
-    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
-<
-------------------------------------------------------------------------------
-6.2 Editing files over network                               *syntastic-netrw*
-
-The standard plugin |netrw| allows Vim to transparently edit files over
-network and inside archives.  Currently syntastic doesn't support this mode
-of operation.  It can only check files that can be accessed directly by local
-checkers, without any translation or conversion.
-
-------------------------------------------------------------------------------
-6.3 The 'shellslash' option                             *syntastic-shellslash*
-
-The 'shellslash' option is relevant only on Windows systems.  This option
-determines (among other things) the rules for quoting command lines, and there
-is no easy way for syntastic to make sure its state is appropriate for your
-shell.  It should be turned off if your 'shell' (or |'syntastic_shell'|) is
-"cmd.exe", and on for shells that expect an UNIX-like syntax, such as Cygwin's
-"sh".  Most checkers will stop working if 'shellslash' is set to the wrong
-value.
-
-------------------------------------------------------------------------------
-6.4 Saving Vim sessions                                   *syntastic-sessions*
-
-If you use |:mksession| to save Vim sessions you should probably make sure to
-remove option "blank" from 'sessionoptions': >
-    set sessionoptions-=blank
-<
-This will prevent |:mksession| from saving |syntastic-error-window| as empty
-quickfix windows.
-
-==============================================================================
-7. Compatibility with other software                 *syntastic-compatibility*
-
-------------------------------------------------------------------------------
-7.1 The csh and tcsh shells                                    *syntastic-csh*
-
-The "csh" and "tcsh" shells are mostly compatible with syntastic.  However,
-some checkers assume Bourne shell syntax for redirecting "stderr".  For this
-reason, you should point |'syntastic_shell'| to a Bourne-compatible shell,
-such as "zsh", "bash", "ksh", or even the original Bourne "sh": >
-    let g:syntastic_shell = "/bin/sh"
-<
-------------------------------------------------------------------------------
-7.2. Eclim                                                   *syntastic-eclim*
-
-Syntastic can be used together with "Eclim" (see http://eclim.org/). However,
-by default Eclim disables syntastic's checks for the filetypes it supports, in
-order to run its own validation. If you'd prefer to use Eclim but still run
-syntastic's checks, set |g:EclimFileTypeValidate| to 0: >
-    let g:EclimFileTypeValidate = 0
-<
-It is also possible to re-enable syntastic checks only for some filetypes, and
-run Eclim's validation for others. Please consult Eclim's documentation for
-details.
-
-------------------------------------------------------------------------------
-7.3 The fish shell                                            *syntastic-fish*
-
-At the time of this writing the "fish" shell (see http://fishshell.com/)
-doesn't support the standard UNIX syntax for file redirections, and thus it
-can't be used together with syntastic. You can however set |'syntastic_shell'|
-to a more traditional shell, such as "zsh", "bash", "ksh", or even the
-original Bourne "sh": >
-    let g:syntastic_shell = "/bin/sh"
-<
-------------------------------------------------------------------------------
-7.4. The fizsh shell                                         *syntastic-fizsh*
-
-Using syntastic with the "fizsh" shell (see https://github.com/zsh-users/fizsh)
-is possible, but potentially problematic. In order to do it you'll need to set
-'shellredir' like this: >
-    set shellredir=>%s\ 2>&1
-<
-Please keep in mind however that Vim can't take advantage of any of the
-interactive features of "fizsh". Using a more traditional shell such as "zsh",
-"bash", "ksh", or the original Bourne "sh" might be a better choice: >
-    let g:syntastic_shell = "/bin/sh"
-<
-------------------------------------------------------------------------------
-7.5 flagship                                              *syntastic-flagship*
-
-The "flagship" Vim plugin (https://github.com/tpope/vim-flagship) has its
-own mechanism of showing flags on the |'statusline'|. To allow "flagship"
-to manage syntastic's statusline flag add the following |autocommand| to
-your vimrc, rather than explicitly adding the flag to your |'statusline'| as
-described in the |syntastic-statusline-flag| section above: >
-    autocmd User Flags call Hoist("window", "SyntasticStatuslineFlag")
-<
-------------------------------------------------------------------------------
-7.6. powerline                                           *syntastic-powerline*
-
-The "powerline" Vim plugin (https://github.com/powerline/powerline) comes
-packaged with a syntastic segment. To customize this segment create a file
-~/.config/powerline/themes/vim/default.json, with a content like this: >
-    {
-        "segment_data" : {
-            "powerline.segments.vim.plugin.syntastic.syntastic" : {
-                "args" : {
-                    "err_format" : "Err: {first_line} #{num} ",
-                    "warn_format" : "Warn: {first_line} #{num} "
-                }
-            }
-        }
-    }
-<
-------------------------------------------------------------------------------
-7.7. The PowerShell shell                               *syntastic-powershell*
-
-At the time of this writing, syntastic is not compatible with using "Windows
-PowerShell" (http://technet.microsoft.com/en-us/library/bb978526.aspx) as Vim's
-'shell'.  You may still run Vim from 'PowerShell', but you do have to point
-Vim's 'shell' to a more traditional program, such as "cmd.exe": >
-    set shell=cmd.exe
-<
-------------------------------------------------------------------------------
-7.8 python-mode                                             *syntastic-pymode*
-
-Syntastic can be used along with the "python-mode" Vim plugin (see
-https://github.com/klen/python-mode). However, they both run syntax checks by
-default when you save buffers to disk, and this is probably not what you want.
-To avoid both plugins opening error windows, you can either set passive mode
-for python in syntastic (see |'syntastic_mode_map'|), or disable lint checks in
-"python-mode", by setting |pymode_lint_write| to 0. E.g.: >
-    let g:pymode_lint_write = 0
-<
-------------------------------------------------------------------------------
-7.9. vim-auto-save                                   *syntastic-vim-auto-save*
-
-Syntastic can be used together with the "vim-auto-save" Vim plugin (see
-https://github.com/907th/vim-auto-save).  However, syntastic checks in active
-mode only work with "vim-auto-save" version 0.1.7 or later.
-
-------------------------------------------------------------------------------
-7.10. vim-go                                                *syntastic-vim-go*
-
-The "vim-go" Vim plugin (https://github.com/fatih/vim-go) uses |quickfix|
-lists, and thus doesn't conflict with syntastic (which uses |location-list|
-lists).  However, both "vim-go" and syntastic run syntax checks by default
-when you save buffers to disk, and this can have confusing results.  To
-avoid both plugins opening error windows, you can either set passive
-mode for go in syntastic (see |syntastic_mode_map|), or prevent "vim-go"
-from showing a quickfix window when |g:go_fmt_command| fails, by setting
-|g:go_fmt_fail_silently| to 1.  E.g.: >
-    let g:go_fmt_fail_silently = 1
-<
-------------------------------------------------------------------------------
-7.11. vim-virtualenv                                *syntastic-vim-virtualenv*
-
-At the time of this writing, syntastic can't run checkers installed
-in Python virtual environments activated by "vim-virtualenv" (see
-https://github.com/jmcantrell/vim-virtualenv).  This is a limitation of
-"vim-virtualenv".
-
-------------------------------------------------------------------------------
-7.12 YouCompleteMe                                             *syntastic-ycm*
-
-Syntastic can be used together with the "YouCompleteMe" Vim plugin (see
-http://valloric.github.io/YouCompleteMe/).  However, by default "YouCompleteMe"
-disables syntastic's checkers for the "c", "cpp", "objc", and "objcpp"
-filetypes, in order to allow its own checkers to run.  If you want to use YCM's
-identifier completer but still run syntastic's checkers for those filetypes you
-have to set |g:ycm_show_diagnostics_ui| to 0. E.g.: >
-    let g:ycm_show_diagnostics_ui = 0
-<
-------------------------------------------------------------------------------
-7.13 The zsh shell and MacVim                                  *syntastic-zsh*
-
-If you're running MacVim together with the "zsh" shell (http://www.zsh.org/)
-you need to be aware that MacVim does not source your .zshrc file, but will
-source a .zshenv file.  Consequently you have to move any setup steps relevant
-to the checkers you're using from .zshrc to .zshenv, otherwise your checkers
-will misbehave when run by syntastic.  This is particularly important for
-programs such as "rvm" (https://rvm.io/) or "rbenv" (http://rbenv.org/), that
-rely on setting environment variables.
-
-==============================================================================
-8. About                                                     *syntastic-about*
-
-The core maintainers of syntastic are:
-    Martin Grenfell (GitHub: scrooloose)
-    Gregor Uhlenheuer (GitHub: kongo2002)
-    LCD 047 (GitHub: lcd047)
-
-Find the latest version of syntastic at:
-
-    http://github.com/scrooloose/syntastic
-
-==============================================================================
-9. License                                                 *syntastic-license*
-
-Syntastic is released under the WTFPL.
-See http://sam.zoy.org/wtfpl/COPYING.
-
- vim:tw=78:sw=4:ft=help:norl:
diff --git a/bundle/syntastic/plugin/syntastic.vim b/bundle/syntastic/plugin/syntastic.vim
deleted file mode 100644
index dd61e84..0000000
--- a/bundle/syntastic/plugin/syntastic.vim
+++ /dev/null
@@ -1,688 +0,0 @@
-"============================================================================
-"File:        syntastic.vim
-"Description: Vim plugin for on the fly syntax checking.
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_plugin') || &compatible
-    finish
-endif
-let g:loaded_syntastic_plugin = 1
-
-if has('reltime')
-    let g:_SYNTASTIC_START = reltime()
-    lockvar! g:_SYNTASTIC_START
-endif
-
-let g:_SYNTASTIC_VERSION = '3.7.0'
-lockvar g:_SYNTASTIC_VERSION
-
-" Sanity checks {{{1
-
-if v:version < 700 || (v:version == 700 && !has('patch175'))
-    call syntastic#log#error('need Vim version 7.175 or later')
-    finish
-endif
-
-for s:feature in [
-            \ 'autocmd',
-            \ 'eval',
-            \ 'file_in_path',
-            \ 'modify_fname',
-            \ 'quickfix',
-            \ 'reltime',
-            \ 'user_commands'
-        \ ]
-    if !has(s:feature)
-        call syntastic#log#error('need Vim compiled with feature ' . s:feature)
-        finish
-    endif
-endfor
-
-let s:_running_windows = syntastic#util#isRunningWindows()
-lockvar s:_running_windows
-
-if !exists('g:syntastic_shell')
-    let g:syntastic_shell = &shell
-endif
-
-if s:_running_windows
-    let g:_SYNTASTIC_UNAME = 'Windows'
-elseif executable('uname')
-    try
-        let g:_SYNTASTIC_UNAME = split(syntastic#util#system('uname'), "\n")[0]
-    catch /\m^Vim\%((\a\+)\)\=:E484/
-        call syntastic#log#error("your shell " .  syntastic#util#var('shell') . " can't handle traditional UNIX syntax for redirections")
-        finish
-    catch /\m^Vim\%((\a\+)\)\=:E684/
-        let g:_SYNTASTIC_UNAME = 'Unknown'
-    endtry
-else
-    let g:_SYNTASTIC_UNAME = 'Unknown'
-endif
-lockvar g:_SYNTASTIC_UNAME
-
-" }}}1
-
-" Defaults {{{1
-
-let g:_SYNTASTIC_DEFAULTS = {
-        \ 'aggregate_errors':         0,
-        \ 'always_populate_loc_list': 0,
-        \ 'auto_jump':                0,
-        \ 'auto_loc_list':            2,
-        \ 'check_on_open':            0,
-        \ 'check_on_wq':              1,
-        \ 'cursor_columns':           1,
-        \ 'debug':                    0,
-        \ 'echo_current_error':       1,
-        \ 'enable_balloons':          1,
-        \ 'enable_highlighting':      1,
-        \ 'enable_signs':             1,
-        \ 'error_symbol':             '>>',
-        \ 'exit_checks':              !(s:_running_windows && syntastic#util#var('shell', &shell) =~? '\m\<cmd\.exe$'),
-        \ 'filetype_map':             {},
-        \ 'full_redraws':             !(has('gui_running') || has('gui_macvim')),
-        \ 'id_checkers':              1,
-        \ 'ignore_extensions':        '\c\v^([gx]?z|lzma|bz2)$',
-        \ 'ignore_files':             [],
-        \ 'loc_list_height':          10,
-        \ 'quiet_messages':           {},
-        \ 'reuse_loc_lists':          0,
-        \ 'shell':                    &shell,
-        \ 'sort_aggregated_errors':   1,
-        \ 'stl_format':               '[Syntax: line:%F (%t)]',
-        \ 'style_error_symbol':       'S>',
-        \ 'style_warning_symbol':     'S>',
-        \ 'warning_symbol':           '>>'
-    \ }
-lockvar! g:_SYNTASTIC_DEFAULTS
-
-for s:key in keys(g:_SYNTASTIC_DEFAULTS)
-    if !exists('g:syntastic_' . s:key)
-        let g:syntastic_{s:key} = copy(g:_SYNTASTIC_DEFAULTS[s:key])
-    endif
-endfor
-
-if exists('g:syntastic_quiet_warnings')
-    call syntastic#log#oneTimeWarn("variable g:syntastic_quiet_warnings is deprecated, please use let g:syntastic_quiet_messages = {'level': 'warnings'} instead")
-    if g:syntastic_quiet_warnings
-        let s:quiet_warnings = get(g:syntastic_quiet_messages, 'type', [])
-        if type(s:quiet_warnings) != type([])
-            let s:quiet_warnings = [s:quiet_warnings]
-        endif
-        call add(s:quiet_warnings, 'warnings')
-        let g:syntastic_quiet_messages['type'] = s:quiet_warnings
-    endif
-endif
-
-" }}}1
-
-" Debug {{{1
-
-let s:_DEBUG_DUMP_OPTIONS = [
-        \ 'shell',
-        \ 'shellcmdflag',
-        \ 'shellpipe',
-        \ 'shellquote',
-        \ 'shellredir',
-        \ 'shellslash',
-        \ 'shelltemp',
-        \ 'shellxquote'
-    \ ]
-if exists('+shellxescape')
-    call add(s:_DEBUG_DUMP_OPTIONS, 'shellxescape')
-endif
-lockvar! s:_DEBUG_DUMP_OPTIONS
-
-" debug constants
-let     g:_SYNTASTIC_DEBUG_TRACE         = 1
-lockvar g:_SYNTASTIC_DEBUG_TRACE
-let     g:_SYNTASTIC_DEBUG_LOCLIST       = 2
-lockvar g:_SYNTASTIC_DEBUG_LOCLIST
-let     g:_SYNTASTIC_DEBUG_NOTIFICATIONS = 4
-lockvar g:_SYNTASTIC_DEBUG_NOTIFICATIONS
-let     g:_SYNTASTIC_DEBUG_AUTOCOMMANDS  = 8
-lockvar g:_SYNTASTIC_DEBUG_AUTOCOMMANDS
-let     g:_SYNTASTIC_DEBUG_VARIABLES     = 16
-lockvar g:_SYNTASTIC_DEBUG_VARIABLES
-let     g:_SYNTASTIC_DEBUG_CHECKERS      = 32
-lockvar g:_SYNTASTIC_DEBUG_CHECKERS
-
-" }}}1
-
-runtime! plugin/syntastic/*.vim
-
-let s:registry = g:SyntasticRegistry.Instance()
-let s:notifiers = g:SyntasticNotifiers.Instance()
-let s:modemap = g:SyntasticModeMap.Instance()
-
-" Commands {{{1
-
-" @vimlint(EVL103, 1, a:cursorPos)
-" @vimlint(EVL103, 1, a:cmdLine)
-" @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) abort " {{{2
-    let checker_names = []
-    for ft in s:_resolve_filetypes([])
-        call extend(checker_names, s:registry.getNamesOfAvailableCheckers(ft))
-    endfor
-    return join(checker_names, "\n")
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:cursorPos)
-" @vimlint(EVL103, 0, a:cmdLine)
-" @vimlint(EVL103, 0, a:argLead)
-
-
-" @vimlint(EVL103, 1, a:cursorPos)
-" @vimlint(EVL103, 1, a:cmdLine)
-" @vimlint(EVL103, 1, a:argLead)
-function! s:CompleteFiletypes(argLead, cmdLine, cursorPos) abort " {{{2
-    return join(s:registry.getKnownFiletypes(), "\n")
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:cursorPos)
-" @vimlint(EVL103, 0, a:cmdLine)
-" @vimlint(EVL103, 0, a:argLead)
-
-command! -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
-command! -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
-command! Errors              call SyntasticErrors()
-command! SyntasticReset      call SyntasticReset()
-command! SyntasticToggleMode call SyntasticToggleMode()
-command! SyntasticSetLoclist call SyntasticSetLoclist()
-
-command! SyntasticJavacEditClasspath runtime! syntax_checkers/java/*.vim | SyntasticJavacEditClasspath
-command! SyntasticJavacEditConfig    runtime! syntax_checkers/java/*.vim | SyntasticJavacEditConfig
-
-" }}}1
-
-" Public API {{{1
-
-function! SyntasticCheck(...) abort " {{{2
-    call s:UpdateErrors(0, a:000)
-    call syntastic#util#redraw(g:syntastic_full_redraws)
-endfunction " }}}2
-
-function! SyntasticInfo(...) abort " {{{2
-    call s:modemap.modeInfo(a:000)
-    call s:registry.echoInfoFor(s:_resolve_filetypes(a:000))
-    call s:_explain_skip(a:000)
-endfunction " }}}2
-
-function! SyntasticErrors() abort " {{{2
-    call g:SyntasticLoclist.current().show()
-endfunction " }}}2
-
-function! SyntasticReset() abort " {{{2
-    call s:ClearCache()
-    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-endfunction " }}}2
-
-function! SyntasticToggleMode() abort " {{{2
-    call s:modemap.toggleMode()
-    call s:ClearCache()
-    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
-    call s:modemap.echoMode()
-endfunction " }}}2
-
-function! SyntasticSetLoclist() abort " {{{2
-    call g:SyntasticLoclist.current().setloclist()
-endfunction " }}}2
-
-" }}}1
-
-" Autocommands {{{1
-
-augroup syntastic
-    autocmd!
-    autocmd BufReadPost  * nested call s:BufReadPostHook()
-    autocmd BufWritePost * nested call s:BufWritePostHook()
-    autocmd BufEnter     *        call s:BufEnterHook()
-augroup END
-
-if exists('##QuitPre')
-    " QuitPre was added in Vim 7.3.544
-    augroup syntastic
-        autocmd QuitPre * call s:QuitPreHook()
-    augroup END
-endif
-
-function! s:BufReadPostHook() abort " {{{2
-    if g:syntastic_check_on_open
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
-            \ 'autocmd: BufReadPost, buffer ' . bufnr('') . ' = ' . string(bufname(str2nr(bufnr('')))))
-        call s:UpdateErrors(1, [])
-    endif
-endfunction " }}}2
-
-function! s:BufWritePostHook() abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
-        \ 'autocmd: BufWritePost, buffer ' . bufnr('') . ' = ' . string(bufname(str2nr(bufnr('')))))
-    call s:UpdateErrors(1, [])
-endfunction " }}}2
-
-function! s:BufEnterHook() abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
-        \ 'autocmd: BufEnter, buffer ' . bufnr('') . ' = ' . string(bufname(str2nr(bufnr('')))) .
-        \ ', &buftype = ' . string(&buftype))
-    if &buftype ==# ''
-        call s:notifiers.refresh(g:SyntasticLoclist.current())
-    elseif &buftype ==# 'quickfix'
-        " TODO: this is needed because in recent versions of Vim lclose
-        " can no longer be called from BufWinLeave
-        " TODO: at this point there is no b:syntastic_loclist
-        let loclist = filter(copy(getloclist(0)), 'v:val["valid"] == 1')
-        let owner = str2nr(getbufvar(bufnr(''), 'syntastic_owner_buffer'))
-        let buffers = syntastic#util#unique(map(loclist, 'v:val["bufnr"]') + (owner ? [owner] : []))
-        if get(w:, 'syntastic_loclist_set', 0) && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
-            call SyntasticLoclistHide()
-        endif
-    endif
-endfunction " }}}2
-
-function! s:QuitPreHook() abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
-        \ 'autocmd: QuitPre, buffer ' . bufnr('') . ' = ' . string(bufname(str2nr(bufnr('')))))
-    let b:syntastic_skip_checks = get(b:, 'syntastic_skip_checks', 0) || !syntastic#util#var('check_on_wq')
-    if get(w:, 'syntastic_loclist_set', 0)
-        call SyntasticLoclistHide()
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Main {{{1
-
-"refresh and redraw all the error info for this buf when saving or reading
-function! s:UpdateErrors(auto_invoked, checker_names) abort " {{{2
-    call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
-    call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, s:_DEBUG_DUMP_OPTIONS)
-    call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
-        \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
-
-    call s:modemap.synch()
-
-    if s:_skip_file()
-        return
-    endif
-
-    let run_checks = !a:auto_invoked || s:modemap.doAutoChecking()
-    if run_checks
-        call s:CacheErrors(a:checker_names)
-        unlockvar! b:syntastic_changedtick
-        let b:syntastic_changedtick = b:changedtick
-        lockvar! b:syntastic_changedtick
-    else
-        if a:auto_invoked
-            return
-        endif
-    endif
-
-    let loclist = g:SyntasticLoclist.current()
-
-    if exists('*SyntasticCheckHook')
-        call SyntasticCheckHook(loclist.getRaw())
-    endif
-
-    " populate loclist and jump {{{3
-    let do_jump = syntastic#util#var('auto_jump') + 0
-    if do_jump == 2
-        let do_jump = loclist.getFirstError(1)
-    elseif do_jump == 3
-        let do_jump = loclist.getFirstError()
-    elseif 0 > do_jump || do_jump > 3
-        let do_jump = 0
-    endif
-
-    let w:syntastic_loclist_set = 0
-    if syntastic#util#var('always_populate_loc_list') || do_jump
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: setloclist (new)')
-        call setloclist(0, loclist.getRaw())
-        let w:syntastic_loclist_set = 1
-        if run_checks && do_jump && !loclist.isEmpty()
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: jump')
-            execute 'silent! lrewind ' . do_jump
-
-            " XXX: Vim doesn't call autocmd commands in a predictible
-            " order, which can lead to missing filetype when jumping
-            " to a new file; the following is a workaround for the
-            " resulting brain damage
-            if &filetype ==# ''
-                silent! filetype detect
-            endif
-        endif
-    endif
-    " }}}3
-
-    call s:notifiers.refresh(loclist)
-endfunction " }}}2
-
-"clear the loc list for the buffer
-function! s:ClearCache() abort " {{{2
-    call s:notifiers.reset(g:SyntasticLoclist.current())
-    call b:syntastic_loclist.destroy()
-endfunction " }}}2
-
-"detect and cache all syntax errors in this buffer
-function! s:CacheErrors(checker_names) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: ' .
-        \ (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
-    call s:ClearCache()
-    let newLoclist = g:SyntasticLoclist.New([])
-
-    if !s:_skip_file()
-        " debug logging {{{3
-        call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$PATH = ' . string($PATH))
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd()))
-        " }}}3
-
-        let filetypes = s:_resolve_filetypes([])
-        let aggregate_errors = syntastic#util#var('aggregate_errors') || len(filetypes) > 1
-        let decorate_errors = aggregate_errors && syntastic#util#var('id_checkers')
-        let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
-
-        let clist = []
-        for type in filetypes
-            call extend(clist, s:registry.getCheckers(type, a:checker_names))
-        endfor
-
-        let names = []
-        let unavailable_checkers = 0
-        for checker in clist
-            let cname = checker.getFiletype() . '/' . checker.getName()
-            if !checker.isAvailable()
-                call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: Checker ' . cname . ' is not available')
-                let unavailable_checkers += 1
-                continue
-            endif
-
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: Invoking checker: ' . cname)
-
-            let loclist = checker.getLocList()
-
-            if !loclist.isEmpty()
-                if decorate_errors
-                    call loclist.decorate(cname)
-                endif
-                call add(names, cname)
-                if checker.wantSort() && !sort_aggregated_errors
-                    call loclist.sort()
-                    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', loclist)
-                endif
-
-                let newLoclist = newLoclist.extend(loclist)
-
-                if !aggregate_errors
-                    break
-                endif
-            endif
-        endfor
-
-        " set names {{{3
-        if !empty(names)
-            if len(syntastic#util#unique(map( copy(names), 'substitute(v:val, "\\m/.*", "", "")' ))) == 1
-                let type = substitute(names[0], '\m/.*', '', '')
-                let name = join(map( names, 'substitute(v:val, "\\m.\\{-}/", "", "")' ), ', ')
-                call newLoclist.setName( name . ' ('. type . ')' )
-            else
-                " checkers from mixed types
-                call newLoclist.setName(join(names, ', '))
-            endif
-        endif
-        " }}}3
-
-        " issue warning about no active checkers {{{3
-        if len(clist) == unavailable_checkers
-            if !empty(a:checker_names)
-                if len(a:checker_names) == 1
-                    call syntastic#log#warn('checker ' . a:checker_names[0] . ' is not available')
-                else
-                    call syntastic#log#warn('checkers ' . join(a:checker_names, ', ') . ' are not available')
-                endif
-            else
-                call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: no checkers available for ' . &filetype)
-            endif
-        endif
-        " }}}3
-
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'aggregated:', newLoclist)
-        if sort_aggregated_errors
-            call newLoclist.sort()
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', newLoclist)
-        endif
-    endif
-
-    call newLoclist.deploy()
-endfunction " }}}2
-
-"Emulates the :lmake command. Sets up the make environment according to the
-"options given, runs make, resets the environment, returns the location list
-"
-"a:options can contain the following keys:
-"    'makeprg'
-"    'errorformat'
-"
-"The corresponding options are set for the duration of the function call. They
-"are set with :let, so dont escape spaces.
-"
-"a:options may also contain:
-"   'defaults' - a dict containing default values for the returned errors
-"   'subtype' - all errors will be assigned the given subtype
-"   'preprocess' - a function to be applied to the error file before parsing errors
-"   'postprocess' - a list of functions to be applied to the error list
-"   'cwd' - change directory to the given path before running the checker
-"   'env' - environment variables to set before running the checker
-"   'returns' - a list of valid exit codes for the checker
-" @vimlint(EVL102, 1, l:env_save)
-function! SyntasticMake(options) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'SyntasticMake: called with options:', a:options)
-
-    " save options and locale env variables {{{3
-    let old_local_errorformat = &l:errorformat
-    let old_errorformat = &errorformat
-    let old_cwd = getcwd()
-    " }}}3
-
-    if has_key(a:options, 'errorformat')
-        let &errorformat = a:options['errorformat']
-    endif
-
-    if has_key(a:options, 'cwd')
-        execute 'lcd ' . fnameescape(a:options['cwd'])
-    endif
-
-    " set environment variables {{{3
-    let env_save = {}
-    if has_key(a:options, 'env') && len(a:options['env'])
-        for key in keys(a:options['env'])
-            if key =~? '\m^[a-z_]\+$'
-                execute 'let env_save[' . string(key) . '] = $' . key
-                execute 'let $' . key . ' = ' . string(a:options['env'][key])
-            endif
-        endfor
-    endif
-    " }}}3
-
-    let err_lines = split(syntastic#util#system(a:options['makeprg']), "\n", 1)
-
-    " restore environment variables {{{3
-    if len(env_save)
-        for key in keys(env_save)
-            execute 'let $' . key . ' = ' . string(env_save[key])
-        endfor
-    endif
-    " }}}3
-
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', err_lines)
-
-    " Does it still make sense to go on?
-    let bailout =
-        \ syntastic#util#var('exit_checks') &&
-        \ has_key(a:options, 'returns') &&
-        \ index(a:options['returns'], v:shell_error) == -1
-
-    if !bailout
-        if has_key(a:options, 'Preprocess')
-            let err_lines = call(a:options['Preprocess'], [err_lines])
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'preprocess (external):', err_lines)
-        elseif has_key(a:options, 'preprocess')
-            let err_lines = call('syntastic#preprocess#' . a:options['preprocess'], [err_lines])
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'preprocess:', err_lines)
-        endif
-        lgetexpr err_lines
-
-        let errors = deepcopy(getloclist(0))
-
-        if has_key(a:options, 'cwd')
-            execute 'lcd ' . fnameescape(old_cwd)
-        endif
-
-        try
-            silent lolder
-        catch /\m^Vim\%((\a\+)\)\=:E380/
-            " E380: At bottom of quickfix stack
-            call setloclist(0, [], 'r')
-        catch /\m^Vim\%((\a\+)\)\=:E776/
-            " E776: No location list
-            " do nothing
-        endtry
-    else
-        let errors = []
-    endif
-
-    " restore options {{{3
-    let &errorformat = old_errorformat
-    let &l:errorformat = old_local_errorformat
-    " }}}3
-
-    if !s:_running_windows && (s:_os_name() =~? 'FreeBSD' || s:_os_name() =~? 'OpenBSD')
-        call syntastic#util#redraw(g:syntastic_full_redraws)
-    endif
-
-    if bailout
-        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', err_lines)
-        throw 'Syntastic: checker error'
-    endif
-
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'raw loclist:', errors)
-
-    if has_key(a:options, 'defaults')
-        call s:_add_to_errors(errors, a:options['defaults'])
-    endif
-
-    " Add subtype info if present.
-    if has_key(a:options, 'subtype')
-        call s:_add_to_errors(errors, { 'subtype': a:options['subtype'] })
-    endif
-
-    if has_key(a:options, 'Postprocess') && !empty(a:options['Postprocess'])
-        for rule in a:options['Postprocess']
-            let errors = call(rule, [errors])
-        endfor
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'postprocess (external):', errors)
-    elseif has_key(a:options, 'postprocess') && !empty(a:options['postprocess'])
-        for rule in a:options['postprocess']
-            let errors = call('syntastic#postprocess#' . rule, [errors])
-        endfor
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'postprocess:', errors)
-    endif
-
-    return errors
-endfunction " }}}2
-" @vimlint(EVL102, 0, l:env_save)
-
-"return a string representing the state of buffer according to
-"g:syntastic_stl_format
-"
-"return '' if no errors are cached for the buffer
-function! SyntasticStatuslineFlag() abort " {{{2
-    return g:SyntasticLoclist.current().getStatuslineFlag()
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-function! s:_resolve_filetypes(filetypes) abort " {{{2
-    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
-    return split( get(g:syntastic_filetype_map, type, type), '\m\.' )
-endfunction " }}}2
-
-function! s:_ignore_file(filename) abort " {{{2
-    let fname = fnamemodify(a:filename, ':p')
-    for pattern in g:syntastic_ignore_files
-        if fname =~# pattern
-            return 1
-        endif
-    endfor
-    return 0
-endfunction " }}}2
-
-" Skip running in special buffers
-function! s:_skip_file() abort " {{{2
-    let fname = expand('%', 1)
-    let skip = get(b:, 'syntastic_skip_checks', 0) || (&buftype !=# '') ||
-        \ !filereadable(fname) || getwinvar(0, '&diff') || s:_ignore_file(fname) ||
-        \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
-    if skip
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '_skip_file: skipping checks')
-    endif
-    return skip
-endfunction " }}}2
-
-" Explain why checks will be skipped for the current file
-function! s:_explain_skip(filetypes) abort " {{{2
-    if empty(a:filetypes) && s:_skip_file()
-        let why = []
-        let fname = expand('%', 1)
-
-        if get(b:, 'syntastic_skip_checks', 0)
-            call add(why, 'b:syntastic_skip_checks set')
-        endif
-        if &buftype !=# ''
-            call add(why, 'buftype = ' . string(&buftype))
-        endif
-        if !filereadable(fname)
-            call add(why, 'file not readable / not local')
-        endif
-        if getwinvar(0, '&diff')
-            call add(why, 'diff mode')
-        endif
-        if s:_ignore_file(fname)
-            call add(why, 'filename matching g:syntastic_ignore_files')
-        endif
-        if fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
-            call add(why, 'extension matching g:syntastic_ignore_extensions')
-        endif
-
-        echomsg 'The current file will not be checked (' . join(why, ', ') . ')'
-    endif
-endfunction " }}}2
-
-" Take a list of errors and add default values to them from a:options
-function! s:_add_to_errors(errors, options) abort " {{{2
-    for err in a:errors
-        for key in keys(a:options)
-            if !has_key(err, key) || empty(err[key])
-                let err[key] = a:options[key]
-            endif
-        endfor
-    endfor
-
-    return a:errors
-endfunction " }}}2
-
-function! s:_os_name() abort " {{{2
-    return g:_SYNTASTIC_UNAME
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/autoloclist.vim b/bundle/syntastic/plugin/syntastic/autoloclist.vim
deleted file mode 100644
index da99dbb..0000000
--- a/bundle/syntastic/plugin/syntastic/autoloclist.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-if exists('g:loaded_syntastic_notifier_autoloclist') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifier_autoloclist = 1
-
-let g:SyntasticAutoloclistNotifier = {}
-
-" Public methods {{{1
-"
-function! g:SyntasticAutoloclistNotifier.New() abort " {{{2
-    let newObj = copy(self)
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticAutoloclistNotifier.refresh(loclist) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: refresh')
-    call g:SyntasticAutoloclistNotifier.AutoToggle(a:loclist)
-endfunction " }}}2
-
-function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: toggle')
-    if !a:loclist.isEmpty()
-        if syntastic#util#var('auto_loc_list') == 1
-            call a:loclist.show()
-        endif
-    else
-        if syntastic#util#var('auto_loc_list') > 0
-
-            "TODO: this will close the loc list window if one was opened by
-            "something other than syntastic
-            lclose
-        endif
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/balloons.vim b/bundle/syntastic/plugin/syntastic/balloons.vim
deleted file mode 100644
index fdd70bf..0000000
--- a/bundle/syntastic/plugin/syntastic/balloons.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-if exists('g:loaded_syntastic_notifier_balloons') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifier_balloons = 1
-
-if !has('balloon_eval')
-    let g:syntastic_enable_balloons = 0
-endif
-
-let g:SyntasticBalloonsNotifier = {}
-
-" Public methods {{{1
-
-function! g:SyntasticBalloonsNotifier.New() abort " {{{2
-    let newObj = copy(self)
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticBalloonsNotifier.enabled() abort " {{{2
-    return has('balloon_eval') && syntastic#util#var('enable_balloons')
-endfunction " }}}2
-
-" Update the error balloons
-function! g:SyntasticBalloonsNotifier.refresh(loclist) abort " {{{2
-    unlet! b:syntastic_private_balloons
-    if self.enabled() && !a:loclist.isEmpty()
-        let b:syntastic_private_balloons = a:loclist.balloons()
-        if !empty(b:syntastic_private_balloons)
-            set ballooneval balloonexpr=SyntasticBalloonsExprNotifier()
-        endif
-    endif
-endfunction " }}}2
-
-" Reset the error balloons
-" @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticBalloonsNotifier.reset(loclist) abort " {{{2
-    let b:syntastic_private_balloons = {}
-    if has('balloon_eval')
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'balloons: reset')
-        unlet! b:syntastic_private_balloons
-        set noballooneval
-    endif
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:loclist)
-
-" }}}1
-
-" Private functions {{{1
-
-function! SyntasticBalloonsExprNotifier() abort " {{{2
-    if !exists('b:syntastic_private_balloons')
-        return ''
-    endif
-    return get(b:syntastic_private_balloons, v:beval_lnum, '')
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/checker.vim b/bundle/syntastic/plugin/syntastic/checker.vim
deleted file mode 100644
index ab2597e..0000000
--- a/bundle/syntastic/plugin/syntastic/checker.vim
+++ /dev/null
@@ -1,260 +0,0 @@
-if exists('g:loaded_syntastic_checker') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_checker = 1
-
-let g:SyntasticChecker = {}
-
-" Public methods {{{1
-
-function! g:SyntasticChecker.New(args) abort " {{{2
-    let newObj = copy(self)
-
-    let newObj._filetype = a:args['filetype']
-    let newObj._name = a:args['name']
-    let newObj._exec = get(a:args, 'exec', newObj._name)
-
-    if has_key(a:args, 'redirect')
-        let [filetype, name] = split(a:args['redirect'], '/')
-        let prefix = 'SyntaxCheckers_' . filetype . '_' . name . '_'
-
-        if exists('g:syntastic_' . filetype . '_' . name . '_sort') && !exists('g:syntastic_' . newObj._filetype . '_' . newObj._name . '_sort')
-            let g:syntastic_{newObj._filetype}_{newObj._name}_sort = g:syntastic_{filetype}_{name}_sort
-        endif
-    else
-        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
-    endif
-
-    if has_key(a:args, 'enable')
-        let newObj._enable = a:args['enable']
-    endif
-
-    let newObj._locListFunc = function(prefix . 'GetLocList')
-
-    if exists('*' . prefix . 'IsAvailable')
-        let newObj._isAvailableFunc = function(prefix . 'IsAvailable')
-    else
-        let newObj._isAvailableFunc = function('s:_isAvailableDefault')
-    endif
-
-    if exists('*' . prefix . 'GetHighlightRegex')
-        let newObj._highlightRegexFunc = function(prefix . 'GetHighlightRegex')
-    endif
-
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticChecker.getFiletype() abort " {{{2
-    return self._filetype
-endfunction " }}}2
-
-function! g:SyntasticChecker.getName() abort " {{{2
-    return self._name
-endfunction " }}}2
-
-" Synchronise _exec with user's setting.  Force re-validation if needed.
-"
-" XXX: This function must be called at least once before calling either
-" getExec() or getExecEscaped().  Normally isAvailable() does that for you
-" automatically, but you should keep still this in mind if you change the
-" current checker workflow.
-function! g:SyntasticChecker.syncExec() abort " {{{2
-    let user_exec =
-        \ expand( exists('b:syntastic_' . self._name . '_exec') ? b:syntastic_{self._name}_exec :
-        \ syntastic#util#var(self._filetype . '_' . self._name . '_exec'), 1 )
-
-    if user_exec !=# '' && user_exec !=# self._exec
-        let self._exec = user_exec
-        if has_key(self, '_available')
-            " we have a new _exec on the block, it has to be validated
-            call remove(self, '_available')
-        endif
-    endif
-endfunction " }}}2
-
-function! g:SyntasticChecker.getExec() abort " {{{2
-    return self._exec
-endfunction " }}}2
-
-function! g:SyntasticChecker.getExecEscaped() abort " {{{2
-    return syntastic#util#shescape(self._exec)
-endfunction " }}}2
-
-function! g:SyntasticChecker.getLocListRaw() abort " {{{2
-    let name = self._filetype . '/' . self._name
-
-    if has_key(self, '_enable')
-        let status = syntastic#util#var(self._enable, -1)
-        if type(status) != type(0)
-            call syntastic#log#error('checker ' . name . ': invalid value ' . strtrans(string(status)) .
-                \ ' for g:syntastic_' . self._enable . '; try 0 or 1 instead')
-            return []
-        endif
-        if status < 0
-            call syntastic#log#error('checker ' . name . ': checks disabled for security reasons; ' .
-                \ 'set g:syntastic_' . self._enable . ' to 1 to override')
-        endif
-        if status <= 0
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' enabled but not forced')
-            return []
-        else
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' forced')
-        endif
-    endif
-
-    try
-        let list = self._locListFunc()
-        if self._exec !=# ''
-            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
-        endif
-    catch /\m\C^Syntastic: checker error$/
-        let list = []
-        if self._exec !=# ''
-            call syntastic#log#error('checker ' . name . ' returned abnormal status ' . v:shell_error)
-        else
-            call syntastic#log#error('checker ' . name . ' aborted')
-        endif
-    endtry
-    call self._populateHighlightRegexes(list)
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, name . ' raw:', list)
-    call self._quietMessages(list)
-    return list
-endfunction " }}}2
-
-function! g:SyntasticChecker.getLocList() abort " {{{2
-    return g:SyntasticLoclist.New(self.getLocListRaw())
-endfunction " }}}2
-
-function! g:SyntasticChecker.getVersion(...) abort " {{{2
-    if !exists('self._version')
-        let command = a:0 ? a:1 : self.getExecEscaped() . ' --version'
-        let version_output = syntastic#util#system(command)
-        call self.log('getVersion: ' . string(command) . ': ' .
-            \ string(split(version_output, "\n", 1)) .
-            \ (v:shell_error ? ' (exit code ' . v:shell_error . ')' : '') )
-        let parsed_ver = syntastic#util#parseVersion(version_output)
-        if len(parsed_ver)
-            call self.setVersion(parsed_ver)
-        else
-            call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
-            call syntastic#log#error("checker " . self._filetype . "/" . self._name . ": can't parse version string (abnormal termination?)")
-        endif
-    endif
-    return get(self, '_version', [])
-endfunction " }}}2
-
-function! g:SyntasticChecker.setVersion(version) abort " {{{2
-    if len(a:version)
-        let self._version = copy(a:version)
-        call self.log(self.getExec() . ' version =', a:version)
-    endif
-endfunction " }}}2
-
-function! g:SyntasticChecker.log(msg, ...) abort " {{{2
-    let leader = self._filetype . '/' . self._name . ': '
-    if a:0 > 0
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg, a:1)
-    else
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg)
-    endif
-endfunction " }}}2
-
-function! g:SyntasticChecker.makeprgBuild(opts) abort " {{{2
-    let basename = self._filetype . '_' . self._name . '_'
-
-    let parts = []
-    call extend(parts, self._getOpt(a:opts, basename, 'exe', self.getExecEscaped()))
-    call extend(parts, self._getOpt(a:opts, basename, 'args', ''))
-    call extend(parts, self._getOpt(a:opts, basename, 'fname', syntastic#util#shexpand('%')))
-    call extend(parts, self._getOpt(a:opts, basename, 'post_args', ''))
-    call extend(parts, self._getOpt(a:opts, basename, 'tail', ''))
-
-    return join(parts)
-endfunction " }}}2
-
-function! g:SyntasticChecker.isAvailable() abort " {{{2
-    call self.syncExec()
-    if !has_key(self, '_available')
-        let self._available = self._isAvailableFunc()
-    endif
-    return self._available
-endfunction " }}}2
-
-function! g:SyntasticChecker.isDisabled() abort " {{{2
-    return has_key(self, '_enable') && syntastic#util#var(self._enable, -1) <= 0
-endfunction " }}}2
-
-function! g:SyntasticChecker.wantSort() abort " {{{2
-    return syntastic#util#var(self._filetype . '_' . self._name . '_sort', 0)
-endfunction " }}}2
-
-" This method is no longer used by syntastic.  It's here only to maintain
-" backwards compatibility with external checkers which might depend on it.
-function! g:SyntasticChecker.setWantSort(val) abort " {{{2
-    if !exists('g:syntastic_' . self._filetype . '_' . self._name . '_sort')
-        let g:syntastic_{self._filetype}_{self._name}_sort = a:val
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Private methods {{{1
-
-function! g:SyntasticChecker._quietMessages(errors) abort " {{{2
-    " wildcard quiet_messages
-    let quiet_filters = copy(syntastic#util#var('quiet_messages', {}))
-    if type(quiet_filters) != type({})
-        call syntastic#log#warn('ignoring invalid syntastic_quiet_messages')
-        unlet quiet_filters
-        let quiet_filters = {}
-    endif
-
-    " per checker quiet_messages
-    let name = self._filetype . '_' . self._name
-    try
-        call extend( quiet_filters, copy(syntastic#util#var(name . '_quiet_messages', {})), 'force' )
-    catch /\m^Vim\%((\a\+)\)\=:E712/
-        call syntastic#log#warn('ignoring invalid syntastic_' . name . '_quiet_messages')
-    endtry
-
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'quiet_messages filter:', quiet_filters)
-
-    if !empty(quiet_filters)
-        call syntastic#util#dictFilter(a:errors, quiet_filters)
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'filtered by quiet_messages:', a:errors)
-    endif
-endfunction " }}}2
-
-function! g:SyntasticChecker._populateHighlightRegexes(errors) abort " {{{2
-    if has_key(self, '_highlightRegexFunc')
-        for e in a:errors
-            if e['valid']
-                let term = self._highlightRegexFunc(e)
-                if term !=# ''
-                    let e['hl'] = term
-                endif
-            endif
-        endfor
-    endif
-endfunction " }}}2
-
-function! g:SyntasticChecker._getOpt(opts, basename, name, default) abort " {{{2
-    let ret = []
-    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_before', '')) )
-    call extend( ret, syntastic#util#argsescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
-    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_after', '')) )
-
-    return ret
-endfunction " }}}2
-
-" }}}1
-
-" Private functions {{{1
-
-function! s:_isAvailableDefault() dict " {{{2
-    return executable(self.getExec())
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/cursor.vim b/bundle/syntastic/plugin/syntastic/cursor.vim
deleted file mode 100644
index f59d87b..0000000
--- a/bundle/syntastic/plugin/syntastic/cursor.vim
+++ /dev/null
@@ -1,138 +0,0 @@
-if exists('g:loaded_syntastic_notifier_cursor') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifier_cursor = 1
-
-let g:SyntasticCursorNotifier = {}
-
-" Public methods {{{1
-
-function! g:SyntasticCursorNotifier.New() abort " {{{2
-    let newObj = copy(self)
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticCursorNotifier.enabled() abort " {{{2
-    return syntastic#util#var('echo_current_error')
-endfunction " }}}2
-
-function! g:SyntasticCursorNotifier.refresh(loclist) abort " {{{2
-    if self.enabled() && !a:loclist.isEmpty()
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: refresh')
-        let b:syntastic_private_messages = copy(a:loclist.messages(bufnr('')))
-        let b:syntastic_private_line = -1
-        let b:syntastic_cursor_columns = a:loclist.getCursorColumns()
-        autocmd! syntastic CursorMoved
-        autocmd syntastic CursorMoved * call SyntasticRefreshCursor()
-    endif
-endfunction " }}}2
-
-" @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticCursorNotifier.reset(loclist) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: reset')
-    autocmd! syntastic CursorMoved
-    unlet! b:syntastic_private_messages
-    let b:syntastic_private_line = -1
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:loclist)
-
-" }}}1
-
-" Private functions {{{1
-
-function! SyntasticRefreshCursor() abort " {{{2
-    if !exists('b:syntastic_private_messages') || empty(b:syntastic_private_messages)
-        " file not checked
-        return
-    endif
-
-    if !exists('b:syntastic_private_line')
-        let b:syntastic_private_line = -1
-    endif
-    let l = line('.')
-    let current_messages = get(b:syntastic_private_messages, l, {})
-
-    if !exists('b:syntastic_cursor_columns')
-        let b:syntastic_cursor_columns = g:syntastic_cursor_columns
-    endif
-
-    if b:syntastic_cursor_columns
-        let c = virtcol('.')
-        if !exists('b:syntastic_private_idx')
-            let b:syntastic_private_idx = -1
-        endif
-
-        if s:_is_same_index(l, b:syntastic_private_line, c, b:syntastic_private_idx, current_messages)
-            return
-        else
-            let b:syntastic_private_line = l
-        endif
-
-        if !empty(current_messages)
-            let b:syntastic_private_idx = s:_find_index(c, current_messages)
-            call syntastic#util#wideMsg(current_messages[b:syntastic_private_idx].text)
-        else
-            let b:syntastic_private_idx = -1
-            echo
-        endif
-    else
-        if l == b:syntastic_private_line
-            return
-        endif
-        let b:syntastic_private_line = l
-
-        if !empty(current_messages)
-            call syntastic#util#wideMsg(current_messages[0].text)
-        else
-            echo
-        endif
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-function! s:_is_same_index(line, old_line, column, idx, messages) abort " {{{2
-    if a:old_line >= 0 && a:line == a:old_line && a:idx >= 0
-        if len(a:messages) <= 1
-            return 1
-        endif
-
-        if a:messages[a:idx].scol <= a:column || a:idx == 0
-            if a:idx == len(a:messages) - 1 || a:column < a:messages[a:idx + 1].scol
-                return 1
-            else
-                return 0
-            endif
-        else
-            return 0
-        endif
-    else
-        return 0
-    endif
-endfunction " }}}2
-
-function! s:_find_index(column, messages) abort " {{{2
-    let max = len(a:messages) - 1
-    if max == 0
-        return 0
-    endif
-    let min = 0
-
-    " modified binary search: assign index 0 to columns to the left of the first error
-    while min < max - 1
-        let mid = (min + max) / 2
-        if a:column < a:messages[mid].scol
-            let max = mid
-        else
-            let min = mid
-        endif
-    endwhile
-
-    return a:column < a:messages[max].scol ? min : max
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/highlighting.vim b/bundle/syntastic/plugin/syntastic/highlighting.vim
deleted file mode 100644
index a9e1a08..0000000
--- a/bundle/syntastic/plugin/syntastic/highlighting.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-if exists('g:loaded_syntastic_notifier_highlighting') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifier_highlighting = 1
-
-" Highlighting requires getmatches introduced in 7.1.040
-let s:has_highlighting = v:version > 701 || (v:version == 701 && has('patch040'))
-lockvar s:has_highlighting
-
-let g:SyntasticHighlightingNotifier = {}
-
-let s:setup_done = 0
-
-" Public methods {{{1
-
-function! g:SyntasticHighlightingNotifier.New() abort " {{{2
-    let newObj = copy(self)
-
-    if !s:setup_done
-        call self._setup()
-        let s:setup_done = 1
-        lockvar s:setup_done
-    endif
-
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticHighlightingNotifier.enabled() abort " {{{2
-    return s:has_highlighting && syntastic#util#var('enable_highlighting')
-endfunction " }}}2
-
-" Sets error highlights in the current window
-function! g:SyntasticHighlightingNotifier.refresh(loclist) abort " {{{2
-    if self.enabled()
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: refresh')
-        call self._reset()
-        let buf = bufnr('')
-        let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
-        for item in issues
-            let group = 'Syntastic' . get(item, 'subtype', '') . ( item['type'] ==? 'E' ? 'Error' : 'Warning' )
-
-            " The function `Syntastic_{filetype}_{checker}_GetHighlightRegex` is
-            " used to override default highlighting.
-            if has_key(item, 'hl')
-                call matchadd(group, '\%' . item['lnum'] . 'l' . item['hl'])
-            elseif get(item, 'col', 0)
-                if get(item, 'vcol', 0)
-                    let lastcol = virtcol([item['lnum'], '$'])
-                    let coltype = 'v'
-                else
-                    let lastcol = col([item['lnum'], '$'])
-                    let coltype = 'c'
-                endif
-                let lcol = min([lastcol, item['col']])
-
-                call matchadd(group, '\%' . item['lnum'] . 'l\%' . lcol . coltype)
-            endif
-        endfor
-    endif
-endfunction " }}}2
-
-" Remove all error highlights from the window
-" @vimlint(EVL103, 1, a:loclist)
-function! g:SyntasticHighlightingNotifier.reset(loclist) abort " {{{2
-    if s:has_highlighting
-        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: reset')
-        call self._reset()
-    endif
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:loclist)
-
-" }}}1
-
-" Private methods {{{1
-
-" One time setup: define our own highlighting
-function! g:SyntasticHighlightingNotifier._setup() abort " {{{2
-    if s:has_highlighting
-        if !hlexists('SyntasticError')
-            highlight link SyntasticError SpellBad
-        endif
-        if !hlexists('SyntasticWarning')
-            highlight link SyntasticWarning SpellCap
-        endif
-        if !hlexists('SyntasticStyleError')
-            highlight link SyntasticStyleError SyntasticError
-        endif
-        if !hlexists('SyntasticStyleWarning')
-            highlight link SyntasticStyleWarning SyntasticWarning
-        endif
-    endif
-endfunction " }}}2
-
-function! g:SyntasticHighlightingNotifier._reset() abort " {{{2
-    for match in getmatches()
-        if stridx(match['group'], 'Syntastic') == 0
-            call matchdelete(match['id'])
-        endif
-    endfor
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/loclist.vim b/bundle/syntastic/plugin/syntastic/loclist.vim
deleted file mode 100644
index 790c37f..0000000
--- a/bundle/syntastic/plugin/syntastic/loclist.vim
+++ /dev/null
@@ -1,436 +0,0 @@
-if exists('g:loaded_syntastic_loclist') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_loclist = 1
-
-let g:SyntasticLoclist = {}
-
-" Public methods {{{1
-
-function! g:SyntasticLoclist.New(rawLoclist) abort " {{{2
-    let newObj = copy(self)
-
-    let llist = filter(copy(a:rawLoclist), 'v:val["valid"] == 1')
-
-    for e in llist
-        if get(e, 'type', '') ==# ''
-            let e['type'] = 'E'
-        endif
-    endfor
-
-    let newObj._rawLoclist = llist
-    let newObj._name = ''
-    let newObj._owner = bufnr('')
-    let newObj._sorted = 0
-    let newObj._columns = g:syntastic_cursor_columns
-
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticLoclist.current() abort " {{{2
-    if !exists('b:syntastic_loclist') || empty(b:syntastic_loclist)
-        let b:syntastic_loclist = g:SyntasticLoclist.New([])
-    endif
-    return b:syntastic_loclist
-endfunction " }}}2
-
-function! g:SyntasticLoclist.extend(other) abort " {{{2
-    let list = self.copyRaw()
-    call extend(list, a:other.copyRaw())
-    return g:SyntasticLoclist.New(list)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.sort() abort " {{{2
-    if !self._sorted
-        for e in self._rawLoclist
-            call s:_set_screen_column(e)
-        endfor
-
-        call sort(self._rawLoclist, self._columns ? 's:_compare_error_items_by_columns' : 's:_compare_error_items_by_lines')
-
-        let self._sorted = 1
-    endif
-endfunction " }}}2
-
-function! g:SyntasticLoclist.isEmpty() abort " {{{2
-    return empty(self._rawLoclist)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.isNewerThan(stamp) abort " {{{2
-    if !exists('self._stamp')
-        let self._stamp = []
-        return 0
-    endif
-    return syntastic#util#compareLexi(self._stamp, a:stamp) > 0
-endfunction " }}}2
-
-function! g:SyntasticLoclist.copyRaw() abort " {{{2
-    return copy(self._rawLoclist)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getRaw() abort " {{{2
-    return self._rawLoclist
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getBuffers() abort " {{{2
-    return syntastic#util#unique(map(copy(self._rawLoclist), 'str2nr(v:val["bufnr"])') + [self._owner])
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getCursorColumns() abort " {{{2
-    return self._columns
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getStatuslineFlag() abort " {{{2
-    if !exists('self._stl_format')
-        let self._stl_format = ''
-    endif
-    if !exists('self._stl_flag')
-        let self._stl_flag = ''
-    endif
-
-    if g:syntastic_stl_format !=# self._stl_format
-        let self._stl_format = g:syntastic_stl_format
-
-        if !empty(self._rawLoclist)
-            let errors = self.errors()
-            let warnings = self.warnings()
-
-            let num_errors = len(errors)
-            let num_warnings = len(warnings)
-            let num_issues = len(self._rawLoclist)
-
-            let output = self._stl_format
-
-            "hide stuff wrapped in %E(...) unless there are errors
-            let output = substitute(output, '\m\C%E{\([^}]*\)}', num_errors ? '\1' : '' , 'g')
-
-            "hide stuff wrapped in %W(...) unless there are warnings
-            let output = substitute(output, '\m\C%W{\([^}]*\)}', num_warnings ? '\1' : '' , 'g')
-
-            "hide stuff wrapped in %B(...) unless there are both errors and warnings
-            let output = substitute(output, '\m\C%B{\([^}]*\)}', (num_warnings && num_errors) ? '\1' : '' , 'g')
-
-            let flags = {
-                \ '%':  '%',
-                \ 't':  num_issues,
-                \ 'e':  num_errors,
-                \ 'w':  num_warnings,
-                \ 'N':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':t') : ''),
-                \ 'P':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':p:~:.') : ''),
-                \ 'F':  (num_issues ? self._rawLoclist[0]['lnum'] : ''),
-                \ 'ne': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':t') : ''),
-                \ 'pe': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':p:~:.') : ''),
-                \ 'fe': (num_errors ? errors[0]['lnum'] : ''),
-                \ 'nw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':t') : ''),
-                \ 'pw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':p:~:.') : ''),
-                \ 'fw': (num_warnings ? warnings[0]['lnum'] : '') }
-            let output = substitute(output, '\v\C\%(-?\d*%(\.\d+)?)([npf][ew]|[NPFtew%])', '\=syntastic#util#wformat(submatch(1), flags[submatch(2)])', 'g')
-
-            let self._stl_flag = output
-        else
-            let self._stl_flag = ''
-        endif
-    endif
-
-    return self._stl_flag
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getFirstError(...) abort " {{{2
-    let max_issues = len(self._rawLoclist)
-    if a:0 && a:1 < max_issues
-        let max_issues = a:1
-    endif
-
-    for idx in range(max_issues)
-        if get(self._rawLoclist[idx], 'type', '') ==? 'E'
-            return idx + 1
-        endif
-    endfor
-
-    return 0
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getName() abort " {{{2
-    return len(self._name)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.setName(name) abort " {{{2
-    let self._name = a:name
-endfunction " }}}2
-
-function! g:SyntasticLoclist.getOwner() abort " {{{2
-    return self._owner
-endfunction " }}}2
-
-function! g:SyntasticLoclist.setOwner(buffer) abort " {{{2
-    let self._owner = type(a:buffer) == type(0) ? a:buffer : str2nr(a:buffer)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.deploy() abort " {{{2
-    call self.setOwner(bufnr(''))
-    let self._stamp = syntastic#util#stamp()
-    for buf in self.getBuffers()
-        call setbufvar(buf, 'syntastic_loclist', self)
-    endfor
-endfunction " }}}2
-
-function! g:SyntasticLoclist.destroy() abort " {{{2
-    for buf in self.getBuffers()
-        call setbufvar(buf, 'syntastic_loclist', {})
-    endfor
-endfunction " }}}2
-
-function! g:SyntasticLoclist.decorate(tag) abort " {{{2
-    for e in self._rawLoclist
-        let e['text'] .= ' [' . a:tag . ']'
-    endfor
-endfunction " }}}2
-
-function! g:SyntasticLoclist.balloons() abort " {{{2
-    if !exists('self._cachedBalloons')
-        let sep = has('balloon_multiline') ? "\n" : ' | '
-
-        let self._cachedBalloons = {}
-        for e in self._rawLoclist
-            let buf = e['bufnr']
-
-            if !has_key(self._cachedBalloons, buf)
-                let self._cachedBalloons[buf] = {}
-            endif
-
-            if has_key(self._cachedBalloons[buf], e['lnum'])
-                let self._cachedBalloons[buf][e['lnum']] .= sep . e['text']
-            else
-                let self._cachedBalloons[buf][e['lnum']] = e['text']
-            endif
-        endfor
-    endif
-
-    return get(self._cachedBalloons, bufnr(''), {})
-endfunction " }}}2
-
-function! g:SyntasticLoclist.errors() abort " {{{2
-    if !exists('self._cachedErrors')
-        let self._cachedErrors = self.filter({'type': 'E'})
-    endif
-    return self._cachedErrors
-endfunction " }}}2
-
-function! g:SyntasticLoclist.warnings() abort " {{{2
-    if !exists('self._cachedWarnings')
-        let self._cachedWarnings = self.filter({'type': 'W'})
-    endif
-    return self._cachedWarnings
-endfunction " }}}2
-
-" Legacy function.  Syntastic no longer calls it, but we keep it
-" around because other plugins (f.i. powerline) depend on it.
-function! g:SyntasticLoclist.hasErrorsOrWarningsToDisplay() abort " {{{2
-    return !self.isEmpty()
-endfunction " }}}2
-
-" cache used by EchoCurrentError()
-function! g:SyntasticLoclist.messages(buf) abort " {{{2
-    if !exists('self._cachedMessages')
-        let self._cachedMessages = {}
-
-        let errors = self.errors() + self.warnings()
-        for e in errors
-            let b = e['bufnr']
-            let l = e['lnum']
-
-            if !has_key(self._cachedMessages, b)
-                let self._cachedMessages[b] = {}
-            endif
-
-            if !has_key(self._cachedMessages[b], l)
-                let self._cachedMessages[b][l] = [e]
-            elseif self._columns
-                call add(self._cachedMessages[b][l], e)
-            endif
-        endfor
-
-        if self._columns
-            if !self._sorted
-                for b in keys(self._cachedMessages)
-                    for l in keys(self._cachedMessages[b])
-                        if len(self._cachedMessages[b][l]) > 1
-                            for e in self._cachedMessages[b][l]
-                                call s:_set_screen_column(e)
-                            endfor
-                            call sort(self._cachedMessages[b][l], 's:_compare_error_items_by_columns')
-                        endif
-                    endfor
-                endfor
-            endif
-
-            for b in keys(self._cachedMessages)
-                for l in keys(self._cachedMessages[b])
-                    call s:_remove_shadowed_items(self._cachedMessages[b][l])
-                endfor
-            endfor
-        endif
-    endif
-
-    return get(self._cachedMessages, a:buf, {})
-endfunction " }}}2
-
-"Filter the list and return new native loclist
-"e.g.
-"  .filter({'bufnr': 10, 'type': 'e'})
-"
-"would return all errors for buffer 10.
-"
-"Note that all comparisons are done with ==?
-function! g:SyntasticLoclist.filter(filters) abort " {{{2
-    let conditions = values(map(copy(a:filters), 's:_translate(v:key, v:val)'))
-    let filter = len(conditions) == 1 ?
-        \ conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
-    return filter(copy(self._rawLoclist), filter)
-endfunction " }}}2
-
-function! g:SyntasticLoclist.setloclist() abort " {{{2
-    if !exists('w:syntastic_loclist_set')
-        let w:syntastic_loclist_set = 0
-    endif
-    let replace = g:syntastic_reuse_loc_lists && w:syntastic_loclist_set
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
-    call setloclist(0, self.getRaw(), replace ? 'r' : ' ')
-    let w:syntastic_loclist_set = 1
-endfunction " }}}2
-
-"display the cached errors for this buf in the location list
-function! g:SyntasticLoclist.show() abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: show')
-    call self.setloclist()
-
-    if !self.isEmpty()
-        let num = winnr()
-        execute 'lopen ' . syntastic#util#var('loc_list_height')
-        if num != winnr()
-            execute num . 'wincmd w'
-        endif
-
-        " try to find the loclist window and set w:quickfix_title
-        let errors = getloclist(0)
-        for buf in tabpagebuflist()
-            if buflisted(buf) && bufloaded(buf) && getbufvar(buf, '&buftype') ==# 'quickfix'
-                let win = bufwinnr(buf)
-                let title = getwinvar(win, 'quickfix_title')
-
-                " TODO: try to make sure we actually own this window; sadly,
-                " errors == getloclist(0) is the only somewhat safe way to
-                " achieve that
-                if strpart(title, 0, 16) ==# ':SyntasticCheck ' ||
-                            \ ( (title ==# '' || title ==# ':setloclist()') && errors == getloclist(0) )
-                    call setwinvar(win, 'quickfix_title', ':SyntasticCheck ' . self._name)
-                    call setbufvar(buf, 'syntastic_owner_buffer', self._owner)
-                endif
-            endif
-        endfor
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Public functions {{{1
-
-function! SyntasticLoclistHide() abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
-    silent! lclose
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-function! s:_translate(key, val) abort " {{{2
-    return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
-endfunction " }}}2
-
-function! s:_set_screen_column(item) abort " {{{2
-    if !has_key(a:item, 'scol')
-        let col = get(a:item, 'col', 0)
-        if col != 0 && get(a:item, 'vcol', 0) == 0
-            let buf = str2nr(a:item['bufnr'])
-            try
-                let line = getbufline(buf, a:item['lnum'])[0]
-            catch  /\m^Vim\%((\a\+)\)\=:E684/
-                let line = ''
-            endtry
-            let a:item['scol'] = syntastic#util#screenWidth(strpart(line, 0, col), getbufvar(buf, '&tabstop'))
-        else
-            let a:item['scol'] = col
-        endif
-    endif
-endfunction " }}}2
-
-function! s:_remove_shadowed_items(errors) abort " {{{2
-    " keep only the first message at a given column
-    let i = 0
-    while i < len(a:errors) - 1
-        let j = i + 1
-        let dupes = 0
-        while j < len(a:errors) && a:errors[j].scol == a:errors[i].scol
-            let dupes = 1
-            let j += 1
-        endwhile
-        if dupes
-            call remove(a:errors, i + 1, j - 1)
-        endif
-        let i += 1
-    endwhile
-
-    " merge messages with the same text
-    let i = 0
-    while i < len(a:errors) - 1
-        let j = i + 1
-        let dupes = 0
-        while j < len(a:errors) && a:errors[j].text == a:errors[i].text
-            let dupes = 1
-            let j += 1
-        endwhile
-        if dupes
-            call remove(a:errors, i + 1, j - 1)
-        endif
-        let i += 1
-    endwhile
-endfunction " }}}2
-
-function! s:_compare_error_items_by_columns(a, b) abort " {{{2
-    if a:a['bufnr'] != a:b['bufnr']
-        " group by file
-        return a:a['bufnr'] - a:b['bufnr']
-    elseif a:a['lnum'] != a:b['lnum']
-        " sort by line
-        return a:a['lnum'] - a:b['lnum']
-    elseif a:a['scol'] != a:b['scol']
-        " sort by screen column
-        return a:a['scol'] - a:b['scol']
-    elseif a:a['type'] !=? a:b['type']
-        " errors take precedence over warnings
-        return a:a['type'] ==? 'E' ? -1 : 1
-    else
-        return 0
-    endif
-endfunction " }}}2
-
-function! s:_compare_error_items_by_lines(a, b) abort " {{{2
-    if a:a['bufnr'] != a:b['bufnr']
-        " group by file
-        return a:a['bufnr'] - a:b['bufnr']
-    elseif a:a['lnum'] != a:b['lnum']
-        " sort by line
-        return a:a['lnum'] - a:b['lnum']
-    elseif a:a['type'] !=? a:b['type']
-        " errors take precedence over warnings
-        return a:a['type'] ==? 'E' ? -1 : 1
-    else
-        " sort by screen column
-        return a:a['scol'] - a:b['scol']
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/modemap.vim b/bundle/syntastic/plugin/syntastic/modemap.vim
deleted file mode 100644
index 501c82b..0000000
--- a/bundle/syntastic/plugin/syntastic/modemap.vim
+++ /dev/null
@@ -1,117 +0,0 @@
-if exists('g:loaded_syntastic_modemap') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_modemap = 1
-
-let g:SyntasticModeMap = {}
-
-" Public methods {{{1
-
-function! g:SyntasticModeMap.Instance() abort " {{{2
-    if !exists('s:SyntasticModeMapInstance')
-        let s:SyntasticModeMapInstance = copy(self)
-        call s:SyntasticModeMapInstance.synch()
-    endif
-
-    return s:SyntasticModeMapInstance
-endfunction " }}}2
-
-function! g:SyntasticModeMap.synch() abort " {{{2
-    if exists('g:syntastic_mode_map')
-        let self._mode = get(g:syntastic_mode_map, 'mode', 'active')
-        let self._activeFiletypes = copy(get(g:syntastic_mode_map, 'active_filetypes', []))
-        let self._passiveFiletypes = copy(get(g:syntastic_mode_map, 'passive_filetypes', []))
-    else
-        let self._mode = 'active'
-        let self._activeFiletypes = []
-        let self._passiveFiletypes = []
-    endif
-endfunction " }}}2
-
-function! g:SyntasticModeMap.allowsAutoChecking(filetype) abort " {{{2
-    let fts = split(a:filetype, '\m\.')
-
-    if self.isPassive()
-        return self._isOneFiletypeActive(fts)
-    else
-        return self._noFiletypesArePassive(fts)
-    endif
-endfunction " }}}2
-
-function! g:SyntasticModeMap.doAutoChecking() abort " {{{2
-    let local_mode = get(b:, 'syntastic_mode', '')
-    if local_mode ==# 'active' || local_mode ==# 'passive'
-        return local_mode ==# 'active'
-    endif
-
-    return self.allowsAutoChecking(&filetype)
-endfunction " }}}2
-
-function! g:SyntasticModeMap.isPassive() abort " {{{2
-    return self._mode ==# 'passive'
-endfunction " }}}2
-
-function! g:SyntasticModeMap.toggleMode() abort " {{{2
-    call self.synch()
-
-    if self._mode ==# 'active'
-        let self._mode = 'passive'
-    else
-        let self._mode = 'active'
-    endif
-
-    "XXX Changing a global variable.  Tsk, tsk...
-    if !exists('g:syntastic_mode_map')
-        let g:syntastic_mode_map = {}
-    endif
-    let g:syntastic_mode_map['mode'] = self._mode
-endfunction " }}}2
-
-function! g:SyntasticModeMap.echoMode() abort " {{{2
-    echo 'Syntastic: ' . self._mode . ' mode enabled'
-endfunction " }}}2
-
-function! g:SyntasticModeMap.modeInfo(filetypes) abort " {{{2
-    echomsg 'Syntastic version: ' . g:_SYNTASTIC_VERSION . ' (Vim ' . v:version . ', ' . g:_SYNTASTIC_UNAME . ')'
-    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
-    echomsg 'Info for filetype: ' . type
-
-    call self.synch()
-    echomsg 'Global mode: ' . self._mode
-    if self._mode ==# 'active'
-        if len(self._passiveFiletypes)
-            let plural = len(self._passiveFiletypes) != 1 ? 's' : ''
-            echomsg 'Passive filetype' . plural . ': ' . join(sort(copy(self._passiveFiletypes)))
-        endif
-    else
-        if len(self._activeFiletypes)
-            let plural = len(self._activeFiletypes) != 1 ? 's' : ''
-            echomsg 'Active filetype' . plural . ': ' . join(sort(copy(self._activeFiletypes)))
-        endif
-    endif
-    echomsg 'Filetype ' . type . ' is ' . (self.allowsAutoChecking(type) ? 'active' : 'passive')
-
-    if !len(a:filetypes)
-        if exists('b:syntastic_mode') && (b:syntastic_mode ==# 'active' || b:syntastic_mode ==# 'passive')
-            echomsg 'Local mode: ' . b:syntastic_mode
-        endif
-
-        echomsg 'The current file will ' . (self.doAutoChecking() ? '' : 'not ') . 'be checked automatically'
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Private methods {{{1
-
-function! g:SyntasticModeMap._isOneFiletypeActive(filetypes) abort " {{{2
-    return !empty(filter(copy(a:filetypes), 'index(self._activeFiletypes, v:val) != -1'))
-endfunction " }}}2
-
-function! g:SyntasticModeMap._noFiletypesArePassive(filetypes) abort " {{{2
-    return empty(filter(copy(a:filetypes), 'index(self._passiveFiletypes, v:val) != -1'))
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/notifiers.vim b/bundle/syntastic/plugin/syntastic/notifiers.vim
deleted file mode 100644
index fe158ca..0000000
--- a/bundle/syntastic/plugin/syntastic/notifiers.vim
+++ /dev/null
@@ -1,86 +0,0 @@
-if exists('g:loaded_syntastic_notifiers') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifiers = 1
-
-let g:SyntasticNotifiers = {}
-
-let s:_NOTIFIER_TYPES = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
-lockvar! s:_NOTIFIER_TYPES
-
-let s:_PERSISTENT_NOTIFIERS = ['signs', 'balloons']
-lockvar! s:_PERSISTENT_NOTIFIERS
-
-" Public methods {{{1
-
-function! g:SyntasticNotifiers.Instance() abort " {{{2
-    if !exists('s:SyntasticNotifiersInstance')
-        let s:SyntasticNotifiersInstance = copy(self)
-        call s:SyntasticNotifiersInstance._initNotifiers()
-    endif
-
-    return s:SyntasticNotifiersInstance
-endfunction " }}}2
-
-function! g:SyntasticNotifiers.refresh(loclist) abort " {{{2
-    if !a:loclist.isEmpty() && !a:loclist.isNewerThan([])
-        " loclist not fully constructed yet
-        return
-    endif
-
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'notifiers: refresh')
-    for type in self._enabled_types
-        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
-        if !has_key(g:{class}, 'enabled') || self._notifier[type].enabled()
-            if index(s:_PERSISTENT_NOTIFIERS, type) > -1
-                " refresh only if loclist has changed since last call
-                if !exists('b:syntastic_private_' . type . '_stamp')
-                    let b:syntastic_private_{type}_stamp = []
-                endif
-                if a:loclist.isNewerThan(b:syntastic_private_{type}_stamp) || a:loclist.isEmpty()
-                    call self._notifier[type].refresh(a:loclist)
-                    let b:syntastic_private_{type}_stamp = syntastic#util#stamp()
-                endif
-            else
-                call self._notifier[type].refresh(a:loclist)
-            endif
-        endif
-    endfor
-endfunction " }}}2
-
-function! g:SyntasticNotifiers.reset(loclist) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'notifiers: reset')
-    for type in self._enabled_types
-        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
-
-        " reset notifiers regardless if they are enabled or not, since
-        " the user might have disabled them since the last refresh();
-        " notifiers MUST be prepared to deal with reset() when disabled
-        if has_key(g:{class}, 'reset')
-            call self._notifier[type].reset(a:loclist)
-        endif
-
-        " also reset stamps
-        if index(s:_PERSISTENT_NOTIFIERS, type) > -1
-            let b:syntastic_private_{type}_stamp = []
-        endif
-    endfor
-endfunction " }}}2
-
-" }}}1
-
-" Private methods {{{1
-
-function! g:SyntasticNotifiers._initNotifiers() abort " {{{2
-    let self._notifier = {}
-    for type in s:_NOTIFIER_TYPES
-        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
-        let self._notifier[type] = g:{class}.New()
-    endfor
-
-    let self._enabled_types = copy(s:_NOTIFIER_TYPES)
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/registry.vim b/bundle/syntastic/plugin/syntastic/registry.vim
deleted file mode 100644
index 016d762..0000000
--- a/bundle/syntastic/plugin/syntastic/registry.vim
+++ /dev/null
@@ -1,354 +0,0 @@
-if exists('g:loaded_syntastic_registry') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_registry = 1
-
-" Initialisation {{{1
-
-let s:_DEFAULT_CHECKERS = {
-        \ 'actionscript':  ['mxmlc'],
-        \ 'ada':           ['gcc'],
-        \ 'apiblueprint':  ['drafter'],
-        \ 'applescript':   ['osacompile'],
-        \ 'asciidoc':      ['asciidoc'],
-        \ 'asm':           ['gcc'],
-        \ 'bro':           ['bro'],
-        \ 'bemhtml':       ['bemhtmllint'],
-        \ 'c':             ['gcc'],
-        \ 'cabal':         ['cabal'],
-        \ 'chef':          ['foodcritic'],
-        \ 'co':            ['coco'],
-        \ 'cobol':         ['cobc'],
-        \ 'coffee':        ['coffee', 'coffeelint'],
-        \ 'coq':           ['coqtop'],
-        \ 'cpp':           ['gcc'],
-        \ 'cs':            ['mcs'],
-        \ 'css':           ['csslint'],
-        \ 'cucumber':      ['cucumber'],
-        \ 'cuda':          ['nvcc'],
-        \ 'd':             ['dmd'],
-        \ 'dart':          ['dartanalyzer'],
-        \ 'docbk':         ['xmllint'],
-        \ 'dustjs':        ['swiffer'],
-        \ 'elixir':        [],
-        \ 'erlang':        ['escript'],
-        \ 'eruby':         ['ruby'],
-        \ 'fortran':       ['gfortran'],
-        \ 'glsl':          ['cgc'],
-        \ 'go':            ['go'],
-        \ 'haml':          ['haml'],
-        \ 'handlebars':    ['handlebars'],
-        \ 'haskell':       ['ghc_mod', 'hdevtools', 'hlint'],
-        \ 'haxe':          ['haxe'],
-        \ 'hss':           ['hss'],
-        \ 'html':          ['tidy'],
-        \ 'jade':          ['jade_lint'],
-        \ 'java':          ['javac'],
-        \ 'javascript':    ['jshint', 'jslint'],
-        \ 'json':          ['jsonlint', 'jsonval'],
-        \ 'less':          ['lessc'],
-        \ 'lex':           ['flex'],
-        \ 'limbo':         ['limbo'],
-        \ 'lisp':          ['clisp'],
-        \ 'llvm':          ['llvm'],
-        \ 'lua':           ['luac'],
-        \ 'markdown':      ['mdl'],
-        \ 'matlab':        ['mlint'],
-        \ 'mercury':       ['mmc'],
-        \ 'nasm':          ['nasm'],
-        \ 'nix':           ['nix'],
-        \ 'nroff':         ['mandoc'],
-        \ 'objc':          ['gcc'],
-        \ 'objcpp':        ['gcc'],
-        \ 'ocaml':         ['camlp4o'],
-        \ 'perl':          ['perlcritic'],
-        \ 'php':           ['php', 'phpcs', 'phpmd'],
-        \ 'po':            ['msgfmt'],
-        \ 'pod':           ['podchecker'],
-        \ 'puppet':        ['puppet', 'puppetlint'],
-        \ 'python':        ['python', 'flake8', 'pylint'],
-        \ 'qml':           ['qmllint'],
-        \ 'r':             [],
-        \ 'racket':        ['racket'],
-        \ 'rnc':           ['rnv'],
-        \ 'rst':           ['rst2pseudoxml'],
-        \ 'ruby':          ['mri'],
-        \ 'sass':          ['sass'],
-        \ 'scala':         ['fsc', 'scalac'],
-        \ 'scss':          ['sass', 'scss_lint'],
-        \ 'sh':            ['sh', 'shellcheck'],
-        \ 'slim':          ['slimrb'],
-        \ 'sml':           ['smlnj'],
-        \ 'spec':          ['rpmlint'],
-        \ 'sql':           ['sqlint'],
-        \ 'stylus':        ['stylint'],
-        \ 'tcl':           ['nagelfar'],
-        \ 'tex':           ['lacheck', 'chktex'],
-        \ 'texinfo':       ['makeinfo'],
-        \ 'text':          [],
-        \ 'twig':          ['twiglint'],
-        \ 'typescript':    ['tsc'],
-        \ 'vala':          ['valac'],
-        \ 'verilog':       ['verilator'],
-        \ 'vhdl':          ['ghdl'],
-        \ 'vim':           ['vimlint'],
-        \ 'xhtml':         ['tidy'],
-        \ 'xml':           ['xmllint'],
-        \ 'xslt':          ['xmllint'],
-        \ 'yacc':          ['bison'],
-        \ 'yaml':          ['jsyaml'],
-        \ 'z80':           ['z80syntaxchecker'],
-        \ 'zpt':           ['zptlint'],
-        \ 'zsh':           ['zsh'],
-    \ }
-lockvar! s:_DEFAULT_CHECKERS
-
-let s:_DEFAULT_FILETYPE_MAP = {
-        \ 'gentoo-metadata': 'xml',
-        \ 'groff': 'nroff',
-        \ 'lhaskell': 'haskell',
-        \ 'litcoffee': 'coffee',
-        \ 'mail': 'text',
-        \ 'mkd': 'markdown',
-        \ 'pe-puppet': 'puppet',
-        \ 'sgml': 'docbk',
-        \ 'sgmllnx': 'docbk',
-    \ }
-lockvar! s:_DEFAULT_FILETYPE_MAP
-
-let s:_ECLIM_TYPES = [
-        \ 'c',
-        \ 'cpp',
-        \ 'html',
-        \ 'java',
-        \ 'php',
-        \ 'python',
-        \ 'ruby',
-    \ ]
-lockvar! s:_ECLIM_TYPES
-
-let s:_YCM_TYPES = [
-        \ 'c',
-        \ 'cpp',
-        \ 'objc',
-        \ 'objcpp',
-    \ ]
-lockvar! s:_YCM_TYPES
-
-let g:SyntasticRegistry = {}
-
-" }}}1
-
-" Public methods {{{1
-
-" Note: Handling of filetype aliases: all public methods take aliases as
-" parameters, all private methods take normalized filetypes.  Public methods
-" are thus supposed to normalize filetypes before calling private methods.
-
-function! g:SyntasticRegistry.Instance() abort " {{{2
-    if !exists('s:SyntasticRegistryInstance')
-        let s:SyntasticRegistryInstance = copy(self)
-        let s:SyntasticRegistryInstance._checkerMap = {}
-    endif
-
-    return s:SyntasticRegistryInstance
-endfunction " }}}2
-
-function! g:SyntasticRegistry.CreateAndRegisterChecker(args) abort " {{{2
-    let checker = g:SyntasticChecker.New(a:args)
-    let registry = g:SyntasticRegistry.Instance()
-    call registry._registerChecker(checker)
-endfunction " }}}2
-
-" Given a list of checker names hints_list, return a map name --> checker.
-" If hints_list is empty, user settings are are used instead. Checkers are
-" not checked for availability (that is, the corresponding IsAvailable() are
-" not run).
-function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) abort " {{{2
-    let ft = s:_normalise_filetype(a:ftalias)
-    call self._loadCheckersFor(ft)
-
-    let checkers_map = self._checkerMap[ft]
-    if empty(checkers_map)
-        return []
-    endif
-
-    call self._checkDeprecation(ft)
-
-    let names =
-        \ !empty(a:hints_list) ? syntastic#util#unique(a:hints_list) :
-        \ exists('b:syntastic_checkers') ? b:syntastic_checkers :
-        \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
-        \ get(s:_DEFAULT_CHECKERS, ft, 0)
-
-    return type(names) == type([]) ?
-        \ self._filterCheckersByName(checkers_map, names) : [checkers_map[keys(checkers_map)[0]]]
-endfunction " }}}2
-
-" Same as getCheckers(), but keep only the available checkers.  This runs the
-" corresponding IsAvailable() functions for all checkers.
-function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) abort " {{{2
-    return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
-endfunction " }}}2
-
-" Same as getCheckers(), but keep only the checkers tyhat are available and
-" disabled.  This runs the corresponding IsAvailable() functions for all checkers.
-function! g:SyntasticRegistry.getCheckersDisabled(ftalias, hints_list) abort " {{{2
-    return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isDisabled() && v:val.isAvailable()')
-endfunction " }}}2
-
-function! g:SyntasticRegistry.getKnownFiletypes() abort " {{{2
-    let types = keys(s:_DEFAULT_CHECKERS)
-
-    call extend(types, keys(s:_DEFAULT_FILETYPE_MAP))
-
-    if exists('g:syntastic_filetype_map')
-        call extend(types, keys(g:syntastic_filetype_map))
-    endif
-
-    if exists('g:syntastic_extra_filetypes') && type(g:syntastic_extra_filetypes) == type([])
-        call extend(types, g:syntastic_extra_filetypes)
-    endif
-
-    return syntastic#util#unique(types)
-endfunction " }}}2
-
-function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) abort " {{{2
-    let ft = s:_normalise_filetype(a:ftalias)
-    call self._loadCheckersFor(ft)
-    return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
-endfunction " }}}2
-
-function! g:SyntasticRegistry.echoInfoFor(ftalias_list) abort " {{{2
-    let ft_list = syntastic#util#unique(map( copy(a:ftalias_list), 's:_normalise_filetype(v:val)' ))
-    if len(ft_list) != 1
-        let available = []
-        let active = []
-        let disabled = []
-
-        for ft in ft_list
-            call extend(available, map( self.getNamesOfAvailableCheckers(ft), 'ft . "/" . v:val' ))
-            call extend(active, map( self.getCheckersAvailable(ft, []), 'ft . "/" . v:val.getName()' ))
-            call extend(disabled, map( self.getCheckersDisabled(ft, []), 'ft . "/" . v:val.getName()' ))
-        endfor
-    else
-        let ft = ft_list[0]
-        let available = self.getNamesOfAvailableCheckers(ft)
-        let active = map(self.getCheckersAvailable(ft, []), 'v:val.getName()')
-        let disabled = map(self.getCheckersDisabled(ft, []), 'v:val.getName()')
-    endif
-
-    let cnt = len(available)
-    let plural = cnt != 1 ? 's' : ''
-    let cklist = cnt ? join(sort(available)) : '-'
-    echomsg 'Available checker' . plural . ': ' . cklist
-
-    let cnt = len(active)
-    let plural = cnt != 1 ? 's' : ''
-    let cklist = cnt ? join(active) : '-'
-    echomsg 'Currently enabled checker' . plural . ': ' . cklist
-
-    let cnt = len(disabled)
-    let plural = cnt != 1 ? 's' : ''
-    if len(disabled)
-        let cklist = join(sort(disabled))
-        echomsg 'Checker' . plural . ' disabled for security reasons: ' . cklist
-    endif
-
-    " Eclim feels entitled to mess with syntastic's variables {{{3
-    if exists(':EclimValidate') && get(g:, 'EclimFileTypeValidate', 1)
-        let disabled = filter(copy(ft_list), 's:_disabled_by_eclim(v:val)')
-        let cnt = len(disabled)
-        if cnt
-            let plural = cnt != 1 ? 's' : ''
-            let cklist = join(disabled, ', ')
-            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by Eclim'
-        endif
-    endif
-    " }}}3
-
-    " So does YouCompleteMe {{{3
-    if exists('g:loaded_youcompleteme') && get(g:, 'ycm_show_diagnostics_ui', get(g:, 'ycm_register_as_syntastic_checker', 1))
-        let disabled = filter(copy(ft_list), 's:_disabled_by_ycm(v:val)')
-        let cnt = len(disabled)
-        if cnt
-            let plural = cnt != 1 ? 's' : ''
-            let cklist = join(disabled, ', ')
-            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by YouCompleteMe'
-        endif
-    endif
-    " }}}3
-endfunction " }}}2
-
-" }}}1
-
-" Private methods {{{1
-
-function! g:SyntasticRegistry._registerChecker(checker) abort " {{{2
-    let ft = a:checker.getFiletype()
-    if !has_key(self._checkerMap, ft)
-        let self._checkerMap[ft] = {}
-    endif
-
-    let name = a:checker.getName()
-    if has_key(self._checkerMap[ft], name)
-        throw 'Syntastic: Duplicate syntax checker name: ' . ft . '/' . name
-    endif
-
-    let self._checkerMap[ft][name] = a:checker
-endfunction " }}}2
-
-function! g:SyntasticRegistry._filterCheckersByName(checkers_map, list) abort " {{{2
-    return filter( map(copy(a:list), 'get(a:checkers_map, v:val, {})'), '!empty(v:val)' )
-endfunction " }}}2
-
-function! g:SyntasticRegistry._loadCheckersFor(filetype) abort " {{{2
-    if has_key(self._checkerMap, a:filetype)
-        return
-    endif
-
-    execute 'runtime! syntax_checkers/' . a:filetype . '/*.vim'
-
-    if !has_key(self._checkerMap, a:filetype)
-        let self._checkerMap[a:filetype] = {}
-    endif
-endfunction " }}}2
-
-" Check for obsolete variable g:syntastic_<filetype>_checker
-function! g:SyntasticRegistry._checkDeprecation(filetype) abort " {{{2
-    if exists('g:syntastic_' . a:filetype . '_checker') && !exists('g:syntastic_' . a:filetype . '_checkers')
-        let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
-        call syntastic#log#oneTimeWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
-    endif
-endfunction " }}}2
-
-" }}}1
-
-" Utilities {{{1
-
-"resolve filetype aliases, and replace - with _ otherwise we cant name
-"syntax checker functions legally for filetypes like "gentoo-metadata"
-function! s:_normalise_filetype(ftalias) abort " {{{2
-    let ft = get(s:_DEFAULT_FILETYPE_MAP, a:ftalias, a:ftalias)
-    let ft = get(g:syntastic_filetype_map, ft, ft)
-    let ft = substitute(ft, '\m-', '_', 'g')
-    return ft
-endfunction " }}}2
-
-function! s:_disabled_by_eclim(filetype) abort " {{{2
-    if index(s:_ECLIM_TYPES, a:filetype) >= 0
-        let lang = toupper(a:filetype[0]) . a:filetype[1:]
-        let ft = a:filetype !=# 'cpp' ? lang : 'C'
-        return get(g:, 'Eclim' . lang . 'Validate', 1) && !get(g:, 'Eclim' . ft . 'SyntasticEnabled', 0)
-    endif
-
-    return 0
-endfunction " }}}2
-
-function! s:_disabled_by_ycm(filetype) abort " {{{2
-    return index(s:_YCM_TYPES, a:filetype) >= 0
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/plugin/syntastic/signs.vim b/bundle/syntastic/plugin/syntastic/signs.vim
deleted file mode 100644
index 1b89d2f..0000000
--- a/bundle/syntastic/plugin/syntastic/signs.vim
+++ /dev/null
@@ -1,138 +0,0 @@
-if exists('g:loaded_syntastic_notifier_signs') || !exists('g:loaded_syntastic_plugin')
-    finish
-endif
-let g:loaded_syntastic_notifier_signs = 1
-
-" Initialisation {{{1
-
-" start counting sign ids at 5000, start here to hopefully avoid conflicting
-" with any other code that places signs (not sure if this precaution is
-" actually needed)
-let s:first_sign_id = 5000
-let s:next_sign_id = s:first_sign_id
-
-let g:SyntasticSignsNotifier = {}
-
-let s:setup_done = 0
-
-" }}}1
-
-" Public methods {{{1
-
-function! g:SyntasticSignsNotifier.New() abort " {{{2
-    let newObj = copy(self)
-
-    if !s:setup_done
-        call self._setup()
-        let s:setup_done = 1
-        lockvar s:setup_done
-    endif
-
-    return newObj
-endfunction " }}}2
-
-function! g:SyntasticSignsNotifier.enabled() abort " {{{2
-    return has('signs') && syntastic#util#var('enable_signs')
-endfunction " }}}2
-
-function! g:SyntasticSignsNotifier.refresh(loclist) abort " {{{2
-    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'signs: refresh')
-    let old_signs = copy(self._bufSignIds())
-    if self.enabled()
-        call self._signErrors(a:loclist)
-    endif
-    call self._removeSigns(old_signs)
-endfunction " }}}2
-
-" }}}1
-
-" Private methods {{{1
-
-" One time setup: define our own sign types and highlighting
-function! g:SyntasticSignsNotifier._setup() abort " {{{2
-    if has('signs')
-        if !hlexists('SyntasticErrorSign')
-            highlight link SyntasticErrorSign error
-        endif
-        if !hlexists('SyntasticWarningSign')
-            highlight link SyntasticWarningSign todo
-        endif
-        if !hlexists('SyntasticStyleErrorSign')
-            highlight link SyntasticStyleErrorSign SyntasticErrorSign
-        endif
-        if !hlexists('SyntasticStyleWarningSign')
-            highlight link SyntasticStyleWarningSign SyntasticWarningSign
-        endif
-        if !hlexists('SyntasticStyleErrorLine')
-            highlight link SyntasticStyleErrorLine SyntasticErrorLine
-        endif
-        if !hlexists('SyntasticStyleWarningLine')
-            highlight link SyntasticStyleWarningLine SyntasticWarningLine
-        endif
-
-        " define the signs used to display syntax and style errors/warns
-        execute 'sign define SyntasticError text=' . g:syntastic_error_symbol .
-            \ ' texthl=SyntasticErrorSign linehl=SyntasticErrorLine'
-        execute 'sign define SyntasticWarning text=' . g:syntastic_warning_symbol .
-            \ ' texthl=SyntasticWarningSign linehl=SyntasticWarningLine'
-        execute 'sign define SyntasticStyleError text=' . g:syntastic_style_error_symbol .
-            \ ' texthl=SyntasticStyleErrorSign linehl=SyntasticStyleErrorLine'
-        execute 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
-            \ ' texthl=SyntasticStyleWarningSign linehl=SyntasticStyleWarningLine'
-    endif
-endfunction " }}}2
-
-" Place signs by all syntax errors in the buffer
-function! g:SyntasticSignsNotifier._signErrors(loclist) abort " {{{2
-    let loclist = a:loclist
-    if !loclist.isEmpty()
-
-        let buf = bufnr('')
-        if !bufloaded(buf)
-            " signs can be placed only in loaded buffers
-            return
-        endif
-
-        " errors come first, so that they are not masked by warnings
-        let issues = copy(loclist.errors())
-        call extend(issues, loclist.warnings())
-        call filter(issues, 'v:val["bufnr"] == buf')
-        let seen = {}
-
-        for i in issues
-            if i['lnum'] > 0 && !has_key(seen, i['lnum'])
-                let seen[i['lnum']] = 1
-
-                let sign_severity = i['type'] ==? 'W' ? 'Warning' : 'Error'
-                let sign_subtype = get(i, 'subtype', '')
-                let sign_type = 'Syntastic' . sign_subtype . sign_severity
-
-                execute 'sign place ' . s:next_sign_id . ' line=' . i['lnum'] . ' name=' . sign_type . ' buffer=' . i['bufnr']
-                call add(self._bufSignIds(), s:next_sign_id)
-                let s:next_sign_id += 1
-            endif
-        endfor
-    endif
-endfunction " }}}2
-
-" Remove the signs with the given ids from this buffer
-function! g:SyntasticSignsNotifier._removeSigns(ids) abort " {{{2
-    if has('signs')
-        for s in reverse(copy(a:ids))
-            execute 'sign unplace ' . s
-            call remove(self._bufSignIds(), index(self._bufSignIds(), s))
-        endfor
-    endif
-endfunction " }}}2
-
-" Get all the ids of the SyntaxError signs in the buffer
-function! g:SyntasticSignsNotifier._bufSignIds() abort " {{{2
-    if !exists('b:syntastic_private_sign_ids')
-        let b:syntastic_private_sign_ids = []
-    endif
-    return b:syntastic_private_sign_ids
-endfunction " }}}2
-
-" }}}1
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim b/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim
deleted file mode 100644
index 1066769..0000000
--- a/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"============================================================================
-"File:        mxmlc.vim
-"Description: ActionScript syntax checker - using mxmlc
-"Maintainer:  Andy Earnshaw <andyearnshaw@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_actionscript_mxmlc_checker')
-    finish
-endif
-let g:loaded_syntastic_actionscript_mxmlc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_actionscript_mxmlc_GetHighlightRegex(item)
-    let term = ''
-
-    if match(a:item['text'], '\mvariable ''') > -1
-        let term = matchstr(a:item['text'], '\m''\zs[^'']\+\ze''')
-
-    elseif match(a:item['text'], 'expected a definition keyword') > -1
-        let term = matchstr(a:item['text'], '\mnot \zs[^.]\+\ze\.')
-
-    elseif match(a:item['text'], '\mundefined \%(property\|method\)') > -1
-        let term = matchstr(a:item['text'], '\mundefined \%(property\|method\) \zs[^. ]\+\ze')
-
-    elseif match(a:item['text'], 'could not be found') > -1
-        let term = matchstr(a:item['text'], '\m \zs\S\+\ze could not be found')
-
-    elseif match(a:item['text'], 'Type was not found') > -1
-        let term = matchstr(a:item['text'], '\m: \zs[^.]\+\zs\.')
-
-    endif
-
-    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
-endfunction
-
-function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
-    call syntastic#log#deprecationWarn('actionscript_mxmlc_conf', 'actionscript_mxmlc_args',
-        \ "'-load-config+=' . syntastic#util#shexpand(OLD_VAR)")
-
-    let makeprg = self.makeprgBuild({ 'args_after': '-output=' . syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%f(%l): col: %c %trror: %m,' .
-        \ '%f(%l): col: %c %tarning: %m,' .
-        \ '%f: %trror: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'actionscript',
-    \ 'name': 'mxmlc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ada/gcc.vim b/bundle/syntastic/syntax_checkers/ada/gcc.vim
deleted file mode 100644
index dc42868..0000000
--- a/bundle/syntastic/syntax_checkers/ada/gcc.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        ada.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Alfredo Di Napoli <alfredo.dinapoli@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ada_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_ada_gcc_checker = 1
-
-if !exists('g:syntastic_ada_compiler_options')
-    let g:syntastic_ada_compiler_options = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ada_gcc_IsAvailable() dict
-    if !exists('g:syntastic_ada_compiler')
-        let g:syntastic_ada_compiler = self.getExec()
-    endif
-    return executable(expand(g:syntastic_ada_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_ada_gcc_GetLocList() dict
-    return syntastic#c#GetLocList('ada', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%f:%l:%c: %m,' .
-        \     '%f:%l: %m',
-        \ 'main_flags': '-c -x ada -gnats',
-        \ 'header_flags': '-x ada -gnats',
-        \ 'header_names': '\.ads$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ada',
-    \ 'name': 'gcc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim b/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim
deleted file mode 100644
index e0ebdfa..0000000
--- a/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-"============================================================================
-"File:        drafter.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_apiblueprint_drafter_checker')
-    finish
-endif
-let g:loaded_syntastic_apiblueprint_drafter_checker = 1
-
-if !exists('g:syntastic_apiblueprint_drafter_sort')
-    let g:syntastic_apiblueprint_drafter_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_apiblueprint_drafter_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'post_args': '-u -l' })
-
-    let errorformat =
-        \ '%trror: (%n)  %m,' .
-        \ '%tarning: (%n)  %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 2] })
-
-    for e in loclist
-        let matches = matchlist(e['text'], '\v^(.+); line (\d+), column (\d+) - line (\d+), column (\d+)$')
-        if len(matches) > 5
-            let e['lnum'] = str2nr(matches[2])
-            let e['col']  = str2nr(matches[3])
-            let e['vcol'] = 0
-
-            if matches[2] == matches[4]
-                let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . matches[5] . 'c'
-            endif
-
-            let e['text'] = matches[1]
-        else
-            let e['valid'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'apiblueprint',
-    \ 'name': 'drafter'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/applescript/osacompile.vim b/bundle/syntastic/syntax_checkers/applescript/osacompile.vim
deleted file mode 100644
index 406e029..0000000
--- a/bundle/syntastic/syntax_checkers/applescript/osacompile.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-"==============================================================================
-"       FileName: applescript.vim
-"           Desc: Syntax checking plugin for syntastic.vim
-"         Author: Zhao Cai
-"          Email: caizhaoff@gmail.com
-"        Version: 0.2.1
-"   Date Created: Thu 09 Sep 2011 10:30:09 AM EST
-"  Last Modified: Fri 09 Dec 2011 01:10:24 PM EST
-"
-"        History: 0.1.0 - working, but it will run the script everytime to check
-"                 syntax. Should use osacompile but strangely it does not give
-"                 errors.
-"
-"                 0.2.0 - switch to osacompile, it gives less errors compared
-"                 with osascript.
-"
-"                 0.2.1 - remove g:syntastic_applescript_tempfile. use
-"                 tempname() instead.
-"
-"        License: This program is free software. It comes without any
-"        warranty, to the extent permitted by applicable law. You can
-"        redistribute it and/or modify it under the terms of the Do What The
-"        Fuck You Want To Public License, Version 2, as published by Sam
-"        Hocevar.  See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_applescript_osacompile_checker')
-    finish
-endif
-let g:loaded_syntastic_applescript_osacompile_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_applescript_osacompile_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-o ' . tempname() . '.scpt' })
-    let errorformat = '%f:%l:%m'
-    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'applescript',
-    \ 'name': 'osacompile' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim
deleted file mode 100644
index 74f3c13..0000000
--- a/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        asciidoc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_asciidoc_asciidoc_checker')
-    finish
-endif
-let g:loaded_syntastic_asciidoc_asciidoc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_asciidoc_asciidoc_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
-
-    let errorformat =
-        \ '%Easciidoc: %tRROR: %f: line %l: %m,' .
-        \ '%Easciidoc: %tRROR: %f: %m,' .
-        \ '%Easciidoc: FAILED: %f: line %l: %m,' .
-        \ '%Easciidoc: FAILED: %f: %m,' .
-        \ '%Wasciidoc: %tARNING: %f: line %l: %m,' .
-        \ '%Wasciidoc: %tARNING: %f: %m,' .
-        \ '%Wasciidoc: DEPRECATED: %f: line %l: %m,' .
-        \ '%Wasciidoc: DEPRECATED: %f: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'asciidoc',
-    \ 'name': 'asciidoc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/asm/gcc.vim b/bundle/syntastic/syntax_checkers/asm/gcc.vim
deleted file mode 100644
index 7bf7eb6..0000000
--- a/bundle/syntastic/syntax_checkers/asm/gcc.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-"============================================================================
-"File:        gcc.vim
-"Description: Syntax checking for at&t and intel assembly files with gcc
-"Maintainer:  Josh Rahm <joshuarahm@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_asm_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_asm_gcc_checker = 1
-
-if !exists('g:syntastic_asm_compiler_options')
-    let g:syntastic_asm_compiler_options = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_asm_gcc_IsAvailable() dict " {{{1
-    if !exists('g:syntastic_asm_compiler')
-        let g:syntastic_asm_compiler = self.getExec()
-    endif
-    return executable(expand(g:syntastic_asm_compiler, 1))
-endfunction " }}}1
-
-function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
-    return syntastic#c#GetLocList('asm', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%f:%l:%c: %trror: %m,' .
-        \     '%f:%l:%c: %tarning: %m,' .
-        \     '%f:%l: %m',
-        \ 'main_flags': '-x assembler -fsyntax-only -masm=' . s:GetDialect() })
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:GetDialect() " {{{2
-    return exists('g:syntastic_asm_dialect') ? g:syntastic_asm_dialect :
-        \ expand('%:e', 1) ==? 'asm' ? 'intel' : 'att'
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'asm',
-    \ 'name': 'gcc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
deleted file mode 100644
index 1837067..0000000
--- a/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-"============================================================================
-"File:        bemhtmllint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Sergej Tatarincev <s.tatarincev at yandex.ua>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_bemhtml_bemhtmllint_checker')
-    finish
-endif
-
-let g:loaded_syntastic_bemhtml_bemhtmllint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function SyntaxCheckers_bemhtml_bemhtmllint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-    let errorformat = '%f:%l:%c: %m'
-    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'bemhtml',
-    \ 'name': 'bemhtmllint',
-    \ 'exec': 'bemhtml-lint' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/bro/bro.vim b/bundle/syntastic/syntax_checkers/bro/bro.vim
deleted file mode 100644
index 38dfbde..0000000
--- a/bundle/syntastic/syntax_checkers/bro/bro.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-"============================================================================
-"File:        bro.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Justin Azoff <justin.azoff@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_bro_bro_checker')
-    finish
-endif
-let g:loaded_syntastic_bro_bro_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_bro_bro_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m at or near "\zs[^"]\+\ze"')
-    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
-endfunction
-
-function! SyntaxCheckers_bro_bro_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    if syntastic#util#system(self.getExecEscaped() . ' --help') !~# '--parse-only'
-        call self.log('unknown option "--parse-only"')
-        return 0
-    endif
-
-    return 1
-endfunction
-
-function! SyntaxCheckers_bro_bro_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_before': '--parse-only' })
-
-    "example: error in ./foo.bro, line 3: unknown identifier banana, at or near "banana"
-    let errorformat =
-        \ 'fatal %trror in %f\, line %l: %m,' .
-        \ '%trror in %f\, line %l: %m,' .
-        \ '%tarning in %f\, line %l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'bro',
-    \ 'name': 'bro'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/avrgcc.vim b/bundle/syntastic/syntax_checkers/c/avrgcc.vim
deleted file mode 100644
index 0fbb984..0000000
--- a/bundle/syntastic/syntax_checkers/c/avrgcc.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-"============================================================================
-"File:        avrgcc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Karel <karelishere at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_c_avrgcc_checker')
-    finish
-endif
-let g:loaded_syntastic_c_avrgcc_checker = 1
-
-if !exists('g:syntastic_avrgcc_config_file')
-    let g:syntastic_avrgcc_config_file = '.syntastic_avrgcc_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_avrgcc_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': syntastic#c#ReadConfig(g:syntastic_avrgcc_config_file),
-        \ 'args_after': '-x c -fsyntax-only' })
-
-    let errorformat =
-        \ '%-G%f:%s:,' .
-        \ '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
-        \ '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
-        \ '%-GIn file included%.%#,' .
-        \ '%-G %#from %f:%l\,,' .
-        \ '%f:%l:%c: %trror: %m,' .
-        \ '%f:%l:%c: %tarning: %m,' .
-        \ '%f:%l:%c: %m,' .
-        \ '%f:%l: %trror: %m,' .
-        \ '%f:%l: %tarning: %m,'.
-        \ '%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'avrgcc',
-    \ 'exec': 'avr-gcc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/checkpatch.vim b/bundle/syntastic/syntax_checkers/c/checkpatch.vim
deleted file mode 100644
index 43b047c..0000000
--- a/bundle/syntastic/syntax_checkers/c/checkpatch.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-"============================================================================
-"File:        checkpatch.vim
-"Description: Syntax checking plugin for syntastic.vim using checkpatch.pl
-"Maintainer:  Daniel Walker <dwalker at fifo99 dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_checkpatch_checker')
-    finish
-endif
-let g:loaded_syntastic_c_checkpatch_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_checkpatch_IsAvailable() dict
-    call syntastic#log#deprecationWarn('c_checker_checkpatch_location', 'c_checkpatch_exec')
-
-    if !exists('g:syntastic_c_checkpatch_exec') && !executable(self.getExec())
-        if executable('checkpatch')
-            let g:syntastic_c_checkpatch_exec = 'checkpatch'
-        elseif executable('./scripts/checkpatch.pl')
-            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch.pl', ':p')
-        elseif executable('./scripts/checkpatch')
-            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch', ':p')
-        endif
-    endif
-
-    call self.log('exec =', self.getExec())
-
-    return executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_c_checkpatch_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--no-summary --no-tree --terse --file' })
-
-    let errorformat =
-        \ '%f:%l: %tARNING: %m,' .
-        \ '%f:%l: %tRROR: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1],
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'checkpatch',
-    \ 'exec': 'checkpatch.pl'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/clang_check.vim b/bundle/syntastic/syntax_checkers/c/clang_check.vim
deleted file mode 100644
index 19e67f1..0000000
--- a/bundle/syntastic/syntax_checkers/c/clang_check.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        clang_check.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_clang_check_checker')
-  finish
-endif
-let g:loaded_syntastic_c_clang_check_checker = 1
-
-if !exists('g:syntastic_clang_check_config_file')
-    let g:syntastic_clang_check_config_file = '.syntastic_clang_check_config'
-endif
-
-if !exists('g:syntastic_c_clang_check_sort')
-    let g:syntastic_c_clang_check_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_clang_check_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'post_args':
-        \   '-- ' .
-        \   syntastic#c#ReadConfig(g:syntastic_clang_check_config_file) . ' ' .
-        \   '-fshow-column ' .
-        \   '-fshow-source-location ' .
-        \   '-fno-caret-diagnostics ' .
-        \   '-fno-color-diagnostics ' .
-        \   '-fdiagnostics-format=clang' })
-
-    let errorformat =
-        \ '%E%f:%l:%c: fatal error: %m,' .
-        \ '%E%f:%l:%c: error: %m,' .
-        \ '%W%f:%l:%c: warning: %m,' .
-        \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
-        \ '%E%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'clang_check',
-    \ 'exec': 'clang-check'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/clang_tidy.vim b/bundle/syntastic/syntax_checkers/c/clang_tidy.vim
deleted file mode 100644
index d3876ea..0000000
--- a/bundle/syntastic/syntax_checkers/c/clang_tidy.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        clang_tidy.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_clang_tidy_checker')
-  finish
-endif
-let g:loaded_syntastic_c_clang_tidy_checker = 1
-
-if !exists('g:syntastic_clang_tidy_config_file')
-    let g:syntastic_clang_tidy_config_file = '.syntastic_clang_tidy_config'
-endif
-
-if !exists('g:syntastic_c_clang_tidy_sort')
-    let g:syntastic_c_clang_tidy_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'post_args':
-        \   '-- ' .
-        \   syntastic#c#ReadConfig(g:syntastic_clang_tidy_config_file) . ' ' .
-        \   '-fshow-column ' .
-        \   '-fshow-source-location ' .
-        \   '-fno-caret-diagnostics ' .
-        \   '-fno-color-diagnostics ' .
-        \   '-fdiagnostics-format=clang' })
-
-    let errorformat =
-        \ '%E%f:%l:%c: fatal error: %m,' .
-        \ '%E%f:%l:%c: error: %m,' .
-        \ '%W%f:%l:%c: warning: %m,' .
-        \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
-        \ '%E%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'clang_tidy',
-    \ 'exec': 'clang-tidy'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/cppcheck.vim b/bundle/syntastic/syntax_checkers/c/cppcheck.vim
deleted file mode 100644
index cd802a8..0000000
--- a/bundle/syntastic/syntax_checkers/c/cppcheck.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-"============================================================================
-"File:        cppcheck.vim
-"Description: Syntax checking plugin for syntastic.vim using cppcheck.pl
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_cppcheck_checker')
-    finish
-endif
-let g:loaded_syntastic_c_cppcheck_checker = 1
-
-if !exists('g:syntastic_cppcheck_config_file')
-    let g:syntastic_cppcheck_config_file = '.syntastic_cppcheck_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_cppcheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
-        \ 'args_after': '-q --enable=style' })
-
-    let errorformat =
-        \ '[%f:%l]: (%trror) %m,' .
-        \ '[%f:%l]: (%tarning) %m,' .
-        \ '[%f:%l]: (%ttyle) %m,' .
-        \ '[%f:%l]: (%terformance) %m,' .
-        \ '[%f:%l]: (%tortability) %m,' .
-        \ '[%f:%l]: (%tnformation) %m,' .
-        \ '[%f:%l]: (%tnconclusive) %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'cppcheck',
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['type'] =~? '\m^[SPI]'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'cppcheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/gcc.vim b/bundle/syntastic/syntax_checkers/c/gcc.vim
deleted file mode 100644
index 4fa9216..0000000
--- a/bundle/syntastic/syntax_checkers/c/gcc.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-"============================================================================
-"File:        c.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_c_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_c_gcc_checker = 1
-
-if !exists('g:syntastic_c_compiler_options')
-    let g:syntastic_c_compiler_options = '-std=gnu99'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_gcc_IsAvailable() dict
-    if !exists('g:syntastic_c_compiler')
-        let g:syntastic_c_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
-    endif
-    call self.log('g:syntastic_c_compiler =', g:syntastic_c_compiler)
-    return executable(expand(g:syntastic_c_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_c_gcc_GetLocList() dict
-    return syntastic#c#GetLocList('c', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
-        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
-        \     '%-GIn file included%.%#,' .
-        \     '%-G %#from %f:%l\,,' .
-        \     '%f:%l:%c: %trror: %m,' .
-        \     '%f:%l:%c: %tarning: %m,' .
-        \     '%f:%l:%c: %m,' .
-        \     '%f:%l: %trror: %m,' .
-        \     '%f:%l: %tarning: %m,'.
-        \     '%f:%l: %m',
-        \ 'main_flags': '-x c -fsyntax-only',
-        \ 'header_flags': '-x c',
-        \ 'header_names': '\m\.h$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'gcc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/make.vim b/bundle/syntastic/syntax_checkers/c/make.vim
deleted file mode 100644
index e477994..0000000
--- a/bundle/syntastic/syntax_checkers/c/make.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        make.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_c_make_checker')
-    finish
-endif
-let g:loaded_syntastic_c_make_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_make_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '-sk', 'fname': '' })
-
-    let errorformat =
-        \ '%-G%f:%s:,' .
-        \ '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
-        \ '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
-        \ '%-GIn file included%.%#,' .
-        \ '%-G %#from %f:%l\,,' .
-        \ '%f:%l:%c: %trror: %m,' .
-        \ '%f:%l:%c: %tarning: %m,' .
-        \ '%f:%l:%c: %m,' .
-        \ '%f:%l: %trror: %m,' .
-        \ '%f:%l: %tarning: %m,'.
-        \ '%f:%l: %m'
-
-    if exists('g:syntastic_c_errorformat')
-        let errorformat = g:syntastic_c_errorformat
-    endif
-
-    " process makeprg
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    " filter the processed errors if desired
-    if exists('g:syntastic_c_remove_include_errors') && g:syntastic_c_remove_include_errors != 0
-        return filter(errors, 'has_key(v:val, "bufnr") && v:val["bufnr"] == ' . bufnr(''))
-    else
-        return errors
-    endif
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'make'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/oclint.vim b/bundle/syntastic/syntax_checkers/c/oclint.vim
deleted file mode 100644
index f172a11..0000000
--- a/bundle/syntastic/syntax_checkers/c/oclint.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-"============================================================================
-"File:        oclint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_oclint_checker')
-    finish
-endif
-let g:loaded_syntastic_c_oclint_checker = 1
-
-if !exists('g:syntastic_oclint_config_file')
-    let g:syntastic_oclint_config_file = '.syntastic_oclint_config'
-endif
-
-if !exists('g:syntastic_c_oclint_sort')
-    let g:syntastic_c_oclint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_oclint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'post_args': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
-
-    let errorformat =
-        \ '%E%f:%l:%c: fatal error: %m,' .
-        \ '%E%f:%l:%c: error: %m,' .
-        \ '%W%f:%l:%c: warning: %m,' .
-        \ '%E%f:%l:%c: %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'returns': [0, 3, 5] })
-
-    for e in loclist
-        if e['text'] =~# '\v P3( |$)'
-            let e['type'] = 'W'
-        endif
-
-        let e['text'] = substitute(e['text'], '\m\C P[1-3]$', '', '')
-        let e['text'] = substitute(e['text'], '\m\C P[1-3] ', ': ', '')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'oclint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/pc_lint.vim b/bundle/syntastic/syntax_checkers/c/pc_lint.vim
deleted file mode 100644
index 6efd17a..0000000
--- a/bundle/syntastic/syntax_checkers/c/pc_lint.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-"============================================================================
-"File:        pc_lint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Steve Bragg <steve at empresseffects dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_c_pc_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_c_pc_lint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-if !exists('g:syntastic_pc_lint_config_file')
-    let g:syntastic_pc_lint_config_file = 'options.lnt'
-endif
-
-function! SyntaxCheckers_c_pc_lint_GetLocList() dict
-    let config = syntastic#util#findFileInParent(g:syntastic_pc_lint_config_file, expand('%:p:h', 1))
-    call self.log('config =', config)
-
-    " -hFs1         - show filename, add space after messages, try to make message 1 line
-    " -width(0,0)   - make sure there are no line breaks
-    " -t            - set tab size
-    " -v            - turn off verbosity
-    let makeprg = self.makeprgBuild({
-        \ 'args': (filereadable(config) ? syntastic#util#shescape(fnamemodify(config, ':p')) : ''),
-        \ 'args_after': ['-hFs1', '-width(0,0)', '-t' . &tabstop, '-format=%f:%l:%C:%t:%n:%m'] })
-
-    let errorformat =
-        \ '%E%f:%l:%v:Error:%n:%m,' .
-        \ '%W%f:%l:%v:Warning:%n:%m,' .
-        \ '%I%f:%l:%v:Info:%n:%m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['cygwinRemoveCR'] })
-
-    for e in loclist
-        if e['type'] ==? 'I'
-            let e['type'] = 'W'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'pc_lint',
-    \ 'exec': 'lint-nt'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/sparse.vim b/bundle/syntastic/syntax_checkers/c/sparse.vim
deleted file mode 100644
index ca831c0..0000000
--- a/bundle/syntastic/syntax_checkers/c/sparse.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        sparse.vim
-"Description: Syntax checking plugin for syntastic.vim using sparse.pl
-"Maintainer:  Daniel Walker <dwalker at fifo99 dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_sparse_checker')
-    finish
-endif
-let g:loaded_syntastic_c_sparse_checker = 1
-
-if !exists('g:syntastic_sparse_config_file')
-    let g:syntastic_sparse_config_file = '.syntastic_sparse_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_sparse_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_sparse_config_file),
-        \ 'args_after': '-ftabstop=' . &ts })
-
-    let errorformat =
-        \ '%f:%l:%v: %trror: %m,' .
-        \ '%f:%l:%v: %tarning: %m,'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 1] })
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'sparse'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/c/splint.vim b/bundle/syntastic/syntax_checkers/c/splint.vim
deleted file mode 100644
index a4e19f0..0000000
--- a/bundle/syntastic/syntax_checkers/c/splint.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        splint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_c_splint_checker')
-    finish
-endif
-let g:loaded_syntastic_c_splint_checker = 1
-
-if !exists('g:syntastic_splint_config_file')
-    let g:syntastic_splint_config_file = '.syntastic_splint_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_c_splint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_splint_config_file),
-        \ 'args_after': '-showfunc -hints +quiet' })
-
-    let errorformat =
-        \ '%-G%f:%l:%v: %[%#]%[%#]%[%#] Internal Bug %.%#,' .
-        \ '%-G%f(%l\,%v): %[%#]%[%#]%[%#] Internal Bug %.%#,' .
-        \ '%W%f:%l:%v: %m,' .
-        \ '%W%f(%l\,%v): %m,' .
-        \ '%W%f:%l: %m,' .
-        \ '%W%f(%l): %m,' .
-        \ '%-C %\+In file included from %.%#,' .
-        \ '%-C %\+from %.%#,' .
-        \ '%+C %.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'defaults': {'type': 'W'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'c',
-    \ 'name': 'splint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cabal/cabal.vim b/bundle/syntastic/syntax_checkers/cabal/cabal.vim
deleted file mode 100644
index e43aefa..0000000
--- a/bundle/syntastic/syntax_checkers/cabal/cabal.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        cabal.vim
-"Description: Haskell package description (.cabal file) linting and syntax
-"             validation via 'cabal check'
-"Maintainer: Ian D. Bollinger <ian.bollinger@gmail.com>
-"License:    This program is free software. It comes without any warranty,
-"            to the extent permitted by applicable law. You can redistribute
-"            it and/or modify it under the terms of the Do What The Fuck You
-"            Want To Public License, Version 2, as published by Sam Hocevar.
-"            See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_cabal_cabal_checker')
-    finish
-endif
-let g:loaded_syntastic_cabal_cabal_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cabal_cabal_GetHighlightRegex(item)
-    let field = matchstr(a:item['text'], "\\vParse of field '\\zs[^']+")
-    if field !=# ''
-        return '\v\c^\s*' . field . '\s*:\s*\zs.*$'
-    endif
-    let field = matchstr(a:item['text'], "\\v(^|\\s)'\\zs[^']+\\ze'")
-    if field !=# ''
-        return '\V\c\<' . escape(field, '\') . '\>'
-    endif
-    return ''
-endfunction
-
-function! SyntaxCheckers_cabal_cabal_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' check'
-
-    let errorformat =
-        \ '%Ecabal: %f:%l: %m,' .
-        \ '%W* %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h', 1),
-        \ 'preprocess': 'cabal',
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cabal',
-    \ 'name': 'cabal'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/chef/foodcritic.vim b/bundle/syntastic/syntax_checkers/chef/foodcritic.vim
deleted file mode 100644
index 35380aa..0000000
--- a/bundle/syntastic/syntax_checkers/chef/foodcritic.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"============================================================================
-"File:        foodcritic.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Doug Ireton <dougireton@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_chef_foodcritic_checker')
-    finish
-endif
-let g:loaded_syntastic_chef_foodcritic_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_chef_foodcritic_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    " FC023: Prefer conditional attributes: ./recipes/config.rb:49
-    let errorformat = 'FC%n: %m: %f:%l'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-      \ 'filetype': 'chef',
-      \ 'name': 'foodcritic'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/co/coco.vim b/bundle/syntastic/syntax_checkers/co/coco.vim
deleted file mode 100644
index 9be5d7d..0000000
--- a/bundle/syntastic/syntax_checkers/co/coco.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        co.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Andrew Kelley <superjoe30@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_co_coco_checker')
-    finish
-endif
-let g:loaded_syntastic_co_coco_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_co_coco_GetLocList() dict
-    let tmpdir = syntastic#util#tmpdir()
-    let makeprg = self.makeprgBuild({ 'args_after': '-c -o ' . tmpdir })
-
-    let errorformat =
-        \ '%EFailed at: %f,' .
-        \ '%ZSyntax%trror: %m on line %l,'.
-        \ '%EFailed at: %f,'.
-        \ '%Z%trror: Parse error on line %l: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    call syntastic#util#rmrf(tmpdir)
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'co',
-    \ 'name': 'coco'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cobol/cobc.vim b/bundle/syntastic/syntax_checkers/cobol/cobc.vim
deleted file mode 100644
index 0cff0cc..0000000
--- a/bundle/syntastic/syntax_checkers/cobol/cobc.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        cobc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-
-if exists('g:loaded_syntastic_cobol_cobc_checker')
-    finish
-endif
-let g:loaded_syntastic_cobol_cobc_checker = 1
-
-if !exists('g:syntastic_cobol_compiler_options')
-    let g:syntastic_cobol_compiler_options = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cobol_cobc_IsAvailable() dict
-    if !exists('g:syntastic_cobol_compiler')
-        let g:syntastic_cobol_compiler = self.getExec()
-    endif
-    call self.log('g:syntastic_cobol_compiler =', g:syntastic_cobol_compiler)
-    return executable(expand(g:syntastic_cobol_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_cobol_cobc_GetLocList() dict
-    return syntastic#c#GetLocList('cobol', 'cobc', {
-        \ 'errorformat': '%f:%l: %trror: %m',
-        \ 'main_flags': '-fsyntax-only' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cobol',
-    \ 'name': 'cobc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/coffee/coffee.vim b/bundle/syntastic/syntax_checkers/coffee/coffee.vim
deleted file mode 100644
index 3b521fc..0000000
--- a/bundle/syntastic/syntax_checkers/coffee/coffee.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-"============================================================================
-"File:        coffee.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Lincoln Stoll <l@lds.li>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-" Note: this script requires CoffeeScript version 1.6.2 or newer.
-"
-
-if exists('g:loaded_syntastic_coffee_coffee_checker')
-    finish
-endif
-let g:loaded_syntastic_coffee_coffee_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_coffee_coffee_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    let ver = self.getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
-    return syntastic#util#versionIsAtLeast(ver, [1, 6, 2])
-endfunction
-
-function! SyntaxCheckers_coffee_coffee_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-cp' })
-
-    let errorformat =
-        \ '%E%f:%l:%c: %trror: %m,' .
-        \ 'Syntax%trror: In %f\, %m on line %l,' .
-        \ '%EError: In %f\, Parse error on line %l: %m,' .
-        \ '%EError: In %f\, %m on line %l,' .
-        \ '%W%f(%l): lint warning: %m,' .
-        \ '%W%f(%l): warning: %m,' .
-        \ '%E%f(%l): SyntaxError: %m,' .
-        \ '%-Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'coffee',
-    \ 'name': 'coffee'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim b/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim
deleted file mode 100644
index e153ed3..0000000
--- a/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        coffeelint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Lincoln Stoll <l@lds.li>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_coffee_coffeelint_checker')
-    finish
-endif
-let g:loaded_syntastic_coffee_coffeelint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
-    if !exists('s:coffeelint_new')
-        let s:coffeelint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 4])
-    endif
-    let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
-
-    let errorformat =
-        \ '%f\,%l\,%\d%#\,%trror\,%m,' .
-        \ '%f\,%l\,%trror\,%m,' .
-        \ '%f\,%l\,%\d%#\,%tarn\,%m,' .
-        \ '%f\,%l\,%tarn\,%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'coffee',
-    \ 'name': 'coffeelint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/coq/coqtop.vim b/bundle/syntastic/syntax_checkers/coq/coqtop.vim
deleted file mode 100644
index 9d96a5a..0000000
--- a/bundle/syntastic/syntax_checkers/coq/coqtop.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-"============================================================================
-"File:        coqtop.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Matvey Aksenov <matvey.aksenov at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_coq_coqtop_checker')
-    finish
-endif
-let g:loaded_syntastic_coq_coqtop_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_coq_coqtop_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-noglob -batch -load-vernac-source' })
-
-    let errorformat =
-        \ '%AFile \"%f\"\, line %l\, characters %c\-%.%#\:,'.
-        \ '%C%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'coq',
-    \ 'name': 'coqtop'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/clang_check.vim b/bundle/syntastic/syntax_checkers/cpp/clang_check.vim
deleted file mode 100644
index 1a92d4b..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/clang_check.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        clang_check.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_clang_check_checker')
-  finish
-endif
-let g:loaded_syntastic_cpp_clang_check_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'clang_check',
-    \ 'exec': 'clang-check',
-    \ 'redirect': 'c/clang_check'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim b/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim
deleted file mode 100644
index b45cf75..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        clang_tidy.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_clang_tidy_checker')
-  finish
-endif
-let g:loaded_syntastic_cpp_clang_tidy_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'clang_tidy',
-    \ 'exec': 'clang-tidy',
-    \ 'redirect': 'c/clang_tidy'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim b/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim
deleted file mode 100644
index c103d7d..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"============================================================================
-"File:        cppcheck.vim
-"Description: Syntax checking plugin for syntastic.vim using cppcheck.pl
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_cppcheck_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_cppcheck_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'cppcheck',
-    \ 'redirect': 'c/cppcheck'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/cpplint.vim b/bundle/syntastic/syntax_checkers/cpp/cpplint.vim
deleted file mode 100644
index 54984bb..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/cpplint.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        cpplint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_cpplint_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_cpplint_checker = 1
-
-if !exists('g:syntastic_cpp_cpplint_thres')
-    let g:syntastic_cpp_cpplint_thres = 5
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_cpplint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '--verbose=3' })
-
-    let errorformat = '%A%f:%l:  %m [%t],%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-
-    " change error types according to the prescribed threshold
-    for e in loclist
-        let e['type'] = e['type'] < g:syntastic_cpp_cpplint_thres ? 'W' : 'E'
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'cpplint',
-    \ 'exec': 'cpplint.py'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/gcc.vim b/bundle/syntastic/syntax_checkers/cpp/gcc.vim
deleted file mode 100644
index 1243980..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/gcc.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"============================================================================
-"File:        cpp.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_gcc_checker = 1
-
-if !exists('g:syntastic_cpp_compiler_options')
-    let g:syntastic_cpp_compiler_options = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_gcc_IsAvailable() dict
-    if !exists('g:syntastic_cpp_compiler')
-        let g:syntastic_cpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang++'
-    endif
-    call self.log('g:syntastic_cpp_compiler =', g:syntastic_cpp_compiler)
-    return executable(expand(g:syntastic_cpp_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_cpp_gcc_GetLocList() dict
-    return syntastic#c#GetLocList('cpp', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%f:%l:%c: %trror: %m,' .
-        \     '%f:%l:%c: %tarning: %m,' .
-        \     '%f:%l:%c: %m,'.
-        \     '%f:%l: %trror: %m,'.
-        \     '%f:%l: %tarning: %m,'.
-        \     '%f:%l: %m',
-        \ 'main_flags': '-x c++ -fsyntax-only',
-        \ 'header_flags': '-x c++',
-        \ 'header_names': '\m\.\(h\|hpp\|hh\)$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'gcc',
-    \ 'exec': 'g++' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/oclint.vim b/bundle/syntastic/syntax_checkers/cpp/oclint.vim
deleted file mode 100644
index 127c5f0..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/oclint.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"============================================================================
-"File:        oclint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_oclint_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_oclint_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'oclint',
-    \ 'redirect': 'c/oclint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim b/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim
deleted file mode 100644
index d834684..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-"============================================================================
-"File:        pc_lint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Steve Bragg <steve at empresseffects dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_pc_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_pc_lint_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'pc_lint',
-    \ 'exec': 'lint-nt',
-    \ 'redirect': 'c/pc_lint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cpp/verapp.vim b/bundle/syntastic/syntax_checkers/cpp/verapp.vim
deleted file mode 100644
index af1fd8c..0000000
--- a/bundle/syntastic/syntax_checkers/cpp/verapp.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        verapp.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Lucas Verney <phyks@phyks.me>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-" Tested with Vera++ 1.3.0
-"============================================================================
-
-if exists('g:loaded_syntastic_cpp_verapp_checker')
-    finish
-endif
-let g:loaded_syntastic_cpp_verapp_checker = 1
-
-if !exists('g:syntastic_verapp_config_file')
-    let g:syntastic_verapp_config_file = '.syntastic_verapp_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_verapp_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_verapp_config_file),
-        \ 'args_after': '--show-rule --no-duplicate -S -c -' })
-
-    let errorformat = '%f:%t:%l:%c:%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'checkstyle',
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cpp',
-    \ 'name': 'verapp',
-    \ 'exec': 'vera++'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cs/mcs.vim b/bundle/syntastic/syntax_checkers/cs/mcs.vim
deleted file mode 100644
index 4544a93..0000000
--- a/bundle/syntastic/syntax_checkers/cs/mcs.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"============================================================================
-"File:        cs.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Daniel Walker <dwalker@fifo99.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cs_mcs_checker')
-    finish
-endif
-let g:loaded_syntastic_cs_mcs_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cs_mcs_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--parse' })
-
-    let errorformat = '%f(%l\,%c): %trror %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cs',
-    \ 'name': 'mcs'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/css/csslint.vim b/bundle/syntastic/syntax_checkers/css/csslint.vim
deleted file mode 100644
index 2d3702b..0000000
--- a/bundle/syntastic/syntax_checkers/css/csslint.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        css.vim
-"Description: Syntax checking plugin for syntastic.vim using `csslint` CLI tool (http://csslint.net).
-"Maintainer:  Ory Band <oryband at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_css_csslint_checker')
-    finish
-endif
-let g:loaded_syntastic_css_csslint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_css_csslint_GetLocList() dict
-    call syntastic#log#deprecationWarn('csslint_options', 'css_csslint_args')
-
-    let makeprg = self.makeprgBuild({ 'args_after': '--format=compact' })
-
-    " Print CSS Lint's error/warning messages from compact format. Ignores blank lines.
-    let errorformat =
-        \ '%-G,' .
-        \ '%-G%f: lint free!,' .
-        \ '%f: line %l\, col %c\, %trror - %m,' .
-        \ '%f: line %l\, col %c\, %tarning - %m,'.
-        \ '%f: line %l\, col %c\, %m,'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'css',
-    \ 'name': 'csslint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/css/phpcs.vim b/bundle/syntastic/syntax_checkers/css/phpcs.vim
deleted file mode 100644
index bdf2665..0000000
--- a/bundle/syntastic/syntax_checkers/css/phpcs.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        phpcs.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_css_phpcs_checker')
-    finish
-endif
-let g:loaded_syntastic_css_phpcs_checker = 1
-
-runtime! syntax_checkers/php/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'css',
-    \ 'name': 'phpcs',
-    \ 'redirect': 'php/phpcs'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/css/prettycss.vim b/bundle/syntastic/syntax_checkers/css/prettycss.vim
deleted file mode 100644
index b531f49..0000000
--- a/bundle/syntastic/syntax_checkers/css/prettycss.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        prettycss.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_css_prettycss_checker')
-    finish
-endif
-let g:loaded_syntastic_css_prettycss_checker = 1
-
-if !exists('g:syntastic_css_prettycss_sort')
-    let g:syntastic_css_prettycss_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_css_prettycss_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m (\zs[^)]\+\ze)$')
-    if term !=# ''
-        let term = '\V' . escape(term, '\')
-    endif
-    return term
-endfunction
-
-function! SyntaxCheckers_css_prettycss_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    " Print CSS Lint's error/warning messages from compact format. Ignores blank lines.
-    let errorformat =
-        \ '%EError:  %m\, line %l\, char %c),' .
-        \ '%WWarning:  %m\, line %l\, char %c),' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-
-    for e in loclist
-        let e['text'] .= ')'
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'css',
-    \ 'name': 'prettycss'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/css/recess.vim b/bundle/syntastic/syntax_checkers/css/recess.vim
deleted file mode 100644
index 92e84e0..0000000
--- a/bundle/syntastic/syntax_checkers/css/recess.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-"============================================================================
-"File:        recess.vim
-"Description: Syntax checking plugin for syntastic.vim using `recess`
-"             (http://twitter.github.io/recess/).
-"Maintainer:  Tim Carry <tim at pixelastic dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_css_recess_checker')
-    finish
-endif
-let g:loaded_syntastic_css_recess_checker = 1
-
-runtime! syntax_checkers/less/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'css',
-    \ 'name': 'recess',
-    \ 'redirect': 'less/recess'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim b/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim
deleted file mode 100644
index 8a48690..0000000
--- a/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        cucumber.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cucumber_cucumber_checker')
-    finish
-endif
-let g:loaded_syntastic_cucumber_cucumber_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cucumber_cucumber_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--dry-run --quiet --strict --format pretty' })
-
-    let errorformat =
-        \ '%f:%l:%c:%m,' .
-        \ '%W      %.%# (%m),' .
-        \ '%-Z%f:%l:%.%#,'.
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cucumber',
-    \ 'name': 'cucumber'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/cuda/nvcc.vim b/bundle/syntastic/syntax_checkers/cuda/nvcc.vim
deleted file mode 100644
index cbcdf20..0000000
--- a/bundle/syntastic/syntax_checkers/cuda/nvcc.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-"============================================================================
-"File:        cuda.vim
-"Description: Syntax checking plugin for syntastic.vim
-"
-"Author:      Hannes Schulz <schulz at ais dot uni-bonn dot de>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_cuda_nvcc_checker')
-    finish
-endif
-let g:loaded_syntastic_cuda_nvcc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
-    if exists('g:syntastic_cuda_arch')
-        let arch_flag = '-arch=' . g:syntastic_cuda_arch
-    else
-        let arch_flag = ''
-    endif
-    let makeprg =
-        \ self.getExecEscaped() . ' ' . arch_flag .
-        \ ' --cuda -O0 -I . -Xcompiler -fsyntax-only ' .
-        \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
-
-    let errorformat =
-        \ '%*[^"]"%f"%*\D%l: %m,'.
-        \ '"%f"%*\D%l: %m,'.
-        \ '%-G%f:%l: (Each undeclared identifier is reported only once,'.
-        \ '%-G%f:%l: for each function it appears in.),'.
-        \ '%f:%l:%c:%m,'.
-        \ '%f(%l):%m,'.
-        \ '%f:%l:%m,'.
-        \ '"%f"\, line %l%*\D%c%*[^ ] %m,'.
-        \ '%D%*\a[%*\d]: Entering directory `%f'','.
-        \ '%X%*\a[%*\d]: Leaving directory `%f'','.
-        \ '%D%*\a: Entering directory `%f'','.
-        \ '%X%*\a: Leaving directory `%f'','.
-        \ '%DMaking %*\a in %f,'.
-        \ '%f|%l| %m'
-
-    if expand('%', 1) =~? '\m\%(.h\|.hpp\|.cuh\)$'
-        if exists('g:syntastic_cuda_check_header')
-            let makeprg =
-                \ 'echo > .syntastic_dummy.cu ; ' .
-                \ self.getExecEscaped() . ' ' . arch_flag .
-                \ ' --cuda -O0 -I . .syntastic_dummy.cu -Xcompiler -fsyntax-only -include ' .
-                \ syntastic#util#shexpand('%') . ' ' . syntastic#c#NullOutput()
-        else
-            return []
-        endif
-    endif
-
-    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'cuda',
-    \ 'name': 'nvcc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/d/dmd.vim b/bundle/syntastic/syntax_checkers/d/dmd.vim
deleted file mode 100644
index 069d486..0000000
--- a/bundle/syntastic/syntax_checkers/d/dmd.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-"============================================================================
-"File:        d.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Alfredo Di Napoli <alfredo dot dinapoli at gmail dot com>
-"License:     Based on the original work of Gregor Uhlenheuer and his
-"             cpp.vim checker so credits are dued.
-"             THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-"             EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-"             OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-"             NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-"             HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-"             WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-"             FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-"             OTHER DEALINGS IN THE SOFTWARE.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_d_dmd_checker')
-    finish
-endif
-let g:loaded_syntastic_d_dmd_checker = 1
-
-if !exists('g:syntastic_d_compiler_options')
-    let g:syntastic_d_compiler_options = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_d_dmd_IsAvailable() dict
-    if !exists('g:syntastic_d_compiler')
-        let g:syntastic_d_compiler = self.getExec()
-    endif
-    call self.log('g:syntastic_d_compiler =', g:syntastic_d_compiler)
-    return executable(expand(g:syntastic_d_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_d_dmd_GetLocList() dict
-    if !exists('g:syntastic_d_include_dirs')
-        let g:syntastic_d_include_dirs = filter(glob($HOME . '/.dub/packages/*', 1, 1), 'isdirectory(v:val)')
-        call map(g:syntastic_d_include_dirs, 'isdirectory(v:val . "/source") ? v:val . "/source" : v:val')
-        call add(g:syntastic_d_include_dirs, './source')
-    endif
-
-    return syntastic#c#GetLocList('d', 'dmd', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,%f(%l): %m,' .
-        \     '%f:%l: %m',
-        \ 'main_flags': '-c -of' . syntastic#util#DevNull(),
-        \ 'header_names': '\m\.di$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'd',
-    \ 'name': 'dmd' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim b/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim
deleted file mode 100644
index 63b8267..0000000
--- a/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-"============================================================================
-"File:        dartanalyzer.vim
-"Description: Dart syntax checker - using dartanalyzer
-"Maintainer:  Maksim Ryzhikov <rv.maksim at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_dart_dartanalyzer_checker')
-    finish
-endif
-let g:loaded_syntastic_dart_dartanalyzer_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_dart_dartanalyzer_GetHighlightRegex(error)
-    if a:error['len']
-        let lcol = a:error['col'] - 1
-        let rcol = a:error['col'] + a:error['len']
-        let ret = '\%>' . lcol . 'c\%<' . rcol . 'c'
-    else
-        let ret = ''
-    endif
-
-    return ret
-endfunction
-
-function! SyntaxCheckers_dart_dartanalyzer_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--machine' })
-
-    " Machine readable format looks like:
-    " SEVERITY|TYPE|ERROR_CODE|FILENAME|LINE_NUMBER|COLUMN|LENGTH|MESSAGE
-    " SEVERITY: (WARNING|ERROR)
-    " TYPE: (RESOLVER|STATIC_TYPE|...)
-    " ERROR_CODE: (NO_SUCH_TYPE|...)
-    " FILENAME: String
-    " LINE_NUMBER: int
-    " COLUMN: int
-    " LENGTH: int
-    " MESSAGE: String
-
-    " We use %n to grab the error length, for the syntax highlighter
-    let commonformat = '|%.%#|%.%#|%f|%l|%c|%n|%m'
-
-    let errorformat =
-        \ '%EERROR'   . commonformat . ',' .
-        \ '%WWARNING' . commonformat
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2, 3] })
-
-    for e in loclist
-        let e['text'] = substitute(e['text'], '\m\\\([\\|]\)', '\1', 'g')
-
-        " Undo the %n hack
-        let e['len'] = e['nr']
-        call remove(e, 'nr')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'dart',
-    \ 'name': 'dartanalyzer' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/docbk/igor.vim b/bundle/syntastic/syntax_checkers/docbk/igor.vim
deleted file mode 100644
index 5448861..0000000
--- a/bundle/syntastic/syntax_checkers/docbk/igor.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        igor.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_docbk_igor_checker')
-    finish
-endif
-let g:loaded_syntastic_docbk_igor_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_docbk_igor_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f:%l:%m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': { 'type': 'W' },
-        \ 'subtype': 'Style',
-        \ 'returns': [0] })
-
-    let buf = bufnr('')
-    for e in loclist
-        " XXX: igor strips directories from filenames
-        let e['bufnr'] = buf
-
-        let e['hl'] = '\V' . escape( substitute(e['text'], '\m[^:]*:', '', ''), '\' )
-        let e['hl'] = substitute(e['hl'], '\V[', '\\zs', 'g')
-        let e['hl'] = substitute(e['hl'], '\V]', '\\ze', 'g')
-
-        " let e['text'] = substitute(e['text'], '\m:.*$', '', '')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'docbk',
-    \ 'name': 'igor'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/docbk/xmllint.vim b/bundle/syntastic/syntax_checkers/docbk/xmllint.vim
deleted file mode 100644
index 01fa416..0000000
--- a/bundle/syntastic/syntax_checkers/docbk/xmllint.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        docbk.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_docbk_xmllint_checker')
-    finish
-endif
-let g:loaded_syntastic_docbk_xmllint_checker = 1
-
-runtime! syntax_checkers/xml/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'docbk',
-    \ 'name': 'xmllint',
-    \ 'redirect': 'xml/xmllint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim b/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim
deleted file mode 100644
index 8edf1d5..0000000
--- a/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        swiffer.vim
-"Description: Dust.js syntax checker - using swiffer
-"Maintainer:  Steven Foote <smfoote at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_dustjs_swiffer_checker')
-    finish
-endif
-
-let g:loaded_syntastic_dustjs_swiffer_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_dustjs_swiffer_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%E%f - Line %l\, Column %c: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
- endfunction
-
-call SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'dustjs',
-    \ 'name': 'swiffer'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/elixir/elixir.vim b/bundle/syntastic/syntax_checkers/elixir/elixir.vim
deleted file mode 100644
index f2ffe67..0000000
--- a/bundle/syntastic/syntax_checkers/elixir/elixir.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"============================================================================
-"File:        elixir.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Richard Ramsden <rramsden at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_elixir_elixir_checker')
-    finish
-endif
-let g:loaded_syntastic_elixir_elixir_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" TODO: we should probably split this into separate checkers
-function! SyntaxCheckers_elixir_elixir_IsAvailable() dict
-    call self.log(
-        \ 'executable("elixir") = ' . executable('elixir') . ', ' .
-        \ 'executable("mix") = ' . executable('mix'))
-    return executable('elixir') && executable('mix')
-endfunction
-
-function! SyntaxCheckers_elixir_elixir_GetLocList() dict
-    let make_options = {}
-    let compile_command = 'elixir'
-    let mix_file = syntastic#util#findFileInParent('mix.exs', expand('%:p:h', 1))
-
-    if filereadable(mix_file)
-        let compile_command = 'mix compile'
-        let make_options['cwd'] = fnamemodify(mix_file, ':p:h')
-    endif
-
-    let make_options['makeprg'] = self.makeprgBuild({ 'exe': compile_command })
-
-    let make_options['errorformat'] =
-        \ '%E** %*[^\ ] %f:%l: %m,' .
-        \ '%W%f:%l: warning: %m'
-
-    return SyntasticMake(make_options)
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'elixir',
-    \ 'name': 'elixir',
-    \ 'enable': 'enable_elixir_checker'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl
deleted file mode 100755
index 730e600..0000000
--- a/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env escript
-
-main([File]) ->
-    Dir = get_root(filename:dirname(File)),
-    Defs = [strong_validation,
-            warn_export_all,
-            warn_export_vars,
-            warn_shadow_vars,
-            warn_obsolete_guard,
-            warn_unused_import,
-            report,
-            {i, Dir ++ "/include"}],
-    %% `rebar.config` is looked for,
-    %% but it is not necessarily the one in the project root.
-    %% I.e. it may be one deeper in the project file hierarchy.
-    RebarFile = rebar_file(Dir),
-    %% `rebar.config` might contain relative paths.
-    %% They are relative to the file! Not to the project root.
-    RebarOpts = rebar_opts(Dir ++ "/" ++ RebarFile),
-    code:add_patha(filename:absname("ebin")),
-    %% `compile:file/2` requires the `{i, Path}` to be relative
-    %% to CWD - no surprise here.
-    compile:file(File, Defs ++ translate_paths(Dir, RebarOpts));
-
-main(_) ->
-    io:format("Usage: ~s <file>~n", [escript:script_name()]),
-    halt(1).
-
-rebar_file(Dir) ->
-    DirList = filename:split(Dir),
-    case lists:last(DirList) of
-        "test" ->
-            "rebar.test.config";
-        _ ->
-            "rebar.config"
-    end.
-
-rebar_opts(RebarFile) ->
-    Dir = get_root(filename:dirname(RebarFile)),
-    case file:consult(RebarFile) of
-        {ok, Terms} ->
-            RebarLibDirs = proplists:get_value(lib_dirs, Terms, []),
-            lists:foreach(
-                fun(LibDir) ->
-                        code:add_pathsa(filelib:wildcard(LibDir ++ "/*/ebin"))
-                end, RebarLibDirs),
-            RebarDepsDir = proplists:get_value(deps_dir, Terms, "deps"),
-            code:add_pathsa(filelib:wildcard(RebarDepsDir ++ "/*/ebin")),
-            IncludeDeps = {i, filename:join(Dir, RebarDepsDir)},
-            proplists:get_value(erl_opts, Terms, []) ++ [IncludeDeps];
-        {error, _} when RebarFile == "rebar.config" ->
-          fallback_opts();
-        {error, _} ->
-            rebar_opts("rebar.config")
-    end.
-
-fallback_opts() ->
-    code:add_pathsa(filelib:wildcard("deps/*/ebin")),
-    code:add_pathsa(nested_app_ebins()),
-    [
-     { i, filename:absname("apps") }, { i, filename:absname("deps") } | [ { i, filename:absname(Path) } || Path <- filelib:wildcard("deps/*/apps")]
-    ].
-
-nested_app_ebins() ->
-    DetectedAppSrcFiles = filelib:wildcard("deps/*/apps/**/*.app.src"),
-    [apps_dir_from_src(AppSrcFile)||AppSrcFile<-DetectedAppSrcFiles].
-
-apps_dir_from_src(SrcFile) ->
-    SrcDir = filename:dirname(SrcFile),
-    filename:join(SrcDir, "../../ebin").
-
-get_root(Dir) ->
-    Path = filename:split(filename:absname(Dir)),
-    filename:join(get_root(lists:reverse(Path), Path)).
-
-get_root([], Path) ->
-    Path;
-get_root(["src" | Tail], _Path) ->
-    lists:reverse(Tail);
-get_root(["test" | Tail], _Path) ->
-    lists:reverse(Tail);
-get_root([_ | Tail], Path) ->
-    get_root(Tail, Path).
-
-translate_paths(Dir, RebarOpts) ->
-    [ translate_path(Dir, Opt) || Opt <- RebarOpts ].
-
-translate_path(Dir, {i, Path}) ->
-    case Path of
-        %% absolute
-        "/" ++ _ -> {i, Path};
-        %% relative -> make absolute taking rebar.config location into account
-        _ -> {i, filename:join([Dir, Path])}
-    end;
-translate_path(_, Other) -> Other.
diff --git a/bundle/syntastic/syntax_checkers/erlang/escript.vim b/bundle/syntastic/syntax_checkers/erlang/escript.vim
deleted file mode 100644
index 9fd869f..0000000
--- a/bundle/syntastic/syntax_checkers/erlang/escript.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        erlang.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Pawel Salata <rockplayer.pl at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_erlang_erlang_checker')
-    finish
-endif
-let g:loaded_syntastic_erlang_erlang_checker = 1
-
-if !exists('g:syntastic_erlc_include_path')
-    let g:syntastic_erlc_include_path = ''
-endif
-
-let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'erlang_check_file.erl')
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_erlang_escript_GetLocList() dict
-    if expand('%:e', 1) ==# 'hrl'
-        return []
-    endif
-
-    let shebang = syntastic#util#parseShebang()
-    if shebang['exe'] ==# 'escript'
-        let args = '-s'
-        let post_args = ''
-    else
-        let args = s:check_file
-        let post_args = g:syntastic_erlc_include_path
-    endif
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': args,
-        \ 'fname': syntastic#util#shexpand('%:p'),
-        \ 'post_args_after': post_args })
-
-    let errorformat =
-        \ '%W%f:%l: warning: %m,'.
-        \ '%E%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'erlang',
-    \ 'name': 'escript'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim b/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim
deleted file mode 100644
index 45f4735..0000000
--- a/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        syntaxerl.vim
-"Description: Syntax checking plugin for syntastic.
-"Maintainer:  locojay
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_erlang_syntaxerl_checker')
-    finish
-endif
-
-let g:loaded_syntastic_erlang_syntaxerl_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-
-function! SyntaxCheckers_erlang_syntaxerl_GetLocList() dict
-
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%W%f:%l: warning: %m,'.
-        \ '%E%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'erlang',
-    \ 'name': 'syntaxerl'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/eruby/ruby.vim b/bundle/syntastic/syntax_checkers/eruby/ruby.vim
deleted file mode 100644
index 16eed62..0000000
--- a/bundle/syntastic/syntax_checkers/eruby/ruby.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-"============================================================================
-"File:        ruby.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_eruby_ruby_checker')
-    finish
-endif
-let g:loaded_syntastic_eruby_ruby_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
-    if !exists('g:syntastic_eruby_ruby_exec') && exists('g:syntastic_ruby_exec')
-        let g:syntastic_eruby_ruby_exec = g:syntastic_ruby_exec
-        call self.log('g:syntastic_eruby_ruby_exec =', g:syntastic_eruby_ruby_exec)
-    endif
-    return executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_eruby_ruby_GetLocList() dict
-    if !exists('s:ruby_new')
-        let s:ruby_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 9])
-    endif
-
-    let fname = "'" . escape(expand('%', 1), "\\'") . "'"
-
-    " TODO: encodings became useful in ruby 1.9 :)
-    if s:ruby_new
-        let enc = &fileencoding !=# '' ? &fileencoding : &encoding
-        let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
-    else
-        let encoding_spec = ''
-    endif
-
-    "gsub fixes issue #7, rails has it's own eruby syntax
-    let makeprg =
-        \ self.getExecEscaped() . ' -rerb -e ' .
-        \ syntastic#util#shescape('puts ERB.new(File.read(' .
-        \     fname . encoding_spec .
-        \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
-        \ ' | ' . self.getExecEscaped() . ' -w -c'
-
-    let errorformat = '%-G%\m%.%#warning: %\%%(possibly %\)%\?useless use of a literal in void context,'
-
-    " filter out lines starting with ...
-    " long lines are truncated and wrapped in ... %p then returns the wrong
-    " column offset
-    let errorformat .= '%-G%\%.%\%.%\%.%.%#,'
-
-    let errorformat .=
-        \ '%-GSyntax OK,'.
-        \ '%E-:%l: syntax error\, %m,%Z%p^,'.
-        \ '%W-:%l: warning: %m,'.
-        \ '%Z%p^,'.
-        \ '%-C%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'defaults': { 'bufnr': bufnr(''), 'vcol': 1 } })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'eruby',
-    \ 'name': 'ruby'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/fortran/gfortran.vim b/bundle/syntastic/syntax_checkers/fortran/gfortran.vim
deleted file mode 100644
index fffaf30..0000000
--- a/bundle/syntastic/syntax_checkers/fortran/gfortran.vim
+++ /dev/null
@@ -1,99 +0,0 @@
-"============================================================================
-"File:        fortran.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_fortran_gfortran_checker')
-    finish
-endif
-let g:loaded_syntastic_fortran_gfortran_checker = 1
-
-if !exists('g:syntastic_fortran_compiler_options')
-    let g:syntastic_fortran_compiler_options = ''
-endif
-
-let s:type_map = {}
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict " {{{1
-    if !exists('g:syntastic_fortran_compiler')
-        let g:syntastic_fortran_compiler = self.getExec()
-    endif
-    call self.log('g:syntastic_fortran_compiler = ', g:syntastic_fortran_compiler)
-    return executable(expand(g:syntastic_fortran_compiler, 1))
-endfunction " }}}1
-
-" @vimlint(EVL104, 1, l:errorformat)
-function! SyntaxCheckers_fortran_gfortran_GetLocList() dict " {{{1
-    call s:SetCompilerType(g:syntastic_fortran_compiler)
-    if !has_key(s:type_map, g:syntastic_fortran_compiler)
-        call syntastic#log#error("checker fortran/gfortran: can't parse version string (abnormal termination?)")
-        return []
-    endif
-
-    if s:type_map[g:syntastic_fortran_compiler] ==# 'gfortran'
-        let errorformat =
-            \ '%-C %#,'.
-            \ '%-C  %#%.%#,'.
-            \ '%A%f:%l%[.:]%c:,'.
-            \ '%Z%\m%\%%(Fatal %\)%\?%trror: %m,'.
-            \ '%Z%tarning: %m,'.
-            \ '%-G%.%#'
-        if !exists('g:syntastic_fortran_gfortran_sort')
-            let g:syntastic_fortran_gfortran_sort = 0
-        endif
-    elseif s:type_map[g:syntastic_fortran_compiler] ==# 'ifort'
-        let errorformat =
-            \ '%E%f(%l): error #%n: %m,'.
-            \ '%W%f(%l): warning #%n: %m,'.
-            \ '%W%f(%l): remark #%n: %m,'.
-            \ '%-Z%p^,'.
-            \ '%-G%.%#'
-        if !exists('g:syntastic_fortran_gfortran_sort')
-            let g:syntastic_fortran_gfortran_sort = 1
-        endif
-    endif
-
-    return syntastic#c#GetLocList('fortran', 'gfortran', {
-        \ 'errorformat': errorformat,
-        \ 'main_flags': '-fsyntax-only' })
-endfunction " }}}1
-" @vimlint(EVL104, 0, l:errorformat)
-
-" Utilities {{{1
-
-function! s:SetCompilerType(exe) " {{{2
-    if !has_key(s:type_map, a:exe)
-        try
-            let ver = filter( split(syntastic#util#system(syntastic#util#shescape(a:exe) . ' --version'), '\n'),
-                \ 'v:val =~# "\\v^%(GNU Fortran|ifort) "' )[0]
-            if ver =~# '\m^GNU Fortran '
-                let s:type_map[a:exe] = 'gfortran'
-            elseif ver =~# '\m^ifort '
-                let s:type_map[a:exe] = 'ifort'
-            endif
-        catch /\m^Vim\%((\a\+)\)\=:E684/
-            " do nothing
-        endtry
-    endif
-endfunction " }}}2
-
-" }}}
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'fortran',
-    \ 'name': 'gfortran' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/glsl/cgc.vim b/bundle/syntastic/syntax_checkers/glsl/cgc.vim
deleted file mode 100644
index 602399d..0000000
--- a/bundle/syntastic/syntax_checkers/glsl/cgc.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-"============================================================================
-"File:        glsl.vim
-"Description: Syntax checker for OpenGL Shading Language
-"Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_glsl_cgc_checker')
-    finish
-endif
-let g:loaded_syntastic_glsl_cgc_checker = 1
-
-let s:glsl_extensions = {
-        \ 'glslf': 'gpu_fp',
-        \ 'glslv': 'gpu_vp',
-        \ 'frag':  'gpu_fp',
-        \ 'vert':  'gpu_vp',
-        \ 'fp':    'gpu_fp',
-        \ 'vp':    'gpu_vp'
-    \ }
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_glsl_cgc_GetLocList() dict " {{{1
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': '-oglsl -profile ' . s:GetProfile(),
-        \ 'args': (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
-
-    let errorformat =
-        \ '%E%f(%l) : error %m,' .
-        \ '%W%f(%l) : warning %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:GetProfile() " {{{2
-    let save_view = winsaveview()
-    let old_foldenable = &foldenable
-    let old_lazyredraw = &lazyredraw
-
-    let &lazyredraw = 1
-    let &foldenable = 0
-    call cursor(1, 1)
-
-    let magic = '\m\C^// profile:\s*'
-    let line = search(magic, 'c')
-
-    call winrestview(save_view)
-    let &foldenable = old_foldenable
-    let &lazyredraw = old_lazyredraw
-
-    if line
-        let profile = matchstr(getline(line), magic . '\zs.*')
-    else
-        let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
-        let profile = get(extensions, tolower(expand('%:e', 1)), 'gpu_vert')
-    endif
-
-    return profile
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \'filetype': 'glsl',
-    \'name': 'cgc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/go.vim b/bundle/syntastic/syntax_checkers/go/go.vim
deleted file mode 100644
index f32f505..0000000
--- a/bundle/syntastic/syntax_checkers/go/go.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-"============================================================================
-"File:        go.vim
-"Description: Check go syntax using 'gofmt -l' followed by 'go [build|test]'
-"Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-" This syntax checker does not reformat your source code.
-" Use a BufWritePre autocommand to that end:
-"   autocmd FileType go autocmd BufWritePre <buffer> Fmt
-
-if exists('g:loaded_syntastic_go_go_checker')
-    finish
-endif
-let g:loaded_syntastic_go_go_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_go_IsAvailable() dict
-    return executable(self.getExec()) && executable('gofmt')
-endfunction
-
-function! SyntaxCheckers_go_go_GetLocList() dict
-    if !exists('s:go_new')
-        let s:go_new = syntastic#util#versionIsAtLeast(self.getVersion(self.getExecEscaped() . ' version'), [1, 5])
-    endif
-
-    " Check with gofmt first, since `go build` and `go test` might not report
-    " syntax errors in the current file if another file with syntax error is
-    " compiled first.
-    let makeprg = self.makeprgBuild({
-        \ 'exe': 'gofmt',
-        \ 'args': '-l',
-        \ 'tail': '> ' . syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%f:%l:%c: %m,' .
-        \ '%-G%.%#'
-
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'e'} })
-    if !empty(errors)
-        return errors
-    endif
-
-    " Test files, i.e. files with a name ending in `_test.go`, are not
-    " compiled by `go build`, therefore `go test` must be called for those.
-    if match(expand('%', 1), '\m_test\.go$') == -1
-        let cmd = 'build'
-        let opts = syntastic#util#var('go_go_build_args', s:go_new ? '-buildmode=archive' : '')
-        let cleanup = 0
-    else
-        let cmd = 'test -c'
-        let opts = syntastic#util#var('go_go_test_args', s:go_new ? '-buildmode=archive' : '')
-        let cleanup = 1
-    endif
-    let opt_str = (type(opts) != type('') || opts !=# '') ? join(syntastic#util#argsescape(opts)) : opts
-    let makeprg = self.getExecEscaped() . ' ' . cmd . ' ' . opt_str
-
-    " The first pattern is for warnings from C compilers.
-    let errorformat =
-        \ '%W%f:%l: warning: %m,' .
-        \ '%E%f:%l:%c:%m,' .
-        \ '%E%f:%l:%m,' .
-        \ '%C%\s%\+%m,' .
-        \ '%+Ecan''t load package: %m,' .
-        \ '%+Einternal error: %m,' .
-        \ '%-G#%.%#'
-
-    " The go compiler needs to either be run with an import path as an
-    " argument or directly from the package directory. Since figuring out
-    " the proper import path is fickle, just cwd to the package.
-
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h', 1),
-        \ 'env': {'GOGC': 'off'},
-        \ 'defaults': {'type': 'e'} })
-
-    if cleanup
-        call delete(expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:p:h:t', 1) . '.test')
-    endif
-
-    return errors
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'go'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/gofmt.vim b/bundle/syntastic/syntax_checkers/go/gofmt.vim
deleted file mode 100644
index bdb6218..0000000
--- a/bundle/syntastic/syntax_checkers/go/gofmt.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-"============================================================================
-"File:        gofmt.vim
-"Description: Check go syntax using 'gofmt -l'
-"Maintainer:  Brandon Thomson <bt@brandonthomson.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-" This syntax checker does not reformat your source code.
-" Use a BufWritePre autocommand to that end:
-"   autocmd FileType go autocmd BufWritePre <buffer> Fmt
-
-if exists('g:loaded_syntastic_go_gofmt_checker')
-    finish
-endif
-let g:loaded_syntastic_go_gofmt_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_gofmt_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-l',
-        \ 'tail_after': '> ' . syntastic#util#DevNull() })
-
-    let errorformat = '%f:%l:%c: %m,%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'e'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'gofmt'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/golint.vim b/bundle/syntastic/syntax_checkers/go/golint.vim
deleted file mode 100644
index 29eee0c..0000000
--- a/bundle/syntastic/syntax_checkers/go/golint.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        golint.vim
-"Description: Check go syntax using 'golint'
-"Maintainer:  Hiroshi Ioka <hirochachacha@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_go_golint_checker')
-    finish
-endif
-let g:loaded_syntastic_go_golint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_golint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%f:%l:%c: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'w'},
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'golint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/gometalinter.vim b/bundle/syntastic/syntax_checkers/go/gometalinter.vim
deleted file mode 100644
index 780f49b..0000000
--- a/bundle/syntastic/syntax_checkers/go/gometalinter.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-"============================================================================
-"File:        gometalinter.vim
-"Description: Check go syntax using 'gometalint'
-"Maintainer:  Joshua Rubin <joshua@rubixconsulting.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_go_gometalinter_checker')
-    finish
-endif
-let g:loaded_syntastic_go_gometalinter_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_gometalinter_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '-t',
-        \ 'fname': syntastic#util#shexpand('%:p:h') })
-
-    let errorformat =
-        \ '%f:%l:%c:%trror: %m,' .
-        \ '%f:%l:%c:%tarning: %m,' .
-        \ '%f:%l::%trror: %m,' .
-        \ '%f:%l::%tarning: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        if e['text'] =~# '\v\(%(deadcode|gocyclo|golint|defercheck|varcheck|structcheck|errcheck|dupl)\)$'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'gometalinter'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/gotype.vim b/bundle/syntastic/syntax_checkers/go/gotype.vim
deleted file mode 100644
index 37472ee..0000000
--- a/bundle/syntastic/syntax_checkers/go/gotype.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        gotype.vim
-"Description: Perform syntactic and semantic checking of Go code using 'gotype'
-"Maintainer:  luz <ne.tetewi@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_go_gotype_checker')
-    finish
-endif
-let g:loaded_syntastic_go_gotype_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_gotype_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': (expand('%', 1) =~# '\m_test\.go$' ? '-a' : ''),
-        \ 'fname': '.' })
-
-    let errorformat =
-        \ '%f:%l:%c: %m,' .
-        \ '%-G%.%#'
-
-    " gotype needs the full go package to test types properly. Just cwd to
-    " the package for the same reasons specified in go.vim ("figuring out
-    " the import path is fickle").
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h', 1),
-        \ 'defaults': {'type': 'e'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'gotype'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/go/govet.vim b/bundle/syntastic/syntax_checkers/go/govet.vim
deleted file mode 100644
index 5d26637..0000000
--- a/bundle/syntastic/syntax_checkers/go/govet.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        govet.vim
-"Description: Perform static analysis of Go code with the vet tool
-"Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_go_govet_checker')
-    finish
-endif
-let g:loaded_syntastic_go_govet_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_go_govet_IsAvailable() dict
-    return executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_go_govet_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' vet'
-
-    let errorformat =
-        \ '%Evet: %.%\+: %f:%l:%c: %m,' .
-        \ '%W%f:%l: %m,' .
-        \ '%-G%.%#'
-
-    " The go compiler needs to either be run with an import path as an
-    " argument or directly from the package directory. Since figuring out
-    " the proper import path is fickle, just cwd to the package.
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'cwd': expand('%:p:h', 1),
-        \ 'defaults': {'type': 'w'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'go',
-    \ 'name': 'govet',
-    \ 'exec': 'go' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haml/haml.vim b/bundle/syntastic/syntax_checkers/haml/haml.vim
deleted file mode 100644
index c0c7318..0000000
--- a/bundle/syntastic/syntax_checkers/haml/haml.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-"============================================================================
-"File:        haml.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_haml_haml_checker')
-    finish
-endif
-let g:loaded_syntastic_haml_haml_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haml_haml_IsAvailable() dict
-    call syntastic#log#deprecationWarn('haml_interpreter', 'haml_haml_exec')
-    return executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_haml_haml_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
-
-    let errorformat =
-        \ 'Haml error on line %l: %m,' .
-        \ 'Syntax error on line %l: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haml',
-    \ 'name': 'haml'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haml/haml_lint.vim b/bundle/syntastic/syntax_checkers/haml/haml_lint.vim
deleted file mode 100644
index 60b3db3..0000000
--- a/bundle/syntastic/syntax_checkers/haml/haml_lint.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-"============================================================================
-"File:        haml_lint.vim
-"Description: HAML style and syntax checker plugin for Syntastic
-"Maintainer:  Shane da Silva <shane@dasilva.io>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_haml_haml_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_haml_haml_lint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haml_haml_lint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-    let errorformat = '%f:%l [%t] %m'
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style'})
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haml',
-    \ 'name': 'haml_lint',
-    \ 'exec': 'haml-lint' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim b/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim
deleted file mode 100644
index f5ae742..0000000
--- a/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        handlebars.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_handlebars_handlebars_checker')
-    finish
-endif
-let g:loaded_syntastic_handlebars_handlebars_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_handlebars_handlebars_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-f ' . syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%EError: %m on line %l:,' .
-        \ '%EError: %m,' .
-        \ '%Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['guards'],
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'handlebars',
-    \ 'name': 'handlebars'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haskell/ghc-mod.vim b/bundle/syntastic/syntax_checkers/haskell/ghc-mod.vim
deleted file mode 100644
index 0446283..0000000
--- a/bundle/syntastic/syntax_checkers/haskell/ghc-mod.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-"============================================================================
-"File:        ghc-mod.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Anthony Carapetis <anthony.carapetis at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_haskell_ghc_mod_checker')
-    finish
-endif
-let g:loaded_syntastic_haskell_ghc_mod_checker = 1
-
-let s:ghc_mod_new = -1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haskell_ghc_mod_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    " ghc-mod 5.0.0 and later needs the "version" command to print the
-    " version.  But the "version" command appeared in 4.1.0.  Thus, we need to
-    " know the version in order to know how to find out the version. :)
-
-    " Try "ghc-mod version".
-    let version_output = split(syntastic#util#system(self.getExecEscaped() . ' version'), '\n', 1)
-    let ver = filter(copy(version_output), 'v:val =~# ''\m\sversion''')
-    if !len(ver)
-        " That didn't work.  Try "ghc-mod" alone.
-        let version_output = split(syntastic#util#system(self.getExecEscaped()), '\n', 1)
-        let ver = filter(copy(version_output), 'v:val =~# ''\m\sversion''')
-    endif
-    let parsed_ver = len(ver) ? syntastic#util#parseVersion(ver[0]) : []
-
-    if len(parsed_ver)
-        " Encouraged by the great success in finding out the version, now we
-        " need either a Vim that can handle NULs in system() output, or a
-        " ghc-mod that has the "--boundary" option.
-        call self.setVersion(parsed_ver)
-        let s:ghc_mod_new = syntastic#util#versionIsAtLeast(parsed_ver, [2, 1, 2])
-    else
-        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', version_output)
-        call syntastic#log#error("checker haskell/ghc_mod: can't parse version string (abnormal termination?)")
-        let s:ghc_mod_new = -1
-    endif
-
-    return (s:ghc_mod_new >= 0) && (v:version >= 704 || s:ghc_mod_new)
-endfunction
-
-function! SyntaxCheckers_haskell_ghc_mod_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'exe': self.getExecEscaped() . ' check' . (s:ghc_mod_new ? ' --boundary=""' : '') })
-
-    let errorformat =
-        \ '%-G%\s%#,' .
-        \ '%f:%l:%c:%trror: %m,' .
-        \ '%f:%l:%c:%tarning: %m,'.
-        \ '%f:%l:%c: %trror: %m,' .
-        \ '%f:%l:%c: %tarning: %m,' .
-        \ '%f:%l:%c:%m,' .
-        \ '%E%f:%l:%c:,' .
-        \ '%Z%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'iconv',
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'returns': [0] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haskell',
-    \ 'name': 'ghc_mod',
-    \ 'exec': 'ghc-mod' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim b/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim
deleted file mode 100644
index 4b0a80f..0000000
--- a/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"============================================================================
-"File:        hdevtools.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Anthony Carapetis <anthony.carapetis at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_haskell_hdevtools_checker')
-    finish
-endif
-let g:loaded_syntastic_haskell_hdevtools_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haskell_hdevtools_GetLocList() dict
-    if !exists('g:syntastic_haskell_hdevtools_args') && exists('g:hdevtools_options')
-        call syntastic#log#oneTimeWarn('variable g:hdevtools_options is deprecated, ' .
-            \ 'please use g:syntastic_haskell_hdevtools_args instead')
-        let g:syntastic_haskell_hdevtools_args = g:hdevtools_options
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe_after': 'check',
-        \ 'fname': syntastic#util#shexpand('%:p') })
-
-    let errorformat =
-        \ '%-Z %#,'.
-        \ '%W%f:%l:%v: Warning: %m,'.
-        \ '%W%f:%l:%v: Warning:,'.
-        \ '%E%f:%l:%v: %m,'.
-        \ '%E%>%f:%l:%v:,'.
-        \ '%+C  %#%m,'.
-        \ '%W%>%f:%l:%v:,'.
-        \ '%+C  %#%tarning: %m,'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'vcol': 1},
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haskell',
-    \ 'name': 'hdevtools'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haskell/hlint.vim b/bundle/syntastic/syntax_checkers/haskell/hlint.vim
deleted file mode 100644
index 096e429..0000000
--- a/bundle/syntastic/syntax_checkers/haskell/hlint.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-"============================================================================
-"File:        hlint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Nicolas Wu <nicolas.wu at gmail dot com>
-"License:     BSD
-"============================================================================
-
-if exists('g:loaded_syntastic_haskell_hlint_checker')
-    finish
-endif
-let g:loaded_syntastic_haskell_hlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haskell_hlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'fname': syntastic#util#shexpand('%:p')})
-
-    let errorformat =
-        \ '%E%f:%l:%v: Error while reading hint file\, %m,' .
-        \ '%E%f:%l:%v: Error: %m,' .
-        \ '%W%f:%l:%v: Warning: %m,' .
-        \ '%C%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'vcol': 1},
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haskell',
-    \ 'name': 'hlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haskell/scan.vim b/bundle/syntastic/syntax_checkers/haskell/scan.vim
deleted file mode 100644
index 7cf7e7b..0000000
--- a/bundle/syntastic/syntax_checkers/haskell/scan.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        scan.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_haskell_scan_checker')
-    finish
-endif
-let g:loaded_syntastic_haskell_scan_checker = 1
-
-if !exists('g:syntastic_haskell_scan_sort')
-    let g:syntastic_haskell_scan_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haskell_scan_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f:%l:%v: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haskell',
-    \ 'name': 'scan'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/haxe/haxe.vim b/bundle/syntastic/syntax_checkers/haxe/haxe.vim
deleted file mode 100644
index 789e9f3..0000000
--- a/bundle/syntastic/syntax_checkers/haxe/haxe.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-"============================================================================
-"File:        haxe.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  David Bernard <david.bernard.31 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_haxe_haxe_checker')
-    finish
-endif
-let g:loaded_syntastic_haxe_haxe_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_haxe_haxe_GetLocList() dict
-    if exists('b:vaxe_hxml')
-        let hxml = b:vaxe_hxml
-    elseif exists('g:vaxe_hxml')
-        let hxml = g:vaxe_hxml
-    else
-        let hxml = syntastic#util#findGlobInParent('*.hxml', expand('%:p:h', 1))
-    endif
-    let hxml = fnamemodify(hxml, ':p')
-
-    call self.log('hxml =', hxml)
-
-    if hxml !=# ''
-        let makeprg = self.makeprgBuild({
-            \ 'fname': syntastic#util#shescape(fnamemodify(hxml, ':t')) })
-
-        let errorformat = '%E%f:%l: characters %c-%n : %m'
-
-        let loclist = SyntasticMake({
-            \ 'makeprg': makeprg,
-            \ 'errorformat': errorformat,
-            \ 'cwd': fnamemodify(hxml, ':h') })
-
-        for e in loclist
-            let e['hl'] = '\%>' . e['col'] . 'c\%<' . (e['nr'] + 1) . 'c'
-            let e['col'] += 1
-            let e['nr'] = 0
-        endfor
-
-        return loclist
-    endif
-
-    return []
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'haxe',
-    \ 'name': 'haxe'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/hss/hss.vim b/bundle/syntastic/syntax_checkers/hss/hss.vim
deleted file mode 100644
index d988615..0000000
--- a/bundle/syntastic/syntax_checkers/hss/hss.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        hss.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Justin Donaldson (jdonaldson@gmail.com)
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_hss_hss_checker')
-    finish
-endif
-let g:loaded_syntastic_hss_hss_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_hss_hss_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after' : '-output ' . syntastic#util#DevNull() })
-
-    let errorformat = '%E%f:%l: %m'
-
-    return SyntasticMake({
-	\ 'makeprg': makeprg,
-	\ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'hss',
-    \ 'name': 'hss'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/html/jshint.vim b/bundle/syntastic/syntax_checkers/html/jshint.vim
deleted file mode 100644
index a7af758..0000000
--- a/bundle/syntastic/syntax_checkers/html/jshint.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        jshint.vim
-"Description: Javascript syntax checker for HTML - using jshint
-"Maintainer:  LCD 47 <lcd047@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_html_jshint_checker')
-    finish
-endif
-let g:loaded_syntastic_html_jshint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_html_jshint_IsAvailable() dict
-    call syntastic#log#deprecationWarn('jshint_exec', 'html_jshint_exec')
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
-endfunction
-
-function! SyntaxCheckers_html_jshint_GetLocList() dict
-    call syntastic#log#deprecationWarn('html_jshint_conf', 'html_jshint_args',
-        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
-
-    let makeprg = self.makeprgBuild({ 'args_after': '--verbose --extract always' })
-
-    let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'html',
-    \ 'name': 'jshint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/html/tidy.vim b/bundle/syntastic/syntax_checkers/html/tidy.vim
deleted file mode 100644
index 3075a7d..0000000
--- a/bundle/syntastic/syntax_checkers/html/tidy.vim
+++ /dev/null
@@ -1,212 +0,0 @@
-"============================================================================
-"File:        tidy.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_html_tidy_checker')
-    finish
-endif
-let g:loaded_syntastic_html_tidy_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Checker options {{{1
-
-if !exists('g:syntastic_html_tidy_ignore_errors')
-    let g:syntastic_html_tidy_ignore_errors = []
-endif
-
-if !exists('g:syntastic_html_tidy_blocklevel_tags')
-    let g:syntastic_html_tidy_blocklevel_tags = []
-endif
-
-if !exists('g:syntastic_html_tidy_inline_tags')
-    let g:syntastic_html_tidy_inline_tags = []
-endif
-
-if !exists('g:syntastic_html_tidy_empty_tags')
-    let g:syntastic_html_tidy_empty_tags = []
-endif
-
-" }}}1
-
-" Constants {{{1
-
-let s:IGNORE_ERRORS = [
-        \ "<table> lacks \"summary\" attribute",
-        \ "not approved by W3C",
-        \ "<input> proprietary attribute \"placeholder\"",
-        \ "<meta> proprietary attribute \"charset\"",
-        \ "<meta> lacks \"content\" attribute",
-        \ "inserting \"type\" attribute",
-        \ "proprietary attribute \"data-",
-        \ "missing <!DOCTYPE> declaration",
-        \ "inserting implicit <body>",
-        \ "inserting missing 'title' element",
-        \ "unescaped & or unknown entity",
-        \ "<input> attribute \"type\" has invalid value",
-        \ "proprietary attribute \"role\"",
-        \ "proprietary attribute \"aria-activedescendant\"",
-        \ "proprietary attribute \"aria-atomic\"",
-        \ "proprietary attribute \"aria-autocomplete\"",
-        \ "proprietary attribute \"aria-busy\"",
-        \ "proprietary attribute \"aria-checked\"",
-        \ "proprietary attribute \"aria-controls\"",
-        \ "proprietary attribute \"aria-describedby\"",
-        \ "proprietary attribute \"aria-disabled\"",
-        \ "proprietary attribute \"aria-dropeffect\"",
-        \ "proprietary attribute \"aria-expanded\"",
-        \ "proprietary attribute \"aria-flowto\"",
-        \ "proprietary attribute \"aria-grabbed\"",
-        \ "proprietary attribute \"aria-haspopup\"",
-        \ "proprietary attribute \"aria-hidden\"",
-        \ "proprietary attribute \"aria-invalid\"",
-        \ "proprietary attribute \"aria-label\"",
-        \ "proprietary attribute \"aria-labelledby\"",
-        \ "proprietary attribute \"aria-level\"",
-        \ "proprietary attribute \"aria-live\"",
-        \ "proprietary attribute \"aria-multiline\"",
-        \ "proprietary attribute \"aria-multiselectable\"",
-        \ "proprietary attribute \"aria-orientation\"",
-        \ "proprietary attribute \"aria-owns\"",
-        \ "proprietary attribute \"aria-posinset\"",
-        \ "proprietary attribute \"aria-pressed\"",
-        \ "proprietary attribute \"aria-readonly\"",
-        \ "proprietary attribute \"aria-relevant\"",
-        \ "proprietary attribute \"aria-relevant\"",
-        \ "proprietary attribute \"aria-required\"",
-        \ "proprietary attribute \"aria-selected\"",
-        \ "proprietary attribute \"aria-setsize\"",
-        \ "proprietary attribute \"aria-sort\"",
-        \ "proprietary attribute \"aria-valuemax\"",
-        \ "proprietary attribute \"aria-valuemin\"",
-        \ "proprietary attribute \"aria-valuenow\"",
-        \ "proprietary attribute \"aria-valuetext\""
-    \ ]
-lockvar! s:IGNORE_ERRORS
-
-let s:BLOCKLEVEL_TAGS = [
-        \ 'main',
-        \ 'section',
-        \ 'article',
-        \ 'aside',
-        \ 'header',
-        \ 'footer',
-        \ 'nav',
-        \ 'figure',
-        \ 'figcaption'
-    \ ]
-lockvar! s:BLOCKLEVEL_TAGS
-
-let s:INLINE_TAGS = [
-        \ 'video',
-        \ 'audio',
-        \ 'source',
-        \ 'embed',
-        \ 'mark',
-        \ 'progress',
-        \ 'meter',
-        \ 'time',
-        \ 'ruby',
-        \ 'rt',
-        \ 'rp',
-        \ 'canvas',
-        \ 'command',
-        \ 'details',
-        \ 'datalist'
-    \ ]
-lockvar! s:INLINE_TAGS
-
-let s:EMPTY_TAGS = [
-        \ 'wbr',
-        \ 'keygen'
-    \ ]
-lockvar! s:EMPTY_TAGS
-
-" }}}1
-
-function! SyntaxCheckers_html_tidy_GetLocList() dict " {{{1
-    let makeprg = self.makeprgBuild({ 'args_after': s:Args() })
-
-    let errorformat =
-        \ '%Wline %l column %v - Warning: %m,' .
-        \ '%Eline %l column %v - Error: %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 1, 2] })
-
-    " filter out valid HTML5 from the errors
-    for e in loclist
-        if e['valid'] && s:IgnoreError(e['text']) == 1
-            let e['valid'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction " }}}1
-
-" Utilities {{{1
-
-" TODO: join this with xhtml.vim for DRY's sake?
-function! s:TidyEncOptByFenc() " {{{2
-    let TIDY_OPTS = {
-            \ 'utf-8':        '-utf8',
-            \ 'ascii':        '-ascii',
-            \ 'latin1':       '-latin1',
-            \ 'iso-2022-jp':  '-iso-2022',
-            \ 'cp1252':       '-win1252',
-            \ 'macroman':     '-mac',
-            \ 'utf-16le':     '-utf16le',
-            \ 'utf-16':       '-utf16',
-            \ 'big5':         '-big5',
-            \ 'cp932':        '-shiftjis',
-            \ 'sjis':         '-shiftjis',
-            \ 'cp850':        '-ibm858',
-        \ }
-    return get(TIDY_OPTS, &fileencoding, '-utf8')
-endfunction " }}}2
-
-function! s:IgnoreError(text) " {{{2
-    for item in s:IGNORE_ERRORS + g:syntastic_html_tidy_ignore_errors
-        if stridx(a:text, item) != -1
-            return 1
-        endif
-    endfor
-    return 0
-endfunction " }}}2
-
-function! s:NewTags(name) " {{{2
-    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
-endfunction " }}}2
-
-function! s:Args() " {{{2
-    let args = s:TidyEncOptByFenc() .
-        \ ' --new-blocklevel-tags ' . s:NewTags('blocklevel_tags') .
-        \ ' --new-inline-tags ' . s:NewTags('inline_tags') .
-        \ ' --new-empty-tags ' . s:NewTags('empty_tags') .
-        \ ' -e'
-    return args
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'html',
-    \ 'name': 'tidy'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/html/validator.vim b/bundle/syntastic/syntax_checkers/html/validator.vim
deleted file mode 100644
index 14a4c64..0000000
--- a/bundle/syntastic/syntax_checkers/html/validator.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-"============================================================================
-"File:        validator.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_html_validator_checker')
-    finish
-endif
-let g:loaded_syntastic_html_validator_checker=1
-
-if !exists('g:syntastic_html_validator_api')
-    let g:syntastic_html_validator_api = 'https://validator.nu/'
-endif
-
-if !exists('g:syntastic_html_validator_parser')
-    let g:syntastic_html_validator_parser = ''
-endif
-
-if !exists('g:syntastic_html_validator_nsfilter')
-    let g:syntastic_html_validator_nsfilter = ''
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_html_validator_GetLocList() dict
-    let fname = syntastic#util#shexpand('%')
-    let makeprg = self.getExecEscaped() . ' -q -L -s --compressed -F out=gnu -F asciiquotes=yes' .
-        \ (g:syntastic_html_validator_parser !=# '' ? ' -F parser=' . g:syntastic_html_validator_parser : '') .
-        \ (g:syntastic_html_validator_nsfilter !=# '' ? ' -F nsfilter=' . g:syntastic_html_validator_nsfilter : '') .
-        \ ' -F doc=@' . fname . '\;type=text/html\;filename=' . fname . ' ' . g:syntastic_html_validator_api
-
-    let errorformat =
-        \ '%E"%f":%l: %trror: %m,' .
-        \ '%E"%f":%l-%\d%\+: %trror: %m,' .
-        \ '%E"%f":%l%\%.%c: %trror: %m,' .
-        \ '%E"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: %trror: %m,' .
-        \ '%E"%f":%l: %trror fatal: %m,' .
-        \ '%E"%f":%l-%\d%\+: %trror fatal: %m,' .
-        \ '%E"%f":%l%\%.%c: %trror fatal: %m,' .
-        \ '%E"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: %trror fatal: %m,' .
-        \ '%W"%f":%l: info %tarning: %m,' .
-        \ '%W"%f":%l-%\d%\+: info %tarning: %m,' .
-        \ '%W"%f":%l%\%.%c: info %tarning: %m,' .
-        \ '%W"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: info %tarning: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'validator',
-        \ 'returns': [0] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'html',
-    \ 'name': 'validator',
-    \ 'exec': 'curl' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/html/w3.vim b/bundle/syntastic/syntax_checkers/html/w3.vim
deleted file mode 100644
index 37ff11a..0000000
--- a/bundle/syntastic/syntax_checkers/html/w3.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-"============================================================================
-"File:        w3.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_html_w3_checker')
-    finish
-endif
-let g:loaded_syntastic_html_w3_checker = 1
-
-if !exists('g:syntastic_html_w3_api')
-    let g:syntastic_html_w3_api = 'http://validator.w3.org/check'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_html_w3_GetLocList() dict
-    let makeprg = self.getExecEscaped() . ' -q -L -s -F output=json ' .
-        \ '-F uploaded_file=@' . syntastic#util#shexpand('%:p') . '\;type=text/html ' .
-        \ g:syntastic_html_w3_api
-
-    let errorformat =
-        \ '%A %\+{,' .
-        \ '%C %\+"lastLine": %l\,%\?,' .
-        \ '%C %\+"lastColumn": %c\,%\?,' .
-        \ '%C %\+"message": "%m"\,%\?,' .
-        \ '%C %\+"type": "%trror"\,%\?,' .
-        \ '%-G %\+"type": "%tnfo"\,%\?,' .
-        \ '%C %\+"subtype": "%tarning"\,%\?,' .
-        \ '%Z %\+}\,,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0] })
-
-    for e in loclist
-        let e['text'] = substitute(e['text'], '\m\\\([\"]\)', '\1', 'g')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'html',
-    \ 'name': 'w3',
-    \ 'exec': 'curl' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/jade/jade_lint.vim b/bundle/syntastic/syntax_checkers/jade/jade_lint.vim
deleted file mode 100644
index 59da5b0..0000000
--- a/bundle/syntastic/syntax_checkers/jade/jade_lint.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-"============================================================================
-"File:        jade_lint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Ben Parnell <benjaminparnell.94@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_jade_jade_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_jade_jade_lint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_jade_jade_lint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-r inline' })
-
-    let errorformat = '%f:%l:%c %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'jade',
-    \ 'name': 'jade_lint',
-    \ 'exec': 'jade-lint' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/java/checkstyle.vim b/bundle/syntastic/syntax_checkers/java/checkstyle.vim
deleted file mode 100644
index f4eee5e..0000000
--- a/bundle/syntastic/syntax_checkers/java/checkstyle.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-"============================================================================
-"File:        checkstyle.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Dmitry Geurkov <d.geurkov at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-" Tested with checkstyle 5.5
-"============================================================================
-
-if exists('g:loaded_syntastic_java_checkstyle_checker')
-    finish
-endif
-let g:loaded_syntastic_java_checkstyle_checker = 1
-
-if !exists('g:syntastic_java_checkstyle_classpath')
-    let g:syntastic_java_checkstyle_classpath = 'checkstyle-6.10.1-all.jar'
-endif
-
-if !exists('g:syntastic_java_checkstyle_conf_file')
-    let g:syntastic_java_checkstyle_conf_file = 'sun_checks.xml'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let conf_file = expand(g:syntastic_java_checkstyle_conf_file, 1)
-    call self.log('filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
-
-    return filereadable(conf_file)
-endfunction
-
-function! SyntaxCheckers_java_checkstyle_GetLocList() dict
-
-    " classpath
-    if !exists('s:sep')
-        let s:sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':'
-    endif
-    let classpath = join(map( split(g:syntastic_java_checkstyle_classpath, s:sep, 1), 'expand(v:val, 1)' ), s:sep)
-    call self.log('classpath =', classpath)
-
-    " forced options
-    let opts = []
-    if classpath !=# ''
-        call extend(opts, ['-cp', classpath])
-    endif
-    call extend(opts, [
-        \ 'com.puppycrawl.tools.checkstyle.Main',
-        \ '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
-        \ '-f', 'xml' ])
-
-    " filename
-    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
-    if has('win32unix')
-        let fname = substitute(syntastic#util#system('cygpath -m ' . fname), '\m\%x00', '', 'g')
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_after': opts, 'fname': fname })
-
-    let errorformat = '%f:%t:%l:%c:%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'checkstyle',
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'java',
-    \ 'name': 'checkstyle',
-    \ 'exec': 'java'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/java/javac.vim b/bundle/syntastic/syntax_checkers/java/javac.vim
deleted file mode 100644
index 9ba6871..0000000
--- a/bundle/syntastic/syntax_checkers/java/javac.vim
+++ /dev/null
@@ -1,440 +0,0 @@
-"============================================================================
-"File:        javac.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Jochen Keil <jochen.keil at gmail dot com>
-"             Dmitry Geurkov <d.geurkov at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_java_javac_checker')
-    finish
-endif
-let g:loaded_syntastic_java_javac_checker = 1
-let g:syntastic_java_javac_maven_pom_tags = ['build', 'properties']
-let g:syntastic_java_javac_maven_pom_properties = {}
-let s:has_maven = 0
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Checker options {{{1
-
-if !exists('g:syntastic_java_javac_executable')
-    let g:syntastic_java_javac_executable = 'javac'
-endif
-
-if !exists('g:syntastic_java_maven_executable')
-    let g:syntastic_java_maven_executable = 'mvn'
-endif
-
-if !exists('g:syntastic_java_javac_options')
-    let g:syntastic_java_javac_options = '-Xlint'
-endif
-
-if !exists('g:syntastic_java_maven_options')
-    let g:syntastic_java_maven_options = ''
-endif
-
-if !exists('g:syntastic_java_javac_classpath')
-    let g:syntastic_java_javac_classpath = ''
-endif
-
-if !exists('g:syntastic_java_javac_delete_output')
-    let g:syntastic_java_javac_delete_output = 1
-endif
-
-if !exists('g:syntastic_java_javac_autoload_maven_classpath')
-    let g:syntastic_java_javac_autoload_maven_classpath = 1
-endif
-
-if !exists('g:syntastic_java_javac_config_file_enabled')
-    let g:syntastic_java_javac_config_file_enabled = 0
-endif
-
-if !exists('g:syntastic_java_javac_config_file')
-    let g:syntastic_java_javac_config_file = '.syntastic_javac_config'
-endif
-
-if !exists('g:syntastic_java_javac_custom_classpath_command')
-    let g:syntastic_java_javac_custom_classpath_command = ''
-endif
-
-if !exists('g:syntastic_java_javac_maven_pom_ftime')
-    let g:syntastic_java_javac_maven_pom_ftime = {}
-endif
-
-if !exists('g:syntastic_java_javac_maven_pom_classpath')
-    let g:syntastic_java_javac_maven_pom_classpath = {}
-endif
-
-" }}}1
-
-" Constants {{{1
-
-let s:_FILE_SHORTCUTS = {
-        \ '%FILE_PATH%':  '%:p',
-        \ '%FILE_NAME%':  '%:t',
-        \ '%FILE_DIR%':   '%:p:h',
-    \ }
-lockvar! s:_FILE_SHORTCUTS
-
-" }}}1
-
-" Commands {{{1
-
-command! SyntasticJavacEditClasspath call s:EditClasspath()
-command! SyntasticJavacEditConfig    call s:EditConfig()
-
-" }}}1
-
-function! SyntaxCheckers_java_javac_IsAvailable() dict " {{{1
-    let s:has_maven = executable(expand(g:syntastic_java_maven_executable, 1))
-    return executable(expand(g:syntastic_java_javac_executable, 1))
-endfunction " }}}1
-
-function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
-    let javac_opts = g:syntastic_java_javac_options
-
-    let output_dir = ''
-    if g:syntastic_java_javac_delete_output
-        let output_dir = syntastic#util#tmpdir()
-        let javac_opts .= ' -d ' . syntastic#util#shescape(output_dir)
-    endif
-
-    " load classpath from config file
-    if g:syntastic_java_javac_config_file_enabled
-        call s:LoadConfigFile()
-    endif
-
-
-    " add classpathes to javac_classpath {{{2
-    let javac_classpath = ''
-
-    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
-        if path !=# ''
-            try
-                let ps = glob(path, 1, 1)
-            catch
-                let ps = split(glob(path, 1), "\n")
-            endtry
-            if type(ps) == type([])
-                for p in ps
-                    let javac_classpath = s:AddToClasspath(javac_classpath, p)
-                endfor
-            else
-                let javac_classpath = s:AddToClasspath(javac_classpath, ps)
-            endif
-        endif
-    endfor
-
-    if s:has_maven && g:syntastic_java_javac_autoload_maven_classpath
-        if !g:syntastic_java_javac_delete_output
-            let javac_opts .= ' -d ' . syntastic#util#shescape(s:MavenOutputDirectory())
-        endif
-        let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
-    endif
-    " }}}2
-
-    " load custom classpath {{{2
-    if g:syntastic_java_javac_custom_classpath_command !=# ''
-        " Pre-process the classpath command string a little.
-        let classpath_command = g:syntastic_java_javac_custom_classpath_command
-        for [key, val] in items(s:_FILE_SHORTCUTS)
-            let classpath_command = substitute(classpath_command, '\V' . key, syntastic#util#shexpand(val), 'g')
-        endfor
-        let lines = syntastic#util#system(classpath_command)
-        if syntastic#util#isRunningWindows() || has('win32unix')
-            let lines = substitute(lines, "\r\n", "\n", 'g')
-        endif
-        for l in split(lines, "\n")
-            let javac_classpath = s:AddToClasspath(javac_classpath, l)
-        endfor
-    endif
-
-    if javac_classpath !=# ''
-        let javac_opts .= ' -cp ' . syntastic#util#shexpand(javac_classpath)
-    endif
-    " }}}2
-
-    let fname = expand('%:p:h', 1) . syntastic#util#Slash() . expand ('%:t', 1)
-
-    if has('win32unix')
-        let fname = syntastic#util#CygwinPath(fname)
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args': javac_opts,
-        \ 'fname': syntastic#util#shescape(fname) })
-
-    " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
-    let errorformat =
-        \ '%E%f:%l: error: %m,'.
-        \ '%W%f:%l: warning: %m,'.
-        \ '%E%f:%l: %m,'.
-        \ '%Z%p^,'.
-        \ '%-G%.%#'
-
-    if output_dir !=# ''
-        silent! call mkdir(output_dir, 'p')
-    endif
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['cygwinRemoveCR'] })
-
-    if output_dir !=# ''
-        call syntastic#util#rmrf(output_dir)
-    endif
-    return errors
-
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:RemoveCarriageReturn(line) " {{{2
-    return substitute(a:line, "\r", '', 'g')
-endfunction " }}}2
-
-function! s:ClassSep() " {{{2
-    return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
-endfunction " }}}2
-
-function! s:AddToClasspath(classpath, path) " {{{2
-    if a:path ==# ''
-        return a:classpath
-    endif
-    return (a:classpath !=# '') ? a:classpath . s:ClassSep() . a:path : a:path
-endfunction " }}}2
-
-function! s:SplitClasspath(classpath) " {{{2
-    return split(a:classpath, s:ClassSep())
-endfunction " }}}2
-
-function! s:LoadConfigFile() " {{{2
-    if filereadable(expand(g:syntastic_java_javac_config_file, 1))
-        execute 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
-    endif
-endfunction " }}}2
-
-function! s:SaveClasspath() " {{{2
-    " build classpath from lines
-    let path = ''
-    let lines = getline(1, line('$'))
-    for l in lines
-        let path = s:AddToClasspath(path, l)
-    endfor
-    " save classpath to config file
-    if g:syntastic_java_javac_config_file_enabled
-        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
-            " load lines from config file
-            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
-            " strip g:syntastic_java_javac_classpath options from config file lines
-            let i = 0
-            while i < len(lines)
-                if match(lines[i], 'g:syntastic_java_javac_classpath') != -1
-                    call remove(lines, i)
-                else
-                    let i += 1
-                endif
-            endwhile
-        else
-            let lines = []
-        endif
-        " add new g:syntastic_java_javac_classpath option to config
-        call add(lines, 'let g:syntastic_java_javac_classpath = ' . string(path))
-        " save config file lines
-        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
-    endif
-    " set new classpath
-    let g:syntastic_java_javac_classpath = path
-    let &modified = 0
-endfunction " }}}2
-
-function! s:EditClasspath() " {{{2
-    let command = 'syntastic javac classpath'
-    let winnr = bufwinnr('^' . command . '$')
-    if winnr < 0
-        let path = []
-        let pathlines = split(g:syntastic_java_javac_classpath, "\n")
-        for p in pathlines
-            call extend(path, s:SplitClasspath(p))
-        endfor
-        execute (len(path) + 5) . 'sp ' . fnameescape(command)
-
-        augroup syntastic
-            autocmd BufWriteCmd <buffer> call s:SaveClasspath() | bwipeout
-        augroup END
-
-        setlocal buftype=acwrite bufhidden=wipe nobuflisted noswapfile nowrap number
-        for p in path
-            call append(line('$') - 1, p)
-        endfor
-        let &modified = 0
-    else
-        execute winnr . 'wincmd w'
-    endif
-endfunction " }}}2
-
-function! s:SaveConfig() " {{{2
-    " get lines
-    let lines = getline(1, line('$'))
-    if g:syntastic_java_javac_config_file_enabled
-        " save config file lines
-        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
-    endif
-    let &modified = 0
-endfunction " }}}2
-
-function! s:EditConfig() " {{{2
-    if !g:syntastic_java_javac_config_file_enabled
-        return
-    endif
-
-    let command = 'syntastic javac config'
-    let winnr = bufwinnr('^' . command . '$')
-    if winnr < 0
-        let lines = []
-        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
-            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
-        endif
-        execute (len(lines) + 5) . 'sp ' . fnameescape(command)
-
-        augroup syntastic
-            autocmd BufWriteCmd <buffer> call s:SaveConfig() | bwipeout
-        augroup END
-
-        setlocal ft=vim buftype=acwrite bufhidden=wipe nobuflisted noswapfile nowrap number
-        for l in lines
-            call append(line('$') - 1, l)
-        endfor
-        let &modified = 0
-    else
-        execute winnr . 'wincmd w'
-    endif
-endfunction " }}}2
-
-function! s:GetMavenProperties() " {{{2
-    let mvn_properties = {}
-    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
-    if s:has_maven && filereadable(pom)
-        if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
-            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
-                \ ' -f ' . syntastic#util#shescape(pom) .
-                \ ' ' . g:syntastic_java_maven_options
-            let mvn_is_managed_tag = 1
-            let mvn_settings_output = split(syntastic#util#system(mvn_cmd . ' help:effective-pom'), "\n")
-            let current_path = 'project'
-            for line in mvn_settings_output
-                let matches = matchlist(line, '\m^\s*<\([a-zA-Z0-9\-\.]\+\)>\s*$')
-                if mvn_is_managed_tag && !empty(matches)
-                    let mvn_is_managed_tag = index(g:syntastic_java_javac_maven_pom_tags, matches[1]) >= 0
-                    let current_path .= '.' . matches[1]
-                else
-                    let matches = matchlist(line, '\m^\s*</\([a-zA-Z0-9\-\.]\+\)>\s*$')
-                    if !empty(matches)
-                        let mvn_is_managed_tag = index(g:syntastic_java_javac_maven_pom_tags, matches[1]) < 0
-                        let current_path  = substitute(current_path, '\m\.' . matches[1] . '$', '', '')
-                    else
-                        let matches = matchlist(line, '\m^\s*<\([a-zA-Z0-9\-\.]\+\)>\(.\+\)</[a-zA-Z0-9\-\.]\+>\s*$')
-                        if mvn_is_managed_tag && !empty(matches)
-                            let mvn_properties[current_path . '.' . matches[1]] = matches[2]
-                        endif
-                    endif
-                endif
-            endfor
-            let g:syntastic_java_javac_maven_pom_properties[pom] = mvn_properties
-        endif
-        return g:syntastic_java_javac_maven_pom_properties[pom]
-    endif
-    return mvn_properties
-endfunction " }}}2
-
-function! s:GetMavenClasspath() " {{{2
-    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
-    if s:has_maven && filereadable(pom)
-        if !has_key(g:syntastic_java_javac_maven_pom_ftime, pom) || g:syntastic_java_javac_maven_pom_ftime[pom] != getftime(pom)
-            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
-                \ ' -f ' . syntastic#util#shescape(pom) .
-                \ ' ' . g:syntastic_java_maven_options
-            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath'), "\n")
-            let mvn_classpath = ''
-            let class_path_next = 0
-
-            for line in mvn_classpath_output
-                if class_path_next == 1
-                    let mvn_classpath = s:RemoveCarriageReturn(line)
-                    break
-                endif
-                if stridx(line, 'Dependencies classpath:') >= 0
-                    let class_path_next = 1
-                endif
-            endfor
-
-            let mvn_properties = s:GetMavenProperties()
-
-            let sep = syntastic#util#Slash()
-            let output_dir = join(['target', 'classes'], sep)
-            if has_key(mvn_properties, 'project.build.outputDirectory')
-                let output_dir = mvn_properties['project.build.outputDirectory']
-            endif
-            let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
-
-            let test_output_dir = join(['target', 'test-classes'], sep)
-            if has_key(mvn_properties, 'project.build.testOutputDirectory')
-                let test_output_dir = mvn_properties['project.build.testOutputDirectory']
-            endif
-            let mvn_classpath = s:AddToClasspath(mvn_classpath, test_output_dir)
-
-            let g:syntastic_java_javac_maven_pom_ftime[pom] = getftime(pom)
-            let g:syntastic_java_javac_maven_pom_classpath[pom] = mvn_classpath
-        endif
-        return g:syntastic_java_javac_maven_pom_classpath[pom]
-    endif
-    return ''
-endfunction " }}}2
-
-function! s:MavenOutputDirectory() " {{{2
-    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
-    if s:has_maven && filereadable(pom)
-        let mvn_properties = s:GetMavenProperties()
-        let output_dir = getcwd()
-        if has_key(mvn_properties, 'project.properties.build.dir')
-            let output_dir = mvn_properties['project.properties.build.dir']
-        endif
-
-        let sep = syntastic#util#Slash()
-        if stridx(expand('%:p:h', 1), join(['src', 'main', 'java'], sep)) >= 0
-            let output_dir = join ([output_dir, 'target', 'classes'], sep)
-            if has_key(mvn_properties, 'project.build.outputDirectory')
-                let output_dir = mvn_properties['project.build.outputDirectory']
-            endif
-        endif
-        if stridx(expand('%:p:h', 1), join(['src', 'test', 'java'], sep)) >= 0
-            let output_dir = join([output_dir, 'target', 'test-classes'], sep)
-            if has_key(mvn_properties, 'project.build.testOutputDirectory')
-                let output_dir = mvn_properties['project.build.testOutputDirectory']
-            endif
-        endif
-
-        if has('win32unix')
-            let output_dir = syntastic#util#CygwinPath(output_dir)
-        endif
-        return output_dir
-    endif
-    return '.'
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'java',
-    \ 'name': 'javac'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim b/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim
deleted file mode 100644
index 8c4190a..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-"============================================================================
-"File:        closurecompiler.vim
-"Description: Javascript syntax checker - using Google Closure Compiler
-"Maintainer:  Motohiro Takayama <mootoh at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_closurecompiler_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_closurecompiler_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
-    call syntastic#log#deprecationWarn('javascript_closure_compiler_path', 'javascript_closurecompiler_path')
-
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let s:has_script = exists('g:syntastic_javascript_closurecompiler_script')
-    if s:has_script
-        return 1
-    endif
-
-    let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
-    call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
-
-    let jar = expand(cp, 1)
-    call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar))
-
-    return filereadable(jar)
-endfunction
-
-function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
-    call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
-    call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
-
-    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''), 1)
-    if filereadable(flist)
-        let file_list = map( readfile(flist), 'expand(v:var, 1)' )
-    else
-        let file_list = [expand('%', 1)]
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path, 1)]),
-        \ 'args_after': '--js',
-        \ 'fname': file_list })
-
-    let errorformat =
-        \ '%-GOK,'.
-        \ '%E%f:%l: ERROR - %m,'.
-        \ '%W%f:%l: WARNING - %m,'.
-        \ '%Z%p^'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'closurecompiler',
-    \ 'exec': get(g:, 'syntastic_javascript_closurecompiler_script', 'java')})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/eslint.vim b/bundle/syntastic/syntax_checkers/javascript/eslint.vim
deleted file mode 100644
index 437bc55..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/eslint.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-"============================================================================
-"File:        eslint.vim
-"Description: Javascript syntax checker - using eslint
-"Maintainer:  Maksim Ryzhikov <rv.maksim at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_eslint_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_eslint_checker = 1
-
-if !exists('g:syntastic_javascript_eslint_sort')
-    let g:syntastic_javascript_eslint_sort = 1
-endif
-
-if !exists('g:syntastic_javascript_eslint_generic')
-    let g:syntastic_javascript_eslint_generic = 0
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
-    if g:syntastic_javascript_eslint_generic
-        call self.log('generic eslint, exec =', self.getExec())
-    endif
-
-    if !executable(self.getExec())
-        return 0
-    endif
-    return g:syntastic_javascript_eslint_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
-endfunction
-
-function! SyntaxCheckers_javascript_eslint_GetLocList() dict
-    if !g:syntastic_javascript_eslint_generic
-        call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
-            \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_before': (g:syntastic_javascript_eslint_generic ? '' : '-f compact') })
-
-    let errorformat =
-        \ '%E%f: line %l\, col %c\, Error - %m,' .
-        \ '%W%f: line %l\, col %c\, Warning - %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['guards'] })
-
-    if !g:syntastic_javascript_eslint_generic
-        if !exists('s:eslint_new')
-            let s:eslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
-        endif
-
-        if !s:eslint_new
-            for e in loclist
-                let e['col'] += 1
-            endfor
-        endif
-    endif
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'eslint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/flow.vim b/bundle/syntastic/syntax_checkers/javascript/flow.vim
deleted file mode 100644
index 6ef3979..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/flow.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"============================================================================
-"File:        flow.vim
-"Description: Javascript syntax checker - using flow
-"Maintainer:  Michael Robinson <mike@pagesofinterest.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_flow_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_flow_checker = 1
-
-if !exists('g:syntastic_javascript_flow_sort')
-    let g:syntastic_javascript_flow_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_flow_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 6])
-endfunction
-
-function! SyntaxCheckers_javascript_flow_GetLocList() dict
-    if syntastic#util#findFileInParent('.flowconfig', expand('%:p:h', 1)) ==# ''
-        return []
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe': self.getExecEscaped() . ' status',
-        \ 'args_after': '--show-all-errors --json' })
-
-    let errorformat =
-        \ '%f:%l:%c:%n: %m,' .
-        \ '%f:%l:%c: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'flow',
-        \ 'defaults': {'type': 'E'} })
-
-    for e in loclist
-        if get(e, 'col', 0) && get(e, 'nr', 0)
-            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
-            let e['nr'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'flow'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/gjslint.vim b/bundle/syntastic/syntax_checkers/javascript/gjslint.vim
deleted file mode 100644
index ec2a2ea..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/gjslint.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-"============================================================================
-"File:        gjslint.vim
-"Description: Javascript syntax checker - using gjslint
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_gjslint_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_gjslint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_gjslint_GetLocList() dict
-    call syntastic#log#deprecationWarn('javascript_gjslint_conf', 'javascript_gjslint_args')
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--nosummary --unix_mode --nodebug_indentation --nobeep' })
-
-    let errorformat =
-        \ "%f:%l:(New Error -%\\?\%n) %m," .
-        \ "%f:%l:(-%\\?%n) %m," .
-        \ "%-G1 files checked," .
-        \ " no errors found.," .
-        \ "%-G%.%#"
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'gjslint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/jscs.vim b/bundle/syntastic/syntax_checkers/javascript/jscs.vim
deleted file mode 100644
index bc1f564..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/jscs.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-"============================================================================
-"File:        jscs.vim
-"Description: Javascript syntax checker - using jscs
-"Maintainer:  LCD 47 <lcd047@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_jscs_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_jscs_checker = 1
-
-if !exists('g:syntastic_javascript_jscs_sort')
-    let g:syntastic_javascript_jscs_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_jscs_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--no-colors --reporter checkstyle' })
-
-    let errorformat = '%f:%t:%l:%c:%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'preprocess': 'checkstyle',
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'jscs'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/jshint.vim b/bundle/syntastic/syntax_checkers/javascript/jshint.vim
deleted file mode 100644
index 492aa69..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/jshint.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-"============================================================================
-"File:        jshint.vim
-"Description: Javascript syntax checker - using jshint
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_jshint_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_jshint_checker = 1
-
-if !exists('g:syntastic_javascript_jshint_sort')
-    let g:syntastic_javascript_jshint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
-    call syntastic#log#deprecationWarn('jshint_exec', 'javascript_jshint_exec')
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let ver = self.getVersion()
-    let s:jshint_new = syntastic#util#versionIsAtLeast(ver, [1, 1])
-
-    return syntastic#util#versionIsAtLeast(ver, [1])
-endfunction
-
-function! SyntaxCheckers_javascript_jshint_GetLocList() dict
-    call syntastic#log#deprecationWarn('javascript_jshint_conf', 'javascript_jshint_args',
-        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
-
-    let makeprg = self.makeprgBuild({ 'args_after': (s:jshint_new ? '--verbose ' : '') })
-
-    let errorformat = s:jshint_new ?
-        \ '%A%f: line %l\, col %v\, %m \(%t%*\d\)' :
-        \ '%E%f: line %l\, col %v\, %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'jshint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/jsl.vim b/bundle/syntastic/syntax_checkers/javascript/jsl.vim
deleted file mode 100644
index aa9862b..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/jsl.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        jsl.vim
-"Description: Javascript syntax checker - using jsl
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_jsl_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_jsl_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_jsl_GetLocList() dict
-    call syntastic#log#deprecationWarn('javascript_jsl_conf', 'javascript_jsl_args',
-        \ "'-conf ' . syntastic#util#shexpand(OLD_VAR)")
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-nologo -nofilelisting -nosummary -nocontext -process' })
-
-    let errorformat =
-        \ '%W%f(%l): lint warning: %m,'.
-        \ '%-Z%p^,'.
-        \ '%W%f(%l): warning: %m,'.
-        \ '%-Z%p^,'.
-        \ '%E%f(%l): SyntaxError: %m,'.
-        \ '%-Z%p^,'.
-        \ '%-G'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'jsl'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/jslint.vim b/bundle/syntastic/syntax_checkers/javascript/jslint.vim
deleted file mode 100644
index e2ce76c..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/jslint.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-"============================================================================
-"File:        jslint.vim
-"Description: Javascript syntax checker - using jslint
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_jslint_checker')
-    finish
-endif
-
-let g:loaded_syntastic_javascript_jslint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_jslint_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\mExpected .* and instead saw ''\zs.*\ze''')
-    if term !=# ''
-        let term = '\V\<' . escape(term, '\') . '\>'
-    endif
-    return term
-endfunction
-
-function! SyntaxCheckers_javascript_jslint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '--white --nomen --regexp --plusplus --bitwise --newcap --sloppy --vars' })
-
-    let errorformat =
-        \ '%E %##%\d%\+ %m,'.
-        \ '%-Z%.%#Line %l\, Pos %c,'.
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'jslint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim b/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim
deleted file mode 100644
index 608fa6e..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"============================================================================
-"File:        jsxhint.vim
-"Description: Javascript syntax checker - using jsxhint
-"Maintainer:  Thomas Boyt <me@thomasboyt.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_jsxhint_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_jsxhint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
-    let parsed_ver = !v:shell_error && (version_output =~# '\m^JSXHint\>') ? syntastic#util#parseVersion(version_output) : []
-    if len(parsed_ver)
-        call self.setVersion(parsed_ver)
-    else
-        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
-        call syntastic#log#error("checker javascript/jsxhint: can't parse version string (abnormal termination?)")
-    endif
-
-    return syntastic#util#versionIsAtLeast(parsed_ver, [0, 4, 1])
-endfunction
-
-function! SyntaxCheckers_javascript_jsxhint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--verbose' })
-
-    let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'jsxhint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/javascript/standard.vim b/bundle/syntastic/syntax_checkers/javascript/standard.vim
deleted file mode 100644
index 0469f65..0000000
--- a/bundle/syntastic/syntax_checkers/javascript/standard.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        standard.vim
-"Description: JavaScript syntax checker - using standard
-"Maintainer:  LCD 47 <lcd047@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_javascript_standard_checker')
-    finish
-endif
-let g:loaded_syntastic_javascript_standard_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_javascript_standard_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
-endfunction
-
-function! SyntaxCheckers_javascript_standard_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '-v' })
-
-    let errorformat = '  %f:%l:%c: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'defaults': {'type': 'W'},
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'javascript',
-    \ 'name': 'standard'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/json/jsonlint.vim b/bundle/syntastic/syntax_checkers/json/jsonlint.vim
deleted file mode 100644
index 9a89c78..0000000
--- a/bundle/syntastic/syntax_checkers/json/jsonlint.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        jsonlint.vim
-"Description: JSON syntax checker - using jsonlint
-"Maintainer:  Miller Medeiros <contact at millermedeiros dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_json_jsonlint_checker')
-    finish
-endif
-let g:loaded_syntastic_json_jsonlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_json_jsonlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'post_args_after': '--compact' })
-
-    let errorformat =
-        \ '%ELine %l:%c,'.
-        \ '%Z\\s%#Reason: %m,'.
-        \ '%C%.%#,'.
-        \ '%f: line %l\, col %c\, %m,'.
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'json',
-    \ 'name': 'jsonlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/json/jsonval.vim b/bundle/syntastic/syntax_checkers/json/jsonval.vim
deleted file mode 100644
index 2a756b6..0000000
--- a/bundle/syntastic/syntax_checkers/json/jsonval.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        jsonval.vim
-"Description: JSON syntax checker - using jsonval
-"Maintainer:  Miller Medeiros <contact at millermedeiros dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_json_jsonval_checker')
-    finish
-endif
-let g:loaded_syntastic_json_jsonval_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_json_jsonval_GetLocList() dict
-    " based on https://gist.github.com/1196345
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f: %m at line %l,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'json',
-    \ 'name': 'jsonval'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/less/less-lint.coffee b/bundle/syntastic/syntax_checkers/less/less-lint.coffee
deleted file mode 100644
index 0b05e4a..0000000
--- a/bundle/syntastic/syntax_checkers/less/less-lint.coffee
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env node
-
-fs = require 'fs'
-less = require 'less'
-args = process.argv.slice(1)
-options = {}
-
-args = args.filter (arg) ->
-    match = arg.match(/^-I(.+)$/)
-    if match
-        options.paths.push(match[1]);
-        return false
-
-    match = arg.match(/^--?([a-z][\-0-9a-z]*)(?:=([^\s]+))?$/i)
-    if match
-        arg = match[1]
-    else
-        return arg
-
-    switch arg
-        when 'strict-imports' then options.strictImports = true
-        when 'include-path'
-            options.paths = match[2].split(if os.type().match(/Windows/) then ';' else ':')
-                .map (p) ->
-                    if p
-                        return path.resolve(process.cwd(), p)
-        when 'O0' then options.optimization = 0
-        when 'O1' then options.optimization = 1
-        when 'O2' then options.optimization = 2
-
-options.filename = args[1]
-
-parser = new(less.Parser) options
-
-fs.readFile(options.filename, 'utf-8', (err,data) ->
-    parser.parse(data, (err, tree) ->
-        if err
-            less.writeError err
-            process.exit(1)
-    )
-)
diff --git a/bundle/syntastic/syntax_checkers/less/less-lint.js b/bundle/syntastic/syntax_checkers/less/less-lint.js
deleted file mode 100644
index 5abc653..0000000
--- a/bundle/syntastic/syntax_checkers/less/less-lint.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by CoffeeScript 1.3.3
-(function() {
-  var args, fs, less, options, parser;
-
-  fs = require('fs');
-
-  less = require('less');
-
-  args = process.argv.slice(1);
-
-  options = {};
-
-  args = args.filter(function(arg) {
-    var match;
-    match = arg.match(/^-I(.+)$/);
-    if (match) {
-      options.paths.push(match[1]);
-      return false;
-    }
-    match = arg.match(/^--?([a-z][\-0-9a-z]*)(?:=([^\s]+))?$/i);
-    if (match) {
-      arg = match[1];
-    } else {
-      return arg;
-    }
-    switch (arg) {
-      case 'strict-imports':
-        return options.strictImports = true;
-      case 'include-path':
-        return options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':').map(function(p) {
-          if (p) {
-            return path.resolve(process.cwd(), p);
-          }
-        });
-      case 'O0':
-        return options.optimization = 0;
-      case 'O1':
-        return options.optimization = 1;
-      case 'O2':
-        return options.optimization = 2;
-    }
-  });
-
-  options.filename = args[1];
-
-  parser = new less.Parser(options);
-
-  fs.readFile(options.filename, 'utf-8', function(err, data) {
-    return parser.parse(data, function(err, tree) {
-      if (err) {
-        less.writeError(err);
-        return process.exit(1);
-      }
-    });
-  });
-
-}).call(this);
diff --git a/bundle/syntastic/syntax_checkers/less/lessc.vim b/bundle/syntastic/syntax_checkers/less/lessc.vim
deleted file mode 100644
index 0328770..0000000
--- a/bundle/syntastic/syntax_checkers/less/lessc.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-"============================================================================
-"File:        less.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Julien Blanchard <julien at sideburns dot eu>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_less_lessc_checker')
-    finish
-endif
-let g:loaded_syntastic_less_lessc_checker = 1
-
-if !exists('g:syntastic_less_options')
-    let g:syntastic_less_options = ''
-endif
-
-if !exists('g:syntastic_less_use_less_lint')
-    let g:syntastic_less_use_less_lint = 0
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'less-lint.js')
-
-function! SyntaxCheckers_less_lessc_IsAvailable() dict
-    call self.log('g:syntastic_less_use_less_lint =', g:syntastic_less_use_less_lint)
-    return g:syntastic_less_use_less_lint ? executable('node') : executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_less_lessc_GetLocList() dict
-    if !exists('s:check_file')
-        let s:check_file = g:syntastic_less_use_less_lint ? s:node_file : self.getExecEscaped()
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe': s:check_file,
-        \ 'args': g:syntastic_less_options,
-        \ 'args_after': '--no-color',
-        \ 'tail': '> ' . syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%m in %f on line %l\, column %c:,' .
-        \ '%m in %f:%l:%c,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['guards'],
-        \ 'defaults': {'bufnr': bufnr(''), 'text': 'Syntax error'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'less',
-    \ 'name': 'lessc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/less/recess.vim b/bundle/syntastic/syntax_checkers/less/recess.vim
deleted file mode 100644
index 1a8d876..0000000
--- a/bundle/syntastic/syntax_checkers/less/recess.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-"============================================================================
-"File:        recess.vim
-"Description: Syntax checking plugin for syntastic.vim using `recess`
-"             (http://twitter.github.io/recess/).
-"Maintainer:  Tim Carry <tim at pixelastic dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_less_recess_checker')
-    finish
-endif
-let g:loaded_syntastic_less_recess_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_less_recess_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'post_args_after': '--format=compact --stripColors' })
-
-    let errorformat =
-        \ '%E%m in %f,' .
-        \ '%Z %#%l.%.%#,' .
-        \ '%f:%l:%m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'less',
-    \ 'name': 'recess'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/lex/flex.vim b/bundle/syntastic/syntax_checkers/lex/flex.vim
deleted file mode 100644
index 82cbf10..0000000
--- a/bundle/syntastic/syntax_checkers/lex/flex.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        lex.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_lex_flex_checker')
-    finish
-endif
-let g:loaded_syntastic_lex_flex_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_lex_flex_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'],
-        \ '\m^\(unrecognized %option\|bad <start condition>\|bad character\( class expression\)\=\): \zs.*')
-    if term ==# ''
-        let term = matchstr(a:item['text'],
-            \ '\m^\(Definition value for\|undefined definition\) \zs{[^}]\+}\ze')
-    endif
-
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_lex_flex_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': syntastic#c#NullOutput() })
-
-    let errorformat = '%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'lex',
-    \ 'name': 'flex'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/limbo/limbo.vim b/bundle/syntastic/syntax_checkers/limbo/limbo.vim
deleted file mode 100644
index 0dfe03c..0000000
--- a/bundle/syntastic/syntax_checkers/limbo/limbo.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-"============================================================================
-"File:        limbo.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Alex Efros <powerman-asdf@ya.ru>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_limbo_limbo_checker')
-    finish
-endif
-let g:loaded_syntastic_limbo_limbo_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_limbo_limbo_GetLocList() dict
-    let include = $INFERNO_HOME !=# '' ? '-I$INFERNO_HOME ' : ''
-    " don't generate .dis in current dir while checking syntax,
-    " .dis should be generated by `mk`
-    let output = filereadable('mkfile') ? (' ' . syntastic#c#NullOutput()) : ''
-
-    let makeprg = self.makeprgBuild({ 'args_before': include . '-w' . output })
-
-    let errorformat = '%E%f:%l:%m'
-    if expand('%', 1) =~# '\m\.m$'
-        let errorformat = '%-G%f:%l: near ` EOF ` : no implementation module,' . errorformat
-    endif
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'limbo',
-    \ 'name': 'limbo' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/lisp/clisp.vim b/bundle/syntastic/syntax_checkers/lisp/clisp.vim
deleted file mode 100644
index 26de435..0000000
--- a/bundle/syntastic/syntax_checkers/lisp/clisp.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-"============================================================================
-"File:        lisp.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_lisp_clisp_checker')
-    finish
-endif
-let g:loaded_syntastic_lisp_clisp_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_lisp_clisp_GetLocList() dict
-    let tmpdir = syntastic#util#tmpdir()
-    let out = tmpdir !=# '.' ? ('-o ' . syntastic#util#shescape(tmpdir . syntastic#util#Slash() . 'syntastic_' . getpid())) : ''
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-q',
-        \ 'fname_before': '-c',
-        \ 'post_args_after': out })
-
-    let errorformat  =
-        \ '%-G;%.%#,' .
-        \ '%W%>WARNING:%.%# line %l : %m,' .
-        \ '%Z  %#%m,' .
-        \ '%W%>WARNING:%.%# lines %l%\%.%\%.%\d%\+ : %m,' .
-        \ '%Z  %#%m,' .
-        \ '%E%>The following functions were %m,' .
-        \ '%Z %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-
-    call syntastic#util#rmrf(tmpdir)
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'lisp',
-    \ 'name': 'clisp'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/llvm/llvm.vim b/bundle/syntastic/syntax_checkers/llvm/llvm.vim
deleted file mode 100644
index 7e90314..0000000
--- a/bundle/syntastic/syntax_checkers/llvm/llvm.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"============================================================================
-"File:        llvm.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Andrew Kelley <superjoe30@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_llvm_llvm_checker')
-    finish
-endif
-let g:loaded_syntastic_llvm_llvm_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_llvm_llvm_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
-
-    let errorformat = 'llc: %f:%l:%c: %trror: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'llvm',
-    \ 'name': 'llvm',
-    \ 'exec': 'llc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/lua/luac.vim b/bundle/syntastic/syntax_checkers/lua/luac.vim
deleted file mode 100644
index 178f76a..0000000
--- a/bundle/syntastic/syntax_checkers/lua/luac.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-"============================================================================
-"File:        lua.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_lua_luac_checker')
-    finish
-endif
-let g:loaded_syntastic_lua_luac_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_lua_luac_GetHighlightRegex(pos)
-    let result = ''
-    let near = matchstr(a:pos['text'], '\mnear ''\zs[^'']\+\ze''')
-    if near !=# ''
-        if near ==# '<eof>'
-            let p = getpos('$')
-            let a:pos['lnum'] = p[1]
-            let a:pos['col'] = p[2]
-            let result = '\%' . p[2] . 'c'
-        else
-            let result = '\V' . escape(near, '\')
-        endif
-
-        " XXX the following piece of code is evil, and is likely to break
-        " in future versions of syntastic; enable it at your own risk :)
-
-        "let open = matchstr(a:pos['text'], '\m(to close ''\zs[^'']\+\ze'' at line [0-9]\+)')
-        "if open != ''
-        "    let line = str2nr(matchstr(a:pos['text'], '\m(to close ''[^'']\+'' at line \zs[0-9]\+\ze)'))
-        "    let group = a:pos['type'] ==? 'E' ? 'SyntasticError' : 'SyntasticWarning'
-        "    call matchadd(group, '\%' . line . 'l\V' . escape(open, '\'))
-        "endif
-    endif
-    return result
-endfunction
-
-function! SyntaxCheckers_lua_luac_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
-
-    let errorformat = 'luac: %#%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': { 'bufnr': bufnr(''), 'type': 'E' } })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'lua',
-    \ 'name': 'luac'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/lua/luacheck.vim b/bundle/syntastic/syntax_checkers/lua/luacheck.vim
deleted file mode 100644
index 5c8521d..0000000
--- a/bundle/syntastic/syntax_checkers/lua/luacheck.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"============================================================================
-"File:        luacheck.vim
-"Description: Lua static analysis using luacheck
-"Maintainer:  Thiago Bastos <tbastos@tbastos.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_lua_luacheck_checker')
-    finish
-endif
-let g:loaded_syntastic_lua_luacheck_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_lua_luacheck_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m''\zs\S\+\ze''')
-    if term !=# ''
-        return '\V\<' . escape(term, '\') . '\>'
-    endif
-
-    let term = matchstr(a:item['text'], '\m\(accessing undefined\|setting non-standard global\|' .
-                \ 'setting non-module global\|unused global\) variable \zs\S\+')
-    if term ==# ''
-        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze was previously defined')
-    endif
-    if term ==# ''
-        let term = matchstr(a:item['text'], '\munused \(variable\|argument\|loop variable\) \zs\S\+')
-    endif
-    if term ==# ''
-        let term = matchstr(a:item['text'], '\m\(value assigned to variable\|value of argument\|' .
-                \ 'value of loop variable\) \zs\S\+')
-    endif
-    if term ==# ''
-        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze is never set')
-    endif
-
-    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
-endfunction
-
-function! SyntaxCheckers_lua_luacheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--no-color' })
-
-    let errorformat =
-        \ '%f:%l:%c: %m,'.
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'defaults': { 'type': 'W' },
-        \ 'returns': [0, 1, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'lua',
-    \ 'name': 'luacheck' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/markdown/mdl.vim b/bundle/syntastic/syntax_checkers/markdown/mdl.vim
deleted file mode 100644
index 3b40a74..0000000
--- a/bundle/syntastic/syntax_checkers/markdown/mdl.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-"============================================================================
-"File:        mdl.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Charles Beynon <etothepiipower at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_markdown_mdl_checker')
-    finish
-endif
-let g:loaded_syntastic_markdown_mdl_checker = 1
-
-if !exists('g:syntastic_markdown_mdl_sort')
-    let g:syntastic_markdown_mdl_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_markdown_mdl_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '--warnings' })
-
-    let errorformat =
-        \ '%E%f:%l: %m,'.
-        \ '%W%f: Kramdown Warning: %m found on line %l'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'markdown',
-    \ 'name': 'mdl'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/matlab/mlint.vim b/bundle/syntastic/syntax_checkers/matlab/mlint.vim
deleted file mode 100644
index 6e0b8d1..0000000
--- a/bundle/syntastic/syntax_checkers/matlab/mlint.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        matlab.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Jason Graham <jason at the-graham dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_matlab_mlint_checker')
-    finish
-endif
-let g:loaded_syntastic_matlab_mlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_matlab_mlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-id $*' })
-
-    let errorformat =
-        \ 'L %l (C %c): %*[a-zA-Z0-9]: %m,'.
-        \ 'L %l (C %c-%*[0-9]): %*[a-zA-Z0-9]: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'matlab',
-    \ 'name': 'mlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/mercury/mmc.vim b/bundle/syntastic/syntax_checkers/mercury/mmc.vim
deleted file mode 100644
index 75ee654..0000000
--- a/bundle/syntastic/syntax_checkers/mercury/mmc.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-"============================================================================
-"File:        mercury.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Joshua Rahm (joshuarahm@gmail.com)
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_mercury_mmc_checker')
-    finish
-endif
-let g:loaded_syntastic_mercury_mmc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_mercury_mmc_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_before': '-e' })
-
-    let errorformat =
-        \ '%C%f:%l:  %m,' .
-        \ '%E%f:%l: %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    for e in loclist
-        if stridx(e['text'], ' warning:') >= 0
-            let e['type'] = 'W'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'mercury',
-    \ 'name': 'mmc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/nasm/nasm.vim b/bundle/syntastic/syntax_checkers/nasm/nasm.vim
deleted file mode 100644
index e309c1f..0000000
--- a/bundle/syntastic/syntax_checkers/nasm/nasm.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        nasm.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Håvard Pettersson <haavard.pettersson at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_nasm_nasm_checker')
-    finish
-endif
-let g:loaded_syntastic_nasm_nasm_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_nasm_nasm_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-X gnu -f elf' .
-        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . syntastic#util#Slash()) .
-        \       ' ' . syntastic#c#NullOutput() })
-
-    let errorformat = '%f:%l: %t%*[^:]: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'nasm',
-    \ 'name': 'nasm'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/nix/nix.vim b/bundle/syntastic/syntax_checkers/nix/nix.vim
deleted file mode 100644
index 5b8fd21..0000000
--- a/bundle/syntastic/syntax_checkers/nix/nix.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-"============================================================================
-"File:        nix.vim
-"Description: Check nix syntax using 'nix-instantiate --eval-only'
-"Maintainer:  Tim Cuthbertson <tim@gfxmonk.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-"
-if exists('g:loaded_syntastic_nix_nix_checker')
-    finish
-endif
-let g:loaded_syntastic_nix_nix_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_nix_nix_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--parse-only' })
-
-    let errorformat =
-        \ '%m\, at %f:%l:%c,' .
-        \ '%m at %f\, line %l:,' .
-        \ 'error: %m\, in %f'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'type': 'e'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'nix',
-    \ 'name': 'nix',
-    \ 'exec': 'nix-instantiate' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/nroff/igor.vim b/bundle/syntastic/syntax_checkers/nroff/igor.vim
deleted file mode 100644
index f19cf69..0000000
--- a/bundle/syntastic/syntax_checkers/nroff/igor.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        igor.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_nroff_igor_checker')
-    finish
-endif
-let g:loaded_syntastic_nroff_igor_checker = 1
-
-runtime! syntax_checkers/docbk/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'nroff',
-    \ 'name': 'igor',
-    \ 'redirect': 'docbk/igor'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/nroff/mandoc.vim b/bundle/syntastic/syntax_checkers/nroff/mandoc.vim
deleted file mode 100644
index 8efc4ce..0000000
--- a/bundle/syntastic/syntax_checkers/nroff/mandoc.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        mandoc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_nroff_mandoc_checker')
-    finish
-endif
-let g:loaded_syntastic_nroff_mandoc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_nroff_mandoc_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-Tlint' })
-
-    let errorformat =
-        \ '%E%f:%l:%c: %tRROR: %m,' .
-        \ '%W%f:%l:%c: %tARNING: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 2, 3, 4] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'nroff',
-    \ 'name': 'mandoc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/objc/gcc.vim b/bundle/syntastic/syntax_checkers/objc/gcc.vim
deleted file mode 100644
index 73da7f8..0000000
--- a/bundle/syntastic/syntax_checkers/objc/gcc.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-"============================================================================
-"File:        objc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_objc_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_objc_gcc_checker = 1
-
-if !exists('g:syntastic_objc_compiler_options')
-    let g:syntastic_objc_compiler_options = '-std=gnu99'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_objc_gcc_IsAvailable() dict
-    if !exists('g:syntastic_objc_compiler')
-        let g:syntastic_objc_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
-    endif
-    call self.log('g:syntastic_objc_compiler =', g:syntastic_objc_compiler)
-    return executable(expand(g:syntastic_objc_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_objc_gcc_GetLocList() dict
-    return syntastic#c#GetLocList('objc', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
-        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
-        \     '%-GIn file included%.%#,'.
-        \     '%-G %#from %f:%l\,,' .
-        \     '%f:%l:%c: %trror: %m,' .
-        \     '%f:%l:%c: %tarning: %m,' .
-        \     '%f:%l:%c: %m,' .
-        \     '%f:%l: %trror: %m,' .
-        \     '%f:%l: %tarning: %m,' .
-        \     '%f:%l: %m',
-        \ 'main_flags': '-x objective-c -fsyntax-only',
-        \ 'header_flags': '-x objective-c-header -lobjc',
-        \ 'header_names': '\m\.h$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'objc',
-    \ 'name': 'gcc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/objc/oclint.vim b/bundle/syntastic/syntax_checkers/objc/oclint.vim
deleted file mode 100644
index 7adf5b8..0000000
--- a/bundle/syntastic/syntax_checkers/objc/oclint.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"============================================================================
-"File:        oclint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_objc_oclint_checker')
-    finish
-endif
-let g:loaded_syntastic_objc_oclint_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'objc',
-    \ 'name': 'oclint',
-    \ 'redirect': 'c/oclint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/objcpp/gcc.vim b/bundle/syntastic/syntax_checkers/objcpp/gcc.vim
deleted file mode 100644
index 6ae7ba5..0000000
--- a/bundle/syntastic/syntax_checkers/objcpp/gcc.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-"============================================================================
-"File:        objcpp.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_objcpp_gcc_checker')
-    finish
-endif
-let g:loaded_syntastic_objcpp_gcc_checker = 1
-
-if !exists('g:syntastic_objcpp_compiler_options')
-    let g:syntastic_objcpp_compiler_options = '-std=gnu99'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_objcpp_gcc_IsAvailable() dict
-    if !exists('g:syntastic_c_compiler')
-        let g:syntastic_objcpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
-    endif
-    call self.log('g:syntastic_objcpp_compiler =', g:syntastic_objcpp_compiler)
-    return executable(expand(g:syntastic_objcpp_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_objcpp_gcc_GetLocList() dict
-    return syntastic#c#GetLocList('objcpp', 'gcc', {
-        \ 'errorformat':
-        \     '%-G%f:%s:,' .
-        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
-        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
-        \     '%-GIn file included%.%#,'.
-        \     '%-G %#from %f:%l\,,' .
-        \     '%f:%l:%c: %trror: %m,' .
-        \     '%f:%l:%c: %tarning: %m,' .
-        \     '%f:%l:%c: %m,' .
-        \     '%f:%l: %trror: %m,' .
-        \     '%f:%l: %tarning: %m,' .
-        \     '%f:%l: %m',
-        \ 'main_flags': '-x objective-c++ -fsyntax-only',
-        \ 'header_flags': '-x objective-c++-header -lobjc',
-        \ 'header_names': '\m\.h$' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'objcpp',
-    \ 'name': 'gcc' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/objcpp/oclint.vim b/bundle/syntastic/syntax_checkers/objcpp/oclint.vim
deleted file mode 100644
index addec47..0000000
--- a/bundle/syntastic/syntax_checkers/objcpp/oclint.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-"============================================================================
-"File:        oclint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_objcpp_oclint_checker')
-    finish
-endif
-let g:loaded_syntastic_objcpp_oclint_checker = 1
-
-runtime! syntax_checkers/c/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'objcpp',
-    \ 'name': 'oclint',
-    \ 'redirect': 'c/oclint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim b/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim
deleted file mode 100644
index e464c5e..0000000
--- a/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim
+++ /dev/null
@@ -1,140 +0,0 @@
-"============================================================================
-"File:        ocaml.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Török Edwin <edwintorok at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ocaml_camlp4o_checker')
-    finish
-endif
-let g:loaded_syntastic_ocaml_camlp4o_checker = 1
-
-if exists('g:syntastic_ocaml_camlp4r') && g:syntastic_ocaml_camlp4r != 0
-    let s:ocamlpp='camlp4r'
-else
-    let s:ocamlpp='camlp4o'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Checker options {{{1
-
-if !exists('g:syntastic_ocaml_use_ocamlc') || !executable('ocamlc')
-    let g:syntastic_ocaml_use_ocamlc = 0
-endif
-
-if !exists('g:syntastic_ocaml_use_janestreet_core')
-    let g:syntastic_ocaml_use_janestreet_core = 0
-endif
-
-if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable('ocamlbuild')
-    let g:syntastic_ocaml_use_ocamlbuild = 0
-endif
-
-" }}}1
-
-function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict " {{{1
-    return executable(s:ocamlpp)
-endfunction " }}}1
-
-function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
-    let makeprg = s:GetMakeprg()
-    if makeprg ==# ''
-        return []
-    endif
-
-    let errorformat =
-        \ '%WWarning: File "%f"\, line %l\, chars %c-%n:,'.
-        \ '%WWarning: line %l\, chars %c-%n:,'.
-        \ '%AFile "%f"\, line %l\, characters %c-%n:,'.
-        \ '%AFile "%f"\, line %l\, characters %c-%*\d (end at line %*\d\, character %*\d):,'.
-        \ '%AFile "%f"\, line %l\, character %c:,'.
-        \ '%AFile "%f"\, line %l\, character %c:%m,'.
-        \ '%-GPreprocessing error %.%#,'.
-        \ '%-GCommand exited %.%#,'.
-        \ '%C%tarning %*\d: %m,'.
-        \ '%C%m,'.
-        \ '%-G+%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-
-    for e in loclist
-        if get(e, 'col', 0) && get(e, 'nr', 0)
-            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
-            let e['nr'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:GetMakeprg() " {{{2
-    if g:syntastic_ocaml_use_ocamlc
-        return s:GetOcamlcMakeprg()
-    endif
-
-    if g:syntastic_ocaml_use_ocamlbuild && isdirectory('_build')
-        return s:GetOcamlBuildMakeprg()
-    endif
-
-    return s:GetOtherMakeprg()
-endfunction " }}}2
-
-function! s:GetOcamlcMakeprg() " {{{2
-    if g:syntastic_ocaml_use_janestreet_core
-        let build_cmd = 'ocamlc -I '
-        let build_cmd .= expand(g:syntastic_ocaml_janestreet_core_dir, 1)
-        let build_cmd .= ' -c ' . syntastic#util#shexpand('%')
-        return build_cmd
-    else
-        return 'ocamlc -c ' . syntastic#util#shexpand('%')
-    endif
-endfunction " }}}2
-
-function! s:GetOcamlBuildMakeprg() " {{{2
-    return 'ocamlbuild -quiet -no-log -tag annot,' . s:ocamlpp . ' -no-links -no-hygiene -no-sanitize ' .
-                \ syntastic#util#shexpand('%:r') . '.cmi'
-endfunction " }}}2
-
-function! s:GetOtherMakeprg() " {{{2
-    "TODO: give this function a better name?
-    "
-    "TODO: should use throw/catch instead of returning an empty makeprg
-
-    let extension = expand('%:e', 1)
-    let makeprg = ''
-
-    if stridx(extension, 'mly') >= 0 && executable('menhir')
-        " ocamlyacc output can't be redirected, so use menhir
-        let makeprg = 'menhir --only-preprocess ' . syntastic#util#shexpand('%') . ' >' . syntastic#util#DevNull()
-    elseif stridx(extension,'mll') >= 0 && executable('ocamllex')
-        let makeprg = 'ocamllex -q ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shexpand('%')
-    else
-        let makeprg = 'camlp4o ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shexpand('%')
-    endif
-
-    return makeprg
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ocaml',
-    \ 'name': 'camlp4o'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/perl/perl.vim b/bundle/syntastic/syntax_checkers/perl/perl.vim
deleted file mode 100644
index 93f8204..0000000
--- a/bundle/syntastic/syntax_checkers/perl/perl.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-"============================================================================
-"File:        perl.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Anthony Carapetis <anthony.carapetis at gmail dot com>,
-"             Eric Harmon <http://eharmon.net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-" Security:
-"
-" This checker runs 'perl -c' against your file, which in turn executes
-" any BEGIN, UNITCHECK, and CHECK blocks, and any use statements in
-" your file.  This is probably fine if you wrote the file yourself,
-" but it can be a problem if you're trying to check third party files.
-" If you are 100% willing to let Vim run the code in your file, set
-" g:syntastic_enable_perl_checker to 1 in your vimrc to enable this
-" checker:
-"
-"   let g:syntastic_enable_perl_checker = 1
-"
-" References:
-"
-" - http://perldoc.perl.org/perlrun.html#*-c*
-
-if exists('g:loaded_syntastic_perl_perl_checker')
-    finish
-endif
-let g:loaded_syntastic_perl_perl_checker = 1
-
-if !exists('g:syntastic_perl_lib_path')
-    let g:syntastic_perl_lib_path = []
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_perl_perl_IsAvailable() dict
-    if !exists('g:syntastic_perl_perl_exec') && exists('g:syntastic_perl_interpreter')
-        let g:syntastic_perl_perl_exec = g:syntastic_perl_interpreter
-    endif
-
-    " don't call executable() here, to allow things like
-    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call syntastic#util#system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('exit(0)'))
-    return v:shell_error == 0
-endfunction
-
-function! SyntaxCheckers_perl_perl_GetLocList() dict
-    if type(g:syntastic_perl_lib_path) == type('')
-        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
-        let includes = split(g:syntastic_perl_lib_path, ',')
-    else
-        let includes = copy(syntastic#util#var('perl_lib_path'))
-    endif
-    let shebang = syntastic#util#parseShebang()
-    let extra = join(map(includes, '"-I" . v:val')) .
-        \ (index(shebang['args'], '-T') >= 0 ? ' -T' : '') .
-        \ (index(shebang['args'], '-t') >= 0 ? ' -t' : '')
-    let errorformat = '%f:%l:%m'
-
-    let makeprg = self.makeprgBuild({ 'args_before': '-c -X ' . extra })
-
-    let errors = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'perl',
-        \ 'defaults': {'type': 'E'} })
-    if !empty(errors)
-        return errors
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_before': '-c -Mwarnings ' . extra })
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'perl',
-        \ 'defaults': {'type': 'W'} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'perl',
-    \ 'name': 'perl',
-    \ 'enable': 'enable_perl_checker'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/perl/perlcritic.vim b/bundle/syntastic/syntax_checkers/perl/perlcritic.vim
deleted file mode 100644
index abe9f43..0000000
--- a/bundle/syntastic/syntax_checkers/perl/perlcritic.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        perlcritic.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_perl_perlcritic_checker')
-    finish
-endif
-let g:loaded_syntastic_perl_perlcritic_checker = 1
-
-if !exists('g:syntastic_perl_perlcritic_thres')
-    let g:syntastic_perl_perlcritic_thres = 5
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_perl_perlcritic_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--quiet --nocolor --verbose "\%s:\%f:\%l:\%c:(\%s) \%m (\%e)\n"' })
-
-    let errorformat = '%t:%f:%l:%c:%m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 2],
-        \ 'subtype': 'Style' })
-
-    " change error types according to the prescribed threshold
-    for e in loclist
-        let e['type'] = e['type'] < g:syntastic_perl_perlcritic_thres ? 'W' : 'E'
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'perl',
-    \ 'name': 'perlcritic'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/perl/podchecker.vim b/bundle/syntastic/syntax_checkers/perl/podchecker.vim
deleted file mode 100644
index 7de61bb..0000000
--- a/bundle/syntastic/syntax_checkers/perl/podchecker.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        podchecker.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_perl_podchecker_checker')
-    finish
-endif
-let g:loaded_syntastic_perl_podchecker_checker = 1
-
-runtime! syntax_checkers/pod/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'perl',
-    \ 'name': 'podchecker',
-    \ 'redirect': 'pod/podchecker'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/php/php.vim b/bundle/syntastic/syntax_checkers/php/php.vim
deleted file mode 100644
index 5b118f6..0000000
--- a/bundle/syntastic/syntax_checkers/php/php.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        php.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_php_php_checker')
-    finish
-endif
-let g:loaded_syntastic_php_php_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_php_php_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], "\\munexpected '\\zs[^']\\+\\ze'")
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_php_php_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '-d error_reporting=E_ALL',
-        \ 'args_after': '-l -d display_errors=1 -d log_errors=0 -d xdebug.cli_color=0' })
-
-    let errorformat =
-        \ '%-GNo syntax errors detected in%.%#,'.
-        \ 'Parse error: %#syntax %trror\, %m in %f on line %l,'.
-        \ 'Parse %trror: %m in %f on line %l,'.
-        \ 'Fatal %trror: %m in %f on line %l,'.
-        \ '%-G\s%#,'.
-        \ '%-GErrors parsing %.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['guards'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'php',
-    \ 'name': 'php'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/php/phpcs.vim b/bundle/syntastic/syntax_checkers/php/phpcs.vim
deleted file mode 100644
index 1bd8f98..0000000
--- a/bundle/syntastic/syntax_checkers/php/phpcs.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        phpcs.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_php_phpcs_checker')
-    finish
-endif
-let g:loaded_syntastic_php_phpcs_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_php_phpcs_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--report=csv' })
-
-    let errorformat =
-        \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity%.%#,'.
-        \ '"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'php',
-    \ 'name': 'phpcs' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/php/phplint.vim b/bundle/syntastic/syntax_checkers/php/phplint.vim
deleted file mode 100644
index d04f3ba..0000000
--- a/bundle/syntastic/syntax_checkers/php/phplint.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-"============================================================================
-"File:        phplint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_php_phplint_checker')
-    finish
-endif
-let g:loaded_syntastic_php_phplint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_php_phplint_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\m\(class\|function\|method\) \zs\S\+\ze was declared as')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\maccess forbidden to \(private\|protected\) \(class\|constant\|method\|variable\|\(private\|protected\) property\) \zs\S\+\ze')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\musing deprecated \(class\|constant\|method\|property\|variable\) \zs\S\+\ze')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
-    if term !=# ''
-        return '\V' . escape(term, '\')
-    endif
-    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_php_phplint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after':
-        \   '--print-file-name ' .
-        \   '--print-line-numbers ' .
-        \   '--print-column-number ' .
-        \   '--print-errors ' .
-        \   '--print-warnings ' .
-        \   '--no-print-notices ' .
-        \   '--no-print-context ' .
-        \   '--no-print-source ' .
-        \   '--tab-size ' . &tabstop })
-
-    let errorformat =
-        \ '%E%f:%l:%v: %tRROR: %m,' .
-        \ '%W%f:%l:%v: %tarning: %m,' .
-        \ '%+C%\t%.%#,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        let e['text'] = substitute(e['text'], '\m \(Hint\|Examples\):.*', '', '')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'php',
-    \ 'name': 'phplint',
-    \ 'exec': 'phpl' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/php/phpmd.vim b/bundle/syntastic/syntax_checkers/php/phpmd.vim
deleted file mode 100644
index 5207d3d..0000000
--- a/bundle/syntastic/syntax_checkers/php/phpmd.vim
+++ /dev/null
@@ -1,77 +0,0 @@
-"============================================================================
-"File:        phpmd.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_php_phpmd_checker')
-    finish
-endif
-let g:loaded_syntastic_php_phpmd_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m\C^The \S\+ \w\+\(()\)\= \(has\|is not\|utilizes\)')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C^The \S\+ \(\w\+\)\(()\)\= .*', '\1', '')
-    endif
-    let term = matchstr(a:item['text'], '\m\C^Avoid \(variables with short\|excessively long variable\) names like \S\+\.')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C^Avoid \(variables with short\|excessively long variable\) names like \(\S\+\)\..*', '\2', '')
-    endif
-    let term = matchstr(a:item['text'], '\m\C^Avoid using short method names like \S\+::\S\+()\.')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C^Avoid using short method names like \S\+::\(\S\+\)()\..*', '\1', '')
-    endif
-    let term = matchstr(a:item['text'], '\m\C^\S\+ accesses the super-global variable ')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C accesses the super-global variable .*$', '', '')
-    endif
-    let term = matchstr(a:item['text'], '\m\C^Constant \S\+ should be defined in uppercase')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C^Constant \(\S\+\) should be defined in uppercase', '\1', '')
-    endif
-    let term = matchstr(a:item['text'], "\\m\\C^The '\\S\\+()' method which returns ")
-    if term !=# ''
-        return '\V'.substitute(term, "\\m\\C^The '\\(\\S\\+\\)()' method which returns.*", '\1', '')
-    endif
-    let term = matchstr(a:item['text'], '\m\C variable \S\+ should begin with ')
-    if term !=# ''
-        return '\V'.substitute(term, '\m\C.* variable \(\S\+\) should begin with .*', '\1', '')
-    endif
-    let term = matchstr(a:item['text'], "\\m\\C^Avoid unused \\(private fields\\|local variables\\|private methods\\|parameters\\) such as '\\S\\+'")
-    if term !=# ''
-        return '\V'.substitute(term, "\\m\\C^Avoid unused \\(private fields\\|local variables\\|private methods\\|parameters\\) such as '\\(\\S\\+\\)'.*", '\2', '')
-    endif
-    return ''
-endfunction
-
-function! SyntaxCheckers_php_phpmd_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'post_args_before': 'text',
-        \ 'post_args': 'codesize,design,unusedcode,naming' })
-
-    let errorformat = '%E%f:%l%\s%#%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype' : 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'php',
-    \ 'name': 'phpmd'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/po/msgfmt.vim b/bundle/syntastic/syntax_checkers/po/msgfmt.vim
deleted file mode 100644
index 1d09733..0000000
--- a/bundle/syntastic/syntax_checkers/po/msgfmt.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        msgfmt.vim
-"Description: Syntax checking plugin for po files of gettext
-"Maintainer:  Ryo Okubo <syucream1031@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_po_msgfmt_checker')
-    finish
-endif
-let g:loaded_syntastic_po_msgfmt_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_po_msgfmt_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\mkeyword "\zs[^"]\+\ze" unknown')
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_po_msgfmt_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-c ' . syntastic#c#NullOutput() })
-
-    let errorformat =
-        \ '%W%f:%l: warning: %m,' .
-        \ '%E%f:%l:%v: %m,' .
-        \ '%E%f:%l: %m,' .
-        \ '%+C %.%#,' .
-        \ '%Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'po',
-    \ 'name': 'msgfmt'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/pod/podchecker.vim b/bundle/syntastic/syntax_checkers/pod/podchecker.vim
deleted file mode 100644
index 9ef5dca..0000000
--- a/bundle/syntastic/syntax_checkers/pod/podchecker.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-"============================================================================
-"File:        podchecker.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_pod_podchecker_checker')
-    finish
-endif
-let g:loaded_syntastic_pod_podchecker_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_pod_podchecker_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%W%[%#]%[%#]%[%#] WARNING: %m at line %l in file %f,' .
-        \ '%W%[%#]%[%#]%[%#] WARNING: %m at line EOF in file %f,' .
-        \ '%E%[%#]%[%#]%[%#] ERROR: %m at line %l in file %f,' .
-        \ '%E%[%#]%[%#]%[%#] ERROR: %m at line EOF in file %f'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2] })
-
-    for e in loclist
-        if e['valid'] && e['lnum'] == 0
-            let e['lnum'] = str2nr(matchstr(e['text'], '\m\<line \zs\d\+\ze'))
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'pod',
-    \ 'name': 'podchecker'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/puppet/puppet.vim b/bundle/syntastic/syntax_checkers/puppet/puppet.vim
deleted file mode 100644
index 83077c7..0000000
--- a/bundle/syntastic/syntax_checkers/puppet/puppet.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        puppet.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Eivind Uggedal <eivind at uggedal dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_puppet_puppet_checker')
-    finish
-endif
-let g:loaded_syntastic_puppet_puppet_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_puppet_puppet_GetLocList() dict
-    if !exists('s:puppet_new')
-        let s:puppet_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 7, 0])
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': (s:puppet_new ? 'parser validate --color=false' : '--color=false --parseonly') })
-
-    let errorformat =
-        \ '%-Gerr: Try ''puppet help parser validate'' for usage,' .
-        \ '%-GError: Try ''puppet help parser validate'' for usage,' .
-        \ '%A%t%*[a-zA-Z]: %m at %f:%l:%c,' .
-        \ '%A%t%*[a-zA-Z]: %m at %f:%l'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'puppet',
-    \ 'name': 'puppet'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim b/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim
deleted file mode 100644
index a492db6..0000000
--- a/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        puppetlint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Eivind Uggedal <eivind at uggedal dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_puppet_puppetlint_checker')
-    finish
-endif
-let g:loaded_syntastic_puppet_puppetlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    let s:puppetlint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 2])
-endfunction
-
-function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict
-    call syntastic#log#deprecationWarn('puppet_lint_arguments', 'puppet_puppetlint_args')
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after':
-        \       '--log-format "%{KIND} [%{check}] %{message} at %{fullpath}:' .
-        \       (s:puppetlint_new ? '%{line}' : '%{linenumber}') . '"' })
-
-    let errorformat = '%t%*[a-zA-Z] %m at %f:%l'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'puppet',
-    \ 'name': 'puppetlint',
-    \ 'exec': 'puppet-lint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/codec.py b/bundle/syntastic/syntax_checkers/python/codec.py
deleted file mode 100755
index 6e980c7..0000000
--- a/bundle/syntastic/syntax_checkers/python/codec.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-from sys import argv, exit
-
-import codecs
-import re
-import os
-
-
-if len(argv) != 2:
-    exit(1)
-
-try:
-    with open(argv[1]) as fle:
-        text = fle.readlines()
-
-    if text:
-        match = re.match(r"#\s*coding\s*:\s*(?P<coding>\w+)", text[0])
-        if match:
-            text = codecs.lookup(match.groupdict()["coding"]).incrementaldecoder().decode(
-                ''.join(text).encode('utf-8')).encode('utf-8')
-
-    if isinstance(text, list):
-        text = ''.join(text).encode('utf-8')
-
-    compile(text, argv[1], 'exec', 0, 1)
-except SyntaxError as err:
-    print('%s:%s:%s: %s' % (err.filename, err.lineno, err.offset, err.msg))
-except Exception as err:
-    print('%s:%s:%s: %s' % (os.path.abspath(argv[1]), 1, 0, err))
diff --git a/bundle/syntastic/syntax_checkers/python/compile.py b/bundle/syntastic/syntax_checkers/python/compile.py
deleted file mode 100755
index 32f1413..0000000
--- a/bundle/syntastic/syntax_checkers/python/compile.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-from sys import argv, exit
-
-
-if len(argv) != 2:
-    exit(1)
-
-try:
-    compile(open(argv[1]).read(), argv[1], 'exec', 0, 1)
-except SyntaxError as err:
-    print('%s:%s:%s: %s' % (err.filename, err.lineno, err.offset, err.msg))
diff --git a/bundle/syntastic/syntax_checkers/python/flake8.vim b/bundle/syntastic/syntax_checkers/python/flake8.vim
deleted file mode 100644
index 257b69d..0000000
--- a/bundle/syntastic/syntax_checkers/python/flake8.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-"============================================================================
-"File:        flake8.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Authors:     Sylvain Soliman <Sylvain dot Soliman+git at gmail dot com>
-"             kstep <me@kstep.me>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_flake8_checker')
-    finish
-endif
-let g:loaded_syntastic_python_flake8_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_flake8_GetHighlightRegex(item)
-    return SyntaxCheckers_python_pyflakes_GetHighlightRegex(a:item)
-endfunction
-
-function! SyntaxCheckers_python_flake8_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f:%l: could not compile,%-Z%p^,' .
-        \ '%A%f:%l:%c: %t%n %m,' .
-        \ '%A%f:%l: %t%n %m,' .
-        \ '%-G%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-
-    for e in loclist
-        " E*** and W*** are pep8 errors
-        " F*** are PyFlakes codes
-        " C*** are McCabe complexity messages
-        " N*** are naming conventions from pep8-naming
-
-        if has_key(e, 'nr')
-            let e['text'] .= printf(' [%s%03d]', e['type'], e['nr'])
-            " E901 are syntax errors
-            " E902 are I/O errors
-            if e['type'] ==? 'E' && e['nr'] !~# '\m^9'
-                let e['subtype'] = 'Style'
-            endif
-            call remove(e, 'nr')
-        endif
-
-        if e['type'] =~? '\m^[CNW]'
-            let e['subtype'] = 'Style'
-        endif
-
-        let e['type'] = e['type'] =~? '\m^[EFC]' ? 'E' : 'W'
-    endfor
-
-    return loclist
-endfunction
-
-runtime! syntax_checkers/python/pyflakes.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'flake8'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/frosted.vim b/bundle/syntastic/syntax_checkers/python/frosted.vim
deleted file mode 100644
index d642795..0000000
--- a/bundle/syntastic/syntax_checkers/python/frosted.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-"============================================================================
-"File:        frosted.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_frosted_checker')
-    finish
-endif
-let g:loaded_syntastic_python_frosted_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_frosted_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-vb' })
-
-    let errorformat =
-        \ '%f:%l:%c:%m,' .
-        \ '%E%f:%l: %m,' .
-        \ '%-Z%p^,' .
-        \ '%-G%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        let e['col'] += 1
-
-        let parts = matchlist(e.text, '\v^([EW]\d+):([^:]*):(.+)')
-        if len(parts) >= 4
-            let e['type'] = parts[1][0]
-            let e['text'] = parts[3] . ' [' . parts[1] . ']'
-            let e['hl'] = '\V\<' . escape(parts[2], '\') . '\>'
-        elseif e['text'] =~? '\v^I\d+:'
-            let e['valid'] = 0
-        else
-            let e['vcol'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'frosted' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/mypy.vim b/bundle/syntastic/syntax_checkers/python/mypy.vim
deleted file mode 100644
index 8e8ded1..0000000
--- a/bundle/syntastic/syntax_checkers/python/mypy.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-"============================================================================
-"File:        mypy.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Author:      Russ Hewgill <Russ dot Hewgill at gmail dot com>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_mypy_checker')
-    finish
-endif
-let g:loaded_syntastic_python_mypy_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_mypy_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f\, line %l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': { 'type': 'E' },
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'mypy'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/pep257.vim b/bundle/syntastic/syntax_checkers/python/pep257.vim
deleted file mode 100644
index 64f5b05..0000000
--- a/bundle/syntastic/syntax_checkers/python/pep257.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-"============================================================================
-"File:        pep257.vim
-"Description: Docstring style checking plugin for syntastic.vim
-"============================================================================
-
-if exists('g:loaded_syntastic_python_pep257_checker')
-    finish
-endif
-let g:loaded_syntastic_python_pep257_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_pep257_GetLocList() dict
-    if !exists('s:pep257_new')
-        let s:pep257_new = syntastic#util#versionIsAtLeast(self.getVersion(), [0, 3])
-    endif
-
-    let makeprg = self.makeprgBuild({})
-
-    if s:pep257_new
-        let errorformat =
-            \ '%E%f:%l %.%#:,' .
-            \ '%+C        %m'
-    else
-        let errorformat =
-            \ '%E%f:%l:%c%\%.%\%.%\d%\+:%\d%\+: %m,' .
-            \ '%E%f:%l:%c: %m,' .
-            \ '%+C    %m'
-    endif
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'subtype': 'Style',
-        \ 'preprocess': 'killEmpty',
-        \ 'postprocess': ['compressWhitespace'] })
-
-    if s:pep257_new == 0
-        " byte offsets rather than column numbers
-        for e in loclist
-            let e['col'] = get(e, 'col', 0) + 1
-        endfor
-    endif
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'pep257'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/pep8.vim b/bundle/syntastic/syntax_checkers/python/pep8.vim
deleted file mode 100644
index 4ce3966..0000000
--- a/bundle/syntastic/syntax_checkers/python/pep8.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        pep8.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_pep8_checker')
-    finish
-endif
-let g:loaded_syntastic_python_pep8_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_pep8_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f:%l:%c: %m'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'subtype': 'Style' })
-
-    for e in loclist
-        let e['type'] = e['text'] =~? '^W' ? 'W' : 'E'
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'pep8'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/prospector.vim b/bundle/syntastic/syntax_checkers/python/prospector.vim
deleted file mode 100644
index c5e4735..0000000
--- a/bundle/syntastic/syntax_checkers/python/prospector.vim
+++ /dev/null
@@ -1,73 +0,0 @@
-"============================================================================
-"File:        prospector.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_prospector_checker')
-    finish
-endif
-let g:loaded_syntastic_python_prospector_checker = 1
-
-if !exists('g:syntastic_python_prospector_sort')
-    let g:syntastic_python_prospector_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_prospector_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 7])
-endfunction
-
-function! SyntaxCheckers_python_prospector_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--messages-only --absolute-paths --die-on-tool-error --zero-exit --output-format json' })
-
-    let errorformat = '%f:%l:%c: %m'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'preprocess': 'prospector',
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['text'] =~# '\v\[%(dodgy|mccabe|pep8|pep257|pyroma)\]$'
-            let e['subtype'] = 'Style'
-        endif
-
-        if e['text'] =~# '\v\[pylint\]$'
-            let e['type'] = e['text'] =~? '\m^[CRW]' ? 'W' : 'E'
-        elseif e['text'] =~# '\v\[%(frosted|pep8)\]$'
-            let e['type'] = e['text'] =~? '\m^W' ? 'W' : 'E'
-        elseif e['text'] =~# '\v\[%(dodgy|pyroma|vulture)\]$'
-            let e['type'] = 'W'
-        else
-            let e['type'] = 'E'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'prospector'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/py3kwarn.vim b/bundle/syntastic/syntax_checkers/python/py3kwarn.vim
deleted file mode 100644
index b0e7771..0000000
--- a/bundle/syntastic/syntax_checkers/python/py3kwarn.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-"============================================================================
-"File:        py3kwarn.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Authors:     Liam Curry <liam@curry.name>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_py3kwarn_checker')
-    finish
-endif
-let g:loaded_syntastic_python_py3kwarn_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_py3kwarn_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%W%f:%l:%c: %m'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'py3kwarn'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/pyflakes.vim b/bundle/syntastic/syntax_checkers/python/pyflakes.vim
deleted file mode 100644
index d403135..0000000
--- a/bundle/syntastic/syntax_checkers/python/pyflakes.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-"============================================================================
-"File:        pyflakes.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Authors:     Martin Grenfell <martin.grenfell@gmail.com>
-"             kstep <me@kstep.me>
-"             Parantapa Bhattacharya <parantapa@gmail.com>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_pyflakes_checker')
-    finish
-endif
-let g:loaded_syntastic_python_pyflakes_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_pyflakes_GetHighlightRegex(i)
-    if stridx(a:i['text'], 'is assigned to but never used') >= 0
-        \ || stridx(a:i['text'], 'imported but unused') >= 0
-        \ || stridx(a:i['text'], 'undefined name') >= 0
-        \ || stridx(a:i['text'], 'redefinition of') >= 0
-        \ || stridx(a:i['text'], 'referenced before assignment') >= 0
-        \ || stridx(a:i['text'], 'duplicate argument') >= 0
-        \ || stridx(a:i['text'], 'after other statements') >= 0
-        \ || stridx(a:i['text'], 'shadowed by loop variable') >= 0
-
-        " fun with Python's %r: try "..." first, then '...'
-        let term = matchstr(a:i['text'], '\m^.\{-}"\zs.\{-1,}\ze"')
-        if term !=# ''
-            return '\V\<' . escape(term, '\') . '\>'
-        endif
-
-        let term = matchstr(a:i['text'], '\m^.\{-}''\zs.\{-1,}\ze''')
-        if term !=# ''
-            return '\V\<' . escape(term, '\') . '\>'
-        endif
-    endif
-    return ''
-endfunction
-
-function! SyntaxCheckers_python_pyflakes_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f:%l: could not compile,'.
-        \ '%-Z%p^,'.
-        \ '%E%f:%l:%c: %m,'.
-        \ '%E%f:%l: %m,'.
-        \ '%-G%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'defaults': {'text': 'Syntax error'} })
-
-    for e in loclist
-        let e['vcol'] = 0
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'pyflakes'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/pylama.vim b/bundle/syntastic/syntax_checkers/python/pylama.vim
deleted file mode 100644
index 12c3ed1..0000000
--- a/bundle/syntastic/syntax_checkers/python/pylama.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-"============================================================================
-"File:        pylama.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_pylama_checker')
-    finish
-endif
-let g:loaded_syntastic_python_pylama_checker = 1
-
-if !exists('g:syntastic_python_pylama_sort')
-    let g:syntastic_python_pylama_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_python_pylama_GetHighlightRegex(item)
-    return SyntaxCheckers_python_pyflakes_GetHighlightRegex(a:item)
-endfunction
-
-function! SyntaxCheckers_python_pylama_GetLocList() dict
-    if !exists('s:pylama_new')
-        let s:pylama_new = syntastic#util#versionIsAtLeast(self.getVersion(), [4])
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-f pep8' . (s:pylama_new ? ' --force' : '') })
-
-    " TODO: "WARNING:pylama:..." messages are probably a logging bug
-    let errorformat =
-        \ '%-GWARNING:pylama:%.%#,' .
-        \ '%A%f:%l:%c: %m'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-
-    " adjust for weirdness in each checker
-    for e in loclist
-        let e['type'] = e['text'] =~? '\m^[RCW]' ? 'W' : 'E'
-        if e['text'] =~# '\v\[%(mccabe|pep257|pylint)\]$'
-            if has_key(e, 'col')
-                let e['col'] += 1
-            endif
-        endif
-        if e['text'] =~# '\v\[pylint\]$'
-            if has_key(e, 'vcol')
-                let e['vcol'] = 0
-            endif
-        endif
-        if e['text'] =~# '\v\[%(mccabe|pep257|pep8)\]$'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-runtime! syntax_checkers/python/pyflakes.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'pylama' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/pylint.vim b/bundle/syntastic/syntax_checkers/python/pylint.vim
deleted file mode 100644
index 2a54cee..0000000
--- a/bundle/syntastic/syntax_checkers/python/pylint.vim
+++ /dev/null
@@ -1,98 +0,0 @@
-"============================================================================
-"File:        pylint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Parantapa Bhattacharya <parantapa at gmail dot com>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_pylint_checker')
-    finish
-endif
-let g:loaded_syntastic_python_pylint_checker = 1
-
-if !exists('g:syntastic_python_pylint_sort')
-    let g:syntastic_python_pylint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:pylint_new = -1
-
-function! SyntaxCheckers_python_pylint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    try
-        " On Windows the version is shown as "pylint-script.py 1.0.0".
-        " On Gentoo Linux it's "pylint-python2.7 0.28.0".
-        " On NixOS, that would be ".pylint-wrapped 0.26.0".
-        " On Arch Linux it's "pylint2 1.1.0".
-        " On new-ish Fedora it's "python3-pylint 1.2.0".
-        " Have you guys considered switching to creative writing yet? ;)
-
-        let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
-        let pylint_version = filter( split(version_output, '\m, \=\|\n'), 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
-        let parsed_ver = syntastic#util#parseVersion(substitute(pylint_version, '\v^\S+\s+', '', ''))
-        call self.setVersion(parsed_ver)
-
-        let s:pylint_new = syntastic#util#versionIsAtLeast(parsed_ver, [1])
-    catch /\m^Vim\%((\a\+)\)\=:E684/
-        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
-        call syntastic#log#error("checker python/pylint: can't parse version string (abnormal termination?)")
-        let s:pylint_new = -1
-    endtry
-
-    return s:pylint_new >= 0
-endfunction
-
-function! SyntaxCheckers_python_pylint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': (s:pylint_new ?
-        \       '-f text --msg-template="{path}:{line}:{column}:{C}: [{symbol}] {msg}" -r n' :
-        \       '-f parseable -r n -i y') })
-
-    let errorformat =
-        \ '%A%f:%l:%c:%t: %m,' .
-        \ '%A%f:%l: %m,' .
-        \ '%A%f:(%l): %m,' .
-        \ '%-Z%p^%.%#,' .
-        \ '%-G%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'returns': range(32) })
-
-    for e in loclist
-        if !s:pylint_new
-            let e['type'] = e['text'][1]
-        endif
-
-        if e['type'] =~? '\m^[EF]'
-            let e['type'] = 'E'
-        elseif e['type'] =~? '\m^[CRW]'
-            let e['type'] = 'W'
-        else
-            let e['valid'] = 0
-        endif
-
-        let e['col'] += 1
-        let e['vcol'] = 0
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'pylint' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/python/python.vim b/bundle/syntastic/syntax_checkers/python/python.vim
deleted file mode 100644
index 17ad2c9..0000000
--- a/bundle/syntastic/syntax_checkers/python/python.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-"============================================================================
-"File:        python.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_python_python_checker')
-    finish
-endif
-let g:loaded_syntastic_python_python_checker = 1
-
-if !exists('g:syntastic_python_python_use_codec')
-    let g:syntastic_python_python_use_codec = 0
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:base_path = expand('<sfile>:p:h', 1) . syntastic#util#Slash()
-
-function! SyntaxCheckers_python_python_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6])
-endfunction
-
-function! SyntaxCheckers_python_python_GetLocList() dict
-    let compiler = s:base_path . (g:syntastic_python_python_use_codec ? 'codec.py' : 'compile.py')
-    call self.log('using compiler script', compiler)
-    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), compiler] })
-
-    let errorformat = '%E%f:%l:%c: %m'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env,
-        \ 'returns': [0] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'python',
-    \ 'name': 'python'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/qml/qmllint.vim b/bundle/syntastic/syntax_checkers/qml/qmllint.vim
deleted file mode 100644
index 0aef61c..0000000
--- a/bundle/syntastic/syntax_checkers/qml/qmllint.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"============================================================================
-"File:        qmllint.vim
-"Description: Syntax checking plugin for syntastic.vim using qmllint
-"Maintainer:  Peter Wu <peter@lekensteyn.nl>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_qml_qmllint_checker')
-    finish
-endif
-let g:loaded_syntastic_qml_qmllint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_qml_qmllint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f:%l : %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['guards'],
-        \ 'returns': [0, 255] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'qml',
-    \ 'name': 'qmllint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/r/lint.vim b/bundle/syntastic/syntax_checkers/r/lint.vim
deleted file mode 100644
index ca086b1..0000000
--- a/bundle/syntastic/syntax_checkers/r/lint.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-"============================================================================
-"File:        lint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_r_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_r_lint_checker = 1
-
-if !exists('g:syntastic_r_lint_styles')
-    let g:syntastic_r_lint_styles = 'lint.style'
-endif
-
-if !exists('g:syntastic_r_lint_sort')
-    let g:syntastic_r_lint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_r_lint_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m`\zs[^`]\+\ze`')
-    if term ==# ''
-        let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
-    endif
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_r_lint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(lint)'))
-    return v:shell_error == 0
-endfunction
-
-function! SyntaxCheckers_r_lint_GetLocList() dict
-    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
-    let setwd = 'setwd("' . escape(getcwd(), '"\') . '"); '
-    let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
-        \ ' -e ' . syntastic#util#shescape(setwd . 'library(lint); ' .
-        \       'try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
-        \ ' --args ' . syntastic#util#shexpand('%')
-
-    let errorformat =
-        \ '%t:%f:%l:%v: %m,' .
-        \ '%t:%f:%l: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'preprocess': 'rparse',
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['type'] ==? 'F'
-            " parse error
-            let e['type'] = 'E'
-            call remove(e, 'subtype')
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'r',
-    \ 'name': 'lint',
-    \ 'exec': 'R' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/r/svtools.vim b/bundle/syntastic/syntax_checkers/r/svtools.vim
deleted file mode 100644
index d2a6a74..0000000
--- a/bundle/syntastic/syntax_checkers/r/svtools.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-"============================================================================
-"File:        svtools.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-" Security:
-"
-" This checker runs the code in your file.  This is probably fine if you
-" wrote the file yourself, but it can be a problem if you're trying to
-" check third party files.  If you are 100% willing to let Vim run the
-" code in your file, set g:syntastic_enable_r_svtools_checker to 1 in
-" your vimrc to enable this checker:
-"
-"   let g:syntastic_enable_r_svtools_checker = 1
-
-if exists('g:loaded_syntastic_r_svtools_checker')
-    finish
-endif
-let g:loaded_syntastic_r_svtools_checker = 1
-
-if !exists('g:syntastic_r_svtools_styles')
-    let g:syntastic_r_svtools_styles = 'lint.style'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_r_svtools_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_r_svtools_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(svTools)'))
-    return v:shell_error == 0
-endfunction
-
-function! SyntaxCheckers_r_svtools_GetLocList() dict
-    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
-    let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
-        \ ' -e ' . syntastic#util#shescape(setwd . 'library(svTools); ' .
-        \       'try(lint(commandArgs(TRUE), filename = commandArgs(TRUE), type = "flat", sep = ":"))') .
-        \ ' --args ' . syntastic#util#shexpand('%')
-
-    let errorformat =
-        \ '%trror:%f:%\s%#%l:%\s%#%v:%m,' .
-        \ '%tarning:%f:%\s%#%l:%\s%#%v:%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'r',
-    \ 'name': 'svtools',
-    \ 'exec': 'R',
-    \ 'enable': 'enable_r_svtools_checker'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim b/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim
deleted file mode 100644
index 14463c4..0000000
--- a/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-"============================================================================
-"File:        code-ayatollah.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_racket_code_ayatollah_checker')
-    finish
-endif
-let g:loaded_syntastic_racket_code_ayatollah_checker = 1
-
-if !exists('g:syntastic_racket_code_ayatollah_script')
-    let g:syntastic_racket_code_ayatollah_script = 'code-ayatollah.rkt'
-endif
-
-if !exists('g:syntastic_racket_code_ayatollah_sort')
-    let g:syntastic_racket_code_ayatollah_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_racket_code_ayatollah_IsAvailable() dict
-    let s:script = expand(g:syntastic_racket_code_ayatollah_script, 1)
-    return executable(self.getExec()) && filereadable(s:script)
-endfunction
-
-function! SyntaxCheckers_racket_code_ayatollah_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:script] })
-
-    let errorformat =
-        \ '  %l:%v: %m,' .
-        \ '%PErrors in %f:,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-
-    for e in loclist
-        let e['col'] += 1
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'racket',
-    \ 'name': 'code_ayatollah',
-    \ 'exec': 'racket' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/racket/racket.vim b/bundle/syntastic/syntax_checkers/racket/racket.vim
deleted file mode 100644
index 59327c9..0000000
--- a/bundle/syntastic/syntax_checkers/racket/racket.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        racket.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Author:      Steve Bragg <steve at empresseffects dot com>
-"
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_racket_racket_checker')
-    finish
-endif
-let g:loaded_syntastic_racket_racket_checker=1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_racket_racket_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    " example of error message
-    "eval-apply.rkt:460:30: the-empty-environment: unbound identifier in module
-    "  in: the-empty-environment
-    let errorformat = '%f:%l:%v: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    for e in loclist
-        if has_key(e, 'col')
-            let e['col'] += 1
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'racket',
-    \ 'name': 'racket'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/rnc/rnv.vim b/bundle/syntastic/syntax_checkers/rnc/rnv.vim
deleted file mode 100644
index 848d60c..0000000
--- a/bundle/syntastic/syntax_checkers/rnc/rnv.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        rnv.vim
-"Description: RelaxNG RNV syntax checking plugin for syntastic.vim
-"Maintainer:  Remko Tronçon <remko at el-tramo dot be>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_rnc_rnv_checker')
-    finish
-endif
-let g:loaded_syntastic_rnc_rnv_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_rnc_rnv_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '-c' })
-
-    let errorformat =
-        \ '%f:%l:%c: %trror: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'rnc',
-    \ 'name': 'rnv'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
deleted file mode 100644
index 1c3ca09..0000000
--- a/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-"============================================================================
-"File:        rst.vim
-"Description: Syntax checking plugin for docutils' reStructuredText files
-"Maintainer:  James Rowe <jnrowe at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-" We use rst2pseudoxml.py, as it is ever so marginally faster than the other
-" rst2${x} tools in docutils.
-
-if exists('g:loaded_syntastic_rst_rst2pseudoxml_checker')
-    finish
-endif
-let g:loaded_syntastic_rst_rst2pseudoxml_checker = 1
-
-let s:rst2pseudoxml = (executable('rst2pseudoxml.py') && !syntastic#util#isRunningWindows()) ? 'rst2pseudoxml.py' : 'rst2pseudoxml'
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_rst_rst2pseudoxml_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--report=2 --exit-status=1',
-        \ 'tail': syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%f:%l: (%tNFO/1) %m,'.
-        \ '%f:%l: (%tARNING/2) %m,'.
-        \ '%f:%l: (%tRROR/3) %m,'.
-        \ '%f:%l: (%tEVERE/4) %m,'.
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    for e in loclist
-        if e['type'] ==? 'S'
-            let e['type'] = 'E'
-        elseif e['type'] ==? 'I'
-            let e['type'] = 'W'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'rst',
-    \ 'name': 'rst2pseudoxml',
-    \ 'exec': s:rst2pseudoxml })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/rst/rstcheck.vim b/bundle/syntastic/syntax_checkers/rst/rstcheck.vim
deleted file mode 100644
index 3c3b8c4..0000000
--- a/bundle/syntastic/syntax_checkers/rst/rstcheck.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        rstcheck.vim
-"Description: Syntax checking for reStructuredText and embedded code blocks
-"Authors:     Steven Myint <git@stevenmyint.com>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_rst_rstcheck_checker')
-    finish
-endif
-let g:loaded_syntastic_rst_rstcheck_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_rst_rstcheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%f:%l: (%tNFO/1) %m,'.
-        \ '%f:%l: (%tARNING/2) %m,'.
-        \ '%f:%l: (%tRROR/3) %m,'.
-        \ '%f:%l: (%tEVERE/4) %m,'.
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        if e['type'] ==? 'S'
-            let e['type'] = 'E'
-        elseif e['type'] ==? 'I'
-            let e['type'] = 'W'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'rst',
-    \ 'name': 'rstcheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/rst/sphinx.vim b/bundle/syntastic/syntax_checkers/rst/sphinx.vim
deleted file mode 100644
index 3c211f4..0000000
--- a/bundle/syntastic/syntax_checkers/rst/sphinx.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-"============================================================================
-"File:        sphinx.vim
-"Description: Syntax checking plugin for Sphinx reStructuredText files
-"Maintainer:  Buck Evan <buck dot 2019 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists("g:loaded_syntastic_rst_sphinx_checker")
-    finish
-endif
-let g:loaded_syntastic_rst_sphinx_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:sphinx_cache_location = syntastic#util#tmpdir()
-lockvar s:sphinx_cache_location
-
-augroup syntastic
-    autocmd VimLeave * call syntastic#util#rmrf(s:sphinx_cache_location)
-augroup END
-
-function! SyntaxCheckers_rst_sphinx_GetLocList() dict
-
-    let srcdir = syntastic#util#var('rst_sphinx_source_dir')
-    call self.log('g:syntastic_rst_sphinx_source_dir =', srcdir)
-    if srcdir ==# ''
-        let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        if config ==# '' || !filereadable(config)
-            call self.log('conf.py file not found')
-            return []
-        endif
-        let srcdir = fnamemodify(config, ':p:h')
-    endif
-
-    let confdir = syntastic#util#var('rst_sphinx_config_dir')
-    call self.log('g:syntastic_rst_sphinx_config_dir =', confdir)
-    if confdir ==# ''
-        let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
-        let confdir = (config !=# '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args': '-n -E',
-        \ 'args_after': '-q -N -b pseudoxml -c ' . syntastic#util#shescape(confdir),
-        \ 'fname': syntastic#util#shescape(srcdir),
-        \ 'fname_after': syntastic#util#shescape(s:sphinx_cache_location) })
-
-    let errorformat =
-        \ '%E%f:%l: SEVER%t: %m,' .
-        \ '%f:%l: %tRROR: %m,' .
-        \ '%f:%l: %tARNING: %m,' .
-        \ '%E%f:: SEVER%t: %m,' .
-        \ '%f:: %tRROR: %m,' .
-        \ '%f:: %tARNING: %m,' .
-        \ '%trror: %m,' .
-        \ '%+C%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0] })
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'rst',
-    \ 'name': 'sphinx',
-    \ 'exec': 'sphinx-build' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/flog.vim b/bundle/syntastic/syntax_checkers/ruby/flog.vim
deleted file mode 100644
index 127cdbd..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/flog.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-"============================================================================
-"File:        flog.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Tim Carry <tim at pixelastic dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_flog_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_flog_checker = 1
-
-if !exists('g:syntastic_ruby_flog_threshold_warning')
-    let g:syntastic_ruby_flog_threshold_warning = 45
-endif
-
-if !exists('g:syntastic_ruby_flog_threshold_error')
-    let g:syntastic_ruby_flog_threshold_error = 90
-endif
-
-if !exists('g:syntastic_ruby_flog_sort')
-    let g:syntastic_ruby_flog_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_flog_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '-a' })
-
-    " Example output:
-    "   93.25: MyClass::my_method my_file:42
-    let errorformat = '%\m%\s%#%m: %.%# %f:%l'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-
-    let trail_w = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_warning) . ')'
-    let trail_e = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_error) . ')'
-    for e in loclist
-      let score = syntastic#util#str2float(e['text'])
-
-      let e['text'] = 'Complexity is too high (' . syntastic#util#float2str(score) . '/'
-      if score < g:syntastic_ruby_flog_threshold_warning
-          let e['valid'] = 0
-      elseif score < g:syntastic_ruby_flog_threshold_error
-          let e['type'] = 'W'
-          let e['text'] .= trail_w
-      else
-          let e['type'] = 'E'
-          let e['text'] .= trail_e
-      endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'flog'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/jruby.vim b/bundle/syntastic/syntax_checkers/ruby/jruby.vim
deleted file mode 100644
index d9d2aee..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/jruby.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        jruby.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Leonid Shevtsov <leonid at shevtsov dot me>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_jruby_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_jruby_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_jruby_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': (syntastic#util#isRunningWindows() ? '-T1 -W1' : '-W1'),
-        \ 'args_after': '-c' })
-
-    let errorformat =
-        \ '%-GSyntax OK for %f,'.
-        \ '%ESyntaxError in %f:%l: syntax error\, %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: warning: %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: %m,'.
-        \ '%-C%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'jruby'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/macruby.vim b/bundle/syntastic/syntax_checkers/ruby/macruby.vim
deleted file mode 100644
index c51188f..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/macruby.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-"============================================================================
-"File:        macruby.vim
-"Description: Syntax checking plugin for syntastic.vim
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_macruby_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_macruby_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_macruby_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '-W1',
-        \ 'args_after': '-c' })
-
-    let errorformat =
-        \ '%-GSyntax OK,'.
-        \ '%E%f:%l: syntax error\, %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: warning: %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: %m,'.
-        \ '%-C%.%#'
-
-    let env = { 'RUBYOPT': '' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'macruby'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/mri.vim b/bundle/syntastic/syntax_checkers/ruby/mri.vim
deleted file mode 100644
index 563ed4f..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/mri.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-"============================================================================
-"File:        mri.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_mri_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_mri_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_mri_IsAvailable() dict
-    if !exists('g:syntastic_ruby_mri_exec') && exists('g:syntastic_ruby_exec')
-        let g:syntastic_ruby_mri_exec = g:syntastic_ruby_exec
-        call self.log('g:syntastic_ruby_exec =', g:syntastic_ruby_exec)
-    endif
-    return executable(self.getExec())
-endfunction
-
-function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
-    if stridx(a:i['text'], 'assigned but unused variable') >= 0
-        let term = split(a:i['text'], ' - ')[1]
-        return '\V\<' . escape(term, '\') . '\>'
-    endif
-
-    return ''
-endfunction
-
-function! SyntaxCheckers_ruby_mri_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '-w -T1',
-        \ 'args_after': '-c' })
-
-    "this is a hack to filter out a repeated useless warning in rspec files
-    "containing lines like
-    "
-    "  foo.should == 'bar'
-    "
-    "Which always generate the warning below. Note that ruby >= 1.9.3 includes
-    "the word "possibly" in the warning
-    let errorformat = '%-G%\m%.%#warning: %\%%(possibly %\)%\?useless use of == in void context,'
-
-    " filter out lines starting with ...
-    " long lines are truncated and wrapped in ... %p then returns the wrong
-    " column offset
-    let errorformat .= '%-G%\%.%\%.%\%.%.%#,'
-
-    let errorformat .=
-        \ '%-GSyntax OK,'.
-        \ '%E%f:%l: syntax error\, %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: warning: %m,'.
-        \ '%Z%p^,'.
-        \ '%W%f:%l: %m,'.
-        \ '%-C%.%#'
-
-    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'env': env })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'mri',
-    \ 'exec': 'ruby'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/reek.vim b/bundle/syntastic/syntax_checkers/ruby/reek.vim
deleted file mode 100644
index d9a564a..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/reek.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"============================================================================
-"File:        reek.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Mindaugas Mozūras
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_reek_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_reek_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_reek_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [1, 3, 0])
-endfunction
-
-function! SyntaxCheckers_ruby_reek_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --line-number --single-line' })
-
-    let errorformat =
-        \ '%E%.%#: Racc::ParseError: %f:%l :: %m,' .
-        \ '%W%f:%l: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 2] })
-
-    for e in loclist
-        if e['type'] ==? 'W'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'reek'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/rubocop.vim b/bundle/syntastic/syntax_checkers/ruby/rubocop.vim
deleted file mode 100644
index 56f54bf..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/rubocop.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-"============================================================================
-"File:        rubocop.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Recai Oktaş <roktas@bil.omu.edu.tr>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_rubocop_checker')
-    finish
-endif
-let g:loaded_syntastic_ruby_rubocop_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 12, 0])
-endfunction
-
-function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs' })
-
-    let errorformat = '%f:%l:%c: %t: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style'})
-
-    " convert rubocop severities to error types recognized by syntastic
-    for e in loclist
-        if e['type'] ==# 'F'
-            let e['type'] = 'E'
-        elseif e['type'] !=# 'W' && e['type'] !=# 'E'
-            let e['type'] = 'W'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'rubocop'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/ruby/rubylint.vim b/bundle/syntastic/syntax_checkers/ruby/rubylint.vim
deleted file mode 100644
index 2e74f87..0000000
--- a/bundle/syntastic/syntax_checkers/ruby/rubylint.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-"============================================================================
-"File:        rubylint.vim
-"Description: Checks Ruby source code using ruby-lint
-"Maintainer:  Yorick Peterse <yorickpeterse@gmail.com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_ruby_rubylint_checker')
-    finish
-endif
-
-let g:loaded_syntastic_ruby_rubylint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
-    if !exists('s:rubylint_new')
-        let s:rubylint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
-    endif
-    let makeprg = self.makeprgBuild({
-        \ 'args': (s:rubylint_new ? '' : 'analyze '),
-        \ 'args_after': '--presenter=syntastic' })
-
-    let errorformat = '%f:%t:%l:%c: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'ruby',
-    \ 'name': 'rubylint',
-    \ 'exec': 'ruby-lint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sass/sass.vim b/bundle/syntastic/syntax_checkers/sass/sass.vim
deleted file mode 100644
index 5f6194f..0000000
--- a/bundle/syntastic/syntax_checkers/sass/sass.vim
+++ /dev/null
@@ -1,84 +0,0 @@
-"============================================================================
-"File:        sass.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_sass_sass_checker')
-    finish
-endif
-let g:loaded_syntastic_sass_sass_checker = 1
-
-"sass caching for large files drastically speeds up the checking, but store it
-"in a temp location otherwise sass puts .sass_cache dirs in the users project
-let s:sass_cache_location = syntastic#util#tmpdir()
-lockvar s:sass_cache_location
-
-augroup syntastic
-    autocmd VimLeave * call syntastic#util#rmrf(s:sass_cache_location)
-augroup END
-
-"By default do not check partials as unknown variables are a syntax error
-if !exists('g:syntastic_sass_check_partials')
-    let g:syntastic_sass_check_partials = 0
-endif
-
-"use compass imports if available
-let s:imports = ''
-if executable('compass')
-    let s:imports = '--compass'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sass_sass_GetLocList() dict
-    if !g:syntastic_sass_check_partials && expand('%:t', 1)[0] ==# '_'
-        return []
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check' })
-
-    let errorformat =
-        \ '%E%\m%\%%(Syntax %\)%\?%trror: %m,' .
-        \ '%+C              %.%#,' .
-        \ '%C        on line %l of %f\, %.%#,' .
-        \ '%C        on line %l of %f,' .
-        \ '%-G %\+from line %.%#,' .
-        \ '%-G %\+Use --trace for backtrace.,' .
-        \ '%W%>DEPRECATION WARNING on line %l of %f:,' .
-        \ '%+C%>  %.%#,' .
-        \ '%W%>WARNING: on line %l of %f:,' .
-        \ '%+C%>  %.%#,' .
-        \ '%W%>WARNING on line %l of %f: %m,' .
-        \ '%+C%>  %.%#,' .
-        \ '%W%>WARNING on line %l of %f:,' .
-        \ '%Z%m,' .
-        \ '%W%>WARNING: %m,' .
-        \ '%C         on line %l of %f\, %.%#,' .
-        \ '%C         on line %l of %f,' .
-        \ '%-G %\+from line %.%#,' .
-        \ 'Syntax %trror on line %l: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sass',
-    \ 'name': 'sass'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sass/sassc.vim b/bundle/syntastic/syntax_checkers/sass/sassc.vim
deleted file mode 100644
index 699e04e..0000000
--- a/bundle/syntastic/syntax_checkers/sass/sassc.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        sassc.vim
-"Description: Syntax checking plugin for syntastic
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_sass_sassc_checker')
-    finish
-endif
-let g:loaded_syntastic_sass_sassc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sass_sassc_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'fname_after': syntastic#util#DevNull() })
-
-    let errorformat = '%f:%l: %trror: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sass',
-    \ 'name': 'sassc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scala/fsc.vim b/bundle/syntastic/syntax_checkers/scala/fsc.vim
deleted file mode 100644
index 25d6a4d..0000000
--- a/bundle/syntastic/syntax_checkers/scala/fsc.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        fsc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_scala_fsc_checker')
-    finish
-endif
-let g:loaded_syntastic_scala_fsc_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_scala_fsc_GetLocList() dict
-    call syntastic#log#deprecationWarn('scala_options', 'scala_fsc_args')
-
-    " fsc has some serious problems with the
-    " working directory changing after being started
-    " that's why we better pass an absolute path
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '-Ystop-after:parser',
-        \ 'fname': syntastic#util#shexpand('%:p') })
-
-    let errorformat =
-        \ '%E%f:%l: %trror: %m,' .
-        \ '%Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scala',
-    \ 'name': 'fsc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scala/scalac.vim b/bundle/syntastic/syntax_checkers/scala/scalac.vim
deleted file mode 100644
index 854876b..0000000
--- a/bundle/syntastic/syntax_checkers/scala/scalac.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        scala.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Rickey Visinski <rickeyvisinski at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_scala_scalac_checker')
-    finish
-endif
-let g:loaded_syntastic_scala_scalac_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_scala_scalac_GetLocList() dict
-    call syntastic#log#deprecationWarn('scala_options', 'scala_scalac_args')
-
-    let makeprg = self.makeprgBuild({ 'args_after': '-Ystop-after:parser' })
-
-    let errorformat =
-        \ '%E%f:%l: %trror: %m,' .
-        \ '%Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scala',
-    \ 'name': 'scalac'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scala/scalastyle.vim b/bundle/syntastic/syntax_checkers/scala/scalastyle.vim
deleted file mode 100644
index 1df96c0..0000000
--- a/bundle/syntastic/syntax_checkers/scala/scalastyle.vim
+++ /dev/null
@@ -1,77 +0,0 @@
-"============================================================================
-"File:        scalastyle.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_scala_scalastyle_checker')
-    finish
-endif
-let g:loaded_syntastic_scala_scalastyle_checker = 1
-
-if !exists('g:syntastic_scala_scalastyle_jar')
-    let g:syntastic_scala_scalastyle_jar = 'scalastyle-batch_2.10.jar'
-endif
-
-if !exists('g:syntastic_scala_scalastyle_config_file')
-    let g:syntastic_scala_scalastyle_config_file = 'scalastyle_config.xml'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let jar = expand(g:syntastic_scala_scalastyle_jar, 1)
-    let conf_file = expand(g:syntastic_scala_scalastyle_config_file, 1)
-    call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar) . ', ' .
-        \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
-
-    return filereadable(jar) && filereadable(conf_file)
-endfunction
-
-function! SyntaxCheckers_scala_scalastyle_GetLocList() dict
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar, 1)],
-        \ 'args_before': ['-q', 'true', '-c', expand(g:syntastic_scala_scalastyle_config_file, 1)] })
-
-    let errorformat =
-        \ '%trror file=%f message=%m line=%l column=%c,' .
-        \ '%trror file=%f message=%m line=%l,' .
-        \ '%tarning file=%f message=%m line=%l column=%c,' .
-        \ '%tarning file=%f message=%m line=%l'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        if has_key(e, 'col')
-            let e['col'] += 1
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scala',
-    \ 'name': 'scalastyle',
-    \ 'exec': 'java'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scss/sass.vim b/bundle/syntastic/syntax_checkers/scss/sass.vim
deleted file mode 100644
index 426bf2d..0000000
--- a/bundle/syntastic/syntax_checkers/scss/sass.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        scss.vim
-"Description: scss syntax checking plugin for syntastic
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_scss_sass_checker')
-    finish
-endif
-let g:loaded_syntastic_scss_sass_checker = 1
-
-runtime! syntax_checkers/sass/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scss',
-    \ 'name': 'sass',
-    \ 'redirect': 'sass/sass'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scss/sassc.vim b/bundle/syntastic/syntax_checkers/scss/sassc.vim
deleted file mode 100644
index 98f7829..0000000
--- a/bundle/syntastic/syntax_checkers/scss/sassc.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        sassc.vim
-"Description: Syntax checking plugin for syntastic
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_scss_sassc_checker')
-    finish
-endif
-let g:loaded_syntastic_scss_sassc_checker = 1
-
-runtime! syntax_checkers/sass/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scss',
-    \ 'name': 'sassc',
-    \ 'redirect': 'sass/sassc'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/scss/scss_lint.vim b/bundle/syntastic/syntax_checkers/scss/scss_lint.vim
deleted file mode 100644
index f292554..0000000
--- a/bundle/syntastic/syntax_checkers/scss/scss_lint.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-"============================================================================
-"File:        scss_lint.vim
-"Description: SCSS style and syntax checker plugin for Syntastic
-"Maintainer:  Shane da Silva <shane@dasilva.io>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"============================================================================
-
-if exists('g:loaded_syntastic_scss_scss_lint_checker')
-    finish
-endif
-let g:loaded_syntastic_scss_scss_lint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 12])
-endfunction
-
-function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat = '%f:%l [%t] %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2, 65, 66] })
-
-    let cutoff = strlen('Syntax Error: ')
-    for e in loclist
-        if e['text'][: cutoff-1] ==# 'Syntax Error: '
-            let e['text'] = e['text'][cutoff :]
-        else
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'scss',
-    \ 'name': 'scss_lint',
-    \ 'exec': 'scss-lint' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sh/bashate.vim b/bundle/syntastic/syntax_checkers/sh/bashate.vim
deleted file mode 100644
index c7888ad..0000000
--- a/bundle/syntastic/syntax_checkers/sh/bashate.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        bashate.vim
-"Description: Bash script style checking plugin for syntastic.vim
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_sh_bashate_checker')
-    finish
-endif
-let g:loaded_syntastic_sh_bashate_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sh_bashate_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%EE%n: %m,' .
-        \ '%Z - %f%\s%\+: L%l,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        let e['text'] = substitute(e['text'], "\\m: '.*", '', '')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sh',
-    \ 'name': 'bashate' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim b/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim
deleted file mode 100644
index 2ed0717..0000000
--- a/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        checkbashisms.vim
-"Description: Shell script syntax/style checking plugin for syntastic.vim
-"Notes:       checkbashisms.pl can be downloaded from
-"             http://debian.inode.at/debian/pool/main/d/devscripts/
-"             as part of the devscripts package.
-"============================================================================
-
-if exists('g:loaded_syntastic_sh_checkbashisms_checker')
-    finish
-endif
-let g:loaded_syntastic_sh_checkbashisms_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sh_checkbashisms_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args': '-fx' })
-
-    let errorformat =
-        \ '%-Gscript %f is already a bash script; skipping,' .
-        \ '%Eerror: %f: %m\, opened in line %l,' .
-        \ '%Eerror: %f: %m,' .
-        \ '%Ecannot open script %f for reading: %m,' .
-        \ '%Wscript %f %m,%C%.# lines,' .
-        \ '%Wpossible bashism in %f line %l (%m):,%C%.%#,%Z.%#,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sh',
-    \ 'name': 'checkbashisms' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sh/sh.vim b/bundle/syntastic/syntax_checkers/sh/sh.vim
deleted file mode 100644
index 395b81b..0000000
--- a/bundle/syntastic/syntax_checkers/sh/sh.vim
+++ /dev/null
@@ -1,93 +0,0 @@
-"============================================================================
-"File:        sh.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_sh_sh_checker')
-    finish
-endif
-let g:loaded_syntastic_sh_sh_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sh_sh_IsAvailable() dict " {{{1
-    call self.log('shell =', s:GetShell())
-    return s:IsShellValid()
-endfunction " }}}1
-
-function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1
-    if s:GetShell() ==# 'zsh'
-        return s:ForwardToZshChecker()
-    endif
-
-    if !s:IsShellValid()
-        return []
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'exe': s:GetShell(),
-        \ 'args_after': '-n' })
-
-    let errorformat = '%f: line %l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:GetShell() " {{{2
-    if !exists('b:shell') || b:shell ==# ''
-        let b:shell = ''
-        let shebang = syntastic#util#parseShebang()['exe']
-        if shebang !=# ''
-            if shebang[-strlen('bash'):-1] ==# 'bash'
-                let b:shell = 'bash'
-            elseif shebang[-strlen('zsh'):-1] ==# 'zsh'
-                let b:shell = 'zsh'
-            elseif shebang[-strlen('sh'):-1] ==# 'sh'
-                let b:shell = 'sh'
-            endif
-        endif
-        " try to use env variable in case no shebang could be found
-        if b:shell ==# ''
-            let b:shell = fnamemodify($SHELL, ':t')
-        endif
-    endif
-    return b:shell
-endfunction " }}}2
-
-function! s:IsShellValid() " {{{2
-    let shell = s:GetShell()
-    return shell !=# '' && executable(shell)
-endfunction " }}}2
-
-function! s:ForwardToZshChecker() " {{{2
-    let registry = g:SyntasticRegistry.Instance()
-    let zsh_checkers = registry.getCheckersAvailable('zsh', ['zsh'])
-    if !empty(zsh_checkers)
-        return zsh_checkers[0].getLocListRaw()
-    else
-        return []
-    endif
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sh',
-    \ 'name': 'sh' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sh/shellcheck.vim b/bundle/syntastic/syntax_checkers/sh/shellcheck.vim
deleted file mode 100644
index c2761d2..0000000
--- a/bundle/syntastic/syntax_checkers/sh/shellcheck.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-"============================================================================
-"File:        shellcheck.vim
-"Description: Shell script syntax/style checking plugin for syntastic.vim
-"============================================================================
-
-if exists('g:loaded_syntastic_sh_shellcheck_checker')
-    finish
-endif
-let g:loaded_syntastic_sh_shellcheck_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sh_shellcheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-f gcc' })
-
-    let errorformat =
-        \ '%f:%l:%c: %trror: %m,' .
-        \ '%f:%l:%c: %tarning: %m,' .
-        \ '%f:%l:%c: %tote: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        if e['type'] ==? 'n'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sh',
-    \ 'name': 'shellcheck' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/slim/slimrb.vim b/bundle/syntastic/syntax_checkers/slim/slimrb.vim
deleted file mode 100644
index 80bac05..0000000
--- a/bundle/syntastic/syntax_checkers/slim/slimrb.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        slim.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_slim_slimrb_checker')
-    finish
-endif
-let g:loaded_syntastic_slim_slimrb_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_slim_slimrb_GetLocList() dict
-    if !exists('s:slimrb_new')
-        let ver = self.getVersion(self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull())
-        let s:slimrb_new = syntastic#util#versionIsAtLeast(ver, [1, 3, 1])
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
-
-    if s:slimrb_new
-        let errorformat =
-            \ '%C %#%f\, Line %l\, Column %c,'.
-            \ '%-G %.%#,'.
-            \ '%ESlim::Parser::SyntaxError: %m,'.
-            \ '%+C%.%#'
-    else
-        let errorformat =
-            \ '%C %#%f\, Line %l,'.
-            \ '%-G %.%#,'.
-            \ '%ESlim::Parser::SyntaxError: %m,'.
-            \ '%+C%.%#'
-    endif
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'slim',
-    \ 'name': 'slimrb'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sml/smlnj.vim b/bundle/syntastic/syntax_checkers/sml/smlnj.vim
deleted file mode 100644
index 8b29db4..0000000
--- a/bundle/syntastic/syntax_checkers/sml/smlnj.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        smlnj.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_sml_smlnj_checker')
-    finish
-endif
-let g:loaded_syntastic_sml_smlnj_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sml_smlnj_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f:%l%\%.%c %trror: %m,' .
-        \ '%E%f:%l%\%.%c-%\d%\+%\%.%\d%\+ %trror: %m,' .
-        \ '%W%f:%l%\%.%c %tarning: %m,' .
-        \ '%W%f:%l%\%.%c-%\d%\+%\%.%\d%\+ %tarning: %m,' .
-        \ '%C%\s%\+%m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sml',
-    \ 'name': 'smlnj',
-    \ 'exec': 'sml'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/spec/rpmlint.vim b/bundle/syntastic/syntax_checkers/spec/rpmlint.vim
deleted file mode 100644
index 7e9431b..0000000
--- a/bundle/syntastic/syntax_checkers/spec/rpmlint.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        rpmlint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_spec_rpmlint_checker')
-    finish
-endif
-let g:loaded_syntastic_spec_rpmlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_spec_rpmlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f:%l: E: %m,' .
-        \ '%E%f: E: %m,' .
-        \ '%W%f:%l: W: %m,' .
-        \ '%W%f: W: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'spec',
-    \ 'name': 'rpmlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/sql/sqlint.vim b/bundle/syntastic/syntax_checkers/sql/sqlint.vim
deleted file mode 100644
index 1e1eea5..0000000
--- a/bundle/syntastic/syntax_checkers/sql/sqlint.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-"============================================================================
-"File:        sqlint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Steve Purcell <steve@sanityinc.com>
-"License:     MIT
-"============================================================================
-
-if exists('g:loaded_syntastic_sql_sqlint_checker')
-    finish
-endif
-let g:loaded_syntastic_sql_sqlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_sql_sqlint_GetHighlightRegex(i)
-    let term = matchstr(a:i['text'], '\m at or near "\zs[^"]\+\ze"')
-    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
-endfunction
-
-function! SyntaxCheckers_sql_sqlint_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 0, 3])
-endfunction
-
-function! SyntaxCheckers_sql_sqlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%E%f:%l:%c:ERROR %m,' .
-        \ '%W%f:%l:%c:WARNING %m,' .
-        \ '%C %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'sql',
-    \ 'name': 'sqlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/stylus/stylint.vim b/bundle/syntastic/syntax_checkers/stylus/stylint.vim
deleted file mode 100644
index f489910..0000000
--- a/bundle/syntastic/syntax_checkers/stylus/stylint.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-"============================================================================
-"File:        stylint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_stylus_stylint_checker')
-    finish
-endif
-let g:loaded_syntastic_stylus_stylint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_stylus_stylint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%WWarning: %m,' .
-        \ '%EError: %m,' .
-        \ '%CFile: %f,' .
-        \ '%CLine: %l:%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'stylus',
-    \ 'name': 'stylint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim b/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim
deleted file mode 100644
index adbce63..0000000
--- a/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-"============================================================================
-"File:        nagelfar.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  James Pickard <james.pickard at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-"
-"Notes:       Requires nagelfar v1.1.12 or later with support for -H option.
-"             See nagelfar homepage http://nagelfar.berlios.de/.
-
-if exists('g:loaded_syntastic_tcl_nagelfar_checker')
-    finish
-endif
-let g:loaded_syntastic_tcl_nagelfar_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_tcl_nagelfar_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-H' })
-
-    let errorformat =
-        \ '%I%f: %l: N %m,'.
-        \ '%f: %l: %t %m,'.
-        \ '%-GChecking file %f'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'tcl',
-    \ 'name': 'nagelfar'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/tex/chktex.vim b/bundle/syntastic/syntax_checkers/tex/chktex.vim
deleted file mode 100644
index 9b35902..0000000
--- a/bundle/syntastic/syntax_checkers/tex/chktex.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-"============================================================================
-"File:        chktex.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_tex_chktex_checker')
-    finish
-endif
-let g:loaded_syntastic_tex_chktex_checker = 1
-
-if !exists('g:syntastic_tex_chktex_showmsgs')
-    let g:syntastic_tex_chktex_showmsgs = 1
-endif
-
-if !exists('g:syntastic_tex_chktex_sort')
-    let g:syntastic_tex_chktex_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_tex_chktex_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-q -v1' })
-
-    let errorformat =
-        \ '%EError %n in %f line %l: %m,' .
-        \ '%WWarning %n in %f line %l: %m,' .
-        \ (g:syntastic_tex_chktex_showmsgs ? '%WMessage %n in %f line %l: %m,' : '') .
-        \ '%Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'tex',
-    \ 'name': 'chktex'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/tex/lacheck.vim b/bundle/syntastic/syntax_checkers/tex/lacheck.vim
deleted file mode 100644
index f156520..0000000
--- a/bundle/syntastic/syntax_checkers/tex/lacheck.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-"============================================================================
-"File:        tex.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_tex_lacheck_checker')
-    finish
-endif
-let g:loaded_syntastic_tex_lacheck_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_tex_lacheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%-G** %f:,' .
-        \ '%E"%f"\, line %l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'tex',
-    \ 'name': 'lacheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim b/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim
deleted file mode 100644
index a66e787..0000000
--- a/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-"============================================================================
-"File:        makeinfo.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_texinfo_makeinfo_checker')
-    finish
-endif
-let g:loaded_syntastic_texinfo_makeinfo_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_texinfo_makeinfo_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], "\\m`\\zs[^']\\+\\ze'")
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_texinfo_makeinfo_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
-
-    let errorformat =
-        \ '%f:%l: %tarning: %m,' .
-        \ '%f:%l: %m,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'type': 'e' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'texinfo',
-    \ 'name': 'makeinfo'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/text/atdtool.vim b/bundle/syntastic/syntax_checkers/text/atdtool.vim
deleted file mode 100644
index e43d9dc..0000000
--- a/bundle/syntastic/syntax_checkers/text/atdtool.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-"============================================================================
-"File:        atdtool.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_text_atdtool_checker')
-    finish
-endif
-let g:loaded_syntastic_text_atdtool_checker = 1
-
-if !exists('g:syntastic_text_atdtool_sort')
-    let g:syntastic_text_atdtool_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_text_atdtool_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], '\m "\zs[^"]\+\ze"\($\| | suggestions:\)')
-    if term !=# ''
-        let col = get(a:item, 'col', 0)
-        let term = (col != 0 ? '\%' . col . 'c' : '') . '\V' . escape(term, '\')
-    endif
-    return term
-endfunction
-
-function! SyntaxCheckers_text_atdtool_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'tail': '2> ' . syntastic#util#DevNull() })
-
-    let errorformat =
-        \ '%W%f:%l:%c: %m,'.
-        \ '%+C  suggestions:%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0],
-        \ 'subtype': 'Style' })
-
-    for e in loclist
-        let e['text'] = substitute(e['text'], '\m\n\s\+', ' | ', 'g')
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'text',
-    \ 'name': 'atdtool'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/text/igor.vim b/bundle/syntastic/syntax_checkers/text/igor.vim
deleted file mode 100644
index bf6fda9..0000000
--- a/bundle/syntastic/syntax_checkers/text/igor.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        igor.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_text_igor_checker')
-    finish
-endif
-let g:loaded_syntastic_text_igor_checker = 1
-
-runtime! syntax_checkers/docbk/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'text',
-    \ 'name': 'igor',
-    \ 'redirect': 'docbk/igor'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/text/language_check.vim b/bundle/syntastic/syntax_checkers/text/language_check.vim
deleted file mode 100644
index e1aa69f..0000000
--- a/bundle/syntastic/syntax_checkers/text/language_check.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-"============================================================================
-"File:        language_check.vim
-"Description: Grammar checker (https://github.com/myint/language-check)
-"Authors:     Steven Myint <git@stevenmyint.com>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_text_language_check_checker')
-    finish
-endif
-let g:loaded_syntastic_text_language_check_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_text_language_check_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =
-        \ '%f:%l:%c: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'text',
-    \ 'name': 'language_check',
-    \ 'exec': 'language-check'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/twig/twiglint.vim b/bundle/syntastic/syntax_checkers/twig/twiglint.vim
deleted file mode 100644
index 547648f..0000000
--- a/bundle/syntastic/syntax_checkers/twig/twiglint.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-"============================================================================
-"File:        twig.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Alexander <iam.asm89 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_twig_twiglint_checker')
-    finish
-endif
-let g:loaded_syntastic_twig_twiglint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_twig_twiglint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': 'lint',
-        \ 'args_after': '--format=csv' })
-
-    let errorformat = '"%f"\,%l\,%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat})
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'twig',
-    \ 'name': 'twiglint',
-    \ 'exec': 'twig-lint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/typescript/tsc.vim b/bundle/syntastic/syntax_checkers/typescript/tsc.vim
deleted file mode 100644
index 3b81e26..0000000
--- a/bundle/syntastic/syntax_checkers/typescript/tsc.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-"============================================================================
-"File:        tsc.vim
-"Description: TypeScript syntax checker
-"Maintainer:  Bill Casarin <bill@casarin.ca>
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_typescript_tsc_checker')
-    finish
-endif
-let g:loaded_syntastic_typescript_tsc_checker = 1
-
-if !exists('g:syntastic_typescript_tsc_sort')
-    let g:syntastic_typescript_tsc_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_typescript_tsc_IsAvailable() dict
-    if !executable(self.getExec())
-        return 0
-    endif
-
-    let version_output = split(syntastic#util#system(self.getExecEscaped() . ' --version'), '\n', 1)
-    let ver = filter(copy(version_output), 'v:val =~# ''\m\<Version ''')
-    let parsed_ver = len(ver) ? syntastic#util#parseVersion(ver[0], '\v<Version \zs\d+(\.\d+)\ze') : []
-
-    if len(parsed_ver)
-        call self.setVersion(parsed_ver)
-        let s:tsc_new = syntastic#util#versionIsAtLeast(parsed_ver, [1, 5])
-    else
-        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', version_output)
-        call syntastic#log#error("checker typescript/tsc: can't parse version string (abnormal termination?)")
-        let s:tsc_new = -1
-    endif
-
-    return s:tsc_new >= 0
-endfunction
-
-function! SyntaxCheckers_typescript_tsc_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '--module commonjs',
-        \ 'args_after': (s:tsc_new ? '--noEmit' : '--out ' . syntastic#util#DevNull()) })
-
-    let errorformat =
-        \ '%E%f %#(%l\,%c): error %m,' .
-        \ '%E%f %#(%l\,%c): %m,' .
-        \ '%Eerror %m,' .
-        \ '%C%\s%\+%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'typescript',
-    \ 'name': 'tsc'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/typescript/tslint.vim b/bundle/syntastic/syntax_checkers/typescript/tslint.vim
deleted file mode 100644
index de224b6..0000000
--- a/bundle/syntastic/syntax_checkers/typescript/tslint.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-"============================================================================
-"File:        typescript/tslint.vim
-"Description: TypeScript linter
-"Maintainer:  Seon-Wook Park <seon.wook@swook.net>
-"============================================================================
-
-if exists('g:loaded_syntastic_typescript_tslint_checker')
-    finish
-endif
-let g:loaded_syntastic_typescript_tslint_checker = 1
-
-if !exists('g:syntastic_typescript_tslint_sort')
-    let g:syntastic_typescript_tslint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_typescript_tslint_GetHighlightRegex(item)
-    let term = matchstr(a:item['text'], "\\m\\s'\\zs.\\{-}\\ze'\\s")
-    return term !=# '' ? '\V' . escape(term, '\') : ''
-endfunction
-
-function! SyntaxCheckers_typescript_tslint_GetLocList() dict
-    if !exists('s:tslint_new')
-        let s:tslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
-    endif
-
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': '--format verbose',
-        \ 'fname_before': (s:tslint_new ? '' : '-f') })
-
-    " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
-    let errorformat = '%f[%l\, %c]: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'tslint',
-        \ 'subtype': 'Style',
-        \ 'returns': [0, 2] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'typescript',
-    \ 'name': 'tslint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/vala/valac.vim b/bundle/syntastic/syntax_checkers/vala/valac.vim
deleted file mode 100644
index f75f7d4..0000000
--- a/bundle/syntastic/syntax_checkers/vala/valac.vim
+++ /dev/null
@@ -1,84 +0,0 @@
-"============================================================================
-"File:        vala.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Konstantin Stepanov (me@kstep.me)
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_vala_valac_checker')
-    finish
-endif
-let g:loaded_syntastic_vala_valac_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos) " {{{1
-    let length = strlen(matchstr(a:pos['text'], '\m\^\+$'))
-    return '\%>' . (a:pos['col'] - 1) . 'c\%<' . (a:pos['col'] + length) . 'c'
-endfunction " }}}1
-
-function! SyntaxCheckers_vala_valac_GetLocList() dict " {{{1
-    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
-    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
-    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . ' ' . vala_vapi_args })
-
-    let errorformat =
-        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
-        \ '%C%m,'.
-        \ '%Z%m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:GetValaModules() " {{{2
-    if exists('g:syntastic_vala_modules')
-        if type(g:syntastic_vala_modules) == type('')
-            return split(g:syntastic_vala_modules, '\s\+')
-        elseif type(g:syntastic_vala_modules) == type([])
-            return copy(g:syntastic_vala_modules)
-        else
-            echoerr 'g:syntastic_vala_modules must be either list or string: fallback to in file modules string'
-        endif
-    endif
-
-    let modules_line = search('^// modules: ', 'n')
-    let modules_str = getline(modules_line)
-    return split(strpart(modules_str, 12), '\s\+')
-endfunction " }}}2
-
-function! s:GetValaVapiDirs() " {{{2
-    if exists('g:syntastic_vala_vapi_dirs')
-        if type(g:syntastic_vala_vapi_dirs) == type('')
-            return split(g:syntastic_vala_vapi_dirs, '\s\+')
-        elseif type(g:syntastic_vala_vapi_dirs) == type([])
-            return copy(g:syntastic_vala_vapi_dirs)
-        else
-            echoerr 'g:syntastic_vala_vapi_dirs must be either a list, or a string: fallback to in-file modules string'
-        endif
-    endif
-
-    let vapi_line = search('^//\s*vapidirs:\s*','n')
-    let vapi_str = getline(vapi_line)
-    return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'vala',
-    \ 'name': 'valac'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/verilog/verilator.vim b/bundle/syntastic/syntax_checkers/verilog/verilator.vim
deleted file mode 100644
index e5cfddc..0000000
--- a/bundle/syntastic/syntax_checkers/verilog/verilator.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        verilator.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Kocha <kocha dot lsifrontend at gmail dot com>
-"============================================================================
-
-if exists('g:loaded_syntastic_verilog_verilator_checker')
-    finish
-endif
-let g:loaded_syntastic_verilog_verilator_checker = 1
-
-if !exists('g:syntastic_verilog_compiler_options')
-    let g:syntastic_verilog_compiler_options = '-Wall'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_verilog_verilator_IsAvailable() dict
-    if !exists('g:syntastic_verilog_compiler')
-        let g:syntastic_verilog_compiler = self.getExec()
-    endif
-    call self.log('g:syntastic_verilog_compiler =', g:syntastic_verilog_compiler)
-    return executable(expand(g:syntastic_verilog_compiler, 1))
-endfunction
-
-function! SyntaxCheckers_verilog_verilator_GetLocList() dict
-    return syntastic#c#GetLocList('verilog', 'verilator', {
-        \ 'errorformat':
-        \     '%%%trror-%\=%\w%#: %f:%l: %m,' .
-        \     '%%%tarning-%\=%\w%#: %f:%l: %m',
-        \ 'main_flags': '--lint-only' })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'verilog',
-    \ 'name': 'verilator' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim b/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim
deleted file mode 100644
index 497152b..0000000
--- a/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        ghdl.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Jan Wagner <jaydyou at janidom dot de>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_vhdl_ghdl_checker')
-    finish
-endif
-let g:loaded_syntastic_vhdl_ghdl_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_vhdl_ghdl_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_before': '-s' })
-
-    let errorformat =  '%f:%l:%c: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'vhdl',
-    \ 'name': 'ghdl'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/vim/vimlint.vim b/bundle/syntastic/syntax_checkers/vim/vimlint.vim
deleted file mode 100644
index 67be033..0000000
--- a/bundle/syntastic/syntax_checkers/vim/vimlint.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-"============================================================================
-"File:        vimlint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_vim_vimlint_checker')
-    finish
-endif
-let g:loaded_syntastic_vim_vimlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item) " {{{1
-    let term = matchstr(a:item['text'], '\m `\zs[^`]\+\ze`')
-    if term !=# ''
-        let col = get(a:item, 'col', 0)
-
-        if col && term[0:1] ==# 'l:'
-            if getline(a:item.lnum)[col-1:col] !=# 'l:'
-                let term = term[2:]
-            endif
-        endif
-
-        return col ? '\%>' . (col - 1) . 'c\%<' . (col + strlen(term)) . 'c' : '\V' . escape(term, '\')
-    endif
-
-    return ''
-endfunction " }}}1
-
-function! SyntaxCheckers_vim_vimlint_IsAvailable() dict " {{{1
-    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim', 1)
-    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim', 1)
-    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim', 1) = " . string(vimlparser) . ', ' .
-                \ "globpath(&runtimepath, 'autoload/vimlint.vim', 1) = " .    string(vimlint))
-    return vimlparser !=# '' && vimlint !=# ''
-endfunction " }}}1
-
-function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
-    " EVL102: unused variable v
-    " EVL103: unused argument v
-    " EVL104: variable may not be initialized on some execution path: v
-    " EVL105: global variable v is defined without g:
-    " EVL106: local variable v is used without l:
-    " EVL201: unreachable code
-    " EVL204: constant in conditional context
-    " EVL205: missing scriptencoding
-    " value 3: the message is a warning
-    "
-    " References: :help vimlint-errorcode and :help vimlint-variables
-    let param = {
-        \ 'output': function('s:vimlintOutput'),
-        \ 'quiet':  1,
-        \ 'EVL102': 3,
-        \ 'EVL103': 3,
-        \ 'EVL104': 3,
-        \ 'EVL105': 3,
-        \ 'EVL106': 3,
-        \ 'EVL201': 3,
-        \ 'EVL204': 3,
-        \ 'EVL205': 3 }
-
-    if exists('g:syntastic_vimlint_options')
-        if type(g:syntastic_vimlint_options) == type({})
-            let options = filter(copy(g:syntastic_vimlint_options), 'v:key =~# "\\m^EVL"')
-            call extend(param, options, 'force')
-        endif
-    endif
-
-    call self.log('options =', param)
-
-    return vimlint#vimlint(expand('%', 1), param)
-endfunction " }}}1
-
-" Utilities {{{1
-
-" @vimlint(EVL103, 1, a:filename)
-function! s:vimlintOutput(filename, pos, ev, eid, mes, obj) " {{{2
-    call add(a:obj.error, {
-        \ 'bufnr': bufnr(''),
-        \ 'lnum': a:pos.lnum,
-        \ 'col': a:pos.col,
-        \ 'vcol': 0,
-        \ 'type': a:ev[0],
-        \ 'text': '[' . a:eid . '] ' . a:mes,
-        \ 'valid': a:pos.lnum > 0 })
-endfunction " }}}2
-" @vimlint(EVL103, 0, a:filename)
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'vim',
-    \ 'name': 'vimlint',
-    \ 'exec': '' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/vim/vint.vim b/bundle/syntastic/syntax_checkers/vim/vint.vim
deleted file mode 100644
index 23a041e..0000000
--- a/bundle/syntastic/syntax_checkers/vim/vint.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        vint.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_vim_vint_checker')
-    finish
-endif
-let g:loaded_syntastic_vim_vint_checker = 1
-
-if !exists('g:syntastic_vim_vint_sort')
-    let g:syntastic_vim_vint_sort = 1
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_vim_vint_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'post_args': '--json' })
-
-    let errorformat = '%f:%l:%c:%t: %m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'preprocess': 'vint',
-        \ 'returns': [0, 1] })
-
-    for e in loclist
-        if e['type'] ==? 's'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        elseif e['type'] !=? 'e' && e['type'] !=? 'w'
-            let e['type'] = 'e'
-        endif
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'vim',
-    \ 'name': 'vint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/xhtml/jshint.vim b/bundle/syntastic/syntax_checkers/xhtml/jshint.vim
deleted file mode 100644
index 413d112..0000000
--- a/bundle/syntastic/syntax_checkers/xhtml/jshint.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        jshint.vim
-"Description: Javascript syntax checker for xHTML - using jshint
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_xhtml_jshint_checker')
-    finish
-endif
-let g:loaded_syntastic_xhtml_jshint_checker = 1
-
-runtime! syntax_checkers/html/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'xhtml',
-    \ 'name': 'jshint',
-    \ 'redirect': 'html/jshint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/xhtml/tidy.vim b/bundle/syntastic/syntax_checkers/xhtml/tidy.vim
deleted file mode 100644
index 7f76d8b..0000000
--- a/bundle/syntastic/syntax_checkers/xhtml/tidy.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-"============================================================================
-"File:        xhtml.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_xhtml_tidy_checker')
-    finish
-endif
-let g:loaded_syntastic_xhtml_tidy_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-if !exists('g:syntastic_xhtml_tidy_ignore_errors')
-    let g:syntastic_xhtml_tidy_ignore_errors = []
-endif
-
-" Constants {{{1
-
-" TODO: join this with html.vim DRY's sake?
-function! s:TidyEncOptByFenc()
-    let TIDY_OPTS = {
-            \ 'utf-8':        '-utf8',
-            \ 'ascii':        '-ascii',
-            \ 'latin1':       '-latin1',
-            \ 'iso-2022-jp':  '-iso-2022',
-            \ 'cp1252':       '-win1252',
-            \ 'macroman':     '-mac',
-            \ 'utf-16le':     '-utf16le',
-            \ 'utf-16':       '-utf16',
-            \ 'big5':         '-big5',
-            \ 'cp932':        '-shiftjis',
-            \ 'sjis':         '-shiftjis',
-            \ 'cp850':        '-ibm858',
-        \ }
-    return get(TIDY_OPTS, &fileencoding, '-utf8')
-endfunction
-
-" }}}1
-
-function! SyntaxCheckers_xhtml_tidy_GetLocList() dict " {{{1
-    let encopt = s:TidyEncOptByFenc()
-    let makeprg = self.makeprgBuild({ 'args_after': encopt . ' -xml -e' })
-
-    let errorformat=
-        \ '%Wline %l column %v - Warning: %m,' .
-        \ '%Eline %l column %v - Error: %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')},
-        \ 'returns': [0, 1, 2] })
-
-    for e in loclist
-        if e['valid'] && s:IgnoreError(e['text']) == 1
-            let e['valid'] = 0
-        endif
-    endfor
-
-    return loclist
-endfunction " }}}1
-
-" Utilities {{{1
-
-function! s:IgnoreError(text) " {{{2
-    for item in g:syntastic_xhtml_tidy_ignore_errors
-        if stridx(a:text, item) != -1
-            return 1
-        endif
-    endfor
-    return 0
-endfunction " }}}2
-
-" }}}1
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'xhtml',
-    \ 'name': 'tidy'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/xml/plutil.vim b/bundle/syntastic/syntax_checkers/xml/plutil.vim
deleted file mode 100644
index 8e80dde..0000000
--- a/bundle/syntastic/syntax_checkers/xml/plutil.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        plutil.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_xml_plutil_checker')
-    finish
-endif
-let g:loaded_syntastic_xml_plutil_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_xml_plutil_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': '-lint -s',
-        \ 'fname_before': '--' })
-
-    let errorformat =
-        \ '%E%f: %m at line %l'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'xml',
-    \ 'name': 'plutil'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/xml/xmllint.vim b/bundle/syntastic/syntax_checkers/xml/xmllint.vim
deleted file mode 100644
index 1300437..0000000
--- a/bundle/syntastic/syntax_checkers/xml/xmllint.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-"============================================================================
-"File:        xml.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Sebastian Kusnier <sebastian at kusnier dot net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_xml_xmllint_checker')
-    finish
-endif
-let g:loaded_syntastic_xml_xmllint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-" You can use a local installation of DTDs to significantly speed up validation
-" and allow you to validate XML data without network access, see xmlcatalog(1)
-" and http://www.xmlsoft.org/catalog.html for more information.
-
-function! SyntaxCheckers_xml_xmllint_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': '--xinclude --postvalid',
-        \ 'args_after': '--noout' })
-
-    let errorformat=
-        \ '%E%f:%l: error : %m,' .
-        \ '%-G%f:%l: validity error : Validation failed: no DTD found %m,' .
-        \ '%W%f:%l: warning : %m,' .
-        \ '%W%f:%l: validity warning : %m,' .
-        \ '%E%f:%l: validity error : %m,' .
-        \ '%E%f:%l: parser error : %m,' .
-        \ '%E%f:%l: %m,' .
-        \ '%-Z%p^,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0, 1, 2, 3, 4, 5] })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'xml',
-    \ 'name': 'xmllint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/xslt/xmllint.vim b/bundle/syntastic/syntax_checkers/xslt/xmllint.vim
deleted file mode 100644
index 1f16a46..0000000
--- a/bundle/syntastic/syntax_checkers/xslt/xmllint.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-"============================================================================
-"File:        xslt.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Sebastian Kusnier <sebastian at kusnier dot net>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_xslt_xmllint_checker')
-    finish
-endif
-let g:loaded_syntastic_xslt_xmllint_checker = 1
-
-runtime! syntax_checkers/xml/*.vim
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'xslt',
-    \ 'name': 'xmllint',
-    \ 'redirect': 'xml/xmllint'})
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/yacc/bison.vim b/bundle/syntastic/syntax_checkers/yacc/bison.vim
deleted file mode 100644
index af8ac91..0000000
--- a/bundle/syntastic/syntax_checkers/yacc/bison.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"============================================================================
-"File:        yacc.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_yacc_bison_checker')
-    finish
-endif
-let g:loaded_syntastic_yacc_bison_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_yacc_bison_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_after': syntastic#c#NullOutput() })
-
-    let errorformat =
-        \ '%E%f:%l%.%v-%.%\{-}: %trror: %m,' .
-        \ '%E%f:%l%.%v: %trror: %m,' .
-        \ '%W%f:%l%.%v-%.%\{-}: %tarning: %m,' .
-        \ '%W%f:%l%.%v: %tarning: %m,' .
-        \ '%I%f:%l%.%v-%.%\{-}: %\s%\+%m,' .
-        \ '%I%f:%l%.%v: %\s%\+%m'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-
-    let last_type = 'E'
-    for e in loclist
-        if e['type'] ==? 'I'
-            let e['type'] = last_type
-        endif
-        let last_type = e['type']
-    endfor
-
-    return loclist
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'yacc',
-    \ 'name': 'bison'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim b/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim
deleted file mode 100644
index e8baa7e..0000000
--- a/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-"============================================================================
-"File:        yaml.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_yaml_jsyaml_checker')
-    finish
-endif
-let g:loaded_syntastic_yaml_jsyaml_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
-    if !exists('s:js_yaml_new')
-        let s:js_yaml_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
-    endif
-
-    let makeprg = self.makeprgBuild({ 'args_after': (s:js_yaml_new ? '' : '--compact') })
-
-    let errorformat =
-        \ 'Error on line %l\, col %c:%m,' .
-        \ 'JS-YAML: %m at line %l\, column %c:,' .
-        \ 'YAMLException: %m at line %l\, column %c:,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'yaml',
-    \ 'name': 'jsyaml',
-    \ 'exec': 'js-yaml'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim b/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim
deleted file mode 100644
index ace118a..0000000
--- a/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-"============================================================================
-"File:        yamlxs.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  LCD 47 <lcd047 at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_yaml_yamlxs_checker')
-    finish
-endif
-let g:loaded_syntastic_yaml_yamlxs_checker = 1
-
-if !exists('g:syntastic_perl_lib_path')
-    let g:syntastic_perl_lib_path = []
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
-    if !exists('g:syntastic_yaml_yamlxs_exec') && exists('g:syntastic_perl_interpreter')
-        let g:syntastic_yaml_yamlxs_exec = g:syntastic_perl_interpreter
-    endif
-
-    " don't call executable() here, to allow things like
-    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
-    silent! call syntastic#util#system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
-    return v:shell_error == 0
-endfunction
-
-function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args_before': s:Modules() . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
-
-    let errorformat =
-        \ '%EYAML::XS::Load Error: The problem:,' .
-        \ '%-C,' .
-        \ '%C    %m,' .
-        \ '%Cwas found at document: %\d%\+\, line: %l\, column: %c,' .
-        \ '%-G%.%#'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'postprocess': ['compressWhitespace'],
-        \ 'defaults': {'bufnr': bufnr('')} })
-endfunction
-
-function s:Modules()
-    if type(g:syntastic_perl_lib_path) == type('')
-        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
-        let includes = split(g:syntastic_perl_lib_path, ',')
-    else
-        let includes = copy(syntastic#util#var('perl_lib_path'))
-    endif
-    return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'yaml',
-    \ 'name': 'yamlxs',
-    \ 'exec': 'perl' })
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
deleted file mode 100644
index af61a8b..0000000
--- a/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-"============================================================================
-"File:        z80syntaxchecker.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Romain Giot <giot.romain at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_z80_z80syntaxchecker_checker')
-    finish
-endif
-let g:loaded_syntastic_z80_z80syntaxchecker_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_z80_z80syntaxchecker_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat =  '%f:%l %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'z80',
-    \ 'name': 'z80syntaxchecker',
-    \ 'exec': 'z80_syntax_checker.py'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/zpt/zptlint.vim b/bundle/syntastic/syntax_checkers/zpt/zptlint.vim
deleted file mode 100644
index 31a6093..0000000
--- a/bundle/syntastic/syntax_checkers/zpt/zptlint.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"============================================================================
-"File:        zpt.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  claytron <robots at claytron dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_zpt_zptlint_checker')
-    finish
-endif
-let g:loaded_syntastic_zpt_zptlint_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_zpt_zptlint_GetLocList() dict
-    let makeprg = self.makeprgBuild({})
-
-    let errorformat=
-        \ '%-P*** Error in: %f,'.
-        \ '%Z%*\s\, at line %l\, column %c,'.
-        \ '%E%*\s%m,'.
-        \ '%-Q'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat })
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'zpt',
-    \ 'name': 'zptlint'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/syntastic/syntax_checkers/zsh/zsh.vim b/bundle/syntastic/syntax_checkers/zsh/zsh.vim
deleted file mode 100644
index 4d458de..0000000
--- a/bundle/syntastic/syntax_checkers/zsh/zsh.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-"============================================================================
-"File:        zsh.vim
-"Description: Syntax checking plugin for syntastic.vim
-"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-"License:     This program is free software. It comes without any warranty,
-"             to the extent permitted by applicable law. You can redistribute
-"             it and/or modify it under the terms of the Do What The Fuck You
-"             Want To Public License, Version 2, as published by Sam Hocevar.
-"             See http://sam.zoy.org/wtfpl/COPYING for more details.
-"
-"============================================================================
-
-if exists('g:loaded_syntastic_zsh_zsh_checker')
-    finish
-endif
-let g:loaded_syntastic_zsh_zsh_checker = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_zsh_zsh_GetLocList() dict
-    let makeprg = self.makeprgBuild({ 'args_after': '-n' })
-
-    let errorformat = '%f:%l: %m'
-
-    return SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat})
-endfunction
-
-call g:SyntasticRegistry.CreateAndRegisterChecker({
-    \ 'filetype': 'zsh',
-    \ 'name': 'zsh'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/colors/256-grayvim.vim b/colors/256-grayvim.vim
deleted file mode 100755
index fc81da0..0000000
--- a/colors/256-grayvim.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" Vim color file
-" Maintainer:	Piotr Husiatyński <phusiatynski@gmail.com>
-
-set background=dark
-set t_Co=256
-let g:colors_name="256-grayvim"
-
-let python_highlight_all = 1
-let c_gnu = 1
-
-
-hi Normal	    ctermfg=253         ctermbg=235        cterm=None
-hi Cursor       ctermfg=Red         ctermbg=None       cterm=None
-hi SpecialKey	ctermfg=87          ctermbg=None       cterm=Bold
-hi Directory	ctermfg=76          ctermbg=None       cterm=None
-hi ErrorMsg     ctermfg=124         ctermbg=White      cterm=None
-hi PreProc	    ctermfg=246         ctermbg=None       cterm=Bold
-hi Search	    ctermfg=160         ctermbg=232        cterm=Bold
-hi Type		    ctermfg=75          ctermbg=None       cterm=Bold
-hi Statement	ctermfg=75          ctermbg=None       cterm=None
-hi Comment	    ctermfg=244         ctermbg=None       cterm=None
-hi Identifier	ctermfg=111         ctermbg=None       cterm=Bold
-hi DiffText	    ctermfg=88          ctermbg=250        cterm=None
-hi Constant	    ctermfg=208         ctermbg=None       cterm=None
-hi Todo         ctermfg=233         ctermbg=118        cterm=Bold
-hi Error	    ctermfg=233         ctermbg=124        cterm=Bold
-hi Special	    ctermfg=160         ctermbg=None       cterm=Bold
-hi Ignore       ctermfg=220         ctermbg=None       cterm=Bold
-hi Underline    ctermfg=244         ctermbg=None       cterm=None
-
-hi FoldColumn	ctermfg=247         ctermbg=None       cterm=Bold
-hi StatusLineNC ctermfg=247         ctermbg=234        cterm=None
-hi StatusLine   ctermfg=247         ctermbg=233        cterm=Bold
-hi VertSplit    ctermfg=247         ctermbg=234        cterm=Bold
-
-hi LineNr	    ctermfg=238         ctermbg=244        cterm=Bold
-hi LineNr	    ctermfg=247         ctermbg=235        cterm=Bold
-hi NonText	    ctermfg=87          ctermbg=None       cterm=Bold
-
-
-hi Pmenu        ctermfg=White       ctermbg=DarkGray    cterm=None
-hi PmenuSel     ctermfg=None        ctermbg=Gray        cterm=Bold
-hi PmenuSbar    ctermfg=DarkGray    ctermbg=DarkGray    cterm=None
-hi PmenuThumb   ctermfg=Gray        ctermbg=Gray        cterm=None
-
-"vim: sw=4
diff --git a/colors/256-jungle.vim b/colors/256-jungle.vim
deleted file mode 100755
index 1ff3d79..0000000
--- a/colors/256-jungle.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" Vim color file
-" Maintainer:	Piotr Husiatyński <phusiatynski@gmail.com>
-
-set background=dark
-set t_Co=256
-let g:colors_name="256-jungle"
-
-let python_highlight_all = 1
-let c_gnu = 1
-
-
-hi Normal	    ctermfg=253         ctermbg=234         cterm=None
-hi Cursor       ctermfg=253         ctermbg=57          cterm=None
-hi SpecialKey	ctermfg=70          ctermbg=None        cterm=None
-hi Directory	ctermfg=57          ctermbg=254         cterm=None
-hi ErrorMsg     ctermfg=160         ctermbg=245         cterm=None
-hi PreProc	    ctermfg=243         ctermbg=None        cterm=Bold
-hi Search	    ctermfg=125         ctermbg=None        cterm=Bold
-hi Type		    ctermfg=166         ctermbg=None        cterm=Bold
-hi Statement	ctermfg=172         ctermbg=None        cterm=Bold
-hi Comment	    ctermfg=240         ctermbg=None        cterm=None
-hi LineNr	    ctermfg=244         ctermbg=233         cterm=None
-hi NonText	    ctermfg=105         ctermbg=None        cterm=Bold
-hi DiffText	    ctermfg=165         ctermbg=244         cterm=None
-hi Constant	    ctermfg=76          ctermbg=None        cterm=None
-hi Todo         ctermfg=162         ctermbg=None        cterm=Bold
-hi Identifier	ctermfg=142         ctermbg=None        cterm=Bold
-hi Error	    ctermfg=None        ctermbg=196         cterm=Bold
-hi Special	    ctermfg=172         ctermbg=None        cterm=Bold
-hi Ignore       ctermfg=221         ctermbg=None        cterm=Bold
-hi Underline    ctermfg=147         ctermbg=None        cterm=Italic
-
-hi FoldColumn	ctermfg=132         ctermbg=None        cterm=None
-hi Folded       ctermfg=132         ctermbg=None        cterm=Bold
-
-hi Visual       ctermfg=248         ctermbg=238         cterm=None
-
-hi Pmenu        ctermfg=62          ctermbg=233         cterm=None
-hi PmenuSel     ctermfg=69          ctermbg=232         cterm=Bold
-hi PmenuSbar    ctermfg=247         ctermbg=233         cterm=Bold
-hi PmenuThumb   ctermfg=248         ctermbg=233         cterm=None
-
-hi StatusLineNC ctermfg=248         ctermbg=239         cterm=None
-hi StatusLine   ctermfg=39          ctermbg=239         cterm=None
-hi VertSplit    ctermfg=239         ctermbg=239         cterm=None
-
-hi TabLine      ctermfg=245         ctermbg=239         cterm=None
-hi TabLineFill  ctermfg=239         ctermbg=239
-hi TabLineSel   ctermfg=104         ctermbg=236         cterm=Bold
-"vim: sw=4
diff --git a/colors/3dglasses.vim b/colors/3dglasses.vim
deleted file mode 100755
index c220ae0..0000000
--- a/colors/3dglasses.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-" Vim color file
-" Name: 3dglasses
-" Maintainer: Erik Falor <ewfalor@gmail.com>
-" Version: 1.1.1
-"
-" 	Version 1.1.1:	Modified MatchParen group so that Matching < > in XML
-" 	files stand out better.
-"
-" 	Version 1.1:	Added support for GetLatestVimScripts
-"
-" 	Version 1.0:	Initial upload
-" GetLatestVimScripts: 2019 1 :AutoInstall: 3dglasses.vim
-
-set background=dark
-if version < 700 
-	finish
-else 
-	if exists("syntax_on")
-		hi clear
-		syntax reset
-	endif
-endif
-
-"map <F1> :echo synIDattr(synID(line("."), col("."), 1), "name")<CR>
-let g:colors_name="3dglasses"
-
-"3D Glasses palette
-" {{{
-let s:White			=	['#ffffff', '#dddddd', '#bbbbbb']
-let s:Black			=	['#000000', '#001621', '#1B3641', '#00222B']
-let s:DarkBlue		=	['#00117B', '#0D4CAD', '#01BEF6']
-let s:LightBlue		=	['#004455', '#0088AA', '#00CCFF', '#55DDFF', '#80E5FF']
-let s:Red			=	['#2b0000', '#800000', '#AA0000', '#FF0000', '#FF2A2A', '#FF5555']
-" }}}
-
-hi Normal      guibg=#00222B guifg=#00ffff
-execute "hi Normal			guibg=" . s:Black[3]  . " guifg=" . s:LightBlue[4]
-execute "hi NonText			guibg=" . s:Black[3] . " guifg=" . s:Red[1]
-
-" {{{ syntax
-execute "hi Comment			gui=italic guifg=" . s:LightBlue[2]
-execute "hi Conditional		gui=bold guifg=" . s:LightBlue[1]
-execute "hi Constant		gui=bold guifg=" . s:Red[2]
-execute "hi Error			guifg=" . s:Red[5] . " guibg=" . s:Red[0]
-execute "hi Identifier		gui=bold guifg=" . s:Red[3]
-execute "hi Ignore			guifg=" . s:Red[1]
-execute "hi Operator		gui=bold guifg=" . s:Red[5]
-execute "hi PreProc			gui=bold guifg=" . s:Red[3]
-execute "hi Repeat			gui=bold guifg=" . s:LightBlue[3]
-execute "hi Special			guifg=" . s:LightBlue[1]
-execute "hi Statement		gui=bold guifg=" . s:LightBlue[2]
-execute "hi String			guifg=" . s:DarkBlue[2]
-execute "hi Title			guifg=" . s:White[0]
-execute "hi Todo			gui=bold guisp=NONE guibg=NONE guifg=" . s:Red[4] 
-execute "hi Type			guifg=" . s:LightBlue[4]
-execute "hi Underlined		gui=underline guifg=" . s:LightBlue[0]
-" }}}
-
-" {{{ groups
-"execute "hi CursorIM		TODO
-"execute "hi DiffAdd		
-"execute "hi DiffChange	
-"execute "hi DiffDelete	
-"execute "hi DiffText	
-execute "hi Directory		guifg=" . s:LightBlue[0]
-"execute "hi Scrollbar		TODO
-"execute "hi SignColumn
-"execute "hi SpecialKey		guifg=" . s:Red[2]
-"execute "hi SpellBad	
-"execute "hi SpellCap	
-"execute "hi SpellLocal	
-"execute "hi SpellRare	
-
-execute "hi Cursor			guibg=" . s:DarkBlue[2] . " guifg=" . s:DarkBlue[0]
-execute "hi CursorColumn	guibg=" . s:Red[0]
-execute "hi CursorLine		guibg=" . s:Red[0]
-execute "hi ErrorMsg		guifg=" . s:White[0] . " guibg=" . s:Red[1]
-execute "hi FoldColumn		guibg=" . s:Red[0] . " guifg=" . s:Red[2]
-execute "hi Folded			guibg=" . s:Red[0] . " guifg=" . s:Red[2]
-execute "hi IncSearch		gui=none guibg=" . s:Red[2] . " guifg=" . s:Red[0] 
-execute "hi LineNr			guibg=" . s:Black[3] . " guifg=" . s:Red[3]
-execute "hi MatchParen		guibg=" . s:Red[2] 
-execute "hi ModeMsg			guibg=NONE guifg=" . s:LightBlue[2]
-execute "hi MoreMsg			guibg=NONE guifg=" . s:Red[2]
-execute "hi Pmenu			guibg=" . s:LightBlue[3] . " guifg=" . s:DarkBlue[0]
-execute "hi PmenuSbar		guibg=" . s:LightBlue[3] . " guifg=" . s:Red[0]
-execute "hi PmenuSel		gui=bold guibg=" . s:LightBlue[3] . " guifg=" . s:Red[4]
-execute "hi PmenuThumb		guibg=" . s:LightBlue[3] . " guifg=" . s:Red[4]
-execute "hi Question		guifg=" . s:Red[2]
-execute "hi Search			gui=bold guisp=NONE guibg=" . s:LightBlue[4] 
-execute "hi StatusLine		gui=none guibg=" . s:LightBlue[2] . " guifg=" . s:LightBlue[0]
-execute "hi StatusLineNC	gui=none guibg=" . s:Red[1] . " guifg=" . s:Red[4]
-execute "hi TabLine			guibg=" . s:Red[1] . " guifg=" . s:Red[3]
-execute "hi TabLineFill		guifg=" . s:Red[1]
-execute "hi TabLineSel		guibg=" . s:LightBlue[3] . " guifg=" . s:DarkBlue[0]
-execute "hi Title			gui=bold guifg=" . s:Red[3]
-execute "hi VertSplit		gui=none guibg=" . s:Red[1] . " guifg=" . s:Red[4]
-execute "hi Visual			guibg=" . s:Red[4] . " guifg=" . s:Red[0]
-execute "hi VisualNOS		gui=underline guibg=NONE"
-execute "hi WarningMsg		guifg=" . s:Red[3]
-execute "hi WildMenu		guifg=" . s:Red[0] . " guibg=" . s:Red[4]
-" }}}
-
-"  {{{ GUI
-"hi Menu      TODO
-"hi Scrollbar TODO
-execute "hi Tooltip			gui=none guibg=" . s:LightBlue[0] . " guifg=" . s:White[1]
-" }}}
-"
-" vim:foldmethod=marker:
diff --git a/colors/BlackSea.vim b/colors/BlackSea.vim
deleted file mode 100755
index a98b7ca..0000000
--- a/colors/BlackSea.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" Vim color file
-" Maintainer:   Gerald S. Williams
-" Last Change:  2007 Jun 13
-
-" This is a dark version/opposite of "seashell". The cterm version of this is
-" very similar to "evening".
-"
-" Only values that differ from defaults are specified.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "BlackSea"
-
-hi Normal guibg=Black guifg=seashell ctermfg=White
-hi NonText guifg=LavenderBlush ctermfg=LightMagenta
-hi DiffDelete guibg=DarkRed guifg=Black ctermbg=DarkRed ctermfg=White
-hi DiffAdd guibg=DarkGreen ctermbg=DarkGreen ctermfg=White
-hi DiffChange guibg=Gray30 ctermbg=DarkCyan ctermfg=White
-hi DiffText gui=NONE guibg=DarkCyan ctermbg=DarkCyan ctermfg=Yellow
-hi Comment guifg=LightBlue
-hi PreProc ctermfg=Magenta
-hi StatusLine guibg=#1f001f guifg=DarkSeaGreen cterm=NONE ctermfg=White ctermbg=DarkGreen
-hi StatusLineNC guifg=Gray
-hi VertSplit guifg=Gray
-hi Type gui=NONE
-hi Identifier guifg=Cyan
-hi Statement guifg=brown3 ctermfg=DarkRed
-hi Search guibg=Gold3 ctermfg=White
-hi Folded guibg=gray20
-hi FoldColumn guibg=gray10
-
-" Original values:
-"hi Constant guifg=DeepPink
-"hi PreProc guifg=Magenta ctermfg=Magenta
diff --git a/colors/ChocolateLiquor.vim b/colors/ChocolateLiquor.vim
deleted file mode 100755
index 9dfa712..0000000
--- a/colors/ChocolateLiquor.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" Vim color file
-" Maintainer:   Gerald S. Williams
-" Last Change:  2007 Jun 13
-
-" This started as a dark version (perhaps opposite is a better term) of
-" PapayaWhip, but took on a life of its own. Easy on the eyes, but still has
-" good contrast. Not bad on a color terminal, either (especially if yours
-" default to PapayaWhip text on a ChocolateLiquor/#3f1f1f background).
-"
-" Only values that differ from defaults are specified.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "ChocolateLiquor"
-
-hi Normal guibg=#3f1f1f guifg=PapayaWhip ctermfg=White
-hi NonText guibg=#1f0f0f guifg=Brown2 ctermfg=Brown ctermbg=Black
-hi LineNr guibg=#1f0f0f guifg=Brown2
-hi DiffDelete guibg=DarkRed guifg=White ctermbg=DarkRed ctermfg=White
-hi DiffAdd guibg=DarkGreen guifg=White ctermbg=DarkGreen ctermfg=White
-hi DiffText gui=NONE guibg=DarkCyan guifg=Yellow ctermbg=DarkCyan ctermfg=Yellow
-hi DiffChange guibg=DarkCyan guifg=White ctermbg=DarkCyan ctermfg=White
-hi Constant ctermfg=Red
-hi Comment guifg=LightBlue3
-hi PreProc guifg=Plum ctermfg=Magenta
-hi StatusLine guibg=White guifg=Sienna4 cterm=NONE ctermfg=Black ctermbg=Brown
-hi StatusLineNC gui=NONE guifg=Black guibg=Gray ctermbg=Black ctermfg=Gray
-hi VertSplit guifg=Gray
-hi Search guibg=Gold3 ctermfg=Blue
-hi Type gui=NONE guifg=DarkSeaGreen2
-hi Statement gui=NONE guifg=Gold3
-hi FoldColumn guibg=#1f0f0f ctermfg=Cyan ctermbg=Black
-hi Folded guibg=grey20 ctermfg=Cyan ctermbg=Black
diff --git a/colors/ChocolatePapaya.vim b/colors/ChocolatePapaya.vim
deleted file mode 100755
index d0f2343..0000000
--- a/colors/ChocolatePapaya.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-" Vim color file
-" Maintainer:   Gerald S. Williams
-" Last Change:  2007 Jun 13
-"
-" This is merely a combination of PapayaWhip and ChocolateLiquor, which
-" started out as light and dark versions of each other anyway.
-
-let s:ChocolatePapaya_style = &background
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "ChocolatePapaya"
-
-if s:ChocolatePapaya_style == 'light'
-    hi Normal guifg=#3f1f1f guibg=PapayaWhip ctermbg=Gray ctermfg=Black
-    hi NonText guibg=Moccasin guifg=Brown ctermfg=Brown
-    hi LineNr guibg=Moccasin
-    hi DiffDelete guibg=LightRed guifg=Black ctermbg=DarkRed ctermfg=White
-    hi DiffAdd guibg=LightGreen ctermbg=DarkGreen ctermfg=White
-    hi DiffChange guibg=LightCyan3 ctermbg=DarkCyan ctermfg=White
-    hi DiffText gui=NONE guibg=Gray80 ctermbg=DarkCyan ctermfg=Yellow
-    hi Comment guifg=MediumBlue
-    hi Constant guifg=DeepPink
-    hi PreProc guifg=DarkMagenta
-    hi StatusLine guibg=White guifg=#5f3705 cterm=bold ctermbg=Brown ctermfg=White
-    hi StatusLineNC gui=None guibg=Gray
-    hi VertSplit gui=None guibg=Gray
-    hi Identifier guifg=#005f5f
-    hi Statement ctermfg=DarkRed
-    hi MatchParen guibg=burlywood
-else
-    hi Normal guibg=#3f1f1f guifg=PapayaWhip ctermfg=White
-    hi NonText guibg=#1f0f0f guifg=Brown2 ctermfg=Brown ctermbg=Black
-    hi LineNr guibg=#1f0f0f guifg=Brown2
-    hi DiffDelete guibg=DarkRed guifg=White ctermbg=DarkRed ctermfg=White
-    hi DiffAdd guibg=DarkGreen guifg=White ctermbg=DarkGreen ctermfg=White
-    hi DiffText gui=NONE guibg=DarkCyan guifg=Yellow ctermbg=DarkCyan ctermfg=Yellow
-    hi DiffChange guibg=DarkCyan guifg=White ctermbg=DarkCyan ctermfg=White
-    hi Constant ctermfg=Red
-    hi Comment guifg=LightBlue3
-    hi PreProc guifg=Plum ctermfg=Magenta
-    hi StatusLine guibg=White guifg=Sienna4 cterm=NONE ctermfg=Black ctermbg=Brown
-    hi StatusLineNC gui=NONE guifg=Black guibg=Gray ctermbg=Black ctermfg=Gray
-    hi VertSplit guifg=Gray
-    hi Search guibg=Gold3 ctermfg=Blue
-    hi Type gui=NONE guifg=DarkSeaGreen2
-    hi Statement gui=NONE guifg=Gold3
-    hi FoldColumn guibg=#1f0f0f ctermfg=Cyan ctermbg=Black
-    hi Folded guibg=grey20 ctermfg=Cyan ctermbg=Black
-endif
diff --git a/colors/CodeFactoryv3.vim b/colors/CodeFactoryv3.vim
deleted file mode 100755
index 292e0e1..0000000
--- a/colors/CodeFactoryv3.vim
+++ /dev/null
@@ -1,266 +0,0 @@
-" Vim color file
-" Name: openbsd
-" Author: Dee Sub Wun
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "openbsd"
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"                                      GUI                                     "
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-
-""""""
-" SYNTAX HIGHLIGHTING
-""""""""""""""""""""""""
-hi Constant         gui=NONE              guifg=#93BF3D         guibg=NONE
-hi String           gui=NONE              guifg=#AFAFBE         guibg=NONE
-hi Character        gui=NONE              guifg=#EBAF12         guibg=NONE
-hi Number           gui=NONE              guifg=#AFAFBE         guibg=NONE
-hi Boolean          gui=NONE              guifg=#AFAFBE         guibg=NONE
-hi Float            gui=NONE              guifg=#AFAFBE         guibg=NONE
-hi Comment          gui=italic            guifg=#009AB5         guibg=NONE
-
-hi Identifier       gui=NONE              guifg=#BF3131         guibg=NONE
-hi Function         gui=NONE              guifg=#DEDEDE         guibg=NONE
-
-hi Statement        gui=bold              guifg=#EBAF12         guibg=NONE
-hi Conditional      gui=bold              guifg=#EBAF12         guibg=NONE
-hi Repeat           gui=bold              guifg=#EBAF12         guibg=NONE
-hi Label            gui=bold              guifg=#EBAF12         guibg=NONE
-hi Operator         gui=NONE              guifg=#808080         guibg=NONE
-hi Keyword          gui=bold              guifg=#EBAF12         guibg=NONE
-hi Exception        gui=NONE              guifg=#C067CC         guibg=NONE
-
-hi PreProc          gui=NONE              guifg=#C067CC         guibg=NONE
-hi Include          gui=NONE              guifg=#C067CC         guibg=NONE
-hi Define           gui=NONE              guifg=#C067CC         guibg=NONE
-hi Macro            gui=NONE              guifg=#C067CC         guibg=NONE
-hi PreCondit        gui=NONE              guifg=#C067CC         guibg=NONE
-
-hi Type             gui=NONE              guifg=#93BF3D         guibg=NONE
-hi StorageClass     gui=NONE              guifg=#93BF3D         guibg=NONE
-hi Structure        gui=NONE              guifg=#93BF3D         guibg=NONE
-hi Typedef          gui=NONE              guifg=#93BF3D         guibg=NONE
-
-hi Special          gui=NONE              guifg=#BF3131         guibg=NONE
-hi SpecialChar      gui=NONE              guifg=#BF3131         guibg=NONE
-hi Tag              gui=NONE              guifg=#BF3131         guibg=NONE
-hi Delimiter        gui=NONE              guifg=#BF3131         guibg=NONE
-hi SpecialComment   gui=NONE              guifg=#BF3131         guibg=NONE
-hi Debug            gui=NONE              guifg=#BF3131         guibg=NONE
-
-hi Underlined       gui=underline         guifg=#505050         guibg=NONE
-
-hi Ignore           gui=NONE              guifg=#222222         guibg=NONE
-
-hi Error            gui=bold              guifg=#FFFFFF         guibg=#BF3131
-
-hi Todo             gui=NONE              guifg=#505050         guibg=#93BF3D
-
-
-""""""
-" INTERFACE
-""""""""""""""""""""""""
-hi Cursor           gui=bold              guifg=#000000         guibg=#FFFFFF
-hi Directory        gui=NONE              guifg=#93BF3D         guibg=NONE
-hi ErrorMsg         gui=bold              guifg=#FFFFFF         guibg=#BF3131
-hi LineNr           gui=NONE              guifg=#222222         guibg=#979797
-hi MatchParen       gui=bold              guifg=#000000         guibg=#93BF3D
-hi ModeMsg          gui=NONE              guifg=#EBAF12         guibg=NONE
-hi MoreMsg          gui=NONE              guifg=#93BF3D         guibg=NONE
-hi NonText          gui=bold              guifg=#0F629E         guibg=NONE
-hi Normal           gui=NONE              guifg=#DEDEDE         guibg=#4A4A4A
-hi Question         gui=NONE              guifg=#93BF3D         guibg=NONE
-hi SpecialKey       gui=NONE              guifg=#93BF3D         guibg=NONE
-hi Title            gui=NONE              guifg=#C067CC         guibg=NONE
-hi VertSplit        gui=reverse           guifg=#222222         guibg=#979797
-hi WarningMsg       gui=NONE              guifg=#FFFFFF         guibg=#BF3131
-hi WildMenu         gui=NONE              guifg=#000000         guibg=#EBAF12
-
-
-""""""
-" TABS
-""""""""""""""""""""""""
-hi TabLine          gui=bold,reverse      guifg=#222222         guibg=#000000
-hi TabLineFill      gui=bold,reverse      guifg=#222222         guibg=#505050
-hi TabLineSel       gui=bold,reverse      guifg=#EBAF12         guibg=#000000
-
-
-""""""
-" COMPLETION
-""""""""""""""""""""""""
-hi Pmenu            gui=NONE              guifg=#DEDEDE         guibg=#0F629E
-hi PmenuSel         gui=NONE              guifg=#000000         guibg=#EBAF12
-
-
-""""""
-" STATUS
-""""""""""""""""""""""""
-hi StatusLine       gui=bold,reverse      guifg=#EBAF12         guibg=#000000
-hi StatusLineNC     gui=bold,reverse      guifg=#222222         guibg=#979797
-
-
-""""""
-" DIFF
-""""""""""""""""""""""""
-hi DiffAdd          gui=NONE              guifg=NONE            guibg=#0F629E
-hi DiffChange       gui=NONE              guifg=NONE            guibg=#C067CC
-hi DiffDelete       gui=bold              guifg=#0F629E         guibg=#009AB5
-hi DiffText         gui=bold              guibg=#BF3131         guibg=NONE
-
-
-""""""
-" VISUAL
-""""""""""""""""""""""""
-hi Visual           gui=NONE              guifg=#FFFFFF         guibg=#0F629E
-hi VisualNOS        gui=bold,underline    guifg=NONE            guibg=NONE
-
-
-""""""
-" FOLDING
-""""""""""""""""""""""""
-hi Folded           gui=NONE              guifg=#222222         guibg=NONE
-hi FoldColumn       gui=NONE              guifg=#222222         guibg=NONE
-
-
-""""""
-" SEARCH
-""""""""""""""""""""""""
-hi IncSearch        gui=NONE              guifg=#FFFFFF          guibg=#93BF3D
-hi Search           gui=NONE              guifg=#FFFFFF          guibg=#93BF3D
-
-
-
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"                                      NO GUI                                  "
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-
-""""""
-" SYNTAX HIGHLIGHTING
-""""""""""""""""""""""""
-hi Constant         cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi String           cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi Character        cterm=NONE              ctermfg=brown           ctermbg=NONE
-hi Number           cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi Boolean          cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi Float            cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi Comment          cterm=NONE              ctermfg=darkcyan        ctermbg=NONE
-
-hi Identifier       cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi Function         cterm=NONE              ctermfg=grey            ctermbg=NONE
-
-hi Statement        cterm=NONE              ctermfg=yellow          ctermbg=NONE
-hi Conditional      cterm=NONE              ctermfg=yellow          ctermbg=NONE
-hi Repeat           cterm=NONE              ctermfg=yellow          ctermbg=NONE
-hi Label            cterm=NONE              ctermfg=yellow          ctermbg=NONE
-hi Operator         cterm=NONE              ctermfg=grey            ctermbg=NONE
-hi Keyword          cterm=NONE              ctermfg=yellow          ctermbg=NONE
-hi Exception        cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-
-hi PreProc          cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-hi Include          cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-hi Define           cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-hi Macro            cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-hi PreCondit        cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-
-hi Type             cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi StorageClass     cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi Structure        cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi Typedef          cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-
-hi Special          cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi SpecialChar      cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi Tag              cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi Delimiter        cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi SpecialComment   cterm=NONE              ctermfg=darkred         ctermbg=NONE
-hi Debug            cterm=NONE              ctermfg=darkred         ctermbg=NONE
-
-hi Underlined       cterm=underline         ctermfg=grey            ctermbg=NONE
-
-hi Ignore           cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-
-hi Error            cterm=NONE              ctermfg=white           ctermbg=darkred
-
-hi Todo             cterm=NONE              ctermfg=grey            ctermbg=darkgreen
-
-
-""""""
-" INTERFACE
-""""""""""""""""""""""""
-hi Cursor           cterm=NONE              ctermfg=black           ctermbg=brown
-hi Directory        cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi ErrorMsg         cterm=NONE              ctermfg=white           ctermbg=darkred
-hi LineNr           cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi MatchParen       cterm=NONE              ctermfg=black           ctermbg=green
-hi ModeMsg          cterm=NONE              ctermfg=brown           ctermbg=NONE
-hi MoreMsg          cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi NonText          cterm=NONE              ctermfg=darkblue        ctermbg=NONE
-hi Question         cterm=NONE              ctermfg=green           ctermbg=NONE
-hi SpecialKey       cterm=NONE              ctermfg=darkgreen       ctermbg=NONE
-hi Title            cterm=NONE              ctermfg=darkmagenta     ctermbg=NONE
-hi VertSplit        cterm=bold,reverse      ctermfg=darkgrey        ctermbg=black
-hi WarningMsg       cterm=NONE              ctermfg=white           ctermbg=darkred
-hi WildMenu         cterm=NONE              ctermfg=black           ctermbg=brown
-
-
-""""""
-" TABS
-""""""""""""""""""""""""
-hi TabLine          cterm=bold,reverse      ctermfg=darkgrey        ctermbg=black
-hi TabLineFill      cterm=bold,reverse      ctermfg=darkgrey        ctermbg=grey
-hi TabLineSel       cterm=bold,reverse      ctermfg=brown           ctermbg=black
-
-
-""""""
-" COMPLETION
-""""""""""""""""""""""""
-hi Pmenu            cterm=reverse           ctermfg=darkgrey        ctermbg=black
-hi PmenuSel         cterm=bold              ctermfg=black           ctermbg=brown
-
-
-""""""
-" STATUS
-""""""""""""""""""""""""
-hi StatusLine       cterm=bold,reverse      ctermfg=brown           ctermbg=black
-hi StatusLineNC     cterm=bold,reverse      ctermfg=darkgrey        ctermbg=black
-
-
-""""""
-" DIFF
-""""""""""""""""""""""""
-hi DiffAdd          cterm=NONE              ctermfg=NONE            ctermbg=darkblue
-hi DiffChange       cterm=NONE              ctermfg=NONE            ctermbg=darkmagenta
-hi DiffDelete       cterm=NONE              ctermfg=darkblue        ctermbg=darkcyan
-hi DiffText         cterm=NONE              ctermbg=darkred         ctermbg=NONE
-
-
-""""""
-" VISUAL
-""""""""""""""""""""""""
-hi Visual           cterm=reverse           ctermfg=NONE            ctermbg=NONE
-hi VisualNOS        cterm=bold,underline    ctermfg=NONE            ctermbg=NONE
-
-
-""""""
-" FOLDING
-""""""""""""""""""""""""
-hi Folded           cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-hi FoldColumn       cterm=NONE              ctermfg=darkgrey        ctermbg=NONE
-
-
-""""""
-" SEARCH
-""""""""""""""""""""""""
-hi IncSearch        cterm=NONE              ctermfg=black           ctermbg=green
-hi Search           cterm=NONE              ctermfg=black           ctermbg=green
-
-
-"vim: sw=4
diff --git a/colors/DevC++.vim b/colors/DevC++.vim
deleted file mode 100755
index 376f040..0000000
--- a/colors/DevC++.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" Vim color file
-" Maintainer:   Xi Chen <hypernewbie@gmail.com>
-" Last Change:  22. december 2005.
-" URL:          http://www.acidplanet.com/hypernewbie
-" The theme I always use from DEV-C++
-" Its the classic theme modified a little, carried
-" over a little from Kate.
-" Merry Christmas!
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="DevC++"
-
-hi Comment	gui=italic		guifg=#335EA8		guibg=NONE
-hi Constant	gui=NONE		guifg=#004488 		guibg=NONE
-hi Identifier	gui=NONE		guifg=Black			guibg=NONE
-hi Statement 	gui=bold		guifg=DarkBlue			guibg=NONE
-hi PreProc	gui=NONE		guifg=DarkGreen			guibg=NONE	
-hi Type		gui=bold		guifg=DarkBlue			guibg=NONE
-hi Special	gui=NONE		guifg=#FF00FF	guibg=NONE
-hi String  	gui=NONE  		guifg=#969696 		guibg=NONE
-hi Number  	gui=NONE		guifg=#660066
-hi Boolean      gui=bold                guifg=DarkBlue		guibg=NONE
-hi Gutter 	gui=NONE		guifg=Black		guibg=Grey
-hi Todo	        gui=bold,italic		guifg=White		guibg=Pink
-hi LineNr	gui=italic		guifg=Black   guibg=#EBE9ED
-hi NonText 	gui=bold 		guifg=Grey70 guibg=White
-hi Visual	gui=NONE		guifg=DarkBlue		guibg=White
-
diff --git a/colors/Monokai.vim b/colors/Monokai.vim
deleted file mode 100755
index 8d5ab52..0000000
--- a/colors/Monokai.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-" Vim color file
-" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration)
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "Monokai"
-
-hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE
-hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
-hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
-hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
-hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE
-hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE
-hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE
-hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline
-hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold
-hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE
-hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE
-hi IncSearch ctermfg=235 ctermbg=186 cterm=NONE guifg=#272822 guibg=#e6db74 gui=NONE
-hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE
-
-hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE
-hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
-hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold
-hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE
-hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE
-hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold
-hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
-hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE
-hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
-hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
-hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE
-hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE
-hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE
-hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
-hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold
-hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold
-hi Type ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
-hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
-hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
-hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE
-hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi htmlTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi htmlEndTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic
-hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE
-hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE
-hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic
-hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
-hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE
-hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE
-hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE
-hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
diff --git a/colors/MountainDew.vim b/colors/MountainDew.vim
deleted file mode 100755
index 51d4935..0000000
--- a/colors/MountainDew.vim
+++ /dev/null
@@ -1,120 +0,0 @@
-" Colorscheme created with ColorSchemeEditor v1.2.1
-"Name: MountainDew
-"Maintainer: Erik Falor <ewfalor@gmail.com>
-"Version: 2.0
-"Last Change: 2008 May 01
-"License: Vim License
-
-"Notes: Do the Dew!
-"Version 2.0 -  Let's see if this is easier on the eyes.  Made the normal background darker.
-
-set background=dark
-if version > 580
-	highlight clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-let g:colors_name = "MountainDew"
-
-if v:version >= 700
-	highlight CursorColumn guibg=#0F5123 gui=NONE
-	highlight CursorLine guibg=#0F5123 gui=NONE
-	highlight Pmenu guifg=#2FB457 guibg=#017550 gui=NONE
-	highlight PmenuSel guifg=#FF0000 guibg=#FFFF00 gui=bold
-	highlight PmenuSbar guibg=#017550 gui=NONE
-	highlight PmenuThumb guibg=#2FB457 gui=NONE
-	highlight TabLine guifg=#60FF60 guibg=#017550 gui=NONE
-	highlight TabLineFill guifg=#017550 guibg=#017550 gui=NONE
-	highlight TabLineSel guifg=#FFFF00 guibg=#FF0000 gui=bold
-	if has('spell')
-		highlight SpellBad gui=undercurl
-		highlight SpellCap gui=undercurl
-		highlight SpellLocal gui=undercurl
-		highlight SpellRare gui=undercurl
-	endif
-endif
-highlight Cursor guifg=#FFFF00 guibg=#FF0000 gui=NONE
-highlight link CursorIM cleared
-highlight DiffAdd guibg=DarkBlue gui=NONE
-highlight DiffChange guibg=DarkMagenta gui=NONE
-highlight DiffDelete guifg=Blue guibg=DarkCyan gui=bold
-highlight DiffText guibg=Red gui=bold
-highlight Directory guifg=#21D959 gui=bold
-highlight ErrorMsg guifg=#FFFF00 guibg=#FF0000 gui=NONE
-highlight FoldColumn guifg=#E12E2A guibg=bg gui=NONE
-highlight Folded guifg=#FFFF00 guibg=bg gui=NONE
-highlight IncSearch guifg=#2FB457 guibg=#FFFF60 gui=bold,reverse
-highlight LineNr guifg=#E12E2A gui=bold
-highlight MatchParen guifg=#017550 guibg=#D8E353 gui=NONE
-highlight ModeMsg guifg=#60FF60 gui=bold
-highlight MoreMsg guifg=#017550 gui=bold
-highlight NonText guifg=#E12E2A guibg=bg gui=bold
-highlight Normal guifg=#FFFFFF guibg=#203D29 gui=NONE
-highlight Question guifg=#60FF60 gui=bold
-highlight Search guifg=#2FB457 guibg=#FFFF00 gui=bold
-highlight SignColumn guifg=fg guibg=bg gui=NONE
-highlight SpecialKey guifg=#90dcb0 gui=NONE
-highlight StatusLine guifg=#FFFF00 guibg=#E12E2A gui=bold
-highlight StatusLineNC guifg=#60FF60 guibg=#017550 gui=NONE
-highlight Title guifg=#60FF60 gui=bold
-highlight VertSplit guifg=#60FF60 guibg=#017550 gui=NONE
-highlight Visual guifg=#FFFFFF guibg=#FFA500 gui=NONE
-highlight VisualNOS guifg=#201a30 guibg=#a3a5FF gui=bold,underline
-highlight WarningMsg guifg=#E12E2A gui=NONE
-highlight WildMenu guifg=#FFFF60 guibg=#2FB457 gui=bold
-highlight link Boolean Constant
-highlight link Character Constant
-highlight Comment guifg=#21D959 gui=NONE
-highlight Conditional guifg=#D8E353 guibg=bg gui=bold
-highlight Constant guifg=#FF0000 gui=NONE
-highlight link Debug Special
-highlight link Define PreProc
-highlight link Delimiter Special
-highlight Error guifg=#FFFF00 guibg=Red gui=NONE
-highlight Exception guifg=#60FF60 guibg=bg gui=NONE
-highlight link Float Number
-highlight Function guifg=#FFFF00 guibg=bg gui=NONE
-highlight Identifier guifg=#FFFF60 gui=NONE
-highlight Ignore guifg=bg gui=NONE
-highlight link Include PreProc
-highlight Keyword guifg=grey guibg=bg gui=bold
-highlight link Label Statement
-highlight link Macro PreProc
-highlight Number guifg=#60FF60 gui=bold
-highlight Operator guifg=#60FF60 guibg=bg gui=NONE
-highlight link PreCondit PreProc
-highlight PreProc guifg=#D8E353 gui=NONE
-highlight Repeat guifg=#D8E353 guibg=bg gui=bold
-highlight Special guifg=#E12E2A gui=bold
-highlight link SpecialChar Special
-highlight link SpecialComment Special
-highlight Statement guifg=#FFFF60 gui=bold
-highlight link StorageClass Type
-highlight link String Constant
-highlight link Structure Type
-highlight link Tag Special
-highlight Todo guifg=#FF0000 guibg=#FFFF00 gui=bold
-highlight Type guifg=#E12E2A gui=bold
-highlight link Typedef Type
-highlight Underlined guifg=#80a0ff gui=underline
-
-
-"ColorScheme metadata{{{
-if v:version >= 700
-	let g:MountainDew_Metadata = {
-				\"Palette" : "#FF0000:#E12E2A:#8B0000:#023525:#0F5123:#017550:#2FB457:#5CAC27:#0D3C0A:#203D29:#FFFF60:#FFFF00:#D8E353:#FF8C00:#FFA500:#60FF60:#21D959:#FFFFFF:#FFFFFF:#000000",
-				\"Maintainer" : "Erik Falor",
-				\"Name" : "MountainDew",
-				\"License" : ["Vim License",
-				\],
-				\"Notes" : ["Do the Dew!",
-				\"Version 2.0 -  Let's see if this is easier on the eyes.  Made the normal background darker.",
-				\],
-				\"Version" : "2.0",
-				\"Email" : "ewfalor@gmail.com",
-				\"Last Change" : "2008 May 01",
-				\}
-endif
-"}}}
-" vim:set foldmethod=marker expandtab filetype=vim:
diff --git a/colors/PapayaWhip.vim b/colors/PapayaWhip.vim
deleted file mode 100755
index 5f8725a..0000000
--- a/colors/PapayaWhip.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" Vim color file
-" Maintainer:   Gerald S. Williams
-" Last Change:  2003 Apr 17
-
-" A nice light background (you guessed it, PapayaWhip) that's relatively easy
-" on the eyes yet very usable. Not nearly as "puffy" as peachpuff.
-"
-" Only values that differ from defaults are specified.
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "PapayaWhip"
-
-hi Normal guifg=#3f1f1f guibg=PapayaWhip ctermbg=Gray ctermfg=Black
-hi NonText guibg=Moccasin guifg=Brown ctermfg=Brown
-hi LineNr guibg=Moccasin
-hi DiffDelete guibg=LightRed guifg=Black ctermbg=DarkRed ctermfg=White
-hi DiffAdd guibg=LightGreen ctermbg=DarkGreen ctermfg=White
-hi DiffChange guibg=LightCyan3 ctermbg=DarkCyan ctermfg=White
-hi DiffText gui=NONE guibg=Gray80 ctermbg=DarkCyan ctermfg=Yellow
-hi Comment guifg=MediumBlue
-hi Constant guifg=DeepPink
-hi PreProc guifg=DarkMagenta
-hi StatusLine guibg=White guifg=#5f3705 cterm=bold ctermbg=Brown ctermfg=White
-hi StatusLineNC gui=None guibg=Gray
-hi VertSplit gui=None guibg=Gray
-hi Identifier guifg=#005f5f
-hi Statement ctermfg=DarkRed
diff --git a/colors/Tomorrow-Night-Blue.vim b/colors/Tomorrow-Night-Blue.vim
deleted file mode 100755
index 2259a0e..0000000
--- a/colors/Tomorrow-Night-Blue.vim
+++ /dev/null
@@ -1,381 +0,0 @@
-" Tomorrow Night Blue - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "ffffff"
-let s:background = "002451"
-let s:selection = "003f8e"
-let s:line = "00346e"
-let s:comment = "7285b7"
-let s:red = "ff9da4"
-let s:orange = "ffc58f"
-let s:yellow = "ffeead"
-let s:green = "d1f1a9"
-let s:aqua = "99ffff"
-let s:blue = "bbdaff"
-let s:purple = "ebbbff"
-let s:window = "4d5057"
-
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow-Night-Blue"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-	" Returns an approximate grey index for the given grey level
-	fun <SID>grey_number(x)
-		if &t_Co == 88
-			if a:x < 23
-				return 0
-			elseif a:x < 69
-				return 1
-			elseif a:x < 103
-				return 2
-			elseif a:x < 127
-				return 3
-			elseif a:x < 150
-				return 4
-			elseif a:x < 173
-				return 5
-			elseif a:x < 196
-				return 6
-			elseif a:x < 219
-				return 7
-			elseif a:x < 243
-				return 8
-			else
-				return 9
-			endif
-		else
-			if a:x < 14
-				return 0
-			else
-				let l:n = (a:x - 8) / 10
-				let l:m = (a:x - 8) % 10
-				if l:m < 5
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual grey level represented by the grey index
-	fun <SID>grey_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 46
-			elseif a:n == 2
-				return 92
-			elseif a:n == 3
-				return 115
-			elseif a:n == 4
-				return 139
-			elseif a:n == 5
-				return 162
-			elseif a:n == 6
-				return 185
-			elseif a:n == 7
-				return 208
-			elseif a:n == 8
-				return 231
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 8 + (a:n * 10)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given grey index
-	fun <SID>grey_colour(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 16
-			elseif a:n == 9
-				return 79
-			else
-				return 79 + a:n
-			endif
-		else
-			if a:n == 0
-				return 16
-			elseif a:n == 25
-				return 231
-			else
-				return 231 + a:n
-			endif
-		endif
-	endfun
-
-	" Returns an approximate colour index for the given colour level
-	fun <SID>rgb_number(x)
-		if &t_Co == 88
-			if a:x < 69
-				return 0
-			elseif a:x < 172
-				return 1
-			elseif a:x < 230
-				return 2
-			else
-				return 3
-			endif
-		else
-			if a:x < 75
-				return 0
-			else
-				let l:n = (a:x - 55) / 40
-				let l:m = (a:x - 55) % 40
-				if l:m < 20
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual colour level for the given colour index
-	fun <SID>rgb_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 139
-			elseif a:n == 2
-				return 205
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 55 + (a:n * 40)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given R/G/B colour indices
-	fun <SID>rgb_colour(x, y, z)
-		if &t_Co == 88
-			return 16 + (a:x * 16) + (a:y * 4) + a:z
-		else
-			return 16 + (a:x * 36) + (a:y * 6) + a:z
-		endif
-	endfun
-
-	" Returns the palette index to approximate the given R/G/B colour levels
-	fun <SID>colour(r, g, b)
-		" Get the closest grey
-		let l:gx = <SID>grey_number(a:r)
-		let l:gy = <SID>grey_number(a:g)
-		let l:gz = <SID>grey_number(a:b)
-
-		" Get the closest colour
-		let l:x = <SID>rgb_number(a:r)
-		let l:y = <SID>rgb_number(a:g)
-		let l:z = <SID>rgb_number(a:b)
-
-		if l:gx == l:gy && l:gy == l:gz
-			" There are two possibilities
-			let l:dgr = <SID>grey_level(l:gx) - a:r
-			let l:dgg = <SID>grey_level(l:gy) - a:g
-			let l:dgb = <SID>grey_level(l:gz) - a:b
-			let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-			let l:dr = <SID>rgb_level(l:gx) - a:r
-			let l:dg = <SID>rgb_level(l:gy) - a:g
-			let l:db = <SID>rgb_level(l:gz) - a:b
-			let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-			if l:dgrey < l:drgb
-				" Use the grey
-				return <SID>grey_colour(l:gx)
-			else
-				" Use the colour
-				return <SID>rgb_colour(l:x, l:y, l:z)
-			endif
-		else
-			" Only one possibility
-			return <SID>rgb_colour(l:x, l:y, l:z)
-		endif
-	endfun
-
-	" Returns the palette index to approximate the 'rrggbb' hex string
-	fun <SID>rgb(rgb)
-		let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-		let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-		let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-		return <SID>colour(l:r, l:g, l:b)
-	endfun
-
-	" Sets the highlighting for the given group
-	fun <SID>X(group, fg, bg, attr)
-		if a:fg != ""
-			exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-		endif
-		if a:bg != ""
-			exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-		endif
-		if a:attr != ""
-			exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-		endif
-	endfun
-
-	" Vim Highlighting
-	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:selection, "", "")
-	call <SID>X("NonText", s:selection, "", "")
-	call <SID>X("SpecialKey", s:selection, "", "")
-	call <SID>X("Search", s:background, s:yellow, "")
-	call <SID>X("TabLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
-	call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
-	call <SID>X("VertSplit", s:window, s:window, "none")
-	call <SID>X("Visual", "", s:selection, "")
-	call <SID>X("Directory", s:blue, "", "")
-	call <SID>X("ModeMsg", s:green, "", "")
-	call <SID>X("MoreMsg", s:green, "", "")
-	call <SID>X("Question", s:green, "", "")
-	call <SID>X("WarningMsg", s:red, "", "")
-	call <SID>X("MatchParen", "", s:selection, "")
-	call <SID>X("Folded", s:comment, s:background, "")
-	call <SID>X("FoldColumn", "", s:background, "")
-	if version >= 700
-		call <SID>X("CursorLine", "", s:line, "none")
-		call <SID>X("CursorColumn", "", s:line, "none")
-		call <SID>X("PMenu", s:foreground, s:selection, "none")
-		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
-	end
-	if version >= 703
-		call <SID>X("ColorColumn", "", s:line, "none")
-	end
-
-	" Standard Highlighting
-	call <SID>X("Comment", s:comment, "", "")
-	call <SID>X("Todo", s:comment, s:background, "")
-	call <SID>X("Title", s:comment, "", "")
-	call <SID>X("Identifier", s:red, "", "none")
-	call <SID>X("Statement", s:foreground, "", "")
-	call <SID>X("Conditional", s:foreground, "", "")
-	call <SID>X("Repeat", s:foreground, "", "")
-	call <SID>X("Structure", s:purple, "", "")
-	call <SID>X("Function", s:blue, "", "")
-	call <SID>X("Constant", s:orange, "", "")
-	call <SID>X("String", s:green, "", "")
-	call <SID>X("Special", s:foreground, "", "")
-	call <SID>X("PreProc", s:purple, "", "")
-	call <SID>X("Operator", s:aqua, "", "none")
-	call <SID>X("Type", s:blue, "", "none")
-	call <SID>X("Define", s:purple, "", "none")
-	call <SID>X("Include", s:blue, "", "")
-	"call <SID>X("Ignore", "666666", "", "")
-
-	" Vim Highlighting
-	call <SID>X("vimCommand", s:red, "", "none")
-
-	" C Highlighting
-	call <SID>X("cType", s:yellow, "", "")
-	call <SID>X("cStorageClass", s:purple, "", "")
-	call <SID>X("cConditional", s:purple, "", "")
-	call <SID>X("cRepeat", s:purple, "", "")
-
-	" PHP Highlighting
-	call <SID>X("phpVarSelector", s:red, "", "")
-	call <SID>X("phpKeyword", s:purple, "", "")
-	call <SID>X("phpRepeat", s:purple, "", "")
-	call <SID>X("phpConditional", s:purple, "", "")
-	call <SID>X("phpStatement", s:purple, "", "")
-	call <SID>X("phpMemberSelector", s:foreground, "", "")
-
-	" Ruby Highlighting
-	call <SID>X("rubySymbol", s:green, "", "")
-	call <SID>X("rubyConstant", s:yellow, "", "")
-	call <SID>X("rubyAccess", s:yellow, "", "")
-	call <SID>X("rubyAttribute", s:blue, "", "")
-	call <SID>X("rubyInclude", s:blue, "", "")
-	call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
-	call <SID>X("rubyCurlyBlock", s:orange, "", "")
-	call <SID>X("rubyStringDelimiter", s:green, "", "")
-	call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
-	call <SID>X("rubyConditional", s:purple, "", "")
-	call <SID>X("rubyRepeat", s:purple, "", "")
-	call <SID>X("rubyControl", s:purple, "", "")
-	call <SID>X("rubyException", s:purple, "", "")
-
-	" Python Highlighting
-	call <SID>X("pythonInclude", s:purple, "", "")
-	call <SID>X("pythonStatement", s:purple, "", "")
-	call <SID>X("pythonConditional", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:purple, "", "")
-	call <SID>X("pythonException", s:purple, "", "")
-	call <SID>X("pythonFunction", s:blue, "", "")
-	call <SID>X("pythonPreCondit", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:aqua, "", "")
-	call <SID>X("pythonExClass", s:orange, "", "")
-
-	" JavaScript Highlighting
-	call <SID>X("javaScriptBraces", s:foreground, "", "")
-	call <SID>X("javaScriptFunction", s:purple, "", "")
-	call <SID>X("javaScriptConditional", s:purple, "", "")
-	call <SID>X("javaScriptRepeat", s:purple, "", "")
-	call <SID>X("javaScriptNumber", s:orange, "", "")
-	call <SID>X("javaScriptMember", s:orange, "", "")
-    call <SID>X("javascriptNull", s:orange, "", "")
-    call <SID>X("javascriptGlobal", s:blue, "", "")
-    call <SID>X("javascriptStatement", s:red, "", "")
-
-	" HTML Highlighting
-	call <SID>X("htmlTag", s:red, "", "")
-	call <SID>X("htmlTagName", s:red, "", "")
-	call <SID>X("htmlArg", s:red, "", "")
-	call <SID>X("htmlScriptTag", s:red, "", "")
-
-	" Diff Highlighting
-	call <SID>X("diffAdded", s:green, "", "")
-	call <SID>X("diffRemoved", s:red, "", "")
-
-	" Lua Highlighting
-	call <SID>X("luaStatement", s:purple, "", "")
-	call <SID>X("luaRepeat", s:purple, "", "")
-	call <SID>X("luaCondStart", s:purple, "", "")
-	call <SID>X("luaCondElseif", s:purple, "", "")
-	call <SID>X("luaCond", s:purple, "", "")
-	call <SID>X("luaCondEnd", s:purple, "", "")
-
-	" Cucumber Highlighting
-	call <SID>X("cucumberGiven", s:blue, "", "")
-	call <SID>X("cucumberGivenAnd", s:blue, "", "")
-
-	" Go Highlighting
-	call <SID>X("goDirective", s:purple, "", "")
-	call <SID>X("goDeclaration", s:purple, "", "")
-	call <SID>X("goStatement", s:purple, "", "")
-	call <SID>X("goConditional", s:purple, "", "")
-	call <SID>X("goConstants", s:orange, "", "")
-	call <SID>X("goTodo", s:yellow, "", "")
-	call <SID>X("goDeclType", s:blue, "", "")
-	call <SID>X("goBuiltins", s:purple, "", "")
-
-	" Delete Functions
-	delf <SID>X
-	delf <SID>rgb
-	delf <SID>colour
-	delf <SID>rgb_colour
-	delf <SID>rgb_level
-	delf <SID>rgb_number
-	delf <SID>grey_colour
-	delf <SID>grey_level
-	delf <SID>grey_number
-endif
-
-set background=dark
diff --git a/colors/Tomorrow-Night-Bright.vim b/colors/Tomorrow-Night-Bright.vim
deleted file mode 100755
index 9ebf55f..0000000
--- a/colors/Tomorrow-Night-Bright.vim
+++ /dev/null
@@ -1,381 +0,0 @@
-" Tomorrow Night Bright - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "eaeaea"
-let s:background = "000000"
-let s:selection = "424242"
-let s:line = "2a2a2a"
-let s:comment = "969896"
-let s:red = "d54e53"
-let s:orange = "e78c45"
-let s:yellow = "e7c547"
-let s:green = "b9ca4a"
-let s:aqua = "70c0b1"
-let s:blue = "7aa6da"
-let s:purple = "c397d8"
-let s:window = "4d5057"
-
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow-Night-Bright"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-	" Returns an approximate grey index for the given grey level
-	fun <SID>grey_number(x)
-		if &t_Co == 88
-			if a:x < 23
-				return 0
-			elseif a:x < 69
-				return 1
-			elseif a:x < 103
-				return 2
-			elseif a:x < 127
-				return 3
-			elseif a:x < 150
-				return 4
-			elseif a:x < 173
-				return 5
-			elseif a:x < 196
-				return 6
-			elseif a:x < 219
-				return 7
-			elseif a:x < 243
-				return 8
-			else
-				return 9
-			endif
-		else
-			if a:x < 14
-				return 0
-			else
-				let l:n = (a:x - 8) / 10
-				let l:m = (a:x - 8) % 10
-				if l:m < 5
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual grey level represented by the grey index
-	fun <SID>grey_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 46
-			elseif a:n == 2
-				return 92
-			elseif a:n == 3
-				return 115
-			elseif a:n == 4
-				return 139
-			elseif a:n == 5
-				return 162
-			elseif a:n == 6
-				return 185
-			elseif a:n == 7
-				return 208
-			elseif a:n == 8
-				return 231
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 8 + (a:n * 10)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given grey index
-	fun <SID>grey_colour(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 16
-			elseif a:n == 9
-				return 79
-			else
-				return 79 + a:n
-			endif
-		else
-			if a:n == 0
-				return 16
-			elseif a:n == 25
-				return 231
-			else
-				return 231 + a:n
-			endif
-		endif
-	endfun
-
-	" Returns an approximate colour index for the given colour level
-	fun <SID>rgb_number(x)
-		if &t_Co == 88
-			if a:x < 69
-				return 0
-			elseif a:x < 172
-				return 1
-			elseif a:x < 230
-				return 2
-			else
-				return 3
-			endif
-		else
-			if a:x < 75
-				return 0
-			else
-				let l:n = (a:x - 55) / 40
-				let l:m = (a:x - 55) % 40
-				if l:m < 20
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual colour level for the given colour index
-	fun <SID>rgb_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 139
-			elseif a:n == 2
-				return 205
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 55 + (a:n * 40)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given R/G/B colour indices
-	fun <SID>rgb_colour(x, y, z)
-		if &t_Co == 88
-			return 16 + (a:x * 16) + (a:y * 4) + a:z
-		else
-			return 16 + (a:x * 36) + (a:y * 6) + a:z
-		endif
-	endfun
-
-	" Returns the palette index to approximate the given R/G/B colour levels
-	fun <SID>colour(r, g, b)
-		" Get the closest grey
-		let l:gx = <SID>grey_number(a:r)
-		let l:gy = <SID>grey_number(a:g)
-		let l:gz = <SID>grey_number(a:b)
-
-		" Get the closest colour
-		let l:x = <SID>rgb_number(a:r)
-		let l:y = <SID>rgb_number(a:g)
-		let l:z = <SID>rgb_number(a:b)
-
-		if l:gx == l:gy && l:gy == l:gz
-			" There are two possibilities
-			let l:dgr = <SID>grey_level(l:gx) - a:r
-			let l:dgg = <SID>grey_level(l:gy) - a:g
-			let l:dgb = <SID>grey_level(l:gz) - a:b
-			let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-			let l:dr = <SID>rgb_level(l:gx) - a:r
-			let l:dg = <SID>rgb_level(l:gy) - a:g
-			let l:db = <SID>rgb_level(l:gz) - a:b
-			let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-			if l:dgrey < l:drgb
-				" Use the grey
-				return <SID>grey_colour(l:gx)
-			else
-				" Use the colour
-				return <SID>rgb_colour(l:x, l:y, l:z)
-			endif
-		else
-			" Only one possibility
-			return <SID>rgb_colour(l:x, l:y, l:z)
-		endif
-	endfun
-
-	" Returns the palette index to approximate the 'rrggbb' hex string
-	fun <SID>rgb(rgb)
-		let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-		let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-		let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-		return <SID>colour(l:r, l:g, l:b)
-	endfun
-
-	" Sets the highlighting for the given group
-	fun <SID>X(group, fg, bg, attr)
-		if a:fg != ""
-			exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-		endif
-		if a:bg != ""
-			exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-		endif
-		if a:attr != ""
-			exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-		endif
-	endfun
-
-	" Vim Highlighting
-	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:selection, "", "")
-	call <SID>X("NonText", s:selection, "", "")
-	call <SID>X("SpecialKey", s:selection, "", "")
-	call <SID>X("Search", s:background, s:yellow, "")
-	call <SID>X("TabLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
-	call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
-	call <SID>X("VertSplit", s:window, s:window, "none")
-	call <SID>X("Visual", "", s:selection, "")
-	call <SID>X("Directory", s:blue, "", "")
-	call <SID>X("ModeMsg", s:green, "", "")
-	call <SID>X("MoreMsg", s:green, "", "")
-	call <SID>X("Question", s:green, "", "")
-	call <SID>X("WarningMsg", s:red, "", "")
-	call <SID>X("MatchParen", "", s:selection, "")
-	call <SID>X("Folded", s:comment, s:background, "")
-	call <SID>X("FoldColumn", "", s:background, "")
-	if version >= 700
-		call <SID>X("CursorLine", "", s:line, "none")
-		call <SID>X("CursorColumn", "", s:line, "none")
-		call <SID>X("PMenu", s:foreground, s:selection, "none")
-		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
-	end
-	if version >= 703
-		call <SID>X("ColorColumn", "", s:line, "none")
-	end
-
-	" Standard Highlighting
-	call <SID>X("Comment", s:comment, "", "")
-	call <SID>X("Todo", s:comment, s:background, "")
-	call <SID>X("Title", s:comment, "", "")
-	call <SID>X("Identifier", s:red, "", "none")
-	call <SID>X("Statement", s:foreground, "", "")
-	call <SID>X("Conditional", s:foreground, "", "")
-	call <SID>X("Repeat", s:foreground, "", "")
-	call <SID>X("Structure", s:purple, "", "")
-	call <SID>X("Function", s:blue, "", "")
-	call <SID>X("Constant", s:orange, "", "")
-	call <SID>X("String", s:green, "", "")
-	call <SID>X("Special", s:foreground, "", "")
-	call <SID>X("PreProc", s:purple, "", "")
-	call <SID>X("Operator", s:aqua, "", "none")
-	call <SID>X("Type", s:blue, "", "none")
-	call <SID>X("Define", s:purple, "", "none")
-	call <SID>X("Include", s:blue, "", "")
-	"call <SID>X("Ignore", "666666", "", "")
-
-	" Vim Highlighting
-	call <SID>X("vimCommand", s:red, "", "none")
-
-	" C Highlighting
-	call <SID>X("cType", s:yellow, "", "")
-	call <SID>X("cStorageClass", s:purple, "", "")
-	call <SID>X("cConditional", s:purple, "", "")
-	call <SID>X("cRepeat", s:purple, "", "")
-
-	" PHP Highlighting
-	call <SID>X("phpVarSelector", s:red, "", "")
-	call <SID>X("phpKeyword", s:purple, "", "")
-	call <SID>X("phpRepeat", s:purple, "", "")
-	call <SID>X("phpConditional", s:purple, "", "")
-	call <SID>X("phpStatement", s:purple, "", "")
-	call <SID>X("phpMemberSelector", s:foreground, "", "")
-
-	" Ruby Highlighting
-	call <SID>X("rubySymbol", s:green, "", "")
-	call <SID>X("rubyConstant", s:yellow, "", "")
-	call <SID>X("rubyAccess", s:yellow, "", "")
-	call <SID>X("rubyAttribute", s:blue, "", "")
-	call <SID>X("rubyInclude", s:blue, "", "")
-	call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
-	call <SID>X("rubyCurlyBlock", s:orange, "", "")
-	call <SID>X("rubyStringDelimiter", s:green, "", "")
-	call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
-	call <SID>X("rubyConditional", s:purple, "", "")
-	call <SID>X("rubyRepeat", s:purple, "", "")
-	call <SID>X("rubyControl", s:purple, "", "")
-	call <SID>X("rubyException", s:purple, "", "")
-
-	" Python Highlighting
-	call <SID>X("pythonInclude", s:purple, "", "")
-	call <SID>X("pythonStatement", s:purple, "", "")
-	call <SID>X("pythonConditional", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:purple, "", "")
-	call <SID>X("pythonException", s:purple, "", "")
-	call <SID>X("pythonFunction", s:blue, "", "")
-	call <SID>X("pythonPreCondit", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:aqua, "", "")
-	call <SID>X("pythonExClass", s:orange, "", "")
-
-	" JavaScript Highlighting
-	call <SID>X("javaScriptBraces", s:foreground, "", "")
-	call <SID>X("javaScriptFunction", s:purple, "", "")
-	call <SID>X("javaScriptConditional", s:purple, "", "")
-	call <SID>X("javaScriptRepeat", s:purple, "", "")
-	call <SID>X("javaScriptNumber", s:orange, "", "")
-	call <SID>X("javaScriptMember", s:orange, "", "")
-    call <SID>X("javascriptNull", s:orange, "", "")
-    call <SID>X("javascriptGlobal", s:blue, "", "")
-    call <SID>X("javascriptStatement", s:red, "", "")
-
-	" HTML Highlighting
-	call <SID>X("htmlTag", s:red, "", "")
-	call <SID>X("htmlTagName", s:red, "", "")
-	call <SID>X("htmlArg", s:red, "", "")
-	call <SID>X("htmlScriptTag", s:red, "", "")
-
-	" Diff Highlighting
-	call <SID>X("diffAdded", s:green, "", "")
-	call <SID>X("diffRemoved", s:red, "", "")
-
-	" Lua Highlighting
-	call <SID>X("luaStatement", s:purple, "", "")
-	call <SID>X("luaRepeat", s:purple, "", "")
-	call <SID>X("luaCondStart", s:purple, "", "")
-	call <SID>X("luaCondElseif", s:purple, "", "")
-	call <SID>X("luaCond", s:purple, "", "")
-	call <SID>X("luaCondEnd", s:purple, "", "")
-
-	" Cucumber Highlighting
-	call <SID>X("cucumberGiven", s:blue, "", "")
-	call <SID>X("cucumberGivenAnd", s:blue, "", "")
-
-	" Go Highlighting
-	call <SID>X("goDirective", s:purple, "", "")
-	call <SID>X("goDeclaration", s:purple, "", "")
-	call <SID>X("goStatement", s:purple, "", "")
-	call <SID>X("goConditional", s:purple, "", "")
-	call <SID>X("goConstants", s:orange, "", "")
-	call <SID>X("goTodo", s:yellow, "", "")
-	call <SID>X("goDeclType", s:blue, "", "")
-	call <SID>X("goBuiltins", s:purple, "", "")
-
-	" Delete Functions
-	delf <SID>X
-	delf <SID>rgb
-	delf <SID>colour
-	delf <SID>rgb_colour
-	delf <SID>rgb_level
-	delf <SID>rgb_number
-	delf <SID>grey_colour
-	delf <SID>grey_level
-	delf <SID>grey_number
-endif
-
-set background=dark
diff --git a/colors/Tomorrow-Night-Eighties.vim b/colors/Tomorrow-Night-Eighties.vim
deleted file mode 100755
index f0b9331..0000000
--- a/colors/Tomorrow-Night-Eighties.vim
+++ /dev/null
@@ -1,381 +0,0 @@
-" Tomorrow Night Eighties - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "cccccc"
-let s:background = "2d2d2d"
-let s:selection = "515151"
-let s:line = "393939"
-let s:comment = "999999"
-let s:red = "f2777a"
-let s:orange = "f99157"
-let s:yellow = "ffcc66"
-let s:green = "99cc99"
-let s:aqua = "009999"
-let s:blue = "99cccc"
-let s:purple = "cc99cc"
-let s:window = "4d5057"
-
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow-Night-Eighties"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-	" Returns an approximate grey index for the given grey level
-	fun <SID>grey_number(x)
-		if &t_Co == 88
-			if a:x < 23
-				return 0
-			elseif a:x < 69
-				return 1
-			elseif a:x < 103
-				return 2
-			elseif a:x < 127
-				return 3
-			elseif a:x < 150
-				return 4
-			elseif a:x < 173
-				return 5
-			elseif a:x < 196
-				return 6
-			elseif a:x < 219
-				return 7
-			elseif a:x < 243
-				return 8
-			else
-				return 9
-			endif
-		else
-			if a:x < 14
-				return 0
-			else
-				let l:n = (a:x - 8) / 10
-				let l:m = (a:x - 8) % 10
-				if l:m < 5
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual grey level represented by the grey index
-	fun <SID>grey_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 46
-			elseif a:n == 2
-				return 92
-			elseif a:n == 3
-				return 115
-			elseif a:n == 4
-				return 139
-			elseif a:n == 5
-				return 162
-			elseif a:n == 6
-				return 185
-			elseif a:n == 7
-				return 208
-			elseif a:n == 8
-				return 231
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 8 + (a:n * 10)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given grey index
-	fun <SID>grey_colour(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 16
-			elseif a:n == 9
-				return 79
-			else
-				return 79 + a:n
-			endif
-		else
-			if a:n == 0
-				return 16
-			elseif a:n == 25
-				return 231
-			else
-				return 231 + a:n
-			endif
-		endif
-	endfun
-
-	" Returns an approximate colour index for the given colour level
-	fun <SID>rgb_number(x)
-		if &t_Co == 88
-			if a:x < 69
-				return 0
-			elseif a:x < 172
-				return 1
-			elseif a:x < 230
-				return 2
-			else
-				return 3
-			endif
-		else
-			if a:x < 75
-				return 0
-			else
-				let l:n = (a:x - 55) / 40
-				let l:m = (a:x - 55) % 40
-				if l:m < 20
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual colour level for the given colour index
-	fun <SID>rgb_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 139
-			elseif a:n == 2
-				return 205
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 55 + (a:n * 40)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given R/G/B colour indices
-	fun <SID>rgb_colour(x, y, z)
-		if &t_Co == 88
-			return 16 + (a:x * 16) + (a:y * 4) + a:z
-		else
-			return 16 + (a:x * 36) + (a:y * 6) + a:z
-		endif
-	endfun
-
-	" Returns the palette index to approximate the given R/G/B colour levels
-	fun <SID>colour(r, g, b)
-		" Get the closest grey
-		let l:gx = <SID>grey_number(a:r)
-		let l:gy = <SID>grey_number(a:g)
-		let l:gz = <SID>grey_number(a:b)
-
-		" Get the closest colour
-		let l:x = <SID>rgb_number(a:r)
-		let l:y = <SID>rgb_number(a:g)
-		let l:z = <SID>rgb_number(a:b)
-
-		if l:gx == l:gy && l:gy == l:gz
-			" There are two possibilities
-			let l:dgr = <SID>grey_level(l:gx) - a:r
-			let l:dgg = <SID>grey_level(l:gy) - a:g
-			let l:dgb = <SID>grey_level(l:gz) - a:b
-			let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-			let l:dr = <SID>rgb_level(l:gx) - a:r
-			let l:dg = <SID>rgb_level(l:gy) - a:g
-			let l:db = <SID>rgb_level(l:gz) - a:b
-			let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-			if l:dgrey < l:drgb
-				" Use the grey
-				return <SID>grey_colour(l:gx)
-			else
-				" Use the colour
-				return <SID>rgb_colour(l:x, l:y, l:z)
-			endif
-		else
-			" Only one possibility
-			return <SID>rgb_colour(l:x, l:y, l:z)
-		endif
-	endfun
-
-	" Returns the palette index to approximate the 'rrggbb' hex string
-	fun <SID>rgb(rgb)
-		let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-		let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-		let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-		return <SID>colour(l:r, l:g, l:b)
-	endfun
-
-	" Sets the highlighting for the given group
-	fun <SID>X(group, fg, bg, attr)
-		if a:fg != ""
-			exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-		endif
-		if a:bg != ""
-			exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-		endif
-		if a:attr != ""
-			exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-		endif
-	endfun
-
-	" Vim Highlighting
-	call <SID>X("Normal", s:foreground, s:background, "")
-	call <SID>X("LineNr", s:selection, "", "")
-	call <SID>X("NonText", s:selection, "", "")
-	call <SID>X("SpecialKey", s:selection, "", "")
-	call <SID>X("Search", s:background, s:yellow, "")
-	call <SID>X("TabLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
-	call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
-	call <SID>X("VertSplit", s:window, s:window, "none")
-	call <SID>X("Visual", "", s:selection, "")
-	call <SID>X("Directory", s:blue, "", "")
-	call <SID>X("ModeMsg", s:green, "", "")
-	call <SID>X("MoreMsg", s:green, "", "")
-	call <SID>X("Question", s:green, "", "")
-	call <SID>X("WarningMsg", s:red, "", "")
-	call <SID>X("MatchParen", "", s:selection, "")
-	call <SID>X("Folded", s:comment, s:background, "")
-	call <SID>X("FoldColumn", "", s:background, "")
-	if version >= 700
-		call <SID>X("CursorLine", "", s:line, "none")
-		call <SID>X("CursorColumn", "", s:line, "none")
-		call <SID>X("PMenu", s:foreground, s:selection, "none")
-		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
-	end
-	if version >= 703
-		call <SID>X("ColorColumn", "", s:line, "none")
-	end
-
-	" Standard Highlighting
-	call <SID>X("Comment", s:comment, "", "")
-	call <SID>X("Todo", s:comment, s:background, "")
-	call <SID>X("Title", s:comment, "", "")
-	call <SID>X("Identifier", s:red, "", "none")
-	call <SID>X("Statement", s:foreground, "", "")
-	call <SID>X("Conditional", s:foreground, "", "")
-	call <SID>X("Repeat", s:foreground, "", "")
-	call <SID>X("Structure", s:purple, "", "")
-	call <SID>X("Function", s:blue, "", "")
-	call <SID>X("Constant", s:orange, "", "")
-	call <SID>X("String", s:green, "", "")
-	call <SID>X("Special", s:foreground, "", "")
-	call <SID>X("PreProc", s:purple, "", "")
-	call <SID>X("Operator", s:aqua, "", "none")
-	call <SID>X("Type", s:blue, "", "none")
-	call <SID>X("Define", s:purple, "", "none")
-	call <SID>X("Include", s:blue, "", "")
-	"call <SID>X("Ignore", "666666", "", "")
-
-	" Vim Highlighting
-	call <SID>X("vimCommand", s:red, "", "none")
-
-	" C Highlighting
-	call <SID>X("cType", s:yellow, "", "")
-	call <SID>X("cStorageClass", s:purple, "", "")
-	call <SID>X("cConditional", s:purple, "", "")
-	call <SID>X("cRepeat", s:purple, "", "")
-
-	" PHP Highlighting
-	call <SID>X("phpVarSelector", s:red, "", "")
-	call <SID>X("phpKeyword", s:purple, "", "")
-	call <SID>X("phpRepeat", s:purple, "", "")
-	call <SID>X("phpConditional", s:purple, "", "")
-	call <SID>X("phpStatement", s:purple, "", "")
-	call <SID>X("phpMemberSelector", s:foreground, "", "")
-
-	" Ruby Highlighting
-	call <SID>X("rubySymbol", s:green, "", "")
-	call <SID>X("rubyConstant", s:yellow, "", "")
-	call <SID>X("rubyAccess", s:yellow, "", "")
-	call <SID>X("rubyAttribute", s:blue, "", "")
-	call <SID>X("rubyInclude", s:blue, "", "")
-	call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
-	call <SID>X("rubyCurlyBlock", s:orange, "", "")
-	call <SID>X("rubyStringDelimiter", s:green, "", "")
-	call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
-	call <SID>X("rubyConditional", s:purple, "", "")
-	call <SID>X("rubyRepeat", s:purple, "", "")
-	call <SID>X("rubyControl", s:purple, "", "")
-	call <SID>X("rubyException", s:purple, "", "")
-
-	" Python Highlighting
-	call <SID>X("pythonInclude", s:purple, "", "")
-	call <SID>X("pythonStatement", s:purple, "", "")
-	call <SID>X("pythonConditional", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:purple, "", "")
-	call <SID>X("pythonException", s:purple, "", "")
-	call <SID>X("pythonFunction", s:blue, "", "")
-	call <SID>X("pythonPreCondit", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:aqua, "", "")
-	call <SID>X("pythonExClass", s:orange, "", "")
-
-	" JavaScript Highlighting
-	call <SID>X("javaScriptBraces", s:foreground, "", "")
-	call <SID>X("javaScriptFunction", s:purple, "", "")
-	call <SID>X("javaScriptConditional", s:purple, "", "")
-	call <SID>X("javaScriptRepeat", s:purple, "", "")
-	call <SID>X("javaScriptNumber", s:orange, "", "")
-	call <SID>X("javaScriptMember", s:orange, "", "")
-    call <SID>X("javascriptNull", s:orange, "", "")
-    call <SID>X("javascriptGlobal", s:blue, "", "")
-    call <SID>X("javascriptStatement", s:red, "", "")
-
-	" HTML Highlighting
-	call <SID>X("htmlTag", s:red, "", "")
-	call <SID>X("htmlTagName", s:red, "", "")
-	call <SID>X("htmlArg", s:red, "", "")
-	call <SID>X("htmlScriptTag", s:red, "", "")
-
-	" Diff Highlighting
-	call <SID>X("diffAdded", s:green, "", "")
-	call <SID>X("diffRemoved", s:red, "", "")
-
-	" Lua Highlighting
-	call <SID>X("luaStatement", s:purple, "", "")
-	call <SID>X("luaRepeat", s:purple, "", "")
-	call <SID>X("luaCondStart", s:purple, "", "")
-	call <SID>X("luaCondElseif", s:purple, "", "")
-	call <SID>X("luaCond", s:purple, "", "")
-	call <SID>X("luaCondEnd", s:purple, "", "")
-
-	" Cucumber Highlighting
-	call <SID>X("cucumberGiven", s:blue, "", "")
-	call <SID>X("cucumberGivenAnd", s:blue, "", "")
-
-	" Go Highlighting
-	call <SID>X("goDirective", s:purple, "", "")
-	call <SID>X("goDeclaration", s:purple, "", "")
-	call <SID>X("goStatement", s:purple, "", "")
-	call <SID>X("goConditional", s:purple, "", "")
-	call <SID>X("goConstants", s:orange, "", "")
-	call <SID>X("goTodo", s:yellow, "", "")
-	call <SID>X("goDeclType", s:blue, "", "")
-	call <SID>X("goBuiltins", s:purple, "", "")
-
-	" Delete Functions
-	delf <SID>X
-	delf <SID>rgb
-	delf <SID>colour
-	delf <SID>rgb_colour
-	delf <SID>rgb_level
-	delf <SID>rgb_number
-	delf <SID>grey_colour
-	delf <SID>grey_level
-	delf <SID>grey_number
-endif
-
-set background=dark
diff --git a/colors/Tomorrow.vim b/colors/Tomorrow.vim
deleted file mode 100755
index d3a76cd..0000000
--- a/colors/Tomorrow.vim
+++ /dev/null
@@ -1,380 +0,0 @@
-" Tomorrow - Full Colour and 256 Colour
-" http://chriskempson.com
-"
-" Hex colour conversion functions borrowed from the theme "Desert256""
-
-" Default GUI Colours
-let s:foreground = "4d4d4c"
-let s:background = "fafafa"
-let s:selection = "d6d6d6"
-let s:line = "efefef"
-let s:comment = "8e908c"
-let s:red = "c82829"
-let s:orange = "f5871f"
-let s:yellow = "eab700"
-let s:green = "718c00"
-let s:aqua = "3e999f"
-let s:blue = "4271ae"
-let s:purple = "8959a8"
-let s:window = "efefef"
-
-set background=light
-hi clear
-syntax reset
-
-let g:colors_name = "Tomorrow"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-	" Returns an approximate grey index for the given grey level
-	fun <SID>grey_number(x)
-		if &t_Co == 88
-			if a:x < 23
-				return 0
-			elseif a:x < 69
-				return 1
-			elseif a:x < 103
-				return 2
-			elseif a:x < 127
-				return 3
-			elseif a:x < 150
-				return 4
-			elseif a:x < 173
-				return 5
-			elseif a:x < 196
-				return 6
-			elseif a:x < 219
-				return 7
-			elseif a:x < 243
-				return 8
-			else
-				return 9
-			endif
-		else
-			if a:x < 14
-				return 0
-			else
-				let l:n = (a:x - 8) / 10
-				let l:m = (a:x - 8) % 10
-				if l:m < 5
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual grey level represented by the grey index
-	fun <SID>grey_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 46
-			elseif a:n == 2
-				return 92
-			elseif a:n == 3
-				return 115
-			elseif a:n == 4
-				return 139
-			elseif a:n == 5
-				return 162
-			elseif a:n == 6
-				return 185
-			elseif a:n == 7
-				return 208
-			elseif a:n == 8
-				return 231
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 8 + (a:n * 10)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given grey index
-	fun <SID>grey_colour(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 16
-			elseif a:n == 9
-				return 79
-			else
-				return 79 + a:n
-			endif
-		else
-			if a:n == 0
-				return 16
-			elseif a:n == 25
-				return 231
-			else
-				return 231 + a:n
-			endif
-		endif
-	endfun
-
-	" Returns an approximate colour index for the given colour level
-	fun <SID>rgb_number(x)
-		if &t_Co == 88
-			if a:x < 69
-				return 0
-			elseif a:x < 172
-				return 1
-			elseif a:x < 230
-				return 2
-			else
-				return 3
-			endif
-		else
-			if a:x < 75
-				return 0
-			else
-				let l:n = (a:x - 55) / 40
-				let l:m = (a:x - 55) % 40
-				if l:m < 20
-					return l:n
-				else
-					return l:n + 1
-				endif
-			endif
-		endif
-	endfun
-
-	" Returns the actual colour level for the given colour index
-	fun <SID>rgb_level(n)
-		if &t_Co == 88
-			if a:n == 0
-				return 0
-			elseif a:n == 1
-				return 139
-			elseif a:n == 2
-				return 205
-			else
-				return 255
-			endif
-		else
-			if a:n == 0
-				return 0
-			else
-				return 55 + (a:n * 40)
-			endif
-		endif
-	endfun
-
-	" Returns the palette index for the given R/G/B colour indices
-	fun <SID>rgb_colour(x, y, z)
-		if &t_Co == 88
-			return 16 + (a:x * 16) + (a:y * 4) + a:z
-		else
-			return 16 + (a:x * 36) + (a:y * 6) + a:z
-		endif
-	endfun
-
-	" Returns the palette index to approximate the given R/G/B colour levels
-	fun <SID>colour(r, g, b)
-		" Get the closest grey
-		let l:gx = <SID>grey_number(a:r)
-		let l:gy = <SID>grey_number(a:g)
-		let l:gz = <SID>grey_number(a:b)
-
-		" Get the closest colour
-		let l:x = <SID>rgb_number(a:r)
-		let l:y = <SID>rgb_number(a:g)
-		let l:z = <SID>rgb_number(a:b)
-
-		if l:gx == l:gy && l:gy == l:gz
-			" There are two possibilities
-			let l:dgr = <SID>grey_level(l:gx) - a:r
-			let l:dgg = <SID>grey_level(l:gy) - a:g
-			let l:dgb = <SID>grey_level(l:gz) - a:b
-			let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-			let l:dr = <SID>rgb_level(l:gx) - a:r
-			let l:dg = <SID>rgb_level(l:gy) - a:g
-			let l:db = <SID>rgb_level(l:gz) - a:b
-			let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-			if l:dgrey < l:drgb
-				" Use the grey
-				return <SID>grey_colour(l:gx)
-			else
-				" Use the colour
-				return <SID>rgb_colour(l:x, l:y, l:z)
-			endif
-		else
-			" Only one possibility
-			return <SID>rgb_colour(l:x, l:y, l:z)
-		endif
-	endfun
-
-	" Returns the palette index to approximate the 'rrggbb' hex string
-	fun <SID>rgb(rgb)
-		let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-		let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-		let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-		return <SID>colour(l:r, l:g, l:b)
-	endfun
-
-	" Sets the highlighting for the given group
-	fun <SID>X(group, fg, bg, attr)
-		if a:fg != ""
-			exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-		endif
-		if a:bg != ""
-			exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-		endif
-		if a:attr != ""
-			exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-		endif
-	endfun
-
-	" Vim Highlighting
-	call <SID>X("Normal", s:foreground, s:background, "")
-  highlight LineNr term=bold cterm=NONE ctermfg=DarkGrey ctermbg=NONE gui=NONE guifg=DarkGrey guibg=NONE
-	call <SID>X("NonText", s:selection, "", "")
-	call <SID>X("SpecialKey", s:selection, "", "")
-	call <SID>X("Search", s:foreground, s:yellow, "")
-	call <SID>X("TabLine", s:foreground, s:background, "reverse")
-	call <SID>X("StatusLine", s:window, s:yellow, "reverse")
-	call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
-	call <SID>X("VertSplit", s:window, s:window, "none")
-	call <SID>X("Visual", "", s:selection, "")
-	call <SID>X("Directory", s:blue, "", "")
-	call <SID>X("ModeMsg", s:green, "", "")
-	call <SID>X("MoreMsg", s:green, "", "")
-	call <SID>X("Question", s:green, "", "")
-	call <SID>X("WarningMsg", s:red, "", "")
-	call <SID>X("MatchParen", "", s:selection, "")
-	call <SID>X("Folded", s:comment, s:background, "")
-	call <SID>X("FoldColumn", "", s:background, "")
-	if version >= 700
-		call <SID>X("CursorLine", "", s:line, "none")
-		call <SID>X("CursorColumn", "", s:line, "none")
-		call <SID>X("PMenu", s:foreground, s:selection, "none")
-		call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
-	end
-	if version >= 703
-		call <SID>X("ColorColumn", "", s:line, "none")
-	end
-
-	" Standard Highlighting
-	call <SID>X("Comment", s:comment, "", "")
-	call <SID>X("Todo", s:comment, s:background, "")
-	call <SID>X("Title", s:comment, "", "")
-	call <SID>X("Identifier", s:red, "", "none")
-	call <SID>X("Statement", s:foreground, "", "")
-	call <SID>X("Conditional", s:foreground, "", "")
-	call <SID>X("Repeat", s:foreground, "", "")
-	call <SID>X("Structure", s:purple, "", "")
-	call <SID>X("Function", s:blue, "", "")
-	call <SID>X("Constant", s:orange, "", "")
-	call <SID>X("String", s:green, "", "")
-	call <SID>X("Special", s:foreground, "", "")
-	call <SID>X("PreProc", s:purple, "", "")
-	call <SID>X("Operator", s:aqua, "", "none")
-	call <SID>X("Type", s:blue, "", "none")
-	call <SID>X("Define", s:purple, "", "none")
-	call <SID>X("Include", s:blue, "", "")
-	"call <SID>X("Ignore", "666666", "", "")
-
-	" Vim Highlighting
-	call <SID>X("vimCommand", s:red, "", "none")
-
-	" C Highlighting
-	call <SID>X("cType", s:yellow, "", "")
-	call <SID>X("cStorageClass", s:purple, "", "")
-	call <SID>X("cConditional", s:purple, "", "")
-	call <SID>X("cRepeat", s:purple, "", "")
-
-	" PHP Highlighting
-	call <SID>X("phpVarSelector", s:red, "", "")
-	call <SID>X("phpKeyword", s:purple, "", "")
-	call <SID>X("phpRepeat", s:purple, "", "")
-	call <SID>X("phpConditional", s:purple, "", "")
-	call <SID>X("phpStatement", s:purple, "", "")
-	call <SID>X("phpMemberSelector", s:foreground, "", "")
-
-	" Ruby Highlighting
-	call <SID>X("rubySymbol", s:green, "", "")
-	call <SID>X("rubyConstant", s:yellow, "", "")
-	call <SID>X("rubyAccess", s:yellow, "", "")
-	call <SID>X("rubyAttribute", s:blue, "", "")
-	call <SID>X("rubyInclude", s:blue, "", "")
-	call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
-	call <SID>X("rubyCurlyBlock", s:orange, "", "")
-	call <SID>X("rubyStringDelimiter", s:green, "", "")
-	call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
-	call <SID>X("rubyConditional", s:purple, "", "")
-	call <SID>X("rubyRepeat", s:purple, "", "")
-	call <SID>X("rubyControl", s:purple, "", "")
-	call <SID>X("rubyException", s:purple, "", "")
-
-	" Python Highlighting
-	call <SID>X("pythonInclude", s:purple, "", "")
-	call <SID>X("pythonStatement", s:purple, "", "")
-	call <SID>X("pythonConditional", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:purple, "", "")
-	call <SID>X("pythonException", s:purple, "", "")
-	call <SID>X("pythonFunction", s:blue, "", "")
-	call <SID>X("pythonPreCondit", s:purple, "", "")
-	call <SID>X("pythonRepeat", s:aqua, "", "")
-	call <SID>X("pythonExClass", s:orange, "", "")
-
-	" JavaScript Highlighting
-	call <SID>X("javaScriptBraces", s:foreground, "", "")
-	call <SID>X("javaScriptFunction", s:purple, "", "")
-	call <SID>X("javaScriptConditional", s:purple, "", "")
-	call <SID>X("javaScriptRepeat", s:purple, "", "")
-	call <SID>X("javaScriptNumber", s:orange, "", "")
-	call <SID>X("javaScriptMember", s:orange, "", "")
-    call <SID>X("javascriptNull", s:orange, "", "")
-    call <SID>X("javascriptGlobal", s:blue, "", "")
-    call <SID>X("javascriptStatement", s:red, "", "")
-
-	" HTML Highlighting
-	call <SID>X("htmlTag", s:red, "", "")
-	call <SID>X("htmlTagName", s:red, "", "")
-	call <SID>X("htmlArg", s:red, "", "")
-	call <SID>X("htmlScriptTag", s:red, "", "")
-
-	" Diff Highlighting
-	call <SID>X("diffAdded", s:green, "", "")
-	call <SID>X("diffRemoved", s:red, "", "")
-
-	" Lua Highlighting
-	call <SID>X("luaStatement", s:purple, "", "")
-	call <SID>X("luaRepeat", s:purple, "", "")
-	call <SID>X("luaCondStart", s:purple, "", "")
-	call <SID>X("luaCondElseif", s:purple, "", "")
-	call <SID>X("luaCond", s:purple, "", "")
-	call <SID>X("luaCondEnd", s:purple, "", "")
-
-	" Cucumber Highlighting
-	call <SID>X("cucumberGiven", s:blue, "", "")
-	call <SID>X("cucumberGivenAnd", s:blue, "", "")
-
-	" Go Highlighting
-	call <SID>X("goDirective", s:purple, "", "")
-	call <SID>X("goDeclaration", s:purple, "", "")
-	call <SID>X("goStatement", s:purple, "", "")
-	call <SID>X("goConditional", s:purple, "", "")
-	call <SID>X("goConstants", s:orange, "", "")
-	call <SID>X("goTodo", s:yellow, "", "")
-	call <SID>X("goDeclType", s:blue, "", "")
-	call <SID>X("goBuiltins", s:purple, "", "")
-
-	" Delete Functions
-	delf <SID>X
-	delf <SID>rgb
-	delf <SID>colour
-	delf <SID>rgb_colour
-	delf <SID>rgb_level
-	delf <SID>rgb_number
-	delf <SID>grey_colour
-	delf <SID>grey_level
-	delf <SID>grey_number
-endif
diff --git a/colors/adam.vim b/colors/adam.vim
deleted file mode 100755
index 748ca7f..0000000
--- a/colors/adam.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-" Based on an original vim color file by
-" Ron Aaron <ron@mossbayeng.com> (2001 Jul 28)
-" 
-" Maintainer:	Adam Krouskop
-" Last Change:	2003 Jul 3
-
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "adam"
-hi Normal		guifg=#008844	guibg=#002244
-hi NonText		guifg=brown
-hi comment		guifg=#D80033
-hi constant		guifg=#CCCCCC
-hi identifier	guifg=#0033FF gui=NONE
-hi statement	guifg=white	gui=NONE
-hi preproc		guifg=#009999
-hi type			guifg=#0033FF gui=NONE
-hi special		guifg=#FFFF00 gui=NONE
-hi ErrorMsg		guifg=Black	guibg=Red
-hi WarningMsg	guifg=Black	guibg=Green
-hi Error		guibg=Red
-hi Todo			guifg=Black	guibg=orange
-hi Cursor		guibg=#ffffff guifg=#cac2ff
-hi Search		guibg=#103F5F gui=bold
-hi IncSearch	gui=bold guibg=#285f7f
-hi LineNr		guifg=darkgrey
-hi title		guifg=darkgrey
-hi StatusLineNC	gui=NONE guifg=lightblue guibg=darkblue
-hi StatusLine	gui=bold	guifg=cyan	guibg=blue
-hi label		guifg=gold2
-hi operator		guifg=orange
-hi clear Visual
-hi Visual		term=reverse cterm=reverse gui=reverse
-hi DiffChange   guibg=darkgreen
-hi DiffText		guibg=olivedrab
-hi DiffAdd		guibg=slateblue
-hi DiffDelete   guibg=coral
-hi Folded		guibg=gray30
-hi FoldColumn	guibg=gray30 guifg=white
-hi cIf0			guifg=gray
diff --git a/colors/adaryn.vim b/colors/adaryn.vim
deleted file mode 100755
index 1b17f22..0000000
--- a/colors/adaryn.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" Vim color file
-" Maintainer:	Glenn T. Norton <gtnorton@adaryn.com>
-" Last Change:	2003-04-11
-
-" adaryn - A color scheme named after my daughter, Adaryn. (A-da-rin)
-" I like deep, sharp colors and this scheme is inspired by 
-" Bohdan Vlasyuk's darkblue.
-" The cterm background is black since the dark blue was just too light.
-" Also the cterm colors are very close to an old Borland C++ color setup.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "adaryn"
-
-hi Normal   guifg=#fffff0 guibg=#00003F ctermfg=white ctermbg=Black
-hi ErrorMsg guifg=#ffffff guibg=#287eff	ctermfg=white ctermbg=red
-hi Visual   guifg=#8080ff guibg=fg gui=reverse ctermfg=blue ctermbg=fg cterm=reverse
-
-hi VisualNOS guifg=#8080ff guibg=fg gui=reverse,underline ctermfg=lightblue ctermbg=fg cterm=reverse,underline
-
-hi Todo guifg=#d14a14 guibg=#1248d1 ctermfg=red	ctermbg=darkblue
-
-hi Search guifg=#90fff0 guibg=#2050d0	ctermfg=white ctermbg=darkblue cterm=underline term=underline
-
-hi IncSearch    guifg=#b0ffff guibg=#2050d0 ctermfg=darkblue ctermbg=gray
-
-hi SpecialKey   guifg=cyan ctermfg=darkcyan
-hi Directory    guifg=cyan ctermfg=cyan
-hi Title	guifg=#BDD094 gui=none ctermfg=magenta cterm=bold
-hi WarningMsg	guifg=red ctermfg=red
-hi WildMenu	guifg=yellow guibg=black ctermfg=yellow ctermbg=black cterm=none term=none
-hi ModeMsg	guifg=#22cce2 ctermfg=lightblue
-hi MoreMsg	ctermfg=darkgreen ctermfg=darkgreen
-hi Question	guifg=green gui=none ctermfg=green cterm=none
-hi NonText	guifg=#0030ff ctermfg=darkblue
-
-hi StatusLine   guifg=blue guibg=darkgray gui=none ctermfg=blue ctermbg=gray term=none cterm=none
-
-hi StatusLineNC guifg=black guibg=darkgray gui=none ctermfg=black ctermbg=gray term=none cterm=none
-
-hi VertSplit guifg=black guibg=darkgray gui=none ctermfg=black ctermbg=gray term=none cterm=none
-
-hi Folded   guifg=#808080 guibg=#000040	ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-
-hi FoldColumn   guifg=#808080 guibg=#000040 ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-
-hi LineNr   guifg=#90f020   ctermfg=green cterm=none
-
-hi DiffAdd  guibg=darkblue ctermbg=darkblue term=none cterm=none
-hi DiffChange   guibg=darkmagenta ctermbg=magenta cterm=none
-hi DiffDelete	ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText	cterm=bold ctermbg=red gui=bold guibg=Red
-
-hi Cursor	guifg=#000020 guibg=#ffaf38 ctermfg=bg ctermbg=brown
-hi lCursor	guifg=#ffffff guibg=#000000 ctermfg=bg ctermbg=darkgreen
-
-
-hi Comment	guifg=yellow ctermfg=Yellow
-hi Constant	ctermfg=green guifg=green cterm=none
-hi Special	ctermfg=White guifg=#FFFFFF cterm=none gui=none
-hi Identifier	ctermfg=DarkRed guifg=#BDD094 cterm=none
-hi Statement	ctermfg=LightCyan cterm=none guifg=#A9A900 gui=none
-hi PreProc	ctermfg=DarkRed guifg=#ffffff gui=none cterm=none
-hi type		ctermfg=LightCyan guifg=LightBlue gui=none cterm=none
-hi Underlined	cterm=underline term=underline
-hi Ignore	guifg=bg ctermfg=bg
-
-
diff --git a/colors/adobe.vim b/colors/adobe.vim
deleted file mode 100755
index 122a5b1..0000000
--- a/colors/adobe.vim
+++ /dev/null
@@ -1,194 +0,0 @@
-" Vim color file
-" Maintainer:  Micah Elliott <mde AT MicahElliott DOT com>
-" Version:     0.3
-" Info:        Adobe theme, easy on eyes.
-"
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Philosophy: See my blog article:
-" http://micahelliott.com/2008/12/editor-color-scheme-philosophyeditor-color-scheme-philosophy/
-"
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Colors:
-"   Blue:      19  26  33  87  153
-"   Green:     58  22  29  84
-"   Red:      124 201 225
-"   Brown:     52 130
-"   Orange:   166
-"   Yellow:   185 192
-"   Gray:     241
-"   White:    253
-" 
-" NOTE: Set your terminal background color to: #B0B087, OR see Normal below
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-let g:colors_name = "adobe"
-
-hi Normal guibg=#b0b087 ctermbg=144
-"hi Normal guibg=#b0b087 ctermbg=NONE
-" This scheme is tuned for light backgrounds, particularly 144 (brown),
-" but others can work...
-" Other good "Normal" background colors: 144 (brown), 179 (orange), 180
-" (peach), 187 (tan), 215 (orange), 145 or 250 (gray), 71 or 72 (green)
-
-" Cursor
-hi Cursor       guibg=Yellow guifg=NONE ctermfg=white ctermbg=yellow
-"hi Cursor  cterm=bold ctermfg=0 ctermbg=0
-
-" Search
-hi Search       guibg=green ctermfg=201 ctermbg=154
-
-" Fold
-hi Folded       guibg=#a0a087
-
-" Split area
-hi StatusLine   gui=reverse guibg=white
-
-" Messages
-hi ModeMsg      gui=none
-hi MoreMsg      gui=reverse
-hi Question     gui=NONE guifg=#ffff60 guibg=NONE
-
-" Other
-hi Todo         gui=underline guifg=white guibg=NONE cterm=bold,underline ctermbg=NONE
-hi NonText      guifg=blue ctermfg=darkblue
-hi VisualNOS    gui=underline
-hi Title        gui=none
-hi SpellBad     ctermfg=245
-
-" Diff
-hi DiffDelete   gui=none
-hi DiffText     gui=none
-hi DiffAdd      guibg=lightblue
-
-" Html
-hi htmlBoldUnderline gui=underline
-hi htmlBold     gui=none
-hi htmlBoldItalic gui=none
-hi htmlBoldUnderlineItalic gui=underline
-
-" Comments
-hi Comment      guifg=#80817c ctermfg=244
-"hi Comment  cterm=bold ctermfg=0
-hi pythonCommentedCode      guifg=#80817c ctermfg=red
-hi pythonKingComment      guifg=#d9d6d8 ctermfg=253
-hi pythonSmartComment      guifg=#9b7d93 ctermfg=138
-hi pythonJavadoc      guifg=#80817c ctermfg=yellow
-hi pythonEpydoc      guifg=#80817c ctermfg=brown
-hi pythonMajorSection      guifg=white ctermfg=white
-hi pythonMinorSection      guifg=white ctermfg=white
-hi pythonInfoComment      guifg=#80817c ctermfg=217
-hi pythonDisabledComment  guifg=#9d979c  ctermfg=247
-hi pythonEolComment      guifg=#80817c ctermfg=blue
-hi pythonTripleDirkString       guifg=#056f7f ctermfg=23
-hi pythonTripleTickString guifg=#9d979c ctermfg=247
-
-" General Programming
-hi Statement    guifg=orange4 gui=none ctermfg=brown
-hi Type         guifg=#626b3e gui=none cterm=bold ctermfg=100
-hi String       guifg=#0a1b98 ctermfg=18
-hi PreProc      guifg=#0066ff ctermfg=192
-hi Special      guifg=purple3 ctermfg=97
-hi Constant     guifg=red4 ctermfg=124
-hi Identifier   guifg=darkblue ctermfg=19
-hi Function     guifg=#b9dad9 gui=bold cterm=bold ctermfg=153
-hi Underlined   guifg=yellow ctermfg=192
-hi Conditional  guifg=#1596bb ctermfg=33
-hi Repeat       guifg=green4 ctermfg=34
-hi Operator     guifg=#c2f555 ctermfg=155
-hi Include      guifg=yellow1 ctermfg=136
-"hi Keyword      guifg=yellow guibg=blue ctermfg=yellow
-"hi Exception    guifg=yellow ctermfg=yellow
-"hi Define       guifg=yellow ctermfg=yellow
-"hi Macro        guifg=yellow ctermfg=yellow
-"hi PreCondit    guifg=brown guibg=yellow
-"hi StorageClass guifg=yellow ctermfg=yellow
-"hi Structure    guifg=yellow ctermfg=yellow
-"hi Typedef      guifg=yellow ctermfg=yellow
-"hi Tag          guifg=yellow ctermfg=yellow
-"hi SpecialChar  guifg=yellow ctermfg=yellow
-"hi Delimiter    guifg=pink ctermfg=yellow
-"hi SpecialComment guifg=yellow ctermfg=yellow
-"hi Debug        guifg=yellow ctermfg=yellow
-
-" Mail
-hi mailQuoted1  guifg=red4 ctermfg=red
-hi mailQuoted2  guifg=blue3 ctermfg=lightblue
-hi mailQuoted3  guifg=orange4 ctermfg=yellow
-hi mailQuoted4  guifg=purple3 ctermfg=darkred
-hi mailQuoted5  guifg=white ctermfg=white
-
-" Perl
-hi PerlPOD      guifg=purple4 ctermfg=99
-hi perlVarPlain guifg=blue4 ctermfg=69
-hi perlIdentifier   guifg=purple ctermfg=93
-hi perlPackageRef   guifg=pink2 ctermfg=177
-hi perlMethod       guifg=red4 ctermfg=160
-hi perlFunctionName gui=bold guifg=darkblue ctermfg=63
-hi perlVarMember    guifg=lightblue4 ctermfg=87
-
-" Python
-"hi pythonStatement xxx links to Statement
-"hi pythonFunction xxx links to Function
-"hi pythonRepeat   xxx links to Repeat
-"hi pythonConditional xxx links to Conditional
-hi pythonImport   guifg=yellow1 ctermfg=yellow
-"hi pythonException xxx links to Exception
-
-"hi pythonOperator xxx links to Operator
-"hi pythonTodo     xxx links to Todo
-"hi pythonComment  xxx links to Comment
-"hi pythonRun      xxx links to Special
-"hi pythonCoding   xxx links to Special
-"hi pythonError    xxx links to Error
-"hi pythonIndentError xxx links to Error
-"hi pythonEscape   xxx links to Special
-"hi pythonEscapeError xxx links to Error
-"hi pythonString   xxx links to String
-"hi pythonDocTest2 xxx links to Special
-"hi pythonDocTest  xxx links to Special
-"hi pythonUniEscape xxx links to Special
-"hi pythonUniEscapeError xxx links to Error
-"hi pythonUniString xxx links to String
-"hi pythonRawEscape xxx cleared
-"hi pythonRawString xxx links to String
-"hi pythonUniRawEscape xxx links to Special
-"hi pythonUniRawEscapeError xxx links to Error
-"hi pythonUniRawString xxx links to String
-"hi pythonStrFormat xxx links to Special
-"hi pythonNumber   xxx links to Number
-"hi pythonFloat    xxx links to Float
-"hi pythonOctalError xxx links to Error
-"hi pythonBuiltinObj xxx links to Structure
-hi pythonBuiltinFunc guifg=#e326b4 gui=bold cterm=bold ctermfg=200
-"hi pythonExClass  xxx links to Structure
-
-" Moin
-hi moinHeader     ctermfg=18
-hi moinItalic     ctermfg=26
-hi moinBold       ctermfg=33
-hi moinBoldItalic ctermfg=87
-hi moinUnderline  ctermfg=153
-"hi moinSubscript  ctermfg=58
-"hi moinSuperscript ctermfg=22
-hi moinTypewriter ctermfg=29
-hi moinMacro      ctermfg=84
-hi moinPreformatted ctermfg=124
-hi moinWikiWord   ctermfg=201
-hi moinBracketLink ctermfg=225
-hi moinSubLink    ctermfg=52
-hi moinNormalURL  ctermfg=130
-hi moinEmail      ctermfg=166
-hi moinBulletList ctermfg=185
-hi moinNumberedList ctermfg=192
-hi moinAlphalist  ctermfg=241
-hi moinRomanlist  ctermfg=223
-hi moinBigromanlist ctermfg=233
-hi moinDescriptionlist ctermfg=243
-hi moinRule       ctermfg=13
-hi moinComment    ctermfg=23
-hi moinPragma     ctermfg=253
-hi moinInterLink  ctermfg=1
diff --git a/colors/adrian.vim b/colors/adrian.vim
deleted file mode 100755
index ba830cd..0000000
--- a/colors/adrian.vim
+++ /dev/null
@@ -1,97 +0,0 @@
-" Vim colorscheme file
-" Maintainer:   Adrian Nagle <vim@naglenet.org>
-" Last Change:  2001-09-25 07:48:15 Mountain Daylight Time
-" URL:          http://www.naglenet.org/vim/syntax/adrian.vim
-" MAIN URL:     http://www.naglenet.org/vim
-
-" This is my custom syntax file to override the defaults provided with Vim.
-" This file should be located in $HOME/vimfiles/colors.
-
-" This file should automatically be sourced by $RUNTIMEPATH.
-
-" NOTE(S):
-" *(1)
-" The color definitions assumes and is intended for a black or dark
-" background.
-
-" *(2)
-" This file is specifically in Unix style EOL format so that I can simply
-" copy this file between Windows and Unix systems.  VIM can source files in
-" with the UNIX EOL format (only <NL> instead of <CR><NR> for DOS) in any
-" operating system if the 'fileformats' is not empty and there is no <CR>
-" just before the <NL> on the first line.  See ':help :source_crnl' and
-" ':help fileformats'.
-"
-" *(3)
-" Move this file to adrian.vim for vim6.0aw.
-"
-
-
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "adrian"
-
-" Normal is for the normal (unhighlighted) text and background.
-" NonText is below the last line (~ lines).
-highlight Normal                  guibg=Black      guifg=Green 
-highlight Cursor                  guibg=Grey70     guifg=White
-highlight NonText                 guibg=Grey80
-highlight StatusLine     gui=bold guibg=DarkGrey   guifg=Orange
-highlight StatusLineNC            guibg=DarkGrey   guifg=Orange
-
-highlight Comment    term=bold      ctermfg=LightGrey                  guifg=#d1ddff
-highlight Constant   term=underline ctermfg=White                      guifg=#ffa0a0
-"highlight Number   term=underline ctermfg=Yellow                     guifg=Yellow
-highlight Identifier term=underline ctermfg=Cyan                       guifg=#40ffff
-highlight Statement  term=bold      ctermfg=Yellow           gui=bold  guifg=#ffff60
-highlight PreProc    term=underline ctermfg=Blue                       guifg=#ff4500
-highlight Type       term=underline ctermfg=DarkGrey         gui=bold  guifg=#7d96ff
-highlight Special    term=bold      ctermfg=Magenta                    guifg=Orange
-highlight Ignore                    ctermfg=black                      guifg=bg
-highlight Error                     ctermfg=White      ctermbg=Red     guifg=White    guibg=Red
-highlight Todo                      ctermfg=Blue       ctermbg=Yellow  guifg=Blue     guibg=Yellow
-
-" Change the highlight of search matches (for use with :set hls).
-highlight Search                    ctermfg=Black      ctermbg=Yellow  guifg=Black    guibg=Yellow  
-
-" Change the highlight of visual highlight.
-highlight Visual      cterm=NONE    ctermfg=Black      ctermbg=LightGrey  gui=NONE    guifg=Black guibg=Grey70
-
-highlight Float                     ctermfg=Blue                       guifg=#88AAEE
-highlight Exception                 ctermfg=Red        ctermbg=White   guifg=Red      guibg=White
-highlight Typedef                   ctermfg=White      ctermbg=Blue    gui=bold       guifg=White guibg=Blue
-highlight SpecialChar               ctermfg=Black      ctermbg=White   guifg=Black    guibg=White
-highlight Delimiter                 ctermfg=White      ctermbg=Black   guifg=White    guibg=Black
-highlight SpecialComment            ctermfg=Black      ctermbg=Green   guifg=Black    guibg=Green
-
-" Common groups that link to default highlighting.
-" You can specify other highlighting easily.
-highlight link String          Constant
-highlight link Character       Constant
-highlight link Number          Constant
-highlight link Boolean         Statement
-"highlight link Float           Number
-highlight link Function        Identifier
-highlight link Conditional     Type
-highlight link Repeat          Type
-highlight link Label           Type
-highlight link Operator        Type
-highlight link Keyword         Type
-"highlight link Exception       Type
-highlight link Include         PreProc
-highlight link Define          PreProc
-highlight link Macro           PreProc
-highlight link PreCondit       PreProc
-highlight link StorageClass    Type
-highlight link Structure       Type
-"highlight link Typedef         Type
-"highlight link SpecialChar     Special
-highlight link Tag             Special
-"highlight link Delimiter       Special
-"highlight link SpecialComment  Special
-highlight link Debug           Special
-
diff --git a/colors/advantage.vim b/colors/advantage.vim
deleted file mode 100755
index fb1c3ce..0000000
--- a/colors/advantage.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file based on northsky
-" Maintainer:   Joe Estock
-" Last Change:  
-" URL:			 
-
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="advantage"
-
-hi Normal	guifg=#00CCCC guibg=#050505
-
-" Search
-"hi Search guibg=#A28D68 guifg=bg gui=none
-"hi Search guibg=#4668A1 guifg=bg gui=none
-hi Search guibg=#3D5B8C guifg=yellow gui=none
-hi IncSearch	guifg=bg guibg=cyan gui=bold
-
-" highlight groups
-hi Cursor	guibg=#D74141 guifg=#e3e3e3
-hi VertSplit guibg=#C0FFFF guifg=#075554 gui=none
-hi Folded	 guifg=plum1 guibg=#061A3E
-hi FoldColumn	guibg=#800080 guifg=tan
-hi ModeMsg guifg=#404040 guibg=#C0C0C0
-hi MoreMsg guifg=darkturquoise guibg=#188F90
-hi NonText guibg=#334C75 guifg=#9FADC5
-hi Question	guifg=#F4BB7E
-
-hi SpecialKey	guifg=#BF9261
-hi StatusLine	guibg=#067C7B guifg=cyan gui=none
-hi StatusLineNC	guibg=#004443 guifg=DimGrey gui=none
-hi Title	guifg=#8DB8C3
-hi Visual gui=bold guifg=black guibg=#84AF84
-hi WarningMsg	guifg=#F60000 gui=underline
-
-" syntax highlighting groups
-hi Comment guifg=DarkGray
-hi Constant guifg=#72A5E4 gui=bold
-hi Number guifg=chartreuse2 gui=bold
-hi Identifier	guifg=#ADCBF1
-hi Statement guifg=yellow
-hi PreProc guifg=#37C9FF
-hi Type	guifg=#FFAE66
-hi Special guifg=#EEBABA
-hi Ignore	guifg=grey60
-hi Todo guibg=#444444 guifg=#00FFFF gui=bold
-hi Label guifg=#ffc0c0
-
-" Vim defaults
-hi ErrorMsg guifg=White guibg=Red
-hi DiffAdd    guibg=DarkBlue
-hi DiffChange guibg=aquamarine4
-hi DiffDelete gui=bold guifg=Yellow guibg=DarkBlue
-hi DiffText   gui=bold guibg=firebrick3
-hi Directory  guifg=Cyan
-hi LineNr     guifg=DarkGreen
-hi WildMenu   guifg=Black guibg=Yellow
-" hi lCursor    guifg=bg guibg=fg
-hi lCursor guibg=SeaGreen1 guifg=NONE
-hi Underlined gui=underline guifg=#80a0ff
-hi Error      guifg=White guibg=Red
diff --git a/colors/af.vim b/colors/af.vim
deleted file mode 100755
index d85e7d3..0000000
--- a/colors/af.vim
+++ /dev/null
@@ -1,99 +0,0 @@
-" Vim color file
-" Maintainer: Stanislav Lechev [AngelFire] <af@mis.bg>
-" Last Change: 2004/03/31
-" URL: http://af.mis.bg/vim/af.vim
-" ICQ: 2924004
-" Info: based on desert and a little bit of gothic
-" Version: 1.1
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="af"
-
-hi User1 guibg=darkblue guifg=yellow
-hi User2 guibg=darkblue guifg=lightblue
-hi User3 guibg=darkblue guifg=red
-hi User4 guibg=darkblue guifg=cyan
-hi User5 guibg=darkblue guifg=lightgreen
-set statusline=%<%1*===\ %5*%f%1*%(\ ===\ %4*%h%1*%)%(\ ===\ %4*%m%1*%)%(\ ===\ %4*%r%1*%)\ ===%====\ %2*%b(0x%B)%1*\ ===\ %3*%l,%c%V%1*\ ===\ %5*%P%1*\ ===%0* laststatus=2
-
-
-hi Normal		guifg=#dfdfdf	guibg=#000000
-"hi Normal		guifg=#87dee0	guibg=#000000
-"hi Normal		guifg=#98fb98	guibg=#000000
-hi Cursor		guibg=khaki		guifg=slategrey
-hi Comment		guifg=#808080
-"hi Identifier	guifg=#98FB98
-hi Identifier	guifg=#87def0
-hi Constant		guifg=#FF99FF
-"hi String		guifg=#87cee0
-hi String		guifg=lightred
-hi Character	guifg=#87cee0
-hi Statement	guifg=khaki
-hi PreProc		guifg=red
-"hi Type			guifg=#a0a0ff						gui=none
-hi Type			guifg=lightgreen					gui=none
-hi Todo			guifg=orangered	guibg=yellow2
-hi Special		guifg=Orange
-hi Visual		guifg=SkyBlue	guibg=grey60		gui=none
-hi IncSearch	guifg=#ffff60	guibg=#0000ff		gui=none
-hi Search		guifg=khaki		guibg=slategrey		gui=none
-hi Ignore		guifg=grey40
-
-hi VertSplit	guibg=#c2bfa5	guifg=grey50		gui=none
-hi Folded		guibg=grey30	guifg=gold
-hi FoldColumn	guibg=grey30	guifg=tan
-hi ModeMsg		guifg=goldenrod
-hi MoreMsg		guifg=SeaGreen
-hi NonText		guifg=LightBlue	guibg=#000000
-hi Question		guifg=springgreen
-hi SpecialKey	guifg=yellowgreen
-hi StatusLineNC	guibg=#c2bfa5	guifg=grey50		gui=none
-hi Title		guifg=indianred
-hi WarningMsg	guifg=salmon
-
-
-" these are from desert ... i didn't change it
-" color terminal definitions
-hi SpecialKey	 ctermfg=darkgreen
-hi NonText	 cterm=bold ctermfg=darkblue
-hi Directory	 ctermfg=darkcyan
-hi ErrorMsg	 cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	 cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	 cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	 ctermfg=darkgreen
-hi ModeMsg	 cterm=NONE ctermfg=brown
-hi LineNr	 ctermfg=3
-hi Question	 ctermfg=green
-hi StatusLine	 cterm=bold,reverse
-hi StatusLineNC  cterm=reverse
-hi VertSplit	 cterm=reverse
-hi Title	 ctermfg=5
-hi Visual	 cterm=reverse
-hi VisualNOS	 cterm=bold,underline
-hi WarningMsg	 ctermfg=1
-hi WildMenu	 ctermfg=0 ctermbg=3
-hi Folded	 ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	 ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	 ctermbg=4
-hi DiffChange	 ctermbg=5
-hi DiffDelete	 cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	 cterm=bold ctermbg=1
-hi Comment	 ctermfg=darkcyan
-hi Constant	 ctermfg=brown
-hi Special	 ctermfg=5
-hi Identifier	 ctermfg=6
-hi Statement	 ctermfg=3
-hi PreProc	 ctermfg=5
-hi Type		 ctermfg=2
-hi Underlined	 cterm=underline ctermfg=5
-hi Ignore	 cterm=bold ctermfg=7
-hi Error	 cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/aiseered.vim b/colors/aiseered.vim
deleted file mode 100755
index 7e71108..0000000
--- a/colors/aiseered.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" gVim color file for working with files in GDL/VCG format.
-" Works nice in conjunction with gdl.vim
-" (see www.vim.org or www.aisee.com)
-" Works fine for C/C++, too.
-
-" Author : Alexander A. Evstyugov-Babaev <alex@absint.com>
-" Version: 0.2 for gVim/Linux,
-"          tested with gVim 6.3.25 under Ubuntu Linux (Warty)
-"          by Jo Vermeulen <jo@lumumba.luc.ac.be>
-" Date   : January 25th 2005
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="aiseered"
-
-hi Normal guifg=lightred guibg=#600000
-hi Cursor guifg=bg guibg=fg
-hi ErrorMsg guibg=red ctermfg=1
-hi Search term=reverse ctermfg=darkred ctermbg=lightred guibg=lightred guifg=#060000
-
-hi Comment guifg=#ffffff
-hi Constant guifg=#88ddee
-hi String guifg=#ffcc88
-hi Character guifg=#ffaa00
-hi Number guifg=#88ddee
-hi Identifier guifg=#cfcfcf
-hi Statement guifg=#eeff99 gui=bold
-hi PreProc guifg=firebrick1 gui=italic
-hi Type guifg=#88ffaa gui=none
-hi Special guifg=#ffaa00
-hi SpecialChar guifg=#ffaa00
-hi StorageClass guifg=#ddaacc
-hi Error guifg=red guibg=white
diff --git a/colors/anotherdark.vim b/colors/anotherdark.vim
deleted file mode 100755
index 72a3341..0000000
--- a/colors/anotherdark.vim
+++ /dev/null
@@ -1,108 +0,0 @@
-" Vim color file
-" Maintainer:	Hans Fugal <hans@fugal.net>
-" Last Change:	$Date: 2003/05/06 16:37:49 $
-" Last Change:	$Date: 2003/06/02 19:40:21 $
-" URL:		http://hans.fugal.net/vim/colors/desert.vim
-" Version:	$Id: desert.vim,v 1.6 2003/06/02 19:40:21 fugalh Exp $
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="anotherdark"
-
-hi Normal	guifg=White guibg=grey20
-
-" highlight groups
-hi Cursor	guibg=khaki guifg=slategrey
-"hi CursorIM
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded	guibg=grey30 guifg=gold
-hi FoldColumn	guibg=grey30 guifg=tan
-hi IncSearch	guifg=slategrey guibg=khaki
-"hi LineNr
-hi ModeMsg	guifg=goldenrod
-hi MoreMsg	guifg=SeaGreen
-hi NonText	guifg=LightBlue guibg=grey30
-hi Question	guifg=springgreen
-hi Search	guibg=peru guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#c2bfa5 guifg=black gui=none
-hi StatusLineNC	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Title	guifg=indianred
-hi Visual	gui=none guifg=khaki guibg=olivedrab
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment	guifg=orange
-hi Constant	guifg=#ffa0a0
-hi Identifier	guifg=palegreen
-hi Statement	guifg=khaki
-hi PreProc	guifg=indianred
-hi Type		guifg=darkkhaki
-hi Special	guifg=navajowhite
-"hi Underlined
-hi Ignore	guifg=grey40
-"hi Error
-hi Todo		guifg=orangered guibg=yellow2
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=lightblue
-hi Constant	ctermfg=darkred
-hi Special	ctermfg=red
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/ansi_blows.vim b/colors/ansi_blows.vim
deleted file mode 100755
index 3f48701..0000000
--- a/colors/ansi_blows.vim
+++ /dev/null
@@ -1,197 +0,0 @@
-" ansi_blows.vim
-" Author:      Brandon Low <lostlogic@lostlogicx.com>
-" Last Change: 28 Feb 2009
-" License:     as-is
-
-set bg=dark
-
-" Remove all existing highlighting and set the defaults.
-hi clear
-
-" Load the syntax highlighting defaults, if it's enabled.
-if exists("syntax_on")
-  syntax reset
-endif
-
-" fg=7
-" bg=0
-" 0 black
-" 1 red
-" 2 green
-" 3 brown/yellow
-" 4 blue
-" 5 magenta
-" 6 cyan
-" 7 white
-
-" Set these colors to the same as your console colors and your gVim and vim
-" will be identically schemed.  These colors are selected to render ANSI
-" graphics reasonably and to be readable.  I recommend setting your terminal
-" emulator to use these colors.  The specific color value that I use in this
-" scheme that can be problematic with other color settings is brown.
-" Terminals often use an ugly and hard to read dark yellow instead of brown
-" and that color makes a couple of my highlight settings here unusable.
-let s:black='#000000'
-let s:boldBlack='#555555'
-let s:red='#b90000'
-let s:boldRed='#dc3244'
-let s:green='#00aa00'
-let s:boldGreen='#44ff44'
-let s:brown='#aa5500'
-let s:yellow='#ffff44'
-let s:blue='#1d28d2'
-let s:boldBlue='#5050ff'
-let s:magenta='#aa00aa'
-let s:boldMagenta='#ff44ff'
-let s:cyan='#00aaaa'
-let s:boldCyan='#44ffff'
-let s:white='#aaaaaa'
-let s:boldWhite='#ffffff'
-
-" These are supposedly Rasterman's colors:
-" let s:black='#000000'
-" let s:boldBlack='#444444'
-" let s:red='#aa0000'
-" let s:boldRed='#ff4444'
-" let s:green='#00d200'
-" let s:boldGreen='#44ff44'
-" let s:brown='#aa5522'
-" let s:yellow='#ffff44'
-" let s:boldBlue='#4444ff'
-" let s:blue='#0000aa'
-" let s:magenta='#aa00aa'
-" let s:boldMagenta='#ff44ff'
-" let s:cyan='#00aaaa'
-" let s:boldCyan='#44ffff'
-" let s:white='#aaaaaa'
-" let s:boldWhite='#ffffff'
-"
-" These are the colors specified in vim help for xterm color display:
-" let s:black='#000000'
-" let s:boldBlack='#808080'
-" let s:red='#c00000'
-" let s:boldRed='#ff6060'
-" let s:green='#008000'
-" let s:boldGreen='#00ff00'
-" let s:brown='#808000'
-" let s:yellow='#ffff00'
-" let s:blue='#0000c0'
-" let s:boldBlue='#8080ff'
-" let s:magenta='#c000c0'
-" let s:boldMagenta='#ff40ff'
-" let s:cyan='#008080'
-" let s:boldCyan='#00ffff'
-" let s:white='#c0c0c0'
-" let s:boldWhite='#ffffff'
-"
-" These are the Eterm defaults:
-" let s:black='#000000'
-" let s:boldBlack='#333333'
-" let s:red='#cc0000'
-" let s:boldRed='#ff0000'
-" let s:green='#00cc00'
-" let s:boldGreen='#00ff00'
-" let s:blue='#0000cc'
-" let s:boldBlue='#0000ff'
-" let s:cyan='#00cccc'
-" let s:boldCyan='#00ffff'
-" let s:magenta='#cc00cc'
-" let s:boldMagenta='#ff00ff'
-" let s:brown='#cccc00'
-" let s:yellow='#ffff00'
-" let s:white='#faebd7'
-" let s:boldWhite='#ffffff'
-"
-" These are gnome-terminal's defaults:
-" let s:black='#000000'
-" let s:boldBlack='#555555'
-" let s:red='#aa0000'
-" let s:boldRed='#ff5555'
-" let s:green='#00aa00'
-" let s:boldGreen='#55ff55'
-" let s:blue='#0000aa'
-" let s:boldBlue='#5555ff'
-" let s:cyan='#00aaaa'
-" let s:boldCyan='#55ffff'
-" let s:magenta='#aa00aa'
-" let s:boldMagenta='#ff55ff'
-" let s:brown='#aa5500'
-" let s:yellow='#ffff55'
-" let s:white='#aaaaaa'
-" let s:boldWhite='#ffffff'
-"
-" These are the colors as defined in the simple CGA spec:
-" let s:black='#000000'
-" let s:boldBlack='#444444'
-" let s:red='#aa0000'
-" let s:boldRed='#ff4444'
-" let s:green='#00aa00'
-" let s:boldGreen='#44ff44'
-" let s:blue='#0000aa'
-" let s:boldBlue='#4444ff'
-" let s:cyan='#00aaaa'
-" let s:boldCyan='#44ffff'
-" let s:magenta='#aa00aa'
-" let s:boldMagenta='#ff44ff'
-" let s:brown='#aaaa00'
-" let s:yellow='#ffff44'
-" let s:white='#aaaaaa'
-" let s:boldWhite='#ffffff'
-
-exe 'hi Normal       guifg=' . s:white . ' guibg=' . s:black
-exe 'hi SpecialKey   guifg=' . s:boldBlue
-exe 'hi NonText      guifg=' . s:boldBlue . ' gui=none'
-exe 'hi Directory    guifg=' . s:boldCyan
-exe 'hi ErrorMsg     guifg=' . s:boldWhite . ' guibg=' . s:red
-exe 'hi IncSearch    cterm=reverse gui=reverse'
-exe 'hi Search       guifg=bg guibg=' . s:brown
-exe 'hi MoreMsg      guifg=' . s:boldGreen . ' gui=none'
-exe 'hi ModeMsg      guifg=' . s:boldWhite . ' gui=none'
-exe 'hi LineNr       guifg=' . s:yellow
-exe 'hi Question     guifg=' . s:boldGreen . ' gui=none'
-exe 'hi StatusLine   cterm=reverse gui=reverse'
-exe 'hi StatusLineNC cterm=reverse gui=reverse'
-exe 'hi VertSplit    cterm=reverse gui=reverse'
-exe 'hi Title        guifg=' . s:boldMagenta . ' gui=none'
-exe 'hi Visual       cterm=reverse gui=reverse guibg=bg'
-exe 'hi VisualNOS    guifg=' . s:boldWhite . ' gui=underline'
-exe 'hi WarningMsg   guifg=' . s:boldRed
-exe 'hi WildMenu     ctermbg=3 guifg=bg guibg=' . s:brown
-exe 'hi Folded       ctermfg=3 ctermbg=7 guifg=' . s:brown . ' guibg=' . s:boldBlack
-exe 'hi FoldColumn   ctermfg=3 ctermbg=7 guifg=' . s:brown . ' guibg=' . s:boldBlack
-exe 'hi DiffAdd      guibg=' . s:blue
-exe 'hi DiffChange   guibg=' . s:magenta
-exe 'hi DiffDelete   cterm=none guifg=' . s:blue . ' guibg=' . s:cyan . ' gui=none'
-exe 'hi DiffText     cterm=bold guifg=' . s:boldWhite . ' guibg=' . s:boldRed
-exe 'hi SignColumn   ctermfg=3 ctermbg=7 guifg=' . s:brown . ' guibg=' . s:boldBlack
-exe 'hi SpellBad     cterm=bold guifg=' . s:boldWhite . ' guisp=' . s:boldRed . ' gui=undercurl'
-exe 'hi SpellCap     cterm=bold guifg=' . s:boldWhite . ' guisp=' . s:boldBlue . ' gui=undercurl'
-exe 'hi SpellRare    cterm=bold guifg=' . s:boldWhite . ' guisp=' . s:boldMagenta . ' gui=undercurl'
-exe 'hi SpellLocal   cterm=bold guifg=' . s:boldWhite . ' guisp=' . s:boldCyan . ' gui=undercurl'
-exe 'hi Pmenu        guibg=' . s:magenta
-exe 'hi PmenuSel     guibg=bg'
-exe 'hi PmenuSbar    ctermfg=3 guifg=' . s:brown . ' guibg=fg'
-exe 'hi PmenuThumb   cterm=reverse gui=reverse'
-exe 'hi TabLine      cterm=underline guifg=fg guibg=bg gui=underline'
-exe 'hi TabLineSel   cterm=bold guifg=' . s:boldWhite
-exe 'hi TabLineFill  cterm=reverse gui=reverse'
-exe 'hi CursorColumn ctermfg=7 ctermbg=7 cterm=bold guifg=' . s:boldWhite . ' guibg=fg'
-exe 'hi CursorLine   cterm=underline gui=underline guibg=bg'
-exe 'hi Cursor       cterm=reverse guifg=bg guibg=fg'
-exe 'hi lCursor      cterm=reverse guifg=bg guibg=fg'
-exe 'hi MatchParen   cterm=bold guifg=' . s:boldWhite . ' guibg=' . s:cyan
-exe 'hi Comment      guifg=' . s:boldCyan
-exe 'hi Constant     guifg=' . s:boldMagenta
-exe 'hi Special      guifg=' . s:boldRed
-exe 'hi Identifier   cterm=bold guifg=' . s:boldCyan . ' gui=bold'
-exe 'hi Statement    guifg=' . s:yellow . ' gui=none'
-exe 'hi PreProc      guifg=' . s:boldBlue
-exe 'hi Type         guifg=' . s:boldGreen . ' gui=none'
-exe 'hi Underlined   cterm=bold,underline guifg=' . s:boldBlue . ' gui=underline'
-exe 'hi Ignore       guifg=bg'
-exe 'hi Error        guifg=' . s:boldWhite . ' guibg=' . s:boldRed
-exe 'hi Todo         guifg=bg guibg=' . s:brown
-
-let colors_name = "ansi_blows"
-
-" vim: sw=2
diff --git a/colors/aqua.vim b/colors/aqua.vim
deleted file mode 100755
index 483b6ac..0000000
--- a/colors/aqua.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-" Vim color file
-" Maintainer:   tranquility@portugalmail.pt
-" Last Change:  6 Apr 2002
-
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="aqua"
-
-hi Normal				guibg=steelblue guifg=linen
-hi Cursor				guibg=lightblue3 guifg=black gui=bold
-hi VertSplit		guifg=white guibg=navyblue gui=none
-hi Folded				guibg=darkblue guifg=white
-hi FoldColumn		guibg=lightgray guifg=navyblue
-hi ModeMsg			guifg=black guibg=steelblue1
-hi MoreMsg			guifg=black guibg=steelblue1
-hi NonText			guifg=white guibg=steelblue4 gui=none
-hi Question			guifg=snow
-hi Search				guibg=#FFFFFF guifg=midnightblue gui=bold
-hi SpecialKey		guifg=navyblue
-hi StatusLine		guibg=skyblue3 guifg=black gui=none
-hi StatusLineNC	guibg=skyblue1 guifg=black gui=none
-hi Title				guifg=bisque3
-hi Subtitle			guifg=black
-hi Visual				guifg=white guibg=royalblue4 gui=none
-hi WarningMsg		guifg=salmon4 guibg=gray60 gui=bold
-hi Comment			guifg=lightskyblue
-hi Constant			guifg=turquoise gui=bold
-hi Identifier		guifg=lightcyan
-hi Statement		guifg=royalblue4
-hi PreProc			guifg=black gui=bold
-hi Type					guifg=lightgreen
-hi Special			guifg=navajowhite
-hi Ignore				guifg=grey29
-hi Todo					guibg=black guifg=white
-hi WildMenu			guibg=aquamarine
diff --git a/colors/ashen.vim b/colors/ashen.vim
deleted file mode 100755
index ace18fa..0000000
--- a/colors/ashen.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-" Vim color file
-" Maintainer:  Tuomas Kasmra <kasmra@gmail.com>
-" Last Change:  2009 Feb 10
-" Version: 0.3
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="ashen"
-
-hi Normal       guifg=#000000                   guibg=#e0e0e0
-hi Title        guifg=#000000   gui=BOLD        guibg=#ffffcc
-hi lCursor      guifg=NONE                      guibg=#000000
-hi LineNr       guifg=#e0e0e0                   guibg=#84986C
-hi Comment      guifg=#c03417   gui=italic
-hi Identifier   guifg=#000000   gui=NONE
-hi Visual       guifg=NONE      gui=NONE        guibg=#00ccff
-hi Directory    guifg=#8b8b8b
-hi NonText      guifg=#6f8b17
-hi Special      guifg=#32329e
-hi Operator     guifg=#01c1c7   gui=NONE
-hi Statement    guifg=#006600   gui=bold
-hi TypeDef      guifg=#dcdce0   gui=NONE
-hi Type         guifg=#4848f3   gui=bold
-hi Boolean      guifg=#669900   gui=NONE
-hi String       guifg=#eb2c2c   gui=NONE
-hi Number       guifg=#9d7d4a   gui=NONE
-hi Constant     guifg=#9d7d4a   gui=NONE
-hi Function     guifg=#660066   gui=NONE
-hi PreProc      guifg=#000080   gui=bold
-hi Keyword      guifg=#c03417   gui=NONE
-
diff --git a/colors/asmanian_blood.vim b/colors/asmanian_blood.vim
deleted file mode 100755
index 378765b..0000000
--- a/colors/asmanian_blood.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-
-set background=dark
-
-hi Normal       guifg=#b4b0b0 guibg=#080404 gui=none
-hi NonText      guifg=#b4b0b0 guibg=#181414 gui=none
-hi SpecialKey   guifg=#b4b0b0 guibg=#282424 gui=bold
-
-hi Comment      guifg=#686460 guibg=#080404 gui=none
-hi Todo         guifg=#686460 guibg=#080404 gui=underline,italic
-hi Search       guifg=#000000 guibg=#f0f000 gui=underline,italic
-hi Visual                     guibg=#282020
-hi MatchParen   guifg=#ffffff guibg=#904030 gui=none
-
-hi Title        guifg=#ffffff guibg=#202020 gui=underline
-hi Underlined   guifg=#b4b0b0 guibg=#080404 gui=underline
-
-hi CursorColumn guifg=#f4f0f0 guibg=#201c1c gui=none
-hi CursorLine   guifg=#f4f0f0 guibg=#201c1c gui=none
-
-hi StatusLine   guifg=#f8e0d0 guibg=#301810 gui=bold
-hi StatusLineNC guifg=#503830 guibg=#200800 gui=none
-hi VertSplit    guifg=#200800 guibg=#301810 gui=none
-hi LineNr       guifg=#848070 guibg=#181414 gui=none
-hi Folded       guifg=#484040 guibg=#080404 gui=bold,italic
-
-hi Define       guifg=#607080 guibg=#080404 gui=italic
-hi Function     guifg=#60b050 guibg=#080404 gui=italic
-hi PreProc      guifg=#a090a0 guibg=#080404 gui=italic
-hi Define       guifg=#806080 guibg=#080404 gui=italic
-hi Identifier   guifg=#c0b060 guibg=#080404 gui=italic
-
-hi Statement    guifg=#506090 guibg=#080404 gui=underline
-hi Repeat       guifg=#906050 guibg=#080404 gui=underline
-hi Conditional  guifg=#609050 guibg=#080404 gui=underline
-hi Exception    guifg=#903020 guibg=#080404 gui=underline
-
-hi Type         guifg=#705850 guibg=#080404 gui=italic
-hi String       guifg=#a06050 guibg=#080404 gui=italic
-hi Special      guifg=#a06050 guibg=#181414 gui=italic
-hi Number       guifg=#60d060 guibg=#080404 gui=none
-hi Constant     guifg=#60d060 guibg=#080404 gui=none
-
diff --git a/colors/astronaut.vim b/colors/astronaut.vim
deleted file mode 100755
index 8caec73..0000000
--- a/colors/astronaut.vim
+++ /dev/null
@@ -1,164 +0,0 @@
-" astronaut.vim: a colorscheme
-"    Maintainer: Charles E. Campbell, Jr. <charles.e.campbell.1@gsfc.nasa.gov>
-"          Date: Feb 21, 2006
-"       Version: 7
-"
-"  Usage:
-"  Put into your <.vimrc> file:
-"    color astronaut
-"
-"  Optional Modifiers:
-"  let g:astronaut_bold=1      : term, cterm, and gui receive bold modifier
-"  let g:astronaut_dark=1      : dark colors used (otherwise some terminals
-"                                make everything bold, which can be all one
-"                                color)
-"  let g:astronaut_underline=1 : assume that underlining works on your terminal
-"  let g:astronaut_italic=1    : allows italic to be used in gui
-"  Examples:
-"   iris       : let astronaut_dark=1
-"   Linux xterm: no modifiers needed
-"
-" GetLatestVimScripts: 122 1 :AutoInstall: astronaut.vim
-
-set background=dark
-hi clear
-if exists( "syntax_on" )
-    syntax reset
-endif
-let g:colors_name      = "astronaut"
-let g:loaded_astronaut = "v7"
-
-" ---------------------------------------------------------------------
-" Default option values
-if !exists("g:astronaut_bold")
- " on some machines, notably SGIs, a bold qualifier means everything is
- " one color (SGIs: yellow)
- let g:astronaut_bold= 0
-endif
-if !exists("g:astronaut_dark")
- " this option, if true, means darkcolor (ex. darkred, darkmagenta, etc)
- " is understood and wanted
- let g:astronaut_dark= 0
-endif
-if !exists("g:astronaut_underline")
- let g:astronaut_underline= 1
-endif
-if !exists("g:astronaut_italic")
- let g:astronaut_italic= 0
-endif
-
-" ---------------------------------------------------------------------
-"  Settings based on options
-if g:astronaut_bold != 0
- let s:bold=",bold"
-else
- let s:bold=""
-endif
-
-if g:astronaut_italic != 0
- let s:italic= ",italic"
-else
- let s:italic= ""
-endif
-
-if g:astronaut_dark != 0
- let s:black   = "black"
- let s:red     = "darkred"
- let s:green   = "darkgreen"
- let s:yellow  = "darkyellow"
- let s:blue    = "darkblue"
- let s:magenta = "darkmagenta"
- let s:cyan    = "darkcyan"
- let s:white   = "white"
-else
- let s:black   = "black"
- let s:red     = "red"
- let s:green   = "green"
- let s:yellow  = "yellow"
- let s:blue    = "blue"
- let s:magenta = "magenta"
- let s:cyan    = "cyan"
- let s:white   = "white"
-endif
-
-if g:astronaut_underline != 0
- let s:underline= ",underline"
- let s:ulbg     = ""
-else
- let s:underline= "none"
- if exists("g:astronaut_dark")
-  let s:ulbg     = "ctermbg=darkmagenta guibg=magenta4"
- else
-  let s:ulbg     = "ctermbg=magenta guibg=magenta"
- endif
-endif
-
-" ---------------------------------------------------------------------
-exe "hi Blue           start=      stop=   ctermfg=".s:blue."                              guifg=blue        guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Comment        start=      stop=   ctermfg=".s:white."                             guifg=white                           term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Conceal                                                ctermfg=".s:blue."      ctermbg=".s:black."     guifg=Blue        guibg=Black         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Constant       start=      stop=   ctermfg=".s:yellow."                            guifg=yellow      guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Cursor                                                                                                 guifg=blue        guibg=green         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Cyan           start=      stop=   ctermfg=".s:cyan."                              guifg=cyan        guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Debug          start=      stop=   ctermfg=".s:magenta."   ctermbg=".s:black."     guifg=magenta     guibg=black         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Delimiter      start=      stop=   ctermfg=".s:white."                             guifg=white       guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi DiffAdd                                                ctermfg=".s:white."     ctermbg=".s:magenta."   guifg=White       guibg=Magenta       term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi DiffChange                                             ctermfg=".s:yellow."    ctermbg=".s:blue."      guifg=Yellow      guibg=Blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi DiffDelete                                             ctermfg=".s:white."     ctermbg=".s:blue."      guifg=White       guibg=Blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi DiffText                                               ctermfg=".s:white."     ctermbg=".s:red."       guifg=White       guibg=Red           term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Directory      start=      stop=   ctermfg=".s:white."                             guifg=white                           term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Error          start=   stop=   ctermfg=".s:white."     ctermbg=".s:red."       guifg=white       guibg=red           term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi ErrorMsg                                               ctermfg=".s:white."     ctermbg=".s:red."       guifg=White       guibg=Red           term=standout".s:bold."         cterm=none".s:bold."              gui=none".s:bold
-exe "hi FoldColumn     start=   stop=   ctermfg=".s:cyan."      ctermbg=".s:black."     guifg=Cyan        guibg=Brown         term=standout".s:bold."         cterm=none".s:bold."              gui=none".s:bold
-exe "hi Folded         start=   stop=   ctermfg=".s:magenta."   ctermbg=".s:black."     guifg=magenta     guibg=black         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Function       start=      stop=   ctermfg=".s:cyan."                              guifg=cyan        guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Green          start=      stop=   ctermfg=".s:green."                             guifg=green       guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Identifier     start=      stop=   ctermfg=".s:magenta."                           guifg=magenta     guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Ignore                                                 ctermfg=".s:black  ."                           guifg=bg                              term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi IncSearch      start=   stop=   ctermfg=".s:black  ."   ctermbg=".s:green."     guifg=black       guibg=green         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi LineNr                                                 ctermfg=".s:yellow." ".s:ulbg."                 guifg=Yellow                          term=none".s:underline.s:bold." cterm=none".s:bold."              gui=none".s:bold
-exe "hi Magenta        start=      stop=   ctermfg=".s:magenta."                           guifg=magenta     guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Menu                                                                                                   guifg=black       guibg=gray75        term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi ModeMsg                                                ctermfg=".s:green."                             guifg=SeaGreen                        term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi MoreMsg                                                ctermfg=".s:green."                             guifg=SeaGreen                        term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi NonText                                                ctermfg=".s:blue."                              guifg=Blue                            term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Normal         start=      stop=   ctermfg=".s:green."                             guifg=green       guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi PreProc        start=   stop=   ctermfg=".s:white."     ctermbg=".s:blue."      guifg=white       guibg=blue3         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Question       start=      stop=   ctermfg=".s:yellow."                            guifg=yellow                          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Red            start=      stop=   ctermfg=".s:red."                               guifg=red         guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Scrollbar                                                                                              guifg=gray80      guibg=gray70        term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Search         start=   stop=   ctermfg=".s:yellow."    ctermbg=".s:blue."      guifg=yellow      guibg=blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Special        start=   stop=   ctermfg=".s:green."     ctermbg=".s:blue."      guifg=green       guibg=blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi SpecialKey     start=   stop=   ctermfg=".s:black."     ctermbg=".s:magenta."   guifg=black       guibg=magenta       term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Statement      start=      stop=   ctermfg=".s:cyan."                              guifg=cyan        guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi StatusLine     start=   stop=   ctermfg=".s:black."     ctermbg=".s:cyan."      guifg=black       guibg=cyan          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi StatusLineNC   start=   stop=   ctermfg=".s:black."     ctermbg=".s:green."     guifg=black       guibg=green         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi String         start=      stop=   ctermfg=".s:yellow."                            guifg=yellow      guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Subtitle       start=      stop=   ctermfg=".s:magenta."                           guifg=magenta     guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-if v:version >= 700
- exe "hi TabLine        start=   stop=   ctermfg=".s:black."     ctermbg=".s:blue."      guifg=black       guibg=blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold.s:underline.s:italic
- exe "hi TabLineSel     start=   stop=   ctermfg=".s:green."     ctermbg=".s:blue."      guifg=green       guibg=blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold.s:underline.s:italic
- exe "hi TabLineFill    start=   stop=   ctermfg=".s:blue."      ctermbg=".s:blue."      guifg=blue        guibg=blue          term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-endif
-exe "hi Tags           start=   stop=   ctermfg=".s:yellow."    ctermbg=".s:blue."      guifg=yellow      guibg=blue3         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Title          start=      stop=   ctermfg=".s:white."                             guifg=white                           term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Todo           start=   stop=   ctermfg=".s:white."     ctermbg=".s:magenta."   guifg=white       guibg=magenta       term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Type           start=    stop=   ctermfg=".s:green."    ".s:ulbg."               guifg=seagreen1                       term=none".s:underline.s:bold." cterm=none".s:bold.s:underline."  gui=none".s:bold.s:underline
-exe "hi Underlined                                             ctermfg=".s:green."     ".s:ulbg."              guifg=green                           term=none".s:underline.s:bold." cterm=none".s:bold.s:underline."  gui=none".s:bold.s:underline
-exe "hi Unique         start=   stop=   ctermfg=".s:blue."      ctermbg=".s:white."     guifg=blue3       guibg=white         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi AltUnique      start=   stop=   ctermfg=".s:magenta."   ctermbg=".s:white."     guifg=magenta     guibg=white         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi AltAltUnique   start=   stop=   ctermfg=".s:black."     ctermbg=".s:white."     guifg=black       guibg=white         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi VertSplit      start=   stop=   ctermfg=".s:black."     ctermbg=".s:green."     guifg=black       guibg=green         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi Visual         start=   stop=   ctermfg=black           ctermbg=green           guifg=Grey        guibg=fg            term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi VisualNOS                                                                      ".s:ulbg."                                                    term=none".s:underline.s:bold." cterm=none".s:bold.s:underline."  gui=none".s:bold.s:underline
-exe "hi WarningMsg     start=   stop=   ctermfg=".s:black."     ctermbg=".s:yellow."    guifg=black       guibg=yellow        term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi White          start=      stop=   ctermfg=".s:white."                             guifg=white       guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi WildMenu                                               ctermfg=".s:black."     ctermbg=".s:yellow."    guifg=Black       guibg=Yellow        term=standout".s:bold."         cterm=none".s:bold."              gui=none".s:bold
-exe "hi Yellow         start=      stop=   ctermfg=".s:yellow."                            guifg=yellow      guibg=navyblue      term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi lCursor                                                                                                guifg=bg          guibg=fg            term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold
-exe "hi AltConstant    start=   stop=   ctermfg=".s:yellow."    ctermbg=".s:black."     guifg=yellow      guibg=black         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold.s:italic
-exe "hi AltFunction    start=   stop=   ctermfg=".s:green."     ctermbg=".s:black."     guifg=green       guibg=black         term=none".s:bold."             cterm=none".s:bold."              gui=none".s:bold.s:italic
-exe "hi AltType        start= stop=   ctermfg=".s:green."     ctermbg=".s:black."     guifg=seagreen1   guibg=black         term=none".s:underline.s:bold." cterm=none".s:bold.s:underline."  gui=none".s:bold.s:underline.s:italic
-exe "hi User1                                                  ctermfg=".s:white."     ctermbg=".s:blue."      guifg=white       guibg=blue"
-exe "hi User2                                                  ctermfg=".s:cyan."      ctermbg=".s:blue."      guifg=cyan        guibg=blue"
-" vim: nowrap
diff --git a/colors/asu1dark.vim b/colors/asu1dark.vim
deleted file mode 100755
index ce5f90f..0000000
--- a/colors/asu1dark.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Vim color file
-" Maintainer:   A. Sinan Unur
-" Last Change:  2001/10/04
-
-" Dark color scheme
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="asu1dark"
-
-" Console Color Scheme
-hi Normal       term=NONE cterm=NONE ctermfg=LightGray   ctermbg=Black
-hi NonText      term=NONE cterm=NONE ctermfg=Brown       ctermbg=Black
-hi Function     term=NONE cterm=NONE ctermfg=DarkCyan    ctermbg=Black
-hi Statement    term=BOLD cterm=BOLD ctermfg=DarkBlue    ctermbg=Black
-hi Special      term=NONE cterm=NONE ctermfg=DarkGreen   ctermbg=Black
-hi SpecialChar  term=NONE cterm=NONE ctermfg=Cyan        ctermbg=Black
-hi Constant     term=NONE cterm=NONE ctermfg=Blue        ctermbg=Black
-hi Comment      term=NONE cterm=NONE ctermfg=DarkGray    ctermbg=Black
-hi Preproc      term=NONE cterm=NONE ctermfg=DarkGreen   ctermbg=Black
-hi Type         term=NONE cterm=NONE ctermfg=DarkMagenta ctermbg=Black
-hi Identifier   term=NONE cterm=NONE ctermfg=Cyan        ctermbg=Black
-hi StatusLine   term=BOLD cterm=NONE ctermfg=Yellow      ctermbg=DarkBlue
-hi StatusLineNC term=NONE cterm=NONE ctermfg=Black       ctermbg=Gray
-hi Visual       term=NONE cterm=NONE ctermfg=White       ctermbg=DarkCyan
-hi Search       term=NONE cterm=NONE ctermbg=Yellow      ctermfg=DarkBlue
-hi VertSplit    term=NONE cterm=NONE ctermfg=Black       ctermbg=Gray
-hi Directory    term=NONE cterm=NONE ctermfg=Green       ctermbg=Black
-hi WarningMsg   term=NONE cterm=NONE ctermfg=Blue        ctermbg=Yellow
-hi Error        term=NONE cterm=NONE ctermfg=DarkRed     ctermbg=Gray
-hi Cursor                            ctermfg=Black       ctermbg=Cyan
-hi LineNr       term=NONE cterm=NONE ctermfg=Red         ctermbg=Black
-
-" GUI Color Scheme
-hi Normal       gui=NONE     guifg=White   guibg=#110022
-hi NonText      gui=NONE     guifg=#ff9999 guibg=#444444
-hi Function     gui=NONE     guifg=#7788ff guibg=#110022
-hi Statement    gui=BOLD     guifg=Yellow  guibg=#110022
-hi Special      gui=NONE     guifg=Cyan    guibg=#110022
-hi Constant     gui=NONE     guifg=#ff9900 guibg=#110022
-hi Comment      gui=NONE     guifg=#99cc99 guibg=#110022
-hi Preproc      gui=NONE     guifg=#33ff66 guibg=#110022
-hi Type         gui=NONE     guifg=#ff5577 guibg=#110022
-hi Identifier   gui=NONE     guifg=Cyan    guibg=#110022
-hi StatusLine   gui=BOLD     guifg=White   guibg=#336600
-hi StatusLineNC gui=NONE     guifg=Black   guibg=#cccccc
-hi Visual       gui=NONE     guifg=White   guibg=#00aa33
-hi Search       gui=BOLD     guibg=Yellow  guifg=DarkBlue
-hi VertSplit    gui=NONE     guifg=White   guibg=#666666
-hi Directory    gui=NONE     guifg=Green   guibg=#110022
-hi WarningMsg   gui=STANDOUT guifg=#0000cc guibg=Yellow
-hi Error        gui=NONE     guifg=White   guibg=Red
-hi Cursor                    guifg=White   guibg=#00ff33
-hi LineNr       gui=NONE     guifg=#cccccc guibg=#334444
-hi ModeMsg      gui=NONE     guifg=Blue    guibg=White
-hi Question     gui=NONE     guifg=#66ff99 guibg=#110022
diff --git a/colors/automation.vim b/colors/automation.vim
deleted file mode 100755
index b449145..0000000
--- a/colors/automation.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Vim color file (automation.vim)                                            
-" Maintainer:	Ken McConnell <nacer@yahoo.com>                                
-" Last Change:	2004 Jan 15                                                  
-"                                                                            
-" This color scheme uses a light grey background.  It was created to simulate
-" the look of an IDE.  It is named after the MFP Automation Team at HP Boise.
-"                                                                            
-
-" First remove all existing highlighting.
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "automation"
-
-hi Normal ctermbg=Black ctermfg=LightGrey guifg=Black guibg=Grey96
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg 		term=standout 	ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
-hi IncSearch		term=reverse 		cterm=bold gui=bold
-hi ModeMsg 			term=bold 			cterm=bold gui=bold
-hi StatusLine 	term=bold 			cterm=bold gui=bold
-hi StatusLineNC term=bold 			cterm=bold gui=bold
-hi VertSplit 		term=bold 			cterm=bold gui=bold
-hi Visual 			term=bold 			cterm=bold gui=bold guifg=Grey guibg=fg
-hi VisualNOS 		term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText 		term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-hi Cursor 			guibg=Black guifg=Black
-hi lCursor 			guibg=Cyan guifg=Black
-hi Directory 		term=bold ctermfg=LightCyan guifg=DarkBlue
-hi LineNr 			term=underline ctermfg=DarkGrey guifg=DarkGrey guibg=LightGrey
-hi MoreMsg 			term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
-hi NonText 			term=bold ctermfg=LightBlue gui=bold guifg=DarkGreen guibg=grey80
-hi Question 		term=standout ctermfg=LightGreen gui=bold guifg=Green
-hi Search 			term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi SpecialKey 	term=bold ctermfg=DarkBlue guifg=DarkBlue
-hi Title 				term=bold ctermfg=LightMagenta gui=bold guifg=DarkBlue
-hi WarningMsg 	term=standout ctermfg=LightRed guifg=Red
-hi WildMenu			term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi Folded 			term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
-hi FoldColumn 	term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
-hi DiffAdd 			term=bold ctermbg=DarkBlue guibg=DarkBlue
-hi DiffChange 	term=bold ctermbg=DarkMagenta guibg=DarkMagenta
-hi DiffDelete 	term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
-hi Comment			guifg=Blue guibg=Grey90 ctermfg=DarkGreen
-hi String				guifg=DarkGreen ctermfg=DarkGreen
-hi Statement		guifg=DarkBlue ctermfg=Blue
-hi Label 				gui=bold guifg=DarkBlue
-" Groups for syntax highlighting
-hi Constant 		term=underline ctermfg=DarkBlue guifg=DarkBlue guibg=Grey96
-hi Special 			term=bold ctermfg=LightRed guifg=DarkBlue guibg=Grey96
-if &t_Co > 8
-  hi Statement 	term=bold cterm=bold ctermfg=DarkBlue guifg=DarkBlue 
-endif
-hi Ignore 			ctermfg=LightGrey guifg=grey90
-
-" vim: sw=2
diff --git a/colors/autumn.vim b/colors/autumn.vim
deleted file mode 100755
index 22a5ef0..0000000
--- a/colors/autumn.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" Vim colour file
-" Maintainer:   Antony Scriven <ad_scriven@postmaster.co.uk>
-" Last Change:  2003-06-12
-"
-set background=light
-hi clear
-if exists("syntax_on")
-        syntax reset
-endif
-
-let colors_name = "autumn"
-
-hi Normal       term=none      cterm=none ctermfg=black         ctermbg=White           gui=none guifg=Black            guibg=#f0f2f0
-hi Cursor       term=none      cterm=none ctermfg=white         ctermbg=darkgrey        gui=none guifg=black            guibg=red
-hi DiffAdd      term=bold       cterm=none      ctermfg=white   ctermbg=DarkBlue        gui=none guifg=#aaeeaa          guibg=#447744
-hi DiffChange   term=bold       cterm=none      ctermfg=white   ctermbg=DarkMagenta     gui=none guifg=lightyellow      guibg=#ddbb55
-hi DiffDelete   term=bold       cterm=none      ctermfg=blue    ctermbg=darkcyan        gui=none guifg=#336633          guibg=#aaccaa
-hi difftext     term=reverse    cterm=bold      ctermfg=white   ctermbg=red             gui=none guifg=lightyellow      guibg=#cc7733
-hi Directory    term=none      cterm=none ctermfg=Red           ctermbg=white           gui=none guifg=Red              guibg=bg
-hi ErrorMsg     term=standout  cterm=none ctermfg=white         ctermbg=DarkRed         gui=none guifg=white            guibg=DarkRed
-hi Folded       term=reverse   cterm=none ctermfg=darkblue      ctermbg=lightgrey       gui=none guifg=darkblue         guibg=lightgrey
-"8 col term
-hi FoldColumn   term=reverse   cterm=none ctermfg=darkblue      ctermbg=grey            gui=none guifg=darkblue         guibg=grey
-hi IncSearch    term=reverse   cterm=none ctermfg=yellow        ctermbg=darkgreen       gui=none guifg=yellow           guibg=#449944 
-hi lCursor      term=reverse   cterm=none ctermfg=black         ctermbg=cyan            gui=none guifg=black            guibg=Cyan
-hi LineNr       term=reverse   cterm=none ctermfg=darkred       ctermbg=grey            gui=none guifg=brown            guibg=lightgrey 
-hi ModeMsg      term=bold      cterm=none ctermfg=green         ctermbg=darkgreen       gui=none guifg=#007700          guibg=#aaccaa
-hi MoreMsg      term=bold      cterm=none ctermfg=darkGreen     ctermbg=white           gui=none guifg=darkgreen        guibg=bg
-hi Question     term=bold      cterm=none ctermfg=darkGreen     ctermbg=white           gui=none guifg=darkgreen        guibg=bg
-hi Search       term=reverse   cterm=none ctermfg=black         ctermbg=yellow          gui=none guifg=black            guibg=yellow
-hi SpecialKey   term=italic    cterm=none ctermfg=lightgrey     ctermbg=white           gui=none guifg=lightblue        guibg=bg
-hi NonText      term=bold      cterm=none ctermfg=lightgrey     ctermbg=white           gui=none guifg=#c6c6c6          guibg=bg
-hi StatusLine   term=reverse   cterm=none ctermfg=white         ctermbg=black           gui=none guifg=#80624d          guibg=#ddd9b8
-hi Title        term=bold      cterm=none ctermfg=DarkMagenta   ctermbg=white           gui=none guifg=DarkMagenta      guibg=bg
-if has("gui_running") || &t_Co > 8
-        hi Visual       term=reverse   cterm=none ctermfg=black         ctermbg=lightgrey       gui=none guifg=black       guibg=lightgreen
-        hi VertSplit    term=reverse   cterm=none ctermfg=darkgrey      ctermbg=darkgrey        gui=none guifg=#c7c7c2     guibg=#d7d7d2 
-        hi StatusLineNC term=reverse   cterm=none ctermfg=white         ctermbg=darkgrey        gui=none guifg=darkgrey    guibg=#d7d7d2
-        hi Comment      term=italic    cterm=none ctermfg=grey          ctermbg=white           gui=none guifg=#ccaaaa     guibg=bg
-else
-        hi Visual       term=reverse   cterm=none ctermfg=green         ctermbg=darkgreen       gui=none guifg=black    guibg=lightgreen
-        hi VertSplit    term=reverse   cterm=none ctermfg=darkcyan      ctermbg=darkblue        gui=none guifg=darkgrey guibg=darkgrey 
-        hi StatusLineNC term=reverse   cterm=none ctermfg=white         ctermbg=darkblue        gui=none guifg=white    guibg=darkgrey
-        hi Comment      term=italic    cterm=none ctermfg=darkcyan      ctermbg=white           gui=none guifg=#ccaaaa  guibg=bg
-endif
-hi VisualNOS    term=bold      cterm=none ctermfg=grey         ctermbg=black        gui=none guifg=grey         guibg=black
-hi WarningMsg   term=standout  cterm=none ctermfg=Red          ctermbg=white        gui=none guifg=Red          guibg=bg
-hi WildMenu     term=bold      cterm=none ctermfg=darkblue     ctermbg=yellow       gui=none guifg=black        guibg=lightyellow
-
-hi Constant     term=underline  cterm=none      ctermfg=darkred         ctermbg=bg      gui=none guifg=#bb6666  guibg=bg
-hi Special      term=bold       cterm=none      ctermfg=darkcyan        ctermbg=white   gui=none guifg=darkcyan guibg=bg
-hi identifier   term=underline  cterm=none      ctermfg=darkmagenta     ctermbg=white   gui=none guifg=darkcyan guibg=bg
-hi statement    term=bold       cterm=none      ctermfg=darkgreen       ctermbg=white   gui=none guifg=#44aa44  guibg=bg
-hi preproc      term=underline  cterm=none      ctermfg=darkgrey        ctermbg=white   gui=none guifg=darkgrey guibg=bg
-hi type         term=none       cterm=none      ctermfg=brown           ctermbg=white   gui=none guifg=#bb9900  guibg=bg
-hi underlined   term=underline  cterm=underline ctermfg=darkmagenta     ctermbg=white   gui=underline guifg=darkmagenta guibg=bg
-hi Ignore       term=italic     cterm=none      ctermfg=lightgrey       ctermbg=white   gui=none guifg=grey     guibg=bg
-"hi todo         term=underline  cterm=bold      ctermfg=yellow          ctermbg=brown   gui=none guifg=#333333     guibg=#ddee33
-hi todo   term=bold       cterm=none      ctermfg=yellow   ctermbg=brown     gui=bold guifg=#229900      guibg=#ddd9b8
-hi function     term=bold       cterm=none      ctermfg=blue            ctermbg=white   gui=none guifg=#0055cc  guibg=bg
-
-hi link String          Constant
-hi link Character       Constant
-hi link Number          Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Conditional     Statement
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Operator        Statement
-hi link Keyword         Statement
-hi link Exception       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 SpecialChar     Special
-hi link Delimiter       Special
-hi link SpecialComment  Special
-hi link Debug           Special
-hi link vimfunction     function
-
-
-" vim: set ts=8 sw=8 et sts=8 tw=72 fo-=t ff=unix :
diff --git a/colors/autumnleaf.vim b/colors/autumnleaf.vim
deleted file mode 100755
index f7af59f..0000000
--- a/colors/autumnleaf.vim
+++ /dev/null
@@ -1,154 +0,0 @@
-" Vim color file
-" Maintainer: Anders Korte
-" Last Change: 17 Oct 2004
-
-" AutumnLeaf color scheme 1.0
-
-set background=light
-
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name="AutumnLeaf"
-
-
-" Colors for the User Interface.
-
-hi Cursor	guibg=#aa7733   guifg=#ffeebb   gui=bold
-hi Normal	guibg=#fffdfa	guifg=black	gui=none
-hi NonText	guibg=#eafaea   guifg=#000099   gui=bold
-hi Visual	guibg=#fff8cc   guifg=black	gui=none
-" hi VisualNOS
-
-hi Linenr	guibg=bg	guifg=#999999 gui=none
-
-" Uncomment these if you use Diff...??
-" hi DiffText	guibg=#cc0000	guifg=white gui=none
-" hi DiffAdd	guibg=#0000cc	guifg=white gui=none
-" hi DiffChange	guibg=#990099	guifg=white gui=none
-" hi DiffDelete	guibg=#888888	guifg=#333333 gui=none
-
-hi Directory	guibg=bg	guifg=#337700   gui=none
-
-hi IncSearch	guibg=#c8e8ff	guifg=black	gui=none
-hi Search	guibg=#c8e8ff	guifg=black	gui=none
-hi SpecialKey	guibg=bg	guifg=fg    	gui=none
-hi Titled	guibg=bg	guifg=fg	gui=none
-
-hi ErrorMsg	    guibg=bg	guifg=#cc0000   gui=bold
-hi ModeMsg	    guibg=bg	guifg=#003399   gui=none
-hi link	MoreMsg	    ModeMsg
-hi link Question    ModeMsg
-hi WarningMsg	    guibg=bg	guifg=#cc0000   gui=bold
-
-hi StatusLine	guibg=#ffeebb	guifg=black	gui=bold
-hi StatusLineNC	guibg=#aa8866	guifg=#f8e8cc	gui=none
-hi VertSplit	guibg=#aa8866	guifg=#ffe0bb	gui=none
-
-" hi Folded
-" hi FoldColumn
-" hi SignColumn
-
-
-" Colors for Syntax Highlighting.
-
-hi Comment guibg=#ddeedd guifg=#002200 gui=none
-
-hi Constant	guibg=bg    guifg=#003399 gui=bold
-hi String	guibg=bg    guifg=#003399 gui=italic
-hi Character	guibg=bg    guifg=#003399 gui=italic
-hi Number	guibg=bg    guifg=#003399 gui=bold
-hi Boolean	guibg=bg    guifg=#003399 gui=bold
-hi Float	guibg=bg    guifg=#003399 gui=bold
-
-hi Identifier	guibg=bg    guifg=#003399 gui=none
-hi Function	guibg=bg    guifg=#0055aa gui=bold
-hi Statement	guibg=bg    guifg=#003399 gui=none
-
-hi Conditional	guibg=bg    guifg=#aa7733 gui=bold
-hi Repeat	guibg=bg    guifg=#aa5544 gui=bold
-hi link	Label	Conditional
-hi Operator	guibg=bg    guifg=#aa7733 gui=bold
-hi link Keyword	Statement
-hi Exception	guibg=bg    guifg=#228877 gui=bold
-
-hi PreProc	    guibg=bg	guifg=#aa7733 gui=bold
-hi Include	    guibg=bg	guifg=#558811 gui=bold
-hi link Define	    Include
-hi link Macro	    Include
-hi link PreCondit   Include
-
-hi Type			guibg=bg    guifg=#007700 gui=bold
-hi link StorageClass	Type
-hi link Structure	Type
-hi Typedef		guibg=bg    guifg=#009900 gui=italic
-
-hi Special	    guibg=bg	    guifg=fg	    gui=none
-hi SpecialChar	    guibg=bg	    guifg=fg	    gui=bold
-hi Tag		    guibg=bg	    guifg=#003399   gui=bold
-hi link Delimiter   Special
-hi SpecialComment   guibg=#dddddd   guifg=#aa0000   gui=none
-hi link Debug	    Special
-
-hi Underlined guibg=bg guifg=blue gui=underline
-
-hi Title    guibg=bg	guifg=fg    	gui=bold
-hi Ignore   guibg=bg	guifg=#999999	gui=none
-hi Error    guibg=red	guifg=white	gui=none
-hi Todo	    guibg=bg	guifg=#aa0000   gui=none
-
-
-
-" The same in cterm colors.
-hi Cursor	ctermbg=6   ctermfg=14
-hi Normal	ctermbg=15  ctermfg=0
-hi NonText	ctermbg=10  ctermfg=1
-hi Visual	ctermbg=14  ctermfg=0
-" hi VisualNOS
-hi Linenr	ctermbg=bg  ctermfg=7
-" hi DiffText	ctermbg=4   ctermfg=15
-" hi DiffAdd	ctermbg=1   ctermfg=15
-" hi DiffChange	ctermbg=5   ctermfg=15
-" hi DiffDelete	ctermbg=7   ctermfg=8
-hi Directory	ctermbg=bg  ctermfg=2 
-hi IncSearch	ctermbg=9   ctermfg=0
-hi Search	ctermbg=9   ctermfg=0
-hi SpecialKey	ctermbg=bg  ctermfg=fg 
-hi Titled	ctermbg=bg  ctermfg=fg
-hi ErrorMsg	ctermbg=bg  ctermfg=12 
-hi ModeMsg	ctermbg=bg  ctermfg=9  
-hi WarningMsg	ctermbg=bg  ctermfg=12 
-hi StatusLine	ctermbg=14  ctermfg=0
-hi StatusLineNC	ctermbg=6   ctermfg=14
-hi VertSplit	ctermbg=6   ctermfg=14
-" hi Folded
-" hi FoldColumn
-" hi SignColumn
-hi Comment	ctermbg=10  ctermfg=2
-hi Constant	ctermbg=bg  ctermfg=9
-hi String	ctermbg=bg  ctermfg=9  cterm=italic
-hi Character	ctermbg=bg  ctermfg=9  cterm=italic
-hi Number	ctermbg=bg  ctermfg=9  cterm=bold
-hi Boolean	ctermbg=bg  ctermfg=9  cterm=bold
-hi Float	ctermbg=bg  ctermfg=9  cterm=bold
-hi Function	ctermbg=bg  ctermfg=9  cterm=bold
-hi Statement	ctermbg=bg  ctermfg=9  cterm=bold
-hi Conditional	ctermbg=bg  ctermfg=6  cterm=bold
-hi Repeat	ctermbg=bg  ctermfg=6  cterm=bold
-hi Operator	ctermbg=bg  ctermfg=6  cterm=bold
-hi Exception	ctermbg=bg  ctermfg=2  cterm=bold
-hi PreProc	ctermbg=bg  ctermfg=6
-hi Include	ctermbg=bg  ctermfg=2  cterm=bold
-hi Type		ctermbg=bg  ctermfg=2  cterm=bold
-hi Typedef	ctermbg=bg  ctermfg=2  cterm=italic
-hi Special	ctermbg=bg  ctermfg=fg cterm=bold
-hi Tag		ctermbg=bg  ctermfg=9  cterm=bold
-hi SpecialComment ctermbg=7 ctermfg=4
-hi Underlined	ctermbg=bg  ctermfg=9  cterm=underline
-hi Title	ctermbg=bg  ctermfg=fg cterm=bold 
-hi Ignore	ctermbg=bg  ctermfg=7
-hi Error	ctermbg=12  ctermfg=15
-hi Todo		ctermbg=bg  ctermfg=15
diff --git a/colors/babymate256.vim b/colors/babymate256.vim
deleted file mode 100755
index e552ddc..0000000
--- a/colors/babymate256.vim
+++ /dev/null
@@ -1,109 +0,0 @@
-" Vim color file
-"
-" Port of gtksourceview babymate color scheme for 256-color terminals by Anton Bobrov (bobrov@vl.ru)
-
-set background=dark
-
-if version > 580
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-
-
-
-let colors_name = "babymate256"
-
-" General colors
-hi Normal guifg=#e3e3e3 ctermfg=254 guibg=#222429 ctermbg=235 gui=none cterm=none
-hi Cursor guifg=#222429 ctermfg=235 guibg=#e3e3e3 ctermbg=254 gui=none cterm=none
-hi Visual guibg=#506681 ctermbg=60 gui=none cterm=none
-hi VisualNOS guifg=#e3e3e3 ctermfg=254 guibg=#666666 ctermbg=241 gui=none cterm=none
-hi Search guifg=#e3e3e3 ctermfg=254 guibg=#506681 ctermbg=60 gui=none cterm=none
-hi Folded guifg=#666666 ctermfg=241 guibg=#222429 ctermbg=235 gui=none cterm=none
-" hi Title gui=none cterm=none
-hi StatusLine guifg=#000000 ctermfg=16 guibg=#c7c7c7 ctermbg=251 gui=none cterm=none
-hi StatusLineNC guifg=#666666 ctermfg=241 guibg=#c7c7c7 ctermbg=251 gui=none cterm=none
-hi VertSplit guifg=#c7c7c7 ctermfg=251 guibg=#c7c7c7 ctermbg=251 gui=none cterm=none
-hi LineNr guifg=#666666 ctermfg=241 guibg=#000000 ctermbg=16 gui=none cterm=none
-hi NonText guifg=#666666 ctermfg=241 guibg=#222429 ctermbg=235 gui=none cterm=none
-" hi SpecialKey gui=none cterm=none
-" hi WarningMsg gui=none cterm=none
-hi ErrorMsg guifg=#e3e3e3 ctermfg=254 gui=none cterm=none
-hi Error guifg=#e3e3e3 ctermfg=254 gui=none cterm=none
-
-" Vim >= 7.0 specific colors
-if version >= 700
-    hi CursorLine guibg=#3a3d45 ctermbg=237 gui=none cterm=none
-    hi MatchParen guifg=#e3e3e3 ctermfg=254 guibg=#000000 ctermbg=16 gui=none cterm=none
-    hi Pmenu guifg=#e3e3e3 ctermfg=254 guibg=#3a3d45 ctermbg=237 gui=none cterm=none
-    hi PmenuSel guifg=#15171c ctermfg=233 guibg=#c7c7c7 ctermbg=251 gui=none cterm=none
-    hi PmenuSbar guifg=#3a3d45 ctermfg=237 guibg=#3a3d45 ctermbg=237 gui=none cterm=none
-    hi PmenuThumb guifg=#666666 ctermfg=241 guibg=#666666 ctermbg=241 gui=none cterm=none
-endif
-
-" Diff highlighting
-hi DiffAdd guifg=#222429 ctermfg=235 guibg=#cbf8b0 ctermbg=193 gui=none cterm=none
-hi DiffDelete guifg=#222429 ctermfg=235 guibg=#ffc0cb ctermbg=217 gui=none cterm=none
-hi DiffChange guifg=#222429 ctermfg=235 guibg=#9cbddd ctermbg=110 gui=none cterm=none
-hi DiffText guifg=#222429 ctermfg=235 guibg=#d0cffe ctermbg=189 gui=none cterm=none
-
-"hi CursorIM
-"hi Directory
-"hi IncSearch
-"hi Menu
-"hi ModeMsg
-"hi MoreMsg
-"hi PmenuSbar
-"hi PmenuThumb
-"hi Question
-"hi Scrollbar
-"hi SignColumn
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-"hi TabLine
-"hi TabLineFill
-"hi TabLineSel
-"hi Tooltip
-"hi User1
-"hi User9
-"hi WildMenu
-
-
-" Syntax highlighting
-hi Keyword guifg=#ffc0cb ctermfg=217 gui=none cterm=none
-" hi Statement guifg=#d0cffe ctermfg=189 gui=none cterm=none
-hi Statement guifg=#ffc0cb ctermfg=217 gui=none cterm=none
-hi Constant guifg=#e3e3e3 ctermfg=254 gui=none cterm=none
-hi Number guifg=#9cbddd ctermfg=110 gui=none cterm=none
-hi PreProc guifg=#ffc0cb ctermfg=217 gui=none cterm=none
-hi Function guifg=#cbf8b0 ctermfg=193 gui=none cterm=none
-hi Identifier guifg=#9cbddd ctermfg=110 gui=none cterm=none
-hi Builtin guifg=#9cbddd ctermfg=110 gui=none cterm=none
-hi Type guifg=#cbf8b0 ctermfg=193 gui=none cterm=none
-hi Special guifg=#e3e3e3 ctermfg=254 gui=none cterm=none
-hi String guifg=#9cbddd ctermfg=110 gui=none cterm=none
-hi Character guifg=#ffc0cb ctermfg=217 gui=none cterm=none
-hi Comment guifg=#666666 ctermfg=241 gui=italic cterm=italic
-hi Todo guifg=#e3e3e3 ctermfg=254 guibg=#000000 ctermbg=16 gui=none cterm=none
-hi Boolean guifg=#9cbddd ctermfg=110 gui=none cterm=none
-
-
-" Links
-hi! link FoldColumn Folded
-hi! link CursorColumn CursorLine
-hi! link ColorColumn CursorLine
-
-hi! link pythonBuiltin Builtin
-hi! link pythonKeyword Statement
-
-" xterm color fix:
-" printf '\033]11;#222429\007\033]4;16;#000000;60;#506681;110;#9CBDDD;189;#D0CFFE;193;#CBF8B0;217;#FFC0CB;233;#15171C;235;#222429;237;#3A3D45;241;#666666;251;#C7C7C7;254;#E3E3E3\007'
-
-" urxvt color fix:
-" urxvt -bg #222429
-" urxvt*background: #222429
-" printf '\033]4;16;#000000;60;#506681;110;#9CBDDD;189;#D0CFFE;193;#CBF8B0;217;#FFC0CB;233;#15171C;235;#222429;237;#3A3D45;241;#666666;251;#C7C7C7;254;#E3E3E3\007'
diff --git a/colors/badwolf.vim b/colors/badwolf.vim
deleted file mode 100755
index e6e0b75..0000000
--- a/colors/badwolf.vim
+++ /dev/null
@@ -1,573 +0,0 @@
-"      _               _                 _  __
-"     | |__   __ _  __| | __      _____ | |/ _|
-"     | '_ \ / _` |/ _` | \ \ /\ / / _ \| | |_
-"     | |_) | (_| | (_| |  \ V  V / (_) | |  _|
-"     |_.__/ \__,_|\__,_|   \_/\_/ \___/|_|_|
-"
-"      I am the Bad Wolf. I create myself.
-"       I take the words. I scatter them in time and space.
-"        A message to lead myself here.
-"
-" A Vim colorscheme pieced together by Steve Losh.
-" Available at http://stevelosh.com/projects/badwolf/
-"
-" Why? {{{
-"
-" After using Molokai for quite a long time, I started longing for
-" a replacement.
-"
-" I love Molokai's high contrast and gooey, saturated tones, but it can be
-" a little inconsistent at times.
-"
-" Also it's winter here in Rochester, so I wanted a color scheme that's a bit
-" warmer.  A little less blue and a bit more red.
-"
-" And so Bad Wolf was born.  I'm no designer, but designers have been scattering
-" beautiful colors through time and space long before I came along.  I took
-" advantage of that and reused some of my favorites to lead me to this scheme.
-"
-" }}}
-
-" Supporting code -------------------------------------------------------------
-" Preamble {{{
-
-if !has("gui_running") && &t_Co != 88 && &t_Co != 256
-    finish
-endif
-
-set background=dark
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "badwolf"
-
-if !exists("g:badwolf_html_link_underline") " {{{
-    let g:badwolf_html_link_underline = 1
-endif " }}}
-
-if !exists("g:badwolf_css_props_highlight") " {{{
-    let g:badwolf_css_props_highlight = 0
-endif " }}}
-
-" }}}
-" Palette {{{
-
-let s:bwc = {}
-
-" The most basic of all our colors is a slightly tweaked version of the Molokai
-" Normal text.
-let s:bwc.plain = ['f8f6f2', 15]
-
-" Pure and simple.
-let s:bwc.snow = ['ffffff', 15]
-let s:bwc.coal = ['000000', 16]
-
-" All of the Gravel colors are based on a brown from Clouds Midnight.
-let s:bwc.brightgravel   = ['d9cec3', 252]
-let s:bwc.lightgravel    = ['998f84', 245]
-let s:bwc.gravel         = ['857f78', 243]
-let s:bwc.mediumgravel   = ['666462', 241]
-let s:bwc.deepgravel     = ['45413b', 238]
-let s:bwc.deepergravel   = ['35322d', 236]
-let s:bwc.darkgravel     = ['242321', 235]
-let s:bwc.blackgravel    = ['1c1b1a', 233]
-let s:bwc.blackestgravel = ['141413', 232]
-
-" A color sampled from a highlight in a photo of a glass of Dale's Pale Ale on
-" my desk.
-let s:bwc.dalespale = ['fade3e', 221]
-
-" A beautiful tan from Tomorrow Night.
-let s:bwc.dirtyblonde = ['f4cf86', 222]
-
-" Delicious, chewy red from Made of Code for the poppiest highlights.
-let s:bwc.taffy = ['ff2c4b', 196]
-
-" Another chewy accent, but use sparingly!
-let s:bwc.saltwatertaffy = ['8cffba', 121]
-
-" The star of the show comes straight from Made of Code.
-let s:bwc.tardis = ['0a9dff', 39]
-
-" This one's from Mustang, not Florida!
-let s:bwc.orange = ['ffa724', 214]
-
-" A limier green from Getafe.
-let s:bwc.lime = ['aeee00', 154]
-
-" Rose's dress in The Idiot's Lantern.
-let s:bwc.dress = ['ff9eb8', 211]
-
-" Another play on the brown from Clouds Midnight.  I love that color.
-let s:bwc.toffee = ['b88853', 137]
-
-" Also based on that Clouds Midnight brown.
-let s:bwc.coffee    = ['c7915b', 173]
-let s:bwc.darkroast = ['88633f', 95]
-
-" }}}
-" Highlighting Function {{{
-function! s:HL(group, fg, ...)
-    " Arguments: group, guifg, guibg, gui, guisp
-
-    let histring = 'hi ' . a:group . ' '
-
-    if strlen(a:fg)
-        if a:fg == 'fg'
-            let histring .= 'guifg=fg ctermfg=fg '
-        else
-            let c = get(s:bwc, a:fg)
-            let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' '
-        endif
-    endif
-
-    if a:0 >= 1 && strlen(a:1)
-        if a:1 == 'bg'
-            let histring .= 'guibg=bg ctermbg=bg '
-        else
-            let c = get(s:bwc, a:1)
-            let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' '
-        endif
-    endif
-
-    if a:0 >= 2 && strlen(a:2)
-        let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
-    endif
-
-    if a:0 >= 3 && strlen(a:3)
-        let c = get(s:bwc, a:3)
-        let histring .= 'guisp=#' . c[0] . ' '
-    endif
-
-    " echom histring
-
-    execute histring
-endfunction
-" }}}
-" Configuration Options {{{
-
-if exists('g:badwolf_darkgutter') && g:badwolf_darkgutter
-    let s:gutter = 'blackestgravel'
-else
-    let s:gutter = 'blackgravel'
-endif
-
-" }}}
-
-" Actual colorscheme ----------------------------------------------------------
-" Vanilla Vim {{{
-
-" General/UI {{{
-
-call s:HL('Normal', 'plain', 'blackgravel')
-
-call s:HL('Folded', 'mediumgravel', 'bg', 'none')
-
-call s:HL('VertSplit', 'lightgravel', 'bg', 'none')
-
-call s:HL('CursorLine',   '', 'darkgravel', 'none')
-call s:HL('CursorColumn', '', 'darkgravel')
-call s:HL('ColorColumn',  '', 'darkgravel')
-
-call s:HL('MatchParen', 'dalespale', 'darkgravel', 'bold')
-
-call s:HL('NonText',    'deepgravel', 'bg')
-call s:HL('SpecialKey', 'deepgravel', 'bg')
-
-call s:HL('Visual',    '',  'deepgravel')
-call s:HL('VisualNOS', '',  'deepgravel')
-
-call s:HL('Search',    'coal', 'dalespale', 'bold')
-call s:HL('IncSearch', 'coal', 'tardis',    'bold')
-
-call s:HL('Underlined', 'fg', '', 'underline')
-
-call s:HL('StatusLine',   'coal', 'tardis',     'bold')
-call s:HL('StatusLineNC', 'snow', 'deepgravel', 'bold')
-
-call s:HL('Directory', 'dirtyblonde', '', 'bold')
-
-call s:HL('Title', 'lime')
-
-call s:HL('ErrorMsg',   'taffy',       'bg', 'bold')
-call s:HL('MoreMsg',    'dalespale',   '',   'bold')
-call s:HL('ModeMsg',    'dirtyblonde', '',   'bold')
-call s:HL('Question',   'dirtyblonde', '',   'bold')
-call s:HL('WarningMsg', 'dress',       '',   'bold')
-
-" This is a ctags tag, not an HTML one.  'Something you can use c-] on'.
-call s:HL('Tag', '', '', 'bold')
-
-" hi IndentGuides                  guibg=#373737
-" hi WildMenu        guifg=#66D9EF guibg=#000000
-
-" }}}
-" Gutter {{{
-
-call s:HL('LineNr',     'mediumgravel', s:gutter)
-call s:HL('SignColumn', '',             s:gutter)
-call s:HL('FoldColumn', 'mediumgravel', s:gutter)
-
-" }}}
-" Cursor {{{
-
-call s:HL('Cursor',  'coal', 'tardis', 'bold')
-call s:HL('vCursor', 'coal', 'tardis', 'bold')
-call s:HL('iCursor', 'coal', 'tardis', 'none')
-
-" }}}
-" Syntax highlighting {{{
-
-" Start with a simple base.
-call s:HL('Special', 'plain')
-
-" Comments are slightly brighter than folds, to make 'headers' easier to see.
-call s:HL('Comment',        'gravel')
-call s:HL('Todo',           'snow', 'bg', 'bold')
-call s:HL('SpecialComment', 'snow', 'bg', 'bold')
-
-" Strings are a nice, pale straw color.  Nothing too fancy.
-call s:HL('String', 'dirtyblonde')
-
-" Control flow stuff is taffy.
-call s:HL('Statement',   'taffy', '', 'bold')
-call s:HL('Keyword',     'taffy', '', 'bold')
-call s:HL('Conditional', 'taffy', '', 'bold')
-call s:HL('Operator',    'taffy', '', 'none')
-call s:HL('Label',       'taffy', '', 'none')
-call s:HL('Repeat',      'taffy', '', 'none')
-
-" Functions and variable declarations are orange, because plain looks weird.
-call s:HL('Identifier', 'orange', '', 'none')
-call s:HL('Function',   'orange', '', 'none')
-
-" Preprocessor stuff is lime, to make it pop.
-"
-" This includes imports in any given language, because they should usually be
-" grouped together at the beginning of a file.  If they're in the middle of some
-" other code they should stand out, because something tricky is
-" probably going on.
-call s:HL('PreProc',   'lime', '', 'none')
-call s:HL('Macro',     'lime', '', 'none')
-call s:HL('Define',    'lime', '', 'none')
-call s:HL('PreCondit', 'lime', '', 'bold')
-
-" Constants of all kinds are colored together.
-" I'm not really happy with the color yet...
-call s:HL('Constant',  'toffee', '', 'bold')
-call s:HL('Character', 'toffee', '', 'bold')
-call s:HL('Boolean',   'toffee', '', 'bold')
-
-call s:HL('Number', 'toffee', '', 'bold')
-call s:HL('Float',  'toffee', '', 'bold')
-
-" Not sure what 'special character in a constant' means, but let's make it pop.
-call s:HL('SpecialChar', 'dress', '', 'bold')
-
-call s:HL('Type', 'dress', '', 'none')
-call s:HL('StorageClass', 'taffy', '', 'none')
-call s:HL('Structure', 'taffy', '', 'none')
-call s:HL('Typedef', 'taffy', '', 'bold')
-
-" Make try/catch blocks stand out.
-call s:HL('Exception', 'lime', '', 'bold')
-
-" Misc
-call s:HL('Error',  'snow',   'taffy', 'bold')
-call s:HL('Debug',  'snow',   '',      'bold')
-call s:HL('Ignore', 'gravel', '',      '')
-
-" }}}
-" Completion Menu {{{
-
-call s:HL('Pmenu', 'plain', 'deepergravel')
-call s:HL('PmenuSel', 'coal', 'tardis', 'bold')
-call s:HL('PmenuSbar', '', 'deepergravel')
-call s:HL('PmenuThumb', 'brightgravel')
-
-" }}}
-" Diffs {{{
-
-call s:HL('DiffDelete', 'coal', 'coal')
-call s:HL('DiffAdd',    '',     'deepergravel')
-call s:HL('DiffChange', '',     'darkgravel')
-call s:HL('DiffText',   'snow', 'deepergravel', 'bold')
-
-" }}}
-" Spelling {{{
-
-if has("spell")
-    call s:HL('SpellCap', 'dalespale', 'bg', 'undercurl,bold', 'dalespale')
-    call s:HL('SpellBad', '', '', 'undercurl', 'dalespale')
-    call s:HL('SpellLocal', '', '', 'undercurl', 'dalespale')
-    call s:HL('SpellRare', '', '', 'undercurl', 'dalespale')
-endif
-
-" }}}
-
-" }}}
-" Plugins {{{
-
-" CtrlP {{{
-
-    " the message when no match is found
-    call s:HL('CtrlPNoEntries', 'snow', 'taffy', 'bold')
-
-    " the matched pattern
-    call s:HL('CtrlPMatch', 'orange', 'bg', 'none')
-
-    " the line prefix '>' in the match window
-    call s:HL('CtrlPLinePre', 'deepgravel', 'bg', 'none')
-
-    " the prompt’s base
-    call s:HL('CtrlPPrtBase', 'deepgravel', 'bg', 'none')
-
-    " the prompt’s text
-    call s:HL('CtrlPPrtText', 'plain', 'bg', 'none')
-
-    " the prompt’s cursor when moving over the text
-    call s:HL('CtrlPPrtCursor', 'coal', 'tardis', 'bold')
-
-    " 'prt' or 'win', also for 'regex'
-    call s:HL('CtrlPMode1', 'coal', 'tardis', 'bold')
-
-    " 'file' or 'path', also for the local working dir
-    call s:HL('CtrlPMode2', 'coal', 'tardis', 'bold')
-
-    " the scanning status
-    call s:HL('CtrlPStats', 'coal', 'tardis', 'bold')
-
-    " TODO: CtrlP extensions.
-    " CtrlPTabExtra  : the part of each line that’s not matched against (Comment)
-    " CtrlPqfLineCol : the line and column numbers in quickfix mode (|s:HL-Search|)
-    " CtrlPUndoT     : the elapsed time in undo mode (|s:HL-Directory|)
-    " CtrlPUndoBr    : the square brackets [] in undo mode (Comment)
-    " CtrlPUndoNr    : the undo number inside [] in undo mode (String)
-
-" }}}
-" EasyMotion {{{
-
-call s:HL('EasyMotionTarget', 'tardis',     'bg', 'bold')
-call s:HL('EasyMotionShade',  'deepgravel', 'bg')
-
-" }}}
-" Interesting Words {{{
-
-" These are only used if you're me or have copied the <leader>hNUM mappings
-" from my Vimrc.
-call s:HL('InterestingWord1', 'coal', 'orange')
-call s:HL('InterestingWord2', 'coal', 'lime')
-call s:HL('InterestingWord3', 'coal', 'taffy')
-
-" }}}
-" Makegreen {{{
-
-" hi GreenBar term=reverse ctermfg=white ctermbg=green guifg=coal guibg=#9edf1c
-" hi RedBar   term=reverse ctermfg=white ctermbg=red guifg=white guibg=#C50048
-
-" }}}
-" ShowMarks {{{
-
-call s:HL('ShowMarksHLl', 'tardis', 'blackgravel')
-call s:HL('ShowMarksHLu', 'tardis', 'blackgravel')
-call s:HL('ShowMarksHLo', 'tardis', 'blackgravel')
-call s:HL('ShowMarksHLm', 'tardis', 'blackgravel')
-
-" }}}
-
-" }}}
-" Filetype-specific {{{
-
-" Clojure {{{
-
-call s:HL('clojureSpecial',  'taffy', '', '')
-call s:HL('clojureDefn',     'taffy', '', '')
-call s:HL('clojureDefMacro', 'taffy', '', '')
-call s:HL('clojureDefine',   'taffy', '', '')
-call s:HL('clojureMacro',    'taffy', '', '')
-call s:HL('clojureCond',     'taffy', '', '')
-
-call s:HL('clojureKeyword', 'orange', '', 'none')
-
-call s:HL('clojureFunc',   'dress', '', 'none')
-call s:HL('clojureRepeat', 'dress', '', 'none')
-
-call s:HL('clojureParen0', 'lightgravel', '', 'none')
-
-call s:HL('clojureAnonArg', 'snow', '', 'bold')
-
-" }}}
-" CSS {{{
-
-if g:badwolf_css_props_highlight
-    call s:HL('cssColorProp', 'dirtyblonde', '', 'none')
-    call s:HL('cssBoxProp', 'dirtyblonde', '', 'none')
-    call s:HL('cssTextProp', 'dirtyblonde', '', 'none')
-    call s:HL('cssRenderProp', 'dirtyblonde', '', 'none')
-    call s:HL('cssGeneratedContentProp', 'dirtyblonde', '', 'none')
-else
-    call s:HL('cssColorProp', 'fg', '', 'none')
-    call s:HL('cssBoxProp', 'fg', '', 'none')
-    call s:HL('cssTextProp', 'fg', '', 'none')
-    call s:HL('cssRenderProp', 'fg', '', 'none')
-    call s:HL('cssGeneratedContentProp', 'fg', '', 'none')
-end
-
-call s:HL('cssValueLength', 'toffee', '', 'bold')
-call s:HL('cssColor', 'toffee', '', 'bold')
-call s:HL('cssBraces', 'lightgravel', '', 'none')
-call s:HL('cssIdentifier', 'orange', '', 'bold')
-call s:HL('cssClassName', 'orange', '', 'none')
-
-" }}}
-" Diff {{{
-
-call s:HL('gitDiff', 'lightgravel', '',)
-
-call s:HL('diffRemoved', 'dress', '',)
-call s:HL('diffAdded', 'lime', '',)
-call s:HL('diffFile', 'coal', 'taffy', 'bold')
-call s:HL('diffNewFile', 'coal', 'taffy', 'bold')
-
-call s:HL('diffLine', 'coal', 'orange', 'bold')
-call s:HL('diffSubname', 'orange', '', 'none')
-
-" }}}
-" Django Templates {{{
-
-call s:HL('djangoArgument', 'dirtyblonde', '',)
-call s:HL('djangoTagBlock', 'orange', '')
-call s:HL('djangoVarBlock', 'orange', '')
-" hi djangoStatement guifg=#ff3853 gui=bold
-" hi djangoVarBlock guifg=#f4cf86
-
-" }}}
-" HTML {{{
-
-" Punctuation
-call s:HL('htmlTag',    'darkroast', 'bg', 'none')
-call s:HL('htmlEndTag', 'darkroast', 'bg', 'none')
-
-" Tag names
-call s:HL('htmlTagName',        'coffee', '', 'bold')
-call s:HL('htmlSpecialTagName', 'coffee', '', 'bold')
-call s:HL('htmlSpecialChar',    'lime',   '', 'none')
-
-" Attributes
-call s:HL('htmlArg', 'coffee', '', 'none')
-
-" Stuff inside an <a> tag
-
-if g:badwolf_html_link_underline
-    call s:HL('htmlLink', 'lightgravel', '', 'underline')
-else
-    call s:HL('htmlLink', 'lightgravel', '', 'none')
-endif
-
-" }}}
-" Java {{{
-
-call s:HL('javaClassDecl', 'taffy', '', 'bold')
-call s:HL('javaScopeDecl', 'taffy', '', 'bold')
-call s:HL('javaCommentTitle', 'gravel', '')
-call s:HL('javaDocTags', 'snow', '', 'none')
-call s:HL('javaDocParam', 'dalespale', '', '')
-
-" }}}
-" LessCSS {{{
-
-call s:HL('lessVariable', 'lime', '', 'none')
-
-" }}}
-" Mail {{{
-
-call s:HL('mailSubject', 'orange', '', 'bold')
-call s:HL('mailHeader', 'lightgravel', '', '')
-call s:HL('mailHeaderKey', 'lightgravel', '', '')
-call s:HL('mailHeaderEmail', 'snow', '', '')
-call s:HL('mailURL', 'toffee', '', 'underline')
-call s:HL('mailSignature', 'gravel', '', 'none')
-
-call s:HL('mailQuoted1', 'gravel', '', 'none')
-call s:HL('mailQuoted2', 'dress', '', 'none')
-call s:HL('mailQuoted3', 'dirtyblonde', '', 'none')
-call s:HL('mailQuoted4', 'orange', '', 'none')
-call s:HL('mailQuoted5', 'lime', '', 'none')
-
-" }}}
-" Markdown {{{
-
-call s:HL('markdownHeadingRule', 'lightgravel', '', 'bold')
-call s:HL('markdownHeadingDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownOrderedListMarker', 'lightgravel', '', 'bold')
-call s:HL('markdownListMarker', 'lightgravel', '', 'bold')
-call s:HL('markdownItalic', 'snow', '', 'bold')
-call s:HL('markdownBold', 'snow', '', 'bold')
-call s:HL('markdownH1', 'orange', '', 'bold')
-call s:HL('markdownH2', 'lime', '', 'bold')
-call s:HL('markdownH3', 'lime', '', 'none')
-call s:HL('markdownH4', 'lime', '', 'none')
-call s:HL('markdownH5', 'lime', '', 'none')
-call s:HL('markdownH6', 'lime', '', 'none')
-call s:HL('markdownLinkText', 'toffee', '', 'underline')
-call s:HL('markdownIdDeclaration', 'toffee')
-call s:HL('markdownAutomaticLink', 'toffee', '', 'bold')
-call s:HL('markdownUrl', 'toffee', '', 'bold')
-call s:HL('markdownUrldelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownLinkDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownLinkTextDelimiter', 'lightgravel', '', 'bold')
-call s:HL('markdownCodeDelimiter', 'dirtyblonde', '', 'bold')
-call s:HL('markdownCode', 'dirtyblonde', '', 'none')
-call s:HL('markdownCodeBlock', 'dirtyblonde', '', 'none')
-
-" }}}
-" MySQL {{{
-
-call s:HL('mysqlSpecial', 'dress', '', 'bold')
-
-" }}}
-" Python {{{
-
-hi def link pythonOperator Operator
-call s:HL('pythonBuiltin',     'dress')
-call s:HL('pythonBuiltinObj',  'dress')
-call s:HL('pythonBuiltinFunc', 'dress')
-call s:HL('pythonEscape',      'dress')
-call s:HL('pythonException',   'lime', '', 'bold')
-call s:HL('pythonExceptions',  'lime', '', 'none')
-call s:HL('pythonPrecondit',   'lime', '', 'none')
-call s:HL('pythonDecorator',   'taffy', '', 'none')
-call s:HL('pythonRun',         'gravel', '', 'bold')
-call s:HL('pythonCoding',      'gravel', '', 'bold')
-
-" }}}
-" SLIMV {{{
-
-" Rainbow parentheses
-call s:HL('hlLevel0', 'gravel')
-call s:HL('hlLevel1', 'orange')
-call s:HL('hlLevel2', 'saltwatertaffy')
-call s:HL('hlLevel3', 'dress')
-call s:HL('hlLevel4', 'coffee')
-call s:HL('hlLevel5', 'dirtyblonde')
-call s:HL('hlLevel6', 'orange')
-call s:HL('hlLevel7', 'saltwatertaffy')
-call s:HL('hlLevel8', 'dress')
-call s:HL('hlLevel9', 'coffee')
-
-" }}}
-" Vim {{{
-
-call s:HL('VimCommentTitle', 'lightgravel', '', 'bold')
-
-call s:HL('VimMapMod',    'dress', '', 'none')
-call s:HL('VimMapModKey', 'dress', '', 'none')
-call s:HL('VimNotation', 'dress', '', 'none')
-call s:HL('VimBracket', 'dress', '', 'none')
-
-" }}}
-
-" }}}
-
diff --git a/colors/basic.vim b/colors/basic.vim
deleted file mode 100755
index da9b5c8..0000000
--- a/colors/basic.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-" Vim color file
-" Maintainer:	Mikel Ward <mikel@mikelward.com>
-" Last Change:	2008 Jan 16
-
-" Remove all existing highlighting and set the defaults.
-highlight clear
-
-" Load the syntax highlighting defaults, if it's enabled.
-"if exists("syntax_on")
-"	syntax reset
-"endif
-
-let colors_name = "basic"
-
-" Remove all highlighting
-highlight clear Constant
-highlight clear Number
-highlight clear Statement
-highlight clear PreProc
-highlight clear Type
-highlight clear Special
-highlight clear Identifier
-
-highlight clear String
-highlight clear Comment
-highlight clear Error
-highlight clear LineNr
-highlight clear NonText
-highlight clear SpecialKey
-
-" Set up some simple non-intrusive colors
-if &background == "light"
-	highlight String term=underline cterm=NONE ctermfg=DarkGreen
-	highlight Comment term=bold cterm=NONE ctermfg=DarkBlue
-	highlight Error term=reverse cterm=NONE ctermfg=DarkRed
-	highlight LineNr term=bold cterm=NONE ctermfg=DarkYellow
-	highlight NonText term=bold cterm=NONE ctermfg=DarkYellow
-	highlight SpecialKey term=bold cterm=NONE ctermfg=DarkYellow
-else
-	highlight String term=underline cterm=NONE ctermfg=Magenta
-	highlight Comment term=bold cterm=NONE ctermfg=Cyan
-	highlight Error term=reverse cterm=NONE ctermbg=Red
-	highlight LineNr term=bold cterm=NONE ctermfg=Yellow
-	highlight NonText term=bold cterm=NONE ctermfg=Yellow
-	highlight SpecialKey term=bold cterm=NONE ctermfg=Yellow
-endif
-
diff --git a/colors/bayQua.vim b/colors/bayQua.vim
deleted file mode 100755
index c279ce6..0000000
--- a/colors/bayQua.vim
+++ /dev/null
@@ -1,161 +0,0 @@
-" Vim color file
-" bayQua v1.2b
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo bayqua in your VimRC/GVimRC file
-"     * GvimRC if using GUI any
-"
-"	- An offwhite version of baycomb, inspired somewhat by TaQua
-"   - Thanks to Desert and OceanDeep for their color scheme 
-"     file layouts
-"   - Thanks to Raimon Grau for his feedback
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="bayQua"
-
-hi Normal       guifg=#003255 guibg=#e8ebf0 "greyish blue2
-hi NonText      guifg=#382920 guibg=#152555
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		guifg=#daddb8  guibg=#308ae5
-else
-	hi Comment		guifg=darkyellow  guibg=#207ada
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Title		guifg=#857540  gui=none
-hi Underlined   guifg=#8a758a  
-
-hi Statement    guifg=#da302a  gui=none
-hi Type			guifg=#307aca  gui=none
-hi Constant		guifg=#3a40aa  gui=none
-hi PreProc      guifg=#9570b5 
-hi Identifier   guifg=#856075  "gui=bold
-hi Special		guifg=#652a7a 
-hi Ignore       guifg=grey40
-hi Todo			guifg=orangered guibg=yellow2
-hi Error        guibg=#b03452
-"""""this section borrowed from OceanDeep/Midnight"""""
-hi Number guifg=#006bcd 
-hi Function gui=None guifg=#d06d50 "or green 50b3b0 
-highlight Conditional gui=None guifg=#a50a4a
-highlight Repeat gui=None guifg=#700d8a
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#e0b045
-highlight Keyword gui=bold guifg=grey guibg=bg
-highlight Exception gui=none guifg=#ea5460
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cadaca guifg=#05293d
-
-hi FoldColumn	guibg=#409ae0 guifg=darkgrey
-"hi FoldColumn	guibg=#83a5cd guifg=#70459F
-hi LineNr       guibg=#409ae0 guifg=darkblue gui=bold
-"hi LineNr       guibg=#081c30 guifg=#80a0dA 
-hi StatusLine	guibg=#20b5fd guifg=#0a150d gui=none
-hi StatusLineNC	guibg=#0580da guifg=#302d34 gui=none
-
-hi Search       guibg=#babdad guifg=#3a4520
-hi IncSearch	guifg=#dadeca guibg=#3a4520 
-
-hi VertSplit	guibg=#525f95 guifg=grey50 gui=none
-hi Folded       guibg=#252f5d guifg=#BBDDCC
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#308c70
-hi Visual       guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=black ctermbg=white
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=magenta
-highlight Repeat ctermfg=magenta
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=white ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=black ctermbg=blue
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=cyan ctermbg=blue cterm=NONE
-hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=black cterm=NONE
-hi Title	ctermfg=darkyellow ctermbg=white
-hi Visual	ctermbg=darkcyan ctermfg=cyan cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=white cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=black ctermbg=white cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=blue
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-
-hi Comment		ctermfg=grey  ctermbg=blue
-
-hi Constant	ctermfg=darkblue
-hi Special	ctermfg=darkmagenta
-hi Identifier	ctermfg=darkyellow cterm=NONE
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkcyan "or darkcyan
-hi Underlined	ctermfg=black ctermbg=white
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-                                     
diff --git a/colors/baycomb.vim b/colors/baycomb.vim
deleted file mode 100755
index 1311e72..0000000
--- a/colors/baycomb.vim
+++ /dev/null
@@ -1,319 +0,0 @@
-" Vim color file
-" baycomb v2.4
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo baycomb in your VimRC/GVimRC file
-"   * Also add :set background=dark  or :setbackground=light
-"     depending on your preference.
-"
-"   - Thanks to Desert and OceanDeep for their color scheme 
-"     file layouts
-"   - Thanks to Raimon Grau and Bob Lied for their feedback
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="baycomb"
-
-if &background == "dark"
-hi Normal       guifg=#a0b4e0 guibg=#11121a   "1a1823
-hi NonText      guifg=#382920 guibg=bg
-
-hi Folded       guibg=#232235 guifg=grey
-hi FoldColumn	guibg=#0a0a18 guifg=#dbcaa5
-hi LineNr       guibg=#101124 guifg=#206aa9 
-hi StatusLine	guibg=#354070 guifg=#6880ea gui=none
-hi StatusLineNC	guibg=#2c3054 guifg=#5c6dbe gui=none
-hi VertSplit	guibg=#22253c guifg=#223355  gui=none
-
-hi tablinesel   guibg=#515a71 guifg=#50aae5 gui=none
-hi tabline      guibg=#4d4d5f guifg=#5b7098 gui=none
-hi tablinefill  guibg=#2d2d3f guifg=#aaaaaa gui=none
-
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-
-hi MatchParen	guibg=#7b5a55 guifg=#001122
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-
-hi Comment		guifg=#349d58 guibg=bg
-hi Title	    guifg=#e5e5ca gui=none
-hi Underlined   guifg=#bac5ba gui=none
-
-hi Statement    guifg=#fca8ad gui=none "a080aa
-hi Type		    guifg=#0490e8  gui=bold
-hi Constant	    guifg=#5c78f0 "guibg=#111a2a
-hi Number       guifg=#4580b4 "guibg=#111a2a
-hi PreProc      guifg=#ba75cf
-hi Special	    guifg=#aaaaca
-hi Ignore       guifg=grey40
-hi Todo		    guifg=orangered guibg=yellow2
-hi Error        guibg=#b03452
-hi Function     guifg=#bab588 guibg=bg gui=bold 
-hi Identifier   guifg=#5094c4   
-"""""this section borrowed from OceanDeep/Midnight"""""
-highlight Conditional gui=None guifg=#d0688d guibg=bg
-highlight Repeat gui=None guifg=#e06070 guibg=bg
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#e8cdc0 guibg=bg
-highlight Keyword gui=bold guifg=grey guibg=bg
-highlight Exception gui=bold guifg=#d0a8ad guibg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-hi DiffText    guibg=#004335
-hi DiffChange   guibg=#685b5c
-hi DiffAdd      guibg=#0a4b8c
-hi DiffDelete   guifg=#300845 guibg=#200845
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cad5c0 guifg=#0000aa
-
-
-hi Search       guibg=darkyellow guifg=black
-hi IncSearch	guifg=#babeaa guibg=#3a4520 
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=#102030 guibg=#80a0f0
-hi VisualNOS    guifg=#201a30 guibg=#a3a5FF
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Cursor ctermfg=black ctermbg=white
-hi Normal ctermfg=grey ctermbg=black
-hi Number ctermfg=darkgreen
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=darkred
-highlight Repeat ctermfg=darkred
-hi Exception ctermfg=darkred
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=darkcyan ctermbg=black
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=yellow ctermbg=darkblue cterm=NONE
-hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=darkgrey cterm=NONE
-hi Title	ctermfg=yellow cterm=NONE
-hi Visual	ctermbg=grey ctermfg=blue cterm=NONE
-hi VisualNOS	ctermbg=grey ctermfg=blue cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgreen ctermbg=darkblue cterm=NONE
-hi FoldColumn	ctermfg=yellow ctermbg=black
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment		ctermfg=darkgreen ctermbg=black
-hi Identifier   ctermfg=cyan
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi function ctermfg=grey
-	hi Type		ctermfg=darkyellow ctermbg=darkblue
-	hi IncSearch	ctermfg=black ctermbg=grey cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkgrey cterm=NONE
-else
-	hi function ctermfg=white
-	hi Type		ctermfg=grey
-	hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Constant	ctermfg=darkcyan
-hi Special	ctermfg=white
-hi Statement	ctermfg=yellow
-hi PreProc	ctermfg=darkred
-hi Underlined	ctermfg=cyan cterm=NONE
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-hi tablinesel   ctermfg=cyan ctermbg=blue
-hi tabline      ctermfg=black ctermbg=blue
-hi tablinefill  ctermfg=green ctermbg=darkblue
-"vim: sw=4
-"
-hi MatchParen	ctermfg=black ctermbg=green
-
-
-elseif &background == "light"
-
-hi Normal       guifg=#003255 guibg=#e8ebf0 "greyish blue2
-hi NonText      guifg=#382920 guibg=#152555
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		guifg=#daddb8  guibg=#308ae5
-else
-	hi Comment		guifg=darkyellow  guibg=#207ada
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Title		guifg=#857540  gui=none
-hi Underlined   guifg=#8a758a  
-
-hi Statement    guifg=#da302a  gui=none
-hi Type			guifg=#307aca  gui=none
-hi Constant		guifg=#3a40aa  gui=none
-hi PreProc      guifg=#9570b5 
-hi Identifier   guifg=#856075  "gui=bold
-hi Special		guifg=#652a7a 
-hi Ignore       guifg=grey40
-hi Todo			guifg=orangered guibg=yellow2
-hi Error        guibg=#b03452
-"""""this section borrowed from OceanDeep/Midnight"""""
-hi Number guifg=#006bcd 
-hi Function gui=None guifg=#d06d50 "or green 50b3b0 
-highlight Conditional gui=None guifg=#a50a4a
-highlight Repeat gui=None guifg=#700d8a
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#e0b045
-highlight Keyword gui=bold guifg=grey guibg=bg
-highlight Exception gui=none guifg=#ea5460
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cadaca guifg=#05293d
-
-hi FoldColumn	guibg=#409ae0 guifg=darkgrey
-"hi FoldColumn	guibg=#83a5cd guifg=#70459F
-hi LineNr       guibg=#409ae0 guifg=darkblue gui=bold
-"hi LineNr       guibg=#081c30 guifg=#80a0dA 
-hi StatusLine	guibg=#20b5fd guifg=#0a150d gui=none
-hi StatusLineNC	guibg=#0580da guifg=#302d34 gui=none
-
-hi Search       guibg=#babdad guifg=#3a4520
-hi IncSearch	guifg=#dadeca guibg=#3a4520 
-
-hi VertSplit	guibg=#525f95 guifg=grey50 gui=none
-hi Folded       guibg=#252f5d guifg=#BBDDCC
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#308c70
-hi Visual       guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=black ctermbg=white
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=magenta
-highlight Repeat ctermfg=magenta
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey ctermbg=grey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=white ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=black ctermbg=blue
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=cyan ctermbg=blue cterm=NONE
-hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=black cterm=NONE
-hi Title	ctermfg=darkyellow ctermbg=white
-hi Visual	ctermbg=darkcyan ctermfg=cyan cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=white cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=black ctermbg=white cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=blue
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-
-hi Comment		ctermfg=grey  ctermbg=blue
-
-hi Constant	ctermfg=darkblue
-hi Special	ctermfg=darkmagenta
-hi Identifier	ctermfg=darkyellow cterm=NONE
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkcyan "or darkcyan
-hi Underlined	ctermfg=black ctermbg=white
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-endif
diff --git a/colors/bclear.vim b/colors/bclear.vim
deleted file mode 100755
index bc35464..0000000
--- a/colors/bclear.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim colorscheme
-" Name:         bclear
-" Maintainer:   Ricky Cintron 'borosai' <borosai at gmail dot com>
-" Last Change:  2010-10-17
-
-hi clear
-set background=light
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "bclear"
-
-"---GUI settings
-hi SpecialKey   guifg=#000000   guibg=#ffcde6
-hi NonText      guifg=#969696   guibg=#f0f0f0   gui=none
-hi Directory    guifg=#78681a
-hi ErrorMsg     guifg=#ffffff   guibg=#a01010
-hi IncSearch    guifg=#ffffff   guibg=#ff8000   gui=none
-hi Search       guifg=#000000   guibg=#ffd073
-hi MoreMsg      guifg=#ffffff   guibg=#3c960f   gui=none
-hi ModeMsg      guifg=#323232                   gui=none
-hi LineNr       guifg=#969696   guibg=#f0f0f0
-hi Question     guifg=#000000   guibg=#ffde37   gui=none
-hi StatusLine   guifg=#ffffff   guibg=#323232   gui=none
-hi StatusLineNC guifg=#f0f0f0   guibg=#646464   gui=none
-hi VertSplit    guifg=#f0f0f0   guibg=#646464   gui=none
-hi Title        guifg=#323232                   gui=none
-hi Visual       guifg=#ffffff   guibg=#1994d1
-hi VisualNOS    guifg=#000000   guibg=#1994d1   gui=none
-hi WarningMsg   guifg=#c8c8c8   guibg=#a01010
-hi WildMenu     guifg=#ffffff   guibg=#1994d1
-hi Folded       guifg=#969696   guibg=#f0f0f0
-hi FoldColumn   guifg=#969696   guibg=#f0f0f0
-hi DiffAdd                      guibg=#deffcd
-hi DiffChange                   guibg=#dad7ff
-hi DiffDelete   guifg=#c8c8c8   guibg=#ffffff   gui=none
-hi DiffText     guifg=#ffffff   guibg=#767396   gui=none
-hi SignColumn   guifg=#969696   guibg=#f0f0f0
-hi Conceal      guifg=#969696   guibg=#f0f0f0
-hi SpellBad     guifg=#000000   guibg=#fff5c3   guisp=#f01818   gui=undercurl
-hi SpellCap     guifg=#000000   guibg=#fff5c3   guisp=#14b9c8   gui=undercurl
-hi SpellRare    guifg=#000000   guibg=#fff5c3   guisp=#4cbe13   gui=undercurl
-hi SpellLocal   guifg=#000000   guibg=#fff5c3   guisp=#000000   gui=undercurl
-hi Pmenu        guifg=#ffffff   guibg=#323232
-hi PmenuSel     guifg=#ffffff   guibg=#1994d1
-hi PmenuSbar    guifg=#323232   guibg=#323232
-hi PmenuThumb   guifg=#646464   guibg=#646464   gui=none
-hi TabLine      guifg=#f0f0f0   guibg=#646464   gui=none
-hi TabLineSel   guifg=#ffffff   guibg=#323232   gui=none
-hi TabLineFill  guifg=#646464   guibg=#646464   gui=none
-hi CursorColumn                 guibg=#e1f5ff
-hi CursorLine                   guibg=#e1f5ff   gui=none
-hi ColorColumn                  guibg=#b8ddf0
-hi Cursor       guifg=#ffffff   guibg=#323232
-hi lCursor      guifg=#ffffff   guibg=#004364
-hi MatchParen   guifg=#ffffff   guibg=#f00078
-hi Normal       guifg=#323232   guibg=#ffffff
-hi Comment      guifg=#969696
-hi Constant     guifg=#1094a0
-hi Special      guifg=#dc6816
-hi Identifier   guifg=#3c960f
-hi Statement    guifg=#3b6ac8                   gui=none
-hi PreProc      guifg=#294a8c
-hi Type         guifg=#a00050                   gui=none
-hi Underlined   guifg=#323232                   gui=underline
-hi Ignore       guifg=#c8c8c8
-hi Error        guifg=#ffffff   guibg=#c81414
-hi Todo         guifg=#c81414   guibg=#ffffff
-
diff --git a/colors/beachcomber.vim b/colors/beachcomber.vim
deleted file mode 100755
index 4b34b66..0000000
--- a/colors/beachcomber.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Vim color file
-" beachcomber v1.0
-" Maintainer:	Rob Valentine <hjzx5ga02@sneakemail.com>
-
-" Beachcomber
-"
-" This theme is meant to remind one of a day at the beach.
-"
-" useful help screens & commands
-" :syntax
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-"
-" useful online resource
-" http://www.colorpicker.com
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="beachcomber"
-
-hi Normal	guibg=#F1EFD8 guifg=#192B4E
-
-" syntax highlighting
-hi Comment	  guifg=#6C5B5B
-hi Title	guifg=#416B24
-hi Underlined guifg=#20b0eF gui=none
-hi Statement  guifg=#41898A
-hi Type		  guifg=#204546
-hi PreProc    guifg=#984D4D
-hi Constant	  guifg=#6A3F70
-hi Identifier guifg=#395420 
-
-"highlight groups
-hi Ignore	guifg=grey40
-hi Todo		guifg=#204546 guibg=#FFBCFD
-hi Cursor	 guibg=#A8CDCD guifg=#FF05EA
-hi MatchParen guibg=#FF05EA guifg=#A8CDCD
-hi Directory guifg=#395420
-hi DiffAdd guifg=#07AF07 guibg=#FFFFFF
-hi DiffChange guifg=#333333 guibg=#FFFFFF
-hi DiffDelete guifg=#FF0000 guibg=#FFFFFF
-hi DiffText guifg=#000000 guibg=#FFE572
-hi ErrorMsg guifg=#FFFFFF guibg=#0000FF
-hi VertSplit	guibg=#555555 guifg=#A3FFFE gui=none
-hi Folded	guibg=#7BD3D4 guifg=#2F2F2F
-hi FoldColumn	guibg=#7BD3D4 guifg=#2F2F2F
-hi LineNr   guifg=#2F2F2F guibg=#B8EAEB 
-hi NonText  guifg=#52503B guibg=#D8D6BC
-hi Search	guibg=#FDFF5B guifg=#52503B
-hi IncSearch	guifg=#FDFF5B guibg=#52503B
-hi StatusLine	guibg=#7BD3D4 guifg=#2F2F2F gui=none
-hi StatusLineNC	guibg=#555555 guifg=#A3FFFE gui=none
-hi Visual   guifg=#726F54 guibg=#D4FEFE
-hi Pmenu	guifg=#52503B guibg=#FAAFFF
-hi PmenuSel	guifg=#242318 guibg=#F375FB 
-"vim: sw=4
diff --git a/colors/beauty256.vim b/colors/beauty256.vim
deleted file mode 100755
index 0781bc9..0000000
--- a/colors/beauty256.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" Vim colour scheme
-" Maintainer:	Mahmoud Sahebi Afzal
-" Last Change:	22 March 2008
-" Version:	1.0
-"
-" This colorscheme is my try to be beautiful as posible in the xterm
-" 256 color environments
-
-hi clear
-set background=light
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'beauty256'
-
-hi Normal gui=none guifg=Black guibg=White ctermfg=0 ctermbg=231
-
-hi Cursor guifg=White guibg=Black ctermfg=231 ctermbg=16
-hi LineNr gui=bold guifg=#828c95 guibg=#bbbbbb ctermfg=244 ctermbg=7
-hi NonText gui=bold guifg=DarkGray guibg=#bbbbbb ctermfg=7 ctermbg=7
-hi SpecialKey term=bold ctermfg=4
-hi Title term=bold ctermfg=5 guifg=RoyalBlue4
-hi Visual term=reverse ctermbg=7 guifg=White guibg=#829db9
-hi Ignore ctermfg=bg guifg=bg
-
-hi FoldColumn guifg=Black guibg=#979797 ctermbg=7 ctermfg=4
-hi Folded guifg=Black guibg=#bbbbbb  ctermbg=7 ctermfg=244
-hi StatusLine guifg=#ddddff guibg=#220088 ctermfg=5 ctermbg=231
-hi StatusLineNC guifg=#829db9 guibg=Black ctermfg=8 ctermbg=188
-hi VertSplit gui=bold guifg=#9ca6af guibg=Black cterm=bold ctermfg=231 ctermbg=8
-hi Wildmenu guifg=Black guibg=White ctermfg=0 ctermbg=11
-"hi CursorLine ctermbg=255
-hi Pmenu guibg=Grey65 guifg=Black gui=none ctermfg=250 ctermbg=238
-hi PmenuSbar guibg=Grey50 guifg=fg gui=none ctermbg=214
-hi PmenuSel guibg=Yellow guifg=Black gui=none ctermbg=214 ctermfg=16
-hi PmenuThumb guibg=Grey75 guifg=fg gui=none cterm=reverse
-
-hi IncSearch gui=none guifg=White guibg=Black cterm=reverse
-hi Search gui=none guifg=Black guibg=Yellow ctermbg=11
-
-hi MoreMsg gui=bold guifg=ForestGreen
-hi Question gui=bold guifg=ForestGreen
-hi WarningMsg gui=bold guifg=Red
-
-hi Comment gui=italic guifg=#9999cc ctermfg=248
-hi Error gui=none guifg=White guibg=Red ctermfg=15 ctermbg=197
-hi Identifier gui=none guifg=Sienna4 ctermfg=94
-hi Special gui=none guifg=RoyalBlue4 ctermfg=69
-hi PreProc gui=none guifg=RoyalBlue3 ctermfg=12
-hi Todo gui=bold guifg=Black guibg=Yellow ctermbg=214 ctermbg=232
-hi Type gui=bold guifg=RoyalBlue4 ctermfg=62
-hi Underlined gui=underline guifg=Blue
-hi Directory ctermfg=132
-hi Pmenu ctermfg=250 ctermbg=238
-hi PmenuSel ctermbg=214 ctermfg=16
-
-hi Boolean gui=bold guifg=ForestGreen
-hi Constant gui=none guifg=ForestGreen
-hi Number gui=bold guifg=ForestGreen
-hi String gui=none guifg=ForestGreen ctermfg=2
-hi helpNote ctermbg=220 ctermfg=16
-
-hi Label gui=bold,underline guifg=Sienna4
-hi Statement gui=bold guifg=#bb88bb ctermfg=132
-hi htmlStatement ctermfg=132
-
-hi htmlBold gui=bold
-hi htmlItalic gui=italic
-hi htmlUnderline gui=underline
-hi htmlBoldItalic gui=bold,italic
-hi htmlBoldUnderline gui=bold,underline
-hi htmlBoldUnderlineItalic gui=bold,underline,italic
-hi htmlUnderlineItalic gui=underline,italic
-
-hi djangoStatement guibg=#ddffaa ctermbg=150 ctermfg=22
-hi docSpecial guifg=RoyalBlue1
-hi docTrans guibg=White guifg=White
-hi docCode guifg=#00aa00
diff --git a/colors/bensday.vim b/colors/bensday.vim
deleted file mode 100755
index 66dae1d..0000000
--- a/colors/bensday.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Maintainer:	Christian V. J. Br�ssow <cvjb@cvjb.de>
-" Last Change: So 27 Apr 2008 18:55:52 CEST
-
-" This color scheme uses a dark grey background.
-" It is based upon the evening color scheme with only slight modifications.
-" So most (99%) of the credit for this color scheme belongs to the maintainer
-" of the original work, Bram Moolenaar.
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "bensday"
-
-hi Normal ctermbg=DarkGrey ctermfg=White guifg=White guibg=grey15
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi ModeMsg term=bold cterm=bold gui=bold
-hi StatusLine term=reverse,bold cterm=reverse,bold gui=bold guifg=DarkBlue guibg=LightGray
-hi User1 term=inverse,bold cterm=inverse,bold ctermfg=red gui=bold guifg=white guibg=DarkBlue
-hi StatusLineNC term=reverse cterm=reverse gui=none guifg=LightGray guibg=#509050
-hi VertSplit term=reverse cterm=reverse gui=reverse guifg=LightGray guibg=DarkBlue
-hi Visual term=reverse cterm=reverse gui=reverse guifg=grey30 guibg=fg
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-hi Cursor guibg=Green guifg=Black
-hi lCursor guibg=Cyan guifg=Black
-hi Directory term=bold ctermfg=LightCyan guifg=Cyan
-hi LineNr term=underline ctermfg=green guibg=grey10 guifg=#509050 gui=bold
-hi MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
-hi NonText term=bold ctermfg=LightBlue gui=bold guifg=LightBlue guibg=grey30
-hi Question term=standout ctermfg=LightGreen gui=bold guifg=Green
-hi Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi SpecialKey term=bold ctermfg=LightBlue guifg=Cyan
-hi Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta
-hi WarningMsg term=standout ctermfg=LightRed guifg=Red
-hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi Folded term=standout ctermbg=LightGrey ctermfg=DarkBlue gui=bold,italic guibg=gray20 guifg=#609060
-hi FoldColumn term=standout ctermbg=LightGrey ctermfg=DarkBlue gui=bold guibg=gray20 guifg=#609060
-hi DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue
-hi DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta
-hi DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
-hi CursorColumn term=reverse ctermbg=Black guibg=grey40
-hi CursorLine term=underline cterm=underline guibg=grey40
-
-" Groups for syntax highlighting
-hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 gui=bold
-hi Special term=bold ctermfg=LightRed guifg=Orange gui=bold
-if &t_Co > 8
-  hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
-endif
-hi Ignore ctermfg=DarkGrey guifg=grey20
-
-" vim: sw=2
diff --git a/colors/billw.vim b/colors/billw.vim
deleted file mode 100755
index 26a0b37..0000000
--- a/colors/billw.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Vim color file
-" Maintainer: Datila Carvalho <datila@hotmail.com>
-" Last Change: May, 19, 2005
-" Version: 0.2
-
-" This is a VIM's version of the emacs color theme
-" _Billw_ created by Bill White.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "billw"
-
-
-""" Colors
-
-" GUI colors
-hi Cursor               guifg=fg guibg=cornsilk
-hi CursorIM             guifg=NONE guibg=cornsilk
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg             gui=bold guifg=White guibg=Red
-"hi VertSplit
-"hi Folded
-"hi FoldColumn
-"hi IncSearch
-hi LineNr               gui=bold guifg=yellow4 guibg=gray10
-hi ModeMsg              gui=bold
-"hi MoreMsg
-"hi NonText
-hi Normal               guibg=black guifg=cornsilk
-"hi Question
-hi Search               gui=bold guifg=Black guibg=cornsilk
-"hi SpecialKey
-hi StatusLine           guifg=tan1 guibg=gray10
-hi StatusLineNC         guifg=orange3
-"hi Title
-hi Visual               guifg=gray35 guibg=fg
-hi VisualNOS            gui=bold guifg=black guibg=fg
-hi WarningMsg           guifg=White guibg=Tomato
-"hi WildMenu
-
-hi User2                guifg=lightgoldenrod guibg=gray15 gui=bold
-
-"If using Motif/Athena
-hi Menu                 guifg=fg guibg=gray35
-hi Scrollbar            guibg=gray35
-
-" Colors for syntax highlighting
-hi Comment              guifg=gold
-
-hi Constant             guifg=mediumspringgreen
-    hi String           guifg=orange
-    hi Character        guifg=orange
-    hi Number           guifg=mediumspringgreen
-    hi Boolean          guifg=mediumspringgreen
-    hi Float            guifg=mediumspringgreen
-
-hi Identifier           guifg=yellow
-    hi Function         guifg=mediumspringgreen
-
-hi Statement            gui=bold guifg=cyan1
-    hi Conditional      gui=bold guifg=cyan1
-    hi Repeat           gui=bold guifg=cyan1
-    hi Label            guifg=cyan1
-    hi Operator         guifg=cyan1
-    "hi Keyword
-    "hi Exception
-
-hi PreProc              guifg=LightSteelBlue
-    hi Include          guifg=LightSteelBlue
-    hi Define           guifg=LightSteelBlue
-    hi Macro            guifg=LightSteelBlue
-    hi PreCondit        guifg=LightSteelBlue
-
-hi Type                 guifg=yellow
-    hi StorageClass     guifg=cyan1
-    hi Structure        gui=bold guifg=cyan1
-    hi Typedef          guifg=cyan1
-
-"hi Special
-    ""Underline Character
-    "hi SpecialChar      gui=underline
-    "hi Tag              gui=bold,underline
-    ""Statement
-    "hi Delimiter        gui=bold
-    ""Bold comment (in Java at least)
-    "hi SpecialComment   gui=bold
-    "hi Debug            gui=bold
-
-hi Underlined           gui=underline
-
-hi Ignore               guifg=bg
-
-hi Error                gui=bold guifg=White guibg=Red
-
-"hi Todo
diff --git a/colors/biogoo.vim b/colors/biogoo.vim
deleted file mode 100755
index cb4a4c9..0000000
--- a/colors/biogoo.vim
+++ /dev/null
@@ -1,121 +0,0 @@
-" Vim color File
-" Name:			biogoo
-" Maintainer:	Benjamin Esham <bdesham@gmail.com>
-" Last Change:	2010-08-16
-" Version:		1.6.1
-"
-" Colorful text on a light gray background.  It's pretty easy on the eyes in my
-" opinion.  Any feedback is greatly appreciated!
-"
-" Installation:
-"	Copy to ~/.vim/colors; do :color biogoo
-"
-" Customization Options:
-"	Use a 'normal' cursor color:
-"		let g:biogoo_normal_cursor = 1
-"
-" Thanks:
-"	Jani Nurminen's zenburn.vim as an example file.
-"	Scott F., Matt F., and sc for feature suggestions/bug reports.
-"	Bill McCarthy for his Vim mailing list post about Vim 7 support.
-"
-" Version History:
-"	1.6.1:	fixed some oversights in 1.6
-"	1.6:	swapped the spelling-error color so that setting 'cursorline' or
-"			'cursorcolumn' doesn't make words invisible; added "ColorColumn" to
-"			support 'colorcolumn' in Vim 7.3
-"	1.5:	should fully support Vim 7 now
-"	1.4:	more Vim 7 support: added the "MatchParen" group for ()[]{} matching
-"	1.3:	added support for Vim 7: added groups for the new spellchecking, and
-"			added a conditional to display Visual mode correctly in any version
-"	1.2:	added "SpellErrors" group for use with vimspell
-"	1.1:	added "IncSearch" group for improved visibility in incremental
-"			searches
-"	1.0:	minor tweaks
-"	0.95:	initial release
-"
-" I will add new groups as requested... e-mail me with any suggestions!
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name = "biogoo"
-
-hi Comment			guifg=#0000c3
-hi ColorColumn		guibg=#e0e0e0
-hi Constant			guifg=#0000ff
-hi CursorColumn		guibg=#ffffff
-hi CursorLine		guibg=#ffffff
-hi Delimiter		guifg=#00007f
-hi DiffAdd			guifg=#007f00 guibg=#e5e5e5
-hi DiffChange		guifg=#00007f guibg=#e5e5e5
-hi DiffDelete		guifg=#7f0000 guibg=#e5e5e5
-hi DiffText			guifg=#ee0000 guibg=#e5e5e5
-hi Directory		guifg=#b85d00
-hi Error			guifg=#d6d6d6 guibg=#7f0000
-hi ErrorMsg			guifg=#ffffff guibg=#ff0000 gui=bold
-hi Float			guifg=#b85d00
-hi FoldColumn		guifg=#00007f guibg=#e5e5e5
-hi Folded			guifg=#00007f guibg=#e5e5e5
-hi Function			guifg=#7f0000
-hi Identifier		guifg=#004000
-hi Include			guifg=#295498 gui=bold
-hi IncSearch		guifg=#ffffff guibg=#0000ff gui=bold
-hi LineNr			guifg=#303030 guibg=#e5e5e5 gui=underline
-hi Keyword			guifg=#00007f
-hi Macro			guifg=#295498
-hi MatchParen		guifg=#ffffff guibg=#00a000
-hi ModeMsg			guifg=#00007f
-hi MoreMsg			guifg=#00007f
-hi NonText			guifg=#007f00
-hi Normal			guifg=#000000 guibg=#d6d6d6
-hi Number			guifg=#b85d00
-hi Operator			guifg=#00007f
-hi Pmenu			guifg=#000000 guibg=#cc9999
-hi PmenuSel			guifg=#ffffff guibg=#993333
-hi PmenuSbar		guibg=#99cc99
-hi PmenuThumb		guifg=#339933
-hi PreCondit		guifg=#295498 gui=bold
-hi PreProc			guifg=#0c3b6b gui=bold
-hi Question			guifg=#00007f
-hi Search			guibg=#ffff00
-hi Special			guifg=#007f00
-hi SpecialKey		guifg=#00007f
-hi SpellBad			guifg=#7f0000 guibg=#f0f0f0 gui=undercurl guisp=#7f0000
-hi SpellCap			guifg=#7f007f guibg=#f0f0f0 gui=undercurl guisp=#7f007f
-hi SpellLocal		guifg=#007f7f guibg=#f0f0f0 gui=undercurl guisp=#007f7f
-hi SpellRare		guifg=#b85d00 guibg=#f0f0f0 gui=undercurl guisp=#b85d00
-hi Statement		guifg=#00007f gui=none
-hi StatusLine		guifg=#00007f guibg=#ffffff
-hi StatusLineNC		guifg=#676767 guibg=#ffffff
-hi String			guifg=#d10000
-hi TabLine			guifg=#222222 guibg=#d6d6d6
-hi TabLineFill		guifg=#d6d6d6
-hi TabLineSel		guifg=#00007f guibg=#eeeeee gui=bold
-hi Title			guifg=#404040 gui=bold
-hi Todo				guifg=#00007f guibg=#e5e5e5 gui=underline
-hi Type				guifg=#540054 gui=bold
-hi Underlined		guifg=#b85d00
-hi VertSplit		guifg=#676767 guibg=#ffffff
-if version < 700
-	hi Visual		guifg=#7f7f7f guibg=#ffffff
-else
-	hi Visual		guifg=#ffffff guibg=#7f7f7f
-endif
-hi VisualNOS		guifg=#007f00 guibg=#e5e5e5
-hi WarningMsg		guifg=#500000
-hi WildMenu			guifg=#540054
-
-" Non-standard highlighting (e.g. for plugins)
-
-" vimspell
-hi SpellErrors		guibg=#f0f0f0 guifg=#7f0000 gui=undercurl guisp=#7f0000
-
-if !exists("g:biogoo_normal_cursor")
-	" use a gray-on-blue cursor
-	hi Cursor		guifg=#ffffff guibg=#00007f
-endif
-
-" vim:noet:ts=4 sw=4 tw=80 cc=+1
diff --git a/colors/black_angus.vim b/colors/black_angus.vim
deleted file mode 100755
index 145b639..0000000
--- a/colors/black_angus.vim
+++ /dev/null
@@ -1,115 +0,0 @@
-" Vim color file
-" Maintainer:	Angus Salkeld
-" Last Change:	14 September 2004
-" Version:		1.0
-" mainly green on black
-
-set background=dark
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "black_angus"
-
-" GUI
-" -----------------------------------------------------------------------
-highlight Normal     	guifg=Grey80	guibg=Black
-highlight Search     	guifg=brown						gui=reverse
-highlight Visual     	guifg=Grey25					gui=bold
-highlight Cursor     	guifg=Yellow	guibg=DarkGreen	gui=bold
-highlight DiffAdd      	guibg=#000080					gui=NONE
-highlight DiffChange   	guibg=#800080					gui=NONE
-highlight DiffDelete    guifg=#80c0e0	guibg=#404040	gui=NONE
-highlight DiffText      guifg=Black		guibg=#c0e080	gui=NONE
-
-" Console
-" -----------------------------------------------------------------------
-highlight Normal     	ctermfg=LightGrey	ctermbg=Black
-highlight Search     	ctermfg=Brown						cterm=reverse
-highlight Visual											cterm=reverse
-highlight Cursor     	ctermfg=Yellow		ctermbg=Green	cterm=bold
-
-" both
-" -----------------------------------------------------------------------
-highlight StatusLine 	guifg=LightGreen	guibg=#003300 gui=none ctermfg=LightGreen ctermbg=DarkGreen term=none
-highlight VertSplit 	guifg=LightGreen	guibg=#003300 gui=none ctermfg=LightGreen ctermbg=DarkGreen term=none
-highlight Folded 		guifg=#aaDDaa		guibg=#333333 gui=none ctermfg=LightGray ctermbg=DarkGray term=none
-highlight FoldColumn 	guifg=LightGreen	guibg=#003300 gui=none ctermfg=LightGreen ctermbg=DarkGreen term=none
-highlight SignColumn 	guifg=LightGreen	guibg=#003300 gui=none ctermfg=LightGreen ctermbg=DarkGreen term=none
-highlight WildMenu 		guifg=LightGreen	guibg=#003300 gui=none ctermfg=LightGreen ctermbg=DarkGreen term=none
-
-highlight LineNr 		guifg=DarkGreen	guibg=Black gui=none ctermfg=DarkGreen ctermbg=Black term=none
-highlight Directory 	guifg=LightGreen 					ctermfg=LightGreen 
-highlight Comment   	guifg=DarkGrey 						ctermfg=DarkGray
-
-highlight Special   	guifg=Orange	ctermfg=Brown
-highlight Title   		guifg=Orange	ctermfg=Brown
-highlight Tag  		 	guifg=DarkRed	ctermfg=DarkRed 
-highlight link Delimiter		Special
-highlight link SpecialChar		Special
-highlight link SpecialComment 	Special
-highlight link SpecialKey		Special
-highlight link NonText			Special
-
-highlight Error 	guifg=White guibg=DarkRed	gui=none	ctermfg=White ctermbg=DarkRed cterm=none
-highlight Debug 	guifg=White guibg=DarkGreen	gui=none	ctermfg=White ctermbg=DarkRed cterm=none
-highlight ErrorMsg 	guifg=White guibg=DarkBlue	gui=none	ctermfg=White ctermbg=DarkRed cterm=none
-highlight WarningMsg guifg=White guibg=DarkBlue	gui=none	ctermfg=White ctermbg=DarkBlue cterm=none
-highlight Todo 		guifg=White guibg=DarkYellow	gui=none	ctermfg=White ctermbg=DarkBlue cterm=none
-highlight link cCommentStartError     WarningMsg
-highlight link cCommentError          Debug
-
-" Preprocesor
-highlight PreCondit 	guifg=Cyan3 	ctermfg=Cyan
-highlight PreProc 		guifg=Magenta 	ctermfg=Magenta
-highlight Include 		guifg=DarkCyan 	ctermfg=DarkCyan
-highlight ifdefIfOut 	guifg=DarkGray 	ctermfg=DarkGray
-highlight link Macro			Include
-highlight link Define			Include
-
-" lang
-highlight Function 		guifg=#AAEEAA 		gui=none   		ctermfg=LightGreen	
-highlight Identifier  	guifg=#bbccbb 		gui=none   		ctermfg=Grey 		
-highlight Statement  	guifg=LightGreen	gui=underline 	ctermfg=LightGreen 	
-highlight Operator  	guifg=Yellow 		gui=none    	ctermfg=Yellow 		
-highlight Conditional  	guifg=lightslateblue gui=none    	ctermfg=LightBlue 	
-
-highlight link Exception		Statement
-highlight link Label 	 		Statement
-highlight link Repeat			Conditional
-
-highlight link Keyword			Label
-
-highlight Constant    	guifg=LightGreen	ctermfg=LightGreen gui=none
-highlight link Character		Constant
-highlight link Number			Constant
-highlight link Boolean			Constant
-highlight link String			Constant
-highlight link Float			Constant
-
-highlight Type 			guifg=DarkGreen		ctermfg=DarkGreen gui=none
-highlight link StorageClass	Type
-highlight link Structure		Type
-highlight link Typedef			Type
-
-" ------------------------------------------------------------------------------
-" Common groups that link to other highlighting definitions.
-highlight link Search			IncSearch
-highlight link Question 		Statement
-highlight link VisualNOS	    Visual
-" ------------------------------------------------------------------------------
-
-" only for vim 5
-if has("unix")
-  if v:version<600
-    highlight Normal  ctermfg=Grey	ctermbg=Black	cterm=NONE	guifg=Grey80      guibg=Black	gui=NONE
-    highlight Search  ctermfg=Black	ctermbg=Red		cterm=bold	guifg=Black       guibg=Red		gui=bold
-    highlight Visual  ctermfg=Black	ctermbg=yellow	cterm=bold	guifg=Grey25					gui=bold
-    highlight Special ctermfg=LightBlue				cterm=NONE	guifg=LightBlue
-    highlight Comment ctermfg=Cyan					cterm=NONE	guifg=LightBlue
-  endif
-endif
-
-
-
diff --git a/colors/blackbeauty.vim b/colors/blackbeauty.vim
deleted file mode 100755
index a824ea3..0000000
--- a/colors/blackbeauty.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-"  Maintainer: Surya
-"  Last Change: 12/23/2003 10:32:41 . 
-"     version: 1.0
-" This color scheme uses a dark background.
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset 
-endif
-
-let g:colors_name = "koehler"
-hi Normal		  guifg=white  guibg=black
-hi Scrollbar	  guibg=darkgray guifg=darkgray
-hi Menu			  guifg=black guibg=gray
-hi SpecialKey	  term=bold  cterm=bold  ctermfg=darkred  guifg=Blue
-hi NonText		  term=bold  cterm=bold  ctermfg=darkred  gui=bold	guifg=Blue
-hi Directory	  term=bold  cterm=bold  ctermfg=brown	guifg=Blue
-hi ErrorMsg		  term=standout  cterm=bold  ctermfg=grey  ctermbg=blue  gui=bold guifg=White  guibg=brown
-hi Search		  term=reverse	ctermfg=white  ctermbg=red	gui=bold guifg=#000000 guibg=Magenta
-hi MoreMsg		  term=bold  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=SeaGreen
-hi ModeMsg		  term=bold  cterm=bold  gui=bold  guifg=White	guibg=Blue
-hi LineNr		  term=underline  cterm=bold  ctermfg=darkcyan	guibg=brown guifg=white
-hi Question		  term=standout  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=Green
-hi StatusLine	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guibg=white guifg=brown
-hi StatusLineNC   term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
-hi Title		  term=bold  cterm=bold  ctermfg=darkmagenta  gui=bold	guifg=Magenta
-hi Visual		  term=reverse	cterm=reverse  gui=reverse
-hi WarningMsg	  term=standout  cterm=bold  ctermfg=darkblue  gui=bold guifg=cyan guibg=Black
-hi Cursor		  guifg=bg	guibg=cyan
-hi Comment		  term=bold  cterm=bold ctermfg=cyan  guifg=#80a0ff
-hi Constant		  term=underline  cterm=bold ctermfg=magenta  guifg=#ffa0a0
-hi String		  term=underline  cterm=bold ctermfg=magenta  gui=bold guifg=brown guibg=darkgray
-hi Number		  term=underline  cterm=bold ctermfg=magenta  guifg=#00ffff
-hi Special		  term=bold  gui=bold cterm=bold ctermfg=red  guifg=Orange
-hi Identifier	  term=underline   ctermfg=brown  guifg=#40ffff
-hi Statement	  term=bold  cterm=bold ctermfg=yellow	gui=bold  guifg=#ffff60
-hi PreProc		  term=underline  ctermfg=darkblue	guifg=#ff80ff
-hi Type			  term=underline  cterm=bold ctermfg=lightgreen  gui=bold  guifg=#60ff60
-hi Error		    gui=bold guifg=Yellow	guibg=Black
-hi Todo			  term=standout  ctermfg=black	ctermbg=darkcyan  guifg=Blue  guibg=Yellow
-"hi VertSplit	guifg=#00FFFF guibg=#000000 gui=bold
-hi link IncSearch		Visual
-hi link Character		Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
-
diff --git a/colors/blackboard.vim b/colors/blackboard.vim
deleted file mode 100755
index 4ef875f..0000000
--- a/colors/blackboard.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Vim color scheme
-"
-" Name:         blackboard.vim
-" Maintainer:   Ben Wyrosdick <ben.wyrosdick@gmail.com> 
-" Last Change:  20 August 2009
-" License:      public domain
-" Version:      1.4
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let g:colors_name = "blackboard"
-
-if has("gui_running")
-  "GUI Colors
-  highlight Normal guifg=White   guibg=#0B1022
-  highlight Cursor guifg=Black   guibg=Yellow
-  highlight CursorLine guibg=#191E2F
-  highlight LineNr guibg=#323232 guifg=#888888
-  highlight Folded guifg=#f1f3e8 guibg=#444444
-  highlight Pmenu guibg=#84A7C1
-
-  "General Colors
-  highlight Comment guifg=#AEAEAE
-  highlight Constant guifg=#CAFE1E
-  highlight Keyword guifg=#FFDE00
-  highlight String guifg=#00D42D
-  highlight Type guifg=#84A7C1
-  highlight Identifier guifg=#00D42D gui=NONE
-  highlight Function guifg=#FF5600 gui=NONE
-  highlight clear Search
-  highlight Search guibg=#1C3B79
-  highlight PreProc guifg=#FF5600
-
-  "HTML Colors
-  highlight link htmlTag Type
-  highlight link htmlEndTag htmlTag
-  highlight link htmlTagName htmlTag
-
-  "Ruby Colors
-  highlight link rubyClass Keyword
-  highlight link rubyDefine Keyword
-  highlight link rubyConstant Type
-  highlight link rubySymbol Constant
-  highlight link rubyStringDelimiter rubyString
-  highlight link rubyInclude Keyword
-  highlight link rubyAttribute Keyword
-  highlight link rubyInstanceVariable Normal
-
-  "Rails Colors
-  highlight link railsMethod Type
-end
diff --git a/colors/blackdust.vim b/colors/blackdust.vim
deleted file mode 100755
index 0eb20a7..0000000
--- a/colors/blackdust.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-set background=dark
-hi clear          
-
-hi Boolean         guifg=#dca3a3 gui=bold
-hi Character       guifg=#dca3a3 gui=bold
-hi Comment         guifg=#7f7f7f
-hi Condtional      guifg=#8fffff
-hi Constant        guifg=#dca3a3 gui=bold
-hi Cursor          guifg=#000000 guibg=#aeaeae
-hi Debug           guifg=#dca3a3 gui=bold
-hi Define          guifg=#ffcfaf gui=bold
-hi Delimiter       guifg=#8f8f8f
-hi DiffAdd         guibg=#613c46
-hi DiffChange      guibg=#333333
-hi DiffDelete      guifg=#333333 guibg=#464646 gui=none
-hi DiffText        guifg=#ffffff guibg=#1f1f1f gui=bold
-hi Directory       guifg=#ffffff gui=bold
-hi Error           guifg=#000000 guibg=#00ffff
-hi ErrorMsg        guifg=#000000 guibg=#00c0cf
-hi Exception       guifg=#8fffff gui=underline
-hi Float           guifg=#9c93b3
-hi FoldColumn      guifg=#dca3a3 guibg=#464646
-hi Folded          guifg=#dca3a3 guibg=#333333
-hi Function        guifg=#ffff8f
-hi Identifier      guifg=#ffffff
-hi Include         guifg=#ffcfaf gui=bold
-hi IncSearch       guifg=#000000 guibg=#c15c66
-hi Keyword         guifg=#ffffff gui=bold
-hi Label           guifg=#8fffff gui=underline
-hi LineNr          guifg=#7f7f7f guibg=#464646
-hi Macro           guifg=#ffcfaf gui=bold
-hi ModeMsg         guifg=#dca3a3 gui=bold
-hi MoreMsg         guifg=#ffffff gui=bold
-hi NonText         guifg=#1f1f1f
-hi Normal          guifg=#cccccc guibg=#3f3f3f
-hi Number          guifg=#aca0a3
-hi Operator        guifg=#ffffff
-hi PreCondit       guifg=#dfaf8f gui=bold
-hi PreProc         guifg=#ffcfaf gui=bold
-hi Question        guifg=#ffffff gui=bold
-hi Repeat          guifg=#8fffff gui=underline
-hi Search          guifg=#000000 guibg=#c15c66
-hi SpecialChar     guifg=#dca3a3 gui=bold
-hi SpecialComment  guifg=#dca3a3 gui=bold
-hi Special         guifg=#7f7f7f
-hi SpecialKey      guifg=#7e7e7e
-hi Statement       guifg=#8fffff
-hi StatusLine      guifg=#333333 guibg=#f18c96
-hi StatusLineNC    guifg=#333333 guibg=#cccccc
-hi StorageClass    guifg=#ffffff gui=bold
-hi String          guifg=#cc9393
-hi Structure       guifg=#ffffff gui=bold,underline
-hi Tag             guifg=#dca3a3 gui=bold
-hi Title           guifg=#ffffff guibg=#333333 gui=bold
-hi Todo            guifg=#ffffff guibg=#000000 gui=bold
-hi Typedef         guifg=#ffffff gui=bold,underline
-hi Type            guifg=#ffffff gui=bold
-hi VertSplit       guifg=#333333 guibg=#cccccc
-hi Visual          guifg=#333333 guibg=#f18c96 gui=reverse
-hi VisualNOS       guifg=#333333 guibg=#f18c96 gui=bold,underline
-hi WarningMsg      guifg=#ffffff guibg=#333333 gui=bold
-hi WildMenu        guifg=#000000 guibg=#dca3a3
diff --git a/colors/blacklight.vim b/colors/blacklight.vim
deleted file mode 100755
index 072a948..0000000
--- a/colors/blacklight.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-"vim gui/256 color file
-"Created with color_toon.vim
-"Version 1.0
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-let colors_name="blacklight"
-
-hi SpecialKey      term=bold ctermfg=2 guifg=yellowgreen
-hi NonText         term=bold ctermfg=84 gui=bold guifg=#5fff87
-hi Directory       term=bold ctermfg=84 guifg=#5fff87
-hi ErrorMsg        term=standout cterm=bold ctermfg=7 ctermbg=1 guifg=White guibg=Red
-hi IncSearch       term=reverse ctermfg=11 ctermbg=10 gui=reverse guifg=slategrey guibg=khaki
-hi Search          term=reverse ctermfg=47 ctermbg=34 guifg=#00ff00 guibg=#00af00
-hi MoreMsg         term=bold ctermfg=2 gui=bold guifg=SeaGreen
-hi ModeMsg         term=bold ctermfg=130 gui=bold guifg=goldenrod
-hi LineNr          term=underline ctermfg=3 guifg=Yellow
-hi Question        term=standout ctermfg=10 gui=bold guifg=springgreen
-hi StatusLine      term=bold,reverse cterm=bold,reverse guifg=black guibg=#c2bfa5
-hi StatusLineNC    term=reverse cterm=reverse guifg=grey50 guibg=#c2bfa5
-hi VertSplit       term=reverse cterm=reverse guifg=grey50 guibg=#c2bfa5
-hi Title           term=bold ctermfg=117 guifg=#87dfff
-hi Visual          term=reverse cterm=reverse guifg=khaki guibg=olivedrab
-hi VisualNOS       term=bold,underline cterm=bold,underline gui=bold,underline
-hi WarningMsg      term=standout ctermfg=1 guifg=salmon
-hi WildMenu        term=standout ctermfg=0 ctermbg=3 guifg=Black guibg=Yellow
-hi Folded          term=standout ctermfg=242 guifg=gold guibg=grey30
-hi FoldColumn      term=standout ctermfg=242 guifg=tan guibg=grey30
-hi DiffAdd         term=bold ctermbg=4 guibg=DarkBlue
-hi DiffChange      term=bold ctermbg=5 guibg=DarkMagenta
-hi DiffDelete      term=bold cterm=bold ctermfg=4 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText        term=reverse cterm=bold ctermbg=1 gui=bold guibg=Red
-hi SignColumn      term=standout ctermfg=14 ctermbg=242 guifg=Cyan guibg=Grey
-hi Cursor          guifg=#303030 guibg=#00ff5f
-hi lCursor         guifg=bg guibg=fg
-hi Normal          ctermfg=39 ctermbg=235 guifg=#00afff guibg=#262626
-hi Comment         term=bold ctermfg=251 guifg=#c6c6c6
-hi Constant        term=underline ctermfg=165 guifg=#d700ff
-hi Special         term=bold ctermfg=3 guifg=DarkYellow
-hi Identifier      term=underline ctermfg=10 guifg=#00ff00
-hi Statement       term=bold ctermfg=228 guifg=#ffff87 gui=NONE
-hi PreProc         term=underline ctermfg=190 guifg=#d7ff00
-hi Type            term=underline ctermfg=159 guifg=#afffff gui=NONE
-hi Underlined      term=underline cterm=underline ctermfg=47 gui=underline guifg=#00ff00
-hi Ignore          cterm=bold ctermfg=242 guifg=grey40
-hi Error           term=reverse cterm=bold ctermfg=7 ctermbg=1 guifg=White guibg=Red
-hi Todo            term=standout ctermfg=0 ctermbg=11 guifg=orangered guibg=yellow2
diff --git a/colors/blazer.vim b/colors/blazer.vim
deleted file mode 100755
index b647680..0000000
--- a/colors/blazer.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-" Vim color scheme
-"
-" Name:         blazer.vim
-" Author:       Mitko Kostov <mitko.kostov@gmail.com>
-" Repo:         http://github.com/mitkok/blazer
-" Last Change:  30 May 2010
-" License:      MIT
-" Version:      0.3
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "blazer"
-
-hi link htmlTag                     xmlTag
-hi link htmlTagName                 xmlTagName
-hi link htmlEndTag                  xmlEndTag
-
-highlight Normal                    guifg=#E6E1DC guibg=#0A0A0A
-highlight Cursor                    guifg=#FFFFFF ctermfg=0 guibg=#FFFFFF ctermbg=15
-highlight CursorLine                guibg=#000000 ctermbg=233 cterm=NONE
-
-highlight Comment                   guifg=#868686 ctermfg=180
-highlight Constant                  guifg=#73B1EE ctermfg=73
-highlight Define                    guifg=#FF2847 ctermfg=173
-highlight Error                     guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88
-highlight Function                  guifg=#1CFFCE ctermfg=221 gui=NONE cterm=NONE
-highlight Identifier                guifg=#FF2847 ctermfg=73 gui=NONE cterm=NONE
-highlight Include                   guifg=#FF2847 ctermfg=173 gui=NONE cterm=NONE
-highlight PreCondit                 guifg=#FF2847 ctermfg=173 gui=NONE cterm=NONE
-highlight Keyword                   guifg=#8AB6EE ctermfg=173 cterm=NONE
-highlight LineNr                    guifg=#9E9E9E ctermfg=159 guibg=#0A0A0A
-highlight Number                    guifg=#E8E8E8 ctermfg=107
-highlight PreProc                   guifg=#8AB6EE ctermfg=103
-highlight Search                    guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline
-highlight Statement                 guifg=#FF2847 ctermfg=173 gui=NONE cterm=NONE
-highlight String                    guifg=#30DF78 ctermfg=107
-highlight Title                     guifg=#CCCCCC ctermfg=15
-highlight Type                      guifg=#8AB6EE ctermfg=167 gui=NONE cterm=NONE
-highlight Visual                    guibg=#8AB6EE ctermbg=60
-
-highlight DiffAdd                   guifg=#E6E1DC ctermfg=7 guibg=#519F50 ctermbg=71
-highlight DiffDelete                guifg=#E6E1DC ctermfg=7 guibg=#660000 ctermbg=52
-highlight Special                   guifg=#8AB6EE ctermfg=167
-
-highlight rubyBlockParameter        guifg=#61EEB2 ctermfg=15
-highlight rubyClass                 guifg=#FF2847 ctermfg=15
-highlight rubyConstant              guifg=#54B5F8 ctermfg=167
-highlight rubyInstanceVariable      guifg=#8AB6EE ctermfg=189
-highlight rubyInterpolation         guifg=#8AB6EE ctermfg=107
-highlight rubyLocalVariableOrMethod guifg=#d990de ctermfg=189
-highlight rubyPredefinedConstant    guifg=#4596ff ctermfg=167
-highlight rubyPseudoVariable        guifg=#4596ff ctermfg=221
-highlight rubyStringDelimiter       guifg=#30DF78 ctermfg=143
-highlight rubyIdentifier            guifg=#8AB6EE ctermfg=143
-highlight rubyOperator              guifg=#FFFFFF ctermfg=143
-highlight rubyInclude               guifg=#FF2847
-highlight rubyConditional           guifg=#FF2847
-highlight rubyOptionalDo            guifg=#FF2847
-highlight rubyConditionalModifier   guifg=#FF2847
-highlight rubyControl               guifg=#FF2847
-highlight rubyClassVariable         guifg=#54b2d9
-highlight rubyAttribute             guifg=#becbf5
-highlight rubyEval                  guifg=#88d1f0
-highlight rubyPseudoVariable        guifg=#8AB6EE
-highlight rubyPredifinedIdentifier  guifg=#8AB6EE
-highlight xmlTag                    guifg=#8AB6EE ctermfg=179
-highlight xmlTagName                guifg=#8AB6EE ctermfg=179
-highlight xmlEndTag                 guifg=#8AB6EE ctermfg=179
-highlight mailSubject               guifg=#A5C261 ctermfg=107
-highlight mailHeaderKey             guifg=#FFC66D ctermfg=221
-highlight mailEmail                 guifg=#A5C261 ctermfg=107 gui=italic cterm=underline
-highlight rubyModule                guifg=#FF2847
-highlight rubyDefine                guifg=#FF2847
-highlight SpellBad                  guifg=#D70000 ctermfg=160 ctermbg=NONE cterm=underline
-highlight SpellRare                 guifg=#D75F87 ctermfg=168 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight SpellCap                  guifg=#D0D0FF ctermfg=189 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight MatchParen                guifg=#519F50 ctermfg=15 guibg=#005f5f ctermbg=23
diff --git a/colors/blink.vim b/colors/blink.vim
deleted file mode 100755
index 8936f2f..0000000
--- a/colors/blink.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" Vim color file
-" Maintainer:	Adam Blinkinsop <blinks@acm.org>
-" Last Change:	2006 Sept 29
-
-" Remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "blink"
-
-" Set Default
-hi Normal term=NONE cterm=NONE ctermfg=Gray ctermbg=Black gui=NONE guifg=Gray guibg=Black
-
-" Vim colors (reverse for highlighting, red for errors, brown for special)
-hi Cursor term=reverse cterm=reverse
-hi CursorIME term=reverse cterm=reverse
-hi CursorColumn term=reverse cterm=reverse
-hi CursorLine term=reverse cterm=reverse
-hi ErrorMsg term=reverse ctermfg=Red ctermbg=Black guifg=Red guibg=Black
-hi ModeMsg term=reverse cterm=reverse
-hi NonText term=bold ctermfg=DarkBlue guifg=#0000c0
-hi SpecialKey term=NONE ctermfg=Brown guifg=#c0c000
-hi StatusLine term=reverse cterm=reverse
-hi Visual term=reverse cterm=reverse gui=NONE guifg=bg guibg=fg
-hi WarningMsg term=reverse ctermfg=Brown guifg=#c0c000
-
-" Syntax Colors, General
-hi Comment term=reverse ctermfg=Black ctermbg=DarkCyan guifg=Black guibg=#00c0c0
-hi Underlined term=underline cterm=underline gui=underline
-hi Ignore term=NONE cterm=NONE gui=NONE
-hi Error term=bold ctermfg=Red ctermbg=Black guifg=Red guibg=Black
-hi Todo term=reverse cterm=reverse gui=reverse
-
-" Constants (plain data)
-hi Constant term=bold cterm=bold ctermfg=Brown ctermbg=Black gui=bold guifg=#c0c000 guibg=Black
-hi def link Boolean Constant
-hi def link Character Constant
-hi def link String Constant
-hi def link Number Constant
-hi def link Float Constant
-
-" Identifiers (are things)
-hi Identifier term=NONE cterm=NONE ctermfg=DarkCyan ctermbg=Black gui=NONE guifg=#00c0c0 ctermbg=Black
-hi def link Function Identifier
-
-" Statements (do things)
-hi Statement term=bold ctermfg=DarkGreen ctermbg=Black guifg=#00c000 ctermbg=Black
-hi def link Conditional Statement
-hi def link Repeat Statement
-hi def link Label Statement
-hi def link Operator Statement
-hi def link Keyword Statement
-hi def link Exception Statement
-
-" Preprocessing (meta)
-hi PreProc term=bold cterm=NONE ctermfg=DarkGreen ctermbg=Black gui=NONE guifg=#00c000 guibg=Black
-hi def link Include PreProc
-hi def link Define PreProc
-hi def link Macro PreProc
-hi def link PreCondit PreProc
-
-" Types (define things)
-hi Type term=NONE cterm=bold ctermfg=DarkCyan ctermbg=Black gui=Bold guifg=#00c0c0 guibg=Black
-hi def link StorageClass Type
-hi def link Structure Type
-hi def link Typedef Type
-
-" Special (undef)
-hi Special term=NONE cterm=NONE ctermfg=Brown ctermbg=Black gui=NONE guifg=#c0c000 guibg=Black
-hi def link Tag Special
-hi def link SpecialChar Special
-hi def link Delimiter Special
-hi def link SpecialComment Special
-hi def link Debug Special
-
-" vim: sw=2
diff --git a/colors/blue.vim b/colors/blue.vim
deleted file mode 100755
index 220700f..0000000
--- a/colors/blue.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-" Vim color file
-" Maintainer:   TaQ <taq@taq.cjb.net>
-" Last Change:  10 October 2001 - 0.2
-" URL: http://taq.cjb.net		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark	" or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="blue"
-
-hi Normal	  ctermfg=Gray  ctermbg=Black guifg=#CCCCCC guibg=#000040
-hi NonText    ctermfg=Gray  ctermbg=Black guifg=#0050EE guibg=#000040
-
-hi Statement  ctermfg=White ctermbg=Black guifg=#007FFF guibg=#000040 gui=BOLD
-hi Comment    ctermfg=Blue  ctermbg=Black guifg=#00A0FF guibg=#000090 gui=NONE
-hi Constant	  ctermfg=White ctermbg=Black guifg=#0050EE guibg=#000040 gui=NONE
-hi Identifier ctermfg=Cyan  ctermbg=Black guifg=#FFFFFF guibg=#000040 gui=NONE
-hi Type		  ctermfg=Cyan  ctermbg=Black guifg=#5050FF guibg=#000040 gui=NONE
-hi Folded	  ctermfg=White ctermbg=Blue  guifg=#00A0FF guibg=#000050 gui=BOLD
-hi Special    ctermfg=Blue  ctermbg=Black guifg=#00A0FF guibg=#000090 gui=NONE
-hi PreProc	  ctermfg=Blue  ctermbg=Black guifg=#00FF00 guibg=#000040 gui=BOLD
-hi Scrollbar  ctermfg=Blue  ctermbg=Black guifg=#00C0FF guibg=#000040
-hi Cursor     ctermfg=white ctermbg=Black guifg=#FFFFFF guibg=#5050FF
-hi ErrorMsg   ctermfg=white ctermbg=Red   guifg=#FFFFFF guibg=#FF0000
-hi WarningMsg ctermfg=Black ctermbg=Yellow   guifg=#000000 guibg=#FFFF00
-hi VertSplit  ctermfg=White ctermbg=Blue     guifg=#000090 guibg=#000090
-hi Directory  ctermfg=Cyan  ctermbg=DarkBlue guifg=#00A0F0 guibg=#000040
-hi Visual	  ctermfg=Black ctermbg=Cyan     guifg=#5050FF guibg=#FFFFFF 
-hi Title      ctermfg=White ctermbg=Blue     guifg=#FFFFFF guibg=#0050EE gui=NONE
-
-hi StatusLine   term=bold cterm=bold ctermfg=White ctermbg=Blue		gui=bold guifg=#FFFFFF guibg=#0050EE
-hi StatusLineNC term=bold cterm=bold ctermfg=Gray  ctermbg=Blue      gui=bold guifg=#AAAAAA guibg=#000090
-hi LineNr		 term=bold cterm=bold ctermfg=White ctermbg=DarkBlue  gui=bold guifg=#00A0FF guibg=#000050
-
diff --git a/colors/bluechia.vim b/colors/bluechia.vim
deleted file mode 100755
index 0d840a1..0000000
--- a/colors/bluechia.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-" Name: bluechia.vim
-" Authorship: Kojo Sugita
-" Modifier: CRUX
-" Last Change: 2009-12-03
-" Revision: 1.0
-"
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'bluechia'
-
-" Default colors
-hi Normal	guifg=#d3daed	guibg=#05131c
-hi NonText	guifg=#92add3	guibg=#071925	gui=none
-hi SpecialKey	guifg=#92add3	guibg=#14220a	gui=none
-hi Cursor	guifg=#3a553a	guibg=#d2ff00
-hi CursorLine	guibg=#303035
-hi CursorColumn	guibg=#303035
-hi lCursor	guifg=#3a553a	guibg=#d2ff00
-hi CursorIM	guifg=#3a553a	guibg=#d2ff00
-
-
-" Directory
-hi Directory	guifg=white gui=bold
-
-" Diff
-hi DiffAdd	guifg=#d2ff00	guibg=#3a553a	gui=none
-hi DiffChange	guifg=#d2ff00	guibg=#3a553a	gui=none
-hi DiffDelete	guifg=#99bdff	guibg=#99bdff	gui=none
-hi DiffText	guifg=#d2ff00	guibg=#448844	gui=bold
-
-
-hi ErrorMsg	guifg=#eb7aa0	guibg=black
-hi VertSplit	guifg=black	guibg=#cfddea
-
-" Folds
-" hi Folded	guifg=#b265a4	guibg=black
-" hi Folded	guifg=#fdfe00	guibg=black
-hi Folded	guifg=#ff6902	guibg=black
-hi FoldColumn	guifg=#557755	guibg=#102010
-
-" Search
-hi Search	guifg=#99bdff	guibg=#071925	gui=none
-hi IncSearch	guifg=#3a553a	guibg=#d2ff00	gui=none
-
-" hi LineNr	guifg=#a9ce49 guibg=black gui=none
-hi LineNr 	guifg=#afcd63	guibg=black	gui=none
-hi ModeMsg	guifg=#cfddea	guibg=black
-hi MoreMsg	guifg=#071925	guibg=black
-hi Question	guifg=#071925	guibg=black
-
-"\n, \0, %d, %s, etc...
-hi Special	guifg=#fcd942			gui=none
-
-" status line
-hi StatusLine	guifg=#cfddea	guibg=black	gui=bold
-" hi StatusLineNC	guifg=#a9ce49	guibg=black	gui=none
-hi StatusLineNC	guifg=#a9ce49	guibg=black	gui=bold
-
-hi Title	guifg=#cfddea	guibg=#000000	gui=none
-hi Visual	guifg=#d2ff00	guibg=#448844	gui=none
-hi VisualNOS	guifg=#071925	guibg=black
-hi WarningMsg	guifg=#d2ff00	guibg=black
-hi WildMenu	guifg=#3a553a	guibg=#d2ff00
-
-hi Number	guifg=#d2ff00
-hi Char		guifg=#d2ff00
-hi String	guifg=#d2ff00
-hi Boolean	guifg=#d2ff00
-hi Comment	guifg=#7b8487
-hi Constant	guifg=#cfddea			gui=none
-hi Identifier	guifg=white
-hi Statement    guifg=#f19dae			gui=none
-
-" Procedure name
-hi Function     guifg=#ef008c
-
-" Define, def
-hi PreProc	guifg=#8ddaea			gui=none
-hi Type		guifg=white			gui=none
-hi Underlined	guifg=gray			gui=underline
-hi Error	guifg=#eb7aa0			guibg=black
-hi Todo		guifg=#fcd942	guibg=black	gui=none
-hi SignColumn   guibg=#05131c
-
-" Matches
-hi MatchParen	guifg=#000000	guibg=#ef008c
-
-" Pmenu
-if version >= 700
-  hi Pmenu	guibg=#202530
-  hi PmenuSel	guifg=#cfddea	guibg=black
-  hi PmenuSbar	guibg=#202530
-
-  hi TabLine	  guifg=#a9ce49	guibg=black	gui=None
-  hi TabLineFill  guibg=#071925	guibg=#071925	gui=None
-  hi TabLineSel	  guifg=#cfddea	guibg=black	gui=None
-endif
-
-finish
-
-" vim:set ts=8 sts=2 sw=2 tw=0:
diff --git a/colors/bluegreen.vim b/colors/bluegreen.vim
deleted file mode 100755
index 0b23dcd..0000000
--- a/colors/bluegreen.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-" Vim color file
-" Maintainer:   
-" Last Change:  
-" URL:			 
-
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="mine"
-
-hi Normal	guifg=White guibg=#061A3E
-
-" highlight groups
-hi Cursor	guibg=#D74141 guifg=#e3e3e3
-hi VertSplit guibg=#C0FFFF guifg=#075554 gui=none
-hi Folded		guibg=#FFC0C0 guifg=black
-hi FoldColumn	guibg=#800080 guifg=tan
-"hi IncSearch	cterm=none ctermbg=blue ctermfg=grey guifg=slategrey guibg=khaki
-hi ModeMsg guifg=#404040 guibg=#C0C0C0
-hi MoreMsg guifg=darkturquoise guibg=#188F90
-hi NonText guibg=#334C75 guifg=#9FADC5
-hi Question	guifg=#F4BB7E
-hi Search guibg=fg guifg=bg 
-hi SpecialKey	guifg=#BF9261
-hi StatusLine	guibg=#004443 guifg=#c0ffff gui=none
-hi StatusLineNC	guibg=#067C7B guifg=#004443 gui=bold
-hi Title	guifg=#8DB8C3
-hi Visual gui=bold guifg=black guibg=#C0FFC0
-hi WarningMsg	guifg=#F60000 gui=underline
-
-" syntax highlighting groups
-hi Comment guifg=#DABEA2
-hi Constant guifg=#72A5E4 gui=bold
-hi Identifier	guifg=#ADCBF1
-hi Statement guifg=#7E75B5
-hi PreProc guifg=#14F07C
-hi Type	guifg=#A9EE8A
-hi Special guifg=#EEBABA
-hi Ignore	guifg=grey60
-hi Todo	guibg=#9C8C84 guifg=#244C0A
-
-"vim: ts=4
diff --git a/colors/blueprint.vim b/colors/blueprint.vim
deleted file mode 100755
index 5ad2125..0000000
--- a/colors/blueprint.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Maintainer:	Xiance Si <adam.si@gmail.com>
-" Last Change:	2002 Mar 09
-
-" blueprint, a color scheme after real engineering blueprint.
-
-set bg=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "blueprint"
-
-hi Normal		guifg=#cccccc guibg=#0e4072						ctermfg=gray ctermbg=black
-hi ErrorMsg		guifg=#ffffff guibg=#0e4072						ctermfg=white ctermbg=lightblue
-hi Visual		guifg=#606060 guibg=fg		gui=reverse				ctermfg=lightblue ctermbg=fg cterm=reverse
-hi VisualNOS	guifg=bg guibg=fg		gui=reverse,underline	ctermfg=lightblue ctermbg=fg cterm=reverse,underline
-hi Todo			guifg=#d14a14 guibg=#1248d1						ctermfg=red	ctermbg=darkblue
-hi Search		guifg=#2050d0 guibg=#90fff0 						ctermfg=white ctermbg=darkblue cterm=underline term=underline
-hi IncSearch	guifg=#b0ffff guibg=#2050d0							ctermfg=darkblue ctermbg=gray
-
-hi SpecialKey		guifg=cyan			ctermfg=darkcyan
-hi Directory		guifg=cyan			ctermfg=cyan
-hi Title			guifg=magenta gui=none ctermfg=magenta cterm=bold
-hi WarningMsg		guifg=red			ctermfg=red
-hi WildMenu			guifg=yellow guibg=black ctermfg=yellow ctermbg=black cterm=none term=none
-hi ModeMsg			guifg=#22cce2		ctermfg=lightblue
-hi MoreMsg			ctermfg=darkgreen	ctermfg=darkgreen
-hi Question			guifg=green gui=none ctermfg=green cterm=none
-hi NonText			guifg=#0030ff		ctermfg=darkblue
-
-hi StatusLine		guifg=blue guibg=darkgray gui=none		ctermfg=blue ctermbg=gray term=none cterm=none
-hi StatusLineNC		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
-hi VertSplit		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
-
-hi Folded			guifg=#808080 guibg=#0d3d6d			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi FoldColumn		guifg=#808080 guibg=#0d3d6d			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi LineNr			guifg=#808080			ctermfg=green cterm=none
-
-hi DiffAdd			guibg=darkblue	ctermbg=darkblue term=none cterm=none
-hi DiffChange		guibg=darkmagenta ctermbg=magenta cterm=none
-hi DiffDelete		ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText			cterm=bold ctermbg=red gui=bold guibg=Red
-
-hi Cursor			guifg=#000020 guibg=#ffaf38 ctermfg=bg ctermbg=brown
-hi lCursor			guifg=#ffffff guibg=#000000 ctermfg=bg ctermbg=darkgreen
-
-
-hi Comment			guifg=#80a0ff ctermfg=darkred
-hi Constant			ctermfg=magenta guifg=#ffa0a0 cterm=none
-hi Special			ctermfg=brown guifg=Orange cterm=none gui=none
-hi Identifier		ctermfg=cyan guifg=#40ffff cterm=none
-hi Statement		ctermfg=white cterm=none guifg=white gui=bold
-hi PreProc			ctermfg=magenta guifg=#999999 gui=none cterm=none
-hi type				ctermfg=darkgreen guifg=#60ff60 gui=none cterm=none
-hi Underlined		cterm=underline term=underline
-hi Ignore			guifg=bg ctermfg=bg
-
-
diff --git a/colors/blueshift.vim b/colors/blueshift.vim
deleted file mode 100755
index bfcf22a..0000000
--- a/colors/blueshift.vim
+++ /dev/null
@@ -1,86 +0,0 @@
-" Blueshift color scheme
-" by Jan Zwiener, mail: jan@zwiener.org
-" Based upon the pyte color scheme by Henning Hasemann
-"
-" 2010/11/16: Version 1.0
-"
-
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "blueshift"
-
-" Taglist colors
-hi MyTagListFileName    guifg=black   guibg=#c0d0e0
-hi MyTagListTagName     guifg=black   guibg=#ffbc29
-
-if version >= 700
-  hi CursorLine     guibg=#f6f6f6
-  hi CursorColumn   guibg=#f6f6f6
-  hi MatchParen     guifg=black     guibg=#dfdfdf
-
-  hi TabLine        guifg=black     guibg=#b0b8c0
-  hi TabLineFill    guifg=#9098a0
-  hi TabLineSel     guifg=black     guibg=#f0f0f0 gui=bold
-
-  hi Pmenu          guifg=white     guibg=#808080
-  hi PmenuSel       guifg=black     guibg=#ffbc29
-endif
-
-hi Title        guifg=#202020   gui=none
-hi Underlined   guifg=#202020   gui=underline
-
-hi Normal       guifg=black     guibg=white
-hi ModeMsg      guifg=black     guibg=white
-hi Cursor       guifg=#f0f0f0   guibg=#101010
-hi LineNr       guifg=#ffffff   guibg=#c0d0e0
-hi Visual       guifg=white     guibg=#5381bc
-hi WildMenu     guifg=black     guibg=#ffbc29
-hi IncSearch    guibg=black     guifg=#ffbc29
-hi Question     guifg=black     guibg=#ffbc29
-
-hi StatusLine   guifg=white     guibg=#8090a0 gui=bold
-hi StatusLineNC guifg=#708090   guibg=#ced5db gui=none
-hi VertSplit    guifg=#a0b0c0   guibg=#a0b0c0 gui=none
-
-hi NonText      guifg=#bebebe   guibg=#f2f2f2
-hi Comment      guifg=#008000   gui=italic
-hi Folded       guifg=#708090   guibg=#c0d0e0
-hi Folded       guifg=#708090   guibg=#c0d0e0
-hi FoldColumn   guifg=#708090   guibg=#c0d0e0
-
-hi Constant     guifg=black
-hi Number       guifg=black
-hi Float        guifg=black
-hi Boolean      guifg=#0048ff
-hi String       guifg=#4070a0   gui=none
-
-hi Statement    guifg=#0048ff   gui=none
-hi Type         guifg=#0048ff   gui=none
-hi Structure    guifg=#0048ff   gui=none
-hi Identifier   guifg=#0048ff   gui=none
-hi Function     guifg=#0048ff   gui=none
-hi Repeat       guifg=#0048ff   gui=bold
-hi Conditional  guifg=#0048ff   gui=bold
-hi Operator     guifg=black
-
-hi PreProc      guifg=#1060a0   gui=none
-hi Define       guifg=#1060a0   gui=bold
-hi Include      guifg=#1060a0   gui=none
-
-hi Error        guifg=red       guibg=white     gui=bold,underline
-hi Todo         guifg=white     guibg=#1060a0   gui=bold
-hi SpecialKey	guifg=#1060a0   guibg=white
-hi Special      guifg=black     guibg=white
-
-" Diff
-hi DiffChange   guifg=NONE      guibg=#e0e0e0   gui=bold
-hi DiffText     guifg=NONE      guibg=#f0c8c8   gui=bold
-hi DiffAdd      guifg=NONE      guibg=#c0e0d0   gui=bold
-hi DiffDelete   guifg=NONE      guibg=#f0e0b0   gui=bold
-
-
diff --git a/colors/bluez.vim b/colors/bluez.vim
deleted file mode 100755
index ce9394a..0000000
--- a/colors/bluez.vim
+++ /dev/null
@@ -1,145 +0,0 @@
-" Vim color file
-" Maintainer:   Shirk <shirk@gmx.net>
-" Last Change:  18 May 2006 - 0.1
-" URL: trinity.linuxdevel.net
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark     "or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="bluez"
-
-if exists("g:bluez_transbg")
-    hi Cursor       ctermfg=19 ctermbg=68
-    hi lCursor      ctermfg=19 ctermbg=69
-    hi Normal       ctermfg=47 ctermbg=none
-    hi Comment      ctermfg=37 ctermbg=none
-    hi Constant     ctermfg=68 ctermbg=none
-        hi String       ctermfg=61 ctermbg=none
-        hi Character    ctermfg=70 ctermbg=none
-        hi Number       ctermfg=71 ctermbg=none
-        hi Boolean      ctermfg=74 ctermbg=none
-        hi Float        ctermfg=75 ctermbg=none
-
-    hi Special      ctermfg=60 ctermbg=none
-        hi Tag              ctermfg=61 ctermbg=none
-        hi Delimiter        ctermfg=62 ctermbg=none
-        hi SpecialChar      ctermfg=63 ctermbg=none
-        hi SpecialComment   ctermfg=63 ctermbg=none
-        hi Debug            ctermfg=76 ctermbg=none cterm=underline
-        hi VimModeline      ctermfg=77 ctermbg=none
-
-    hi Identifier   ctermfg=53 ctermbg=none
-        hi Function ctermfg=54 ctermbg=none
-
-    hi Statement    ctermfg=23 ctermbg=none
-        hi Conditional      ctermfg=39 ctermbg=none
-        hi Repeat           ctermfg=39 ctermbg=none
-        hi Label            ctermfg=55 ctermbg=none
-        hi Operator         ctermfg=55 ctermbg=none
-        hi Keyword          ctermfg=51 ctermbg=none
-        hi Exception        ctermfg=49 ctermbg=none
-
-    hi PreProc      ctermfg=35 ctermbg=none
-        hi Include          ctermfg=51 ctermbg=none
-        hi Define           ctermfg=55 ctermbg=none
-        hi Macro            ctermfg=58 ctermbg=none
-        hi PreCondit        ctermfg=59 ctermbg=none
-
-    hi Type         ctermfg=46 ctermbg=none
-        hi StorageClass     ctermfg=47 ctermbg=none
-        hi Structure        ctermfg=62 ctermbg=none
-        hi Typedef          ctermfg=63 ctermbg=none
-
-    hi Underline    ctermfg=70 ctermbg=none cterm=underline
-    hi Ignore       ctermfg=18 ctermbg=none
-    hi Error        ctermfg=0 ctermbg=65
-    hi Todo         ctermfg=67 ctermbg=none
-
-    hi Pmenu        ctermfg=79 ctermbg=23
-    hi PmenuSel     ctermfg=79 ctermbg=19
-    hi PmenuSbar    ctermfg=38 ctermbg=17
-    hi PmenuThumb   ctermfg=23 ctermbg=76
-
-    hi Folded       ctermfg=48 ctermbg=none
-    hi FoldColumn   ctermfg=49 ctermbg=none
-
-    hi SpellLocal   ctermfg=31 ctermbg=22
-
-    hi WildMenu     ctermfg=79 ctermbg=23
-    hi IncSearch    ctermfg=0  ctermbg=35
-    hi Search       ctermfg=0  ctermbg=50
-    hi StatusLine   ctermfg=52 ctermbg=none cterm=bold
-    hi StatusLineNC ctermfg=52 ctermbg=none
-    hi VertSplit    ctermfg=52 ctermbg=none
-
-else
-    hi Cursor       ctermfg=19 ctermbg=68
-    hi lCursor      ctermfg=19 ctermbg=69
-    hi Normal       ctermfg=47 ctermbg=0
-    hi Comment      ctermfg=37 ctermbg=0
-    hi Constant     ctermfg=68 ctermbg=0
-        hi String       ctermfg=61 ctermbg=0
-        hi Character    ctermfg=70 ctermbg=0
-        hi Number       ctermfg=71 ctermbg=0
-        hi Boolean      ctermfg=74 ctermbg=0
-        hi Float        ctermfg=75 ctermbg=0
-
-    hi Special      ctermfg=60 ctermbg=0
-        hi Tag              ctermfg=61 ctermbg=0
-        hi Delimiter        ctermfg=62 ctermbg=0
-        hi SpecialChar      ctermfg=63 ctermbg=0
-        hi SpecialComment   ctermfg=63 ctermbg=0
-        hi Debug            ctermfg=76 ctermbg=0 cterm=underline
-        hi VimModeline      ctermfg=77 ctermbg=0
-
-    hi Identifier   ctermfg=53 ctermbg=0
-        hi Function ctermfg=54 ctermbg=0
-
-    hi Statement    ctermfg=23 ctermbg=0
-        hi Conditional      ctermfg=39 ctermbg=0
-        hi Repeat           ctermfg=39 ctermbg=0
-        hi Label            ctermfg=55 ctermbg=0
-        hi Operator         ctermfg=55 ctermbg=0
-        hi Keyword          ctermfg=51 ctermbg=0
-        hi Exception        ctermfg=49 ctermbg=0
-
-    hi PreProc      ctermfg=35 ctermbg=0
-        hi Include          ctermfg=51 ctermbg=0
-        hi Define           ctermfg=55 ctermbg=0
-        hi Macro            ctermfg=58 ctermbg=0
-        hi PreCondit        ctermfg=59 ctermbg=0
-
-    hi Type         ctermfg=46 ctermbg=0
-        hi StorageClass     ctermfg=47 ctermbg=0
-        hi Structure        ctermfg=62 ctermbg=0
-        hi Typedef          ctermfg=63 ctermbg=0
-
-    hi Underline    ctermfg=70 ctermbg=0 cterm=underline
-    hi Ignore       ctermfg=18 ctermbg=0
-    hi Error        ctermfg=0 ctermbg=65
-    hi Todo         ctermfg=67 ctermbg=0
-
-    hi Pmenu        ctermfg=79 ctermbg=23
-    hi PmenuSel     ctermfg=79 ctermbg=19
-    hi PmenuSbar    ctermfg=38 ctermbg=17
-    hi PmenuThumb   ctermfg=23 ctermbg=76
-
-    hi Folded       ctermfg=48 ctermbg=0
-    hi FoldColumn   ctermfg=49 ctermbg=0
-
-    hi SpellLocal   ctermfg=31 ctermbg=22
-
-    hi WildMenu     ctermfg=79 ctermbg=23
-    hi IncSearch    ctermfg=0  ctermbg=35
-    hi Search       ctermfg=0  ctermbg=50
-    hi StatusLine   ctermfg=52 ctermbg=0 cterm=bold
-    hi StatusLineNC ctermfg=52 ctermbg=0
-    hi VertSplit    ctermfg=52 ctermbg=0
-endif
diff --git a/colors/blugrine.vim b/colors/blugrine.vim
deleted file mode 100755
index 6ba6330..0000000
--- a/colors/blugrine.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" author Helder Correia < helder (dot) correia (at) netcabo (dot) pt>
-" version 2004.0
-" based on bluegreen colorscheme by Joao Estevao
-" feel free to modify / redistribute this file
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="blugrine"
-
-hi Normal	guifg=White guibg=#000000
-
-" highlight groups
-hi Cursor	guibg=#D74141 guifg=#e3e3e3
-hi VertSplit guibg=#C0FFFF guifg=#075554 gui=none
-hi Folded		guibg=#FFC0C0 guifg=black
-hi FoldColumn	guibg=#800080 guifg=tan
-hi ModeMsg guifg=#404040 guibg=#C0C0C0
-hi MoreMsg guifg=darkturquoise guibg=#188F90
-hi NonText guibg=#334C75 guifg=#9FADC5
-hi Question	guifg=#F4BB7E
-hi Search guibg=fg guifg=bg 
-hi SpecialKey	guifg=#BF9261
-hi StatusLine	guibg=#004443 guifg=#c0ffff gui=none
-hi StatusLineNC	guibg=#067C7B guifg=#004443 gui=bold
-hi Title	guifg=#8DB8C3
-hi Visual gui=bold guifg=black guibg=#C0FFC0
-hi WarningMsg	guifg=#F60000 gui=underline
-
-" syntax highlighting groups
-hi Comment guifg=#DABEA2
-hi Constant guifg=#72A5E4 gui=bold
-hi Identifier	guifg=#ADCBF1
-hi Statement guifg=#7E75B5
-hi PreProc guifg=#14F07C
-hi Type	guifg=#A9EE8A
-hi Special guifg=#EEBABA
-hi Ignore	guifg=grey60
-hi Todo	guibg=#9C8C84 guifg=#244C0A
-
diff --git a/colors/bmichaelsen.vim b/colors/bmichaelsen.vim
deleted file mode 100755
index b63f65c..0000000
--- a/colors/bmichaelsen.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Bj�rn Michaelsen <bmichaelsen@gmx.de> 
-" based on: Zellner maintained by Ron Aaron <ronaharon@yahoo.com>
-" Last Change:	2003 Sep 09 
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "bmichaelsen"
-
-hi Comment term=bold ctermfg=Red guifg=Red
-hi Normal guifg=black guibg=#dee2ee
-hi Constant term=underline ctermfg=Magenta guifg=Magenta
-hi Special term=bold ctermfg=Magenta guifg=Magenta
-hi Identifier term=underline ctermfg=Blue guifg=Blue
-hi Statement term=bold ctermfg=DarkRed gui=NONE guifg=Brown
-hi PreProc term=underline ctermfg=Magenta guifg=Purple
-hi Type term=underline ctermfg=Blue gui=NONE guifg=Blue
-hi Visual term=reverse ctermfg=Yellow ctermbg=Red gui=NONE guifg=Black guibg=#5a5d6a
-hi Search term=reverse ctermfg=Black ctermbg=Cyan gui=NONE guifg=Black guibg=Cyan
-hi Tag term=bold ctermfg=DarkGreen guifg=DarkGreen
-hi Error term=reverse ctermfg=15 ctermbg=9 guibg=Red guifg=White
-hi Todo term=standout ctermbg=Yellow ctermfg=Black guifg=Blue guibg=#5a5d6a
-hi  StatusLine term=bold,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=NONE guifg=Black guibg=#a4b2c5
-hi! link MoreMsg Comment
-hi! link ErrorMsg Visual
-hi! link WarningMsg ErrorMsg
-hi! link Question Comment
-hi link String	Constant
-hi link Character	Constant
-hi link Number	Constant
-hi link Boolean	Constant
-hi link Float		Number
-hi link Function	Identifier
-hi link Conditional	Statement
-hi link Repeat	Statement
-hi link Label		Statement
-hi link Operator	Statement
-hi link Keyword	Statement
-hi link Exception	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 SpecialChar	Special
-hi link Delimiter	Special
-hi link SpecialComment Special
-hi link Debug		Special
diff --git a/colors/bocau.vim b/colors/bocau.vim
deleted file mode 100755
index 3506258..0000000
--- a/colors/bocau.vim
+++ /dev/null
@@ -1,187 +0,0 @@
-" Maintainer:	Tien Le (tienlex@gmail.com)
-" Version:      1.0
-" Last Change:	Dec 17 2010
-" Based on the Vividchalk theme of Tim Pope and Mustang theme
-
-if has("gui_running")
-    set background=dark
-endif
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "bocau"
-
-" First two functions adapted from inkpot.vim
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! s:M(a)
-    return strpart("0245", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! s:X(a)
-    if &t_Co == 88
-        return a:a
-    else
-        if a:a == 8
-            return 237
-        elseif a:a < 16
-            return a:a
-        elseif a:a > 79
-            return 232 + (3 * (a:a - 80))
-        else
-            let l:b = a:a - 16
-            let l:x = l:b % 4
-            let l:y = (l:b / 4) % 4
-            let l:z = (l:b / 16)
-            return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z))
-        endif
-    endif
-endfun
-
-function! E2T(a)
-    return s:X(a:a)
-endfunction
-
-function! s:choose(mediocre,good)
-    if &t_Co != 88 && &t_Co != 256
-        return a:mediocre
-    else
-        return s:X(a:good)
-    endif
-endfunction
-
-function! s:hifg(group,guifg,first,second,...)
-    if a:0 && &t_Co == 256
-        let ctermfg = a:1
-    else
-        let ctermfg = s:choose(a:first,a:second)
-    endif
-    exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg
-endfunction
-
-function! s:hibg(group,guibg,first,second)
-    let ctermbg = s:choose(a:first,a:second)
-    exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg
-endfunction
-
-hi link railsMethod         PreProc
-hi link rubyDefine          Keyword
-hi link rubySymbol          Constant
-hi link rubyAccess          rubyMethod
-hi link rubyAttribute       rubyMethod
-hi link rubyEval            rubyMethod
-hi link rubyException       rubyMethod
-hi link rubyInclude         rubyMethod
-hi link rubyStringDelimiter rubyString
-hi link rubyRegexp          Regexp
-hi link rubyRegexpDelimiter rubyRegexp
-"hi link rubyConstant        Variable
-"hi link rubyGlobalVariable  Variable
-"hi link rubyClassVariable   Variable
-"hi link rubyInstanceVariable Variable
-hi link javascriptRegexpString  Regexp
-hi link javascriptNumber        Number
-hi link javascriptNull          Constant
-highlight link diffAdded        String
-highlight link diffRemoved      Statement
-highlight link diffLine         PreProc
-highlight link diffSubname      Comment
-
-call s:hifg("Normal","#EEEEEE","White",87)
-if &background == "light" || has("gui_running")
-    hi Normal guibg=Black ctermbg=Black
-else
-    hi Normal guibg=Black ctermbg=NONE
-endif
-highlight StatusLine    guifg=Black   guibg=#aabbee gui=bold ctermfg=Black ctermbg=White  cterm=bold
-highlight StatusLineNC  guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey   cterm=none
-"if &t_Co == 256
-    "highlight StatusLine ctermbg=117
-"else
-    "highlight StatusLine ctermbg=43
-"endif
-
-highlight Ignore        ctermfg=Black
-highlight WildMenu      guifg=Black   guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold
-highlight Cursor        guifg=Black guibg=White ctermfg=Black ctermbg=White
-highlight CursorLine    guibg=#333333 guifg=NONE
-highlight CursorColumn  guibg=#333333 guifg=NONE
-highlight NonText       guifg=#404040 ctermfg=8
-highlight SpecialKey    guifg=#404040 ctermfg=8
-highlight Directory     none
-high link Directory     Identifier
-highlight ErrorMsg      guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE
-highlight Search        guifg=NONE ctermfg=NONE gui=none cterm=none
-call s:hibg("Search"    ,"Yellow","DarkBlue",81)
-highlight IncSearch     guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight MoreMsg       guifg=#00AA00 ctermfg=Green
-highlight LineNr        guifg=#808080 ctermfg=White
-call s:hibg("LineNr"    ,"#101010","DarkBlue",80)
-highlight Question      none
-high link Question      MoreMsg
-highlight Title         guifg=White ctermfg=Magenta
-highlight VisualNOS     gui=none cterm=none
-call s:hibg("Visual"    ,"#444444","LightBlue",83)
-call s:hibg("VisualNOS" ,"#222222","DarkBlue",81)
-call s:hibg("MatchParen","#1100AA","DarkBlue",18)
-highlight WarningMsg    guifg=Red ctermfg=Red
-highlight Error         ctermbg=DarkRed
-highlight SpellBad      ctermbg=DarkRed
-" FIXME: Comments
-highlight SpellRare     ctermbg=DarkMagenta
-highlight SpellCap      ctermbg=DarkBlue
-highlight SpellLocal    ctermbg=DarkCyan
-
-call s:hibg("Folded"    ,"#110077","DarkBlue",17)
-call s:hifg("Folded"    ,"#aaddee","LightCyan",63)
-highlight FoldColumn    none
-high link FoldColumn    Folded
-highlight DiffAdd       ctermbg=4 guibg=DarkBlue
-highlight DiffChange    ctermbg=5 guibg=DarkMagenta
-highlight DiffDelete    ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
-highlight DiffText      ctermbg=DarkRed
-highlight DiffText      cterm=bold ctermbg=9 gui=bold guibg=Red
-
-highlight Pmenu         guifg=White ctermfg=White
-highlight PmenuSel      guifg=White ctermfg=White
-call s:hibg("Pmenu"     ,"#000099","Blue",18)
-call s:hibg("PmenuSel"  ,"#5555ff","DarkCyan",39)
-highlight PmenuSbar     guibg=Grey ctermbg=Grey
-highlight PmenuThumb    guibg=White ctermbg=White
-highlight TabLine       gui=underline cterm=underline
-call s:hifg("TabLine"   ,"#bbbbbb","LightGrey",85)
-call s:hibg("TabLine"   ,"#333333","DarkGrey",80)
-highlight TabLineSel    guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight TabLineFill   gui=underline cterm=underline
-call s:hifg("TabLineFill","#bbbbbb","LightGrey",85)
-call s:hibg("TabLineFill","#808080","Grey",83)
-
-hi Type gui=none
-hi Statement gui=none
-if !has("gui_mac")
-    " Mac GUI degrades italics to ugly underlining.
-    hi Comment gui=italic
-    hi railsUserClass  gui=italic
-    hi railsUserMethod gui=italic
-endif
-hi Identifier cterm=none
-" Commented numbers at the end are *old* 256 color values
-"highlight PreProc       guifg=#EDF8F9
-call s:hifg("Comment"        ,"#aaaaaa","Grey",34) " 92
-" 26 instead?
-call s:hifg("Constant"       ,"#AAAA77","DarkCyan",21) " 30
-call s:hifg("rubyNumber"     ,"#CCFF33","Yellow",60) " 190
-call s:hifg("String"         ,"#b1d631","LightGreen",44,82) " 82
-call s:hifg("Identifier"     ,"#33CCFF","Yellow",72) " 220
-call s:hifg("Statement"      ,"#ff7700","Brown",68) " 202
-call s:hifg("PreProc"        ,"#AAFFFF","LightCyan",47) " 213
-call s:hifg("railsUserMethod","#AACCFF","LightCyan",27)
-call s:hifg("Type"           ,"#ffaa00","Grey",57) " 101
-call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101
-call s:hifg("Special"        ,"#33AA00","DarkGreen",24) " 7
-call s:hifg("Regexp"         ,"#44B4CC","DarkCyan",21) " 74
-call s:hifg("rubyMethod"     ,"#DDE93D","Yellow",77) " 191
-"highlight railsMethod   guifg=#EE1122 ctermfg=1
diff --git a/colors/bog.vim b/colors/bog.vim
deleted file mode 100755
index 542262d..0000000
--- a/colors/bog.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" Vim color file
-" Maintainer:   [smeagol] <webmaster@quantumz.net>
-" Last Change:  
-" URL:		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-" your pick:
-set background=light	" or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="bog"
-
-hi Normal guifg=#3a3a3d guibg=white ctermfg=darkgrey ctermbg=white
-
-" OR
-
-" highlight clear Normal
-" set background&
-" highlight clear
-" if &background == "light"
-"   highlight Error ...
-"   ...
-" else
-"   highlight Error ...
-"   ...
-" endif
-
-" A good way to see what your colorscheme does is to follow this procedure:
-" :w 
-" :so % 
-"
-" Then to see what the current setting is use the highlight command.  
-" For example,
-" 	:hi Cursor
-" gives
-"	Cursor         xxx guifg=bg guibg=fg 
- 	
-" Uncomment and complete the commands you want to change from the default.
-
-hi Cursor guifg=#04ae6c	guibg=#0056a0 ctermfg=darkgreen ctermbg=darkblue	
-"hi CursorIM	
-hi Directory guifg=green ctermfg=green	
-"hi DiffAdd		
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-hi ErrorMsg guibg=#004a8a guifg=white ctermfg=white ctermbg=darkblue	
-hi VertSplit guibg=#04ae6c guifg=#0056a0	
-hi Folded guibg=#0a62c4 guifg=#60abff ctermfg=lightgrey ctermbg=blue		
-hi FoldColumn guibg=#0a62c4 guifg=#60abff ctermfg=lightgrey ctermbg=blue	
-hi IncSearch guifg=white guibg=#ffdc34 ctermfg=white ctermbg=lightred gui=underline	
-hi LineNr guifg=#3669e8 guibg=white ctermfg=lightblue ctermbg=white		
-hi ModeMsg guifg=orange guibg=white ctermfg=lightred ctermbg=white		
-hi MoreMsg guifg=orange guibg=white ctermfg=lightred ctermbg=white		
-hi NonText gui=bold		
-hi Question guifg=white guibg=orange ctermfg=white ctermbg=lightred	
-hi Search guifg=white guibg=#ffdc34 ctermfg=white ctermbg=lightred gui=underline		
-"hi SpecialKey	
-hi StatusLine guifg=#04ae6c guibg=white ctermfg=darkgreen ctermbg=white
-hi StatusLineNC guifg=#04ae6c guibg=white ctermfg=darkgreen ctermbg=white	
-hi Title guifg=#02233f gui=bold	
-hi Visual guifg=darkblue guibg=white ctermfg=darkblue ctermbg=white		
-"hi VisualNOS	
-hi WarningMsg guifg=white guibg=orange ctermfg=white ctermbg=lightblue	
-hi WildMenu guifg=#75dc34 guibg=white ctermfg=lightgreen ctermbg=white	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment guifg=orange guibg=white ctermbg=white ctermfg=blue
-hi Constant  guifg=#5b8f8d guibg=white ctermfg=grey ctermbg=white	
-hi Identifier guifg=#aad2ff guibg=white ctermfg=grey ctermbg=white	
-hi Statement guifg=#808283 guibg=white ctermfg=lightgrey ctermbg=white	
-hi PreProc guifg=#023a6a gui=bold guibg=white ctermfg=darkblue ctermbg=white                                                                     
-hi Type guifg=#0e9152 guibg=white ctermfg=darkgreen ctermbg=white		
-hi Special guifg=white guibg=skyblue ctermfg=white ctermbg=blue	
-hi Underlined guifg=#00d0e8 ctermbg=blue	
-hi Ignore guifg=black guibg=white ctermfg=black ctermbg=white		
-"hi Error		
-hi Todo guibg=lightblue guifg=white ctermbg=lightblue ctermfg=white		
diff --git a/colors/borland.vim b/colors/borland.vim
deleted file mode 100755
index c39c101..0000000
--- a/colors/borland.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Maintainer:   Yegappan Lakshmanan
-" Last Change:  2001 Sep 9
-
-" Color settings similar to that used in Borland IDE's.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="borland"
-
-hi Normal       term=NONE cterm=NONE ctermfg=Yellow ctermbg=DarkBlue
-hi Normal       gui=NONE guifg=Yellow guibg=DarkBlue
-hi NonText      term=NONE cterm=NONE ctermfg=White ctermbg=DarkBlue
-hi NonText      gui=NONE guifg=White guibg=DarkBlue
-
-hi Statement    term=NONE cterm=NONE ctermfg=White  ctermbg=DarkBlue
-hi Statement    gui=NONE guifg=White guibg=DarkBlue
-hi Special      term=NONE cterm=NONE ctermfg=Cyan ctermbg=DarkBlue
-hi Special      gui=NONE guifg=Cyan guibg=DarkBlue
-hi Constant     term=NONE cterm=NONE ctermfg=Magenta ctermbg=DarkBlue
-hi Constant     gui=NONE guifg=Magenta guibg=DarkBlue
-hi Comment      term=NONE cterm=NONE ctermfg=Gray ctermbg=DarkBlue
-hi Comment      gui=NONE guifg=Gray guibg=DarkBlue
-hi Preproc      term=NONE cterm=NONE ctermfg=Green ctermbg=DarkBlue
-hi Preproc      gui=NONE guifg=Green guibg=DarkBlue
-hi Type         term=NONE cterm=NONE ctermfg=White ctermbg=DarkBlue
-hi Type         gui=NONE guifg=White guibg=DarkBlue
-hi Identifier   term=NONE cterm=NONE ctermfg=White ctermbg=DarkBlue
-hi Identifier   gui=NONE guifg=White guibg=DarkBlue
-
-hi StatusLine   term=bold cterm=bold ctermfg=Black ctermbg=White
-hi StatusLine   gui=bold guifg=Black guibg=White
-
-hi StatusLineNC term=NONE cterm=NONE ctermfg=Black ctermbg=White
-hi StatusLineNC gui=NONE guifg=Black guibg=White
-
-hi Visual       term=NONE cterm=NONE ctermfg=Black ctermbg=DarkCyan
-hi Visual       gui=NONE guifg=Black guibg=DarkCyan
-
-hi Search       term=NONE cterm=NONE ctermbg=Gray
-hi Search       gui=NONE guibg=Gray
-
-hi VertSplit    term=NONE cterm=NONE ctermfg=Black ctermbg=White
-hi VertSplit    gui=NONE guifg=Black guibg=White
-
-hi Directory    term=NONE cterm=NONE ctermfg=Green ctermbg=DarkBlue
-hi Directory    gui=NONE guifg=Green guibg=DarkBlue
-
-hi WarningMsg   term=standout cterm=NONE ctermfg=Red ctermbg=DarkBlue
-hi WarningMsg   gui=standout guifg=Red guibg=DarkBlue
-
-hi Error        term=NONE cterm=NONE ctermfg=White ctermbg=Red
-hi Error        gui=NONE guifg=White guibg=Red
-
-hi Cursor       ctermfg=Black ctermbg=Yellow
-hi Cursor       guifg=Black guibg=Yellow
-
diff --git a/colors/breeze.vim b/colors/breeze.vim
deleted file mode 100755
index 21cf417..0000000
--- a/colors/breeze.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/30 Wed 00:08.
-"     version: 1.0
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "breeze"
-
-hi Normal       guifg=#ffffff guibg=#005c70
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#60ffff guibg=#6060ff
-hi Search       gui=NONE guifg=#ffffff guibg=#6060ff
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi WarningMsg   gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi ModeMsg      gui=NONE guifg=#60ffff guibg=NONE
-hi MoreMsg      gui=NONE guifg=#ffc0ff guibg=NONE
-hi Question     gui=NONE guifg=#ffff60 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#d0d0e0
-hi StatusLineNC gui=NONE guifg=#606080 guibg=#d0d0e0
-hi VertSplit    gui=NONE guifg=#606080 guibg=#d0d0e0
-hi WildMenu     gui=NONE guifg=#000000 guibg=#00c8f0
-
-" Diff
-hi DiffText     gui=UNDERLINE guifg=#ffff00 guibg=#000000
-hi DiffChange   gui=NONE guifg=#ffffff guibg=#000000
-hi DiffDelete   gui=NONE guifg=#60ff60 guibg=#000000
-hi DiffAdd      gui=NONE guifg=#60ff60 guibg=#000000
-
-" Cursor
-hi Cursor       gui=NONE guifg=#ffffff guibg=#d86020
-hi lCursor      gui=NONE guifg=#ffffff guibg=#e000b0
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#e000b0
-
-" Fold
-hi Folded       gui=NONE guifg=#ffffff guibg=#0088c0
-" hi Folded       gui=NONE guifg=#ffffff guibg=#2080d0
-hi FoldColumn   gui=NONE guifg=#60e0e0 guibg=#006c7f
-
-" Other
-hi Directory    gui=NONE guifg=#00e0ff guibg=NONE
-hi LineNr       gui=NONE guifg=#60a8bc guibg=NONE
-hi NonText      gui=BOLD guifg=#00c0c0 guibg=#006276
-hi SpecialKey   gui=NONE guifg=#e0a0ff guibg=NONE
-hi Title        gui=BOLD guifg=#ffffff guibg=NONE
-hi Visual       gui=NONE guifg=#ffffff guibg=#6060d0
-" hi VisualNOS  gui=NONE guifg=#ffffff guibg=#6060d0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#c8d0d0 guibg=NONE
-hi Constant     gui=NONE guifg=#60ffff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi Identifier   gui=NONE guifg=#cacaff guibg=NONE
-hi Ignore       gui=NONE guifg=#006074 guibg=NONE
-hi PreProc      gui=NONE guifg=#ffc0ff guibg=NONE
-hi Special      gui=NONE guifg=#ffd074 guibg=NONE
-hi Statement    gui=NONE guifg=#ffff80 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#ffb0b0 guibg=NONE
-hi Type         gui=NONE guifg=#80ffa0 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=#ffffff guibg=NONE
diff --git a/colors/brookstream.vim b/colors/brookstream.vim
deleted file mode 100755
index ee907c6..0000000
--- a/colors/brookstream.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-"--------------------------------------------------------------------
-" Name Of File: brookstream.vim.
-" Description: Gvim colorscheme, works best with version 6.1 GUI .
-" Maintainer: Peter B�ckstr�m.
-" Creator: Peter B�ckstr�m.
-" URL: http://www.brookstream.org (Swedish).
-" Credits: Inspiration from the darkdot scheme.
-" Last Change: Friday, April 13, 2003.
-" Installation: Drop this file in your $VIMRUNTIME/colors/ directory.
-"--------------------------------------------------------------------
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="brookstream"
-
-"--------------------------------------------------------------------
-
-hi Normal					gui=none	guibg=#000000	guifg=#bbbbbb
-hi Cursor										guibg=#44ff44 guifg=#000000
-hi Directory															guifg=#44ffff
-hi DiffAdd									guibg=#080808	guifg=#ffff00
-hi DiffDelete								guibg=#080808	guifg=#444444
-hi DiffChange								guibg=#080808	guifg=#ffffff
-hi DiffText									guibg=#080808	guifg=#bb0000
-hi ErrorMsg									guibg=#880000	guifg=#ffffff
-hi Folded																	guifg=#000088
-hi IncSearch								guibg=#000000	guifg=#bbcccc
-hi LineNr										guibg=#050505	guifg=#4682b4
-hi ModeMsg																guifg=#ffffff
-hi MoreMsg													 			guifg=#44ff44
-hi NonText																guifg=#4444ff
-hi Question																guifg=#ffff00
-hi SpecialKey															guifg=#4444ff
-hi StatusLine			gui=none	guibg=#2f4f4f	guifg=#ffffff
-hi StatusLineNC		gui=none	guibg=#bbbbbb	guifg=#000000		
-hi Title																	guifg=#ffffff
-hi Visual					gui=none	guibg=#bbbbbb	guifg=#000000
-hi WarningMsg								guifg=#ffff00
-
-" syntax highlighting groups ----------------------------------------
-
-hi Comment									guifg=#696969
-hi Constant									guifg=#00aaaa
-hi Identifier								guifg=#00e5ee
-hi Statement 								guifg=#00ffff
-hi PreProc									guifg=#8470ff
-hi Type											guifg=#ffffff
-hi Special		gui=none			guifg=#87cefa
-hi Underlined	gui=bold		  guifg=#4444ff
-hi Ignore		 								guifg=#444444
-hi Error			guibg=#000000	guifg=#bb0000
-hi Todo				guibg=#aa0006	guifg=#fff300
-hi Operator 	gui=none 			guifg=#00bfff
-hi Function 	 			        guifg=#1e90ff
-hi String 		gui=None 			guifg=#4682b4
-hi Boolean									guifg=#9bcd9b
-
-"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
-
-"- end of colorscheme -----------------------------------------------	
diff --git a/colors/brown.vim b/colors/brown.vim
deleted file mode 100755
index aecfe4e..0000000
--- a/colors/brown.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-hi comment      guifg=#fef8ff ctermfg=red
-hi constant     guifg=#aa712f ctermfg=white
-hi cursor       guibg=#5e3807 guifg=#deb887
-hi diffadd                    ctermbg=green   ctermfg=black
-hi diffchange                 ctermbg=green   ctermfg=white
-hi diffdelete                 ctermbg=none    ctermfg=darkyellow
-hi difftext                   ctermbg=black   ctermfg=green
-hi directory    guifg=#3e1807 ctermfg=green
-hi error        guibg=#cc3807 guifg=#deb887
-hi errormsg     guifg=#cc3807 guibg=#f9d7a6
-hi identifier   guifg=#5e3807 ctermfg=green
-hi incsearch    guifg=#f9d7a6 guibg=#8e6837
-hi modemsg      guifg=#793807 ctermbg=none    ctermfg=cyan gui=none
-hi moremsg      guifg=#793807 gui=none
-hi nontext      guifg=#ffffff ctermfg=darkgrey
-hi normal       guibg=#deb887 guifg=#846037
-hi preproc      guifg=#7e6f27 ctermfg=white
-hi question     guifg=#793807 gui=none
-hi scrollbar    guibg=#deb887 guifg=#ae8857
-hi search       guifg=#f9d7a6 ctermbg=cyan ctermfg=yellow guibg=#8e6837
-hi special      guifg=#000000 ctermfg=yellow
-hi specialkey   guifg=#ffffff ctermfg=white
-hi statement    guifg=#7e5827 ctermfg=cyan
-hi statusline   guibg=#fee8b7 ctermbg=black ctermfg=darkgreen guifg=#793807 gui=none
-hi statuslinenc guibg=#ae8857 ctermbg=black ctermfg=darkcyan guifg=#deb887 gui=none
-hi title        guifg=#793807 ctermfg=darkgreen gui=none
-hi todo         guibg=#995827 guifg=#fed8a7
-hi type         guifg=#7e5827 ctermfg=yellow gui=none
-hi vertsplit    guibg=#ae8857 ctermbg=green ctermfg=black guifg=#ae8857 gui=none
-hi visual       guifg=#f9d7a6 guibg=#8e6837 ctermbg=black ctermfg=darkcyan
-hi warningmsg   guifg=#cc3807
-hi wildmenu     guifg=#f9d7a6 guibg=#8e6837
diff --git a/colors/bubblegum.vim b/colors/bubblegum.vim
old mode 100755
new mode 100644
diff --git a/colors/busierbee.vim b/colors/busierbee.vim
deleted file mode 100755
index 6e175f9..0000000
--- a/colors/busierbee.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Maintainer:	Stuart Radnidge
-" Version:      1.0.0
-" Last Change:	August 1st, 2010
-" Credits:      This is a modification of the BusyBee.vim color scheme by Patrick J. Anderson.
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "busierbee"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine    ctermbg=234
-  hi CursorColumn  ctermbg=234
-  hi MatchParen    ctermfg=157 ctermbg=237 cterm=bold
-  hi Pmenu 		   ctermbg=238
-  hi PmenuSel 	   ctermfg=0 ctermbg=148
-endif
-
-" General colors
-hi Cursor 		   ctermbg=241
-hi Normal 		   ctermfg=253 ctermbg=234
-hi NonText 		   ctermfg=244 ctermbg=235
-hi LineNr 		   ctermfg=244 ctermbg=232
-hi StatusLine 	   ctermfg=253 ctermbg=238
-hi StatusLineNC    ctermfg=246 ctermbg=238
-hi VertSplit 	   ctermfg=238 ctermbg=238
-hi Folded 		   ctermbg=4 ctermfg=248
-hi Title		   ctermfg=254 cterm=bold
-hi Visual		   ctermfg=254 ctermbg=4
-hi SpecialKey	   ctermfg=244 ctermbg=236
-
-" Syntax highlighting
-hi Comment 		   ctermfg=244
-hi Todo 		   ctermfg=245
-hi Boolean         ctermfg=220
-hi String 		   ctermfg=149
-hi Identifier 	   ctermfg=148
-hi Function 	   ctermfg=176
-hi Type 		   ctermfg=103
-hi Statement 	   ctermfg=103
-hi Keyword		   ctermfg=208
-hi Constant 	   ctermfg=208
-hi Number		   ctermfg=208
-hi Special		   ctermfg=208
-hi PreProc 		   ctermfg=230
-hi Todo            ctermfg=200
-
-" Code-specific colors
-hi pythonImport    ctermfg=38
-hi pythonException ctermfg=200
-hi pythonOperator  ctermfg=103
-hi pythonBuiltinFunction ctermfg=200
-hi pythonExClass   ctermfg=200
diff --git a/colors/busybee.vim b/colors/busybee.vim
deleted file mode 100755
index 57cbdc9..0000000
--- a/colors/busybee.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Maintainer:	Patrick J. Anderson
-" Version:      1.0.1
-" Last Change:	February 23, 2009
-" Credits:      This is a modification of Mustang.vim color scheme
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "busybee"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine    guibg=#202020 ctermbg=234
-  hi CursorColumn  guibg=#202020 ctermbg=234
-  hi MatchParen    guifg=#d0ffc0 guibg=#202020 gui=bold ctermfg=157 ctermbg=237 cterm=bold
-  hi Pmenu 		   guifg=#ffffff guibg=#202020 ctermfg=255 ctermbg=238
-  hi PmenuSel 	   guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148
-endif
-
-" General colors
-hi Cursor 		   guifg=NONE    guibg=#626262 gui=none ctermbg=241
-hi Normal 		   guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234
-hi NonText 		   guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=235
-hi LineNr 		   guifg=#303030 guibg=#202020 gui=none ctermfg=244 ctermbg=232
-hi StatusLine 	   guifg=#d3d3d5 guibg=#303030 gui=none ctermfg=253 ctermbg=238
-hi StatusLineNC    guifg=#939395 guibg=#303030 gui=none ctermfg=246 ctermbg=238
-hi VertSplit 	   guifg=#444444 guibg=#303030 gui=none ctermfg=238 ctermbg=238
-hi Folded 		   guibg=#384048 guifg=#a0a8b0 gui=none ctermbg=4 ctermfg=248
-hi Title		   guifg=#f6f3e8 guibg=NONE	gui=bold ctermfg=254 cterm=bold
-hi Visual		   guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4
-hi SpecialKey	   guifg=#808080 guibg=#343434 gui=none ctermfg=244 ctermbg=236
-
-" Syntax highlighting
-hi Comment 		   guifg=#3f3f3f gui=italic ctermfg=244
-hi Todo 		   guifg=#8f8f8f gui=none ctermfg=245
-hi Boolean         guifg=#b1d631 gui=none ctermfg=148
-hi String 		   guifg=#606060 gui=none ctermfg=148
-hi Identifier 	   guifg=#b1d631 gui=none ctermfg=148
-hi Function 	   guifg=#ffff00 gui=none ctermfg=255
-hi Type 		   guifg=#7e8aa2 gui=none ctermfg=103
-hi Statement 	   guifg=#7e8aa2 gui=none ctermfg=103
-hi Keyword		   guifg=#ff9800 gui=none ctermfg=208
-hi Constant 	   guifg=#ff9800 gui=none  ctermfg=208
-hi Number		   guifg=#ff9800 gui=none ctermfg=208
-hi Special		   guifg=#ff9800 gui=none ctermfg=208
-hi PreProc 		   guifg=#faf4c6 gui=none ctermfg=230
-hi Todo            guifg=#ff9f00 guibg=#202020 gui=none
-
-" Code-specific colors
-hi pythonImport    guifg=#009000 gui=none ctermfg=255
-hi pythonException guifg=#f00000 gui=none ctermfg=200
-hi pythonOperator  guifg=#7e8aa2 gui=none ctermfg=103
-hi pythonBuiltinFunction guifg=#009000 gui=none ctermfg=200
-hi pythonExClass   guifg=#009000 gui=none ctermfg=200
-
diff --git a/colors/buttercream.vim b/colors/buttercream.vim
deleted file mode 100755
index 58055fd..0000000
--- a/colors/buttercream.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Vim color file
-" vim: tw=0 ts=8 sw=4
-" Scriptname:	buttercream
-" Maintainer:	H�kan Wikstr�m <hakan@prinsig.se>
-" Version:	1.1
-" Last Change:	20060413
-" As of now only gui is supported
-" Based on the theme fog theme by Thomas R. Kimpton <tomk@emcity.net>
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "buttercream"
-
-"  Highlight		Foreground		Background			Extras
-
-hi Normal		guifg=#213a58		guibg=#ffffde
-hi NonText		guifg=LightBlue		guibg=#eee9bf			gui=bold
-hi Comment		guifg=#2f8e99
-hi Constant		guifg=#7070a0
-hi Statement		guifg=DarkGreen						gui=bold
-hi identifier		guifg=DarkGreen
-hi preproc		guifg=#408040
-hi type			guifg=DarkBlue
-hi label		guifg=#c06000
-hi operator		guifg=DarkGreen						gui=bold
-hi StorageClass		guifg=#a02060						gui=bold
-hi Number		guifg=Blue
-hi Special		guifg=#aa8822
-hi Cursor		guifg=LightGrey		guibg=#880088
-hi lCursor		guifg=Black		guibg=Cyan
-hi ErrorMsg		guifg=White		guibg=DarkRed
-hi DiffText					guibg=DarkRed			gui=bold
-hi Directory		guifg=DarkGrey						gui=underline
-hi LineNr		guifg=#ccaa22
-hi MoreMsg		guifg=SeaGreen						gui=bold
-hi Question		guifg=DarkGreen						gui=bold
-hi Search		guifg=Black		guibg=#887722
-hi SpecialKey		guifg=Blue
-hi SpecialChar		guifg=DarkGrey						gui=bold
-hi Title		guifg=DarkMagenta					gui=underline
-hi WarningMsg		guifg=DarkBlue		guibg=#9999cc
-hi WildMenu		guifg=Black		guibg=Yellow			gui=underline
-hi Folded		guifg=DarkBlue		guibg=LightGrey
-hi FoldColumn		guifg=DarkBLue		guibg=Grey
-hi DiffAdd					guibg=DarkBlue
-hi DiffChange					guibg=DarkMagenta
-hi DiffDelete		guifg=Blue		guibg=DarkCyan			gui=bold
-hi Ignore		guifg=grey90
-hi IncSearch									gui=reverse
-hi ModeMsg									gui=bold
-hi StatusLine									gui=reverse,bold
-hi StatusLineNC									gui=reverse
-hi VertSplit									gui=reverse
-hi Visual		guifg=LightGrey						gui=reverse
-hi VisualNOS									gui=underline,bold
-hi Todo						guibg=#ccaa22			gui=bold,underline
diff --git a/colors/bvemu.vim b/colors/bvemu.vim
deleted file mode 100755
index 9a3ace2..0000000
--- a/colors/bvemu.vim
+++ /dev/null
@@ -1,367 +0,0 @@
-" Vim color file
-" Maintainer:   Subramanyam <balu.vemu@gmail.com>
-" Version: 1.0
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name="bvemu"
-
-" Base color
-" ----------
-hi Normal           guifg=#949F92           guibg=#202020
-hi Normal           ctermfg=253             ctermbg=235
-
-" Comment Group
-" -------------
-" any comment
-hi Comment          guifg=#887C6B                                 gui=none
-hi Comment          ctermfg=240                                     cterm=none
-
-" Blue based
-" Constant Group
-" --------------
-" any constant
-hi Constant         guifg=#8CD0D3                                   gui=none
-hi Constant         ctermfg=116                                     cterm=none
-
-" strings
-hi String           guifg=#ADADAD                                   gui=none
-hi String           ctermfg=110                                     cterm=none
-
-" character constant
-hi Character        guifg=#8B0000                                   gui=none
-hi Character        ctermfg=110                                     cterm=none
-
-" numbers decimal/hex
-hi Number           guifg=#A3ABB7                                   gui=none
-hi Number           ctermfg=116                                     cterm=none
-
-" true, false
-" could actually test this
-hi Boolean          guifg=#FF85A0                                   gui=none
-hi Boolean          ctermfg=116                                     cterm=none
-
-" float
-hi Float            guifg=#B94E48                                   gui=none
-hi Float            ctermfg=116                                     cterm=none
-
-
-" Identifier Group
-" ----------------
-" any variable name
-hi Identifier       guifg=#C4AD87                                   gui=none
-hi Identifier       ctermfg=216                                     cterm=none
-
-" function, method, class
-hi Function         guifg=#C4AD87                                   gui=none
-hi Function         ctermfg=216                                     cterm=none
-
-" Statement Group
-" ---------------
-" any statement
-hi Statement        guifg=#BDCB28                                   gui=none
-hi Statement        ctermfg=150                                     cterm=none
-
-" if, then, else
-hi Conditional      guifg=#DA3287                                   gui=none
-hi Conditional      ctermfg=150                                     cterm=none
-
-" try, catch, throw, raise
-hi Exception        guifg=#FF7900                                   gui=none
-hi Exception        ctermfg=150                                     cterm=none
-
-" for, while, do
-hi Repeat           guifg=#1E90FF                                   gui=none
-hi Repeat           ctermfg=150                                     cterm=none
-
-" case, default
-hi Label            guifg=#CD00CC                                   gui=none
-hi Label            ctermfg=150                                     cterm=none
-
-" sizeof, +, *
-hi Operator         guifg=#1560BD                                   gui=none
-hi Operator         ctermfg=150                                     cterm=none
-
-" any other keyword
-hi Keyword          guifg=#C19A6B                                   gui=none
-hi Keyword          ctermfg=150                                     cterm=none
-
-" Preprocessor Group
-" ------------------
-" generic preprocessor
-hi PreProc          guifg=#D82626                                   gui=none
-hi PreProc          ctermfg=223                                     cterm=none
-
-" #include
-hi Include          guifg=#36EF0A                                   gui=none
-hi Include          ctermfg=223                                     cterm=none
-
-" #define
-hi Define           guifg=#EF0A5C                                   gui=none
-hi Define           ctermfg=223                                     cterm=none
-
-" same as define
-hi Macro            guifg=#0AEFC3                                   gui=none
-hi Macro            ctermfg=223                                     cterm=none
-
-" #if, #else, #endif
-hi PreCondit        guifg=#7D7D7D                                   gui=none
-hi PreCondit        ctermfg=223                                     cterm=none
-
-" Type Group
-" ----------
-" int, long, char
-hi Type             guifg=#60A0B7                                   gui=none
-hi Type             ctermfg=115                                     cterm=none
-
-" static, register, volative
-hi StorageClass     guifg=#D1E231                                   gui=none
-hi StorageClass     ctermfg=115                                     cterm=none
-
-" struct, union, enum
-hi Structure        guifg=#FFCC00                                   gui=none
-hi Structure        ctermfg=115                                     cterm=none
-
-" typedef
-hi Typedef          guifg=#2CCDD3                                   gui=none
-hi Typedef          ctermfg=115                                     cterm=none
-
-" Special Group
-" -------------
-" any special symbol
-hi Special          guifg=#FEF896                                   gui=none
-hi Special          ctermfg=181                                     cterm=none
-
-" special character in a constant
-hi SpecialChar      guifg=#FBEC5D                                   gui=none
-hi SpecialChar      ctermfg=181                                     cterm=none
-
-" things you can CTRL-]
-hi Tag              guifg=#FBEC5D                                   gui=none
-hi Tag              ctermfg=181                                     cterm=none
-
-" character that needs attention
-hi Delimiter        guifg=#E4F59F                                   gui=none
-hi Delimiter        ctermfg=181                                     cterm=none
-
-" special things inside a comment
-hi SpecialComment   guifg=#F5DA9F                                   gui=none
-hi SpecialComment   ctermfg=181                                     cterm=none
-
-" debugging statements
-hi Debug            guifg=#cca3b3           guibg=NONE              gui=none
-hi Debug            ctermfg=181             ctermbg=NONE            cterm=none
-
-""TODO
-" Underlined Group
-" ----------------
-" text that stands out, html links
-hi Underlined       guifg=#415FB8                                    gui=underline
-hi Underlined       ctermfg=fg                                      cterm=underline
-
-" Ignore Group
-" ------------
-" left blank, hidden
-hi Ignore           guifg=bg
-hi Ignore           ctermfg=bg
-
-" Error Group
-" -----------
-" any erroneous construct
-hi Error            guifg=#E80000           guibg=#432323           gui=none
-hi Error            ctermfg=167             ctermbg=52            cterm=none
-
-" Todo Group
-" ----------
-" todo, fixme, note, xxx
-hi Todo             guifg=#E80000           guibg=NONE              gui=underline
-hi Todo             ctermfg=228             ctermbg=NONE            cterm=underline
-
-" Spelling
-" --------
-" word not recognized
-hi SpellBad         guisp=#B4FF96                                   gui=undercurl
-hi SpellBad                                 ctermbg=9               cterm=undercurl
-
-" word not capitalized
-hi SpellCap         guisp=#C00F00                                   gui=undercurl
-hi SpellCap                                 ctermbg=12              cterm=undercurl
-
-" rare word
-hi SpellRare        guisp=#FF4400                                   gui=undercurl
-hi SpellRare                                ctermbg=13              cterm=undercurl
-
-" wrong spelling for selected region
-hi SpellLocal       guisp=#E80000                                   gui=undercurl
-hi SpellLocal                               ctermbg=14              cterm=undercurl
-
-" Cursor
-" ------
-" character under the cursor
-hi Cursor           guifg=bg                guibg=#a3e3ed
-hi Cursor           ctermfg=bg              ctermbg=153
-
-" like cursor, but used when in IME mode
-hi CursorIM         guifg=bg                guibg=#96cdcd
-hi CursorIM         ctermfg=bg              ctermbg=116
-
-" cursor column
-hi CursorColumn     guifg=NONE              guibg=#202438           gui=none
-hi CursorColumn     ctermfg=NONE            ctermbg=236             cterm=none
-
-" cursor line/row
-hi CursorLine       gui=NONE                guibg=#202438           gui=none
-hi CursorLine       cterm=NONE              ctermbg=236             cterm=none
-
-" Misc
-" ----
-" directory names and other special names in listings
-hi Directory        guifg=#c0e0b0                                   gui=none
-hi Directory        ctermfg=151                                     cterm=none
-
-" error messages on the command line
-hi ErrorMsg         guifg=#ee0000           guibg=NONE              gui=none
-hi ErrorMsg         ctermfg=196             ctermbg=NONE            cterm=none
-
-" column separating vertically split windows
-hi VertSplit        guifg=#777777           guibg=#363946           gui=none
-hi VertSplit        ctermfg=242             ctermbg=237             cterm=none
-
-" columns where signs are displayed (used in IDEs)
-hi SignColumn       guifg=#9fafaf           guibg=#181818           gui=none
-hi SignColumn       ctermfg=145             ctermbg=233             cterm=none
-
-" line numbers
-hi LineNr           guifg=#818698           guibg=#363946
-hi LineNr           ctermfg=102             ctermbg=237
-
-" match parenthesis, brackets
-hi MatchParen       guifg=#BAFF00           guibg=NONE              gui=bold
-hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=bold
-
-" the 'more' prompt when output takes more than one line
-hi MoreMsg          guifg=#2e8b57                                   gui=none
-hi MoreMsg          ctermfg=29                                      cterm=none
-
-" text showing what mode you are in
-hi ModeMsg          guifg=#76d5f8           guibg=NONE              gui=none
-hi ModeMsg          ctermfg=117             ctermbg=NONE            cterm=none
-
-" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
-hi NonText          guifg=#FF7F00                                   gui=none
-hi NonText          ctermfg=235                                     cterm=none
-
-" the hit-enter prompt (show more output) and yes/no questions
-hi Question         guifg=fg                                        gui=none
-hi Question         ctermfg=fg                                      cterm=none
-
-" meta and special keys used with map, unprintable characters
-hi SpecialKey       guifg=#405060
-hi SpecialKey       ctermfg=237
-
-" titles for output from :set all, :autocmd, etc
-hi Title            guifg=#FF9500                                   gui=none
-hi Title            ctermfg=74                                      cterm=none
-
-"hi Title            guifg=#5ec8e5                                   gui=none
-" warning messages
-hi WarningMsg       guifg=#e5786d                                   gui=none
-hi WarningMsg       ctermfg=173                                     cterm=none
-
-" current match in the wildmenu completion
-hi WildMenu         guifg=#cae682           guibg=#363946           gui=bold,underline
-hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
-
-" Diff
-" ----
-" added line
-hi DiffAdd          guifg=#00CFFF           guibg=#313c36           gui=none
-hi DiffAdd          ctermfg=108             ctermbg=22              cterm=none
-
-" changed line
-hi DiffChange       guifg=NONE              guibg=#FF9631           gui=none
-hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
-
-" deleted line
-hi DiffDelete       guifg=#FF0000           guibg=#E85500           gui=none
-hi DiffDelete       ctermfg=59              ctermbg=58              cterm=none
-
-" changed text within line
-hi DiffText         guifg=#f05060           guibg=#4a343a           gui=bold
-hi DiffText         ctermfg=203             ctermbg=52             cterm=bold
-
-" Folds
-" -----
-" line used for closed folds
-hi Folded           guifg=#91d6f8           guibg=#363946           gui=none
-hi Folded           ctermfg=117             ctermbg=238             cterm=none
-
-" column on side used to indicated open and closed folds
-hi FoldColumn       guifg=#91d6f8           guibg=#363946           gui=none
-hi FoldColumn       ctermfg=117             ctermbg=238             cterm=none
-
-" Search
-" ------
-" highlight incremental search text; also highlight text replaced with :s///c
-hi IncSearch        guifg=#BD00FF                                   gui=reverse
-hi IncSearch        ctermfg=87                                      cterm=reverse
-
-" hlsearch (last search pattern), also used for quickfix
-hi Search                                    guibg=#ffaa33          gui=none
-hi Search                                    ctermbg=214            cterm=none
-
-" Popup Menu
-" ----------
-" normal item in popup
-hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
-
-" selected item in popup
-hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
-
-" scrollbar in popup
-hi PMenuSbar                                guibg=#505860           gui=none
-hi PMenuSbar                                ctermbg=59              cterm=none
-
-" thumb of the scrollbar in the popup
-hi PMenuThumb                               guibg=#808890           gui=none
-hi PMenuThumb                               ctermbg=102             cterm=none
-
-" Status Line
-" -----------
-" status line for current window
-hi StatusLine       guifg=#e0e0e0           guibg=#363946           gui=bold
-hi StatusLine       ctermfg=254             ctermbg=237             cterm=bold
-
-" status line for non-current windows
-hi StatusLineNC     guifg=#767986           guibg=#363946           gui=none
-hi StatusLineNC     ctermfg=244             ctermbg=237             cterm=none
-
-" Tab Lines
-" ---------
-" tab pages line, not active tab page label
-hi TabLine          guifg=#462244           guibg=#363946           gui=none
-hi TabLine          ctermfg=244             ctermbg=236             cterm=none
-
-" tab pages line, where there are no labels
-hi TabLineFill      guifg=#A2ADA3           guibg=#363946           gui=none
-hi TabLineFill      ctermfg=187             ctermbg=236             cterm=none
-
-" tab pages line, active tab page label
-hi TabLineSel       guifg=#002DC2           guibg=#414658           gui=bold
-hi TabLineSel       ctermfg=254             ctermbg=236             cterm=bold
-
-" Visual
-" ------
-" visual mode selection
-hi Visual           guifg=NONE              guibg=#CFE4FF
-hi Visual           ctermfg=NONE            ctermbg=24
-
-" visual mode selection when vim is not owning the selection (x11 only)
-hi VisualNOS        guifg=fg                                        gui=underline
-hi VisualNOS        ctermfg=fg                                      cterm=underline
diff --git a/colors/bw.vim b/colors/bw.vim
deleted file mode 100755
index 4c97e57..0000000
--- a/colors/bw.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Vim color file
-" Maintainer:   Hans Fugal <hans@fugal.net>
-" Last Change:  5 Oct 2001
-" URL:		http://fugal.net/vim/colors/bw.vim
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-"
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="bw"
-
-hi SpecialKey     cterm=bold		ctermfg=NONE
-hi NonText        cterm=bold	    	ctermfg=NONE
-hi Directory      cterm=bold	    	ctermfg=NONE
-hi ErrorMsg       cterm=standout    	ctermfg=NONE
-hi IncSearch      cterm=reverse	    	ctermfg=NONE
-hi Search         cterm=reverse	    	ctermfg=NONE
-hi MoreMsg        cterm=bold	    	ctermfg=NONE
-hi ModeMsg        cterm=bold	    	ctermfg=NONE
-hi LineNr         cterm=underline   	ctermfg=NONE
-hi Question       cterm=standout    	ctermfg=NONE
-hi StatusLine     cterm=bold,reverse	ctermfg=NONE
-hi StatusLineNC   cterm=reverse 	ctermfg=NONE
-hi VertSplit      cterm=reverse		ctermfg=NONE
-hi Title          cterm=bold		ctermfg=NONE
-hi Visual         cterm=reverse		ctermfg=NONE
-hi VisualNOS      cterm=bold,underline	ctermfg=NONE
-hi WarningMsg     cterm=standout	ctermfg=NONE
-hi WildMenu       cterm=standout	ctermfg=NONE
-hi Folded         cterm=standout	ctermfg=NONE
-hi FoldColumn     cterm=standout	ctermfg=NONE
-hi DiffAdd        cterm=bold	        ctermfg=NONE
-hi DiffChange     cterm=bold	        ctermfg=NONE
-hi DiffDelete     cterm=bold	        ctermfg=NONE
-hi DiffText       cterm=reverse	        ctermfg=NONE
-hi Comment        cterm=bold	        ctermfg=NONE
-hi Constant       cterm=underline	ctermfg=NONE
-hi Special        cterm=bold		ctermfg=NONE
-hi Identifier     cterm=underline	ctermfg=NONE
-hi Statement      cterm=bold		ctermfg=NONE
-hi PreProc        cterm=underline	ctermfg=NONE
-hi Type           cterm=underline	ctermfg=NONE
-hi Underlined     cterm=underline	ctermfg=NONE
-hi Ignore         cterm=bold		ctermfg=NONE
-hi Error          cterm=reverse		ctermfg=NONE
-hi Todo           cterm=standout	ctermfg=NONE
diff --git a/colors/c.vim b/colors/c.vim
deleted file mode 100755
index 6109c22..0000000
--- a/colors/c.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" Vim Syntax Highlighting File
-" 
-" Language: C
-"
-" Extra: This is to copy the vi clone elvis on its
-"        syntax highlighting.
-"
-" Maintainer: Dean Jones<dean@cleancode.org>
-"
-" Comment: This works well with the default c.vim
-"          that comes with vim6.x.  It basically 
-"          overrides the very bright colors it uses
-"          and uses simple white for highlighting 
-"          key words and types in the C language.
-"          If you're using Eterm, uncomment the 
-"          Normal line specified below.
-
-hi clear
-
-" Eterm users, uncomment the line below
-" hi Normal ctermfg=grey
-
-hi PreProc ctermfg=white
-hi Type ctermfg=white
-hi Statement ctermfg=white
-hi Comment ctermfg=grey
-hi Constant cterm=NONE ctermfg=NONE
-hi Number cterm=NONE ctermfg=NONE
-hi String cterm=NONE ctermfg=NONE
-hi Special cterm=NONE ctermfg=NONE
-
-" EOF for Dean's Elvis like highlighting
diff --git a/colors/calmar256-light.vim b/colors/calmar256-light.vim
deleted file mode 100755
index 941f8ea..0000000
--- a/colors/calmar256-light.vim
+++ /dev/null
@@ -1,247 +0,0 @@
-" Vim color file:  calmar256-dark.vim
-" Last Change: 21. Aug 2007
-" License: public domain
-" Maintainer:: calmar <mac@calmar.ws>
-"
-" for a 256 color capable terminal like xterm-256color, ... or gvim as well
-" "{{{
-" it only works in such a terminal and when you have:
-" set t_Co=256
-" in your vimrc"}}}
-
-" {{{ t_Co=256 is set - check 
-if &t_Co != 256 && ! has("gui_running")
-    echomsg ""
-    echomsg "write 'set t_Co=256' in your .vimrc or this file won't load"
-    echomsg ""
-    finish
-endif
-" }}}
-" {{{ reset colors and set colors_name and store cpo setting
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "calmar256-light"
-
-let s:save_cpo = &cpo
-set cpo&vim
-" }}}
-
-" FORMAT:"{{{
-"
-" \ ["color-group", "term-style", "foreground-color", "background-color", "gui-style", "under-curl-color" ],
-"
-" 'term-style'/'gui-style' can be: 
-"              bold, underline, undercurl, reverse, inverse, italic, standout, NONE
-"
-" if gui-style is empty, the term-style value is used for the gui
-"
-" (Note: not everything is supported by a terminal nor the gui)
-"
-" besides empty values defaults to 'NONE"
-"
-" may also check:  :help highlight-groups
-"                  :help hl-<highlight-group> "
-"
-" for the Color numbers (0-255) for the foreground/background and under-curl-colors:
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
- 
-"}}}
-"============================================================
-"             EDIT/ADD your style/colors below
-"------------------------------------------------------------
- 
-" Format:   \ ["color-group",   
-"                               "term-style", 
-"                                       "foreground-color", 
-"                                                "background-color", 
-"                                                       "gui-style", 
-"                                                                   "under-curl-color" ],
-
-let s:colors256 = [
-            \ ["Normal",        "",     "17",   "230",  "",         ""   ],
-            \ ["Cursor",        "",     "",     "226",  "",         ""   ],
-            \ ["CursorLine",    "",     "",     "222",  "",         ""   ],
-            \ ["CursorColumn",  "",     "",     "223",  "",         ""   ],
-            \ ["Incsearch",     "bold", "195",  "28",   "",         ""   ],
-            \ ["Search",        "",     "",     "119",  "",         ""   ],
-            \ ["ErrorMsg",      "bold", "16",   "202",  "",         ""   ],
-            \ ["WarningMsg",    "bold", "16",   "190",  "",         ""   ],
-            \ ["ModeMsg",       "bold", "16",   "51",   "",         ""   ],
-            \ ["MoreMsg",       "bold", "16",   "154",  "",         ""   ],
-            \ ["Question",      "bold", "27",   "",     "",         ""   ],
-            \ ["StatusLine",    "",     "231",  "30",   "",         ""   ],
-            \ ["StatusLineNC",  "",     "20",   "250",  "",         ""   ],
-            \ ["User1",         "bold", "28",   "",     "",         ""   ],
-            \ ["User2",         "bold", "39",   "",     "",         ""   ],
-            \ ["VertSplit",     "",     "84",   "22",   "",         ""   ],
-            \ ["WildMenu",      "bold", "87",   "35",   "",         ""   ],
-            \ ["DiffText",      "",     "16",   "190",  "",         ""   ],
-            \ ["DiffChange",    "",     "16",   "83",   "",         ""   ],
-            \ ["DiffDelete",    "",     "79",   "124",  "",         ""   ],
-            \ ["DiffAdd",       "",     "79",   "21",   "",         ""   ],
-            \ ["Folded",        "bold", "19",   "115",  "",         ""   ],
-            \ ["FoldedColumn",  "",     "39",   "190",  "",         ""   ],
-            \ ["FoldColumn",    "",     "19",   "115",  "",         ""   ],
-            \ ["Directory",     "",     "28",   "",     "",         ""   ],
-            \ ["LineNr",        "",     "63",   "228",  "",         ""   ],
-            \ ["NonText",       "",     "243",  "229",  "",         ""   ],
-            \ ["SpecialKey",    "",     "190",  "",     "",         ""   ],
-            \ ["Title",         "bold", "18",   "",     "",         ""   ],
-            \ ["Visual",        "",     "",     "220",  "",         ""   ],
-            \ ["Comment",       "",     "21",   "255",  "",         ""   ],
-            \ ["Costant",       "",     "58",   "",     "",         ""   ],
-            \ ["String",        "",     "160",  "",     "",         ""   ],
-            \ ["Error",         "",     "130",  "",     "",         ""   ],
-            \ ["Identifier",    "",     "31",   "",     "",         ""   ],
-            \ ["Ignore",        "",     "",     "",     "",         ""   ],
-            \ ["Number",        "bold", "23",   "",     "",         ""   ],
-            \ ["PreProc",       "",     "26",   "255",  "",         ""   ],
-            \ ["Special",       "",     "",     "229",  "",         ""   ],
-            \ ["SpecialChar",   "",     "22",   "",     "",         ""   ],
-            \ ["Statement",     "",     "36",   "",     "",         ""   ],
-            \ ["Todo",          "",     "",     "229",  "",         ""   ],
-            \ ["Type",          "",     "20",   "",     "",         ""   ],
-            \ ["Underlined",    "bold", "25",   "",     "",         ""   ],
-            \ ["TaglistTagName","bold", "29",   "118",  "",         ""   ]]
-
-let s:colorvim7 = [
-            \ ["Pmenu",         "",     "229",  "29",   "",         ""   ],
-            \ ["PmenuSel",      "bold", "232",  "226",  "",         ""   ],
-            \ ["PmenuSbar",     "",     "16",   "119",  "",         ""   ],
-            \ ["PmenuThumb",    "",     "16",   "11",   "",         ""   ],
-            \ ["SpellBad",      "undercurl", "","",     "undercurl","160"  ],
-            \ ["SpellRare",     "",     "",     "228",  "",         ""   ],
-            \ ["SpellLocal",    "",     "",     "224",  "",         ""   ],
-            \ ["SpellCap",      "",     "",     "247",  "",         ""   ],
-            \ ["MatchParen",    "bold", "15",   "22",   "",         ""   ],
-            \ ["TabLine",       "",     "252",  "22",   "",         ""   ],
-            \ ["TabLineSel",    "bold", "253",  "30",   "",         ""   ],
-            \ ["TabLineFill",   "",     "247",  "16",   "",         ""   ]]
-
-"============================================================
-"        * NO NEED * to edit below (unless bugfixing)
-"============================================================
-"
-" {{{ change empty fields to "NONE"
-
-for s:col in s:colors256
-    for i in  [1, 2, 3, 4, 5]
-        if s:col[i] == "" 
-            let s:col[i] = "NONE"
-        endif
-    endfor
-endfor
-
-for s:col in s:colorvim7
-    for i in  [1, 2, 3, 4, 5]
-        if s:col[i] == "" 
-            let s:col[i] = "NONE"
-        endif
-    endfor
-endfor
-" }}}
-" {{{ check args helper function
-function! s:checkargs(arg)
-    if a:arg+0 == 0 && a:arg != "0"  "its a string
-        return a:arg
-    else
-        return s:cmap[a:arg+0]       "get rgb color based on the number
-    endif
-endfunction
-" }}}
-" {{{ guisetcolor helper function
-"
-function! s:guisetcolor(colarg)
-    " if gui-style is empty use (c)term-style also for gui
-        if a:colarg[4] == ""
-            let guival = a:colarg[1]
-        else
-            let guival = a:colarg[4]
-        endif
-
-        let fg = s:checkargs(a:colarg[2])
-        let bg = s:checkargs(a:colarg[3])
-        let sp = s:checkargs(a:colarg[5])
-
-        exec "hi ".a:colarg[0]." gui=".guival." guifg=".fg." guibg=".bg." guisp=".sp
-endfunction
-" }}}
-" {{{ color setup for terminal
-if ! has("gui_running")
-    for s:col in s:colors256
-        exec "hi ".s:col[0]." cterm=".s:col[1]." ctermfg=".s:col[2]." ctermbg=".s:col[3]
-    endfor
-    if v:version >= 700
-        for s:col in s:colorvim7
-            exec "hi ".s:col[0]." cterm=".s:col[1]." ctermfg=".s:col[2]." ctermbg=".s:col[3]
-        endfor
-    endif
-else
-" }}}
-    " color-mapping array {{{
-    " number of vim colors and #html colors equivalent for gui
-    let s:cmap =   [ 
-                \ "#000000", "#800000", "#008000", "#808000", 
-                \ "#000080", "#800080", "#008080", "#c0c0c0", 
-                \ "#808080", "#ff0000", "#00ff00", "#ffff00", 
-                \ "#0000ff", "#ff00ff", "#00ffff", "#ffffff", 
-                \
-                \ "#000000", "#00005f", "#000087", "#0000af", "#0000d7", "#0000ff", 
-                \ "#005f00", "#005f5f", "#005f87", "#005faf", "#005fd7", "#005fff", 
-                \ "#008700", "#00875f", "#008787", "#0087af", "#0087d7", "#0087ff", 
-                \ "#00af00", "#00af5f", "#00af87", "#00afaf", "#00afd7", "#00afff", 
-                \ "#00d700", "#00d75f", "#00d787", "#00d7af", "#00d7d7", "#00d7ff", 
-                \ "#00ff00", "#00ff5f", "#00ff87", "#00ffaf", "#00ffd7", "#00ffff", 
-                \ "#5f0000", "#5f005f", "#5f0087", "#5f00af", "#5f00d7", "#5f00ff", 
-                \ "#5f5f00", "#5f5f5f", "#5f5f87", "#5f5faf", "#5f5fd7", "#5f5fff", 
-                \ "#5f8700", "#5f875f", "#5f8787", "#5f87af", "#5f87d7", "#5f87ff", 
-                \ "#5faf00", "#5faf5f", "#5faf87", "#5fafaf", "#5fafd7", "#5fafff", 
-                \ "#5fd700", "#5fd75f", "#5fd787", "#5fd7af", "#5fd7d7", "#5fd7ff", 
-                \ "#5fff00", "#5fff5f", "#5fff87", "#5fffaf", "#5fffd7", "#5fffff", 
-                \ "#870000", "#87005f", "#870087", "#8700af", "#8700d7", "#8700ff", 
-                \ "#875f00", "#875f5f", "#875f87", "#875faf", "#875fd7", "#875fff", 
-                \ "#878700", "#87875f", "#878787", "#8787af", "#8787d7", "#8787ff", 
-                \ "#87af00", "#87af5f", "#87af87", "#87afaf", "#87afd7", "#87afff", 
-                \ "#87d700", "#87d75f", "#87d787", "#87d7af", "#87d7d7", "#87d7ff", 
-                \ "#87ff00", "#87ff5f", "#87ff87", "#87ffaf", "#87ffd7", "#87ffff", 
-                \ "#af0000", "#af005f", "#af0087", "#af00af", "#af00d7", "#af00ff", 
-                \ "#af5f00", "#af5f5f", "#af5f87", "#af5faf", "#af5fd7", "#af5fff", 
-                \ "#af8700", "#af875f", "#af8787", "#af87af", "#af87d7", "#af87ff", 
-                \ "#afaf00", "#afaf5f", "#afaf87", "#afafaf", "#afafd7", "#afafff", 
-                \ "#afd700", "#afd75f", "#afd787", "#afd7af", "#afd7d7", "#afd7ff", 
-                \ "#afff00", "#afff5f", "#afff87", "#afffaf", "#afffd7", "#afffff", 
-                \ "#d70000", "#d7005f", "#d70087", "#d700af", "#d700d7", "#d700ff", 
-                \ "#d75f00", "#d75f5f", "#d75f87", "#d75faf", "#d75fd7", "#d75fff", 
-                \ "#d78700", "#d7875f", "#d78787", "#d787af", "#d787d7", "#d787ff", 
-                \ "#d7af00", "#d7af5f", "#d7af87", "#d7afaf", "#d7afd7", "#d7afff", 
-                \ "#d7d700", "#d7d75f", "#d7d787", "#d7d7af", "#d7d7d7", "#d7d7ff", 
-                \ "#d7ff00", "#d7ff5f", "#d7ff87", "#d7ffaf", "#d7ffd7", "#d7ffff", 
-                \ "#ff0000", "#ff005f", "#ff0087", "#ff00af", "#ff00d7", "#ff00ff", 
-                \ "#ff5f00", "#ff5f5f", "#ff5f87", "#ff5faf", "#ff5fd7", "#ff5fff", 
-                \ "#ff8700", "#ff875f", "#ff8787", "#ff87af", "#ff87d7", "#ff87ff", 
-                \ "#ffaf00", "#ffaf5f", "#ffaf87", "#ffafaf", "#ffafd7", "#ffafff", 
-                \ "#ffd700", "#ffd75f", "#ffd787", "#ffd7af", "#ffd7d7", "#ffd7ff", 
-                \ "#ffff00", "#ffff5f", "#ffff87", "#ffffaf", "#ffffd7", "#ffffff", 
-                \
-                \ "#080808", "#121212", "#1c1c1c", "#262626", "#303030", "#3a3a3a", 
-                \ "#444444", "#4e4e4e", "#585858", "#606060", "#666666", "#767676", 
-                \ "#808080", "#8a8a8a", "#949494", "#9e9e9e", "#a8a8a8", "#b2b2b2", 
-                \ "#bcbcbc", "#c6c6c6", "#d0d0d0", "#dadada", "#e4e4e4", "#eeeeee" ]
-    " }}}
-" {{{ color setup for gvim
-    for s:col in s:colors256
-        call s:guisetcolor(s:col)
-    endfor
-    if v:version >= 700
-        for s:col in s:colorvim7
-            call s:guisetcolor(s:col)
-        endfor
-    endif
-endif
-" }}}
-let &cpo = s:save_cpo   " restoring &cpo value
-" vim: set fdm=marker fileformat=unix:
diff --git a/colors/camo.vim b/colors/camo.vim
deleted file mode 100755
index 059af42..0000000
--- a/colors/camo.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-" Vim color file
-" Maintainer:   Tim Aldrich <aldy0169@yahoo.com>
-" Last Change:  19 January 2002
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="camo"
-hi Normal       guifg=bisque            guibg=grey15
-hi Cursor       guifg=snow              guibg=bisque3
-hi CursorIM     guifg=OliveDrab4        guibg=bisque
-hi Directory    guifg=OliveDrab4        guibg=grey15
-hi DiffAdd      guifg=DarkOliveGreen1   guibg=grey15
-hi DiffChange   guifg=PaleGreen         guibg=grey15
-hi DiffDelete   guifg=red               guibg=grey15
-hi DiffText     guifg=grey15            guibg=red
-hi ErrorMsg     guifg=snow              guibg=red
-hi VertSplit    guifg=bisque4           guibg=DarkOliveGreen1
-hi Folded       guifg=DarkOliveGreen2   guibg=grey30
-hi FoldColumn   guifg=DarkOliveGreen2   guibg=grey30
-hi IncSearch    guifg=bisque            guibg=red
-hi LineNr       guifg=OliveDrab4        guibg=grey15
-hi ModeMsg      guifg=khaki3            guibg=grey15
-hi MoreMsg      guifg=khaki3            guibg=grey15
-hi NonText      guifg=DarkSalmon        guibg=grey10
-hi Question     guifg=IndianRed         guibg=grey10
-hi Search       guifg=DarkSalmon        guibg=grey15
-hi SpecialKey   guifg=yellow            guibg=grey15
-hi StatusLine   guifg=bisque4           guibg=DarkOliveGreen1
-hi StatusLineNC guifg=bisque4           guibg=DarkOliveGreen3
-hi Title        guifg=IndianRed         guibg=grey15
-hi Visual       guifg=OliveDrab4        guibg=bisque1
-hi WarningMsg   guifg=bisque            guibg=red
-hi WildMenu     guifg=LightBlue         guibg=DarkViolet
-
-
-"Syntax hilight groups
-
-hi Comment      guifg=tan
-hi Constant     guifg=khaki
-hi String       guifg=moccasin
-hi Character    guifg=chocolate
-hi Number       guifg=chocolate
-hi Boolean      guifg=OliveDrab3
-hi Float        guifg=chocolate
-hi Identifier   guifg=khaki4
-hi Function     guifg=OliveDrab4
-hi Statement    guifg=khaki
-hi Conditional  guifg=khaki
-hi Repeat       guifg=khaki
-hi Label        guifg=khaki
-hi Operator     guifg=DarkKhaki
-hi Keyword      guifg=DarkKhaki
-hi Exception    guifg=khaki
-hi PreProc      guifg=khaki4
-hi Include      guifg=khaki4
-hi Define       guifg=khaki1
-hi Macro        guifg=khaki2
-hi PreCondit    guifg=khaki3
-hi Type         guifg=khaki3
-hi StorageClass guifg=tan
-hi Structure    guifg=DarkGoldenrod
-hi Typedef      guifg=khaki3
-hi Special      guifg=IndianRed
-hi SpecialChar  guifg=DarkGoldenrod
-hi Tag          guifg=DarkKhaki
-hi Delimiter    guifg=DarkGoldenrod
-hi SpecialComment   guifg=cornsilk
-hi Debug        guifg=brown
-hi Underlined   guifg=IndianRed
-hi Ignore       guifg=grey30
-hi Error        guifg=bisque    guibg=red
-hi Todo         guifg=red       guibg=bisque
-
diff --git a/colors/campfire.vim b/colors/campfire.vim
deleted file mode 100755
index 74572c3..0000000
--- a/colors/campfire.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-" Vim color file
-" Maintainer:	Alexander Timmermans <alexandertimmermans@orange.nl>
-" Last Change: 28 september 2006
-
-set bg=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "campfire"
-
-hi Normal		guifg=#c0c0c0 guibg=#000040						ctermfg=gray ctermbg=black
-hi ErrorMsg		guifg=#ffffff guibg=#287eff						ctermfg=white ctermbg=lightblue
-hi Visual		guifg=#8080ff guibg=fg		gui=reverse				ctermfg=lightblue ctermbg=fg cterm=reverse
-hi VisualNOS	guifg=#8080ff guibg=fg		gui=reverse,underline	ctermfg=lightblue ctermbg=fg cterm=reverse,underline
-hi Todo			guifg=#d14a14 guibg=#1248d1						ctermfg=red	ctermbg=darkblue
-hi Search		guifg=#90fff0 guibg=#2050d0						ctermfg=white ctermbg=darkblue cterm=underline term=underline
-hi IncSearch	guifg=#b0ffff guibg=#2050d0							ctermfg=darkblue ctermbg=gray
-
-hi SpecialKey		guifg=cyan			ctermfg=darkcyan
-hi Directory		guifg=cyan			ctermfg=cyan
-hi Title			guifg=magenta gui=none ctermfg=magenta cterm=bold
-hi WarningMsg		guifg=red			ctermfg=red
-hi WildMenu			guifg=yellow guibg=black ctermfg=yellow ctermbg=black cterm=none term=none
-hi ModeMsg			guifg=#22cce2		ctermfg=lightblue
-hi MoreMsg			ctermfg=darkgreen	ctermfg=darkgreen
-hi Question			guifg=green gui=none ctermfg=green cterm=none
-hi NonText			guifg=#0030ff		ctermfg=darkblue
-
-hi StatusLine		guifg=blue guibg=darkgray gui=none		ctermfg=blue ctermbg=gray term=none cterm=none
-hi StatusLineNC		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
-hi VertSplit		guifg=black guibg=darkgray gui=none		ctermfg=black ctermbg=gray term=none cterm=none
-
-hi Folded			guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi FoldColumn		guifg=#808080 guibg=#000040			ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi LineNr			guifg=#90f020			ctermfg=green cterm=none
-
-hi DiffAdd			guibg=darkblue	ctermbg=darkblue term=none cterm=none
-hi DiffChange		guibg=darkmagenta ctermbg=magenta cterm=none
-hi DiffDelete		ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText			cterm=bold ctermbg=red gui=bold guibg=Red
-
-hi lCursor			guifg=#ffffff guibg=#000000 ctermfg=bg ctermbg=darkgreen
-
-
-hi Comment			guifg=#80a0ff ctermfg=darkred
-hi Constant			ctermfg=magenta guifg=#ffa0a0 cterm=none
-hi Special			ctermfg=brown guifg=Orange cterm=none gui=none
-hi Identifier		ctermfg=cyan guifg=seagreen1 cterm=none
-hi Statement		ctermfg=yellow cterm=none guifg=#ffff60 gui=none
-hi PreProc			ctermfg=magenta guifg=gold gui=none cterm=none
-hi type				ctermfg=green guifg=seagreen1 gui=none cterm=none
-hi Underlined		cterm=underline term=underline
-hi Ignore			guifg=bg ctermfg=bg
-hi String       term=NONE           cterm=NONE           gui=NONE           start=^[[m^[[33m    stop=^[[m^[[32m   ctermfg=3   guifg=LightGrey
-hi Constant     term=NONE           cterm=NONE           gui=NONE           start=^[[m^[[33m    stop=^[[m^[[32m   ctermfg=3   guifg=LightGrey
diff --git a/colors/candy.vim b/colors/candy.vim
deleted file mode 100755
index 545ff7c..0000000
--- a/colors/candy.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/04/28 Sun 19:35.
-"     version: 1.0
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "candy"
-
-hi Normal       guifg=#f0f0f8 guibg=#000000
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#80ffff guibg=#0060c0
-hi Search       gui=NONE guifg=#f0f0f8 guibg=#0060c0
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffa0ff guibg=NONE
-hi WarningMsg   gui=BOLD guifg=#ffa0ff guibg=NONE
-hi ModeMsg      gui=BOLD guifg=#40f0d0 guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#00ffff guibg=#008070
-hi Question     gui=BOLD guifg=#e8e800 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#c8c8d8
-hi StatusLineNC gui=NONE guifg=#707080 guibg=#c8c8d8
-hi VertSplit    gui=NONE guifg=#606080 guibg=#c8c8d8
-hi WildMenu     gui=NONE guifg=#000000 guibg=#a0a0ff
-
-" Diff
-hi DiffText     gui=NONE guifg=#ff78f0 guibg=#a02860
-hi DiffChange   gui=NONE guifg=#e03870 guibg=#601830
-hi DiffDelete   gui=NONE guifg=#a0d0ff guibg=#0020a0
-hi DiffAdd      gui=NONE guifg=#a0d0ff guibg=#0020a0
-
-" Cursor
-hi Cursor       gui=NONE guifg=#00ffff guibg=#008070
-hi lCursor      gui=NONE guifg=#ffffff guibg=#8800ff
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#8800ff
-
-" Fold
-hi Folded       gui=NONE guifg=#40f0f0 guibg=#005080
-hi FoldColumn   gui=NONE guifg=#40c0ff guibg=#00305c
-
-" Other
-hi Directory    gui=NONE guifg=#40f0d0 guibg=NONE
-hi LineNr       gui=NONE guifg=#9090a0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4080ff guibg=NONE
-hi SpecialKey   gui=BOLD guifg=#8080ff guibg=NONE
-hi Title        gui=BOLD guifg=#f0f0f8 guibg=NONE
-hi Visual       gui=NONE guifg=#e0e0f0 guibg=#707080
-
-" Syntax group
-hi Comment      gui=NONE guifg=#c0c0d0 guibg=NONE
-hi Constant     gui=NONE guifg=#90d0ff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff0088
-hi Identifier   gui=NONE guifg=#40f0f0 guibg=NONE
-hi Ignore       gui=NONE guifg=#000000 guibg=NONE
-hi PreProc      gui=NONE guifg=#40f0a0 guibg=NONE
-hi Special      gui=NONE guifg=#e0e080 guibg=NONE
-hi Statement    gui=NONE guifg=#ffa0ff guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#ffa0a0 guibg=NONE
-hi Type         gui=NONE guifg=#ffc864 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=#f0f0f8 guibg=NONE
-
-" HTML
-hi htmlLink                 gui=UNDERLINE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
diff --git a/colors/candycode.vim b/colors/candycode.vim
deleted file mode 100755
index 3800d9d..0000000
--- a/colors/candycode.vim
+++ /dev/null
@@ -1,174 +0,0 @@
-" Vim color file -- candycode
-" Maintainer:   Justin Constantino <goflyapig-at-gmail-com>
-" Last Change:  2006 Aug 12
-
-set background=dark
-highlight clear
-let g:colors_name="candycode"
-
-let save_cpo = &cpo
-set cpo&vim
-
-" basic highlight groups (:help highlight-groups) {{{
-
-" text {{{
-
-hi Normal       guifg=#ffffff       guibg=#050505       gui=NONE
-            \   ctermfg=white       ctermbg=black       cterm=NONE
-
-hi Folded       guifg=#c2bfa5       guibg=#050505       gui=underline
-            \   ctermfg=lightgray   ctermbg=black       cterm=underline
-
-hi LineNr       guifg=#928c75       guibg=NONE          gui=NONE
-            \   ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-
-hi Directory    guifg=#00bbdd       guibg=NONE          gui=NONE
-            \   ctermfg=cyan        ctermbg=NONE        cterm=NONE
-hi NonText      guifg=#77ff22       guibg=NONE          gui=bold
-            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
-hi SpecialKey   guifg=#559933       guibg=NONE          gui=NONE
-            \   ctermfg=green       ctermbg=NONE        cterm=NONE
-
-hi SpellBad     guifg=NONE          guibg=NONE          gui=undercurl
-            \   ctermfg=white       ctermbg=darkred     guisp=#ff0011
-hi SpellCap     guifg=NONE          guibg=NONE          gui=undercurl
-            \   ctermfg=white       ctermbg=darkblue    guisp=#0044ff
-hi SpellLocal   guifg=NONE          guibg=NONE          gui=undercurl
-            \   ctermfg=black       ctermbg=cyan        guisp=#00dd99   
-hi SpellRare    guifg=NONE          guibg=NONE          gui=undercurl
-            \   ctermfg=white       ctermbg=darkmagenta guisp=#ff22ee   
-
-hi DiffAdd      guifg=#ffffff       guibg=#126493       gui=NONE
-            \   ctermfg=white       ctermbg=darkblue    cterm=NONE
-hi DiffChange   guifg=#000000       guibg=#976398       gui=NONE
-            \   ctermfg=black       ctermbg=darkmagenta cterm=NONE
-hi DiffDelete   guifg=#000000       guibg=#be1923       gui=bold
-            \   ctermfg=black       ctermbg=red         cterm=bold
-hi DiffText     guifg=#ffffff       guibg=#976398       gui=bold
-            \   ctermfg=white       ctermbg=green       cterm=bold
-
-" }}}
-" borders / separators / menus {{{
-
-hi FoldColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold            
-            \   ctermfg=lightgray   ctermbg=darkgray    cterm=NONE
-hi SignColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold
-            \   ctermfg=lightgray   ctermbg=darkgray    cterm=NONE
-
-hi Pmenu        guifg=#000000       guibg=#a6a190       gui=NONE
-            \   ctermfg=white       ctermbg=darkgray    cterm=NONE
-hi PmenuSel     guifg=#ffffff       guibg=#133293       gui=NONE
-            \   ctermfg=white       ctermbg=lightblue   cterm=NONE
-hi PmenuSbar    guifg=NONE          guibg=#555555       gui=NONE
-            \   ctermfg=black       ctermbg=black       cterm=NONE
-hi PmenuThumb   guifg=NONE          guibg=#cccccc       gui=NONE
-            \   ctermfg=gray        ctermbg=gray        cterm=NONE
-
-hi StatusLine   guifg=#000000       guibg=#c2bfa5       gui=bold    
-            \   ctermfg=black       ctermbg=white       cterm=bold
-hi StatusLineNC guifg=#444444       guibg=#c2bfa5       gui=NONE    
-            \   ctermfg=darkgray    ctermbg=white       cterm=NONE
-hi WildMenu     guifg=#ffffff       guibg=#133293       gui=bold
-            \   ctermfg=white       ctermbg=darkblue    cterm=bold
-hi VertSplit    guifg=#c2bfa5       guibg=#c2bfa5       gui=NONE
-            \   ctermfg=white       ctermbg=white       cterm=NONE
-
-hi TabLine      guifg=#000000       guibg=#c2bfa5       gui=NONE
-            \   ctermfg=black       ctermbg=white       cterm=NONE
-hi TabLineFill  guifg=#000000       guibg=#c2bfa5       gui=NONE
-            \   ctermfg=black       ctermbg=white       cterm=NONE
-hi TabLineSel   guifg=#ffffff       guibg=#133293       gui=NONE
-            \   ctermfg=white       ctermbg=black       cterm=NONE
-
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" }}}
-" cursor / dynamic / other {{{
-
-hi Cursor       guifg=#000000       guibg=#ffff99       gui=NONE
-            \   ctermfg=black       ctermbg=white       cterm=NONE
-hi CursorIM     guifg=#000000       guibg=#aaccff       gui=NONE
-            \   ctermfg=black       ctermbg=white       cterm=reverse
-hi CursorLine   guifg=NONE          guibg=#1b1b1b       gui=NONE
-            \   ctermfg=NONE        ctermbg=NONE        cterm=NONE
-hi CursorColumn guifg=NONE          guibg=#1b1b1b       gui=NONE
-            \   ctermfg=NONE        ctermbg=NONE        cterm=NONE
-
-hi Visual       guifg=#ffffff       guibg=#606070       gui=NONE
-            \   ctermfg=white       ctermbg=lightblue   cterm=NONE
-
-hi IncSearch    guifg=#000000       guibg=#eedd33       gui=bold 
-            \   ctermfg=white       ctermbg=yellow      cterm=NONE
-hi Search       guifg=#efefd0       guibg=#937340       gui=NONE
-            \   ctermfg=white       ctermbg=darkgreen   cterm=NONE
-
-hi MatchParen   guifg=NONE          guibg=#3377aa       gui=NONE
-            \   ctermfg=white       ctermbg=blue        cterm=NONE
-
-"hi VisualNOS
-
-" }}}
-" listings / messages {{{
-
-hi ModeMsg      guifg=#eecc18       guibg=NONE          gui=NONE
-            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
-hi Title        guifg=#dd4452       guibg=NONE          gui=bold
-            \   ctermfg=red         ctermbg=NONE        cterm=bold
-hi Question     guifg=#66d077       guibg=NONE          gui=NONE
-            \   ctermfg=green       ctermbg=NONE        cterm=NONE
-hi MoreMsg      guifg=#39d049       guibg=NONE          gui=NONE
-            \   ctermfg=green       ctermbg=NONE        cterm=NONE
-
-hi ErrorMsg     guifg=#ffffff       guibg=#ff0000       gui=bold
-            \   ctermfg=white       ctermbg=red         cterm=bold
-hi WarningMsg   guifg=#ccae22       guibg=NONE          gui=bold    
-            \   ctermfg=yellow      ctermbg=NONE        cterm=bold
-
-" }}}
-
-" }}}
-" syntax highlighting groups (:help group-name) {{{
-
-hi Comment      guifg=#ff9922       guibg=NONE          gui=NONE
-            \   ctermfg=brown       ctermbg=NONE        cterm=NONE
-
-hi Constant     guifg=#ff6050       guibg=NONE          gui=NONE
-            \   ctermfg=red         ctermbg=NONE        cterm=NONE
-hi Boolean      guifg=#ff6050       guibg=NONE          gui=bold  
-            \   ctermfg=red         ctermbg=NONE        cterm=bold
-
-hi Identifier   guifg=#eecc44       guibg=NONE          gui=NONE
-            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
-
-hi Statement    guifg=#66d077       guibg=NONE          gui=bold
-            \   ctermfg=green       ctermbg=NONE        cterm=bold
-
-hi PreProc      guifg=#bb88dd       guibg=NONE          gui=NONE
-            \   ctermfg=darkmagenta ctermbg=NONE        cterm=NONE
-
-hi Type         guifg=#4093cc       guibg=NONE          gui=bold
-            \   ctermfg=lightblue   ctermbg=NONE        cterm=bold
-
-hi Special      guifg=#9999aa       guibg=NONE          gui=bold  
-            \   ctermfg=lightgray   ctermbg=NONE        cterm=bold
-
-hi Underlined   guifg=#80a0ff       guibg=NONE          gui=underline
-            \   ctermfg=NONE        ctermbg=NONE        cterm=underline
-            \   term=underline 
-
-hi Ignore       guifg=#888888       guibg=NONE          gui=NONE
-            \   ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-
-hi Error        guifg=#ffffff       guibg=#ff0000       gui=NONE
-            \   ctermfg=white       ctermbg=red         cterm=NONE
-
-hi Todo         guifg=#ffffff       guibg=#ee7700       gui=bold
-            \   ctermfg=black       ctermbg=yellow      cterm=bold
-
-" }}}
-
-let &cpo = save_cpo
-
-" vim: fdm=marker fdl=0
diff --git a/colors/candyman.vim b/colors/candyman.vim
deleted file mode 100755
index b0fa8cf..0000000
--- a/colors/candyman.vim
+++ /dev/null
@@ -1,426 +0,0 @@
-" Vim color file
-"
-" " __ _ _ _ "
-" " \ \ ___| | |_ _| |__ ___ __ _ _ __ ___ "
-" " \ \/ _ \ | | | | | _ \ / _ \/ _ | _ \/ __| "
-" " /\_/ / __/ | | |_| | |_| | __/ |_| | | | \__ \ "
-" " \___/ \___|_|_|\__ |____/ \___|\____|_| |_|___/ "
-" " \___/ "
-"
-" "A colorful, dark color scheme for Vim."
-"
-" File: candyman.vim
-" Maintainer: NanoTech <http://nanotech.nanotechcorp.net/>
-" Version: 1.2
-" Last Change: May 26th, 2009
-" Contributors: Daniel Herbert <http://pocket-ninja.com>,
-" Henry So, Jr. <henryso@panix.com>,
-" David Liang <bmdavll at gmail dot com>
-"
-" Copyright (c) 2009 NanoTech
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
- 
-set background=dark
- 
-hi clear
- 
-if exists("syntax_on")
-syntax reset
-endif
- 
-let colors_name = "candyman"
- 
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-let s:low_color = 0
-else
-let s:low_color = 1
-endif
- 
-" Color approximation functions by Henry So, Jr. and David Liang {{{
-" Added to jellybeans.vim by Daniel Herbert
- 
-" returns an approximate grey index for the given grey level
-fun! s:grey_number(x)
-if &t_Co == 88
-if a:x < 23
-return 0
-elseif a:x < 69
-return 1
-elseif a:x < 103
-return 2
-elseif a:x < 127
-return 3
-elseif a:x < 150
-return 4
-elseif a:x < 173
-return 5
-elseif a:x < 196
-return 6
-elseif a:x < 219
-return 7
-elseif a:x < 243
-return 8
-else
-return 9
-endif
-else
-if a:x < 14
-return 0
-else
-let l:n = (a:x - 8) / 10
-let l:m = (a:x - 8) % 10
-if l:m < 5
-return l:n
-else
-return l:n + 1
-endif
-endif
-endif
-endfun
- 
-" returns the actual grey level represented by the grey index
-fun! s:grey_level(n)
-if &t_Co == 88
-if a:n == 0
-return 0
-elseif a:n == 1
-return 46
-elseif a:n == 2
-return 92
-elseif a:n == 3
-return 115
-elseif a:n == 4
-return 139
-elseif a:n == 5
-return 162
-elseif a:n == 6
-return 185
-elseif a:n == 7
-return 208
-elseif a:n == 8
-return 231
-else
-return 255
-endif
-else
-if a:n == 0
-return 0
-else
-return 8 + (a:n * 10)
-endif
-endif
-endfun
- 
-" returns the palette index for the given grey index
-fun! s:grey_color(n)
-if &t_Co == 88
-if a:n == 0
-return 16
-elseif a:n == 9
-return 79
-else
-return 79 + a:n
-endif
-else
-if a:n == 0
-return 16
-elseif a:n == 25
-return 231
-else
-return 231 + a:n
-endif
-endif
-endfun
- 
-" returns an approximate color index for the given color level
-fun! s:rgb_number(x)
-if &t_Co == 88
-if a:x < 69
-return 0
-elseif a:x < 172
-return 1
-elseif a:x < 230
-return 2
-else
-return 3
-endif
-else
-if a:x < 75
-return 0
-else
-let l:n = (a:x - 55) / 40
-let l:m = (a:x - 55) % 40
-if l:m < 20
-return l:n
-else
-return l:n + 1
-endif
-endif
-endif
-endfun
- 
-" returns the actual color level for the given color index
-fun! s:rgb_level(n)
-if &t_Co == 88
-if a:n == 0
-return 0
-elseif a:n == 1
-return 139
-elseif a:n == 2
-return 205
-else
-return 255
-endif
-else
-if a:n == 0
-return 0
-else
-return 55 + (a:n * 40)
-endif
-endif
-endfun
- 
-" returns the palette index for the given R/G/B color indices
-fun! s:rgb_color(x, y, z)
-if &t_Co == 88
-return 16 + (a:x * 16) + (a:y * 4) + a:z
-else
-return 16 + (a:x * 36) + (a:y * 6) + a:z
-endif
-endfun
- 
-" returns the palette index to approximate the given R/G/B color levels
-fun! s:color(r, g, b)
-" get the closest grey
-let l:gx = s:grey_number(a:r)
-let l:gy = s:grey_number(a:g)
-let l:gz = s:grey_number(a:b)
- 
-" get the closest color
-let l:x = s:rgb_number(a:r)
-let l:y = s:rgb_number(a:g)
-let l:z = s:rgb_number(a:b)
- 
-if l:gx == l:gy && l:gy == l:gz
-" there are two possibilities
-let l:dgr = s:grey_level(l:gx) - a:r
-let l:dgg = s:grey_level(l:gy) - a:g
-let l:dgb = s:grey_level(l:gz) - a:b
-let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-let l:dr = s:rgb_level(l:gx) - a:r
-let l:dg = s:rgb_level(l:gy) - a:g
-let l:db = s:rgb_level(l:gz) - a:b
-let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-if l:dgrey < l:drgb
-" use the grey
-return s:grey_color(l:gx)
-else
-" use the color
-return s:rgb_color(l:x, l:y, l:z)
-endif
-else
-" only one possibility
-return s:rgb_color(l:x, l:y, l:z)
-endif
-endfun
- 
-" returns the palette index to approximate the 'rrggbb' hex string
-fun! s:rgb(rgb)
-let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-return s:color(l:r, l:g, l:b)
-endfun
- 
-" sets the highlighting for the given group
-fun! s:X(group, fg, bg, attr, lcfg, lcbg)
-if s:low_color
-let l:fge = empty(a:lcfg)
-let l:bge = empty(a:lcbg)
- 
-if !l:fge && !l:bge
-exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
-elseif !l:fge && l:bge
-exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
-elseif l:fge && !l:bge
-exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
-endif
-else
-let l:fge = empty(a:fg)
-let l:bge = empty(a:bg)
- 
-if !l:fge && !l:bge
-exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg)
-elseif !l:fge && l:bge
-exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)
-elseif l:fge && !l:bge
-exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermbg=".s:rgb(a:bg)
-endif
-endif
- 
-if a:attr == ""
-exec "hi ".a:group." gui=none cterm=none"
-else
-if a:attr == 'italic'
-exec "hi ".a:group." gui=".a:attr." cterm=none"
-else
-exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
-endif
-endif
-endfun
-" }}}
- 
-if version >= 700
-  call s:X("CursorLine","","5a5a5a","","","")
-  call s:X("CursorColumn","","5a5a5a","","","")
-  call s:X("MatchParen","ffffff","80a090","bold","","")
- 
-  call s:X("TabLine","262626","b0b8c0","italic","","Black")
-  call s:X("TabLineFill","9098a0","","","","")
-  call s:X("TabLineSel","262626","f0f0f0","italic,bold","","")
- 
-" Auto-completion
-  call s:X("Pmenu","ffffff","262626","","","")
-  call s:X("PmenuSel","101010","eeeeee","","","")
-endif
-
-call s:X("Visual","","503d50","","","")
-call s:X("Cursor","","996699","","","")
-
-call s:X("Normal","e8e8d3","151515","","White","")
-call s:X("LineNr","605958","151515","none","Black","")
-call s:X("Comment","888888","","italic","Grey","")
-call s:X("Todo","8a3c3b","","bold","","")
- 
-call s:X("StatusLine","f0f0f0","393f47","italic","","")
-call s:X("StatusLineNC","484848","1a1f26","italic","","")
-call s:X("VertSplit","393f47","393f47","italic","","")
- 
-call s:X("Folded","a0a8b0","384048","italic","black","")
-call s:X("FoldColumn","a0a8b0","384048","","","")
-call s:X("SignColumn","a0a8b0","384048","","","")
- 
-call s:X("Title","70b950","","bold","","")
- 
-call s:X("Constant","cf6a4c","","","Red","")
-call s:X("Special","799d6a","","","Green","")
-call s:X("Delimiter","668799","","","Grey","")
- 
-call s:X("String","99ad6a","","","Green","")
-call s:X("StringDelimiter","556633","","","DarkGreen","")
- 
-call s:X("Identifier","c6b6ee","","","LightCyan","")
-call s:X("Structure","79a5bf","","","LightCyan","")
-call s:X("Function","be9f5f","","","Yellow","")
-call s:X("Statement","8197bf","","","DarkBlue","")
-call s:X("PreProc","8fbfdc","","","LightBlue","")
-
-call s:X("Test","8fbfdc","","","LightBlue","")
-
-hi link Operator Normal
- 
-call s:X("Type","d8a465","","","Yellow","")
-call s:X("NonText","808080","151515","","","")
- 
-call s:X("SpecialKey","808080","343434","","","")
- 
-call s:X("Search","f0a0c0","302028","underline","Magenta","")
- 
-call s:X("Directory","dad085","","","","")
-call s:X("ErrorMsg","","902020","","","")
-
-" Diff
- 
-hi link diffRemoved Constant
-hi link diffAdded String
- 
-" VimDiff
- 
-call s:X("DiffAdd","","032218","","Black","DarkGreen")
-call s:X("DiffChange","","100920","","Black","DarkMagenta")
-call s:X("DiffDelete","220000","220000","","DarkRed","DarkRed")
-call s:X("DiffText","","000940","","","DarkRed")
- 
-" PHP
- 
-hi link phpFunctions Function
-call s:X("StorageClass","c59f6f","","","Red","")
-hi link phpSuperglobal Identifier
-hi link phpQuoteSingle StringDelimiter
-hi link phpQuoteDouble StringDelimiter
-hi link phpBoolean Constant
-hi link phpNull Constant
-hi link phpArrayPair Operator
- 
-" Ruby
- 
-hi link rubySharpBang Comment
-call s:X("rubyClass","447799","","","DarkBlue","")
-call s:X("rubyIdentifier","c6b6fe","","","","")
- 
-call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","")
-call s:X("rubySymbol","7697d6","","","Blue","")
-hi link rubyGlobalVariable rubyInstanceVariable
-hi link rubyModule rubyClass
-call s:X("rubyControl","7597c6","","","","")
- 
-hi link rubyString String
-hi link rubyStringDelimiter StringDelimiter
-hi link rubyInterpolationDelimiter Identifier
- 
-call s:X("rubyRegexpDelimiter","540063","","","Magenta","")
-call s:X("rubyRegexp","dd0093","","","DarkMagenta","")
-call s:X("rubyRegexpSpecial","a40073","","","Magenta","")
- 
-call s:X("rubyPredefinedIdentifier","de5577","","","Red","")
-
-
-
-" JavaScript
-hi link javaScriptValue Constant
-hi link javaScriptRegexpString rubyRegexp
- 
-" Objective-C/Cocoa
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link objcDirective rubyClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
- 
-" Tag list
-hi link TagListFileName Directory
- 
-" delete functions {{{
-delf s:X
-delf s:rgb
-delf s:color
-delf s:rgb_color
-delf s:rgb_level
-delf s:rgb_number
-delf s:grey_color
-delf s:grey_level
-delf s:grey_number
-" }}}
- 
-
diff --git a/colors/caramel.vim b/colors/caramel.vim
deleted file mode 100755
index 81f6fd5..0000000
--- a/colors/caramel.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-" Vim color file
-" Maintainer	: Brian Gant
-" Email		: gantbd@muohio.edu
-" Last Change	: 2/15/03
-" Version	: 0.1
-"
-" TODO : add colors for diff and other non-implemented
-"        stuff
-" 
-" LICENCE (heh) : Emailware.  Basically it means use it,
-"   abuse it, change it, love it, leave it, whatever!  I
-"   do however make the simple request that if you use the
-"   scheme, drop me an email and let me know what you think
-"   about it, especially if you modify it!  I don't use
-"   the non-implemented features on a regular enough basis
-"   to get a feel for how they flesh out.
-"
-"   Designed for use with COBOL, but looks pretty good with
-"   Perl, PHP, and C/C++ too (at least I think so).
-"
-"   Brian
-"   
-" ---------------------------------------------------------
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="caramel"
-
-" ---------------------------------------------------------
-
-hi Normal		guifg=#dca454	guibg=#5c5094
-
-" ---------------------------------------------------------
-
-hi Cursor		guifg=#303030	guibg=#dca454
-hi CursorIM		guifg=#303030	guibg=#dca454
-hi ErrorMsg		guifg=#b4a8a8	guibg=bg
-hi IncSearch		guifg=#e0d070	guibg=#303030
-hi LineNr		guifg=#b4a8a8	guibg=#39325d
-hi ModeMsg		guifg=#b4a8a8	guibg=bg
-hi MoreMsg		guifg=#b4a8a8	guibg=bg
-hi NonText		guifg=#b4a8a8	guibg=#39325d
-hi Question		guifg=#b4a8a8	guibg=bg
-hi Search		guifg=#303030	guibg=#e0d070
-hi StatusLine		guifg=#e0d070	guibg=#303030
-hi StatusLineNC		guifg=#dca454	guibg=#303030
-hi Title		guifg=#b4a8a8	guibg=#39325d
-hi Visual		guifg=#b4a8a8	guibg=#303030
-hi VisualNOS		guifg=#b4a8a8	guibg=#303030
-hi WarningMsg		guifg=#b4a8a8	guibg=#39325d
-
-" ---------------------------------------------------------
-
-hi Comment		guifg=#b4a8a8	guibg=bg
-hi Constant		guifg=#9cd464	guibg=bg
-hi Identifier		guifg=#e8c47c	guibg=bg
-hi Statement		guifg=#8088bc	guibg=bg
-hi PreProc		guifg=#e0d070	guibg=bg
-hi Type			guifg=#e0d070	guibg=bg
-hi Special		guifg=#e0d070	guibg=bg
-hi Underlined		guifg=#9cd464	guibg=bg
-hi Ignore		guifg=fg	guibg=bg
-hi Error		guifg=#cc74a8	guibg=#9cd464
-hi Todo			guifg=bg	guibg=#e0d070
diff --git a/colors/carrot.vim b/colors/carrot.vim
deleted file mode 100755
index f809c91..0000000
--- a/colors/carrot.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" Vim color file
-" Maintainer:	Juan frias <juandfrias at gmail dot com>
-" Last Change:	2007 Feb 25
-" Version:	1.0.1
-" URL:		http://www.axisym3.net/jdany/vim-the-editor/#carrot
-
-set background=light
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "carrot"
-
-" Normal
-highlight Normal gui=none guifg=DarkBlue guibg=PeachPuff 
-
-" Search
-highlight IncSearch gui=none guifg=White   guibg=Brown
-highlight Search    gui=bold guifg=#804020 guibg=#fcc657 
-
-" Messages
-highlight ErrorMsg   gui=none guifg=#f8f8f8 guibg=#4040ff
-highlight WarningMsg gui=none guifg=#f8f8f8 guibg=FireBrick
-highlight ModeMsg    gui=none guifg=#d06000 guibg=bg
-highlight MoreMsg    gui=none guifg=#0090a0 guibg=bg
-highlight Question   gui=none guifg=#8000ff guibg=bg
-
-" Split area
-highlight StatusLine   gui=bold guifg=Black   guibg=#FFB848
-highlight StatusLineNC gui=none guifg=Brown   guibg=#FCC785 
-highlight VertSplit    gui=none guifg=#f8f8f8 guibg=#904838 
-highlight WildMenu     gui=bold guifg=White   guibg=NavyBlue
-
-" Diff
-highlight DiffText   gui=none guifg=red   guibg=#ffd0d0 
-highlight DiffChange gui=none guifg=black guibg=#ffe7e7 
-highlight DiffDelete gui=none guifg=bg    guibg=#e7e7ff 
-highlight DiffAdd    gui=none guifg=blue  guibg=#e7e7ff 
-
-" Cursor
-highlight Cursor   gui=none guifg=Grey85  guibg=Red4
-highlight lCursor  gui=none guifg=#ffffff guibg=#8040ff
-highlight CursorIM gui=none guifg=#ffffff guibg=Red3
-
-" Fold
-highlight Folded     gui=none guifg=#804030 guibg=#fff0d0 
-highlight FoldColumn gui=none guifg=#6b6b6b guibg=#e7e7e7 
-
-" Other
-highlight Directory  gui=none guifg=#112662 guibg=bg
-highlight LineNr     gui=none guifg=#6b6b6b guibg=bg
-highlight NonText    gui=none guifg=#707070 guibg=PeachPuff2
-highlight SpecialKey gui=none guifg=#c0c0c0 guibg=bg 
-highlight Title      gui=bold guifg=#112662 guibg=bg
-highlight Visual     gui=none guifg=#804020 guibg=#ffc0a0 
-
-" Syntax group
-highlight Comment    gui=none guifg=SteelBlue4 guibg=bg      
-highlight Constant   gui=none guifg=#00884c guibg=bg      
-highlight Error      gui=none guifg=#f8f8f8 guibg=#4040ff term=reverse 
-highlight Identifier gui=none guifg=#b07800 guibg=bg      
-highlight Ignore     gui=none guifg=bg      guibg=bg      
-highlight PreProc    gui=none guifg=#683821 guibg=bg      
-highlight Special    gui=none guifg=#8040f0 guibg=bg      
-highlight Statement  gui=bold guifg=IndianRed3 guibg=bg      
-highlight Conditional gui=bold guifg=#7f0055 guibg=bg      
-highlight Todo       gui=none guifg=White   guibg=Grey20   term=standout       
-highlight Type       gui=bold guifg=Brown   guibg=bg      
-highlight Underlined gui=none guifg=blue    guibg=bg
-highlight String     gui=none guifg=#8010a0 guibg=bg      
-highlight Number     gui=none guifg=#0000ff guibg=bg      
-
-if !has("gui_running")
-    hi link Float          Number
-    hi link Include        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      Normal
-    hi link SpecialComment Special
-    hi link Debug          Special
-endif
-
-" vim:ff=unix:
diff --git a/colors/carvedwood.vim b/colors/carvedwood.vim
deleted file mode 100755
index ba1839e..0000000
--- a/colors/carvedwood.vim
+++ /dev/null
@@ -1,118 +0,0 @@
-" Vim color file
-" carvedwood v0.7c
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"               [axs221.1l.com]
-
-" carvedwood -
-"     a color scheme modified from my desertocean scheme into a brown
-" and green scheme, easier on the eyes and optimized for more important syntax
-" to stand out the most (eg comments and values are dark and dull while
-" statements are bright).
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="carvedwood"
-
-hi Normal	guifg=#dac0cd guibg=#1f2221
-
-" syntax highlighting
-hi Comment	  guifg=#5a6a6d
-hi Title	  guifg=#60b0ea
-hi Underlined guifg=#80aae0
-hi Statement  guifg=#fac5ba
-hi Type		  guifg=#cd9a8a
-hi PreProc    guifg=#ba857a gui=none 
-hi Constant	  guifg=#9a757d
-hi Identifier guifg=#bd7560
-hi Special	  guifg=#cab0a5
-hi Ignore     guifg=grey40
-hi Todo		  guifg=orangered guibg=yellow2
-hi Error      guibg=#e04462
-"end syntax highlighting
-
-" highlight groups
-hi Cursor	guibg=#205a50 guifg=#7ab0aa
-"hi CursorIM
-hi Directory guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#c2b0a5 guifg=grey50 gui=none
-hi Folded	guibg=#4a4f4d guifg=#BBDDCC
-hi FoldColumn	guibg=#4c3e3b guifg=#00CCFF
-hi LineNr   guifg=#D0C5CA guibg=#594540
-hi ModeMsg	guifg=#00AACC
-hi MoreMsg	guifg=SeaGreen
-hi NonText  guifg=#382920 guibg=#1b1f1f
-hi Question	guifg=#AABBCC
-hi Search	guibg=#5a6d7d guifg=#bac5d0
-hi IncSearch	guifg=#50606d guibg=#cddaf0
-hi SpecialKey	guifg=#90703B
-hi StatusLine	guibg=#c99f93 guifg=#102015 gui=none
-hi StatusLineNC	guibg=#937b7a guifg=#373334 gui=none
-hi Visual   guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" color terminal definitions
-hi Normal ctermfg=white
-hi SpecialKey	ctermfg=darkyellow
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=white ctermbg=brown
-hi Question	ctermfg=green
-hi StatusLine	cterm=none ctermbg=white ctermfg=darkgreen
-hi StatusLineNC	cterm=none ctermbg=white ctermfg=black
-hi VertSplit	cterm=none ctermbg=darkgreen
-hi Title	ctermfg=blue
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=white ctermbg=darkcyan
-hi FoldColumn	ctermfg=darkcyan ctermbg=grey
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Special	ctermfg=white
-hi Identifier	ctermfg=brown
-hi Statement	ctermfg=yellow
-hi PreProc	ctermfg=red
-hi Type		ctermfg=brown
-hi Constant	ctermfg=grey
-hi Underlined	cterm=none ctermfg=blue ctermbg=darkgrey
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-hi Function ctermfg=yellow
-
-
-"vim: sw=4
- 
diff --git a/colors/carvedwoodcool.vim b/colors/carvedwoodcool.vim
deleted file mode 100755
index ab725a8..0000000
--- a/colors/carvedwoodcool.vim
+++ /dev/null
@@ -1,116 +0,0 @@
-" Vim color file
-" carvedwood v0.1
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"               [axs221.1l.com]
-
-" carvedwood -
-"     a cool blue version of my color scheme modified from my desertocean scheme into a brown
-" and green scheme, easier on the eyes and optimized for more important syntax
-" to stand out the most (eg comments and values are dark and dull while
-" statements are bright).
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="carvedwoodcool"
-
-hi Normal       guibg=#05181c guifg=#aa9aa3 
-hi NonText      guibg=#1c3447 guifg=#382920
-hi Folded       guibg=#4a4f4d guifg=#BBDDCC
-hi FoldColumn	guibg=#3a4a5a guifg=#00CCFF
-hi LineNr       guibg=#153040 guifg=#D0C5c0 
-hi StatusLine	guibg=#d0a59a guifg=#102015 gui=none
-hi StatusLineNC	guibg=#937b7a guifg=#373334 gui=none
-
-" syntax highlighting
-hi Comment	  guifg=#2d303d
-hi Title	  guifg=#60b0ea
-hi Underlined guifg=#80aae0
-hi Statement  guifg=#f0caba
-hi Type		  guifg=#c09a8a
-hi Constant	  guifg=#55464a
-hi PreProc    guifg=#aa7065 gui=none 
-hi Identifier guifg=#d07a70
-hi Special	  guifg=#556065
-hi Ignore     guifg=grey40
-hi Todo		  guifg=orangered guibg=yellow2
-hi Error      guibg=#e04462
-"end syntax highlighting
-
-" highlight groups
-hi Cursor	guibg=#104550 guifg=#6aa09a
-"hi CursorIM
-hi Directory guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi ModeMsg      guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi Search       guibg=#5a6d7d guifg=#bac5d0
-hi IncSearch	guifg=#50606d guibg=#cddaf0
-hi SpecialKey	guifg=#90703B
-hi Visual       guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Constant	ctermfg=brown
-hi Special	ctermfg=5
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
-
diff --git a/colors/chance-of-storm.vim b/colors/chance-of-storm.vim
deleted file mode 100755
index 2387304..0000000
--- a/colors/chance-of-storm.vim
+++ /dev/null
@@ -1,155 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Author: Mario Gutierrez (mario@mgutz.com)
-" Last Change: Dececember 6, 2010 
-" Version: 0.1.2
-"
-" removed italics on string
-" ruby interpolation color
-" identifier color
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "chance-of-storm"
-
-
-"""""""""" General
-
-hi Normal 		guifg=#cacfd3   guibg=#181c20 gui=none
-
-" Vim >= 7.0
-if version >= 700
-  hi CursorLine         guibg=#2a2e31
-  hi MatchParen         guifg=magenta   guibg=black   gui=bold,italic
-  hi Pmenu 		guifg=#dfeff6   guibg=#1E415E
-  hi PmenuSel 	        guifg=#dfeff6   guibg=#2D7889
-
-  hi IncSearch          guifg=bg        guibg=#AF81F4 gui=bold
-  hi Search             guifg=bg        guibg=#AF81F4 gui=none
-endif
-
-hi Cursor 		guifg=bg        guibg=#8fdef9 gui=none
-hi Folded 		guifg=#68CEE8   guibg=#1A3951 gui=none
-hi FoldColumn           guifg=#1E415E   guibg=#1A3951 gui=none
-hi LineNr 		guifg=#2e363d   guibg=bg      gui=none
-" e.g. tildes at the end of file
-hi NonText 		guifg=#2e363d   guibg=bg      gui=none
-hi Question             guifg=#6dbb6d   guibg=bg      gui=none
-hi StatusLine 	        guifg=lightmagenta   guibg=#060809 gui=none
-hi StatusLineNC         guifg=#69839a   guibg=#060809 gui=none
-hi TabLine              guifg=#555555   guibg=#dddddd gui=none
-hi TabLineFill 		guifg=fg        guibg=#dddddd gui=none
-hi TabLineSel           guifg=#101010   guibg=#b0b0b0 gui=none
-hi Title 		guifg=#ef7760   guibg=bg      gui=none
-hi VertSplit 	        guifg=#060809   guibg=#060809 gui=bold
- " Selected text color
-hi Visual		guifg=#dfeff6   guibg=#24557A gui=none
-hi WarningMsg           guifg=#bb6d6d   guibg=bg      gui=none
-
-
-"""""""""" Syntax highlighting
-
-hi Comment 		guifg=#69839a   guibg=bg      gui=italic
-hi Constant 	        guifg=#96defa   gui=none
-hi Function 	        guifg=#9e7cd7   gui=none
-hi Identifier 	        guifg=#2ed6d7   gui=none
-hi Ignore 		guifg=bg        guibg=bg      gui=none
-hi Keyword		guifg=#8ac6f2   gui=none
-hi Number		guifg=#e1d4a8   gui=none
-hi PreProc 		guifg=#f99d71   gui=none
-hi Special		guifg=#ffcde4   gui=none
-hi Statement 	        guifg=#8ac6f2   gui=none
-hi String 		guifg=#89e14b   gui=none
-hi Todo 		guifg=#ADED80   guibg=bg      gui=bold
-hi Type 		guifg=#489fd7   gui=none
-hi Underlined 	        guifg=#8ac6f2   gui=underline
-
-
-""""""""""" ERB
-
-hi link erubyDelimiter      PreProc 
-
-
-""""""""""" HAML
-
-hi link hamlAttributes      htmlArg
-hi link hamlTag             htmlTag 
-hi link hamlTagName         htmlTagName 
-hi link hamlIdChar          hamlId
-hi link hamlClassChar       hamlClass
-
-
-""""""""""" HELP
-
-hi link helpSectionDelim    NonText
-hi link helpExample         Statement
-
-
-""""""""""" HTML
-
-hi link htmlTag             Statement
-hi link htmlEndTag          Statement
-hi link htmlTagName         Statement 
-
-
-"""""""""" JavaScript
-
-hi link javaScriptFunction  Statement
-hi link javaScriptFuncName  Function
-hi link javaScriptLabel     PreProc 
-
-
-"""""""""" MAKE
-
-hi link makeCommands        Statement
-
-
-"""""""""" MARKDOWN (tpope's vim-markdown)
-
-hi link markdownCodeBlock           Statement
-hi link markdownCode                Statement 
-hi link markdownCodeDelimiter       Statement
-hi link markdownHeadingDelimiter    Title
-hi      markdownLinkText 	    guifg=#489fd7   gui=underline
-hi      markdownUrl                 guifg=#69839a   guibg=bg        gui=none
-hi link markdownLinkTextDelimiter   markdownUrl 
-hi link markdownLinkDelimiter       markdownUrl 
-
-
-""""""""""" NERDTree
-
-hi link treePart            NonText
-hi link treePartFile        treePart 
-hi link treeDirSlash        treePart
-hi link treeDir             Statement 
-hi link treeClosable        PreProc
-hi link treeOpenable        treeClosable
-hi link treeUp              treeClosable 
-hi      treeFlag            guifg=#3e71a1 guibg=bg gui=none
-hi link treeHelp            Comment
-hi link treeLink            Type
-hi link treeExecFile        Type
-
-
-"""""""""" PHP 
-
-hi link phpVarSelector      Identifier
-
-
-"""""""""" Ruby
-
-hi      rubyAccess                  guifg=#ef7760 guibg=bg gui=italic
-hi      rubyInterpolation           guifg=#c2f0a2 guibg=bg 
-hi link rubyInterpolationDelimiter  rubyInterpolation
-hi link rubyStringDelimiter         String
-
-
-""""""""""" XML
-
-hi link xmlTag              htmlTag
-hi link xmlEndTag           htmlEndTag
-hi link xmlTagName          htmlTagName
diff --git a/colors/charged-256.vim b/colors/charged-256.vim
deleted file mode 100755
index 9f132d7..0000000
--- a/colors/charged-256.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-hi Normal       ctermfg=247 ctermbg=16
-hi NonText      ctermfg=247 ctermbg=232
-
-hi LineNr       ctermfg=237 ctermbg=232
-hi VertSplit    ctermfg=234 ctermbg=234
-hi StatusLine   ctermfg=240 ctermbg=234
-hi StatusLineNC ctermfg=234 ctermbg=238 
-
-hi Folded       ctermfg=243 ctermbg=16
-hi FoldColumn   ctermfg=243 ctermbg=16
-
-hi PMenum       ctermfg=240 ctermbg=234
-hi PMenuSbar    ctermfg=240 ctermbg=234
-hi PMenuThumb   ctermfg=237 ctermbg=232
-
-hi TabLine      ctermfg=240 ctermbg=234
-hi TabLineSel   ctermfg=16  ctermbg=243
-hi TabLineFill  ctermfg=238 ctermbg=234 cterm=underline
diff --git a/colors/charon.vim b/colors/charon.vim
deleted file mode 100755
index 64f0355..0000000
--- a/colors/charon.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" 
-" Comments are welcome !
-" Spammers will be shot. Survivors will be shot again
-" 
-" Last Change: 17 Oct 2005
-" Version:1.0
-" Changes: Recolored comments and Statement
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="charon"
-
-hi Normal   guibg=black	 guifg=#f0c009
-hi Statusline    gui=none guibg=SteelBlue guifg=PowderBlue
-hi  VertSplit    gui=none guibg=black guifg=SkyBlue
-hi StatuslineNC  gui=none guibg=LightSlateGray guifg=MistyRose
-hi LineNr   guifg=SlateGray2 gui=none
-hi Cursor   guibg=IndianRed guifg=Snow gui=none
-hi Visual   guibg=Yellow guifg=Black gui=none
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-"guibg=#8c9bfa
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=#8080af
-hi Operator   guifg=LightCoral
-
-hi Identifier guifg=#1faf40 gui=NONE
-
-hi Statement	 guifg=#fff0ff gui=NONE
-hi TypeDef       guifg=#ff00c8 gui=NONE
-hi Type          guifg=#ffffc8 gui=NONE
-hi Boolean       guifg=#ff00aa gui=NONE
-
-hi String        guifg=Gray75 gui=NONE
-hi Number        guifg=PeachPuff gui=NONE
-hi Constant      guifg=#ff8080 gui=NONE
-hi Folded        guifg=PowderBlue guibg=SteelBlue gui=BOLD
-hi FoldColumn      guifg=#ff8080 guibg=black gui=italic
-
-hi Function      gui=NONE      guifg=#6666ff
-hi PreProc       guifg=#ffff00 gui=italic
-hi Define        gui=bold guifg=Red 
-
-hi Keyword       guifg=Tomato gui=NONE
-hi Search        gui=NONE guibg=DodgerBlue guifg=snow 
-"guibg=#339900
-hi IncSearch     gui=NONE guifg=FireBrick4 guibg=AntiqueWhite1
-hi Conditional   gui=none guifg=DeepSkyBlue1
-hi browseDirectory  gui=none guifg=DarkSlateGray1
-hi DiffText    gui=italic guifg=black guibg=yellow
-hi DiffAdd     gui=none   guifg=yellow guibg=#006000
-hi DiffChange  gui=none   guifg=yellow guibg=#000060 
-hi DiffDelete  gui=none   guifg=black  guibg=#600000 
-
diff --git a/colors/chela_light.vim b/colors/chela_light.vim
deleted file mode 100755
index 3cde34d..0000000
--- a/colors/chela_light.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-" Vim color file
-"
-" Maintainer:   Stefan Karlsson <stefan.74@comhem.se>
-" Last Change:  8 August 2006
-
-
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="chela_light"
-
-
-"Syntax Groups =============================================
-
-hi comment      guibg=#fafafa   guifg=#339900   gui=none
-
-hi constant     guibg=#fafafa   guifg=#cc2222   gui=none
-
-hi identifier   guibg=#fafafa   guifg=#2222ff   gui=none
-
-hi statement    guibg=#fafafa   guifg=#2222ff   gui=none
-
-hi preproc      guibg=#fafafa   guifg=#2222ff   gui=none
-hi precondit    guibg=#fafafa   guifg=#cc00cc   gui=none
-
-hi type         guibg=#fafafa   guifg=#2222ff   gui=none
-
-hi special      guibg=#fafafa   guifg=#cc00cc   gui=none
-hi specialchar  guibg=#fafafa   guifg=#cc2222   gui=underline
-
-hi underlined   guibg=#fafafa   guifg=#2222ff   gui=underline
-
-hi error        guibg=#ff2222   guifg=#ffffff   gui=none
-
-hi todo         guibg=#339933   guifg=#ffffff   gui=none
-
-
-"General Groups ============================================
-
-hi cursor       guibg=#000000   guifg=#ffffff   gui=none
-"  cursorim?
-hi cursorcolumn guibg=#eeeeee                   gui=none
-hi cursorline   guibg=#eeeeee                   gui=none
-
-hi directory    guibg=#fafafa   guifg=#2222ff   gui=none
-
-hi diffadd      guibg=#66ff66   guifg=#000000   gui=none
-hi diffchange   guibg=#ffff00   guifg=#cccc99   gui=none
-hi diffdelete   guibg=#ff6666   guifg=#ff6666   gui=none
-hi difftext     guibg=#ffff00   guifg=#000000   gui=none
-
-hi errormsg     guibg=#ff2222   guifg=#ffffff   gui=none
-
-hi vertsplit    guibg=#2222ff   guifg=#2222ff   gui=none
-
-hi folded       guibg=#eeeeee   guifg=#2222ff   gui=none
-hi foldcolumn   guibg=#eeeeee   guifg=#999999   gui=none
-
-"  signcolumn?
-
-hi incsearch    guibg=#ffbb00   guifg=#000000   gui=none
-
-hi linenr       guibg=#fafafa   guifg=#cccccc   gui=none
-
-hi matchparen   guibg=#cccccc                   gui=none
-
-hi modemsg      guibg=#fafafa   guifg=#999999   gui=none
-
-hi moremsg      guibg=#339900   guifg=#ffffff   gui=none
-
-hi nontext      guibg=#fafafa   guifg=#999999   gui=none
-
-hi normal       guibg=#fafafa   guifg=#222222   gui=none
-
-hi pmenu        guibg=#cccccc   guifg=#222222   gui=none
-hi pmenusel     guibg=#2222ff   guifg=#ffffff   gui=none
-"  pmenusbar?
-"  pmenuthumb?
-
-hi question     guibg=#339900   guifg=#ffffff   gui=none
-
-hi search       guibg=#ffff00   guifg=#000000   gui=none
-
-hi specialkey   guibg=#fafafa   guifg=#cc00cc   gui=none
-
-hi spellbad                                     gui=undercurl guisp=#ff2222
-hi spellcap                                     gui=undercurl guisp=#ff2222
-hi spelllocal                                   gui=undercurl guisp=#cc2222
-hi spellrare                                    gui=undercurl guisp=#22cc22
-
-hi statusline   guibg=#2222ff   guifg=#ffffff   gui=none
-hi statuslinenc guibg=#2222ff   guifg=#999999   gui=none
-
-hi tabline      guibg=#cccccc   guifg=#222222   gui=none
-hi tablinesel   guibg=#2222ff   guifg=#ffffff   gui=none
-hi tablinefill  guibg=#aaaaaa   guifg=#aaaaaa   gui=none
-
-hi title        guibg=#fafafa   guifg=#6666ff   gui=none
-
-hi visual       guibg=#cccccc   guifg=#333333   gui=none
-"  visualnos?
-
-hi warningmsg   guibg=#fafafa   guifg=#ff0000   gui=none
-
-hi wildmenu     guibg=#339900   guifg=#ffffff   gui=none
-
diff --git a/colors/chlordane.vim b/colors/chlordane.vim
deleted file mode 100755
index 11b83f3..0000000
--- a/colors/chlordane.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-    " vim:set ts=8 sts=2 sw=2 tw=0:
-" Name: chlordane.vim
-" Maintainer:	Kojo Sugita
-" Last Change:  2008-11-22
-" Revision: 1.2
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'chlordane'
-
-hi Cursor	guifg=#3a553a guibg=#77dd88
-hi lCursor	guifg=#3a553a guibg=#77dd88
-hi CursorLine	guibg=#000000 gui=underline
-hi CursorIM	guifg=#3a553a guibg=#77dd88
-hi Directory	guifg=#77dd88 guibg=#000000 gui=bold
-hi DiffAdd	guifg=#77dd88 guibg=#3a553a gui=none
-hi DiffChange	guifg=#77dd88 guibg=#3a553a gui=none
-hi DiffDelete	guifg=#223322 guibg=#223322 gui=none
-hi DiffText	guifg=#77dd88 guibg=#448844 gui=bold
-hi ErrorMsg	guifg=#ee1111 guibg=#000000
-hi VertSplit	guifg=#223322 guibg=#223322
-hi Folded	guifg=#55af66 guibg=#000000
-hi FoldColumn	guifg=#557755 guibg=#102010
-hi IncSearch	guifg=#3a553a guibg=#77dd88 gui=none
-hi LineNr	guifg=#446644 guibg=#000000 gui=none
-hi ModeMsg	guifg=#55af66 guibg=#000000
-hi MoreMsg	guifg=#55af66 guibg=#000000
-hi Normal	guifg=#55af66 guibg=#000000
-hi Question	guifg=#55af66 guibg=#000000
-hi Search	guifg=#223322 guibg=#55af66 gui=none
-hi NonText	guifg=#606060 gui=none
-hi SpecialKey	guifg=#707070
-"\n, \0, %d, %s, etc...
-hi Special	guifg=#55af66 guibg=#223333 gui=bold
-" status line
-hi StatusLine	guifg=#88ee99 guibg=#447f55 gui=bold
-hi StatusLineNC term=bold cterm=bold,underline ctermfg=green ctermbg=Black
-hi StatusLineNC term=bold gui=bold,underline guifg=#3a553a  guibg=Black
-hi Title	guifg=#77dd88 guibg=#223322 gui=bold
-hi Visual	guifg=#77dd88 guibg=#448844 gui=none
-hi VisualNOS	guifg=#55af66 guibg=#000000
-hi WarningMsg	guifg=#77dd88 guibg=#000000
-hi WildMenu	guifg=#3a553a guibg=#77dd88
-hi Number	guifg=#77dd88 guibg=#354535
-hi Char		guifg=#77dd88 guibg=#354535
-hi String	guifg=#77dd88 guibg=#354535
-hi Boolean	guifg=#77dd88 guibg=#354535
-hi Comment	guifg=#446644
-hi Constant	guifg=#88ee99 gui=none
-hi Identifier	guifg=#77dd88
-hi Statement	guifg=#88ee99 gui=none
-
-"Procedure name
-hi Function     guifg=#77dd88
-
-"Define, def
-hi PreProc	guifg=#77dd88 gui=bold
-hi Type		guifg=#77dd88 gui=bold
-hi Underlined	guifg=#77dd88 gui=underline
-hi Error	guifg=#ee1111 guibg=#000000
-hi Todo		guifg=#223322 guibg=#55af66 gui=none
-hi SignColumn   guibg=#000000
-
-if version >= 700
-  " Pmenu
-  hi Pmenu	guibg=#222222
-  hi PmenuSel	guibg=#3a553a guifg=#77dd88
-  hi PmenuSbar	guibg=#222222
-
-  " Tab
-  hi TabLine	  guifg=#3a553a guibg=black gui=bold
-  hi TabLineFill  guifg=black guibg=black gui=bold
-  hi TabLineSel	  guifg=#88ee99 guibg=#447f55 gui=bold
-endif
-
-
diff --git a/colors/chocolate.vim b/colors/chocolate.vim
deleted file mode 100755
index 7c575de..0000000
--- a/colors/chocolate.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file
-" Maintainer:   Adam Hayward
-" Last Change:  2008 June 04
-" Email:        <adam@happy.cat>
-" Version:      0.1
-" 
-" Choclolate colorscheme, based on the W3C core style of the same name.
-" See http://www.w3.org/StyleSheets/Core/Overview
-" This file is also based on 'clean.vim' by Ron Aaron
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "chocolate"
-hi Normal		  guifg=#D0FFD0 guibg=#212121
-hi Scrollbar	  guifg=darkcyan guibg=cyan
-hi Menu			  guifg=black guibg=cyan
-hi SpecialKey	  term=bold  cterm=bold  ctermfg=darkred  guifg=Blue
-hi NonText		  term=bold  cterm=bold  ctermfg=darkred  gui=bold	guifg=white
-hi Directory	  term=bold  cterm=bold  ctermfg=brown	guifg=lightblue
-hi ErrorMsg		  term=standout  cterm=bold  ctermfg=grey  ctermbg=blue  guifg=White  guibg=Red
-hi Search		  term=reverse	ctermfg=white  ctermbg=red	guifg=white  guibg=#7080dd gui=bold
-hi MoreMsg		  term=bold  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=SeaGreen
-hi ModeMsg		  term=bold  cterm=bold  gui=bold  guifg=White	guibg=Blue
-hi LineNr		  term=underline  cterm=bold  ctermfg=darkcyan	guifg=#707070
-hi Question		  term=standout  cterm=bold  ctermfg=darkgreen	gui=bold  guifg=Green
-hi StatusLine	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white
-hi StatusLineNC   term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
-hi Title		  term=bold  cterm=bold  ctermfg=darkmagenta  gui=bold	guifg=#a05000
-hi Visual		  term=reverse	cterm=reverse  gui=reverse
-hi WarningMsg	  term=standout  cterm=bold  ctermfg=darkblue  guifg=Red
-hi Cursor		  guifg=bg	guibg=Green
-hi Comment		  term=bold  cterm=bold ctermfg=cyan  guifg=#30dd00
-hi Constant		  term=underline  cterm=bold ctermfg=magenta  guifg=#FFCC00
-hi Special		  term=bold  cterm=bold ctermfg=red  guifg=yellow gui=bold
-hi Identifier	  term=underline   ctermfg=brown  guifg=white
-hi Function		  guifg=#00ccaa 
-hi Operator		  guifg=white
-hi Statement	  term=bold  cterm=bold ctermfg=yellow	guifg=#ffffff gui=bold
-hi PreProc		  term=underline  ctermfg=darkblue	guifg=yellow gui=bold
-hi Type			  term=underline  cterm=bold ctermfg=lightgreen  gui=bold  guifg=#dddddd
-hi Error		  term=reverse	ctermfg=darkcyan  ctermbg=white guifg=Red	guibg=white
-hi Todo			  term=standout  ctermfg=black	ctermbg=darkcyan  guifg=#f5f5f5 guibg=#aa4040 gui=bold
-hi VertSplit	  guibg=#505050 guifg=white
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Statement
-hi link Float			Number
-" hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-" hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
-
diff --git a/colors/chrysoprase.vim b/colors/chrysoprase.vim
deleted file mode 100755
index 8120e07..0000000
--- a/colors/chrysoprase.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" Chrysoprase color theme for (G)Vim, version 0.0.2
-" by Antoine Kalmbach <antoine dot kalmbach at jyu dot fi>
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "chrysoprase"
-
-hi CursorLine guibg=#cccccc
-hi CursorColumn guibg=#cccccc
-hi MatchParen guifg=white guibg=#dd1144 gui=bold
-hi TabLine guifg=white guibg=#445588 gui=italic
-hi TabLineFill guifg=#9098a0
-hi TabLineSel guifg=white guibg=#dd1144 gui=bold
-hi Pmenu guifg=#222222 guibg=#990000
-hi Title      guifg=#202020 gui=bold
-hi Underlined  guifg=#202020 gui=underline
-hi Cursor    guifg=white   guibg=#333333
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#444444 guibg=#dddddd 
-hi Normal    guifg=#000000   guibg=#eeeeee
-hi StatusLine guifg=white guibg=#8090a0 gui=bold,italic
-hi StatusLineNC guifg=white guibg=#a0b0c0 gui=none
-hi VertSplit guifg=#111111 guibg=#a0b0c0 gui=NONE
-hi Folded    guifg=#111111 guibg=white
-hi Keyword   guifg=green gui=bold
-hi PreProc   guifg=#111111 gui=bold
-hi NonText   guifg=#111111 guibg=white
-hi Comment   guifg=#555555 gui=bold,italic
-hi Constant  guifg=#a512d5
-hi String    guifg=#dd1144
-hi Number    guifg=#005599
-hi Float      guifg=#0088BB
-hi Statement  guifg=#111111 gui=bold
-hi Type       guifg=#445588 
-hi Structure  guifg=black gui=bold
-hi Function   guifg=#990000 gui=bold
-hi Identifier guifg=#445588 gui=bold
-hi Repeat      guifg=#222222 gui=bold
-hi Conditional guifg=#222222 gui=bold
-hi Define     guifg=#222222 gui=bold
-hi Error      guifg=white guibg=#990022 gui=none
-hi Todo       guifg=white guibg=#dd1144 gui=bold,underline
-hi Special    guifg=#dd1144 
-hi Operator   guifg=#222222 gui=bold
-hi SpecialKey guifg=#994400 guibg=#e8e8e8 gui=bold  
-hi DiffChange guifg=NONE guibg=#e0e0e0 gui=italic,bold
-hi DiffText guifg=NONE guibg=#f0c8c8 gui=italic,bold
-hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=italic,bold
-hi DiffDelete guifg=NONE guibg=#f0e0b0 gui=italic,bold
-
diff --git a/colors/ciscoacl.vim b/colors/ciscoacl.vim
deleted file mode 100755
index 5cd00fa..0000000
--- a/colors/ciscoacl.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" 
-" Vim syntax file
-" Language: cisco access-list files
-" Maintainer: Vladimir Kotal <vlada@devnull.cz>
-" 
-" Last Modification: 23-Nov-2004
-" 
-" 
-syntax clear
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" syntax case ignore
-
-setlocal iskeyword+=/
-setlocal iskeyword+=:
-setlocal iskeyword+=.
-setlocal iskeyword+=-
-
-setlocal foldmethod=syntax
-syn sync fromstart
-
-" keywords
-syntax keyword	aclCmd			permit 
-syntax keyword  aclDeny			deny
-syntax keyword  aclHost 		host
-syntax keyword	aclPort			bgp chargen cmd daytime discard domain
-syntax keyword  aclPort			echo exec finger ftp ftp-data gopher 
-syntax keyword  aclPort			hostname ident irc klogin kshell login 
-syntax keyword  aclPort			lpd nntp pim-auto-rp pop2 pop3 smtp sunrpc 
-syntax keyword  aclPort			syslog tacacs talk telnet time uucp whois 
-syntax keyword  aclPort			www biff bootpc bootps dnsix echo isakmp 
-syntax keyword  aclPort			mobile-ip nameserver netbios-dgm netbios-ns 
-syntax keyword  aclPort			netbios-ss ntp rip snmp snmptrap sunrpc 
-syntax keyword  aclPort			syslog talk tftp time who xdmcp 
-
-" protocols
-"syntax keyword aclProto		icmp ip tcp udp
-
-syntax keyword 	aclSrcDst		any
-
-"syntax keyword aclSrcDst		host
-"syntax keyword aclLog			log logging
-
-" regexps
-syntax match    aclACL			/^access-list\s+/
-" TODO: differentiate network address/mask
-syntax match 	ciscoip 		/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
-
-" syntax match ciscocomment /^!.*/
-syntax keyword	aclTodo			TODO XXX contained
-syntax region 	ciscocomment	start="^!" matchgroup=NONE end="$" contains=@cCommentGroup,aclTodo
-syntax region 	ciscocomment 	start=// end=//
-
-"syntax match 	aclDefine		/[A-Z][A-Z\_0-9]*/ contained
-syntax match 	aclDefine		/[A-Z][A-Z\_0-9]*/
-"syntax region	remark			start="^access-list.*remark" end="$" contains=aclACL,aclDefine
-syntax region	remark			start="remark " end="$"
-
-"syntax region	portspec		start="eq" end="\s*[a-z0-9]*"
-"syntax region	portspec 		start="range" end="\s*[a-z0-9]*\s*[a-z0-9]*"
-
-syntax match	aclGenericNum	/\<\d\+\>/
-
-
-
-" Define the default hightlighting.
-" 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_cisco_syn_inits")
-    if version < 508
-	   let did_cisco_syn_inits = 1
-	   command -nargs=+ HiLink hi link <args>
-    else
-	   command -nargs=+ HiLink hi def link <args>
-    endif
-
-	" special highlighting for deny keyword
-    hi Deny gui=bold guifg=LightRed ctermfg=White ctermbg=LightRed term=underline
-    
-	HiLink aclDeny			Deny
-    HiLink aclCmd			Statement
-    HiLink ciscoip			Type
-    HiLink remark			String
-    HiLink ciscocomment		Comment
-    HiLink portspec			Type
-	HiLink aclDefine		Identifier
-	HiLink aclGenericNum	Constant
-	HiLink aclPort			Constant
-	HiLink aclSrcDst		Type
-	HiLink aclTodo			Todo
-
-    delcommand HiLink
-endif
-
-let b:current_syntax = "cisco"
-
-" vim:ts=4
diff --git a/colors/clarity.vim b/colors/clarity.vim
deleted file mode 100755
index 3440ba3..0000000
--- a/colors/clarity.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-" Vim color - Clarity
-"  
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="clarity"
-
-highlight Normal         gui=NONE guifg=LightBlue2   guibg=#1F3055
-highlight Comment        gui=NONE guifg=Grey62       guibg=bg 
-highlight PreProc        gui=NONE guifg=Salmon       guibg=bg 
-highlight Precondit      gui=NONE guifg=Khaki3       guibg=bg
-highlight Identifier     gui=NONE guifg=Khaki3       guibg=bg 
-highlight Type           gui=BOLD guifg=Orange       guibg=bg 
-highlight StorageClass   gui=BOLD guifg=Cornsilk2    guibg=bg
-highlight Todo           gui=BOLD guifg=#1F3055      guibg=White 
-highlight NonText        gui=NONE guifg=#334C51      guibg=SteelBlue4 
-highlight LineNr         gui=NONE guifg=HoneyDew2    guibg=Grey25 
-highlight StatusLineNC   gui=NONE guifg=Grey80       guibg=LightBlue4 
-highlight StatusLine     gui=NONE guifg=DarkBlue     guibg=#FFFFCA 
-highlight IncSearch      gui=NONE guifg=Black        guibg=#FFE568
-highlight Search         gui=UNDERLINE,BOLD          guifg=#FFE568 guibg=bg
-highlight Cursor         gui=NONE guifg=Grey50       guibg=#FFE568
-highlight CursorIM       gui=NONE guifg=Grey50       guibg=#FFE568
-highlight Title          gui=BOLD guifg=OliveDrab3   guibg=bg
-highlight WarningMsg     gui=BOLD guifg=White        guibg=Red4
-highlight String         gui=NONE guifg=Grey80       guibg=bg      
-highlight Number         gui=NONE guifg=OliveDrab2   guibg=bg
-highlight Constant       gui=NONE guifg=#ACEDAB      guibg=bg 
-highlight Visual         gui=BOLD guifg=White        guibg=bg
-highlight Directory      gui=NONE guifg=PeachPuff    guibg=bg
-highlight DiffAdd        gui=NONE guifg=white        guibg=SeaGreen
-highlight DiffChange     gui=BOLD guifg=white        guibg=Blue
-highlight DiffDelete     gui=NONE guifg=Grey40       guibg=Grey20 
-highlight DiffText       gui=BOLD guifg=HoneyDew1    guibg=FireBrick 
-highlight Typedef        gui=NONE guifg=Cornsilk     guibg=bg
-highlight Define         gui=NONE guifg=White        guibg=bg
-highlight Tag            gui=NONE guifg=LightBlue2   guibg=bg
-highlight Debug          gui=BOLD guifg=Green        guibg=bg
-highlight Special        gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight SpecialChar    gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight Delimiter      gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight SpecialComment gui=NONE guifg=NavajoWhite3 guibg=bg         
-highlight Conditional    gui=BOLD guifg=Wheat2       guibg=bg         
-highlight Statement      gui=BOLD guifg=Pink3        guibg=bg 
-highlight WildMenu       gui=NONE guifg=White        guibg=FireBrick
-highlight browseSuffixes gui=NONE guifg=Cornsilk3    guibg=bg
-
-
-
diff --git a/colors/cleanphp.vim b/colors/cleanphp.vim
deleted file mode 100755
index c0af691..0000000
--- a/colors/cleanphp.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-" Vim color file
-" Maintainer:	Billy McIntosh <billymcintosh@ntlworld.com>
-" Last Change:	June 24, 2003
-" Licence:	    Public Domain
-
-" This package offers a eye-catching color scheme for PHP syntax
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "cleanphp"
-
-hi Normal guifg=#008000 guibg=#d3e4f8
-
-hi ErrorMsg guibg=#d3e4f8 guifg=Red
-hi IncSearch gui=reverse
-hi ModeMsg gui=bold
-hi StatusLine gui=reverse,bold
-hi StatusLineNC gui=reverse
-hi VertSplit gui=reverse
-hi Visual gui=reverse guifg=#c0c0c0 guibg=fg
-hi VisualNOS gui=underline,bold
-hi DiffText gui=bold guibg=Red
-hi Cursor guibg=Black guifg=NONE
-hi lCursor guibg=Black guifg=NONE
-hi Directory guifg=#ff8040
-hi LineNr guifg=#008000
-hi MoreMsg gui=bold guifg=SeaGreen
-hi NonText gui=bold guifg=#ff8040 guibg=#d3e4f8
-hi Question gui=bold guifg=Black
-hi Search guibg=#008000 guifg=NONE
-hi SpecialKey guifg=#ff8040
-hi Title gui=bold guifg=Magenta
-hi WarningMsg guifg=Red
-hi WildMenu guibg=Cyan guifg=#d3e4f8
-hi Folded guibg=White guifg=Darkblue
-hi FoldColumn guibg=#c0c0c0 guifg=Darkblue
-hi DiffAdd guibg=Lightblue
-hi DiffChange guibg=LightMagenta
-hi DiffDelete gui=bold guifg=#ff8040 guibg=LightCyan
-
-hi Comment guifg=#ff8040 guibg=#d3e4f8
-hi Constant guifg=#BB0000 guibg=#d3e4f8
-hi PreProc guifg=#008080 guibg=#d3e4f8
-hi Statement gui=NONE guifg=#008000 guibg=#d3e4f8
-hi Special guifg=#008080 guibg=#d3e4f8
-hi Ignore guifg=#c0c0c0
-hi Identifier guifg=#000080 guibg=#d3e4f8
-hi Type guifg=#00BB00 guibg=#d3e4f8
-
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
-
-" vim: sw=2
\ No newline at end of file
diff --git a/colors/cloudy.vim b/colors/cloudy.vim
deleted file mode 100755
index 7bbbc51..0000000
--- a/colors/cloudy.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" Last Change: 25 August 2005
-" Version:1.0
-
-
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="peppers"
-
-hi Normal   guifg=#ffffcc	 guibg=#003366 
-hi LineNr   guifg=white guibg=#003366 
-hi Statusline    gui=none guibg=#0099cc guifg=#ffffff
-hi StatuslineNC    gui=none guibg=#003399 guifg=#ffffff
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=#cccccc
-hi Operator   guifg=#ff0000
-
-hi Identifier    guifg=#33ff99 gui=NONE
-
-hi Statement	 guifg=#cc9966 gui=NONE
-hi TypeDef       guifg=#c000c8 gui=NONE
-hi Type          guifg=#ccffff gui=NONE
-hi Boolean       guifg=#ff00aa gui=NONE
-
-hi String        guifg=#99ccff gui=NONE
-hi Number        guifg=#66ff66 gui=NONE
-hi Constant      guifg=#f0f080 gui=NONE
-
-hi Function      gui=NONE      guifg=#fffcfc 
-hi PreProc       guifg=#ffff00 gui=NONE
-hi Define        gui=bold guifg=#f0f0f0 
-hi Special       gui=none guifg=#cccccc 
-hi BrowseDirectory  gui=bold guifg=#FFFF00 
-
-hi Keyword       guifg=#ff8088 gui=NONE
-hi Search        gui=NONE guibg=#ffff00 guifg=#330000 
-hi IncSearch     gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi SpecialKey    gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi NonText       gui=NONE guifg=#fcfcfc 
-hi Directory     gui=NONE guifg=#999900 
-hi browseDirectory     gui=NONE guifg=#00F0FF 
diff --git a/colors/clue.vim b/colors/clue.vim
deleted file mode 100755
index b752c2d..0000000
--- a/colors/clue.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim color file
-" Maintainer: Boyko Bantchev <boykobb@gmail.com>
-" Last Change: 2008 Aug 27
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "clue"
-hi normal                     guifg=#e0e0e0   guibg=darkblue                    ctermfg=grey        ctermbg=black
-hi identifier                 guifg=grey                                        ctermfg=grey
-hi type         gui=bold      guifg=#8080e0                                     ctermfg=darkcyan
-hi statement    gui=bold      guifg=#e09000                                     ctermfg=brown
-hi operator     gui=bold      guifg=orange                                      ctermfg=brown
-hi constant                   guifg=cyan                                        ctermfg=darkblue
-hi label        gui=bold      guifg=darkyellow                                  ctermfg=grey
-hi special                    guifg=magenta                                     ctermfg=darkmagenta
-hi preproc                    guifg=#00e000                                     ctermfg=darkgreen
-hi comment      gui=italic    guifg=darkgrey                                    ctermfg=blue        ctermbg=black
-hi todo                       guifg=white     guibg=brown                       ctermfg=black       ctermbg=yellow
-hi nontext                    guifg=magenta                                     ctermfg=magenta
-hi underlined   gui=underline guifg=cyan                        cterm=underline ctermfg=darkcyan
-
-hi cursor       gui=reverse   guifg=white     guibg=black       cterm=reverse   ctermfg=white       ctermbg=black
-hi lcursor      gui=reverse   guifg=cyan      guibg=black       cterm=reverse   ctermfg=cyan        ctermbg=black
-hi matchparen   gui=bold      guifg=yellow    guibg=darkblue                    ctermfg=yellow      ctermbg=black
-
-hi search                     guifg=black     guibg=magenta                     ctermfg=black       ctermbg=magenta
-hi incsearch    gui=none      guifg=black     guibg=white       cterm=none      ctermfg=black       ctermbg=white
-hi visual                     guifg=white     guibg=darkcyan    cterm=none      ctermfg=black       ctermbg=cyan
-
-hi error        gui=none      guifg=red       guibg=darkblue    cterm=none      ctermfg=red         ctermbg=black
-hi errormsg     gui=none      guifg=orange    guibg=darkblue    cterm=none      ctermfg=red         ctermbg=black
-hi warningmsg   gui=bold      guifg=cyan      guibg=darkblue                    ctermfg=cyan
-hi modemsg                    guifg=yellow                                      ctermfg=brown
-hi moremsg                    guifg=yellow                                      ctermfg=brown
-
-hi statusline   gui=bold      guifg=cyan      guibg=blue        cterm=none      ctermfg=black       ctermbg=white
-hi statuslinenc gui=none      guifg=cyan      guibg=blue        cterm=none      ctermfg=black       ctermbg=white
-hi vertsplit    gui=none      guifg=white     guibg=blue        cterm=none      ctermfg=black       ctermbg=white
-hi linenr                     guifg=cyan                                        ctermfg=darkcyan
-
-hi folded                     guifg=black     guibg=orange                      ctermfg=black       ctermbg=yellow
-hi foldcolumn                 guifg=white     guibg=blue                        ctermfg=black       ctermbg=grey
-
-hi diffchange                 guifg=white     guibg=darkgreen                   ctermfg=black       ctermbg=darkcyan
-hi difftext     gui=none      guifg=black     guibg=orange      cterm=none      ctermfg=grey        ctermbg=darkred
-hi diffdelete                 guifg=lightgrey guibg=darkmagenta                 ctermfg=grey        ctermbg=darkred
-hi diffadd                    guifg=white     guibg=darkcyan                    ctermfg=black       ctermbg=darkgreen
-
-hi pmenu                      guifg=white     guibg=blue                        ctermfg=black       ctermbg=darkcyan
-hi pmenusel                   guifg=black     guibg=white                       ctermfg=black       ctermbg=white
-hi pmenusbar                  guifg=black     guibg=grey                        ctermfg=black       ctermbg=grey
-hi pmenuthumb   gui=reverse                                     cterm=reverse
-
-hi spellcap     guisp=darkcyan
-hi spelllocal                                                                   ctermfg=black
-
-hi title        gui=bold      guifg=white                                       ctermfg=white
-hi signcolumn                 guifg=white     guibg=darkcyan                    ctermfg=black       ctermbg=darkcyan
-hi tabline      gui=underline guifg=black     guibg=darkgrey    cterm=underline ctermfg=black       ctermbg=white
diff --git a/colors/cobalt.vim b/colors/cobalt.vim
deleted file mode 100755
index 0e46380..0000000
--- a/colors/cobalt.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" ==============================================================================
-"        File: cobalt.vim
-"      Author: David Terei <davidterei@gmail.com>
-"		    URL: http://www.vim.org/scripts/script.php?script_id=2828
-" Last Change: Thu Feb 03 13:44:07 PST 2011
-"     Version: 1.2
-"     License: Distributed under the Vim charityware license.
-"     Summary: A colour scheme for Vim attempting to replicate TextMates
-"              cobalt scheme.
-"
-" GetLatestVimScripts: 2828 1 :AutoInstall: cobalt.vim
-"
-" Description:
-" A colour scheme for Vim that attempts to replicate TextMates cobalt colour
-" scheme. This scheme only supports GVim, it should work fine in Vim but no
-" promises are made about this or how it looks.
-"
-" History:
-"   Wed Oct 28, 2009 - 1.0:
-"     * Initial release.
-"   Thu Feb 03, 2011 - 1.2:
-"     * Tweaks by David Terei
-"     * Tweaks by Константин Городинский <gor.konstantin@gmail.com>
-"
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="cobalt"
-
-hi Normal         guifg=#FFFFFF           guibg=#002F52  
-hi NonText        guifg=#FFFFFF           guibg=#002F52
-hi CursorLine     guifg=NONE              guibg=#002943
-hi Cursor         guifg=#F8F8F8           guibg=#A7A7A7
-hi CursorIM       guifg=#F8F8F8           guibg=#002947"#5F5A60
-hi Directory      guifg=#8F9D6A           guibg=#141414
-hi ErrorMsg       guifg=#CF6A4C           guibg=#420E09
-hi VertSplit      guifg=#AC885B           guibg=#FFFFFF
-hi Folded         guifg=#F9EE98           guibg=#494949
-
-hi IncSearch      guifg=#000000           guibg=#CF6A4C
-hi LineNr         guifg=#59809d           guibg=#003454 "espresso style
-"hi LineNr         guifg=#888888           guibg=#e1e1e1 "textmate default
-"hi LineNr         guifg=#7587A6           guibg=#000000 "own style
-hi ModeMsg        guifg=#CF7D34           guibg=#E9C062
-hi MoreMsg        guifg=#CF7D34           guibg=#E9C062
-hi Question       guifg=#7587A6           guibg=#0E2231
-hi Search         guifg=#420E09           guibg=#CF6A4C
-hi SpecialKey     guifg=#CF7D34           guibg=#141414
-hi StatusLine     guifg=#0E2231           guibg=#8693A5
-hi StatusLineNC   guifg=#7587A6           guibg=#F8F8F8
-hi Title          guifg=#8B98AB           guibg=#0E2231
-hi Visual         guifg=#FFFFFF           guibg=#B36539
-hi WarningMsg     guifg=#CF6A4C           guibg=#420E09
-hi WildMenu       guifg=#AFC4DB           guibg=#0E2231
-
-"Syntax highlight groups
-
-hi Comment        guifg=#009DFF gui=italic
-hi Constant       guifg=#E77E6E
-hi String         guifg=#3AD900
-hi Character      guifg=#E9C062
-hi Number         guifg=#FF7C9D
-hi Boolean        guifg=#FF7C9D
-hi Float          guifg=#FF7C9D
-hi Identifier     guifg=#FFEF92 gui=bold"#FF99E7"#FFEF92
-hi Function       guifg=#FFEF92 gui=bold"#FFAD51
-hi Statement      guifg=#FF9D00 gui=bold 
-hi Conditional    guifg=#FF9D00 gui=bold 
-hi Repeat         guifg=khaki
-hi Label          guifg=#E9C062
-hi Operator       guifg=#FFAC00 gui=bold 
-hi Keyword        guifg=#FF7C9D gui=bold "#E9C062
-hi Exception      guifg=khaki
-hi PreProc        guifg=khaki4
-hi Include        guifg=#A9C4D5 "Import
-hi Define         guifg=khaki1
-hi Macro          guifg=#9B703F
-hi PreCondit      guifg=#A9C4D5
-hi Type           guifg=#80FFBB gui=none"Filepath, IO, Maybe
-hi StorageClass   guifg=tan
-hi Structure      guifg=#FF9D00 "module
-hi Typedef        guifg=khaki3
-hi Special        guifg=#F2DD00
-hi SpecialChar    guifg=DarkGoldenrod
-hi Tag            guifg=DarkKhaki
-hi Delimiter      guifg=DarkGoldenrod
-hi SpecialComment guifg=cornsilk
-hi Debug          guifg=brown
-hi Underlined     guifg=#Cf6A4C
-hi Ignore         guifg=#666666
-hi Error          guifg=#CF6A4C    guibg=#420E09
-hi Todo           guifg=#7587A6    guibg=#0E2231
-hi Pmenu          guifg=#141414    guibg=#CDA869
-hi PmenuSel       guifg=#F8F8F8    guibg=#9B703F
-hi PmenuSbar      guibg=#DAEFA3
-hi PmenuThumb     guifg=#8F9D6A
-
-
diff --git a/colors/cobaltish.vim b/colors/cobaltish.vim
deleted file mode 100755
index 703533e..0000000
--- a/colors/cobaltish.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-" ==============================================================================
-"        File: cobaltish.vim
-"      Author: David Terei <davidterei@gmail.com>
-"		    URL: http://www.vim.org/scripts/script.php?script_id=3439
-" Last Change: Thu Feb 03 13:44:07 PST 2011
-"     Version: 1.0
-"     License: Distributed under the Vim charityware license.
-"     Summary: A colour scheme for Vim inspired by TextMates cobalt scheme.
-"
-" GetLatestVimScripts: 3439 1 :AutoInstall: cobaltish.vim
-"
-" Description:
-" A colour scheme for Vim that is based on TextMates cobalt colour scheme.
-" This scheme only supports GVim, it should work fine in Vim but no promises
-" are made about this or how it looks.
-"
-" History:
-"   Thu Feb 03, 2011 - 1.0:
-"     * Initial release - based of cobalt colour scheme.
-"
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="cobalt"
-
-hi Normal         guifg=#FFFFFF           guibg=#002240
-hi NonText        guifg=#E9E9E9           guibg=#002240
-hi CursorLine     guifg=NONE              guibg=#05192A
-hi Cursor         guifg=#101010           guibg=#F0F0F0
-hi CursorIM       guifg=#FFFFFF           guibg=#000000
-hi Directory      guifg=#A9C4D5
-hi ErrorMsg       guifg=#CF6A4C           guibg=#420E09
-hi VertSplit      guifg=#A9C4D5           guibg=#101010
-hi Folded         guifg=#F9EE98           guibg=#203560
-
-hi IncSearch      guifg=#000000           guibg=#CF6A4C
-hi LineNr         guifg=#7587A6           guibg=#000000
-hi ModeMsg        guifg=#CF7D34           guibg=#E9C062
-hi MoreMsg        guifg=#CF7D34           guibg=#E9C062
-hi Question       guifg=#7587A6           guibg=#0E2231
-hi Search         guifg=#420E09           guibg=#CF6A4C
-hi SpecialKey     guifg=#CF7D34           guibg=#141414
-hi StatusLine     guifg=#0E2231           guibg=#8693A5
-hi StatusLineNC   guifg=#7587A6           guibg=#F8F8F8
-hi Title          guifg=#8B98AB           guibg=#0E2231
-hi Visual         guifg=#0E2231           guibg=#AFC4DB
-hi WarningMsg     guifg=#CF6A4C           guibg=#420E09
-hi WildMenu       guifg=#AFC4DB           guibg=#0E2231
-
-"Syntax highlight groups
-
-hi Comment        guifg=#999999 gui=italic
-hi Constant       guifg=#E77E6E
-hi String         guifg=#3AD900
-hi Character      guifg=#E9C062
-hi Number         guifg=#FF627E
-hi Boolean        guifg=#CF6A4C
-hi Float          guifg=#F05A73
-hi Identifier     guifg=#7587a6 gui=bold
-hi Function       guifg=#FFAD51 gui=bold
-hi Statement      guifg=#FF9D00 gui=bold
-hi Conditional    guifg=#FF9D00 gui=bold
-hi Repeat         guifg=khaki
-hi Label          guifg=#E9C062
-hi Operator       guifg=#FFB054 gui=bold
-hi Keyword        guifg=#E9C062 gui=bold
-hi Exception      guifg=khaki
-hi PreProc        guifg=khaki4
-hi Include        guifg=#A9C4D5 "Import
-hi Define         guifg=khaki1
-hi Macro          guifg=#FF9D00
-hi PreCondit      guifg=#A9C4D5
-hi Type           guifg=#80FFBB "Filepath, IO, Maybe
-hi StorageClass   guifg=tan
-hi Structure      guifg=#FFEA72 "module
-hi Typedef        guifg=khaki3
-hi Special        guifg=#F2DD00
-hi SpecialChar    guifg=DarkGoldenrod
-hi Tag            guifg=DarkKhaki
-hi Delimiter      guifg=DarkGoldenrod
-hi SpecialComment guifg=cornsilk
-hi Debug          guifg=brown
-hi Underlined     guifg=#Cf6A4C
-hi Ignore         guifg=#666666
-hi Error          guifg=#CF6A4C    guibg=#420E09
-hi Todo           guifg=#7587A6    guibg=#0E2231
-hi Pmenu          guifg=#141414    guibg=#CDA869
-hi PmenuSel       guifg=#F8F8F8    guibg=#9B703F
-hi PmenuSbar      guibg=#DAEFA3
-hi PmenuThumb     guifg=#8F9D6A
-
diff --git a/colors/codeblocks_dark.vim b/colors/codeblocks_dark.vim
deleted file mode 100755
index 9bb32ae..0000000
--- a/colors/codeblocks_dark.vim
+++ /dev/null
@@ -1,139 +0,0 @@
-" Vim color file
-" Maintainer: Sergey Vlasov <sergey.vlsv@gmail.com>
-" Inspired by original Code::Blocks theme in a dark manner.
-
-set background=dark
-highlight clear
-let g:colors_name="codeblocks_dark"
-
-let save_cpo = &cpo
-set cpo&vim
-
-" basic highlight groups (:help highlight-groups) {{{
-
-" text {{{
-hi Normal       guifg=#D1D1D1       guibg=#121316       gui=NONE
-
-hi Folded       guifg=#c2bfa5       guibg=#050505       gui=underline
-hi LineNr		guifg=#928c75		guibg=#0B0B0D		gui=NONE
-hi Directory    guifg=#00bbdd       guibg=NONE          gui=bold
-hi NonText      guifg=#77ff22       guibg=NONE          gui=bold
-hi SpecialKey   guifg=#559933       guibg=NONE          gui=NONE
-
-hi SpellBad     guifg=NONE          guibg=NONE          gui=undercurl
-hi SpellCap     guifg=NONE          guibg=NONE          gui=undercurl
-hi SpellLocal   guifg=NONE          guibg=NONE          gui=undercurl
-hi SpellRare    guifg=NONE          guibg=NONE          gui=undercurl
-
-hi DiffAdd      guifg=#ffffff       guibg=#126493       gui=NONE
-hi DiffChange   guifg=#000000       guibg=#976398       gui=NONE
-hi DiffDelete   guifg=#000000       guibg=#be1923       gui=bold
-hi DiffText     guifg=#ffffff       guibg=#976398       gui=bold
-" }}}
-
-" borders / separators / menus {{{
-hi FoldColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold
-hi SignColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold
-
-hi Pmenu        guifg=#000000       guibg=#a6a190       gui=NONE
-hi PmenuSel     guifg=#ffffff       guibg=#133293       gui=NONE
-hi PmenuSbar    guifg=NONE          guibg=#555555       gui=NONE
-hi PmenuThumb   guifg=NONE          guibg=#cccccc       gui=NONE
-
-hi StatusLine   guifg=#000000       guibg=#c2bfa5       gui=bold
-hi StatusLineNC guifg=#444444       guibg=#c2bfa5       gui=NONE
-hi WildMenu     guifg=#ffffff       guibg=#133293       gui=bold
-hi VertSplit    guifg=#c2bfa5       guibg=#c2bfa5       gui=NONE
-
-hi TabLine      guifg=#000000       guibg=#c2bfa5       gui=NONE
-hi TabLineFill  guifg=#000000       guibg=#c2bfa5       gui=NONE
-hi TabLineSel   guifg=#ffffff       guibg=#133293       gui=NONE
-
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-" }}}
-
-" cursor / dynamic / other {{{
-hi Cursor       guifg=#000000       guibg=#ffff99       gui=NONE
-hi CursorIM     guifg=#000000       guibg=#aaccff       gui=NONE
-hi CursorLine   guifg=NONE          guibg=#1b1b1b       gui=NONE
-hi CursorColumn guifg=NONE          guibg=#1b1b1b       gui=NONE
-
-hi Visual       guifg=NONE			guibg=#344863 gui=NONE
-hi IncSearch    guifg=#000000       guibg=#eedd33       gui=bold
-hi Search       guifg=#efefd0       guibg=#A80F2B       gui=NONE
-hi MatchParen   guifg=#FFC124       guibg=#47360A       gui=bold
-
-"hi VisualNOS
-" }}}
-
-" listings / messages {{{
-hi ModeMsg      guifg=#eecc18       guibg=NONE          gui=NONE
-hi Title        guifg=#dd4452       guibg=NONE          gui=bold
-hi Question     guifg=#66d077       guibg=NONE          gui=NONE
-hi MoreMsg      guifg=#39d049       guibg=NONE          gui=NONE
-hi ErrorMsg     guifg=#ffffff       guibg=#ff0000       gui=bold
-hi WarningMsg   guifg=#ccae22       guibg=NONE          gui=bold
-" }}}
-
-" }}}
-
-" syntax highlighting groups {{{
-"*Comment	any comment
-hi Comment      guifg=#566E67       guibg=NONE          gui=NONE
-
-"*Constant		any constant
-" String		a string constant
-" Character		a character constant: 'c', '\n'
-" Number		a number constant: 234, 0xff
-" Boolean		a boolean constant: TRUE, false
-" Float			a floating point constant: 2.3e10
-hi Constant     guifg=#F34AFF       guibg=NONE          gui=NONE
-hi String       guifg=#4D63EB		guibg=NONE			gui=NONE
-hi Character	guifg=orange		guibg=NONE          gui=bold
-hi Boolean		guifg=#F34AFF       guibg=NONE          gui=bold
-
-"*PreProc		generic
-" Include		preprocessor #include
-" Define		preprocessor #define
-" Macro			same as Define
-" PreCondit		preprocessor #if, #else, #endif, etc.
-hi PreProc      guifg=#9FEF47       guibg=NONE          gui=NONE
-
-"*Type			int, long, char, etc.
-" StorageClass	static, register, volatile, etc.
-" Structure		struct, union, enum, etc.
-" Typedef		A typedef
-hi Type         guifg=#47ABF0       guibg=NONE          gui=bold
-
-"*Identifier	any variable name
-" Function		function name (also: methods for classes)
-
-" Statement		any statement
-" Conditional	if, then, else, endif, switch, etc.
-" Repeat		for, do, while, etc.
-" Label			case, default, etc.
-" Operator		sizeof, +, *, etc.
-" Keyword		any other keyword
-" Exception		try, catch, throw
-hi Statement    guifg=#47ABF0       guibg=NONE          gui=bold
-hi Operator     guifg=#EC2417       guibg=NONE          gui=NONE
-
-"*Special		any special symbol
-" SpecialChar	special character in a constant
-" Tag			you can use CTRL-] on this
-" Delimiter		character that needs attention
-" SpecialComment	special things inside a comment
-" Debug			debugging statements
-hi Special      guifg=#83E683		guibg=NONE          gui=bold
-hi SpecialChar	guifg=orange		guibg=NONE          gui=bold
-hi Delimiter	guifg=orange		guibg=NONE          gui=bold
-
-hi Underlined   guifg=#80a0ff       guibg=NONE          gui=underline
-hi Ignore       guifg=#888888       guibg=NONE          gui=NONE
-hi Error        guifg=#ffffff       guibg=#ff0000       gui=NONE
-hi Todo         guifg=#ffffff       guibg=#ee7700       gui=bold
-" }}}
-
-let &cpo = save_cpo
diff --git a/colors/codeburn.vim b/colors/codeburn.vim
deleted file mode 100755
index 8332bc3..0000000
--- a/colors/codeburn.vim
+++ /dev/null
@@ -1,203 +0,0 @@
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "codeburn-0.2"
-
-if version >= 700
-  " NERDTree current 
-  hi CursorLine guibg=#BFB7AD gui=none
-  "hi CursorColumn guibg=#e4e2e0
-  hi MatchParen guibg=black guifg=white gui=none
-
-  hi TabLineFill guifg=#BFB39C guibg=#BFB39C
-  hi TabLine guifg=gray40 guibg=#BFB39C gui=none
-  hi TabLineSel guifg=gray90 guibg=#AB9876 gui=none
-
-  "P-Menu (auto-completion)
-  hi Pmenu guifg=white guibg=#a4a2a0
-  "PmenuSel
-  "PmenuSbar
-  "PmenuThumb
-endif
-
-hi Normal    guifg=gray20   guibg=#dcd8d8
-
-hi ModeMsg guifg=gray10 guibg=#B3C71E gui=none
-hi MoreMsg guifg=gray10 guibg=#B3C71E gui=none
-hi Question guifg=gray10 guibg=#B3C71E gui=none
-hi WarningMsg guifg=#600000  gui=none guibg=#dcd8d8
-
-" Html-Titles
-hi Title      guifg=gray20 gui=none 
-
-hi Underlined  guifg=gray20 gui=underline
-hi Cursor    guifg=white   guibg=#888480
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#B0B1A1
-hi StatusLine guifg=gray90 guibg=#888480 gui=none
-
-" not current status line 
-hi StatusLineNC guifg=gray40 guibg=#ABA7A4 gui=none
-
-hi VertSplit guifg=#ABA7A4 guibg=#ABA7A4 gui=NONE
-
-" unused areas marked with ~
-hi NonText gui=none guifg=#dcd8d8
-
-hi Comment   guifg=#909090 gui=italic
-
-" ruby: symbols
-hi Constant  guifg=MediumSlateBlue 
-
-hi String    guifg=#3366cc
-hi String    guifg=DodgerBlue
-hi link Character String
-hi link Number Constant
-hi link Float Number
-
-" ruby: debug, mixin, scope, throw, python: def
-hi Statement guifg=gray20 gui=none
-hi Keyword guifg=#605118 gui=none
-
-" ruby: interpolation
-hi Operator gui=none
-
-" HTML: arguments
-" Ruby: classname
-hi Type  gui=none guifg=SaddleBrown
-
-" Python: Standard exceptions, True&False
-""hi Structure  guifg=Sienna gui=bold,underline
-
-" Ruby: method definitions and calls
-hi Identifier guifg=gray10
-hi Function   guifg=#c2590e
-
-hi Directory   guifg=SaddleBrown
-
-" do ..end
-hi Repeat guifg=#660000 gui=none
-
-" Ruby: if..else..end
-hi Conditional guifg=#990000
-
-" Ruby: require, labels in .vim, 
-hi PreProc    guifg=DarkGoldenrod gui=none
-
-hi Folded guifg=#64634B guibg=#c8c4c0 gui=none
-
-" Ruby: def..end, class..end
-""hi Define guifg=#784830
-
-" used by help tags * |
-hi Ignore guifg=#A8A890
-
-hi Error guifg=#a02000 guibg=white gui=underline
-
-hi Todo guifg=#6A7164 guibg=NONE gui=underline
-
-" search highlight
-hi Search guibg=#ccff66
-
-" Python: %(...)s - constructs, encoding, D: \n etc
-" Ruby: ""
-hi Special guifg=#808000 gui=none
-
-" color of <TAB>s etc...  , NERDTRee
-hi SpecialKey guifg=gray60 gui=italic
-
-
-" visual selection higlight
-hi Visual guibg=#ffff00
-
-" string interpolation
-hi Delimiter guifg=#666600 gui=bold
-
-" Diff
-hi DiffChange guifg=NONE guibg=#e4e2e0 gui=italic
-hi DiffText guifg=NONE guibg=#f0e0a0 gui=none
-hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=bold
-hi DiffDelete guifg=NONE guibg=#f0a0a0 gui=italic,bold
-
-hi link rubyBoolean Boolean
-hi link rubyComment Comment
-hi link rubyString String
-hi link rubyStringDelimiter String
-
-hi link htmlTag Type
-hi link htmlEndTag htmlTag
-hi link htmlTagName htmlTag
-
-hi link htmlArg Function
-
-hi link hamlHtmlTag htmlTagName
-hi link hamlPreDef hamlHtmlTag
-hi link hmlHtmlTagEndl hamlHtmlTag
-
-" hi rubyASCIICode
-hi rubyAccess guifg=Brown
-"hi rubyAttribute guifg=red gui=underline
-"hi rubyBlock                   gui=underline
-"hi rubyBlockArgument gui=underline
-hi rubyBlockParameter guifg=gray20
-hi link rubyClass Type
-
-""hi rubyClassVariable           gui=none        guifg=#556B2F     guibg=white
-""hi rubyConstant                gui=none        guifg=#DC143C     guibg=white
-
-" do..end begin rescue end
-hi link rubyControl Repeat
-
-"for somre reason begin end in erb is tied to this color instead of Conditional and Control
-hi link rubyBeginEnd Repeat 
-
-"hi rubyCurlyBlock guifg=#9C420C
-"hi rubyData                    gui=            guifg=            guibg=
-"hi rubyDataDirective           gui=            guifg=            guibg=
-hi link rubyDefine Function
-"hi rubyDelimEscape
-"hi rubyDoBlock guifg=SlateBlue guibg=red
-"hi rubyDocumentation           gui=            guifg=            guibg=
-"hi rubyError
-"hi rubyEscape
-"hi rubyEval
-hi rubyException               guifg=Red
-"hi rubyExprSubst               gui=underline        guifg=#FF4500
-"hi rubyFloat
-""hi rubyFunction                gui=none        guifg=#784830
-"hi rubyGlobalVariable          gui=none            guifg=cyan
-hi link rubyHeredocStart Comment
-hi link rubyHeredocEnd Comment
-"hi rubyIdentifier              gui=underline
-"hi rubyInclude                 gui=            guifg=            guibg=
-"hi rubyInstanceVariable        gui=none            guifg=gray20
-"hi rubyInteger
-"hi rubyInterpolation guifg=Orange
-"hi rubyIterator                gui=underline        guifg=black
-hi link rubyKeyword Normal
-" hi rubyKeywordAsMethod
-""hi rubyLocalVariableOrMethod gui=underline guifg=cyan
-hi link rubyModule Type
-"hi rubyNestedAngleBrackets
-"hi rubyNestedCurlyBraces gui=underline
-"hi rubyNestedParentheses
-"hi rubyNestedSquareBrackets
-"hi rubyNoDoBlock
-"hi rubyNoInterpolation
-"hi rubyNumber                  gui=            guifg=            guibg=
-hi link rubyOperator Normal
-"hi rubyOptDoBlock gui=underline
-"hi rubyOptDoLine
-hi rubyPredefinedConstant      guifg=gray30
-hi rubyPredefinedIdentifier    guifg=gray30
-hi rubyPredefinedVariable      guifg=gray30
-"hi rubyPseudoVariable
-"hi rubySharpBang               gui=            guifg=            guibg=
-"hi rubySpaceError
-hi rubySymbol guifg=Purple
-
-"hi rubyTodo                    gui=            guifg=            guibg=
diff --git a/colors/codeschool.vim b/colors/codeschool.vim
deleted file mode 100755
index 7ca4f4b..0000000
--- a/colors/codeschool.vim
+++ /dev/null
@@ -1,108 +0,0 @@
-" Vim color file
-" Converted from my Textmate Code School theme using Coloration
-" http://astonj.com
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "codeschool"
-
-hi Cursor ctermfg=16 ctermbg=145 cterm=NONE guifg=#182227 guibg=#9ea7a6 gui=NONE
-hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3f4b52 gui=NONE
-hi CursorLine ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
-hi CursorColumn ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
-hi ColorColumn ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#2e373b gui=NONE
-hi LineNr ctermfg=102 ctermbg=23 cterm=NONE guifg=#84898c guibg=#2a343a gui=NONE
-hi VertSplit ctermfg=59 ctermbg=59 cterm=NONE guifg=#252c31 guibg=#252c31 gui=NONE
-hi MatchParen ctermfg=180 ctermbg=NONE cterm=underline guifg=#dda790 guibg=NONE gui=underline
-hi StatusLine ctermfg=231 ctermbg=59 cterm=bold guifg=#f0f0f0 guibg=#575e61 gui=bold
-hi StatusLineNC ctermfg=231 ctermbg=59 cterm=NONE guifg=#f0f0f0 guibg=#575e61 gui=NONE
-hi Pmenu ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3f4b52 gui=NONE
-hi IncSearch ctermfg=16 ctermbg=107 cterm=NONE guifg=#182227 guibg=#8bb664 gui=NONE
-hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi Directory ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Folded ctermfg=247 ctermbg=16 cterm=NONE guifg=#9a9a9a guibg=#182227 gui=NONE
-
-hi Normal ctermfg=231 ctermbg=16 cterm=NONE guifg=#f0f0f0 guibg=#252c31 gui=NONE
-hi Boolean ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Character ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Comment ctermfg=247 ctermbg=NONE cterm=NONE guifg=#9a9a9a guibg=NONE gui=italic
-hi Conditional ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi Constant ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Define ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f0f0f0 guibg=#43820d gui=bold
-hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#880708 guibg=NONE gui=NONE
-hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f0f0f0 guibg=#1c3657 gui=NONE
-hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f0f0f0 guibg=#204a87 gui=bold
-hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi Float ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Function ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi Keyword ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi Label ctermfg=107 ctermbg=NONE cterm=NONE guifg=#8bb664 guibg=NONE gui=NONE
-hi NonText ctermfg=59 ctermbg=17 cterm=NONE guifg=#414e58 guibg=#232c31 gui=NONE
-hi Number ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi Operator ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi PreProc ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f0f0f0 guibg=NONE gui=NONE
-hi SpecialKey ctermfg=59 ctermbg=23 cterm=NONE guifg=#414e58 guibg=#252c31 gui=NONE
-hi Statement ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi StorageClass ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi String ctermfg=107 ctermbg=NONE cterm=NONE guifg=#8bb664 guibg=NONE gui=NONE
-hi Tag ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f0f0f0 guibg=NONE gui=bold
-hi Todo ctermfg=247 ctermbg=NONE cterm=inverse,bold guifg=#9a9a9a guibg=NONE gui=inverse,bold,italic
-hi Type ctermfg=153 ctermbg=NONE cterm=NONE guifg=#b5d8f6 guibg=NONE gui=NONE
-hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi rubyClass ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi rubyFunction ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi rubyConstant ctermfg=146 ctermbg=NONE cterm=NONE guifg=#bfabcb guibg=NONE gui=NONE
-hi rubyStringDelimiter ctermfg=107 ctermbg=NONE cterm=NONE guifg=#8bb664 guibg=NONE gui=NONE
-hi rubyBlockParameter ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi rubyInstanceVariable ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi rubyInclude ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi rubyGlobalVariable ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi rubyRegexp ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE
-hi rubyRegexpDelimiter ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE
-hi rubyEscape ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi rubyControl ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi rubyClassVariable ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi rubyOperator ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi rubyException ctermfg=180 ctermbg=NONE cterm=NONE guifg=#dda790 guibg=NONE gui=NONE
-hi rubyPseudoVariable ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi rubyRailsUserClass ctermfg=146 ctermbg=NONE cterm=NONE guifg=#bfabcb guibg=NONE gui=NONE
-hi rubyRailsARAssociationMethod ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi rubyRailsARMethod ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi rubyRailsRenderMethod ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi rubyRailsMethod ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi erubyComment ctermfg=247 ctermbg=NONE cterm=NONE guifg=#9a9a9a guibg=NONE gui=italic
-hi erubyRailsMethod ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi htmlTag ctermfg=111 ctermbg=NONE cterm=NONE guifg=#89bdff guibg=NONE gui=NONE
-hi htmlEndTag ctermfg=111 ctermbg=NONE cterm=NONE guifg=#89bdff guibg=NONE gui=NONE
-hi htmlTagName ctermfg=111 ctermbg=NONE cterm=NONE guifg=#89bdff guibg=NONE gui=NONE
-hi htmlArg ctermfg=111 ctermbg=NONE cterm=NONE guifg=#89bdff guibg=NONE gui=NONE
-hi htmlSpecialChar ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi javaScriptFunction ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi javaScriptRailsFunction ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlKey ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi yamlAnchor ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi yamlAlias ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi yamlDocumentHeader ctermfg=107 ctermbg=NONE cterm=NONE guifg=#8bb664 guibg=NONE gui=NONE
-hi cssURL ctermfg=74 ctermbg=NONE cterm=NONE guifg=#68a9eb guibg=NONE gui=NONE
-hi cssFunctionName ctermfg=186 ctermbg=NONE cterm=NONE guifg=#dad085 guibg=NONE gui=NONE
-hi cssColor ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi cssPseudoClassId ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi cssClassName ctermfg=153 ctermbg=NONE cterm=NONE guifg=#bcdbff guibg=NONE gui=NONE
-hi cssValueLength ctermfg=68 ctermbg=NONE cterm=NONE guifg=#3c98d9 guibg=NONE gui=NONE
-hi cssCommonAttr ctermfg=151 ctermbg=NONE cterm=NONE guifg=#a7cfa3 guibg=NONE gui=NONE
-hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
diff --git a/colors/coffee.vim b/colors/coffee.vim
deleted file mode 100755
index 284fb01..0000000
--- a/colors/coffee.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Maintainer:	David Lazar <david#c7.campus.utcluj.ro>
-" Last Change:	Fri Jan 31 01:08:13 UTC 2003
-" Version:	1.0
-" URL:		http://c7.campus.utcluj.ro/~david/coffee.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="coffee"
-
-hi Normal	gui=none	guibg= #514c44 guifg=#b0a594
-
-hi Cursor	gui=none	guibg=#ffffff	guifg=bg
-hi link CursorIM Cursor
-hi Directory					guifg=#ffffff
-hi DiffAdd			guibg=#9e9485	guifg=bg
-hi DiffDelete			guibg=#2e2b26	guifg=fg
-hi DiffChange			guibg=#70695e	guifg=fg
-hi DiffText			guibg=#70695e	guifg=#880000
-hi ErrorMsg			guibg=#880000	guifg=#ffffff
-hi Folded					guifg=#88c0c7
-hi FoldColumn					guifg=#88c0c7
-hi IncSearch			guifg=#fff0d6	guibg=#000000
-hi LineNr			guibg=#000000	guifg=#ffff21
-hi ModeMsg					guifg=#ffffff
-hi MoreMsg					guifg=#00ff00
-hi NonText					guifg=#61616d
-hi Question					guifg=#ffff00
-hi link Search IncSearch
-hi SpecialKey					guifg=#ffffff
-hi StatusLine			guibg=#000000	guifg=#deefff
-hi StatusLineNC			guibg=#395956	guifg=#a4b1bd
-hi VertSplit			guibg=#395956	guifg=#a4b1bd
-hi Title					guifg=#ffffff
-hi Visual			guifg=#fff0d6	guibg=#000000
-hi VisualNOS			guifg=#dddddd	guibg=bg
-hi WarningMsg					guifg=#ffff00
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment					guifg=#1a1813
-hi Constant					guifg=#cefece
-hi Identifier					guifg=#cc7c3d
-hi Statement					guifg=#effec5
-hi PreProc					guifg=#85ff85
-hi Type						guifg=#c6feeb
-hi Special					guifg=#eeffee
-hi Underlined	gui=underline			guifg=#ffffff
-hi Ignore					guifg=fg
-hi Error			guibg=bg	guifg=#ff4c4a
-hi Todo				guibg=#aa0006	guifg=#fff300
-
diff --git a/colors/coldgreen.vim b/colors/coldgreen.vim
deleted file mode 100755
index 747eebf..0000000
--- a/colors/coldgreen.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" Vim/GVim color scheme file (coldgreen.vim)
-" Maintainer:   Hideo Hattori
-" Version:      0.1
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "coldgreen"
-
-" Base setting
-hi Normal       ctermfg=grey        ctermbg=none        cterm=none      guifg=grey80    guibg=black
-hi NonText      ctermfg=grey        ctermbg=none        cterm=none      guifg=grey80    guibg=black
-
-hi Cursor       ctermfg=darkgreen   ctermbg=black       cterm=reverse   guibg=green
-hi CursorIM     ctermfg=darkmagenta ctermbg=darkred     cterm=reverse   guibg=magenta
-hi CursorLine                                           cterm=reverse   guibg=grey10
-hi CursorColumn                                         cterm=reverse   guibg=grey10
-
-hi LineNr       ctermfg=lightcyan   ctermbg=none        cterm=none      guifg=grey30    guibg=black
-hi StatusLine   ctermfg=black       ctermbg=white       cterm=none      guifg=black     guibg=lightblue     gui=none
-hi StatusLineNC ctermfg=grey        ctermbg=darkblue                    guifg=grey40    guibg=black         gui=reverse
-hi Search       ctermfg=grey        ctermbg=lightmagenta cterm=none     guifg=black     guibg=lightmagenta
-
-" Syntax Highlight
-hi Comment      ctermfg=lightblue   ctermbg=none                    guifg=#3366ff
-hi String       ctermfg=blue        ctermbg=none                    guifg=#66ffcc
-hi Number       ctermfg=none        ctermbg=none
-hi Special      ctermfg=cyan        ctermbg=none    cterm=none      guifg=#66ffcc                   gui=bold
-hi Keyword      ctermfg=lightgreen  ctermbg=none    cterm=none      guifg=lightgreen                gui=none
-
-hi Type         ctermfg=lightgreen  ctermbg=none
-hi Identifier   ctermfg=white       ctermbg=none    cterm=none      guifg=#66ffcc
-hi Function     ctermfg=lightcyan   ctermbg=none    cterm=none      guifg=white                     gui=none
-hi Statement    ctermfg=green       ctermbg=none                    guifg=#66ff66                   gui=none
-
-hi Conditional  ctermfg=green       ctermbg=none                    guifg=#00ff66
-hi Repeat       ctermfg=green       ctermbg=none                    guifg=#00ff66
-hi PreProc      ctermfg=lightcyan   ctermbg=none    cterm=none      guifg=#9966ff
-
-hi Constant     ctermfg=lightmagenta ctermbg=none                   guifg=#9966ff                   gui=none
-hi Character    ctermfg=cyan        ctermbg=none                    guifg=#66ffcc
-
-hi Todo         ctermfg=white       ctermbg=lightred    cterm=none  guifg=white     guibg=red
-
-" Python Syntax Highlight
-hi pythonBuiltin ctermfg=lightcyan  ctermbg=none                    guifg=white                     gui=none
-
-" Diff Syntax Highlight
-hi diffFile     ctermfg=yellow      ctermbg=none    cterm=none
-hi diffAdded    ctermfg=lightgreen  ctermbg=none
-hi diffRemoved  ctermfg=lightblue   ctermbg=none
-
diff --git a/colors/colorer.vim b/colors/colorer.vim
deleted file mode 100755
index 30e1277..0000000
--- a/colors/colorer.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Sergey V. Beduev <shaman@interdon.net>
-" Last Change: Sun Mar 28 11:19:38 EEST 2004
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "colorer"
-
-hi Normal	        ctermfg=Gray guifg=DarkGray guibg=black
-hi Visual	        ctermfg=DarkCyan guibg=black guifg=DarkCyan
-hi Comment	        ctermfg=Brown guifg=#B46918	gui=NONE
-hi PerlPOD	        ctermfg=Brown guifg=#B86A18	gui=NONE
-hi Constant	        ctermfg=White guifg=White gui=NONE
-hi Charachter	    ctermfg=Yellow guifg=Yellow	gui=NONE
-hi String           ctermfg=Yellow guifg=Yellow	gui=NONE
-hi Number	        ctermfg=White guifg=White gui=NONE
-hi Boolean	        ctermfg=Cyan guifg=DarkGray	gui=NONE
-hi Special	        ctermfg=DarkMagenta	guifg=Red gui=NONE
-hi Define	        ctermfg=LightMagenta guifg=Magenta gui=NONE
-hi Identifier 	    ctermfg=Green guifg=Green gui=NONE
-hi Exception 	    ctermfg=White guifg=White gui=NONE
-hi Statement 	    ctermfg=White guifg=White gui=NONE
-hi Label 	        ctermfg=White guifg=White gui=NONE
-hi Keyword 	        ctermfg=White guifg=White gui=NONE
-hi PreProc	        ctermfg=Green guifg=Green gui=NONE
-hi Type		        ctermfg=LightGreen guifg=Green gui=NONE
-hi Function	        ctermfg=White guifg=White gui=NONE
-hi Repeat	        ctermfg=White guifg=White gui=NONE
-hi Operator	        ctermfg=White guifg=White gui=NONE
-hi Ignore	        ctermfg=black guifg=bg
-hi Folded           ctermbg=LightBlue ctermfg=Gray guibg=DarkBlue guifg=DarkGray gui=NONE
-hi Error	        term=reverse ctermbg=Red ctermfg=White guibg=darkRed guifg=White gui=NONE
-hi Todo		        term=standout ctermbg=Yellow ctermfg=Black guifg=Black guibg=#AD5500 gui=NONE
-hi Done		        term=standout ctermbg=Gray ctermfg=White guifg=White guibg=Gray gui=NONE
-
-hi SpellErrors      ctermfg=DarkRed guifg=Black	gui=NONE
-
-hi MailQ            ctermfg=darkcyan guibg=black	gui=NONE
-hi MailQu           ctermfg=darkgreen guibg=black	gui=NONE
-hi MyDiffNew	    ctermfg=magenta guifg=red	gui=NONE
-hi MyDiffCommLine   ctermfg=white	ctermbg=red	guifg=white guibg=darkred gui=NONE
-hi MyDiffRemoved    ctermfg=LightRed guifg=red	gui=NONE
-hi MyDiffSubName    ctermfg=DarkCyan guifg=Cyan gui=NONE
-hi MyDiffNormal	    ctermbg=White ctermfg=black	guibg=White guifg=black	gui=NONE
-hi MoreMsg          gui=NONE
-hi ModeMsg          gui=NONE
-hi Title            gui=NONE
-hi NonText          gui=NONE
-hi DiffDelete       gui=NONE
-hi DiffText         gui=NONE
-hi StatusLine       guifg=black guibg=gray gui=NONE
-hi Question         gui=NONE
-" Common groups that link to default highlighting.
-" You can specify other highlighting easily.
-"hi link String	Constant
-"hi link Character	Constant
-"hi link Number		Constant
-"hi link Boolean	Constant
-hi link Float		Number
-hi link Conditional	Repeat
-hi link Include		PreProc
-hi link Structure	Define
-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 SpecialChar	Special
-hi link Delimiter	Normal
-hi link SpecialComment 	Special
-hi link Debug		Special
-
diff --git a/colors/colorful.vim b/colors/colorful.vim
deleted file mode 100755
index 4ccd15d..0000000
--- a/colors/colorful.vim
+++ /dev/null
@@ -1,133 +0,0 @@
-" Vim color file
-" A modified verion of habiLight color schemeversion of habiLight color scheme by Christian Habermann
-
-" Intro {{{1
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "colorful"
-
-" Normal {{{1
-hi Normal guifg=DarkBlue guibg=WhiteSmoke
-
-" Search {{{1
-hi IncSearch cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=UNDERLINE guifg=White guibg=NavyBlue
-hi Search term=reverse cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=NONE guifg=DarkBlue guibg=#FFE270
-
-" Messages {{{1
-hi ErrorMsg gui=BOLD guifg=#EB1513 guibg=NONE
-hi! link WarningMsg ErrorMsg
-hi ModeMsg gui=BOLD guifg=#0070ff guibg=NONE
-hi MoreMsg guibg=NONE guifg=seagreen
-hi! link Question MoreMsg
-
-" Split area {{{1
-hi StatusLineNC gui=NONE guibg=LightBlue guifg=white
-hi StatusLine gui=NONE guibg=SteelBlue guifg=WhiteSmoke
-hi! link VertSplit StatusLineNC
-hi WildMenu gui=BOLD guifg=White guibg=DarkSalmon
-
-" Diff {{{1
-hi DiffText   gui=NONE guifg=#f83010 guibg=#ffeae0
-hi DiffChange gui=NONE guifg=#006800 guibg=#d0ffd0
-hi DiffDelete gui=NONE guifg=#2020ff guibg=#c8f2ea
-hi! link DiffAdd DiffDelete
-
-" Cursor {{{1
-hi Cursor       gui=none guifg=White guibg=DarkBlue
-"hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold {{{1
-hi Folded gui=NONE guibg=#B5EEB5 guifg=black
-"hi FoldColumn gui=NONE guibg=#9FD29F guifg=black
-hi! link FoldColumn Folded
-
-" Other {{{1
-hi Directory    gui=NONE guifg=NavyBlue guibg=#FFE9E3
-hi BrowseDirectory gui=NONE guifg=Blue2 guibg=#FFE9E3
-hi BrowseCurDirectory gui=NONE guifg=Red4 guibg=#FFE9E3
-hi BrowseFile gui=NONE guifg=NavyBlue guibg=#E3EFFF
-hi BrowseSuffixes gui=none guifg=Gray50 guibg=bg
-hi LineNr       gui=NONE guifg=#8080a0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4000ff guibg=White
-"hi SpecialKey   gui=NONE guifg=#A35B00 guibg=NONE
-hi Title        gui=BOLD guifg=#1014AD guibg=NONE
-hi Visual term=reverse ctermfg=yellow ctermbg=black gui=NONE guifg=Black guibg=#D6E3F8
-hi VisualNOS term=reverse ctermfg=yellow ctermbg=black gui=UNDERLINE guifg=Black guibg=#BDDFFF
-
-" Syntax group {{{1
-hi Comment term=BOLD ctermfg=darkgray guifg=SteelBlue guibg=#F0F6FF
-hi Type term=UNDERLINE ctermfg=red gui=NONE guifg=#B91F49 guibg=#FFE3E5
-hi Error term=REVERSE ctermfg=15 ctermbg=9 guibg=Red guifg=White
-hi Identifier term=UNDERLINE ctermfg=Blue guifg=Blue
-hi Number   term=UNDERLINE ctermfg=red gui=NONE guifg=#00C226 guibg=#DBF8E3
-hi PreProc term=UNDERLINE ctermfg=darkblue guifg=#1071CE guibg=#E3EFFF
-hi Special term=BOLD ctermfg=darkmagenta guifg=red2
-hi Statement term=BOLD ctermfg=DarkRed gui=NONE guifg=#F06F00 guibg=#FCECE0
-hi Conditional term=BOLD ctermfg=DarkRed gui=NONE guifg=#F06F00 guibg=#FCECEE
-hi Tag term=BOLD ctermfg=DarkGreen guifg=DarkGreen
-hi Todo term=STANDOUT ctermbg=Yellow ctermfg=blue gui=BOLD guifg=DarkBlue guibg=Red
-hi Constant term=BOLD ctermfg=Blue gui=NONE guifg=Red4 guibg=#FEE6FF
-hi! link String	Constant
-hi! link Character	Constant
-hi! link Boolean	Constant
-hi! link Float		Number
-hi! link Function	Identifier
-hi! link Repeat	Statement
-hi! link Label		Statement
-hi! link Operator	Statement
-hi! link Keyword	Statement
-hi! link Exception	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 SpecialChar	Special
-hi! link Delimiter	Special
-hi! link SpecialComment Special
-hi! link Debug		Special
-
-" HTML {{{1
-hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
-" Tabs {{{1
-highlight TabLine     term=underline cterm=underline ctermfg=0 ctermbg=7 gui=underline guibg=LightGrey
-highlight TabLineFill term=reverse cterm=reverse gui=reverse
-highlight TabLineSel  term=bold cterm=bold gui=bold
-
-" Spell Checker {{{1
-if v:version >= 700
-    highlight SpellBad    term=reverse   ctermbg=12 gui=undercurl guisp=Red
-    highlight SpellCap    term=reverse   ctermbg=9  gui=undercurl guisp=Blue
-    highlight SpellRare   term=reverse   ctermbg=13 gui=undercurl guisp=Magenta
-    highlight SpellLocale term=underline ctermbg=11 gui=undercurl guisp=DarkCyan
-endif 
-
-" Completion {{{1
-highlight Pmenu      ctermbg=13  guifg=Black   guibg=#BDDFFF
-highlight PmenuSel   ctermbg=7   guifg=Black   guibg=Orange
-highlight PmenuSbar  ctermbg=7   guifg=#CCCCCC guibg=#CCCCCC
-highlight PmenuThumb cterm=reverse  gui=reverse guifg=Black   guibg=#AAAAAA
-
-" Misc {{{1
-highlight KDE              guifg=magenta gui=NONE
-highlight mySpecialSymbols guifg=magenta gui=NONE 
-
-
-highlight MatchParen  term=reverse ctermbg=11 gui=bold guibg=#B5EEB5 guifg=black
-
-
-" vim600:foldmethod=marker
diff --git a/colors/colorful256.vim b/colors/colorful256.vim
deleted file mode 100755
index 86fa476..0000000
--- a/colors/colorful256.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" Vim color file:  colorful256.vim
-" Last Change: 03 Oct, 2007
-" License: public domain
-" Maintainer:: Jagpreet<jagpreetc AT gmail DOT com>
-"
-" for a 256 color capable terminal
-" "{{{
-" You must set t_Co=256 before calling this colorscheme 
-"
-" Color numbers (0-255) see:
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-" 
-" Added gui colors
-"
-
-if &t_Co != 256 && ! has("gui_running")
-    echomsg ""
-    echomsg "colors not loaded first please set t_Co=256 in your .vimrc"
-    echomsg ""
-    finish
-endif
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "colorful256"
-
- highlight Normal       cterm=none    ctermfg=249 ctermbg=16  gui=none    guifg=#b2b2b2 guibg=#000000
- highlight Special      cterm=none    ctermfg=105 ctermbg=16  gui=none    guifg=#8787ff guibg=#000000
- highlight Comment      cterm=none    ctermfg=3   ctermbg=16  gui=none    guifg=#808000 guibg=#000000
- highlight Constant     cterm=none    ctermfg=9   ctermbg=16  gui=none    guifg=#ff0000 guibg=#000000
- highlight LineNr       cterm=none    ctermfg=48  ctermbg=16  gui=none    guifg=#00ff87 guibg=#000000
- highlight Number       cterm=none    ctermfg=209 ctermbg=16  gui=none    guifg=#ff875f guibg=#000000
- highlight PreProc      cterm=none    ctermfg=10  ctermbg=16  gui=none    guifg=#ff00ff guibg=#000000
- highlight Statement    cterm=none    ctermfg=51  ctermbg=16  gui=none    guifg=#00ffff guibg=#000000
- highlight Type         cterm=none    ctermfg=39  ctermbg=16  gui=none    guifg=#00afff guibg=#000000
- highlight Error        cterm=none    ctermfg=9   ctermbg=16  gui=none    guifg=#ff0000 guibg=#000000
- highlight Identifier   cterm=none    ctermfg=207 ctermbg=16  gui=none    guifg=#ff5fff guibg=#000000
- highlight SpecialKey   cterm=none    ctermfg=36  ctermbg=16  gui=none    guifg=#00af87 guibg=#000000
- highlight NonText      cterm=none    ctermfg=164 ctermbg=16  gui=none    guifg=#df00df guibg=#000000
- highlight Directory    cterm=none    ctermfg=34  ctermbg=16  gui=none    guifg=#00af00 guibg=#000000
- highlight ErrorMsg     cterm=none    ctermfg=9   ctermbg=16  gui=none    guifg=#ff0000 guibg=#000000
- highlight MoreMsg      cterm=none    ctermfg=34  ctermbg=16  gui=none    guifg=#00af00 guibg=#000000
- highlight Title        cterm=none    ctermfg=199 ctermbg=16  gui=none    guifg=#ff00af guibg=#000000
- highlight WarningMsg   cterm=none    ctermfg=9   ctermbg=16  gui=none    guifg=#ff0000 guibg=#000000
- highlight DiffDelete   cterm=none    ctermfg=207 ctermbg=16  gui=none    guifg=#ff5fff guibg=#000000
- highlight Search       cterm=none    ctermfg=15  ctermbg=160 gui=none    guifg=#ffffff guibg=#df0000
- highlight Visual       cterm=none    ctermfg=16  ctermbg=50  gui=none    guifg=#000000 guibg=#00ffdf
- highlight Cursor       cterm=none    ctermfg=16  ctermbg=33  gui=none    guifg=#000000 guibg=#0087ff
- highlight StatusLine   cterm=reverse ctermfg=58  ctermbg=15  gui=reverse guifg=#5f5f00 guibg=#ffffff
- highlight Question     cterm=none    ctermfg=16  ctermbg=226 gui=none    guifg=#000000 guibg=#ffff00
- highlight Todo         cterm=none    ctermfg=160 ctermbg=184 gui=none    guifg=#df0000 guibg=#dfdf00
- highlight Folded       cterm=none    ctermfg=15  ctermbg=58  gui=none    guifg=#ffffff guibg=#5f5f00
- highlight ModeMsg      cterm=none    ctermfg=16  ctermbg=46  gui=none    guifg=#000000 guibg=#00ff00
- highlight VisualNOS    cterm=none    ctermfg=16  ctermbg=28  gui=none    guifg=#000000 guibg=#008700
- highlight WildMenu     cterm=none    ctermfg=16  ctermbg=226 gui=none    guifg=#000000 guibg=#ffff00
- highlight FoldColumn   cterm=none    ctermfg=15  ctermbg=58  gui=none    guifg=#ffffff guibg=#5f5f00
- highlight SignColumn   cterm=none    ctermfg=16  ctermbg=28  gui=none    guifg=#000000 guibg=#008700
- highlight DiffText     cterm=none    ctermfg=16  ctermbg=34  gui=none    guifg=#000000 guibg=#00af00
- highlight StatusLineNC cterm=reverse ctermfg=131 ctermbg=15  gui=reverse guifg=#af5f5f guibg=#ffffff
- highlight VertSplit    cterm=reverse ctermfg=172 ctermbg=15  gui=reverse guifg=#df8700 guibg=#ffffff
- highlight User1        cterm=none    ctermbg=20  ctermfg=15  gui=none    guibg=#0000df guifg=#ffffff
- highlight User2        cterm=none    ctermbg=20  ctermfg=46  gui=none    guibg=#0000df guifg=#00ff00
- highlight User3        cterm=none    ctermbg=20  ctermfg=46  gui=none    guibg=#0000df guifg=#00ff00
- highlight User4        cterm=none    ctermbg=20  ctermfg=50  gui=none    guibg=#0000df guifg=#00ffdf
- highlight User5        cterm=none    ctermbg=20  ctermfg=46  gui=none    guibg=#0000df guifg=#00ff00
-
-" for groups introduced in version 7
-if v:version >= 700
-   highlight Pmenu       cterm=none ctermfg=16 ctermbg=165 gui=none guifg=#000000 guibg=#df00ff
-   highlight PmenuSel    cterm=none ctermfg=16 ctermbg=220 gui=none guifg=#000000 guibg=#ffdf00
-   highlight tablinesel  cterm=none ctermfg=15 ctermbg=58  gui=none guifg=#ffffff guibg=#5f5f00
-   highlight tabline     cterm=none ctermfg=7  ctermbg=58  gui=none guifg=#c0c0c0 guibg=#5f5f00
-   highlight tablinefill cterm=none ctermfg=58 ctermbg=58  gui=none guifg=#5f5f00 guibg=#5f5f00
-endif
-
-"for taglist plugin
-"
-if exists('loaded_taglist')
-   highlight TagListTagName  cterm=none ctermfg=16  ctermbg=28 gui=none guifg=#000000 guibg=#008700
-   highlight TagListTagScope cterm=none ctermfg=16  ctermbg=28 gui=none guifg=#000000 guibg=#008700
-   highlight TagListTitle    cterm=none ctermfg=199 ctermbg=16 gui=none guifg=#ff00af guibg=#000000
-   highlight TagListComment  cterm=none ctermfg=16  ctermbg=28 gui=none guifg=#000000 guibg=#008700
-   highlight TagListFileName cterm=none ctermfg=15  ctermbg=90 gui=none guifg=#ffffff guibg=#870087
-endif
diff --git a/colors/colorscheme_template.vim b/colors/colorscheme_template.vim
deleted file mode 100755
index 660a199..0000000
--- a/colors/colorscheme_template.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" Vim color file
-" Maintainer:   Your name <youremail@something.com>
-" Last Change:  
-" URL:		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-" your pick:
-set background=dark	" or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="mycolorscheme"
-
-"hi Normal
-
-" OR
-
-" highlight clear Normal
-" set background&
-" highlight clear
-" if &background == "light"
-"   highlight Error ...
-"   ...
-" else
-"   highlight Error ...
-"   ...
-" endif
-
-" A good way to see what your colorscheme does is to follow this procedure:
-" :w 
-" :so % 
-"
-" Then to see what the current setting is use the highlight command.  
-" For example,
-" 	:hi Cursor
-" gives
-"	Cursor         xxx guifg=bg guibg=fg 
- 	
-" Uncomment and complete the commands you want to change from the default.
-
-"hi Cursor		
-"hi CursorIM	
-"hi Directory	
-"hi DiffAdd		
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-"hi ErrorMsg	
-"hi VertSplit	
-"hi Folded		
-"hi FoldColumn	
-"hi IncSearch	
-"hi LineNr		
-"hi ModeMsg		
-"hi MoreMsg		
-"hi NonText		
-"hi Question	
-"hi Search		
-"hi SpecialKey	
-"hi StatusLine	
-"hi StatusLineNC	
-"hi Title		
-"hi Visual		
-"hi VisualNOS	
-"hi WarningMsg	
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-"hi Comment
-"hi Constant	
-"hi Identifier	
-"hi Statement	
-"hi PreProc	
-"hi Type		
-"hi Special	
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-"hi Todo		
-
diff --git a/colors/colorzone.vim b/colors/colorzone.vim
deleted file mode 100755
index 0b26f8f..0000000
--- a/colors/colorzone.vim
+++ /dev/null
@@ -1,168 +0,0 @@
-"Vim color file
-"Maintainer: Ricky Wu <richiewu at live dot com>
-"Note:       If your terminal can use RGB colors, use this escape sequence colors:
-"            ff888a85,ffef2929,ff8ae234,ffe9b96e,ff00bfff,ffda70d6,ff87ceeb,ffeeeeec
-"            grey     red      green    yellow   blue     magenta  cyan     white
-"            The Terminal colors and GUI colors are diffrent.
-
-"First remove all existing highlighting.
-set background=light
-if version > 580
- "no guarantees for version 5.8 and below
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-let colors_name = "colorzone"
-
-"High Light For Normal
-hi Normal  ctermfg=black ctermfg=yellow guifg=#2e3436 guibg=#eeeeec
-hi NonText ctermfg=black guifg=#eeeeec  guibg=#eeeeec
-
-"Cursor
-hi Cursor       cterm=reverse ctermbg=red   ctermfg=white guibg=#ef2929 guifg=white
-hi CursorIM     cterm=reverse ctermbg=red   ctermfg=white guibg=#ef2929 guifg=white
-hi CursorLine   ctermbg=none  ctermfg=magenta  guibg=#eeeeec guifg=#e06800
-hi CursorColumn ctermbg=none  ctermfg=none  guibg=#555753
-
-"Symbol
-hi Directory    ctermfg=blue   guifg=#3465a4
-hi MatchParen   ctermfg=yellow guibg=#fcaf3e guifg=black
-
-"Messages
-hi ModeMsg    ctermfg=red    guifg=red
-hi MoreMsg    ctermfg=green  guifg=#4e9a06
-hi WarningMsg ctermfg=yellow guifg=#cc0000
-hi ErrorMsg   ctermbg=red    ctermfg=white   guibg=#cc0000 guifg=#eeeeec
-
-"Menu
-"hi Pmenu      ctermbg=yellow   ctermfg=blue guibg=#87ceeb guifg=black
-hi Pmenu      cterm=none     ctermbg=green   ctermfg=white  guibg=#6b8e23 guifg=white
-hi PmenuSel   cterm=none     ctermbg=blue    ctermfg=yellow guibg=#fcaf3e guifg=black
-hi PmenuSbar  ctermbg=none   ctermfg=grey    guibg=#2e3436  guifg=white
-hi PmenuThumb ctermfg=cyan   guibg=#2e3436   guifg=white
-hi WildMenu   ctermbg=cyan   guibg=#edd400   guifg=#888a85
-
-"Search
-"hi Search ctermbg=LightRed ctermfg=white guibg=#ff4500 guifg=white
-hi Search     ctermfg=yellow   ctermbg=LightRed guibg=#fcaf3e guifg=black
-hi IncSearch  cterm=reverse    gui=reverse
-
-hi Question   ctermfg=green    guifg=#4e9a06
-hi Title      ctermfg=green    guifg=#4e9a06
-
-"Fold
-hi Folded     ctermfg=blue     guibg=#d3d7cf guifg=#204a87
-hi FoldColumn ctermfg=grey     guibg=#888a85 guifg=#204a87
-
-"Vim Diff
-hi DiffAdd    ctermfg=green    guifg=white guibg=#6b8e23
-hi DiffChange ctermfg=yellow   guifg=white guibg=#f57900
-hi DiffDelete ctermfg=red      guifg=white guibg=#cc0000
-hi DiffText   ctermfg=blue     guifg=white guibg=#3465a4 gui=none
-
-"Spell cheking
-hi SpellBad   ctermfg=red      guifg=red
-hi SpellCap   ctermfg=green    guifg=green
-hi SpellLocal ctermfg=brown    guifg=brown
-hi SpellRare  ctermfg=yellow   guifg=yellow
-
-"Debugging 
-hi Debug      ctermfg=red      guifg=red
-
-"Colors for comments
-hi Comment    ctermfg=darkgrey guifg=#888a87 
-hi SpecialComment ctermfg=grey guifg=#2e3436
-hi SpecialKey ctermfg=cyan     guifg=#3465a4
-
-"Syntax elements
-hi Builtin    ctermfg=lightblue  guifg=#e06800
-hi vimFuncName ctermfg=Lightblue guifg=#e06800
-hi Condition  ctermfg=cyan       guifg=#4e9a06
-hi Delimiter  ctermfg=yellow     guifg=#4e9a06
-hi Function   ctermfg=blue       guifg=blue
-hi Identifier ctermfg=yellow     gui=none       guifg=#000000
-hi Keyword    ctermfg=yellow     guifg=#4e9a06
-hi Label      ctermfg=yellow     guifg=#8a2be2
-hi NameSpace  ctermfg=green      guifg=green
-hi Operator   ctermfg=white      guifg=#4169e1
-hi Repeat     ctermfg=cyan       guifg=#4e9a06
-hi Statement  ctermfg=Lightgreen gui=none       guifg=#4e9a06
-
-"The name of functions methods and classes 
-hi Type      ctermfg=green   gui=none guifg=#4e9a06
-hi Boolean   ctermfg=red     guifg=red
-hi Character ctermfg=magenta guifg=magenta
-hi Constant  ctermfg=red     guifg=#ce5c00 
-hi Float     ctermfg=red     guifg=red
-hi Number    ctermfg=magenta guifg=#ff00ff
-hi String    ctermfg=cyan    guifg=#8a2be2
-
-"The special characters
-hi Special     ctermfg=magenta   guifg=#ce5c00  guibg=#eeeeec
-hi SpecialChar ctermfg=red   guifg=red
-hi Underlined  ctermfg=blue  guifg=#204a87
-
-"The preprocessors
-hi PageMark    ctermfg=LightCyan   guifg=#4169e1
-"Like '#define' in C/C++ language
-hi Define      ctermfg=blue        guifg=blue
-hi Macro       ctermfg=magenta     guifg=#4169e1
-"The included sources
-hi Include     ctermfg=magenta     guifg=#4169e1
-
-"Text marking
-hi Ignore      ctermfg=grey        guifg=#555753
-hi Todo        ctermfg=yellow      guibg=#fce94f     guifg=#204a87
-hi Exception   ctermfg=magenta     guifg=magenta
-hi Error       ctermfg=red         guibg=#8a2be2     guifg=white
-
-"Embed statement
-hi SQL_Statement  ctermfg=LightMagenta guifg=#9400d3
-hi CICS_Statement ctermfg=LightMagenta guifg=#4e9a06
-
-hi TabLine        ctermbg=none ctermfg=darkgrey guifg=red
-hi TabLineSel     ctermbg=none ctermfg=red      guifg=red 
-hi TabLineFill    cterm=none   guifg=#2e3436    guibg=blue
-
-"Tags which can use <C-]> on
-hi Tag            ctermfg=magenta  guifg=magenta
-
-"Windows elements
-hi VertSplit  ctermbg=white   gui=reverse   guibg=#2e3436 guifg=#eeeeec
-hi Visual     cterm=none      ctermbg=green ctermfg=white gui=none  guibg=#6b8e23 guifg=white
-hi VisualNOS  cterm=underline gui=underline
-hi LineNr     ctermfg=darkgrey   guifg=#2e3436
-hi SignColumn cterm=none      ctermbg=none ctermfg=red gui=none guifg=black guibg=#eeeeec 
-
-"StatusLine
-hi StatusLine cterm=none ctermbg=none ctermfg=cyan guibg=#fff8dc guifg=black gui=none 
-hi StatusLineNC cterm=none ctermbg=none ctermfg=darkgrey guibg=#fff8dc guifg=#555753 gui=none
-hi StatuslineBufNr cterm=none ctermfg=black ctermbg=cyan gui=none guibg=#840c0c guifg=#ffffff
-hi StatuslineFlag cterm=none ctermfg=black ctermbg=cyan gui=none guibg=#f57900 guifg=black
-"hi StatuslinePath cterm=none ctermfg=white ctermbg=green gui=none guibg=#fff8dc guifg=black
-"hi StatuslineFileName cterm=none ctermfg=white ctermbg=blue gui=none guibg=#ffc0cb guifg=black
-"hi StatuslineFileType cterm=none ctermbg=white ctermfg=black gui=none guibg=#87ceeb guifg=black
-"hi StatuslineFileEnc cterm=none ctermfg=white ctermbg=yellow gui=none guibg=#fff8dc guifg=black
-"hi StatuslineChar cterm=none ctermbg=white ctermfg=yellow gui=none guibg=#fff8dc guifg=black
-hi StatuslinePosition cterm=none ctermfg=white ctermbg=magenta gui=none guibg=#8a2be2 guifg=white
-"hi StatuslinePercent cterm=reverse ctermfg=white ctermbg=red gui=none guibg=#ffc0cb guifg=black
-hi StatuslineCapsBuddy cterm=none ctermfg=white ctermbg=green gui=none guibg=#8ae234 guifg=black
-"hi StatuslineTime cterm=none ctermfg=black ctermbg=cyan gui=none guibg=#fff8dc guifg=black
-"hi StatuslineSyn cterm=none ctermbg=white ctermfg=yellow gui=none guibg=#60af9f guifg=black
-"hi StatuslineRealSyn cterm=none ctermbg=white ctermfg=yellow gui=none guibg=#5881b7 guifg=black
-"hi StatuslineTermEnc cterm=none ctermbg=white ctermfg=yellow gui=none guibg=#77cf77 guifg=black
-
-"----------
-"This color scheme uses a light grey background.
-"Based on "tango-morning" and "wargreycolorscheme" color scheme 
-"Tango color palette: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette
-"Version:0.1: Initial vesion
-"Version:0.2: Merge with tango-morning
-"Version:0.3: Optimized for PLI and vim syntax
-"Version:0.4: 2010 March 11, Changes for some fields' color and highlighting for c/c++
-"Version:0.5: 2010 June 02, Little changes for some fields' color and statusline
-"Version:1.0: 2010 June: Optimize cterm colors and changes for gui 
-"             This version support both term and gui very well
-"vim: sw=2
diff --git a/colors/contrasty.vim b/colors/contrasty.vim
deleted file mode 100755
index d5e6b7d..0000000
--- a/colors/contrasty.vim
+++ /dev/null
@@ -1,232 +0,0 @@
-" Contrasty colour scheme
-" Author: Ben Schmidt
-" Version: 3
-
-" Set general colour options.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = expand('<sfile>:t:r')
-
-" COLOR KEYWORDS
-
-" Black DarkBlue DarkGreen DarkCyan DarkRed DarkMagenta Brown Grey
-" DarkGrey Blue Green Cyan Red Magenta Yellow White
-
-" GENERAL HIGHLIGHTS
-
-" 	Normal		normal text (should be set first)
-hi Normal term=none
-hi Normal cterm=none ctermfg=White ctermbg=Black
-hi Normal gui=none guifg=White guibg=Black
-" 	Cursor		the character under the cursor
-hi Cursor term=inverse
-hi Cursor cterm=none ctermfg=bg ctermbg=fg
-hi Cursor gui=none guifg=bg guibg=fg
-" 	CursorIM	like Cursor, but used when in IME mode |CursorIM|
-hi CursorIM term=inverse
-hi CursorIM cterm=none ctermfg=bg ctermbg=fg
-hi CursorIM gui=none guifg=bg guibg=fg
-" 	Directory	directory names (and other special names in listings)
-hi Directory term=bold
-hi Directory cterm=none ctermfg=Yellow ctermbg=bg
-hi Directory gui=none guifg=#ffff00 guibg=bg
-" 	DiffAdd		diff mode: Added line |diff.txt|
-hi DiffAdd term=none
-hi DiffAdd cterm=none ctermfg=Brown ctermbg=bg
-hi DiffAdd gui=none guifg=#ccaa44 guibg=bg
-" 	DiffChange	diff mode: Changed line |diff.txt|
-hi DiffChange term=bold
-hi DiffChange cterm=none ctermfg=Yellow ctermbg=bg
-hi DiffChange gui=none guifg=#ffff00 guibg=bg
-" 	DiffDelete	diff mode: Deleted line |diff.txt|
-hi DiffDelete term=none
-hi DiffDelete cterm=none ctermfg=DarkGrey ctermbg=bg
-hi DiffDelete gui=none guifg=#777777 guibg=bg
-" 	DiffText	diff mode: Changed text within a changed line |diff.txt|
-hi DiffText term=bold,underline
-hi DiffText cterm=none ctermfg=Red ctermbg=bg
-hi DiffText gui=none guifg=#ff8800 guibg=bg
-" 	ErrorMsg	error messages on the command line
-hi ErrorMsg term=inverse
-hi ErrorMsg cterm=none ctermfg=White ctermbg=DarkRed
-hi ErrorMsg gui=none guifg=White guibg=#770000
-" 	VertSplit	the column separating vertically split windows
-hi! link VertSplit StatusLine
-" 	Folded		line used for closed folds
-hi Folded term=bold
-hi Folded cterm=bold ctermfg=fg ctermbg=bg
-hi Folded gui=bold guifg=fg guibg=bg
-" 	FoldColumn	'foldcolumn'
-hi! link FoldColumn StatusLine
-" 	IncSearch	'incsearch' highlighting; also used for the text replaced with
-" 			":s///c"
-hi! link IncSearch Search
-" 	LineNr		line number for ":number" and ":#" commands, and when 'number'
-" 			option is set.
-hi! link LineNr StatusLine
-" 	ModeMsg		'showmode' message (e.g., "-- INSERT --")
-hi! link ModeMsg StatusLine
-" 	MoreMsg		|more-prompt|
-hi! link MoreMsg StatusLine
-" 	NonText		'~' and '@' at the end of the window, characters from
-" 			'showbreak' and other characters that do not really exist in
-" 			the text (e.g., ">" displayed when a double-wide character
-" 			doesn't fit at the end of the line).
-hi NonText term=none
-hi NonText cterm=none ctermfg=DarkGrey ctermbg=bg
-hi NonText gui=none guifg=#777777 guibg=bg
-" 	Question	|hit-enter| prompt and yes/no questions
-hi! link Question StatusLine
-" 	Search		Last search pattern highlighting (see 'hlsearch').
-" 			Also used for highlighting the current line in the quickfix
-" 			window and similar items that need to stand out.
-hi Search term=inverse
-hi Search cterm=none ctermfg=bg ctermbg=fg
-hi Search gui=none guifg=bg guibg=fg
-" 	SpecialKey	Meta and special keys listed with ":map", also for text used
-" 			to show unprintable characters in the text, 'listchars'.
-" 			Generally: text that is displayed differently from what it
-" 			really is.
-hi SpecialKey term=bold
-hi SpecialKey cterm=none ctermfg=DarkCyan ctermbg=bg
-hi SpecialKey gui=none guifg=#007777 guibg=bg
-" 	StatusLine	status line of current window
-hi StatusLine term=bold,inverse
-hi StatusLine cterm=none ctermfg=Black ctermbg=White
-hi StatusLine gui=none guifg=Black guibg=White
-" 	StatusLineNC	status lines of not-current windows
-" 			Note: if this is equal to "StatusLine" Vim will use "^^^" in
-" 			the status line of the current window.
-hi StatusLineNC term=inverse
-hi StatusLineNC cterm=none ctermfg=DarkGrey ctermbg=White
-hi StatusLineNC gui=none guifg=#777777 guibg=White
-"  TabLine		tab pages line, not active tab page label
-hi TabLine term=none
-hi TabLine cterm=none ctermfg=yellow ctermbg=DarkGrey
-hi TabLine gui=none guifg=yellow guibg=#777777
-"  TabLineFill	tab pages line, where there are no labels
-hi TabLineFill term=none
-hi TabLineFill ctermfg=DarkGrey
-hi TabLineFill guifg=#777777
-"  TabLineSel	tab pages line, active tab page label
-hi TabLineSel term=inverse
-hi TabLineSel cterm=none ctermfg=yellow ctermbg=Black
-hi TabLineSel gui=none guifg=yellow guibg=Black
-" 	Title		titles for output from ":set all", ":autocmd" etc.
-hi Title term=bold,underline
-hi Title cterm=none ctermfg=Yellow ctermbg=bg
-hi Title gui=none guifg=#ffff00 guibg=bg
-" 	Visual		Visual mode selection
-hi Visual term=inverse
-hi Visual cterm=none ctermfg=bg ctermbg=fg
-hi Visual gui=none guifg=bg guibg=fg
-" 	VisualNOS	Visual mode selection when vim is "Not Owning the Selection".
-" 			Only X11 Gui's |gui-x11| and |xterm-clipboard| supports this.
-hi! link VisualNOS Visual
-" 	WarningMsg	warning messages
-hi! link WarningMsg StatusLine
-" 	WildMenu	current match in 'wildmenu' completion
-hi WildMenu term=bold,inverse
-hi WildMenu cterm=none ctermfg=bg ctermbg=Yellow
-hi WildMenu gui=none guifg=bg guibg=#ffff00
-
-" DEFAULT SYNTAX HIGHLIGHTS
-
-" 	*Comment	any comment
-hi Comment term=bold
-hi Comment cterm=none ctermfg=Cyan ctermbg=bg
-hi Comment gui=none guifg=#00ccff guibg=bg
-" 	*Constant	any constant
-" 	 String		a string constant: "this is a string"
-" 	 Character	a character constant: 'c', '\n'
-" 	 Number		a number constant: 234, 0xff
-" 	 Boolean	a boolean constant: TRUE, false
-" 	 Float		a floating point constant: 2.3e10
-hi Constant term=none
-hi Constant cterm=none ctermfg=Brown ctermbg=bg
-hi Constant gui=none guifg=#ccaa44 guibg=bg
-hi! link Literal Normal
-hi! link String Literal
-hi! link Character Literal
-hi! link Number Literal
-hi! link Boolean Constant
-hi! link Float Literal
-" 	*Identifier	any variable name
-" 	 Function	function name (also: methods for classes)
-hi Identifier term=none
-hi Identifier cterm=none ctermfg=Magenta ctermbg=bg
-hi Identifier gui=none guifg=#ff00ff guibg=bg
-hi! link Function Statement
-" 	*Statement	any statement
-" 	 Conditional	if, then, else, endif, switch, etc.
-" 	 Repeat		for, do, while, etc.
-" 	 Label		case, default, etc.
-" 	 Operator	"sizeof", "+", "*", etc.
-" 	 Keyword	any other keyword
-" 	 Exception	try, catch, throw
-hi Statement term=underline
-hi Statement cterm=none ctermfg=Yellow ctermbg=bg
-hi Statement gui=none guifg=#ffff00 guibg=bg
-hi! link Conditional Statement
-hi! link Repeat Statement
-hi! link Label Statement
-hi! link Operator Normal
-hi! link Keyword Statement
-hi! link Exception Statement
-" 	*PreProc	generic Preprocessor
-" 	 Include	preprocessor #include
-" 	 Define		preprocessor #define
-" 	 Macro		same as Define
-" 	 PreCondit	preprocessor #if, #else, #endif, etc.
-hi PreProc term=none
-hi PreProc cterm=none ctermfg=Magenta ctermbg=bg
-hi PreProc gui=none guifg=#ff00ff guibg=bg
-hi! link Include PreProc
-hi! link Define PreProc
-hi! link Macro PreProc
-hi! link PreCondit PreProc
-" 	*Type		int, long, char, etc.
-" 	 StorageClass	static, register, volatile, etc.
-" 	 Structure	struct, union, enum, etc.
-" 	 Typedef	A typedef
-hi Type term=none
-hi Type cterm=none ctermfg=Brown ctermbg=bg
-hi Type gui=none guifg=#ccaa44 guibg=bg
-hi! link StorageClass Type
-hi! link Structure Type
-hi! link Typedef Type
-" 	*Special	any special symbol
-" 	 SpecialChar	special character in a constant
-" 	 Tag		you can use CTRL-] on this
-" 	 Delimiter	character that needs attention
-" 	 SpecialComment	special things inside a comment
-" 	 Debug		debugging statements
-hi Special term=bold
-hi Special cterm=none ctermfg=DarkCyan ctermbg=bg
-hi Special gui=none guifg=#007777 guibg=bg
-hi! link SpecialChar Special
-hi! link Tag Special
-hi! link Delimiter Normal
-hi! link SpecialComment Special
-hi! link Debug Special
-" 	*Underlined	text that stands out, HTML links
-hi Underlined term=underline
-hi Underlined cterm=underline ctermfg=fg ctermbg=bg
-hi Underlined gui=underline guifg=fg guibg=bg
-" 	*Ignore		left blank, hidden
-" hi Ignore term=?
-hi Ignore cterm=none ctermfg=bg ctermbg=bg
-hi Ignore gui=none guifg=bg guibg=bg
-" 	*Error		any erroneous construct
-hi Error term=inverse
-hi Error cterm=none ctermfg=White ctermbg=DarkRed
-hi Error gui=none guifg=White guibg=#770000
-" 	*Todo		anything that needs extra attention; mostly the
-" 			keywords TODO FIXME and XXX
-hi Todo term=inverse
-hi Todo cterm=none ctermfg=Red ctermbg=Black
-hi Todo gui=none guifg=#ff0000 guibg=Black
-
diff --git a/colors/cool.vim b/colors/cool.vim
deleted file mode 100755
index a7593d9..0000000
--- a/colors/cool.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-" Vim color file
-" Maintainer:	Gergely Kontra <kgergely@mcl.hu>
-" Last Change:	2002. 07. 03.
-" Based on scite colors.
-" I've changed my mind, and inverted the colors.
-" After an hour, this is the result.
-" Not resembles to scite's colors :-]
-" I'm a bit red-blind, so if you have suggestions, don't hesitate :)
-"           ^^^^^^^^^ Sorry, I cannot speak English well, just want to say,
-"           that in some rare cases I cannot distinguish between some colors
-"           (I've just realized it, when I see some special tests)
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "cool"
-
-
-" GUI
-"highlight Normal	guifg=#77BBFF	guibg=#304060
-highlight Normal	guifg=#77BBFF	guibg=#102040
-highlight Normal	ctermfg=LightBlue	ctermbg=Black
-
-highlight Comment	guifg=#EEEEEE	guibg=#393939
-highlight Comment	ctermfg=white	ctermbg=DarkGrey
-
-highlight Constant	gui=underline
-highlight Constant	ctermfg=LightBlue cterm=bold,underline
-
-highlight Cursor	guifg=#999999	guibg=#FFFFFF
-
-highlight Define	guifg=#FFFF80	guibg=#000099 gui=bold
-highlight Define	ctermfg=Yellow	ctermbg=DarkBlue cterm=bold
-
-highlight Delimiter	guifg=#FFFFFF	guibg=#221F22	gui=bold
-
-highlight FoldColumn	guifg=#FFFFFF	guibg=#222222
-highlight FoldColumn	ctermfg=White	ctermbg=DarkGrey cterm=reverse
-
-highlight Folded	guifg=#000000	guibg=#999999
-highlight Folded	ctermfg=DarkGrey	ctermbg=Black	cterm=reverse
-
-highlight Function	guifg=#dddddd	guibg=#000099 gui=bold
-highlight Function	ctermfg=White	ctermbg=DarkBlue cterm=bold
-
-highlight IncSearch	guifg=#000000	guibg=#ffffff	gui=bold,underline
-
-highlight LineNr	guifg=#FFFFFF	guibg=#444444
-
-highlight Number	guifg=#dddddd	gui=bold
-highlight Number	ctermfg=LightCyan
-
-highlight PreProc	guibg=#000000	guifg=#77bbff gui=bold
-
-highlight Search	guifg=#ffffff	guibg=#335577
-highlight Search	ctermfg=White ctermbg=Cyan cterm=reverse
-
-highlight Special	guifg=#ccaa55	guibg=#102040 gui=none
-highlight Special	ctermfg=Brown	ctermbg=Black	cterm=bold
-
-highlight Statement	guifg=#FF8080			gui=bold
-highlight Statement	ctermfg=Magenta			cterm=bold
-
-highlight StatusLine	guifg=#FFFFFF	guibg=#553333
-highlight StatusLine	ctermfg=white	ctermbg=DarkRed
-
-highlight StatusLineNC	guifg=#AA8888	guibg=#000000
-highlight StatusLineNC	ctermfg=red	ctermbg=black
-
-highlight String	guifg=#99ffaa guibg=#000000
-highlight String	ctermfg=White
-
-highlight Subtitle	guifg=#FFFFFF	guibg=#994444 gui=bold,underline
-
-highlight Type		guifg=#FFFFFF   gui=NONE
-highlight Type		guifg=white   gui=NONE
-
-highlight Visual	guibg=#112233	guifg=#6688AA
-highlight Visual	ctermbg=DarkBlue	ctermfg=LightBlue
diff --git a/colors/corn.vim b/colors/corn.vim
deleted file mode 100755
index 45d612c..0000000
--- a/colors/corn.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" Vim colorscheme
-" Author: Charles <cherry_avium@yahoo.com>
-" Version: 0.01
-" Date: 07 December 2005
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-" multiple scheme method
-" - one for C like language
-" - one for markup language
-" - one for style language (properties) -> property more outstanding than
-"                                          object
-
-let colors_name = "Corn"
-" set mouseshape+=i:arrow
-
-" Window elements
-hi Cursor                   guifg=#000000 guibg=#F0F0F0
-hi Folded                   guifg=#C0C0C0 guibg=#808080
-hi LineNr                   guifg=#CCCCCC
-hi NonText                  guifg=#CCCCCC
-hi Normal                   guifg=#E0E0E0 guibg=#333333
-hi StatusLine               guifg=#B8860B guibg=#E5E5E5
-hi StatusLineNC             guifg=#C0C0C0 guibg=#000000
-hi Visual                   guifg=#C0C0C0 guibg=#000000
-
-" Main groups
-hi Comment                  guifg=#BBCCEE
-hi Constant                 guifg=#EEDDAA gui=none
-hi Statement                guifg=#CCEE00 gui=italic
-hi StatementU               guifg=#CCEE00 gui=underline
-hi Keyword                  guifg=#CCEE00
-hi Underlined               guifg=#E0E0E0 gui=underline
-hi Error                    guifg=#FFFFFF guibg=#FF0000
-
-" Tag syntax
-hi Attribute                guifg=#CCCCCC gui=italic
-
-hi! link String             Constant
-hi! link Character          Constant
-hi! link Number             Constant
-hi! link Boolean            Constant
-hi! link Float              Constant
-
-hi! link Identifier         Normal
-hi! link Function           Statement
-
-hi! link Operator           Keyword
-hi! link Preproc            Keyword
-hi! link Type               Keyword
-
-hi! link Special            Keyword
-hi! link Ignore             Normal
-hi! link Todo               Error
-
-hi! link Title              Normal 
-
-
-hi! link phpDefine          StatementU
-
-hi! link HtmlArg            Attribute
-hi! link HtmlSpecialChar    Statement
-
-hi! link xmlTagName         Keyword
-hi! link xmlEndTag          Keyword
-hi! link xmlEntity          Statement
-hi! link xmlCData           Comment
-hi! link xmlAttrib          Attribute
diff --git a/colors/corporation.vim b/colors/corporation.vim
deleted file mode 100755
index 14cde77..0000000
--- a/colors/corporation.vim
+++ /dev/null
@@ -1,99 +0,0 @@
-" description:	color scheme based on
-" 		julievonderropp's corporation (available on kuler.adobe.com)
-"      author:	kamil.stachowski@gmail.com
-"     license:	gpl 3+
-"     version:	0.1 (2008.11.08)
-
-" changelog:
-"       0.1:	2008.11.08
-"       	initial version
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "corporation"
-
-
-"black		192224
-"blue		536991
-"grey dark	5E6C70
-"grey light	A1A6A8
-"white		F9F9FF
-"yellow		BD9800
-
-hi Comment	gui=italic	guifg=#5E6C70
-hi Constant			guifg=#A1A6A8
-hi Cursor			guifg=#192224	guibg=#F9F9F9
-hi CursorColumn					guibg=#222E30
-hi CursorIM			guifg=#192224	guibg=#536991
-hi DiffAdd					guibg=#193224
-hi DiffChange					guibg=#492224
-hi DiffDelete					guibg=#192224
-hi DiffText					guibg=#492224
-hi Error			guifg=#A1A6A8	guibg=#912C00
-hi FoldColumn	gui=italic	guifg=#192224	guibg=#A1A6A8
-hi Identifier			guifg=#BD9800
-hi ModeMsg	gui=bold	guifg=#F9F9F9	guibg=#192224
-hi Normal			guifg=#F9F9FF	guibg=#192224
-hi PreProc			guifg=#BD9800
-hi Search			guifg=#192224	guibg=#BD9800
-hi SignColumn			guifg=#192224	guibg=#536991
-hi Statement	gui=bold	guifg=#BD9800
-hi StatusLine	gui=bold	guifg=#192224	guibg=#BD9800
-hi StatusLineNC	gui=bold	guifg=#192224	guibg=#5E6C70
-hi Title	gui=bold	guifg=#F9F9FF	guibg=#192224
-hi Todo				guifg=#F9F9FF	guibg=#BD9800
-hi Type		gui=bold	guifg=#536991
-hi Underlined	gui=underline	guifg=#F9F9FF	guibg=#192224
-hi Visual			guifg=#192224	guibg=#F9F9FF
-hi VisualNOS	gui=underline	guifg=#192224	guibg=#F9F9FF
-hi WildMenu					guibg=#A1A6A8
-
-hi! link Boolean	Constant
-hi! link Character	Constant
-hi! link Conditional	Statement
-hi! link CursorLine	CursorColumn
-hi! link Debug		Special
-hi! link Define		PreProc
-hi! link Delimiter	Special
-hi! link Directory	Type
-hi! link ErrorMsg	Error
-hi! link Exception	Statement
-hi! link Float		Constant
-hi! link Folded		FoldColumn
-hi! link Function	Type
-hi! link IncSearch	Search
-hi! link Include	PreProc
-hi! link Keyword	Statement
-hi! link Label		Statement
-hi! link LineNr		Identifier
-hi! link Macro		PreProc
-hi! link MatchParen	Statement
-hi! link MoreMsg	Statement
-hi! link NonText	Comment
-hi! link Number		Constant
-hi! link Operator	Statement
-hi! link PreCondit	PreProc
-hi! link Repeat		Statement
-hi! link Special	PreProc
-hi! link SpecialChar	Special
-hi! link SpecialComment	Special
-hi! link SpecialKey	Comment
-hi! link SpellBad	Underlined
-hi! link SpellCap	Underlined
-hi! link SpellLocal	Underlined
-hi! link SpellRare	Underlined
-hi! link StorageClass	Type
-hi! link String		Constant
-hi! link Structure	Type
-hi! link TabLine	StatusLineNC
-hi! link TabLineFill	StatusLineNC
-hi! link TabLineSel	StatusLine
-hi! link Tag		Special
-hi! link Typedef	Type
-hi! link VertSplit	StatusLineNC
-hi! link WarningMsg	Error
diff --git a/colors/cthulhian.vim b/colors/cthulhian.vim
deleted file mode 100755
index 0a4abd1..0000000
--- a/colors/cthulhian.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-" -- Init ------------------------------------------------------------------------------------------
-
-set background=dark
-highlight clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-runtime colors/oceandeep.vim
-
-let g:colors_name = "cthulhian"
-
-" -- Clear some stuff ------------------------------------------------------------------------------
-
-highlight clear Folded
-highlight clear FoldColumn
-highlight clear LineNr
-highlight clear SpecialKey
-highlight clear StatusLine
-highlight clear StatusLineNC
-highlight clear Comment
-highlight clear Conditional
-highlight clear Repeat
-highlight clear Special
-highlight clear Underlined
-highlight clear Todo
-
-" -- Do some redefinitions -------------------------------------------------------------------------
-
-highlight Folded	guibg=#305060 guifg=#b0d0e0
-highlight FoldColumn	guibg=#305060 guifg=#b0d0e0
-highlight LineNr	gui=NONE guifg=#007777 guibg=NONE
-highlight SpecialKey	guibg=bg guifg=SeaGreen
-highlight StatusLine	gui=BOLD guifg=#c9c9c9 guibg=#4e4e6e
-highlight StatusLineNC	gui=NONE guifg=#b9b9b9 guibg=#3e3e5e
-highlight Comment	gui=None guifg=#708090
-highlight Conditional	gui=Bold guifg=LightGreen guibg=bg
-highlight Repeat	gui=Bold guifg=SeaGreen2 guibg=bg
-highlight Special	gui=None guifg=#dd88ff
-highlight Underlined	gui=underline guifg=honeydew3 guibg=bg
-highlight Todo		gui=underline guifg=Cyan guibg=#507080
diff --git a/colors/custom.vim b/colors/custom.vim
deleted file mode 100755
index 977bd70..0000000
--- a/colors/custom.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" Make external commands work through a pipe instead of a pseudo-tty
-"set noguipty
-
-" set guioptions=agml      " scrollbar on left
-
-" Only do this for Vim version 5.0 and later.
-if version >= 500
-
-  " Switch on syntax highlighting.
-"  source $VIM/vim61/syntax/syntax.vim
-"  source $VIM/vim-5.0/syntax/syntax.vim
-
-  hi clear
-  " Switch on search pattern highlighting.
-  set hlsearch
-
-  " highlight Comment gui=italic
-
-  highlight Comment    guifg=green3 guibg=black 
-"  highlight Comment     guifg=SkyBlue1 gui=none
-  highlight Constant    guifg=cyan gui=none guibg=black
-"  highlight Constant gui=col_lgreen_bl
-  highlight Identifier  guifg=lawngreen
-  highlight Statement   guifg=Yellow gui=none
-  highlight Type        guifg=goldenrod gui=none
-  highlight Special     guifg=gold gui=none guibg=black
-  highlight Search  	guifg=hotpink3 guibg=grey20
-  highlight Question  	guifg=Blue guibg=black
-  highlight WinEnd  	guifg=fg guibg=black gui=none
-  highlight SpecialKey 	guifg=pink
-  highlight Directory 	guifg=MistyRose
-  highlight Title 	guifg=pink
-  highlight Todo 	guifg=pink
-  highlight MoreMsg 	guifg=pink
-  highlight WarningMsg 	guibg=black guifg=red term=reverse
-  highlight tclCurlyList 	guifg=white
-  highlight Operator	term=NONE ctermfg=6 guifg=cyan gui=none
-"  highlight Function	term=bold ctermbg=1 guifg=darkgreen gui=bold
-  highlight Function	ctermbg=1 guifg=lightblue
-  highlight String 	guifg=lavender
-  "highlight tclFlag 	guifg=thistle3
-  highlight tclFlag 	guifg=pink
-  highlight PreProc 	guifg=pink
-
-  " Yellow
-  " OliveDrab1
-  " NavajoWhite
-  " MistyRose
-  " LightGoldenRod1
-  " LavenderBlush
-  " LemonChiffon
-  " LightGoldenRod
-  " PaleGoldenRod
-  " PaleGreen
-  " PaleTurquoise
-  " PeachPuff
-  " RosyBrown1
-  " PowderBlue
-  " SandyBrown
-  " SeaGreen1
-  " LightPink
-  " LightSalmon1
-  " LightSkyBlue1
-  " SlateGray1
-  " SpringGreen
-  " aquamarine
-  " azure3
-  " beige
-  " bisque
-  " burlywood
-  " burlywood1
-  " coral
-  " cornsilk2
-  " cyan
-  " gold
-  " gray85
-  " ivory2
-  " khaki
-  " khaki1
-  " lavender
-  " moccasin
-  " pink
-  " plum1
-  " thistle1
-  " turquoise
-
-    hi Normal ctermfg=DarkBlue ctermbg=grey guifg=lightgreen guibg=black
-  highlight Comment    guifg=green3 ctermbg=Grey ctermfg=Magenta
-
-endif
-
diff --git a/colors/d8g_01.vim b/colors/d8g_01.vim
deleted file mode 100755
index d7e5411..0000000
--- a/colors/d8g_01.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" Vim color file
-" d8g_01 - Martin Kopta (http://martin.kopta.eu)
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "d8g_01"
-
-" Console
-hi Normal     ctermfg=white  ctermbg=Black
-hi Cursor     ctermfg=Black  ctermbg=LightGrey      cterm=NONE
-hi Search     ctermfg=Black ctermbg=Cyan            cterm=NONE
-hi Visual                                           cterm=reverse
-hi Special    ctermfg=darkgrey
-hi Comment    ctermfg=darkgrey
-hi StatusLine ctermfg=white  ctermbg=black
-hi Identifier ctermfg=Cyan
-hi Statement  ctermfg=Cyan                          cterm=NONE
-hi Constant   ctermfg=Grey                          cterm=NONE
-hi Type       ctermfg=Cyan                          cterm=NONE
-hi LineNr     ctermfg=grey   ctermbg=black
-hi Line       ctermfg=white                         term=underline
-hi Preproc    ctermfg=Cyan
-
-hi Pmenu      ctermfg=black  ctermbg=gray
-hi PmenuSel   ctermfg=black  ctermbg=yellow
-hi PmenuSbar  ctermfg=white  ctermbg=black
-hi PmenuThumb ctermfg=white  ctermbg=gray
-
diff --git a/colors/d8g_02.vim b/colors/d8g_02.vim
deleted file mode 100755
index 57fef5f..0000000
--- a/colors/d8g_02.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" Vim color file
-" d8g_02 - Martin Kopta (http://martin.kopta.eu)
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "d8g_02"
-
-" Console
-hi Normal     ctermfg=black  ctermbg=white
-hi Cursor     ctermfg=white  ctermbg=black          cterm=NONE
-hi Search     ctermfg=Black  ctermbg=magenta        cterm=NONE
-hi Visual     ctermfg=white  ctermbg=darkgrey       cterm=NONE
-hi Special    ctermfg=darkgrey
-hi Comment    ctermfg=darkgrey
-hi StatusLine ctermfg=black  ctermbg=white
-hi Identifier ctermfg=magenta
-hi Statement  ctermfg=magenta                       cterm=NONE
-hi Constant   ctermfg=black                         cterm=NONE
-hi Type       ctermfg=magenta                       cterm=NONE
-hi LineNr     ctermfg=black  ctermbg=lightgray
-hi Line       ctermfg=black                         term=underline
-hi PreProc    ctermfg=darkmagenta                   term=underline 
-
-hi Pmenu      ctermfg=black  ctermbg=gray
-hi PmenuSel   ctermfg=black  ctermbg=yellow
-hi PmenuSbar  ctermfg=white  ctermbg=black
-hi PmenuThumb ctermfg=white  ctermbg=gray
-
diff --git a/colors/d8g_03.vim b/colors/d8g_03.vim
deleted file mode 100755
index ddc942b..0000000
--- a/colors/d8g_03.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" Vim color file
-" d8g_03 - Martin Kopta (http://martin.kopta.eu)
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "d8g_03"
-
-" Console
-hi Normal     ctermfg=white  ctermbg=black
-hi Cursor     ctermfg=white  ctermbg=darkgray       cterm=NONE
-hi Search     ctermfg=black  ctermbg=green          cterm=NONE
-hi Visual                                           cterm=reverse
-hi Special    ctermfg=lightblue
-hi Comment    ctermfg=lightyellow
-hi StatusLine ctermfg=white  ctermbg=black
-hi Identifier ctermfg=LightBlue
-hi Statement  ctermfg=LightBlue                     cterm=NONE
-hi Constant   ctermfg=grey                          cterm=NONE
-hi Type       ctermfg=LightBlue                     cterm=NONE
-hi LineNr     ctermfg=grey   ctermbg=black
-hi Line       ctermfg=white                         term=underline
-hi Preproc    ctermfg=LightBlue
-
-hi Pmenu      ctermfg=black  ctermbg=lightgreen
-hi PmenuSel   ctermfg=black  ctermbg=yellow
-hi PmenuSbar  ctermfg=white  ctermbg=black
-hi PmenuThumb ctermfg=white  ctermbg=lightgreen
-
diff --git a/colors/d8g_04.vim b/colors/d8g_04.vim
deleted file mode 100755
index 620eb37..0000000
--- a/colors/d8g_04.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" Vim color file
-" d8g_04 - Martin Kopta (http://martin.kopta.eu)
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "d8g_04"
-
-" Console
-hi Normal     ctermfg=red    ctermbg=black
-hi Cursor     ctermfg=white  ctermbg=darkgray      cterm=NONE
-hi Search     ctermfg=black  ctermbg=green         cterm=NONE
-hi Visual                                          cterm=reverse
-hi Special    ctermfg=DarkRed
-hi Comment    ctermfg=Grey
-hi StatusLine ctermfg=white  ctermbg=black
-hi Identifier ctermfg=DarkRed
-hi Statement  ctermfg=DarkRed                      cterm=NONE
-hi Constant   ctermfg=grey                         cterm=NONE
-hi Type       ctermfg=LightRed                     cterm=NONE
-hi LineNr     ctermfg=grey   ctermbg=black
-hi Line       ctermfg=white                        term=underline
-hi Preproc    ctermfg=DarkRed
-
-hi Pmenu      ctermfg=black  ctermbg=lightgreen
-hi PmenuSel   ctermfg=black  ctermbg=yellow
-hi PmenuSbar  ctermfg=white  ctermbg=black
-hi PmenuThumb ctermfg=white  ctermbg=lightgreen
-
diff --git a/colors/dante.vim b/colors/dante.vim
deleted file mode 100755
index f584889..0000000
--- a/colors/dante.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" File: "/home/caciano/.vim/dante.vim"
-" Created: "Thu, 23 May 2002 00:12:20 -0300 (caciano)"
-" Updated: "Sat, 24 Aug 2002 14:04:21 -0300 (caciano)"
-" Copyright (C) 2002, Caciano Machado <caciano@inf.ufrgs.br>
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Colorscheme Option:
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-hi clear
-if exists("syntax on")
-	syntax reset
-endif
-let g:colors_name = "dante"
-
-" General colors
-hi Normal	ctermfg=gray guifg=peachpuff3 guibg=black
-hi Directory	term=bold ctermfg=blue guifg=royalblue
-hi ErrorMsg	term=standout ctermfg=white ctermbg=red guifg=white guibg=red3
-hi NonText	term=bold ctermfg=darkgray guibg=gray3 guifg=gray20
-hi SpecialKey	term=bold ctermfg=darkgray guifg=gray30
-hi LineNr	term=underline ctermfg=darkgray guifg=ivory4 guibg=gray4
-hi IncSearch	term=reverse cterm=reverse gui=reverse,bold guifg=darkgoldenrod2
-hi Search	term=reverse ctermfg=black ctermbg=yellow guifg=gray10 guibg=gold2
-hi Visual	term=bold,reverse cterm=bold,reverse ctermfg=gray ctermbg=black gui=bold,reverse guifg=gray40 guibg=black
-hi VisualNOS	term=bold,underline cterm=bold,underline gui=bold,underline
-hi MoreMsg	term=bold ctermfg=green gui=bold guifg=olivedrab1
-hi ModeMsg	term=bold cterm=bold gui=bold
-hi Question	term=standout ctermfg=green gui=bold guifg=olivedrab1
-hi WarningMsg	term=standout ctermfg=red gui=bold guifg=red3
-hi WildMenu	term=standout ctermfg=black ctermbg=yellow guifg=black guibg=gold2
-hi Folded	term=standout ctermfg=blue ctermbg=white guifg=royalblue1 guibg=white
-hi FoldColumn	term=standout ctermfg=blue ctermbg=white guifg=royalblue3 guibg=white
-hi DiffAdd	term=bold ctermbg=blue guibg=royalblue2
-hi DiffChange	term=bold ctermbg=darkmagenta guibg=maroon
-hi DiffDelete	term=bold cterm=bold ctermfg=lightblue ctermbg=cyan gui=bold guifg=lightblue guibg=cyan4
-hi DiffText	term=reverse cterm=bold ctermbg=red gui=bold guibg=red3
-hi Cursor	guifg=bg guibg=fg
-hi lCursor	guifg=bg guibg=fg
-hi StatusLine	term=reverse cterm=reverse gui=reverse guifg=gray60
-hi StatusLineNC	term=reverse cterm=reverse gui=reverse guifg=gray40
-hi VertSplit	term=reverse cterm=reverse gui=bold,reverse guifg=gray40
-hi Title	term=bold ctermfg=magenta gui=bold guifg=aquamarine
-
-" syntax hi colors
-hi Comment	term=bold ctermfg=darkcyan guifg=cyan4
-hi PreProc	term=underline ctermfg=darkblue guifg=dodgerblue4
-hi Constant	term=underline ctermfg=darkred guifg=firebrick3
-hi Type		term=underline ctermfg=darkgreen gui=none guifg=chartreuse3
-hi Statement	term=bold ctermfg=darkyellow gui=none guifg=gold3
-hi Identifier	term=underline ctermfg=darkgreen guifg=darkolivegreen4
-hi Ignore	term=bold ctermfg=darkgray guifg=gray45
-hi Special	term=underline ctermfg=brown guifg=sienna
-hi Error	term=reverse ctermfg=gray ctermbg=red guifg=gray guibg=red3
-hi Todo		term=standout ctermfg=black ctermbg=yellow gui=bold guifg=gray10 guibg=yellow4
-hi Underlined	term=underline cterm=underline ctermfg=darkblue gui=underline guifg=slateblue
-hi Number	term=underline ctermfg=darkred guifg=red2
-" syntax hi links
-hi link String		Constant
-hi link Character	Constant
-hi link Number		Constant
-hi link Boolean		Constant
-hi link Float		Number
-hi link Function	Identifier
-hi link Number		Constant
-hi link Conditional	Statement
-hi link Repeat		Statement
-hi link Label		Statement
-hi link Keyword		Statement
-hi link Exception	Statement
-hi link Operator	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 SpecialChar	Special
-hi link Delimiter	Special
-hi link SpecialComment	Special
-hi link Debug		Special
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/colors/dark-ruby.vim b/colors/dark-ruby.vim
deleted file mode 100755
index 684c74d..0000000
--- a/colors/dark-ruby.vim
+++ /dev/null
@@ -1,294 +0,0 @@
-" Vim color file
-" Maintainer:   Priit Tamboom <priit ät mx.ee>
-" Last Change: Alfa version 
-" URL: http://www.vim.org/scripts/script.php?script_id=2256
-
-" In order to enamble 256 colors on Ubuntu 
-" install: sudo apt-get install ncurses-term
-set term=xterm-256color
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="dark-ruby"
-
-" A good way to see what your colorscheme does is to follow this procedure:
-" :w 
-" :so % 
-"
-" Then to see what the current setting is use the highlight command.  
-" For example,
-" 	:hi Cursor
-" gives
-"	Cursor         xxx guifg=bg guibg=fg 
- 	
-" Uncomment and complete the commands you want to change from the default.
-
-" highlight Normal guibg=#EDE9E3
-" hi Cursor		ctermfg=red	guifg=lightgray		
-" hi CursorIM		ctermfg=red	guifg=lightgray	
-" hi Directory		ctermfg=red	guifg=lightgray	
-" hi DiffAdd		ctermfg=red	guifg=lightgray	
-" hi DiffChange		ctermfg=red	guifg=lightgray	
-" hi DiffDelete		ctermfg=red	guifg=lightgray	
-" hi DiffText		ctermfg=red	guifg=lightgray	
-" hi ErrorMsg		ctermfg=red	guifg=lightgray	
-" hi VertSplit		ctermfg=red	guifg=lightgray	
-" hi Folded		ctermfg=red	guifg=lightgray	
-" hi FoldColumn		ctermfg=red	guifg=lightgray	
-" hi IncSearch		ctermfg=red	guifg=lightgray	
-" hi ModeMsg		ctermfg=red	guifg=lightgray	
-" hi MoreMsg		ctermfg=red	guifg=lightgray	
-" hi NonText		ctermfg=red	guifg=lightgray	
-" hi Question		ctermfg=red	guifg=lightgray	
-" hi Search		ctermfg=red	guifg=lightgray	
-" hi SpecialKey		ctermfg=red	guifg=lightgray	
-" hi StatusLine		ctermfg=red	guifg=lightgray	
-" hi StatusLineNC	ctermfg=red	guifg=lightgray	
-" hi Title		ctermfg=red	guifg=lightgray	
-" hi Visual		ctermfg=red	guifg=lightgray	
-" hi VisualNOS		ctermfg=red	guifg=lightgray	
-" hi WarningMsg		ctermfg=red	guifg=lightgray	
-" hi WildMenu		ctermfg=red	guifg=lightgray	
-" hi Menu		ctermfg=red	guifg=lightgray	
-" hi Scrollbar		ctermfg=red	guifg=lightgray	
-" hi Tooltip		ctermfg=red	guifg=lightgray	
-
-" syntax highlighting groups
-hi LineNr		ctermfg=252	guifg=252	
-hi Comment		ctermfg=darkgreen	guifg=28	
-hi Constant		ctermfg=185	guifg=185	
-hi Identifier		ctermfg=252	guifg=252	
-hi Statement		ctermfg=32	guifg=32	
-hi PreProc		ctermfg=252	guifg=252	
-hi Type		ctermfg=167	guifg=167	
-hi Special		ctermfg=252	guifg=252	
-hi Underlined		ctermfg=red	guifg=red	
-hi Ignore		ctermfg=red	guifg=red	
-hi Error		ctermfg=160 ctermbg=none	guifg=160	guibg=none
-hi Todo			ctermfg=red	guifg=red	
-
-" Alfa version notes: color 'red' means I haven't set color yet
-
-hi rubyEscape			ctermfg=252	guifg=252	
-hi rubyInterpolationDelimiter	ctermfg=252	guifg=252
-hi rubyInterpolation		ctermfg=252	guifg=252	
-hi rubyPredefinedVariable	ctermfg=red	guifg=red	
-hi rubyInstanceVariable		ctermfg=66	guifg=66	
-hi rubyClassVariable		ctermfg=red	guifg=red	
-hi rubyGlobalVariable		ctermfg=red	guifg=red	
-hi rubyPredefinedVariable	ctermfg=red	guifg=red	
-hi rubyNoInterpolation		ctermfg=red	guifg=red	
-hi rubyDelimEscape		ctermfg=red	guifg=red	
-hi rubyNestedParentheses	ctermfg=red	guifg=red	
-hi rubyNestedCurlyBraces	ctermfg=red	guifg=red	
-hi rubyNestedAngleBrackets	ctermfg=red	guifg=red	
-hi rubyNestedSquareBrackets	ctermfg=red	guifg=red	
-hi rubyASCIICode		ctermfg=red	guifg=red	
-hi rubyInteger			ctermfg=185	guifg=185	
-hi rubyFloat			ctermfg=185	guifg=185	
-hi rubyLocalVariableOrMethod	ctermfg=red	guifg=red	
-hi rubyBlockArgument		ctermfg=red	guifg=red	
-hi rubyConstant			ctermfg=252	guifg=252	
-hi rubySymbol			ctermfg=167	guifg=167	
-hi rubyStringSpecial		ctermfg=red	guifg=red	
-hi rubyBlockParameter		ctermfg=252	guifg=252	
-hi rubyPredefinedConstant	ctermfg=red	guifg=red	
-hi rubyRegexp			ctermfg=167	guifg=167	
-hi rubyString			ctermfg=185	guifg=185	
-hi rubyBoolean			ctermfg=252	guifg=252	
-hi rubyPseudoVariable		ctermfg=252	guifg=252	
-hi rubyMethodDeclaration	ctermfg=red	guifg=red	
-hi rubyClassDeclaration		ctermfg=red	guifg=red	
-hi rubyModuleDeclaration	ctermfg=red	guifg=red	
-hi rubyFunction			ctermfg=252	guifg=252	
-hi rubyDefine			ctermfg=32	guifg=32
-hi rubyClass			ctermfg=25	guifg=25
-hi rubyModule			ctermfg=25	guifg=25
-hi rubyBlock			ctermfg=252	guifg=252	
-hi rubyConditional		ctermfg=81	guifg=81	
-hi rubyRepeat			ctermfg=81	guifg=81
-hi rubyControl			ctermfg=81	guifg=81
-hi rubyKeyword			ctermfg=red	guifg=red	
-hi rubyOperator			ctermfg=red	guifg=red	
-hi rubyBeginEnd			ctermfg=red	guifg=red	
-hi rubyAccess			ctermfg=32	guifg=32	
-hi rubyAttribute		ctermfg=252	guifg=252	
-hi rubyEval			ctermfg=red	guifg=red	
-hi rubyException		ctermfg=red	guifg=red	
-hi rubyInclude			ctermfg=252	guifg=252	
-hi rubySharpBang		ctermfg=red	guifg=red	
-hi rubyTodo			ctermfg=34	guifg=34	
-hi rubyComment			ctermfg=28	guifg=28
-hi rubyDocumentation		ctermfg=red	guifg=red	
-hi rubyData			ctermfg=red	guifg=red	
-
-hi railsMethod    ctermfg=107 guifg=107
-hi railsUserClass  ctermfg=107 guifg=107
-hi railsUserMethod  ctermfg=107 guifg=107
-
-" hi rubyRailsError	ctermfg=lightgray	guifg=lightgray	
-" hi rubyRailsDeprecatedMethod	ctermfg=lightgray	guifg=lightgray	
-" hi erubyRailsMethod	ctermfg=lightgray	guifg=lightgray	
-" hi erubyRailsRenderMethod	ctermfg=lightgray	guifg=lightgray	
-" hi erubyRailsHelperMethod	ctermfg=lightgray	guifg=lightgray	
-"hi javascriptRailsClass	ctermfg=lightgray	guifg=lightgray	
-"hi javascriptRailsFunction	ctermfg=lightgray	guifg=lightgray	
-"hi htmlError	ctermfg=lightgray	guifg=lightgray	
-"hi htmlSpecialChar	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptExpression	ctermfg=lightgray	guifg=lightgray	
-"hi htmlString	ctermfg=lightgray	guifg=lightgray	
-"hi htmlValue	ctermfg=lightgray	guifg=lightgray	
-"hi htmlTagN	ctermfg=lightgray	guifg=lightgray	
-"hi htmlTagError	ctermfg=lightgray	guifg=lightgray	
-hi htmlEndTag	ctermfg=25	guifg=25	
-"hi htmlArg	ctermfg=lightgray	guifg=lightgray	
-"hi htmlEvent	ctermfg=lightgray	guifg=lightgray	
-"hi htmlCssDefinition	ctermfg=lightgray	guifg=lightgray	
-hi htmlTag	ctermfg=25	guifg=25	
-hi htmlTagName	ctermfg=25	guifg=25	
-"hi htmlSpecialTagName	ctermfg=lightgray	guifg=lightgray	
-"hi htmlCommentPart	ctermfg=lightgray	guifg=lightgray	
-"hi htmlCommentError	ctermfg=lightgray	guifg=lightgray	
-"hi htmlComment	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreStmt	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreError	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreAttr	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreProc	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreProcAttrError	ctermfg=lightgray	guifg=lightgray	
-"hi htmlPreProcAttrName	ctermfg=lightgray	guifg=lightgray	
-"hi htmlLink	ctermfg=lightgray	guifg=lightgray	
-"hi javaScript	ctermfg=lightgray	guifg=lightgray	
-"hi htmlBoldUnderline	ctermfg=lightgray	guifg=lightgray	
-"hi htmlBoldItalic	ctermfg=lightgray	guifg=lightgray	
-"hi htmlBold	ctermfg=lightgray	guifg=lightgray	
-"hi htmlBoldUnderlineItalic	ctermfg=lightgray	guifg=lightgray	
-"hi htmlBoldItalicUnderline	ctermfg=lightgray	guifg=lightgray	
-"hi htmlUnderlineBold	ctermfg=lightgray	guifg=lightgray	
-"hi htmlUnderlineItalic	ctermfg=lightgray	guifg=lightgray	
-"hi htmlUnderline	ctermfg=lightgray	guifg=lightgray	
-"hi htmlUnderlineBoldItalic	ctermfg=lightgray	guifg=lightgray	
-"hi htmlUnderlineItalicBold	ctermfg=lightgray	guifg=lightgray	
-"hi htmlItalicBold	ctermfg=lightgray	guifg=lightgray	
-"hi htmlItalicUnderline	ctermfg=lightgray	guifg=lightgray	
-"hi htmlItalic	ctermfg=lightgray	guifg=lightgray	
-"hi htmlItalicBoldUnderline	ctermfg=lightgray	guifg=lightgray	
-"hi htmlItalicUnderlineBold	ctermfg=lightgray	guifg=lightgray	
-hi htmlH1	ctermfg=25	guifg=25	
-"hi htmlH2	ctermfg=lightgray	guifg=lightgray	
-"hi htmlH3	ctermfg=lightgray	guifg=lightgray	
-"hi htmlH4	ctermfg=lightgray	guifg=lightgray	
-"hi htmlH5	ctermfg=lightgray	guifg=lightgray	
-"hi htmlH6	ctermfg=lightgray	guifg=lightgray	
-"hi htmlTitle	ctermfg=lightgray	guifg=lightgray	
-"hi cssStyle	ctermfg=lightgray	guifg=lightgray	
-"hi htmlHead	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptCommentTodo	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptLineComment	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptCommentSkip	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptComment	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptSpecial	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptStringD	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptStringS	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptSpecialCharacter	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptNumber	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptRegexpString	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptConditional	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptRepeat	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptBranch	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptOperator	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptType	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptStatement	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptBoolean	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptNull	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptIdentifier	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptLabel	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptException	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptMessage	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptDeprecated	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptReserved	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptFunction	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptBraces	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptBraces	ctermfg=lightgray	guifg=lightgray	
-"hi javaScriptParens	ctermfg=lightgray	guifg=lightgray	
-"hi htmlCssStyleComment	ctermfg=lightgray	guifg=lightgray	
-"hi htmlScriptTag	ctermfg=lightgray	guifg=lightgray	
-"hi htmlEventTag	ctermfg=lightgray	guifg=lightgray	
-"hi htmlEventSQ	ctermfg=lightgray	guifg=lightgray	
-"hi htmlEventDQ	ctermfg=lightgray	guifg=lightgray	
-"hi vbStatement	ctermfg=lightgray	guifg=lightgray	
-"hi vbFunction	ctermfg=lightgray	guifg=lightgray	
-"hi vbMethods	ctermfg=lightgray	guifg=lightgray	
-"hi vbEvents	ctermfg=lightgray	guifg=lightgray	
-"hi vbTypes	ctermfg=lightgray	guifg=lightgray	
-"hi vbOperator	ctermfg=lightgray	guifg=lightgray	
-"hi vbConst	ctermfg=lightgray	guifg=lightgray	
-"hi vbTodo	ctermfg=lightgray	guifg=lightgray	
-"hi vbNumber	ctermfg=lightgray	guifg=lightgray	
-"hi vbString	ctermfg=lightgray	guifg=lightgray	
-"hi vbComment	ctermfg=lightgray	guifg=lightgray	
-"hi vbLineNumber	ctermfg=lightgray	guifg=lightgray	
-"hi vbTypeSpecifier	ctermfg=lightgray	guifg=lightgray	
-"hi cssTagName	ctermfg=lightgray	guifg=lightgray	
-"hi cssDefinition	ctermfg=lightgray	guifg=lightgray	
-"hi cssSelectorOp	ctermfg=lightgray	guifg=lightgray	
-"hi cssSelectorOp2	ctermfg=lightgray	guifg=lightgray	
-"hi cssUnicodeEscape	ctermfg=lightgray	guifg=lightgray	
-"hi cssStringQ	ctermfg=lightgray	guifg=lightgray	
-"hi cssStringQQ	ctermfg=lightgray	guifg=lightgray	
-"hi cssIdentifier	ctermfg=lightgray	guifg=lightgray	
-"hi cssMediaType	ctermfg=lightgray	guifg=lightgray	
-"hi cssMedia	ctermfg=lightgray	guifg=lightgray	
-"hi cssMediaComma	ctermfg=lightgray	guifg=lightgray	
-"hi cssMediaBlock	ctermfg=lightgray	guifg=lightgray	
-"hi cssBraces	ctermfg=lightgray	guifg=lightgray	
-"hi cssError	ctermfg=lightgray	guifg=lightgray	
-"hi cssComment	ctermfg=lightgray	guifg=lightgray	
-"hi cssURL	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueInteger	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueNumber	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueLength	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueAngle	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueTime	ctermfg=lightgray	guifg=lightgray	
-"hi cssValueFrequency	ctermfg=lightgray	guifg=lightgray	
-"hi cssFontDescriptor	ctermfg=lightgray	guifg=lightgray	
-"hi cssFontProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssFontAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssCommonAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssFontDescriptorProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssFontDescriptorFunction	ctermfg=lightgray	guifg=lightgray	
-"hi cssUnicodeRange	ctermfg=lightgray	guifg=lightgray	
-"hi cssColor	ctermfg=lightgray	guifg=lightgray	
-"hi cssFunction	ctermfg=lightgray	guifg=lightgray	
-"hi cssImportant	ctermfg=lightgray	guifg=lightgray	
-"hi cssColorProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssColorAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssTextProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssTextAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssBoxProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssBoxAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssGeneratedContentProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssGeneratedContentAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssAurlAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssPagingProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssPagingAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssUIProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssUIAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssRenderAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssRenderProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssAuralProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssTableProp	ctermfg=lightgray	guifg=lightgray	
-"hi cssTableAttr	ctermfg=lightgray	guifg=lightgray	
-"hi cssInclude	ctermfg=lightgray	guifg=lightgray	
-"hi cssBraceError	ctermfg=lightgray	guifg=lightgray	
-"hi cssPreudoClassId	ctermfg=lightgray	guifg=lightgray	
-"hi cssPseudoClass	ctermfg=lightgray	guifg=lightgray	
-"hi cssPseudoClassLang	ctermfg=lightgray	guifg=lightgray	
-"hi cssSpecialCharQQ	ctermfg=lightgray	guifg=lightgray	
-"hi cssSpecialCharQ	ctermfg=lightgray	guifg=lightgray	
-"hi erubyOneLiner	ctermfg=lightgray	guifg=lightgray	
-"hi erubyBlock	ctermfg=lightgray	guifg=lightgray	
-"hi erubyExpression	ctermfg=lightgray	guifg=lightgray	
-"hi erubyComment	ctermfg=lightgray	guifg=lightgray	
diff --git a/colors/darkBlue.vim b/colors/darkBlue.vim
deleted file mode 100755
index 54d560a..0000000
--- a/colors/darkBlue.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Version: 1.0
-" Maintainer:	lilydjwg <lilydjwg@gmail.com>
-" Last Change:	2009年6月23日
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "darkBlue"
-
-hi Comment guifg=#6666ff
-hi Constant guifg=#99cc33
-hi Cursor guifg=#ffffff guibg=#335577
-hi CursorIM guifg=#00AAFF guibg=#FF66FF
-hi CursorLine guibg=#223344
-hi DiffAdd guifg=#000000 guibg=#33ff33
-hi DiffChange guifg=#dddddd guibg=#5555CC
-hi DiffDelete guifg=#000000 guibg=#ee6699
-hi DiffText guifg=#ffffff guibg=#8888ff
-hi Directory guifg=#ff99ff
-hi Error gui=underline guifg=#ff0000 guibg=#111133
-hi ErrorMsg guifg=#FFFF00 guibg=#0000FF
-hi FoldColumn guifg=#0033FF guibg=#333333
-hi Folded guifg=#6666ff guibg=#223344
-hi Identifier guifg=#00a0e0
-hi Ignore gui=None
-hi IncSearch gui=bold,reverse guifg=#99ff99 guibg=#3454ff
-hi LineNr guifg=#446699
-hi MatchParen guifg=#99FF99 guibg=#112233
-hi ModeMsg gui=bold guifg=#AAAA3C guibg=#222211
-hi MoreMsg guifg=#FFFF00
-hi NonText guifg=#8400ff guibg=#102030
-hi Normal guifg=#eeeeee guibg=#112233
-hi Pmenu guifg=#3366FF guibg=#111111
-hi PmenuSbar guibg=#113355
-hi PmenuSel guifg=#80ff00 guibg=#1a1a1a
-hi PmenuThumb gui=reverse
-hi PreProc guifg=#FF99FF
-hi Question gui=bold guifg=#009966 guibg=#113322
-hi Search guifg=#3404ff guibg=#FFFF00
-hi SignColumn guifg=#00FFFF guibg=#C0C0C0
-hi Special guifg=#FF00FF
-hi SpecialKey guifg=#00AEA0 guibg=#22302D
-hi SpellBad gui=undercurl
-hi SpellCap gui=undercurl
-hi SpellLocal gui=undercurl
-hi SpellRare gui=undercurl
-hi Statement guifg=#00a0e0
-hi StatusLine gui=reverse guifg=#00c4ff guibg=#000000
-hi StatusLineNC guifg=#A4A4FF guibg=#444400
-hi TabLine guifg=#0066FF guibg=#001133
-hi TabLineFill gui=None
-hi TabLineSel gui=underline guifg=#999944 guibg=#112233
-hi Title guifg=#ffff44
-hi Todo gui=bold,underline guifg=#ff0000 guibg=#112233
-hi Type guifg=#ff9933
-hi Underlined gui=underline
-hi VertSplit gui=reverse guifg=#00C4FF guibg=#0000FF
-hi Visual guibg=#223344
-hi VisualNOS gui=None
-hi WarningMsg guifg=#FFA500 guibg=#000080
-hi WildMenu gui=None
-hi link Boolean Constant
-hi link Character Constant
-hi link Conditional Statement
-hi link CursorColumn CursorLine
-hi link Debug Special
-hi link Define PreProc
-hi link Delimiter Special
-hi link Exception Statement
-hi link Float Constant
-hi link Function Identifier
-hi link Include PreProc
-hi link Keyword Statement
-hi link Label Statement
-hi link Macro PreProc
-hi link Number Constant
-hi link Operator Statement
-hi link PreCondit PreProc
-hi link Repeat Statement
-hi link SpecialChar Special
-hi link SpecialComment Special
-hi link StorageClass Type
-hi link String Constant
-hi link Structure Type
-hi link Tag Special
-hi link Typedef Type
diff --git a/colors/darkZ.vim b/colors/darkZ.vim
deleted file mode 100755
index 246f69a..0000000
--- a/colors/darkZ.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" Vim color file
-" Create by Andy
-" QQ24375048
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="darkZ"
-
-hi Normal	guifg=#DFD6C1 guibg=gray14 gui=none
-
-" highlight groups
-hi Cursor       guifg=black          guibg=yellow		gui=none
-hi ErrorMsg     guifg=white          guibg=red			gui=none
-hi VertSplit    guifg=gray40         guibg=gray40		gui=none
-hi Folded       guifg=DarkSlateGray3 guibg=grey30		gui=none
-hi FoldColumn   guifg=tan            guibg=grey30		gui=none
-hi IncSearch    guifg=#b0ffff        guibg=#2050d0
-hi LineNr       guifg=burlywood3     gui=none
-hi ModeMsg      guifg=SkyBlue        gui=none
-hi MoreMsg      guifg=SeaGreen       gui=none
-hi NonText      guifg=cyan           gui=none
-hi Question     guifg=springgreen    gui=none
-hi Search       guifg=gray80         guibg=#445599		gui=none
-hi SpecialKey   guifg=cyan           gui=none
-hi StatusLine   guifg=black          guibg=Pink		gui=bold
-hi StatusLineNC guifg=grey           guibg=gray40		gui=none
-hi Title        guifg=#ff4400        gui=none			gui=bold
-hi Visual       guifg=gray17         guibg=tan1			gui=none
-hi WarningMsg   guifg=salmon         gui=none
-hi Pmenu        guifg=white          guibg=#445599		gui=none
-hi PmenuSel     guifg=#445599        guibg=gray
-hi WildMenu     guifg=gray           guibg=gray17		gui=none
-hi MatchParen	guifg=cyan           guibg=#6C6C6C		gui=bold
-hi DiffAdd      guifg=black          guibg=wheat1
-hi DiffChange   guifg=black          guibg=skyblue1
-hi DiffText     guifg=black          guibg=hotpink1		gui=none
-hi DiffDelete   guibg=gray45         guifg=black		gui=none
-
-" syntax highlighting groups
-hi Comment      guifg=gray50         gui=italic
-hi Constant     guifg=#FF77FF        gui=none
-hi Identifier   guifg=#6FDEF8        gui=none
-hi Function     guifg=#82EF2A        gui=none
-hi Statement    guifg=#FCFC63        gui=none
-hi PreProc      guifg=#82EF2A        gui=none
-hi Type         guifg=#33AFF3        gui=none
-hi Special      guifg=orange          gui=none
-hi Ignore       guifg=red            gui=none
-hi Todo         guifg=red            guibg=yellow2     gui=none
-
-" color terminal definitions
-hi SpecialKey   ctermfg=red
-hi NonText      cterm=bold           ctermfg=darkblue
-hi Directory    ctermfg=darkcyan
-hi ErrorMsg     cterm=bold           ctermfg=7         ctermbg=1
-hi IncSearch    cterm=NONE           ctermfg=yellow    ctermbg=green
-hi Search       cterm=NONE           ctermfg=white     ctermbg=grey
-hi MoreMsg      ctermfg=darkgreen
-hi ModeMsg      cterm=NONE           ctermfg=brown
-hi LineNr       ctermfg=3
-hi Question     ctermfg=green
-hi StatusLine   cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit    cterm=reverse
-hi Title        ctermfg=5
-hi Visual       cterm=reverse
-hi VisualNOS    cterm=bold,underline
-hi WarningMsg   ctermfg=1
-hi WildMenu     ctermfg=0            ctermbg=3
-hi Folded       ctermfg=darkgrey     ctermbg=NONE
-hi FoldColumn   ctermfg=darkgrey     ctermbg=NONE
-hi DiffAdd      ctermbg=4
-hi DiffChange   ctermbg=5
-hi DiffDelete   cterm=bold           ctermfg=4         ctermbg=6
-hi DiffText     cterm=bold           ctermbg=1
-hi Comment      ctermfg=darkcyan
-hi Constant     ctermfg=brown
-hi Special      ctermfg=5
-hi Identifier   ctermfg=6
-hi Statement    ctermfg=3
-hi PreProc      ctermfg=5
-hi Type         ctermfg=2
-hi Underlined   cterm=underline      ctermfg=5
-hi Ignore       ctermfg=darkgrey
-hi Error        cterm=bold           ctermfg=7         ctermbg=1
-
diff --git a/colors/darkblack.vim b/colors/darkblack.vim
deleted file mode 100755
index e7505a0..0000000
--- a/colors/darkblack.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim color file
-" Maintainer:	Matthew Jimenez	<mjimenez@ersnet.net>
-" Last Change:	2005 Feb 25
-
-" darkblack -- an alteration to the darkblue colorscheme by Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-
-
-set bg=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "darkblack"
-
-hi Normal	guifg=lightgray guibg=black	ctermfg=lightgray ctermbg=black
-hi ErrorMsg	guifg=black guibg=lightred	ctermfg=white ctermbg=lightblue
-hi PMenu guibg=PaleTurquoise1 guifg=black
-hi PMenuSel guibg=DeepSkyBlue2 guifg=black
-hi Visual               guifg=white guibg=DarkSlateGray
-hi VisualNOS	guifg=lightblue guibg=fg	gui=reverse,underline	ctermfg=lightblue ctermbg=fg cterm=reverse,underline
-hi Todo		guifg=red guibg=black	ctermfg=red	ctermbg=black
-hi Search	guifg=black guibg=yellow	ctermfg=white ctermbg=black cterm=underline term=underline
-hi IncSearch	guifg=yellow guibg=black	ctermfg=black ctermbg=gray
-
-hi SpecialKey	guifg=cyan	ctermfg=darkcyan
-hi Directory	guifg=cyan	ctermfg=cyan
-hi Title	guifg=magenta gui=none ctermfg=magenta cterm=bold
-hi WarningMsg	guifg=red	ctermfg=red
-hi WildMenu	guifg=yellow guibg=black ctermfg=yellow ctermbg=black cterm=none term=none
-hi ModeMsg	guifg=lightblue	ctermfg=lightblue
-hi MoreMsg	ctermfg=darkgreen	ctermfg=darkgreen
-hi Question	guifg=green gui=none ctermfg=green cterm=none
-hi NonText	guifg=lightcyan	ctermfg=lightcyan
-
-hi StatusLine	guifg=lightblue guibg=darkgray gui=none	ctermfg=lightblue ctermbg=gray term=none cterm=none
-hi StatusLineNC	guifg=black guibg=darkgray gui=none	ctermfg=black ctermbg=gray term=none cterm=none
-hi VertSplit	guifg=black guibg=darkgray gui=none	ctermfg=black ctermbg=gray term=none cterm=none
-
-hi Folded	guifg=darkgrey guibg=black	ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi FoldColumn	guifg=darkgrey guibg=black	ctermfg=darkgrey ctermbg=black cterm=bold term=bold
-hi LineNr	guifg=green	ctermfg=green cterm=none
-
-hi DiffAdd	guibg=black	ctermbg=black term=none cterm=none
-hi DiffChange	guibg=darkmagenta ctermbg=magenta cterm=none
-hi DiffDelete	ctermfg=lightblue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText	cterm=bold ctermbg=red gui=bold guibg=Red
-
-hi Cursor	guifg=bg guibg=lightgrey ctermfg=bg ctermbg=lightgrey
-hi lCursor	guifg=bg guibg=darkgreen ctermfg=bg ctermbg=darkgreen
-
-
-hi Comment	guifg=lightblue ctermfg=lightblue
-hi Constant	ctermfg=magenta guifg=magenta cterm=none
-hi Special	ctermfg=brown guifg=Orange cterm=none gui=none
-hi Identifier	ctermfg=cyan guifg=cyan cterm=none
-hi Statement	ctermfg=yellow cterm=none guifg=yellow gui=none
-hi PreProc	ctermfg=magenta guifg=magenta gui=none cterm=none
-hi type		ctermfg=green guifg=green gui=none cterm=none
-hi Underlined	cterm=underline term=underline
-hi Ignore	guifg=bg ctermfg=bg
-
diff --git a/colors/darkblue2.vim b/colors/darkblue2.vim
deleted file mode 100755
index eee2cc7..0000000
--- a/colors/darkblue2.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Vim color file
-" Maintainer: Datila Carvalho <datila@hotmail.com>
-" Last Change: May, 19, 2005
-" Version: 0.2
-
-" This is a VIM's version of the emacs color theme
-" _Dark Blue2_ created by Chris McMahan.
-
-""" Init stuff
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "darkblue2"
-
-
-""" Colors
-
-" GUI colors
-hi Cursor               guifg=#233b5a guibg=Yellow
-hi CursorIM             guifg=NONE guibg=Yellow
-hi Directory            gui=bold guifg=cyan
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-hi DiffText             guibg=grey50
-hi ErrorMsg             gui=bold guifg=White guibg=gray85
-hi VertSplit            gui=bold guifg=NONE guibg=gray80
-"hi Folded
-"hi FoldColumn
-"hi IncSearch
-hi LineNr				gui=bold guifg=lightsteelblue guibg=#132b4a
-hi ModeMsg              gui=bold
-"hi MoreMsg
-"hi NonText
-hi Normal               guibg=#233b5a guifg=#fff8dc
-"hi Question
-hi Search               gui=bold guifg=#233b5a guibg=lightgoldenrod
-"hi SpecialKey
-hi StatusLine           guifg=steelblue4 guibg=lightgray 
-hi StatusLineNC         guifg=royalblue4 guibg=lightsteelblue
-"hi Title
-hi Visual               guifg=steelblue guibg=fg
-hi VisualNOS            gui=bold guifg=steelblue guibg=fg
-hi WarningMsg           guifg=White guibg=Tomato
-"hi WildMenu
-
-hi User2				guifg=lightskyblue guibg=#021a39 gui=bold
-
-" If using Motif/Athena
-hi Menu                 guibg=#233b5a guifg=#fff8dc
-hi Scrollbar            guibg=bg
-
-" Colors for syntax highlighting
-hi Comment              gui=italic guifg=mediumaquamarine
-
-hi Constant             gui=bold guifg=lightgoldenrod1
-    hi String           guifg=aquamarine
-    hi Character        guifg=aquamarine
-    hi Number           gui=bold guifg=lightgoldenrod1
-    hi Boolean          gui=bold guifg=lightgoldenrod1
-    hi Float            gui=bold guifg=lightgoldenrod1
-
-hi Identifier           gui=bold guifg=palegreen
-    hi Function         guifg=lightskyblue
-
-hi Statement            gui=bold guifg=cyan
-    hi Conditional      gui=bold guifg=cyan
-    hi Repeat           gui=bold guifg=cyan
-    hi Label            guifg=cyan
-    hi Operator         guifg=cyan
-    "hi Keyword
-    "hi Exception
-
-hi PreProc              guifg=lightsteelblue
-    hi Include          gui=bold guifg=lightsteelblue
-    hi Define           guifg=lightsteelblue
-    hi Macro            guifg=lightsteelblue
-    hi PreCondit        guifg=lightsteelblue
-
-hi Type                 gui=bold guifg=palegreen
-    hi StorageClass     gui=bold guifg=lightgoldenrod1
-    hi Structure        gui=bold guifg=lightgoldenrod1
-    hi Typedef          gui=bold guifg=lightgoldenrod1
-
-"hi Special
-    ""Underline Character
-    "hi SpecialChar
-    "hi Tag
-    ""Statement
-    "hi Delimiter
-    ""Bold comment (in Java at least)
-    "hi SpecialComment
-    "hi Debug
-
-hi Underlined           gui=underline
-
-hi Ignore               guifg=bg
-
-hi Error                gui=bold guifg=White guibg=Red
-
-"hi Todo
diff --git a/colors/darkbone.vim b/colors/darkbone.vim
deleted file mode 100755
index a97c8fe..0000000
--- a/colors/darkbone.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Name:		darkbone.vim
-" Maintainer:	Kojo Sugita
-" Last Change:	2008-11-22
-" Revision:	1.1
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'darkbone'
-
-"default colors
-hi Normal	guifg=#a0a0c0 guibg=#000000
-hi NonText	guifg=#606080 guibg=#101020 gui=none
-hi SpecialKey	guifg=#404060
-hi Cursor	guifg=#000000 guibg=#a0a0c0
-hi CursorLine	guibg=#303050
-hi CursorColumn	guibg=#303050
-hi lCursor	guifg=#000000 guibg=#a0a0c0
-hi CursorIM	guifg=#000000 guibg=#a0a0c0
-
-" Directory
-hi Directory	guifg=#e0e0ff guibg=#000000 gui=bold
-
-" Diff
-hi DiffAdd	guifg=#8090f0 guibg=#000000 gui=none
-hi DiffChange	guifg=#8090f0 guibg=#000000 gui=none
-hi DiffDelete	guifg=#8090f0 guibg=#000000 gui=none
-hi DiffText	guifg=#8090f0 guibg=#000000 gui=bold
-
-" Message
-hi ModeMsg	guifg=#a0a0c0 guibg=#000000
-hi MoreMsg	guifg=#a0a0c0 guibg=#000000
-hi ErrorMsg	guifg=#ee1111 guibg=#000000
-hi WarningMsg	guifg=#ee1111 guibg=#000000
-
-hi VertSplit	guifg=#606080 guibg=#606080
-
-" Folds
-hi Folded	guifg=#a0a0c0 guibg=#000000
-hi FoldColumn	guifg=#a0a0c0 guibg=#102010
-
-" Search
-hi Search	guifg=#000000 guibg=#c0c0ff gui=none
-hi IncSearch	guifg=#000000 guibg=#c0c0ff gui=none
-
-hi LineNr	guifg=#606080 guibg=#000000 gui=none
-hi Question	guifg=#a0a0c0 guibg=#000000
-
-"\n, \0, %d, %s, etc...
-" hi Special	guifg=#d0e080 guibg=#000000 gui=none
-hi Special	guifg=#808080 guibg=#000000 gui=none
-
-" status line
-hi StatusLine	guifg=#c0c0ff guibg=#000000 gui=bold,underline
-hi StatusLineNC	guifg=#606080 guibg=#000000 gui=bold,underline
-hi WildMenu	guifg=#000000 guibg=#c0c0ff
-
-hi Title	guifg=#c0c0ff guibg=#000000 gui=bold
-hi Visual	guifg=#000000 guibg=#707090 gui=none
-hi VisualNOS	guifg=#a0a0c0 guibg=#000000
-
-hi Number	guifg=#d0e080 guibg=#000000
-hi Char		guifg=#d0e080 guibg=#000000
-hi String	guifg=#d0e080 guibg=#000000
-
-hi Boolean	guifg=#d0e080 guibg=#000000
-hi Comment	guifg=#606080
-hi Constant 	guifg=#f0a0b0 guibg=#000000 gui=none
-hi Identifier	guifg=#8090f0
-hi Statement	guifg=#8090f0 gui=none
-
-"Procedure name
-hi Function	guifg=#f0b040
-
-"Define, def
-" hi PreProc	guifg=#f0a0b0 gui=none
-hi PreProc	guifg=#e0e0ff gui=none
-
-hi Type		guifg=#e0e0ff gui=none
-hi Underlined	guifg=#a0a0c0 gui=underline
-hi Error	guifg=#ee1111 guibg=#000000
-hi Todo		guifg=#8090f0 guibg=#000000 gui=none
-hi SignColumn   guibg=#000000
-
-" Matches
-hi MatchParen	guifg=#a0a0c0 guibg=#404080 gui=none
-
-if version >= 700
-  " Pmenu
-  hi Pmenu	guibg=#202040
-  hi PmenuSel	guibg=#404080 guifg=#a0a0c0
-  hi PmenuSbar	guibg=#202040
-
-  " Tab
-  hi TabLine	  guifg=#606080 guibg=black gui=underline
-  hi TabLineFill  guifg=#a0a0c0 guibg=black gui=none
-  hi TabLineSel	  guifg=#c0c0ff guibg=#606080 gui=bold
-endif
-
-" vim:set ts=8 sts=2 sw=2 tw=0:
diff --git a/colors/darkburn.vim b/colors/darkburn.vim
deleted file mode 100755
index c2fa999..0000000
--- a/colors/darkburn.vim
+++ /dev/null
@@ -1,300 +0,0 @@
-"=============================================================================
-" Vim color file
-" File:       darkburn.vim
-" Maintainer: Taurus Olson <taurusolson@gmail.com>
-" License:    GPL
-" Created:    2009-03-27 20:25:21 CET
-" Modified:   2009-06-06 21:18:55 CET
-" Version:    1.2
-
-" Modified version of zenburn originally created by: 
-" Maintainer:   Jani Nurminen <slinky@iki.fi>
-" Last Change:  $Id: zenburn.vim,v 2.4 2008/11/18 20:43:18 slinky Exp $
-" URL:      	http://slinky.imukuppi.org/zenburnpage/
-" License:      GPL
-"=============================================================================
-"
-" Credits:
-"  - Jani Nurminen - original Zenburn
-"  - 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
-"
-" CONFIGURABLE PARAMETERS:
-" 
-" You can use the default (don't set any parameters), or you can
-" set some parameters to tweak the Zenburn colours.
-"
-" * You can now set a darker background for bright environments. To activate, use:
-"   contrast Zenburn, use:
-"
-     let g:darkburn_high_Contrast = 1
-"
-" * To get more contrast to the Visual selection, use
-"   
-"     let g:darkburn_alternate_Visual = 1
-" 
-" * To use alternate colouring for Error message, use
-"     
-      let g:darkburn_alternate_Error = 1
-"
-" * The new default for Include is a duller orange. To use the original
-"   colouring for Include, use
-"     
-      let g:darkburn_alternate_Include = 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:darkburn_force_dark_Background = 1
-"
-" * To turn the parameter(s) back to defaults, use UNLET:
-"
-"      unlet g:darkburn_alternate_Include
-"
-"   Setting to 0 won't work!
-"
-" That's it, enjoy!
-" 
-" TODO
-"   - Visual alternate color is broken? Try GVim >= 7.0.66 if you have trouble
-"   - IME colouring (CursorIM)
-
-set background=dark
-hi clear          
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="darkburn"
-
-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=#dcdccc 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=#dcdcdc
-hi IncSearch       guibg=#f8f893 guifg=#385f38
-hi Keyword         guifg=#f0dfaf gui=bold
-hi Label           guifg=#dfcfaf gui=underline
-hi LineNr          guifg=#9fafaf guibg=#262626
-hi Macro           guifg=#ffcfaf gui=bold
-hi ModeMsg         guifg=#6fb86f gui=none
-hi MoreMsg         guifg=#ffffff gui=bold
-hi NonText         guifg=#404040
-hi Number          guifg=#8cd0d3
-hi Operator        guifg=#f0efd0
-hi PreCondit       guifg=#dfaf8f gui=bold
-hi PreProc         guifg=#ffb23f gui=bold
-hi Question        guifg=#ffffff gui=bold
-hi Repeat          guifg=#ffd7a7 gui=bold
-hi Search          guifg=#ffffe0 guibg=#284f28
-hi SpecialChar     guifg=#9fbfd6 gui=bold
-hi SpecialComment  guifg=#82a282 gui=bold
-hi Special         guifg=#9fbfd6
-hi SpecialKey      guifg=#9ece9e
-hi Statement       guifg=#6fb86f  gui=none
-hi StatusLine      guifg=#313633 guibg=#ccdc90
-hi StatusLineNC    guifg=#2e3330 guibg=#88b090
-hi StorageClass    guifg=#c3bf9f gui=bold
-hi String          guifg=#b75151
-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=188   cterm=bold
-    hi ErrorMsg        ctermfg=115   ctermbg=236     cterm=bold
-    hi Exception       ctermfg=249   cterm=bold
-    hi Float           ctermfg=251  
-    hi FoldColumn      ctermfg=109   ctermbg=238    
-    hi Folded          ctermfg=109   ctermbg=238    
-    hi Function        ctermfg=228  
-    hi Identifier      ctermfg=223  
-    hi IncSearch       ctermbg=228   ctermfg=238    
-    hi Keyword         ctermfg=223   cterm=bold
-    hi Label           ctermfg=187   cterm=underline
-    hi LineNr          ctermfg=248   ctermbg=235    
-    hi Macro           ctermfg=223   cterm=bold
-    hi ModeMsg         ctermfg=223   cterm=none
-    hi MoreMsg         ctermfg=15    cterm=bold
-    hi NonText         ctermfg=238  
-    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
-    hi CursorLine      ctermbg=236   cterm=none
-
-    " 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:darkburn_high_Contrast")
-        hi Normal ctermfg=188 ctermbg=234
-    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 foldcolumn      ctermbg=238
-        hi folded          ctermbg=238
-        hi incsearch       ctermbg=228
-        hi linenr          ctermbg=238  
-        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
-    endif
-endif
-
-if exists("g:darkburn_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:darkburn_high_Contrast")
-    " use new darker background
-    hi Normal          guifg=#ffffff guibg=#1f1f1f
-    hi CursorLine      guibg=#121212 gui=bold
-    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 TabLineFill     guifg=#cfcfaf guibg=#181818 gui=bold
-    hi TabLineSel      guifg=#efefef guibg=#1c1c1b gui=bold
-    hi TabLine         guifg=#b6bf98 guibg=#181818 gui=bold
-    hi CursorColumn    guifg=#dcdccc guibg=#2b2b2b
-else
-    " Original, lighter background
-    hi Normal          guifg=#dcdccc guibg=#3f3f3f
-    hi CursorLine      guibg=#434443
-    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 TabLineFill     guifg=#cfcfaf guibg=#353535 gui=bold
-    hi TabLineSel      guifg=#efefef guibg=#3a3a39 gui=bold
-    hi TabLine         guifg=#b6bf98 guibg=#353535 gui=bold
-    hi CursorColumn    guifg=#dcdccc guibg=#4f4f4f
-endif
-    
-
-if exists("g:darkburn_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=#71d3b4 guibg=#233323 gui=none
-    hi VisualNOS       guifg=#71d3b4 guibg=#233323 gui=none
-endif
-
-if exists("g:darkburn_alternate_Error")
-    " use a bit different Error
-    hi Error           guifg=#ef9f9f guibg=#201010 gui=bold  
-else
-    " default
-    hi Error           guifg=#e37170 guibg=#332323 gui=none
-endif
-
-if exists("g:darkburn_alternate_Include")
-    " original setting
-    hi Include         guifg=#ffcfaf  gui=bold
-else
-    " new, less contrasted one
-    hi Include         guifg=#dfaf8f gui=bold
-endif
-    " TODO check for more obscure syntax groups that they're ok
-
-" vim: :
diff --git a/colors/darkdot.vim b/colors/darkdot.vim
deleted file mode 100755
index de59f71..0000000
--- a/colors/darkdot.vim
+++ /dev/null
@@ -1,97 +0,0 @@
-" Vim color file
-" Maintainer:	David Lazar <david_bv|wants no spam|at|yahoo|dot|com>
-" Last Change:	Fri, 25 Aug 2006 16:30:00 +0300
-" Version:	2.7
-" 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=#00285e	guifg=#d6ebf0
-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
-
-if v:version >= 700
-	hi link Pmenu		StatusLineNC
-	hi link PmenuSel	StatusLine
-	hi link PmenuThumb	StatusLine
-	hi link PmenuSbar	StatusLineNC
-
-	hi SpellBad	ctermbg=none	ctermfg=red	gui=undercurl	guisp=#ff6666
-	hi SpellCap	ctermbg=none	ctermfg=blue	gui=undercurl	guisp=#6666ff
-	hi SpellRare	ctermbg=none	ctermfg=magenta	gui=undercurl	guisp=#ff66ff
-
-	hi TabLine	cterm=inverse	ctermbg=none	ctermfg=none	gui=none	guibg=#bbbbbb	guifg=#000000
-	hi TabLineSel	cterm=bold	ctermbg=none	ctermfg=none	gui=none	guibg=#bbbbbb	guifg=#000000
-	hi TabLineFill 	cterm=inverse	ctermbg=none	ctermfg=none	gui=none	guibg=#bbbbbb	guifg=#000000
-
-	hi MatchParen	cterm=bold	ctermbg=none	ctermfg=green	gui=bold	guibg=bg	guifg=#44ff44
-endif
diff --git a/colors/darkeclipse.vim b/colors/darkeclipse.vim
deleted file mode 100755
index 2e68b98..0000000
--- a/colors/darkeclipse.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Name:		darkeclipse.vim
-" Maintainer:	Kojo Sugita
-" Last Change:	2008-11-22
-" Revision:	1.1
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'darkeclipse'
-
-"default colors
-hi Normal	guifg=#b0b0b0 guibg=#101520
-hi NonText	guifg=#606060 guibg=#202530	gui=none
-hi SpecialKey	guifg=#606060 guibg=#101520
-hi Cursor	guifg=#101520 guibg=#c0c0c0
-hi CursorLine	guibg=#252530
-hi CursorColumn	guibg=#252530
-hi lCursor	guifg=#101520 guibg=#c0c0c0
-hi CursorIM	guifg=#101520 guibg=#c0c0c0
-
-" Directory
-hi Directory	guifg=#f0f0f0 guibg=#101520 gui=bold
-
-" Diff
-hi DiffAdd	guifg=#8090f0 guibg=#101520 gui=none
-hi DiffChange	guifg=#8090f0 guibg=#101520 gui=none
-hi DiffDelete	guifg=#8090f0 guibg=#101520 gui=none
-hi DiffText	guifg=#8090f0 guibg=#101520 gui=bold
-
-" Message
-hi ModeMsg	guifg=#c0c0c0 guibg=#101520
-hi MoreMsg	guifg=#c0c0c0 guibg=#101520
-hi ErrorMsg	guifg=#ee1111 guibg=#101520
-hi WarningMsg	guifg=#ee1111 guibg=#101520
-
-hi VertSplit	guifg=#808080 guibg=#808080
-
-" Folds
-hi Folded	guifg=#c0c0c0 guibg=#101520
-hi FoldColumn	guifg=#c0c0c0 guibg=#102010
-
-" Search
-hi Search	guifg=#101520 guibg=#c0c0c0 gui=none
-hi IncSearch	guifg=#101520 guibg=#c0c0c0 gui=none
-
-hi LineNr	guifg=#606570 guibg=#000000 gui=none
-hi Question	guifg=#c0c0c0 guibg=#101520
-
-"\n, \0, %d, %s, etc...
-hi Special	guifg=#f0f0f0 guibg=#101520 gui=none
-
-" status line
-hi StatusLine	guifg=#000000 guibg=#808080 gui=none
-hi StatusLineNC	guifg=#404040 guibg=#707070 gui=none
-hi WildMenu	guifg=#000000 guibg=#c0c0c0
-
-hi Title	guifg=#9090f0 guibg=#101520 gui=bold
-hi Visual	guibg=#000000 guifg=#cae682 gui=underline
-hi VisualNOS	guifg=#b0b0b0 guibg=#101520
-
-hi Number	guifg=#9090f0 guibg=#101520
-hi Char		guifg=#9090f0 guibg=#101520
-hi String	guifg=#9090f0 guibg=#101520
-hi Boolean	guifg=#9090f0 guibg=#101520
-hi Comment	guifg=#70c010
-hi Constant 	guifg=#f0b040 guibg=#101520 gui=none
-
-" hi Identifier	guifg=#9090f0
-hi Identifier	guifg=#f0a0b0
-hi Statement	guifg=#f0a0b0 gui=none
-
-"Procedure name
-hi Function	guifg=#f0f0f0
-
-"Define, def
-hi PreProc	guifg=#f0f0f0 gui=none
-
-hi Type		guifg=#f0a0b0 gui=none
-hi Underlined	guifg=#c0c0c0 gui=underline
-hi Error	guifg=#ee1111 guibg=#101520
-hi Todo		guifg=#9090f0 guibg=#101520 gui=none
-hi SignColumn   guibg=#101520
-
-" Matches
-hi MatchParen	guifg=#000000 guibg=#90e030 gui=none
-
-if version >= 700
-  " Pmenu
-  hi Pmenu	guibg=#202530 guifg=#c0c0c0
-  hi PmenuSel	guibg=#f0f0f0 guifg=#101520
-  hi PmenuSbar	guibg=#505050
-  hi PmenuThumb	guifg=#f0f0f0
-
-  " Tab
-  hi TabLine	  guifg=#b0b0b0 guibg=black gui=underline
-  hi TabLineFill  guifg=#b0b0b0 guibg=black gui=none
-  hi TabLineSel	  guifg=#9090f0 guibg=black gui=underline
-endif
-
-" vim:set ts=8 sts=2 sw=2 tw=0:
diff --git a/colors/darker-robin.vim b/colors/darker-robin.vim
deleted file mode 100755
index 23feec6..0000000
--- a/colors/darker-robin.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" Vim color file
-" Maintainer: Alexander Chaika <bucha-chaka@yandex.ru>
-" Last Change: October, 6,2006
-" Version: 0.1
-
-" This is a modification of robinhood color scheme,
-" _ created by Alex Schroede.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-
-""" Colors
-
-" GUI colors
-hi Cursor			guifg=fg		guibg=gray		gui=none
-hi CursorIM			guifg=NONE		guibg=gray		gui=none
-" hi Directory		guifg=#ff0000	guibg=#00ffff	gui=none
-" hi DiffAdd
-" hi DiffChange
-" hi DiffDelete
-" hi DiffText
-hi ErrorMsg			guifg=White 	guibg=Red		gui=none
-" hi Folded
-" hi FoldColumn
-" hi IncSearch
-" hi ModeMsg
-" hi MoreMsg
-hi NonText			guifg=#000000	guibg=#101010	gui=none
-
-hi LineNr			guifg=#909000	guibg=#101010	gui=none
-
-hi Normal			guifg=#807057	guibg=#101010	gui=none
-" hi Question
-hi Search 			guifg=#000000	guibg=gray		gui=none
-" hi SpecialKey
-hi StatusLine		guifg=#000000	guibg=#606050	gui=none
-hi StatusLineNC		guifg=#000001	guibg=#606050	gui=none
-" hi Title
-" hi Visual			guifg=#ffff00				gui=none
-" hi VisualNOS		guifg=Black						gui=none
-hi WarningMsg		guifg=White						gui=none
-" hi WildMenu
-
-hi Comment			guifg=#606099					gui=none
-
-hi Constant			guifg=#8da0a0					gui=none
-hi String			guifg=#a0644d					gui=none
-hi Character		guifg=#a0644d					gui=none
-hi Number			guifg=#8da0a0					gui=none
-hi Boolean			guifg=#8da0a0					gui=none
-hi Float			guifg=#8da0a0					gui=none
-
-hi Identifier		guifg=#70b970					gui=none
-hi Function			guifg=yellowgreen				gui=none
-
-hi Statement		guifg=#b05a50					gui=none
-hi Conditional		guifg=#b05a50					gui=none
-hi Repeat			guifg=#b05a50					gui=none
-hi Label			guifg=#b05a50					gui=none
-hi Operator			guifg=#c0ba98					gui=none
-hi Keyword			guifg=#b05a50					gui=none
-hi Exception		guifg=#b05a50					gui=none
-
-hi PreProc			guifg=#70b970					gui=none
-hi Include			guifg=#70b970					gui=none
-hi Define			guifg=#70b970					gui=none
-hi Macro			guifg=#70b970					gui=none
-hi PreCondit		guifg=#70b970					gui=none
-
-
-hi Type				guifg=#70b970					gui=none
-hi StorageClass		guifg=#50a085					gui=none
-hi Structure		guifg=#50a085					gui=none
-hi Typedef			guifg=#50a085					gui=none
-
-hi Underlined										gui=underline
-
-hi Ignore			guifg=bg
-
-hi Error			guifg=White		guibg=Red		gui=none
-
-hi Todo				guifg=#900000	guibg=#909000	gui=none
-
diff --git a/colors/darkerdesert.vim b/colors/darkerdesert.vim
deleted file mode 100755
index a77534c..0000000
--- a/colors/darkerdesert.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-" Vim color file
-" Maintainer:   Zhang Jing
-" Last Change:  %[% 2005��12��15�� ������ 15ʱ40��34�� %]%
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="softblack"
-
-hi Normal	    guibg=#121212   guifg=#9090a0
-
-hi Cursor	    guibg=#b3b3df   guifg=grey30    gui=bold
-hi VertSplit	guibg=#505050   guifg=grey50    gui=none
-hi Folded	    guibg=#252525   guifg=gold3
-hi FoldColumn	guibg=#252525   guifg=gold3
-hi IncSearch	guifg=slategrey guibg=khaki
-hi LineNr		guifg=grey30
-hi ModeMsg	    guifg=goldenrod3
-hi MoreMsg	    guifg=SeaGreen
-hi NonText	    guifg=LightBlue guibg=#252525
-hi Question	    guifg=#28a45c
-hi Search	    guibg=#b17733   guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#606050   guifg=black     gui=none
-hi StatusLineNC	guibg=#606050   guifg=grey20    gui=none
-hi Title	    guifg=#38d9ff
-hi Visual	    guifg=#d0d0d0   guibg=#6d8824   gui=none
-hi WarningMsg	guifg=salmon
-hi ErrorMsg     guifg=white     guibg=#b03030
-
-hi Comment	    guifg=#5080a0
-hi Constant	    guifg=#a16261
-hi Identifier	guifg=#308040
-hi Statement	guifg=#a4a338
-hi PreProc	    guifg=#a54140
-hi Type		    guifg=#655723
-hi Special	    guifg=#c9b37e
-hi Ignore 	    guifg=grey40
-hi Error        guifg=white     guibg=#b03030
-hi Todo		    guifg=#802c13   guibg=#c3bc44   gui=bold
-"vim:ts=4:tw=4
diff --git a/colors/darkocean.vim b/colors/darkocean.vim
deleted file mode 100755
index 99d2ed3..0000000
--- a/colors/darkocean.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-" Name Of File: darkocean.vim
-"  Description: Gvim colorscheme, works best with version 6.0.
-"   Maintainer: Naveen Chandra R <ncr AT iitbombay DOT org>
-"  Last Change: Thursday, August 15, 2002
-" Installation: Drop this file in your $VIMRUNTIME/colors/ directory
-"               or manually source this file using ':so darkocean.vim'.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="darkocean"
-
-hi Cursor         gui=None            guibg=#add8e6    guifg=#000000
-hi CursorIM       gui=None            guibg=#add8e6    guifg=#000000
-hi Directory      gui=None            guibg=bg         guifg=#20b2aa
-hi DiffAdd        gui=Bold            guibg=#7e354d    guifg=fg
-hi DiffChange     gui=Bold            guibg=#103040    guifg=#cc3300
-hi DiffDelete     gui=Bold,Reverse    guibg=#7e354d    guifg=fg
-hi DiffText       gui=Bold            guibg=#d74141    guifg=fg
-hi ErrorMsg       gui=None            guibg=#b22222    guifg=#ffffe0
-hi VertSplit      gui=None            guibg=#999999    guifg=#000000
-hi Folded         gui=Bold            guibg=#003366    guifg=#999999
-hi FoldColumn     gui=Bold            guibg=#305070    guifg=#b0d0e0
-hi IncSearch      gui=Bold            guibg=#8db6cd    guifg=fg
-hi LineNr         gui=Bold            guibg=#0f0f0f    guifg=#8db6cd
-hi MoreMsg        gui=Bold            guibg=bg         guifg=#bf9261
-hi ModeMsg        gui=Bold            guibg=bg         guifg=#4682b4
-hi NonText        gui=None            guibg=#0f0f0f    guifg=#87cefa
-hi Normal         gui=None            guibg=#000000    guifg=#e0ffff
-hi Question       gui=Bold            guibg=bg         guifg=#f4bb7e
-hi Search         gui=Bold            guibg=#607b8b    guifg=#000000
-hi SpecialKey     gui=None            guibg=bg         guifg=#63b8ff
-hi StatusLine     gui=Bold            guibg=#8db6cd    guifg=#000000
-hi StatusLineNC   gui=None            guibg=#607b8b    guifg=#1a1a1a
-hi Title          gui=Bold            guibg=bg         guifg=#5cacee
-hi Visual         gui=Reverse         guibg=#ffffff    guifg=#36648b
-hi VisualNOS      gui=Bold,Underline  guibg=#4682b4    guifg=fg
-hi WarningMsg     gui=Bold            guibg=bg         guifg=#b22222
-hi WildMenu       gui=Bold            guibg=#607b8b    guifg=#000000
-hi Comment        gui=None            guibg=#102520    guifg=#8db6cd
-hi Constant       gui=None            guibg=bg         guifg=#c34a2c
-hi Identifier     gui=None            guibg=bg         guifg=#009acd
-hi Statement      gui=None            guibg=bg         guifg=#72a5ee
-hi PreProc        gui=None            guibg=bg         guifg=#c12869
-hi Include        gui=None            guibg=bg         guifg=#ccccff
-hi Type           gui=None            guibg=bg         guifg=#3b9c9c
-hi Error          gui=None            guibg=#b22222    guifg=#ffffe0
-hi Todo           gui=None            guibg=#507080    guifg=#3bcccc
-hi Ignore         gui=None            guibg=bg         guifg=#777777
-hi TagName        gui=None            guibg=#660000    guifg=#a7a7a7
diff --git a/colors/darkrobot.vim b/colors/darkrobot.vim
deleted file mode 100755
index dd29444..0000000
--- a/colors/darkrobot.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-" Vim color file
-" pacific v1.0
-" Maintainer:	Rob Valentine <hjzx5ga02@sneakemail.com>
-
-" Dark Robot
-"
-"
-" useful help screens & commands
-" :syntax
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-"
-" useful online resource
-" http://www.colorpicker.com
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="darkrobot"
-
-hi Normal	guibg=#1D1D1D guifg=#FFFFFF
-
-" syntax highlighting
-hi Comment	  guifg=#B8B8B8
-hi Title	guifg=#FFFFFF gui=none
-hi Underlined guifg=#20b0eF gui=none
-hi Statement  guifg=#FF6262 gui=none
-hi Type		  guifg=#FEFFBA gui=none
-hi PreProc    guifg=#FFA41B
-hi Constant	  guifg=#DAC5FF guibg=#141414
-hi Identifier guifg=#7EFAFF 
-
-"highlight groups
-hi Ignore	guifg=grey40
-hi Todo		guifg=#000000 guibg=#60FF5C
-hi Cursor	 guibg=#2424FF guifg=#60FF5C
-hi MatchParen guibg=#60FF5C guifg=#2424FF
-hi Special guifg=#466EFF
-hi Directory guifg=#FEFFBA gui=underline
-hi DiffAdd guifg=#07AF07 guibg=#1D1D1D
-hi DiffChange guifg=#FFFFFF guibg=#1D1D1D gui=underline
-hi DiffDelete guifg=#FF0000 guibg=#1D1D1D
-hi DiffText guifg=#60FF5C guibg=#1D1D1D gui=underline
-hi ErrorMsg guifg=#FFFFFF guibg=#FF0000
-hi VertSplit	guifg=#B8B8B8 guibg=#373737 gui=none
-hi Folded	guibg=#373737 guifg=#FFFFFF "#A6D5F6
-hi FoldColumn	guibg=#000000 guifg=#FFFFFF gui=bold
-hi LineNr   guifg=#B8B8B8 guibg=#373737
-hi ModeMsg guifg=#60FF5C gui=none
-hi MoreMsg guifg=#60FF5C gui=none
-hi Question guifg=#60FF5C gui=none
-hi NonText  guifg=#A6A6A6 guibg=#222222
-hi Search	guibg=slategrey guifg=#FFDABB
-hi IncSearch	guifg=slategrey guibg=#FFDFB0
-hi StatusLine	guibg=#000000 guifg=#B8B8B8 gui=none
-hi StatusLineNC	guibg=#000000 guifg=#666666 gui=none
-hi Visual   guifg=#FFFFFF guibg=#07077B
-hi Pmenu	guifg=#5A5A5A guibg=#A8FF97
-hi PmenuSel	guifg=#2E2E2E guibg=#62FB44 
-"vim: sw=4
diff --git a/colors/darkroom.vim b/colors/darkroom.vim
deleted file mode 100755
index 8fb2c79..0000000
--- a/colors/darkroom.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" Vim color file
-" Maintainer:   Connor Berry <connorberry@yahoo.com>
-" Last Change:  2008.05.23
-" URL: www.narwhale.org
-
-set background=dark     "or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="darkroom"
-
-        hi LineNr       term=bold gui=bold guifg=green guibg=black
-        hi LineNr       term=bold cterm=bold ctermfg=green ctermbg=black
-        hi Normal       ctermfg=Green ctermbg=Black
-        hi Normal       guifg=Green guibg=Black
-        hi NonText      ctermfg=black  ctermbg=Black
-        hi NonText      guifg=black  guibg=Black
-
-        hi Statement    ctermfg=DarkCyan      ctermbg=Black
-        hi Statement    guifg=DarkCyan      guibg=Black
-        hi Comment      ctermfg=darkgreen  ctermbg=Black cterm=bold term=bold
-        hi Comment      guifg=darkgreen  guibg=Black gui=bold term=bold
-        hi Constant     ctermfg=DarkCyan  ctermbg=Black
-        hi Constant     guifg=DarkCyan  guibg=Black
-        hi Identifier   ctermfg=Green      ctermbg=Black
-        hi Identifier   guifg=Green      guibg=Black
-        hi Type         ctermfg=DarkCyan ctermbg=Black
-        hi Type         guifg=DarkCyan guibg=Black
-        hi String       ctermfg=Cyan ctermbg=black
-        hi String       guifg=Cyan guibg=Black
-        hi Boolean      ctermfg=DarkCyan ctermbg=Black
-        hi Boolean      guifg=DarkCyan guibg=Black
-        hi Number       ctermfg=DarkCyan ctermbg=Black
-        hi Number       guifg=DarkCyan guibg=Black
-        hi Folded       ctermfg=DarkCyan ctermbg=Black cterm=underline term=none
-        hi Folded       guifg=DarkCyan guibg=Black gui=underline term=none
-        hi Special      ctermfg=darkgreen      ctermbg=Black
-        hi Special      guifg=darkgreen      guibg=Black
-        hi PreProc      ctermfg=DarkGreen ctermbg=Black cterm=bold term=bold
-        hi PreProc      guifg=DarkGreen guibg=Black gui=bold term=bold
-        hi Scrollbar    ctermfg=DarkCyan      ctermbg=Black
-        hi Scrollbar    guifg=DarkCyan      guibg=Black
-        hi Cursor       ctermfg=Black     ctermbg=green
-        hi Cursor       guifg=Black     guibg=green
-        hi ErrorMsg     ctermfg=Red       ctermbg=Black cterm=bold term=bold
-        hi ErrorMsg     guifg=Red       guibg=Black gui=bold term=bold
-        hi WarningMsg   ctermfg=Yellow    ctermbg=Black
-        hi WarningMsg   guifg=Yellow    guibg=Black
-        hi VertSplit    ctermfg=black     ctermbg=Black
-        hi VertSplit    guifg=black     guibg=Black
-        hi Directory    ctermfg=Green      ctermbg=DarkBlue
-        hi Directory    guifg=Green      guibg=DarkBlue
-        hi Visual       ctermfg=White     ctermbg=DarkGray cterm=underline term=none
-        hi Visual       guifg=White     guibg=DarkGray gui=underline term=none
-        hi Title        ctermfg=White     ctermbg=DarkBlue
-        hi Title        guifg=White     guibg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold,underline ctermfg=White ctermbg=Black
-        hi StatusLine   term=bold gui=bold,underline guifg=White guibg=Black
-        hi StatusLineNC term=bold cterm=bold,underline ctermfg=Gray  ctermbg=Black
-        hi StatusLineNC term=bold gui=bold,underline guifg=Gray  guibg=Black
-
-        hi cursorline   ctermbg=darkgreen ctermfg=black
-        hi cursorline   guibg=darkgreen guifg=black
-
-let s:currentfile=bufname(0)
-only
-set wiw=90
-e --
-setlocal buftype=nofile
-setlocal bufhidden=hide
-setlocal noswapfile
-setlocal nobuflisted
-vsplit
-vsplit
-execute "normal \<c-w>l"
-execute "normal \<c-w>="
-if strlen(s:currentfile)
-e #
-else
-e scratch
-  setlocal buftype=nofile
-  setlocal bufhidden=hide
-  setlocal noswapfile
-endif
-execute "normal G"
-"startinsert!
-unlet s:currentfile
diff --git a/colors/darkslategray.vim b/colors/darkslategray.vim
deleted file mode 100755
index b36aef0..0000000
--- a/colors/darkslategray.vim
+++ /dev/null
@@ -1,117 +0,0 @@
-" vim: set tw=0 sw=4 sts=4 et:
-
-" Vim color file
-" Maintainer: Tuomas Susi <tsusi@cc.hut.fi>
-" Last Change: 2004 October 05
-" Version: 1.7
-
-" Emacs in RedHat Linux used to have (still does?) a kind of 'Wheat on
-" DarkSlateGray' color scheme by default. This color scheme is created in the
-" same spirit.
-"
-" Darkslategray is intended to be nice to your eyes (low contrast) and to take
-" advantage of syntax hilighting as much as possible.
-"
-" This color scheme is for the GUI only, I'm happy with default console colors.
-" Needs at least vim 6.0.
-
-
-" Init stuff
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "darkslategray"
-
-
-" GUI colors
-
-hi Cursor               guifg=fg guibg=#da70d6
-hi CursorIM             guifg=NONE guibg=#ff83fa
-hi Directory            guifg=#e0ffff
-hi DiffAdd              guibg=#528b8b
-hi DiffChange           guibg=#8b636c
-hi DiffDelete           gui=bold guifg=fg guibg=#000000
-hi DiffText             gui=bold guibg=#6959cd
-hi ErrorMsg             gui=bold guifg=#ffffff guibg=#ff0000
-hi VertSplit            gui=bold guifg=#bdb76b guibg=#000000
-hi Folded               guifg=#000000 guibg=#bdb76b
-hi FoldColumn           guifg=#000000 guibg=#bdb76b
-hi SignColumn           gui=bold guifg=#bdb76b guibg=#20b2aa
-hi IncSearch            gui=bold guifg=#000000 guibg=#ffffff
-hi LineNr               gui=bold guifg=#bdb76b guibg=#528b8b
-hi ModeMsg              gui=bold
-hi MoreMsg              gui=bold guifg=#20b2aa
-hi NonText              gui=bold guifg=#ffffff
-hi Normal               guibg=#2f4f4f guifg=#f5deb3
-hi Question             gui=bold guifg=#ff6347
-hi Search               gui=bold guifg=#000000 guibg=#ffd700
-hi SpecialKey           guifg=#00ffff
-hi StatusLine           gui=bold guifg=#f0e68c guibg=#000000
-hi StatusLineNC         guibg=#bdb76b guifg=#404040
-hi Title                gui=bold guifg=#ff6347
-hi Visual               guifg=#000000 guibg=fg
-hi VisualNOS            gui=bold guifg=#000000 guibg=fg
-hi WarningMsg           guifg=#ffffff guibg=#ff6347
-hi WildMenu             gui=bold guifg=#000000 guibg=#ffff00
-
-
-" I use GTK and don't wanna change these
-"hi Menu foobar
-"hi Scrollbar foobar
-"hi Tooltip foobar
-
-
-" Colors for syntax highlighting
-hi Comment              guifg=#da70d6
-
-hi Constant             guifg=#cdcd00
-    hi String           guifg=#7fffd4
-    hi Character        guifg=#7fffd4
-    hi Number           guifg=#ff6347
-    hi Boolean          guifg=#cdcd00
-    hi Float            guifg=#ff6347
-
-hi Identifier           guifg=#afeeee
-    hi Function         guifg=#ffffff
-
-hi Statement            gui=bold guifg=#4682b4
-    hi Conditional      gui=bold guifg=#4682b4
-    hi Repeat           gui=bold guifg=#4682b4
-    hi Label            gui=bold guifg=#4682b4
-    hi Operator         gui=bold guifg=#4682b4
-    hi Keyword          gui=bold guifg=#4682b4
-    hi Exception        gui=bold guifg=#4682b4
-
-hi PreProc              guifg=#cdcd00
-    hi Include          guifg=#ffff00
-    hi Define           guifg=#cdcd00
-    hi Macro            guifg=#cdcd00
-    hi PreCondit        guifg=#cdcd00
-
-hi Type                 gui=bold guifg=#98fb98
-    hi StorageClass     guifg=#00ff00
-    hi Structure        guifg=#20b2aa
-    hi Typedef          guifg=#00ff7f
-
-hi Special              guifg=#ff6347
-    "Underline Character
-    hi SpecialChar      gui=underline guifg=#7fffd4
-    hi Tag              guifg=#ff6347
-    "Statement
-    hi Delimiter        gui=bold guifg=#b0c4de
-    "Bold comment (in Java at least)
-    hi SpecialComment   gui=bold guifg=#da70d6
-    hi Debug            gui=bold guifg=#ff0000
-
-hi Underlined           gui=underline
-
-hi Ignore               guifg=bg
-
-hi Error                gui=bold guifg=#ffffff guibg=#ff0000
-
-hi Todo                 gui=bold guifg=#000000 guibg=#ff83fa
-
diff --git a/colors/darkspectrum.vim b/colors/darkspectrum.vim
deleted file mode 100755
index 26ed7f3..0000000
--- a/colors/darkspectrum.vim
+++ /dev/null
@@ -1,130 +0,0 @@
-" Vim color file
-"
-" Author: Brian Mock <mock.brian@gmail.com>
-"
-" Note: Based on Oblivion color scheme for gedit (gtk-source-view)
-"
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-hi clear
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="darkspectrum"
-
-hi Normal guifg=#efefef guibg=#2A2A2A
-
-" highlight groups
-hi Cursor		guibg=#ffffff guifg=#000000
-hi CursorLine	guibg=#000000
-"hi CursorLine	guibg=#3e4446
-hi CursorColumn	guibg=#464646
-
-"hi DiffText     guibg=#4e9a06 guifg=#FFFFFF gui=bold
-"hi DiffChange   guibg=#4e9a06 guifg=#FFFFFF gui=bold
-"hi DiffAdd      guibg=#204a87 guifg=#FFFFFF gui=bold
-"hi DiffDelete   guibg=#5c3566 guifg=#FFFFFF gui=bold
-
-hi DiffAdd         guifg=#ffcc7f guibg=#a67429 gui=none
-hi DiffChange      guifg=#7fbdff guibg=#425c78 gui=none
-hi DiffText        guifg=#8ae234 guibg=#4e9a06 gui=none
-"hi DiffDelete      guifg=#252723 guibg=#000000 gui=none
-hi DiffDelete      guifg=#000000 guibg=#000000 gui=none
-"hi ErrorMsg
-
-hi Number		guifg=#fce94f
-
-hi Folded		guibg=#000000 guifg=#FFFFFF gui=bold
-hi vimFold		guibg=#000000 guifg=#FFFFFF gui=bold
-hi FoldColumn	guibg=#000000 guifg=#FFFFFF gui=bold
-
-hi LineNr		guifg=#535353 guibg=#202020
-hi NonText		guifg=#535353 guibg=#202020
-hi Folded		guifg=#535353 guibg=#202020 gui=bold
-hi FoldeColumn  guifg=#535353 guibg=#202020 gui=bold
-"hi VertSplit	guibg=#ffffff guifg=#ffffff gui=none
-
-hi VertSplit	guibg=#3C3C3C guifg=#3C3C3C gui=none
-hi StatusLine   guifg=#FFFFFF guibg=#3C3C3C gui=none
-hi StatusLineNC guifg=#808080 guibg=#3C3C3C gui=none
-
-hi ModeMsg		guifg=#fce94f
-hi MoreMsg		guifg=#fce94f
-hi Visual		guifg=#FFFFFF guibg=#3465a4 gui=none
-hi VisualNOS    guifg=#FFFFFF guibg=#204a87 gui=none
-hi IncSearch	guibg=#FFFFFF guifg=#ef5939
-hi Search		guibg=#ad7fa8 guifg=#FFFFFF
-hi SpecialKey	guifg=#8ae234
-
-hi Title		guifg=#ef5939
-hi WarningMsg	guifg=#ef5939
-hi Number		guifg=#fcaf3e
-
-hi MatchParen	guibg=#ad7fa8 guifg=#FFFFFF
-hi Comment		guifg=#8a8a8a
-hi Constant		guifg=#ef5939 gui=none
-hi String		guifg=#fce94f
-hi Identifier	guifg=#729fcf
-hi Statement	guifg=#ffffff gui=bold
-hi PreProc		guifg=#ffffff gui=bold
-hi Type			guifg=#8ae234 gui=bold
-hi Special		guifg=#e9b96e
-hi Underlined	guifg=#ad7fa8 gui=underline
-hi Directory	guifg=#729fcf
-hi Ignore		guifg=#555753
-hi Todo			guifg=#FFFFFF guibg=#ef5939 gui=bold
-hi Function		guifg=#ad7fa8
-
-"hi WildMenu     guibg=#2e3436 guifg=#ffffff gui=bold
-"hi WildMenu     guifg=#7fbdff guibg=#425c78 gui=none
-hi WildMenu     guifg=#ffffff guibg=#3465a4 gui=none
-
-hi Pmenu        guibg=#000000 guifg=#c0c0c0
-hi PmenuSel     guibg=#3465a4 guifg=#ffffff
-hi PmenuSbar    guibg=#444444 guifg=#444444
-hi PmenuThumb   guibg=#888888 guifg=#888888 
-
-hi cppSTLType   guifg=#729fcf gui=bold
-
-hi spellBad     guisp=#fcaf3e
-hi spellCap     guisp=#73d216
-hi spellRare    guisp=#ad7fa8
-hi spellLocal   guisp=#729fcf
-
-hi link cppSTL          Function
-hi link Error			Todo
-hi link Character		Number
-hi link rubySymbol		Number
-hi link htmlTag			htmlEndTag
-"hi link htmlTagName     htmlTag
-hi link htmlLink		Underlined
-hi link pythonFunction	Identifier
-hi link Question		Type
-hi link CursorIM		Cursor
-hi link VisualNOS		Visual
-hi link xmlTag			Identifier
-hi link xmlTagName		Identifier
-hi link shDeref			Identifier
-hi link shVariable		Function
-hi link rubySharpBang	Special
-hi link perlSharpBang	Special
-hi link schemeFunc      Statement
-"hi link shSpecialVariables Constant
-"hi link bashSpecialVariables Constant
-
-" tabs (non gui)
-hi TabLine		guifg=#A3A3A3 guibg=#202020 gui=none
-hi TabLineFill	guifg=#535353 guibg=#202020 gui=none
-hi TabLineSel	guifg=#FFFFFF gui=bold
-"hi TabLineSel	guifg=#FFFFFF guibg=#000000 gui=bold
-" vim: sw=4 ts=4
diff --git a/colors/darktango.vim b/colors/darktango.vim
deleted file mode 100755
index 4ceeca9..0000000
--- a/colors/darktango.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-" Vim color file
-" Name: DarkTango
-" Maintainer: Panos Laganakos <panos.laganakos@gmail.com>
-" Version: 0.3
-
-
-set background=dark
-if version > 580
-	" no guarantees for version 5.8 and below, but this makes it stop
-	" complaining
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let g:colors_name="darktango"
-
-hi Normal	guibg=#2e3436 guifg=#d3d7cf
-
-" {{{ syntax
-hi Comment	guifg=#555753
-hi Title	guifg=#eeeeec
-hi Underlined	guifg=#20b0eF gui=none
-hi Statement	guifg=#888a85
-hi Type		guifg=#ce5c00
-hi PreProc	guifg=#eeeeec 
-hi Constant	guifg=#babdb6
-hi Identifier	guifg=#ce5c00 
-hi Special	guifg=#eeeeec
-hi Ignore	guifg=#f57900
-hi Todo		guibg=#ce5c00 guifg=#eeeeec
-"hi Error
-"}}}
-
-" {{{ groups
-hi Cursor	guibg=#babdb6 guifg=#2e3436
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#555753 guifg=#2e3436 gui=none
-hi Folded	guibg=#555753 guifg=#eeeeec
-hi FoldColumn	guibg=#2e3436 guifg=#555753
-hi LineNr	guibg=#2e3436 guifg=#555753
-hi MatchParen	guibg=#babdb6 guifg=#2e3436
-hi ModeMsg	guifg=#ce5c00
-hi MoreMsg	guifg=#ce5c00
-hi NonText	guibg=#2e3436 guifg=#555753
-hi Question	guifg=#aabbcc
-hi Search	guibg=#fce94f guifg=#c4a000
-hi IncSearch	guibg=#c4a000 guifg=#fce94f
-hi SpecialKey	guifg=#ce5c00
-hi StatusLine	guibg=#555753 guifg=#eeeeec gui=none
-hi StatusLineNC	guibg=#555753 guifg=#272334 gui=none
-hi Visual	guibg=#fcaf3e guifg=#ce5c00 
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-hi Pmenu	guibg=#babdb6 guifg=#555753
-hi PmenuSel	guibg=#eeeeec guifg=#2e3436
-hi CursorLine	guibg=#212628
-" }}}
-
-"  {{{ terminal
-" TODO
-" }}}
-
-"vim: sw=4
diff --git a/colors/darkzen.vim b/colors/darkzen.vim
deleted file mode 100755
index 0c93498..0000000
--- a/colors/darkzen.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Vim color file
-" Maintainer:   Rudá Moura <ruda.moura@gmail.com>
-" Last Change:	Mon Oct 18 23:09:26 BRST 2010
-
-set background=dark
-highlight clear
-if exists("syntax on")
-  syntax reset
-endif
-
-let g:colors_name = "darkzen"
-
-highlight Normal     term=none ctermfg=gray    cterm=none guifg=gray    gui=none guibg=black
-highlight Comment    term=none ctermfg=cyan    cterm=none guifg=cyan    gui=none
-highlight Constant   term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Special    term=none ctermfg=red     cterm=bold guifg=red     gui=bold
-highlight Identifier term=none ctermfg=gray    cterm=none guifg=gray    gui=none
-highlight Statement  term=bold ctermfg=gray    cterm=bold guifg=gray    gui=bold
-highlight Operator   term=bold ctermfg=gray    cterm=bold guifg=gray    gui=bold
-highlight PreProc    term=bold ctermfg=lightgreen   cterm=none guifg=green   gui=none
-highlight Type       term=bold ctermfg=magenta cterm=none guifg=magenta gui=none
-highlight String     term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Number     term=none ctermfg=red     cterm=none guifg=red     gui=none
diff --git a/colors/dawn.vim b/colors/dawn.vim
deleted file mode 100755
index a97c5ad..0000000
--- a/colors/dawn.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" Vim color file
-" Maintainer:	Ajit J. Thakkar (ajit AT unb DOT ca)
-" Last Change:	2005 Nov. 24
-" Version:	1.5
-" URL:		http://www.unb.ca/chem/ajit/vim.htm
-
-" This GUI-only color scheme has a light grey background, and is a softer
-" variant of the default and morning color schemes.
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "dawn"
-
-hi Normal	guifg=Black guibg=grey90
-"hi Normal	guifg=Black guibg=grey80
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg	gui=NONE guifg=Red guibg=Linen
-hi IncSearch	gui=NONE guifg=fg guibg=LightGreen
-hi ModeMsg	gui=NONE guifg=fg guibg=bg
-hi StatusLine	gui=NONE guifg=DarkBlue guibg=grey70
-hi StatusLineNC	gui=NONE guifg=grey90 guibg=grey70
-hi VertSplit	gui=NONE guifg=grey70 guibg=grey70
-hi Visual	gui=reverse guifg=Grey guibg=fg
-hi VisualNOS	gui=underline,bold guifg=fg guibg=bg
-hi DiffText	gui=NONE guifg=Blue guibg=LightYellow
-"hi DiffText	gui=NONE guifg=Blue guibg=MistyRose2
-hi Cursor	guifg=NONE guibg=Green
-hi lCursor	guifg=NONE guibg=Cyan
-hi Directory	guifg=Blue guibg=bg
-hi LineNr	guifg=Brown guibg=grey80
-hi MoreMsg	gui=NONE guifg=SeaGreen guibg=bg
-hi NonText	gui=NONE guifg=Blue guibg=grey80
-hi Question	gui=NONE guifg=SeaGreen guibg=bg
-hi Search	guifg=fg guibg=PeachPuff
-hi SpecialKey	guifg=Blue guibg=bg
-hi Title	gui=NONE guifg=Magenta guibg=bg
-hi WarningMsg	guifg=Red guibg=bg
-hi WildMenu	guifg=fg guibg=PeachPuff
-hi Folded	guifg=Grey40 guibg=bg " guifg=DarkBlue guibg=LightGrey
-hi FoldColumn	guifg=DarkBlue guibg=Grey
-hi DiffAdd	gui=NONE guifg=Blue guibg=LightCyan
-hi DiffChange	gui=NONE guifg=fg guibg=MistyRose2
-hi DiffDelete	gui=NONE guifg=LightBlue guibg=LightCyan
-
-" Colors for syntax highlighting
-hi Constant	gui=NONE guifg=azure4 guibg=bg
-"hi Constant	gui=NONE guifg=DeepSkyBlue4 guibg=bg
-hi String	gui=NONE guifg=DarkOliveGreen4 guibg=bg
-hi Special	gui=NONE guifg=Cyan4 guibg=bg
-hi Statement	gui=NONE guifg=SlateBlue4 guibg=bg
-hi Operator	gui=NONE guifg=Purple guibg=bg
-hi Ignore	gui=NONE guifg=bg guibg=bg
-if v:version >= 700
-  hi SpellBad	gui=undercurl guisp=DeepPink1 guifg=fg guibg=bg
-  hi SpellCap	gui=undercurl guisp=Blue guifg=fg guibg=bg
-  hi SpellRare	gui=undercurl guisp=Black guifg=fg guibg=bg
-  hi SpellLocal	gui=undercurl guisp=SeaGreen guifg=fg guibg=bg
-endif
-hi ToDo		gui=NONE guifg=DeepPink1 guibg=bg
-hi Error	gui=NONE guifg=Red guibg=Linen
-hi Comment	gui=NONE guifg=RoyalBlue guibg=NONE
-hi Identifier	gui=NONE guifg=DodgerBlue3 guibg=NONE
-"hi Identifier	gui=NONE guifg=SteelBlue4 guibg=NONE
-hi PreProc	gui=NONE guifg=Magenta4 guibg=NONE
-hi Type		gui=NONE guifg=Brown guibg=NONE
-hi Underlined	gui=underline guifg=SlateBlue guibg=bg
-"if exists("g:minimal_colors")
-"  hi Statement	gui=NONE guifg=fg guibg=bg
-"  hi Identifier	gui=NONE guifg=fg guibg=bg
-"  hi Type	gui=NONE guifg=fg guibg=bg
-"endif
-
-" vim: sw=2
diff --git a/colors/delek.vim b/colors/delek.vim
deleted file mode 100755
index 32e4536..0000000
--- a/colors/delek.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-" Vim color file
-" Maintainer:	David Schweikert <dws@ee.ethz.ch>
-" Last Change:	2001 Mai 14
-
-" First remove all existing highlighting.
-hi clear
-
-let colors_name = "delek"
-
-hi Normal guifg=Black guibg=white
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi ModeMsg term=bold cterm=bold gui=bold
-hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-hi Cursor guibg=Green guifg=NONE
-hi lCursor guibg=Cyan guifg=NONE
-hi Directory term=bold ctermfg=DarkBlue guifg=Blue
-hi LineNr term=underline ctermfg=Brown guifg=Brown
-hi MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE
-hi SpecialKey term=bold ctermfg=DarkBlue guifg=Blue
-hi Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta
-hi WarningMsg term=standout ctermfg=DarkRed guifg=Red
-hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
-hi FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
-hi DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue
-hi DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta
-hi DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
-
-hi StatusLine	cterm=bold ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
-hi StatusLineNC	cterm=bold ctermbg=blue ctermfg=black  guibg=gold guifg=blue
-hi NonText term=bold ctermfg=Blue gui=bold guifg=gray guibg=white
-hi Cursor guibg=fg guifg=bg
-
-" syntax highlighting
-hi PreProc    term=underline cterm=NONE ctermfg=darkmagenta  gui=NONE guifg=magenta3
-hi Identifier term=underline cterm=NONE ctermfg=darkcyan     gui=NONE guifg=cyan4
-hi Comment    term=NONE      cterm=NONE ctermfg=darkred      gui=NONE guifg=red2
-hi Constant   term=underline cterm=NONE ctermfg=darkgreen    gui=NONE guifg=green3
-hi Special    term=bold      cterm=NONE ctermfg=lightred     gui=NONE guifg=deeppink
-hi Statement  term=bold      cterm=bold ctermfg=blue         gui=bold guifg=blue
-hi Type	      term=underline cterm=NONE ctermfg=blue         gui=bold guifg=blue 
-
-if exists("syntax_on")
-  let syntax_cmd = "enable"
-  runtime syntax/syncolor.vim
-  unlet syntax_cmd
-endif
-
-" vim: sw=2
diff --git a/colors/delphi.vim b/colors/delphi.vim
deleted file mode 100755
index 7e37c6b..0000000
--- a/colors/delphi.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Vim color file
-" Maintainer : Sebastian-Torsten Tillmann <sttillmann@users.sourceforge.net>
-" Last Change: 2006-02-21
-" Version    : 1.0.1
-
-set background=light
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="delphi"
-
-hi Comment    gui=Italic  guifg=DarkBlue  guibg=NONE
-hi Constant   gui=NONE    guifg=DarkBlue  guibg=NONE
-hi Identifier gui=NONE    guifg=Black     guibg=NONE
-hi Statement  gui=Bold    guifg=Black     guibg=NONE
-hi PreProc    gui=NONE    guifg=DarkGreen guibg=NONE
-hi Type       gui=NONE    guifg=Black     guibg=NONE
-hi Special    gui=NONE    guifg=DarkBlue  guibg=NONE
-hi Todo       gui=Italic  guifg=DarkBlue  guibg=NONE
-hi Error      gui=NONE    guifg=DarkRed   guibg=NONE
diff --git a/colors/denim.vim b/colors/denim.vim
deleted file mode 100755
index c41af9f..0000000
--- a/colors/denim.vim
+++ /dev/null
@@ -1,141 +0,0 @@
-" Maintainer:   Tim Aldrich <aldy0169@yahoo.com>
-" Last Change:  19 November 2001
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="denim"
-" GUI colors {{{
-hi Normal		guifg=#FFFFFF guibg=#000038
-hi Cursor		guifg=#000038 guibg=#FFFFFF
-hi CursorIM		guifg=#6699CC guibg=#99CCCC
-hi Directory	guifg=#33CCFF guibg=#6699CC
-hi DiffAdd		guifg=#FFFFCC guibg=#000038
-hi DiffChange	guifg=#FF9900 guibg=#000038
-hi DiffDelete	guifg=#999999 guibg=#000038
-hi DiffText		guifg=#FFFFFF guibg=#000038
-hi ErrorMsg		guifg=#FFFFFF guibg=#FF0000
-hi VertSplit	guifg=#FFFFFF guibg=#000038
-hi Folded		guifg=#999999 guibg=#003366
-hi FoldColumn	guifg=#0000EE guibg=#6699CC
-hi IncSearch	guifg=#FFFF00 guibg=#000038
-hi LineNr		guifg=#FFFFEE guibg=#000038
-hi ModeMsg		guifg=#FFFFFF guibg=#000038
-hi MoreMsg		guifg=#FFFFFF guibg=#000038
-hi NonText		guifg=#FFFFFF guibg=#00003D
-hi Question		guifg=#FFFFFF guibg=#0000EE
-hi Search		guifg=#993300 guibg=#6699CC
-hi SpecialKey	guifg=#FFFF00 guibg=#000038
-hi StatusLine	guifg=#FFFFFF guibg=#000038
-hi StatusLineNC	guifg=#CCCCCC guibg=#000038
-hi Title		guifg=#FFFFFF guibg=#FF9900
-hi Visual		guifg=#003366 guibg=#6699FF
-hi WarningMsg	guifg=#FF0000 guibg=#FFFFFF
-hi WildMenu		guifg=#000038 guibg=#999999
-" }}}
-
-" cterm colors {{{
-hi Normal		ctermfg=white ctermbg=darkblue
-hi Cursor		ctermfg=darkblue ctermbg=white
-hi CursorIM		ctermfg=lightcyan ctermbg=lightcyan
-hi Directory	ctermfg=lightblue ctermbg=lightcyan
-hi DiffAdd		ctermfg=LightYellow ctermbg=darkblue
-hi DiffChange	ctermfg=darkred ctermbg=darkblue
-hi DiffDelete	ctermfg=grey ctermbg=darkblue
-hi DiffText		ctermfg=white   ctermbg=darkblue
-hi ErrorMsg		ctermfg=red ctermbg=lightcyan
-hi VertSplit	ctermfg=white   ctermbg=darkblue
-hi Folded		ctermfg=grey ctermbg=darkblue
-hi FoldColumn	ctermfg=darkred ctermbg=lightcyan
-hi IncSearch	ctermfg=yellow ctermbg=darkblue
-hi LineNr		ctermfg=lightyellow ctermbg=darkblue
-hi ModeMsg		ctermfg=white   ctermbg=darkblue
-hi MoreMsg		ctermfg=white   ctermbg=darkblue
-hi NonText		ctermfg=white   ctermbg=lightblue
-hi Question		ctermfg=white   ctermbg=darkblue
-hi Search		ctermfg=darkred ctermbg=lightcyan
-hi SpecialKey	ctermfg=yellow ctermbg=darkblue
-hi StatusLine	ctermfg=white   ctermbg=darkblue
-hi StatusLineNC	ctermfg=lightgrey ctermbg=darkblue
-hi Title		ctermfg=white   ctermbg=yellow
-hi Visual		ctermfg=lightblue ctermbg=cyan
-hi WarningMsg	ctermfg=red ctermbg=white
-hi WildMenu		ctermfg=darkblue ctermbg=grey
-" }}}
-
-" GUI hilight groups {{{
-
-hi Comment		guifg=#999999
-hi Constant		guifg=#33FF33
-hi String		guifg=#CCCC99
-hi Character	guifg=#33FF33
-hi Number		guifg=#33FF33
-hi Boolean		guifg=#33FF33
-hi Float		guifg=#33FF33
-hi Identifier	guifg=#33FFFF
-hi Function		guifg=#33FFFF
-hi Statement	guifg=#FFFFCC
-hi Conditional	guifg=#FFFFCC
-hi Repeat		guifg=#FFFFCC
-hi Label		guifg=#33FF99
-hi Operator		guifg=#FFFF00
-hi Keyword		guifg=#FFFF00
-hi Exception	guifg=#FFFFAA
-hi PreProc		guifg=#66CCFF
-hi Include		guifg=#66CCFF
-hi Define		guifg=#66CCFF
-hi Macro		guifg=#66CCFF
-hi PreCondit	guifg=#66CCFF
-hi Type			guifg=#33FF99
-hi StorageClass	guifg=#33FF99
-hi Structure	guifg=#33FF99
-hi Typedef		guifg=#33FF99
-hi Special		guifg=#00FF00
-hi SpecialChar	guifg=#00FF00
-hi Tag			guifg=#CCCCFF
-hi Delimiter	guifg=#CCCCFF
-hi SpecialComment	guifg=#FFFFCC
-hi Debug		guifg=#CC3300
-hi Ignore		guifg=#0066AA
-hi Error		guifg=#FF0000 guibg=#FFFFFF
-hi Todo			guifg=#999999 guibg=#FFFFFF
-" }}}
-
-" cterm hilight groups {{{
-hi Comment		ctermfg=grey
-hi Constant		ctermfg=lightgreen
-hi String		ctermfg=brown
-hi Character	ctermfg=lightgreen
-hi Number		ctermfg=lightgreen
-hi Boolean		ctermfg=lightgreen
-hi Float		ctermfg=lightgreen
-hi Identifier	ctermfg=lightcyan
-hi Function		ctermfg=lightcyan
-hi Statement	ctermfg=lightyellow
-hi Conditional	ctermfg=lightyellow
-hi Repeat		ctermfg=lightyellow
-hi Label		ctermfg=lightcyan
-hi Operator		ctermfg=yellow
-hi Keyword		ctermfg=yellow
-hi Exception	ctermfg=yellow
-hi PreProc		ctermfg=darkcyan
-hi Include		ctermfg=darkcyan
-hi Define		ctermfg=darkcyan
-hi Macro		ctermfg=darkcyan
-hi PreCondit	ctermfg=darkcyan
-hi Type			ctermfg=lightcyan
-hi StorageClass	ctermfg=lightcyan
-hi Structure	ctermfg=lightcyan
-hi Typedef		ctermfg=lightcyan
-hi Special		ctermfg=green
-hi SpecialChar	ctermfg=green
-hi Tag			ctermfg=brown
-hi Delimiter	ctermfg=brown
-hi SpecialComment	ctermfg=lightyellow
-hi Debug		ctermfg=magenta
-hi Ignore		ctermfg=lightblue
-hi Error		ctermfg=red ctermbg=white
-hi Todo			ctermfg=grey ctermbg=white
-" }}}
diff --git a/colors/derefined.vim b/colors/derefined.vim
deleted file mode 100755
index 80c7431..0000000
--- a/colors/derefined.vim
+++ /dev/null
@@ -1,101 +0,0 @@
-" Vim color file
-" derefined v1.1b
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo derefined in your VimRC/GVimRC file
-"   * Also add :set background=dark  or :setbackground=light
-"     depending on your preference.
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="derefined"
-
-hi Normal       guifg=green guibg=darkcyan ctermfg=green ctermbg=darkcyan 
-hi NonText      guifg=red guibg=black ctermfg=red ctermbg=black
-
-hi Folded       guibg=black guifg=green gui=bold ctermbg=black ctermfg=green
-hi FoldColumn	guibg=black guifg=yellow ctermbg=black ctermfg=yellow
-hi LineNr       guibg=black guifg=cyan gui=none ctermbg=black ctermfg=cyan
-hi StatusLine	guibg=grey guifg=blue gui=bold ctermbg=white ctermfg=blue
-hi StatusLineNC	guibg=grey guifg=black gui=bold ctermbg=grey ctermfg=black 
-hi VertSplit	guibg=darkgreen guifg=darkblue  gui=none ctermbg=darkgrey ctermfg=darkblue
-
-hi tablinesel   guibg=#515a71 guifg=#50aae5 gui=none
-hi tabline      guibg=#4d4d5f guifg=#5b7098 gui=none
-hi tablinefill  guibg=#2d2d3f guifg=#aaaaaa gui=none
-
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-
-hi MatchParen	guibg=#7b5a55 guifg=#001122
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-
-hi Comment		guifg=black  guibg=bg ctermfg=black ctermbg=bg gui=bold
-hi Title	    guifg=green guibg=darkblue gui=none  ctermfg=green ctermbg=darkblue cterm=none 
-hi Underlined   guifg=cyan guibg=darkblue gui=none    ctermfg=cyan ctermbg=darkblue cterm=none   
-
-hi Statement    guifg=yellow gui=none ctermfg=yellow cterm=none
-hi Type		    guifg=cyan  gui=none ctermfg=cyan  cterm=none
-hi Constant	    guifg=white ctermfg=white
-hi Number       guifg=white ctermfg=white
-hi PreProc      guifg=grey ctermfg=grey
-hi Special	    guifg=grey ctermfg=grey
-hi Ignore       guifg=grey40  ctermfg=grey
-hi Todo		    guifg=orangered guibg=yellow2 ctermfg=red ctermbg=yellow
-hi Error        guifg=yellow guibg=red ctermfg=yellow ctermbg=red
-hi Function     guifg=yellow guibg=bg gui=None ctermfg=yellow ctermbg=bg cterm=none
-hi Identifier   guifg=cyan ctermfg=cyan guibg=bg ctermbg=bg gui=none cterm=none
-"""""this section borrowed from OceanDeep/Midnight"""""
-highlight Conditional gui=None guifg=yellow guibg=bg cterm=None ctermfg=yellow ctermbg=bg
-highlight Repeat gui=None guifg=yellow guibg=bg cterm=None ctermfg=yellow ctermbg=bg
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=yellow guibg=bg cterm=None ctermfg=yellow ctermbg=bg
-highlight Keyword gui=bold guifg=grey guibg=bg cterm=bold ctermfg=grey ctermbg=bg
-highlight Exception gui=bold guifg=yellow guibg=bg cterm=bold ctermfg=yellow ctermbg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=yellow guifg=black
-
-
-hi Search       guibg=darkgreen guifg=darkyellow  ctermbg=darkgreen ctermfg=darkyellow
-hi IncSearch	guifg=darkyellow guibg=darkgreen   ctermfg=darkyellow ctermbg=darkgreen 
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=cyan guibg=black  ctermfg=cyan ctermbg=black 
-hi VisualNOS    guifg=cyan guibg=black  ctermfg=cyan ctermbg=black 
-hi WarningMsg	guifg=salmon
-hi WildMenu guifg=grey guibg=blue
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
diff --git a/colors/desert.vim b/colors/desert.vim
deleted file mode 100755
index e43c61b..0000000
--- a/colors/desert.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Vim color file
-" Maintainer:   Hans Fugal <hans@fugal.net>
-" Last Change:  $Date: 2003/06/02 19:28:15 $
-" URL:		http://hans.fugal.net/vim/colors/desert.vim 
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="desert"
-
-hi Normal	guifg=White guibg=grey20
-
-" highlight groups
-hi Cursor	guibg=khaki guifg=slategrey
-"hi CursorIM	
-"hi Directory	
-"hi DiffAdd				
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-"hi ErrorMsg	
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded	guibg=grey30 guifg=gold 
-hi FoldColumn	guibg=grey30 guifg=tan
-hi IncSearch	guifg=slategrey guibg=khaki
-"hi LineNr				
-hi ModeMsg	guifg=goldenrod
-hi MoreMsg	guifg=SeaGreen
-hi NonText	guifg=LightBlue guibg=grey30
-hi Question	guifg=springgreen
-hi Search	guibg=peru guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#c2bfa5 guifg=black gui=none
-hi StatusLineNC	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Title	guifg=indianred
-hi Visual	gui=none guifg=khaki guibg=olivedrab
-"hi VisualNOS	
-hi WarningMsg	guifg=salmon
-"hi WildMenu	
-"hi Menu				
-"hi Scrollbar	
-"hi Tooltip				
-
-" syntax highlighting groups
-hi Comment	 guifg=SkyBlue
-hi Constant	 guifg=#ffa0a0
-hi Identifier	 guifg=palegreen
-hi Statement	 guifg=khaki
-hi PreProc	 guifg=indianred
-hi Type		 guifg=darkkhaki
-hi Special	 guifg=navajowhite
-"hi Underlined	
-hi Ignore 	 guifg=grey40
-"hi Error			
-hi Todo		 guifg=orangered guibg=yellow2
-
-" color terminal definitions
-hi SpecialKey    ctermfg=darkgreen
-hi NonText       cterm=bold ctermfg=darkblue
-hi Directory     ctermfg=darkcyan
-hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
-hi Search        cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg       ctermfg=darkgreen
-hi ModeMsg       cterm=NONE ctermfg=brown
-hi LineNr        ctermfg=3
-hi Question      ctermfg=green
-hi StatusLine    cterm=bold,reverse
-hi StatusLineNC  cterm=reverse
-hi VertSplit     cterm=reverse
-hi Title         ctermfg=5
-hi Visual        cterm=reverse
-hi VisualNOS     cterm=bold,underline
-hi WarningMsg    ctermfg=1
-hi WildMenu      ctermfg=0 ctermbg=3
-hi Folded        ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd       ctermbg=4
-hi DiffChange    ctermbg=5
-hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
-hi DiffText      cterm=bold ctermbg=1
-hi Comment       ctermfg=darkcyan
-hi Constant      ctermfg=brown
-hi Special       ctermfg=5
-hi Identifier    ctermfg=6
-hi Statement     ctermfg=3
-hi PreProc       ctermfg=5
-hi Type          ctermfg=2
-hi Underlined    cterm=underline ctermfg=5
-hi Ignore        ctermfg=darkgrey
-hi Error         cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/desert256.vim b/colors/desert256.vim
deleted file mode 100755
index 7a97742..0000000
--- a/colors/desert256.vim
+++ /dev/null
@@ -1,338 +0,0 @@
-" Vim color file
-" Maintainer: Henry So, Jr. <henryso@panix.com>
-
-" These are the colors of the "desert" theme by Hans Fugal with a few small
-" modifications (namely that I lowered the intensity of the normal white and
-" made the normal and nontext backgrounds black), modified to work with 88-
-" and 256-color xterms.
-"
-" The original "desert" theme is available as part of the vim distribution or
-" at http://hans.fugal.net/vim/colors/.
-"
-" The real feature of this color scheme, with a wink to the "inkpot" theme, is
-" the programmatic approximation of the gui colors to the palettes of 88- and
-" 256- color xterms.  The functions that do this (folded away, for
-" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
-" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
-"
-" I struggled with trying to parse the rgb.txt file to avoid the necessity of
-" converting color names to #rrggbb form, but decided it was just not worth
-" the effort.  Maybe someone seeing this may decide otherwise...
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="desert256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-    " functions {{{
-    " returns an approximate grey index for the given grey level
-    fun <SID>grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    fun <SID>grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    fun <SID>grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    fun <SID>rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    fun <SID>rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    fun <SID>rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    fun <SID>color(r, g, b)
-        " get the closest grey
-        let l:gx = <SID>grey_number(a:r)
-        let l:gy = <SID>grey_number(a:g)
-        let l:gz = <SID>grey_number(a:b)
-
-        " get the closest color
-        let l:x = <SID>rgb_number(a:r)
-        let l:y = <SID>rgb_number(a:g)
-        let l:z = <SID>rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = <SID>grey_level(l:gx) - a:r
-            let l:dgg = <SID>grey_level(l:gy) - a:g
-            let l:dgb = <SID>grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = <SID>rgb_level(l:gx) - a:r
-            let l:dg = <SID>rgb_level(l:gy) - a:g
-            let l:db = <SID>rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return <SID>grey_color(l:gx)
-            else
-                " use the color
-                return <SID>rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return <SID>rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    fun <SID>rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return <SID>color(l:r, l:g, l:b)
-    endfun
-
-    " sets the highlighting for the given group
-    fun <SID>X(group, fg, bg, attr)
-        if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-        endif
-        if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-        endif
-        if a:attr != ""
-            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-        endif
-    endfun
-    " }}}
-
-    call <SID>X("Normal", "cccccc", "000000", "")
-
-    " highlight groups
-    call <SID>X("Cursor", "708090", "f0e68c", "")
-    "CursorIM
-    "Directory
-    "DiffAdd
-    "DiffChange
-    "DiffDelete
-    "DiffText
-    "ErrorMsg
-    call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
-    call <SID>X("Folded", "ffd700", "4d4d4d", "")
-    call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
-    call <SID>X("IncSearch", "708090", "f0e68c", "")
-    "LineNr
-    call <SID>X("ModeMsg", "daa520", "", "")
-    call <SID>X("MoreMsg", "2e8b57", "", "")
-    call <SID>X("NonText", "addbe7", "000000", "bold")
-    call <SID>X("Question", "00ff7f", "", "")
-    call <SID>X("Search", "f5deb3", "cd853f", "")
-    call <SID>X("SpecialKey", "9acd32", "", "")
-    call <SID>X("StatusLine", "c2bfa5", "000000", "reverse")
-    call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse")
-    call <SID>X("Title", "cd5c5c", "", "")
-    call <SID>X("Visual", "6b8e23", "f0e68c", "reverse")
-    "VisualNOS
-    call <SID>X("WarningMsg", "fa8072", "", "")
-    "WildMenu
-    "Menu
-    "Scrollbar
-    "Tooltip
-
-    " syntax highlighting groups
-    call <SID>X("Comment", "87ceeb", "", "")
-    call <SID>X("Constant", "ffa0a0", "", "")
-    call <SID>X("Identifier", "98fb98", "", "none")
-    call <SID>X("Statement", "f0e68c", "", "bold")
-    call <SID>X("PreProc", "cd5c5c", "", "")
-    call <SID>X("Type", "bdb76b", "", "bold")
-    call <SID>X("Special", "ffdead", "", "")
-    "Underlined
-    call <SID>X("Ignore", "666666", "", "")
-    "Error
-    call <SID>X("Todo", "ff4500", "eeee00", "")
-
-    " delete functions {{{
-    delf <SID>X
-    delf <SID>rgb
-    delf <SID>color
-    delf <SID>rgb_color
-    delf <SID>rgb_level
-    delf <SID>rgb_number
-    delf <SID>grey_color
-    delf <SID>grey_level
-    delf <SID>grey_number
-    " }}}
-else
-    " color terminal definitions
-    hi SpecialKey    ctermfg=darkgreen
-    hi NonText       cterm=bold ctermfg=darkblue
-    hi Directory     ctermfg=darkcyan
-    hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
-    hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
-    hi Search        cterm=NONE ctermfg=grey ctermbg=blue
-    hi MoreMsg       ctermfg=darkgreen
-    hi ModeMsg       cterm=NONE ctermfg=brown
-    hi LineNr        ctermfg=3
-    hi Question      ctermfg=green
-    hi StatusLine    cterm=bold,reverse
-    hi StatusLineNC  cterm=reverse
-    hi VertSplit     cterm=reverse
-    hi Title         ctermfg=5
-    hi Visual        cterm=reverse
-    hi VisualNOS     cterm=bold,underline
-    hi WarningMsg    ctermfg=1
-    hi WildMenu      ctermfg=0 ctermbg=3
-    hi Folded        ctermfg=darkgrey ctermbg=NONE
-    hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
-    hi DiffAdd       ctermbg=4
-    hi DiffChange    ctermbg=5
-    hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
-    hi DiffText      cterm=bold ctermbg=1
-    hi Comment       ctermfg=darkcyan
-    hi Constant      ctermfg=brown
-    hi Special       ctermfg=5
-    hi Identifier    ctermfg=6
-    hi Statement     ctermfg=3
-    hi PreProc       ctermfg=5
-    hi Type          ctermfg=2
-    hi Underlined    cterm=underline ctermfg=5
-    hi Ignore        ctermfg=darkgrey
-    hi Error         cterm=bold ctermfg=7 ctermbg=1
-endif
-
-" vim: set fdl=0 fdm=marker:
diff --git a/colors/desertEx.vim b/colors/desertEx.vim
deleted file mode 100755
index 08ef878..0000000
--- a/colors/desertEx.vim
+++ /dev/null
@@ -1,98 +0,0 @@
-" Vim color file
-" Maintainer:   Mingbai <mbbill AT gmail DOT com>
-" Last Change:  2006-12-24 20:09:09
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="desertEx"
-
-hi Normal	guifg=gray guibg=grey17 gui=none
-
-" AlignCtrl default
-" AlignCtrl =P0 guifg guibg gui
-" Align
-
-" highlight groups
-hi Cursor       guifg=black          guibg=yellow   gui=none
-hi ErrorMsg     guifg=white          guibg=red      gui=none
-hi VertSplit    guifg=gray40         guibg=gray40   gui=none
-hi Folded       guifg=DarkSlateGray3 guibg=grey30   gui=none
-hi FoldColumn   guifg=tan            guibg=grey30   gui=none
-hi IncSearch    guifg=#b0ffff        guibg=#2050d0
-hi LineNr       guifg=burlywood3     gui=none
-hi ModeMsg      guifg=SkyBlue        gui=none
-hi MoreMsg      guifg=SeaGreen       gui=none
-hi NonText      guifg=cyan           gui=none
-hi Question     guifg=springgreen    gui=none
-hi Search       guifg=gray80         guibg=#445599  gui=none
-hi SpecialKey   guifg=cyan           gui=none
-hi StatusLine   guifg=black          guibg=#c2bfa5  gui=bold
-hi StatusLineNC guifg=grey           guibg=gray40   gui=none
-hi Title        guifg=indianred      gui=none
-hi Visual       guifg=gray17         guibg=tan1     gui=none
-hi WarningMsg   guifg=salmon         gui=none
-hi Pmenu        guifg=white          guibg=#445599  gui=none
-hi PmenuSel     guifg=#445599        guibg=gray
-hi WildMenu     guifg=gray           guibg=gray17   gui=none
-hi MatchParen	guifg=cyan           guibg=NONE     gui=bold
-hi DiffAdd      guifg=black          guibg=wheat1
-hi DiffChange   guifg=black          guibg=skyblue1
-hi DiffText     guifg=black          guibg=hotpink1  gui=none
-hi DiffDelete   guibg=gray45         guifg=black     gui=none
-
-
-
-" syntax highlighting groups
-hi Comment      guifg=PaleGreen3     gui=italic
-hi Constant     guifg=salmon         gui=none
-hi Identifier   guifg=Skyblue        gui=none
-hi Function     guifg=Skyblue        gui=none
-hi Statement    guifg=lightgoldenrod2 gui=none
-hi PreProc      guifg=PaleVioletRed2 gui=none
-hi Type         guifg=tan1           gui=none
-hi Special      guifg=aquamarine2    gui=none
-hi Ignore       guifg=grey40         gui=none
-hi Todo         guifg=orangered      guibg=yellow2 gui=none
-
-" color terminal definitions
-hi SpecialKey   ctermfg=darkgreen
-hi NonText      cterm=bold           ctermfg=darkblue
-hi Directory    ctermfg=darkcyan
-hi ErrorMsg     cterm=bold           ctermfg=7        ctermbg=1
-hi IncSearch    cterm=NONE           ctermfg=yellow   ctermbg=green
-hi Search       cterm=NONE           ctermfg=grey     ctermbg=blue
-hi MoreMsg      ctermfg=darkgreen
-hi ModeMsg      cterm=NONE           ctermfg=brown
-hi LineNr       ctermfg=3
-hi Question     ctermfg=green
-hi StatusLine   cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit    cterm=reverse
-hi Title        ctermfg=5
-hi Visual       cterm=reverse
-hi VisualNOS    cterm=bold,underline
-hi WarningMsg   ctermfg=1
-hi WildMenu     ctermfg=0            ctermbg=3
-hi Folded       ctermfg=darkgrey     ctermbg=NONE
-hi FoldColumn   ctermfg=darkgrey     ctermbg=NONE
-hi DiffAdd      ctermbg=4
-hi DiffChange   ctermbg=5
-hi DiffDelete   cterm=bold           ctermfg=4        ctermbg=6
-hi DiffText     cterm=bold           ctermbg=1
-hi Comment      ctermfg=darkcyan
-hi Constant     ctermfg=brown
-hi Special      ctermfg=5
-hi Identifier   ctermfg=6
-hi Statement    ctermfg=3
-hi PreProc      ctermfg=5
-hi Type         ctermfg=2
-hi Underlined   cterm=underline      ctermfg=5
-hi Ignore       ctermfg=darkgrey
-hi Error        cterm=bold           ctermfg=7        ctermbg=1
diff --git a/colors/desertedocean.vim b/colors/desertedocean.vim
deleted file mode 100755
index 5643a44..0000000
--- a/colors/desertedocean.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-" Vim color file
-" desertedocean v0.2b
-" Maintainer:	Shawn Axsom <axm285@gmail.com>
-"               [axm285.xena-free.com]
-
-" desertedocean, a colorscheme using the desert colorscheme as a template, based loosely off of desert, oceandeep, and zenburn.
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="desertedocean"
-
-hi Normal	guifg=#FFE9E0 guibg=#102D33
-
-" highlight groups
-"hi Cursor	guibg=#660000 guifg=#AA5522
-hi Cursor	guibg=#007799 guifg=#00D6CC
-"hi CursorIM
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded	guibg=#337799 guifg=#BBDDCC
-hi FoldColumn	guibg=#337799 guifg=#00CCFF
-hi LineNr   guifg=#CCF0FF guibg=#006688 
-hi ModeMsg	guifg=#00AACC
-hi MoreMsg	guifg=SeaGreen
-hi NonText  guifg=#283940 guibg=#253F49 "same as background """"""""""""""""  """""""""""""""  """""""""""""""  """""""""""""""  """""""""""""""  """""""""""""""  """"""""""""""""""""""
-hi Question	guifg=springgreen
-hi Search	guibg=slategrey guifg=#FFDABB
-hi IncSearch	guifg=slategrey guibg=#FFDFB0
-hi SpecialKey	guifg=#00CCBB " blue green
-hi StatusLine	guibg=#00A0D0 guifg=#050709 gui=none
-hi StatusLineNC	guibg=#0595c0 guifg=#272324 gui=none
-hi Title	guifg=#33AAFF
-hi Visual   guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment	  guifg=#69B9DA
-hi Underlined guifg=#33BBFF
-hi Statement  guifg=#FF836E
-hi PreProc    guifg=#FF8076 gui=NONE
-hi Constant	  guifg=#FF6B5B " or #FF707A 
-hi Identifier guifg=#FFDDEE
-hi Type		  guifg=#FFB592
-hi Special	  guifg=navajowhite
-hi Ignore	guifg=grey40
-"hi Error
-hi Todo		guifg=orangered guibg=yellow2
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Constant	ctermfg=brown
-hi Special	ctermfg=5
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/desertedoceanburnt.vim b/colors/desertedoceanburnt.vim
deleted file mode 100755
index d718cfd..0000000
--- a/colors/desertedoceanburnt.vim
+++ /dev/null
@@ -1,113 +0,0 @@
-" Vim color file
-" desertedoceanburnt v0.1
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"               [axs221.1l.com]
-
-" desertedoceanburnt, a dull, low contrast version of the desertedocean 
-"  colorscheme, which used the desert colorscheme as template, based
-"  loosely off of desert, oceandeep, and zenburn.
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    "  complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="desertedoceanburnt"
-
-hi Normal	guifg=#FFFAFD guibg=#13232d
-hi Cursor	guibg=#204769 guifg=#A0BaBa
-"hi CursorIM
-
-" syntax highlighting
-hi Comment	  guifg=#8AC0DA
-hi Title	guifg=#509BDF
-hi Underlined guifg=#20C0FF
-hi Statement  guifg=#da938a
-hi Type		  guifg=#e0c6b9
-hi PreProc    guifg=#d590aa gui=NONE
-hi Constant	  guifg=#ddaab7 " or #FF707A 
-hi Identifier guifg=#caeDfE
-hi Special	  guifg=navajowhite
-hi Ignore	guifg=grey40
-hi Todo		guifg=orangered guibg=yellow2
-"hi Error
-"end syntax highlighting
-
-" highlight groups
-hi Directory guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded	guibg=#337799 guifg=#BBDDCC
-hi FoldColumn	guibg=#004f70 guifg=#50ACCF
-hi LineNr   guifg=#CCF0FF guibg=#004968 
-hi ModeMsg	guifg=#00AACC
-hi MoreMsg	guifg=SeaGreen
-hi NonText  guifg=#285960 guibg=#152C39
-hi Question	guifg=#AABBCC
-hi Search	guibg=slategrey guifg=#FFDABB
-hi IncSearch	guifg=slategrey guibg=#FFDFB0
-hi SpecialKey	guifg=#00CCBB " blue green
-hi StatusLine	guibg=#0085CA guifg=#050709 gui=none
-hi StatusLineNC	guibg=#1069A0 guifg=#272334 gui=none
-hi Visual   guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Constant	ctermfg=brown
-hi Special	ctermfg=5
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/detailed.vim b/colors/detailed.vim
deleted file mode 100755
index ca70f7b..0000000
--- a/colors/detailed.vim
+++ /dev/null
@@ -1,790 +0,0 @@
-" Source repo: http://github.com/rking/vim-detailed
-"
-" So many 256-color schemes merely shift the palette around, displaying only 8
-" colors (even though they're a *different* set of 8 colors than default).
-"
-" This scheme is more detailed than that.
-"
-" Your eyes will learn to pick up on subtler patterns without requiring as
-" much from your conscious mind.  Instead of the goal being merely looking
-" cool, the goal is to maximize info bandwidth from the computer to the brain.
-" The regexes, for example, are much easier to pick out. The overall feel of a
-" given file becomes much more intuitively recognizeable (you'll know you're
-" in foo.rb, not bar.rb, without having to read any text). Certain bits will
-" "pop" into being the right colors, such as the difference between
-" "RUBY_VERISON" and "RUBY_VERSION", or # encoding: utf-8
-"
-" ## 256 Color Requirement
-"
-" If you aren't getting 256 colors, you aren't getting detailed.vim.
-" Typically, you'll have to make sure your `$TERM` variable is set right. This
-" can get un-set by some programs, such as tmux. So you can force it to
-" something like:
-"
-"     export TERM=screen-256color
-"     # or:
-"     export TERM=xterm-256color
-"
-" If these are unavailable on the target system, you might have to place a
-" terminfo file in `~/.terminfo/`  -or- you can be totally gross and force it
-" with `:set &t_Co=256` in vim. But don't be gross. It's uncouth.
-"
-" ## Color Choices
-"
-" As a historical note, some small effort was taken to be similar to the
-" default vim syntax highlighting where it makes sense. That is, "def" is
-" magenta in the default, so vim-detailed makes it a shade of purple (and uses
-" different shades for all the other magenta things from the default
-" colorscheme). A person could modify this idea and do better:
-"
-" - Greens - The 256 color palette itself is heavy on green variants. If you
-"   used more greens, you'd be able to group similar-but-different pieces
-"   together more closely.
-" - Coolness - If you adjusted the color choices for æsthetic value rather than
-"   utilitarian, you could get a more stylish theme without sacrificing much
-"   detail.
-"
-" ## Download
-"
-"  If using Pathogen,
-"
-"      cd ~/.vim/bundle && git clone https://github.com/rking/vim-detailed
-"
-"  If using no vim plugin manager:
-"
-"      mkdir -p ~/.vim/colors/ && cd $_ && wget https://raw.github.com/rking/vim-detailed/master/colors/detailed.vim
-"
-" ## Setup
-"
-" In your ~/.vimrc (or ~/.vim/plugin/colorscheme.vim if you like to organize):
-"
-"     colo detailed
-"
-" This enables it globally. If you want to just do it for a trial, as long as
-" you have done one of the steps in the "Download" section, above, you can do:
-"
-"     vim foo.rb +colo\ detailed
-"
-" Or, from within vim:
-"
-"     :colo detailed
-
-let colors_name = 'detailed'
-
-" Prevent any screwy setting from causing errors:
-let s:save_cpo = &cpo | set cpo&vim
-
-" Turn on moar syntaks!
-let ruby_operators = 1
-
-" If you don't have this, rails.vim will zap the matchers when it resets
-" syntax for its own additions:
-au Syntax * call s:fatpacked_rainbow_parens()
-
-au Syntax ruby call s:detailed_syntax_addtions()
-
-" Show detailed syntax stack
-nmap <Leader>dets :call <SID>SynStack()<CR>
-fun! <SID>SynStack()
-  echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
-endfun
-
-" Color Palette {{{
-
-" Boring ctermfg ⇒ guifg map {{{
-let s:cterm_gui_map = {
-  \0: '000000',
-  \1: 'ff0000',
-  \2: '00ff00',
-  \3: 'ffff00',
-  \4: '0000ff',
-  \5: 'ff00ff',
-  \6: '00ffff',
-  \16: '000000',
-  \17: '00005f',
-  \18: '000087',
-  \19: '0000af',
-  \20: '0000d7',
-  \21: '0000ff',
-  \22: '005f00',
-  \23: '005f5f',
-  \24: '005f87',
-  \25: '005faf',
-  \26: '005fd7',
-  \27: '005fff',
-  \28: '008700',
-  \29: '00875f',
-  \30: '008787',
-  \31: '0087af',
-  \32: '0087d7',
-  \33: '0087ff',
-  \34: '00af00',
-  \35: '00af5f',
-  \36: '00af87',
-  \37: '00afaf',
-  \38: '00afd7',
-  \39: '00afff',
-  \40: '00d700',
-  \41: '00d75f',
-  \42: '00d787',
-  \43: '00d7af',
-  \44: '00d7d7',
-  \45: '00d7ff',
-  \46: '00ff00',
-  \47: '00ff5f',
-  \48: '00ff87',
-  \49: '00ffaf',
-  \50: '00ffd7',
-  \51: '00ffff',
-  \52: '5f0000',
-  \53: '5f005f',
-  \54: '5f0087',
-  \55: '5f00af',
-  \56: '5f00d7',
-  \57: '5f00ff',
-  \58: '5f5f00',
-  \59: '5f5f5f',
-  \60: '5f5f87',
-  \61: '5f5faf',
-  \62: '5f5fd7',
-  \63: '5f5fff',
-  \64: '5f8700',
-  \65: '5f875f',
-  \66: '5f8787',
-  \67: '5f87af',
-  \68: '5f87d7',
-  \69: '5f87ff',
-  \70: '5faf00',
-  \71: '5faf5f',
-  \72: '5faf87',
-  \73: '5fafaf',
-  \74: '5fafd7',
-  \75: '5fafff',
-  \76: '5fd700',
-  \77: '5fd75f',
-  \78: '5fd787',
-  \79: '5fd7af',
-  \80: '5fd7d7',
-  \81: '5fd7ff',
-  \82: '5fff00',
-  \83: '5fff5f',
-  \84: '5fff87',
-  \85: '5fffaf',
-  \86: '5fffd7',
-  \87: '5fffff',
-  \88: '870000',
-  \89: '87005f',
-  \90: '870087',
-  \91: '8700af',
-  \92: '8700d7',
-  \93: '8700ff',
-  \94: '875f00',
-  \95: '875f5f',
-  \96: '875f87',
-  \97: '875faf',
-  \98: '875fd7',
-  \99: '875fff',
-  \100: '878700',
-  \101: '87875f',
-  \102: '878787',
-  \103: '8787af',
-  \104: '8787d7',
-  \105: '8787ff',
-  \106: '87af00',
-  \107: '87af5f',
-  \108: '87af87',
-  \109: '87afaf',
-  \110: '87afd7',
-  \111: '87afff',
-  \112: '87d700',
-  \113: '87d75f',
-  \114: '87d787',
-  \115: '87d7af',
-  \116: '87d7d7',
-  \117: '87d7ff',
-  \118: '87ff00',
-  \119: '87ff5f',
-  \120: '87ff87',
-  \121: '87ffaf',
-  \122: '87ffd7',
-  \123: '87ffff',
-  \124: 'af0000',
-  \125: 'af005f',
-  \126: 'af0087',
-  \127: 'af00af',
-  \128: 'af00d7',
-  \129: 'af00ff',
-  \130: 'af5f00',
-  \131: 'af5f5f',
-  \132: 'af5f87',
-  \133: 'af5faf',
-  \134: 'af5fd7',
-  \135: 'af5fff',
-  \136: 'af8700',
-  \137: 'af875f',
-  \138: 'af8787',
-  \139: 'af87af',
-  \140: 'af87d7',
-  \141: 'af87ff',
-  \142: 'afaf00',
-  \143: 'afaf5f',
-  \144: 'afaf87',
-  \145: 'afafaf',
-  \146: 'afafd7',
-  \147: 'afafff',
-  \148: 'afd700',
-  \149: 'afd75f',
-  \150: 'afd787',
-  \151: 'afd7af',
-  \152: 'afd7d7',
-  \153: 'afd7ff',
-  \154: 'afff00',
-  \155: 'afff5f',
-  \156: 'afff87',
-  \157: 'afffaf',
-  \158: 'afffd7',
-  \159: 'afffff',
-  \160: 'd70000',
-  \161: 'd7005f',
-  \162: 'd70087',
-  \163: 'd700af',
-  \164: 'd700d7',
-  \165: 'd700ff',
-  \166: 'd75f00',
-  \167: 'd75f5f',
-  \168: 'd75f87',
-  \169: 'd75faf',
-  \170: 'd75fd7',
-  \171: 'd75fff',
-  \172: 'd78700',
-  \173: 'd7875f',
-  \174: 'd78787',
-  \175: 'd787af',
-  \176: 'd787d7',
-  \177: 'd787ff',
-  \178: 'd7af00',
-  \179: 'd7af5f',
-  \180: 'd7af87',
-  \181: 'd7afaf',
-  \182: 'd7afd7',
-  \183: 'd7afff',
-  \184: 'd7d700',
-  \185: 'd7d75f',
-  \186: 'd7d787',
-  \187: 'd7d7af',
-  \188: 'd7d7d7',
-  \189: 'd7d7ff',
-  \190: 'd7ff00',
-  \191: 'd7ff5f',
-  \192: 'd7ff87',
-  \193: 'd7ffaf',
-  \194: 'd7ffd7',
-  \195: 'd7ffff',
-  \196: 'ff0000',
-  \197: 'ff005f',
-  \198: 'ff0087',
-  \199: 'ff00af',
-  \200: 'ff00d7',
-  \201: 'ff00ff',
-  \202: 'ff5f00',
-  \203: 'ff5f5f',
-  \204: 'ff5f87',
-  \205: 'ff5faf',
-  \206: 'ff5fd7',
-  \207: 'ff5fff',
-  \208: 'ff8700',
-  \209: 'ff875f',
-  \210: 'ff8787',
-  \211: 'ff87af',
-  \212: 'ff87d7',
-  \213: 'ff87ff',
-  \214: 'ffaf00',
-  \215: 'ffaf5f',
-  \216: 'ffaf87',
-  \217: 'ffafaf',
-  \218: 'ffafd7',
-  \219: 'ffafff',
-  \220: 'ffd700',
-  \221: 'ffd75f',
-  \222: 'ffd787',
-  \223: 'ffd7af',
-  \224: 'ffd7d7',
-  \225: 'ffd7ff',
-  \226: 'ffff00',
-  \227: 'ffff5f',
-  \228: 'ffff87',
-  \229: 'ffffaf',
-  \230: 'ffffd7',
-  \231: 'ffffff',
-  \232: '080808',
-  \233: '121212',
-  \234: '1c1c1c',
-  \235: '262626',
-  \236: '303030',
-  \237: '3a3a3a',
-  \238: '444444',
-  \239: '4e4e4e',
-  \240: '585858',
-  \241: '626262',
-  \242: '6c6c6c',
-  \243: '767676',
-  \244: '808080',
-  \245: '8a8a8a',
-  \246: '949494',
-  \247: '9e9e9e',
-  \248: 'a8a8a8',
-  \249: 'b2b2b2',
-  \250: 'bcbcbc',
-  \251: 'c6c6c6',
-  \252: 'd0d0d0',
-  \253: 'dadada',
-  \254: 'e4e4e4',
-  \255: 'eeeeee',
-  \}
-" }}}
-
-let s:c = {
-  \'basic8_red (TODO: use this)': 1,
-  \'basic8_green': 2,
-  \'basic8_yellow': 3,
-  \'basic8_blue (TODO: use this)': 4,
-  \'basic8_magenta': 5,
-  \'basic8_cyan': 6,
-  \'basic8_black': 0,
-  \'red52': 52,
-  \'red88': 88,
-  \'red124': 124,
-  \'red160': 160,
-  \'red161': 161,
-  \'red196': 196,
-  \'yellow58': 58,
-  \'yellow100': 100,
-  \'yellow136 (TODO: use this)': 136,
-  \'yellow142 (TODO: use this)': 142,
-  \'yellow148': 148,
-  \'yellow149': 149,
-  \'yellow190': 190,
-  \'yellow220 (TODO: use this)': 220,
-  \'yellow228': 228,
-  \'orange208': 208,
-  \'orange178': 178,
-  \'orange180': 180,
-  \'orange222': 222,
-  \'light_yellow230': 229,
-  \'graygreen (TODO: use this)': 23,
-  \'green22': 22,
-  \'green23': 23,
-  \'green34': 34,
-  \'green71': 71,
-  \'green76': 76,
-  \'green84': 84,
-  \'green123': 123,
-  \'seafoam': 30,
-  \'seafoam2 (TODO: use this)': 35,
-  \'teal50': 50,
-  \'blue17 (TODO: use this)': 17,
-  \'blue19 (TODO: use this)': 19,
-  \'blue20 (TODO: use this)': 20,
-  \'blue25': 25,
-  \'blue27': 27,
-  \'blue33': 33,
-  \'blue37': 37,
-  \'blue75': 75,
-  \'blue87': 87,
-  \'lavender104': 104,
-  \'purple53': 53,
-  \'purple89 (TODO: use this)': 89,
-  \'purple90': 90,
-  \'purple95 (TODO: use this)': 95,
-  \'purple99 (TODO: use this)': 79,
-  \'purple125': 125,
-  \'purple126': 126,
-  \'purple127 (TODO: use this)': 127,
-  \'purple129 (TODO: use this)': 129,
-  \'purple131': 131,
-  \'purple141 (TODO: use this)': 141,
-  \'purple161 (TODO: use this)': 161,
-  \'purple201': 201,
-  \'purple224': 224,
-  \'purple225': 225,
-  \'gray16': 16,
-  \'gray232': 232,
-  \'gray233': 233,
-  \'gray234': 234,
-  \'gray235': 235,
-  \'gray236': 236,
-  \'gray237': 237,
-  \'gray238': 238,
-  \'gray239': 239,
-  \'gray240': 240,
-  \'gray241': 241,
-  \'gray242': 242,
-  \'gray243': 243,
-  \'gray244': 244,
-  \'gray245': 245,
-  \'gray246': 246,
-  \'gray247': 247,
-  \'gray248': 248,
-  \'gray249': 249,
-  \'gray250': 250,
-  \'gray251': 251,
-  \'gray252': 252,
-  \'gray253': 253,
-  \'gray254': 254,
-  \'gray255': 255,
-  \}
-
-" }}}
-
-" :hi funcs {{{
-fun! s:color_for(id, fgbg)
-  let num = s:c[a:id]
-  let gui = s:cterm_gui_map[l:num]
-  return 'cterm'.a:fgbg.'='.l:num.' gui'.a:fgbg.'=#'.l:gui
-endfun
-
-fun! s:fg(group, fg)
-  exe 'hi '.a:group.' '.s:color_for(a:fg,'fg')
-endfun
-
-fun! s:bg(group, bg)
-  exe 'hi '.a:group.' '.s:color_for(a:bg,'bg')
-endfun
-
-fun! s:fgbg(group, fg, bg)
-  exe 'hi '.a:group.' '.s:color_for(a:fg,'fg').' '.s:color_for(a:bg,'bg')
-endfun
-
-fun! s:bold_fg(group, fg)
-  exe 'hi '.a:group.' '.s:color_for(a:fg,'fg').' cterm=bold gui=bold'
-endfun
-
-fun! s:underline_fgbg(group, fg, bg)
-  exe 'hi '.a:group.' ctermfg='.s:c[a:fg].' '
-    \s:color_for(a:bg,'bg').' cterm=underline,bold gui=underline,bold'
-endfun
-
-fun! s:make_obvious(group)
-  call s:fgbg(a:group, 'green84', 'red160')
-endfun
-" }}}
-
-" For now, force darkness. If you're a big fan of white bg's, let me know, and
-" we can collaborate on a solution.
-set bg=dark
-hi Normal ctermfg=254 ctermbg=0
-call s:fgbg('Normal', 'gray254', 'basic8_black')
-" Note: ctermbg=233 was my previous value before user feedback. Any opinions?
-
-" Basic/Default-like Palette {{{
-hi SpecialKey     term=bold ctermfg=81 guifg=Cyan
-hi NonText        term=bold ctermfg=12 gui=bold guifg=Blue
-hi Directory      term=bold ctermfg=159 guifg=Cyan
-hi ErrorMsg       term=standout ctermfg=15 ctermbg=1 guifg=White guibg=Red
-hi IncSearch      term=reverse cterm=reverse gui=reverse
-hi Search         term=reverse ctermfg=0 ctermbg=11 guifg=Black guibg=Yellow
-hi MoreMsg        term=bold ctermfg=121 gui=bold guifg=SeaGreen
-hi ModeMsg        term=bold cterm=bold gui=bold
-hi LineNr         term=underline ctermfg=11 guifg=Yellow
-hi CursorLineNr   term=bold ctermfg=11 gui=bold guifg=Yellow
-hi Question       term=standout ctermfg=121 gui=bold guifg=Green
-hi StatusLine     term=bold,reverse cterm=bold,reverse gui=bold,reverse
-hi StatusLineNC   term=reverse cterm=reverse gui=reverse
-hi VertSplit      term=reverse cterm=reverse gui=reverse
-hi Title          term=bold ctermfg=225 gui=bold guifg=Magenta
-hi Visual         term=reverse ctermbg=242 guibg=DarkGrey
-hi VisualNOS      term=bold,underline cterm=bold,underline gui=bold,underline
-hi WarningMsg     term=standout ctermfg=224 guifg=Red
-hi WildMenu       term=standout ctermfg=0 ctermbg=11 guifg=Black guibg=Yellow
-hi Folded         term=standout ctermfg=14 ctermbg=242 guifg=Cyan guibg=DarkGrey
-hi FoldColumn     term=standout ctermfg=14 ctermbg=242 guifg=Cyan guibg=Grey
-hi DiffAdd        term=bold ctermbg=4 guibg=DarkBlue
-hi DiffChange     term=bold ctermbg=5 guibg=DarkMagenta
-hi DiffDelete     term=bold ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
-hi DiffText       term=reverse cterm=bold ctermbg=9 gui=bold guibg=Red
-hi SignColumn     term=standout ctermfg=14 ctermbg=242 guifg=Cyan guibg=Grey
-hi Conceal        ctermfg=7 ctermbg=242 guifg=LightGrey guibg=DarkGrey
-hi SpellBad       term=reverse ctermbg=9 gui=undercurl guisp=Red
-hi SpellCap       term=reverse ctermbg=12 gui=undercurl guisp=Blue
-hi SpellRare      term=reverse ctermbg=13 gui=undercurl guisp=Magenta
-hi SpellLocal     term=underline ctermbg=14 gui=undercurl guisp=Cyan
-hi Pmenu          ctermfg=0 ctermbg=13 guibg=Magenta
-hi PmenuSel       ctermfg=0 ctermbg=242 guibg=DarkGrey
-hi PmenuSbar      ctermbg=248 guibg=Grey
-hi PmenuThumb     ctermbg=15 guibg=White
-hi TabLine        term=underline cterm=underline ctermfg=15 ctermbg=242 gui=underline guibg=DarkGrey
-hi TabLineSel     term=bold cterm=bold gui=bold
-hi TabLineFill    term=reverse cterm=reverse gui=reverse
-hi CursorColumn   term=reverse ctermbg=242 guibg=Grey40
-hi CursorLine     term=underline cterm=underline guibg=Grey40
-hi ColorColumn    term=reverse ctermfg=9 ctermbg=12 guifg=black guibg=lightgrey
-hi MatchParen     term=reverse ctermbg=6 guibg=DarkCyan
-hi Constant       term=underline ctermfg=13 guifg=#ffa0a0
-hi Special        term=bold ctermfg=224 guifg=Orange
-hi Identifier     term=underline cterm=bold ctermfg=14 guifg=#40ffff
-hi Statement      term=bold ctermfg=11 gui=bold guifg=#ffff60
-hi PreProc        term=underline ctermfg=81 guifg=#ff80ff
-hi Type           term=underline ctermfg=121 gui=bold guifg=#60ff60
-hi Underlined     term=underline cterm=underline ctermfg=81 gui=underline guifg=#80a0ff
-hi Ignore         ctermfg=0 guifg=bg
-hi Error          term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red
-hi Todo           term=standout ctermfg=0 ctermbg=11 guifg=Blue guibg=Yellow
-
-call s:fg('Comment', 'gray242') " In my books, comments should be quiet.
-" }}}
-
-" Default links {{{
-hi link String          Constant
-hi link Character       Constant
-hi link Number          Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Function        Identifier
-hi link Conditional     Statement
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Operator        Statement
-hi link Keyword         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 SpecialChar     Special
-hi link Delimiter       Special
-hi link SpecialComment  Special
-hi link Debug           Special
-hi link mailQuoted1     Type
-hi link GPGWarning      WarningMsg
-hi link GPGError        ErrorMsg
-hi link GPGHighlightUnknownRecipient  ErrorMsg
-
-hi link rubyConditional  Conditional
-hi link rubyExceptional  rubyConditional " No-show.
-hi link rubyMethodExceptional  rubyDefine " And another.
-hi link rubyStringEscape  Special
-hi link rubyQuoteEscape  rubyStringEscape
-" hi rubyInterpolation cleared
-hi link rubyInvalidVariable  Error
-hi link rubyNoInterpolation  rubyString " E.g. \#{} inside a string.
-hi link rubyException   Exception
-hi link rubyKeyword     Keyword
-"}}}
-
-" s:detailed_colors — the good stuff {{{
-fun! s:detailed_colors()
-  " vimdiff uses Diff*
-  call s:bg('DiffChange', 'gray240')
-  call s:bg('DiffText', 'gray232')
-  call s:bg('DiffAdd', 'green23')
-  call s:bg('DiffDelete', 'yellow58')
-  " ft=diff syntax uses diff*
-  call s:fg('diffAdded', 'green34')
-  call s:fg('diffRemoved', 'yellow58')
-  " diffFile
-
-  call s:fg('rubyConstant', 'green34')
-
-  call s:bold_fg('rubyClass', 'purple126')
-  call s:fg('rubyModule', 'purple126')
-  call s:fg('rubyDefine', 'basic8_magenta')
-  call s:fg('rubyInclude', 'purple53')
-
-  call s:bold_fg('rubyFunction', 'blue27')
-  " No-show: call s:make_obvious('rubyMethodDeclaration')
-
-  call s:fg('rubyInstanceVariable', 'blue75')
-
-  call s:fgbg('rubyString', 'red160', 'gray233')
-  call s:fg('rubyStringDelimiter', 'blue33')
-  call s:fg('rubyInterpolationDelimiter', 'gray244')
-
-  call s:fg('rubyRegexpSpecial', 'seafoam')
-  hi link rubyRegexpComment Comment
-  " Not quite sure why these don't show up:
-  " call s:make_obvious('rubyRegexpParens')
-  " call s:make_obvious('rubyRegexpBrackets')
-
-  call s:fg('rubyRegexpCharClass', 'basic8_green')
-  call s:fg('rubyRegexpQuantifier', 'yellow148')
-  call s:bold_fg('rubyRegexpEscape', 'purple90')
-  call s:fg('rubyRegexpAnchor', 'purple90')
-  call s:fg('rubyRegexpDot', 'green34')
-  call s:bold_fg('rubyRegexpDelimiter', 'red88')
-  call s:fgbg('rubyRegexp', 'red160', 'gray233')
-  call s:fg('rubyASCIICode', 'green71')
-
-  call s:fg('rubyPseudoVariable', 'purple125')
-  call s:fg('rubyInteger', 'red124')
-  call s:fg('rubyFloat', 'red160')
-
-  call s:fg('rubyBlockArgument', 'blue87')
-  call s:fg('rubySymbol', 'lavender104')
-  call s:bold_fg('rubyBlockParameter', 'basic8_cyan')
-  call s:fg('rubyBlockParameterList', 'blue25')
-  call s:bold_fg('rubyPredefinedConstant', 'green22')
-  call s:bold_fg('rubyPredefinedVariable', 'blue37')
-  " XXX no clue why this wont show up: call s:make_obvious('rubyHeredocStart')
-  " TODO: fix these: call s:make_obvious('rubyAliasDeclaration2')
-  "                  call s:make_obvious('rubyAliasDeclaration')
-  call s:fg('rubyBoolean', 'purple131')
-  call s:fg('rubyOperator', 'green123')
-  hi link rubyPseudoOperator  rubyOperator " -= /= **= *= etc
-  " TODO! call s:make_obvious('rubyClassDeclaration')
-  "       call s:make_obvious('rubyDeclaration')
-  " call s:make_obvious('rubyModuleDeclaration')
-  hi link rubyBeginEnd    Statement " TODO
-  call s:fg('rubyAccess', 'yellow100')
-  call s:fg('rubyAttribute', 'orange178') " attr_{accessor,reader,writer}
-  call s:fg('rubyEval', 'yellow190')
-
-  " Blocks:
-  " (basic)
-  call s:fg('rubyMethodBlock', 'purple224')
-  call s:fg('rubyBlock', 'purple225')
-  call s:fg('rubyBlockExpression', 'orange180')
-  " (conditionals)
-  call s:fg('rubyControl', 'orange178')
-  call s:bold_fg('Conditional', 'basic8_yellow')
-  call s:bold_fg('rubyConditionalModifier', 'yellow148') " 'Yoda if'
-  call s:fg('rubyConditionalExpression', 'light_yellow230')
-  hi link rubyCaseExpression rubyConditionalExpression
-  " (loops)
-  call s:fg('rubyRepeat', 'orange178')
-  call s:bold_fg('rubyRepeatModifier', 'yellow149') " …while/until
-  call s:fg('rubyRepeatExpression', 'orange222')
-  hi link rubyDoBlock rubyRepeatExpression
-
-  " TODO: call s:make_obvious('rubyOptionalDo')
-  " TODO: call s:make_obvious('rubyOptionalDoLine')
-  call s:fg('rubySharpBang', 'gray251')
-  hi link rubyFirstAndSecondCommentLine rubySharpBang
-  hi link rubyComment Comment
-  " hi rubyMultilineComment cleared
-  hi link rubyDocumentation  Comment
-  call s:fg('rubyDataDirective', 'purple201')
-  call s:fg('rubyData', 'gray245')
-
-  "* Distinguish between each of TODO/FIXME/XXX
-  call s:fgbg('detailTodo', 'green76', 'gray238')
-  call s:fgbg('detailFixme', 'gray232', 'orange208')
-  call s:fgbg('detailXxx', 'gray235', 'red196')
-
-  call s:fgbg('Error', 'gray235', 'red196')
-  call s:underline_fgbg('Search', 'gray254', 'gray235')
-
-  " https://github.com/bitc/vim-bad-whitespace
-  call s:fgbg('BadWhitespace', 'gray238', 'yellow58')
-  hi link rubySpaceError BadWhitespace
-
-  "* `fail`/`raise`/`exit` were yellow by default, but here a more warny orange.
-  call s:fg('Exception', 'orange208')
-  hi link rubyExits Exception
-  "* class `@@vars` get ugly, cautionary color: they are troublesome.
-  call s:fgbg('rubyClassVariable', 'blue75', 'red52')
-  "* global `$vars` also get a bit of ugliness. Everyone knows they're iffy.
-  call s:fgbg('rubyGlobalVariable', 'red161', 'gray234')
-
-  " rails.vim niceness:
-  call s:fg('rubyRailsARAssociationMethod', 'teal50')
-
-  " detailed.vim especialties:
-  call s:fg('rubyInitialize', 'green84')
-  call s:bold_fg('rubyEncodingDirective', 'green22')
-
-  " Only linked highlights, not actual syntax:
-  " call s:make_obvious('rubyIdentifier')
-  " call s:make_obvious('rubyError')
-
-  " Pretty much just the leftover default:
-  " call s:make_obvious('rubyLocalVariableOrMethod')
-
-  " Gets all [{()}] within any {}'s. Not very useful AFAICT:
-  " call s:make_obvious('rubyCurlyBlock')
-
-  " These mess up on first ] of [a[1]]. Seems plain busted.
-  " call s:make_obvious('rubyArrayDelimiter')
-  " call s:make_obvious('rubyArrayLiteral')
-
-  " Mere implementation details, AFAICT:
-  " call s:make_obvious('rubyNestedParentheses')
-  " call s:make_obvious('rubyNestedCurlyBraces')
-  " call s:make_obvious('rubyNestedAngleBrackets')
-  " call s:make_obvious('rubyNestedSquareBrackets')
-  " call s:make_obvious('rubyDelimEscape')
-  " call s:make_obvious('rubySymbolDelimiter')
-endfun
-" }}}
-
-fun! s:detailed_syntax_addtions()
-  call s:detailed_colors()
-
-  " The default syntax/ruby.vim gets this way wrong (only does 2 chars and is
-  " transparent):
-  syn match rubyBlockArgument "&[_[:lower:]][_[:alnum:]]*" contains=NONE display
-  " Steal this back from the too-generic 'rubyControl':
-  syn match rubyExits "\<\%(exit!\|\%(abort\|at_exit\|exit\|fork\|trap\)\>[?!]\@!\)"
-
-  " Bonus!
-  syn match rubyInitialize '\<initialize\>' contained containedin=rubyMethodDeclaration
-
-  syn match rubyEncodingDirective "\cencoding: *utf-8" contained
-
-  " TODO - make this more elegant.
-  syn match rubyFirstAndSecondCommentLine '\%^#.*'
-    \ contains=rubyEncodingDirective contained
-  syn match rubyFirstAndSecondCommentLine '\%^#.*\n#.*'
-    \ contains=rubyEncodingDirective contained
-
-  syn keyword detailTodo TODO contained
-  syn keyword detailFixme FIXME contained
-  syn keyword detailXxx XXX contained
-  syn match   rubyComment   "#.*" contains=rubySharpBang,rubySpaceError,
-    \rubyFirstAndSecondCommentLine,detailTodo,detailFixme,detailXxx,@Spell
-  " TODO - somehow make the detail{Todo,Fixme,Xxx} work for non-ruby langs.
-endfun
-call s:detailed_syntax_addtions()
-
-" Rainbow-Parens Improved {{{
-" Inlined from v2.3 of http://www.vim.org/scripts/script.php?script_id=4176
-" 1. to remove the external dep, 2. to work around vim-rails resetting it.
-" Thanks!
-fun! s:fatpacked_rainbow_parens()
-  let guifgs = exists('g:rainbow_guifgs')? g:rainbow_guifgs : [
-        \ 'DarkOrchid3', 'RoyalBlue3', 'SeaGreen3',
-        \ 'DarkOrange3', 'FireBrick',
-        \ ]
-
-  let ctermfgs = exists('g:rainbow_ctermfgs')? g:rainbow_ctermfgs : [
-        \ 'darkgray', 'Darkblue', 'darkmagenta',
-        \ 'darkcyan', 'darkred', 'darkgreen',
-        \ ]
-
-  let max = has('gui_running')? len(guifgs) : len(ctermfgs)
-
-  let cmd = 'syn region %s matchgroup=%s start=/%s/ end=/%s/ containedin=%s contains=%s'
-  let str = 'TOP'
-  for each in range(1, max)
-    let str .= ',lv'.each
-  endfor
-  for [left , right] in [['(',')'],['\[','\]'],['{','}']]
-    for each in range(1, max - 1)
-      exe printf(cmd, 'lv'.each, 'lv'.each.'c', left, right, 'lv'.(each+1) , str)
-    endfor
-    exe printf(cmd, 'lv'.max, 'lv'.max.'c', left, right, 'lv1' , str)
-  endfor
-
-  for id in range(1 , max)
-    let ctermfg = ctermfgs[(max - id) % len(ctermfgs)]
-    let guifg = guifgs[(max - id) % len(guifgs)]
-    exe 'hi default lv'.id.'c ctermfg='.ctermfg.' guifg='.guifg
-  endfor
-endfun
-" }}}
-
-let &cpo = s:save_cpo
-
-" vim:foldmethod=marker
diff --git a/colors/devbox-dark-256.vim b/colors/devbox-dark-256.vim
deleted file mode 100755
index 349f56f..0000000
--- a/colors/devbox-dark-256.vim
+++ /dev/null
@@ -1,143 +0,0 @@
-" Vim color file
-" Name: devbox-dark-256
-" Author: Dee Sub Wun
-
-set background=dark
-set t_Co=256
-let g:colors_name="devbox-dark-256"
-
-let python_highlight_all = 1
-let c_gnu = 1
-
-
-""""""
-" SYNTAX HIGHLIGHTING
-""""""""""""""""""""""""
-hi Constant         cterm=NONE         	    ctermfg=149         ctermbg=NONE
-hi String           cterm=NONE              ctermfg=208         ctermbg=NONE
-hi Character        cterm=NONE              ctermfg=149         ctermbg=NONE
-hi Number           cterm=NONE              ctermfg=208         ctermbg=NONE
-hi Boolean          cterm=NONE              ctermfg=208         ctermbg=NONE
-hi Float            cterm=NONE              ctermfg=208         ctermbg=NONE
-hi Comment          cterm=NONE	            ctermfg=66          ctermbg=NONE
-
-hi Identifier       cterm=NONE              ctermfg=15          ctermbg=NONE
-hi Function         cterm=NONE              ctermfg=15          ctermbg=NONE
-
-hi Statement        cterm=bold              ctermfg=149         ctermbg=NONE
-hi Conditional      cterm=bold              ctermfg=149         ctermbg=NONE
-hi Repeat           cterm=bold              ctermfg=149         ctermbg=NONE
-hi Label            cterm=bold              ctermfg=149         ctermbg=NONE
-hi Operator         cterm=NONE              ctermfg=149         ctermbg=NONE
-hi Keyword          cterm=bold              ctermfg=149         ctermbg=NONE
-hi Exception        cterm=NONE              ctermfg=170         ctermbg=NONE
-
-hi PreProc          cterm=NONE              ctermfg=170         ctermbg=NONE
-hi Include          cterm=NONE              ctermfg=170         ctermbg=NONE
-hi Define           cterm=NONE              ctermfg=170         ctermbg=NONE
-hi Macro            cterm=NONE              ctermfg=170         ctermbg=NONE
-hi PreCondit        cterm=NONE              ctermfg=170         ctermbg=NONE
-
-hi Type             cterm=NONE              ctermfg=149         ctermbg=NONE
-hi StorageClass     cterm=NONE              ctermfg=149         ctermbg=NONE
-hi Structure        cterm=NONE              ctermfg=110         ctermbg=NONE
-hi Typedef          cterm=NONE              ctermfg=149         ctermbg=NONE
-
-hi Special          cterm=NONE              ctermfg=15          ctermbg=NONE
-hi SpecialChar      cterm=NONE              ctermfg=15          ctermbg=NONE
-hi Tag              cterm=NONE              ctermfg=149         ctermbg=NONE
-hi Delimiter        cterm=NONE              ctermfg=15          ctermbg=NONE
-hi SpecialComment   cterm=NONE              ctermfg=15          ctermbg=NONE
-hi Debug            cterm=NONE              ctermfg=15          ctermbg=NONE
-
-hi xmlTagName       cterm=NONE			    ctermfg=149			ctermbg=NONE
-hi xmlCdata         cterm=NONE			    ctermfg=246			ctermbg=NONE
-hi xmlAttrib        cterm=NONE			    ctermfg=110			ctermbg=NONE
-hi htmlTagName      cterm=NONE			    ctermfg=149			ctermbg=NONE
-hi htmlArg          cterm=NONE			    ctermfg=110			ctermbg=NONE
-hi htmlItalic		cterm=NONE				ctermfg=253		    ctermbg=235
-
-hi Underlined       cterm=underline         ctermfg=110         ctermbg=NONE
-
-hi Ignore           cterm=NONE              ctermfg=15          ctermbg=NONE
-
-hi Error            cterm=bold              ctermfg=15          ctermbg=9
-
-hi Todo             cterm=NONE              ctermfg=15          ctermbg=149
-
-
-""""""
-" INTERFACE
-""""""""""""""""""""""""
-hi Cursor           cterm=NONE              ctermfg=white       ctermbg=red
-hi CursorLine       cterm=NONE			    ctermfg=NONE		ctermbg=236
-hi CursorColumn     cterm=NONE			    ctermfg=NONE		ctermbg=236
-hi Directory        cterm=NONE              ctermfg=149         ctermbg=NONE
-hi ErrorMsg         cterm=bold              ctermfg=15          ctermbg=9
-hi LineNr           cterm=NONE              ctermfg=245         ctermbg=238
-hi MatchParen       cterm=bold              ctermfg=0           ctermbg=149
-hi ModeMsg          cterm=NONE              ctermfg=15          ctermbg=NONE
-hi MoreMsg          cterm=NONE              ctermfg=149         ctermbg=NONE
-hi NonText          cterm=bold              ctermfg=239         ctermbg=NONE
-hi Normal           cterm=NONE              ctermfg=253         ctermbg=235
-hi Question         cterm=NONE              ctermfg=149         ctermbg=NONE
-hi SpecialKey       cterm=NONE              ctermfg=149         ctermbg=NONE
-hi Title            cterm=NONE              ctermfg=170         ctermbg=NONE
-hi VertSplit        cterm=reverse           ctermfg=0	        ctermbg=240
-hi WarningMsg       cterm=NONE              ctermfg=9           ctermbg=NONE
-hi WildMenu         cterm=NONE              ctermfg=15          ctermbg=236
-
-
-""""""
-" TABS
-""""""""""""""""""""""""
-hi TabLine          cterm=bold,reverse      ctermfg=0	        ctermbg=240
-hi TabLineFill      cterm=bold,reverse      ctermfg=0	        ctermbg=240
-hi TabLineSel       cterm=bold,reverse      ctermfg=0	        ctermbg=240
-
-
-""""""
-" COMPLETION
-""""""""""""""""""""""""
-hi Pmenu            cterm=NONE              ctermfg=252 		ctermbg=75
-hi PmenuSel         cterm=NONE              ctermfg=NONE	    ctermbg=75
-
-
-""""""
-" STATUS
-""""""""""""""""""""""""
-hi StatusLine       cterm=reverse      		ctermfg=111         ctermbg=0
-hi StatusLineNC     cterm=reverse 	   		ctermfg=238	        ctermbg=245
-
-
-""""""
-" DIFF
-""""""""""""""""""""""""
-hi DiffAdd          cterm=NONE              ctermfg=NONE        ctermbg=239
-hi DiffChange       cterm=NONE              ctermfg=NONE        ctermbg=170
-hi DiffDelete       cterm=bold              ctermfg=239         ctermbg=66
-hi DiffText         cterm=bold              ctermfg=15         	ctermbg=NONE
-
-
-""""""
-" VISUAL
-""""""""""""""""""""""""
-hi Visual           cterm=NONE              ctermfg=15         	ctermbg=239
-hi VisualNOS        cterm=NONE              ctermfg=15         	ctermbg=239
-
-
-""""""
-" FOLDING
-""""""""""""""""""""""""
-hi Folded           cterm=NONE              ctermfg=244 		ctermbg=235
-hi FoldColumn       cterm=NONE              ctermfg=15          ctermbg=237
-
-
-""""""
-" SEARCH
-""""""""""""""""""""""""
-hi IncSearch        cterm=NONE              ctermfg=15          ctermbg=149
-hi Search           cterm=NONE              ctermfg=15          ctermbg=149
-
-
-"vim: sw=4
diff --git a/colors/deveiate.vim b/colors/deveiate.vim
deleted file mode 100755
index 354265f..0000000
--- a/colors/deveiate.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-"
-" Vim color theme: DevEiate
-"
-" Gvim color definition file, based loosely on Michael Granger's
-" eye-pleasing theme for Textmate of the same name.
-"       Mahlon E. Smith <mahlon@martini.nu>
-"       Michael Granger <ged@faeriemud.org>
-"
-" Drop this into your ~/.vim/colors directory, then load it via
-"       :colorscheme deveiate
-"
-" $Id: deveiate.vim 66 2008-06-30 02:28:56Z mahlon $
-
-
-" ----------------------------------------
-" Color definition reference
-" ----------------------------------------
-" :help group-name
-" :help highlight-groups
-" :help cterm-colors
-
-set background=dark
-highlight clear
-let g:colors_name="deveiate"
-
-" ----------------------------------------
-" highlight groups
-" ----------------------------------------
-highlight Normal guifg=#f6dfb2 guibg=#00000f
-highlight LineNr guifg=#333333
-highlight Cursor guibg=yellow guifg=NONE
-highlight CursorLine guibg=#171520
-highlight Search guibg=#001632 guifg=NONE
-highlight Visual guibg=#001632 guifg=NONE
-highlight VisualNOS guibg=#001632 guifg=NONE
-highlight Question guifg=yellow
-highlight StatusLine guibg=#d4d2cb guifg=#292087
-highlight StatusLineNC guibg=#8372be guifg=#22115c
-highlight TabLine guibg=black guifg=#333333
-highlight TabLineSel guibg=#333333 guifg=#f8f8f8
-highlight TabLineFill guifg=black
-highlight WildMenu guifg=yellow guibg=#22115c
-highlight Pmenu guibg=black guifg=#da8d53
-highlight PmenuSel guibg=black guifg=#76a3d7
-highlight PmenuSbar guibg=black
-highlight PmenuThumb guibg=black guifg=#333333
-highlight Folded guifg=#8b98ab guibg=black
-highlight FoldColumn guifg=#8b98ab guibg=black
-highlight VertSplit guifg=black guibg=#333333
-highlight DiffAdd guifg=#f8f8f8 guibg=#253b22
-highlight DiffChange guifg=#f8f8f8 guibg=#4a410d
-highlight DiffDelete guifg=#f8f8f8 guibg=#420e09
-highlight DiffText guifg=white guibg=#7d6f20
-highlight NonText guifg=#222222
-
-" ----------------------------------------
-" syntax highlighting groups
-" ----------------------------------------
-highlight Comment guifg=#a82419
-highlight Constant guifg=#76a3d7
-highlight Function guifg=#9b859d
-highlight String guifg=#da8d53
-highlight Special guifg=#da8d53
-highlight PreProc gui=bold guifg=#00cbcd
-highlight Identifier guifg=#9bda8b
-highlight Number guifg=#9bda8b
-highlight Float guifg=#9bda8b
-highlight Statement guifg=#00cbcd
-highlight todo guibg=NONE guifg=yellow
-highlight MatchParen guifg=yellow guibg=NONE
-
-
-" ----------------------------------------
-" ruby specific syntax highlighting
-" ----------------------------------------
-highlight rubyConstant guifg=#76a3d7
-highlight rubyInstanceVariable guifg=#c2eaf4
-highlight rubyClassVariable guifg=#c2eaf4
-highlight rubySymbol guifg=#9bda8b
-highlight rubyEscape guifg=#ddf2a4
-highlight rubyInterpolation guifg=#ddf2a4
-highlight rubyClass guifg=#c3adc5
-highlight rubyPseudoVariable guifg=#9bda8b
-highlight rubyOperator guifg=#00cbcd
-
-" ----------------------------------------
-" other misc colors
-" ----------------------------------------
-highlight MyTagListFileName guifg=yellow guibg=NONE
-
diff --git a/colors/developer.vim b/colors/developer.vim
deleted file mode 100755
index 18a1380..0000000
--- a/colors/developer.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-" Vim color file
-" Maintainer:	Jens Frederich <jfrederich@gmail.com>
-
-" First remove all old syntax autocommands.
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "developer"
-
-" Console colors
-" 0 = rgb: 0/0/0       hex: #000000  black    (text)
-" 1 = rgb: 0/128/0     hex: #008000  green    (comments)
-" 2 = rgb: 0/0/255     hex: #0000ff  blue     (keywords)
-" 3 = rgb: 51/94/168   hex: #335EA8  darkblue (selection)
-" 4 = rgb: 163/21/21   hex: #A31515  red      (string, chars, todo, errors)
-" 5 = rgb: 255/255/255 hex: #ffffff  white    (todo, selection and errors)
-
-hi Cursor                                           guibg=Orange    gui=NONE
-
-hi Visual         ctermfg=5 ctermbg=3 guifg=#ffffff guibg=#335EA8   gui=NONE
-hi Comment        ctermfg=1           guifg=#008000                 gui=NONE     
-hi String         ctermfg=4           guifg=#A31515                 gui=NONE
-hi Constant	      ctermfg=2           guifg=#0000ff                 gui=NONE    
-hi Error 		      ctermfg=5 ctermbg=4 guifg=#ffffff guibg=#A31515   gui=NONE    
-hi ErrorMsg       ctermfg=5 ctermbg=4 guifg=#ffffff guibg=#A31515   gui=NONE
-hi Search		      ctermfg=5 ctermbg=3 guifg=#ffffff guibg=#335EA8   gui=NONE    
-hi Directory      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Todo           ctermfg=5 ctermbg=4 guifg=#ffffff guibg=#A31515   gui=NONE
-hi Folded         ctermbg=0           guifg=#000000                 gui=NONE
-hi FoldColumn     ctermbg=0           guifg=#000000                 gui=NONE
-hi Method         ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Special        ctermfg=2           guifg=#0000ff                 gui=NONE
-hi SpecialChar    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Identifier     ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Statement      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Include        ctermfg=2           guifg=#0000ff                 gui=NONE
-hi PreProc        ctermfg=4           guifg=#A31515                 gui=NONE
-hi Character	    ctermfg=4           guifg=#A31515                 gui=NONE
-hi Number		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Boolean		    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Float		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Function	      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Type           ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Conditional	  ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Repeat		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Label		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Operator	      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Keyword		    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Exception	    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Include		    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Define		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Macro		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi PreCondit	    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi StorageClass	  ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Structure	    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Typedef		    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Tag		        ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Delimiter	    ctermfg=2           guifg=#0000ff                 gui=NONE
-hi SpecialComment ctermfg=2           guifg=#0000ff                 gui=NONE
-hi Debug		      ctermfg=2           guifg=#0000ff                 gui=NONE
-hi NonText        ctermfg=2                                         gui=NONE
-hi VertSplit                                                        gui=NONE  cterm=NONE term=NONE 
-hi MatchParen     ctermfg=0 ctermbg=3 guibg=#335EA8
-hi User1                                                            gui=bold  cterm=bold
-
diff --git a/colors/django.vim b/colors/django.vim
deleted file mode 100755
index 230bce5..0000000
--- a/colors/django.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-"
-" Django Color Scheme
-" ===================
-"
-" conversion of the textmate django colorscheme from the django
-" trac.
-"
-" Author:    Armin Ronacher <armin.ronacher@active-4.com>
-" Version:   0.1
-"
-set background=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "django"
-
-" Default Colors
-hi Normal       guifg=#f8f8f8   guibg=#0b2f20
-hi NonText      guifg=#0b2f20   guibg=#1a3c2f
-hi Cursor       guibg=#336242
-hi lCursor      guibg=#336242
-
-" Search
-hi Search	    guibg=peru      guifg=wheat
-hi IncSearch	cterm=NONE      ctermfg=yellow      ctermbg=green
-hi Search	    cterm=NONE      ctermfg=grey        ctermbg=blue
-
-" Window Elements
-hi StatusLine   guifg=white     guibg=#8fbb9e       gui=bold
-hi StatusLineNC guifg=#1a3c2f   guibg=#8dbc6a
-hi VertSplit    guifg=#244a2a   guibg=#244a2a
-hi Folded       guifg=#8cbb9e   guibg=#244a2a
-hi IncSearch	guifg=slategrey guibg=khaki
-
-" Specials
-hi Todo         guifg=#c6210b   guibg=#61150b       gui=bold
-hi Title        guifg=#ffffff   gui=bold
-
-" Strings
-hi String       guifg=#87bb9e
-hi Constant     guifg=#87bb9e
-
-" Syntax
-hi Number       guifg=#387258   gui=bold
-hi Statement    guifg=#f2e862   gui=bold
-hi Function     guifg=#fec756
-hi PreProc      guifg=#aa5507   gui=bold
-hi Comment      guifg=#245032   gui=italic
-hi Type         guifg=#96dd3b   gui=bold
-
-" Diff
-hi DiffAdd	    ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	    cterm=bold ctermbg=1
-
diff --git a/colors/donbass.vim b/colors/donbass.vim
deleted file mode 100755
index 5307702..0000000
--- a/colors/donbass.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" Vim color file
-" Name:         donbass.vim
-" Description:  Light color scheme for 256-color terminals and GUI
-" Version:      0.4
-" Last Change:  11 Aug 2009
-" Maintainer:   Dmitry Maluka <dmitrymaluka@gmail.com>
-" License:      Public Domain
-"
-" Inspired by xoria256.vim by Dmitriy Y. Zotikov (xio) <xio@ungrund.org>.
-"
-" Color numbers (0-255):
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-"
-" Suggestions and patches are welcome.
-
-
-if &t_Co != 256 && !has("gui_running")
-    echomsg ""
-    echomsg "err: please use 256-color terminal or GUI (so that t_Co=256 could be set)"
-    echomsg ""
-    finish
-endif
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "donbass"
-
-" General
-hi Normal        ctermfg=232  guifg=#080808  ctermbg=252  guibg=#d0d0d0  cterm=none  gui=none
-hi Visual        ctermfg=16   guifg=#000000  ctermbg=74   guibg=#5fafdf  cterm=none  gui=none
-hi VisualNOS     ctermfg=52   guifg=#5f0000  ctermbg=137  guibg=#af875f  cterm=none  gui=none
-hi Search        ctermfg=253  guifg=#dadada  ctermbg=25   guibg=#005faf  cterm=none  gui=none
-hi IncSearch     ctermfg=253  guifg=#dadada  ctermbg=130  guibg=#af5f00  cterm=none  gui=none
-hi MatchParen    ctermfg=fg   guifg=fg       ctermbg=249  guibg=#b2b2b2  cterm=none  gui=none
-hi ErrorMsg      ctermfg=254  guifg=#e4e4e4  ctermbg=160  guibg=#df0000  cterm=none  gui=none
-hi WarningMsg    ctermfg=196  guifg=#ff0000  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi ModeMsg       ctermfg=254  guifg=#e4e4e4  ctermbg=28   guibg=#008700  cterm=bold  gui=bold
-hi MoreMsg       ctermfg=254  guifg=#e4e4e4  ctermbg=28   guibg=#008700  cterm=bold  gui=bold
-hi Question      ctermfg=52   guifg=#5f0000  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi StatusLine    ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=bold  gui=bold
-hi StatusLineNC  ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=none  gui=none
-hi VertSplit     ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=none  gui=none
-hi TabLine       ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=none  gui=none
-hi TabLineFill   ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=none  gui=none
-hi TabLineSel    ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=bold  gui=bold
-hi WildMenu      ctermfg=250  guifg=#bcbcbc  ctermbg=236  guibg=#303030  cterm=none  gui=none
-hi Folded        ctermfg=fg   guifg=fg       ctermbg=250  guibg=#bcbcbc  cterm=none  gui=none
-hi FoldColumn    ctermfg=124  guifg=#af0000  ctermbg=250  guibg=#bcbcbc  cterm=bold  gui=bold
-hi Pmenu         ctermfg=16   guifg=#000000  ctermbg=248  guibg=#a8a8a8  cterm=none  gui=none
-hi PmenuSel      ctermfg=16   guifg=#000000  ctermbg=244  guibg=#808080  cterm=none  gui=none
-hi PmenuSbar     ctermfg=fg   guifg=fg       ctermbg=244  guibg=#808080  cterm=none  gui=none
-hi PmenuThumb    ctermfg=251  guifg=#c6c6c6  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi LineNr        ctermfg=238  guifg=#444444  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi NonText       ctermfg=238  guifg=#444444  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi SpecialKey    ctermfg=239  guifg=#4e4e4e  ctermbg=250  guibg=#bcbcbc  cterm=bold  gui=bold
-hi Title         ctermfg=254  guifg=#e4e4e4  ctermbg=167  guibg=#df5f5f  cterm=none  gui=none
-hi Directory     ctermfg=24   guifg=#005f87  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi DiffAdd       ctermfg=fg   guifg=fg       ctermbg=71   guibg=#5faf5f  cterm=none  gui=none
-hi DiffDelete    ctermfg=fg   guifg=fg       ctermbg=102  guibg=#878787  cterm=none  gui=none
-hi DiffChange    ctermfg=fg   guifg=fg       ctermbg=167  guibg=#df5f5f  cterm=none  gui=none
-hi DiffText      ctermfg=fg   guifg=fg       ctermbg=180  guibg=#dfaf87  cterm=none  gui=none
-hi SpellBad      ctermfg=124  guifg=#af0000  ctermbg=bg   guibg=bg  cterm=underline  gui=underline
-hi SpellCap      ctermfg=22   guifg=#005f00  ctermbg=bg   guibg=bg  cterm=underline  gui=underline
-hi SpellLocal    ctermfg=21   guifg=#0000ff  ctermbg=bg   guibg=bg  cterm=underline  gui=underline
-hi SpellRare     ctermfg=92   guifg=#8700df  ctermbg=bg   guibg=bg  cterm=underline  gui=underline
-
-" Syntax
-hi Identifier    ctermfg=52   guifg=#5f0000  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi Statement     ctermfg=28   guifg=#008700  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi Type          ctermfg=25   guifg=#005faf  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi Constant      ctermfg=160  guifg=#df0000  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi String        ctermfg=23   guifg=#005f5f  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi Special       ctermfg=131  guifg=#af5f5f  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi PreProc       ctermfg=29   guifg=#00875f  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi Comment       ctermfg=241  guifg=#606060  ctermbg=bg   guibg=bg       cterm=none  gui=none
-hi Todo          ctermfg=254  guifg=#e4e4e4  ctermbg=166  guibg=#df5f00  cterm=none  gui=none
-hi Underlined    ctermfg=fg   guifg=fg       ctermbg=bg   guibg=bg  cterm=underline  gui=underline
-hi Error         ctermfg=196  guifg=#ff0000  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi cPreCondit    ctermfg=131  guifg=#af5f5f  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffRemoved   ctermfg=131  guifg=#af5f5f  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffAdded     ctermfg=28   guifg=#008700  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffChanged   ctermfg=130  guifg=#af5f00  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffFile      ctermfg=25   guifg=#005faf  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffLine      ctermfg=25   guifg=#005faf  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
-hi diffSubname   ctermfg=29   guifg=#00875f  ctermbg=bg   guibg=bg       cterm=bold  gui=bold
diff --git a/colors/doorhinge.vim b/colors/doorhinge.vim
deleted file mode 100755
index 16ecdcc..0000000
--- a/colors/doorhinge.vim
+++ /dev/null
@@ -1,99 +0,0 @@
-" doorhinge.vim - Vim color file
-" Maintainer:	Scott McRae <dimset@gmail.com>
-" Last Change:	Oct 30, 2007
-" Version: 0.6
-"
-"  +-----+
-" [|     |   Rhymes with?
-"  |     |                      
-"  |    *|
-"  |     |
-" [|     |
-"  +-----+ 
-" 
-" http://www.vim.org/scripts/script.php?script_id=1671 - doorhinge.vim
-" http://members.shaw.ca/dimset/vim/_vimrc - my vimrc!
-" http://members.shaw.ca/dimset/vim/doorhinge.vim - mirror
-" http://members.shaw.ca/dimset/vim/guishot.png - GUI screenshot
-" http://members.shaw.ca/dimset/vim/xtermshot.png - xterm w/transparency
-"
-" Updated: cleaned up a bit, added cursorline, diff, pmenu, tabline,
-" minibuf, modified statusline, visual modes, folds, color tweaks
-"
-"
-set background=dark
-" Remove all existing highlighting
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-" Theme Name
-let g:colors_name = "doorhinge"
-
-hi Normal		    guibg=#405871   guifg=#BFCFFF   ctermfg=LightGray   ctermbg=none 
-
-hi ErrorMsg		    guibg=#A50000   guifg=White     ctermfg=Red         ctermbg=none        term=bold       cterm=bold
-hi WarningMsg 		guibg=#FFCC00   guifg=White     ctermfg=Yellow      ctermbg=none        term=bold       cterm=bold
-
-hi IncSearch		guibg=#804000   guifg=#FF9911 	ctermfg=DarkRed     ctermbg=Brown       term=bold            
-hi Search		    guibg=#804000   guifg=#FF9911   ctermfg=DarkRed     ctermbg=Brown       term=bold       gui=reverse    
-
-hi StatusLine		guibg=#25345F   guifg=#647C95   ctermfg=White       ctermbg=DarkBlue    term=underline  cterm=underline     gui=underline		    
-hi StatusLineNC	    guibg=#25345F   guifg=#526A83   ctermfg=Gray        ctermbg=DarkBlue    term=none       cterm=none       gui=none
-hi VertSplit		guibg=#25345F   guifg=#526A83   ctermfg=White       ctermbg=DarkBlue    term=none       cterm=none       gui=none		
-hi LineNr		                    guifg=#25345F   ctermfg=White       ctermbg=DarkBlue    term=none
-
-hi Directory 		guibg=#405871   guifg=#CCCCFF   ctermfg=White       ctermbg=none        term=bold		   
-hi WildMenu 		guibg=Black     guifg=#FF9911   ctermfg=Brown       ctermbg=Black       term=standout	
-hi Folded		    guibg=#25345F   guifg=#CCCCCC   ctermfg=White       ctermbg=DarkBlue    term=standout	cterm=underline
-hi FoldColumn 		guibg=#25345F   guifg=#FFFFFF   ctermfg=White       ctermbg=DarkBlue    term=standout	
-
-hi Cursor		    guibg=#25345F   guifg=#CCCCCC   ctermfg=White       ctermbg=Blue
-hi lCursor		    guibg=#25345F   guifg=#CCCCCC
-hi CursorColumn     guibg=#49617A
-hi CursorLine       guibg=#5B738C
-
-hi Visual 		    guibg=#25345F   guifg=#647C95   ctermfg=White       ctermbg=none        term=bold       cterm=bold      gui=none 
-hi VisualNOS 		guibg=#25345F   guifg=#526A83   ctermfg=White       ctermbg=none        term=bold       cterm=bold      gui=underline
-
-hi DiffText		    guibg=#FF9911   guifg=White     gui=none 	
-hi DiffAdd 		    guibg=#FFB720   guifg=White	    gui=bold         
-hi DiffChange 		guibg=#D26C00		            gui=underline     
-hi DiffDelete 		guibg=#AA4400   guifg=#DDDDDD   gui=bold	
-
-" vim 7+
-if v:version >= 700
-hi Pmenu            guibg=#25345F   guifg=#647C95
-hi PmenuSel         guibg=#2E3D68   guifg=#CCCCCC   gui=underline
-hi PmenuSbar        guibg=Black     guifg=#CCCCCC
-hi PmenuThumb       guibg=Black     guifg=#FF9911
-endif
-
-" minibufexplorer
-hi MBENormal        guibg=#405871   guifg=#5EA7DD   ctermfg=White       ctermbg=DarkBlue    term=none       gui=none 
-hi MBEChanged       guibg=#405871   guifg=#80C9FF   ctermfg=White       ctermbg=DarkBlue    term=Bold       gui=none
-hi MBEVisibleNormal guibg=#25345F   guifg=#5EA7DD   ctermfg=White       ctermbg=DarkBlue    term=none       gui=none
-hi MBEVisibleChanged    guibg=#25345F   guifg=#80C9FF   ctermfg=White       ctermbg=DarkBlue    term=Bold       gui=none
-
-hi perlSpecialMatch   guifg=#FF9911   guibg=Black   ctermfg=Brown       ctermbg=Black
-hi perlSpecialString  guifg=#FF9911   guibg=Black   ctermfg=Brown       ctermbg=Black
-
-hi Comment		                    guifg=#5EA7DD   ctermfg=DarkCyan    ctermbg=none        term=bold       cterm=bold
-hi PreProc		                    guifg=#999999   ctermfg=LightGray   ctermbg=none        term=bold       cterm=bold
-hi Constant 		                guifg=#FF9911	ctermfg=Brown       ctermbg=none		term=underline
-hi Special 		    guibg=Black	    guifg=#FF9911   ctermfg=Brown       ctermbg=Black       term=bold
-hi Identifier		                guifg=#BBBBBB   ctermfg=LightGray   ctermbg=none
-hi Tag              guibg=Black     guifg=#B0E0E6
-hi Statement 	                    guifg=#FFFFFF   ctermfg=White       ctermbg=none        term=bold       cterm=bold  gui=bold      
-hi Type			                    guifg=#80C9FF   ctermfg=LightCyan   ctermbg=none      	term=underline  gui=NONE
-hi Title 		                    guifg=#C8E2FF   ctermfg=Cyan        ctermbg=DarkBlue	term=bold	    gui=bold
-hi Question 		                guifg=#80C9FF   ctermfg=Blue        ctermbg=none        cterm=bold      term=bold   gui=bold
-hi SpecialKey 		                guifg=#677F98 	                                        term=bold
-hi SignColumn       guibg=Black     guifg=#FF9911
-hi Todo			    guibg=yellow2   guifg=orangered ctermfg=Brown       ctermbg=Yellow
-hi Ignore 		                    guifg=grey20 	ctermfg=DarkGrey    ctermbg=none
-hi ModeMsg 		                    guifg=#80C9FF   ctermfg=Blue        ctermbg=none        cterm=bold      term=bold   gui=bold
-hi MoreMsg 		                    guifg=#80C9FF   ctermfg=Blue        ctermbg=none        cterm=bold      term=bold   gui=bold
-hi NonText 		    guibg=#2D3D4F   guifg=#405871   ctermfg=DarkGray    ctermbg=none        cterm=bold      term=bold   gui=bold		        
-hi MatchParen       guibg=Black     guifg=#FF9911   ctermfg=Brown       ctermbg=none        cterm=bold      term=bold   gui=bold
-" EOF
diff --git a/colors/doriath.vim b/colors/doriath.vim
deleted file mode 100755
index 2182206..0000000
--- a/colors/doriath.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" Vim color file
-" Maintainer:   Alex Esplin (alex.esplin@gmail.com)
-" Last Change:  
-" URL:          
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="doriath"
-
-hi Normal               guifg=#d2ffc6 guibg=#0e2a1a
-hi Cursor               guibg=#54ff9f guifg=#0e2a1a
-"hi CursorIM    
-"hi Directory   
-"hi DiffAdd             
-"hi DiffChange  
-"hi DiffDelete  
-"hi DiffText    
-"hi ErrorMsg    
-hi VertSplit            guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded               guibg=#4e9271 guifg=#0e2a1a
-hi FoldColumn           guibg=grey30 guifg=tan
-hi IncSearch            guibg=khaki guifg=slategrey
-hi LineNr               guifg=khaki
-hi ModeMsg              guifg=goldenrod
-hi MoreMsg              guifg=SeaGreen
-hi NonText              guibg=LightBlue guibg=SeaGreen
-hi Question             guifg=springgreen
-hi Search               guibg=DarkRed guifg=DarkSeaGreen4
-hi SpecialKey           guifg=yellowgreen
-hi StatusLine           guibg=#c2dfa5 guifg=black gui=none
-hi StatusLineNC         guibg=#c2dfa5 guifg=grey50 gui=none
-hi Title                guifg=IndianRed 
-hi Visual               guibg=olivedrab guifg=khaki gui=none
-"hi VisualNOS   
-hi WarningMsg           guifg=salmon
-"hi WildMenu    
-"hi Menu                
-hi Scrollbar            guibg=#0e2a1a
-"hi Tooltip             
-
-" syntax highlighting groups
-hi Comment              guifg=#1d96e7
-hi Constant             guifg=#00ff62
-hi Identifier           guifg=#28dbd2
-hi Statement            guifg=#ffff5b
-hi PreProc              guifg=IndianRed
-hi Type                 guifg=#ff3636
-hi Special              guifg=navajowhite
-"hi Underlined  
-hi Ignore               guifg=grey40
-"hi Error               
-hi Todo                 guifg=orangered guibg=yellow2
-
diff --git a/colors/dual.vim b/colors/dual.vim
deleted file mode 100755
index 44cfd88..0000000
--- a/colors/dual.vim
+++ /dev/null
@@ -1,231 +0,0 @@
-"==============================================================================.
-"        File: dual.vim                                                        |
-"     License: Public Domain, FREE as LOVE.                                    |
-" Description: The Dual colorscheme you've been longing for. On VIM, it uses   |
-"              dark colors. On GVIM, it uses bright colors without bold,       |
-"              italic nor underline font styles (except for spell checking     |
-"              and some GUI elements).                                         |
-"        Note: - Only standard (for all languages) highlight-groups are set.   |
-"              - This colorscheme _should_ look nice everywhere.               |
-"==============================================================================|
-"      Author: drachenkiraa, {_drachen_kiraa_}@{_gmail_}.{com_}  (remove: _{}) |
-" Last Change: 2009 Jul 1                                                      |
-"     Version: 1.1                                                             |
-"==========================================================================={{{1
-" Changes:                                                                     |
-"  1.0: Public release.                                                        |
-"  1.1: A LOT of changes, if you are interested to know what really changed:   |
-"       Changed 'CursorLine', 'CursorColumn' to use 'gui=underline' instead of |
-"         using 'guibg' color.                                                 |
-"       Made 'PMenuSel' guibg color more darker.                               |
-"       Changed  'SpellRare' guisp color to DarkMagenta.                       |
-"       Tab pages, Status and Split bars now use gray-blue and blue-white      |
-"         as colors (for both terminal and gui).                               |
-"       Changed 'MoreMsg' guifg color from Gray30 to DarkGreen.                |
-"       Changed 'Question' gui option to italic.                               |
-"       Changed 'Directory' ctermfg from Yellow to Blue.                       |
-"       Changed all Diff colors to use their darker versions.                  |
-"       Made 'LineNr' transparent and brighter.                                |
-"       Made 'SignColumn' transparent.                                         |
-"       Made 'Folded' and 'FoldColumn' darkblue over transparent for cterm,    |
-"         and made their GUI colors more brighter.                             |
-"       Changed 'IncSearch' ctermbg and guibg colors from                      |
-"         LighMagenta to Green.                                                |
-"       Added 'ctermfg'and 'guifg' options to 'Search'.                        |
-"       Made 'Comment' guifg and ctermfg colors more brighter.                 |
-"       Linked 'Number', 'Float' and 'Boolean' to 'Constant'.                  |
-"       Changed 'Constant' ctermfg color from Magenta to Yellow,               |
-"         and made guifg colors more darker.                                   |
-"       Changed 'Character' ctermfg color from Magenta to DarkRed,             |
-"         and made guifg colors more darker.                                   |
-"       Made 'String' ctermfg color more darker.                               |
-"       Linked 'Function' to 'Identifier', and changed their ctermfg and guifg |
-"         to Magenta and a dark violet respectively.                           |
-"       Linked 'Conditional', 'Repeat', 'Operator', 'Keyword', 'Label' and     |
-"         'Exception' to 'Statement.                                           |
-"       Changed 'Statement' ctermfg color from Green to Blue.                  |
-"       Linked 'StorageClass', 'Structure' and 'Typedef' to 'Type'.            |
-"       Changed 'Type' ctermfg color from Cyan to Blue.                        |
-"       Linked 'Include', 'Define' and 'Macro' to 'PreProc'.                   |
-"       Changed 'PreProc' ctermfg color to a darker version.                   |
-"       Changed 'PreCondit' ctermfg color from Blue to Yellow and guifg color  |
-"         from Red to Gold like.                                               |
-"       Changed 'Special', 'SpecialChar', 'Tag' and 'Delimiter' ctermfg color  |
-"         from Red to Cyan and changed their guifg color to sky blue.          |
-"       Changed 'MatchParen' guibg color from light magenta to DarkBlue.       |
-"       Changed 'Todo' ctermbg and guibg colors to Green and DarkGreen.        |
-"       Made 'Underlined'ctermbg transparent.                                  |
-"       Set 'NonText' guibg color to the same as the 'FoldColumn' guibg color. |
-"==============================================================================|
-"  Color Test: :he group-name                                                  |
-"              :so $VIMRUNTIME/syntax/hitest.vim                               |
-"   Tested On: - Linux (gvim v6.3, v6.4);                                      |
-"              - Standard Linux Terminal (vim v6.3, v6.4);                     |
-"              - Xterm, Rxvt, Konsole, gnome-terminal (vim v6.3, v6.4).        |
-"              - Windows (gvim v7.1, v7.2);                                    |
-"              - DOS (vim v7.1, v7.2).                                         |
-"        TODO: * Test this colorscheme on newer versions of vim/gvim for Linux |
-"                and other systems (*BSD, Mac, Amiga?).                        |
-"              * Are all the has("feature") checks really worth?               |
-"                Please enlighten me if I'm wrong.                             |
-"==============================================================================|
-" Random Tips:                                                                 |
-" * If your terminal supports more than 8 colors (which is the case of most    |
-"   modern xterms, rxvts, and others), then it is worth adding the following   |
-"   lines somewhere into your .vimrc:                                          |
-"       if &term =~ "xterm"                                                    |
-"         set t_Co=16                                                          |
-"       endif                                                                  |
-"   That'll make this colorscheme look a lot better on such terminals.         |
-"   For further help checkout:                                                 |
-"       :he term-dependent-settings                                            |
-"       :he term                                                               |
-"===========================================================================}}}1
-" Initial setup stuff {{{1
-" Remove existing highlighting
-if has("gui_running")
-  set background=light
-else
-  set background=dark
-endif
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "dual"
-hi Normal ctermbg=Black ctermfg=Gray guibg=White guifg=Black gui=none
-
-" Vim >= 7.0 specific colors {{{1
-if v:version >= 700
-  " Cursor colors {{{2
-  hi Cursor ctermbg=fg ctermfg=bg cterm=NONE guibg=DarkBlue guifg=bg gui=none
-  hi CursorLine ctermbg=DarkGray cterm=NONE guibg=bg gui=underline
-  hi CursorColumn ctermbg=DarkGray cterm=NONE guibg=bg gui=underline
-  " only for Win32, IME status
-  if has('multi_byte_ime')
-    hi CursorIM guibg=#660066 guifg=NONE gui=none
-  endif
-
-  " Auto-completion Popup Menu colors {{{2
-  hi Pmenu ctermbg=Gray ctermfg=bg cterm=NONE guibg=#ccff99 guifg=fg gui=none
-  hi PmenuSel ctermbg=DarkRed ctermfg=White cterm=NONE guibg=#336600 guifg=bg gui=bold
-  hi PmenuSbar ctermbg=DarkRed ctermfg=fg cterm=NONE guibg=#99cc66 guifg=fg gui=none
-  hi PmenuThumb ctermbg=DarkGray ctermfg=DarkGray cterm=NONE guibg=#669933 guifg=bg gui=none
-
-  " Tab colors {{{2
-  if has("windows")
-    hi TabLine ctermbg=Gray ctermfg=DarkBlue guibg=Gray75 guifg=#003399 gui=none
-    hi TabLineFill ctermbg=Gray ctermfg=DarkBlue guibg=Gray75 guifg=#003399 gui=none
-    hi TabLineSel ctermbg=DarkBlue ctermfg=fg guibg=#003399 guifg=bg gui=bold
-  endif
-
-  " Spell checking colors {{{2
-  if has("spell")
-    hi SpellBad ctermbg=White ctermfg=Red cterm=NONE guisp=Red gui=undercurl
-    hi SpellCap ctermbg=White ctermfg=Blue cterm=NONE guisp=Blue gui=undercurl
-    hi SpellLocal ctermbg=White ctermfg=DarkCyan cterm=NONE guisp=DarkCyan gui=undercurl
-    hi SpellRare ctermbg=White ctermfg=Magenta cterm=NONE guisp=DarkMagenta gui=undercurl
-  endif
-
-endif "}}}1
-" Messages and other texts' colors {{{1
-hi WarningMsg ctermbg=bg ctermfg=Red cterm=NONE guibg=bg guifg=Red3 gui=none
-hi ErrorMsg ctermbg=Red ctermfg=White cterm=NONE guibg=Red3 guifg=bg gui=none
-hi ModeMsg ctermbg=bg ctermfg=fg cterm=NONE guibg=bg guifg=fg gui=none
-hi MoreMsg ctermbg=bg ctermfg=Green cterm=NONE guibg=bg guifg=DarkGreen gui=none
-hi Question ctermbg=bg ctermfg=White cterm=NONE guibg=bg guifg=Gray30 gui=italic
-hi Directory ctermbg=bg ctermfg=Blue cterm=NONE guibg=bg guifg=Blue2 gui=none
-hi Title ctermbg=bg ctermfg=Magenta cterm=NONE guibg=bg guifg=Blue gui=bold
-
-" Diff colors {{{1
-if has("diff")
-  hi DiffAdd ctermbg=Green ctermfg=bg cterm=NONE guibg=#ccffcc gui=none
-  hi DiffChange ctermbg=Blue ctermfg=fg cterm=NONE guibg=#ccccff gui=none
-  hi DiffDelete ctermbg=Red ctermfg=bg cterm=NONE guibg=#ffcccc gui=none
-  hi DiffText ctermbg=Cyan ctermfg=bg cterm=NONE guibg=#ccffff gui=none
-endif
-
-" Outline, Fold & Sign columns colors {{{1
-hi LineNr ctermbg=bg ctermfg=DarkGray guibg=bg guifg=Gray60 gui=none
-if has("folding")
-  hi Folded ctermbg=bg ctermfg=DarkBlue cterm=NONE guibg=Gray95 guifg=Gray40 gui=none
-  hi FoldColumn ctermbg=bg ctermfg=DarkBlue cterm=NONE guibg=Gray95 guifg=Gray40 gui=none
-endif
-if has("signs")
-  hi SignColumn ctermbg=bg ctermfg=Yellow cterm=NONE guibg=Gray95 guifg=#0033ff gui=none
-endif
-
-" Search & Special characters' colors {{{1
-if has("extra_search")
-  hi Search ctermbg=Yellow ctermfg=bg cterm=NONE guibg=Yellow guifg=fg gui=none
-  hi IncSearch ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=fg gui=none
-endif
-hi NonText ctermbg=bg ctermfg=DarkGray guibg=Gray95 guifg=DarkGray gui=none
-hi SpecialKey ctermbg=bg ctermfg=Brown guibg=bg guifg=#993333 gui=none
-
-" Window Bars, Status line & Visual mode colors {{{1
-hi StatusLine ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#003399 guifg=bg gui=none
-if has("windows")
-  hi StatusLineNC ctermbg=Gray ctermfg=DarkBlue cterm=NONE guibg=Gray75 guifg=#003399 gui=italic
-endif
-if has("vertsplit")
-  hi VertSplit ctermbg=Gray ctermfg=DarkBlue cterm=NONE guibg=Gray75 guifg=#003399 gui=bold
-endif
-
-if has("wildmenu")
-  hi WildMenu ctermbg=bg ctermfg=Blue guibg=bg guifg=#003399 gui=bold
-endif
-
-if has("visual")
-  hi Visual ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=DarkBlue guifg=bg gui=none
-  hi VisualNOS ctermbg=fg ctermfg=DarkBlue cterm=NONE guibg=DarkBlue guifg=bg gui=none
-endif
-
-" Syntax highlighting colors {{{1
-hi Comment ctermbg=bg ctermfg=Green guibg=bg guifg=#008800 gui=none
-hi link SpecialComment Comment
-
-hi Character ctermbg=bg ctermfg=Red guibg=bg guifg=#cc0000 gui=none
-hi String ctermbg=bg ctermfg=Red guibg=bg guifg=#cc0000 gui=none
-hi Constant ctermbg=bg ctermfg=Yellow guibg=bg guifg=#ff6600 gui=none
-hi link Number Constant
-hi link Float Constant
-hi link Boolean Constant
-
-hi Identifier ctermbg=bg ctermfg=Magenta guibg=bg guifg=#990099 gui=none
-hi link Function Identifier
-
-hi Statement ctermbg=bg ctermfg=Blue guibg=bg guifg=#0000cc gui=none
-hi link Conditional Statement
-hi link Repeat Statement
-hi link Operator Statement
-hi link Keyword Statement
-hi link Label Statement
-hi link Exception Statement
-
-hi Type ctermbg=bg ctermfg=Blue guibg=bg guifg=#0000cc gui=none
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-
-hi PreProc ctermbg=bg ctermfg=DarkYellow guibg=bg guifg=#666600 gui=none
-hi PreCondit ctermbg=bg ctermfg=Yellow guibg=bg guifg=#999900 gui=none
-hi link Include PreProc
-hi link Define PreProc
-hi link Macro PreProc
-
-hi Special ctermbg=bg ctermfg=Cyan guibg=bg guifg=#3366cc gui=none
-hi SpecialChar ctermbg=bg ctermfg=Cyan guibg=bg guifg=Blue gui=none
-hi Tag ctermbg=bg ctermfg=Cyan guibg=bg guifg=#3366cc gui=none
-hi Delimiter ctermbg=bg ctermfg=Cyan guibg=bg guifg=#3366cc gui=none
-hi Debug ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-
-hi MatchParen ctermbg=White ctermfg=Black cterm=NONE guibg=DarkBlue guifg=bg gui=none
-hi Error ctermbg=Red ctermfg=White cterm=NONE guibg=bg guifg=Red gui=none
-hi Ignore ctermbg=bg ctermfg=bg cterm=NONE guibg=bg guifg=bg gui=none
-hi Todo ctermbg=Green ctermfg=bg cterm=NONE guibg=DarkGreen guifg=bg gui=none
-hi Underlined ctermbg=bg ctermfg=Cyan cterm=underline guibg=bg guifg=Blue2 gui=underline
-"}}}1
-"==========================================================================={{{1
-" vim: set et sw=2 sts=2 ts=8 nowrap:
-" vim600: set fdc=2 fdm=marker:
diff --git a/colors/dull.vim b/colors/dull.vim
deleted file mode 100755
index bff07d7..0000000
--- a/colors/dull.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" dull : a very low saturation colour scheme
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "dull"
-
-if &background == "light"
-  hi Normal       guifg=Black guibg=White
-  hi SpecialKey   term=bold ctermfg=DarkBlue guifg=DarkBlue
-  hi NonText      term=bold cterm=bold ctermfg=DarkBlue gui=bold guifg=DarkBlue
-  hi Directory    term=bold ctermfg=DarkBlue guifg=DarkBlue
-  hi ErrorMsg     term=standout cterm=bold ctermfg=White ctermbg=Red guifg=White guibg=Red
-  hi IncSearch    term=reverse cterm=reverse gui=reverse
-  hi Search       term=reverse ctermbg=Yellow guibg=Yellow
-  hi MoreMsg      term=bold ctermfg=DarkGreen gui=bold guifg=DarkGreen
-  hi ModeMsg      term=bold cterm=bold gui=bold
-  hi LineNr       term=underline ctermfg=Brown guifg=Brown
-  hi Question     term=standout ctermfg=DarkGreen gui=bold guifg=DarkGreen
-  hi StatusLine   term=bold,reverse cterm=bold,reverse gui=bold,reverse
-  hi StatusLineNC term=reverse cterm=reverse gui=reverse
-  hi VertSplit    term=reverse cterm=reverse gui=reverse
-  hi Title        term=bold ctermfg=DarkMagenta gui=bold guifg=DarkMagenta
-  hi Visual       term=reverse cterm=reverse gui=reverse guifg=Grey guibg=fg
-  hi VisualNOS    term=bold,underline cterm=bold,underline gui=bold,underline
-  hi WarningMsg   term=standout ctermfg=DarkRed guifg=DarkRed
-  hi WildMenu     term=standout ctermfg=Black ctermbg=Yellow guifg=Black guibg=Yellow
-  hi Folded       term=standout ctermfg=DarkBlue ctermbg=LightGrey guifg=DarkBlue guibg=LightGrey
-  hi FoldColumn   term=standout ctermfg=DarkBlue ctermbg=Grey guifg=DarkBlue guibg=Grey
-  hi DiffAdd      term=bold ctermbg=DarkBlue guibg=DarkBlue
-  hi DiffChange   term=bold ctermbg=DarkMagenta guibg=DarkMagenta
-  hi DiffDelete   term=bold cterm=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
-  hi DiffText     term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-  hi SignColumn   term=standout ctermfg=DarkBlue ctermbg=Grey guifg=DarkBlue guibg=Grey
-  hi Cursor       guifg=bg guibg=fg
-  hi lCursor      guifg=bg guibg=fg
-  hi Comment      term=bold ctermfg=DarkBlue guifg=#606060
-  hi Constant     term=underline ctermfg=DarkMagenta guifg=#400080
-  hi Special      term=bold ctermfg=DarkBlue guifg=#000080
-  hi Identifier   term=underline ctermfg=DarkCyan guifg=#006060
-  hi Statement    term=bold ctermfg=Brown gui=none guifg=#603000
-  hi PreProc      term=underline ctermfg=DarkMagenta guifg=#800040
-  hi Type         term=underline ctermfg=DarkGreen gui=none guifg=#006000
-  hi Underlined   term=underline cterm=underline ctermfg=DarkMagenta gui=underline guifg=#600030
-  hi Ignore       cterm=bold ctermfg=LightGray guifg=LightGray
-  hi Error        term=reverse cterm=bold ctermfg=LightGrey ctermbg=Red guifg=White guibg=Red
-  hi Todo         term=standout ctermfg=Black ctermbg=Yellow guifg=Blue guibg=Yellow
-else
-  hi Normal       guifg=LightGrey guibg=Black
-  hi SpecialKey   term=bold cterm=bold ctermfg=Cyan guifg=Cyan
-  hi NonText      term=bold cterm=bold ctermfg=Blue gui=bold guifg=Blue
-  hi Directory    term=bold cterm=bold ctermfg=Cyan guifg=Cyan
-  hi ErrorMsg     term=standout cterm=bold ctermfg=White ctermbg=Red guifg=White guibg=Red
-  hi IncSearch    term=reverse cterm=reverse gui=reverse
-  hi Search       term=reverse ctermfg=Black ctermbg=Yellow guifg=Black guibg=Yellow
-  hi MoreMsg      term=bold cterm=bold ctermfg=Green gui=bold guifg=SeaGreen
-  hi ModeMsg      term=bold cterm=bold gui=bold
-  hi LineNr       term=underline cterm=bold ctermfg=Yellow guifg=Yellow
-  hi Question     term=standout cterm=bold ctermfg=Green gui=bold guifg=Green
-  hi StatusLine   term=bold,reverse cterm=bold,reverse gui=bold,reverse
-  hi StatusLineNC term=reverse cterm=reverse gui=reverse
-  hi VertSplit    term=reverse cterm=reverse gui=reverse
-  hi Title        term=bold cterm=bold ctermfg=Magenta gui=bold guifg=Magenta
-  hi Visual       term=reverse cterm=reverse gui=reverse guifg=Grey guibg=Black
-  hi VisualNOS    term=bold,underline cterm=bold,underline gui=bold,underline
-  hi WarningMsg   term=standout cterm=bold ctermfg=Red guifg=Red
-  hi WildMenu     term=standout ctermfg=Black ctermbg=Yellow guifg=Black guibg=Yellow
-  hi Folded       term=standout cterm=bold ctermfg=Cyan ctermbg=DarkGrey guifg=Cyan guibg=DarkGrey
-  hi FoldColumn   term=standout cterm=bold ctermfg=Cyan ctermbg=Grey guifg=Cyan guibg=Grey
-  hi DiffAdd      term=bold ctermbg=DarkBlue guibg=DarkBlue
-  hi DiffChange   term=bold ctermbg=DarkMagenta guibg=DarkMagenta
-  hi DiffDelete   term=bold cterm=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
-  hi DiffText     term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-  hi SignColumn   term=standout cterm=bold ctermfg=Cyan ctermbg=Grey guifg=Cyan guibg=Grey
-  hi Cursor       guifg=bg guibg=fg
-  hi lCursor      guifg=bg guibg=fg
-  hi Comment      term=bold cterm=bold ctermfg=Cyan guifg=#b0b0b0
-  hi Constant     term=underline cterm=bold ctermfg=Magenta guifg=#f0d0d0
-  hi Special      term=bold cterm=bold ctermfg=Red guifg=#f0d0f0
-  hi Identifier   term=underline cterm=bold ctermfg=Cyan guifg=#d0e8e8
-  hi Statement    term=bold cterm=bold ctermfg=Yellow gui=none guifg=#e8e8c0
-  hi PreProc      term=underline cterm=bold ctermfg=Blue guifg=#f0d8f0
-  hi Type         term=underline cterm=bold ctermfg=Green gui=none guifg=#d0e8d0
-  hi Underlined   term=underline cterm=bold,underline ctermfg=Blue gui=underline guifg=#d8e0e8
-  hi Ignore       ctermfg=0 guifg=bg
-  hi Error        term=reverse cterm=bold ctermfg=White ctermbg=Red guifg=White guibg=Red
-  hi Todo         term=standout ctermfg=Blue ctermbg=Yellow guifg=Blue guibg=Yellow
-endif
diff --git a/colors/dusk.vim b/colors/dusk.vim
deleted file mode 100755
index 8feddd7..0000000
--- a/colors/dusk.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file
-" Maintainer:	Ajit J. Thakkar (ajit AT unb DOT ca)
-" Last Change:	2005 Nov. 21
-" Version:	1.1
-" URL:		http://www.unb.ca/chem/ajit/vim.htm
-
-" This GUI-only color scheme has a blue-black background
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "dusk"
-
-hi Normal	guifg=ivory guibg=#1f3048
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg	gui=NONE guifg=Red guibg=Linen
-hi IncSearch	gui=NONE guibg=LightGreen guifg=Black
-hi ModeMsg	gui=NONE guifg=fg guibg=bg
-hi StatusLine	gui=NONE guifg=DarkBlue guibg=Grey
-hi StatusLineNC	gui=NONE guifg=Grey50 guibg=Grey
-hi VertSplit	gui=NONE guifg=Grey guibg=Grey
-hi Visual	gui=reverse guifg=fg guibg=LightSkyBlue4
-hi VisualNOS	gui=underline guifg=fg guibg=bg
-hi DiffText	gui=NONE guifg=Yellow guibg=LightSkyBlue4
-hi Cursor	guibg=Green guifg=Black
-hi lCursor	guibg=Cyan guifg=Black
-hi Directory	guifg=LightGreen guibg=bg
-hi LineNr	guifg=MistyRose3 guibg=bg
-hi MoreMsg	gui=NONE guifg=SeaGreen guibg=bg
-hi NonText	gui=NONE guifg=Cyan4 guibg=#102848
-hi Question	gui=NONE guifg=LimeGreen guibg=bg
-hi Search	gui=NONE guifg=SkyBlue4 guibg=Bisque
-hi SpecialKey	guifg=Cyan guibg=bg
-hi Title	gui=NONE guifg=Yellow2 guibg=bg
-hi WarningMsg	guifg=Tomato3 guibg=Linen
-hi WildMenu	gui=NONE guifg=SkyBlue4 guibg=Bisque
-"hi Folded	guifg=MistyRose2 guibg=bg
-hi Folded	guifg=MistyRose2 guibg=#102848
-hi FoldColumn	guifg=DarkBlue guibg=Grey
-hi DiffAdd	gui=NONE guifg=Blue guibg=LightCyan
-hi DiffChange	gui=NONE guifg=white guibg=LightCyan4
-hi DiffDelete	gui=NONE guifg=LightBlue guibg=LightCyan
-
-" Colors for syntax highlighting
-hi Constant	gui=NONE guifg=MistyRose3 guibg=bg
-hi String	gui=NONE guifg=LightBlue3 guibg=bg
-hi Special	gui=NONE guifg=GoldenRod guibg=bg
-hi Statement	gui=NONE guifg=khaki guibg=bg
-"hi Statement	gui=NONE guifg=#d7cd7b guibg=bg
-hi Operator	gui=NONE guifg=Chartreuse guibg=bg
-hi Ignore	gui=NONE guifg=bg guibg=bg
-if v:version >= 700
-  hi SpellBad	gui=undercurl guisp=Red guifg=fg guibg=bg
-  hi SpellCap	gui=undercurl guisp=GoldenRod guifg=fg guibg=bg
-  hi SpellRare	gui=undercurl guisp=Ivory guifg=fg guibg=bg
-  hi SpellLocal	gui=undercurl guisp=SeaGreen guifg=fg guibg=bg
-endif
-hi ToDo		gui=NONE guifg=DodgerBlue guibg=bg
-hi Error	gui=NONE guifg=Red guibg=Linen
-hi Comment	gui=NONE guifg=SlateGrey guibg=bg
-"hi Comment	gui=NONE guifg=Lavender guibg=bg
-hi Identifier	gui=NONE guifg=BlanchedAlmond guibg=bg
-hi PreProc	gui=NONE guifg=#ffa0a0 guibg=bg
-hi Type		gui=NONE guifg=NavajoWhite guibg=bg
-hi Underlined	gui=underline guifg=fg guibg=bg
-
-" vim: sw=2
diff --git a/colors/earendel.vim b/colors/earendel.vim
deleted file mode 100755
index 06a9d0a..0000000
--- a/colors/earendel.vim
+++ /dev/null
@@ -1,161 +0,0 @@
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "earendel"
-
-execute "command! -nargs=1 Colo set background=<args>"
-
-if &background == "light"
-    hi Normal ctermbg=15 ctermfg=0 guibg=#f7f7f7 guifg=#000000 gui=none
-
-    hi ColorColumn ctermbg=7 ctermfg=fg guibg=#d5d5d5 gui=none
-    hi Cursor guibg=#000000 guifg=#ffffff gui=none
-    hi CursorColumn ctermbg=7 ctermfg=fg guibg=#e0e0e0 gui=none
-    hi CursorLine ctermbg=7 ctermfg=fg guibg=#e0e0e0 gui=none
-    hi DiffAdd guibg=#bae981 guifg=fg gui=none
-    hi DiffChange guibg=#8495e6 guifg=fg gui=none
-    hi DiffDelete guibg=#ff95a5 guifg=fg gui=none
-    hi DiffText guibg=#b9c2f0 guifg=fg gui=bold
-    hi Directory guibg=bg guifg=#272fc2 gui=none
-    hi ErrorMsg guibg=#ca001f guifg=#ffffff gui=bold
-    hi FoldColumn ctermbg=bg guibg=bg guifg=#656565 gui=none
-    hi Folded guibg=#cacaca guifg=#324263 gui=bold
-    hi IncSearch guibg=#f7b69d gui=none
-    hi LineNr guibg=bg guifg=#656565 gui=none
-    hi ModeMsg ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold
-    hi MoreMsg guibg=bg guifg=#4a4a4a gui=bold
-    hi NonText ctermfg=8 guibg=bg guifg=#656565 gui=bold
-    hi Pmenu guibg=#aab8d5 guifg=fg gui=none
-    hi PmenuSbar guibg=#6a83b5 guifg=fg gui=none
-    hi PmenuSel guibg=#fee06b guifg=fg gui=none
-    hi PmenuThumb guibg=#c7cfe2 guifg=fg gui=none
-    hi Question guibg=bg guifg=#4a4a4a gui=bold
-    hi Search guibg=#fee481 gui=none
-    hi SignColumn ctermbg=bg guibg=bg guifg=#656565 gui=none
-    hi SpecialKey guibg=bg guifg=#844631 gui=none
-    hi StatusLine ctermbg=0 ctermfg=15 guibg=#96aad3 guifg=fg gui=bold
-    hi StatusLineNC ctermbg=7 ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none
-    if has("spell")
-        hi SpellBad guisp=#ca001f gui=undercurl
-        hi SpellCap guisp=#272fc2 gui=undercurl
-        hi SpellLocal guisp=#0f8674 gui=undercurl
-        hi SpellRare guisp=#d16c7a gui=undercurl
-    endif
-    hi TabLine guibg=#d4d4d4 guifg=fg gui=underline
-    hi TabLineFill guibg=#d4d4d4 guifg=fg gui=underline
-    hi TabLineSel guibg=bg guifg=fg gui=bold
-    hi Title guifg=fg gui=bold
-    hi VertSplit ctermbg=7 ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none
-    if version >= 700
-        hi Visual ctermbg=7 ctermfg=fg guibg=#bfbfbf gui=none
-    else
-        hi Visual ctermbg=7 ctermfg=fg guibg=#bfbfbf guifg=fg gui=none
-    endif    
-    hi VisualNOS ctermbg=8 ctermfg=fg guibg=bg guifg=#324263 gui=bold,underline
-    hi WarningMsg guibg=bg guifg=#ca001f gui=bold
-    hi WildMenu guibg=#fedc56 guifg=fg gui=bold
-
-    hi Comment guibg=bg guifg=#558817 gui=none
-    hi Constant guibg=bg guifg=#a8660d gui=none
-    hi Error guibg=bg guifg=#bf001d gui=none
-    hi Identifier guibg=bg guifg=#0e7c6b gui=none
-    hi Ignore guibg=bg guifg=bg gui=none
-    hi lCursor guibg=#79bf21 guifg=#ffffff gui=none
-    hi MatchParen guibg=#0f8674 guifg=#ffffff gui=none
-    hi PreProc guibg=bg guifg=#a33243 gui=none
-    hi Special guibg=bg guifg=#844631 gui=none
-    hi Statement guibg=bg guifg=#2239a8 gui=bold
-    hi Todo guibg=#fedc56 guifg=#512b1e gui=bold
-    hi Type guibg=bg guifg=#1d318d gui=bold
-    hi Underlined ctermbg=bg ctermfg=fg guibg=bg guifg=#272fc2 gui=underline
-
-    hi htmlBold ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=underline,italic
-else
-    hi Normal ctermbg=0 ctermfg=7 guibg=#181818 guifg=#cacaca gui=none
-
-    hi ColorColumn ctermbg=8 ctermfg=15 guibg=#4a4a4a gui=none
-    hi Cursor guibg=#e5e5e5 guifg=#000000 gui=none
-    hi CursorColumn ctermbg=8 ctermfg=15 guibg=#404040 gui=none
-    hi CursorLine ctermbg=8 ctermfg=15 guibg=#404040 gui=none
-    hi DiffAdd guibg=#558817 guifg=#dadada gui=none
-    hi DiffChange guibg=#1b2e85 guifg=#dadada gui=none
-    hi DiffDelete guibg=#9f0018 guifg=#dadada gui=none
-    hi DiffText guibg=#2540ba guifg=#dadada gui=bold
-    hi Directory guibg=bg guifg=#8c91e8 gui=none
-    hi ErrorMsg guibg=#ca001f guifg=#e5e5e5 gui=bold
-    hi FoldColumn ctermbg=bg guibg=bg guifg=#9a9a9a gui=none
-    hi Folded guibg=#555555 guifg=#bfcadf gui=bold
-    hi IncSearch guibg=#a7380e guifg=#dadada gui=none
-    hi LineNr guibg=bg guifg=#9a9a9a gui=none
-    hi ModeMsg ctermbg=bg ctermfg=fg guibg=bg guifg=fg gui=bold
-    hi MoreMsg guibg=bg guifg=#b5b5b5 gui=bold
-    hi NonText ctermfg=8 guibg=bg guifg=#9a9a9a gui=bold
-    hi Pmenu guibg=#3d5078 guifg=#dadada gui=none
-    hi PmenuSbar guibg=#324263 guifg=#dadada gui=none
-    hi PmenuSel guibg=#f3c201 guifg=#000000 gui=none
-    hi PmenuThumb guibg=#5c77ad guifg=#dadada gui=none
-    hi Question guibg=bg guifg=#b5b5b5 gui=bold
-    hi Search guibg=#947601 guifg=#dadada gui=none
-    hi SignColumn ctermbg=bg guibg=bg guifg=#9a9a9a gui=none
-    hi SpecialKey guibg=bg guifg=#d3a901 gui=none
-    hi StatusLine ctermbg=7 ctermfg=0 guibg=#41609e guifg=#e5e5e5 gui=bold
-    hi StatusLineNC ctermbg=7 ctermfg=0 guibg=#35466a guifg=#afbacf gui=none
-    if has("spell")
-        hi SpellBad guisp=#ea0023 gui=undercurl
-        hi SpellCap guisp=#8c91e8 gui=undercurl
-        hi SpellLocal guisp=#16c9ae gui=undercurl
-        hi SpellRare guisp=#e09ea8 gui=undercurl
-    endif
-    hi TabLine guibg=#4a4a4a guifg=#e5e5e5 gui=underline
-    hi TabLineFill guibg=#4a4a4a guifg=#e5e5e5 gui=underline
-    hi TabLineSel guibg=bg guifg=#e5e5e5 gui=bold
-    hi Title ctermbg=bg ctermfg=15 guifg=#e5e5e5 gui=bold
-    hi VertSplit ctermbg=7 ctermfg=0 guibg=#35466a guifg=#afbacf gui=none
-    if version >= 700
-        hi Visual ctermbg=7 ctermfg=0 guibg=#606060 gui=none
-    else
-        hi Visual ctermbg=7 ctermfg=0 guibg=#606060 guifg=fg gui=none
-    endif    
-    hi VisualNOS ctermbg=8 ctermfg=0 guibg=bg guifg=#bfcadf gui=bold,underline
-    hi WarningMsg guibg=bg guifg=#ea0023 gui=bold
-    hi WildMenu guibg=#fbca01 guifg=#000000 gui=bold
-
-    hi Comment guibg=bg guifg=#77be21 gui=none
-    hi Constant guibg=bg guifg=#dc8511 gui=none
-    hi Error guibg=bg guifg=#ea0023 gui=none
-    hi Identifier guibg=bg guifg=#16c9ae gui=none
-    hi Ignore guibg=bg guifg=bg gui=none
-    hi lCursor guibg=#c4ec93 guifg=#000000 gui=none
-    hi MatchParen guibg=#17d2b7 guifg=#000000 gui=none
-    hi PreProc guibg=bg guifg=#e09ea8 gui=none
-    hi Special guibg=bg guifg=#d3a901 gui=none
-    hi Statement guibg=bg guifg=#a7b4ed gui=bold
-    hi Todo guibg=#fedc56 guifg=#512b1e gui=bold
-    hi Type guibg=bg guifg=#95a4ea gui=bold
-    hi Underlined ctermbg=bg ctermfg=15 guibg=bg guifg=#8c91e8 gui=underline
-
-    hi htmlBold ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=bg ctermfg=15 guibg=bg guifg=fg gui=underline,italic
-endif
-
-hi! default link bbcodeBold htmlBold
-hi! default link bbcodeBoldItalic htmlBoldItalic
-hi! default link bbcodeBoldItalicUnderline htmlBoldUnderlineItalic
-hi! default link bbcodeBoldUnderline htmlBoldUnderline
-hi! default link bbcodeItalic htmlItalic
-hi! default link bbcodeItalicUnderline htmlUnderlineItalic
-hi! default link bbcodeUnderline htmlUnderline
diff --git a/colors/earth.vim b/colors/earth.vim
deleted file mode 100755
index 306529b..0000000
--- a/colors/earth.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-"  Maintainer: Shrinath
-" Last Change: 2004/09/13 Mon 12:50.
-"     version: 0.2
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "earth"
-
-hi Normal       guifg=#000000 guibg=#99CC99
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#60ffff guibg=#6060ff
-hi Search       gui=NONE guifg=#ffffff guibg=#6060ff
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi WarningMsg   gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi ModeMsg      gui=NONE guifg=#60ffff guibg=NONE
-hi MoreMsg      gui=NONE guifg=#ffc0ff guibg=NONE
-hi Question     gui=NONE guifg=#ffff60 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#d0d0e0
-hi StatusLineNC gui=NONE guifg=#606080 guibg=#d0d0e0
-hi VertSplit    gui=NONE guifg=#606080 guibg=#d0d0e0
-hi WildMenu     gui=NONE guifg=#000000 guibg=#00c8f0
-
-" Diff
-hi DiffText     gui=UNDERLINE guifg=#ffff00 guibg=#000000
-hi DiffChange   gui=NONE guifg=#ffffff guibg=#000000
-hi DiffDelete   gui=NONE guifg=#60ff60 guibg=#000000
-hi DiffAdd      gui=NONE guifg=#60ff60 guibg=#000000
-
-" Cursor
-hi Cursor       gui=NONE guifg=#ffffff guibg=#d86020
-hi lCursor      gui=NONE guifg=#ffffff guibg=#e000b0
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#e000b0
-
-" Fold
-hi Folded       gui=NONE guifg=#ffffff guibg=#0088c0
-" hi Folded       gui=NONE guifg=#ffffff guibg=#2080d0
-hi FoldColumn   gui=NONE guifg=#60e0e0 guibg=#006c7f
-
-" Other
-hi Directory    gui=NONE guifg=#00e0ff guibg=NONE
-hi LineNr       gui=BOLD guifg=#669966 guibg=NONE
-hi NonText      gui=BOLD guifg=#00c0c0 guibg=#9999CC
-hi SpecialKey   gui=NONE guifg=#e0a0ff guibg=NONE
-hi Title        gui=BOLD guifg=#003300 guibg=NONE
-hi Visual       gui=NONE guifg=#000000 guibg=#6060d0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#996666 guibg=NONE
-hi Constant     gui=NONE guifg=#990066 guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff40a0
-hi Identifier   gui=NONE guifg=#669966 guibg=NONE
-hi Ignore       gui=NONE guifg=#993300 guibg=NONE
-hi PreProc      gui=NONE guifg=#009900 guibg=NONE
-hi Special      gui=NONE guifg=#FF0000 guibg=NONE
-hi Statement    gui=NONE guifg=#CC9900 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#993300 guibg=NONE
-hi Type         gui=NONE guifg=#993300 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=#663300 guibg=NONE
-
diff --git a/colors/earthburn.vim b/colors/earthburn.vim
deleted file mode 100755
index e788c44..0000000
--- a/colors/earthburn.vim
+++ /dev/null
@@ -1,201 +0,0 @@
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "earthburn"
-
-if version >= 700
-  " NERDTree current 
-  hi CursorLine guibg=#BFB7AD gui=none
-  "hi CursorColumn guibg=#e4e2e0
-  hi MatchParen guibg=black guifg=white gui=none
-
-  hi TabLineFill guifg=#BFB39C guibg=#BFB39C
-  hi TabLine guifg=gray40 guibg=#BFB39C gui=none
-  hi TabLineSel guifg=gray90 guibg=#AB9876 gui=none
-
-  "P-Menu (auto-completion)
-  hi Pmenu guifg=white guibg=#a4a2a0
-  "PmenuSel
-  "PmenuSbar
-  "PmenuThumb
-endif
-
-"hi Normal    guifg=gray30   guibg=#e0dcd9
-"hi Normal    guifg=gray30   guibg=#d0ccc9
-hi Normal    guifg=gray30   guibg=#d8d4d4
-
-hi ModeMsg guifg=gray10 guibg=#B3C71E gui=none
-hi MoreMsg guifg=gray10 guibg=#B3C71E gui=none
-hi Question guifg=gray10 guibg=#B3C71E gui=none
-hi WarningMsg guifg=#600000  gui=none guibg=#d8d4d4
-
-" Html-Titles
-hi Title      guifg=gray30 gui=none 
-
-hi Underlined  guifg=gray30 gui=underline
-hi Cursor    guifg=white   guibg=#888480
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#B0B1A1
-hi StatusLine guifg=gray90 guibg=#888480 gui=none
-
-" not current status line 
-hi StatusLineNC guifg=gray40 guibg=#ABA7A4 gui=none
-
-hi VertSplit guifg=#ABA7A4 guibg=#ABA7A4 gui=NONE
-
-" unused areas marked with ~
-hi NonText gui=none guifg=#d8d4d4
-
-hi Comment   guifg=#8A9184 gui=italic
-hi Comment   guifg=#8A919c gui=italic
-
-" ruby: symbols
-hi Constant  guifg=#75722F
-hi String    guifg=#8D9902
-hi link Character String
-hi link Number Constant
-hi link Float Number
-
-" ruby: debug, mixin, scope, throw, python: def
-hi Statement guifg=#605118 gui=none
-hi Keyword guifg=#605118 gui=none
-
-" ruby: interpolation
-hi Operator gui=none
-
-" HTML: arguments
-" Ruby: classname
-hi Type  gui=none guifg=#907800
-
-" Python: Standard exceptions, True&False
-""hi Structure  guifg=Sienna gui=bold,underline
-
-" Ruby: method definitions and calls
-hi Identifier guifg=#685616 gui=none
-""hi Function   guifg=#685616
-
-hi Directory   guifg=#907800
-
-hi Repeat      guifg=#480000 gui=none
-
-" Ruby: if..else..end
-hi Conditional guifg=#730000
-
-" Ruby: require
-hi PreProc    guifg=#64634B gui=none
-
-hi Folded guifg=#64634B guibg=#c8c4c0 gui=none
-
-" Ruby: def..end, class..end
-""hi Define guifg=#685616
-
-" used by help tags * |
-hi Ignore guifg=#A8A890
-
-hi Error guifg=#a02000 guibg=white gui=underline
-
-hi Todo guifg=#6A7164 guibg=NONE gui=underline
-
-hi Search guibg=#F0D890 ""C0D878""FFE9A8
-
-" Python: %(...)s - constructs, encoding, D: \n etc
-" Ruby: ""
-hi Special guifg=#808000 gui=none
-
-" color of <TAB>s etc...  , NERDTRee
-hi SpecialKey guifg=gray60 gui=italic
-
-
-" visual selection higlight
-hi Visual guibg=#A8E4FF
-hi Visual guibg=#F0F0C0
-
-" string interpolation
-hi Delimiter guifg=#6B6A17
-
-" Diff
-hi DiffChange guifg=NONE guibg=#e4e2e0 gui=italic
-hi DiffText guifg=NONE guibg=#f0e0a0 gui=none
-hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=bold
-hi DiffDelete guifg=NONE guibg=#f0a0a0 gui=italic,bold
-
-hi link rubyBoolean Boolean
-hi link rubyComment Comment
-hi link rubyString String
-hi link rubyStringDelimiter String
-
-hi htmlTag guifg=#755C3B gui=none
-hi link htmlEndTag htmlTag
-hi link htmlTagName htmlTag
-
-hi link hamlHtmlTag htmlTagName
-hi link hamlPreDef hamlHtmlTag
-hi link hmlHtmlTagEndl hamlHtmlTag
-
-" hi rubyASCIICode
-hi rubyAccess guifg=#939264
-"hi rubyAttribute guifg=red gui=underline
-"hi rubyBlock                   gui=underline
-"hi rubyBlockArgument gui=underline
-"hi rubyBlockParameter guifg=gray20
-hi link rubyClass Type
-
-""hi rubyClassVariable           gui=none        guifg=#556B2F     guibg=white
-""hi rubyConstant                gui=none        guifg=#DC143C     guibg=white
-
-" do..end begin rescue end
-hi link rubyControl Repeat
-
-"for somre reason begin end in erb is tied to this color instead of Conditional and Control
-hi link rubyBeginEnd Repeat 
-
-"hi rubyCurlyBlock guifg=#9C420C
-"hi rubyData                    gui=            guifg=            guibg=
-"hi rubyDataDirective           gui=            guifg=            guibg=
-hi link rubyDefine Function
-"hi rubyDelimEscape
-"hi rubyDoBlock guifg=SlateBlue guibg=red
-"hi rubyDocumentation           gui=            guifg=            guibg=
-"hi rubyError
-"hi rubyEscape
-"hi rubyEval
-hi rubyException               guifg=#8C4D38
-"hi rubyExprSubst               gui=underline        guifg=#FF4500
-"hi rubyFloat
-""hi rubyFunction                gui=none        guifg=#685616
-"hi rubyGlobalVariable          gui=none            guifg=cyan
-hi link rubyHeredocStart Comment
-hi link rubyHeredocEnd Comment
-"hi rubyIdentifier              gui=underline
-"hi rubyInclude                 gui=            guifg=            guibg=
-"hi rubyInstanceVariable        gui=none            guifg=gray20
-"hi rubyInteger
-"hi rubyInterpolation guifg=Orange
-"hi rubyIterator                gui=underline        guifg=black
-hi link rubyKeyword Normal
-" hi rubyKeywordAsMethod
-""hi rubyLocalVariableOrMethod gui=underline guifg=cyan
-hi link rubyModule Type
-"hi rubyNestedAngleBrackets
-"hi rubyNestedCurlyBraces gui=underline
-"hi rubyNestedParentheses
-"hi rubyNestedSquareBrackets
-"hi rubyNoDoBlock
-"hi rubyNoInterpolation
-"hi rubyNumber                  gui=            guifg=            guibg=
-hi link rubyOperator Normal
-"hi rubyOptDoBlock gui=underline
-"hi rubyOptDoLine
-hi rubyPredefinedConstant      guifg=gray40
-hi rubyPredefinedIdentifier    guifg=gray40
-hi rubyPredefinedVariable      guifg=gray40
-"hi rubyPseudoVariable
-"hi rubySharpBang               gui=            guifg=            guibg=
-"hi rubySpaceError
-""hi rubySymbol                  gui=none        guifg=#9E9C096A6C19
-
-"hi rubyTodo                    gui=            guifg=            guibg=
diff --git a/colors/eclipse.vim b/colors/eclipse.vim
deleted file mode 100755
index 0d7d36a..0000000
--- a/colors/eclipse.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-" Vim color file
-" Maintainer:	Juan frias <juandfrias at gmail dot com>
-" Last Change:	2007 Feb 25
-" Version:	1.0.1
-" URL:		http://www.axisym3.net/jdany/vim-the-editor/#eclipse
-set background=light
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "eclipse"
-
-highlight Normal gui=none guifg=#000000 guibg=#ffffff ctermfg=Gray
-
-" Search
-highlight IncSearch gui=underline guifg=#404040 guibg=#e0e040
-highlight Search    gui=none      guifg=#544060 guibg=#f0c0ff ctermbg=1
-
-" Messages
-highlight ErrorMsg   gui=none guifg=#f8f8f8 guibg=#4040ff
-highlight WarningMsg gui=none guifg=#f8f8f8 guibg=#4040ff
-highlight ModeMsg    gui=none guifg=#d06000 guibg=bg
-highlight MoreMsg    gui=none guifg=#0090a0 guibg=bg
-highlight Question   gui=none guifg=#8000ff guibg=bg
-
-" Split area
-highlight StatusLine   gui=none guifg=#ffffff guibg=#4570aa cterm=bold       ctermbg=blue     ctermfg=white
-highlight StatusLineNC gui=none guifg=#ffffff guibg=#75a0da cterm=none       ctermfg=darkgrey ctermbg=blue
-highlight VertSplit    gui=none guifg=#f8f8f8 guibg=#904838 ctermfg=darkgrey cterm=none       ctermbg=blue
-highlight WildMenu     gui=none guifg=#f8f8f8 guibg=#ff3030
-
-" Diff
-highlight DiffText   gui=none guifg=red   guibg=#ffd0d0 cterm=bold    ctermbg=5  ctermfg=3
-highlight DiffChange gui=none guifg=black guibg=#ffe7e7 cterm=none    ctermbg=5  ctermfg=7
-highlight DiffDelete gui=none guifg=bg    guibg=#e7e7ff ctermbg=black
-highlight DiffAdd    gui=none guifg=blue  guibg=#e7e7ff ctermbg=green cterm=bold
-
-" Cursor
-highlight Cursor   gui=none guifg=#ffffff guibg=#0080f0
-highlight lCursor  gui=none guifg=#ffffff guibg=#8040ff
-highlight CursorIM gui=none guifg=#ffffff guibg=#8040ff
-
-" Fold
-highlight Folded     gui=none guifg=#804030 guibg=#fff0d0 ctermbg=black ctermfg=black cterm=bold
-highlight FoldColumn gui=none guifg=#6b6b6b guibg=#e7e7e7 ctermfg=black ctermbg=white
-
-" Popup Menu
-highlight PMenu      ctermbg=green ctermfg=white
-highlight PMenuSel   ctermbg=white ctermfg=black
-highlight PMenuSBar  ctermbg=red   ctermfg=white
-highlight PMenuThumb ctermbg=white ctermfg=red
-
-" Other
-highlight Directory  gui=none guifg=#7050ff guibg=bg
-highlight LineNr     gui=none guifg=#6b6b6b guibg=#eeeeee
-highlight NonText    gui=none guifg=#707070 guibg=#e7e7e7
-highlight SpecialKey gui=none guifg=#c0c0c0 guibg=bg      cterm=none       ctermfg=4
-highlight Title      gui=bold guifg=#0033cc guibg=bg
-highlight Visual     gui=none guifg=#804020 guibg=#ffc0a0 ctermfg=DarkCyan
-
-" Syntax group
-highlight Comment    gui=none guifg=#236e25 guibg=bg      ctermfg=2
-highlight Constant   gui=none guifg=#00884c guibg=bg      ctermfg=White
-highlight Error      gui=none guifg=#f8f8f8 guibg=#4040ff term=reverse        ctermbg=Red    ctermfg=White
-highlight Identifier gui=none guifg=#b07800 guibg=bg      ctermfg=Green
-highlight Ignore     gui=none guifg=bg      guibg=bg      ctermfg=black
-highlight PreProc    gui=none guifg=#683821 guibg=bg      ctermfg=Green
-highlight Special    gui=none guifg=#8040f0 guibg=bg      ctermfg=DarkMagenta
-highlight Statement  gui=none guifg=#b64f90 guibg=bg      ctermfg=White
-highlight Todo       gui=none guifg=#ff5050 guibg=white   term=standout       ctermbg=Yellow ctermfg=Black
-highlight Type       gui=bold guifg=#7f0055 guibg=bg      ctermfg=LightGreen
-highlight Underlined gui=none guifg=blue    guibg=bg
-highlight String     gui=none guifg=#8010a0 guibg=bg      ctermfg=Yellow
-highlight Number     gui=none guifg=#0000ff guibg=bg      ctermfg=White
-
-if !has("gui_running")
-    hi link Float          Number
-    hi link Conditional    Repeat
-    hi link Include        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      Normal
-    hi link SpecialComment Special
-    hi link Debug          Special
-endif
-
-" vim:ff=unix:
diff --git a/colors/eclm_wombat.vim b/colors/eclm_wombat.vim
deleted file mode 100755
index d84225d..0000000
--- a/colors/eclm_wombat.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" Maintainer:  Alex Duller alexduller@gmail.com
-" Last Change:  December 16 2008
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "eclm_wombat"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine     guibg=#2d2d2d
-  hi CursorColumn   guibg=#2d2d2d
-  hi MatchParen     guifg=#f6f3e8 guibg=NONE gui=bold
-  hi Pmenu          guifg=#f6f3e8 guibg=#444444
-  hi PmenuSel       guifg=#000000 guibg=#cae682
-endif
-
-" General colors
-hi Cursor           guifg=#000000 gui=none
-hi Normal           guifg=#e6e1de guibg=#2b2b2b gui=none
-hi NonText          guifg=#808080 guibg=#303030 gui=none
-hi LineNr           guifg=#857b6f guibg=#000000 gui=none
-hi StatusLine       guifg=#f6f3e8 guibg=#444444 gui=italic
-hi StatusLineNC     guifg=#857b6f guibg=#444444 gui=none
-hi VertSplit        guifg=#444444 guibg=#444444 gui=none
-hi Folded           guibg=#384048 guifg=#a0a8b0 gui=none
-hi Title            guifg=#f6f3e8 guibg=NONE    gui=bold
-hi Visual           guifg=#f6f3e8 guibg=#1d1d1d gui=none
-hi SpecialKey       guifg=#808080 guibg=#343434 gui=none
-hi Error            guifg=#c41df5 guibg=#232323 gui=none
-
-" Syntax highlighting
-hi Comment          guifg=#99968b gui=italic
-hi Todo             guifg=#8f8f8f gui=italic
-hi Constant         guifg=#6e9cbe gui=none
-hi String           guifg=#cae682 gui=italic
-hi Identifier       guifg=#c9ceff gui=none
-hi Function         guifg=#ff00ac guibg=#1d1d1d gui=none
-hi Type             guifg=#ffffff gui=bold
-hi Statement        guifg=#92a1ea gui=none
-hi Keyword          guifg=#69a1ff gui=none
-hi PreProc          guifg=#8ac6f2 gui=none
-hi Number           guifg=#99968b gui=none
-hi Special          guifg=#e7f6da gui=none
-
-" Rail specific
-hi link RubyStringDemiliter String
-
-hi link htmlTag                     Identifier
-hi link htmlTagName                 htmlTag
-hi link htmlEndTag                  htmlTag
diff --git a/colors/edo_sea.vim b/colors/edo_sea.vim
deleted file mode 100755
index f03300a..0000000
--- a/colors/edo_sea.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/30 Wed 00:01.
-"     version: 1.0
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "Edo_sea"
-
-hi Normal       guifg=#f0f0f8 guibg=#303060
-
-" Search
-hi IncSearch    gui=UNDERLINE,BOLD guifg=#f0f0f0 guibg=#c030f0
-hi Search       gui=BOLD guifg=#f0e0f0 guibg=#b020f0
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#f0f0f0 guibg=#f000a0
-hi WarningMsg   gui=BOLD guifg=#f0f0f0 guibg=#f000a0
-hi ModeMsg      gui=BOLD guifg=#00e0f0 guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#00f0f0 guibg=#6060f0
-hi Question     gui=BOLD guifg=#00f0d0 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#d0d0e0
-hi StatusLineNC gui=NONE guifg=#606080 guibg=#d0d0e0
-hi VertSplit    gui=NONE guifg=#606080 guibg=#d0d0e0
-hi WildMenu     gui=NONE guifg=#000000 guibg=#f090f0
-
-" Diff
-hi DiffText     gui=UNDERLINE guifg=#f0f000 guibg=#000000
-hi DiffChange   gui=NONE guifg=#f0f0f0 guibg=#000000
-hi DiffDelete   gui=NONE guifg=#60f060 guibg=#000000
-hi DiffAdd      gui=NONE guifg=#60f060 guibg=#000000
-
-" Cursor
-hi Cursor       gui=NONE guifg=#f0f0f0 guibg=#d86020
-hi lCursor      gui=NONE guifg=#f0f0f0 guibg=#e000b0
-hi CursorIM     gui=NONE guifg=#f0f0f0 guibg=#e000b0
-
-" Fold
-hi Folded       gui=NONE guifg=#f0f0f0 guibg=#0080a0
-hi FoldColumn   gui=NONE guifg=#9090f0 guibg=#3c3c88
-
-" Other
-hi Directory    gui=NONE guifg=#00f0f0 guibg=NONE
-hi LineNr       gui=NONE guifg=#7070e8 guibg=NONE
-hi NonText      gui=BOLD guifg=#8080f0 guibg=NONE
-hi SpecialKey   gui=BOLD guifg=#60c0f0 guibg=NONE
-hi Title        gui=BOLD guifg=#f0f0f8 guibg=NONE
-hi Visual       gui=NONE guifg=#f0f0f0 guibg=#6060f0
-" hi VisualNOS  gui=NONE guifg=#f0f0f0 guibg=#6060f0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#b0b0b8 guibg=#343478
-hi Constant     gui=NONE guifg=#50f0d0 guibg=NONE
-hi Error        gui=NONE guifg=#f0f0f0 guibg=#c03030
-hi Identifier   gui=NONE guifg=#d0c0f0 guibg=NONE
-hi Ignore       gui=NONE guifg=#303070 guibg=NONE
-hi PreProc      gui=NONE guifg=#f0b0f0 guibg=NONE
-hi Special      gui=NONE guifg=#d0f050 guibg=NONE
-hi Statement    gui=NONE guifg=#f0d050 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#f070e0 guibg=NONE
-hi Type         gui=NONE guifg=#40f080 guibg=NONE
-hi Underlined   gui=UNDERLINE,BOLD guifg=#f0f0f8 guibg=NONE
diff --git a/colors/ego.vim b/colors/ego.vim
deleted file mode 100755
index df0c3d7..0000000
--- a/colors/ego.vim
+++ /dev/null
@@ -1,153 +0,0 @@
-" Vim color file
-" Maintainer: Robby Colvin
-" Last Change: 2010-04-30
-" Version: 0.1
-" based on 'ego' theme for Xcode:
-" http://developers.enormego.com/view/xcode_ego_theme
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "ego"
-
-" GUI Colors
-hi Cursor               gui=NONE guibg=#8DA1A1 guifg=#ffffff
-hi CursorIM             gui=bold guifg=#ffffff guibg=#8DA1A1
-hi CursorLine           gui=NONE guibg=#3D4646
-hi CursorColumn         gui=NONE guibg=#3D4646
-hi Directory            gui=NONE guifg=red guibg=bg
-hi DiffAdd              gui=NONE guifg=fg guibg=DarkCyan
-hi DiffChange           gui=NONE guifg=fg guibg=Green4
-hi DiffDelete           gui=NONE guifg=fg guibg=black
-hi DiffText             gui=bold guifg=fg guibg=bg
-hi ErrorMsg                      guifg=LightYellow  guibg=FireBrick
-hi VertSplit            gui=NONE guifg=black guibg=grey60
-hi Folded               gui=bold guibg=#305060 guifg=#b0d0e0
-hi FoldColumn           gui=NONE guibg=#305060 guifg=#b0d0e0
-hi IncSearch            gui=reverse guifg=fg guibg=bg
-hi LineNr               guibg=grey6 guifg=#777777
-hi ModeMsg              guibg=DarkGreen guifg=LightGreen
-hi MoreMsg              gui=bold  guifg=SeaGreen4 guibg=bg
-hi NonText              gui=NONE guibg=#000000 guifg=LightSkyBlue
-hi Normal               gui=NONE guibg=#18191F guifg=#F6F6F6
-hi Question             gui=bold  guifg=SeaGreen2 guibg=bg
-hi Search               gui=NONE guibg=LightSkyBlue4 guifg=NONE
-hi SpecialKey           guibg=#103040 guifg=#324262
-hi StatusLine           gui=bold guibg=grey88 guifg=black
-hi StatusLineNC         gui=NONE guibg=grey60 guifg=grey10
-hi Title                gui=bold  guifg=MediumOrchid1 guibg=bg
-hi Visual               gui=reverse guibg=#ffffff guifg=SeaGreen
-hi VisualNOS            gui=bold,underline guifg=fg guibg=bg
-hi WarningMsg           gui=bold guifg=FireBrick1 guibg=bg
-hi WildMenu             gui=bold guibg=Chartreuse guifg=Black
-
-" General Syntax Colors
-
-" Light green
-hi Comment              gui=NONE guifg=#C8F482 guibg=bg
-hi Todo                 gui=bold guifg=#C8F482 guibg=bg
-
-" Green #82c057
-hi Identifier           gui=NONE guifg=#82c057 guibg=bg
-hi Type                 gui=NONE guifg=#82c057 guibg=bg
-
-" Yellow
-hi Statement            gui=NONE guifg=#F6DA7B guibg=bg
-hi Conditional          gui=NONE guifg=#F6DA7B guibg=bg
-hi Operator             gui=NONE guifg=#F6DA7B guibg=bg
-hi Label                gui=NONE guifg=#F6DA7B guibg=bg
-hi Define               gui=NONE guifg=#F6DA7B guibg=bg
-hi Macro                gui=NONE guifg=#F6DA7B guibg=bg
-
-" Rose
-hi String               gui=NONE guifg=#E38081 guibg=bg
-
-" Pink #e29aeb
-
-" Light Purple
-hi Character            gui=NONE guifg=#9d7ff2 guibg=bg
-
-" Dark Purple
-hi Number               gui=NONE guifg=#776CC4 guibg=bg
-hi Float                gui=NONE guifg=#776CC4 guibg=bg
-hi Boolean              gui=bold guifg=#776CC4 guibg=bg
-
-" Light Cyan
-hi Function             gui=NONE guifg=#95D5F1 guibg=bg
-hi StorageClass         gui=NONE guifg=#95D5F1 guibg=bg
-hi Structure            gui=NONE guifg=#95D5F1 guibg=bg
-hi Typedef              gui=NONE guifg=#95D5F1 guibg=bg
-hi Constant             gui=NONE guifg=#95D5F1 guibg=bg
-
-" Dark Blue #9bb2ee
-
-" Dunno color: #55747c
-hi Special              gui=NONE guifg=#55747c guibg=bg
-hi Delimiter            gui=NONE guifg=#55747c guibg=bg
-hi SpecialChar          gui=NONE guifg=#55747c guibg=bg
-hi SpecialComment       gui=NONE guifg=#55747c guibg=bg
-hi Tag                  gui=NONE guifg=#55747c guibg=bg
-hi Debug                gui=NONE guifg=#55747c guibg=bg
-
-" Brown
-hi Repeat               gui=NONE guifg=#C67C48 guibg=bg
-hi PreProc              gui=NONE guifg=#C67C48 guibg=bg
-hi Include              gui=NONE guifg=#C67C48 guibg=bg
-hi PreCondit            gui=NONE guifg=#C67C48 guibg=bg
-hi Keyword              gui=NONE guifg=#C67C48 guibg=bg
-hi Exception            gui=NONE guifg=#C67C48 guibg=bg
-
-" Other
-hi Underlined           gui=underline guifg=honeydew4 guibg=bg
-hi Ignore               guifg=#204050
-hi Error                guifg=LightYellow  guibg=FireBrick
-
-" Ruby-specific
-hi rubySharpBang gui=bold guifg=#e29aeb
-hi rubyRegexp           guifg=#9BB2EE
-" hi link rubyRegexpDelimiter Special
-" hi link rubyEscape Special " Backslashes
-" hi link rubyInterpolationDelimiter Special
-" hi link rubyStringDelimiter Special
-" hi rubyRepeatModifier guifg=#e29aeb " while/until
-" hi link rubyArrayDelimiter    Special  " [ , , ]
-" " hi rubyCurlyBlock  guifg=#e29aeb
-" hi link rubyControl Statement
-" hi link rubyAccess Keyword " public, private, protected
-" hi rubyPredefinedVariable guifg=#55747C " $!, etc.
-" hi rubyClassVariable     guifg=#E29AEB
-" hi rubyBeginEnd guifg=#e29aeb
-" hi rubyAttribute guifg=#e29aeb " attr_accessor, attr_reader, attr_writer
-" hi link rubyClass             Keyword 
-" hi link rubyModule            Keyword 
-" hi link rubyKeyword           Keyword 
-" hi link rubyOperator          Operator " defined? keyword
-" hi link rubyIdentifier        Identifier
-" hi link rubyInstanceVariable  Identifier
-" hi rubyGlobalVariable    guifg=#e29aeb
-" hi link rubyClassVariable     Identifier
-" hi link rubyConstant          Type  
-" hi link rubyConditionalModifier Conditional " if/unless
-" hi rubyBlockArgument guifg=#e29aeb
-" hi rubySymbol
-
-" Objective-C-specific
-" hi objcConstant         gui=NONE guifg=#F6DA7B guibg=bg
-" hi objcInstMethod       gui=NONE guifg=#C67C48 guibg=bg
-" hi objcMethod gui=NONE guifg=#C67C48 guibg=bg
-" hi objcFactMethod gui=NONE guifg=#ffffff guibg=bg
-" hi objcMethodArg gui=NONE guifg=#ffffff guibg=bg
-" hi objcMessageName gui=NONE guifg=#ffffff guibg=bg
-" hi objcMessageColon gui=NONE guifg=#ffffff guibg=bg
-" hi objcClass gui=NONE guifg=#95D5F1 guibg=bg
-" hi link cocoaClass objcClass " NSMutableDictionary, etc.
-" hi link objcSubclass objcClass
-" hi objcSuperclass gui=NONE guifg=#e29aeb guibg=bg " @end
-" hi objcDirective gui=NONE guifg=#F6DA7B guibg=bg " @end
-" hi link cocoaFunction Function
-" hi objcMethodName gui=NONE guifg=#ffffff guibg=bg
-" hi link objcMethodArg Normal
-" hi objcMessageName gui=NONE guifg=#95D5F1 guibg=bg " alloc, array, release, etc.
diff --git a/colors/ekinivim.vim b/colors/ekinivim.vim
deleted file mode 100755
index 2445c38..0000000
--- a/colors/ekinivim.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" Maintainer:	John del Rosario (john2x@gmail.com)
-" Last Change:	November 24, 2009
-"
-" Vim port of Ekini Edit gEdit colorscheme found on www.ekini.net
-" Used wombat.vim as base file
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "ekinivim"
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine guibg=#000709
-  hi CursorColumn guibg=#000709
-  hi MatchParen guifg=#dee5e7 guibg=#c4a000 gui=bold
-  hi Pmenu 		guifg=#C9C9BB guibg=#444444 
-  hi PmenuSel 	guifg=#000000 guibg=#e1a230
-endif
-
-" General colors
-hi Cursor 		guifg=NONE    guibg=#425461 gui=none
-hi Normal 		guifg=#C9C9BB guibg=#2E3330 gui=none
-hi NonText 		guifg=#808080 guibg=#303030 gui=none
-hi LineNr 		guifg=#dee5e7 guibg=#000000 gui=none
-hi StatusLine 	guifg=#6a9875 guibg=#000709 gui=none
-hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none
-hi VertSplit 	guifg=#444444 guibg=#444444 gui=none
-hi Folded 		guibg=#384048 guifg=#a0a8b0 gui=none
-hi Title		guifg=#f6f3e8 guibg=NONE	gui=bold
-hi Visual		guifg=#fefeec guibg=#6c8b9f gui=none
-hi SpecialKey	guifg=#808080 guibg=#343434 gui=none
-
-" Syntax highlighting
-hi Comment 		guifg=#6a9875 gui=none
-hi Todo 		guifg=#faf6e4 guibg=#4e5d62 gui=italic
-hi Constant 	guifg=#F696DB gui=bold
-hi String 		guifg=#e1a230 gui=none
-hi Identifier 	guifg=#A8E1FE gui=none
-hi Function 	guifg=#cae682 gui=none
-hi Type 		guifg=#B2FD6D gui=none
-hi Statement 	guifg=#F6DD62 gui=bold
-hi Operator     guifg=#F6DD62 gui=none
-hi Keyword		guifg=#8ac6f2 gui=none
-hi PreProc 		guifg=#B2FD6D gui=bold
-hi Number		guifg=#4DF4FF gui=none
-hi Special		guifg=#4DF4FF gui=bold
-
-
diff --git a/colors/ekvoli.vim b/colors/ekvoli.vim
deleted file mode 100755
index 3362968..0000000
--- a/colors/ekvoli.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Vim color file
-" Maintainer:	Preben Randhol <randhol+ekvoli@pvv.org>
-" Last Change:	2008 Feb 24
-" License: 		GNU Public License (GPL) v2
-"
-" Version 1.6: Added colours for TVO and changed folding colour
-
-
-highlight clear Normal
-set background&
-
-" Remove all existing highlighting and set the defaults.
-highlight clear
-
-" Load the syntax highlighting defaults, if it's enabled.
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "ekvoli"
-
-hi Cursor         	guifg=white gui=reverse,bold     
-hi iCursor        	guifg=white gui=reverse,bold     
-hi rCursor        	guifg=white gui=reverse,bold     
-hi vCursor        	guifg=white gui=reverse,bold     
-hi lCursor        	guifg=white gui=reverse,bold     
-hi nCursor        	guifg=white gui=reverse,bold     
-hi CursorLine     	guibg=#05456f gui=none
-hi CursorColumn   	guibg=#05456f gui=none		
-
-
-hi Normal			guifg=white guibg=#001535
-hi Error			guibg=#6000a0 gui=bold,italic,undercurl guisp=white
-hi ErrorMsg			guifg=white guibg=#287eff gui=bold,italic
-hi Visual			guibg=#2080c0 guifg=white gui=bold
-hi VisualNOS		guibg=#6080a0 guifg=white gui=bold
-hi Todo				guibg=#00a0d0 guifg=white gui=underline
-
-hi NonText			guifg=#6590f0
-
-hi Search 			guibg=#667799 guifg=white gui=bold 
-hi IncSearch 		guibg=#667799 guifg=white gui=bold 
-
-hi SpecialKey		guifg=#00c0e0
-hi Directory		guifg=#00c0e0
-hi Title			guifg=#00a0f0 gui=none 
-hi WarningMsg		guifg=lightblue			
-hi WildMenu			guifg=white guibg=#0080c0
-hi Pmenu			guifg=white guibg=#005090
-hi PmenuSel			guifg=white guibg=#3070c0
-hi ModeMsg			guifg=#22cce2		
-hi MoreMsg			guifg=#22cce2 gui=bold	
-hi Question			guifg=#22cce2 gui=none 
-
-hi MatchParen		guifg=white guibg=#3070c0 gui=bold
-
-hi StatusLine		guifg=white guibg=#104075 gui=bold
-hi StatusLineNC		guifg=#65a0f0 guibg=#104075 gui=none
-hi VertSplit		guifg=#305885 guibg=#305885 gui=none
-hi Folded			guifg=#65b0f6 guibg=#122555 gui=italic
-hi FoldColumn		guifg=white guibg=#103366 gui=none
-hi LineNr			guifg=#5080b0 gui=bold
-
-hi DiffAdd			guibg=#2080a0 guifg=white gui=bold
-hi DiffChange		guibg=#2080a0 guifg=white gui=bold
-hi DiffDelete		guibg=#306080 guifg=white gui=none 
-hi DiffText			guibg=#8070a0 guifg=white gui=bold 
-
-hi SpellBad 		gui=undercurl,italic guisp=#76daff 
-hi SpellCap 		gui=undercurl guisp=#7ba2ba 
-hi SpellRare 		gui=undercurl guisp=#8080f0
-hi SpellLocal  		gui=undercurl guisp=#c0c0e0
-
-hi Comment   		guifg=#9590d5 gui=italic
-
-
-hi Constant			guifg=#87c6f0 gui=italic
-hi Special			guifg=#50a0e0 gui=bold
-hi Identifier	 	guifg=#7fe9ff 
-hi Statement	  	guifg=white gui=bold
-hi PreProc	 		guifg=#3f8fff gui=none
-
-hi type		 		guifg=#90bfd0 gui=none 
-hi Ignore			guifg=bg 
-hi Underlined		gui=underline cterm=underline term=underline
-
-
-" TVO - The Vim Outliner
-hi otlTab0    gui=bold,underline guifg=#eeeeff
-hi otlTab1    gui=bold,underline guifg=#3377ee
-hi otlTab2    gui=bold,underline guifg=#22cae2
-hi otlTab3    gui=bold,underline guifg=#9966ff
-hi otlTab5    gui=bold,underline guifg=#22aae2
-hi otlTab4    gui=bold,underline guifg=#92caf2
-hi otlTab7    gui=bold,underline guifg=#22bae2
-hi otlTab6    gui=bold,underline guifg=#8866ee
-hi otlTab8    gui=bold,underline guifg=#1166ee
-hi otlTab9    gui=bold,underline guifg=#99ddee
-hi otlTodo    gui=bold,underline guifg=white guibg=#00a0d0
-hi otlTagRef  guifg=white guibg=#8070a0   
-hi otlTagDef  guifg=white guibg=#005090
-
-
-
-
diff --git a/colors/elise.vim b/colors/elise.vim
deleted file mode 100755
index 8036f62..0000000
--- a/colors/elise.vim
+++ /dev/null
@@ -1,182 +0,0 @@
-"==============================================================================.
-"        File: elise.vim                                                       |
-"     License: Public Domain, FREE as LOVE.                                    |
-" Description: The colorscheme "F�r Elise".                                    |
-"              A pinky-yellowy-greeny colorscheme inspired on a popular        |
-"              classical composition of "Ludwig van Beethoven", called         |
-"              "F�r Elise" (For Elise).                                        |
-"        Note: - Only standard (for all languages) highlight-groups are set.   |
-"              - This colorscheme _should_ look nice everywhere.               |
-"==============================================================================|
-"      Author: drachenkiraa, {_drachen_kiraa_}@{_gmail_}.{com_}  (remove: _{}) |
-" Last Change: 2009 Jul 1                                                      |
-"     Version: 1.0                                                             |
-"==========================================================================={{{1
-"  Color Test: :he group-name                                                  |
-"              :so $VIMRUNTIME/syntax/hitest.vim                               |
-"   Tested On: - Linux (gvim v6.3, v6.4);                                      |
-"              - Standard Linux Terminal (vim v6.3, v6.4);                     |
-"              - Xterm, Rxvt, Konsole, gnome-terminal (vim v6.3, v6.4).        |
-"              - Windows (gvim v7.1, v7.2);                                    |
-"              - DOS (vim v7.1, v7.2).                                         |
-"        TODO: * Test this colorscheme on newer versions of vim/gvim for Linux |
-"                and other systems (*BSD, Mac, Amiga?).                        |
-"              * Are all the has("feature") checks really worth?               |
-"                Please enlighten me if I'm wrong.                             |
-"==============================================================================|
-" Random Tips:                                                                 |
-" * If your terminal supports more than 8 colors (which is the case of most    |
-"   modern xterms, rxvts, and others), then it is worth adding the following   |
-"   lines somewhere into your .vimrc:                                          |
-"       if &term =~ "xterm"                                                    |
-"         set t_Co=16                                                          |
-"       endif                                                                  |
-"   That'll make this colorscheme look a lot better on such terminals.         |
-"   For further help checkout:                                                 |
-"       :he term-dependent-settings                                            |
-"       :he term                                                               |
-"===========================================================================}}}1
-" Initial setup stuff {{{1
-" Remove existing highlighting
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "elise"
-hi Normal ctermbg=Black ctermfg=Gray cterm=NONE guibg=Black guifg=Gray75 gui=none
-
-" Vim >= 7.0 specific colors {{{1
-if v:version >= 700
-  " Cursor colors {{{2
-  hi Cursor ctermbg=DarkYellow ctermfg=fg guibg=LightYellow guifg=bg gui=none
-  hi CursorLine ctermbg=DarkGray guibg=Gray15 gui=none
-  hi CursorColumn ctermbg=DarkGray guibg=Gray15 gui=none
-  " only for Win32, IME status
-  if has('multi_byte_ime')
-    hi CursorIM guibg=LightGreen guifg=NONE gui=none
-  endif
-
-  " Auto-completion Popup Menu colors {{{2
-  hi Pmenu ctermbg=DarkMagenta ctermfg=bg cterm=NONE guibg=#330066 guifg=fg gui=none
-  hi PmenuSel ctermbg=bg ctermfg=Magenta cterm=NONE guibg=#cc99ff guifg=bg gui=none
-  hi PmenuSbar ctermbg=DarkBlue ctermfg=DarkBlue cterm=NONE guibg=#663399 guifg=fg gui=none
-  hi PmenuThumb ctermbg=DarkCyan ctermfg=DarkCyan cterm=NONE guibg=#9966cc guifg=fg gui=none
-
-  " Tab colors {{{2
-  if has("windows")
-    hi TabLine ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=none
-    hi TabLineFill ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=none
-    hi TabLineSel ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#ffcc66 guifg=Gray20 gui=bold
-  endif
-
-  " Spell checking colors {{{2
-  if has("spell")
-    hi SpellBad ctermbg=White ctermfg=Red cterm=NONE guisp=Red gui=undercurl
-    hi SpellCap ctermbg=White ctermfg=Blue cterm=NONE guisp=Blue gui=undercurl
-    hi SpellLocal ctermbg=White ctermfg=DarkCyan cterm=NONE guisp=DarkCyan gui=undercurl
-    hi SpellRare ctermbg=White ctermfg=DarkMagenta cterm=NONE guisp=Magenta gui=undercurl
-  endif
-
-endif "}}}1
-" Messages and other texts' colors {{{1
-hi WarningMsg ctermbg=bg ctermfg=Red cterm=NONE guibg=bg guifg=#ff3333 gui=none
-hi ErrorMsg ctermbg=Red ctermfg=White cterm=NONE guibg=Red2 guifg=White gui=none
-hi ModeMsg ctermbg=bg ctermfg=fg cterm=NONE guibg=bg guifg=fg gui=none
-hi MoreMsg ctermbg=bg ctermfg=Cyan cterm=NONE guibg=bg guifg=Cyan gui=none
-hi Question ctermbg=bg ctermfg=White cterm=NONE guibg=bg guifg=White gui=none
-hi Directory ctermbg=bg ctermfg=Yellow cterm=NONE guibg=bg guifg=Yellow gui=none
-hi Title ctermbg=bg ctermfg=Yellow cterm=NONE guibg=bg guifg=Yellow gui=none
-
-" Diff colors {{{1
-if has("diff")
-  hi DiffAdd ctermbg=Green ctermfg=bg cterm=NONE guibg=LightGreen guifg=bg gui=none
-  hi DiffChange ctermbg=Blue ctermfg=fg cterm=NONE guibg=LightBlue guifg=bg gui=none
-  hi DiffDelete ctermbg=Red ctermfg=fg cterm=NONE guibg=LightRed guifg=bg gui=none
-  hi DiffText ctermbg=Cyan ctermfg=bg cterm=NONE guibg=LightCyan guifg=bg gui=none
-endif
-
-" Outline, Fold & Sign columns colors {{{1
-hi LineNr ctermbg=bg ctermfg=DarkGray guibg=bg guifg=Gray40 gui=none
-if has("folding")
-  hi Folded ctermbg=bg ctermfg=DarkCyan cterm=NONE guibg=Gray10 guifg=#66ccff gui=none
-  hi FoldColumn ctermbg=bg ctermfg=Cyan cterm=NONE guibg=Gray10 guifg=#66ccff gui=none
-endif
-if has("signs")
-  hi SignColumn ctermbg=bg ctermfg=Magenta guibg=Gray10 guifg=Magenta gui=none
-endif
-
-" Search & Special characters' colors {{{1
-if has("extra_search")
-  hi Search ctermbg=Yellow ctermfg=bg cterm=NONE guibg=Yellow guifg=bg gui=none
-  hi IncSearch ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=bg gui=none
-endif
-hi NonText ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-hi SpecialKey ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-
-" Window Bars, Status line & Visual mode colors {{{1
-hi StatusLine ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#ffcc66 guifg=bg gui=none
-if has("windows")
-  hi StatusLineNC ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=none
-endif
-
-if has("vertsplit")
-  hi VertSplit ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=none
-endif
-
-if has("wildmenu")
-  hi WildMenu ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ffcc66 gui=bold
-endif
-
-if has("visual")
-  hi Visual ctermbg=Yellow ctermfg=bg cterm=NONE guibg=#ffffcc guifg=bg gui=none
-  hi VisualNOS ctermbg=DarkBlue ctermfg=Yellow cterm=NONE guibg=#ffffcc guifg=DarkRed gui=none
-endif
-
-" Syntax highlighting colors {{{1
-hi Comment ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ff99cc gui=none
-hi link SpecialComment Comment
-
-hi Character ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi String ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi Constant ctermbg=bg ctermfg=Blue guibg=bg guifg=LightBlue gui=none
-hi link Number Constant
-hi link Float Constant
-hi link Boolean Constant
-
-hi Identifier ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi Function ctermbg=bg ctermfg=Green guibg=bg guifg=Green gui=none
-
-hi Statement ctermbg=bg ctermfg=Yellow guibg=bg guifg=#eecc00 gui=none
-hi link Conditional Statement
-hi link Repeat Statement
-hi link Operator Statement
-hi link Keyword Statement
-hi link Label Statement
-hi link Exception Statement
-
-hi Type ctermbg=bg ctermfg=Green guibg=bg guifg=#99ee00 gui=none
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-
-hi PreProc ctermbg=bg ctermfg=Blue guibg=bg guifg=#cc99ff gui=none
-hi PreCondit ctermbg=bg ctermfg=Blue guibg=bg guifg=#cc66dd gui=none
-hi link Include PreProc
-hi link Define PreProc
-
-hi Special ctermbg=bg ctermfg=Blue guibg=bg guifg=#ff8888 gui=none
-hi SpecialChar ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ff33ff gui=none
-hi Tag ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi Delimiter ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi Debug ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-
-hi MatchParen ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=bg gui=none
-hi Error ctermbg=Red ctermfg=White cterm=NONE guibg=bg guifg=#ff3333 gui=none
-hi Ignore ctermbg=bg ctermfg=bg cterm=NONE guibg=bg guifg=bg gui=none
-hi Todo ctermbg=Magenta ctermfg=bg cterm=NONE guibg=#ff66cc guifg=bg gui=none
-hi Underlined ctermbg=bg ctermfg=Cyan cterm=underline guibg=bg guifg=Cyan gui=underline
-"}}}1
-"==========================================================================={{{1
-" vim: set et sw=2 sts=2 ts=8 nowrap:
-" vim600: set fdc=2 fdm=marker:
diff --git a/colors/elisex.vim b/colors/elisex.vim
deleted file mode 100755
index 61bdf67..0000000
--- a/colors/elisex.vim
+++ /dev/null
@@ -1,183 +0,0 @@
-"==============================================================================.
-"        File: elisex.vim                                                      |
-"     License: Public Domain, FREE as LOVE.                                    |
-" Description: The colorscheme "F�r die Sexy Elise".                           |
-"              A pinky-yellowy-greeny colorscheme inspired on a popular        |
-"              classical composition of "Ludwig van Beethoven", called         |
-"              "F�r Elise" (For Elise). This one uses bold and italic font     |
-"              styles to please your eyes.                                     |
-"        Note: - Only standard (for all languages) highlight-groups are set.   |
-"              - This colorscheme _should_ look nice everywhere.               |
-"==============================================================================|
-"      Author: drachenkiraa, {_drachen_kiraa_}@{_gmail_}.{com_}  (remove: _{}) |
-" Last Change: 2009 Jul 1                                                      |
-"     Version: 1.0                                                             |
-"==========================================================================={{{1
-"  Color Test: :he group-name                                                  |
-"              :so $VIMRUNTIME/syntax/hitest.vim                               |
-"   Tested On: - Linux (gvim v6.3, v6.4);                                      |
-"              - Standard Linux Terminal (vim v6.3, v6.4);                     |
-"              - Xterm, Rxvt, Konsole, gnome-terminal (vim v6.3, v6.4).        |
-"              - Windows (gvim v7.1, v7.2);                                    |
-"              - DOS (vim v7.1, v7.2).                                         |
-"        TODO: * Test this colorscheme on newer versions of vim/gvim for Linux |
-"                and other systems (*BSD, Mac, Amiga?).                        |
-"              * Are all the has("feature") checks really worth?               |
-"                Please enlighten me if I'm wrong.                             |
-"==============================================================================|
-" Random Tips:                                                                 |
-" * If your terminal supports more than 8 colors (which is the case of most    |
-"   modern xterms, rxvts, and others), then it is worth adding the following   |
-"   lines somewhere into your .vimrc:                                          |
-"       if &term =~ "xterm"                                                    |
-"         set t_Co=16                                                          |
-"       endif                                                                  |
-"   That'll make this colorscheme look a lot better on such terminals.         |
-"   For further help checkout:                                                 |
-"       :he term-dependent-settings                                            |
-"       :he term                                                               |
-"===========================================================================}}}1
-" Initial setup stuff {{{1
-" Remove existing highlighting
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "elisex"
-hi Normal ctermbg=Black ctermfg=Gray cterm=NONE guibg=Black guifg=Gray75 gui=none
-
-" Vim >= 7.0 specific colors {{{1
-if v:version >= 700
-  " Cursor colors {{{2
-  hi Cursor ctermbg=DarkYellow ctermfg=fg guibg=LightYellow guifg=bg gui=none
-  hi CursorLine ctermbg=DarkGray guibg=Gray15 gui=none
-  hi CursorColumn ctermbg=DarkGray guibg=Gray15 gui=none
-  " only for Win32, IME status
-  if has('multi_byte_ime')
-    hi CursorIM guibg=LightGreen guifg=NONE gui=none
-  endif
-
-  " Auto-completion Popup Menu colors {{{2
-  hi Pmenu ctermbg=DarkMagenta ctermfg=bg cterm=NONE guibg=#330066 guifg=fg gui=none
-  hi PmenuSel ctermbg=bg ctermfg=Magenta cterm=NONE guibg=#cc99ff guifg=bg gui=bold
-  hi PmenuSbar ctermbg=DarkBlue ctermfg=DarkBlue cterm=NONE guibg=#663399 guifg=fg gui=none
-  hi PmenuThumb ctermbg=DarkCyan ctermfg=DarkCyan cterm=NONE guibg=#9966cc guifg=fg gui=none
-
-  " Tab colors {{{2
-  if has("windows")
-    hi TabLine ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=italic
-    hi TabLineFill ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=italic
-    hi TabLineSel ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#ffcc66 guifg=Gray20 gui=bold
-  endif
-
-  " Spell checking colors {{{2
-  if has("spell")
-    hi SpellBad ctermbg=White ctermfg=Red cterm=NONE guisp=Red gui=undercurl
-    hi SpellCap ctermbg=White ctermfg=Blue cterm=NONE guisp=Blue gui=undercurl
-    hi SpellLocal ctermbg=White ctermfg=DarkCyan cterm=NONE guisp=DarkCyan gui=undercurl
-    hi SpellRare ctermbg=White ctermfg=DarkMagenta cterm=NONE guisp=Magenta gui=undercurl
-  endif
-
-endif "}}}1
-" Messages and other texts' colors {{{1
-hi WarningMsg ctermbg=bg ctermfg=Red cterm=NONE guibg=bg guifg=#ff3333 gui=italic
-hi ErrorMsg ctermbg=Red ctermfg=White cterm=NONE guibg=Red2 guifg=White gui=none
-hi ModeMsg ctermbg=bg ctermfg=fg cterm=NONE guibg=bg guifg=fg gui=none
-hi MoreMsg ctermbg=bg ctermfg=Cyan cterm=NONE guibg=bg guifg=Cyan gui=none
-hi Question ctermbg=bg ctermfg=White cterm=NONE guibg=bg guifg=White gui=italic
-hi Directory ctermbg=bg ctermfg=Yellow cterm=NONE guibg=bg guifg=Yellow gui=none
-hi Title ctermbg=bg ctermfg=Yellow cterm=NONE guibg=bg guifg=Yellow gui=underline
-
-" Diff colors {{{1
-if has("diff")
-  hi DiffAdd ctermbg=Green ctermfg=bg cterm=NONE guibg=LightGreen guifg=bg gui=none
-  hi DiffChange ctermbg=Blue ctermfg=fg cterm=NONE guibg=LightBlue guifg=bg gui=none
-  hi DiffDelete ctermbg=Red ctermfg=fg cterm=NONE guibg=LightRed guifg=bg gui=none
-  hi DiffText ctermbg=Cyan ctermfg=bg cterm=NONE guibg=LightCyan guifg=bg gui=none
-endif
-
-" Outline, Fold & Sign columns colors {{{1
-hi LineNr ctermbg=bg ctermfg=DarkGray guibg=bg guifg=Gray40 gui=none
-if has("folding")
-  hi Folded ctermbg=bg ctermfg=DarkCyan cterm=NONE guibg=Gray10 guifg=#66ccff gui=none
-  hi FoldColumn ctermbg=bg ctermfg=Cyan cterm=NONE guibg=Gray10 guifg=#66ccff gui=none
-endif
-if has("signs")
-  hi SignColumn ctermbg=bg ctermfg=Magenta guibg=Gray10 guifg=Magenta gui=none
-endif
-
-" Search & Special characters' colors {{{1
-if has("extra_search")
-  hi Search ctermbg=Yellow ctermfg=bg cterm=NONE guibg=Yellow guifg=bg gui=none
-  hi IncSearch ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=bg gui=none
-endif
-hi NonText ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-hi SpecialKey ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-
-" Window Bars, Status line & Visual mode colors {{{1
-hi StatusLine ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#ffcc66 guifg=bg gui=none
-if has("windows")
-  hi StatusLineNC ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=italic
-endif
-
-if has("vertsplit")
-  hi VertSplit ctermbg=DarkYellow ctermfg=bg cterm=NONE guibg=Gray20 guifg=#ffcc66 gui=none
-endif
-
-if has("wildmenu")
-  hi WildMenu ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ffcc66 gui=bold
-endif
-
-if has("visual")
-  hi Visual ctermbg=Yellow ctermfg=bg cterm=NONE guibg=#ffffcc guifg=bg gui=none
-  hi VisualNOS ctermbg=DarkBlue ctermfg=Yellow cterm=NONE guibg=#ffffcc guifg=DarkRed gui=none
-endif
-
-" Syntax highlighting colors {{{1
-hi Comment ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ff99cc gui=none
-hi link SpecialComment Comment
-
-hi Character ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi String ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi Constant ctermbg=bg ctermfg=Blue guibg=bg guifg=LightBlue gui=bold
-hi link Number Constant
-hi link Float Constant
-hi link Boolean Constant
-
-hi Identifier ctermbg=bg ctermfg=Cyan guibg=bg guifg=Cyan gui=none
-hi Function ctermbg=bg ctermfg=Green guibg=bg guifg=Green gui=bold,italic
-
-hi Statement ctermbg=bg ctermfg=Yellow guibg=bg guifg=#eecc00 gui=bold
-hi link Conditional Statement
-hi link Repeat Statement
-hi link Operator Statement
-hi link Keyword Statement
-hi link Label Statement
-hi link Exception Statement
-
-hi Type ctermbg=bg ctermfg=Green guibg=bg guifg=#99ee00 gui=bold
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-
-hi PreProc ctermbg=bg ctermfg=Blue guibg=bg guifg=#cc99ff gui=none
-hi PreCondit ctermbg=bg ctermfg=Blue guibg=bg guifg=#cc66dd gui=bold,italic
-hi link Include PreProc
-hi link Define PreProc
-
-hi Special ctermbg=bg ctermfg=Blue guibg=bg guifg=#ff8888 gui=none
-hi SpecialChar ctermbg=bg ctermfg=Magenta guibg=bg guifg=#ff33ff gui=none
-hi Tag ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi Delimiter ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi Debug ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-
-hi MatchParen ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=bg gui=bold
-hi Error ctermbg=Red ctermfg=White cterm=NONE guibg=bg guifg=#ff3333 gui=none
-hi Ignore ctermbg=bg ctermfg=bg cterm=NONE guibg=bg guifg=bg gui=none
-hi Todo ctermbg=Magenta ctermfg=bg cterm=NONE guibg=#ff66cc guifg=bg gui=bold
-hi Underlined ctermbg=bg ctermfg=Cyan cterm=underline guibg=bg guifg=Cyan gui=underline
-"}}}1
-"==========================================================================={{{1
-" vim: set et sw=2 sts=2 ts=8 nowrap:
-" vim600: set fdc=2 fdm=marker:
diff --git a/colors/emacs.vim b/colors/emacs.vim
deleted file mode 100755
index 21f22f7..0000000
--- a/colors/emacs.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-" Vim color file
-" Maintainer:	Michael Piefel <piefel@informatik.hu-berlin.de>
-" Last Change:	2001 Aug 16
-" Licence:	Public Domain
-
-" This color scheme uses a White background. It's based on Bram's
-" morning theme, but doesn't try to work for non-GUI editing.
-" 
-" It's supposed to look like the Emacs standard colors, at least
-" for C. But Emacs has different categories, so it's not very good.
-
-" First remove all existing highlighting.
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "emacs"
-
-hi Normal guifg=Black guibg=White
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg guibg=Red guifg=White
-hi IncSearch gui=reverse
-hi ModeMsg gui=bold
-hi StatusLine gui=reverse,bold
-hi StatusLineNC gui=reverse
-hi VertSplit gui=reverse
-hi Visual gui=reverse guifg=Grey guibg=fg
-hi VisualNOS gui=underline,bold
-hi DiffText gui=bold guibg=Red
-hi Cursor guibg=Black guifg=NONE
-hi lCursor guibg=Cyan guifg=NONE
-hi Directory guifg=Blue
-hi LineNr guifg=Brown
-hi MoreMsg gui=bold guifg=SeaGreen
-hi NonText gui=bold guifg=Blue guibg=grey90
-hi Question gui=bold guifg=SeaGreen
-hi Search guibg=Yellow guifg=NONE
-hi SpecialKey guifg=Blue
-hi Title gui=bold guifg=Magenta
-hi WarningMsg guifg=Red
-hi WildMenu guibg=Yellow guifg=Black
-hi Folded guibg=White guifg=DarkBlue
-hi FoldColumn guibg=Grey guifg=DarkBlue
-hi DiffAdd guibg=LightBlue
-hi DiffChange guibg=LightMagenta
-hi DiffDelete gui=bold guifg=Blue guibg=LightCyan
-
-" Colors for syntax highlighting
-hi Comment guifg=#AC2020 guibg=White
-hi Constant guifg=#C28F8F guibg=White
-hi PreProc guifg=#D569D5 guibg=White
-hi Statement gui=NONE guifg=#9C20EE guibg=White
-hi Type guifg=#9C20EE guibg=White
-hi Special guifg=SlateBlue guibg=White
-hi Ignore guifg=White
-
-" Some specials (override hilinks)
-
-
-" vim: sw=2
diff --git a/colors/enzyme.vim b/colors/enzyme.vim
deleted file mode 100755
index a3b7e39..0000000
--- a/colors/enzyme.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Kamil Kisiel <kamil@zymeworks.com>
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "enzyme"
-set bg=dark
-hi Normal		  ctermfg=grey
-hi Scrollbar	  guifg=darkcyan guibg=cyan
-hi Menu			  guifg=black guibg=cyan
-hi SpecialKey	  term=bold  cterm=bold  ctermfg=darkred
-hi NonText		  term=bold  cterm=bold  ctermfg=darkred
-hi Directory	  term=bold  cterm=bold  ctermfg=brown
-hi ErrorMsg		  term=standout  cterm=bold  ctermfg=grey ctermbg=red
-hi Search		  term=reverse  ctermfg=white  ctermbg=magenta
-hi MoreMsg		  term=bold  cterm=bold  ctermfg=darkgreen
-hi ModeMsg		  term=bold  cterm=bold
-hi LineNr		  term=underline  cterm=bold  ctermfg=darkcyan
-hi Question		  term=standout  cterm=bold  ctermfg=darkgreen
-hi StatusLineNC	  term=bold,reverse  cterm=bold ctermfg=darkblue ctermbg=white
-hi StatusLine     term=reverse	ctermfg=darkblue ctermbg=white
-hi Folded		  ctermfg=white ctermbg=darkred
-hi Title		  term=bold  cterm=bold  ctermfg=darkmagenta
-hi Visual		  term=reverse	cterm=reverse
-hi WarningMsg	  term=standout  cterm=bold  ctermfg=darkred
-hi Cursor		  guifg=bg	guibg=Green
-hi Comment		  term=bold  cterm=bold ctermfg=cyan
-hi Constant		  term=underline  cterm=bold ctermfg=LightBlue
-hi Special		  term=bold  cterm=bold ctermfg=red
-hi Identifier	  term=underline   ctermfg=brown
-hi Statement	  term=bold  cterm=bold ctermfg=yellow
-hi PreProc		  term=underline  ctermfg=darkmagenta
-hi Type			  term=underline  cterm=bold ctermfg=lightgreen
-hi Error		  term=reverse	ctermfg=darkcyan  ctermbg=black
-hi Todo			  term=standout  ctermfg=black	ctermbg=darkcyan
-hi CursorLine	  term=underline  guibg=#555555 cterm=underline
-hi CursorColumn	  term=underline  guibg=#555555 cterm=underline
-hi MatchParen	  term=reverse  ctermfg=blue
-hi TabLine		  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white
-hi TabLineFill	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white
-hi TabLineSel	  term=reverse	ctermfg=white ctermbg=lightblue
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
diff --git a/colors/evening_2.vim b/colors/evening_2.vim
deleted file mode 100755
index 27d9f19..0000000
--- a/colors/evening_2.vim
+++ /dev/null
@@ -1,57 +0,0 @@
-" Vim color file
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 14
-
-" This color scheme uses a dark grey background.
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "evening_2"
-
-hi Normal ctermbg=DarkGrey ctermfg=White guifg=gray90 guibg=grey25
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi ModeMsg term=bold cterm=bold gui=bold
-hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
-hi StatusLineNC term=reverse cterm=reverse gui=reverse
-hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse ctermbg=black guibg=grey40
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red
-hi Cursor guibg=Green guifg=Black
-hi lCursor guibg=Cyan guifg=Black
-hi Directory term=bold ctermfg=LightCyan guifg=Cyan
-""hi LineNr term=underline ctermfg=Yellow guifg=Yellow
-hi LineNr term=underline ctermfg=Yellow guifg=#8db6cd
-hi MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen
-hi NonText term=bold ctermfg=LightBlue gui=bold guifg=LightBlue guibg=grey30
-hi Question term=standout ctermfg=LightGreen gui=bold guifg=Green
-hi Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi SpecialKey term=bold ctermfg=LightBlue guifg=Cyan
-hi Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta
-hi WarningMsg term=standout ctermfg=LightRed guifg=Red
-hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black
-hi Folded term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
-hi FoldColumn term=standout ctermbg=LightGrey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue
-hi DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue
-hi DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta
-hi DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan
-hi CursorColumn term=reverse ctermbg=Black guibg=grey40
-hi CursorLine term=underline cterm=underline guibg=grey40
-
-" Groups for syntax highlighting
-hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 guibg=grey25
-hi Special term=bold ctermfg=LightRed guifg=Orange guibg=grey25
-if &t_Co > 8
-  hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
-endif
-hi Ignore ctermfg=DarkGrey guifg=grey20
-
-" vim: sw=2
diff --git a/colors/far.vim b/colors/far.vim
deleted file mode 100755
index 21e7ca0..0000000
--- a/colors/far.vim
+++ /dev/null
@@ -1,68 +0,0 @@
-" Vim color file
-" Maintainer: Dmitri Shevchenko <dmi3@ngs.ru>
-" Last Change: 2006 Feb 15
-
-" This is a VIM's version of the FAR(http://www.rarsoft.com) internal editor
-" color scheme
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="far"
-
-hi Type term=NONE cterm=NONE ctermfg=Yellow ctermbg=DarkBlue
-hi Type gui=NONE guifg=Yellow guibg=DarkBlue
-
-hi NonText term=NONE cterm=NONE ctermfg=White ctermbg=DarkBlue
-hi NonText gui=NONE guifg=White guibg=DarkBlue
-
-hi Statement term=NONE cterm=NONE ctermfg=Yellow ctermbg=DarkBlue
-hi Statement gui=NONE guifg=Yellow guibg=DarkBlue
-
-hi Special term=NONE cterm=NONE ctermfg=Green ctermbg=DarkBlue
-hi Special gui=NONE guifg=Green guibg=DarkBlue
-
-hi Constant term=NONE cterm=NONE ctermfg=DarkGreen ctermbg=DarkBlue
-hi Constant gui=NONE guifg=DarkGreen guibg=DarkBlue
-
-hi Normal term=NONE cterm=NONE ctermfg=Gray ctermbg=DarkBlue
-hi Normal gui=NONE guifg=Gray guibg=DarkBlue
-
-hi Preproc term=NONE cterm=NONE ctermfg=Red ctermbg=DarkBlue
-hi Preproc gui=NONE guifg=Red guibg=DarkBlue
-
-hi Comment term=NONE cterm=NONE ctermfg=Brown ctermbg=DarkBlue
-hi Comment gui=NONE guifg=DarkYellow guibg=DarkBlue
-
-hi Identifier term=NONE cterm=NONE ctermfg=Cyan ctermbg=DarkBlue
-hi Identifier gui=NONE guifg=Cyan guibg=DarkBlue
-
-hi StatusLine term=bold cterm=bold ctermfg=DarkGray ctermbg=Gray
-hi StatusLine gui=bold guifg=DarkGray guibg=Gray
-
-hi StatusLineNC term=NONE cterm=NONE ctermfg=DarkGray ctermbg=Gray
-hi StatusLineNC gui=NONE guifg=DarkGray guibg=Gray
-
-hi Visual term=NONE cterm=NONE ctermfg=Black ctermbg=DarkCyan
-hi Visual gui=NONE guifg=Black guibg=DarkCyan
-
-hi Search term=NONE cterm=NONE ctermbg=DarkYellow
-hi Search gui=NONE guibg=DarkYellow
-
-hi VertSplit term=NONE cterm=NONE ctermfg=Black ctermbg=White
-hi VertSplit gui=NONE guifg=Black guibg=White
-
-hi Directory term=NONE cterm=NONE ctermfg=Cyan ctermbg=DarkBlue
-hi Directory gui=NONE guifg=Cyan guibg=DarkBlue
-
-hi WarningMsg term=standout cterm=NONE ctermfg=Red ctermbg=DarkBlue
-hi WarningMsg gui=standout guifg=Red guibg=DarkBlue
-
-hi Error term=NONE cterm=NONE ctermfg=White ctermbg=Red
-hi Error gui=NONE guifg=White guibg=Red
-
-hi Cursor ctermfg=Black ctermbg=Green
-hi Cursor guifg=Black guibg=Green
-
diff --git a/colors/fine_blue.vim b/colors/fine_blue.vim
deleted file mode 100755
index 89c280c..0000000
--- a/colors/fine_blue.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/30 Wed 00:12.
-"     version: 1.7
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "fine_blue"
-
-hi Normal       guifg=#404048 guibg=#f8f8f8
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404054 guibg=#40ffff
-hi Search       gui=NONE guifg=#404054 guibg=#ffffa0
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi WarningMsg   gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi ModeMsg      gui=NONE guifg=#0070ff guibg=NONE
-hi MoreMsg      gui=NONE guifg=#a800ff guibg=NONE
-hi Question     gui=NONE guifg=#008050 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404054
-hi StatusLineNC gui=NONE guifg=#b8b8c0 guibg=#404054
-hi VertSplit    gui=NONE guifg=#f8f8f8 guibg=#404054
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#00aacc
-
-" Diff
-hi DiffText     gui=NONE guifg=#4040ff guibg=#c0c0ff
-hi DiffChange   gui=NONE guifg=#5050ff guibg=#e0e0ff
-hi DiffDelete   gui=NONE guifg=#4040ff guibg=#c8f2ea
-hi DiffAdd      gui=NONE guifg=#4040ff guibg=#c8f2ea
-
-" Cursor
-hi Cursor       gui=NONE guifg=#0000ff guibg=#00e0ff
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#7820ff guibg=#e0d8ff
-hi FoldColumn   gui=NONE guifg=#aa60ff guibg=#f0f0f4
-" hi Folded       gui=NONE guifg=#58587c guibg=#e0e0e8
-" hi FoldColumn   gui=NONE guifg=#9090b0 guibg=#f0f0f4
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#a0a0b0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4000ff guibg=#ececf0
-hi SpecialKey   gui=NONE guifg=#d87000 guibg=NONE
-hi Title        gui=NONE guifg=#004060 guibg=#c8f0f8
-hi Visual       gui=NONE guifg=#404060 guibg=#dddde8
-" hi VisualNOS  gui=NONE guifg=#404060 guibg=#dddde8
-
-" Syntax group
-hi Comment      gui=NONE guifg=#ff00c0 guibg=NONE
-hi Constant     gui=NONE guifg=#2020ff guibg=#e8e8ff
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff4080
-hi Identifier   gui=NONE guifg=#c800ff guibg=NONE
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc      gui=NONE guifg=#0070e6 guibg=NONE
-hi Special      gui=NONE guifg=#005858 guibg=#ccf7ee
-hi Statement    gui=NONE guifg=#008858 guibg=NONE
-hi Todo         gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=NONE guifg=#7040ff guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=#0000ff guibg=NONE
diff --git a/colors/flatland.vim b/colors/flatland.vim
deleted file mode 100755
index 66088a7..0000000
--- a/colors/flatland.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-" Vim color file
-" Converted from Textmate theme PlasticCodeWrap using Coloration v0.3.3 (http://github.com/sickill/coloration)
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "flatland"
-
-hi Cursor ctermfg=16 ctermbg=59 cterm=NONE guifg=#26292c guibg=#646769 gui=NONE
-hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#515559 gui=NONE
-hi CursorLine ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3b3e40 gui=NONE
-hi CursorColumn ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3b3e40 gui=NONE
-hi ColorColumn ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3b3e40 gui=NONE
-hi LineNr ctermfg=102 ctermbg=59 cterm=NONE guifg=#8f9192 guibg=#3b3e40 gui=NONE
-hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#636567 guibg=#636567 gui=NONE
-hi MatchParen ctermfg=209 ctermbg=NONE cterm=underline guifg=#fa9a4b guibg=NONE gui=underline
-hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f8 guibg=#636567 gui=bold
-hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f8 guibg=#636567 gui=NONE
-hi Pmenu ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#3c3f42 gui=NONE
-hi IncSearch ctermfg=16 ctermbg=231 cterm=NONE guifg=#26292c guibg=#f6f6f6 gui=NONE
-hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi Directory ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Folded ctermfg=102 ctermbg=16 cterm=NONE guifg=#798188 guibg=#26292c gui=NONE
-
-hi Normal ctermfg=231 ctermbg=16 cterm=NONE guifg=#f8f8f8 guibg=#26292c gui=NONE
-hi Boolean ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Character ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Comment ctermfg=102 ctermbg=NONE cterm=NONE guifg=#798188 guibg=NONE gui=NONE
-hi Conditional ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi Constant ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Define ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f8 guibg=#46830e gui=bold
-hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0809 guibg=NONE gui=NONE
-hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f8f8f8 guibg=#233a5a gui=NONE
-hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f8 guibg=#204a87 gui=bold
-hi ErrorMsg ctermfg=231 ctermbg=124 cterm=NONE guifg=#f8f8f8 guibg=#aa2915 gui=NONE
-hi WarningMsg ctermfg=231 ctermbg=124 cterm=NONE guifg=#f8f8f8 guibg=#aa2915 gui=NONE
-hi Float ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Function ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi Identifier ctermfg=228 ctermbg=NONE cterm=NONE guifg=#f6f080 guibg=NONE gui=NONE
-hi Keyword ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi Label ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f6f6f6 guibg=NONE gui=NONE
-hi NonText ctermfg=102 ctermbg=59 cterm=NONE guifg=#7a8288 guibg=#313336 gui=NONE
-hi Number ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi Operator ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi PreProc ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f8 guibg=NONE gui=NONE
-hi SpecialKey ctermfg=102 ctermbg=59 cterm=NONE guifg=#7a8288 guibg=#3b3e40 gui=NONE
-hi Statement ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi StorageClass ctermfg=228 ctermbg=NONE cterm=NONE guifg=#f6f080 guibg=NONE gui=NONE
-hi String ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f6f6f6 guibg=NONE gui=NONE
-hi Tag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f8 guibg=NONE gui=bold
-hi Todo ctermfg=102 ctermbg=NONE cterm=inverse,bold guifg=#798188 guibg=NONE gui=inverse,bold
-hi Type ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi rubyClass ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi rubyFunction ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi rubyConstant ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi rubyStringDelimiter ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f6f6f6 guibg=NONE gui=NONE
-hi rubyBlockParameter ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi rubyInstanceVariable ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi rubyInclude ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi rubyGlobalVariable ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi rubyRegexp ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi rubyRegexpDelimiter ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi rubyEscape ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi rubyControl ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi rubyClassVariable ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi rubyOperator ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi rubyException ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fa9a4b guibg=NONE gui=NONE
-hi rubyPseudoVariable ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi rubyRailsUserClass ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi rubyRailsARAssociationMethod ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi rubyRailsARMethod ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi rubyRailsRenderMethod ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi rubyRailsMethod ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi erubyComment ctermfg=102 ctermbg=NONE cterm=NONE guifg=#798188 guibg=NONE gui=NONE
-hi erubyRailsMethod ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi htmlTag ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b7d877 guibg=NONE gui=NONE
-hi htmlEndTag ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b7d877 guibg=NONE gui=NONE
-hi htmlTagName ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b7d877 guibg=NONE gui=NONE
-hi htmlArg ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b7d877 guibg=NONE gui=NONE
-hi htmlSpecialChar ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1e94b guibg=NONE gui=NONE
-hi javaScriptFunction ctermfg=228 ctermbg=NONE cterm=NONE guifg=#f6f080 guibg=NONE gui=NONE
-hi javaScriptRailsFunction ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlKey ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi yamlAnchor ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi yamlAlias ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi yamlDocumentHeader ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f6f6f6 guibg=NONE gui=NONE
-hi cssURL ctermfg=209 ctermbg=NONE cterm=NONE guifg=#fb9a4b guibg=NONE gui=NONE
-hi cssFunctionName ctermfg=215 ctermbg=NONE cterm=NONE guifg=#ffb454 guibg=NONE gui=NONE
-hi cssColor ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi cssPseudoClassId ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi cssClassName ctermfg=74 ctermbg=NONE cterm=NONE guifg=#72aaca guibg=NONE gui=NONE
-hi cssValueLength ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b8d977 guibg=NONE gui=NONE
-hi cssCommonAttr ctermfg=150 ctermbg=NONE cterm=NONE guifg=#b7d877 guibg=NONE gui=NONE
-hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
diff --git a/colors/fnaqevan.vim b/colors/fnaqevan.vim
deleted file mode 100755
index d936cee..0000000
--- a/colors/fnaqevan.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-" Vim color file
-" Maintainer: Rafal Sulejman <rms@poczta.onet.pl>
-" Last Change:  2002.06.18
-"
-" This color scheme uses a black (dark) background.
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "fnaqevan"
-
-hi Normal       guibg=#000000 guifg=#C0C0C0 gui=NONE
-
-" Main colors
-hi Constant     guibg=#000000 guifg=#00B8E0 gui=NONE
-hi Identifier   guibg=#000000 guifg=#FFA850 gui=NONE
-hi Special      guibg=#000000 guifg=#B899C8 gui=NONE
-hi Statement    guibg=#000000 guifg=#EEE840 gui=NONE
-hi Preproc      guibg=#000000 guifg=#00B098 gui=NONE
-hi Type         guibg=#000000 guifg=#40D040 gui=NONE
-
-" Secondary colors
-hi Comment      guibg=#000000 guifg=#006699 gui=NONE
-hi Visual       guibg=#005900 guifg=#40C940 gui=NONE
-hi VisualNOS    guibg=#005900 guifg=#40C940 gui=NONE
-hi Search       guibg=#707000 guifg=#FFFF00 gui=NONE
-hi IncSearch    guibg=#D05000 guifg=#FFE000 gui=NONE
-
-" Special colors
-hi WarningMsg   guibg=#707000 guifg=#FFFF00 gui=NONE
-hi MoreMsg      guibg=#000070 guifg=#00B8E0 gui=NONE
-hi ErrorMsg     guibg=#CC0000 guifg=#FFEE00 gui=NONE
-hi ModeMsg      guibg=#000000 guifg=#E8E8E8 gui=NONE
-hi WildMenu     guibg=#5f5f5f guifg=#FFEE60 gui=NONE
-hi StatusLine   guibg=#1f1f1f guifg=#F0F0F0 gui=NONE
-hi StatusLineNC guibg=#0f0f0f guifg=#eaea3a gui=NONE
-hi VertSplit    guibg=#1f1f1f guifg=#F0F0F0 gui=NONE
-hi Error        guibg=#EE0000 guifg=#FFDD60 gui=NONE
-hi Todo         guibg=#EEE000 guifg=#000000 gui=NONE
-hi Title        guibg=#000000 guifg=#ffffff gui=NONE
-hi Question     guibg=#005900 guifg=#40E840 gui=NONE
-hi LineNr       guibg=#000000 guifg=#F0B0E0 gui=NONE
-hi Directory    guibg=#000000 guifg=#D0D0D0 gui=NONE
-hi NonText      guibg=#000000 guifg=#FFDDAA gui=NONE
-hi SpecialKey   guibg=#000000 guifg=#FFFFFF gui=NONE
-
-" Diff colors
-hi DiffAdd      guibg=#505050 guifg=#D0D0D0 gui=NONE
-hi DiffChange   guibg=#505050 guifg=#D0D0D0 gui=NONE
-hi DiffDelete   guibg=#505050 guifg=#D0D0D0 gui=NONE
-hi DiffText     guibg=#707070 guifg=#F0F0F0 gui=NONE
-
-" Folding colors
-hi Folded       guibg=#703070 guifg=#DDB8DD gui=NONE
-hi FoldColumn   guibg=#C4153B guifg=#F0F0F0 gui=NONE
-
-" Cursor colors
-hi Cursor       guibg=#FFFFFF guifg=#000000 gui=NONE
-hi icursor      guibg=#FFEE00 guifg=#000000 gui=NONE
-hi ncursor      guibg=#FFFFFF guifg=#000000 gui=NONE
-hi rcursor      guibg=#00CCFF guifg=#000000 gui=NONE
-hi lcursor      guibg=#40D040 guifg=#000000 gui=NONE
-
diff --git a/colors/fog.vim b/colors/fog.vim
deleted file mode 100755
index ab263ab..0000000
--- a/colors/fog.vim
+++ /dev/null
@@ -1,170 +0,0 @@
-" Vim color file
-" vim: tw=0 ts=4 sw=4
-" Maintainer:	Thomas R. Kimpton <tomk@emcity.net>
-" Last Change:	2001 Nov 8
-" This color scheme is meant for the person that spends hours
-" and hours and hours and... in vim and wants some contrast to
-" help pick things out in the files they edit, but doesn't want
-" **C**O**N**T**R**A**S**T**!
-
-set background=light
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "fog"
-
-hi Normal		ctermbg=White		ctermfg=Black
-" 660066 = darkish purple
-hi Normal		guifg=#660066		guibg=grey80
-
-hi NonText		term=bold
-hi NonText		ctermfg=LightBlue
-hi NonText		gui=bold			guifg=LightBlue			guibg=grey80
-
-hi Comment		ctermfg=DarkGrey	ctermbg=White
-" 444499 = darkish blue grey
-hi Comment		guifg=#444499
-
-hi Constant		term=underline
-hi Constant		ctermfg=Magenta
-hi Constant		guifg=#7070a0
-
-hi Statement	term=bold
-hi Statement	cterm=bold			ctermfg=DarkGreen		ctermbg=White
-hi Statement	guifg=DarkGreen		gui=bold
-
-hi identifier	ctermfg=DarkGreen
-hi identifier	guifg=DarkGreen
-
-hi preproc		ctermfg=DarkGreen
-hi preproc		guifg=#408040
-
-hi type			ctermfg=DarkBlue
-hi type			guifg=DarkBlue
-
-hi label		ctermfg=yellow
-hi label		guifg=#c06000
-
-hi operator		ctermfg=darkYellow
-hi operator		guifg=DarkGreen		gui=bold
-
-hi StorageClass	ctermfg=DarkRed			ctermbg=White
-hi StorageClass	guifg=#a02060			gui=bold
-
-hi Number		ctermfg=Blue		ctermbg=White
-hi Number		guifg=Blue
-
-hi Special		term=bold
-hi Special		ctermfg=LightRed
-hi Special		guifg=#aa8822
-
-hi Cursor		ctermbg=DarkMagenta
-hi Cursor		guibg=#880088		guifg=LightGrey
-
-hi lCursor		guibg=Cyan			guifg=Black
-
-hi ErrorMsg		term=standout
-hi ErrorMsg		ctermbg=DarkRed		ctermfg=White
-hi ErrorMsg		guibg=DarkRed		guifg=White
-
-hi DiffText		term=reverse
-hi DiffText		cterm=bold			ctermbg=DarkRed
-hi DiffText		gui=bold			guibg=DarkRed
-
-hi Directory	term=bold
-hi Directory	ctermfg=LightRed
-hi Directory	guifg=Red gui=underline
-
-hi LineNr		term=underline
-hi LineNr		ctermfg=Yellow
-hi LineNr		guifg=#ccaa22
-
-hi MoreMsg		term=bold
-hi MoreMsg		ctermfg=LightGreen
-hi MoreMsg		gui=bold			guifg=SeaGreen
-
-hi Question		term=standout
-hi Question		ctermfg=LightGreen
-hi Question		gui=bold			guifg=DarkGreen
-
-hi Search		term=reverse
-hi Search		ctermbg=DarkYellow	ctermfg=Black
-hi Search		guibg=#887722		guifg=Black
-
-hi SpecialKey	term=bold
-hi SpecialKey	ctermfg=LightBlue
-hi SpecialKey	guifg=Blue
-
-hi SpecialChar	ctermfg=DarkGrey	ctermbg=White
-hi SpecialChar	guifg=DarkGrey		gui=bold
-
-hi Title		term=bold
-hi Title		ctermfg=LightMagenta
-hi Title		gui=underline			guifg=DarkMagenta
-
-hi WarningMsg	term=standout
-hi WarningMsg	ctermfg=LightRed
-hi WarningMsg	guifg=DarkBlue		guibg=#9999cc
-
-hi WildMenu		term=standout
-hi WildMenu		ctermbg=Yellow		ctermfg=Black
-hi WildMenu		guibg=Yellow		guifg=Black gui=underline
-
-hi Folded		term=standout
-hi Folded		ctermbg=LightGrey	ctermfg=DarkBlue
-hi Folded		guibg=LightGrey		guifg=DarkBlue
-
-hi FoldColumn	term=standout
-hi FoldColumn	ctermbg=LightGrey	ctermfg=DarkBlue
-hi FoldColumn	guibg=Grey			guifg=DarkBlue
-
-hi DiffAdd		term=bold
-hi DiffAdd		ctermbg=DarkBlue
-hi DiffAdd		guibg=DarkBlue
-
-hi DiffChange	term=bold
-hi DiffChange	ctermbg=DarkMagenta
-hi DiffChange	guibg=DarkMagenta
-
-hi DiffDelete	term=bold
-hi DiffDelete	ctermfg=Blue		ctermbg=DarkCyan
-hi DiffDelete	gui=bold			guifg=Blue			guibg=DarkCyan
-
-hi Ignore		ctermfg=LightGrey
-hi Ignore		guifg=grey90
-
-hi IncSearch	term=reverse
-hi IncSearch	cterm=reverse
-hi IncSearch	gui=reverse
-
-hi ModeMsg		term=bold
-hi ModeMsg		cterm=bold
-hi ModeMsg		gui=bold
-
-hi StatusLine	term=reverse,bold
-hi StatusLine	cterm=reverse,bold
-hi StatusLine	gui=reverse,bold
-
-hi StatusLineNC	term=reverse
-hi StatusLineNC	cterm=reverse
-hi StatusLineNC	gui=reverse
-
-hi VertSplit	term=reverse
-hi VertSplit	cterm=reverse
-hi VertSplit	gui=reverse
-
-hi Visual		term=reverse
-hi Visual		cterm=reverse
-hi Visual		gui=reverse			guifg=DarkGrey		guibg=fg
-
-hi VisualNOS	term=underline,bold
-hi VisualNOS	cterm=underline,bold
-hi VisualNOS	gui=underline,bold
-
-hi Todo			gui=reverse
-
-" vim: sw=2
diff --git a/colors/fokus.vim b/colors/fokus.vim
deleted file mode 100755
index 8f99b08..0000000
--- a/colors/fokus.vim
+++ /dev/null
@@ -1,168 +0,0 @@
-" Vim color file
-"
-" Name: fokus
-" Maintainer: Mohammad Satrio <http://tyok.org>
-" Version: 0.3
-" Last Change: February 7th, 2011
-"
-" Edited from fruit color scheme by Tiza, version 1.3
-" This color scheme uses a light background.
-
-hi clear
-
-set background=light
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="fokus"
-
-hi Normal       guifg=#404040 guibg=#F5F3E7
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404040 guibg=#FF99FF
-hi Search       gui=NONE guifg=#404040 guibg=#ffdd99
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi WarningMsg   gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi ModeMsg      gui=NONE guifg=#ff4080 guibg=NONE
-hi MoreMsg      gui=NONE guifg=#009070 guibg=NONE
-hi Question     gui=NONE guifg=#f030d0 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404040
-hi StatusLineNC gui=NONE guibg=#C2C0B7 guifg=#404040
-hi VertSplit    gui=NONE guifg=#c2c0b7 guibg=#c2c0b7
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#ff4080
-
-" Diff
-hi DiffText     gui=NONE guifg=#e04040 guibg=#ffd8d8
-hi DiffChange   gui=NONE guifg=#408040 guibg=#d0f0d0
-hi DiffDelete   gui=NONE guifg=#4848ff guibg=#ffd0ff
-hi DiffAdd      gui=NONE guifg=#4848ff guibg=#ffd0ff
-
-" Cursor
-hi Cursor       gui=NONE guifg=#ffffff guibg=#404040
-hi CursorLine   guibg=#EBE8DC
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#20605c guibg=#b8e8dc
-hi FoldColumn   gui=NONE guifg=#40a098 guibg=#f0f0f0
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#acacac guibg=NONE
-hi NonText      gui=BOLD guifg=#aaaaaa
-hi Pmenu        guifg=#404040 guibg=#FFddF5
-hi PmenuSel     guifg=#ff00aa guibg=#ffffff
-hi SpecialKey   gui=NONE guifg=#4040ff guibg=NONE
-hi Title        gui=NONE guifg=#0050a0 guibg=NONE
-hi Visual       gui=NONE guifg=NONE guibg=#FFddF5
-" hi VisualNOS    gui=NONE guifg=#484848 guibg=#e0e0e0
-
-" Syntax group
-hi Boolean      guifg=#F59300
-hi Comment      gui=NONE guifg=#D998C2 guibg=NONE
-hi Constant     gui=NONE guifg=#ff4080 guibg=NONE
-hi Delimiter    gui=NONE guifg=#99cc66
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff4080
-hi Function     guifg=#dd2222
-hi Identifier   gui=NONE guifg=#0070e6 guibg=NONE
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi MatchParen   gui=BOLD guifg=#ffffff guibg=#ff4080
-hi PreProc      gui=NONE guifg=#7AA1CC guibg=NONE
-hi Special      gui=NONE guifg=#ff9900 guibg=NONE
-hi Statement    gui=NONE guifg=NONE guibg=NONE
-"#f030d0
-hi String       guifg=#889D52
-hi Todo         gui=UNDERLINE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=NONE guifg=#8955A3 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
-
-hi Conditional  guifg=#3399ff
-hi Repeat       guifg=#0000ff
-"hi link Operator Normal
-hi Operator guifg=#CC7A7A
-
-" tree
-hi link treePart Comment
-hi link treePartFile treePart
-hi link treeOpenable treePart
-hi link treeClosable treeOpenable
-hi link treeExecFile rubyRegexp
-
-" html
-hi link htmlTag xmlTag
-hi link htmlTagName xmlTagName
-hi link htmlEndTag xmlEndTag
-hi link htmlArg xmlAttrib
-hi link htmlString xmlString
-hi link htmlTagN htmlTagName
-hi link htmlSpecialTagName htmlTagName
-
-hi xmlTag guifg=#bbbbbb
-hi xmlTagName guifg=#CC7A7A
-hi link xmlEndTag xmlTag
-hi link xmlAttrib PreProc
-hi xmlString guifg=#888888
-
-" javascript
-hi javaScriptParens guifg=#bbbbbb
-hi link javaScriptBraces javaScriptFunction
-
-" ruuubyyyy
-hi link rubyDefine PreProc
-hi link rubyIdentifier Identifier
-hi railsClass guifg=#ff4080
-hi link rubyConditional Conditional
-hi link rubyInstanceVariable Type
-hi link rubyClassVariable rubyInstanceVariable
-hi link rubyBeginEnd rubyIdentifier
-hi link rubyBlockParameterList rubyBlockParameter
-hi link rubyConstant Constant
-hi link rubyControl rubyBeginEnd
-hi link rubyInterpolationDelimiter Comment
-hi link rubyOptionalDo rubyBeginEnd
-hi link rubyOperator Operator
-hi link rubyPseudoVariable rubyBoolean
-hi link rubyStringEscape Normal
-hi rubySymbol guifg=#27A3A3
-hi link railsMethod xmlTagName
-hi rubyAccess guifg=#855A76 guibg=#F5D7EB
-hi rubyRegexp guifg=#D63267
-hi link rubyRegexpDelimiter rubyRegexp
-hi rubyRegexpSpecial guifg=#D63267
-hi link cucumberWhenTable String
-hi link cucumberThenTable cucumberWhenTable
-hi link cucumberThen railsClass
-hi link cucumberWhen Conditional
-hi link cucumberGiven Type
-hi link cucumberScenario Function
-hi link cucumberFeature Function
-
-" php
-hi link phpQuoteSingle Delimiter
-hi link phpQuotedouble Delimiter
-hi link phpIdentifier Normal
-hi link phpVarSelector Comment
-hi link phpEcho phpFunctions
-hi link phpFunctions xmlTagName
-hi link phpDefineFuncName Function
-hi link phpDefineMethodName Function
-hi phpDefineClassName guifg=#ff4080
-hi phpStructureHere guifg=#ff4080
-hi link phpRelation phpOperator
-hi link phpBoolean Boolean
-hi link phpSuperGlobal Type
-hi link phpArray phpFunctions
-hi phpStringDouble guifg=#009900
-hi phpParent guifg=#B8CDE6
-hi link phpBrace phpParent
-hi link phpSemicolon phpParent
diff --git a/colors/forneus.vim b/colors/forneus.vim
deleted file mode 100755
index 4e98142..0000000
--- a/colors/forneus.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "forneus"
-
-hi Normal          ctermfg=15 ctermbg=0 guifg=#EEEEEE guibg=#111111
- 
-hi SpecialKey      cterm=bold ctermfg=4 gui=bold guifg=#0000BB
-hi NonText         cterm=bold ctermfg=4 gui=bold guifg=#000099
-hi Directory       ctermfg=33	guifg=#0087ff	
-hi ErrorMsg        cterm=bold ctermfg=1 ctermbg=0 gui=bold guifg=#000000 guibg=#CC0000
-hi IncSearch       cterm=bold ctermfg=0 ctermbg=40 guifg=#00d700 guibg=#000000
-hi Search          ctermfg=0 ctermbg=40 guibg=#00d700
-hi MoreMsg         cterm=bold ctermfg=2 
-hi ModeMsg         cterm=bold ctermfg=38 guifg=#00afd7
-hi LineNr          ctermfg=105 ctermbg=235 guifg=#8787ff guibg=#262626
-hi Question        cterm=bold ctermfg=1 ctermbg=0  
-hi StatusLine      ctermfg=239 ctermbg=232 guifg=#4e4e4e guibg=#080808
-hi StatusLineNC    ctermfg=239 ctermbg=235 guifg=#4e4e4e guibg=#262626
-hi VertSplit       ctermfg=239 ctermbg=4 guifg=#4e4e4e
-hi Title           cterm=bold ctermfg=2 gui=bold guifg=#00CC00
-hi Visual          ctermfg=NONE ctermbg=237 guibg=#3a3a3a
-hi VisualNOS       cterm=bold,underline
-hi WarningMsg      cterm=bold ctermfg=1 ctermbg=0 
-hi WildMenu        ctermfg=0 ctermbg=2 guibg=#00CC00
-hi Folded          ctermfg=105 ctermbg=235 guifg=#8787ff guibg=#262626
-hi FoldColumn      ctermfg=39 ctermbg=235 guifg=#00afff guibg=#262626
-hi DiffAdd         ctermfg=79 ctermbg=20 guifg=#5fd7af guibg=#0000d7
-hi DiffChange      ctermfg=252 ctermbg=54 guifg=#dadada guibg=#5f0087
-hi DiffDelete      ctermfg=7 ctermbg=1 guifg=#999999 guibg=#CC0000  
-hi DiffText        ctermfg=7 ctermbg=1 guifg=#ffffff guibg=#DD0000 
-hi SignColumn      ctermfg=105 ctermbg=235 guifg=#8787ff guibg=#262626
-hi SpellBad        cterm=NONE
-hi SpellCap        cterm=NONE
-hi SpellRare       cterm=NONE
-hi SpellLocal      cterm=NONE
-hi Pmenu           cterm=NONE
-hi PmenuSel        cterm=bold 
-hi PmenuSbar       cterm=bold
-hi PmenuThumb      cterm=bold 
-hi TabLine         cterm=NONE ctermfg=15 ctermbg=242 guifg=#000000 guibg=#6c6c6c
-hi TabLineSel      cterm=bold 
-hi TabLineFill     cterm=NONE ctermbg=242 guibg=#6c6c6c
-hi CursorColumn    cterm=NONE ctermbg=234 guibg=#1c1c1c
-hi CursorLine      cterm=NONE ctermbg=234 guibg=#1c1c1c
-hi Cursor		   cterm=NONE
-hi lCursor		   cterm=NONE
-hi MatchParen      term=NONE cterm=NONE ctermfg=0 ctermbg=2 guibg=#00DD00
-hi Comment         cterm=bold ctermfg=6 gui=bold guifg=#00ffff
-hi Constant        cterm=bold ctermfg=40 gui=bold guifg=#00d700 guibg=#000000
-hi Special         ctermfg=63 guifg=#5f5fff
-hi Identifier      ctermfg=131 guifg=#af5f5f
-hi Statement       cterm=bold ctermfg=33 gui=bold guifg=#0087ff
-hi PreProc         cterm=bold ctermfg=40 gui=bold guifg=#00d700
-hi Type            ctermfg=208 guifg=#ff8700
-hi Underlined      cterm=bold ctermfg=1 gui=bold
-hi Ignore          ctermfg=1 guifg=#FF0000
-hi Error           ctermfg=0 ctermbg=1 gui=bold guifg=#000000 guibg=#FF0000
-hi Todo            cterm=bold ctermfg=1 ctermbg=232 gui=bold guifg=#000000 guibg=#FF0000
-hi String          ctermfg=92 gui=bold guifg=#e55b3c 
-hi Number          cterm=bold ctermfg=11 gui=bold guifg=#ffff00
-hi SpecialChar     cterm=underline ctermfg=9 ctermbg=0 gui=underline guifg=#CC0000
-hi SpecialComment  cterm=bold ctermfg=63 gui=bold guifg=#5f5fff
-hi Character       cterm=bold ctermfg=11 gui=bold guifg=#ffff00
-hi Delimiter       guifg=#A55B3C
-
-hi link Boolean         Constant
-hi link Conditional     Statement
-hi link Debug           Special
-hi link Define          PreProc
-hi link Exception       Statement
-hi link Float           Number
-hi link Function        Identifier
-hi link Include         PreProc
-hi link Keyword         Statement
-hi link Label           Statement
-hi link Macro           PreProc
-hi link Operator        Statement
-hi link PreCondit       PreProc
-hi link Repeat          Statement
-hi link StorageClass    Type
-hi link Structure       Type
-hi link Tag             Special
-hi link Typedef         Type
-
-"C specific colors
-hi cLabel cterm=bold,underline ctermfg=23 gui=bold,underline guifg=#005f5f 
-hi TaglistTagName  cterm=bold ctermfg=39 gui=bold guifg=#00afff
-
-"html specific colors
-hi htmlLinke cterm=underline
-hi htmlSpecialChar ctermfg=1
-hi htmlString ctermfg=92
-hi htmlValue ctermfg=35
-
-"ruby specific colors
-hi rubyClassVariable cterm=bold ctermfg=208 guifg=#ff8700
-hi rubyConstant cterm=bold ctermfg=13
-hi rubyDefine cterm=bold ctermfg=33 gui=bold guifg=#0087ff
-hi rubyFunction cterm=bold ctermfg=255 gui=bold guifg=#FFFFFF
-hi rubyGlobalVariable ctermfg=124 guifg=#af0000
-hi rubyInstanceVariable ctermfg=208 guifg=#ff8700
-hi rubyInterpolation cterm=underline ctermfg=9 guifg=#BB0000
-hi rubyInterpolationDelimiter cterm=bold ctermfg=9 guifg=#BB0000
-hi rubyPredefinedConstant  cterm=bold ctermfg=1 
-hi rubyPredefinedVariable  cterm=bold ctermfg=1
-hi rubyPseudoVariable cterm=bold ctermfg=4
-hi rubySymbol ctermfg=89 gui=bold guifg=#6ac825
-
-"eruby specific colors
-hi erubyDelimiter cterm=bold ctermfg=1 guifg=#ee0000
-hi erubyRailsHelperMethod guibg=#333333
diff --git a/colors/freya.vim b/colors/freya.vim
deleted file mode 100755
index a8adbd4..0000000
--- a/colors/freya.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "freya"
-
-hi Normal ctermbg=0 ctermfg=7 cterm=none guibg=#2a2a2a guifg=#dcdccc gui=none
-
-hi Cursor guibg=fg guifg=bg gui=none
-hi CursorColumn guibg=#3f3f3f gui=none
-hi CursorLine guibg=#3f3f3f gui=none
-hi DiffAdd guibg=#008b00 guifg=fg gui=none
-hi DiffChange guibg=#00008b guifg=fg gui=none
-hi DiffDelete guibg=#8b0000 guifg=fg gui=none
-hi DiffText guibg=#0000cd guifg=fg gui=bold
-hi Directory guibg=bg guifg=#d4b064 gui=none
-hi ErrorMsg guibg=bg guifg=#f07070 gui=bold
-hi FoldColumn ctermbg=bg guibg=bg guifg=#c2b680 gui=none
-hi Folded guibg=#101010 guifg=#c2b680 gui=none
-hi IncSearch guibg=#866a4f guifg=fg gui=none
-hi LineNr guibg=bg guifg=#9f8f80 gui=none
-hi ModeMsg guibg=bg guifg=fg gui=bold
-hi MoreMsg guibg=bg guifg=#dabfa5 gui=bold
-hi NonText ctermfg=8 guibg=bg guifg=#9f8f80 gui=bold
-hi Pmenu guibg=#a78869 guifg=#000000 gui=none
-hi PmenuSbar guibg=#B99F86 guifg=fg gui=none
-hi PmenuSel guibg=#c0aa94 guifg=bg gui=none
-hi PmenuThumb guibg=#f7f7f1 guifg=bg gui=none
-hi Question guibg=bg guifg=#dabfa5 gui=bold
-hi Search guibg=#c0aa94 guifg=bg gui=none
-hi SignColumn ctermbg=bg guibg=bg guifg=#c2b680 gui=none
-hi SpecialKey guibg=bg guifg=#d4b064 gui=none
-if has("spell")
-    hi SpellBad guisp=#f07070 gui=undercurl
-    hi SpellCap guisp=#7070f0 gui=undercurl
-    hi SpellLocal guisp=#70f0f0 gui=undercurl
-    hi SpellRare guisp=#f070f0 gui=undercurl
-endif
-hi StatusLine ctermbg=7 ctermfg=0 guibg=#736559 guifg=#f7f7f1 gui=bold
-hi StatusLineNC ctermbg=8 ctermfg=0 guibg=#564d43 guifg=#f7f7f1 gui=none
-hi TabLine guibg=#564d43 guifg=#f7f7f1 gui=underline
-hi TabLineFill guibg=#564d43 guifg=#f7f7f1 gui=underline
-hi TabLineSel guibg=bg guifg=#f7f7f1 gui=bold
-hi Title ctermbg=0 ctermfg=15 guifg=#f7f7f1 gui=bold
-hi VertSplit ctermbg=7 ctermfg=0 guibg=#564d43 guifg=#f7f7f1 gui=none
-if version >= 700
-    hi Visual ctermbg=7 ctermfg=0 guibg=#5f5f5f gui=none
-else
-    hi Visual ctermbg=7 ctermfg=0 guibg=#5f5f5f guifg=fg gui=none
-endif
-hi VisualNOS guibg=bg guifg=#c0aa94 gui=bold,underline
-hi WarningMsg guibg=bg guifg=#f07070 gui=none
-hi WildMenu guibg=#c0aa94 guifg=bg gui=bold
-
-hi Comment guibg=bg guifg=#c2b680 gui=none
-hi Constant guibg=bg guifg=#afe091 gui=none
-hi Error guibg=bg guifg=#f07070 gui=none
-hi Identifier guibg=bg guifg=#dabfa5 gui=none
-hi Ignore guibg=bg guifg=bg gui=none
-hi lCursor guibg=#c0aa94 guifg=bg gui=none
-hi MatchParen guibg=#008b8b gui=none
-hi PreProc guibg=bg guifg=#c2aed0 gui=none
-hi Special guibg=bg guifg=#d4b064 gui=none
-hi Statement guibg=bg guifg=#e0af91 gui=bold
-hi Todo guibg=#aed0ae guifg=bg gui=none
-hi Type guibg=bg guifg=#dabfa5 gui=bold
-hi Underlined guibg=bg guifg=#d4b064 gui=underline
-
-hi htmlBold ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold
-hi htmlItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=italic
-hi htmlUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline
-hi htmlBoldItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,italic
-hi htmlBoldUnderline ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline
-hi htmlBoldUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=bold,underline,italic
-hi htmlUnderlineItalic ctermbg=0 ctermfg=15 guibg=bg guifg=fg gui=underline,italic
diff --git a/colors/frood.vim b/colors/frood.vim
deleted file mode 100755
index 82afe23..0000000
--- a/colors/frood.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-set background=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name = "frood"
-
-hi SpecialKey        guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi NonText           guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi Directory         guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi ErrorMsg          guifg=Black       guibg=Red         ctermfg=Black       ctermbg=Red         gui=NONE      cterm=NONE
-hi IncSearch         guifg=Black       guibg=LightBlue   ctermfg=Black       ctermbg=LightBlue   gui=NONE      cterm=NONE
-hi Search            guifg=Black       guibg=Yellow      ctermfg=Black       ctermbg=Yellow      gui=NONE      cterm=NONE
-hi MoreMsg           guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi ModeMsg           guifg=White       guibg=Black       ctermfg=White       ctermbg=Black       gui=NONE      cterm=NONE
-hi LineNr            guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi Question          guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi StatusLine        guifg=White       guibg=DarkGray    ctermfg=White       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi StatusLineNC      guifg=Black       guibg=DarkGray    ctermfg=Black       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi VertSplit         guifg=Black       guibg=DarkGray    ctermfg=Black       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi Title        NONE
-hi Visual            guifg=Black       guibg=LightBlue   ctermfg=Black       ctermbg=LightBlue   gui=NONE      cterm=NONE
-hi VisualNos         guifg=Black       guibg=LightGreen  ctermfg=Black       ctermbg=LightGreen  gui=NONE      cterm=NONE
-hi WarningMsg        guifg=Red         guibg=Black       ctermfg=Red         ctermbg=Black       gui=NONE      cterm=NONE
-hi WildMenu          guifg=Black       guibg=Gray        ctermfg=Black       ctermbg=Gray        gui=NONE      cterm=NONE
-hi Folded            guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi FoldColumn        guifg=Black       guibg=DarkGray    ctermfg=Black       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi DiffAdd           guifg=Black       guibg=LightGreen  ctermfg=Black       ctermbg=LightGreen  gui=NONE      cterm=NONE
-hi DiffChange        guifg=Black       guibg=LightYellow ctermfg=Black       ctermbg=LightYellow gui=NONE      cterm=NONE
-hi DiffDelete        guifg=Black       guibg=LightRed    ctermfg=Black       ctermbg=LightRed    gui=NONE      cterm=NONE
-hi DiffText          guifg=Black       guibg=LightCyan   ctermfg=Black       ctermbg=LightCyan   gui=NONE      cterm=NONE
-hi SignColumn        guifg=Black       guibg=DarkGray    ctermfg=Black       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi Conceal           guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi SpellBad     NONE                                                                             gui=underline cterm=underline
-hi SpellCap     NONE
-hi SpellRare    NONE
-hi SpellLocal   NONE
-hi Pmenu             guifg=White       guibg=DarkGray    ctermfg=White       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi PmenuSel          guifg=Black       guibg=Gray        ctermfg=Black       ctermbg=Gray        gui=NONE      cterm=NONE
-hi PmenuSbar                           guibg=Gray                            ctermbg=Gray        gui=NONE      cterm=NONE
-hi PmenuThumb                          guibg=White                           ctermbg=White       gui=NONE      cterm=NONE
-hi TabLine           guifg=White       guibg=DarkGray    ctermfg=White       ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi TabLineSel        guifg=Black       guibg=Gray        ctermfg=Black       ctermbg=Gray        gui=NONE      cterm=NONE
-hi TabLineFill                         guibg=DarkGray                        ctermbg=DarkGray    gui=NONE      cterm=NONE
-hi CursorColumn NONE                                                                             gui=reverse   cterm=reverse
-hi CursorLine   NONE                                                                             gui=reverse   cterm=reverse
-hi ColorColumn  NONE                                                                             gui=reverse   cterm=reverse
-hi MatchParen        guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi Normal            guifg=White       guibg=Black       ctermfg=White       ctermbg=Black       gui=NONE      cterm=NONE
-hi Comment           guifg=DarkGray    guibg=Black       ctermfg=DarkGray    ctermbg=Black       gui=NONE      cterm=NONE
-hi Constant          guifg=Magenta     guibg=Black       ctermfg=Magenta     ctermbg=Black       gui=NONE      cterm=NONE
-hi Special           guifg=Magenta     guibg=Black       ctermfg=Magenta     ctermbg=Black       gui=NONE      cterm=NONE
-hi Identifier        guifg=LightGreen  guibg=Black       ctermfg=LightGreen  ctermbg=Black       gui=NONE      cterm=NONE
-hi Statement         guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi PreProc           guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=NONE      cterm=NONE
-hi Type              guifg=LightYellow guibg=Black       ctermfg=LightYellow ctermbg=Black       gui=NONE      cterm=NONE
-hi Underlined        guifg=LightBlue   guibg=Black       ctermfg=LightBlue   ctermbg=Black       gui=underline cterm=underline
-hi Ignore            guifg=Black       guibg=Black       ctermfg=Black       ctermbg=Black       gui=NONE      cterm=NONE
-hi Error             guifg=Black       guibg=Red         ctermfg=Black       ctermbg=Red         gui=NONE      cterm=NONE
-hi Todo              guifg=Red         guibg=Black       ctermfg=Red         ctermbg=Black       gui=NONE      cterm=NONE
diff --git a/colors/fruidle.vim b/colors/fruidle.vim
deleted file mode 100755
index 8066147..0000000
--- a/colors/fruidle.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-" Vim color file
-" Maintainer: Andr�s Su�rez <ansuga@gmail.com> 
-" Last Change: 2009/02/10 Tue 16:55
-"     version: 1.2
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "fruidle"
-
-" Normal
-hi Normal       guifg=#404040 guibg=#ffffff
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404040 guibg=#40ffff
-hi Search       gui=NONE guifg=#404040 guibg=#ffff60
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi WarningMsg   gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi ModeMsg      gui=NONE guifg=#dd0000 guibg=NONE
-hi MoreMsg      gui=NONE guifg=#009070 guibg=NONE
-hi Question     gui=NONE guifg=#ff7700 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404040
-hi StatusLineNC gui=NONE guifg=#a4a4a4 guibg=#404040
-hi VertSplit    gui=NONE guifg=#f8f8f8 guibg=#404040
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#dd0000
-
-" Diff
-hi DiffText     gui=NONE guifg=#e04040 guibg=#ffd8d8
-hi DiffChange   gui=NONE guifg=#408040 guibg=#d0f0d0
-hi DiffDelete   gui=NONE guifg=#4848ff guibg=#ffd0ff
-hi DiffAdd      gui=NONE guifg=#4848ff guibg=#ffd0ff
-
-" Cursor
-hi Cursor       gui=NONE guifg=#0000ff guibg=#00e0ff
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#20605c guibg=#b8e8dc
-hi FoldColumn   gui=NONE guifg=#40a098 guibg=#f0f0f0
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#acacac guibg=NONE
-hi NonText      gui=BOLD guifg=#00a0c0 guibg=#ececec
-hi SpecialKey   gui=NONE guifg=#4040ff guibg=NONE
-hi Title        gui=NONE guifg=#0050a0 guibg=#c0e8ff
-hi Visual       gui=NONE guifg=#484848 guibg=#e0e0e0
-" hi VisualNOS    gui=NONE guifg=#484848 guibg=#e0e0e0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#dd0000 guibg=NONE
-hi Constant     gui=NONE guifg=#0070e6 guibg=NONE
-hi Number       gui=NONE guifg=#aa0094 guibg=NONE
-hi Identifier   gui=NONE guifg=#0070e6 guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#dd0000
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc      gui=BOLD guifg=#e06800 guibg=NONE
-hi Special      gui=NONE guifg=#4a9400 guibg=NONE
-hi Statement    gui=NONE guifg=#ff7700 guibg=NONE
-hi Todo         gui=UNDERLINE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=BOLD guifg=#0070e6 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
-hi Include      gui=BOLD guifg=#dd0000 guibg=NONE 
-hi Function     gui=BOLD guifg=#00aa00 guibg=NONE
-hi String       gui=NONE guifg=#00aa00 ctermfg=1
diff --git a/colors/fruit.vim b/colors/fruit.vim
deleted file mode 100755
index 624b90f..0000000
--- a/colors/fruit.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/08/28 Wed 00:28.
-"     version: 1.3
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "fruit"
-
-hi Normal       guifg=#404040 guibg=#f8f8f8
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404040 guibg=#40ffff
-hi Search       gui=NONE guifg=#404040 guibg=#ffff60
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi WarningMsg   gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi ModeMsg      gui=NONE guifg=#ff4080 guibg=NONE
-hi MoreMsg      gui=NONE guifg=#009070 guibg=NONE
-hi Question     gui=NONE guifg=#f030d0 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404040
-hi StatusLineNC gui=NONE guifg=#a4a4a4 guibg=#404040
-hi VertSplit    gui=NONE guifg=#f8f8f8 guibg=#404040
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#ff4080
-
-" Diff
-hi DiffText     gui=NONE guifg=#e04040 guibg=#ffd8d8
-hi DiffChange   gui=NONE guifg=#408040 guibg=#d0f0d0
-hi DiffDelete   gui=NONE guifg=#4848ff guibg=#ffd0ff
-hi DiffAdd      gui=NONE guifg=#4848ff guibg=#ffd0ff
-
-" Cursor
-hi Cursor       gui=NONE guifg=#0000ff guibg=#00e0ff
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#20605c guibg=#b8e8dc
-hi FoldColumn   gui=NONE guifg=#40a098 guibg=#f0f0f0
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#acacac guibg=NONE
-hi NonText      gui=BOLD guifg=#00a0c0 guibg=#ececec
-hi SpecialKey   gui=NONE guifg=#4040ff guibg=NONE
-hi Title        gui=NONE guifg=#0050a0 guibg=#c0e8ff
-hi Visual       gui=NONE guifg=#484848 guibg=#e0e0e0
-" hi VisualNOS    gui=NONE guifg=#484848 guibg=#e0e0e0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#ff4080 guibg=NONE
-hi Constant     gui=NONE guifg=#8016ff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff4080
-hi Identifier   gui=NONE guifg=#008888 guibg=NONE
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc      gui=NONE guifg=#e06800 guibg=NONE
-hi Special      gui=NONE guifg=#4a9400 guibg=NONE
-hi Statement    gui=NONE guifg=#f030d0 guibg=NONE
-hi Todo         gui=UNDERLINE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=NONE guifg=#0070e6 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
diff --git a/colors/fruity.vim b/colors/fruity.vim
deleted file mode 100755
index 261500c..0000000
--- a/colors/fruity.vim
+++ /dev/null
@@ -1,147 +0,0 @@
-"
-" Fruity Color Scheme
-" ===================
-"
-" Author:   Armin Ronacher <armin.ronacher@active-4.com>
-" Version:  0.2
-"
-set background=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "fruity"
-
-" Default Colors
-hi Normal       guifg=#ffffff   guibg=#111111
-hi NonText      guifg=#444444   guibg=#000000
-hi Cursor       guibg=#aaaaaa
-hi lCursor      guibg=#aaaaaa
-
-" Search
-hi Search       guifg=#800000   guibg=#ffae00
-hi IncSearch    guifg=#800000   guibg=#ffae00
-
-" Window Elements
-hi StatusLine   guifg=#ffffff   guibg=#8090a0   gui=bold
-hi StatusLineNC guifg=#506070   guibg=#a0b0c0
-hi VertSplit    guifg=#a0b0c0   guibg=#a0b0c0
-hi Folded       guifg=#111111   guibg=#8090a0
-hi IncSearch    guifg=#708090   guibg=#f0e68c
-hi Pmenu        guifg=#ffffff   guibg=#cb2f27
-hi SignColumn   guibg=#111111
-hi CursorLine   guibg=#181818
-hi LineNr       guifg=#aaaaaa   guibg=#222222
-
-" Specials
-hi Todo         guifg=#e50808   guibg=#520000   gui=bold
-hi Title        guifg=#ffffff                   gui=bold
-hi Special      guifg=#fd8900
-
-" Syntax Elements
-hi String       guifg=#0086d2
-hi Constant     guifg=#0086d2
-hi Number       guifg=#0086f7                   gui=bold
-hi Statement    guifg=#fb660a                   gui=bold
-hi Function     guifg=#ff0086                   gui=bold
-hi PreProc      guifg=#ff0007                   gui=bold
-hi Comment      guifg=#00d2ff   guibg=#0f140f   gui=italic
-hi Type         guifg=#cdcaa9                   gui=bold
-hi Error        guifg=#ffffff   guibg=#ab0000
-hi Identifier   guifg=#ff0086                   gui=bold
-hi Label        guifg=#ff0086
-
-" Python Highlighting for python.vim
-hi pythonCoding guifg=#ff0086
-hi pythonRun    guifg=#ff0086
-hi pythonBuiltinObj     guifg=#2b6ba2           gui=bold
-hi pythonBuiltinFunc    guifg=#2b6ba2           gui=bold
-hi pythonException      guifg=#ee0000           gui=bold
-hi pythonExClass        guifg=#66cd66           gui=bold
-hi pythonSpaceError     guibg=#270000
-hi pythonDocTest    guifg=#2f5f49
-hi pythonDocTest2   guifg=#3b916a
-hi pythonFunction   guifg=#ee0000               gui=bold
-hi pythonClass      guifg=#ff0086               gui=bold
-
-" JavaScript Highlighting
-hi javaScript                   guifg=#ffffff
-hi javaScriptRegexpString       guifg=#aa6600
-hi javaScriptDocComment         guifg=#aaaaaa
-hi javaScriptCssStyles          guifg=#dd7700
-hi javaScriptDomElemFuncs       guifg=#66cd66
-hi javaScriptHtmlElemFuncs      guifg=#dd7700
-hi javaScriptLabel              guifg=#00bdec   gui=italic
-hi javaScriptPrototype          guifg=#00bdec
-hi javaScriptConditional        guifg=#ff0007   gui=bold
-hi javaScriptRepeat             guifg=#ff0007   gui=bold
-hi javaScriptFunction           guifg=#ff0086   gui=bold
-
-" CSS Highlighting
-hi cssIdentifier            guifg=#66cd66       gui=bold
-hi cssBraces                guifg=#00bdec       gui=bold
-
-" Ruby Highlighting
-hi rubyFunction     guifg=#0066bb               gui=bold
-hi rubyClass        guifg=#ff0086               gui=bold
-hi rubyModule       guifg=#ff0086               gui=bold,underline
-hi rubyKeyword      guifg=#008800               gui=bold
-hi rubySymbol       guifg=#aa6600
-hi rubyIndentifier              guifg=#008aff
-hi rubyGlobalVariable           guifg=#dd7700
-hi rubyConstant                 guifg=#5894d2   gui=bold
-hi rubyBlockParameter           guifg=#66cd66
-hi rubyPredefinedIdentifier     guifg=#555555   gui=bold
-hi rubyString           guifg=#0086d2
-hi rubyStringDelimiter  guifg=#dd7700
-hi rubySpaceError       guibg=#270000
-hi rubyDocumentation    guifg=#aaaaaa
-hi rubyData             guifg=#555555
-
-" XML Highlighting
-hi xmlTag           guifg=#00bdec
-hi xmlTagName       guifg=#00bdec
-hi xmlEndTag        guifg=#00bdec
-hi xmlNamespace     guifg=#00bdec                   gui=underline
-hi xmlAttribPunct   guifg=#cccaa9                   gui=bold
-hi xmlEqual         guifg=#cccaa9                   gui=bold
-hi xmlCdata         guifg=#bf0945                   gui=bold
-hi xmlCdataCdata	guifg=#ac1446   guibg=#23010c   gui=none
-hi xmlCdataStart	guifg=#bf0945                   gui=bold
-hi xmlCdataEnd		guifg=#bf0945                   gui=bold
-
-" HTML Highlighting
-hi htmlTag          guifg=#00bdec               gui=bold
-hi htmlEndTag       guifg=#00bdec               gui=bold
-hi htmlSpecialTagName   guifg=#66cd66
-hi htmlTagName      guifg=#66cd66
-hi htmlTagN         guifg=#66cd66
-hi htmlEvent        guifg=#ffffff
-
-" Django Highlighting
-hi djangoTagBlock   guifg=#ff0007   guibg=#200000   gui=bold
-hi djangoVarBlock   guifg=#ff0007   guibg=#200000
-hi djangoArgument   guifg=#0086d2   guibg=#200000
-hi djangoStatement  guifg=#fb660a   guibg=#200000   gui=bold
-hi djangoComment    guifg=#008800   guibg=#002300   gui=italic
-hi djangoFilter     guifg=#ff0086   guibg=#200000   gui=italic
-
-" Jinja Highlighting
-hi jinjaTagBlock    guifg=#ff0007   guibg=#200000   gui=bold
-hi jinjaVarBlock    guifg=#ff0007   guibg=#200000
-hi jinjaString      guifg=#0086d2   guibg=#200000
-hi jinjaNumber      guifg=#bf0945   guibg=#200000   gui=bold
-hi jinjaStatement   guifg=#fb660a   guibg=#200000   gui=bold
-hi jinjaComment     guifg=#008800   guibg=#002300   gui=italic
-hi jinjaFilter      guifg=#ff0086   guibg=#200000
-hi jinjaRaw         guifg=#aaaaaa   guibg=#200000
-hi jinjaOperator    guifg=#ffffff   guibg=#200000
-hi jinjaVariable    guifg=#92cd35   guibg=#200000
-hi jinjaAttribute   guifg=#dd7700   guibg=#200000
-hi jinjaSpecial     guifg=#008ffd   guibg=#200000
-
-" ERuby Highlighting (for my eruby.vim)
-hi erubyRubyDelim   guifg=#2c8a16                   gui=bold
-hi erubyComment     guifg=#4d9b3a                   gui=italic
diff --git a/colors/fu.vim b/colors/fu.vim
deleted file mode 100755
index 2a96dc4..0000000
--- a/colors/fu.vim
+++ /dev/null
@@ -1,121 +0,0 @@
-" Vim color file
-"
-"         Name: fu.vim
-"      Version: 1.1
-"   Maintainer: Aaron Mueller <mail@aaron-mueller.de>
-" Contributors: Florian Eitel <feitel@indeedgeek.de>
-"               Tinou <tinoucas@gmail.com>
-"
-" This is a compositon from railscast, mustang and xoria256 with a lot of
-" improvemts in the colors. Want to change toe colors to your needs? Go to
-" this page to see what number is set wo what color:
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-"
-" History:
-"   2010-06-09 - Merge changes from Florian Eitel in this file. There was many
-"                whitespace issues and some unused highlight settings which are removed
-"                now. Also merged Tinous GUI version of the whole colorscheme. Thanks a
-"                lot dudes!
-"
-"   2010-06-09 - Initial setup and creation of this file. Additional colors for
-"                Ruby and the diff view are added.
-"
-
-if &t_Co != 256 && ! has("gui_running")
-  echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)"
-  finish
-endif
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "fu"
-
-
-" General colors
-hi Normal         ctermfg=252   ctermbg=234                  guifg=#d0d0d0  guibg=#1c1c1c
-hi CursorColumn                 ctermbg=238                                 guibg=#444444
-hi Cursor                       ctermbg=214                                 guibg=#ffaf00
-hi CursorLine                   ctermbg=238                                 guibg=#444444
-hi FoldColumn     ctermfg=248   ctermbg=bg                   guifg=#a8a8a8  guibg=#000000
-hi Folded         ctermfg=255   ctermbg=60                   guifg=#eeeeee  guibg=#5f5f87
-hi IncSearch      ctermfg=0     ctermbg=223                  guifg=#000000  guibg=#ffd7af
-hi NonText        ctermfg=248   ctermbg=233   cterm=bold     guifg=#a8a8a8  guibg=#121212
-hi Search         ctermfg=0     ctermbg=149                  guifg=#000000  guibg=#afd75f
-hi SignColumn     ctermfg=248                                guifg=#a8a8a8
-hi SpecialKey     ctermfg=77                                 guifg=#5fd75f
-hi StatusLine     ctermfg=232   ctermbg=255                  guifg=#080808  guibg=#eeeeee
-hi StatusLineNC   ctermfg=237   ctermbg=253                  guifg=#3a3a3a  guibg=#dadada
-hi TabLine        ctermfg=253   ctermbg=237                  guifg=#dadada  guibg=#3a3a3a
-hi TabLineFill    ctermfg=0     ctermbg=0                    guifg=#000000  guibg=#000000
-hi TabLineSel     ctermfg=255   ctermbg=33                   guifg=#eeeeee  guibg=#0087ff
-hi VertSplit      ctermfg=237   ctermbg=237                  guifg=#3a3a3a  guibg=#3a3a3a
-hi Visual         ctermfg=24    ctermbg=153                  guifg=#005f87  guibg=#afd7ff
-hi VIsualNOS      ctermfg=24    ctermbg=153                  guifg=#005f87  guibg=#afd7ff
-hi LineNr         ctermfg=248   ctermbg=232                  guifg=#a8a8a8  guibg=#080808
-hi ModeMsg        ctermfg=220                                guifg=#ffd700
-
-hi ErrorMsg       ctermfg=196   ctermbg=52                   guifg=#ff0000  guibg=#5f0000
-hi SpellBad       ctermfg=196   ctermbg=52
-
-if version >= 700
-  hi CursorLine   ctermbg=236                                               guibg=#303030
-  hi CursorColumn ctermbg=236                                               guibg=#303030
-  hi MatchParen   ctermfg=157   ctermbg=237   cterm=bold     guifg=#afffaf  guibg=#3a3a3a
-  hi Pmenu        ctermfg=255   ctermbg=236                  guifg=#eeeeee  guibg=#303030
-  hi PmenuSel     ctermfg=0     ctermbg=74                   guifg=#000000  guibg=#5fafd7
-  hi PmenuSbar                  ctermbg=243                                 guibg=#767676
-  hi PmenuThumb                 ctermbg=252                                 guibg=#d0d0d0
-  hi WildMenu     ctermfg=255   ctermbg=33                   guifg=#eeeeee  guibg=#0087ff
-endif
-
-" Syntax highlighting
-hi Comment        ctermfg=244                                guifg=#808080
-
-hi Constant       ctermfg=220                 cterm=bold     guifg=#ffd700
-hi String         ctermfg=107   ctermbg=233                  guifg=#87af5f  guibg=#121212
-hi Character      ctermfg=228   ctermbg=16                   guifg=#ffff87  guibg=#000000
-hi Number         ctermfg=214                                guifg=#ffaf00
-hi Boolean        ctermfg=148                                guifg=#afd700
-
-hi Identifier     ctermfg=149                                guifg=#afd75f
-hi Function       ctermfg=231                                guifg=#ffffff
-
-hi Statement      ctermfg=103                                guifg=#8787af
-hi Conditional    ctermfg=105                                guifg=#8787ff
-hi Repeat         ctermfg=105                                guifg=#8787ff
-hi Label          ctermfg=105                                guifg=#8787ff
-hi Operator       ctermfg=243                                guifg=#767676
-hi Keyword        ctermfg=190                                guifg=#d7ff00
-hi Exception      ctermfg=166   ctermbg=0                    guifg=#d75f00  guibg=#000000
-
-hi PreProc 		    ctermfg=229                                guifg=#ffffaf
-
-hi Type           ctermfg=111                                guifg=#87afff
-hi Structure      ctermfg=111   ctermbg=233                  guifg=#87afff  guibg=#121212
-
-hi Special        ctermfg=220                                guifg=#ffd700
-hi SpecialComment ctermfg=228   ctermbg=16                   guifg=#ffff87  guibg=#000000
-
-hi Error          ctermfg=196   ctermbg=52                   guifg=#ff0000  guibg=#5f0000
-hi Todo           ctermfg=46    ctermbg=22                   guifg=#00ff00  guibg=#005f00
-
-" Diff
-hi diffAdd        ctermfg=bg    ctermbg=151                  guifg=#afd787
-hi diffDelete     ctermfg=bg    ctermbg=246                  guifg=#d78787
-hi diffChange     ctermfg=bg    ctermbg=181                  guifg=#000000  guibg=#afd7af 
-hi diffText       ctermfg=bg    ctermbg=174   cterm=bold     guifg=#000000  guibg=#949494
-
-" Ruby
-hi rubyBlockParameter        ctermfg=27                      guifg=#005fff
-hi rubyClass                 ctermfg=75                      guifg=#5fafff
-hi rubyConstant              ctermfg=167                     guifg=#d75f5f
-hi rubyInterpolation         ctermfg=107                     guifg=#87af5f
-hi rubyLocalVariableOrMethod ctermfg=189                     guifg=#d7d7ff
-hi rubyPredefinedConstant    ctermfg=167                     guifg=#d75f5f
-hi rubyPseudoVariable        ctermfg=221                     guifg=#ffd75f
-hi rubyStringDelimiter       ctermfg=143                     guifg=#afaf5f
-
diff --git a/colors/gardener.vim b/colors/gardener.vim
deleted file mode 100755
index 4c70e4f..0000000
--- a/colors/gardener.vim
+++ /dev/null
@@ -1,271 +0,0 @@
-" Vim color file
-" Original Maintainer: Anders Korte <anderskorte@eml.cc>
-
-"    Modified: by entheon <jazzworksweb@yahoo.com>
-" Last Change: 13 Sept 2005
-
-" Gardener v1.1
-" A modification of the Guardian colorscheme v1.2
-
-"   'For code surgeons and web gardeners everywhere'
-
-" A nice earthy  color scheme which is easy on  the eyes. It
-" has  as it's  base a  dark background  monocrhomatic khaki
-" scheme with dabs of color thrown  in here and there on the
-" keywords. Plus  lots of  extra config  options so  you can
-" tweak  it to  your liking  and or  make it  more like  the
-" original Guardian scheme. All the defaults are what I like
-" but if you want to change stuff just set the right var and
-" it will change pretty much  immediately, you might have to
-" move out of and back into your buffer for it to refresh.
-
-
-" Features:
-"   256 Color XTerm Compatibility
-"   Richer Syntax
-"   Black Background
-"   Functions
-"   No Italics
-"   Purple Booleans
-"   Swapped Status Line Colors
-"   Other minor tweaks
-
-" Change Log:
-"   changed the  ghastly puke  salmon red  to green  like it
-"   should have been in the  first place esp considering the
-"   name  Gardener, now  all  vimsters can  truly frolic  in
-"   their Vim Gardens
-
-" Options:
-"   g:gardener_light_comments
-"       if  this var  exists then  comments are  white on  a
-"       gray-blue  background  if it  is  not  set then  the
-"       comments default  to medium grey with  no background
-"       color, I can't stand bg colors but some people might
-"       like it, so I left it as an option.
-"
-"   g:gardener_soil
-"       This  is a  GUI  only option  because  there are  no
-"       colors that work  even in the 256  color XTerm. This
-"       option gives you a  brownish background instead of a
-"       black background. I think the black background gives
-"       better contrast and thus is  easier to read from. if
-"       you disagree then you've got this option
-"
-"   g:gardener_setnum
-"       turns the background of the line numbers black
-
-" Using The Options:
-"       To enable a feature add the line
-"           let g:gardenter_some_feature=1
-"       to your ~/.vimrc 
-"       To disable the feature temporarily run the command
-"           :unlet g:gardener_some_feature
-"       To  disable the  feature permanently,  simply remove
-"       the line from your .vimrc file.
-
-set background=dark
-hi clear
-syntax reset
-
-if has("gui_running")
-
-" Colors for the User Interface.
-    if exists("g:gardener_setnum")
-        hi linenr           guibg=black       guifg=#808080    gui=bold
-    else
-        hi linenr           guibg=#262626     guifg=#808080    gui=bold
-    endif
-
-    hi Cursor           guibg=#cc4455     guifg=white      gui=bold 
-    hi link             CursorIM Cursor
-    if exists("g:gardener_soil")
-        hi Normal           guibg=#332211     guifg=white      gui=none 
-    else
-        hi Normal           guibg=black       guifg=white      gui=none 
-    endif
-    hi NonText          guibg=#445566     guifg=#ffeecc    gui=bold 
-    hi Visual           guibg=#557799     guifg=white      gui=none 
-
-    hi Directory        guibg=bg	      guifg=#337700    gui=none
-
-    hi IncSearch        guibg=#0066cc     guifg=white      gui=none
-    hi link Seach       IncSearch
-
-    hi SpecialKey       guibg=bg	      guifg=fg         gui=none 
-    hi Titled           guibg=bg	      guifg=fg         gui=none 
-
-    hi ErrorMsg         guibg=bg	      guifg=#ff0000    gui=bold 
-    hi ModeMsg          guibg=bg	      guifg=#ffeecc    gui=none 
-    hi link	            MoreMsg           ModeMsg
-    hi Question         guibg=bg	      guifg=#ccffcc    gui=bold 
-    hi link	            WarningMsg        ErrorMsg
-
-    hi StatusLineNC     guibg=#ffeecc	  guifg=black	   gui=none 
-    hi StatusLine       guibg=#cc4455	  guifg=white	   gui=bold 
-    hi VertSplit        guibg=#ffeecc	  guifg=black	   gui=none 
-
-    hi DiffAdd          guibg=#446688     guifg=fg	       gui=none 
-    hi DiffChange       guibg=#558855     guifg=fg	       gui=none 
-    hi DiffDelete       guibg=#884444     guifg=fg	       gui=none 
-    hi DiffText         guibg=#884444     guifg=fg	       gui=bold 
-
-    " Colors for Syntax Highlighting.
-    if exists("g:gardener_light_comments")
-        hi Comment          guibg=#334455     guifg=#dddddd    gui=none 
-    else
-        hi Comment          guibg=bg          guifg=#888888    gui=none    
-    endif
-
-
-    hi Define	        guibg=bg          guifg=#66ccdd    gui=bold
-    hi Conditional      guibg=bg          guifg=#aadd55    gui=bold
-
-    hi Constant         guibg=bg          guifg=white	   gui=bold    
-    hi Identifier       guibg=bg          guifg=#ffddaa    gui=none    
-    hi String           guibg=bg          guifg=#ffffcc    gui=none    
-    hi Character        guibg=bg          guifg=#ffffcc    gui=bold    
-    hi Number           guibg=bg          guifg=#bbddff    gui=bold    
-    hi Boolean          guibg=bg          guifg=#ff55ff    gui=bold    
-    hi Float            guibg=bg          guifg=#bbddff    gui=bold    
-
-    hi Function         guibg=bg          guifg=#ffffaa    gui=bold    
-    hi Statement        guibg=bg          guifg=#ffffcc    gui=bold    
-
-    hi Repeat           guibg=bg          guifg=#ff9900    gui=bold    
-    hi Label            guibg=bg          guifg=#ffccff    gui=bold    
-    hi Operator         guibg=bg          guifg=#cc9966    gui=bold    
-    hi Keyword          guibg=bg          guifg=#66ffcc    gui=bold    
-    hi Exception        guibg=bg          guifg=#66ffcc    gui=bold    
-
-    hi PreProc	        guibg=bg          guifg=#ffcc99    gui=bold    
-    hi Include	        guibg=bg          guifg=#99cc99    gui=bold    
-    hi link Macro	  Include
-    hi link PreCondit Include
-
-    hi Type		        guibg=bg	      guifg=#ccffaa    gui=bold    
-    hi Structure	    guibg=bg	      guifg=#99ff99    gui=bold    
-    hi Typedef	        guibg=bg	      guifg=#99cc99    gui=italic  
-
-    hi StorageClass	    guibg=bg	      guifg=#99cc99    gui=bold    
-    hi Special	        guibg=bg	      guifg=#bbddff	   gui=bold    
-    hi SpecialChar	    guibg=bg	      guifg=#bbddff	   gui=bold    
-    hi Tag		        guibg=bg	      guifg=#bbddff	   gui=bold    
-    hi Delimiter	    guibg=bg	      guifg=fg	       gui=bold    
-    hi SpecialComment   guibg=#334455     guifg=#dddddd	   gui=italic  
-    hi Debug	        guibg=bg          guifg=#ff9999	   gui=none    
-
-    hi Underlined       guibg=bg          guifg=#99ccff    gui=underline
-
-    hi Title            guibg=#445566     guifg=white	   gui=bold    
-    hi Ignore           guibg=bg	      guifg=#cccccc    gui=italic  
-    hi Error            guibg=#ff0000     guifg=white	   gui=bold    
-    hi Todo	            guibg=#556677     guifg=#ff0000    gui=bold    
-
-    hi htmlH1           guibg=bg          guifg=#ffffff    gui=bold
-    hi htmlH2           guibg=bg          guifg=#dadada    gui=bold
-    hi htmlH3           guibg=bg          guifg=#c6c6c6    gui=bold
-    hi htmlH4           guibg=bg          guifg=#b2b2b2    gui=bold
-    hi htmlH5           guibg=bg          guifg=#9e9e9e    gui=bold
-    hi htmlH6           guibg=bg          guifg=#8a8a8a    gui=bold
-
-else
-" Colors for the User Interface.
-
-    if exists("g:gardener_setnum")
-        exec "hi linenr     cterm=BOLD   ctermfg=235   ctermbg=244"
-    else
-        exec "hi linenr     cterm=BOLD   ctermfg=244   ctermbg=235"
-    endif
-
-
-    exec "hi Cursor         cterm=BOLD   ctermfg=255   ctermbg=167"
-    exec "hi CursorIM       cterm=BOLD   ctermfg=255   ctermbg=167"
-
-    exec "hi Normal         cterm=NONE   ctermfg=255   ctermbg=233"
-    exec "hi NonText        cterm=NONE   ctermfg=230   ctermbg=60"
-    exec "hi Visual         cterm=NONE   ctermfg=255   ctermbg=68"
-
-    exec "hi Linear         cterm=NONE   ctermfg=248   ctermbg=NONE"
-
-    exec "hi Directory      cterm=NONE   ctermfg=64    ctermbg=NONE"
-
-    exec "hi IncSearch      cterm=NONE   ctermfg=255   ctermbg=25"
-
-    exec "hi ErrorMsg       cterm=BOLD   ctermfg=196   ctermbg=NONE"
-    exec "hi WarningMsg     cterm=BOLD   ctermfg=196   ctermbg=NONE"
-    exec "hi ModeMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
-    exec "hi MoreMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
-    exec "hi Question       cterm=NONE   ctermfg=194   ctermbg=NONE"
-
-    exec "hi StatusLineNC   cterm=NONE   ctermfg=16    ctermbg=229"
-    exec "hi StatusLine     cterm=BOLD   ctermfg=255   ctermbg=167"
-    exec "hi VertSplit      cterm=NONE   ctermfg=16    ctermbg=229"
-
-    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=60"
-    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=65"
-    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=95"
-    exec "hi DiffAdd        cterm=BOLD   ctermfg=255   ctermbg=95"
-
-    " Colors for Syntax Highlighting.
-    if exists("g:gardener_light_comments")
-        exec "hi Comment        cterm=NONE   ctermfg=253   ctermbg=60"
-    else
-        exec "hi Comment        cterm=NONE   ctermfg=244   ctermbg=NONE"
-    endif
-
-    exec "hi Constant       cterm=BOLD   ctermfg=255  ctermbg=NONE"
-    exec "hi String         cterm=NONE   ctermfg=230  ctermbg=NONE"
-    exec "hi Character      cterm=BOLD   ctermfg=230  ctermbg=NONE"
-    exec "hi Number         cterm=BOLD   ctermfg=153  ctermbg=NONE"
-    exec "hi Boolean        cterm=NONE   ctermfg=207  ctermbg=NONE"
-    exec "hi Float          cterm=BOLD   ctermfg=153  ctermbg=NONE"
-
-    exec "hi Identifier     cterm=NONE   ctermfg=223  ctermbg=NONE"
-    exec "hi Function       cterm=BOLD   ctermfg=229  ctermbg=NONE"
-    exec "hi Statement      cterm=BOLD   ctermfg=230  ctermbg=NONE"
-
-    exec "hi Define         cterm=BOLD   ctermfg=68  ctermbg=NONE"
-    exec "hi Conditional    cterm=BOLD   ctermfg=149  ctermbg=NONE"
-
-    exec "hi Repeat         cterm=BOLD   ctermfg=208  ctermbg=NONE"
-    exec "hi Label          cterm=BOLD   ctermfg=225  ctermbg=NONE"
-    exec "hi Operator       cterm=BOLD   ctermfg=173  ctermbg=NONE"
-    exec "hi Keyword        cterm=BOLD   ctermfg=86   ctermbg=NONE"
-    exec "hi Exception      cterm=BOLD   ctermfg=86   ctermbg=NONE"
-
-    exec "hi PreProc        cterm=BOLD   ctermfg=222   ctermbg=NONE"
-    exec "hi Include        cterm=BOLD   ctermfg=114   ctermbg=NONE"
-    exec "hi Macro          cterm=BOLD   ctermfg=114   ctermbg=NONE"
-    exec "hi PreCondit      cterm=BOLD   ctermfg=114   ctermbg=NONE"
-
-    exec "hi Type           cterm=BOLD   ctermfg=193   ctermbg=NONE"
-    exec "hi StorageClass   cterm=BOLD   ctermfg=78    ctermbg=NONE"
-    exec "hi Structure      cterm=BOLD   ctermfg=114   ctermbg=NONE"
-    exec "hi Typedef        cterm=BOLD   ctermfg=114   ctermbg=NONE"
-
-    exec "hi Special        cterm=BOLD   ctermfg=153   ctermbg=NONE"
-    exec "hi SpecialChar    cterm=BOLD   ctermfg=153   ctermbg=NONE"
-    exec "hi Tag            cterm=BOLD   ctermfg=153   ctermbg=NONE"
-    exec "hi Delimiter      cterm=BOLD   ctermfg=255   ctermbg=NONE"
-    exec "hi SpecialComment cterm=BOLD   ctermfg=253   ctermbg=24"
-    exec "hi Debug          cterm=NONE   ctermfg=210   ctermbg=NONE"
-
-    exec "hi Title          cterm=BOLD   ctermfg=255   ctermbg=60"
-    exec "hi Ignore         cterm=NONE   ctermfg=251   ctermbg=NONE"
-    exec "hi Error          cterm=NONE   ctermfg=255   ctermbg=196"
-    exec "hi Ignore         cterm=NONE   ctermfg=196   ctermbg=60"
-
-    exec "hi htmlH1         cterm=BOLD   ctermfg=255   ctermbg=NONE"
-    exec "hi htmlH2         cterm=BOLD   ctermfg=253   ctermbg=NONE"
-    exec "hi htmlH3         cterm=BOLD   ctermfg=251   ctermbg=NONE"
-    exec "hi htmlH4         cterm=BOLD   ctermfg=249   ctermbg=NONE"
-    exec "hi htmlH5         cterm=BOLD   ctermfg=247   ctermbg=NONE"
-    exec "hi htmlH6         cterm=BOLD   ctermfg=245   ctermbg=NONE"
-
-endif
-" And finally.
-
-let g:colors_name = "gardener"
-let colors_name   = "gardener"
-
diff --git a/colors/gemcolors.vim b/colors/gemcolors.vim
deleted file mode 100755
index 22eec67..0000000
--- a/colors/gemcolors.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" Vim color file
-" Maintainer: Jason Lee <huacnlee@gmail.com>
-" Website: http://huacnlee.com
-" Last Change: 2009/11/20
-"     version: 1.0
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "gemcolors"
-
-" Normal
-hi Normal       guifg=#F8F8F8 guibg=#141414
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#F8F8F8 guibg=#4A9400
-hi Search       gui=NONE guifg=#F8F8F8 guibg=#4A9400
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi WarningMsg   gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi ModeMsg      gui=NONE guifg=#dd0000 guibg=NONE
-hi MoreMsg      gui=NONE guifg=#009070 guibg=NONE
-hi Question     gui=NONE guifg=#ff7700 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#F8F8F8 guibg=#2F2F2F
-hi StatusLineNC gui=NONE guifg=#a4a4a4 guibg=#2F2F2F
-hi VertSplit    gui=NONE guifg=#F8F8F8 guibg=#2F2F2F
-hi WildMenu     gui=NONE guifg=#F8F8F8 guibg=#dd0000
-
-" Diff
-hi DiffText     gui=NONE guifg=#e04040 guibg=#ffd8d8
-hi DiffChange   gui=NONE guifg=#408040 guibg=#d0f0d0
-hi DiffDelete   gui=NONE guifg=#4848ff guibg=#ffd0ff
-hi DiffAdd      gui=NONE guifg=#4848ff guibg=#ffd0ff
-
-" Cursor
-hi Cursor       gui=NONE guifg=#F8F8F8 guibg=#C03030
-hi CursorLine   guifg=#F9F9F9 guibg=#C03030
-hi lCursor      gui=NONE guifg=#F8F8F8 guibg=#C03030
-hi CursorIM     gui=NONE guifg=#F8F8F8 guibg=#C03030
-
-" Fold
-hi Folded       gui=NONE guifg=#F9F9F9 guibg=#6C1B1B
-hi FoldColumn   gui=NONE guifg=#40a098 guibg=#f0f0f0
-
-" Other
-hi Directory    gui=NONE guifg=#9B703F guibg=NONE
-hi LineNr       gui=NONE guifg=#acacac guibg=NONE
-hi NonText      gui=NONE guifg=#00a0c0 guibg=NONE
-hi SpecialKey   gui=NONE guifg=#4040ff guibg=NONE
-hi Title        gui=NONE guifg=#F8F8F8 guibg=NONE
-hi Visual       gui=NONE guifg=#FFFFFF guibg=#C03030
-" hi VisualNOS    gui=NONE guifg=#484848 guibg=#e0e0e0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#494949 guibg=NONE
-hi Constant     gui=NONE guifg=#8f9d6a guibg=NONE
-hi Number       gui=NONE guifg=#C03030 guibg=NONE
-hi Identifier   gui=NONE guifg=#8f9d6a guibg=NONE
-hi Error        gui=NONE guifg=#ffffff guibg=#dd0000
-hi Ignore       gui=NONE guifg=#F8F8F8 guibg=NONE
-hi PreProc      gui=NONE guifg=#CDA869 guibg=NONE
-hi Special      gui=NONE guifg=#4a9400 guibg=NONE
-hi Statement    gui=NONE guifg=#ff7700 guibg=NONE
-hi Todo         gui=UNDERLINE guifg=#FFFFFF guibg=#9b703f
-hi Type         gui=NONE guifg=#F9EE98 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
-hi Include      gui=NONE guifg=#dd0000 guibg=NONE 
-hi Function     gui=NONE guifg=#9B703F guibg=NONE
-hi String       gui=NONE guifg=#C03030 
-
-hi Pmenu          guifg=#E3CEA9         guibg=#494949
-hi PmenuSel       guifg=#000000         guibg=#9B703F
-
-hi xmlTag                    guifg=#E8BF6A ctermfg=179
-hi xmlTagName                guifg=#E8BF6A ctermfg=179
-hi xmlEndTag                 guifg=#E8BF6A ctermfg=179
-hi link htmlTag                     xmlTag
-hi link htmlTagName                 xmlTagName
-hi link htmlEndTag                  xmlEndTag
-
-
diff --git a/colors/gentooish.vim b/colors/gentooish.vim
deleted file mode 100755
index 5e27572..0000000
--- a/colors/gentooish.vim
+++ /dev/null
@@ -1,144 +0,0 @@
-" Vim color file
-" Name:    gentooish.vim
-" Author:  Brian Carper<brian@briancarper.net>
-" Version: 0.4
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-
-hi Normal gui=NONE   guifg=#cccccc   guibg=#191919 ctermfg=252 ctermbg=234
-hi IncSearch gui=NONE   guifg=#000000   guibg=#8bff95 term=reverse ctermfg=16 ctermbg=120
-hi Search gui=NONE   guifg=#cccccc   guibg=#863132 term=reverse ctermfg=252 ctermbg=95
-hi ErrorMsg gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95
-hi WarningMsg gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95
-hi ModeMsg gui=NONE   guifg=#cccccc   guibg=NONE term=bold ctermfg=252
-hi MoreMsg gui=NONE   guifg=#cccccc   guibg=NONE term=bold ctermfg=252
-hi Question gui=NONE   guifg=#cccccc   guibg=NONE term=standout ctermfg=252
-hi StatusLine gui=BOLD   guifg=#cccccc   guibg=#333333 term=bold,reverse cterm=bold ctermfg=252 ctermbg=236
-hi User1 gui=BOLD   guifg=#999999   guibg=#333333 cterm=bold ctermfg=246 ctermbg=236
-hi User2 gui=BOLD   guifg=#8bff95   guibg=#333333 cterm=bold ctermfg=120 ctermbg=236
-hi StatusLineNC gui=NONE   guifg=#999999   guibg=#333333 term=reverse cterm=bold ctermfg=240 ctermbg=236
-hi VertSplit gui=NONE   guifg=#cccccc   guibg=#333333 term=reverse ctermfg=252 ctermbg=236
-hi WildMenu gui=BOLD   guifg=#cf7dff   guibg=#1F0F29 term=standout cterm=bold ctermfg=177 ctermbg=16
-hi DiffText gui=NONE   guifg=#000000  guibg=#4cd169 term=reverse ctermfg=16 ctermbg=77
-hi DiffChange gui=NONE   guifg=NONE     guibg=#541691 term=bold ctermbg=54
-hi DiffDelete gui=NONE   guifg=#cccccc  guibg=#863132 term=bold ctermfg=252 ctermbg=95
-hi DiffAdd gui=NONE   guifg=#cccccc  guibg=#306d30 term=bold ctermfg=252 ctermbg=59
-hi Cursor gui=NONE   guifg=#000000   guibg=#8bff95 ctermfg=16 ctermbg=120
-hi Folded gui=NONE   guifg=#aaa400   guibg=#000000 term=standout ctermfg=142 ctermbg=16
-hi FoldColumn gui=NONE   guifg=#cccccc   guibg=#000000 term=standout ctermfg=252 ctermbg=16
-hi Directory gui=NONE   guifg=#8bff95   guibg=NONE term=bold ctermfg=120
-hi LineNr gui=NONE   guifg=#bbbbbb   guibg=#222222 term=underline ctermfg=250 ctermbg=235
-hi NonText gui=NONE   guifg=#555555   guibg=NONE term=bold ctermfg=240
-hi SpecialKey gui=NONE   guifg=#6f6f2f   guibg=NONE term=bold ctermfg=58
-hi Title gui=NONE   guifg=#9a383a   guibg=NONE term=bold ctermfg=95
-hi Comment gui=NONE   guifg=#666666   guibg=NONE term=bold ctermfg=241
-hi Constant gui=NONE   guifg=#b8bb00   guibg=NONE term=underline ctermfg=142
-hi Boolean gui=NONE   guifg=#00ff00   guibg=NONE ctermfg=46 ctermfg=46
-hi String gui=NONE   guifg=#5dff9e   guibg=#0f291a ctermfg=85 ctermbg=16 ctermfg=85 ctermbg=16
-hi Error gui=NONE   guifg=#990000   guibg=#000000 term=reverse ctermfg=88 ctermbg=16 term=reverse ctermfg=88 ctermbg=16
-hi Identifier gui=NONE   guifg=#4cbbd1   guibg=NONE term=underline ctermfg=74 term=underline ctermfg=74
-hi Ignore gui=NONE   guifg=#555555 ctermfg=240 ctermfg=240
-hi Number gui=NONE   guifg=#ddaa66   guibg=NONE ctermfg=179 ctermfg=179
-hi PreProc gui=NONE   guifg=#9a383a   guibg=NONE term=underline ctermfg=95 term=underline ctermfg=95
-hi Special gui=NONE   guifg=#ffcd8b   guibg=NONE term=bold ctermfg=222 term=bold ctermfg=222
-hi Statement gui=NONE   guifg=#4cd169   guibg=NONE term=bold ctermfg=77 term=bold ctermfg=77
-hi Todo gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95 term=standout ctermfg=252 ctermbg=95
-hi Type gui=NONE   guifg=#c476f1   guibg=NONE term=underline ctermfg=177 term=underline ctermfg=177
-hi Underlined gui=UNDERLINE   guifg=#cccccc   guibg=NONE term=underline cterm=underline ctermfg=252 term=underline cterm=underline ctermfg=252
-hi Visual gui=reverse guifg=#6e4287   guibg=#ffffff term=reverse ctermfg=231 ctermbg=60
-hi VisualNOS gui=NONE   guifg=#cccccc   guibg=#000000 term=bold,underline ctermfg=252 ctermbg=16
-hi CursorLine gui=NONE   guifg=NONE      guibg=#222222 term=underline ctermbg=235
-hi CursorColumn gui=NONE   guifg=NONE      guibg=#222222 term=reverse ctermbg=235
-hi lispList gui=NONE   guifg=#555555
-hi Pmenu gui=NONE   guifg=#cccccc   guibg=#222222 ctermfg=252 ctermbg=235
-hi PMenuSel gui=BOLD   guifg=#c476f1   guibg=#000000
-hi PmenuSbar gui=NONE   guifg=#cccccc   guibg=#000000 ctermfg=252 ctermbg=16
-hi PmenuThumb gui=NONE   guifg=#cccccc   guibg=#333333 ctermfg=252 ctermbg=236
-hi SpellBad gui=undercurl guisp=#cc6666 term=reverse cterm=undercurl ctermfg=167
-hi SpellRare gui=undercurl guisp=#cc66cc term=reverse cterm=undercurl ctermfg=170
-hi SpellLocal gui=undercurl guisp=#cccc66 term=underline cterm=undercurl ctermfg=185
-hi SpellCap gui=undercurl guisp=#66cccc term=reverse cterm=undercurl ctermfg=80
-hi MatchParen gui=NONE      guifg=#ffffff   guibg=#005500 term=reverse ctermfg=231 ctermbg=22
-hi SpecialKey gui=NONE   guifg=#6f6f2f   guibg=NONE term=bold ctermfg=58
-hi NonText gui=NONE   guifg=#555555   guibg=NONE term=bold ctermfg=240
-hi Directory gui=NONE   guifg=#8bff95   guibg=NONE term=bold ctermfg=120
-hi ErrorMsg gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95
-hi IncSearch gui=NONE   guifg=#000000   guibg=#8bff95 term=reverse ctermfg=16 ctermbg=120
-hi Search gui=NONE   guifg=#cccccc   guibg=#863132 term=reverse ctermfg=252 ctermbg=95
-hi MoreMsg gui=NONE   guifg=#cccccc   guibg=NONE term=bold ctermfg=252
-hi ModeMsg gui=NONE   guifg=#cccccc   guibg=NONE term=bold ctermfg=252
-hi LineNr gui=NONE   guifg=#bbbbbb   guibg=#222222 term=underline ctermfg=250 ctermbg=235
-hi Question gui=NONE   guifg=#cccccc   guibg=NONE term=standout ctermfg=252
-hi StatusLine gui=BOLD   guifg=#cccccc   guibg=#333333 term=bold,reverse cterm=bold ctermfg=252 ctermbg=236
-hi StatusLineNC gui=NONE   guifg=#999999   guibg=#333333 term=reverse cterm=bold ctermfg=240 ctermbg=236
-hi VertSplit gui=NONE   guifg=#cccccc   guibg=#333333 term=reverse ctermfg=252 ctermbg=236
-hi Title gui=NONE   guifg=#9a383a   guibg=NONE term=bold ctermfg=95
-hi Visual gui=reverse guifg=#6e4287   guibg=#ffffff term=reverse ctermfg=231 ctermbg=60
-hi VisualNOS gui=NONE   guifg=#cccccc   guibg=#000000 term=bold,underline ctermfg=252 ctermbg=16
-hi WarningMsg gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95
-hi WildMenu gui=BOLD   guifg=#cf7dff   guibg=#1F0F29 term=standout cterm=bold ctermfg=177 ctermbg=16
-hi Folded gui=NONE   guifg=#aaa400   guibg=#000000 term=standout ctermfg=142 ctermbg=16
-hi FoldColumn gui=NONE   guifg=#cccccc   guibg=#000000 term=standout ctermfg=252 ctermbg=16
-hi DiffAdd gui=NONE   guifg=#cccccc  guibg=#306d30 term=bold ctermfg=252 ctermbg=59
-hi DiffChange gui=NONE   guifg=NONE     guibg=#541691 term=bold ctermbg=54
-hi DiffDelete gui=NONE   guifg=#cccccc  guibg=#863132 term=bold ctermfg=252 ctermbg=95
-hi DiffText gui=NONE   guifg=#000000  guibg=#4cd169 term=reverse ctermfg=16 ctermbg=77
-hi SignColumn  term=standout ctermfg=51 ctermbg=250
-hi SignColumn  term=standout ctermfg=51 ctermbg=250
-hi TabLine  term=underline cterm=underline ctermbg=248
-hi TabLine  term=underline cterm=underline ctermbg=248
-hi TabLineSel  term=bold cterm=bold
-hi TabLineSel  term=bold cterm=bold
-hi TabLineFill  term=reverse ctermfg=234 ctermbg=252
-hi TabLineFill  term=reverse ctermfg=234 ctermbg=252
-hi CursorColumn gui=NONE   guifg=NONE      guibg=#222222 term=reverse ctermbg=235
-hi CursorLine gui=NONE   guifg=NONE      guibg=#222222 term=underline ctermbg=235
-hi Cursor gui=NONE   guifg=#000000   guibg=#8bff95 ctermfg=16 ctermbg=120
-hi lCursor  ctermfg=234 ctermbg=252
-hi lCursor  ctermfg=234 ctermbg=252
-hi Normal gui=NONE   guifg=#cccccc   guibg=#191919 ctermfg=252 ctermbg=234
-hi Comment gui=NONE   guifg=#666666   guibg=NONE term=bold ctermfg=241
-hi Constant gui=NONE   guifg=#b8bb00   guibg=NONE term=underline ctermfg=142
-hi Special gui=NONE   guifg=#ffcd8b   guibg=NONE term=bold ctermfg=222 term=bold ctermfg=222
-hi Identifier gui=NONE   guifg=#4cbbd1   guibg=NONE term=underline ctermfg=74 term=underline ctermfg=74
-hi Statement gui=NONE   guifg=#4cd169   guibg=NONE term=bold ctermfg=77 term=bold ctermfg=77
-hi PreProc gui=NONE   guifg=#9a383a   guibg=NONE term=underline ctermfg=95 term=underline ctermfg=95
-hi Type gui=NONE   guifg=#c476f1   guibg=NONE term=underline ctermfg=177 term=underline ctermfg=177
-hi Underlined gui=UNDERLINE   guifg=#cccccc   guibg=NONE term=underline cterm=underline ctermfg=252 term=underline cterm=underline ctermfg=252
-hi Ignore gui=NONE   guifg=#555555 ctermfg=240 ctermfg=240
-hi Error gui=NONE   guifg=#990000   guibg=#000000 term=reverse ctermfg=88 ctermbg=16 term=reverse ctermfg=88 ctermbg=16
-hi Todo gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95 term=standout ctermfg=252 ctermbg=95
-hi String gui=NONE   guifg=#5dff9e   guibg=#0f291a ctermfg=85 ctermbg=16 ctermfg=85 ctermbg=16
-hi Number gui=NONE   guifg=#ddaa66   guibg=NONE ctermfg=179 ctermfg=179
-hi Boolean gui=NONE   guifg=#00ff00   guibg=NONE ctermfg=46 ctermfg=46
-hi Special gui=NONE   guifg=#ffcd8b   guibg=NONE term=bold ctermfg=222 term=bold ctermfg=222
-hi Identifier gui=NONE   guifg=#4cbbd1   guibg=NONE term=underline ctermfg=74 term=underline ctermfg=74
-hi Statement gui=NONE   guifg=#4cd169   guibg=NONE term=bold ctermfg=77 term=bold ctermfg=77
-hi PreProc gui=NONE   guifg=#9a383a   guibg=NONE term=underline ctermfg=95 term=underline ctermfg=95
-hi Type gui=NONE   guifg=#c476f1   guibg=NONE term=underline ctermfg=177 term=underline ctermfg=177
-hi Underlined gui=UNDERLINE   guifg=#cccccc   guibg=NONE term=underline cterm=underline ctermfg=252
-hi Ignore gui=NONE   guifg=#555555 ctermfg=240 ctermfg=240
-hi Error gui=NONE   guifg=#990000   guibg=#000000 term=reverse ctermfg=88 ctermbg=16 term=reverse ctermfg=88 ctermbg=16
-hi Todo gui=NONE   guifg=#cccccc   guibg=#863132 term=standout ctermfg=252 ctermbg=95 term=standout ctermfg=252 ctermbg=95
-hi String gui=NONE   guifg=#5dff9e   guibg=#0f291a ctermfg=85 ctermbg=16 ctermfg=85 ctermbg=16
-hi Number gui=NONE   guifg=#ddaa66   guibg=NONE ctermfg=179 ctermfg=179
-hi Boolean gui=NONE   guifg=#00ff00   guibg=NONE ctermfg=46 ctermfg=46
-hi User1 gui=BOLD   guifg=#999999   guibg=#333333 cterm=bold ctermfg=246 ctermbg=236
-hi User2 gui=BOLD   guifg=#8bff95   guibg=#333333 cterm=bold ctermfg=120 ctermbg=236
-if v:version >= 700
-    hi SpellBad gui=undercurl guisp=#cc6666 term=reverse cterm=undercurl ctermfg=167
-    hi SpellCap gui=undercurl guisp=#66cccc term=reverse cterm=undercurl ctermfg=80
-    hi SpellRare gui=undercurl guisp=#cc66cc term=reverse cterm=undercurl ctermfg=170
-    hi SpellLocal gui=undercurl guisp=#cccc66 term=underline cterm=undercurl ctermfg=185
-    hi Pmenu gui=NONE   guifg=#cccccc   guibg=#222222 ctermfg=252 ctermbg=235
-    hi PmenuSel  cterm=bold ctermfg=177 ctermbg=16
-    hi PmenuSel  cterm=bold ctermfg=177 ctermbg=16
-    hi PmenuSbar gui=NONE   guifg=#cccccc   guibg=#000000 ctermfg=252 ctermbg=16
-    hi PmenuThumb gui=NONE   guifg=#cccccc   guibg=#333333 ctermfg=252 ctermbg=236
-    hi MatchParen gui=NONE      guifg=#ffffff   guibg=#005500 term=reverse ctermfg=231 ctermbg=22
-endif
diff --git a/colors/getafe.vim b/colors/getafe.vim
deleted file mode 100755
index 57754d2..0000000
--- a/colors/getafe.vim
+++ /dev/null
@@ -1,189 +0,0 @@
-" Maintainer:   Lars Smit
-" Version:      0.1
-" Last Change:  7 februari 2011
-" Credits:      Vim color scheme "getafe"
-"
-" Color Scheme Overview: 
-"	:ru syntax/hitest.vim
-"
-" Relevant Help: 
-"	:h highlight-groups
-"
-"	Colors
-"         HEX       R   G   B
-" blue    #01B0F0   1   176 240
-" pink    #FF358B   255 53  139
-" black   #000000   0   0   0
-" brown   #1B1D1E   27  29  30
-" green   #AEEE00   174 238 0
-" grey    #5A7085   90  112 133
-" orange  #FF500E   255 80  14
-" yellow  #FFDC00   255 220 0
-" white   #F8FFF9   248 255 249
-" cyan    #C6C5FE   198 197 254
-
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "getafe"
-
-"————————————————+———————————————————————————————————————————————+———+———————————————————————————————————————————————"
-"                | GUI                                           |   | TERMINAL                                      "
-"      TYPE      +———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-"                | foreground    | background    |               |   | foreground    | background    |               "
-"————————————————+———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Full colors reset
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-" Base colors
-
-hi ColorColumn                     guibg=#1B1D1E   gui=none                            ctermbg=234
-hi Conceal         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Cursor          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi CursorIM        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi CursorColumn    guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi CursorLine                      guibg=#1B1D1E   gui=none                            ctermbg=234
-hi Directory       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi DiffAdd         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi DiffChange      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi DiffDelete      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi DiffText        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi ErrorMsg        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi VertSplit       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Folded          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi FoldColumn      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SignColumn      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi IncSearch       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi LineNr          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi MatchParen      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi ModeMsg         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi MoreMsg         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi NonText         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Normal          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Pmenu           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi PmenuSel        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi PmenuSbar       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi PmenuThumb      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Question        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Search          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpecialKey      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpellBad        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpellCap        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpellLocal      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpellRare       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi StatusLine      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi StatusLineNC    guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi TabLine         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi TabLineFill     guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi TabLineSel      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Title           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi VisualNOS       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi WarningMsg      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi WildMenu        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Syntax related colors
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi Comment         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Constant        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi String          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Character       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Number          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Boolean         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Float           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Identifier      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Function        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Statement       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Conditional     guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Repeat          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Label           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Operator        guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Keyword         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Exception       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi PreProc         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Include         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Define          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Macro           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi PreCondit       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Type            guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi StorageClass    guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Structure       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Typedef         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Special         guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpecialChar     guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Tag             guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Delimiter       guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi SpecialComment  guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Debug           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Underlined      guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Ignore          guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Error           guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-hi Todo            guifg=#F8FFF9   guibg=#1B1D1E   gui=none            ctermfg=15      ctermbg=234
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Interface                                                                                                          "
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi ColorColumn                     guibg=#f7f7f7                                       ctermbg=15
-hi Cursor          guifg=#1B1D1E   guibg=#FF500E                       ctermfg=234     ctermbg=202
-hi CursorLine                      guibg=#f7f7f7                                       ctermbg=15
-hi Directory       guifg=#01B0F0                                       ctermfg=39
-hi VertSplit       guifg=#F8FFF9   guibg=#5A7085                       ctermfg=15      ctermbg=60
-hi Folded          guifg=#5A7085   guibg=#FFDC00                       ctermfg=60      ctermbg=220
-hi IncSearch       guifg=#1B1D1E   guibg=#a7a7a7                       ctermfg=234     ctermbg=248
-hi LineNr          guifg=#5A7085   guibg=#000000                       ctermfg=60      ctermbg=0
-hi NonText         guifg=#eeeeee   guibg=#1B1D1E                       ctermfg=7       ctermbg=234
-hi Search          guifg=#F8FFF9   guibg=#FF358B                       ctermfg=15      ctermbg=204
-hi StatusLine      guifg=#F8FFF9   guibg=#01B0F0    gui=bold           ctermfg=15      ctermbg=39
-hi StatusLineNC    guifg=#F8FFF9   guibg=#5A7085                       ctermfg=15      ctermbg=60
-hi Todo            guifg=#000000   guibg=#FFDC00    gui=bold           ctermfg=0       ctermbg=220
-hi Visual                          guibg=#5A7085                                       ctermbg=60
-hi CursorLine                      guibg=#5A7085                                       ctermbg=60
-hi ColorColumn                     guibg=#5A7085                                       ctermbg=60
-hi ModeMsg         guifg=#000000   guibg=#FFDC00                       ctermfg=0       ctermbg=220
-hi SpecialKey      guifg=#5A7085                                       ctermfg=60
-hi ErrorMsg        guifg=#000000   guibg=#FF500E                       ctermfg=0       ctermbg=202
-hi Title           guifg=#F8FFF9                                       ctermfg=15
-hi DiffAdd	       guifg=#000000   guibg=#AEEE00                       ctermfg=0       ctermbg=154
-hi DiffChange      guifg=#000000   guibg=#FFDC00                       ctermfg=0       ctermbg=220
-hi DiffDelete      guifg=#000000   guibg=#FF358B                       ctermfg=0       ctermbg=204
-hi DiffText        guifg=#F8FFF9                                       ctermfg=15
-hi MatchParen      guifg=#F8FFF9   guibg=#FF500E                       ctermfg=15      ctermbg=202
-hi Identifier      guifg=#FF500E                                       ctermfg=202
-hi Type            guifg=#AEEE00                                       ctermfg=154
-hi Label           guifg=#AEEE00                                       ctermfg=154
-hi Special         guifg=#01B0F0                                       ctermfg=39
-hi WildMenu        guifg=#01B0F0   guibg=#000000                       ctermfg=39      ctermbg=0
-hi Pmenu           guifg=#01B0F0   guibg=#000000                       ctermfg=39      ctermbg=0
-hi PmenuSel                        guibg=#5A7085                                       ctermbg=60
-hi PmenuSbar                       guibg=#5A7085                                       ctermbg=60
-hi PmenuThumb      guifg=#01B0F0                                       ctermfg=39
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Syntax related colors
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi Comment         guifg=#5A7085                                       ctermfg=60
-hi Constant        guifg=#FF358B                                       ctermfg=204
-hi String          guifg=#FF358B                                       ctermfg=204
-hi Number          guifg=#FF500E                                       ctermfg=202
-hi Boolean         guifg=#AEEE00                                       ctermfg=154
-hi Float           guifg=#B37A7A                                       ctermfg=138
-hi Function        guifg=#01B0F0                                       ctermfg=39
-hi Statement       guifg=#01B0F0                                       ctermfg=39
-hi Conditional     guifg=#AEEE00                                       ctermfg=154
-hi Operator        guifg=#FF500E                                       ctermfg=202
-hi Keyword         guifg=#AEEE00                                       ctermfg=154
-hi Define          guifg=#AEEE00                                       ctermfg=154
-hi Delimiter       guifg=#AEEE00                                       ctermfg=154
-
-
diff --git a/colors/getfresh.vim b/colors/getfresh.vim
deleted file mode 100755
index df9ef27..0000000
--- a/colors/getfresh.vim
+++ /dev/null
@@ -1,145 +0,0 @@
-" Vim color scheme
-"
-" Name:        getfresh.vim
-" Maintainer:  Christian Brassat <crshd@mail.com>
-" License:     public domain
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "getfresh"
-
-" General Colors
-let NormalFG      = '#DDCCBB'
-
-"let NormalFG      = '#30251D'
-let NormalBG      = '#151515'
-
-let DarkGray      = '#393939'
-let LightGray     = '#AF875F'
-
-let DarkRed       = '#BF1E2D'
-let LightRed      = '#E7212A'
-
-let DarkGreen     = '#9DBA3A'
-let LightGreen    = '#A9C938'
-
-let DarkYellow    = '#F5B915'
-let LightYellow   = '#F7D325'
-
-let DarkBlue      = '#1CA1DB'
-let LightBlue     = '#00AFDA'
-
-let DarkMagenta   = '#652F90'
-let LightMagenta  = '#894E9F'
-
-let DarkCyan      = '#EA7D24'
-let LightCyan     = '#F79321'
-
-let White         = '#E7E8E9'
-
-" Specific Colors
-let CursorColor   = '#FF8939'
-let CursorLColor  = '#202020'
-
-let LineNrFG      = '#555555'
-let LineNrBG      = '#101010'
-
-let FoldFG        = DarkCyan
-let FoldLineBG    = NormalBG
-let FoldColBG     = '#050505'
-
-let SplitFG       = '#1B1B1B'
-let SplitBG       = SplitFG
-
-let StatusBG      = DarkGray
-
-" GUI - bold/italic/underline/none 
-let GUI           = 'none'
-
-" Different Font
-let OtherFont     = '-*-neep-medium-*-*-*-10-*-*-*-*-*-*-*'
-
-exe 'hi Nontext                   guifg='.LightGray
-exe 'hi Normal                    guifg='.NormalFG.'      guibg='.NormalBG
-exe 'hi Cursor                                            guibg='.CursorColor
-exe 'hi CursorLine                                        guibg='.CursorLColor
-exe 'hi LineNr                    guifg='.LineNrFG.'      guibg='.LineNrBG
-exe 'hi Search                                            guibg='.DarkCyan
-exe 'hi VertSplit                 guifg='.SplitFG.'       guibg='.SplitBG
-exe 'hi Visual                                            guibg='.DarkCyan
-exe 'hi Folded                    guifg='.FoldFG.'        guibg='.FoldLineBG
-exe 'hi FoldColumn                guifg='.FoldFG.'        guibg='.FoldColBG
-exe 'hi Directory                 guifg='.LightGreen
-exe 'hi Pmenu                     guifg='.NormalFG.'      guibg='.LightGray
-exe 'hi PmenuSel                  guifg='.DarkGray.'      guibg='.LightGreen
-exe 'hi PMenuSbar                                         guibg='.DarkCyan
-exe 'hi PMenuThumb                                        guibg='.DarkGreen
-exe 'hi Comment                   guifg='.LightGray.'                                       font='.OtherFont
-exe 'hi Todo                      guifg='.LightGray.'     guibg=NONE'
-exe 'hi NonText                   guifg='.DarkCyan
-exe 'hi SpecialKey                guifg='.DarkCyan
-exe 'hi Constant                  guifg='.DarkBlue
-exe 'hi Define                    guifg='.White.'                           gui='.GUI
-exe 'hi Delimiter                 guifg='.DarkMagenta
-exe 'hi Error                     guifg='.DarkGray.'      guibg='.DarkRed
-exe 'hi Function                  guifg='.DarkRed.'                             gui='.GUI
-exe 'hi Identifier                guifg='.LightYellow
-exe 'hi Include                   guifg='.DarkYellow.'                          gui='.GUI
-exe 'hi Keyword                   guifg='.DarkMagenta
-exe 'hi Macro                     guifg='.DarkMagenta
-exe 'hi Number                    guifg='.LightGreen
-exe 'hi PreCondit                 guifg='.DarkMagenta.'                         gui='.GUI
-exe 'hi PreProc                   guifg='.DarkYellow
-exe 'hi Statement                 guifg='.LightBlue.'                           gui='.GUI
-exe 'hi String                    guifg='.White
-exe 'hi Title                     guifg='.LightGray
-exe 'hi Type                      guifg='.DarkRed.'                             gui='.GUI
-exe 'hi DiffAdd                   guifg='.DarkGray.'    guibg='.LightGreen
-exe 'hi DiffDelete                guifg='.DarkGray.'    guibg='.LightRed
-
-hi link htmlTag              xmlTag
-hi link htmlTagName          xmlTagName
-hi link htmlEndTag           xmlEndTag
-
-exe 'hi xmlTag                    guifg='.LightMagenta
-exe 'hi xmlTagName                guifg='.LightMagenta
-exe 'hi xmlEndTag                 guifg='.LightMagenta
-
-" Status line - changes colors depending on insert mode
-" Standard
-exe 'hi User1                     guifg='.DarkYellow.'  guibg='.StatusBG.'      gui='.GUI
-exe 'hi User2                     guifg='.DarkRed.'     guibg='.StatusBG.'      gui='.GUI
-exe 'hi User3                     guifg='.LightGreen.'  guibg='.StatusBG.'      gui='.GUI
-exe 'hi User4                     guifg='.DarkGray.'    guibg='.DarkMagenta.'   gui='.GUI
-exe 'hi User5                     guifg='.NormalFG.'    guibg='.StatusBG
-exe 'hi User6                     guifg='.LightGray.'   guibg='.StatusBG
-exe 'hi User7                     guifg='.StatusBG.'    guibg='.StatusBG.'      gui='.GUI
-exe 'hi StatusLine                guifg='.NormalFG.'    guibg='.StatusBG.'      gui='.GUI
-exe 'hi StatusLineNC              guifg='.LightGray.'   guibg='.StatusBG.'      gui='.GUI
-
-function! InsertStatuslineColor(mode)
-  let DarkGray      = '#101010'
-  let DarkRed       = '#E84F4F'
-  let DarkBlue      = '#7DC1CF'
-  let DarkMagenta   = '#9B64FB'
-
-  if a:mode == 'i' " Insert Mode
-    exe 'hi User4                 guifg='.DarkGray.'    guibg='.DarkBlue
-
-  elseif a:mode == 'r' " Replace Mode
-    exe 'hi User4                 guifg='.DarkGray.'    guibg='.DarkRed
-
-  else
-    exe 'hi User4                 guifg='.DarkGray.'    guibg='.DarkMagenta
-
-  endif
-endfunction
-
-" Call function
-exe 'au InsertEnter * call InsertStatuslineColor(v:insertmode)'
-exe 'au InsertLeave * hi statusline guifg='.NormalFG.' guibg='.StatusBG
-exe 'au InsertLeave * hi User4      guifg='.DarkGray.' guibg='.DarkMagenta
diff --git a/colors/github.vim b/colors/github.vim
old mode 100755
new mode 100644
diff --git a/colors/gobo.vim b/colors/gobo.vim
deleted file mode 100755
index 13a8cf5..0000000
--- a/colors/gobo.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-" Created using ColorSchemeCreator
-" by Ot�vio Corr�a Cordeiro (cordeiro@exatas.unisinos.br) (2004 July)
-"
-" Maintainer: Ot�vio Corr�a Cordeiro
-" Last Change: 2004 July
-
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "ColorSchemeCreator"  
-hi Normal		guifg=#111111 guibg=#FFFFFF  
-hi comment		guifg=#33CC99 gui=italic  
-hi constant		guifg=#CC0099 gui=bold  
-hi statement		guifg=#3399FF gui=bold  
-hi preproc		guifg=#0066FF
-hi type			guifg=#6600CC gui=bold  
-hi special		guifg=#6600CC
-hi operator		guifg=#CC0099
-hi clear Visual 
-hi Visual		term=reverse cterm=reverse gui=reverse  
diff --git a/colors/golded.vim b/colors/golded.vim
deleted file mode 100755
index 5034d26..0000000
--- a/colors/golded.vim
+++ /dev/null
@@ -1,113 +0,0 @@
-" GVim color file
-" Author: Martin Mauchauffee
-" Note: Based on GoldED from Amiga. Using low contrast colors to avoid
-" flicking effects when switching beetween windows, like browser and
-" terminal which uses black or white background.
-
-hi clear
-if version > 600
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-let g:colors_name="golded"
-
-hi Boolean gui=NONE guifg=#99ffff guibg=#919191
-hi Character gui=UNDERLINE guifg=#990000 guibg=#aaaaaa
-hi Comment gui=BOLD guifg=#ffbbff guibg=NONE
-hi Conditional gui=BOLD guifg=#aaff00 guibg=NONE
-hi Constant gui=NONE guifg=#990000 guibg=NONE
-hi Cursor gui=NONE guifg=#000000 guibg=#ffffff
-hi CursorColumn gui=NONE guifg=NONE guibg=#bbbbbb
-hi CursorIM gui=NONE guifg=#000000 guibg=#ffffff
-hi CursorLine gui=NONE guifg=NONE guibg=#bbbbbb
-hi Debug gui=NONE guifg=#ffffff guibg=#916e6e
-hi Define gui=NONE guifg=#ccccff guibg=#919191
-hi Delimiter gui=NONE guifg=#555577 guibg=NONE
-hi DiffAdd gui=NONE guifg=NONE guibg=#99bb99
-hi DiffChange gui=NONE guifg=NONE guibg=#9999bb
-hi DiffDelete gui=NONE guifg=NONE guibg=#bb9999
-hi DiffText gui=NONE guifg=NONE guibg=BG
-hi Directory gui=NONE guifg=#00ff8b guibg=#919191
-hi Error gui=NONE guifg=#ffffff guibg=#dd3333
-hi ErrorMsg gui=BOLD guifg=#ffffff guibg=#cc3300
-hi Exception gui=BOLD guifg=#ffff99 guibg=NONE
-hi FoldColumn gui=NONE guifg=#cccccc guibg=#6688bb
-hi Folded gui=NONE guifg=#cccccc guibg=#888888
-hi Function gui=NONE guifg=#990099 guibg=NONE
-hi Identifier gui=NONE guifg=#6633aa guibg=NONE
-hi Ignore gui=NONE guifg=#cccccc guibg=NONE
-hi IncSearch gui=BOLD guifg=FG guibg=#777777
-hi Include gui=NONE guifg=#336e6e guibg=#b3b3b3
-hi Label gui=BOLD guifg=#99ffdd guibg=NONE
-hi LineNr gui=NONE guifg=#666666 guibg=#b3b3b3
-hi Macro gui=NONE guifg=#913333 guibg=#b3b3b3
-hi MatchParen gui=NONE guifg=#000000 guibg=#cc88dd
-hi ModeMsg gui=BOLD guifg=#ffffff guibg=#dd4400
-hi MoreMsg gui=BOLD guifg=#ffffff guibg=#ee7700
-hi NonText gui=NONE guifg=#aadd77 guibg=#919191
-hi Normal gui=NONE guifg=#000000 guibg=#a2a2a2
-hi Number gui=NONE guifg=#bb3333 guibg=NONE
-hi Operator gui=NONE guifg=#555577 guibg=NONE
-hi Pmenu gui=NONE guifg=#000000 guibg=#6688bb
-hi PmenuSel gui=BOLD guifg=#ffffff guibg=#6688bb
-hi PreCondit gui=NONE guifg=#a2ddee guibg=#919191
-hi PreProc gui=NONE guifg=#dddd77 guibg=#919191
-hi Question gui=UNDERLINE guifg=#00ff8b guibg=#919191
-hi Repeat gui=BOLD guifg=#ffbb44 guibg=NONE
-hi Search gui=INVERSE guifg=FG guibg=BG
-hi SignColumn gui=NONE guifg=#000000 guibg=#777777
-hi Special gui=NONE guifg=#ffdd77 guibg=#999999
-hi SpecialChar gui=NONE guifg=#ffffff guibg=#886e91
-hi SpecialComment gui=NONE guifg=#ffbbff guibg=#919191
-hi SpecialKey gui=BOLD guifg=#99cc66 guibg=#919191
-hi Statement gui=BOLD guifg=#99ffff guibg=NONE
-hi StatusLine gui=NONE guifg=#ffffff guibg=#6688bb
-hi StatusLineNC gui=NONE guifg=#bbbbbb guibg=#6688bb
-hi StorageClass gui=NONE guifg=#660099 guibg=NONE
-hi String gui=NONE guifg=#eeee33 guibg=NONE
-hi Structure gui=NONE guifg=#2244cc guibg=NONE
-hi Tag gui=NONE guifg=#ffffff guibg=#6e9188
-hi TaglistTagName gui=BOLD guifg=#808bed guibg=#b3b3b3
-hi Title gui=BOLD guifg=#ffffff guibg=NONE
-hi Todo gui=NONE guifg=#ffffff guibg=#bb77cc
-hi Type gui=BOLD guifg=#996644 guibg=NONE
-hi Typedef gui=NONE guifg=#990099 guibg=NONE
-hi Underlined gui=UNDERLINE guifg=#ffffcc guibg=NONE
-hi Visual gui=NONE guifg=#000000 guibg=#6688bb
-hi WarningMsg gui=BOLD guifg=#ffffff guibg=#ff6600
-hi WildMenu gui=NONE guifg=#000000 guibg=#ffffff
-
-"hi link VertSplit StatusLineNC
-"hi link cssSelectorOp Operator
-"hi link htmlEndTag htmlTag
-"hi link htmlTagName htmlTag
-
-hi htmlTag gui=NONE guifg=#99ffff guibg=NONE
-
-hi link phpClasses NONE
-hi link phpCoreConstant NONE
-hi link phpInterfaces NONE
-hi link phpSpecialFunction NONE
-hi phpClasses gui=UNDERLINE guifg=#990099 guibg=NONE
-hi phpCoreConstant gui=NONE guifg=#990000 guibg=#b3b3b3
-hi phpHereDoc guibg=#bbbb99
-hi phpInterfaces gui=UNDERLINE guifg=#990000 guibg=NONE
-hi phpMethodsVar guibg=#aaaaaa
-hi phpVarSelector gui=NONE guifg=#6633aa guibg=NONE
-hi phpSpecialFunction gui=UNDERLINE guifg=#990099 guibg=NONE
-
-hi col_darkgray gui=NONE guifg=#666666 guibg=NONE
-hi col_grey gui=NONE guifg=#cccccc guibg=NONE
-
-hi sqlStatement gui=BOLD guifg=#2244cc guibg=#bbbb99
-hi sqlKeyword gui=NONE guifg=#2244cc guibg=#bbbb99
-hi sqlString gui=NONE guifg=#bb3333 guibg=#bbbb99
-hi sqlNumber gui=NONE guifg=#bb3333 guibg=#bbbb99
-hi sqlDashComment gui=BOLD guifg=#990099 guibg=#bbbb99
-hi sqlSlashComment gui=BOLD guifg=#990099 guibg=#bbbb99
-hi sqlMultiComment gui=BOLD guifg=#990099 guibg=#bbbb99
-hi sqlType gui=BOLD guifg=#996644 guibg=#bbbb99
-hi sqlFunction gui=NONE guifg=#990099 guibg=#bbbb99
-hi sqlOperator gui=NONE guifg=#555577 guibg=#bbbb99
diff --git a/colors/golden.vim b/colors/golden.vim
deleted file mode 100755
index 8cceaf7..0000000
--- a/colors/golden.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-" Creator: Ryan Phillips <ryan@trolocsis.com>
-" Credits: This color scheme originated from the idea of 
-"          Jeffrey Bakker, the creator of webcpp (http://webcpp.sourceforge.net/).
-"     URL: http://www.trolocsis.com/vim/golden.vim
-"
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "golden"
-hi Normal		  ctermfg=yellow guifg=#ddbb00  guibg=black
-hi Scrollbar	  ctermfg=Yellow guifg=#ddbb00  guibg=black
-hi Menu			  ctermfg=darkyellow guifg=#ffddaa  guibg=black
-hi SpecialKey	  ctermfg=yellow term=bold  cterm=bold  guifg=#ffddaa 
-hi NonText		  ctermfg=LightBlue term=bold  cterm=bold  gui=bold	guifg=#DBCA98
-hi Directory	  ctermfg=DarkYellow term=bold  cterm=bold  guifg=#ffddaa
-hi ErrorMsg		  term=standout  cterm=bold  ctermfg=White  ctermbg=Red  guifg=White  guibg=Red
-hi Search		  term=reverse	ctermfg=white  ctermbg=red	guifg=white  guibg=Red
-hi MoreMsg		  term=bold  cterm=bold  ctermfg=Yellow	gui=bold  guifg=#ddbb00
-hi ModeMsg		  term=bold  ctermfg=DarkYellow cterm=bold  gui=bold  guifg=Black	guibg=#ddbb00
-hi LineNr		  term=underline ctermfg=Brown cterm=bold guifg=#978345
-hi Question		  term=standout  cterm=bold  ctermfg=Brown	gui=bold  guifg=#ffddaa
-hi StatusLine	  term=bold,reverse  cterm=bold ctermfg=Black ctermbg=DarkGrey gui=bold guifg=#978345 guibg=#2E2E2E
-hi StatusLineNC   term=reverse	ctermfg=white ctermbg=black guifg=grey guibg=#3E3E3E
-hi Title		  term=bold  cterm=bold  ctermfg=brown  gui=bold	guifg=#DBCA98
-hi Visual		  term=reverse	cterm=reverse  gui=reverse
-hi WarningMsg	  term=standout  cterm=bold  ctermfg=darkblue  guifg=Red
-hi Cursor		  guifg=bg	guibg=#FF5E06 ctermbg=Brown
-hi Comment		  term=bold  cterm=bold ctermfg=brown  guifg=#978345
-hi Constant		  term=underline  cterm=bold ctermfg=red  guifg=Red
-hi Special		  term=bold  cterm=bold ctermfg=red guifg=Orange
-hi Identifier	  term=underline ctermfg=lightgray  guifg=#DBCA98
-hi Statement	  term=bold  cterm=bold ctermfg=lightgreen	gui=bold  guifg=#ffff60
-hi PreProc		  term=underline  ctermfg=brown	guifg=#ffddaa
-hi Type			  term=underline  cterm=bold ctermfg=lightgreen  gui=bold  guifg=#FFE13F
-hi Error		  term=reverse	ctermfg=darkcyan  ctermbg=black  guifg=Red	guibg=Black
-hi Todo			  term=standout  ctermfg=black	ctermbg=yellow  guifg=#FFE13F  guibg=#2E2E2E
-hi VertSplit      guifg=#2E2E2E guibg=#978345 ctermfg=black ctermbg=darkgrey
-hi Folded		  guifg=orange  guibg=#2E2E2E ctermfg=yellow
-
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
diff --git a/colors/google.vim b/colors/google.vim
deleted file mode 100755
index 365e7b6..0000000
--- a/colors/google.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" description:	color scheme based on google's
-"      author:	kamil.stachowski@gmail.com
-"     license:	gpl 3+
-"     version:	0.2 (2008.11.27)
-
-" changelog:
-"         0.2:	2008.11.27
-"         		changed MatchParen to link to Type (thanks to Jarosław Mężyk)
-"         		added Diff*
-"         0.1:	2008.11.20
-"       		initial version
-
-
-set background=dark
-
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "google"
-
-
-" black			000000
-" blue dark		6694e3
-" blue dark2	2a5db0
-" blue light	e0ecff
-" green dark	006633
-" green light	46aa64
-" grey			aaaaaa
-" red			d96666
-" white			ffffff
-" yellow		ffffb5
-
-" pmenu
-
-hi Comment 		guifg=#aaaaaa	guibg=#ffffff	gui=none
-hi Constant 	guifg=#6694e3	guibg=#ffffff	gui=none
-hi Cursor 		guifg=#ffffff	guibg=#000000	gui=none
-hi CursorLine		          	guibg=#efefef	gui=none
-hi DiffAdd		guifg=#ffffff	guibg=#006633	gui=none
-hi DiffChange	guifg=#000000	guibg=#ffffb5	gui=none
-hi DiffDelete	guifg=#000000	guibg=#d96666	gui=none
-hi DiffText		guifg=#d96666	guibg=#ffffb5	gui=none
-hi Folded 		guibg=#efefef	guifg=#000000	gui=italic
-hi Identifier 	guifg=#7799bb	guibg=#ffffff	gui=none
-hi ModeMsg		guifg=#ffffff	guibg=#6694e3	gui=bold
-hi NonText 		guifg=#f0f0f0	guibg=#ffffff	gui=none
-hi Normal 		guifg=#000000	guibg=#ffffff	gui=none
-hi PreProc 		guifg=#46aa64	guibg=#ffffff	gui=none
-hi Search		guifg=#000000	guibg=#ffffb5
-hi Special		guifg=#2a5db0	guibg=#ffffff	gui=none
-hi Statement 	guifg=#2a5db0	guibg=#ffffff	gui=bold,underline
-hi StatusLine 	guifg=#ffffff	guibg=#6694e3	gui=bold
-hi StatusLineNC guifg=#aaaaaa	guibg=#e0ecff	gui=none
-hi Todo 		guifg=#ffffff	guibg=#d96666	gui=bold
-hi Type 		guifg=#006633	guibg=#ffffff	gui=bold
-hi Underlined	guifg=#000000	guibg=#ffffff	gui=underline
-hi VertSplit	guifg=#e0ecff	guibg=#e0ecff	gui= none
-hi Visual		guifg=#ffffff	guibg=#6694e3	gui=none
-hi!	link Macro			PreProc
-hi! link Boolean		Constant
-hi! link Character		Constant
-hi! link Conditional	Statement
-hi! link CursorColumn	CursorLine
-hi! link Debug			PreProc	
-hi! link Define			PreProc
-hi! link Delimiter		Identifier
-hi! link Directory		Statement
-hi! link Error			Todo
-hi! link ErrorMsg		Error
-hi! link Exception		Statement
-hi! link Float			Constant
-hi! link FoldColumn		Folded
-hi! link Function		Identifier
-hi! link Function		Identifier
-hi! link Ignore			Comment
-hi! link Include		PreProc
-hi! link IncSearch		Search
-hi! link Keyword		Identifier
-hi! link Keyword		Identifier
-hi! link Label			Statement
-hi! link LineNr			Comment
-hi! link MatchParen		Statement
-hi! link MoreMsg		Identifier
-hi! link NonText		Comment
-hi! link Number			Constant
-hi! link Operator		Identifier
-hi! link Question		MoreMsg
-hi! link PreCondit		PreProc
-hi! link Repeat			Statement
-hi! link SignColumn		Identifier
-hi! link SpecialChar	Special
-hi! link SpecialComment	Special
-hi! link SpecialKey		Special
-hi! link SpellBad		Error
-hi! link SpellCap		Error
-hi! link SpellLocal		Error
-hi! link SpellRare		Error
-hi! link StorageClass	Type
-hi! link String			Constant
-hi! link Structure		Type
-hi! link Title			Structure
-hi! link Typedef		Type
-hi! link WarningMsg		Error
diff --git a/colors/gor.vim b/colors/gor.vim
deleted file mode 100755
index b0584a1..0000000
--- a/colors/gor.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Jokes
-" Last Change:	
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "gor"
-hi Normal		guifg=white	guibg=#005856
-hi NonText		guifg=white	guibg=#005856
-hi comment		guifg=darkgrey
-hi constant		guifg=orange	
-hi identifier	guifg=orange gui=NONE
-hi statement	guifg=cyan	gui=NONE
-"hi preproc		guifg=#6063CD
-hi preproc		guifg=cyan
-hi type			guifg=green gui=NONE	
-hi special		guifg=yellow
-hi ErrorMsg		guifg=Black	guibg=Red
-hi WarningMsg	guifg=Black	guibg=Green
-hi Error		guibg=Red
-hi Todo			guifg=Black	guibg=orange
-hi Cursor		guibg=#ffffff guifg=#004f50
-"hi Cursor		guibg=#603070 guifg=#0000ff
-hi Folded		guifg=#999999 guibg=#006336
-hi Search		guibg=orange
-hi IncSearch	gui=NONE guibg=orange
-hi LineNr		guifg=grey
-hi title		guifg=grey
-"hi StatusLineNC	gui=NONE guifg=lightblue guibg=darkblue
-hi StatusLineNC	gui=NONE guibg=red
-hi StatusLine	guifg=black	guibg=darkgreen
-hi label		guifg=gold2
-hi operator		guifg=orange
-hi clear Visual
-hi Visual		guibg=orange guifg=#00932D
-hi DiffChange   guibg=darkgreen
-hi DiffText		guibg=olivedrab
-hi DiffAdd		guibg=slateblue
-hi DiffDelete   guibg=coral
-hi Folded		guibg=gray30
-hi FoldColumn	guibg=gray30 guifg=white
-hi cIf0			guifg=gray
diff --git a/colors/gothic.vim b/colors/gothic.vim
deleted file mode 100755
index 94df10c..0000000
--- a/colors/gothic.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-" Vim color file
-" Maintainer:	Stefano deFlorian - \Goth\ <stefano@junglebit.net>
-" Last Change:	2006 Jul 16
-" Light - Dark :-)
-" optimized for TFT panels
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "gothic"
-
-" hardcoded colors :
-
-" GUI
-highlight Normal     guifg=#efefef guibg=#000000
-highlight Cursor     guifg=#000000 guibg=#efefef gui=NONE
-highlight Search     guifg=#ffff60 guibg=#0000ff gui=NONE
-highlight Visual     guifg=Grey25 gui=NONE
-highlight Special    guifg=#b0b000 gui=NONE
-highlight Comment    guifg=#3030ff gui=NONE
-highlight StatusLine guifg=blue guibg=white
-highlight Statement  guifg=#ffff60 gui=NONE
-highlight PreProc    guifg=#a0e0a0 gui=NONE
-highlight Identifier guifg=#00ffff gui=NONE
-highlight Function	guifg=#00ffff gui=NONE
-highlight Constant   guifg=#ff5050 gui=NONE
-highlight Type       guifg=#a0a0ff gui=NONE
-
-" Console
-highlight Normal     ctermfg=LightGrey	ctermbg=Black
-highlight Cursor     ctermfg=Black ctermbg=LightGrey cterm=NONE
-highlight Search     ctermfg=LightGrey ctermbg=Blue cterm=NONE
-highlight Visual		cterm=reverse
-highlight Special    ctermfg=Red cterm=NONE
-highlight Comment    ctermfg=DarkBlue cterm=NONE
-highlight StatusLine ctermfg=White	ctermbg=Blue
-highlight Identifier ctermfg=Cyan cterm=NONE
-highlight Function   ctermfg=Cyan cterm=NONE
-highlight PreProc		ctermfg=Magenta cterm=NONE
-highlight Statement  ctermfg=Brown cterm=NONE
-highlight Constant   ctermfg=Red cterm=NONE
-highlight Type       ctermfg=Green cterm=NONE
diff --git a/colors/grape.vim b/colors/grape.vim
deleted file mode 100755
index ac8dd93..0000000
--- a/colors/grape.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" vim: ts=4 sw=4 sts=4
-" Vim colorscheme
-" Author: Charles <cherry_avium@yahoo.com>
-" Version: -
-" Date: 26 January 2006
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name = "grape"
-
-hi Normal                   guibg=seashell   guifg=black
-
-" Window elements
-hi Cursor                   guifg=gray90 guibg=gray10
-" hi Folded                   guifg=#C0C0C0 guibg=#808080
-hi LineNr                   guibg=gray70 guifg=white
-" hi NonText                  guifg=#CCCCCC
-hi StatusLine               guifg=white guibg=gray70 gui=none
-hi StatusLineNC             guifg=gray90 guibg=gray70 gui=italic
-" hi Visual                   guifg=#C0C0C0 guibg=#000000
-
-" Main groups
-hi Comment                  guifg=#339933 gui=italic
-hi Constant                 guifg=black gui=bold
-hi Statement                guifg=slateblue gui=bold
-hi StatementU               guifg=slateblue gui=bold
-hi Keyword                  guifg=slateblue gui=bold
-hi Underlined               guifg=black gui=underline
-hi Error                    guifg=black guibg=red
- 
-" Tag syntax
-hi Attribute                guifg=violetred gui=bold
- 
-hi String                   guifg=darkgoldenrod
-hi! link Character          String
-hi! link Number             Constant
-hi! link Boolean            Constant
-hi! link Float              Constant
- 
-hi Identifier               guifg=mediumvioletred
-hi Function                 guifg=blueviolet
- 
-hi Operator                 guifg=red
-hi! link Preproc            Keyword
-hi! link Type               Keyword
- 
-hi! link Special            Keyword
-hi! link Ignore             Normal
-hi! link Todo               Error
-
-hi Title                    guifg=black gui=bold
-
-hi! link HTMLH2             Title
-hi HTMLString               guifg=darkgoldenrod
-hi! link HTMLTag            Keyword
-hi! link HTMLEndTag         Keyword
diff --git a/colors/graywh.vim b/colors/graywh.vim
deleted file mode 100755
index 725e23d..0000000
--- a/colors/graywh.vim
+++ /dev/null
@@ -1,204 +0,0 @@
-" Vim color file
-" Maintainer:   Will Gray <graywh@gmail.com>
-" GetLatestVimScripts: 2616 1 :AutoInstall: graywh.vim
-"
-" For best results on 88/256-color terminals, I recommend CSApprox.vim by
-" godlygeek.
-
-" Favorite colors {{{1
-"                Light                           Dark
-"       Black    5F5F5F 236  8   1E1E1E 234      000000  16 0
-"       Red      FFD7D7 224      FF8787 210  9   D70000 160 1
-"       Green    D7FFD7 194      87FF87 120 10   00D700  40 2
-"       Yellow   FFFFD7 230      FFFF87 228 11   D7D700 184 3
-"       Blue     AFD7FF 153      87AFFF 111 12   005FD7  68 4
-"       Magenta  FFD7FF 225      FF87FF 213 13   D700D7 164 5
-"       Cyan     D7FFFF 195      87FFFF 123 14   00D7D7  44 6
-"       Gray     FFFFFF 231 15                   D7D7D7 251 7
-" }}}1
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "graywh"
-
-" Links {{{1
-hi! link Character String
-hi! link CursorColumn CursorLine
-hi! link VertSplit StatusLineNC
-
-" For GUI {{{1
-hi Normal               guifg=#D7D7D7   guibg=#1C1C1C
-
-" Vim {{{2
-hi SpecialKey           guifg=#4E4E4E   guibg=bg        gui=none
-hi NonText              guifg=#87FFFF   guibg=#262626   gui=none
-hi Directory            guifg=#00AFAF
-hi ErrorMsg             guifg=#D70000   guibg=bg
-hi IncSearch                                            gui=reverse
-hi Search                               guibg=#FFFF00
-hi MoreMsg              guifg=#5FAF87                   gui=bold
-hi ModeMsg                                              gui=bold
-hi LineNr               guifg=#D7D7AF   guibg=#262626
-hi Question             guifg=#5FFF5F                   gui=bold
-hi StatusLine                                           gui=reverse,bold
-hi StatusLineNC                                         gui=reverse
-hi Title                guifg=#FF87FF                   gui=bold
-hi Visual                               guibg=NONE      gui=reverse
-hi VisualNOS                                            gui=bold,underline
-hi WarningMsg           guifg=#D7D700
-hi WildMenu             guifg=bg        guibg=#D7D700
-hi Folded               guifg=#FFD7FF   guibg=#444444   gui=italic
-hi FoldColumn           guifg=#87FFFF   guibg=#444444
-
-if v:version >= 600
-  hi DiffAdd                            guibg=#123012
-  hi DiffChange                         guibg=#121230
-  hi DiffDelete         guifg=fg        guibg=#301212   gui=none
-  hi DiffText                           guibg=#303012   gui=none
-endif
-
-hi SignColumn           guifg=#FFFF87   guibg=#444444
-
-if v:version >= 700
-  hi SpellBad                                           gui=undercurl           guisp=#FF0000
-  hi SpellCap                                           gui=undercurl           guisp=#0000FF
-  hi SpellRare                                          gui=undercurl           guisp=#FF00FF
-  hi SpellLocal                                         gui=undercurl           guisp=#00FFFF
-endif
-
-hi Pmenu                guifg=fg        guibg=#D787D7
-hi PmenuSel             guifg=fg        guibg=#878787
-hi PmenuSbar            guifg=fg        guibg=#878787
-hi PmenuThumb                                           gui=reverse
-hi TabLine              guifg=bg        guibg=fg        gui=none
-hi TabLineSel           guifg=fg        guibg=bg        gui=bold
-hi TabLineFill          guifg=fg        guibg=bg        gui=reverse
-hi CursorLine                           guibg=#303030
-hi Cursor               guifg=bg        guibg=fg
-
-" Syntax {{{2
-hi lCursor              guifg=bg        guibg=fg
-hi MatchParen                           guibg=#00AFAF
-hi Comment              guifg=#AFFFAF                   gui=italic
-hi Constant             guifg=#FFAFAF
-hi String               guifg=#FFAFFF
-hi Boolean              guifg=#5F87FF                   gui=bold
-hi Identifier           guifg=#AFFFFF
-hi Function             guifg=#AFD7FF
-hi Statement            guifg=#87AFFF                   gui=none
-hi Operator             guifg=#FFAF87
-hi PreProc              guifg=#5FFFFF                   gui=none
-hi Type                 guifg=#FFFFAF                   gui=none
-hi Special              guifg=#FF5F5F
-hi Underlined           guifg=#AFAFFF                   gui=underline
-hi Ignore               guifg=bg
-hi Error                guifg=#FFFFFF   guibg=#FF5F5F
-hi Todo                 guifg=#0000D7   guibg=#FFFF5F
-
-" Custom {{{2
-hi colorIndentLevel1                    guibg=#121212
-hi colorIndentLevel2                    guibg=#262626
-" mail {{{3
-hi mailQuoted1          guifg=#AFAFD7   guibg=#303030
-hi mailQuoted2          guifg=#D7AFAF   guibg=#303030
-hi mailQuoted3          guifg=#AFD7AF   guibg=#303030
-hi mailQuoted4          guifg=#D7AFD7   guibg=#303030
-hi mailQuoted5          guifg=#AFD7D7   guibg=#303030
-hi mailQuoted6          guifg=#D7D7AF   guibg=#303030
-hi mailEmail            guifg=#5F87FF                   gui=underline
-hi mailSignature        guifg=#8A8A8A
-
-" For 16 color terminals {{{1
-hi Normal               ctermfg=Gray            ctermbg=Black
-
-" Vim {{{2
-hi SpecialKey           ctermfg=DarkGray
-hi NonText              ctermfg=Cyan
-hi Directory            ctermfg=DarkCyan
-hi ErrorMsg             ctermfg=DarkRed         ctermbg=bg
-hi IncSearch                                                            cterm=reverse
-hi Search                                       ctermbg=Yellow
-hi MoreMsg              ctermfg=Green
-hi ModeMsg                                                              cterm=bold
-hi LineNr               ctermfg=Yellow
-hi Question             ctermfg=Green
-hi StatusLine                                                           cterm=reverse,bold
-hi StatusLineNC                                                         cterm=reverse
-hi VertSplit                                                            cterm=reverse
-hi Title                ctermfg=Magenta
-hi Visual                                       ctermbg=bg              cterm=reverse
-hi VisualNOS                                                            cterm=underline
-hi WarningMsg           ctermfg=DarkYellow
-hi WildMenu             ctermfg=bg              ctermbg=Yellow
-hi Folded               ctermfg=Magenta         ctermbg=bg
-hi FoldColumn           ctermfg=Cyan            ctermbg=bg
-
-if v:version >= 600
-  hi DiffAdd              ctermfg=Black           ctermbg=DarkGreen
-  hi DiffChange                                   ctermbg=DarkBlue
-  hi DiffDelete           ctermfg=Black           ctermbg=DarkRed
-  hi DiffText             ctermfg=Black           ctermbg=DarkYellow      cterm=none
-endif
-
-hi SignColumn           ctermfg=Yellow          ctermbg=bg
-
-if v:version >= 700
-  hi SpellBad                                     ctermbg=DarkRed         cterm=underline
-  hi SpellCap                                     ctermbg=DarkBlue        cterm=underline
-  hi SpellRare                                    ctermbg=DarkMagenta     cterm=underline
-  hi SpellLocal                                   ctermbg=DarkCyan        cterm=underline
-endif
-
-hi Pmenu                ctermfg=fg              ctermbg=DarkMagenta
-hi PmenuSel             ctermfg=fg              ctermbg=DarkGray
-hi PmenuSbar            ctermfg=fg              ctermbg=DarkGray
-hi PmenuThumb                                                           cterm=reverse
-hi TabLine              ctermfg=bg              ctermbg=fg              cterm=none
-hi TabLineSel                                                           cterm=bold
-hi TabLineFill                                                          cterm=reverse
-hi CursorLine                                   ctermbg=DarkGray
-
-" Syntax {{{2
-hi MatchParen                                   ctermbg=DarkCyan
-hi Comment              ctermfg=Green
-hi Constant             ctermfg=Red
-hi String               ctermfg=Magenta
-hi Boolean              ctermfg=Blue
-hi Identifier           ctermfg=Cyan                                    cterm=none
-hi Function             ctermfg=Cyan
-hi Statement            ctermfg=Blue
-hi Operator             ctermfg=Blue
-hi PreProc              ctermfg=DarkCyan
-hi Type                 ctermfg=Yellow
-hi Special              ctermfg=DarkRed
-hi Underlined           ctermfg=Magenta                                 cterm=underline
-hi Ignore               ctermfg=bg
-hi Error                ctermfg=White           ctermbg=Red
-hi Todo                 ctermfg=DarkBlue        ctermbg=Yellow
-
-" Custom {{{2
-hi colorIndentLevel1                            ctermbg=Black
-hi colorIndentLevel2                            ctermbg=DarkGray
-" mail {{{3
-hi mailQuoted1          ctermfg=DarkBlue
-hi mailQuoted2          ctermfg=DarkRed
-hi mailQuoted3          ctermfg=DarkGreen
-hi mailQuoted4          ctermfg=DarkMagenta
-hi mailQuoted5          ctermfg=DarkCyan
-hi mailQuoted6          ctermfg=DarkYellow
-hi mailEmail            ctermfg=Blue                                    cterm=underline
-hi mailSignature        ctermfg=DarkGray
-
-" 8-color terminal extras {{{2
-if &t_Co == 8
-  hi Identifier                                                           cterm=bold
-endif
-
-" CSApprox config {{{1
-let g:CSApprox_hook_graywh_post = ['hi Visual          ctermbg=NONE ctermfg=NONE cterm=reverse',
-                                 \ 'hi IncSearch       ctermbg=NONE ctermfg=NONE cterm=reverse' ]
diff --git a/colors/grb256.vim b/colors/grb256.vim
deleted file mode 100755
index ad542bf..0000000
--- a/colors/grb256.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" From https://github.com/garybernhardt/destroy-all-software-extras/blob/master/das-0030-some-vim-tips/grb256.vim
-" Based on
-runtime colors/ir_black.vim
-
-let g:colors_name = "grb256"
-
-hi pythonSpaceError ctermbg=red guibg=red
-
-hi Comment ctermfg=darkgray
-
-hi StatusLine ctermbg=darkgrey ctermfg=white
-hi StatusLineNC ctermbg=black ctermfg=lightgrey
-hi VertSplit ctermbg=black ctermfg=lightgrey
-hi LineNr ctermfg=darkgray
-hi CursorLine     guifg=NONE        guibg=#121212     gui=NONE      ctermfg=NONE        ctermbg=234
-hi Function       guifg=#FFD2A7     guibg=NONE        gui=NONE      ctermfg=yellow      ctermbg=NONE   cterm=NONE
-hi Visual         guifg=NONE        guibg=#262D51     gui=NONE      ctermfg=NONE        ctermbg=236    cterm=NONE
-
-hi Error            guifg=NONE        guibg=NONE        gui=undercurl ctermfg=16       ctermbg=red     cterm=NONE     guisp=#FF6C60 " undercurl color
-hi ErrorMsg         guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=16       ctermbg=red     cterm=NONE
-hi WarningMsg       guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=16       ctermbg=red     cterm=NONE
-hi SpellBad         guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=16       ctermbg=160     cterm=NONE
-
-" ir_black doesn't highlight operators for some reason
-hi Operator        guifg=#6699CC     guibg=NONE        gui=NONE      ctermfg=lightblue   ctermbg=NONE        cterm=NONE
-
-highlight DiffAdd term=reverse cterm=bold ctermbg=lightgreen ctermfg=16
-highlight DiffChange term=reverse cterm=bold ctermbg=lightblue ctermfg=16
-highlight DiffText term=reverse cterm=bold ctermbg=lightgray ctermfg=16
-highlight DiffDelete term=reverse cterm=bold ctermbg=lightred ctermfg=16
-
-highlight PmenuSel ctermfg=16 ctermbg=156
diff --git a/colors/greens.vim b/colors/greens.vim
deleted file mode 100755
index 1963c7a..0000000
--- a/colors/greens.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Vim color file
-" Maintainer:   Yuheng Xie <elephant@linux.net.cn>
-" Last Change:  2007 Jan 29
-
-" This color scheme uses a black background.
-
-" First remove all existing highlighting.
-set background=dark
-highlight clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "greens"
-
-hi Cursor                         guifg=Black      guibg=#FFBF00
-hi Normal      ctermfg=Grey       guifg=#A4A090    guibg=Black        ctermbg=Black
-hi Visual                         guifg=Black      guibg=#C4C090      gui=NONE
-
-hi Comment     ctermfg=DarkGreen  guifg=DarkGreen
-hi Constant    ctermfg=Red        guifg=Red
-hi Special     ctermfg=DarkRed    guifg=#600000
-hi Identifier  ctermfg=Cyan       guifg=#40D8D0
-hi Statement   ctermfg=Yellow     guifg=Yellow                        gui=NONE
-hi PreProc     ctermfg=Green      guifg=Green
-hi Type        ctermfg=White      guifg=White                         gui=NONE
-hi Ignore      ctermfg=DarkGrey   guifg=#22201C
-
-hi FoldColumn                     guifg=#C4C0B0    guibg=#42403C
-hi Folded                         guifg=#C4C0B0    guibg=#22201C
-
-hi DiffAdd                                         guibg=DarkBlue     ctermbg=DarkBlue
-hi DiffDelete                                      guibg=DarkCyan     ctermbg=DarkCyan  gui=NONE
-hi DiffText                                        guibg=DarkRed      ctermbg=DarkRed   gui=NONE
-hi DiffChange                                      guibg=DarkMagenta  ctermbg=DarkMagenta
-
-if v:version >= 700
-
-hi CursorLine                                      guibg=#403820
-hi CursorColumn                                    guibg=#403820
-
-hi MatchParen  ctermfg=White      guifg=White      guibg=DarkGreen    ctermbg=DarkGreen
-
-hi Pmenu       ctermfg=Black      guifg=Black      guibg=#C4C090      ctermbg=LightGray
-hi PmenuSel    ctermfg=Black      guifg=Black      guibg=#FFBF00      ctermbg=Yellow
-hi PmenuSbar   ctermfg=Black      guifg=Black      guibg=LightGray    ctermbg=White
-hi PmenuThumb  ctermfg=Black      guifg=Black      guibg=White        ctermbg=Green  gui=NONE  cterm=NONE
-
-hi TabLine                        guifg=Black      guibg=#A4A090      gui=NONE
-hi TabLineFill                    guifg=Black      guibg=#A4A090      gui=NONE
-hi TabLineSel                     guifg=White      guibg=Black
-
-endif
-
-" vim: ts=2 sw=2
diff --git a/colors/greenvision.vim b/colors/greenvision.vim
deleted file mode 100755
index c20329c..0000000
--- a/colors/greenvision.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" Vim color file
-" Name: greenvision.vim
-" Maintainer: Paul B. Mahol <onemda@No-NoSpaMgmail.com>
-" Last Change: 6.6.2008
-" License: Vim License
-" Revision: 29
-
-if !has("gui_running") && &t_Co != 256 && &t_Co != 88
-	echomsg ""
-	echomsg "err: please use GUI or a 256-color terminal or 88-color terminal"
-	echomsg ""
-	finish
-endif
-
-if &background == "light"
-	set background=dark
-endif
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'greenvision'
-
-hi Comment		guifg=#008220 guibg=#000000 gui=none ctermfg=034 ctermbg=000 cterm=none
-hi Constant		guifg=#1fc700 guibg=#001c00 gui=none ctermfg=041 ctermbg=000 cterm=none
-hi Cursor		guifg=#00ff00 gui=bold,reverse ctermfg=010 ctermbg=000 cterm=bold,reverse
-hi CursorColumn 	guifg=#000000 guibg=#00cc00 gui=none ctermfg=000 ctermbg=002 cterm=none
-hi CursorIM		guifg=#00ff00 guibg=#000000 gui=bold ctermfg=046 ctermbg=000 cterm=bold
-hi CursorLine		guifg=#000000 guibg=#00cc00 gui=none ctermfg=000 ctermbg=002 cterm=none
-hi DiffAdd		guifg=#00bf00 guibg=#002200 gui=none ctermfg=034 ctermbg=000 cterm=none
-hi DiffChange		guifg=#00a900 guibg=#002200 gui=none ctermfg=040 ctermbg=000 cterm=none
-hi DiffDelete		guifg=#000000 guibg=#005500 gui=none ctermfg=002 ctermbg=000 cterm=none
-hi DiffText		guifg=#00aa00 guibg=#004400 gui=underline ctermfg=028 ctermbg=000 cterm=none
-hi Directory		guifg=#009330 guibg=#000000 gui=none ctermfg=022 ctermbg=000 cterm=none
-hi Error		guifg=#000000 guibg=#00d000 gui=none ctermfg=000 ctermbg=010 cterm=none
-hi ErrorMsg		guifg=#000000 guibg=#00ff00 gui=bold ctermfg=000 ctermbg=010 cterm=none
-hi FoldColumn		guifg=#00b900 guibg=#000300 gui=none ctermfg=046 ctermbg=016 cterm=none
-hi Folded		guifg=#00bf00 guibg=#001200 gui=none ctermfg=010 ctermbg=022 cterm=none
-hi Identifier		guifg=#50d930 guibg=#000000 gui=none ctermfg=028 ctermbg=000 cterm=none
-hi IncSearch		gui=reverse cterm=reverse
-hi LineNr		guifg=#007900 guibg=#000600 gui=none ctermfg=034 ctermbg=016 cterm=none
-hi MatchParen		guifg=#304300 guibg=#00fe00 gui=none ctermfg=010 ctermbg=022 cterm=bold
-hi ModeMsg		guifg=#00ea00 guibg=#000900 gui=none ctermfg=002 ctermbg=000 cterm=none
-hi MoreMsg		guifg=#00e700 guibg=#001000 gui=bold ctermfg=002 ctermbg=000 cterm=bold
-hi NonText		guifg=#008700 guibg=#001000 gui=none ctermfg=022 ctermbg=000 cterm=none
-hi Normal		guifg=#00a900 guibg=#000000 gui=none ctermfg=002 ctermbg=000 cterm=none
-hi Pmenu		guifg=#00bf00 guibg=#000a00 gui=none ctermfg=002 ctermbg=000 cterm=none
-hi PmenuSbar		guifg=#00dc00 guibg=#001c00 gui=none ctermfg=034 ctermbg=022 cterm=none
-hi PmenuSel		guifg=#00f300 guibg=#002200 gui=none ctermfg=010 ctermbg=022 cterm=none
-hi PreProc		guifg=#00ac5c guibg=#000000 gui=none ctermfg=047 ctermbg=000 cterm=none
-hi Question		guifg=#009f00 guibg=#000000 gui=none ctermfg=040 ctermbg=000 cterm=none
-hi Search		gui=reverse cterm=reverse
-hi Special		guifg=#00d700 guibg=#001200 gui=none ctermfg=002 ctermbg=000 cterm=none
-hi SpecialKey		guifg=#008000 guibg=#002300 gui=bold ctermfg=034 ctermbg=000 cterm=bold
-hi Statement		guifg=#2fc626 guibg=#000000 gui=none ctermfg=010 ctermbg=000 cterm=none
-hi StatusLine		guifg=#00ff00 guibg=#001000 gui=none ctermfg=047 ctermbg=022 cterm=bold
-hi StatusLineNC		guifg=#005500 guibg=#001000 gui=none ctermfg=034 ctermbg=022 cterm=none
-hi TabLine		guifg=#00f400 guibg=#000a00 gui=none ctermfg=040 ctermbg=000 cterm=none
-hi TabLineFill		guifg=#00ea00 guibg=#000000 gui=none ctermfg=000 ctermbg=000 cterm=none
-hi TabLineSel		guifg=#00f000 guibg=#002a00 gui=none ctermfg=046 ctermbg=022 cterm=bold
-hi Title		guifg=#09ab00 guibg=#000000 gui=bold ctermfg=010 ctermbg=000 cterm=bold
-hi Todo			guifg=#000000 guibg=#00ed00 gui=none ctermfg=000 ctermbg=002 cterm=none
-hi Type			guifg=#1fb631 guibg=#000000 gui=none ctermfg=046 ctermbg=000 cterm=none
-hi Underlined		guifg=#00b400 guibg=#000000 gui=underline ctermfg=002 ctermbg=000 cterm=underline
-hi VertSplit		guifg=#000600 guibg=#001f00 gui=none ctermfg=022 ctermbg=022 cterm=none
-hi Visual		guibg=#001500 gui=reverse ctermbg=000 cterm=reverse
-hi VisualNOS		guibg=#002700 gui=reverse ctermbg=022 cterm=reverse
-hi WarningMsg		guifg=#000000 guibg=#00ff00 gui=none ctermfg=010 ctermbg=000 cterm=none
-hi WildMenu		guifg=#00cb00 guibg=#000000 gui=reverse ctermfg=000 ctermbg=010 cterm=reverse
diff --git a/colors/grey2.vim b/colors/grey2.vim
deleted file mode 100755
index aae99ae..0000000
--- a/colors/grey2.vim
+++ /dev/null
@@ -1,153 +0,0 @@
-runtime macro/colorConvert.vim
-" Set 'background' back to the default.  The value can't always be estimated
-" and is then guessed.
-hi clear Normal
-set background=dark
-
-" Remove all existing highlighting and set the defaults.
-hi clear
-
-" Load the syntax highlighting defaults, if it's enabled.
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "grey2"
-
-if exists( 'g:grey2_text_bg' )
-    let s:bg = !!g:grey2_text_bg
-else
-    let s:bg = 1
-endif
-    
-
-
-" Normal Define Character Constant Todo Label Identifier Keyword Function Question Tag Statement Cursor Search Type Visual Folded Operator Number Comment Directory Title Special Underlined String PreProc SpecialChar Hint Emphasize 
-"
-" CursorLine CursorColumn DiffAdd DiffChange DiffDelete DiffText ErrorMsg FoldColumn Ignore IncSearch LineNr ModeMsg MoreMsg NonText Pmenu PmenuSel SpecialKey VertSplit VisualNOS WarningMsg WildMenu
-
-
-
-hi  Normal       gui=none      guifg=#b0b0b0     guibg=#282828
-
-hi  Define       gui=none      guifg=#7f3b5d     guibg=NONE
-hi  Character    gui=none      guifg=#a0576a     guibg=NONE
-hi  Constant     gui=none      guifg=#c77575     guibg=NONE
-hi  Todo         gui=none      guifg=#000000     guibg=#d07c16
-hi  Label        gui=none      guifg=#eba700     guibg=#4c4646
-hi  Identifier   gui=none      guifg=#9f7951     guibg=NONE
-hi  Keyword      gui=none      guifg=#d0b020
-hi  Function     gui=none      guifg=#9cc846     guibg=NONE
-hi  Question     gui=none      guifg=#82c000     guibg=NONE
-hi  Tag          gui=none      guifg=#7b9f63     guibg=NONE
-hi  Statement    gui=none      guifg=#65c76a     guibg=NONE
-hi  Cursor       gui=none      guifg=#000000     guibg=#00ff00
-hi  Search       gui=none      guifg=#ffffff     guibg=#4b7435
-hi  Type         gui=none      guifg=#417047     guibg=NONE
-hi  Visual       gui=none      guifg=NONE        guibg=#304050
-hi  Folded       gui=none      guifg=#667088     guibg=NONE
-hi  Operator     gui=none      guifg=#718da7     guibg=NONE
-hi  Number       gui=none      guifg=#5b68a8     guibg=#181818
-hi  Comment      gui=none      guifg=#5d5dcb     guibg=NONE
-hi  Directory    gui=none      guifg=#8080d0     guibg=NONE
-hi  Title        gui=none      guifg=#d090f0     guibg=NONE
-hi  Special      gui=none      guifg=#6a4ee7     guibg=NONE
-hi  Underlined   gui=underline guifg=#8962ce     guibg=NONE
-hi  PreProc      gui=none      guifg=#6b33ff     guibg=#181818
-hi  String       gui=none      guifg=#7c5ad1     guibg=#1c1c1c
-
-if !s:bg
-    hi  Number   guibg=NONE
-    hi  PreProc  guibg=NONE
-    hi  String   guibg=NONE
-endif
-
-
-
-
-hi  SpecialChar  gui=none      guifg=NONE        guibg=NONE
-hi  Hint         gui=underline guifg=NONE        guibg=NONE
-hi  Emphasize    gui=none      guifg=#000000     guibg=NONE
-hi  CursorLine   gui=none                        guibg=#404040
-hi  CursorColumn gui=none                        guibg=#303030
-hi  DiffAdd      gui=none      guifg=NONE        guibg=#283734
-hi  DiffChange   gui=none      guifg=NONE        guibg=#895b33
-hi  DiffDelete   gui=none      guifg=NONE        guibg=#3e535c
-hi  DiffText     gui=none      guifg=#dddddd     guibg=#cc7733
-hi  ErrorMsg     gui=none      guifg=#ffffff     guibg=#880000
-hi  FoldColumn   gui=none      guifg=#507080     guibg=#a0a0a0
-hi  Ignore       gui=none      guifg=#6c6c6c     guibg=NONE
-hi  IncSearch    gui=none      guifg=NONE        guibg=#4c55f8
-hi  LineNr       gui=none      guifg=#535384     guibg=#080808
-hi  ModeMsg      gui=none      guifg=#cbfd4b     guibg=NONE
-hi  MoreMsg      gui=none      guifg=#47d347     guibg=NONE
-hi  NonText      gui=none      guifg=#606060     guibg=NONE
-hi  Pmenu        gui=none      guifg=#303030     guibg=#a3a3c4
-hi  PmenuSel     gui=none      guifg=#000000     guibg=#81e781
-hi  SpecialKey   gui=none      guifg=#5c5c5c     guibg=NONE
-hi  VertSplit    gui=none      guifg=#a7a7a2     guibg=#546292
-hi  VisualNOS    gui=none      guifg=#aaaaaa        guibg=#000000
-hi  WarningMsg   gui=none      guifg=#cf2323     guibg=NONE
-hi  WildMenu     gui=none      guifg=#ffffff     guibg=#506080
-
-
-hi link Boolean         Constant
-hi link Float           Number
-hi link Conditional     Statement
-hi link Repeat          Statement
-hi link Exception       Statement
-hi link Include         PreProc
-hi link Macro           PreProc
-hi link PreCondit       PreProc
-hi link StorageClass    Type
-hi link Structure       Type
-hi link Typedef         Type
-hi link SpecialChar     Special
-hi link Delimiter       Special
-hi link SpecialComment  Special
-hi link Debug           Special
-hi link vimfunction     function
-
-
-hi def link MyTagListTagName Visual
-hi def link MyTagListFileName Identifier
-
-hi link vimVar          Identifier
-
-" =====================================================
-" XPTemplate color setting
-" http://www.vim.org/scripts/script.php?script_id=2611
-" =====================================================
-
-hi XPTcurrentPH         gui=underline   guibg=#3c3c3c guifg=NONE
-hi XPTfollowingPH       gui=underline	guibg=NONE guifg=NONE
-hi XPTnextItem          gui=none	guibg=#3e3e68 guifg=#dddddd
-
-
-
-
-
-hi MatchParen     gui=none guibg=#244c5c guifg=NONE
-" }}}
-
-
-
-
-hi StatuslineBufNr     cterm=none    ctermfg=black  ctermbg=cyan    gui=none guibg=#840c0c guifg=#ffffff
-hi StatuslineFlag      cterm=none    ctermfg=black  ctermbg=cyan    gui=none guibg=#bc5b4c guifg=#ffffff
-hi StatuslinePath      cterm=none    ctermfg=white  ctermbg=green   gui=none guibg=#8d6c47 guifg=black
-hi StatuslineFileName  cterm=none    ctermfg=white  ctermbg=blue    gui=none guibg=#d59159 guifg=black
-hi StatuslineFileEnc   cterm=none    ctermfg=white  ctermbg=yellow  gui=none guibg=#ffff77 guifg=black
-hi StatuslineFileType  cterm=bold    ctermbg=white  ctermfg=black   gui=none guibg=#acff84 guifg=black
-hi StatuslineTermEnc   cterm=none    ctermbg=white  ctermfg=yellow  gui=none guibg=#77cf77 guifg=black
-hi StatuslineChar      cterm=none    ctermbg=white  ctermfg=yellow  gui=none guibg=#66b06f guifg=black
-hi StatuslineSyn       cterm=none    ctermbg=white  ctermfg=yellow  gui=none guibg=#60af9f guifg=black
-hi StatuslineRealSyn   cterm=none    ctermbg=white  ctermfg=yellow  gui=none guibg=#5881b7 guifg=black
-hi StatusLine          cterm=none    ctermbg=white  ctermfg=yellow  gui=none guibg=#3f4d77 guifg=#729eb0 
-hi StatuslineTime      cterm=none    ctermfg=black  ctermbg=cyan    gui=none guibg=#3a406e guifg=#000000
-hi StatuslineSomething cterm=reverse ctermfg=white  ctermbg=darkred gui=none guibg=#c0c0f0 guifg=black
-hi StatusLineNC                                                     gui=none guibg=#304050 guifg=#70a0a0 
-
-
-
-
diff --git a/colors/greyblue.vim b/colors/greyblue.vim
deleted file mode 100755
index 1b3c233..0000000
--- a/colors/greyblue.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-" Vim color file
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "greyblue"
-
-hi Normal          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#b7af9f guibg=#090909
-
-" Search
-hi IncSearch       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7800ff guibg=#e0d8ff
-hi Search          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7800ff guibg=#e0d8ff
-
-" Messages
-hi ErrorMsg        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi WarningMsg      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi ModeMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi MoreMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi Question        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-
-" Split area
-hi StatusLine      ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#070707 guibg=#cfcfbf
-hi StatusLineNC    ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#5f5f4f guibg=#cfcfbf
-hi VertSplit       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#cfcfbf
-hi WildMenu        ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#070707 guibg=#ff5533
-
-" Diff
-hi DiffText        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#07cfef guibg=#00151f
-hi DiffChange      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ff97ff guibg=#2f002f
-hi DiffDelete      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
-hi DiffAdd         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
-
-" Cursor
-hi Cursor       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffff00 guibg=#7fff00
-hi lCursor      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#7fff00
-hi CursorIM     ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#7fff00
-
-" Fold
-hi Folded          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#87ff00 guibg=#1f2700
-hi FoldColumn      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#559f00 guibg=#0f0f0b
-
-" Other
-hi Directory       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaba guibg=NONE
-hi LineNr          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7f7f5f guibg=NONE
-hi NonText         ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#211d1a guibg=#211d1a
-hi SpecialKey      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#378fff guibg=NONE
-hi Title           ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffbf9f guibg=#370f07
-hi Visual          ctermfg=NONE ctermbg=NONE gui=reverse guifg=#a5a5a5 guibg=#353535
-
-" Syntax group
-hi Comment         ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#555565 guibg=NONE
-hi Constant        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#d1bfb1 guibg=#151515
-hi Error           ctermfg=NONE ctermbg=NONE gui=NONE guifg=#00ffff guibg=NONE
-hi Identifier      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaba guibg=NONE
-hi Ignore          ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
-hi PreProc         ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
-hi Special         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aa1565 guibg=NONE
-hi Statement       ctermfg=NONE ctermbg=NONE gui=bold guifg=#d1bfb1 guibg=NONE
-hi Todo            ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
-hi Type            ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#d1bfb1 guibg=NONE
-hi Underlined      ctermfg=NONE ctermbg=NONE gui=UNDERLINE guifg=NONE guibg=NONE
-
-" HTML
-hi htmlLink        gui=UNDERLINE guifg=#ffff00 guibg=NONE
-hi htmlBold        gui=BOLD
-hi htmlBoldItalic  gui=BOLD,ITALIC
-hi htmlBoldUnderline  gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic      gui=ITALIC
-hi htmlUnderline   gui=UNDERLINE
-hi htmlUnderlineItalic  gui=UNDERLINE,ITALIC
diff --git a/colors/gruvbox.vim b/colors/gruvbox.vim
old mode 100755
new mode 100644
index e0d1885..66246fb
--- a/colors/gruvbox.vim
+++ b/colors/gruvbox.vim
@@ -3,344 +3,679 @@
 " Description: Retro groove color scheme for Vim
 " Author: morhetz <morhetz@gmail.com>
 " Source: https://github.com/morhetz/gruvbox
-" Last Modified: 9 Dec 2012
+" Last Modified: 12 Aug 2017
 " -----------------------------------------------------------------------------
 
 " Supporting code -------------------------------------------------------------
 " Initialisation: {{{
 
-"set background=dark
-
 if version > 580
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
+  hi clear
+  if exists("syntax_on")
+    syntax reset
+  endif
 endif
 
-let g:colors_name="gruvbox"
+let g:colors_name='gruvbox'
+
+if !(has('termguicolors') && &termguicolors) && !has('gui_running') && &t_Co != 256
+  finish
+endif
 
-" To be done {{{
-""" if has("gui_running") || &t_Co == 88 || &t_Co == 256
-"""   let s:low_color = 0
-""" else
-"""   let s:low_color = 1
-""" endif
 " }}}
+" Global Settings: {{{
+
+if !exists('g:gruvbox_bold')
+  let g:gruvbox_bold=1
+endif
+if !exists('g:gruvbox_italic')
+  if has('gui_running') || $TERM_ITALICS == 'true'
+    let g:gruvbox_italic=1
+  else
+    let g:gruvbox_italic=0
+  endif
+endif
+if !exists('g:gruvbox_undercurl')
+  let g:gruvbox_undercurl=1
+endif
+if !exists('g:gruvbox_underline')
+  let g:gruvbox_underline=1
+endif
+if !exists('g:gruvbox_inverse')
+  let g:gruvbox_inverse=1
+endif
+
+if !exists('g:gruvbox_guisp_fallback') || index(['fg', 'bg'], g:gruvbox_guisp_fallback) == -1
+  let g:gruvbox_guisp_fallback='NONE'
+endif
+
+if !exists('g:gruvbox_improved_strings')
+  let g:gruvbox_improved_strings=0
+endif
+
+if !exists('g:gruvbox_improved_warnings')
+  let g:gruvbox_improved_warnings=0
+endif
 
-if !has("gui_running") && &t_Co != 88 && &t_Co != 256
-	finish
+if !exists('g:gruvbox_termcolors')
+  let g:gruvbox_termcolors=256
 endif
 
+if !exists('g:gruvbox_invert_indent_guides')
+  let g:gruvbox_invert_indent_guides=0
+endif
+
+if exists('g:gruvbox_contrast')
+  echo 'g:gruvbox_contrast is deprecated; use g:gruvbox_contrast_light and g:gruvbox_contrast_dark instead'
+endif
+
+if !exists('g:gruvbox_contrast_dark')
+  let g:gruvbox_contrast_dark='medium'
+endif
+
+if !exists('g:gruvbox_contrast_light')
+  let g:gruvbox_contrast_light='medium'
+endif
+
+let s:is_dark=(&background == 'dark')
+
 " }}}
 " Palette: {{{
 
+" setup palette dictionary
 let s:gb = {}
 
-if &background == "dark"
-	let s:gb.dark0  = ['282828', 235]
-	let s:gb.dark1  = ['3c3836', 237]
-	let s:gb.dark2  = ['504945', 239]
-	let s:gb.dark3  = ['665c54', 241]
-	let s:gb.dark4  = ['7c6f64', 243]
-
-	let s:gb.medium = ['928374', 245]
-
-	let s:gb.light0 = ['fdf4c1', 247]
-	let s:gb.light1 = ['ebdbb2', 223]
-	let s:gb.light2 = ['d5c4a1', 251]
-	let s:gb.light3 = ['bdae93', 253]
-	let s:gb.light4 = ['a89984', 255]
-
-	let s:gb.red    = ['fb4934', 167]
-	let s:gb.orange = ['fe8019', 208]
-	let s:gb.yellow = ['fabd2f', 214]
-	let s:gb.green  = ['b8bb26', 142]
-	let s:gb.aqua   = ['8ec07c', 108]
-	let s:gb.blue   = ['83a598', 109]
-	let s:gb.purple = ['d3869b', 175]
+" fill it with absolute colors
+let s:gb.dark0_hard  = ['#1d2021', 234]     " 29-32-33
+let s:gb.dark0       = ['#282828', 235]     " 40-40-40
+let s:gb.dark0_soft  = ['#32302f', 236]     " 50-48-47
+let s:gb.dark1       = ['#3c3836', 237]     " 60-56-54
+let s:gb.dark2       = ['#504945', 239]     " 80-73-69
+let s:gb.dark3       = ['#665c54', 241]     " 102-92-84
+let s:gb.dark4       = ['#7c6f64', 243]     " 124-111-100
+let s:gb.dark4_256   = ['#7c6f64', 243]     " 124-111-100
+
+let s:gb.gray_245    = ['#928374', 245]     " 146-131-116
+let s:gb.gray_244    = ['#928374', 244]     " 146-131-116
+
+let s:gb.light0_hard = ['#f9f5d7', 230]     " 249-245-215
+let s:gb.light0      = ['#fbf1c7', 229]     " 253-244-193
+let s:gb.light0_soft = ['#f2e5bc', 228]     " 242-229-188
+let s:gb.light1      = ['#ebdbb2', 223]     " 235-219-178
+let s:gb.light2      = ['#d5c4a1', 250]     " 213-196-161
+let s:gb.light3      = ['#bdae93', 248]     " 189-174-147
+let s:gb.light4      = ['#a89984', 246]     " 168-153-132
+let s:gb.light4_256  = ['#a89984', 246]     " 168-153-132
+
+let s:gb.bright_red     = ['#fb4934', 167]     " 251-73-52
+let s:gb.bright_green   = ['#b8bb26', 142]     " 184-187-38
+let s:gb.bright_yellow  = ['#fabd2f', 214]     " 250-189-47
+let s:gb.bright_blue    = ['#83a598', 109]     " 131-165-152
+let s:gb.bright_purple  = ['#d3869b', 175]     " 211-134-155
+let s:gb.bright_aqua    = ['#8ec07c', 108]     " 142-192-124
+let s:gb.bright_orange  = ['#fe8019', 208]     " 254-128-25
+
+let s:gb.neutral_red    = ['#cc241d', 124]     " 204-36-29
+let s:gb.neutral_green  = ['#98971a', 106]     " 152-151-26
+let s:gb.neutral_yellow = ['#d79921', 172]     " 215-153-33
+let s:gb.neutral_blue   = ['#458588', 66]      " 69-133-136
+let s:gb.neutral_purple = ['#b16286', 132]     " 177-98-134
+let s:gb.neutral_aqua   = ['#689d6a', 72]      " 104-157-106
+let s:gb.neutral_orange = ['#d65d0e', 166]     " 214-93-14
+
+let s:gb.faded_red      = ['#9d0006', 88]      " 157-0-6
+let s:gb.faded_green    = ['#79740e', 100]     " 121-116-14
+let s:gb.faded_yellow   = ['#b57614', 136]     " 181-118-20
+let s:gb.faded_blue     = ['#076678', 24]      " 7-102-120
+let s:gb.faded_purple   = ['#8f3f71', 96]      " 143-63-113
+let s:gb.faded_aqua     = ['#427b58', 66]      " 66-123-88
+let s:gb.faded_orange   = ['#af3a03', 130]     " 175-58-3
+
+" }}}
+" Setup Emphasis: {{{
+
+let s:bold = 'bold,'
+if g:gruvbox_bold == 0
+  let s:bold = ''
+endif
+
+let s:italic = 'italic,'
+if g:gruvbox_italic == 0
+  let s:italic = ''
+endif
+
+let s:underline = 'underline,'
+if g:gruvbox_underline == 0
+  let s:underline = ''
+endif
+
+let s:undercurl = 'undercurl,'
+if g:gruvbox_undercurl == 0
+  let s:undercurl = ''
+endif
+
+let s:inverse = 'inverse,'
+if g:gruvbox_inverse == 0
+  let s:inverse = ''
+endif
+
+" }}}
+" Setup Colors: {{{
+
+let s:vim_bg = ['bg', 'bg']
+let s:vim_fg = ['fg', 'fg']
+let s:none = ['NONE', 'NONE']
+
+" determine relative colors
+if s:is_dark
+  let s:bg0  = s:gb.dark0
+  if g:gruvbox_contrast_dark == 'soft'
+    let s:bg0  = s:gb.dark0_soft
+  elseif g:gruvbox_contrast_dark == 'hard'
+    let s:bg0  = s:gb.dark0_hard
+  endif
+
+  let s:bg1  = s:gb.dark1
+  let s:bg2  = s:gb.dark2
+  let s:bg3  = s:gb.dark3
+  let s:bg4  = s:gb.dark4
+
+  let s:gray = s:gb.gray_245
+
+  let s:fg0 = s:gb.light0
+  let s:fg1 = s:gb.light1
+  let s:fg2 = s:gb.light2
+  let s:fg3 = s:gb.light3
+  let s:fg4 = s:gb.light4
+
+  let s:fg4_256 = s:gb.light4_256
+
+  let s:red    = s:gb.bright_red
+  let s:green  = s:gb.bright_green
+  let s:yellow = s:gb.bright_yellow
+  let s:blue   = s:gb.bright_blue
+  let s:purple = s:gb.bright_purple
+  let s:aqua   = s:gb.bright_aqua
+  let s:orange = s:gb.bright_orange
+else
+  let s:bg0  = s:gb.light0
+  if g:gruvbox_contrast_light == 'soft'
+    let s:bg0  = s:gb.light0_soft
+  elseif g:gruvbox_contrast_light == 'hard'
+    let s:bg0  = s:gb.light0_hard
+  endif
+
+  let s:bg1  = s:gb.light1
+  let s:bg2  = s:gb.light2
+  let s:bg3  = s:gb.light3
+  let s:bg4  = s:gb.light4
+
+  let s:gray = s:gb.gray_244
+
+  let s:fg0 = s:gb.dark0
+  let s:fg1 = s:gb.dark1
+  let s:fg2 = s:gb.dark2
+  let s:fg3 = s:gb.dark3
+  let s:fg4 = s:gb.dark4
+
+  let s:fg4_256 = s:gb.dark4_256
+
+  let s:red    = s:gb.faded_red
+  let s:green  = s:gb.faded_green
+  let s:yellow = s:gb.faded_yellow
+  let s:blue   = s:gb.faded_blue
+  let s:purple = s:gb.faded_purple
+  let s:aqua   = s:gb.faded_aqua
+  let s:orange = s:gb.faded_orange
+endif
+
+" reset to 16 colors fallback
+if g:gruvbox_termcolors == 16
+  let s:bg0[1]    = 0
+  let s:fg4[1]    = 7
+  let s:gray[1]   = 8
+  let s:red[1]    = 9
+  let s:green[1]  = 10
+  let s:yellow[1] = 11
+  let s:blue[1]   = 12
+  let s:purple[1] = 13
+  let s:aqua[1]   = 14
+  let s:fg1[1]    = 15
+endif
+
+" save current relative colors back to palette dictionary
+let s:gb.bg0 = s:bg0
+let s:gb.bg1 = s:bg1
+let s:gb.bg2 = s:bg2
+let s:gb.bg3 = s:bg3
+let s:gb.bg4 = s:bg4
+
+let s:gb.gray = s:gray
+
+let s:gb.fg0 = s:fg0
+let s:gb.fg1 = s:fg1
+let s:gb.fg2 = s:fg2
+let s:gb.fg3 = s:fg3
+let s:gb.fg4 = s:fg4
+
+let s:gb.fg4_256 = s:fg4_256
+
+let s:gb.red    = s:red
+let s:gb.green  = s:green
+let s:gb.yellow = s:yellow
+let s:gb.blue   = s:blue
+let s:gb.purple = s:purple
+let s:gb.aqua   = s:aqua
+let s:gb.orange = s:orange
+
+" }}}
+" Setup Terminal Colors For Neovim: {{{
+
+if has('nvim')
+  let g:terminal_color_0 = s:bg0[0]
+  let g:terminal_color_8 = s:gray[0]
+
+  let g:terminal_color_1 = s:gb.neutral_red[0]
+  let g:terminal_color_9 = s:red[0]
+
+  let g:terminal_color_2 = s:gb.neutral_green[0]
+  let g:terminal_color_10 = s:green[0]
+
+  let g:terminal_color_3 = s:gb.neutral_yellow[0]
+  let g:terminal_color_11 = s:yellow[0]
+
+  let g:terminal_color_4 = s:gb.neutral_blue[0]
+  let g:terminal_color_12 = s:blue[0]
+
+  let g:terminal_color_5 = s:gb.neutral_purple[0]
+  let g:terminal_color_13 = s:purple[0]
+
+  let g:terminal_color_6 = s:gb.neutral_aqua[0]
+  let g:terminal_color_14 = s:aqua[0]
+
+  let g:terminal_color_7 = s:fg4[0]
+  let g:terminal_color_15 = s:fg1[0]
+endif
+
+" }}}
+" Overload Setting: {{{
+
+let s:hls_cursor = s:orange
+if exists('g:gruvbox_hls_cursor')
+  let s:hls_cursor = get(s:gb, g:gruvbox_hls_cursor)
+endif
+
+let s:number_column = s:none
+if exists('g:gruvbox_number_column')
+  let s:number_column = get(s:gb, g:gruvbox_number_column)
+endif
+
+let s:sign_column = s:bg1
+
+if exists('g:gitgutter_override_sign_column_highlight') &&
+      \ g:gitgutter_override_sign_column_highlight == 1
+  let s:sign_column = s:number_column
 else
-	let s:gb.dark0  = ['fdf4c1', 235]
-	let s:gb.dark1  = ['ebdbb2', 237]
-	let s:gb.dark2  = ['d5c4a1', 239]
-	let s:gb.dark3  = ['bdae93', 241]
-	let s:gb.dark4  = ['a89984', 243]
+  let g:gitgutter_override_sign_column_highlight = 0
 
-	let s:gb.medium = ['928374', 245]
+  if exists('g:gruvbox_sign_column')
+    let s:sign_column = get(s:gb, g:gruvbox_sign_column)
+  endif
+endif
+
+let s:color_column = s:bg1
+if exists('g:gruvbox_color_column')
+  let s:color_column = get(s:gb, g:gruvbox_color_column)
+endif
 
-	let s:gb.light0 = ['282828', 247]
-	let s:gb.light1 = ['3c3836', 223]
-	let s:gb.light2 = ['504945', 251]
-	let s:gb.light3 = ['665c54', 253]
-	let s:gb.light4 = ['7c6f64', 255]
+let s:vert_split = s:bg0
+if exists('g:gruvbox_vert_split')
+  let s:vert_split = get(s:gb, g:gruvbox_vert_split)
+endif
 
-	let s:gb.red    = ['9d0006', 167]
-	let s:gb.orange = ['af3a03', 208]
-	let s:gb.yellow = ['b57614', 214]
-	let s:gb.green  = ['79740e', 142]
-	let s:gb.aqua   = ['427b58', 108]
-	let s:gb.blue   = ['076678', 109]
-	let s:gb.purple = ['8f3f71', 175]
+let s:invert_signs = ''
+if exists('g:gruvbox_invert_signs')
+  if g:gruvbox_invert_signs == 1
+    let s:invert_signs = s:inverse
+  endif
+endif
+
+let s:invert_selection = s:inverse
+if exists('g:gruvbox_invert_selection')
+  if g:gruvbox_invert_selection == 0
+    let s:invert_selection = ''
+  endif
+endif
+
+let s:invert_tabline = ''
+if exists('g:gruvbox_invert_tabline')
+  if g:gruvbox_invert_tabline == 1
+    let s:invert_tabline = s:inverse
+  endif
+endif
+
+let s:italicize_comments = s:italic
+if exists('g:gruvbox_italicize_comments')
+  if g:gruvbox_italicize_comments == 0
+    let s:italicize_comments = ''
+  endif
+endif
+
+let s:italicize_strings = ''
+if exists('g:gruvbox_italicize_strings')
+  if g:gruvbox_italicize_strings == 1
+    let s:italicize_strings = s:italic
+  endif
 endif
 
 " }}}
 " Highlighting Function: {{{
 
 function! s:HL(group, fg, ...)
-	" Arguments: group, guifg, guibg, gui, guisp
-
-	let histring = 'hi ' . a:group . ' '
-
-	if strlen(a:fg)
-		if a:fg == 'fg'
-			let histring .= 'guifg=fg ctermfg=fg '
-		elseif a:fg == 'bg'
-			let histring .= 'guifg=bg ctermfg=bg '
-		elseif a:fg == 'none'
-			let histring .= 'guifg=NONE ctermfg=NONE '
-		else
-			let c = get(s:gb, a:fg)
-			let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' '
-		endif
-	endif
-
-	if a:0 >= 1 && strlen(a:1)
-		if a:1 == 'bg'
-			let histring .= 'guibg=bg ctermbg=bg '
-		elseif a:fg == 'fg'
-			let histring .= 'guibg=fg ctermbg=fg '
-		elseif a:1 == 'none'
-			let histring .= 'guibg=NONE ctermfg=NONE '
-		else
-			let c = get(s:gb, a:1)
-			let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' '
-		endif
-	else
-		let histring .= 'guibg=NONE ctermbg=NONE '
-	endif
-
-	if a:0 >= 2 && strlen(a:2)
-		if a:2 == 'none'
-			let histring .= 'gui=NONE cterm=NONE '
-		else
-			let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
-	endif
-	else
-		let histring .= 'gui=NONE cterm=NONE '
-	endif
-
-	if a:0 >= 3 && strlen(a:3)
-		if a:3 == 'none'
-			let histring .= 'guisp=NONE '
-		else
-			let c = get(s:gb, a:3)
-			let histring .= 'guisp=#' . c[0] . ' '
-		endif
-	endif
-
-	execute histring
+  " Arguments: group, guifg, guibg, gui, guisp
+
+  " foreground
+  let fg = a:fg
+
+  " background
+  if a:0 >= 1
+    let bg = a:1
+  else
+    let bg = s:none
+  endif
+
+  " emphasis
+  if a:0 >= 2 && strlen(a:2)
+    let emstr = a:2
+  else
+    let emstr = 'NONE,'
+  endif
+
+  " special fallback
+  if a:0 >= 3
+    if g:gruvbox_guisp_fallback != 'NONE'
+      let fg = a:3
+    endif
+
+    " bg fallback mode should invert higlighting
+    if g:gruvbox_guisp_fallback == 'bg'
+      let emstr .= 'inverse,'
+    endif
+  endif
+
+  let histring = [ 'hi', a:group,
+        \ 'guifg=' . fg[0], 'ctermfg=' . fg[1],
+        \ 'guibg=' . bg[0], 'ctermbg=' . bg[1],
+        \ 'gui=' . emstr[:-2], 'cterm=' . emstr[:-2]
+        \ ]
+
+  " special
+  if a:0 >= 3
+    call add(histring, 'guisp=' . a:3[0])
+  endif
+
+  execute join(histring, ' ')
 endfunction
 
 " }}}
+" Gruvbox Hi Groups: {{{
+
+" memoize common hi groups
+call s:HL('GruvboxFg0', s:fg0)
+call s:HL('GruvboxFg1', s:fg1)
+call s:HL('GruvboxFg2', s:fg2)
+call s:HL('GruvboxFg3', s:fg3)
+call s:HL('GruvboxFg4', s:fg4)
+call s:HL('GruvboxGray', s:gray)
+call s:HL('GruvboxBg0', s:bg0)
+call s:HL('GruvboxBg1', s:bg1)
+call s:HL('GruvboxBg2', s:bg2)
+call s:HL('GruvboxBg3', s:bg3)
+call s:HL('GruvboxBg4', s:bg4)
+
+call s:HL('GruvboxRed', s:red)
+call s:HL('GruvboxRedBold', s:red, s:none, s:bold)
+call s:HL('GruvboxGreen', s:green)
+call s:HL('GruvboxGreenBold', s:green, s:none, s:bold)
+call s:HL('GruvboxYellow', s:yellow)
+call s:HL('GruvboxYellowBold', s:yellow, s:none, s:bold)
+call s:HL('GruvboxBlue', s:blue)
+call s:HL('GruvboxBlueBold', s:blue, s:none, s:bold)
+call s:HL('GruvboxPurple', s:purple)
+call s:HL('GruvboxPurpleBold', s:purple, s:none, s:bold)
+call s:HL('GruvboxAqua', s:aqua)
+call s:HL('GruvboxAquaBold', s:aqua, s:none, s:bold)
+call s:HL('GruvboxOrange', s:orange)
+call s:HL('GruvboxOrangeBold', s:orange, s:none, s:bold)
+
+call s:HL('GruvboxRedSign', s:red, s:sign_column, s:invert_signs)
+call s:HL('GruvboxGreenSign', s:green, s:sign_column, s:invert_signs)
+call s:HL('GruvboxYellowSign', s:yellow, s:sign_column, s:invert_signs)
+call s:HL('GruvboxBlueSign', s:blue, s:sign_column, s:invert_signs)
+call s:HL('GruvboxPurpleSign', s:purple, s:sign_column, s:invert_signs)
+call s:HL('GruvboxAquaSign', s:aqua, s:sign_column, s:invert_signs)
+call s:HL('GruvboxOrangeSign', s:orange, s:sign_column, s:invert_signs)
 
-" Vanilla colorscheme ----------------------------------------------------------
+" }}}
 
+" Vanilla colorscheme ---------------------------------------------------------
 " General UI: {{{
 
 " Normal text
-call s:HL('Normal', 'light1', 'dark0')
-
-if version >= 700
-	" Screen line that the cursor is
-	call s:HL('CursorLine',   'none', 'dark1')
-	" Screen column that the cursor is
-	call s:HL('CursorColumn', 'none', 'dark1')
+call s:HL('Normal', s:fg1, s:bg0)
 
-	" Tab pages line filler
-	call s:HL('TabLineFill', 'dark4', 'bg')
-	" Active tab page label
-	call s:HL('TabLineSel', 'bg', 'dark4', 'bold')
-	" Not active tab page label
-	call s:HL('TabLine', 'dark4', 'bg')
+" Correct background (see issue #7):
+" --- Problem with changing between dark and light on 256 color terminal
+" --- https://github.com/morhetz/gruvbox/issues/7
+if s:is_dark
+  set background=dark
+else
+  set background=light
+endif
 
-	" Match paired bracket under the cursor
-"	call s:HL('MatchParen', 'orange', 'dark3', 'bold')
-	call s:HL('MatchParen', 'none', 'dark3', 'bold')
+if version >= 700
+  " Screen line that the cursor is
+  call s:HL('CursorLine',   s:none, s:bg1)
+  " Screen column that the cursor is
+  hi! link CursorColumn CursorLine
+
+  " Tab pages line filler
+  call s:HL('TabLineFill', s:bg4, s:bg1, s:invert_tabline)
+  " Active tab page label
+  call s:HL('TabLineSel', s:green, s:bg1, s:invert_tabline)
+  " Not active tab page label
+  hi! link TabLine TabLineFill
+
+  " Match paired bracket under the cursor
+  call s:HL('MatchParen', s:none, s:bg3, s:bold)
 endif
 
 if version >= 703
-	" Highlighted screen columns
-	call s:HL('ColorColumn',  'none', 'dark1')
+  " Highlighted screen columns
+  call s:HL('ColorColumn',  s:none, s:color_column)
 
-	" Concealed element: \lambda → λ"
-	call s:HL('Conceal', 'blue', 'none')"
+  " Concealed element: \lambda → λ
+  call s:HL('Conceal', s:blue, s:none)
 
-	" Line number of CursorLine 
-	call s:HL('CursorLineNr', 'yellow', 'dark1')
+  " Line number of CursorLine
+  call s:HL('CursorLineNr', s:yellow, s:bg1)
 endif
 
-call s:HL('NonText',    'dark2')
-call s:HL('SpecialKey', 'dark2')
+hi! link NonText GruvboxBg2
+hi! link SpecialKey GruvboxBg2
 
-call s:HL('Visual',    'none',  'dark3', 'inverse')
-call s:HL('VisualNOS', 'none',  'dark3', 'inverse')
+call s:HL('Visual',    s:none,  s:bg3, s:invert_selection)
+hi! link VisualNOS Visual
 
-call s:HL('Search',    'dark0', 'yellow')
-call s:HL('IncSearch', 'dark0', 'yellow')
+call s:HL('Search',    s:yellow, s:bg0, s:inverse)
+call s:HL('IncSearch', s:hls_cursor, s:bg0, s:inverse)
 
-call s:HL('Underlined', 'blue', 'none', 'underline')
+call s:HL('Underlined', s:blue, s:none, s:underline)
 
-call s:HL('StatusLine',   'dark0', 'dark4', 'bold')
-call s:HL('StatusLineNC', 'light4', 'dark2', 'bold')
+call s:HL('StatusLine',   s:bg2, s:fg1, s:inverse)
+call s:HL('StatusLineNC', s:bg1, s:fg4, s:inverse)
 
 " The column separating vertically split windows
-call s:HL('VertSplit', 'light4', 'dark2')
+call s:HL('VertSplit', s:bg3, s:vert_split)
 
 " Current match in wildmenu completion
-call s:HL('WildMenu', 'blue', 'dark2', 'bold')
+call s:HL('WildMenu', s:blue, s:bg2, s:bold)
 
 " Directory names, special names in listing
-call s:HL('Directory', 'green', 'none', 'bold')
+hi! link Directory GruvboxGreenBold
 
 " Titles for output from :set all, :autocmd, etc.
-call s:HL('Title', 'green', 'none', 'bold')
+hi! link Title GruvboxGreenBold
 
 " Error messages on the command line
-call s:HL('ErrorMsg',   'bg', 'red', 'bold')
+call s:HL('ErrorMsg',   s:bg0, s:red, s:bold)
 " More prompt: -- More --
-call s:HL('MoreMsg',    'yellow', 'none', 'bold')
+hi! link MoreMsg GruvboxYellowBold
 " Current mode message: -- INSERT --
-call s:HL('ModeMsg',    'yellow', 'none', 'bold')
+hi! link ModeMsg GruvboxYellowBold
 " 'Press enter' prompt and yes/no questions
-call s:HL('Question',   'orange', 'none', 'bold')
+hi! link Question GruvboxOrangeBold
 " Warning messages
-call s:HL('WarningMsg', 'red', 'none', 'bold')
+hi! link WarningMsg GruvboxRedBold
 
 " }}}
 " Gutter: {{{
 
 " Line number for :number and :# commands
-call s:HL('LineNr', 'dark4')
+call s:HL('LineNr', s:bg4, s:number_column)
 
 " Column where signs are displayed
-call s:HL('SignColumn', 'none', 'bg')
+call s:HL('SignColumn', s:none, s:sign_column)
 
 " Line used for closed folds
-call s:HL('Folded', 'medium', 'dark1', 'italic')
+call s:HL('Folded', s:gray, s:bg1, s:italic)
 " Column where folds are displayed
-call s:HL('FoldColumn', 'medium', 'dark1')
+call s:HL('FoldColumn', s:gray, s:bg1)
 
 " }}}
 " Cursor: {{{
 
 " Character under cursor
-call s:HL('Cursor',  'none', 'none', 'inverse')
+call s:HL('Cursor', s:none, s:none, s:inverse)
 " Visual mode cursor, selection
-call s:HL('vCursor', 'none', 'none', 'inverse')
+hi! link vCursor Cursor
 " Input moder cursor
-call s:HL('iCursor', 'none', 'none', 'inverse')
+hi! link iCursor Cursor
 " Language mapping cursor
-call s:HL('lCursor', 'none', 'none', 'inverse')
+hi! link lCursor Cursor
 
 " }}}
 " Syntax Highlighting: {{{
 
-call s:HL('Special', 'orange')
+if g:gruvbox_improved_strings == 0
+  hi! link Special GruvboxOrange
+else
+  call s:HL('Special', s:orange, s:bg1, s:italicize_strings)
+endif
 
-call s:HL('Comment', 'medium', 'none', 'italic')
-call s:HL('Todo',    'fg', 'bg', 'bold')
+call s:HL('Comment', s:gray, s:none, s:italicize_comments)
+call s:HL('Todo', s:vim_fg, s:vim_bg, s:bold . s:italic)
+call s:HL('Error', s:red, s:vim_bg, s:bold . s:inverse)
 
 " Generic statement
-call s:HL('Statement',   'red')
+hi! link Statement GruvboxRed
 " if, then, else, endif, swicth, etc.
-call s:HL('Conditional', 'red')
+hi! link Conditional GruvboxRed
 " for, do, while, etc.
-call s:HL('Repeat',      'red')
+hi! link Repeat GruvboxRed
 " case, default, etc.
-call s:HL('Label',       'red')
+hi! link Label GruvboxRed
 " try, catch, throw
-call s:HL('Exception',   'red')
+hi! link Exception GruvboxRed
 " sizeof, "+", "*", etc.
-hi! def link Operator Normal
+hi! link Operator Normal
 " Any other keyword
-call s:HL('Keyword',     'red')
+hi! link Keyword GruvboxRed
 
 " Variable name
-call s:HL('Identifier', 'blue')
+hi! link Identifier GruvboxBlue
 " Function name
-call s:HL('Function',   'green', 'none', 'bold')
+hi! link Function GruvboxGreenBold
 
 " Generic preprocessor
-call s:HL('PreProc',   'aqua')
+hi! link PreProc GruvboxAqua
 " Preprocessor #include
-call s:HL('Include',   'aqua')
+hi! link Include GruvboxAqua
 " Preprocessor #define
-call s:HL('Define',    'aqua')
+hi! link Define GruvboxAqua
 " Same as Define
-call s:HL('Macro',     'aqua')
+hi! link Macro GruvboxAqua
 " Preprocessor #if, #else, #endif, etc.
-call s:HL('PreCondit', 'aqua')
+hi! link PreCondit GruvboxAqua
 
 " Generic constant
-call s:HL('Constant',  'purple')
+hi! link Constant GruvboxPurple
 " Character constant: 'c', '/n'
-call s:HL('Character', 'purple')
+hi! link Character GruvboxPurple
 " String constant: "this is a string"
-call s:HL('String',    'green')
+if g:gruvbox_improved_strings == 0
+  call s:HL('String',  s:green, s:none, s:italicize_strings)
+else
+  call s:HL('String',  s:fg1, s:bg1, s:italicize_strings)
+endif
 " Boolean constant: TRUE, false
-call s:HL('Boolean',   'purple')
+hi! link Boolean GruvboxPurple
 " Number constant: 234, 0xff
-call s:HL('Number',    'purple')
+hi! link Number GruvboxPurple
 " Floating point constant: 2.3e10
-call s:HL('Float',     'purple')
+hi! link Float GruvboxPurple
 
 " Generic type
-call s:HL('Type', 'yellow')
+hi! link Type GruvboxYellow
 " static, register, volatile, etc
-call s:HL('StorageClass', 'orange')
+hi! link StorageClass GruvboxOrange
 " struct, union, enum, etc.
-call s:HL('Structure', 'aqua')
+hi! link Structure GruvboxAqua
 " typedef
-call s:HL('Typedef', 'yellow')
+hi! link Typedef GruvboxYellow
 
 " }}}
 " Completion Menu: {{{
 
 if version >= 700
-	" Popup menu: normal item
-	call s:HL('Pmenu', 'light1', 'dark2')
-	" Popup menu: selected item
-	call s:HL('PmenuSel', 'dark2', 'blue', 'bold')
-	" Popup menu: scrollbar
-	call s:HL('PmenuSbar', 'none', 'dark2')
-	" Popup menu: scrollbar thumb
-	call s:HL('PmenuThumb', 'none', 'dark4')
+  " Popup menu: normal item
+  call s:HL('Pmenu', s:fg1, s:bg2)
+  " Popup menu: selected item
+  call s:HL('PmenuSel', s:bg2, s:blue, s:bold)
+  " Popup menu: scrollbar
+  call s:HL('PmenuSbar', s:none, s:bg2)
+  " Popup menu: scrollbar thumb
+  call s:HL('PmenuThumb', s:none, s:bg4)
 endif
 
 " }}}
 " Diffs: {{{
 
-call s:HL('DiffDelete', 'dark0', 'red')
-call s:HL('DiffAdd',    'dark0', 'green')
-"call s:HL('DiffChange', 'dark0', 'blue')
-"call s:HL('DiffText',   'dark0', 'yellow')
+call s:HL('DiffDelete', s:red, s:bg0, s:inverse)
+call s:HL('DiffAdd',    s:green, s:bg0, s:inverse)
+"call s:HL('DiffChange', s:bg0, s:blue)
+"call s:HL('DiffText',   s:bg0, s:yellow)
 
 " Alternative setting
-call s:HL('DiffChange', 'dark0', 'aqua')
-call s:HL('DiffText',   'dark0', 'yellow')
+call s:HL('DiffChange', s:aqua, s:bg0, s:inverse)
+call s:HL('DiffText',   s:yellow, s:bg0, s:inverse)
 
 " }}}
 " Spelling: {{{
 
 if has("spell")
-	" Not capitalised word
-	call s:HL('SpellCap',   'none', 'none', 'undercurl', 'red')
-	" Not recognized word
-	call s:HL('SpellBad',   'none', 'none', 'undercurl', 'blue')
-	" Wrong spelling for selected region
-	call s:HL('SpellLocal', 'none', 'none', 'undercurl', 'aqua')
-	" Rare word
-	call s:HL('SpellRare',  'none', 'none', 'undercurl', 'purple')
+  " Not capitalised word, or compile warnings
+  if g:gruvbox_improved_warnings == 0
+    call s:HL('SpellCap',   s:none, s:none, s:undercurl, s:red)
+  else
+    call s:HL('SpellCap',   s:green, s:none, s:bold . s:italic)
+  endif
+  " Not recognized word
+  call s:HL('SpellBad',   s:none, s:none, s:undercurl, s:blue)
+  " Wrong spelling for selected region
+  call s:HL('SpellLocal', s:none, s:none, s:undercurl, s:aqua)
+  " Rare word
+  call s:HL('SpellRare',  s:none, s:none, s:undercurl, s:purple)
 endif
 
 " }}}
@@ -348,101 +683,736 @@ endif
 " Plugin specific -------------------------------------------------------------
 " EasyMotion: {{{
 
-hi! def link EasyMotionTarget Search
-hi! def link EasyMotionShade Comment
+hi! link EasyMotionTarget Search
+hi! link EasyMotionShade Comment
+
+" }}}
+" Sneak: {{{
+
+hi! link Sneak Search
+hi! link SneakLabel Search
 
 " }}}
 " Indent Guides: {{{
 
-let g:indent_guides_auto_colors = 0
-
-"call s:HL('IndentGuidesOdd', 'bg', 'dark2')
-"call s:HL('IndentGuidesEven', 'bg', 'dark1')
-
-call s:HL('IndentGuidesOdd', 'bg', 'dark2', 'inverse')
-call s:HL('IndentGuidesEven', 'bg', 'dark3', 'inverse')
-
-" }}}
-" Better Rainbow Parentheses: {{{
-
-let g:rbpt_colorpairs = [
-    \ ['brown',       '#458588'],
-    \ ['Darkblue',    '#b16286'],
-    \ ['darkgray',    '#cc241d'],
-    \ ['darkgreen',   '#d65d0e'],
-    \ ['darkcyan',    '#458588'],
-    \ ['darkred',     '#b16286'],
-    \ ['darkmagenta', '#cc241d'],
-    \ ['brown',       '#d65d0e'],
-    \ ['gray',        '#458588'],
-    \ ['black',       '#b16286'],
-    \ ['darkmagenta', '#cc241d'],
-    \ ['Darkblue',    '#d65d0e'],
-    \ ['darkgreen',   '#458588'],
-    \ ['darkcyan',    '#b16286'],
-    \ ['darkred',     '#cc241d'],
-    \ ['red',         '#d65d0e'],
+if !exists('g:indent_guides_auto_colors')
+  let g:indent_guides_auto_colors = 0
+endif
+
+if g:indent_guides_auto_colors == 0
+  if g:gruvbox_invert_indent_guides == 0
+    call s:HL('IndentGuidesOdd', s:vim_bg, s:bg2)
+    call s:HL('IndentGuidesEven', s:vim_bg, s:bg1)
+  else
+    call s:HL('IndentGuidesOdd', s:vim_bg, s:bg2, s:inverse)
+    call s:HL('IndentGuidesEven', s:vim_bg, s:bg3, s:inverse)
+  endif
+endif
+
+" }}}
+" IndentLine: {{{
+
+if !exists('g:indentLine_color_term')
+  let g:indentLine_color_term = s:bg2[1]
+endif
+if !exists('g:indentLine_color_gui')
+  let g:indentLine_color_gui = s:bg2[0]
+endif
+
+" }}}
+" Rainbow Parentheses: {{{
+
+if !exists('g:rbpt_colorpairs')
+  let g:rbpt_colorpairs =
+    \ [
+      \ ['blue', '#458588'], ['magenta', '#b16286'],
+      \ ['red',  '#cc241d'], ['166',     '#d65d0e']
     \ ]
+endif
+
+let g:rainbow_guifgs = [ '#d65d0e', '#cc241d', '#b16286', '#458588' ]
+let g:rainbow_ctermfgs = [ '166', 'red', 'magenta', 'blue' ]
+
+if !exists('g:rainbow_conf')
+   let g:rainbow_conf = {}
+endif
+if !has_key(g:rainbow_conf, 'guifgs')
+   let g:rainbow_conf['guifgs'] = g:rainbow_guifgs
+endif
+if !has_key(g:rainbow_conf, 'ctermfgs')
+   let g:rainbow_conf['ctermfgs'] = g:rainbow_ctermfgs
+endif
+
+let g:niji_dark_colours = g:rbpt_colorpairs
+let g:niji_light_colours = g:rbpt_colorpairs
 
 "}}}
+" GitGutter: {{{
+
+hi! link GitGutterAdd GruvboxGreenSign
+hi! link GitGutterChange GruvboxAquaSign
+hi! link GitGutterDelete GruvboxRedSign
+hi! link GitGutterChangeDelete GruvboxAquaSign
+
+" }}}
+" GitCommit: "{{{
+
+hi! link gitcommitSelectedFile GruvboxGreen
+hi! link gitcommitDiscardedFile GruvboxRed
+
+" }}}
+" Signify: {{{
+
+hi! link SignifySignAdd GruvboxGreenSign
+hi! link SignifySignChange GruvboxAquaSign
+hi! link SignifySignDelete GruvboxRedSign
+
+" }}}
+" Syntastic: {{{
+
+call s:HL('SyntasticError', s:none, s:none, s:undercurl, s:red)
+call s:HL('SyntasticWarning', s:none, s:none, s:undercurl, s:yellow)
+
+hi! link SyntasticErrorSign GruvboxRedSign
+hi! link SyntasticWarningSign GruvboxYellowSign
+
+" }}}
+" Signature: {{{
+hi! link SignatureMarkText   GruvboxBlueSign
+hi! link SignatureMarkerText GruvboxPurpleSign
+
+" }}}
+" ShowMarks: {{{
+
+hi! link ShowMarksHLl GruvboxBlueSign
+hi! link ShowMarksHLu GruvboxBlueSign
+hi! link ShowMarksHLo GruvboxBlueSign
+hi! link ShowMarksHLm GruvboxBlueSign
+
+" }}}
+" CtrlP: {{{
+
+hi! link CtrlPMatch GruvboxYellow
+hi! link CtrlPNoEntries GruvboxRed
+hi! link CtrlPPrtBase GruvboxBg2
+hi! link CtrlPPrtCursor GruvboxBlue
+hi! link CtrlPLinePre GruvboxBg2
+
+call s:HL('CtrlPMode1', s:blue, s:bg2, s:bold)
+call s:HL('CtrlPMode2', s:bg0, s:blue, s:bold)
+call s:HL('CtrlPStats', s:fg4, s:bg2, s:bold)
+
+" }}}
+" Startify: {{{
+
+hi! link StartifyBracket GruvboxFg3
+hi! link StartifyFile GruvboxFg1
+hi! link StartifyNumber GruvboxBlue
+hi! link StartifyPath GruvboxGray
+hi! link StartifySlash GruvboxGray
+hi! link StartifySection GruvboxYellow
+hi! link StartifySpecial GruvboxBg2
+hi! link StartifyHeader GruvboxOrange
+hi! link StartifyFooter GruvboxBg2
+
+" }}}
+" Vimshell: {{{
+
+let g:vimshell_escape_colors = [
+  \ s:bg4[0], s:red[0], s:green[0], s:yellow[0],
+  \ s:blue[0], s:purple[0], s:aqua[0], s:fg4[0],
+  \ s:bg0[0], s:red[0], s:green[0], s:orange[0],
+  \ s:blue[0], s:purple[0], s:aqua[0], s:fg0[0]
+  \ ]
+
+" }}}
+" BufTabLine: {{{
+
+call s:HL('BufTabLineCurrent', s:bg0, s:fg4)
+call s:HL('BufTabLineActive', s:fg4, s:bg2)
+call s:HL('BufTabLineHidden', s:bg4, s:bg1)
+call s:HL('BufTabLineFill', s:bg0, s:bg0)
+
+" }}}
+" Asynchronous Lint Engine: {{{
+
+call s:HL('ALEError', s:none, s:none, s:undercurl, s:red)
+call s:HL('ALEWarning', s:none, s:none, s:undercurl, s:yellow)
+call s:HL('ALEInfo', s:none, s:none, s:undercurl, s:blue)
+
+hi! link ALEErrorSign GruvboxRedSign
+hi! link ALEWarningSign GruvboxYellowSign
+hi! link ALEInfoSign GruvboxBlueSign
+
+" }}}
+" Dirvish: {{{
+
+hi! link DirvishPathTail GruvboxAqua
+hi! link DirvishArg GruvboxYellow
+
+" }}}
+" Netrw: {{{
+
+hi! link netrwDir GruvboxAqua
+hi! link netrwClassify GruvboxAqua
+hi! link netrwLink GruvboxGray
+hi! link netrwSymLink GruvboxFg1
+hi! link netrwExe GruvboxYellow
+hi! link netrwComment GruvboxGray
+hi! link netrwList GruvboxBlue
+hi! link netrwHelpCmd GruvboxAqua
+hi! link netrwCmdSep GruvboxFg3
+hi! link netrwVersion GruvboxGreen
+
+" }}}
+" NERDTree: {{{
+
+hi! link NERDTreeDir GruvboxAqua
+hi! link NERDTreeDirSlash GruvboxAqua
+
+hi! link NERDTreeOpenable GruvboxOrange
+hi! link NERDTreeClosable GruvboxOrange
+
+hi! link NERDTreeFile GruvboxFg1
+hi! link NERDTreeExecFile GruvboxYellow
+
+hi! link NERDTreeUp GruvboxGray
+hi! link NERDTreeCWD GruvboxGreen
+hi! link NERDTreeHelp GruvboxFg1
+
+hi! link NERDTreeToggleOn GruvboxGreen
+hi! link NERDTreeToggleOff GruvboxRed
+
+" }}}
+" Vim Multiple Cursors: {{{
+
+call s:HL('multiple_cursors_cursor', s:none, s:none, s:inverse)
+call s:HL('multiple_cursors_visual', s:none, s:bg2)
+
+" }}}
+" coc.nvim: {{{
+
+hi! link CocErrorSign GruvboxRedSign
+hi! link CocWarningSign GruvboxOrangeSign
+hi! link CocInfoSign GruvboxYellowSign
+hi! link CocHintSign GruvboxBlueSign
+hi! link CocErrorFloat GruvboxRed
+hi! link CocWarningFloat GruvboxOrange
+hi! link CocInfoFloat GruvboxYellow
+hi! link CocHintFloat GruvboxBlue
+hi! link CocDiagnosticsError GruvboxRed
+hi! link CocDiagnosticsWarning GruvboxOrange
+hi! link CocDiagnosticsInfo GruvboxYellow
+hi! link CocDiagnosticsHint GruvboxBlue
+
+hi! link CocSelectedText GruvboxRed
+hi! link CocCodeLens GruvboxGray
+
+call s:HL('CocErrorHighlight', s:none, s:none, s:undercurl, s:red)
+call s:HL('CocWarningHighlight', s:none, s:none, s:undercurl, s:orange)
+call s:HL('CocInfoHighlight', s:none, s:none, s:undercurl, s:yellow)
+call s:HL('CocHintHighlight', s:none, s:none, s:undercurl, s:blue)
+
+" }}}
 
 " Filetype specific -----------------------------------------------------------
 " Diff: {{{
 
-call s:HL('diffAdded', 'green')
-call s:HL('diffRemoved', 'red')
-call s:HL('diffChanged', 'aqua')
+hi! link diffAdded GruvboxGreen
+hi! link diffRemoved GruvboxRed
+hi! link diffChanged GruvboxAqua
 
-call s:HL('diffFile', 'orange')
-call s:HL('diffNewFile', 'yellow')
+hi! link diffFile GruvboxOrange
+hi! link diffNewFile GruvboxYellow
 
-call s:HL('diffLine', 'blue')
+hi! link diffLine GruvboxBlue
 
 " }}}
 " Html: {{{
 
-call s:HL('htmlTag', 'blue')
-call s:HL('htmlEndTag', 'blue')
+hi! link htmlTag GruvboxBlue
+hi! link htmlEndTag GruvboxBlue
 
-call s:HL('htmlTagName', 'aqua', '', 'bold')
-call s:HL('htmlArg', 'aqua')
+hi! link htmlTagName GruvboxAquaBold
+hi! link htmlArg GruvboxAqua
 
-call s:HL('htmlScriptTag', 'purple')
-call s:HL('htmlTagN', 'light1')
-call s:HL('htmlSpecialTagName', 'aqua', '', 'bold')
+hi! link htmlScriptTag GruvboxPurple
+hi! link htmlTagN GruvboxFg1
+hi! link htmlSpecialTagName GruvboxAquaBold
 
-call s:HL('htmlLink', 'light4', '', 'underline')
+call s:HL('htmlLink', s:fg4, s:none, s:underline)
 
-call s:HL('htmlSpecialChar', 'orange')
+hi! link htmlSpecialChar GruvboxOrange
+
+call s:HL('htmlBold', s:vim_fg, s:vim_bg, s:bold)
+call s:HL('htmlBoldUnderline', s:vim_fg, s:vim_bg, s:bold . s:underline)
+call s:HL('htmlBoldItalic', s:vim_fg, s:vim_bg, s:bold . s:italic)
+call s:HL('htmlBoldUnderlineItalic', s:vim_fg, s:vim_bg, s:bold . s:underline . s:italic)
+
+call s:HL('htmlUnderline', s:vim_fg, s:vim_bg, s:underline)
+call s:HL('htmlUnderlineItalic', s:vim_fg, s:vim_bg, s:underline . s:italic)
+call s:HL('htmlItalic', s:vim_fg, s:vim_bg, s:italic)
 
+" }}}
+" Xml: {{{
+
+hi! link xmlTag GruvboxBlue
+hi! link xmlEndTag GruvboxBlue
+hi! link xmlTagName GruvboxBlue
+hi! link xmlEqual GruvboxBlue
+hi! link docbkKeyword GruvboxAquaBold
+
+hi! link xmlDocTypeDecl GruvboxGray
+hi! link xmlDocTypeKeyword GruvboxPurple
+hi! link xmlCdataStart GruvboxGray
+hi! link xmlCdataCdata GruvboxPurple
+hi! link dtdFunction GruvboxGray
+hi! link dtdTagName GruvboxPurple
+
+hi! link xmlAttrib GruvboxAqua
+hi! link xmlProcessingDelim GruvboxGray
+hi! link dtdParamEntityPunct GruvboxGray
+hi! link dtdParamEntityDPunct GruvboxGray
+hi! link xmlAttribPunct GruvboxGray
+
+hi! link xmlEntity GruvboxOrange
+hi! link xmlEntityPunct GruvboxOrange
 " }}}
 " Vim: {{{
 
-call s:HL('vimCommentTitle', 'light4', '', 'bold,italic')
+call s:HL('vimCommentTitle', s:fg4_256, s:none, s:bold . s:italicize_comments)
+
+hi! link vimNotation GruvboxOrange
+hi! link vimBracket GruvboxOrange
+hi! link vimMapModKey GruvboxOrange
+hi! link vimFuncSID GruvboxFg3
+hi! link vimSetSep GruvboxFg3
+hi! link vimSep GruvboxFg3
+hi! link vimContinue GruvboxFg3
+
+" }}}
+" Clojure: {{{
+
+hi! link clojureKeyword GruvboxBlue
+hi! link clojureCond GruvboxOrange
+hi! link clojureSpecial GruvboxOrange
+hi! link clojureDefine GruvboxOrange
+
+hi! link clojureFunc GruvboxYellow
+hi! link clojureRepeat GruvboxYellow
+hi! link clojureCharacter GruvboxAqua
+hi! link clojureStringEscape GruvboxAqua
+hi! link clojureException GruvboxRed
+
+hi! link clojureRegexp GruvboxAqua
+hi! link clojureRegexpEscape GruvboxAqua
+call s:HL('clojureRegexpCharClass', s:fg3, s:none, s:bold)
+hi! link clojureRegexpMod clojureRegexpCharClass
+hi! link clojureRegexpQuantifier clojureRegexpCharClass
+
+hi! link clojureParen GruvboxFg3
+hi! link clojureAnonArg GruvboxYellow
+hi! link clojureVariable GruvboxBlue
+hi! link clojureMacro GruvboxOrange
+
+hi! link clojureMeta GruvboxYellow
+hi! link clojureDeref GruvboxYellow
+hi! link clojureQuote GruvboxYellow
+hi! link clojureUnquote GruvboxYellow
+
+" }}}
+" C: {{{
+
+hi! link cOperator GruvboxPurple
+hi! link cStructure GruvboxOrange
+
+" }}}
+" Python: {{{
+
+hi! link pythonBuiltin GruvboxOrange
+hi! link pythonBuiltinObj GruvboxOrange
+hi! link pythonBuiltinFunc GruvboxOrange
+hi! link pythonFunction GruvboxAqua
+hi! link pythonDecorator GruvboxRed
+hi! link pythonInclude GruvboxBlue
+hi! link pythonImport GruvboxBlue
+hi! link pythonRun GruvboxBlue
+hi! link pythonCoding GruvboxBlue
+hi! link pythonOperator GruvboxRed
+hi! link pythonException GruvboxRed
+hi! link pythonExceptions GruvboxPurple
+hi! link pythonBoolean GruvboxPurple
+hi! link pythonDot GruvboxFg3
+hi! link pythonConditional GruvboxRed
+hi! link pythonRepeat GruvboxRed
+hi! link pythonDottedName GruvboxGreenBold
+
+" }}}
+" CSS: {{{
+
+hi! link cssBraces GruvboxBlue
+hi! link cssFunctionName GruvboxYellow
+hi! link cssIdentifier GruvboxOrange
+hi! link cssClassName GruvboxGreen
+hi! link cssColor GruvboxBlue
+hi! link cssSelectorOp GruvboxBlue
+hi! link cssSelectorOp2 GruvboxBlue
+hi! link cssImportant GruvboxGreen
+hi! link cssVendor GruvboxFg1
+
+hi! link cssTextProp GruvboxAqua
+hi! link cssAnimationProp GruvboxAqua
+hi! link cssUIProp GruvboxYellow
+hi! link cssTransformProp GruvboxAqua
+hi! link cssTransitionProp GruvboxAqua
+hi! link cssPrintProp GruvboxAqua
+hi! link cssPositioningProp GruvboxYellow
+hi! link cssBoxProp GruvboxAqua
+hi! link cssFontDescriptorProp GruvboxAqua
+hi! link cssFlexibleBoxProp GruvboxAqua
+hi! link cssBorderOutlineProp GruvboxAqua
+hi! link cssBackgroundProp GruvboxAqua
+hi! link cssMarginProp GruvboxAqua
+hi! link cssListProp GruvboxAqua
+hi! link cssTableProp GruvboxAqua
+hi! link cssFontProp GruvboxAqua
+hi! link cssPaddingProp GruvboxAqua
+hi! link cssDimensionProp GruvboxAqua
+hi! link cssRenderProp GruvboxAqua
+hi! link cssColorProp GruvboxAqua
+hi! link cssGeneratedContentProp GruvboxAqua
+
+" }}}
+" JavaScript: {{{
+
+hi! link javaScriptBraces GruvboxFg1
+hi! link javaScriptFunction GruvboxAqua
+hi! link javaScriptIdentifier GruvboxRed
+hi! link javaScriptMember GruvboxBlue
+hi! link javaScriptNumber GruvboxPurple
+hi! link javaScriptNull GruvboxPurple
+hi! link javaScriptParens GruvboxFg3
+
+" }}}
+" YAJS: {{{
+
+hi! link javascriptImport GruvboxAqua
+hi! link javascriptExport GruvboxAqua
+hi! link javascriptClassKeyword GruvboxAqua
+hi! link javascriptClassExtends GruvboxAqua
+hi! link javascriptDefault GruvboxAqua
+
+hi! link javascriptClassName GruvboxYellow
+hi! link javascriptClassSuperName GruvboxYellow
+hi! link javascriptGlobal GruvboxYellow
+
+hi! link javascriptEndColons GruvboxFg1
+hi! link javascriptFuncArg GruvboxFg1
+hi! link javascriptGlobalMethod GruvboxFg1
+hi! link javascriptNodeGlobal GruvboxFg1
+hi! link javascriptBOMWindowProp GruvboxFg1
+hi! link javascriptArrayMethod GruvboxFg1
+hi! link javascriptArrayStaticMethod GruvboxFg1
+hi! link javascriptCacheMethod GruvboxFg1
+hi! link javascriptDateMethod GruvboxFg1
+hi! link javascriptMathStaticMethod GruvboxFg1
+
+" hi! link javascriptProp GruvboxFg1
+hi! link javascriptURLUtilsProp GruvboxFg1
+hi! link javascriptBOMNavigatorProp GruvboxFg1
+hi! link javascriptDOMDocMethod GruvboxFg1
+hi! link javascriptDOMDocProp GruvboxFg1
+hi! link javascriptBOMLocationMethod GruvboxFg1
+hi! link javascriptBOMWindowMethod GruvboxFg1
+hi! link javascriptStringMethod GruvboxFg1
+
+hi! link javascriptVariable GruvboxOrange
+" hi! link javascriptVariable GruvboxRed
+" hi! link javascriptIdentifier GruvboxOrange
+" hi! link javascriptClassSuper GruvboxOrange
+hi! link javascriptIdentifier GruvboxOrange
+hi! link javascriptClassSuper GruvboxOrange
+
+" hi! link javascriptFuncKeyword GruvboxOrange
+" hi! link javascriptAsyncFunc GruvboxOrange
+hi! link javascriptFuncKeyword GruvboxAqua
+hi! link javascriptAsyncFunc GruvboxAqua
+hi! link javascriptClassStatic GruvboxOrange
+
+hi! link javascriptOperator GruvboxRed
+hi! link javascriptForOperator GruvboxRed
+hi! link javascriptYield GruvboxRed
+hi! link javascriptExceptions GruvboxRed
+hi! link javascriptMessage GruvboxRed
+
+hi! link javascriptTemplateSB GruvboxAqua
+hi! link javascriptTemplateSubstitution GruvboxFg1
+
+" hi! link javascriptLabel GruvboxBlue
+" hi! link javascriptObjectLabel GruvboxBlue
+" hi! link javascriptPropertyName GruvboxBlue
+hi! link javascriptLabel GruvboxFg1
+hi! link javascriptObjectLabel GruvboxFg1
+hi! link javascriptPropertyName GruvboxFg1
+
+hi! link javascriptLogicSymbols GruvboxFg1
+hi! link javascriptArrowFunc GruvboxYellow
+
+hi! link javascriptDocParamName GruvboxFg4
+hi! link javascriptDocTags GruvboxFg4
+hi! link javascriptDocNotation GruvboxFg4
+hi! link javascriptDocParamType GruvboxFg4
+hi! link javascriptDocNamedParamType GruvboxFg4
+
+hi! link javascriptBrackets GruvboxFg1
+hi! link javascriptDOMElemAttrs GruvboxFg1
+hi! link javascriptDOMEventMethod GruvboxFg1
+hi! link javascriptDOMNodeMethod GruvboxFg1
+hi! link javascriptDOMStorageMethod GruvboxFg1
+hi! link javascriptHeadersMethod GruvboxFg1
+
+hi! link javascriptAsyncFuncKeyword GruvboxRed
+hi! link javascriptAwaitFuncKeyword GruvboxRed
+
+" }}}
+" PanglossJS: {{{
+
+hi! link jsClassKeyword GruvboxAqua
+hi! link jsExtendsKeyword GruvboxAqua
+hi! link jsExportDefault GruvboxAqua
+hi! link jsTemplateBraces GruvboxAqua
+hi! link jsGlobalNodeObjects GruvboxFg1
+hi! link jsGlobalObjects GruvboxFg1
+hi! link jsFunction GruvboxAqua
+hi! link jsFuncParens GruvboxFg3
+hi! link jsParens GruvboxFg3
+hi! link jsNull GruvboxPurple
+hi! link jsUndefined GruvboxPurple
+hi! link jsClassDefinition GruvboxYellow
+
+" }}}
+" TypeScript: {{{
+
+hi! link typeScriptReserved GruvboxAqua
+hi! link typeScriptLabel GruvboxAqua
+hi! link typeScriptFuncKeyword GruvboxAqua
+hi! link typeScriptIdentifier GruvboxOrange
+hi! link typeScriptBraces GruvboxFg1
+hi! link typeScriptEndColons GruvboxFg1
+hi! link typeScriptDOMObjects GruvboxFg1
+hi! link typeScriptAjaxMethods GruvboxFg1
+hi! link typeScriptLogicSymbols GruvboxFg1
+hi! link typeScriptDocSeeTag Comment
+hi! link typeScriptDocParam Comment
+hi! link typeScriptDocTags vimCommentTitle
+hi! link typeScriptGlobalObjects GruvboxFg1
+hi! link typeScriptParens GruvboxFg3
+hi! link typeScriptOpSymbols GruvboxFg3
+hi! link typeScriptHtmlElemProperties GruvboxFg1
+hi! link typeScriptNull GruvboxPurple
+hi! link typeScriptInterpolationDelimiter GruvboxAqua
+
+" }}}
+" PureScript: {{{
+
+hi! link purescriptModuleKeyword GruvboxAqua
+hi! link purescriptModuleName GruvboxFg1
+hi! link purescriptWhere GruvboxAqua
+hi! link purescriptDelimiter GruvboxFg4
+hi! link purescriptType GruvboxFg1
+hi! link purescriptImportKeyword GruvboxAqua
+hi! link purescriptHidingKeyword GruvboxAqua
+hi! link purescriptAsKeyword GruvboxAqua
+hi! link purescriptStructure GruvboxAqua
+hi! link purescriptOperator GruvboxBlue
+
+hi! link purescriptTypeVar GruvboxFg1
+hi! link purescriptConstructor GruvboxFg1
+hi! link purescriptFunction GruvboxFg1
+hi! link purescriptConditional GruvboxOrange
+hi! link purescriptBacktick GruvboxOrange
+
+" }}}
+" CoffeeScript: {{{
+
+hi! link coffeeExtendedOp GruvboxFg3
+hi! link coffeeSpecialOp GruvboxFg3
+hi! link coffeeCurly GruvboxOrange
+hi! link coffeeParen GruvboxFg3
+hi! link coffeeBracket GruvboxOrange
+
+" }}}
+" Ruby: {{{
+
+hi! link rubyStringDelimiter GruvboxGreen
+hi! link rubyInterpolationDelimiter GruvboxAqua
+
+" }}}
+" ObjectiveC: {{{
+
+hi! link objcTypeModifier GruvboxRed
+hi! link objcDirective GruvboxBlue
+
+" }}}
+" Go: {{{
+
+hi! link goDirective GruvboxAqua
+hi! link goConstants GruvboxPurple
+hi! link goDeclaration GruvboxRed
+hi! link goDeclType GruvboxBlue
+hi! link goBuiltins GruvboxOrange
+
+" }}}
+" Lua: {{{
+
+hi! link luaIn GruvboxRed
+hi! link luaFunction GruvboxAqua
+hi! link luaTable GruvboxOrange
+
+" }}}
+" MoonScript: {{{
+
+hi! link moonSpecialOp GruvboxFg3
+hi! link moonExtendedOp GruvboxFg3
+hi! link moonFunction GruvboxFg3
+hi! link moonObject GruvboxYellow
+
+" }}}
+" Java: {{{
+
+hi! link javaAnnotation GruvboxBlue
+hi! link javaDocTags GruvboxAqua
+hi! link javaCommentTitle vimCommentTitle
+hi! link javaParen GruvboxFg3
+hi! link javaParen1 GruvboxFg3
+hi! link javaParen2 GruvboxFg3
+hi! link javaParen3 GruvboxFg3
+hi! link javaParen4 GruvboxFg3
+hi! link javaParen5 GruvboxFg3
+hi! link javaOperator GruvboxOrange
+
+hi! link javaVarArg GruvboxGreen
+
+" }}}
+" Elixir: {{{
+
+hi! link elixirDocString Comment
 
-"hi! def link vimVar Identifier
-"hi! def link vimFunc Function
-"hi! def link vimUserFunc Function
+hi! link elixirStringDelimiter GruvboxGreen
+hi! link elixirInterpolationDelimiter GruvboxAqua
 
+hi! link elixirModuleDeclaration GruvboxYellow
+
+" }}}
+" Scala: {{{
+
+" NB: scala vim syntax file is kinda horrible
+hi! link scalaNameDefinition GruvboxFg1
+hi! link scalaCaseFollowing GruvboxFg1
+hi! link scalaCapitalWord GruvboxFg1
+hi! link scalaTypeExtension GruvboxFg1
+
+hi! link scalaKeyword GruvboxRed
+hi! link scalaKeywordModifier GruvboxRed
+
+hi! link scalaSpecial GruvboxAqua
+hi! link scalaOperator GruvboxFg1
+
+hi! link scalaTypeDeclaration GruvboxYellow
+hi! link scalaTypeTypePostDeclaration GruvboxYellow
+
+hi! link scalaInstanceDeclaration GruvboxFg1
+hi! link scalaInterpolation GruvboxAqua
+
+" }}}
+" Markdown: {{{
 
-"call s:HL('vimUserFunc', 'green', '', 'bold')
-"call s:HL('vimFunction', 'green', '', 'bold')
+call s:HL('markdownItalic', s:fg3, s:none, s:italic)
 
-"call s:HL('vimFunc', 'blue')
-"call s:HL('vimFuncName', 'blue')
+hi! link markdownH1 GruvboxGreenBold
+hi! link markdownH2 GruvboxGreenBold
+hi! link markdownH3 GruvboxYellowBold
+hi! link markdownH4 GruvboxYellowBold
+hi! link markdownH5 GruvboxYellow
+hi! link markdownH6 GruvboxYellow
 
-"call s:HL('vimVar', 'purple')
-"call s:HL('vimIsCommand', 'purple')
+hi! link markdownCode GruvboxAqua
+hi! link markdownCodeBlock GruvboxAqua
+hi! link markdownCodeDelimiter GruvboxAqua
 
+hi! link markdownBlockquote GruvboxGray
+hi! link markdownListMarker GruvboxGray
+hi! link markdownOrderedListMarker GruvboxGray
+hi! link markdownRule GruvboxGray
+hi! link markdownHeadingRule GruvboxGray
 
-"call s:HL('vimMapMod', 'purple', '', 'bold,italic')
-"call s:HL('vimMapModKey', 'purple', '', 'bold,italic')
+hi! link markdownUrlDelimiter GruvboxFg3
+hi! link markdownLinkDelimiter GruvboxFg3
+hi! link markdownLinkTextDelimiter GruvboxFg3
 
-"call s:HL('vimFunction', 'purple')
-"call s:HL('vimUserFunc', 'purple')
-"call s:HL('vimUserFunc', 'purple')
+hi! link markdownHeadingDelimiter GruvboxOrange
+hi! link markdownUrl GruvboxPurple
+hi! link markdownUrlTitleDelimiter GruvboxGreen
 
-"hi! def link vimFunc Function
-"hi! def link vimUserFunc Function
+call s:HL('markdownLinkText', s:gray, s:none, s:underline)
+hi! link markdownIdDeclaration markdownLinkText
 
 " }}}
+" Haskell: {{{
+
+" hi! link haskellType GruvboxYellow
+" hi! link haskellOperators GruvboxOrange
+" hi! link haskellConditional GruvboxAqua
+" hi! link haskellLet GruvboxOrange
+"
+hi! link haskellType GruvboxFg1
+hi! link haskellIdentifier GruvboxFg1
+hi! link haskellSeparator GruvboxFg1
+hi! link haskellDelimiter GruvboxFg4
+hi! link haskellOperators GruvboxBlue
+"
+hi! link haskellBacktick GruvboxOrange
+hi! link haskellStatement GruvboxOrange
+hi! link haskellConditional GruvboxOrange
+
+hi! link haskellLet GruvboxAqua
+hi! link haskellDefault GruvboxAqua
+hi! link haskellWhere GruvboxAqua
+hi! link haskellBottom GruvboxAqua
+hi! link haskellBlockKeywords GruvboxAqua
+hi! link haskellImportKeywords GruvboxAqua
+hi! link haskellDeclKeyword GruvboxAqua
+hi! link haskellDeriving GruvboxAqua
+hi! link haskellAssocType GruvboxAqua
+
+hi! link haskellNumber GruvboxPurple
+hi! link haskellPragma GruvboxPurple
+
+hi! link haskellString GruvboxGreen
+hi! link haskellChar GruvboxGreen
+
+" }}}
+" Json: {{{
+
+hi! link jsonKeyword GruvboxGreen
+hi! link jsonQuote GruvboxGreen
+hi! link jsonBraces GruvboxFg1
+hi! link jsonString GruvboxFg1
+
+" }}}
+
+
+" Functions -------------------------------------------------------------------
+" Search Highlighting Cursor {{{
+
+function! GruvboxHlsShowCursor()
+  call s:HL('Cursor', s:bg0, s:hls_cursor)
+endfunction
+
+function! GruvboxHlsHideCursor()
+  call s:HL('Cursor', s:none, s:none, s:inverse)
+endfunction
+
+" }}}
+
+" vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker:
diff --git a/colors/guardian.vim b/colors/guardian.vim
deleted file mode 100755
index 5bba649..0000000
--- a/colors/guardian.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Vim color file
-" Maintainer: Anders Korte <anderskorte@eml.cc>
-" Last Change: 6 Apr 2005
-
-" Guardian color scheme 1.2
-
-" Rich-syntax colors for source editing and other vimming.
-
-set background=dark
-hi clear
-syntax reset
-
-" Colors for the User Interface.
-
-hi Cursor      guibg=#cc4455  guifg=white    gui=bold ctermbg=4 ctermfg=15
-hi link CursorIM Cursor
-hi Normal      guibg=#332211  guifg=white    gui=none ctermbg=0 ctermfg=15
-hi NonText     guibg=#445566  guifg=#ffeecc  gui=bold ctermbg=8 ctermfg=14
-hi Visual      guibg=#557799  guifg=white    gui=none ctermbg=9 ctermfg=15
-
-hi Linenr      guibg=bg	      guifg=#aaaaaa  gui=none ctermbg=bg ctermfg=7
-
-hi Directory   guibg=bg	      guifg=#337700  gui=none ctermbg=bg ctermfg=10
-
-hi IncSearch   guibg=#0066cc  guifg=white    gui=none ctermbg=1 ctermfg=15
-hi link Seach IncSearch
-
-hi SpecialKey  guibg=bg	guifg=fg       gui=none ctermbg=bg ctermfg=fg
-hi Titled      guibg=bg	guifg=fg       gui=none ctermbg=bg ctermfg=fg
-
-hi ErrorMsg    guibg=bg	guifg=#ff0000  gui=bold ctermbg=bg ctermfg=12
-hi ModeMsg     guibg=bg	guifg=#ffeecc  gui=none ctermbg=bg ctermfg=14
-hi link	 MoreMsg     ModeMsg
-hi Question    guibg=bg	guifg=#ccffcc  gui=bold ctermbg=bg ctermfg=10
-hi link	 WarningMsg  ErrorMsg
-
-hi StatusLine	  guibg=#ffeecc	 guifg=black	gui=bold ctermbg=14 ctermfg=0
-hi StatusLineNC	  guibg=#cc4455	 guifg=white	gui=none ctermbg=4  ctermfg=11
-hi VertSplit	  guibg=#cc4455	 guifg=white	gui=none ctermbg=4  ctermfg=11
-
-hi DiffAdd     guibg=#446688  guifg=fg	  gui=none ctermbg=1 ctermfg=fg
-hi DiffChange  guibg=#558855  guifg=fg	  gui=none ctermbg=2 ctermfg=fg
-hi DiffDelete  guibg=#884444  guifg=fg	  gui=none ctermbg=4 ctermfg=fg
-hi DiffText    guibg=#884444  guifg=fg	  gui=bold ctermbg=4 ctermfg=fg
-
-" Colors for Syntax Highlighting.
-
-hi Comment  guibg=#334455  guifg=#dddddd  gui=none    ctermbg=8	  ctermfg=7
-
-hi Constant    guibg=bg	   guifg=white	  gui=bold    ctermbg=8	  ctermfg=15
-hi String      guibg=bg	   guifg=#ffffcc  gui=italic  ctermbg=bg  ctermfg=14
-hi Character   guibg=bg	   guifg=#ffffcc  gui=bold    ctermbg=bg  ctermfg=14
-hi Number      guibg=bg	   guifg=#bbddff  gui=bold    ctermbg=1   ctermfg=15
-hi Boolean     guibg=bg	   guifg=#bbddff  gui=none    ctermbg=1   ctermfg=15
-hi Float       guibg=bg	   guifg=#bbddff  gui=bold    ctermbg=1   ctermfg=15
-
-hi Identifier  guibg=bg    guifg=#ffddaa  gui=bold    ctermbg=bg  ctermfg=12
-hi Function    guibg=bg    guifg=#ffddaa  gui=bold    ctermbg=bg  ctermfg=12
-hi Statement   guibg=bg    guifg=#ffffcc  gui=bold    ctermbg=bg  ctermfg=14
-
-hi Conditional guibg=bg    guifg=#ff6666  gui=bold    ctermbg=bg  ctermfg=12
-hi Repeat      guibg=bg    guifg=#ff9900  gui=bold    ctermbg=4   ctermfg=14
-hi Label       guibg=bg    guifg=#ffccff  gui=bold    ctermbg=bg   ctermfg=13
-hi Operator    guibg=bg    guifg=#cc9966  gui=bold    ctermbg=6   ctermfg=15
-hi Keyword     guibg=bg	   guifg=#66ffcc  gui=bold    ctermbg=bg  ctermfg=10
-hi Exception   guibg=bg	   guifg=#66ffcc  gui=bold    ctermbg=bg  ctermfg=10
-
-hi PreProc	  guibg=bg	 guifg=#ffcc99	gui=bold ctermbg=4  ctermfg=14
-hi Include	  guibg=bg	 guifg=#99cc99	gui=bold ctermbg=bg ctermfg=10
-hi link Define	  Include
-hi link Macro	  Include
-hi link PreCondit Include
-
-hi Type		  guibg=bg	 guifg=#ff7788  gui=bold    ctermbg=bg	ctermfg=12
-hi StorageClass	  guibg=bg	 guifg=#99cc99  gui=bold    ctermbg=bg	ctermfg=10
-hi Structure	  guibg=bg	 guifg=#99ff99  gui=bold    ctermbg=bg	ctermfg=10
-hi Typedef	  guibg=bg	 guifg=#99cc99  gui=italic  ctermbg=bg	ctermfg=10
-
-hi Special	  guibg=bg	 guifg=#bbddff	gui=bold    ctermbg=1	ctermfg=15
-hi SpecialChar	  guibg=bg	 guifg=#bbddff	gui=bold    ctermbg=1	ctermfg=15
-hi Tag		  guibg=bg	 guifg=#bbddff	gui=bold    ctermbg=1	ctermfg=15
-hi Delimiter	  guibg=bg	 guifg=fg	gui=bold    ctermbg=1	ctermfg=fg
-hi SpecialComment guibg=#334455	 guifg=#dddddd	gui=italic  ctermbg=1	ctermfg=15
-hi Debug	  guibg=bg	 guifg=#ff9999	gui=none    ctermbg=8	ctermfg=12
-
-hi Underlined guibg=bg guifg=#99ccff gui=underline ctermbg=bg ctermfg=9 cterm=underline
-
-hi Title    guibg=#445566  guifg=white	  gui=bold    ctermbg=1	  ctermfg=15
-hi Ignore   guibg=bg	   guifg=#cccccc  gui=italic  ctermbg=bg  ctermfg=8
-hi Error    guibg=#ff0000  guifg=white	  gui=bold    ctermbg=12  ctermfg=15
-hi Todo	    guibg=#556677  guifg=#ff0000  gui=bold    ctermbg=1	  ctermfg=12
-
-hi htmlH2 guibg=bg guifg=fg gui=bold ctermbg=8 ctermfg=fg
-hi link htmlH3 htmlH2
-hi link htmlH4 htmlH3
-hi link htmlH5 htmlH4
-hi link htmlH6 htmlH5
-
-" And finally.
-
-let g:colors_name = "Guardian"
-let colors_name   = "Guardian"
-
diff --git a/colors/guepardo.vim b/colors/guepardo.vim
deleted file mode 100755
index 34e61af..0000000
--- a/colors/guepardo.vim
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Omar Gomez <omar.gomez@gmail.com>
-" Last Change: 2009 Jan 09	
-
-" Header
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "guepardo"
-
-" Colors
-" Grays:
-" fcfcfc: Very light gray
-" 7f7f7f: Strong gray
-" e4e5e4: Pale gray
-" 
-" Blues:
-" 5181ab: Greyish blue
-" 0064f3: Strong blue 
-" deefff: Pale blue
-" 0086b5: Deep blue
-
-" Violet:
-" 4970cc: Deep purple
-
-"Orange:
-" d66715: Burnt Orange
-" ff8d03: Deep orange
-
-"Brown:
-"894c24: brown
-
-"Green
-" 1ca330: Deep green
-
-hi Normal		guifg=#000000			guibg=#fcfcfc "Very Light Grey
-hi Title	guifg=#894c24 "Brown
-hi Comment	gui=italic		guifg=#5181ab "Greish blue
-hi String	guifg=#7f7f7f "Strong gray
-hi Constant	guifg=#5181ab "Greysh blue
-hi pythonBuiltin guifg=#5181ab "Greysh blue
-hi Special	guifg=#4970cc "Deep purple
-hi Identifier guifg=#1ca330 "Deep green
-hi Statement gui=bold	guifg=#0086b5 "Deep blue
-hi PreProc	gui=bold   guifg=#4900cc "Deep purple
-hi Type	gui=bold		guifg=#0086b5 "Deep blue
-hi Function	gui=bold guifg=#0086b5 "Deep blue
-hi Repeat	gui=bold guifg=Black
-hi Error	guibg=Red guifg=White
-hi Todo		    guibg=#5181ab guifg=#ffffff "Greish blue
-hi Cursor guibg=#0064f3 guifg=#ffffff "Strong blue
-hi Include guifg=#894c24 "Brown
-
-"Python
-hi pythonStatement guifg=#0086b5 "Deep blue
-hi pythonImport guifg=#894c24
-hi pythonRepeat gui=bold guifg=Black " Python Repeat : for, while, etc.
-hi pythonConditional gui=bold guifg=Black " Python conditonnal : if, elif, else, then
-hi pythonPrecondit guifg=#894c24 " python Precondit : import from
-hi pythonOperator gui=bold guifg=Black " pythonOperator : and, in, is, not, or
-hi pythonComment gui=italic		guifg=#5181ab "Greish blue
-hi pythonRawString guifg=#4970cc " Python raw strings
-
-"Gui:
-hi LineNr	    guibg=#5181ab guifg=#ffffff
-hi Visual  guibg=#0064f3 guifg=#ffffff
-hi StatusLine guibg=#ffffff guifg=#5181ab
-hi StatusLineNC guibg=#ffffff guifg=#5181ab
-hi Folded guibg=#5181ab guifg=#ffffff
-hi FoldColumn guibg=#5181ab guifg=#ffffff
-
-hi MatchParen	guibg=#ff8d03 guifg=White
-hi CursorLine	guibg=#deefff
-hi Search	    guibg=White guifg=#ff8d03
-hi IncSearch	guibg=White guifg=#ff8d03
-hi SpecialKey	guifg=#4970cc
-hi WarningMsg	guibg=Red guifg=White
-hi Menu        guibg=#ff6a6a guifg=#000000
-hi Pmenu	    guibg=#babdb6 guifg=#555753
-hi PmenuSel	    guibg=#eeeeee guifg=#2e3436
-hi Ignore guifg=#7f7f7f
-
-
-" Common groups that link to default highlighting.
-" You can specify other highlighting easily.
-hi! default link Operator    Type
-hi! default link Character	String
-hi! default link Number	Constant
-hi! default link Boolean	Constant
-hi! default link Float		Number
-hi! default link Conditional	Repeat
-hi! default link Label		Statement
-hi! default link Keyword	Statement
-hi! default link Exception	Special	
-hi! default link Include	PreProc
-hi! default link Define	PreProc
-hi! default link Macro		PreProc
-hi! default link PreCondit	PreProc
-hi! default link StorageClass	Type
-hi! default link Structure	Type
-hi! default link Typedef	Type
-hi! default link Tag		Special
-hi! default link SpecialChar	Special
-hi! default link Delimiter	Special
-hi! default link SpecialComment Special
-hi! default link Debug		Special
-hi! default link Directory MatchParen	
-hi! default link NonText LineNr
-
-hi! default link ModeMsg	  LineNr 
-hi! default link MoreMsg	LineNr
-" ===== Statements
-hi! default link Underlined Special	
-
-
-" pythonException:
-
diff --git a/colors/h80.vim b/colors/h80.vim
deleted file mode 100755
index 9f15e2a..0000000
--- a/colors/h80.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-" author Helder Correia < helder (.) pereira (.) correia (@) gmail (.) com >
-" version 1.0
-" feel free to modify and/or redistribute this file
-
-set background=dark
-
-hi clear
-
-if exists( "syntax_on" )
-    syntax reset
-endif
-
-let g:colors_name="h80"
-
-hi Normal	guifg=White		guibg=#000020
-
-" highlight groups
-hi Cursor	guifg=#e3e3e3		guibg=#D74141
-hi VertSplit	guifg=#075554		guibg=#C0FFFF	gui=none
-hi Folded	guifg=black  		guibg=#FFC0C0
-hi FoldColumn	guifg=tan    		guibg=#800080
-hi ModeMsg	guifg=#404040		guibg=#C0C0C0
-hi MoreMsg	guifg=darkturquoise	guibg=#188F90
-hi NonText	guifg=#9FADC5		guibg=#334C75
-hi Question	guifg=#F4BB7E
-hi Search	guifg=bg     		guibg=fg
-hi SpecialKey	guifg=#BF9261
-hi StatusLine	guifg=#c0ffff		guibg=#004443	gui=none
-hi StatusLineNC	guifg=#004443		guibg=#067C7B	gui=bold
-hi Title	guifg=#8DB8C3
-hi Visual	guifg=black  		guibg=#C0FFC0	gui=bold
-hi WarningMsg	guifg=#F60000				gui=underline
-
-" syntax highlighting groups
-hi Comment	guifg=#666666                           gui=italic
-hi Constant	guifg=#A9EE5A				gui=bold,italic
-hi Identifier	guifg=#555555
-hi Function	guifg=#555555
-hi Statement	guifg=#ff9742                           gui=bold,italic
-hi PreProc	guifg=#F9449A
-hi Type		guifg=#55AAFF                           gui=bold,italic
-hi Special	guifg=#A9EE8A
-hi Todo		guifg=#FFFFFF		guibg=#FF0000
-
diff --git a/colors/habiLight.vim b/colors/habiLight.vim
deleted file mode 100755
index ea294f5..0000000
--- a/colors/habiLight.vim
+++ /dev/null
@@ -1,138 +0,0 @@
-" Vim color file
-" A version of nuvola.vim colorscheme, original by Dr. J. Pfefferl
-" I changed some colors and added some highlights for C and Vim 7
-
-" vim: tw=0 ts=4 sw=4
-" Maintainer:  Christian Habermann
-" Email:       christian( at )habermann-net( point )de
-" Version:     1.2
-" History:     1.2: nicer colors for paren matching
-"              1.1: Vim 7 support added (completion, spell checker, paren, tabs)
-"              1.0: initial version
-"
-" Intro {{{1
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "habiLight"
-
-" Normal {{{1
-hi Normal ctermfg=black ctermbg=NONE guifg=black guibg=#F9F5F9
-
-" Search {{{1
-hi IncSearch cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=UNDERLINE guifg=Black guibg=#FFE568
-hi Search term=reverse cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=NONE guifg=Black guibg=#FFE568
-
-" Messages {{{1
-hi ErrorMsg gui=BOLD guifg=#EB1513 guibg=NONE
-hi! link WarningMsg ErrorMsg
-hi ModeMsg gui=BOLD guifg=#0070ff guibg=NONE
-hi MoreMsg guibg=NONE guifg=seagreen
-hi! link Question MoreMsg
-
-" Split area {{{1
-hi StatusLine term=BOLD,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=BOLD guibg=#56A0EE guifg=white
-hi StatusLineNC gui=NONE guibg=#56A0EE guifg=#E9E9F4
-hi! link VertSplit StatusLineNC
-hi WildMenu gui=UNDERLINE guifg=#56A0EE guibg=#E9E9F4
-
-" Diff {{{1
-hi DiffText   gui=NONE guifg=#f83010 guibg=#ffeae0
-hi DiffChange gui=NONE guifg=#006800 guibg=#d0ffd0
-hi DiffDelete gui=NONE guifg=#2020ff guibg=#c8f2ea
-hi! link DiffAdd DiffDelete
-
-" Cursor {{{1
-hi Cursor       gui=none guifg=black guibg=orange
-"hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold {{{1
-hi Folded gui=NONE guibg=#B5EEB5 guifg=black
-"hi FoldColumn gui=NONE guibg=#9FD29F guifg=black
-hi! link FoldColumn Folded
-
-" Other {{{1
-hi Directory    gui=NONE guifg=#0000ff guibg=NONE
-hi LineNr       gui=NONE guifg=#8080a0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4000ff guibg=#EFEFF7
-"hi SpecialKey   gui=NONE guifg=#A35B00 guibg=NONE
-hi Title        gui=BOLD guifg=#1014AD guibg=NONE
-hi Visual term=reverse ctermfg=yellow ctermbg=black gui=NONE guifg=Black guibg=#BDDFFF
-hi VisualNOS term=reverse ctermfg=yellow ctermbg=black gui=UNDERLINE guifg=Black guibg=#BDDFFF
-
-" Syntax group {{{1
-hi Comment term=BOLD ctermfg=darkgray guifg=darkcyan
-hi Constant term=UNDERLINE ctermfg=red guifg=#B91F49
-hi Error term=REVERSE ctermfg=15 ctermbg=9 guibg=Red guifg=White
-hi Identifier term=UNDERLINE ctermfg=Blue guifg=Blue
-hi Number   term=UNDERLINE ctermfg=red gui=NONE guifg=#00C226
-hi PreProc term=UNDERLINE ctermfg=darkblue guifg=#1071CE
-hi Special term=BOLD ctermfg=darkmagenta guifg=red2
-hi Statement term=BOLD ctermfg=DarkRed gui=NONE guifg=#F06F00
-hi Tag term=BOLD ctermfg=DarkGreen guifg=DarkGreen
-hi Todo term=STANDOUT ctermbg=Yellow ctermfg=blue guifg=Blue guibg=Yellow
-hi Type term=UNDERLINE ctermfg=Blue gui=NONE guifg=Blue
-hi! link String	Constant
-hi! link Character	Constant
-hi! link Boolean	Constant
-hi! link Float		Number
-hi! link Function	Identifier
-hi! link Conditional	Statement
-hi! link Repeat	Statement
-hi! link Label		Statement
-hi! link Operator	Statement
-hi! link Keyword	Statement
-hi! link Exception	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 SpecialChar	Special
-hi! link Delimiter	Special
-hi! link SpecialComment Special
-hi! link Debug		Special
-
-" HTML {{{1
-hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
-" Tabs {{{1
-highlight TabLine     term=underline cterm=underline ctermfg=0 ctermbg=7 gui=underline guibg=LightGrey
-highlight TabLineFill term=reverse cterm=reverse gui=reverse
-highlight TabLineSel  term=bold cterm=bold gui=bold
-
-" Spell Checker {{{1
-if v:version >= 700
-    highlight SpellBad    term=reverse   ctermbg=12 gui=undercurl guisp=Red
-    highlight SpellCap    term=reverse   ctermbg=9  gui=undercurl guisp=Blue
-    highlight SpellRare   term=reverse   ctermbg=13 gui=undercurl guisp=Magenta
-    highlight SpellLocale term=underline ctermbg=11 gui=undercurl guisp=DarkCyan
-endif 
-
-" Completion {{{1
-highlight Pmenu      ctermbg=13  guifg=Black   guibg=#BDDFFF
-highlight PmenuSel   ctermbg=7   guifg=Black   guibg=Orange
-highlight PmenuSbar  ctermbg=7   guifg=#CCCCCC guibg=#CCCCCC
-highlight PmenuThumb cterm=reverse  gui=reverse guifg=Black   guibg=#AAAAAA
-
-" Misc {{{1
-highlight KDE              guifg=magenta gui=NONE
-highlight mySpecialSymbols guifg=magenta gui=NONE 
-
-
-highlight MatchParen  term=reverse ctermbg=11 gui=bold guibg=#B5EEB5 guifg=black
-
-
-" vim600:foldmethod=marker
diff --git a/colors/heliotrope.vim b/colors/heliotrope.vim
deleted file mode 100755
index 438fea7..0000000
--- a/colors/heliotrope.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-" Heliotrope color theme for Vim, version 0.0.1
-" by Antoine Kalmbach <antoine |DOT| kalmbach -AT- jyu /DOT/ fi>
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "heliotrope"
-
-hi CursorLine       guibg=#cccccc
-hi CursorColumn     guibg=#cccccc
-hi MatchParen       guifg=white       guibg=#A62300 gui=bold
-hi TabLine          guifg=white       guibg=#A62300 gui=italic
-hi TabLineFill      guifg=white      
-hi TabLineSel       guifg=white       guibg=#dd1144 gui=bold
-hi Pmenu            guifg=white       guibg=#B92503 gui=bold
-hi Title            guifg=#202020     gui=bold
-hi Underlined       guifg=#202020     gui=underline
-hi Cursor           guifg=white       guibg=#333333
-hi lCursor          guifg=black       guibg=white
-hi LineNr           guifg=#032506     guibg=#e3f8f2
-hi Normal           guifg=#000000     guibg=#ffffff
-hi StatusLine       guifg=#032506     guibg=#82b687 gui=bold
-hi StatusLineNC     guifg=#032506     guibg=#82b687 gui=bold
-hi VertSplit        guifg=#82b687     guibg=#82b687 gui=bold
-hi Folded           guifg=#111111     guibg=white
-hi Keyword          guifg=green       gui=bold
-hi PreProc          guifg=#111111     gui=bold
-hi NonText          guifg=#111111     guibg=white
-hi Comment          guifg=#555555     gui=bold,italic
-hi Constant         guifg=#007633     gui=bold
-hi String           guifg=#a65A00    
-hi Number           guifg=#034569    
-hi Float            guifg=#0088BB    
-hi Statement        guifg=#111111     gui=bold
-hi Type             guifg=#0d4c15    
-hi Structure        guifg=black       gui=bold
-hi Function         guifg=#B92503     gui=bold
-hi Identifier       guifg=#445588     gui=bold
-hi Repeat           guifg=#222222     gui=bold
-hi Conditional      guifg=#222222     gui=bold
-hi Define           guifg=#222222     gui=bold
-hi Error            guifg=white       guibg=#990022 gui=none
-hi Todo             guifg=white       guibg=#206876 gui=bold,underline
-hi Special          guifg=#007633
-hi Operator         guifg=#222222     gui=bold
-hi SpecialKey       guifg=#994400     guibg=#e8e8e8 gui=bold  
-hi DiffChange       guifg=NONE        guibg=#e0e0e0 gui=italic,bold
-hi DiffText         guifg=NONE        guibg=#e0e0e0 gui=italic,bold
-hi DiffAdd          guifg=NONE        guibg=#c0e0d0 gui=italic,bold
-hi DiffDelete       guifg=NONE        guibg=#e0c0b0 gui=italic,bold
-" MiniBufExplorer stuff (I LOVE this plugin!) {{{ 
-hi MBENormal        guifg=#333333     guibg=#e3f8f2 gui=none
-hi MBEChanged       guifg=#B92503     guibg=#e3f8f2 gui=bold
-hi MBEVisibleNormal guifg=white       guibg=#82b687
-hi MBEVisibleChanged guifg=#880000    guibg=#82b687 gui=bold
-" }}}
diff --git a/colors/hemisu.vim b/colors/hemisu.vim
deleted file mode 100755
index 2c29dc4..0000000
--- a/colors/hemisu.vim
+++ /dev/null
@@ -1,215 +0,0 @@
-" hemisu.vim - Vim color scheme
-" ----------------------------------------------------------
-" Author:	Noah Frederick (http://noahfrederick.com/)
-" Version:	3.4
-" License:	Creative Commons Attribution-NonCommercial
-" 			3.0 Unported License       (see README.md)
-" ----------------------------------------------------------
-
-" Setup ----------------------------------------------------{{{
-" Reset syntax highlighting
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-" Declare theme name
-let g:colors_name="hemisu"
-
-"}}}
-" The Colors -----------------------------------------------{{{
-" Define reusable colors
-let s:black=           { "gui": "#000000", "cterm": "16"  }
-let s:white=           { "gui": "#FFFFFF", "cterm": "231" }
-let s:almostWhite=     { "gui": "#EEEEEE", "cterm": "255" }
-let s:almostBlack=     { "gui": "#111111", "cterm": "233" }
-let s:middleDarkGrey=  { "gui": "#777777", "cterm": "241" }
-let s:middleLightGrey= { "gui": "#999999", "cterm": "246" }
-let s:lightGrey=       { "gui": "#BBBBBB", "cterm": "249" }
-let s:darkGrey=        { "gui": "#444444", "cterm": "238" }
-
-let s:darkPink=        { "gui": "#63001C", "cterm": "88"  }
-let s:middleDarkPink=  { "gui": "#FF0055", "cterm": "197" }
-let s:middleLightPink= { "gui": "#D65E76", "cterm": "167" }
-let s:lightPink=       { "gui": "#FFAFAF", "cterm": "217" }
-
-let s:darkBlue=        { "gui": "#005F87", "cterm": "24"  }
-let s:middleDarkBlue=  { "gui": "#538192", "cterm": "24"  }
-let s:middleLightBlue= { "gui": "#9FD3E6", "cterm": "116" }
-let s:lightBlue=       { "gui": "#CBE4EE", "cterm": "195" }
-
-let s:darkGreen=       { "gui": "#5F5F00", "cterm": "58"  }
-let s:middleDarkGreen= { "gui": "#739200", "cterm": "64"  }
-let s:middleLightGreen={ "gui": "#B1D631", "cterm": "149" }
-let s:lightGreen=      { "gui": "#BBFFAA", "cterm": "157" }
-
-let s:darkTan=         { "gui": "#503D15", "cterm": "52"  }
-let s:lightTan=        { "gui": "#ECE1C8", "cterm": "230" }
-
-" Assign to semantic categories based on background color
-if &background=="dark"
-	" Dark theme
-	let s:bg=s:black
-	let s:norm=s:almostWhite
-	let s:comment=s:middleDarkGrey
-	let s:dimmed=s:middleLightGrey
-	let s:subtle=s:darkGrey
-	let s:faint=s:almostBlack
-	let s:accent1=s:middleLightBlue
-	let s:accent2=s:middleLightGreen
-	let s:accent3=s:lightGreen
-	let s:accent4=s:lightTan
-	let s:normRed=s:middleLightPink
-	let s:normGreen=s:middleLightGreen
-	let s:normBlue=s:middleLightBlue
-	let s:faintRed=s:darkPink
-	let s:faintGreen=s:darkGreen
-	let s:faintBlue=s:darkBlue
-else
-	" Light theme
-	let s:bg=s:white
-	let s:norm=s:almostBlack
-	let s:comment=s:middleLightGrey
-	let s:dimmed=s:middleDarkGrey
-	let s:subtle=s:lightGrey
-	let s:faint=s:almostWhite
-	let s:accent1=s:middleDarkBlue
-	let s:accent2=s:middleDarkGreen
-	let s:accent3=s:middleDarkPink
-	let s:accent4=s:darkTan
-	let s:normRed=s:middleDarkPink
-	let s:normGreen=s:middleDarkGreen
-	let s:normBlue=s:middleDarkBlue
-	let s:faintRed=s:lightPink
-	let s:faintGreen=s:lightGreen
-	let s:faintBlue=s:lightBlue
-endif
-
-"}}}
-" Utilility Function ---------------------------------------{{{
-function! s:h(group, style)
-	execute "highlight" a:group
-		\ "guifg="   (has_key(a:style, "fg")    ? a:style.fg.gui   : "NONE")
-		\ "guibg="   (has_key(a:style, "bg")    ? a:style.bg.gui   : "NONE")
-		\ "guisp="   (has_key(a:style, "sp")    ? a:style.sp.gui   : "NONE")
-		\ "gui="     (has_key(a:style, "gui")   ? a:style.gui      : "NONE")
-		\ "ctermfg=" (has_key(a:style, "fg")    ? a:style.fg.cterm : "NONE")
-		\ "ctermbg=" (has_key(a:style, "bg")    ? a:style.bg.cterm : "NONE")
-		\ "cterm="   (has_key(a:style, "cterm") ? a:style.cterm    : "NONE")
-endfunction
-
-"}}}
-" Highlights - Vim >= 7 ------------------------------------{{{
-if version >= 700
-	call s:h("CursorLine",  { "bg": s:faint })
-	call s:h("MatchParen",  { "fg": s:accent1, "bg": s:faint, "gui": "bold" })
-	call s:h("Pmenu",       { "bg": s:faint })
-	call s:h("PmenuThumb",  { "bg": s:norm })
-	call s:h("PmenuSBar",   { "bg": s:subtle })
-	call s:h("PmenuSel",    { "bg": s:faintBlue })
-	call s:h("ColorColumn", { "bg": s:faintRed })
-	call s:h("SpellBad",    { "sp": s:normRed, "gui": "undercurl" })
-	call s:h("SpellCap",    { "sp": s:accent1, "gui": "undercurl" })
-	call s:h("SpellRare",   { "sp": s:normGreen, "gui": "undercurl" })
-	call s:h("SpellLocal",  { "sp": s:accent4, "gui": "undercurl" })
-	hi! link CursorColumn	CursorLine
-
-	" Use background for cterm Spell*, which does not support undercurl
-	execute "hi! SpellBad   ctermbg=" s:faintRed.cterm
-	execute "hi! SpellCap   ctermbg=" s:faintBlue.cterm
-	execute "hi! SpellRare  ctermbg=" s:faintGreen.cterm
-	execute "hi! SpellLocal ctermbg=" s:faint.cterm
-endif
-
-"}}}
-" Highlights - UI ------------------------------------------{{{
-call s:h("Normal",       { "fg": s:norm, "bg": s:bg })
-call s:h("NonText",      { "fg": s:subtle })
-call s:h("Cursor",       { "fg": s:bg, "bg": s:accent3 })
-call s:h("Visual",       { "bg": s:faintBlue })
-call s:h("IncSearch",    { "bg": s:faintBlue })
-call s:h("Search",       { "bg": s:faintGreen })
-call s:h("StatusLine",   { "fg": s:norm, "bg": s:faint, "gui": "bold", "cterm": "bold" })
-call s:h("StatusLineNC", { "fg": s:dimmed, "bg": s:faint })
-call s:h("SignColumn",   { "fg": s:norm })
-call s:h("VertSplit",    { "fg": s:subtle, "bg": s:faint })
-call s:h("TabLine",      { "fg": s:dimmed, "bg": s:faint })
-call s:h("TabLineSel",   { "gui": "bold", "cterm": "bold" })
-call s:h("Folded",       { "fg": s:comment, "bg": s:faint })
-call s:h("Directory",    { "fg": s:accent1 })
-call s:h("Title",        { "fg": s:accent4, "gui": "bold", "cterm": "bold" })
-call s:h("ErrorMsg",     { "bg": s:faintRed })
-call s:h("DiffAdd",      { "bg": s:faintGreen })
-call s:h("DiffChange",   { "bg": s:faintRed })
-call s:h("DiffDelete",   { "fg": s:normRed, "bg": s:faintRed })
-call s:h("DiffText",     { "bg": s:faintRed, "gui": "bold", "cterm": "bold" })
-call s:h("User1",        { "fg": s:bg, "bg": s:normGreen })
-call s:h("User2",        { "fg": s:bg, "bg": s:normRed })
-call s:h("User3",        { "fg": s:bg, "bg": s:normBlue })
-hi! link WildMenu	IncSearch
-hi! link FoldColumn	SignColumn
-hi! link WarningMsg	ErrorMsg
-hi! link MoreMsg	Title
-hi! link Question	MoreMsg
-hi! link ModeMsg	MoreMsg
-hi! link TabLineFill	StatusLineNC
-hi! link LineNr		NonText
-hi! link SpecialKey	NonText
-
-"}}}
-" Highlights - Generic Syntax ------------------------------{{{
-call s:h("Delimiter",  { "fg": s:dimmed })
-call s:h("Comment",    { "fg": s:comment, "gui": "italic" })
-call s:h("Underlined", { "fg": s:accent1, "gui": "underline", "cterm": "underline" })
-call s:h("Type",       { "fg": s:accent3 })
-call s:h("String",     { "fg": s:accent2 })
-call s:h("Keyword",    { "fg": s:accent2, "gui": "bold", "cterm": "bold" })
-call s:h("Todo",       { "fg": s:normRed, "gui": "bold", "cterm": "bold" })
-call s:h("Function",   { "gui": "bold", "cterm": "bold" })
-hi! link Identifier	Function
-hi! link Statement	Type
-hi! link Constant	Directory
-hi! link Number		Constant
-hi! link Special	Constant
-hi! link PreProc	Constant
-hi! link Error		ErrorMsg
-
-"}}}
-" Highlights - HTML ----------------------------------------{{{
-hi! link htmlLink	Underlined
-hi! link htmlTag	Type
-hi! link htmlEndTag	htmlTag
-
-"}}}
-" Highlights - CSS -----------------------------------------{{{
-hi! link cssBraces	Delimiter
-hi! link cssSelectorOp	cssBraces
-hi! link cssClassName	Normal
-
-"}}}
-" Highlights - Markdown ------------------------------------{{{
-hi! link mkdListItem	mkdDelimiter
-
-"}}}
-" Highlights - Shell ---------------------------------------{{{
-hi! link shOperator	Delimiter
-hi! link shCaseBar	Delimiter
-
-"}}}
-" Highlights - JavaScript ----------------------------------{{{
-hi! link javaScriptValue	Constant
-hi! link javaScriptNull	Constant
-hi! link javaScriptBraces	Normal
-
-"}}}
-" Highlights - Help ----------------------------------------{{{
-hi! link helpExample	String
-hi! link helpHeadline	Title
-hi! link helpSectionDelim	Comment
-hi! link helpHyperTextEntry	Statement
-hi! link helpHyperTextJump	Underlined
-hi! link helpURL	Underlined
-
-"}}}
-
-" vim: fdm=marker
diff --git a/colors/herald.vim b/colors/herald.vim
deleted file mode 100755
index 23bab56..0000000
--- a/colors/herald.vim
+++ /dev/null
@@ -1,385 +0,0 @@
-" Vim color file
-" Name:       herald.vim
-" Author:     Fabio Cevasco <h3rald@h3rald.com>
-" Version:    0.2.0
-" Notes:      Supports 8, 16, 256 and 16,777,216 (RGB) color modes
-
-hi clear
-
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "herald"
-
-set background=dark
-
-" Set some syntax-related variables
-let ruby_operators = 1
-
-if has("gui_running")
-
-	" -> Text; Miscellaneous
-	hi Normal         guibg=#1F1F1F guifg=#D0D0D0 gui=none
-	hi SpecialKey     guibg=#1F1F1F guifg=#E783E9 gui=none
-	hi VertSplit      guibg=#1F1F1F guifg=#FFEE68 gui=none
-	hi SignColumn     guibg=#1F1F1F guifg=#BF81FA gui=none
-	hi NonText        guibg=#1F1F1F guifg=#FC6984 gui=none
-	hi Directory      guibg=#1F1F1F guifg=#FFEE68 gui=none 
-	hi Title          guibg=#1F1F1F guifg=#6DF584 gui=bold
-
-	" -> Cursor 
-	hi Cursor         guibg=#FFEE68 guifg=#1F1F1F gui=none
-	hi CursorIM       guibg=#FFEE68 guifg=#1F1F1F gui=none
-	hi CursorColumn   guibg=#000000               gui=none
-	hi CursorLine     guibg=#000000               gui=none
-
-	" -> Folding
-	hi FoldColumn     guibg=#001336 guifg=#003DAD gui=none
-	hi Folded         guibg=#001336 guifg=#003DAD gui=none
-
-	" -> Line info  
-	hi LineNr         guibg=#000000 guifg=#696567 gui=none
-	hi StatusLine     guibg=#000000 guifg=#696567 gui=none
-	hi StatusLineNC   guibg=#25365a guifg=#696567 gui=none
-
-	" -> Messages
-	hi ErrorMsg       guibg=#A32024 guifg=#D0D0D0 gui=none
-	hi Question       guibg=#1F1F1F guifg=#FFA500 gui=none
-	hi WarningMsg     guibg=#FFA500 guifg=#000000 gui=none
-	hi MoreMsg        guibg=#1F1F1F guifg=#FFA500 gui=none
-	hi ModeMsg        guibg=#1F1F1F guifg=#FFA500 gui=none
-
-	" -> Search 
-	hi Search         guibg=#696567 guifg=#FFEE68 gui=none 
-	hi IncSearch      guibg=#696567 guifg=#FFEE68 gui=none
-
-	" -> Diff
-	hi DiffAdd        guibg=#006124 guifg=#ED9000 gui=none
-	hi DiffChange     guibg=#0B294A guifg=#A36000 gui=none
-	hi DiffDelete     guibg=#081F38 guifg=#ED9000 gui=none
-	hi DiffText       guibg=#12457D guifg=#ED9000 gui=underline
-
-	" -> Menu
-	hi Pmenu          guibg=#140100 guifg=#660300 gui=none
-	hi PmenuSel       guibg=#F17A00 guifg=#4C0200 gui=none
-	hi PmenuSbar      guibg=#430300               gui=none
-	hi PmenuThumb     guibg=#720300               gui=none
-	hi PmenuSel       guibg=#F17A00 guifg=#4C0200 gui=none
-
-	" -> Tabs
-	hi TabLine        guibg=#141414 guifg=#1F1F1F gui=none
-	hi TabLineFill    guibg=#000000               gui=none
-	hi TabLineSel     guibg=#1F1F1F guifg=#D0D0D0 gui=bold  
-	"
-	" -> Visual Mode
-	hi Visual         guibg=#000000 guifg=#FFB539 gui=none
-	hi VisualNOS      guibg=#000000 guifg=#696567 gui=none
-
-	" -> Code
-	hi Comment        guibg=#1F1F1F guifg=#696567 gui=none
-	hi Constant       guibg=#1F1F1F guifg=#6DF584 gui=none
-	hi String         guibg=#1F1F1F guifg=#FFB539 gui=none
-	hi Error          guibg=#1F1F1F guifg=#FC4234 gui=none
-	hi Identifier     guibg=#1F1F1F guifg=#70BDF1 gui=none
-	hi Function       guibg=#1F1F1F guifg=#90CBF1 gui=none
-	hi Ignore         guibg=#1F1F1F guifg=#1F1F1F gui=none
-	hi MatchParen     guibg=#FFA500 guifg=#1F1F1F gui=none
-	hi PreProc        guibg=#1F1F1F guifg=#BF81FA gui=none
-	hi Special        guibg=#1F1F1F guifg=#FFEE68 gui=none
-	hi Todo           guibg=#1F1F1F guifg=#FC4234 gui=bold
-	hi Underlined     guibg=#1F1F1F guifg=#FC4234 gui=underline
-	hi Statement      guibg=#1F1F1F guifg=#E783E9 gui=none
-	hi Operator       guibg=#1F1F1F guifg=#FC6984 gui=none
-	hi Delimiter      guibg=#1F1F1F guifg=#FC6984 gui=none
-	hi Type           guibg=#1F1F1F guifg=#FFEE68 gui=none
-	hi Exception      guibg=#1F1F1F guifg=#FC4234 gui=none
-
-	" -> HTML-specific
-	hi htmlBold                 guibg=#1F1F1F guifg=#D0D0D0 gui=bold
-	hi htmlBoldItalic           guibg=#1F1F1F guifg=#D0D0D0 gui=bold,italic
-	hi htmlBoldUnderline        guibg=#1F1F1F guifg=#D0D0D0 gui=bold,underline
-	hi htmlBoldUnderlineItalic  guibg=#1F1F1F guifg=#D0D0D0 gui=bold,underline,italic
-	hi htmlItalic               guibg=#1F1F1F guifg=#D0D0D0 gui=italic
-	hi htmlUnderline            guibg=#1F1F1F guifg=#D0D0D0 gui=underline
-	hi htmlUnderlineItalic      guibg=#1F1F1F guifg=#D0D0D0 gui=underline,italic
-
-elseif &t_Co == 256
-
-	" -> Text; Miscellaneous
-	hi Normal         ctermbg=234  ctermfg=252   cterm=none
-	hi SpecialKey     ctermbg=234  ctermfg=176   cterm=none
-	hi VertSplit      ctermbg=234  ctermfg=227   cterm=none
-	hi SignColumn     ctermbg=234  ctermfg=141   cterm=none
-	hi NonText        ctermbg=234  ctermfg=204   cterm=none
-	hi Directory      ctermbg=234  ctermfg=227   cterm=none 
-	hi Title          ctermbg=234  ctermfg=84    cterm=bold
-
-	" -> Cursor 
-	hi Cursor         ctermbg=227  ctermfg=234   cterm=none
-	hi CursorIM       ctermbg=227  ctermfg=234   cterm=none
-	hi CursorColumn   ctermbg=0                  cterm=none
-	hi CursorLine     ctermbg=0                  cterm=none
-
-	" -> Folding
-	hi FoldColumn     ctermbg=234  ctermfg=25    cterm=none
-	hi Folded         ctermbg=234  ctermfg=25    cterm=none
-
-	" -> Line info  
-	hi LineNr         ctermbg=0    ctermfg=241   cterm=none
-	hi StatusLine     ctermbg=0    ctermfg=241   cterm=none
-	hi StatusLineNC   ctermbg=237  ctermfg=241   cterm=none
-
-	" -> Messages
-	hi ErrorMsg       ctermbg=124  ctermfg=252   cterm=none
-	hi Question       ctermbg=234  ctermfg=214   cterm=none
-	hi WarningMsg     ctermbg=214  ctermfg=0     cterm=none
-	hi MoreMsg        ctermbg=234  ctermfg=214   cterm=none
-	hi ModeMsg        ctermbg=234  ctermfg=214   cterm=none
-
-	" -> Search 
-	hi Search         ctermbg=241  ctermfg=227   cterm=none 
-	hi IncSearch      ctermbg=241  ctermfg=227   cterm=none
-
-	" -> Diff
-	hi DiffAdd        ctermbg=22   ctermfg=208   cterm=none
-	hi DiffChange     ctermbg=235  ctermfg=130   cterm=none
-	hi DiffDelete     ctermbg=234  ctermfg=208   cterm=none
-	hi DiffText       ctermbg=24   ctermfg=208   cterm=underline
-
-	" -> Menu
-	hi Pmenu          ctermbg=0    ctermfg=52    cterm=none
-	hi PmenuSel       ctermbg=208  ctermfg=52    cterm=none
-	hi PmenuSbar      ctermbg=52                 cterm=none
-	hi PmenuThumb     ctermbg=52                 cterm=none
-	hi PmenuSel       ctermbg=208  ctermfg=52    cterm=none
-
-	" -> Tabs
-	hi TabLine        ctermbg=233  ctermfg=234   cterm=none
-	hi TabLineFill    ctermbg=0                  cterm=none
-	hi TabLineSel     ctermbg=234  ctermfg=252   cterm=bold 
-	"
-	" -> Visual Mode
-	hi Visual         ctermbg=0    ctermfg=215   cterm=none 
-	hi VisualNOS      ctermbg=0    ctermfg=241   cterm=none
-
-	" -> Code
-	hi Comment        ctermbg=234  ctermfg=241   cterm=none
-	hi Constant       ctermbg=234  ctermfg=84    cterm=none
-	hi String         ctermbg=234  ctermfg=215   cterm=none
-	hi Error          ctermbg=234  ctermfg=203   cterm=none
-	hi Identifier     ctermbg=234  ctermfg=75    cterm=none
-	hi Function       ctermbg=234  ctermfg=117   cterm=none
-	hi Ignore         ctermbg=234  ctermfg=234   cterm=none
-	hi MatchParen     ctermbg=214  ctermfg=234   cterm=none
-	hi PreProc        ctermbg=234  ctermfg=141   cterm=none
-	hi Special        ctermbg=234  ctermfg=227   cterm=none
-	hi Todo           ctermbg=234  ctermfg=203   cterm=bold
-	hi Underlined     ctermbg=234  ctermfg=203   cterm=underline
-	hi Statement      ctermbg=234  ctermfg=176   cterm=none
-	hi Operator       ctermbg=234  ctermfg=204   cterm=none
-	hi Delimiter      ctermbg=234  ctermfg=204   cterm=none
-	hi Type           ctermbg=234  ctermfg=227   cterm=none
-	hi Exception      ctermbg=234  ctermfg=203   cterm=none 
-
-	" -> HTML-specific
-	hi htmlBold                 ctermbg=234  ctermfg=252   cterm=bold
-	hi htmlBoldItalic           ctermbg=234  ctermfg=252   cterm=bold,italic
-	hi htmlBoldUnderline        ctermbg=234  ctermfg=252   cterm=bold,underline
-	hi htmlBoldUnderlineItalic  ctermbg=234  ctermfg=252   cterm=bold,underline,italic
-	hi htmlItalic               ctermbg=234  ctermfg=252   cterm=italic
-	hi htmlUnderline            ctermbg=234  ctermfg=252   cterm=underline
-	hi htmlUnderlineItalic      ctermbg=234  ctermfg=252   cterm=underline,italic
-
-elseif &t_Co == 16
-
-	" -> Text; Miscellaneous
-	hi Normal         ctermbg=8  ctermfg=15 cterm=none
-	hi SpecialKey     ctermbg=8  ctermfg=5  cterm=none
-	hi VertSplit      ctermbg=8  ctermfg=14  cterm=none
-	hi SignColumn     ctermbg=8  ctermfg=5  cterm=none
-  hi NonText        ctermbg=8  ctermfg=4  cterm=none
-  hi Directory      ctermbg=8  ctermfg=14  cterm=none 
-  hi Title          ctermbg=8  ctermfg=10 cterm=bold
-
-  " -> Cursor 
-  hi Cursor         ctermbg=14 ctermfg=8  cterm=none
-  hi CursorIM       ctermbg=14 ctermfg=8  cterm=none
-  hi CursorColumn   ctermbg=0            cterm=none
-  hi CursorLine     ctermbg=0            cterm=none
-
-  " -> Folding
-  hi FoldColumn     ctermbg=0  ctermfg=1  cterm=none
-  hi Folded         ctermbg=0  ctermfg=1  cterm=none
-
-  " -> Line info  
-  hi LineNr         ctermbg=0  ctermfg=7  cterm=none
-  hi StatusLine     ctermbg=0  ctermfg=7  cterm=none
-  hi StatusLineNC   ctermbg=0  ctermfg=7  cterm=none
-
-  " -> Messages
-  hi ErrorMsg       ctermbg=4  ctermfg=7  cterm=none
-  hi Question       ctermbg=8  ctermfg=14 cterm=none
-  hi WarningMsg     ctermbg=14 ctermfg=0  cterm=none
-  hi MoreMsg        ctermbg=8  ctermfg=14 cterm=none
-  hi ModeMsg        ctermbg=8  ctermfg=14 cterm=none
-
-  " -> Search 
-  hi Search         ctermbg=7  ctermfg=14 cterm=none 
-  hi IncSearch      ctermbg=7  ctermfg=14 cterm=none
-
-  " -> Diff
-  hi DiffAdd        ctermbg=0  ctermfg=10 cterm=none
-  hi DiffChange     ctermbg=0  ctermfg=14 cterm=none
-  hi DiffDelete     ctermbg=0  ctermfg=12 cterm=none
-  hi DiffText       ctermbg=1  ctermfg=14 cterm=underline
-
-  " -> Menu
-  hi Pmenu          ctermbg=0  ctermfg=4  cterm=none
-  hi PmenuSel       ctermbg=14 ctermfg=4  cterm=none
-  hi PmenuSbar      ctermbg=0             cterm=none
-  hi PmenuThumb     ctermbg=4             cterm=none
-  hi PmenuSel       ctermbg=14 ctermfg=4  cterm=none
-
-  " -> Tabs
-  hi TabLine        ctermbg=7  ctermfg=8  cterm=none
-  hi TabLineFill    ctermbg=0             cterm=none
-  hi TabLineSel     ctermbg=8  ctermfg=7  cterm=bold  
-  "
-  " -> Visual Mode
-  hi Visual         ctermbg=0  ctermfg=14 cterm=none
-  hi VisualNOS      ctermbg=0  ctermfg=7  cterm=none
-
-  " -> Code
-  hi Comment        ctermbg=8  ctermfg=7  cterm=none
-  hi Constant       ctermbg=8  ctermfg=10 cterm=none
-  hi String         ctermbg=8  ctermfg=6  cterm=none
-  hi Error          ctermbg=8  ctermfg=4  cterm=none
-  hi Identifier     ctermbg=8  ctermfg=11 cterm=none
-  hi Function       ctermbg=8  ctermfg=11 cterm=none
-  hi Ignore         ctermbg=8  ctermfg=8  cterm=none
-  hi MatchParen     ctermbg=14 ctermfg=8  cterm=none
-  hi PreProc        ctermbg=8  ctermfg=5  cterm=none
-  hi Special        ctermbg=8  ctermfg=14 cterm=none
-  hi Todo           ctermbg=8  ctermfg=12 cterm=bold
-  hi Underlined     ctermbg=8  ctermfg=12 cterm=underline
-  hi Statement      ctermbg=8  ctermfg=13 cterm=none
-  hi Operator       ctermbg=8  ctermfg=4  cterm=none
-  hi Delimiter      ctermbg=8  ctermfg=4 cterm=none
-  hi Type           ctermbg=8  ctermfg=14 cterm=none
-  hi Exception      ctermbg=8  ctermfg=12 cterm=none
-
-  " -> HTML-specific
-  hi htmlBold                  ctermbg=8 ctermfg=7 cterm=bold
-  hi htmlBoldItalic            ctermbg=8 ctermfg=7 cterm=bold,italic
-  hi htmlBoldUnderline         ctermbg=8 ctermfg=7 cterm=bold,underline
-  hi htmlBoldUnderlineItalic   ctermbg=8 ctermfg=7 cterm=bold,underline,italic
-  hi htmlItalic                ctermbg=8 ctermfg=7 cterm=italic
-  hi htmlUnderline             ctermbg=8 ctermfg=7 cterm=underline
-  hi htmlUnderlineItalic       ctermbg=8 ctermfg=7 cterm=underline,italic
-
-
-elseif &t_Co == 8
-
-	" -> Text; Miscellaneous
-	hi Normal         ctermbg=8  ctermfg=7  cterm=none
-	hi SpecialKey     ctermbg=8  ctermfg=5  cterm=none
-	hi VertSplit      ctermbg=8  ctermfg=6  cterm=none
-	hi SignColumn     ctermbg=8  ctermfg=5  cterm=none
-  hi NonText        ctermbg=8  ctermfg=4  cterm=none
-  hi Directory      ctermbg=8  ctermfg=6  cterm=none 
-  hi Title          ctermbg=8  ctermfg=2  cterm=bold
-
-  " -> Cursor 
-  hi Cursor         ctermbg=6  ctermfg=8  cterm=none
-  hi CursorIM       ctermbg=6  ctermfg=8  cterm=none
-  hi CursorColumn   ctermbg=0             cterm=none
-  hi CursorLine     ctermbg=0             cterm=none
-
-  " -> Folding
-  hi FoldColumn     ctermbg=0  ctermfg=1  cterm=none
-  hi Folded         ctermbg=0  ctermfg=1  cterm=none
-
-  " -> Line info  
-  hi LineNr         ctermbg=0  ctermfg=7  cterm=none
-  hi StatusLine     ctermbg=0  ctermfg=7  cterm=none
-  hi StatusLineNC   ctermbg=0  ctermfg=7  cterm=none
-
-  " -> Messages
-  hi ErrorMsg       ctermbg=4  ctermfg=7  cterm=none
-  hi Question       ctermbg=8  ctermfg=6  cterm=none
-  hi WarningMsg     ctermbg=6  ctermfg=0  cterm=none
-  hi MoreMsg        ctermbg=8  ctermfg=6  cterm=none
-  hi ModeMsg        ctermbg=8  ctermfg=6  cterm=none
-
-  " -> Search 
-  hi Search         ctermbg=7  ctermfg=6  cterm=none 
-  hi IncSearch      ctermbg=7  ctermfg=6  cterm=none
-
-  " -> Diff
-  hi DiffAdd        ctermbg=0  ctermfg=2  cterm=none
-  hi DiffChange     ctermbg=0  ctermfg=6  cterm=none
-  hi DiffDelete     ctermbg=0  ctermfg=4  cterm=none
-  hi DiffText       ctermbg=1  ctermfg=6  cterm=underline
-
-  " -> Menu
-  hi Pmenu          ctermbg=0  ctermfg=4  cterm=none
-  hi PmenuSel       ctermbg=6  ctermfg=4  cterm=none
-  hi PmenuSbar      ctermbg=0             cterm=none
-  hi PmenuThumb     ctermbg=4             cterm=none
-  hi PmenuSel       ctermbg=6  ctermfg=4  cterm=none
-
-  " -> Tabs
-  hi TabLine        ctermbg=7  ctermfg=8  cterm=none
-  hi TabLineFill    ctermbg=0             cterm=none
-  hi TabLineSel     ctermbg=8  ctermfg=7  cterm=bold  
-  "
-  " -> Visual Mode
-  hi Visual         ctermbg=0  ctermfg=6 cterm=none
-  hi VisualNOS      ctermbg=0  ctermfg=7  cterm=none
-
-  " -> Code
-  hi Comment        ctermbg=8  ctermfg=7  cterm=none
-  hi Constant       ctermbg=8  ctermfg=2 cterm=none
-  hi String         ctermbg=8  ctermfg=6  cterm=none
-  hi Error          ctermbg=8  ctermfg=4  cterm=none
-  hi Identifier     ctermbg=8  ctermfg=3 cterm=none
-  hi Function       ctermbg=8  ctermfg=3 cterm=none
-  hi Ignore         ctermbg=8  ctermfg=8  cterm=none
-  hi MatchParen     ctermbg=6  ctermfg=8  cterm=none
-  hi PreProc        ctermbg=8  ctermfg=5  cterm=none
-  hi Special        ctermbg=8  ctermfg=6 cterm=none
-  hi Todo           ctermbg=8  ctermfg=4 cterm=bold
-  hi Underlined     ctermbg=8  ctermfg=4 cterm=underline
-  hi Statement      ctermbg=8  ctermfg=5 cterm=none
-  hi Operator       ctermbg=8  ctermfg=4  cterm=none
-  hi Delimiter      ctermbg=8  ctermfg=4 cterm=none
-  hi Type           ctermbg=8  ctermfg=6 cterm=none
-  hi Exception      ctermbg=8  ctermfg=4 cterm=none
-
-  " -> HTML-specific
-  hi htmlBold                  ctermbg=8 ctermfg=7 cterm=bold
-  hi htmlBoldItalic            ctermbg=8 ctermfg=7 cterm=bold,italic
-  hi htmlBoldUnderline         ctermbg=8 ctermfg=7 cterm=bold,underline
-  hi htmlBoldUnderlineItalic   ctermbg=8 ctermfg=7 cterm=bold,underline,italic
-  hi htmlItalic                ctermbg=8 ctermfg=7 cterm=italic
-  hi htmlUnderline             ctermbg=8 ctermfg=7 cterm=underline
-  hi htmlUnderlineItalic       ctermbg=8 ctermfg=7 cterm=underline,italic
-
-endif
-
-hi! default link bbcodeBold htmlBold
-hi! default link bbcodeBoldItalic htmlBoldItalic
-hi! default link bbcodeBoldItalicUnderline htmlBoldUnderlineItalic
-hi! default link bbcodeBoldUnderline htmlBoldUnderline
-hi! default link bbcodeItalic htmlItalic
-hi! default link bbcodeItalicUnderline htmlUnderlineItalic
-hi! default link bbcodeUnderline htmlUnderline
-
-" Spellcheck formatting
-if has("spell")
-	hi SpellBad   guisp=#FC4234 gui=undercurl
-	hi SpellCap   guisp=#70BDF1 gui=undercurl
-	hi SpellLocal guisp=#FFEE68 gui=undercurl
-	hi SpellRare  guisp=#6DF584 gui=undercurl
-endif
diff --git a/colors/hornet.vim b/colors/hornet.vim
deleted file mode 100755
index 3990c36..0000000
--- a/colors/hornet.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Maintainer:	Taurus Olson
-" Mail:         taurusolson@gmail.com
-" Version:      1.0.2
-" Last Change:	October 17, 2009 
-" Credits:      This is a modification of busybee.vim color scheme
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "hornet"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine    guibg=#303030 ctermbg=234
-  hi CursorColumn  guibg=#202020 ctermbg=234
-  hi MatchParen    guifg=#d0ffc0 guibg=#202020 gui=bold ctermfg=157 ctermbg=237 cterm=bold
-  hi Pmenu 		   guifg=#ffffff guibg=#202020 ctermfg=255 ctermbg=238
-  hi PmenuSel 	   guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148
-endif
-
-" General colors
-hi Cursor 		   guifg=NONE    guibg=#626262 gui=none ctermbg=241
-hi Normal 		   guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234
-hi NonText 		   guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=235
-hi LineNr 		   guifg=#303030 guibg=#202020 gui=none ctermfg=244 ctermbg=232
-hi StatusLine 	           guifg=#d3d3d5 guibg=#303030 gui=none ctermfg=253 ctermbg=238
-hi StatusLineNC            guifg=#939395 guibg=#303030 gui=none ctermfg=246 ctermbg=238
-hi VertSplit 	           guifg=#444444 guibg=#303030 gui=none ctermfg=238 ctermbg=238
-hi Folded 		   guibg=#384048 guifg=#a0a8b0 gui=none ctermbg=4 ctermfg=248
-hi Title		   guifg=#f6f3e8 guibg=NONE	gui=bold ctermfg=254 cterm=bold
-hi Visual		   guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4
-hi SpecialKey	           guifg=#808080 guibg=#343434 gui=none ctermfg=244 ctermbg=236
-hi Directory 		   guifg=#fecf35 gui=none ctermfg=148 
-
-" Syntax highlighting
-hi Comment 		   guifg=#757575 gui=italic ctermfg=244
-hi Todo 		   guifg=#fec135 gui=none ctermfg=245
-hi Boolean         guifg=#b1d631 gui=none ctermfg=148
-hi String 		   guifg=#fecf35 gui=none ctermfg=148 
-hi Identifier 	   guifg=#b1d631 gui=none ctermfg=148
-hi Function 	   guifg=#fdb32a gui=none ctermfg=255
-hi Type 		   guifg=#7e8aa2 gui=none ctermfg=103
-hi Statement 	   guifg=#7e8aa2 gui=none ctermfg=103
-hi Keyword		   guifg=#ff9800 gui=none ctermfg=208
-hi Constant 	   guifg=#c03000 gui=none  ctermfg=208
-hi Number		   guifg=#ff9800 gui=none ctermfg=208
-hi Special		   guifg=#4bb5c1 gui=none ctermfg=208
-hi PreProc 		   guifg=#96ca2d gui=none ctermfg=230
-hi Todo            guifg=#fec135 guibg=#202020 gui=none
-hi Search          guifg=#000000 guibg=#aeee00 gui=none
-
-" Code-specific colors
-hi pythonImport    guifg=#7fc6bc gui=none ctermfg=255
-hi pythonException guifg=#f00000 gui=none ctermfg=200
-hi pythonOperator  guifg=#7e8aa2 gui=none ctermfg=103
-hi pythonBuiltinFunction guifg=#009000 gui=none ctermfg=200
-hi pythonExClass   guifg=#009000 gui=none ctermfg=200
diff --git a/colors/hybrid.vim b/colors/hybrid.vim
old mode 100755
new mode 100644
diff --git a/colors/ibmedit.vim b/colors/ibmedit.vim
deleted file mode 100755
index 4b846c6..0000000
--- a/colors/ibmedit.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Maintainer:   Maarten Slaets
-" Last Change:  2002 Aug 16
-
-" Color settings similar to that used in IBM Edit
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="ibmedit"
-
-hi Normal       term=NONE cterm=NONE ctermfg=Gray ctermbg=DarkBlue
-hi Normal       gui=NONE guifg=#CCCCCC guibg=DarkBlue
-hi NonText      term=NONE cterm=NONE ctermfg=Gray ctermbg=DarkBlue
-hi NonText      gui=NONE guifg=#CCCCCC guibg=DarkBlue
-
-hi Statement    term=NONE cterm=NONE ctermfg=White  ctermbg=DarkBlue
-hi Statement    gui=NONE guifg=White guibg=DarkBlue
-hi Special      term=NONE cterm=NONE ctermfg=White ctermbg=DarkBlue
-hi Special      gui=NONE guifg=White guibg=DarkBlue
-hi Constant     term=NONE cterm=NONE ctermfg=Cyan ctermbg=DarkBlue
-hi Constant     gui=NONE guifg=#99CCFF guibg=DarkBlue
-hi Comment      term=NONE cterm=NONE ctermfg=Blue ctermbg=DarkBlue
-hi Comment      gui=NONE guifg=#6666FF guibg=DarkBlue
-hi Preproc      term=NONE cterm=NONE ctermfg=Cyan ctermbg=DarkBlue
-hi Preproc      gui=NONE guifg=#99CCFF guibg=DarkBlue
-hi Type         term=NONE cterm=NONE ctermfg=Gray ctermbg=DarkBlue
-hi Type         gui=NONE guifg=#CCCCCC guibg=DarkBlue
-hi Identifier   term=NONE cterm=NONE ctermfg=Grey ctermbg=DarkBlue
-hi Identifier   gui=NONE guifg=#CCCCCC guibg=DarkBlue
-
-hi StatusLine   term=bold cterm=bold ctermfg=Black ctermbg=White
-hi StatusLine   gui=bold guifg=Black guibg=White
-
-hi StatusLineNC term=NONE cterm=NONE ctermfg=Black ctermbg=White
-hi StatusLineNC gui=NONE guifg=Black guibg=White
-
-hi Visual       term=NONE cterm=NONE ctermfg=Black ctermbg=DarkCyan
-hi Visual       gui=NONE guifg=Black guibg=Gray
-
-hi Search       term=NONE cterm=NONE ctermbg=Gray
-hi Search       gui=NONE guibg=Gray
-
-hi VertSplit    term=NONE cterm=NONE ctermfg=Black ctermbg=White
-hi VertSplit    gui=NONE guifg=Black guibg=White
-
-hi Directory    term=NONE cterm=NONE ctermfg=Green ctermbg=DarkBlue
-hi Directory    gui=NONE guifg=Green guibg=DarkBlue
-
-hi WarningMsg   term=standout cterm=NONE ctermfg=Red ctermbg=DarkBlue
-hi WarningMsg   gui=standout guifg=Red guibg=DarkBlue
-
-hi Error        term=NONE cterm=NONE ctermfg=White ctermbg=Red
-hi Error        gui=NONE guifg=White guibg=Red
-
-hi Cursor       ctermfg=Black ctermbg=Yellow
-hi Cursor       guifg=Black guibg=Yellow
-
diff --git a/colors/icansee.vim b/colors/icansee.vim
deleted file mode 100755
index 615f035..0000000
--- a/colors/icansee.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-" Vim color file tailored legibility on black background.
-" Add below line to your vimrc file to ensure optimal experience (sets term to use
-" 256, instead of 16, colors):
-"   set t_Co=256
-"
-" Maintainer:	John Rhee  <jrhee75@gmail.com>
-" Last Change:	2007/09/11	v0.2	Set PreProc (set variables) to white.
-
-hi clear
-set background=dark
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name = "icansee"
-
-"color settings for these terminal types:
-"Black		term=NONE cterm=NONE ctermfg=0 ctermbg=0
-"DarkRed	term=NONE cterm=NONE ctermfg=1 ctermbg=0
-"DarkGreen	term=NONE cterm=NONE ctermfg=2 ctermbg=0
-"Brown		term=NONE cterm=NONE ctermfg=3 ctermbg=0
-"DarkBlue	term=NONE cterm=NONE ctermfg=4 ctermbg=0
-"DarkMagenta	term=NONE cterm=NONE ctermfg=5 ctermbg=0
-"DarkCyan	term=NONE cterm=NONE ctermfg=6 ctermbg=0
-"Gray		term=NONE cterm=NONE ctermfg=7 ctermbg=0
-"DarkGray	term=NONE cterm=bold ctermfg=0 ctermbg=0
-"Red		term=NONE cterm=bold ctermfg=1 ctermbg=0
-"Green		term=NONE cterm=bold ctermfg=2 ctermbg=0
-"Yellow		term=NONE cterm=bold ctermfg=3 ctermbg=0
-"Blue		term=NONE cterm=bold ctermfg=4 ctermbg=0
-"Magenta	term=NONE cterm=bold ctermfg=5 ctermbg=0
-"Cyan		term=NONE cterm=bold ctermfg=6 ctermbg=0
-"White		term=NONE cterm=bold ctermfg=7 ctermbg=0
-
-"hi Comment	term=bold		ctermfg=Blue						guifg=Blue
-hi Comment	term=bold		ctermfg=DarkGray					guifg=DarkGray
-hi Constant	term=underline		ctermfg=DarkGreen			gui=NONE	guifg=DarkGreen
-hi Cursor									guibg=fg	guifg=Orchid
-hi Directory	term=bold		ctermfg=Cyan						guifg=Cyan
-hi Error	term=reverse		ctermbg=Red		ctermfg=White	guibg=Red	guifg=White
-hi ErrorMsg	term=standout		ctermbg=DarkRed		ctermfg=White	guibg=Red	guifg=White
-hi Identifier	term=underline		ctermfg=Cyan						guifg=Cyan
-hi Ignore				ctermfg=Black						guifg=bg
-hi IncSearch	term=reverse		cterm=reverse				gui=reverse
-hi LineNr	term=underline		ctermfg=DarkYellow					guifg=Yellow
-hi ModeMsg	term=bold		cterm=bold				gui=bold
-hi MoreMsg	term=bold		ctermfg=Green				gui=bold	guifg=SeaGreen
-hi NonText	term=bold		ctermfg=DarkGreen			gui=bold	guifg=DarkGreen
-hi Normal				ctermbg=Black		ctermfg=Gray	guibg=Black	guifg=Gray
-hi PreProc	term=underline		ctermfg=White						guifg=White
-hi Question	term=standout		ctermfg=Green				gui=bold	guifg=Green
-hi Search				ctermbg=Magenta		ctermfg=White	guibg=Magenta	guifg=White
-hi Special	term=bold		ctermfg=Red						guifg=Red
-hi SpecialKey	term=bold		ctermfg=Green						guifg=Green
-hi Statement	term=bold		ctermfg=Yellow				gui=NONE	guifg=Yellow
-hi StatusLine	term=reverse,bold 	cterm=reverse				gui=reverse
-hi StatusLineNC term=reverse		cterm=reverse				gui=reverse
-hi Title	term=bold		ctermfg=Magenta				gui=bold	guifg=Pink
-hi Todo		term=standout		ctermbg=DarkYellow	ctermfg=Black	guibg=Yellow	guifg=Black
-hi Type					ctermfg=Green				gui=NONE	guifg=Green
-hi Visual	term=reverse		cterm=reverse				guibg=DarkGreen	guifg=White
-hi WarningMsg	term=standout		ctermfg=Red						guifg=Red
diff --git a/colors/impact.vim b/colors/impact.vim
deleted file mode 100755
index 507ff3d..0000000
--- a/colors/impact.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Maintainer:   Shirk <shirk@gmx.net>
-" Last Change:  19 September 2005 - 0.2
-" URL: trinity.gentoofreaks.org
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark     "or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="impact"
-
-if exists("g:impact_transbg")
-        hi Normal       ctermfg=LightGray ctermbg=none
-        hi NonText      ctermfg=DarkGray  ctermbg=none
-
-        hi Statement    ctermfg=Blue      ctermbg=none
-        hi Comment      ctermfg=DarkGray  ctermbg=none cterm=bold term=bold
-        hi Constant     ctermfg=DarkCyan  ctermbg=none
-        hi Identifier   ctermfg=Cyan      ctermbg=none
-        hi Type         ctermfg=DarkGreen ctermbg=none
-        hi Folded       ctermfg=DarkGreen ctermbg=none cterm=underline term=none
-        hi Special      ctermfg=Blue      ctermbg=none
-        hi PreProc      ctermfg=LightGray ctermbg=none cterm=bold term=bold
-        hi Scrollbar    ctermfg=Blue      ctermbg=none
-        hi Cursor       ctermfg=white     ctermbg=none
-        hi ErrorMsg     ctermfg=Red       ctermbg=none cterm=bold term=bold
-        hi WarningMsg   ctermfg=Yellow    ctermbg=none
-        hi VertSplit    ctermfg=White     ctermbg=none
-        hi Directory    ctermfg=Cyan      ctermbg=DarkBlue
-        hi Visual       ctermfg=White     ctermbg=DarkGray cterm=underline term=none
-        hi Title        ctermfg=White     ctermbg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold,underline ctermfg=White ctermbg=Black
-        hi StatusLineNC term=bold cterm=bold,underline ctermfg=Gray  ctermbg=Black
-        hi LineNr       term=bold cterm=bold ctermfg=White ctermbg=DarkGray
-else
-        hi Normal       ctermfg=LightGray ctermbg=Black
-        hi NonText      ctermfg=DarkGray  ctermbg=Black
-
-        hi Statement    ctermfg=Blue      ctermbg=Black
-        hi Comment      ctermfg=DarkGray  ctermbg=Black cterm=bold term=bold
-        hi Constant     ctermfg=DarkCyan  ctermbg=Black
-        hi Identifier   ctermfg=Cyan      ctermbg=Black
-        hi Type         ctermfg=DarkGreen ctermbg=Black
-        hi Folded       ctermfg=DarkGreen ctermbg=Black cterm=underline term=none
-        hi Special      ctermfg=Blue      ctermbg=Black
-        hi PreProc      ctermfg=LightGray ctermbg=Black cterm=bold term=bold
-        hi Scrollbar    ctermfg=Blue      ctermbg=Black
-        hi Cursor       ctermfg=white     ctermbg=Black
-        hi ErrorMsg     ctermfg=Red       ctermbg=Black cterm=bold term=bold
-        hi WarningMsg   ctermfg=Yellow    ctermbg=Black
-        hi VertSplit    ctermfg=White     ctermbg=Black
-        hi Directory    ctermfg=Cyan      ctermbg=DarkBlue
-        hi Visual       ctermfg=White     ctermbg=DarkGray cterm=underline term=none
-        hi Title        ctermfg=White     ctermbg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold,underline ctermfg=White ctermbg=Black
-        hi StatusLineNC term=bold cterm=bold,underline ctermfg=Gray  ctermbg=Black
-        hi LineNr       term=bold cterm=bold ctermfg=White ctermbg=DarkGray
-endif
diff --git a/colors/impactG.vim b/colors/impactG.vim
deleted file mode 100755
index fcf3462..0000000
--- a/colors/impactG.vim
+++ /dev/null
@@ -1,68 +0,0 @@
-" Vim color file
-" Maintainer:   Shirk <shirk@gmx.net>
-" Last Change:  19 September 2005 - 0.2
-" URL: trinity.gentoofreaks.org
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark     "or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="impact"
-
-if exists("g:impact_transbg")
-        hi Normal       ctermfg=LightGray guifg=LightGray ctermbg=none
-        hi NonText      ctermfg=DarkGray guifg=DarkGray  ctermbg=none
-
-        hi Statement    ctermfg=Blue guifg=Blue      ctermbg=none
-        hi Comment      ctermfg=DarkGray guifg=DarkGray  ctermbg=none guibg=Black cterm=bold gui=bold term=bold
-        hi Constant     ctermfg=DarkCyan guifg=DarkCyan  ctermbg=none guibg=Black
-        hi Identifier   ctermfg=Cyan guifg=Cyan      ctermbg=none guibg=Black
-        hi Type         ctermfg=DarkGreen guifg=DarkGreen ctermbg=none guibg=Black
-        hi Folded       ctermfg=DarkGreen guifg=DarkGreen ctermbg=none guibg=Black cterm=underline gui=underline term=none
-        hi Special      ctermfg=Blue guifg=Blue      ctermbg=none guibg=Black
-        hi PreProc      ctermfg=LightGray guifg=LightGray ctermbg=none guibg=Black cterm=bold gui=bold term=bold
-        hi Scrollbar    ctermfg=Blue guifg=Blue      ctermbg=none guibg=Black
-        hi Cursor       ctermfg=white guifg=white     ctermbg=none guibg=Black
-        hi ErrorMsg     ctermfg=Red guifg=Red       ctermbg=none guibg=Black cterm=bold gui=bold term=bold
-        hi WarningMsg   ctermfg=Yellow guifg=Yellow    ctermbg=none guibg=Black
-        hi VertSplit    ctermfg=White guifg=White     ctermbg=none guibg=Black
-        hi Directory    ctermfg=Cyan guifg=Cyan      ctermbg=DarkBlue guibg=DarkBlue
-        hi Visual       ctermfg=White guifg=White     ctermbg=DarkGray guibg=DarkGray cterm=underline gui=underline term=none
-        hi Title        ctermfg=White guifg=White     ctermbg=DarkBlue guibg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold gui=bold,underline ctermfg=White guifg=White ctermbg=Black guibg=Black
-        hi StatusLineNC term=bold cterm=bold gui=bold,underline ctermfg=Gray guifg=Gray  ctermbg=Black guibg=Black
-        hi LineNr       term=bold cterm=bold gui=bold ctermfg=White guifg=White ctermbg=DarkGray guibg=DarkGray
-else
-        hi Normal       ctermfg=LightGray guifg=LightGray ctermbg=Black guibg=Black
-        hi NonText      ctermfg=DarkGray guifg=DarkGray  ctermbg=Black guibg=Black
-
-        hi Statement    ctermfg=Blue guifg=Blue      ctermbg=Black guibg=Black
-        hi Comment      ctermfg=DarkGray guifg=DarkGray  ctermbg=Black guibg=Black cterm=bold gui=bold term=bold
-        hi Constant     ctermfg=DarkCyan guifg=DarkCyan  ctermbg=Black guibg=Black
-        hi Identifier   ctermfg=Cyan guifg=Cyan      ctermbg=Black guibg=Black
-        hi Type         ctermfg=DarkGreen guifg=DarkGreen ctermbg=Black guibg=Black
-        hi Folded       ctermfg=DarkGreen guifg=DarkGreen ctermbg=Black guibg=Black cterm=underline gui=underline term=none
-        hi Special      ctermfg=Blue guifg=Blue      ctermbg=Black guibg=Black
-        hi PreProc      ctermfg=LightGray guifg=LightGray ctermbg=Black guibg=Black cterm=bold gui=bold term=bold
-        hi Scrollbar    ctermfg=Blue guifg=Blue      ctermbg=Black guibg=Black
-        hi Cursor       ctermfg=white guifg=white     ctermbg=Black guibg=Black
-        hi ErrorMsg     ctermfg=Red guifg=Red       ctermbg=Black guibg=Black cterm=bold gui=bold term=bold
-        hi WarningMsg   ctermfg=Yellow guifg=Yellow    ctermbg=Black guibg=Black
-        hi VertSplit    ctermfg=White guifg=White     ctermbg=Black guibg=Black
-        hi Directory    ctermfg=Cyan guifg=Cyan      ctermbg=DarkBlue guibg=DarkBlue
-        hi Visual       ctermfg=White guifg=White     ctermbg=DarkGray guibg=DarkGray cterm=underline gui=underline term=none
-        hi Title        ctermfg=White guifg=White     ctermbg=DarkBlue guibg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold gui=bold,underline ctermfg=White guifg=White ctermbg=Black guibg=Black
-        hi StatusLineNC term=bold cterm=bold gui=bold,underline ctermfg=Gray guifg=Gray  ctermbg=Black guibg=Black
-        hi LineNr       term=bold cterm=bold gui=bold ctermfg=White guifg=White ctermbg=DarkGray guibg=DarkGray
-endif
-
-
diff --git a/colors/industrial.vim b/colors/industrial.vim
deleted file mode 100755
index 6e609cc..0000000
--- a/colors/industrial.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" Vim color file
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "industrial"
-
-hi Normal          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaaa guibg=#222222
-
-" Search
-"hi IncSearch       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#222222 guibg=#336699
-"hi Search          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#222222 guibg=#669933
-hi IncSearch       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#222222 guibg=#ffff00
-hi Search          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#222222 guibg=#ffff00
-
-" Messages
-hi ErrorMsg        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi WarningMsg      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi ModeMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi MoreMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-hi Question        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
-
-" Split area
-hi StatusLine      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=#003366
-hi StatusLineNC    ctermfg=NONE ctermbg=NONE gui=NONE guifg=#cccccc guibg=#000000
-hi VertSplit       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#cccccc guibg=#000000
-hi WildMenu        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=#336699
-
-" Diff
-hi DiffText        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#07cfef guibg=#00151f
-hi DiffChange      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ff97ff guibg=#2f002f
-hi DiffDelete      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
-hi DiffAdd         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
-
-" Cursor
-hi Cursor          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#000000 guibg=#669933
-hi lCursor         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#7fff00
-hi CursorIM        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#669933
-hi CursorLine      ctermfg=NONE ctermbg=NONE gui=NONE guibg=#444444
-hi CursorColumn    ctermfg=NONE ctermbg=NONE gui=NONE guibg=#444444
-
-" Fold
-hi Folded          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=#333333
-hi FoldColumn      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=#333333
-
-" Other
-hi Directory       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaba guibg=NONE
-hi LineNr          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#666666 guibg=NONE
-hi NonText         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#211d1a guibg=#211d1a
-hi SpecialKey      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#378fff guibg=NONE
-hi Title           ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffbf9f guibg=#370f07
-hi Visual          ctermfg=NONE ctermbg=NONE gui=reverse guifg=#a5a5a5 guibg=#353535
-hi SpellBad        term=reverse ctermbg=Red  gui=undercurl guisp=#aa1565
-
-" Syntax group
-hi Comment         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#666666 guibg=NONE
-hi Constant        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#336699 guibg=#333333
-hi Error           ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE    guibg=#ff0000
-hi Identifier      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#669933 guibg=NONE
-hi Ignore          ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
-hi PreProc         ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
-hi Special         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#cccccc guibg=NONE
-hi Statement       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#336699 guibg=NONE
-hi Todo            ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffff00 guibg=NONE
-hi Type            ctermfg=NONE ctermbg=NONE gui=NONE guifg=#556677 guibg=NONE
-hi Underlined      ctermfg=NONE ctermbg=NONE gui=UNDERLINE guifg=NONE guibg=NONE
-
-" HTML
-hi htmlLink                 gui=UNDERLINE guifg=#abcdef guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
diff --git a/colors/ingretu.vim b/colors/ingretu.vim
deleted file mode 100755
index 4a143b2..0000000
--- a/colors/ingretu.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" Name:         ingretu.vim
-" Maintainer:   http://github.com/gmarik
-" Home:         http://github.com/gmarik/ingretu
-" License:      public domain
-" Description:  scheme is derived from Jo Vermeulen's vibrantink.vim
-" TODO:         not tested in 256 color mode
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let g:colors_name = "ingretu"
-
-hi MergeConflict guibg=red
-match MergeConflict /[><]\{7\} /
-
-highlight StatusLine ctermfg=black ctermbg=green cterm=NONE guifg=#ffbc29 guibg=black
-highlight StatusLineNC ctermfg=black ctermbg=lightblue cterm=NONE guifg=#808080 guibg=white
-highlight VertSplit term=reverse cterm=reverse gui=none guifg=#00FF00
-
-hi Visual term=reverse cterm=reverse gui=reverse guifg=#00AA00 guibg=fg
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-
-" Wildmenu and Fuzzyfinder like dynamic menus
-highlight Pmenu    guifg=white guibg=#808080
-highlight PmenuSel guifg=black guibg=#ffbc29
-highlight WildMenu guifg=black guibg=#ffbc29
-
-if has("gui_running")
-    highlight Normal guifg=White   guibg=Black
-    highlight Cursor gui=reverse guibg=black guifg=#0aaaaa
-    highlight CursorLine guibg=#323300
-    highlight Keyword guifg=#FF6600
-    highlight Define guifg=#FF6600
-    highlight Comment guifg=Gray
-    highlight Identifier guifg=cyan gui=NONE
-    highlight rubySymbol guifg=#339999 gui=NONE
-    highlight rubyStringDelimiter guifg=#33FF33
-    highlight rubyInterpolation guifg=White
-    highlight rubyPseudoVariable guifg=#339999
-    highlight rubyConstant gui=BOLD guifg=#55AA55
-    highlight Type guifg=#AAAAFF
-    highlight Constant guifg=#FFEE98
-    highlight Function guifg=#FFCC00 gui=NONE
-    highlight Include guifg=#FFCC00 gui=NONE
-    highlight Statement guifg=#FF6600 gui=NONE
-    highlight String guifg=#AAFFAA
-    highlight Search guibg=#00FF00
-else
-    set t_Co=256
-    highlight Normal ctermfg=White ctermbg=Black
-    highlight Cursor ctermfg=Black ctermbg=Green
-    highlight Keyword ctermfg=202
-    highlight Define ctermfg=202
-    highlight Comment ctermfg=98
-    highlight Identifier cterm=NONE ctermfg=Cyan
-    highlight rubySymbol ctermfg=66
-    highlight rubyStringDelimiter ctermfg=82
-    highlight rubyInterpolation ctermfg=White
-    highlight rubyPseudoVariable ctermfg=66
-    highlight rubyConstant cterm=bold ctermfg=68
-    highlight Type ctermfg=68
-    highlight Constant cterm=bold ctermfg=34
-    highlight Function ctermfg=220
-    highlight Include ctermfg=220
-    highlight Statement ctermfg=202
-    highlight String ctermfg=34
-    highlight Search ctermbg=yellow
-    highlight CursorLine cterm=NONE ctermbg=235
-endif
diff --git a/colors/inkpot.vim b/colors/inkpot.vim
deleted file mode 100755
index 025e795..0000000
--- a/colors/inkpot.vim
+++ /dev/null
@@ -1,216 +0,0 @@
-" Vim color file
-" Name:       inkpot.vim
-" Maintainer: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
-" Homepage:   http://github.com/ciaranm/inkpot/
-"
-" This should work in the GUI, rxvt-unicode (88 colour mode) and xterm (256
-" colour mode). It won't work in 8/16 colour terminals.
-"
-" To use a black background, :let g:inkpot_black_background = 1
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "inkpot"
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! <SID>M(a)
-    return strpart("0135", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! <SID>X(a)
-    if &t_Co == 88
-        return a:a
-    else
-        if a:a == 8
-            return 237
-        elseif a:a < 16
-            return a:a
-        elseif a:a > 79
-            return 232 + (3 * (a:a - 80))
-        else
-            let l:b = a:a - 16
-            let l:x = l:b % 4
-            let l:y = (l:b / 4) % 4
-            let l:z = (l:b / 16)
-            return 16 + <SID>M(l:x) + (6 * <SID>M(l:y)) + (36 * <SID>M(l:z))
-        endif
-    endif
-endfun
-
-if ! exists("g:inkpot_black_background")
-    let g:inkpot_black_background = 0
-endif
-
-if has("gui_running")
-    if ! g:inkpot_black_background
-        hi Normal         gui=NONE   guifg=#cfbfad   guibg=#1e1e27
-    else
-        hi Normal         gui=NONE   guifg=#cfbfad   guibg=#000000
-    endif
-
-    hi CursorLine         guibg=#2e2e37
-
-    hi IncSearch      gui=BOLD   guifg=#303030   guibg=#cd8b60
-    hi Search         gui=NONE   guifg=#303030   guibg=#cd8b60
-    hi ErrorMsg       gui=BOLD   guifg=#ffffff   guibg=#ce4e4e
-    hi WarningMsg     gui=BOLD   guifg=#ffffff   guibg=#ce8e4e
-    hi ModeMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
-    hi MoreMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
-    hi Question       gui=BOLD   guifg=#ffcd00   guibg=NONE
-
-    hi StatusLine     gui=BOLD   guifg=#b9b9b9   guibg=#3e3e5e
-    hi User1          gui=BOLD   guifg=#00ff8b   guibg=#3e3e5e
-    hi User2          gui=BOLD   guifg=#7070a0   guibg=#3e3e5e
-    hi StatusLineNC   gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
-    hi VertSplit      gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
-
-    hi WildMenu       gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
-
-    hi MBENormal                 guifg=#cfbfad   guibg=#2e2e3f
-    hi MBEChanged                guifg=#eeeeee   guibg=#2e2e3f
-    hi MBEVisibleNormal          guifg=#cfcfcd   guibg=#4e4e8f
-    hi MBEVisibleChanged         guifg=#eeeeee   guibg=#4e4e8f
-
-    hi DiffText       gui=NONE   guifg=#ffffcd   guibg=#4a2a4a
-    hi DiffChange     gui=NONE   guifg=#ffffcd   guibg=#306b8f
-    hi DiffDelete     gui=NONE   guifg=#ffffcd   guibg=#6d3030
-    hi DiffAdd        gui=NONE   guifg=#ffffcd   guibg=#306d30
-
-    hi Cursor         gui=NONE   guifg=#404040   guibg=#8b8bff
-    hi lCursor        gui=NONE   guifg=#404040   guibg=#8fff8b
-    hi CursorIM       gui=NONE   guifg=#404040   guibg=#8b8bff
-
-    hi Folded         gui=NONE   guifg=#cfcfcd   guibg=#4b208f
-    hi FoldColumn     gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
-
-    hi Directory      gui=NONE   guifg=#00ff8b   guibg=NONE
-    hi LineNr         gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
-    hi NonText        gui=BOLD   guifg=#8b8bcd   guibg=NONE
-    hi SpecialKey     gui=BOLD   guifg=#ab60ed   guibg=NONE
-    hi Title          gui=BOLD   guifg=#af4f4b   guibg=NONE
-    hi Visual         gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
-
-    hi Comment        gui=NONE   guifg=#cd8b00   guibg=NONE
-    hi Constant       gui=NONE   guifg=#ffcd8b   guibg=NONE
-    hi String         gui=NONE   guifg=#ffcd8b   guibg=#404040
-    hi Error          gui=NONE   guifg=#ffffff   guibg=#6e2e2e
-    hi Identifier     gui=NONE   guifg=#ff8bff   guibg=NONE
-    hi Ignore         gui=NONE
-    hi Number         gui=NONE   guifg=#f0ad6d   guibg=NONE
-    hi PreProc        gui=NONE   guifg=#409090   guibg=NONE
-    hi Special        gui=NONE   guifg=#c080d0   guibg=NONE
-    hi SpecialChar    gui=NONE   guifg=#c080d0   guibg=#404040
-    hi Statement      gui=NONE   guifg=#808bed   guibg=NONE
-    hi Todo           gui=BOLD   guifg=#303030   guibg=#d0a060
-    hi Type           gui=NONE   guifg=#ff8bff   guibg=NONE
-    hi Underlined     gui=BOLD   guifg=#df9f2d   guibg=NONE
-    hi TaglistTagName gui=BOLD   guifg=#808bed   guibg=NONE
-
-    hi perlSpecialMatch   gui=NONE guifg=#c080d0   guibg=#404040
-    hi perlSpecialString  gui=NONE guifg=#c080d0   guibg=#404040
-
-    hi cSpecialCharacter  gui=NONE guifg=#c080d0   guibg=#404040
-    hi cFormat            gui=NONE guifg=#c080d0   guibg=#404040
-
-    hi doxygenBrief                 gui=NONE guifg=#fdab60   guibg=NONE
-    hi doxygenParam                 gui=NONE guifg=#fdd090   guibg=NONE
-    hi doxygenPrev                  gui=NONE guifg=#fdd090   guibg=NONE
-    hi doxygenSmallSpecial          gui=NONE guifg=#fdd090   guibg=NONE
-    hi doxygenSpecial               gui=NONE guifg=#fdd090   guibg=NONE
-    hi doxygenComment               gui=NONE guifg=#ad7b20   guibg=NONE
-    hi doxygenSpecial               gui=NONE guifg=#fdab60   guibg=NONE
-    hi doxygenSpecialMultilineDesc  gui=NONE guifg=#ad600b   guibg=NONE
-    hi doxygenSpecialOnelineDesc    gui=NONE guifg=#ad600b   guibg=NONE
-
-    if v:version >= 700
-        hi Pmenu          gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
-        hi PmenuSel       gui=BOLD   guifg=#eeeeee   guibg=#2e2e3f
-        hi PmenuSbar      gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
-        hi PmenuThumb     gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
-
-        hi SpellBad     gui=undercurl guisp=#cc6666
-        hi SpellRare    gui=undercurl guisp=#cc66cc
-        hi SpellLocal   gui=undercurl guisp=#cccc66
-        hi SpellCap     gui=undercurl guisp=#66cccc
-
-        hi MatchParen   gui=NONE      guifg=#cfbfad   guibg=#4e4e8f
-    endif
-else
-    if ! g:inkpot_black_background
-        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(80)
-    else
-        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(16)
-    endif
-
-    exec "hi IncSearch      cterm=BOLD   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
-    exec "hi Search         cterm=NONE   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
-    exec "hi ErrorMsg       cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(48)
-    exec "hi WarningMsg     cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(68)
-    exec "hi ModeMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
-    exec "hi MoreMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
-    exec "hi Question       cterm=BOLD   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
-
-    exec "hi StatusLine     cterm=BOLD   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
-    exec "hi User1          cterm=BOLD   ctermfg=" . <SID>X(28) . " ctermbg=" . <SID>X(81)
-    exec "hi User2          cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(81)
-    exec "hi StatusLineNC   cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
-    exec "hi VertSplit      cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
-
-    exec "hi WildMenu       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
-
-    exec "hi MBENormal                   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
-    exec "hi MBEChanged                  ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(81)
-    exec "hi MBEVisibleNormal            ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(82)
-    exec "hi MBEVisibleChanged           ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
-
-    exec "hi DiffText       cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(34)
-    exec "hi DiffChange     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(17)
-    exec "hi DiffDelete     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
-    exec "hi DiffAdd        cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(20)
-
-    exec "hi Folded         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(35)
-    exec "hi FoldColumn     cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
-
-    exec "hi Directory      cterm=NONE   ctermfg=" . <SID>X(28) . " ctermbg=" . "NONE"
-    exec "hi LineNr         cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
-    exec "hi NonText        cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
-    exec "hi SpecialKey     cterm=BOLD   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
-    exec "hi Title          cterm=BOLD   ctermfg=" . <SID>X(48) . " ctermbg=" . "NONE"
-    exec "hi Visual         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(38)
-
-    exec "hi Comment        cterm=NONE   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
-    exec "hi Constant       cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . "NONE"
-    exec "hi String         cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . <SID>X(81)
-    exec "hi Error          cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
-    exec "hi Identifier     cterm=NONE   ctermfg=" . <SID>X(53) . " ctermbg=" . "NONE"
-    exec "hi Ignore         cterm=NONE"
-    exec "hi Number         cterm=NONE   ctermfg=" . <SID>X(69) . " ctermbg=" . "NONE"
-    exec "hi PreProc        cterm=NONE   ctermfg=" . <SID>X(25) . " ctermbg=" . "NONE"
-    exec "hi Special        cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
-    exec "hi SpecialChar    cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . <SID>X(81)
-    exec "hi Statement      cterm=NONE   ctermfg=" . <SID>X(27) . " ctermbg=" . "NONE"
-    exec "hi Todo           cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(57)
-    exec "hi Type           cterm=NONE   ctermfg=" . <SID>X(71) . " ctermbg=" . "NONE"
-    exec "hi Underlined     cterm=BOLD   ctermfg=" . <SID>X(77) . " ctermbg=" . "NONE"
-    exec "hi TaglistTagName cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
-
-    if v:version >= 700
-        exec "hi Pmenu          cterm=NONE   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
-        exec "hi PmenuSel       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
-        exec "hi PmenuSbar      cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
-        exec "hi PmenuThumb     cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
-
-        exec "hi SpellBad       cterm=NONE ctermbg=" . <SID>X(32)
-        exec "hi SpellRare      cterm=NONE ctermbg=" . <SID>X(33)
-        exec "hi SpellLocal     cterm=NONE ctermbg=" . <SID>X(36)
-        exec "hi SpellCap       cterm=NONE ctermbg=" . <SID>X(21)
-        exec "hi MatchParen     cterm=NONE ctermbg=" . <SID>X(14) . "ctermfg=" . <SID>X(25)
-    endif
-endif
-
-" vim: set et :
diff --git a/colors/ironman.vim b/colors/ironman.vim
deleted file mode 100755
index d98a936..0000000
--- a/colors/ironman.vim
+++ /dev/null
@@ -1,133 +0,0 @@
-" Vim color file
-" Maintainer:  Michael Boehler
-" Mail:        michael@familie-boehler.de
-" Last Change: 2008-2-21
-" Version:     3.2
-" This color scheme uses a light background.
-" GUI only
-" inspired by colorsheme PYTE
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "ironman"
-
-hi Normal                    guifg=#222222 guibg=#F0F0F0
-                             
-" Search
-hi IncSearch                 gui=NONE guifg=Black guibg=#FFFF4B
-hi Search                    gui=NONE guifg=Black guibg=#FFFF8F
-
-" Messages
-hi ErrorMsg                  gui=NONE guifg=#FF0000 guibg=NONE    
-hi WarningMsg                gui=NONE guifg=#FF6600 guibg=NONE
-hi ModeMsg                   gui=NONE guifg=#0070ff guibg=NONE
-hi MoreMsg                   gui=NONE guifg=#FF6600 guibg=NONE
-hi Question                  gui=NONE guifg=#008050 guibg=NONE
-
-" Completion Popup Menu
-hi Pmenu                     gui=NONE guifg=#303040 guibg=#ccff00
-hi PmenuSel                  gui=NONE guifg=#303040 guibg=#ffff00
-" hi PmenuSbar	scrollbar  |hl-PmenuSbar|
-" hi PmenuThumb	thumb of the scrollbar  |hl-PmenuThumb|
-
-" Split area
-hi StatusLine                gui=ITALIC guifg=white   guibg=#8090a0
-hi StatusLineNC              gui=ITALIC guifg=#506070 guibg=#a0b0c0
-hi VertSplit                 gui=NONE guifg=#a0b0c0 guibg=#a0b0c0
-hi WarningMsgildMenu         gui=NONE guifg=Black   guibg=Orange
-" hi WildMenu                  gui=UNDERLINE guifg=#56A0EE guibg=#E9E9F4
-
-" Diff
-hi DiffText                  gui=NONE guifg=#2020ff guibg=#c8f2ea
-hi DiffDelete                gui=NONE guifg=#f83010 guibg=#ffeae0
-hi DiffAdd                   gui=NONE guifg=#006800 guibg=#d0ffd0
-hi DiffChange                gui=NONE guifg=#2020ff guibg=#c8f2ea
-                             
-" Cursor
-hi Cursor                    gui=NONE guifg=#ffffff guibg=#DE7171
-hi lCursor                   gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM                  gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorLine                gui=NONE guifg=NONE    guibg=#f6f6f6
-hi CursorColumn              gui=NONE guifg=NONE    guibg=#F9F9F9
-                             
-" Fold
-hi Folded                    gui=NONE guifg=#3399ff guibg=#EAF5FF
-hi FoldColumn                gui=NONE guifg=#3399ff guibg=#EAF5FF
-                             
-" Other hi Directory         gui=NONE guifg=#0000ff guibg=NONE
-hi LineNr                    gui=NONE guifg=#FFFFFF guibg=#C0D0E0
-hi NonText                   gui=NONE guifg=#C0C0C0 guibg=#E0E0E0
-hi SpecialKey                gui=NONE guifg=#35E0DF guibg=NONE
-hi Title                     gui=NONE guifg=#004060 guibg=#c8f0f8
-hi Visual                    gui=NONE guibg=#BDDFFF
-hi MatchParen                gui=NONE guifg=NONE    guibg=#9FFF82
-
-" Syntax group
-hi Comment                   gui=ITALIC guifg=#A0B0C0 guibg=#EFEFFF
-hi Paren                     gui=NONE guifg=#9326C1 guibg=NONE
-hi Comma                     gui=NONE guifg=#C12660 guibg=NONE
-hi Constant                  gui=NONE guifg=NONE    guibg=#E8F1FF
-hi Statement                 gui=NONE guifg=#005EC4 guibg=NONE
-hi Error                     gui=BOLD,UNDERLINE     guifg=#ff4080 guibg=NONE
-hi Identifier                gui=NONE guifg=#339933 guibg=NONE
-hi Ignore                    gui=NONE guifg=#f8f8f8 guibg=NONE
-hi Number                    gui=NONE guifg=#087B4D
-hi PreProc                   gui=NONE guifg=#0070e6 guibg=NONE
-hi Special                   gui=NONE guifg=#0000ff guibg=#ccf7ee
-hi Delimiter                 gui=BOLD guifg=#A8360F guibg=NONE
-hi Todo                      gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi Type                      gui=NONE guifg=#eb7950 guibg=NONE
-hi Underlined                gui=UNDERLINE guifg=#0000ff guibg=NONE
-
-hi Conditional               gui=None guifg=#0053FF guibg=bg
-hi Repeat                    gui=None guifg=SeaGreen2 guibg=bg
-hi Operator                  gui=None guifg=#0085B1 guibg=bg
-hi Keyword                   gui=None guifg=DarkBlue guibg=bg
-hi Exception                 gui=None guifg=DarkBlue guibg=bg
-hi Function                  gui=BOLD guifg=#3E0F70
-
-hi! link String	Constant
-hi! link SpecialComment Comment
-hi! link Character	Constant
-hi! link Boolean	Constant
-hi! link Float		Number
-hi! link Label		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 SpecialChar	Special
-hi! link Debug		Special
-
-" HTML
-hi htmlLink                  gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                  gui=BOLD
-hi htmlBoldItalic            gui=BOLD,ITALIC
-hi htmlBoldUnderline         gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic   gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic                gui=ITALIC
-hi htmlUnderline             gui=UNDERLINE
-hi htmlUnderlineItalic       gui=UNDERLINE,ITALIC
-
-" Tabs {{{1
-highlight TabLine            gui=underline guibg=LightGrey
-highlight TabLineFill        gui=reverse
-highlight TabLineSel         gui=bold
-
-highlight SpellBad           gui=undercurl guisp=Red
-highlight SpellCap           gui=undercurl guisp=Blue
-highlight SpellRare          gui=undercurl guisp=Magenta
-highlight SpellLocale        gui=undercurl guisp=DarkCyan
-
-" Completion {{{1
-highlight Pmenu              guifg=Black   guibg=#BDDFFF
-highlight PmenuSel           guifg=Black   guibg=Orange
-highlight PmenuSbar          guifg=#CCCCCC guibg=#CCCCCC
-highlight PmenuThumb         gui=reverse guifg=Black   guibg=#AAAAAA
diff --git a/colors/jammy.vim b/colors/jammy.vim
deleted file mode 100755
index b12ed5f..0000000
--- a/colors/jammy.vim
+++ /dev/null
@@ -1,111 +0,0 @@
-" Vim color file inherit from the desrt.vim 
-" Maintainer:	Jammy Lee<mistapostle@gmail.com>
-" Last Change:	$Date: 2008/03/20 19:30:30 $
-" Version:	$Id: jammy.vim,v 1.1 2008/03/20 $
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="jammy"
-
-hi Normal	guifg=White guibg=Black
-
-" highlight groups
-hi Cursor	guibg=khaki guifg=slategrey
-"hi CursorIM
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi String	guifg=Skyblue
-hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Folded	guibg=grey30 guifg=gold
-hi FoldColumn	guibg=grey30 guifg=tan
-hi IncSearch	guifg=slategrey guibg=khaki
-"hi LineNr
-hi ModeMsg	guifg=goldenrod
-hi MoreMsg	guifg=SeaGreen
-hi NonText	guifg=LightBlue guibg=black
-hi Question	guifg=springgreen
-hi Search	guibg=peru guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#c2bfa5 guifg=black gui=none
-hi StatusLineNC	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Title	guifg=indianred
-hi Visual	gui=none   guibg=grey30
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment	guifg=grey60
-hi Constant	guifg=indianred
-
-hi Identifier	guifg=palegreen 
-"hi Identifier	guifg=#D18B2C
-"palegreen
-"hi Statement	guifg=khaki
-hi Statement    guifg=#E6DB74
-hi PreProc	guifg=Skyblue
-hi Type		guifg=darkkhaki
-hi Special	guifg=navajowhite
-"hi Underlined
-hi Ignore	guifg=grey40
-"hi Error
-hi Todo		guifg=orangered guibg=yellow2
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Constant	ctermfg=brown
-hi Special	ctermfg=5
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/jelleybeans.vim b/colors/jelleybeans.vim
deleted file mode 100755
index a2df4cc..0000000
--- a/colors/jelleybeans.vim
+++ /dev/null
@@ -1,425 +0,0 @@
-" Vim color file
-"
-"  "    __       _ _       _                             "
-"  "    \ \  ___| | |_   _| |__   ___  __ _ _ __  ___    "
-"  "     \ \/ _ \ | | | | |  _ \ / _ \/ _  |  _ \/ __|   "
-"  "  /\_/ /  __/ | | |_| | |_| |  __/ |_| | | | \__ \   "
-"  "  \___/ \___|_|_|\__  |____/ \___|\____|_| |_|___/   "
-"  "                 \___/                               "
-"
-"         "A colorful, dark color scheme for Vim."
-"
-" File:         jellybeans.vim
-" Maintainer:   NanoTech <http://nanotech.nanotechcorp.net/>
-" Version:      1.3
-" Last Change:  October 25th, 2010
-" Contributors: Daniel Herbert <http://pocket-ninja.com>,
-"               Henry So, Jr. <henryso@panix.com>,
-"               David Liang <bmdavll at gmail dot com>
-"
-" Copyright (c) 2009-2010 NanoTech
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "jellybeans"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-  let s:low_color = 0
-else
-  let s:low_color = 1
-endif
-
-" Color approximation functions by Henry So, Jr. and David Liang {{{
-" Added to jellybeans.vim by Daniel Herbert
-
-" returns an approximate grey index for the given grey level
-fun! s:grey_number(x)
-  if &t_Co == 88
-    if a:x < 23
-      return 0
-    elseif a:x < 69
-      return 1
-    elseif a:x < 103
-      return 2
-    elseif a:x < 127
-      return 3
-    elseif a:x < 150
-      return 4
-    elseif a:x < 173
-      return 5
-    elseif a:x < 196
-      return 6
-    elseif a:x < 219
-      return 7
-    elseif a:x < 243
-      return 8
-    else
-      return 9
-    endif
-  else
-    if a:x < 14
-      return 0
-    else
-      let l:n = (a:x - 8) / 10
-      let l:m = (a:x - 8) % 10
-      if l:m < 5
-        return l:n
-      else
-        return l:n + 1
-      endif
-    endif
-  endif
-endfun
-
-" returns the actual grey level represented by the grey index
-fun! s:grey_level(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 0
-    elseif a:n == 1
-      return 46
-    elseif a:n == 2
-      return 92
-    elseif a:n == 3
-      return 115
-    elseif a:n == 4
-      return 139
-    elseif a:n == 5
-      return 162
-    elseif a:n == 6
-      return 185
-    elseif a:n == 7
-      return 208
-    elseif a:n == 8
-      return 231
-    else
-      return 255
-    endif
-  else
-    if a:n == 0
-      return 0
-    else
-      return 8 + (a:n * 10)
-    endif
-  endif
-endfun
-
-" returns the palette index for the given grey index
-fun! s:grey_color(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 16
-    elseif a:n == 9
-      return 79
-    else
-      return 79 + a:n
-    endif
-  else
-    if a:n == 0
-      return 16
-    elseif a:n == 25
-      return 231
-    else
-      return 231 + a:n
-    endif
-  endif
-endfun
-
-" returns an approximate color index for the given color level
-fun! s:rgb_number(x)
-  if &t_Co == 88
-    if a:x < 69
-      return 0
-    elseif a:x < 172
-      return 1
-    elseif a:x < 230
-      return 2
-    else
-      return 3
-    endif
-  else
-    if a:x < 75
-      return 0
-    else
-      let l:n = (a:x - 55) / 40
-      let l:m = (a:x - 55) % 40
-      if l:m < 20
-        return l:n
-      else
-        return l:n + 1
-      endif
-    endif
-  endif
-endfun
-
-" returns the actual color level for the given color index
-fun! s:rgb_level(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 0
-    elseif a:n == 1
-      return 139
-    elseif a:n == 2
-      return 205
-    else
-      return 255
-    endif
-  else
-    if a:n == 0
-      return 0
-    else
-      return 55 + (a:n * 40)
-    endif
-  endif
-endfun
-
-" returns the palette index for the given R/G/B color indices
-fun! s:rgb_color(x, y, z)
-  if &t_Co == 88
-    return 16 + (a:x * 16) + (a:y * 4) + a:z
-  else
-    return 16 + (a:x * 36) + (a:y * 6) + a:z
-  endif
-endfun
-
-" returns the palette index to approximate the given R/G/B color levels
-fun! s:color(r, g, b)
-  " get the closest grey
-  let l:gx = s:grey_number(a:r)
-  let l:gy = s:grey_number(a:g)
-  let l:gz = s:grey_number(a:b)
-
-  " get the closest color
-  let l:x = s:rgb_number(a:r)
-  let l:y = s:rgb_number(a:g)
-  let l:z = s:rgb_number(a:b)
-
-  if l:gx == l:gy && l:gy == l:gz
-    " there are two possibilities
-    let l:dgr = s:grey_level(l:gx) - a:r
-    let l:dgg = s:grey_level(l:gy) - a:g
-    let l:dgb = s:grey_level(l:gz) - a:b
-    let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-    let l:dr = s:rgb_level(l:gx) - a:r
-    let l:dg = s:rgb_level(l:gy) - a:g
-    let l:db = s:rgb_level(l:gz) - a:b
-    let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-    if l:dgrey < l:drgb
-      " use the grey
-      return s:grey_color(l:gx)
-    else
-      " use the color
-      return s:rgb_color(l:x, l:y, l:z)
-    endif
-  else
-    " only one possibility
-    return s:rgb_color(l:x, l:y, l:z)
-  endif
-endfun
-
-" returns the palette index to approximate the 'rrggbb' hex string
-fun! s:rgb(rgb)
-  let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-  let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-  let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-  return s:color(l:r, l:g, l:b)
-endfun
-
-" sets the highlighting for the given group
-fun! s:X(group, fg, bg, attr, lcfg, lcbg)
-  if s:low_color
-    let l:fge = empty(a:lcfg)
-    let l:bge = empty(a:lcbg)
-
-    if !l:fge && !l:bge
-      exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
-    elseif !l:fge && l:bge
-      exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
-    elseif l:fge && !l:bge
-      exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
-    endif
-  else
-    let l:fge = empty(a:fg)
-    let l:bge = empty(a:bg)
-
-    if !l:fge && !l:bge
-      exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg)
-    elseif !l:fge && l:bge
-      exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)
-    elseif l:fge && !l:bge
-      exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermbg=".s:rgb(a:bg)
-    endif
-  endif
-
-  if a:attr == ""
-    exec "hi ".a:group." gui=none cterm=none"
-  else
-    if a:attr == 'italic'
-      exec "hi ".a:group." gui=".a:attr." cterm=none"
-    else
-      exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
-    endif
-  endif
-endfun
-" }}}
-
-if version >= 700
-  call s:X("CursorLine","","1c1c1c","","","")
-  call s:X("CursorColumn","","1c1c1c","","","")
-  call s:X("MatchParen","ffffff","80a090","bold","","")
-
-  call s:X("TabLine","000000","b0b8c0","italic","","Black")
-  call s:X("TabLineFill","9098a0","","","","")
-  call s:X("TabLineSel","000000","f0f0f0","italic,bold","","")
-
-  " Auto-completion
-  call s:X("Pmenu","ffffff","000000","","","")
-  call s:X("PmenuSel","101010","eeeeee","","","")
-endif
-
-call s:X("Visual","","404040","","","")
-call s:X("Cursor","","b0d0f0","","","")
-
-call s:X("Normal","e8e8d3","151515","","White","")
-call s:X("LineNr","605958","151515","none","Black","")
-call s:X("Comment","888888","","italic","Grey","")
-call s:X("Todo","808080","","bold","","")
-
-call s:X("StatusLine","000000","dddddd","italic","Black","White")
-call s:X("StatusLineNC","ffffff","403c41","italic","White","Black")
-call s:X("VertSplit","777777","403c41","italic","Black","Black")
-
-call s:X("Folded","a0a8b0","384048","italic","black","")
-call s:X("FoldColumn","a0a8b0","384048","","","")
-call s:X("SignColumn","a0a8b0","384048","","","")
-
-call s:X("Title","70b950","","bold","","")
-
-call s:X("Constant","cf6a4c","","","Red","")
-call s:X("Special","799d6a","","","Green","")
-call s:X("Delimiter","668799","","","Grey","")
-
-call s:X("String","99ad6a","","","Green","")
-call s:X("StringDelimiter","556633","","","DarkGreen","")
-
-call s:X("Identifier","c6b6ee","","","LightCyan","")
-call s:X("Structure","8fbfdc","","","LightCyan","")
-call s:X("Function","fad07a","","","Yellow","")
-call s:X("Statement","8197bf","","","DarkBlue","")
-call s:X("PreProc","8fbfdc","","","LightBlue","")
-
-hi link Operator Normal
-
-call s:X("Type","ffb964","","","Yellow","")
-call s:X("NonText","606060","151515","","","")
-
-call s:X("SpecialKey","444444","1c1c1c","","","")
-
-call s:X("Search","f0a0c0","302028","underline","Magenta","")
-
-call s:X("Directory","dad085","","","","")
-call s:X("ErrorMsg","","902020","","","")
-hi link Error ErrorMsg
-
-" Diff
-
-hi link diffRemoved Constant
-hi link diffAdded String
-
-" VimDiff
-
-call s:X("DiffAdd","","032218","","Black","DarkGreen")
-call s:X("DiffChange","","100920","","Black","DarkMagenta")
-call s:X("DiffDelete","220000","220000","","DarkRed","DarkRed")
-call s:X("DiffText","","000940","","","DarkRed")
-
-" PHP
-
-hi link phpFunctions Function
-call s:X("StorageClass","c59f6f","","","Red","")
-hi link phpSuperglobal Identifier
-hi link phpQuoteSingle StringDelimiter
-hi link phpQuoteDouble StringDelimiter
-hi link phpBoolean Constant
-hi link phpNull Constant
-hi link phpArrayPair Operator
-
-" Ruby
-
-hi link rubySharpBang Comment
-call s:X("rubyClass","447799","","","DarkBlue","")
-call s:X("rubyIdentifier","c6b6fe","","","","")
-
-call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","")
-call s:X("rubySymbol","7697d6","","","Blue","")
-hi link rubyGlobalVariable rubyInstanceVariable
-hi link rubyModule rubyClass
-call s:X("rubyControl","7597c6","","","","")
-
-hi link rubyString String
-hi link rubyStringDelimiter StringDelimiter
-hi link rubyInterpolationDelimiter Identifier
-
-call s:X("rubyRegexpDelimiter","540063","","","Magenta","")
-call s:X("rubyRegexp","dd0093","","","DarkMagenta","")
-call s:X("rubyRegexpSpecial","a40073","","","Magenta","")
-
-call s:X("rubyPredefinedIdentifier","de5577","","","Red","")
-
-" JavaScript
-hi link javaScriptValue Constant
-hi link javaScriptRegexpString rubyRegexp
-
-" C
-
-hi link cOperator Constant
-
-" Objective-C/Cocoa
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link objcDirective rubyClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
-
-" Tag list
-hi link TagListFileName Directory
-
-" delete functions {{{
-delf s:X
-delf s:rgb
-delf s:color
-delf s:rgb_color
-delf s:rgb_level
-delf s:rgb_number
-delf s:grey_color
-delf s:grey_level
-delf s:grey_number
-" }}}
diff --git a/colors/jellybeans.vim b/colors/jellybeans.vim
deleted file mode 100755
index a2df4cc..0000000
--- a/colors/jellybeans.vim
+++ /dev/null
@@ -1,425 +0,0 @@
-" Vim color file
-"
-"  "    __       _ _       _                             "
-"  "    \ \  ___| | |_   _| |__   ___  __ _ _ __  ___    "
-"  "     \ \/ _ \ | | | | |  _ \ / _ \/ _  |  _ \/ __|   "
-"  "  /\_/ /  __/ | | |_| | |_| |  __/ |_| | | | \__ \   "
-"  "  \___/ \___|_|_|\__  |____/ \___|\____|_| |_|___/   "
-"  "                 \___/                               "
-"
-"         "A colorful, dark color scheme for Vim."
-"
-" File:         jellybeans.vim
-" Maintainer:   NanoTech <http://nanotech.nanotechcorp.net/>
-" Version:      1.3
-" Last Change:  October 25th, 2010
-" Contributors: Daniel Herbert <http://pocket-ninja.com>,
-"               Henry So, Jr. <henryso@panix.com>,
-"               David Liang <bmdavll at gmail dot com>
-"
-" Copyright (c) 2009-2010 NanoTech
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "jellybeans"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-  let s:low_color = 0
-else
-  let s:low_color = 1
-endif
-
-" Color approximation functions by Henry So, Jr. and David Liang {{{
-" Added to jellybeans.vim by Daniel Herbert
-
-" returns an approximate grey index for the given grey level
-fun! s:grey_number(x)
-  if &t_Co == 88
-    if a:x < 23
-      return 0
-    elseif a:x < 69
-      return 1
-    elseif a:x < 103
-      return 2
-    elseif a:x < 127
-      return 3
-    elseif a:x < 150
-      return 4
-    elseif a:x < 173
-      return 5
-    elseif a:x < 196
-      return 6
-    elseif a:x < 219
-      return 7
-    elseif a:x < 243
-      return 8
-    else
-      return 9
-    endif
-  else
-    if a:x < 14
-      return 0
-    else
-      let l:n = (a:x - 8) / 10
-      let l:m = (a:x - 8) % 10
-      if l:m < 5
-        return l:n
-      else
-        return l:n + 1
-      endif
-    endif
-  endif
-endfun
-
-" returns the actual grey level represented by the grey index
-fun! s:grey_level(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 0
-    elseif a:n == 1
-      return 46
-    elseif a:n == 2
-      return 92
-    elseif a:n == 3
-      return 115
-    elseif a:n == 4
-      return 139
-    elseif a:n == 5
-      return 162
-    elseif a:n == 6
-      return 185
-    elseif a:n == 7
-      return 208
-    elseif a:n == 8
-      return 231
-    else
-      return 255
-    endif
-  else
-    if a:n == 0
-      return 0
-    else
-      return 8 + (a:n * 10)
-    endif
-  endif
-endfun
-
-" returns the palette index for the given grey index
-fun! s:grey_color(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 16
-    elseif a:n == 9
-      return 79
-    else
-      return 79 + a:n
-    endif
-  else
-    if a:n == 0
-      return 16
-    elseif a:n == 25
-      return 231
-    else
-      return 231 + a:n
-    endif
-  endif
-endfun
-
-" returns an approximate color index for the given color level
-fun! s:rgb_number(x)
-  if &t_Co == 88
-    if a:x < 69
-      return 0
-    elseif a:x < 172
-      return 1
-    elseif a:x < 230
-      return 2
-    else
-      return 3
-    endif
-  else
-    if a:x < 75
-      return 0
-    else
-      let l:n = (a:x - 55) / 40
-      let l:m = (a:x - 55) % 40
-      if l:m < 20
-        return l:n
-      else
-        return l:n + 1
-      endif
-    endif
-  endif
-endfun
-
-" returns the actual color level for the given color index
-fun! s:rgb_level(n)
-  if &t_Co == 88
-    if a:n == 0
-      return 0
-    elseif a:n == 1
-      return 139
-    elseif a:n == 2
-      return 205
-    else
-      return 255
-    endif
-  else
-    if a:n == 0
-      return 0
-    else
-      return 55 + (a:n * 40)
-    endif
-  endif
-endfun
-
-" returns the palette index for the given R/G/B color indices
-fun! s:rgb_color(x, y, z)
-  if &t_Co == 88
-    return 16 + (a:x * 16) + (a:y * 4) + a:z
-  else
-    return 16 + (a:x * 36) + (a:y * 6) + a:z
-  endif
-endfun
-
-" returns the palette index to approximate the given R/G/B color levels
-fun! s:color(r, g, b)
-  " get the closest grey
-  let l:gx = s:grey_number(a:r)
-  let l:gy = s:grey_number(a:g)
-  let l:gz = s:grey_number(a:b)
-
-  " get the closest color
-  let l:x = s:rgb_number(a:r)
-  let l:y = s:rgb_number(a:g)
-  let l:z = s:rgb_number(a:b)
-
-  if l:gx == l:gy && l:gy == l:gz
-    " there are two possibilities
-    let l:dgr = s:grey_level(l:gx) - a:r
-    let l:dgg = s:grey_level(l:gy) - a:g
-    let l:dgb = s:grey_level(l:gz) - a:b
-    let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-    let l:dr = s:rgb_level(l:gx) - a:r
-    let l:dg = s:rgb_level(l:gy) - a:g
-    let l:db = s:rgb_level(l:gz) - a:b
-    let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-    if l:dgrey < l:drgb
-      " use the grey
-      return s:grey_color(l:gx)
-    else
-      " use the color
-      return s:rgb_color(l:x, l:y, l:z)
-    endif
-  else
-    " only one possibility
-    return s:rgb_color(l:x, l:y, l:z)
-  endif
-endfun
-
-" returns the palette index to approximate the 'rrggbb' hex string
-fun! s:rgb(rgb)
-  let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-  let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-  let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-  return s:color(l:r, l:g, l:b)
-endfun
-
-" sets the highlighting for the given group
-fun! s:X(group, fg, bg, attr, lcfg, lcbg)
-  if s:low_color
-    let l:fge = empty(a:lcfg)
-    let l:bge = empty(a:lcbg)
-
-    if !l:fge && !l:bge
-      exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
-    elseif !l:fge && l:bge
-      exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
-    elseif l:fge && !l:bge
-      exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
-    endif
-  else
-    let l:fge = empty(a:fg)
-    let l:bge = empty(a:bg)
-
-    if !l:fge && !l:bge
-      exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg)
-    elseif !l:fge && l:bge
-      exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)
-    elseif l:fge && !l:bge
-      exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermbg=".s:rgb(a:bg)
-    endif
-  endif
-
-  if a:attr == ""
-    exec "hi ".a:group." gui=none cterm=none"
-  else
-    if a:attr == 'italic'
-      exec "hi ".a:group." gui=".a:attr." cterm=none"
-    else
-      exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
-    endif
-  endif
-endfun
-" }}}
-
-if version >= 700
-  call s:X("CursorLine","","1c1c1c","","","")
-  call s:X("CursorColumn","","1c1c1c","","","")
-  call s:X("MatchParen","ffffff","80a090","bold","","")
-
-  call s:X("TabLine","000000","b0b8c0","italic","","Black")
-  call s:X("TabLineFill","9098a0","","","","")
-  call s:X("TabLineSel","000000","f0f0f0","italic,bold","","")
-
-  " Auto-completion
-  call s:X("Pmenu","ffffff","000000","","","")
-  call s:X("PmenuSel","101010","eeeeee","","","")
-endif
-
-call s:X("Visual","","404040","","","")
-call s:X("Cursor","","b0d0f0","","","")
-
-call s:X("Normal","e8e8d3","151515","","White","")
-call s:X("LineNr","605958","151515","none","Black","")
-call s:X("Comment","888888","","italic","Grey","")
-call s:X("Todo","808080","","bold","","")
-
-call s:X("StatusLine","000000","dddddd","italic","Black","White")
-call s:X("StatusLineNC","ffffff","403c41","italic","White","Black")
-call s:X("VertSplit","777777","403c41","italic","Black","Black")
-
-call s:X("Folded","a0a8b0","384048","italic","black","")
-call s:X("FoldColumn","a0a8b0","384048","","","")
-call s:X("SignColumn","a0a8b0","384048","","","")
-
-call s:X("Title","70b950","","bold","","")
-
-call s:X("Constant","cf6a4c","","","Red","")
-call s:X("Special","799d6a","","","Green","")
-call s:X("Delimiter","668799","","","Grey","")
-
-call s:X("String","99ad6a","","","Green","")
-call s:X("StringDelimiter","556633","","","DarkGreen","")
-
-call s:X("Identifier","c6b6ee","","","LightCyan","")
-call s:X("Structure","8fbfdc","","","LightCyan","")
-call s:X("Function","fad07a","","","Yellow","")
-call s:X("Statement","8197bf","","","DarkBlue","")
-call s:X("PreProc","8fbfdc","","","LightBlue","")
-
-hi link Operator Normal
-
-call s:X("Type","ffb964","","","Yellow","")
-call s:X("NonText","606060","151515","","","")
-
-call s:X("SpecialKey","444444","1c1c1c","","","")
-
-call s:X("Search","f0a0c0","302028","underline","Magenta","")
-
-call s:X("Directory","dad085","","","","")
-call s:X("ErrorMsg","","902020","","","")
-hi link Error ErrorMsg
-
-" Diff
-
-hi link diffRemoved Constant
-hi link diffAdded String
-
-" VimDiff
-
-call s:X("DiffAdd","","032218","","Black","DarkGreen")
-call s:X("DiffChange","","100920","","Black","DarkMagenta")
-call s:X("DiffDelete","220000","220000","","DarkRed","DarkRed")
-call s:X("DiffText","","000940","","","DarkRed")
-
-" PHP
-
-hi link phpFunctions Function
-call s:X("StorageClass","c59f6f","","","Red","")
-hi link phpSuperglobal Identifier
-hi link phpQuoteSingle StringDelimiter
-hi link phpQuoteDouble StringDelimiter
-hi link phpBoolean Constant
-hi link phpNull Constant
-hi link phpArrayPair Operator
-
-" Ruby
-
-hi link rubySharpBang Comment
-call s:X("rubyClass","447799","","","DarkBlue","")
-call s:X("rubyIdentifier","c6b6fe","","","","")
-
-call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","")
-call s:X("rubySymbol","7697d6","","","Blue","")
-hi link rubyGlobalVariable rubyInstanceVariable
-hi link rubyModule rubyClass
-call s:X("rubyControl","7597c6","","","","")
-
-hi link rubyString String
-hi link rubyStringDelimiter StringDelimiter
-hi link rubyInterpolationDelimiter Identifier
-
-call s:X("rubyRegexpDelimiter","540063","","","Magenta","")
-call s:X("rubyRegexp","dd0093","","","DarkMagenta","")
-call s:X("rubyRegexpSpecial","a40073","","","Magenta","")
-
-call s:X("rubyPredefinedIdentifier","de5577","","","Red","")
-
-" JavaScript
-hi link javaScriptValue Constant
-hi link javaScriptRegexpString rubyRegexp
-
-" C
-
-hi link cOperator Constant
-
-" Objective-C/Cocoa
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link objcDirective rubyClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
-
-" Tag list
-hi link TagListFileName Directory
-
-" delete functions {{{
-delf s:X
-delf s:rgb
-delf s:color
-delf s:rgb_color
-delf s:rgb_level
-delf s:rgb_number
-delf s:grey_color
-delf s:grey_level
-delf s:grey_number
-" }}}
diff --git a/colors/jellyx.vim b/colors/jellyx.vim
deleted file mode 100755
index a75f360..0000000
--- a/colors/jellyx.vim
+++ /dev/null
@@ -1,235 +0,0 @@
-
-"      __     _ _     __ __
-"   __|  |___| | |_ _|  |  |  A delicious collision of
-"  |  |  | -_| | | | |-   -|
-"  |_____|___|_|_|_  |__|__|  Jellybeans and Xoria256.
-"                |___|
-
-" Version:  0.1
-" Author:   Sung Pae <sung@metablu.com>
-" Homepage: http://github.com/guns/jellyx.vim
-" License:  MIT (knock yourself out)
-
-
-" INSPIRED BY: {{{
-"
-" Main color palette from Xoria256.vim:
-"
-" Author:   Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
-" Homepage: http://www.vim.org/scripts/script.php?script_id=2140
-"
-" Misc colors and function-based approach from Jellybeans.vim:
-"
-" Author:   NanoTech <http://nanotech.nanotechcorp.net/>
-" Homepage: http://github.com/nanotech/jellybeans.vim
-" License:  MIT
-" Copyright (c) 2009-2010 NanoTech
-"
-"}}}
-
-
-""" Initialize {{{
-
-set background=dark
-
-highlight clear
-
-if exists('syntax_on')
-    syntax reset
-endif
-
-let colors_name = 'jellyx'
-
-if &t_Co != 256 && ! has('gui_running')
-    echoerr 'Not enough colors to display JellyX!'
-    echoerr 'Go buy yourself a new terminal.'
-    finish
-endif
-
-"}}}
-
-
-""" Functions {{{
-
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html {{{
-let s:xterm_colors = {
-    \ '0':   '#000000', '1':   '#800000', '2':   '#008000', '3':   '#808000', '4':   '#000080',
-    \ '5':   '#800080', '6':   '#008080', '7':   '#c0c0c0', '8':   '#808080', '9':   '#ff0000',
-    \ '10':  '#00ff00', '11':  '#ffff00', '12':  '#0000ff', '13':  '#ff00ff', '14':  '#00ffff',
-    \ '15':  '#ffffff', '16':  '#000000', '17':  '#00005f', '18':  '#000087', '19':  '#0000af',
-    \ '20':  '#0000df', '21':  '#0000ff', '22':  '#005f00', '23':  '#005f5f', '24':  '#005f87',
-    \ '25':  '#005faf', '26':  '#005fdf', '27':  '#005fff', '28':  '#008700', '29':  '#00875f',
-    \ '30':  '#008787', '31':  '#0087af', '32':  '#0087df', '33':  '#0087ff', '34':  '#00af00',
-    \ '35':  '#00af5f', '36':  '#00af87', '37':  '#00afaf', '38':  '#00afdf', '39':  '#00afff',
-    \ '40':  '#00df00', '41':  '#00df5f', '42':  '#00df87', '43':  '#00dfaf', '44':  '#00dfdf',
-    \ '45':  '#00dfff', '46':  '#00ff00', '47':  '#00ff5f', '48':  '#00ff87', '49':  '#00ffaf',
-    \ '50':  '#00ffdf', '51':  '#00ffff', '52':  '#5f0000', '53':  '#5f005f', '54':  '#5f0087',
-    \ '55':  '#5f00af', '56':  '#5f00df', '57':  '#5f00ff', '58':  '#5f5f00', '59':  '#5f5f5f',
-    \ '60':  '#5f5f87', '61':  '#5f5faf', '62':  '#5f5fdf', '63':  '#5f5fff', '64':  '#5f8700',
-    \ '65':  '#5f875f', '66':  '#5f8787', '67':  '#5f87af', '68':  '#5f87df', '69':  '#5f87ff',
-    \ '70':  '#5faf00', '71':  '#5faf5f', '72':  '#5faf87', '73':  '#5fafaf', '74':  '#5fafdf',
-    \ '75':  '#5fafff', '76':  '#5fdf00', '77':  '#5fdf5f', '78':  '#5fdf87', '79':  '#5fdfaf',
-    \ '80':  '#5fdfdf', '81':  '#5fdfff', '82':  '#5fff00', '83':  '#5fff5f', '84':  '#5fff87',
-    \ '85':  '#5fffaf', '86':  '#5fffdf', '87':  '#5fffff', '88':  '#870000', '89':  '#87005f',
-    \ '90':  '#870087', '91':  '#8700af', '92':  '#8700df', '93':  '#8700ff', '94':  '#875f00',
-    \ '95':  '#875f5f', '96':  '#875f87', '97':  '#875faf', '98':  '#875fdf', '99':  '#875fff',
-    \ '100': '#878700', '101': '#87875f', '102': '#878787', '103': '#8787af', '104': '#8787df',
-    \ '105': '#8787ff', '106': '#87af00', '107': '#87af5f', '108': '#87af87', '109': '#87afaf',
-    \ '110': '#87afdf', '111': '#87afff', '112': '#87df00', '113': '#87df5f', '114': '#87df87',
-    \ '115': '#87dfaf', '116': '#87dfdf', '117': '#87dfff', '118': '#87ff00', '119': '#87ff5f',
-    \ '120': '#87ff87', '121': '#87ffaf', '122': '#87ffdf', '123': '#87ffff', '124': '#af0000',
-    \ '125': '#af005f', '126': '#af0087', '127': '#af00af', '128': '#af00df', '129': '#af00ff',
-    \ '130': '#af5f00', '131': '#af5f5f', '132': '#af5f87', '133': '#af5faf', '134': '#af5fdf',
-    \ '135': '#af5fff', '136': '#af8700', '137': '#af875f', '138': '#af8787', '139': '#af87af',
-    \ '140': '#af87df', '141': '#af87ff', '142': '#afaf00', '143': '#afaf5f', '144': '#afaf87',
-    \ '145': '#afafaf', '146': '#afafdf', '147': '#afafff', '148': '#afdf00', '149': '#afdf5f',
-    \ '150': '#afdf87', '151': '#afdfaf', '152': '#afdfdf', '153': '#afdfff', '154': '#afff00',
-    \ '155': '#afff5f', '156': '#afff87', '157': '#afffaf', '158': '#afffdf', '159': '#afffff',
-    \ '160': '#df0000', '161': '#df005f', '162': '#df0087', '163': '#df00af', '164': '#df00df',
-    \ '165': '#df00ff', '166': '#df5f00', '167': '#df5f5f', '168': '#df5f87', '169': '#df5faf',
-    \ '170': '#df5fdf', '171': '#df5fff', '172': '#df8700', '173': '#df875f', '174': '#df8787',
-    \ '175': '#df87af', '176': '#df87df', '177': '#df87ff', '178': '#dfaf00', '179': '#dfaf5f',
-    \ '180': '#dfaf87', '181': '#dfafaf', '182': '#dfafdf', '183': '#dfafff', '184': '#dfdf00',
-    \ '185': '#dfdf5f', '186': '#dfdf87', '187': '#dfdfaf', '188': '#dfdfdf', '189': '#dfdfff',
-    \ '190': '#dfff00', '191': '#dfff5f', '192': '#dfff87', '193': '#dfffaf', '194': '#dfffdf',
-    \ '195': '#dfffff', '196': '#ff0000', '197': '#ff005f', '198': '#ff0087', '199': '#ff00af',
-    \ '200': '#ff00df', '201': '#ff00ff', '202': '#ff5f00', '203': '#ff5f5f', '204': '#ff5f87',
-    \ '205': '#ff5faf', '206': '#ff5fdf', '207': '#ff5fff', '208': '#ff8700', '209': '#ff875f',
-    \ '210': '#ff8787', '211': '#ff87af', '212': '#ff87df', '213': '#ff87ff', '214': '#ffaf00',
-    \ '215': '#ffaf5f', '216': '#ffaf87', '217': '#ffafaf', '218': '#ffafdf', '219': '#ffafff',
-    \ '220': '#ffdf00', '221': '#ffdf5f', '222': '#ffdf87', '223': '#ffdfaf', '224': '#ffdfdf',
-    \ '225': '#ffdfff', '226': '#ffff00', '227': '#ffff5f', '228': '#ffff87', '229': '#ffffaf',
-    \ '230': '#ffffdf', '231': '#ffffff', '232': '#080808', '233': '#121212', '234': '#1c1c1c',
-    \ '235': '#262626', '236': '#303030', '237': '#3a3a3a', '238': '#444444', '239': '#4e4e4e',
-    \ '240': '#585858', '241': '#606060', '242': '#666666', '243': '#767676', '244': '#808080',
-    \ '245': '#8a8a8a', '246': '#949494', '247': '#9e9e9e', '248': '#a8a8a8', '249': '#b2b2b2',
-    \ '250': '#bcbcbc', '251': '#c6c6c6', '252': '#d0d0d0', '253': '#dadada', '254': '#e4e4e4',
-    \ '255': '#eeeeee', 'fg': 'fg', 'bg': 'bg', 'none': 'none' } "}}}
-
-" We are primarily targeting 256-color terminals; "{{{
-" exact GUI RGB values are therefore easy to obtain
-command! -nargs=+ HI call s:HI(<f-args>)
-function! s:HI(group, fg, bg, fx, ...)
-    if a:fg != '-'
-        execute 'highlight '.a:group.' ctermfg='.a:fg.' guifg='.s:xterm_colors[a:fg]
-    endif
-
-    if a:bg != '-'
-        execute 'highlight '.a:group.' ctermbg='.a:bg.' guibg='.s:xterm_colors[a:bg]
-    endif
-
-    if a:fx != '-'
-        " rxvt-unicode can display italic fonts, among other things
-        if a:fx =~ 'italic' && &term !~ '^rxvt-unicode'
-            execute 'highlight '.a:group.' term='.a:fx.' gui='.a:fx.' cterm='.substitute(a:fx,',\?italic,\?','','g')
-        else
-            execute 'highlight '.a:group.' term='.a:fx.' gui='.a:fx.' cterm='.a:fx
-        endif
-    endif
-
-    " Any additional arguments are simply passed along
-    if a:0
-        execute 'highlight '.a:group.' '.join(a:000,' ')
-    endif
-endfunction "}}}
-
-"}}}
-
-
-""" Common UI {{{
-
-HI Normal           252     0       none
-
-HI Cursor           -       214     -
-HI CursorColumn     -       238     -
-HI CursorLine       -       233     none
-
-HI Visual           fg      96      -
-HI VisualNOS        fg      60      -
-HI IncSearch        -       -       inverse
-HI Search           158     bg      underline
-
-HI LineNr           240     -       -
-HI FoldColumn       240     bg      -
-HI SignColumn       240     -       -
-HI NonText          240     -       -
-
-HI Folded           232     60      bold,italic
-HI StatusLine       -       234     bold
-HI StatusLineNC     -       234     none
-HI TabLine          249     236     none
-HI TabLineSel       -       bg      bold,italic
-HI TabLineFill      bg      0       none
-HI VertSplit        234     234     none
-
-HI Pmenu            fg      234     -
-HI PmenuSel         0       140     -
-HI PmenuSbar        -       234     -
-HI PmenuThumb       -       140     -
-HI WildMenu         0       150     bold
-HI Title            225     -       -
-
-HI SpellBad         160     bg      underline   guisp=#df0000
-HI SpellCap         189     bg      underline
-HI SpellRare        168     bg      underline
-
-HI SpecialKey       77      -       -
-HI ErrorMsg         -       88      -
-HI MatchParen       fg      17      bold
-
-"}}}
-
-
-""" Common Syntax {{{
-
-HI Comment          244     -       -
-HI Constant         229     -       -
-HI Error            -       88      -
-HI Identifier       182     -       none
-HI Ignore           238     -       -
-HI Number           180     -       -
-HI PreProc          150     -       -
-HI Special          174     -       -
-HI Statement        110     -       none
-HI Todo             184     bg      bold
-HI Type             146     -       none
-HI Underlined       39      -       underline
-
-"}}}
-
-
-""" Diff / Vimdiff {{{
-
-HI diffAdded        150     -       -
-HI diffRemoved      174     -       -
-HI diffAdd          bg      151     -
-HI diffDelete       bg      186     none
-HI diffDelete       bg      246     none
-HI diffChange       bg      181     -
-HI diffText         bg      174     none
-
-"}}}
-
-
-""" Custom groups {{{
-
-if exists('g:jellyx_show_whitespace')
-    autocmd Syntax *
-        \ syntax match Tab           /\v\t/      containedin=ALL |
-        \ syntax match TrailingWS    /\v\s+$/    containedin=ALL
-
-    HI Tab          -       234     -
-    HI TrailingWS   -       89      -
-endif
-
-"}}}
-
-
-""" Cleanup {{{
-
-delcommand  HI
-delfunction s:HI
-
-"}}}
-
-" vim: set expandtab ts=4 sts=4 sw=4 :
diff --git a/colors/jhdark.vim b/colors/jhdark.vim
deleted file mode 100755
index 14001e5..0000000
--- a/colors/jhdark.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file by J�rn Horstmann <joern_h@gmx.net>
-" Black background, works in gui and console
-" Last change 30.11.2004
-
-set bg=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "jhdark"
-
-hi Normal         guifg=#999999 guibg=#000000 gui=none ctermfg=gray     ctermbg=black    cterm=none
-
-hi ErrorMsg       guifg=#ff0000 guibg=bg      gui=none ctermfg=red      ctermbg=bg       cterm=none
-hi Visual         guifg=bg      guibg=#0000ff gui=none ctermfg=bg       ctermbg=blue cterm=none
-hi VisualNOS      guifg=bg      guibg=#0000ff gui=none ctermfg=bg       ctermbg=blue cterm=none
-hi Todo           guifg=bg      guibg=#aaaa00 gui=none ctermfg=bg       ctermbg=yellow   cterm=none
-"hi Todo          guifg=#884400 guibg=bg      gui=none ctermfg=bg       ctermbg=yellow   cterm=none
-hi Search         guifg=bg      guibg=#4444aa gui=none ctermfg=bg       ctermbg=darkcyan     cterm=none
-hi IncSearch      guifg=bg      guibg=#4444aa gui=none ctermfg=bg       ctermbg=darkcyan     cterm=none
-
-hi SpecialKey     guifg=#775522 guibg=bg      gui=none ctermfg=magenta  ctermbg=bg       cterm=none
-hi Directory      guifg=#000088 guibg=bg      gui=none ctermfg=blue     ctermbg=bg       cterm=none
-hi WarningMsg     guifg=#ff0000 guibg=bg      gui=none ctermfg=red      ctermbg=bg       cterm=none
-hi WildMenu       guifg=bg      guibg=#ffff00 gui=none ctermfg=bg       ctermbg=yellow   cterm=none
-hi ModeMsg        guifg=fg      guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-hi Title          guifg=fg      guibg=#cccccc gui=none ctermfg=bg       ctermbg=fg       cterm=none
-hi MoreMsg        guifg=fg      guibg=bg      gui=none ctermfg=bg       ctermbg=fg       cterm=none
-hi Question       guifg=fg      guibg=bg      gui=none ctermfg=bg       ctermbg=fg       cterm=none
-hi NonText        guifg=#666666 guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-
-hi StatusLine     guifg=#dddddd guibg=#000088 gui=none ctermfg=bg       ctermbg=darkblue cterm=none
-hi StatusLineNC   guifg=#dddddd guibg=#333333 gui=none ctermfg=bg       ctermbg=darkgray cterm=none
-hi VertSplit      guifg=#dddddd guibg=#333333 gui=none ctermfg=bg       ctermbg=darkgray cterm=none
-
-hi Folded         guifg=#bb0099 guibg=#222222 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-hi FoldColumn     guifg=#bb0099 guibg=#222222 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-hi SignColumn     guifg=#bb0099 guibg=#222222 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-hi LineNr         guifg=#bb0099 guibg=#222222 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-
-"hi Folded         guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi FoldColumn     guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi SignColumn     guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi LineNr         guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-
-hi DiffChange     guifg=bg      guibg=#888800 gui=none ctermfg=bg       ctermbg=brown      cterm=none
-hi DiffAdd        guifg=bg      guibg=#000088 gui=none ctermfg=bg       ctermbg=darkblue   cterm=none
-hi DiffDelete     guifg=bg      guibg=#880000 gui=none ctermfg=bg       ctermbg=darkred    cterm=none
-hi DiffText       guifg=fg      guibg=#dd0000 gui=none ctermfg=fg       ctermbg=red        cterm=none
-
-hi Cursor         guifg=bg      guibg=fg      gui=none ctermfg=bg       ctermbg=fg         cterm=none
-hi lCursor        guifg=bg      guibg=fg      gui=none ctermfg=bg       ctermbg=fg         cterm=none
-
-hi Comment        guifg=#008800 guibg=bg      gui=none ctermfg=darkgreen  ctermbg=bg     cterm=none
-hi Operator       guifg=#ffffff guibg=bg      gui=none ctermfg=fg         ctermbg=bg     cterm=none
-hi Constant       guifg=#aa0000 guibg=bg      gui=none ctermfg=darkred    ctermbg=bg     cterm=none
-hi Special        guifg=#997700 guibg=bg      gui=none ctermfg=brown      ctermbg=bg     cterm=none
-
-hi Identifier     guifg=#dddddd guibg=bg      gui=none ctermfg=gray     ctermbg=bg    cterm=none
-
-hi Type           guifg=#6666dd guibg=bg      gui=none ctermfg=blue     ctermbg=bg    cterm=none
-hi Statement      guifg=#dddddd guibg=bg      gui=none ctermfg=white    ctermbg=bg    cterm=none
-
-hi PreProc        guifg=#008888 guibg=bg      gui=none ctermfg=darkcyan ctermbg=bg    cterm=none
-
-hi Error          guifg=fg      guibg=#ff0000 gui=none ctermfg=bg       ctermbg=red   cterm=none
-
-hi Ignore         guifg=bg      ctermfg=bg   
-hi Underlined     guifg=fg      guibg=bg ctermfg=fg ctermbg=bg cterm=underline term=underline gui=underline
diff --git a/colors/jhlight.vim b/colors/jhlight.vim
deleted file mode 100755
index 6420579..0000000
--- a/colors/jhlight.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" Vim color file by J�rn Horstmann <joern_h@gmx.net>
-" Light background, works in GUI and cobnsole
-" Last change 08.09.2004
-" TODO
-
-set bg=light
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "jhlight"
-
-hi Normal         guifg=#000000 guibg=#ffffff gui=none ctermfg=black    ctermbg=grey     cterm=none
-
-hi ErrorMsg       guifg=#ff0000 guibg=bg      gui=none ctermfg=red      ctermbg=bg       cterm=none
-hi Visual         guifg=bg      guibg=#4444aa gui=none ctermfg=bg       ctermbg=darkcyan cterm=none
-hi VisualNOS      guifg=bg      guibg=#4444aa gui=none ctermfg=bg       ctermbg=darkcyan cterm=none
-hi Todo           guifg=fg      guibg=#bbbb77 gui=none ctermfg=bg       ctermbg=brown    cterm=none
-"hi Todo          guifg=#884400 guibg=bg      gui=none ctermfg=bg       ctermbg=yellow   cterm=none
-hi Search         guifg=fg      guibg=#8888ee gui=none ctermfg=bg       ctermbg=blue     cterm=none
-hi IncSearch      guifg=fg      guibg=#8888ee gui=none ctermfg=bg       ctermbg=blue     cterm=none
-
-hi SpecialKey     guifg=#553300 guibg=bg      gui=none ctermfg=darkmagenta ctermbg=bg       cterm=none
-hi Directory      guifg=#000088 guibg=bg      gui=none ctermfg=blue     ctermbg=bg       cterm=none
-hi WarningMsg     guifg=#ff0000 guibg=bg      gui=none ctermfg=red      ctermbg=bg       cterm=none
-hi WildMenu       guifg=fg      guibg=#ffff00 gui=none ctermfg=bg       ctermbg=brown    cterm=none
-hi ModeMsg        guifg=fg      guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-hi Title          guifg=#000088 guibg=#cccccc gui=none ctermfg=fg       ctermbg=bg       cterm=none
-hi MoreMsg        guifg=#000088 guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-hi Question       guifg=#000088 guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-hi NonText        guifg=#444444 guibg=bg      gui=none ctermfg=fg       ctermbg=bg       cterm=none
-
-hi StatusLine     guifg=#dddddd guibg=#000088 gui=none ctermfg=white    ctermbg=darkblue cterm=none
-hi StatusLineNC   guifg=#dddddd guibg=#333333 gui=none ctermfg=grey     ctermbg=black    cterm=none
-hi VertSplit      guifg=#dddddd guibg=#333333 gui=none ctermfg=white    ctermbg=black    cterm=none
-
-hi Folded         guifg=#005500 guibg=#999999 gui=none ctermfg=darkgreen ctermbg=darkgray cterm=none
-hi FoldColumn     guifg=#005500 guibg=#999999 gui=none ctermfg=darkgreen ctermbg=darkgray cterm=none
-hi SignColumn     guifg=#005500 guibg=#999999 gui=none ctermfg=darkgreen ctermbg=darkgray cterm=none
-hi LineNr         guifg=#005500 guibg=#999999 gui=none ctermfg=darkgreen ctermbg=darkgray cterm=none
-
-"hi Folded         guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi FoldColumn     guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi SignColumn     guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-"hi LineNr         guifg=#dddddd guibg=#666666 gui=none ctermfg=darkmagenta ctermbg=bg cterm=none
-
-hi DiffChange     guifg=bg      guibg=#888800 gui=none ctermfg=bg       ctermbg=brown      cterm=none
-hi DiffAdd        guifg=bg      guibg=#000088 gui=none ctermfg=bg       ctermbg=darkblue   cterm=none
-hi DiffDelete     guifg=bg      guibg=#880000 gui=none ctermfg=bg       ctermbg=darkred    cterm=none
-hi DiffText       guifg=fg      guibg=#dd0000 gui=none ctermfg=fg       ctermbg=red        cterm=none
-
-hi Cursor         guifg=bg      guibg=fg      gui=none ctermfg=bg       ctermbg=fg         cterm=none
-hi lCursor        guifg=bg      guibg=fg      gui=none ctermfg=bg       ctermbg=fg         cterm=none
-
-hi Comment        guifg=#006600 guibg=bg      gui=none ctermfg=darkgreen  ctermbg=bg     cterm=none
-hi Operator       guifg=fg      guibg=bg      gui=none ctermfg=fg         ctermbg=bg     cterm=none
-hi Constant       guifg=#880000 guibg=bg      gui=none ctermfg=darkred    ctermbg=bg     cterm=none
-hi Special        guifg=#553300 guibg=bg      gui=none ctermfg=brown      ctermbg=bg     cterm=none
-
-hi Identifier     guifg=#000088 guibg=bg      gui=none ctermfg=darkblue   ctermbg=bg       cterm=none
-"hi Function      guifg=#000044 gui=none
-
-"hi Keyword       guifg=#000088 gui=none
-
-if exists("g:jh_hi_use_bold")
-    hi Type           guifg=#660044 guibg=bg      gui=bold ctermfg=darkmagenta ctermbg=bg    cterm=none
-    hi Statement      guifg=#440066 guibg=bg      gui=bold ctermfg=darkmagenta ctermbg=bg    cterm=none
-else
-    hi Type           guifg=#660044 guibg=bg      gui=none ctermfg=darkmagenta ctermbg=bg    cterm=none
-    hi Statement      guifg=#440066 guibg=bg      gui=none ctermfg=darkmagenta ctermbg=bg    cterm=none
-endif
-
-hi PreProc        guifg=#004466 guibg=bg      gui=none ctermfg=darkcyan ctermbg=bg    cterm=none
-
-hi Error          guifg=fg      guibg=#880000 gui=none ctermfg=bg       ctermbg=red   cterm=none
-
-hi Ignore         guifg=bg      ctermfg=bg   
-hi Underlined     guifg=fg guibg=bg ctermfg=fg ctermbg=bg cterm=underline term=underline gui=underline
diff --git a/colors/jiks.vim b/colors/jiks.vim
deleted file mode 100755
index 31dc684..0000000
--- a/colors/jiks.vim
+++ /dev/null
@@ -1,190 +0,0 @@
-" Vim color scheme
-" Name:         jiks.vim
-" Author:       Jikku Jose <jikkujose@gmail.com>
-" Version:      1.0
-" GetLatestVimScripts: 1891 1 :AutoInstall: jiks.vim
-
-" Based on the vividchalk for Vim by Tim Pope
-
-if has("gui_running")
-    set background=dark
-endif
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "jiks"
-
-" First two functions adapted from inkpot.vim
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! s:M(a)
-    return strpart("0245", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! s:X(a)
-    if &t_Co == 88
-        return a:a
-    else
-        if a:a == 8
-            return 237
-        elseif a:a < 16
-            return a:a
-        elseif a:a > 79
-            return 232 + (3 * (a:a - 80))
-        else
-            let l:b = a:a - 16
-            let l:x = l:b % 4
-            let l:y = (l:b / 4) % 4
-            let l:z = (l:b / 16)
-            return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z))
-        endif
-    endif
-endfun
-
-function! E2T(a)
-    return s:X(a:a)
-endfunction
-
-function! s:choose(mediocre,good)
-    if &t_Co != 88 && &t_Co != 256
-        return a:mediocre
-    else
-        return s:X(a:good)
-    endif
-endfunction
-
-function! s:hifg(group,guifg,first,second,...)
-    if a:0 && &t_Co == 256
-        let ctermfg = a:1
-    else
-        let ctermfg = s:choose(a:first,a:second)
-    endif
-    exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg
-endfunction
-
-function! s:hibg(group,guibg,first,second)
-    let ctermbg = s:choose(a:first,a:second)
-    exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg
-endfunction
-
-hi link railsMethod         PreProc
-hi link rubyDefine          Keyword
-hi link rubySymbol          Constant
-hi link rubyAccess          rubyMethod
-hi link rubyAttribute       rubyMethod
-hi link rubyEval            rubyMethod
-hi link rubyException       rubyMethod
-hi link rubyInclude         rubyMethod
-hi link rubyStringDelimiter rubyString
-hi link rubyRegexp          Regexp
-hi link rubyRegexpDelimiter rubyRegexp
-"hi link rubyConstant        Variable
-"hi link rubyGlobalVariable  Variable
-"hi link rubyClassVariable   Variable
-"hi link rubyInstanceVariable Variable
-hi link javascriptRegexpString  Regexp
-hi link javascriptNumber        Number
-hi link javascriptNull          Constant
-highlight link diffAdded        String
-highlight link diffRemoved      Statement
-highlight link diffLine         PreProc
-highlight link diffSubname      Comment
-
-call s:hifg("Normal","#EEEEEE","White",87)
-if &background == "light" || has("gui_running")
-    hi Normal guibg=Black ctermbg=Black
-else
-    hi Normal guibg=Black ctermbg=NONE
-endif
-highlight StatusLine    guifg=Black   guibg=#aabbee gui=bold ctermfg=Black ctermbg=White  cterm=bold
-highlight StatusLineNC  guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey   cterm=none
-"if &t_Co == 256
-    "highlight StatusLine ctermbg=117
-"else
-    "highlight StatusLine ctermbg=43
-"endif
-
-highlight Ignore        ctermfg=Black
-highlight WildMenu      guifg=Black   guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold
-highlight Cursor        guifg=Black guibg=White ctermfg=Black ctermbg=White
-highlight CursorLine    guibg=#333333 guifg=NONE
-highlight CursorColumn  guibg=#333333 guifg=NONE
-highlight NonText       guifg=#404040 ctermfg=8
-highlight SpecialKey    guifg=#404040 ctermfg=8
-highlight Directory     none
-high link Directory     Identifier
-highlight ErrorMsg      guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE
-highlight Search        guifg=NONE ctermfg=NONE gui=none cterm=none
-call s:hibg("Search"    ,"#555555","DarkBlue",81)
-highlight IncSearch     guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight MoreMsg       guifg=#00AA00 ctermfg=Green
-highlight LineNr        guifg=#DDEEFF ctermfg=White
-call s:hibg("LineNr"    ,"#222222","DarkBlue",80)
-highlight Question      none
-high link Question      MoreMsg
-highlight Title         guifg=Magenta ctermfg=Magenta
-highlight VisualNOS     gui=none cterm=none
-call s:hibg("Visual"    ,"#555577","LightBlue",83)
-call s:hibg("VisualNOS" ,"#444444","DarkBlue",81)
-call s:hibg("MatchParen","#1100AA","DarkBlue",18)
-highlight WarningMsg    guifg=Red ctermfg=Red
-highlight Error         ctermbg=DarkRed
-highlight SpellBad      ctermbg=DarkRed
-" FIXME: Comments
-highlight SpellRare     ctermbg=DarkMagenta
-highlight SpellCap      ctermbg=DarkBlue
-highlight SpellLocal    ctermbg=DarkCyan
-
-call s:hibg("Folded"    ,"#333333","LightGray",7)
-call s:hifg("Folded"    ,"#aaddee","LightCyan",63)
-highlight FoldColumn    none
-high link FoldColumn    Folded
-highlight DiffAdd       ctermbg=4 guibg=DarkBlue
-highlight DiffChange    ctermbg=5 guibg=DarkMagenta
-highlight DiffDelete    ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
-highlight DiffText      ctermbg=DarkRed
-highlight DiffText      cterm=bold ctermbg=9 gui=bold guibg=Red
-
-highlight Pmenu         guifg=White ctermfg=White gui=bold cterm=bold
-highlight PmenuSel      guifg=White ctermfg=White gui=bold cterm=bold
-call s:hibg("Pmenu"     ,"#000099","Blue",18)
-call s:hibg("PmenuSel"  ,"#5555ff","DarkCyan",39)
-highlight PmenuSbar     guibg=Grey ctermbg=Grey
-highlight PmenuThumb    guibg=White ctermbg=White
-highlight TabLine       gui=underline cterm=underline
-call s:hifg("TabLine"   ,"#bbbbbb","LightGrey",85)
-call s:hibg("TabLine"   ,"#333333","DarkGrey",80)
-highlight TabLineSel    guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight TabLineFill   gui=underline cterm=underline
-call s:hifg("TabLineFill","#bbbbbb","LightGrey",85)
-call s:hibg("TabLineFill","#808080","Grey",83)
-
-hi Type gui=none
-hi Statement gui=none
-if !has("gui_mac")
-    " Mac GUI degrades italics to ugly underlining.
-    hi Comment gui=italic
-    hi railsUserClass  gui=italic
-    hi railsUserMethod gui=italic
-endif
-hi Identifier cterm=none
-" Commented numbers at the end are *old* 256 color values
-"highlight PreProc       guifg=#EDF8F9
-call s:hifg("Comment"        ,"#9933CC","DarkMagenta",34) " 92
-" 26 instead?
-call s:hifg("Constant"       ,"#339999","DarkCyan",21) " 30
-call s:hifg("rubyNumber"     ,"#CCFF33","Yellow",60) " 190
-call s:hifg("String"         ,"#66FF00","LightGreen",44,82) " 82
-call s:hifg("Identifier"     ,"#FFCC00","Yellow",72) " 220
-call s:hifg("Statement"      ,"#FF6600","Brown",68) " 202
-call s:hifg("PreProc"        ,"#AAFFFF","LightCyan",47) " 213
-call s:hifg("railsUserMethod","#AACCFF","LightCyan",27)
-call s:hifg("Type"           ,"#AAAA77","Grey",57) " 101
-call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101
-call s:hifg("Special"        ,"#33AA00","DarkGreen",24) " 7
-call s:hifg("Regexp"         ,"#44B4CC","DarkCyan",21) " 74
-call s:hifg("rubyMethod"     ,"#DDE93D","Yellow",77) " 191
-"highlight railsMethod   guifg=#EE1122 ctermfg=1
diff --git a/colors/kalt.vim b/colors/kalt.vim
deleted file mode 100755
index be56b87..0000000
--- a/colors/kalt.vim
+++ /dev/null
@@ -1,213 +0,0 @@
-"==============================================================================.
-"        File: kalt.vim                                                        |
-"     License: Public Domain, FREE as LOVE.                                    |
-" Description: A cold colorscheme for GVIM/VIM without bold, italic nor        |
-"              underline font styles (except for spell checking and some GUI   |
-"              elements). On VIM it uses a black background.                   |
-"        Note: - Only standard (for all languages) highlight-groups are set.   |
-"              - This colorscheme _should_ look nice everywhere.               |
-"==============================================================================|
-"      Author: drachenkiraa, {_drachen_kiraa_}@{_gmail_}.{com_}  (remove: _{}) |
-" Last Change: 2009 Jul 1                                                      |
-"     Version: 1.1                                                             |
-"==========================================================================={{{1
-" Thanks:                                                                      |
-" Starwing Wesley, for telling me that the Cursor disappeared when moving it   |
-"   on a  Comment (in gnome-terminal).                                         |
-" Changes:                                                                     |
-"  1.0: Public release.                                                        |
-"  1.1: FIX: Cursor disappeared when moving it in a Comment. This ONLY         |
-"         happened on one terminal (gnome-terminal). Now the Comment ctermfg   |
-"         color is DarkGreen for all 8 color Xterms. But you'll still get the  |
-"         original color (DarkGray) if your terminal supports more colors      |
-"         (or if you set 't_Co' [look below in "Random Tips"]).                |
-"       Changed 'Cursor', 'CursorLine', 'CursorColumn' colors to DarkBlue      |
-"         instead of the ugly Green.                                           |
-"       Changed 'SpellRare' guifg color from Magenta to DarkMagenta.           |
-"       Changed 'IncSearch' guifg color from LighMagenta to Green.             |
-"       Changed 'PreCondit' guifg color to a Darker Yellow color.              |
-"       Changed 'Special' guifg color from Blue to a Dark Red color.           |
-"       Set ctermfg and guifg options of 'Search' and 'IncSearch' to the       |
-"         background color.                                                    |
-"       Made 'Character' guifg color more brighter.                            |
-"       Changed 'Special' guifg color from Blue to a nice Red color.           |
-"==============================================================================|
-"  Color Test: :he group-name                                                  |
-"              :so $VIMRUNTIME/syntax/hitest.vim                               |
-"   Tested On: - Linux (gvim v6.3, v6.4);                                      |
-"              - Standard Linux Terminal (vim v6.3, v6.4);                     |
-"              - Xterm, Rxvt, Konsole, gnome-terminal (vim v6.3, v6.4).        |
-"              - Windows (gvim v7.1, v7.2);                                    |
-"              - DOS (vim v7.1, v7.2).                                         |
-"        TODO: * Test this colorscheme on newer versions of vim/gvim for Linux |
-"                and other systems (*BSD, Mac, Amiga?).                        |
-"              * Are all the has("feature") checks really worth?               |
-"                Please enlighten me if I'm wrong.                             |
-"==============================================================================|
-" Random Tips:                                                                 |
-" * If your terminal supports more than 8 colors (which is the case of most    |
-"   modern xterms, rxvts, and others), then it is worth adding the following   |
-"   lines somewhere into your .vimrc:                                          |
-"       if &term =~ "xterm"                                                    |
-"         set t_Co=16                                                          |
-"       endif                                                                  |
-"   That'll make this colorscheme look a lot better on such terminals.         |
-"   For further help checkout:                                                 |
-"       :he term-dependent-settings                                            |
-"       :he term                                                               |
-"===========================================================================}}}1
-" Initial setup stuff {{{1
-" Remove existing highlighting
-if has("gui_running")
-  set background=light
-else
-  set background=dark
-endif
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "kalt"
-hi Normal ctermbg=Black ctermfg=Gray cterm=NONE guibg=#eaeaea guifg=Black gui=none
-
-" Vim >= 7.0 specific colors {{{1
-if v:version >= 700
-  " Cursor colors {{{2
-  hi Cursor ctermbg=DarkBlue ctermfg=fg guibg=DarkBlue guifg=bg gui=none
-  hi CursorLine ctermbg=DarkBlue guibg=#ccccff gui=none
-  hi CursorColumn ctermbg=DarkBlue guibg=#ccccff gui=none
-  " only for Win32, IME status
-  if has('multi_byte_ime')
-    hi CursorIM guibg=DarkMagenta guifg=NONE gui=none
-  endif
-
-  " Auto-completion Popup Menu colors {{{2
-  hi Pmenu ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=#9999cc guifg=fg gui=none
-  hi PmenuSel ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#333399 guifg=bg gui=none
-  hi PmenuSbar ctermbg=DarkBlue ctermfg=DarkBlue cterm=NONE guibg=#333399 guifg=fg gui=none
-  hi PmenuThumb ctermbg=Gray ctermfg=Gray cterm=NONE guibg=#6666cc guifg=fg gui=none
-
-  " Tab colors {{{2
-  if has("windows")
-    hi TabLine ctermbg=DarkCyan ctermfg=DarkBlue guibg=DarkGray guifg=DarkBlue gui=none
-    hi TabLineFill ctermbg=DarkCyan ctermfg=DarkBlue guibg=DarkGray guifg=DarkBlue gui=none
-    hi TabLineSel ctermbg=DarkBlue ctermfg=Gray guibg=DarkBlue guifg=Gray gui=bold
-  endif
-
-  " Spell checking colors {{{2
-  if has("spell")
-    hi SpellBad ctermbg=White ctermfg=Red cterm=NONE guisp=Red gui=undercurl
-    hi SpellCap ctermbg=White ctermfg=Blue cterm=NONE guisp=Blue gui=undercurl
-    hi SpellLocal ctermbg=White ctermfg=DarkCyan cterm=NONE guisp=DarkCyan gui=undercurl
-    hi SpellRare ctermbg=White ctermfg=DarkMagenta cterm=NONE guisp=Magenta gui=undercurl
-  endif
-
-endif "}}}1
-" Messages and other texts' colors {{{1
-hi WarningMsg ctermbg=bg ctermfg=Red cterm=NONE guibg=bg guifg=Red3 gui=none
-hi ErrorMsg ctermbg=Red ctermfg=White cterm=NONE guibg=Red3 guifg=White gui=none
-hi ModeMsg ctermbg=bg ctermfg=fg cterm=NONE guibg=bg guifg=fg gui=none
-hi MoreMsg ctermbg=bg ctermfg=Green cterm=NONE guibg=bg guifg=DarkGreen gui=none
-hi Question ctermbg=bg ctermfg=White cterm=NONE guibg=bg guifg=DarkBlue gui=none
-hi Directory ctermbg=bg ctermfg=Blue cterm=NONE guibg=bg guifg=Blue gui=none
-hi Title ctermbg=bg ctermfg=Blue cterm=NONE guibg=bg guifg=Blue gui=none
-
-" Diff colors {{{1
-if has("diff")
-  hi DiffAdd ctermbg=Green ctermfg=bg cterm=NONE guibg=LightGreen gui=none
-  hi DiffChange ctermbg=Blue ctermfg=fg cterm=NONE guibg=LightBlue gui=none
-  hi DiffDelete ctermbg=Red ctermfg=fg cterm=NONE guibg=LightRed gui=none
-  hi DiffText ctermbg=Cyan ctermfg=bg cterm=NONE guibg=LightCyan gui=none
-endif
-
-" Outline, Fold & Sign columns colors {{{1
-hi LineNr ctermbg=bg ctermfg=DarkYellow guibg=Gray85 guifg=Gray40 gui=none
-if has("folding")
-  hi Folded ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=Gray80 guifg=DarkBlue gui=none
-  hi FoldColumn ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=Gray80 guifg=DarkBlue gui=none
-endif
-if has("signs")
-  hi SignColumn ctermbg=bg ctermfg=Yellow cterm=NONE guibg=Gray85 guifg=DarkBlue gui=none
-endif
-
-" Search & Special characters' colors {{{1
-if has("extra_search")
-  hi Search ctermbg=Yellow ctermfg=bg cterm=NONE guibg=Yellow guifg=fg gui=none
-  hi IncSearch ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=fg gui=none
-endif
-hi NonText ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-hi SpecialKey ctermbg=bg ctermfg=Brown guibg=bg guifg=#993333 gui=none
-
-" Window Bars, Status line & Visual mode colors {{{1
-hi StatusLine ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=DarkRed guifg=bg gui=none
-if has("windows")
-  hi StatusLineNC ctermbg=DarkGreen ctermfg=bg cterm=NONE guibg=Gray60 guifg=DarkRed gui=none
-endif
-
-if has("vertsplit")
-  hi VertSplit ctermbg=DarkGreen ctermfg=bg cterm=NONE guibg=DarkRed guifg=bg gui=none
-endif
-
-if has("wildmenu")
-  hi WildMenu ctermbg=bg ctermfg=Green cterm=NONE guibg=bg guifg=DarkRed gui=bold
-endif
-
-if has("visual")
-  hi Visual ctermbg=DarkMagenta ctermfg=bg cterm=NONE guibg=#ccee88 guifg=fg gui=none
-  hi VisualNOS ctermbg=bg ctermfg=DarkMagenta cterm=NONE guibg=#ccee88 guifg=fg gui=none
-endif
-
-" Syntax highlighting colors {{{1
-hi Comment ctermbg=bg ctermfg=DarkGray guibg=bg guifg=Gray50 gui=none
-" 8 color terminals fix:
-"   The Cursor disappears when moving it in a Comment. Only happened on
-"   one terminal: gnome-terminal. This Fixes-it for all other weird
-"   8 color terminals.
-if (&term =~ "xterm") && (&t_Co < 16)
-  hi Comment ctermfg=DarkGreen
-endif
-hi link SpecialComment Comment
-
-hi Character ctermbg=bg ctermfg=Red guibg=bg guifg=#990000 gui=none
-hi String ctermbg=bg ctermfg=Magenta guibg=bg guifg=Blue gui=none
-hi Constant ctermbg=bg ctermfg=Yellow guibg=bg guifg=DarkGreen gui=none
-hi link Number Constant
-hi link Float Constant
-hi link Boolean Constant
-
-hi Identifier ctermbg=bg ctermfg=Green guibg=bg guifg=DarkGreen gui=none
-hi Function ctermbg=bg ctermfg=Green guibg=bg guifg=DarkGreen gui=none
-
-hi Statement ctermbg=bg ctermfg=Blue guibg=bg guifg=DarkBlue gui=none
-hi link Conditional Statement
-hi link Repeat Statement
-hi link Operator Statement
-hi link Keyword Statement
-hi link Label Statement
-hi link Exception Statement
-
-hi Type ctermbg=bg ctermfg=DarkMagenta guibg=bg guifg=DarkMagenta gui=none
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-
-hi PreProc ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi PreCondit ctermbg=bg ctermfg=DarkYellow guibg=bg guifg=#aa8800 gui=none
-hi link Include PreProc
-hi link Define PreProc
-
-hi Special ctermbg=bg ctermfg=Blue guibg=bg guifg=#990000 gui=none
-hi SpecialChar ctermbg=bg ctermfg=Red guibg=bg guifg=Red gui=none
-hi Tag ctermbg=bg ctermfg=DarkRed guibg=bg guifg=DarkRed gui=none
-hi Delimiter ctermbg=bg ctermfg=DarkRed guibg=bg guifg=DarkRed gui=none
-hi Debug ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-
-hi MatchParen ctermbg=White ctermfg=Black cterm=NONE guibg=Blue guifg=White gui=none
-hi Error ctermbg=Red ctermfg=White cterm=NONE guibg=bg guifg=Red gui=none
-hi Ignore ctermbg=bg ctermfg=bg cterm=NONE guibg=bg guifg=bg gui=none
-hi Todo ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=DarkCyan guifg=bg gui=none
-hi Underlined ctermbg=bg ctermfg=Blue cterm=underline guibg=bg guifg=Blue gui=underline
-"}}}1
-"==========================================================================={{{1
-" vim: set et sw=2 sts=2 ts=8 nowrap:
-" vim600: set fdc=2 fdm=marker:
diff --git a/colors/kaltex.vim b/colors/kaltex.vim
deleted file mode 100755
index 4601a2d..0000000
--- a/colors/kaltex.vim
+++ /dev/null
@@ -1,213 +0,0 @@
-"==============================================================================.
-"        File: kaltex.vim                                                      |
-"     License: Public Domain, FREE as LOVE.                                    |
-" Description: A cold colorscheme for GVIM/VIM with bold, italic and underline |
-"              font styles. On VIM it uses a black background.                 |
-"        Note: - Only standard (for all languages) highlight-groups are set.   |
-"              - This colorscheme _should_ look nice everywhere.               |
-"==============================================================================|
-"      Author: drachenkiraa, {_drachen_kiraa_}@{_gmail_}.{com_}  (remove: _{}) |
-" Last Change: 2009 Jul 1                                                      |
-"     Version: 1.1                                                             |
-"==========================================================================={{{1
-" Thanks:                                                                      |
-" Starwing Wesley, for telling me that the Cursor disappeared when moving it   |
-"   on a  Comment (in gnome-terminal).                                         |
-" Changes:                                                                     |
-"  1.0: Public release.                                                        |
-"  1.1: FIX: Cursor disappeared when moving it in a Comment. This ONLY         |
-"         happened on one terminal (gnome-terminal). Now the Comment ctermfg   |
-"         color is DarkGreen for all 8 color Xterms. But you'll still get the  |
-"         original color (DarkGray) if your terminal supports more colors      |
-"         (or if you set 't_Co' [look below in "Random Tips"]).                |
-"       Changed 'Cursor', 'CursorLine', 'CursorColumn' colors to DarkBlue      |
-"         instead of the ugly Green.                                           |
-"       Changed 'SpellRare' guifg color from Magenta to DarkMagenta.           |
-"       Changed 'IncSearch' guifg color from LighMagenta to Green.             |
-"       Changed 'PreCondit' guifg color to a Darker Yellow color.              |
-"       Changed 'Special' guifg color from Blue to a Dark Red color.           |
-"       Set ctermfg and guifg options of 'Search' and 'IncSearch' to the       |
-"         background color.                                                    |
-"       Made 'Character' guifg color more brighter.                            |
-"       Changed 'Special' guifg color from Blue to a nice Red color.           |
-"       Changed 'PmenuSel' and 'Todo' gui option to bold.                      |
-"==============================================================================|
-"  Color Test: :he group-name                                                  |
-"              :so $VIMRUNTIME/syntax/hitest.vim                               |
-"   Tested On: - Linux (gvim v6.3, v6.4);                                      |
-"              - Standard Linux Terminal (vim v6.3, v6.4);                     |
-"              - Xterm, Rxvt, Konsole, gnome-terminal (vim v6.3, v6.4).        |
-"              - Windows (gvim v7.1, v7.2);                                    |
-"              - DOS (vim v7.1, v7.2).                                         |
-"        TODO: * Test this colorscheme on newer versions of vim/gvim for Linux |
-"                and other systems (*BSD, Mac, Amiga?).                        |
-"              * Are all the has("feature") checks really worth?               |
-"                Please enlighten me if I'm wrong.                             |
-"==============================================================================|
-" Random Tips:                                                                 |
-" * If your terminal supports more than 8 colors (which is the case of most    |
-"   modern xterms, rxvts, and others), then it is worth adding the following   |
-"   lines somewhere into your .vimrc:                                          |
-"       if &term =~ "xterm"                                                    |
-"         set t_Co=16                                                          |
-"       endif                                                                  |
-"   That'll make this colorscheme look a lot better on such terminals.         |
-"   For further help checkout:                                                 |
-"       :he term-dependent-settings                                            |
-"       :he term                                                               |
-"===========================================================================}}}1
-" Initial setup stuff {{{1
-" Remove existing highlighting
-if has("gui_running")
-  set background=light
-else
-  set background=dark
-endif
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "kaltex"
-hi Normal ctermbg=Black ctermfg=Gray cterm=NONE guibg=#eaeaea guifg=Black gui=none
-
-" Vim >= 7.0 specific colors {{{1
-if v:version >= 700
-  " Cursor colors {{{2
-  hi Cursor ctermbg=DarkBlue ctermfg=fg guibg=DarkBlue guifg=bg gui=none
-  hi CursorLine ctermbg=DarkBlue guibg=#ccccff gui=none
-  hi CursorColumn ctermbg=DarkBlue guibg=#ccccff gui=none
-  " only for Win32, IME status
-  if has('multi_byte_ime')
-    hi CursorIM guibg=DarkMagenta guifg=NONE gui=none
-  endif
-
-  " Auto-completion Popup Menu colors {{{2
-  hi Pmenu ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=#9999cc guifg=fg gui=none
-  hi PmenuSel ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=#333399 guifg=bg gui=bold
-  hi PmenuSbar ctermbg=DarkBlue ctermfg=DarkBlue cterm=NONE guibg=#333399 guifg=fg gui=none
-  hi PmenuThumb ctermbg=Gray ctermfg=Gray cterm=NONE guibg=#6666cc guifg=fg gui=none
-
-  " Tab colors {{{2
-  if has("windows")
-    hi TabLine ctermbg=DarkCyan ctermfg=DarkBlue guibg=DarkGray guifg=DarkBlue gui=none
-    hi TabLineFill ctermbg=DarkCyan ctermfg=DarkBlue guibg=DarkGray guifg=DarkBlue gui=none
-    hi TabLineSel ctermbg=DarkBlue ctermfg=Gray guibg=DarkBlue guifg=Gray gui=bold
-  endif
-
-  " Spell checking colors {{{2
-  if has("spell")
-    hi SpellBad ctermbg=White ctermfg=Red cterm=NONE guisp=Red gui=undercurl
-    hi SpellCap ctermbg=White ctermfg=Blue cterm=NONE guisp=Blue gui=undercurl
-    hi SpellLocal ctermbg=White ctermfg=DarkCyan cterm=NONE guisp=DarkCyan gui=undercurl
-    hi SpellRare ctermbg=White ctermfg=DarkMagenta cterm=NONE guisp=Magenta gui=undercurl
-  endif
-
-endif "}}}1
-" Messages and other texts' colors {{{1
-hi WarningMsg ctermbg=bg ctermfg=Red cterm=NONE guibg=bg guifg=Red3 gui=none
-hi ErrorMsg ctermbg=Red ctermfg=White cterm=NONE guibg=Red3 guifg=White gui=none
-hi ModeMsg ctermbg=bg ctermfg=fg cterm=NONE guibg=bg guifg=fg gui=none
-hi MoreMsg ctermbg=bg ctermfg=Green cterm=NONE guibg=bg guifg=DarkGreen gui=none
-hi Question ctermbg=bg ctermfg=White cterm=NONE guibg=bg guifg=DarkBlue gui=none
-hi Directory ctermbg=bg ctermfg=Blue cterm=NONE guibg=bg guifg=Blue gui=none
-hi Title ctermbg=bg ctermfg=Blue cterm=NONE guibg=bg guifg=Blue gui=none
-
-" Diff colors {{{1
-if has("diff")
-  hi DiffAdd ctermbg=Green ctermfg=bg cterm=NONE guibg=LightGreen gui=none
-  hi DiffChange ctermbg=Blue ctermfg=fg cterm=NONE guibg=LightBlue gui=none
-  hi DiffDelete ctermbg=Red ctermfg=fg cterm=NONE guibg=LightRed gui=none
-  hi DiffText ctermbg=Cyan ctermfg=bg cterm=NONE guibg=LightCyan gui=none
-endif
-
-" Outline, Fold & Sign columns colors {{{1
-hi LineNr ctermbg=bg ctermfg=DarkYellow guibg=Gray85 guifg=Gray40 gui=none
-if has("folding")
-  hi Folded ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=Gray80 guifg=DarkBlue gui=none
-  hi FoldColumn ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=Gray80 guifg=DarkBlue gui=none
-endif
-if has("signs")
-  hi SignColumn ctermbg=bg ctermfg=Yellow cterm=NONE guibg=Gray85 guifg=DarkBlue gui=none
-endif
-
-" Search & Special characters' colors {{{1
-if has("extra_search")
-  hi Search ctermbg=Yellow ctermfg=bg cterm=NONE guibg=Yellow guifg=fg gui=none
-  hi IncSearch ctermbg=Green ctermfg=bg cterm=NONE guibg=Green guifg=fg gui=none
-endif
-hi NonText ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-hi SpecialKey ctermbg=bg ctermfg=Brown guibg=bg guifg=#993333 gui=none
-
-" Window Bars, Status line & Visual mode colors {{{1
-hi StatusLine ctermbg=DarkBlue ctermfg=fg cterm=NONE guibg=DarkRed guifg=bg gui=none
-if has("windows")
-  hi StatusLineNC ctermbg=DarkGreen ctermfg=bg cterm=NONE guibg=Gray60 guifg=DarkRed gui=none
-endif
-
-if has("vertsplit")
-  hi VertSplit ctermbg=DarkGreen ctermfg=bg cterm=NONE guibg=DarkRed guifg=bg gui=none
-endif
-
-if has("wildmenu")
-  hi WildMenu ctermbg=bg ctermfg=Green cterm=NONE guibg=bg guifg=DarkRed gui=bold
-endif
-
-if has("visual")
-  hi Visual ctermbg=DarkMagenta ctermfg=bg cterm=NONE guibg=#ccee88 guifg=fg gui=none
-  hi VisualNOS ctermbg=bg ctermfg=DarkMagenta cterm=NONE guibg=#ccee88 guifg=fg gui=none
-endif
-
-" Syntax highlighting colors {{{1
-hi Comment ctermbg=bg ctermfg=DarkGray guibg=bg guifg=Gray50 gui=none
-" 8 color terminals fix:
-"   The Cursor disappears when moving it in a Comment. Only happened on
-"   one terminal: gnome-terminal. This Fixes-it for all other weird
-"   8 color terminals.
-if (&term =~ "xterm") && (&t_Co < 16)
-  hi Comment ctermfg=DarkGreen
-endif
-hi link SpecialComment Comment
-
-hi Character ctermbg=bg ctermfg=Red guibg=bg guifg=#990000 gui=none
-hi String ctermbg=bg ctermfg=Magenta guibg=bg guifg=Blue gui=none
-hi Constant ctermbg=bg ctermfg=Yellow guibg=bg guifg=DarkGreen gui=none
-hi link Number Constant
-hi link Float Constant
-hi link Boolean Constant
-
-hi Identifier ctermbg=bg ctermfg=Green guibg=bg guifg=DarkGreen gui=none
-hi Function ctermbg=bg ctermfg=Green guibg=bg guifg=DarkGreen gui=bold
-
-hi Statement ctermbg=bg ctermfg=Blue guibg=bg guifg=DarkBlue gui=bold
-hi link Conditional Statement
-hi link Repeat Statement
-hi link Operator Statement
-hi link Keyword Statement
-hi link Label Statement
-hi link Exception Statement
-
-hi Type ctermbg=bg ctermfg=DarkMagenta guibg=bg guifg=DarkMagenta gui=bold
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-
-hi PreProc ctermbg=bg ctermfg=DarkCyan guibg=bg guifg=DarkCyan gui=none
-hi PreCondit ctermbg=bg ctermfg=DarkYellow guibg=bg guifg=#bbaa00 gui=bold
-hi link Include PreProc
-hi link Define PreProc
-
-hi Special ctermbg=bg ctermfg=Blue guibg=bg guifg=#990000 gui=bold
-hi SpecialChar ctermbg=bg ctermfg=Red guibg=bg guifg=Red gui=none
-hi Tag ctermbg=bg ctermfg=DarkRed guibg=bg guifg=DarkRed gui=none
-hi Delimiter ctermbg=bg ctermfg=DarkRed guibg=bg guifg=DarkRed gui=none
-hi Debug ctermbg=bg ctermfg=DarkGray guibg=bg guifg=DarkGray gui=none
-
-hi MatchParen ctermbg=White ctermfg=Black cterm=NONE guibg=Blue guifg=White gui=none
-hi Error ctermbg=Red ctermfg=White cterm=NONE guibg=bg guifg=Red gui=none
-hi Ignore ctermbg=bg ctermfg=bg cterm=NONE guibg=bg guifg=bg gui=none
-hi Todo ctermbg=DarkCyan ctermfg=bg cterm=NONE guibg=DarkCyan guifg=bg gui=bold
-hi Underlined ctermbg=bg ctermfg=Blue cterm=underline guibg=bg guifg=Blue gui=underline
-"}}}1
-"==========================================================================={{{1
-" vim: set et sw=2 sts=2 ts=8 nowrap:
-" vim600: set fdc=2 fdm=marker:
diff --git a/colors/kate.vim b/colors/kate.vim
deleted file mode 100755
index 168f420..0000000
--- a/colors/kate.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Vim color file
-" Maintainer:   Donald Ephraim Curtis <dcurtis@gmail.com>
-" Last Change:  09. january 2007.
-" URL:          http://milkbox.net
-" Kate default color themes.
-" version 1.1
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="DevC++"
-
-hi Comment      gui=italic      guifg=#808080		guibg=NONE
-hi Identifier   gui=NONE		guifg=Black			guibg=NONE
-hi Statement    gui=bold		guifg=DarkBlue		guibg=NONE
-hi PreProc      gui=NONE		guifg=#008000		guibg=NONE	
-hi Statement    gui=bold        guifg=Black         guibg=NONE
-hi Type         gui=bold		guifg=#800000		guibg=NONE
-hi link Constant Type
-hi Special      gui=NONE		guifg=Black 	    guibg=NONE
-hi Structure    gui=bold        guifg=Black         guibg=NONE
-hi String       gui=NONE  	    guifg=#DD0000	    guibg=NONE
-hi Number       gui=NONE		guifg=#0000FF       guibg=NONE
-hi SpecialKey   gui=NONE		guifg=#0000FF       guibg=NONE
-hi Float        gui=NONE        guifg=#800080       guibg=NONE
-hi Boolean      gui=bold        guifg=Black	        guibg=NONE
-hi Gutter       gui=NONE        guifg=Black		    guibg=Grey
-hi Todo         gui=bold    	guifg=black		    guibg=#FFCCCC
-hi LineNr       gui=NONE        guifg=Black         guibg=#EBE9ED
-hi NonText      gui=bold 		guifg=black         guibg=#EBE9ED
-hi Visual       gui=reverse     guifg=NONE          guibg=NONE
-hi MatchParen   gui=NONE        guifg=Black         guibg=#FFFF99
-hi Question     gui=NONE        guifg=DarkGreen     guibg=NONE
-hi More         gui=bold        guifg=DarkGreen     guibg=NONE
-hi StatusLine   gui=bold        guifg=Black         guibg=#EBE9ED
-
-" C/C++ Colors
-hi link cIncluded PreProc
-hi cOctal       gui=NONE        guifg=#008080       guibg=NONE
-hi cSpecial     gui=NONE        guifg=#FF00FF       guibg=NONE
-hi link cSpecialCharacter cSpecial
-
-" Latex Colors
-"hi texStatement guifg=#606000
-hi link texType Normal
-hi link texDocType Type
-hi link texDefParm Normal
-hi link texInput Normal
-hi link texInputFile Normal
-hi link texNewCmd texDocType
-hi link texSection String
-hi link texSectionName SpecialKey
-hi link texDelimiter Normal
-hi link texRefZone Normal
-hi link texMath PreProc
-hi link texLigature texMath
-hi texStatement gui=NONE        guifg=#800000       guibg=NONE
diff --git a/colors/kellys.vim b/colors/kellys.vim
deleted file mode 100755
index da1b1a1..0000000
--- a/colors/kellys.vim
+++ /dev/null
@@ -1,271 +0,0 @@
-" Description:	a colour scheme inspired by kellys bicycles
-"  Maintainer:	kamil.stachowski@gmail.com
-"     License:	gpl 3+
-"     Version:	0.4 (2011.01.11)
-
-" changelog:
-"         0.4:	2011.01.11
-"				fixed 256-colour
-"				improved php and TeX
-"         		linked htmlItalic to Underlined
-"         		added Conceal
-"         		added netrw
-"         0.3:	2008.12.07
-"				finished ada, haskell, html, lisp, pascal, php, python, ruby, scheme, sh, xml and vim
-"				changed preproc to slightly darker
-"				changed statement to bold
-"         0.2:	2008.12.02
-"				added support for 256-colour terminal
-"				added diff*, pmenu* and wildmenu
-"				added some cpp, java*, python*, some sh and ruby*
-"				removed italic from comments and made them slightly lighter
-"         0.1:	2008.11.28
-"       		initial version
-
-
-set background=dark
-
-if version > 580
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let colors_name = "kellys"
-
-" black			2a2b2f	235
-" blue			62acce	81
-" blue slight	9ab2c8	74
-" brown slight	d1c79e	144
-" green yellowy	d1d435	184
-" grey dark		67686b	240
-" grey light	e1e0e5	254
-" orange		e6ac32	178
-" red			9d0e15	124
-" +
-" green			00d700	40
-
-if has("gui_running")
-	hi Comment		guifg=#67686b	guibg=#2a2b2f	gui=none
-	hi Cursor 		guifg=#2a2b2f	guibg=#e1e0e5	gui=none
-	hi Conceal		guifg=#e1e0e5	guibg=#67686b	gui=none
-	hi Constant 	guifg=#d1c79e	guibg=#2a2b2f	gui=none
-	hi CursorLine		          	guibg=#303132	gui=none
-	hi DiffAdd		guifg=#2a2b2f	guibg=#00d700	gui=none
-	hi DiffChange	guifg=#2a2b2f	guibg=#d1c79e	gui=none
-	hi DiffDelete	guifg=#67686b	guibg=#2a2b2f	gui=none
-	hi DiffText		guifg=#9d0e15	guibg=#d1c79e	gui=none
-	hi Error		guifg=#9d0e15	guibg=#2a2b2f	gui=underline
-	hi Folded 		guifg=#2a2b2f	guibg=#67686b	gui=none
-	hi MatchParen	guifg=#d1d435	guibg=#2a2b2f	gui=bold,underline
-	hi ModeMsg		guifg=#e1e0e5	guibg=#2a2b2f	gui=bold
-	hi Normal 		guifg=#e1e0e5	guibg=#2a2b2f	gui=none
-	hi Pmenu		guifg=#2a2b2f	guibg=#9ab2c8	gui=none
-	hi PmenuSel		guifg=#2a2b2f	guibg=#62acce	gui=bold
-	hi PmenuSbar	guifg=#2a2b2f	guibg=#2a2b2f	gui=none
-	hi PmenuThumb	guifg=#2a2b2f	guibg=#62acce	gui=none
-	hi PreProc		guifg=#d1d435	guibg=#2a2b2f	gui=none 
-	hi Search		guifg=#2a2b2f	guibg=#e1e0e5	gui=none
-	hi Special		guifg=#9ab2c8	guibg=#2a2b2f	gui=none
-	hi Statement	guifg=#62acce	guibg=#2a2b2f	gui=bold
-	hi StatusLine 	guifg=#2a2b2f	guibg=#62acce	gui=bold
-	hi StatusLineNC guifg=#2a2b2f	guibg=#e1e0e5	gui=none
-	hi Todo 		guifg=#e1e0e5	guibg=#9d0e15	gui=bold
-	hi Type 		guifg=#e6ac32	guibg=#2a2b2f	gui=none
-	hi Underlined	guifg=#e1e0e5	guibg=#2a2b2f	gui=underline
-	hi Visual		guifg=#2a2b2f	guibg=#e1e0e5	gui=none
-	hi Wildmenu		guifg=#00d700	guibg=#2a2b2f	gui=none
-else
-	if &t_Co == 256
-		hi Comment		ctermfg=239	ctermbg=235	cterm=none
-		hi Conceal		ctermfg=254	ctermbg=239	cterm=none
-		hi Cursor 		ctermfg=235	ctermbg=254	cterm=none
-		hi Constant 	ctermfg=144	ctermbg=235	cterm=none
-		hi CursorLine		       	ctermbg=236	cterm=none
-		hi DiffAdd		ctermfg=235	ctermbg=40	cterm=none
-		hi DiffChange	ctermfg=235	ctermbg=144	cterm=none
-		hi DiffDelete	ctermfg=239	ctermbg=235	cterm=none
-		hi DiffText		ctermfg=124	ctermbg=144	cterm=none
-		hi Error		ctermfg=254	ctermbg=235	cterm=underline
-		hi Folded 		ctermfg=239	ctermbg=235	cterm=none
-		hi MatchParen	ctermfg=184	ctermbg=235	cterm=bold,underline
-		hi ModeMsg		ctermfg=254	ctermbg=235	cterm=bold
-		hi Normal 		ctermfg=254	ctermbg=235	cterm=none
-		hi Pmenu		ctermfg=235	ctermbg=74	cterm=none
-		hi PmenuSel		ctermfg=235	ctermbg=81	cterm=bold
-		hi PmenuSbar	ctermfg=235	ctermbg=235	cterm=none
-		hi PmenuThumb	ctermfg=235	ctermbg=81	cterm=none
-		hi PreProc		ctermfg=184	ctermbg=235	cterm=none 
-		hi Search		ctermfg=235	ctermbg=254	cterm=none
-		hi Special		ctermfg=74	ctermbg=235	cterm=none
-		hi Statement	ctermfg=81	ctermbg=235	cterm=none
-		hi StatusLine 	ctermfg=235	ctermbg=81	cterm=bold
-		hi StatusLineNC ctermfg=235	ctermbg=254	cterm=none
-		hi Todo 		ctermfg=254	ctermbg=124	cterm=bold
-		hi Type 		ctermfg=178	ctermbg=235	cterm=none
-		hi Underlined	ctermfg=254	ctermbg=235	cterm=underline
-		hi Visual		ctermfg=235	ctermbg=255	cterm=none
-		hi Wildmenu		ctermfg=40	ctermbg=235	cterm=none
-	endif
-endif
-
-hi! link Boolean		Constant
-hi! link Character		Constant
-hi! link Conditional	Statement
-hi! link CursorColumn	CursorLine
-hi! link Debug			Special	
-hi! link Define			PreProc
-hi! link Delimiter		Special
-hi! link Directory		Type
-hi! link Error			Error
-hi! link ErrorMsg		Error
-hi! link Exception		Statement
-hi! link Float			Constant
-hi! link FoldColumn		Folded
-hi! link Function		Normal
-hi! link Identifier		Special
-hi! link Ignore			Comment
-hi! link IncSearch		Search
-hi! link Include		PreProc
-hi! link Keyword		Statement
-hi! link Label			Statement
-hi! link LineNr			Comment
-hi! link Macro			PreProc
-hi! link MoreMsg		ModeMsg
-hi! link NonText		Comment
-hi! link Number			Constant
-hi! link Operator		Special
-hi! link PreCondit		PreProc
-hi! link Question		MoreMsg
-hi! link Repeat			Statement
-hi! link SignColumn		FoldColumn
-hi! link SpecialChar	Special
-hi! link SpecialComment	Special
-hi! link SpecialKey		Comment
-hi! link SpellBad		Error
-hi! link SpellCap		Error
-hi! link SpellLocal		Error
-hi! link SpellRare		Error
-hi! link StorageClass	Type
-hi! link String			Constant
-hi! link Structure		Type
-hi! link Tag			Special
-hi! link Title			ModeMsg
-hi! link Typedef		Type
-hi! link VertSplit		StatusLineNC
-hi! link WarningMsg		Error
-
-" ada
-hi! link adaBegin			Type
-hi! link adaEnd				Type
-hi! link adaKeyword			Special
-" c++
-hi! link cppAccess			Type
-hi! link cppStatement		Special
-" hs
-hi! link ConId				Type
-hi! link hsPragma			PreProc
-hi! link hsConSym			Operator
-" html
-hi! link htmlArg			Statement
-hi! link htmlEndTag			Special
-hi! link htmlItalic			Underlined
-hi! link htmlLink			Underlined
-hi! link htmlSpecialTagName	PreProc
-hi! link htmlTag			Special
-hi! link htmlTagName		Type
-" java
-hi! link javaTypeDef		Special
-" lisp
-hi! link lispAtom			Constant
-hi! link lispAtomMark		Constant
-hi! link lispConcat			Special
-hi! link lispDecl			Type
-hi! link lispFunc			Special
-hi! link lispKey			PreProc
-" netrw
-hi! link netrwDir			Special
-hi! link netrwExe			Wildmenu
-hi! link netrwSymLink		Statement
-" pas
-hi! link pascalAsmKey		Statement
-hi! link pascalDirective	PreProc
-hi! link pascalModifier		PreProc
-hi! link pascalPredefined	Special
-hi! link pascalStatement	Type
-hi! link pascalStruct		Type
-" php
-hi! link phpComparison		Special
-hi! link phpDefine			Type
-hi! link phpIdentifier		Normal
-hi! link phpMemberSelector	Special
-hi! link phpRegion			Special
-hi! link phpVarSelector		Special
-" py
-hi! link pythonStatement	Type
-" rb
-hi! link rubyConstant		Special
-hi! link rubyDefine			Type
-hi! link rubyRegexp			Special
-" scm
-hi! link schemeSyntax		Special
-" sh
-hi! link shArithRegion		Normal
-hi! link shDerefSimple		Normal
-hi! link shDerefVar			Normal
-hi! link shFunction			Type
-hi! link shLoop				Statement
-hi! link shStatement		Special
-hi! link shVariable			Normal
-" sql
-hi! link sqlKeyword			Statement
-" tex
-hi! link texDocType			PreProc
-hi! link texLigature		Constant
-hi! link texMatcher			Normal
-hi! link texNewCmd			PreProc
-hi! link texOnlyMath		Constant
-hi! link texRefZone			Constant
-hi! link texSection			Type
-hi! link texSectionMarker	Type
-hi! link texSectionModifier	Constant
-hi! link texTypeSize		Special
-hi! link texTypeStyle		Special
-" vim
-hi! link vimCommand			Statement
-hi! link vimCommentTitle	Normal
-hi! link vimEnvVar			Special
-hi! link vimFuncKey			Type
-hi! link vimGroup			Special
-hi! link vimHiAttrib		Constant
-hi! link vimHiCTerm			Special
-hi! link vimHiCtermFgBg		Special
-hi! link vimHighlight		Special
-hi! link vimHiGui			Special
-hi! link vimHiGuiFgBg		Special
-hi! link vimOption			Special
-hi! link vimSyntax			Special
-hi! link vimSynType			Special
-hi! link vimUserAttrb		Special
-" xml
-hi! link xmlAttrib			Special
-hi! link xmlCdata			Normal
-hi! link xmlCdataCdata		Statement
-hi! link xmlCdataEnd		PreProc
-hi! link xmlCdataStart		PreProc
-hi! link xmlDocType			PreProc
-hi! link xmlDocTypeDecl		PreProc
-hi! link xmlDocTypeKeyword	PreProc
-hi! link xmlEndTag			Statement
-hi! link xmlProcessingDelim	PreProc
-hi! link xmlNamespace		PreProc
-hi! link xmlTagName			Statement
-
-" hi! link TexTypeStyle		Comment
-" hi! link TexStatement		Comment
-" hi! link TexRefZone			Normal
-" hi! link TexSectionName		Comment
-" hi! link TexSectionMarker	Comment
-" hi! link Delimiter			Comment
-" hi! link TexMatcher			Comment
diff --git a/colors/khaki.vim b/colors/khaki.vim
deleted file mode 100755
index 07a6e24..0000000
--- a/colors/khaki.vim
+++ /dev/null
@@ -1,178 +0,0 @@
-" Vim color file: khaki.vim
-"   Version:        1.0
-"   Author:         Frank Baruch <ez2b4got10 AT gmail DOT com>
-"   License:        GPL
-"   Compatibility:  Vim 5.7 onwards.
-"------------------------------------------------------------------------------
-"
-"   A light colorscheme optimized for gui and 256 color terminals.
-"
-"   Features:
-"       - Optimized for 256 colour palette, then converted to gui.
-"       - Identical colour rendition in both gui and cterm environments.
-"       - Low-contrast minimizes eye-strain during long edit sessions.
-"       - Avoids use of terminal attributes {bold italic etc}, with the
-"         exception of 'underline' used with the 'Underlined' group-name.
-"
-"   Installation:
-"       - Copy khaki.vim to ~/.vim/colors/
-"       - Add following lines to ~/.vimrc
-"           if !has("gui_running")
-"               set t_Co=256
-"           endif
-"           colorscheme khaki
-"
-"   Version History:
-"       1.1:    2007/08/27 Fix gui palette intensity (0x8f should be 0x87).
-"       1.0:    2007/08/10 Initial release.
-"
-"   To Do:
-"       Add any missing standard colorscheme functionality.
-"
-"   Feedback:
-"       Please email the author any comments and suggestions for improvement.
-"
-"------------------------------------------------------------------------------
-
-if &t_Co != 256 && !has("gui_running")
-    echomsg ""
-    echomsg "write 'set t_Co=256' in your .vimrc or this file won't load"
-    echomsg ""
-    finish
-endif
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "khaki"
-
-if !has("gui_running")
-    hi Normal           cterm=NONE      ctermfg=58      ctermbg=187
-    hi Cursor           cterm=NONE      ctermfg=230     ctermbg=58
-    hi CursorLine       cterm=NONE      ctermfg=NONE    ctermbg=186
-    hi CursorColumn     cterm=NONE      ctermfg=NONE    ctermbg=185
-    hi Incsearch        cterm=NONE      ctermfg=58      ctermbg=174
-    hi Search           cterm=NONE      ctermfg=58      ctermbg=174
-    hi ErrorMsg         cterm=NONE      ctermfg=58      ctermbg=197
-    hi WarningMsg       cterm=NONE      ctermfg=58      ctermbg=226
-    hi ModeMsg          cterm=NONE      ctermfg=58      ctermbg=192
-    hi MoreMsg          cterm=NONE      ctermfg=58      ctermbg=154
-    hi Question         cterm=NONE      ctermfg=27      ctermbg=NONE
-    hi StatusLine       cterm=NONE      ctermfg=187     ctermbg=30
-    hi StatusLineNC     cterm=NONE      ctermfg=58      ctermbg=101
-    hi User1            cterm=NONE      ctermfg=28      ctermbg=NONE
-    hi User2            cterm=NONE      ctermfg=39      ctermbg=NONE
-    hi VertSplit        cterm=NONE      ctermfg=144     ctermbg=144
-    hi WildMenu         cterm=NONE      ctermfg=58      ctermbg=144
-    hi DiffText         cterm=NONE      ctermfg=58      ctermbg=190
-    hi DiffChange       cterm=NONE      ctermfg=58      ctermbg=83
-    hi DiffDelete       cterm=NONE      ctermfg=187     ctermbg=124
-    hi DiffAdd          cterm=NONE      ctermfg=187     ctermbg=21
-    hi Folded           cterm=NONE      ctermfg=19      ctermbg=115
-    hi FoldedColumn     cterm=NONE      ctermfg=39      ctermbg=190
-    hi FoldColumn       cterm=NONE      ctermfg=19      ctermbg=115
-    hi Directory        cterm=NONE      ctermfg=28      ctermbg=NONE
-    hi LineNr           cterm=NONE      ctermfg=58      ctermbg=144
-    hi NonText          cterm=NONE      ctermfg=58      ctermbg=144
-    hi SpecialKey       cterm=NONE      ctermfg=130     ctermbg=NONE
-    hi Title            cterm=NONE      ctermfg=19      ctermbg=NONE
-    hi Visual           cterm=NONE      ctermfg=58      ctermbg=192
-    hi Comment          cterm=NONE      ctermfg=101     ctermbg=NONE
-    hi Constant         cterm=NONE      ctermfg=131     ctermbg=NONE
-    hi String           cterm=NONE      ctermfg=23      ctermbg=NONE
-    hi Error            cterm=NONE      ctermfg=197     ctermbg=NONE
-    hi Identifier       cterm=NONE      ctermfg=24      ctermbg=NONE
-    hi Ignore           cterm=NONE      ctermfg=187     ctermbg=NONE
-    hi Number           cterm=NONE      ctermfg=22      ctermbg=NONE
-    hi PreProc          cterm=NONE      ctermfg=52      ctermbg=NONE
-    hi Special          cterm=NONE      ctermfg=22      ctermbg=NONE
-    hi SpecialChar      cterm=NONE      ctermfg=88      ctermbg=NONE
-    hi Statement        cterm=NONE      ctermfg=89      ctermbg=NONE
-    hi Todo             cterm=NONE      ctermfg=58      ctermbg=156
-    hi Type             cterm=NONE      ctermfg=53      ctermbg=NONE
-    hi Underlined       cterm=UNDERLINE ctermfg=NONE    ctermbg=NONE
-    hi TaglistTagName   cterm=NONE      ctermfg=29      ctermbg=118
-endif
-
-if has("gui_running")
-    hi Normal           gui=NONE        guifg=#5f5f00   guibg=#d7d7af
-    hi Cursor           gui=NONE        guifg=#ffffd7   guibg=#5f5f00
-    hi CursorLine       gui=NONE        guifg=NONE      guibg=#d7d787
-    hi CursorColumn     gui=NONE        guifg=NONE      guibg=#d7d75f
-    hi Incsearch        gui=NONE        guifg=#5f5f00   guibg=#d78787
-    hi Search           gui=NONE        guifg=#5f5f00   guibg=#d78787
-    hi ErrorMsg         gui=NONE        guifg=#5f5f00   guibg=#ff005f
-    hi WarningMsg       gui=NONE        guifg=#5f5f00   guibg=#ffff00
-    hi ModeMsg          gui=NONE        guifg=#5f5f00   guibg=#d7ff87
-    hi MoreMsg          gui=NONE        guifg=#5f5f00   guibg=#afff00
-    hi Question         gui=NONE        guifg=#005fff   guibg=NONE
-    hi StatusLine       gui=NONE        guifg=#d7d7af   guibg=#008787
-    hi StatusLineNC     gui=NONE        guifg=#5f5f00   guibg=#87875f
-    hi User1            gui=NONE        guifg=#008700   guibg=NONE
-    hi User2            gui=NONE        guifg=#00afff   guibg=NONE
-    hi VertSplit        gui=NONE        guifg=#afaf87   guibg=#afaf87
-    hi WildMenu         gui=NONE        guifg=#5f5f00   guibg=#afaf87
-    hi DiffText         gui=NONE        guifg=#5f5f00   guibg=#d7ff00
-    hi DiffChange       gui=NONE        guifg=#5f5f00   guibg=#5fff5f
-    hi DiffDelete       gui=NONE        guifg=#d7d7af   guibg=#af0000
-    hi DiffAdd          gui=NONE        guifg=#d7d7af   guibg=#0000ff
-    hi Folded           gui=NONE        guifg=#0000af   guibg=#87d7af
-    hi FoldedColumn     gui=NONE        guifg=#00afff   guibg=#d7ff00
-    hi FoldColumn       gui=NONE        guifg=#0000af   guibg=#87d7af
-    hi Directory        gui=NONE        guifg=#008700   guibg=NONE
-    hi LineNr           gui=NONE        guifg=#5f5f00   guibg=#afaf87
-    hi NonText          gui=NONE        guifg=#5f5f00   guibg=#afaf87
-    hi SpecialKey       gui=NONE        guifg=#af5f00   guibg=NONE
-    hi Title            gui=NONE        guifg=#0000af   guibg=NONE
-    hi Visual           gui=NONE        guifg=#5f5f00   guibg=#d7ff87
-    hi Comment          gui=NONE        guifg=#87875f   guibg=NONE
-    hi Constant         gui=NONE        guifg=#af5f5f   guibg=NONE
-    hi String           gui=NONE        guifg=#005f5f   guibg=NONE
-    hi Error            gui=NONE        guifg=#ff005f   guibg=NONE
-    hi Identifier       gui=NONE        guifg=#005f87   guibg=NONE
-    hi Ignore           gui=NONE        guifg=#d7d7af   guibg=NONE
-    hi Number           gui=NONE        guifg=#005f00   guibg=NONE
-    hi PreProc          gui=NONE        guifg=#5f0000   guibg=NONE
-    hi Special          gui=NONE        guifg=#005f00   guibg=NONE
-    hi SpecialChar      gui=NONE        guifg=#870000   guibg=NONE
-    hi Statement        gui=NONE        guifg=#87005f   guibg=NONE
-    hi Todo             gui=NONE        guifg=#5f5f00   guibg=#afff87
-    hi Type             gui=NONE        guifg=#5f005f   guibg=NONE
-    hi Underlined       gui=UNDERLINE   guifg=NONE      guibg=NONE
-    hi TaglistTagName   gui=NONE        guifg=#00875f   guibg=#87ff00
-endif
-
-if !has("gui_running") && v:version >= 700
-    hi Pmenu            cterm=NONE      ctermfg=229     ctermbg=29
-    hi PmenuSel         cterm=NONE      ctermfg=59      ctermbg=226
-    hi PmenuSbar        cterm=NONE      ctermfg=58      ctermbg=119
-    hi PmenuThumb       cterm=NONE      ctermfg=58      ctermbg=226
-    hi SpellBad         cterm=NONE      ctermfg=NONE    ctermbg=192
-    hi SpellRare        cterm=NONE      ctermfg=NONE    ctermbg=228
-    hi SpellLocal       cterm=NONE      ctermfg=NONE    ctermbg=224
-    hi SpellCap         cterm=NONE      ctermfg=NONE    ctermbg=145
-    hi MatchParen       cterm=NONE      ctermfg=187     ctermbg=22
-    hi TabLine          cterm=NONE      ctermfg=187     ctermbg=22
-    hi TabLineSel       cterm=NONE      ctermfg=187     ctermbg=30
-    hi TabLineFill      cterm=NONE      ctermfg=187     ctermbg=58
-endif
-
-if has("gui_running") && v:version >= 700
-    hi Pmenu            gui=NONE        guifg=#ffffaf   guibg=#00875f
-    hi PmenuSel         gui=NONE        guifg=#5f5f5f   guibg=#ffff00
-    hi PmenuSbar        gui=NONE        guifg=#5f5f00   guibg=#87ff5f
-    hi PmenuThumb       gui=NONE        guifg=#5f5f00   guibg=#ffff00
-    hi SpellBad         gui=NONE        guifg=NONE      guibg=#d7ff87
-    hi SpellRare        gui=NONE        guifg=NONE      guibg=#ffff87
-    hi SpellLocal       gui=NONE        guifg=NONE      guibg=#ffd7d7
-    hi SpellCap         gui=NONE        guifg=NONE      guibg=#afafaf
-    hi MatchParen       gui=NONE        guifg=#d7d7af   guibg=#005f00
-    hi TabLine          gui=NONE        guifg=#d7d7af   guibg=#005f00
-    hi TabLineSel       gui=NONE        guifg=#d7d7af   guibg=#008787
-    hi TabLineFill      gui=NONE        guifg=#d7d7af   guibg=#5f5f00
-endif
-
-" vim: set sts=4 et tw=0 ft=vim:
diff --git a/colors/kib_darktango.vim b/colors/kib_darktango.vim
deleted file mode 100755
index 55a8101..0000000
--- a/colors/kib_darktango.vim
+++ /dev/null
@@ -1,171 +0,0 @@
-" Vim color file
-" Name: kib_darktango
-" Maintainer: Kib� <kib2@free.fr>
-" Version: 0.3
-" Last Time Modified: 01.01.2007
-
-" Couleur du fond d'ecran
-set background=dark
-if version > 580
-	" Pas de versions inferieures a la 5.80, mais cela 
-	" fait en sorte que Vim ne se plaint pas
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let g:colors_name="kib_darktango"
-
-" To help you visit this page : http://www.vim.org/htmldoc/syntax.html#tag-highlight
-
-" ======================================================
-" ==================================== normal Mode:
-" ======================================================
-" {{{ syntax
-
-
-" ==== Some constants : 
-
-" Normal : foreground and background
-hi Normal	guibg=#2e3436 guifg=#d3d7cf
-" ==== Titles : ?
-hi Title	guifg=#4e9a06
-
-
-" ==== Comments : any comment
-hi Comment	guifg=#edd400 " any comment
-
-" ===== Constants :
-hi Constants guifg=#e9b96e " any constant   
-hi String guifg=#729fcf  " a string constant: "this is a string"
-hi Character guifg=#3465a4  " a character constant: 'c', '\n'
-hi Number guifg=#e9b96e  " a number constant: 234, 0xff
-hi Boolean guifg=#c1c144  " a boolean constant: TRUE, false
-hi Float guifg=#c1c144  " a floating point constant: 2.3e10
-
-" ===== Identifier : any variable name
-hi Identifier	guifg=#f57900   " function name (also: methods for classes)
-
-" ===== Statements : Les mots cles de chaque language
-hi Statement	guifg=#729fcf " par d�faut
-hi Conditional guifg=#4e9a06 " if, then, else, endif, switch, etc.
-hi Repeat guifg=#73d216 " boucles for, do, while, etc.
-hi Label guifg=#8ae234 " case, default, etc.
-hi Operator guifg=#fcaf3e  " "sizeof", "+", "*", etc.
-hi Keyword guifg=#f57900  " any other keyword
-hi Exception guifg=#ce5c00  " try, catch, throw
-
-" ==== PreProc : generic Preprocessor
-hi PreProc	guifg=#eeeeec " generic Preprocessor
-hi Include guifg=#eeeeec  " preprocessor #include
-hi Define guifg=#eeeeec  " preprocessor #define
-hi Macro guifg=#eeeeec  " same as Define
-hi PreCondit guifg=#eeeeec  " preprocessor #if, #else, #endif, etc.
-
-" ==== Types : int, long, char, etc.
-hi Type		guifg=#ffffff   " int, long, char, etc.
-hi StorageClass guifg=#ffffff  " static, register, volatile, etc.
-hi Structure guifg=#ffffff  " struct, union, enum, etc.
-hi Typedef guifg=#ffffff  " A typedef
- 
-" ==== Special : any special symbol
-hi Special	guifg=#eeeeec " any special symbol
-hi SpecialChar guifg=#eeeeec  " special character in a constant
-hi Tag guifg=#eeeeec  " you can use CTRL-] on this
-hi Delimiter guifg=#eeeeec  " character that needs attention
-hi SpecialComment guifg=#eeeeec  " special things inside a comment
-hi Debug guifg=#eeeeec  " debugging statements
-
-" ==== Underlined : text that stands out, liens HTML
-hi Underlined	guifg=#20b0eF gui=none
-
-" ==== Ignore :
-hi Ignore guifg=#f57900  " left blank, hidden
-
-" ==== Error : any erroneous construct
-hi Error guifg=#f57900  "
-
-" ==== Todo :
-hi Todo		guibg=#ce5c00 guifg=#eeeeec " keywords TODO FIXME and XXX
-
-" ======================================================
-" ==================================== End Normal mode
-" ======================================================
-
-" ======================================================
-" ==================================== Start Python Mode:
-" ======================================================
-
-" pythonStatement:
-hi pythonStatement guifg=#729fcf
-" pythonRepeat:
-hi pythonRepeat guifg=#8ae234
-" pythonConditional:
-hi pythonConditional guifg=#73d216
-" pythonPrecondit:
-hi pythonPrecondit guifg=#ef2929
-" pythonOperator:
-hi pythonOperator guifg=#ad7fa8
-" pythonComment:
-hi pythonComment guifg=#edd400
-" pythonEscape:
-hi pythonEscape guifg=#3465a4
-" pythonRawString:
-hi pythonRawString guifg=#ad9361
-" pythonBuiltin:
-hi pythonBuiltin guifg=#729fcf
-" pythonException:
-hi pythonException guifg=#cc0000
-" pythonFunction:
-" pythonTodo:
-" pythonDecorator:
-" pythonString:
-" pythonNumber:
-" pythonSpaceError:
-" pythonSync:
-
-" ======================================================
-" ==================================== End Python Mode:
-" ======================================================
-
-" {{{ groups
-hi Cursor	guibg=#fcaf3e guifg=#2e3436
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#888a85 guifg=#2e3436 gui=none
-hi Folded	guibg=#555753 guifg=#eeeeec
-hi FoldColumn	guibg=#2e3436 guifg=#555753
-hi LineNr	guibg=#2e3436 guifg=#c4a000
-hi MatchParen	guibg=#babdb6 guifg=#2e3436
-hi ModeMsg	guifg=#f57900
-hi MoreMsg	guifg=#f57900
-hi NonText	guibg=#2e3436 guifg=#555753
-hi Question	guifg=#aabbcc
-hi Search	guibg=#fce94f guifg=#c4a000
-hi IncSearch	guibg=#c4a000 guifg=#fce94f
-hi SpecialKey	guifg=#ce5c00
-hi StatusLine	guibg=#888a85 guifg=#2e3436 gui=none
-hi StatusLineNC	guibg=#888a85 guifg=#fce94f gui=none
-hi Visual	guibg=#fcaf3e guifg=#ce5c00 
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-hi Pmenu	guibg=#babdb6 guifg=#555753
-hi PmenuSel	guibg=#eeeeec guifg=#2e3436
-hi CursorLine	guibg=#212628
-" }}}
-
-"  {{{ terminal
-" TODO
-" }}}
-
-"vim: sw=4
diff --git a/colors/kib_plastic.vim b/colors/kib_plastic.vim
deleted file mode 100755
index 547fc0f..0000000
--- a/colors/kib_plastic.vim
+++ /dev/null
@@ -1,188 +0,0 @@
-" Vim color file
-" Name: kib_plastic
-" Maintainer: Kib� <kib2@free.fr>
-" Version: 0.1
-" Last Time Modified: 02.01.2007
-
-" Couleur du fond d'ecran
-set background=light
-if version > 580
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let g:colors_name="kib_plastic"
-
-" Help : type ':highlight' and read...
-
-" ======================================================
-" ==================================== normal Mode:
-" ======================================================
-
-" ==== Some constants : 
-
-" Normal : foreground and background
-hi Normal	guibg=#eeeeee guifg=#515044
-
-" ==== Titles : 
-hi Title	guifg=#4e9a06
-
-
-" ==== Comments : any comment
-hi Comments	guifg=#0066ff " any comment
-
-" ===== Constants :
-hi Constants guifg=#6782d3 " any constant   
-hi String guifg=#729fcf  " a string constant: "this is a string"
-hi Character guifg=#3465a4  " a character constant: 'c', '\n'
-hi Number guifg=#0066cd  " a number constant: 234, 0xff
-hi Boolean guifg=#c1c144  " a boolean constant: TRUE, false
-hi Float guifg=#c1c144  " a floating point constant: 2.3e10
-
-" ===== Identifier : any variable name
-hi Identifier	guifg=#ff8000   " function name (also: methods for classes)
-
-" ===== Statements : Les mots cles de chaque language
-hi Statement	guifg=#9700cc " par d�faut
-hi Conditional guifg=#4e9a06 " if, then, else, endif, switch, etc.
-hi Repeat guifg=#73d216 " boucles for, do, while, etc.
-hi Label guifg=#8ae234 " case, default, etc.
-hi Operator guifg=#fcaf3e  " "sizeof", "+", "*", etc.
-hi Keyword guifg=#f57900  " any other keyword
-hi Exception guifg=#ce5c00  " try, catch, throw
-
-" ==== PreProc : generic Preprocessor
-hi PreProc	guifg=#8f5502 " generic Preprocessor
-hi Include guifg=#8f5502  " preprocessor #include
-hi Define guifg=#8f5502  " preprocessor #define
-hi Macro guifg=#8f5502  " same as Define
-hi PreCondit guifg=#8f5502  " preprocessor #if, #else, #endif, etc.
-
-" ==== Types : int, long, char, etc.
-hi Type		guifg=#000000   " int, long, char, etc.
-hi StorageClass guifg=#000000  " static, register, volatile, etc.
-hi Structure guifg=#000000  " struct, union, enum, etc.
-hi Typedef guifg=#000000  " A typedef
- 
-" ==== Special : any special symbol
-hi Special	guifg=#4e9a06 " any special symbol
-hi SpecialChar guifg=#4e9a06   " special character in a constant
-hi Tag guifg=#4e9a06   " you can use CTRL-] on this
-hi Delimiter guifg=#4e9a06   " character that needs attention
-hi SpecialComment guifg=#4e9a06   " special things inside a comment
-hi Debug guifg=#4e9a06   " debugging statements
-
-" ==== Underlined : text that stands out, liens HTML
-hi Underlined	guifg=#20b0eF gui=none
-
-" ==== Ignore :
-hi Ignore guifg=#f57900  " left blank, hidden
-
-" ==== Error : any erroneous construct
-hi Error guifg=#990000  "
-
-" ==== Todo :
-hi Todo		guibg=#ce5c00 guifg=#eeeeec " keywords TODO FIXME and XXX
-
-" ======================================================
-" ==================================== End Normal mode
-" ======================================================
-
-" ======================================================
-" ==================================== Start Python Mode:
-" ==== Dmitry Vasiliev as written a very good Python.vim
-" ==== syntax file, wich brings more features. See:
-" ==== http://www.hlabs.spb.ru/vim/python.vim
-" ======================================================
-
-" pythonSync: 
-
-" pythonStatement:
-hi pythonStatement guifg=#4e9a06 " Python Statement : break, continue, del
-
-" pythonImport:
-hi pythonImport guifg=#9700cc " Python Imports : break, continue, del
-
-" pythonRepeat:
-hi pythonRepeat guifg=#4e9a06 " Python Repeat : for, while, etc.
-
-" pythonConditional:
-hi pythonConditional guifg=#d28202 " Python conditonnal : if, elif, else, then
-
-" pythonPrecondit:
-hi pythonPrecondit guifg=#ef2929 " python Precondit : import from
-
-" pythonOperator: 
-hi pythonOperator guifg=#ef2929 " pythonOperator : and, in, is, not, or
-
-" pythonComment:
-hi pythonComment guifg=#0066ff " Python comments
-
-" pythonEscape:
-
-
-" pythonRawString:
-hi pythonRawString guifg=#ad7fa8 " Python raw strings
-
-" pythonBuiltin: True False bool enumerate set frozenset help
-
-
-" pythonException:
-
-" ===== Linked 
-" pythonFunction: links to Function
-
-" pythonTodo: links to Todo
-
-" pythonDecorator: links to Define 
-
-" pythonString: links to String
-
-" pythonNumber: links to Number
-
-" pythonSpaceError: links to Error
-
-" ======================================================
-" ==================================== End Python Mode:
-" ======================================================
-hi Cursor guibg=#ff6a6a guifg=#ffffff
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=#888a85 guifg=#2e3436 gui=none
-hi Folded	    guibg=#babdb6 guifg=#000000             " How the text appears once folded
-hi FoldColumn	guibg=#babdb6 guifg=#555753 
-hi LineNr	    guibg=#eeeeee guifg=#fcaf3e             " Line numbers
-hi MatchParen	guibg=#babdb6 guifg=#2e3436
-hi ModeMsg	    guifg=#f57900
-hi MoreMsg	    guifg=#f57900
-hi NonText	    guibg=#eeeeee guifg=#555753
-hi Question	    guifg=#aabbcc
-hi Search	    guibg=#fce94f guifg=#c4a000
-hi IncSearch	guibg=#c4a000 guifg=#fce94f
-hi SpecialKey	guifg=#ce5c00
-hi StatusLine	guibg=#888a85 guifg=#2e3436 gui=none
-hi StatusLineNC	guibg=#888a85 guifg=#fce94f gui=none
-hi Visual	    guibg=#ff6a6a guifg=#000000             " Selection of text in Visual Mode
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-hi WildMenu
-hi Menu        guibg=#ff6a6a guifg=#000000
-"hi Scrollbar   guibg=grey30 guifg=tan
-"hi Tooltip
-hi Pmenu	    guibg=#babdb6 guifg=#555753
-hi PmenuSel	    guibg=#eeeeee guifg=#2e3436
-hi CursorLine	guibg=#212628
-
-
-"  {{{ terminal
-" TODO
-" }}}
-
-"vim: sw=4
diff --git a/colors/kiss.vim b/colors/kiss.vim
deleted file mode 100755
index 747d001..0000000
--- a/colors/kiss.vim
+++ /dev/null
@@ -1,147 +0,0 @@
-" Vim color file
-" Maintaner: kt0x2e <kt0x2e@gmail.com>
-" Last Change: 2010 Apr 25
-" Version: 0.1
-
-hi clear
-set background=dark
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "kiss"
-let ruby_operators = 1
-
-" Default Colors
-hi Normal  guifg=#d0d0d0 guibg=#1f1f1f
-hi NonText guibg=#1F1F1F guifg=#e783e9 gui=none
-
-hi Cursor  guibg=#babdb6
-hi ICursor guibg=#babdb6
-
-" Search
-hi Search    guifg=#2e3436 guibg=#90bdf1
-hi IncSearch guibg=#2e3436 guifg=#90bdf1
-
-" Window Elements
-hi StatusLine   ctermbg=0     ctermfg=241   cterm=none
-hi StatusLineNC ctermbg=237   ctermfg=241   cterm=none
-hi VertSplit    guifg=#555753 guibg=#888a85 gui=none
-hi Visual       guibg=#000000
-hi MoreMsg      guifg=#729fcf
-hi Question     guifg=#bf81fa gui=none
-hi WildMenu     guifg=#eeeeec guibg=#0e1416
-hi LineNr       guifg=#696567 guibg=#000000
-hi SignColumn   guibg=#bf81fa
-
-" Pmenu
-hi Pmenu      guibg=#2e3436 guifg=#eeeeec
-hi PmenuSel   guibg=#ffffff guifg=#1e2426
-hi PmenuSbar  guibg=#555753
-hi PmenuThumb guifg=#ffffff
-
-" Diff
-hi DiffDelete guifg=#2e3436 guibg=#0e1416
-hi DiffAdd    guibg=#1f2b2d
-hi DiffChange guibg=#2e3436
-hi DiffText   guibg=#000000 gui=none
-
-" Folds
-hi Folded     guifg=#656563 guibg=#0e0e0e
-hi FoldColumn guifg=#3465a4 guibg=#000000
-
-" Specials
-hi Title      guifg=#90bdf1
-hi Todo       guifg=#90bdf1 guibg=bg
-hi SpecialKey guifg=#e783e9
-
-" Tabs
-hi TabLine     guibg=#0a1012 guifg=#888a85
-hi TabLineFill guifg=#0a1012
-hi TabLineSel  guibg=#555753 guifg=#eeeeec gui=none
-
-" Matches
-hi MatchParen guifg=#2e3436 guibg=#90bdf1
-
-" Tree
-hi Directory guifg=#ffffff
-
-" Syntax
-hi Comment    guifg=#656763
-hi Constant   guifg=#bf81fa
-hi Number     guifg=#bf81fa
-hi Statement  guifg=#e783e9 gui=none
-hi Identifier guifg=#bf81fa
-hi PreProc    guifg=#90bdf1
-hi Function   guifg=#90bdf1
-hi Type       guifg=#90bdf1 gui=none
-hi Keyword    guifg=#bf81fa
-hi Special    guifg=#888a85
-hi Error      guifg=#eeeeec guibg=#cc0000
-
-" PHP
-hi phpRegionDelimiter          guifg=#ad7fa8
-hi phpPropertySelector         guifg=#888a85
-hi phpPropertySelectorInString guifg=#888a85
-hi phpOperator                 guifg=#888a85
-hi phpArrayPair                guifg=#888a85
-hi phpAssignByRef              guifg=#888a85
-hi phpRelation                 guifg=#888a85
-hi phpMemberSelector           guifg=#888a85
-hi phpUnknownSelector          guifg=#888a85
-hi phpVarSelector              guifg=#babdb6
-hi phpSemicolon                guifg=#888a85 gui=none
-hi phpFunctions                guifg=#d3d7cf
-hi phpParent                   guifg=#888a85
-
-" JavaScript
-hi javaScriptBraces   guifg=#888a85
-hi javaScriptOperator guifg=#888a85
-
-" HTML
-hi htmlTag            guifg=#888a85
-hi htmlEndTag         guifg=#888a85
-hi htmlTagName        guifg=#babdb6
-hi htmlSpecialTagName guifg=#babdb6
-hi htmlArg            guifg=#d3d7cf
-hi htmlTitle          guifg=#bf81fa gui=none
-hi link htmlH1 htmlTitle
-hi link htmlH2 htmlH1
-hi link htmlH3 htmlH1
-hi link htmlH4 htmlH1
-hi link htmlH5 htmlH1
-hi link htmlH6 htmlH1
-
-" XML
-hi link xmlTag    htmlTag
-hi link xmlEndTag htmlEndTag
-hi link xmlAttrib htmlArg
-
-" CSS
-hi cssSelectorOp    guifg=#eeeeec
-hi cssUIProp        guifg=#d3d7cf
-hi cssPseudoClassId guifg=#eeeeec
-hi cssBraces        guifg=#888a85
-hi cssIdentifier    guifg=#90bdf1
-hi cssTagName       guifg=#90bdf1
-hi link cssSelectorOp2          cssSelectorOp
-hi link cssPagingProp           cssUIProp
-hi link cssGeneratedContentProp cssUIProp
-hi link cssRenderProp           cssUIProp
-hi link cssBoxProp              cssUIProp
-hi link cssTextProp             cssUIProp
-hi link cssColorProp            cssUIProp
-hi link cssFontProp             cssUIProp
-hi link cssInclude              Function
-hi link cssCommonAttr           Constant
-hi link cssUIAttr               Constant
-hi link cssTableAttr            Constant
-hi link cssPagingAttr           Constant
-hi link cssGeneratedContentAttr Constant
-hi link cssAuralAttr            Constant
-hi link cssRenderAttr           Constant
-hi link cssBoxAttr              Constant
-hi link cssTextAttr             Constant
-hi link cssColorAttr            Constant
-hi link cssFontAttr             Constant
diff --git a/colors/kkruby.vim b/colors/kkruby.vim
deleted file mode 100755
index 564ffda..0000000
--- a/colors/kkruby.vim
+++ /dev/null
@@ -1,86 +0,0 @@
-" Vim color scheme
-"
-" Name:         kkruby.vim
-" Auth:   kk, Mitko Kostov <mitkok@7thoughts.com>
-" Last Change:  09 May 2011
-" License:      MIT
-" Version:      0.3
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "kkruby"
-hi link htmlTag                     xmlTag
-hi link htmlTagName                 xmlTagName
-hi link htmlEndTag                  xmlEndTag
-
-highlight Normal                    guifg=#c1c1c1 guibg=#050706
-highlight Cursor                    guifg=#FFFFFF ctermfg=0 guibg=#FFFFFF ctermbg=15	
-highlight CursorLine                guibg=#000000 ctermbg=233 cterm=NONE
-
-highlight Comment                   guifg=#66b666 ctermfg=180
-highlight Constant                  guifg=#4596ff ctermfg=73
-highlight Define                    guifg=#ff6458 ctermfg=173
-highlight Error                     guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88
-highlight Function                  guifg=#50e7c5 ctermfg=221 gui=NONE cterm=NONE
-highlight Identifier                guifg=#dFdF10 ctermfg=73 gui=NONE cterm=NONE
-highlight Include                   guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
-highlight PreCondit                 guifg=yellow ctermfg=173 gui=NONE cterm=NONE
-highlight Keyword                   guifg=yellow ctermfg=173 cterm=NONE
-highlight LineNr                    guifg=#9E9E9E ctermfg=159 guibg=#171717
-highlight Number                    guifg=#A5C261 ctermfg=107
-highlight PreProc                   guifg=#CC7833 ctermfg=103
-highlight Search                    guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline
-highlight Statement                 guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
-highlight String                    guifg=#d6d881 ctermfg=107
-highlight Title                     guifg=#CC7833 ctermfg=15
-highlight Type                      guifg=#DA4939 ctermfg=167 gui=NONE cterm=NONE
-highlight Visual                    guibg=#5A647E ctermbg=60
-
-highlight DiffAdd                   guifg=#E6E1DC ctermfg=7 guibg=#519F50 ctermbg=71
-highlight DiffDelete                guifg=#E6E1DC ctermfg=7 guibg=#660000 ctermbg=52
-highlight Special                   guifg=#bb3333 ctermfg=167 
-
-highlight rubyBlockParameter        guifg=#7bcfff ctermfg=15
-highlight rubyClass                 guifg=#8eb999 ctermfg=15
-highlight rubyConstant              guifg=#72b6ff ctermfg=167
-highlight rubyInstanceVariable      guifg=#4596ff ctermfg=189
-highlight rubyInterpolation         guifg=#d990de ctermfg=107
-highlight rubyLocalVariableOrMethod guifg=#d990de ctermfg=189
-highlight rubyPredefinedConstant    guifg=#4596ff ctermfg=167
-highlight rubyPseudoVariable        guifg=#4596ff ctermfg=221
-highlight rubyStringDelimiter       guifg=#99cf50 ctermfg=143
-
-"全局变量$
-highlight rubyIdentifier            guifg=#58c353     ctermfg=143
-
-highlight rubyOperator              guifg=#0000ff     ctermfg=143
-highlight rubyInclude               guifg=#888888
-"if 条件
-highlight rubyConditional           guifg=#b34040
-highlight rubyOptionalDo            guifg=#ff0000
-"单行操作符
-highlight rubyConditionalModifier   guifg=#6f40a8
-"do end
-highlight rubyControl               guifg=#afbf00
-highlight rubyClassVariable         guifg=#7f3030
-highlight rubyAttribute             guifg=#af0b15
-highlight rubyEval                  guifg=#48d1f0
-
-highlight rubyPseudoVariable        guifg=#af04a7
-highlight rubyPredifinedIdentifier  guifg=#aa4400
-highlight xmlTag                    guifg=#E81F6A ctermfg=179
-highlight xmlTagName                guifg=#E81F6A ctermfg=179
-highlight xmlEndTag                 guifg=#e81F6A ctermfg=179
-highlight mailSubject               guifg=#A5C261 ctermfg=107
-highlight mailHeaderKey             guifg=#FFC66D ctermfg=221
-highlight mailEmail                 guifg=#A5C261 ctermfg=107 gui=italic cterm=underline
-highlight rubyModule                guifg=#ef5969
-highlight rubyDefine                guifg=#c0399D
-highlight SpellBad                  guifg=#D70000 ctermfg=160 ctermbg=NONE cterm=underline
-highlight SpellRare                 guifg=#D75F87 ctermfg=168 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight SpellCap                  guifg=#ff000F ctermfg=189 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight MatchParen                guifg=#519F50 ctermfg=15 guibg=#005f5f ctermbg=23
-
diff --git a/colors/kolor.vim b/colors/kolor.vim
deleted file mode 100755
index 261718b..0000000
--- a/colors/kolor.vim
+++ /dev/null
@@ -1,200 +0,0 @@
-"
-"
-"
-"
-"                     dP                dP
-"                    88                88
-"                   88  .dP  .d8888b. 88 .d8888b. 88d888b.
-"                  88888"   88'  `88 88 88'  `88 88'  `88
-"                 88  `8b. 88.  .88 88 88.  .88 88
-"                dP   `YP `88888P' dP `88888P' dP
-"
-"
-"                   ...when you need pro colors!
-"
-"
-"
-"
-" Name: Kolor
-" Author: Alessandro Di Martino
-" Version: 1.3.0
-" URL: https://github.com/zeis/vim-kolor
-" License: MIT License (see end of this file)
-"
-" --------------------------------------------------------------------------
-" DESCRIPTION
-" --------------------------------------------------------------------------
-" Colorful Vim color scheme with 256 color terminal support.
-" Designed to have high text readability and optimal visibility of every
-" element, and to be eye comfortable as well.
-"
-" --------------------------------------------------------------------------
-" INSTALLATION
-" --------------------------------------------------------------------------
-" Copy kolor.vim to ~/.vim/colors (on Windows <your-vim-dir>\vimfiles\colors).
-" Then add the line "colorscheme kolor" in your vimrc file, and restart Vim.
-" If you use Pathogen, the directory structure is compatible.
-"
-" --------------------------------------------------------------------------
-" DONATIONS
-" --------------------------------------------------------------------------
-" If you want to make a donation, rather, consider to help the Uganda children
-" on Vim's website.
-" This color scheme is dedicated to them.
-
-
-highlight clear
-set background=dark
-if exists('syntax_on')
-    syntax reset
-endif
-let g:colors_name='kolor'
-
-highlight Normal          guifg=#c6c6c6    guibg=#2e2d2b    gui=none
-highlight SpecialKey      guifg=#7eaefd    guibg=NONE       gui=none
-highlight NonText         guifg=#7eaefd    guibg=#2e2d2b    gui=none
-highlight Directory       guifg=#e6987a    guibg=NONE       gui=none
-highlight ErrorMsg        guifg=#d96e8a    guibg=NONE       gui=bold
-highlight IncSearch       guifg=#000000    guibg=#ff5fd7    gui=none
-highlight Search          guifg=#ff8901    guibg=NONE       gui=bold
-highlight MoreMsg         guifg=#8cd991    guibg=NONE       gui=bold
-highlight ModeMsg         guifg=#e2e2e2    guibg=NONE       gui=bold
-highlight LineNr          guifg=#808080    guibg=#242322    gui=none
-highlight CursorLineNr    guifg=#e2e2e2    guibg=#383734    gui=bold
-highlight Question        guifg=#75d7d8    guibg=NONE       gui=bold
-highlight StatusLine      guifg=#000000    guibg=#9e9e9e    gui=none
-highlight StatusLineNC    guifg=#b2b2b2    guibg=#4a4a4a    gui=none
-highlight VertSplit       guifg=#4a4a4a    guibg=#4a4a4a    gui=none
-highlight Title           guifg=#e2e2e2    guibg=NONE       gui=none
-highlight Visual          guifg=#e2e2e2    guibg=#5c5c5c    gui=none
-highlight VisualNOS       guifg=#e2e2e2    guibg=NONE       gui=underline
-highlight WarningMsg      guifg=#ff5fd7    guibg=NONE       gui=bold
-highlight WildMenu        guifg=#000000    guibg=#75d7d8    gui=none
-highlight Folded          guifg=#8787af    guibg=#242322    gui=none
-highlight FoldColumn      guifg=#8787af    guibg=#242322    gui=none
-highlight DiffAdd         guifg=NONE       guibg=#005154    gui=none
-highlight DiffChange      guifg=NONE       guibg=#4f3598    gui=none
-highlight DiffDelete      guifg=#d96e8a    guibg=#72323f    gui=none
-highlight DiffText        guifg=NONE       guibg=#00488e    gui=none
-highlight SignColumn      guifg=#808080    guibg=#2e2d2b    gui=none
-highlight Conceal         guifg=#c6c6c6    guibg=NONE       gui=none
-highlight SpellBad        guifg=NONE       guibg=NONE       gui=undercurl    guisp=#d96e8a
-highlight SpellCap        guifg=NONE       guibg=NONE       gui=undercurl    guisp=#75d7d8
-highlight SpellRare       guifg=NONE       guibg=NONE       gui=undercurl    guisp=#8cd991
-highlight SpellLocal      guifg=NONE       guibg=NONE       gui=undercurl    guisp=#dbc570
-highlight Pmenu           guifg=#c6c6c6    guibg=#242322    gui=none
-highlight PmenuSel        guifg=#000000    guibg=#7eaefd    gui=none
-highlight PmenuSbar       guifg=#ff5fd7    guibg=#262626    gui=none
-highlight PmenuSbar       guifg=#ff5fd7    guibg=#2e2d2b    gui=none
-highlight PmenuThumb      guifg=#2e2d2b    guibg=#ff5fd7    gui=none
-highlight TabLine         guifg=#808080    guibg=#242322    gui=none
-highlight TablineSel      guifg=#000000    guibg=#9e9e9e    gui=none
-highlight TablineFill     guifg=#808080    guibg=#242322    gui=none
-highlight CursorColumn    guifg=NONE       guibg=#383734    gui=none
-highlight CursorLine      guifg=NONE       guibg=#383734    gui=none
-highlight ColorColumn     guifg=NONE       guibg=#383734    gui=none
-highlight Cursor          guifg=#000000    guibg=#e2e2e2    gui=none
-highlight lCursor         guifg=#000000    guibg=#e2e2e2    gui=none
-highlight MatchParen      guifg=#2e2c29    guibg=#ff5fd7    gui=bold
-highlight Comment         guifg=#808080    guibg=NONE       gui=italic
-highlight Constant        guifg=#e6987a    guibg=NONE       gui=italic
-highlight Special         guifg=#ce6bd0    guibg=NONE       gui=none
-highlight Identifier      guifg=#75d7d8    guibg=NONE       gui=none
-highlight Statement       guifg=#d96e8a    guibg=NONE       gui=bold
-highlight PreProc         guifg=#dbc570    guibg=NONE       gui=none
-highlight Type            guifg=#a080ea    guibg=NONE       gui=bold
-highlight Underlined      guifg=#7eaefd    guibg=NONE       gui=underline
-highlight Error           guifg=#d96e8a    guibg=NONE       gui=bold
-highlight Todo            guifg=#75d7d8    guibg=NONE       gui=bold
-highlight String          guifg=#ad8788    guibg=NONE       gui=italic
-highlight Number          guifg=#dbc570    guibg=NONE       gui=none
-highlight Function        guifg=#88da77    guibg=NONE       gui=none
-highlight Keyword         guifg=#d96e8a    guibg=NONE       gui=bold
-
-if &t_Co > 255
-  highlight Normal          ctermfg=251     ctermbg=235     cterm=none
-  highlight SpecialKey      ctermfg=111     ctermbg=none    cterm=none
-  highlight NonText         ctermfg=111     ctermbg=235     cterm=none
-  highlight Directory       ctermfg=180     ctermbg=none    cterm=none
-  highlight ErrorMsg        ctermfg=168     ctermbg=none    cterm=bold
-  highlight IncSearch       ctermfg=0       ctermbg=206     cterm=none
-  highlight Search          ctermfg=208     ctermbg=none    cterm=bold
-  highlight MoreMsg         ctermfg=121     ctermbg=none    cterm=bold
-  highlight ModeMsg         ctermfg=254     ctermbg=none    cterm=bold
-  highlight LineNr          ctermfg=244     ctermbg=234     cterm=none
-  highlight CursorLineNr    ctermfg=254     ctermbg=236     cterm=bold
-  highlight Question        ctermfg=80      ctermbg=none    cterm=bold
-  highlight StatusLine      ctermfg=0       ctermbg=247     cterm=none
-  highlight StatusLineNC    ctermfg=247     ctermbg=238     cterm=none
-  highlight VertSplit       ctermfg=238     ctermbg=238     cterm=none
-  highlight Title           ctermfg=254     ctermbg=none    cterm=none
-  highlight Visual          ctermfg=254     ctermbg=240     cterm=none
-  highlight VisualNOS       ctermfg=254     ctermbg=none    cterm=underline
-  highlight WarningMsg      ctermfg=206     ctermbg=none    cterm=bold
-  highlight WildMenu        ctermfg=0       ctermbg=80      cterm=none
-  highlight Folded          ctermfg=103     ctermbg=234     cterm=none
-  highlight FoldColumn      ctermfg=103     ctermbg=234     cterm=none
-  highlight DiffAdd         ctermfg=none    ctermbg=23      cterm=none
-  highlight DiffChange      ctermfg=none    ctermbg=56      cterm=none
-  highlight DiffDelete      ctermfg=168     ctermbg=96      cterm=none
-  highlight DiffText        ctermfg=none    ctermbg=25      cterm=none
-  highlight SignColumn      ctermfg=244     ctermbg=235     cterm=none
-  highlight Conceal         ctermfg=251     ctermbg=none    cterm=none
-  highlight SpellBad        ctermfg=168     ctermbg=none    cterm=underline
-  highlight SpellCap        ctermfg=80      ctermbg=none    cterm=underline
-  highlight SpellRare       ctermfg=121     ctermbg=none    cterm=underline
-  highlight SpellLocal      ctermfg=186     ctermbg=none    cterm=underline
-  highlight Pmenu           ctermfg=251     ctermbg=234     cterm=none
-  highlight PmenuSel        ctermfg=0       ctermbg=111     cterm=none
-  highlight PmenuSbar       ctermfg=206     ctermbg=235     cterm=none
-  highlight PmenuThumb      ctermfg=235     ctermbg=206     cterm=none
-  highlight TabLine         ctermfg=244     ctermbg=234     cterm=none
-  highlight TablineSel      ctermfg=0       ctermbg=247     cterm=none
-  highlight TablineFill     ctermfg=244     ctermbg=234     cterm=none
-  highlight CursorColumn    ctermfg=none    ctermbg=236     cterm=none
-  highlight CursorLine      ctermfg=none    ctermbg=236     cterm=none
-  highlight ColorColumn     ctermfg=none    ctermbg=236     cterm=none
-  highlight Cursor          ctermfg=0       ctermbg=254     cterm=none
-  highlight MatchParen      ctermfg=235     ctermbg=206     cterm=bold
-  highlight Comment         ctermfg=244     ctermbg=none    cterm=none
-  highlight Constant        ctermfg=180     ctermbg=none    cterm=none
-  highlight Special         ctermfg=176     ctermbg=none    cterm=none
-  highlight Identifier      ctermfg=80      ctermbg=none    cterm=none
-  highlight Statement       ctermfg=168     ctermbg=none    cterm=bold
-  highlight PreProc         ctermfg=186     ctermbg=none    cterm=none
-  highlight Type            ctermfg=141     ctermbg=none    cterm=bold
-  highlight Underlined      ctermfg=111     ctermbg=none    cterm=underline
-  highlight Error           ctermfg=168     ctermbg=none    cterm=bold
-  highlight Todo            ctermfg=80      ctermbg=none    cterm=bold
-  highlight String          ctermfg=138     ctermbg=none    cterm=none
-  highlight Number          ctermfg=186     ctermbg=none    cterm=none
-  highlight Function        ctermfg=114     ctermbg=none    cterm=none
-  highlight Keyword         ctermfg=168     ctermbg=none    cterm=bold
-end
-
-
-" --------------------------------------------------------------------------
-" LICENSE
-" --------------------------------------------------------------------------
-" Copyright (c) 2012 Alessandro Di Martino
-"
-" Permission is hereby granted, free of charge, to any person
-" obtaining a copy of this software and associated documentation
-" files (the "Software"), to deal in the Software without
-" restriction, including without limitation the rights to use,
-" copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the
-" Software is furnished to do so, subject to the following
-" conditions:
-"
-" The above copyright notice and this permission notice shall be
-" included in all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-" OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-" HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-" OTHER DEALINGS IN THE SOFTWARE.
diff --git a/colors/kruby.vim b/colors/kruby.vim
deleted file mode 100755
index a7259cd..0000000
--- a/colors/kruby.vim
+++ /dev/null
@@ -1,86 +0,0 @@
-" Vim color scheme
-"
-" Name:         kkruby.vim
-" Auth:   kk, Mitko Kostov <mitkok@7thoughts.com>
-" Last Change:  09 May 2011
-" License:      MIT
-" Version:      0.3
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "kkruby"
-hi link htmlTag                     xmlTag
-hi link htmlTagName                 xmlTagName
-hi link htmlEndTag                  xmlEndTag
-
-"highlight Normal                    guifg=#E6E1DC guibg=#090909
-highlight Normal                    guifg=#d1c1cf guibg=#070706
-highlight Cursor                    guifg=#FFFFFF ctermfg=0 guibg=#FFFFFF ctermbg=15	
-highlight CursorLine                guibg=#000000 ctermbg=233 cterm=NONE
-
-highlight Comment                   guifg=#76d676 ctermfg=180
-highlight Constant                  guifg=#4596ff ctermfg=73
-highlight Define                    guifg=#ff6458 ctermfg=173
-highlight Error                     guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88
-highlight Function                  guifg=#50e7c5 ctermfg=221 gui=NONE cterm=NONE
-highlight Identifier                guifg=#dFdF10 ctermfg=73 gui=NONE cterm=NONE
-highlight Include                   guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
-highlight PreCondit                 guifg=yellow ctermfg=173 gui=NONE cterm=NONE
-highlight Keyword                   guifg=yellow ctermfg=173 cterm=NONE
-highlight LineNr                    guifg=#9E9E9E ctermfg=159 guibg=#171717
-highlight Number                    guifg=#A5C261 ctermfg=107
-highlight PreProc                   guifg=#CC7833 ctermfg=103
-highlight Search                    guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline
-highlight Statement                 guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
-highlight String                    guifg=#e6f881 ctermfg=107
-highlight Title                     guifg=#CC7833 ctermfg=15
-highlight Type                      guifg=#DA4939 ctermfg=167 gui=NONE cterm=NONE
-highlight Visual                    guibg=#5A647E ctermbg=60
-
-highlight DiffAdd                   guifg=#E6E1DC ctermfg=7 guibg=#519F50 ctermbg=71
-highlight DiffDelete                guifg=#E6E1DC ctermfg=7 guibg=#660000 ctermbg=52
-highlight Special                   guifg=#bb3333 ctermfg=167 
-
-highlight rubyBlockParameter        guifg=#7bcfff ctermfg=15
-highlight rubyClass                 guifg=#8eb999 ctermfg=15
-highlight rubyConstant              guifg=#72b6ff ctermfg=167
-highlight rubyInstanceVariable      guifg=#4596ff ctermfg=189
-highlight rubyInterpolation         guifg=#d990de ctermfg=107
-highlight rubyLocalVariableOrMethod guifg=#d990de ctermfg=189
-highlight rubyPredefinedConstant    guifg=#4596ff ctermfg=167
-highlight rubyPseudoVariable        guifg=#4596ff ctermfg=221
-highlight rubyStringDelimiter       guifg=#99cf50 ctermfg=143
-
-"全局变量$
-highlight rubyIdentifier            guifg=#58c353     ctermfg=143
-
-highlight rubyOperator              guifg=#0000ff     ctermfg=143
-highlight rubyInclude               guifg=#888888
-"if 条件
-highlight rubyConditional           guifg=#bf3030
-highlight rubyOptionalDo            guifg=#ff0000
-"单行操作符
-highlight rubyConditionalModifier   guifg=#6f40a8
-highlight rubyControl               guifg=#8fe040
-highlight rubyClassVariable         guifg=#3f0000
-highlight rubyAttribute             guifg=#af0b15
-highlight rubyEval                  guifg=#48d1f0
-
-highlight rubyPseudoVariable        guifg=#af04a7
-highlight rubyPredifinedIdentifier  guifg=#aa4400
-highlight xmlTag                    guifg=#E81F6A ctermfg=179
-highlight xmlTagName                guifg=#E81F6A ctermfg=179
-highlight xmlEndTag                 guifg=#e81F6A ctermfg=179
-highlight mailSubject               guifg=#A5C261 ctermfg=107
-highlight mailHeaderKey             guifg=#FFC66D ctermfg=221
-highlight mailEmail                 guifg=#A5C261 ctermfg=107 gui=italic cterm=underline
-highlight rubyModule                guifg=#ef5969
-highlight rubyDefine                guifg=#a0499D
-highlight SpellBad                  guifg=#D70000 ctermfg=160 ctermbg=NONE cterm=underline
-highlight SpellRare                 guifg=#D75F87 ctermfg=168 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight SpellCap                  guifg=#ff000F ctermfg=189 guibg=NONE ctermbg=NONE gui=underline cterm=underline
-highlight MatchParen                guifg=#519F50 ctermfg=15 guibg=#005f5f ctermbg=23
-
diff --git a/colors/kyle.vim b/colors/kyle.vim
deleted file mode 100755
index 5a34391..0000000
--- a/colors/kyle.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-" vim:sw=8:ts=8
-"
-" act like t_Co=0 but use (256) color on just a few things
-"
-
-set background=light
-
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "kyle"
-
-if &background == "light"
-  hi Normal             cterm=NONE              ctermbg=7       ctermfg=235
-endif
-
-hi Normal               cterm=NONE              ctermbg=234     ctermfg=250
-hi SpecialKey		cterm=bold		ctermfg=NONE
-hi IncSearch		cterm=reverse		ctermfg=NONE
-hi Search		cterm=reverse		ctermfg=NONE
-hi MoreMsg		cterm=bold		ctermfg=NONE
-hi ModeMsg		cterm=bold		ctermfg=NONE
-hi LineNr		cterm=NONE		ctermfg=238
-hi StatusLine		cterm=bold,reverse	ctermfg=NONE
-hi StatusLineNC		cterm=reverse		ctermfg=NONE
-hi VertSplit		cterm=reverse		ctermfg=NONE
-hi Title		cterm=bold		ctermfg=NONE
-hi Visual		cterm=reverse		ctermfg=NONE
-hi VisualNOS		cterm=bold	        ctermfg=NONE
-hi WarningMsg		cterm=standout		ctermfg=NONE
-hi WildMenu		cterm=standout		ctermfg=NONE
-hi Folded		cterm=standout		ctermfg=NONE
-hi FoldColumn		cterm=standout		ctermfg=NONE
-hi DiffAdd		cterm=bold		ctermfg=NONE
-hi DiffChange		cterm=bold		ctermfg=NONE
-hi DiffDelete		cterm=bold		ctermfg=NONE
-hi DiffText		cterm=reverse		ctermfg=NONE
-hi Type                 cterm=None              ctermbg=NONE    ctermfg=NONE
-hi Keyword              cterm=None              ctermbg=NONE    ctermfg=NONE
-hi Number               cterm=None              ctermbg=NONE    ctermfg=NONE
-hi Char                 cterm=None              ctermbg=NONE    ctermfg=NONE
-hi Format               cterm=None              ctermbg=NONE    ctermfg=NONE
-hi Special              cterm=underline         ctermbg=NONE    ctermfg=NONE
-hi Constant             cterm=None              ctermbg=NONE    ctermfg=NONE
-hi PreProc              cterm=None              ctermfg=NONE
-hi Directive            cterm=NONE              ctermbg=NONE    ctermfg=NONE
-hi Conditional          cterm=NONE              ctermbg=NONE    ctermfg=NONE
-hi Comment		cterm=NONE		ctermbg=NONE    ctermfg=245
-hi Func                 cterm=None              ctermbg=234     ctermfg=250
-hi Identifier           cterm=NONE              ctermbg=NONE    ctermfg=NONE
-hi Statement            cterm=NONE              ctermbg=NONE    ctermfg=NONE
-hi Ignore		cterm=bold		ctermfg=NONE
-hi String               cterm=underline         ctermfg=NONE
-hi ErrorMsg		cterm=reverse		ctermfg=9	ctermbg=15
-hi Error		cterm=reverse		ctermfg=9	ctermbg=15
-hi Todo			cterm=bold,standout	ctermfg=11	ctermbg=0
-hi MatchParen		cterm=bold		ctermfg=none	ctermbg=250
-
-hi ColorColumn							ctermbg=255
diff --git a/colors/lazarus.vim b/colors/lazarus.vim
deleted file mode 100755
index 073d147..0000000
--- a/colors/lazarus.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Vim color file
-" Maintainer : Sebastian-Torsten Tillmann <sttillmann@users.sourceforge.net>
-" Last Change: 2006-10-04
-" Version    : 1.0.0
-
-set background=light
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="lazarus"
-
-hi Comment    gui=Bold		guifg=Blue  		guibg=NONE
-hi Constant   gui=NONE    guifg=Blue		  guibg=NONE
-hi Identifier gui=NONE    guifg=Red		    guibg=NONE
-hi Statement  gui=Bold    guifg=Black     guibg=NONE
-hi PreProc    gui=Bold    guifg=Red				guibg=NONE
-hi Type       gui=NONE    guifg=Black     guibg=NONE
-hi Special    gui=NONE    guifg=Blue		  guibg=NONE
-hi Todo       gui=Italic  guifg=Red			  guibg=NONE
-hi Error      gui=NONE    guifg=Red			  guibg=NONE
diff --git a/colors/legiblelight.vim b/colors/legiblelight.vim
deleted file mode 100755
index 4f4e29f..0000000
--- a/colors/legiblelight.vim
+++ /dev/null
@@ -1,362 +0,0 @@
-"==============================================================================
-"Filename:              legiblelight.vim
-"Last Modified:         2010-06-03
-"Version:               1.1.2
-"Maintainer:            Tony Dunsworth <tony.dunsworth AT gmail DOT com>
-"Copyright:             2010 Tony Dunsworth
-"                       This script is free software; you can do almost
-"                       anything you wish with it under the terms of the GNU
-"                       General Public License version 2 as published by the
-"                       Free Software Foundation.
-"Description:           Vim colour scheme - code framework a blend of tabula
-"                       by Bernd Pol and maroloccio by Marco Ipolito. The colour
-"                       scheme is completely mine. I wanted a better light
-"                       scheme which matches my tastes for blues and greens.
-"                       There are versions for GUI and 256 colour xterm (I'm
-"                       hoping that one looks better.)
-"Scheme:                legiblelight
-"Install:               Put this file in the users color directory
-"                       (~/.vim/colors) then load it with :colorscheme
-"                       legiblelight.
-"==============================================================================
-"Latest Changes
-"==============================================================================
-"- First iteration, so just putting it all together.
-"==============================================================================
-
-hi clear
-set background=light
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "legiblelight"
-"let g:Tabula_setOptions = 0
-
-" --- GUI section
-
-hi Normal           guifg=#0000cd   guibg=#ffffff   gui=none    " mediumblue on white
-hi Cursor           guifg=#696969   guibg=fg        gui=none    " dimgray on mediumblue
-hi CursorColumn     guifg=fg        guibg=#dcdcdc   gui=none    " mediumblue on gainsboro
-hi CursorLine       guifg=fg        guibg=#dcdcdc   gui=none    " mediumblue on gainsboro
-hi CursorIM         guifg=#00008b   guibg=bg        gui=none    " darkblue on background
-hi DiffAdd          guifg=#4b0082   guibg=bg        gui=none    " indigo on background
-hi DiffChange       guifg=#800080   guibg=bg        gui=none    " purple on background
-hi DiffDelete       guifg=#8b008b   guibg=bg        gui=none    " darkmagenta on background
-hi DiffText         guifg=#483d8b   guibg=bg        gui=none    " darkslateblue on background
-hi ErrorMsg         guifg=#cd0000   guibg=bg        gui=bold    " red3 on background (bold)
-hi FoldColumn       guifg=#00ced1   guibg=bg        gui=bold    " darkturquoise on background (bold)
-hi Folded           guifg=#48d1cc   guibg=bg        gui=italic  " mediumturquoise on background (italic)
-hi IncSearch        guifg=#00bfff   guibg=bg        gui=bold    " deepskyblue on background
-hi LineNr           guifg=#000080   guibg=#dcdcdc   gui=none    " navy on gainsboro
-hi MatchParen       guifg=#ffffff   guibg=#4169e1   gui=none    " white on royalblue
-hi ModeMsg          guifg=#ff6347   guibg=bg        gui=bold    " tomato on background (bold)
-hi MoreMsg          guifg=#ff4500   guibg=bg        gui=bold    " orangered on background (bold)
-hi NonText          guifg=#add8e6   guibg=bg        gui=none    " lightblue on background
-hi Pmenu            guifg=#5f9ea0   guibg=bg        gui=none    " cadetblue on background
-hi PmenuSbar        guifg=#ffffff   guibg=#5f9ea0   gui=none    " white on cadetblue
-hi PmenuSel         guifg=#b0c4de   guibg=bg        gui=none    " lightsteelblue on background
-hi PmenuThumb       guifg=#87ceeb   guibg=bg        gui=reverse " skyblue on background
-hi Question         guifg=#ffffff   guibg=#0000ff   gui=bold    " white on blue (bold)
-hi SignColumn       guifg=#4169e1   guibg=bg        gui=bold    " royalblue on background (bold)
-hi Search           guifg=#191970   guibg=bg        gui=none    " midnightblue on background
-hi SpecialKey       guifg=#2f4f4f   guibg=bg        gui=none    " darkslategray on background
-hi SpellBad         guisp=#ee0000   guibg=bg        gui=underline   " red2 on background
-hi SpellCap         guisp=#dc143c   guibg=bg        gui=underline   " crimson on background
-hi SpellLocal       guisp=#cd5c5c   guibg=bg        gui=underline   " indianred on background
-hi SpellRare        guisp=#fa8072   guibg=bg        gui=underline   " salmon on background
-hi StatusLine       guifg=#556b2f   guibg=bg        gui=none    " darkolivegreen on background
-hi StatusLineNC     guifg=#6b8e23   guibg=bg        gui=none    " olivedrab on background
-hi TabLine          guifg=#008080   guibg=bg        gui=underline   " teal on background
-hi TabLineFill      guifg=fg        guibg=bg        gui=reverse " mediumblue on background
-hi TabLineSel       guifg=fg        guibg=bg        gui=bold    " mediumblue on background (bold)
-hi VertSplit        guifg=#008b8b   guibg=bg        gui=none    " darkcyan on background
-hi Visual           guifg=#1e90ff   guibg=bg        gui=none    " dodgerblue on background
-hi WarningMsg       guifg=#ff0000   guibg=bg        gui=none    " red on background
-hi WildMenu         guifg=#000000   guibg=bg        gui=none    " black on background
-
-" --- Syntax
-
-hi Comment          guifg=#556b2f   guibg=bg        gui=italic  " darkolivegreen on background (italic)
-hi Constant         guifg=#008000   guibg=bg        gui=none    " green on background
-hi String           guifg=#228b22   guibg=bg        gui=none    " forestgreen on background
-hi Character        guifg=#228b22   guibg=bg        gui=none    " forestgreen on background
-hi Number           guifg=#2e8b57   guibg=bg        gui=none    " seagreen on background
-hi Float            guifg=#2e8b57   guibg=bg        gui=none    " seagreen on background
-hi Boolean          guifg=#006400   guibg=bg        gui=none    " darkgreen on background
-hi Identifier       guifg=#a0522d   guibg=bg        gui=none    " sienna on background
-hi Function         guifg=#8b4513   guibg=bg        gui=none    " saddlebrown on background
-hi Statement        guifg=#00008b   guibg=bg        gui=none    " darkblue on background
-hi Conditional      guifg=#003399   guibg=bg        gui=italic  " districtblue on background (italic)
-hi Repeat           guifg=#0000ff   guibg=bg        gui=italic  " blue on background (italic)
-hi Label            guifg=#000080   guibg=bg        gui=italic  " navy on background (italic)
-hi Operator         guifg=#4682b4   guibg=bg        gui=italic  " steelblue on background (italic)
-hi Keyword          guifg=#00008b   guibg=bg        gui=none    " darkblue on background
-hi Exception        guifg=#4169e1   guibg=bg        gui=italic  " royalblue on background (italic)
-hi PreProc          guifg=#800080   guibg=bg        gui=italic  " purple on background (italic)
-hi Include          guifg=#8b008b   guibg=bg        gui=italic  " darkmagenta on background (italic)
-hi Define           guifg=#9932cc   guibg=bg        gui=italic  " darkorchid on background (italic)
-hi Macro            guifg=#9400d3   guibg=bg        gui=italic  " darkviolet on background (italic)
-hi PreCondit        guifg=#ba55d3   guibg=bg        gui=italic  " mediumorchid on background (italic)
-hi Type             guifg=#483d8b   guibg=bg        gui=none    " darkslateblue on background
-hi Typedef          guifg=#6a5acd   guibg=bg        gui=none    " slateblue on background
-hi Structure        guifg=#8a2be2   guibg=bg        gui=none    " blueviolet on background
-hi StorageClass     guifg=#9966cc   guibg=bg        gui=none    " amethyst on background
-hi Special          guifg=#808000   guibg=bg        gui=none    " olive on background
-hi SpecialChar      guifg=#6b8e23   guibg=bg        gui=italic  " olivedrab on background (italic)
-hi Tag              guifg=#4682b4   guibg=bg        gui=none    " steelblue on background
-hi Delimiter        guifg=#66cdaa   guibg=bg        gui=none    " mediumaquamarine on background
-hi SpecialComment   guifg=#8fbc8f   guibg=bg        gui=none    " darkseagreen on background
-hi Ignore           guifg=#f5deb3   guibg=bg        gui=none    " wheat on background
-hi Error            guifg=#cd0000   guibg=bg        gui=bold    " red3 on background (bold)
-hi Todo             guifg=#bc8f8f   guibg=bg        gui=bold    " rosybrown on background (bold)
-hi Exception        guifg=#ee0000   guibg=bg        gui=bold    " red2 on background (bold)
-hi Underlined                                       gui=underline    " underline
-
-" --- VimError
-
-hi VimError         guifg=#ffffff   guibg=#ff0000   gui=bold    " white on red (bold)
-hi VimCommentTitle  guifg=#778899   guibg=bg        gui=italic  " lightslategray on background (italic)
-
-" --- QuickFix
-
-hi dfLineNr         guifg=#008080   guibg=#dcdcdc   gui=bold    " teal on gainsboro (bold)
-
-" --- Diff
-
-hi diffOldFile      guifg=#5f9ea0   guibg=bg        gui=none    " cadetblue on background
-hi diffNewFile      guifg=#00bfff   guibg=bg        gui=none    " deepskyblue on background
-hi diffFile         guifg=#40e0d0   guibg=bg        gui=none    " turquoise on background
-hi link diffOnly    Constant
-hi link diffIdentical   Constant
-hi link diffDiffer  Constant
-hi link diffBDiffer Constant
-hi link diffIsA     Constant
-hi link diffNoEOL   Constant
-hi link diffCommon  Constant
-hi diffRemoved      guifg=#8b0000   guibg=bg        gui=none    " darkred on background
-hi diffChanged      guifg=#32cd32   guibg=bg        gui=none    " limegreen on background
-hi diffAdded        guifg=#3cb371   guibg=bg        gui=none    " mediumseagreen on background
-hi diffLine         guifg=#7b68ee   guibg=bg        gui=italic  " mediumslateblue on background (italic)
-hi link diffSubname diffLine
-hi link diffComment Comment
-
-" --- CTerm8 (Light)
-if &t_Co == 8
-    if &background == "light"
-        hi Normal       ctermfg=DarkBlue        ctermbg=White
-        hi Cursor       ctermfg=White           ctermbg=DarkBlue
-        if version>=700
-            hi CursorColumn     ctermfg=LightBlue   ctermbg=White
-            hi CursorLine       ctermfg=LightBlue   cterm=Underline
-        endif
-        hi CursorIM     ctermfg=DarkBlue
-        hi DiffAdd      ctermfg=DarkMagenta
-        hi DiffChange   ctermfg=DarkMagenta     cterm=Underline
-        hi DiffDelete   ctermfg=DarkRed         cterm=Underline
-        hi DiffText     ctermfg=DarkGray
-        hi ErrorMsg     ctermfg=White           ctermbg=DarkRed
-        hi FoldColumn   ctermfg=DarkCyan
-        hi Folded       ctermfg=DarkCyan        cterm=Underline
-        hi IncSearch    ctermfg=DarkBlue        ctermbg=Yellow
-        hi LineNr       ctermfg=DarkBlue        ctermbg=Gray
-        hi MatchParen   ctermfg=Brown           
-        hi ModeMsg      ctermfg=LightRed
-        hi MoreMsg      ctermfg=LightRed        cterm=Underline
-        hi NonText      ctermfg=LightBlue
-        if version>=700
-            hi Pmenu            ctermfg=LightBlue       ctermbg=Yellow
-            hi PmenuSbar        ctermfg=Yellow          ctermbg=LightBlue
-            hi PmenuSel         ctermfg=LightBlue       cterm=Italic
-            hi PmenuThumb       ctermfg=LightBlue       cterm=Underline
-        endif
-        hi Question     ctermfg=White           ctermbg=LightRed
-        hi SignColumn   ctermfg=DarkBlue
-        hi Search       ctermfg=DarkBlue        ctermbg=Yellow
-        hi SpellBad     ctermfg=LightRed        cterm=Underline
-        hi SpellCap     ctermfg=LightRed        
-        hi SpellLocal   ctermfg=LightRed
-        hi SpellRare    ctermfg=LightRed
-        hi TabLine      ctermfg=LightCyan
-        hi TablLineFill ctermfg=LightCyan
-        hi TabLineSel   ctermfg=LightCyan
-        hi VertSplit    ctermfg=DarkCyan
-        hi Visual       ctermfg=DarkBlue
-        hi WarningMsg   ctermfg=DarkRed
-        hi WildMenu     ctermfg=Black
-        hi Comment      ctermfg=DarkGreen       cterm=Underline
-        hi Constant     ctermfg=DarkGreen
-        hi Identifier   ctermfg=Brown
-        hi Statement    ctermfg=DarkBlue
-        hi PreProc      ctermfg=DarkMagenta
-        hi Type         ctermfg=LightBlue
-        hi Special      ctermfg=LightGreen
-        hi Error        ctermfg=DarkRed
-        hi Todo         ctermfg=Brown           cterm=Underline
-        hi Exception    ctermfg=LightRed        cterm=Underline
-        hi Underlined   cterm=Underline
-    endif
-
-" --- CTerm256 (light)
-elseif &t_Co == 256
-    
-    if v:version < 700
-        command! -nargs=+ CSAHi exe "hi" substitute(substitute(<q-args>, "undercurl", "underline", "g"), "guisp\\S\\+", "", "g")
-    else
-        command! -nargs=+ CSAHi exe "hi" <q-args>
-    endif
-    if has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^screen") && exists("g:CSApprox_konsole") && g:CSApprox_konsol) || &term =~? "^konsole"
-        CSAHi Normal        ctermfg=20  ctermbg=231
-        CSAHi Cursor        ctermfg=249 ctermbg=18
-        CSAHi CursorColumn  ctermfg=25  ctermbg=252
-        CSAHi CursorLine    ctermfg=25  ctermbg=252
-        CSAHi CursorIM      ctermfg=18  ctermbg=231
-        CSAHi DiffAdd       ctermfg=53  ctermbg=231
-        CSAHi DiffChange    ctermfg=54  ctermbg=231
-        CSAHi DiffDelete    ctermfg=90  ctermbg=231
-        CSAHi DiffText      ctermfg=57  ctermbg=231
-        CSAHi ErrorMsg      ctermfg=160 ctermbg=231 term=bold
-        CSAHi FoldColumn    ctermfg=37  ctermbg=231 term=bold
-        CSAHi Folded        ctermfg=38  ctermbg=231 term=bold
-        CSAHi IncSearch     ctermfg=19  ctermbg=231
-        CSAHi LineNr        ctermfg=20  ctermbg=251
-        CSAHi MatchParen    ctermfg=231 ctermbg=20
-        CSAHi ModeMsg       ctermfg=166 ctermbg=231 term=bold
-        CSAHi MoreMsg       ctermfg=202 ctermbg=231 term=bold
-        CSAHi NonText       ctermfg=39  ctermbg=231
-        CSAHi Pmenu         ctermfg=32  ctermbg=231
-        CSAHi PmenuSbar     ctermfg=231 ctermbg=32
-        CSAHi PmenuSel      ctermfg=68  ctermbg=231
-        CSAHi PmenuThumb    ctermfg=110 ctermbg=231 term=reverse
-        CSAHi Question      ctermfg=231 ctermbg=21  term=bold
-        CSAHi SignColumn    ctermfg=19  ctermbg=231 term=bold
-        CSAHi Search        ctermfg=17  ctermbg=231
-        CSAHi SpecialKey    ctermfg=237 ctermbg=231
-        CSAHi SpellBad      ctermfg=196 ctermbg=231 term=underline
-        CSAHi SpellCap      ctermfg=52  ctermbg=231 term=underline
-        CSAHi SpellLocal    ctermfg=124 ctermbg=231 term=underline
-        CSAHi SpellRare     ctermfg=160 ctermbg=231 term=underline
-        CSAHi StatusLine    ctermfg=64  ctermbg=231
-        CSAHi StatusLineNC  ctermfg=58  ctermbg=231
-        CSAHi TabLine       ctermfg=23  ctermbg=231 term=underline
-        CSAHi TabLineFill   ctermfg=20  ctermbg=231 term=reverse
-        CSAHi TabLineSel    ctermfg=20  ctermbg=231 term=underline
-        CSAHi VertSplit     ctermfg=24  ctermbg=231
-        CSAHi Visual        ctermfg=21  ctermbg=231
-        CSAHi WarningMsg    ctermfg=196 ctermbg=231
-        CSAHi WildMenu      ctermfg=16  ctermbg=231
-        CSAHi Comment       ctermfg=100 ctermbg=231 term=italic
-        CSAHi Constant      ctermfg=34  ctermbg=231
-        CSAHi Indentifier   ctermfg=137 ctermbg=231
-        CSAHi Statement     ctermfg=19  ctermbg=231
-        CSAHi PreProc       ctermfg=54  ctermbg=231
-        CSAHi Type          ctermfg=26  ctermbg=231
-        CSAHi Special       ctermfg=58  ctermbg=231
-        CSAHi Error         ctermfg=160 ctermbg=231 term=bold
-        CSAHi Todo          ctermfg=95  ctermbg=231 term=bold
-        CSAHi Exception     ctermfg=124 ctermbg=231 term=bold
-        CSAHi Underlined                            term=underline
-    elseif has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^screen") && exists("g:CSApprox_eterm") && g:CSApprox_eterrm) || &term=~> "^eterm"
-        CSAHi Normal        ctermfg=20  ctermbg=231
-        CSAHi Cursor        ctermfg=249 ctermbg=18
-        CSAHi CursorColumn  ctermfg=25  ctermbg=252
-        CSAHi CursorLine    ctermfg=25  ctermbg=252
-        CSAHi CursorIM      ctermfg=18  ctermbg=231
-        CSAHi DiffAdd       ctermfg=53  ctermbg=231
-        CSAHi DiffChange    ctermfg=54  ctermbg=231
-        CSAHi DiffDelete    ctermfg=90  ctermbg=231
-        CSAHi DiffText      ctermfg=57  ctermbg=231
-        CSAHi ErrorMsg      ctermfg=160 ctermbg=231 term=bold
-        CSAHi FoldColumn    ctermfg=37  ctermbg=231 term=bold
-        CSAHi Folded        ctermfg=38  ctermbg=231 term=bold
-        CSAHi IncSearch     ctermfg=19  ctermbg=231
-        CSAHi LineNr        ctermfg=20  ctermbg=251
-        CSAHi MatchParen    ctermfg=231 ctermbg=20
-        CSAHi ModeMsg       ctermfg=166 ctermbg=231 term=bold
-        CSAHi MoreMsg       ctermfg=202 ctermbg=231 term=bold
-        CSAHi NonText       ctermfg=39  ctermbg=231
-        CSAHi Pmenu         ctermfg=32  ctermbg=231
-        CSAHi PmenuSbar     ctermfg=231 ctermbg=32
-        CSAHi PmenuSel      ctermfg=68  ctermbg=231
-        CSAHi PmenuThumb    ctermfg=110 ctermbg=231 term=reverse
-        CSAHi Question      ctermfg=231 ctermbg=21  term=bold
-        CSAHi SignColumn    ctermfg=19  ctermbg=231 term=bold
-        CSAHi Search        ctermfg=17  ctermbg=231
-        CSAHi SpecialKey    ctermfg=237 ctermbg=231
-        CSAHi SpellBad      ctermfg=196 ctermbg=231 term=underline
-        CSAHi SpellCap      ctermfg=52  ctermbg=231 term=underline
-        CSAHi SpellLocal    ctermfg=124 ctermbg=231 term=underline
-        CSAHi SpellRare     ctermfg=160 ctermbg=231 term=underline
-        CSAHi StatusLine    ctermfg=64  ctermbg=231
-        CSAHi StatusLineNC  ctermfg=58  ctermbg=231
-        CSAHi TabLine       ctermfg=23  ctermbg=231 term=underline
-        CSAHi TabLineFill   ctermfg=20  ctermbg=231 term=reverse
-        CSAHi TabLineSel    ctermfg=20  ctermbg=231 term=underline
-        CSAHi VertSplit     ctermfg=24  ctermbg=231
-        CSAHi Visual        ctermfg=21  ctermbg=231
-        CSAHi WarningMsg    ctermfg=196 ctermbg=231
-        CSAHi WildMenu      ctermfg=16  ctermbg=231
-        CSAHi Comment       ctermfg=100 ctermbg=231 term=italic
-        CSAHi Constant      ctermfg=34  ctermbg=231
-        CSAHi Indentifier   ctermfg=137 ctermbg=231
-        CSAHi Statement     ctermfg=19  ctermbg=231
-        CSAHi PreProc       ctermfg=54  ctermbg=231
-        CSAHi Type          ctermfg=26  ctermbg=231
-        CSAHi Special       ctermfg=58  ctermbg=231
-        CSAHi Error         ctermfg=160 ctermbg=231 term=bold
-        CSAHi Todo          ctermfg=95  ctermbg=231 term=bold
-        CSAHi Exception     ctermfg=124 ctermbg=231 term=bold
-        CSAHi Underlined                            term=underline
-    elseif has("gui_running") || &t_Co == 256
-        CSAHi Normal        ctermfg=20  ctermbg=231
-        CSAHi Cursor        ctermfg=249 ctermbg=18
-        CSAHi CursorColumn  ctermfg=25  ctermbg=252
-        CSAHi CursorLine    ctermfg=25  ctermbg=252
-        CSAHi CursorIM      ctermfg=18  ctermbg=231
-        CSAHi DiffAdd       ctermfg=53  ctermbg=231
-        CSAHi DiffChange    ctermfg=54  ctermbg=231
-        CSAHi DiffDelete    ctermfg=90  ctermbg=231
-        CSAHi DiffText      ctermfg=57  ctermbg=231
-        CSAHi ErrorMsg      ctermfg=160 ctermbg=231 term=bold
-        CSAHi FoldColumn    ctermfg=37  ctermbg=231 term=bold
-        CSAHi Folded        ctermfg=38  ctermbg=231 term=bold
-        CSAHi IncSearch     ctermfg=19  ctermbg=231
-        CSAHi LineNr        ctermfg=20  ctermbg=251
-        CSAHi MatchParen    ctermfg=231 ctermbg=20
-        CSAHi ModeMsg       ctermfg=166 ctermbg=231 term=bold
-        CSAHi MoreMsg       ctermfg=202 ctermbg=231 term=bold
-        CSAHi NonText       ctermfg=39  ctermbg=231
-        CSAHi Pmenu         ctermfg=32  ctermbg=231
-        CSAHi PmenuSbar     ctermfg=231 ctermbg=32
-        CSAHi PmenuSel      ctermfg=68  ctermbg=231
-        CSAHi PmenuThumb    ctermfg=110 ctermbg=231 term=reverse
-        CSAHi Question      ctermfg=231 ctermbg=21  term=bold
-        CSAHi SignColumn    ctermfg=19  ctermbg=231 term=bold
-        CSAHi Search        ctermfg=17  ctermbg=231
-        CSAHi SpecialKey    ctermfg=237 ctermbg=231
-        CSAHi SpellBad      ctermfg=196 ctermbg=231 term=underline
-        CSAHi SpellCap      ctermfg=52  ctermbg=231 term=underline
-        CSAHi SpellLocal    ctermfg=124 ctermbg=231 term=underline
-        CSAHi SpellRare     ctermfg=160 ctermbg=231 term=underline
-        CSAHi StatusLine    ctermfg=64  ctermbg=231
-        CSAHi StatusLineNC  ctermfg=58  ctermbg=231
-        CSAHi TabLine       ctermfg=23  ctermbg=231 term=underline
-        CSAHi TabLineFill   ctermfg=20  ctermbg=231 term=reverse
-        CSAHi TabLineSel    ctermfg=20  ctermbg=231 term=underline
-        CSAHi VertSplit     ctermfg=24  ctermbg=231
-        CSAHi Visual        ctermfg=21  ctermbg=231
-        CSAHi WarningMsg    ctermfg=196 ctermbg=231
-        CSAHi WildMenu      ctermfg=16  ctermbg=231
-        CSAHi Comment       ctermfg=100 ctermbg=231 term=italic
-        CSAHi Constant      ctermfg=34  ctermbg=231
-        CSAHi Indentifier   ctermfg=137 ctermbg=231
-        CSAHi Statement     ctermfg=19  ctermbg=231
-        CSAHi PreProc       ctermfg=54  ctermbg=231
-        CSAHi Type          ctermfg=26  ctermbg=231
-        CSAHi Special       ctermfg=58  ctermbg=231
-        CSAHi Error         ctermfg=160 ctermbg=231 term=bold
-        CSAHi Todo          ctermfg=95  ctermbg=231 term=bold
-        CSAHi Exception     ctermfg=124 ctermbg=231 term=bold
-        CSAHi Underlined                            term=underline
-    endif
-    delcommand CSAHi
-endif
diff --git a/colors/leglight2.vim b/colors/leglight2.vim
deleted file mode 100755
index 1b6e945..0000000
--- a/colors/leglight2.vim
+++ /dev/null
@@ -1,204 +0,0 @@
-"==============================================================================
-"Filename:          leglight2.vim
-"Last Modified:     2010-06-03
-"Version:           1.0.1
-"Maintainer:        Tony Dunsworth <tony DOT dunsworth AT gmail DOT com>
-"Copyright:         2010 Tony Dunsworth
-"                   This script is free software; you can do almost 
-"                   anything you want with it under the terms of the GNU
-"                   General Pulic License version 2 as published by the
-"                   Free Software Foundation
-"Description:       Vim colour scheme - a rebuild of legiblelight.vim on 
-"                   a Linux working system to address errors which were
-"                   in the Windows build. There is a predominance of blues
-"                   greens and the like. There will be versions for GUI and
-"                   for 256 colour xterm.
-"Scheme:            leglight2
-"Install:           Put this file in the users colour directory
-"                   (~/.vim/colors) then load it with :colorscheme
-"                   leglight2.
-"==============================================================================
-
-" Initialization and Setup {{{1
-"==============================================================================
-hi clear
-set background=light
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name = "leglight2"
-" }}}
-
-" GUI Section {{{1
-"==============================================================================
-hi Normal           guifg=#0000cd   guibg=#ffffff   gui=none    " mediumblue on white
-hi Cursor           guifg=#ffffff   guibg=#0000cd   gui=none    " white on mediumblue
-if exists('g:leglight2_cursor_line_visibility') && g:leglight2_cursor_line_visibility >= 2
-    hi CursorColumn guifg=#0000cd   guibg=#dcdcdc   gui=none    " mediumblue on gainsboro
-    hi CursorLine   guifg=#0000cd   guibg=#dcdcdc   gui=none    " mediumblue on gainsboro
-elseif exists('g:leglight2_cursor_line_visibility') && g:leglight2_cursor_line_visibility >= 1
-    hi CursorColumn guifg=#0000ff   guibg=#dcdcdc   gui=none    " blue on gainsboro
-    hi CursorLine   guifg=#0000ff   guibg=#dcdcdc   gui=none    " blue on gainsboro
-endif
-hi CursorIM         guifg=#00008b   guibg=#ffffff   gui=none    " darkblue on white
-hi DiffAdd          guifg=#4b0082   guibg=bg        gui=none    " indigo on background
-hi DiffChange       guifg=#800080   guibg=bg        gui=none    " purple on background
-hi DiffDelete       guifg=#8b008b   guibg=bg        gui=none    " darkmagenta on background
-hi DiffText         guifg=#483d8b   guibg=bg        gui=none    " darkslateblue on background
-hi ErrorMsg         guifg=#cd0000   guibg=bg        gui=bold    " red3 on background (bold)
-hi FoldColumn       guifg=#00ced1   guibg=bg        gui=bold    " darkturquoise on background (bold)
-hi Folded           guifg=#48d1cc   guibg=bg        gui=italic  " mediumturquoise on background (italic)
-hi IncSearch        guifg=#00bfff   guibg=bg        gui=bold    " deepskyblue on background (bold)
-hi LineNr           guifg=#000080   guibg=#dcdcdc   gui=none    " navy on gainsboro
-hi MatchParen       guifg=#ffffff   guibg=#4169e1   gui=none    " white on royalblue
-hi ModeMsg          guifg=#ff6347   guibg=bg        gui=bold    " tomato on background (bold)
-hi MoreMsg          guifg=#ff4500   guibg=bg        gui=bold    " orangered on background (bold)
-hi NonText          guifg=#add8e6   guibg=bg        gui=none    " lightblue on background
-hi Pmenu            guifg=#5f9ea0   guibg=bg        gui=none    " cadetblue on background
-hi PmenuSbar        guifg=#ffffff   guibg=#5f9ea0   gui=none    " white on cadetblue
-hi PmenuSel         guifg=#b0c4de   guibg=bg        gui=none    " lightsteelblue on background
-hi PmenuThumb       guifg=#87ceeb   guibg=bg        gui=reverse " skyblue on background
-hi Question         guifg=#ffffff   guibg=#0000ff   gui=bold    " white on blue (bold)
-hi SignColumn       guifg=#4169e1   guibg=bg        gui=bold    " royalblue on background (bold)
-hi Search           guifg=#191970   guibg=bg        gui=none    " midnightblue on background
-hi SpecialKey       guifg=#2f4f4f   guibg=bg        gui=none    " darkslategray on background
-hi SpellBad         guisp=#ee0000   guibg=bg        gui=underline   " red2 on background (underline)
-hi SpellCap         guisp=#dc143c   guibg=bg        gui=underline   " crimson on background (underline)
-hi SpellLocal       guisp=#cd5c5c   guibg=bg        gui=underline   " indianred on background (underline)
-hi SpellRare        guisp=#fa8072   guibg=bg        gui=underline   " salmon on background (underline)
-hi StatusLine       guifg=#556b2f   guibg=bg        gui=none    " darkolivegreen on background
-hi StatusLineNC     guifg=#6b8e23   guibg=bg        gui=none    " olivedrab on background
-hi TabLine          guifg=#008080   guibg=bg        gui=underline   " teal on background (underline)
-hi TabLineFill      guifg=#0000cd   guibg=bg        gui=reverse " mediumblue on background
-hi TabLineSel       guifg=#0000cd   guibg=bg        gui=bold    " mediumblue on background (bold)
-hi VertSplit        guifg=#008b8b   guibg=bg        gui=none    " darkcyan on background
-hi Visual           guifg=#1e90ff   guibg=bg        gui=none    " dodgerblue on background
-hi WarningMsg       guifg=#ff0000   guibg=bg        gui=none    " red on background
-hi WildMenu         guifg=#000000   guibg=bg        gui=none    " black on background
-" }}}
-
-" Syntax {{{ 1
-" General {{{ 2
-"==============================================================================
-hi Comment          guifg=#556b2f   guibg=#ffffff   gui=italic  " darkolivegreen on background (italic)
-hi Constant         guifg=#008000   guibg=bg        gui=none    " green on background
-hi String           guifg=#228b22   guibg=bg        gui=none    " forestgreen on background
-hi Character        guifg=#228b22   guibg=bg        gui=none    " forestgreen on background
-hi Number           guifg=#2e8b57   guibg=bg        gui=none    " seagreen on background
-hi Float            guifg=#2e8b57   guibg=bg        gui=none    " seagreen on background
-hi Boolean          guifg=#006400   guibg=bg        gui=none    " darkgreen on background
-hi Identifier       guifg=#a0522d   guibg=bg        gui=none    " sienna on background
-hi Function         guifg=#8b4513   guibg=bg        gui=none    " saddlebrown on background
-hi Statement        guifg=#00008b   guibg=bg        gui=none    " darkblue on background
-hi Conditional      guifg=#003399   guibg=bg        gui=italic  " districtblue on background (italic)
-hi Repeat           guifg=#0000ff   guibg=bg        gui=italic  " blue on background (italic)
-hi Label            guifg=#000080   guibg=bg        gui=italic  " navy on background (italic)
-hi Operator         guifg=#4682b4   guibg=bg        gui=italic  " steelblue on background (italic)
-hi Keyword          guifg=#00008b   guibg=bg        gui=none    " darkblue on background
-hi Exception        guifg=#4169e1   guibg=bg        gui=italic  " royalblue on background (italic)
-hi PreProc          guifg=#800080   guibg=bg        gui=italic  " purple on background (italic)
-hi Include          guifg=#8b008b   guibg=bg        gui=italic  " darkmagenta on background (italic)
-hi Define           guifg=#9932cc   guibg=bg        gui=italic  " darkorchid on background (italic)
-hi Macro            guifg=#9400d3   guibg=bg        gui=italic  " darkviolet on background (italic)
-hi PreCondit        guifg=#ba55d3   guibg=bg        gui=italic  " mediumorchid on background (italic)
-hi Type             guifg=#483d8b   guibg=bg        gui=none    " darkslateblue on background
-hi Typedef          guifg=#6a5acd   guibg=bg        gui=none    " slateblue on background
-hi Structure        guifg=#8a2be2   guibg=bg        gui=none    " blueviolet on background
-hi StorageClass     guifg=#9966cc   guibg=bg        gui=none    " amethyst on background
-hi Special          guifg=#808000   guibg=bg        gui=none    " olive on background
-hi SpecialChar      guifg=#6b8e23   guibg=bg        gui=italic  " olivedrab on background (italic)
-hi Tag              guifg=#4682b4   guibg=bg        gui=none    " steelblue on background
-hi Delimiter        guifg=#66cdaa   guibg=bg        gui=none    " mediumaquamarine on background
-hi SpecialComment   guifg=#8fbc8f   guibg=bg        gui=none    " darkseagreen on background
-hi Ignore           guifg=#f5deb3   guibg=bg        gui=none    " wheat on background
-hi Error            guifg=#cd0000   guibg=bg        gui=bold    " red3 on background (bold)
-hi Todo             guifg=#bc8f8f   guibg=bg        gui=bold    " rosybrown on background
-hi Exception        guifg=#ee0000   guibg=bg        gui=bold    " red2 on background (bold)
-hi Underlined                                       gui=underline   " underlined
-" 2}}}
-
-" Vim {{{2
-"==============================================================================
-hi VimError         guifg=#ffffff   guibg=#ff0000   gui=bold    " white on red (bold)
-hi VimCommentTitle  guifg=#778899   guibg=#ffffff   gui=italic  " lightslategray on background (italic)
-" 2}}}
-
-" QuickFix {{{2
-"==============================================================================
-hi qfLineNr         guifg=#008080   guibg=#dcdcdc   gui=bold    " teal on gainsboro (bold)
-" 2}}}
-
-" Diff {{{2
-"==============================================================================
-hi diffOldFile      guifg=#5f9ea0   guibg=#ffffff   gui=none    " cadetblue on background
-hi diffNewFile      guifg=#00bfff   guibg=bg        gui=none    " deepskyblue on background
-hi diffFile         guifg=#40e0d0   guibg=bg        gui=none    " turquoise on background
-hi link diffOnly    Constant
-hi link diffIdentical   Constant
-hi link diffDiffer  Constant
-hi link diffBDiffer Constant
-hi link diffIsA     Constant
-hi link diffNoEOL   Constant
-hi link diffCommon  Constant
-hi diffRemoved      guifg=#8b0000   guibg=bg        gui=none    " darkred on background
-hi diffChanged      guifg=#32cd32   guibg=bg        gui=none    " limegreen on background
-hi diffAdded        guifg=#3cb371   guibg=bg        gui=none    " mediumseagreen on background
-hi diffLine         guifg=#7b68ee   guibg=bg        gui=italic  " mediumslateblue on background (italic)
-hi link diffSubname diffLine
-hi link diffComment Comment
-" 2}}}
-
-" 1}}}
-
-" 256-Color Terminal Colours {{{1
-"==============================================================================
-hi Normal           ctermfg=20      ctermbg=231     cterm=none  
-hi Cursor           ctermfg=249     ctermbg=18      cterm=none
-hi CursorColumn     ctermfg=25      ctermbg=252     cterm=none
-hi CursorLine       ctermfg=25      ctermbg=252     cterm=none
-hi CursorIM         ctermfg=18      ctermbg=252     cterm=none
-hi DiffAdd          ctermfg=53      ctermbg=231     cterm=none
-hi DiffChange       ctermfg=54      ctermbg=231     cterm=none
-hi DiffDelete       ctermfg=90      ctermbg=231     cterm=none
-hi DiffText         ctermfg=57      ctermbg=231     cterm=none
-hi ErrorMsg         ctermfg=160     ctermbg=231     cterm=bold
-hi FoldColumn       ctermfg=37      ctermbg=231     cterm=bold
-hi Folded           ctermfg=38      ctermbg=231     cterm=bold
-hi IncSearch        ctermfg=19      ctermbg=231     cterm=none
-hi LineNr           ctermfg=20      ctermbg=251     cterm=none
-hi MatchParen       ctermfg=231     ctermbg=20      cterm=none
-hi ModeMsg          ctermfg=166     ctermbg=231     cterm=bold
-hi MoreMsg          ctermfg=202     ctermbg=231     cterm=bold
-hi NonText          ctermfg=39      ctermbg=231     cterm=none
-hi Pmenu            ctermfg=32      ctermbg=231     cterm=none
-hi PmenuSbar        ctermfg=231     ctermbg=32      cterm=none
-hi PmenuSel         ctermfg=68      ctermbg=231     cterm=none
-hi PmenuThumb       ctermfg=110     ctermbg=231     cterm=reverse
-hi Question         ctermfg=231     ctermbg=21      cterm=bold
-hi SignColumn       ctermfg=19      ctermbg=231     cterm=bold
-hi Search           ctermfg=17      ctermbg=231     cterm=none
-hi SpecialKey       ctermfg=237     ctermbg=231     cterm=none
-hi SpellBad         ctermfg=196     ctermbg=231     cterm=underline
-hi SpellCap         ctermfg=52      ctermbg=231     cterm=underline
-hi SpellLocal       ctermfg=124     ctermbg=231     cterm=underline
-hi SpellRare        ctermfg=160     ctermbg=231     cterm=underline
-hi StatusLine       ctermfg=64      ctermbg=231     cterm=none
-hi StatusLineNC     ctermfg=58      ctermbg=231     cterm=none
-hi TabLine          ctermfg=23      ctermbg=231     cterm=underline
-hi TabLineFill      ctermfg=20      ctermbg=231     cterm=reverse
-hi TabLineSel       ctermfg=20      ctermbg=231     cterm=underline
-hi VertSplit        ctermfg=24      ctermbg=231     cterm=none
-hi Visual           ctermfg=21      ctermbg=231     cterm=none
-hi WarningMsg       ctermfg=196     ctermbg=231     cterm=none
-hi WildMenu         ctermfg=16      ctermbg=231     cterm=none
-hi Comment          ctermfg=100     ctermbg=231     cterm=italic
-hi Constant         ctermfg=34      ctermbg=231     cterm=none
-hi Identifier       ctermfg=137     ctermbg=231     cterm=none
-hi Statement        ctermfg=19      ctermbg=231     cterm=none
-hi PreProc          ctermfg=54      ctermbg=231     cterm=none
-hi Type             ctermfg=26      ctermbg=231     cterm=none
-hi Special          ctermfg=58      ctermbg=231     cterm=none
-hi Error            ctermfg=160     ctermbg=231     cterm=bold
-hi Exception        ctermfg=95      ctermbg=231     cterm=bold
-hi Underlined                                       cterm=underline
-" 1}}}
diff --git a/colors/leo.vim b/colors/leo.vim
deleted file mode 100755
index c36a76d..0000000
--- a/colors/leo.vim
+++ /dev/null
@@ -1,191 +0,0 @@
-" Vim color file
-" Maintainer:		Lorenzo Leonini <vim-theme[a]leonini[.]net>
-" Last Change:	2010 Nov 20
-" URL:					http://www.leonini.net
-
-" Description:
-" A contrasted theme for long programming sessions.
-" Specially for 256-colors term (xterm, Eterm, konsole, gnome-terminal, ...)
-" Very good with Ruby, C, Lua, PHP, HTML, shell...
-" (but no using language specific settings)
-
-" Note:
-" If your term report 8 colors (but is 256 capable), put 'set t_Co=256'
-" in your .vimrc
-
-" Tips:
-" :verbose hi StatusLine
-" Color numbers (0-255) see:
-"		http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-"	:so $VIMRUNTIME/syntax/hitest.vim
-
-" 1.00
-" Tab colors
-" Vim 7.3 addition
-"
-" 0.94
-" Folding
-"
-" 0.93
-" Console and GUI are deliberately differents.
-"
-" 0.92
-" Fixed visual in GUI mode
-" Dark line numbers
-"
-" 0.91
-" fixed cursor color with MatchParen
-"
-" 0.9
-" more blue (blue <=> green swap)
-" lot of changes, some may prefer previous version
-"
-" 0.82
-" menu backgrounf lighter
-" LineNr
-" gui comments in italic
-" remove some default bold in gui
-"
-" 0.81
-" invisible char
-" line number
-" status bar
-" add MatchParen
-" add Underlined
-"
-" 0.8
-" GUI fixed, color < 16 fixed
-" comments from 247 => 249
-" main color 255 => 254
-" boolean and numbers more visible
-"
-" 0.6
-" Synchro with GUI
-
-" 0.5
-" Ligther vertical separation
-" Better diff
-" Better pmenu
-" Uniformisation between status bar, tabs and pmenu
-" Added spell hl
-" Change search highlight (I don't use it...)
-" Folding done
-" All in 256 code
-
-if !has("gui_running")
-	if &t_Co != 256
-		echomsg "err: Please use a 256-colors terminal (so that t_Co=256 could be set)."
-		echomsg ""
-		finish
-	end
-endif
-
-let g:colors_name = "leo256"
-
-set background=dark
-if v:version > 580
-	highlight clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-" ### Normal should come first
-
-" console-gui different
-hi Normal				cterm=none		ctermfg=255		ctermbg=232 guifg=#ffffff	guibg=#121212
-hi CursorLine		cterm=none		ctermbg=16		guibg=#050505
-hi SpecialKey		cterm=none		ctermfg=245		ctermbg=233		guifg=#8a8a8a	guibg=#090909
-hi Folded				cterm=none		ctermfg=110		ctermbg=233		guifg=#87afd7	guibg=#000000
-
-
-hi Cursor				cterm=none		ctermfg=bg		ctermbg=fg	guibg=fg	guifg=bg
-hi DiffAdd			cterm=none		ctermbg=235		guibg=#262626
-hi DiffChange		cterm=none		ctermbg=235		guibg=#262626
-hi DiffDelete		cterm=none		ctermfg=238		ctermbg=244		guifg=#444444	guibg=#808080
-hi DiffText			cterm=bold		ctermfg=255		ctermbg=196		guifg=#ffffff
-hi Directory		cterm=none		ctermfg=196
-hi ErrorMsg			cterm=none		ctermfg=255		ctermbg=160		guifg=#ffffff
-hi FoldColumn		cterm=none		ctermfg=110		ctermbg=16		guifg=#87afd7 guibg=#000000
-hi IncSearch		cterm=reverse
-"hi LineNr				cterm=none		ctermfg=229		ctermbg=16		guifg=#ffff87	guibg=#000000
-"hi LineNr				cterm=none		ctermfg=27		ctermbg=16		guifg=#005fff	guibg=#000000
-hi LineNr				cterm=none		ctermfg=239		ctermbg=16		guifg=#4e4e4e	guibg=#000000
-hi ModeMsg			cterm=bold
-hi MoreMsg			cterm=none		ctermfg=40
-hi NonText			cterm=none		ctermfg=21
-hi Question			cterm=none		ctermfg=40
-hi Search				cterm=none		ctermfg=16		ctermbg=248		guifg=#000000	guibg=#a8a8a8
-hi SignColumn		cterm=none		ctermbg=16		guibg=#000000
-hi StatusLine		cterm=bold		ctermfg=255		ctermbg=19		guifg=#0000af	guibg=#ffffff
-hi StatusLineNC	cterm=none		ctermfg=252		ctermbg=17		guifg=#00005f guibg=#d0d0d0
-hi Title				cterm=none		ctermfg=33
-hi VertSplit		cterm=none		ctermfg=254		ctermbg=16		guifg=#000000 guibg=#eeeeee
-hi Visual				cterm=reverse	ctermbg=none								gui=reverse		guibg=#080808
-hi VisualNOS		cterm=underline,bold
-hi WarningMsg		cterm=none		ctermfg=255		guifg=#ffffff
-hi WildMenu			cterm=none		ctermfg=16		ctermbg=11
-
-if v:version >= 700
-	hi MatchParen		cterm=none		ctermfg=190		ctermbg=20		guifg=#d7ff00	guibg=#0000d7
-
-	" light
-	"hi Pmenu				cterm=none	ctermfg=16		ctermbg=252
-	"hi PmenuSel			cterm=none	ctermfg=255		ctermbg=21
-	"hi PmenuSbar		cterm=none	ctermfg=240		ctermbg=240
-  "hi PmenuThumb		cterm=none	ctermfg=255		ctermbg=255
-
-	"dark
-	hi Pmenu				cterm=none		ctermfg=255		ctermbg=235		guifg=#ffffff		guibg=#262626
-	hi PmenuSel			cterm=none		ctermfg=255		ctermbg=21		guifg=#ffffff		guibg=#0000ff
-	hi PmenuSbar		cterm=none		ctermfg=240		ctermbg=240		guibg=#444444
-  hi PmenuThumb		cterm=none		ctermfg=255		ctermbg=255		guifg=#ffffff
-
-	" No need for GUI colors
-	hi SpellBad			cterm=none    ctermfg=16		ctermbg=196
-	hi SpellCap			cterm=none    ctermfg=16		ctermbg=196
-	hi SpellLocal		cterm=none    ctermfg=16		ctermbg=196
-	hi SpellRare		cterm=none    ctermfg=16		ctermbg=196
-	
-	" No need for GUI colors
-	"hi TabLine			cterm=none	ctermfg=252		ctermbg=17
-	"hi TabLineSel		cterm=none	ctermfg=255		ctermbg=21
-	"hi TabLineFill	cterm=none	ctermfg=17		ctermbg=17
-	hi TabLine			cterm=none	ctermfg=233		ctermbg=110
-	hi TabLineSel		cterm=none	ctermfg=110		ctermbg=233
-	hi TabLineFill	cterm=none	ctermfg=233		ctermbg=110
-
-endif
-
-if v:version >= 703
-	hi ColorColumn	cterm=none	ctermfg=250		ctermbg=234
-endif
-
-" ### syntax highlighting
-
-hi Boolean			cterm=none		ctermfg=215		guifg=#ffaf5f
-hi Character		cterm=none		ctermfg=184		guifg=#d7d700
-hi Comment			cterm=none		ctermfg=248		gui=italic		guifg=#a8a8a8
-hi Conditional	cterm=none		ctermfg=33		guifg=#0087ff
-hi Constant			cterm=none		ctermfg=226		guifg=#ffff00
-hi Define				cterm=bold		ctermfg=27		gui=bold			guifg=#005fff
-hi Delimiter		cterm=none		ctermfg=196		guifg=#ff0000
-hi Error				cterm=none		ctermfg=255		ctermbg=9			guifg=#ffffff
-hi Exception		cterm=bold		ctermfg=226		gui=bold			guifg=#ffff00
-hi Function			cterm=none		ctermfg=196		guifg=#ff0000
-hi Identifier		cterm=none		ctermfg=40		gui=none			guifg=#00d700
-hi Keyword			cterm=none		ctermfg=123		guifg=#87ffff
-hi Number				cterm=none		ctermfg=209		guifg=#ff875f
-hi Operator			cterm=none		ctermfg=226		guifg=#ffff00
-hi PreProc			cterm=none		ctermfg=202		guifg=#ff5f00
-hi Special			cterm=none		ctermfg=206		ctermbg=234		guifg=#ff5fd7 guibg=#1c1c1c
-hi Statement		cterm=none		ctermfg=171		gui=none			guifg=#d75fff
-"hi String				cterm=none		ctermfg=224		ctermbg=234		guifg=#ffd7d7	guibg=#1c1c1c
-hi String				cterm=none		ctermfg=180		ctermbg=234		guifg=#d7af87	guibg=#1c1c1c
-hi Todo					cterm=none		ctermfg=16		ctermbg=226		guifg=#000000 guibg=#ffff00
-hi Type					cterm=none		ctermfg=75		gui=none			guifg=#5fafff
-hi Underlined		cterm=underline	ctermfg=39	gui=underline	guifg=#00afff
-
-" ADDITIONNAL
-hi Repeat		cterm=none		ctermfg=99				guifg=#875fff
-
diff --git a/colors/less.vim b/colors/less.vim
deleted file mode 100755
index c874913..0000000
--- a/colors/less.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-" vim color file
-" Maintainer:  Brian Nelson <nelsonbc@gmail.com>
-" Last Change: $Revision: 1.1 $ $Date: 2003/12/15 17:25:08 $
-"
-" Less is More - A minimal color scheme. 
-" Disigned to work equally well on 8 or 16 colors, terminal or gui. 
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "less"
-
-hi Normal         term=none ctermfg=7 ctermbg=0 gui=none guifg=LightGray guibg=black
-hi Directory      term=bold cterm=bold ctermfg=blue guifg=Blue
-hi Search         term=reverse ctermfg=white  ctermbg=blue guifg=white guibg=Blue
-hi MoreMsg        term=bold cterm=bold ctermfg=darkgreen gui=bold guifg=DarkGreen
-hi ModeMsg        term=bold cterm=bold gui=bold guifg=White guibg=Blue
-hi LineNr         term=underline cterm=bold ctermfg=darkcyan guifg=DarkCyan
-hi Question       term=standout cterm=bold ctermfg=darkgreen gui=bold guifg=DarkGreen
-hi Comment        term=bold cterm=bold ctermfg=0 gui=none guifg=DarkGray
-hi Constant       term=bold cterm=none ctermfg=7 gui=none guifg=LightGray
-hi Special        term=bold cterm=none ctermfg=3 gui=none guifg=Orange
-hi Identifier     term=none cterm=none ctermfg=7 gui=none guifg=LightGray
-hi PreProc        term=underline cterm=bold ctermfg=7 gui=bold guifg=White
-hi Error          term=reverse cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=Black guibg=Red
-hi Todo           term=standout cterm=none ctermfg=0 ctermbg=7 guifg=Black guibg=White
-hi String         term=none cterm=none ctermfg=3 gui=none guifg=LightYellow
-hi Function       term=bold cterm=bold ctermfg=3 gui=none guifg=Yellow
-hi Statement      term=bold cterm=bold ctermfg=7 gui=bold guifg=White
-hi Include        term=bold cterm=bold ctermfg=4 gui=none guifg=LightBlue
-hi StorageClass   term=bold cterm=bold ctermfg=5 gui=none guifg=LightMagenta
-hi Type           term=none cterm=none ctermfg=7 gui=none guifg=LightGray
-hi Defined        term=bold cterm=bold ctermfg=6 gui=none guifg=LightCyan
-hi link Character       String
-hi link Number          Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Conditional     Statement
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Operator        Statement
-hi link Keyword         Statement
-hi link Exception       Statement
-hi link Macro           Include
-hi link PreCondit       PreProc
-hi link Structure       Type
-hi link Typedef         Type
-hi link Tag             Special
-hi link SpecialChar     Special
-hi link Delimiter       Special
-hi link SpecialComment  Special
-hi link Debug           Special
diff --git a/colors/lettuce.vim b/colors/lettuce.vim
deleted file mode 100755
index 223dc36..0000000
--- a/colors/lettuce.vim
+++ /dev/null
@@ -1,215 +0,0 @@
-" Vim color file
-"     Version:    1.2 2007.08.08
-"     Author:     Valyaeff Valentin <hhyperr AT gmail DOT com>
-"     License:    GPL
-"
-" Copyright 2007 Valyaeff Valentin
-"
-" 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 3 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, see <http://www.gnu.org/licenses/>.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="lettuce"
-
-
-augroup Syntax_extensions
-    au!
-    au Syntax c,cpp,ruby,javascript syn match Operator "[*/%&|!=><^~,.;:?+-]\+" display contains=TOP
-    au Syntax c,cpp syn region cParen matchgroup=Operator transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell
-    au Syntax c,cpp syn region cCppParen matchgroup=Operator transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
-    au Syntax c,cpp syn region cBracket matchgroup=Operator transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT,@cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString,@Spell
-    au Syntax c,cpp syn region cCppBracket matchgroup=Operator transparent start='\[\|<::\@!' skip='\\$' excludenl end=']\|:>' end='$' contained contains=ALLBUT,@cParenGroup,cErrInParen,cParen,cBracket,cString,@Spell
-    au Syntax c,cpp syn region cBlock matchgroup=OperatorCurlyBrackets start="{" end="}" transparent fold
-    au Syntax ruby syn match rubyBlockParameter "\%(\%(\<do\>\|{\)\s*\)\@<=|\s*[( ,a-zA-Z0-9_*)]\+\ze\s*|"hs=s+1 display
-    au Syntax ruby syn region rubyCurlyBlock matchgroup=Operator start="{" end="}" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo fold
-    au Syntax ruby syn region rubyParentheses matchgroup=Operator start="(" end=")" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo
-    au Syntax ruby syn region rubySquareBrackets matchgroup=Operator start="\[" end="\]" contains=ALLBUT,@rubyExtendedStringSpecial,rubyTodo
-    au Syntax javascript syn region javascriptCurlyBrackets matchgroup=Operator start="{" end="}" transparent fold
-    au Syntax javascript syn region javascriptParentheses matchgroup=Operator start="(" end=")" transparent
-    au Syntax javascript syn region javascriptSquareBrackets matchgroup=Operator start="\[" end="\]" transparent
-augroup END
-
-
-if !has("gui_running")
-
-hi rubyGlobalVariable       cterm=none                   ctermfg=64
-hi rubyPredefinedIdentifier cterm=bold                   ctermfg=64
-hi def link rubyStringDelimiter String
-
-hi Normal           cterm=none       ctermbg=232 ctermfg=189
-hi StatusLine       cterm=none       ctermbg=236 ctermfg=231
-hi StatusLineNC     cterm=none       ctermbg=236 ctermfg=103
-hi User1            cterm=bold       ctermbg=236 ctermfg=223
-hi User2            cterm=none       ctermbg=236 ctermfg=240
-hi VertSplit        cterm=none       ctermbg=236 ctermfg=103
-hi TabLine          cterm=none       ctermbg=236 ctermfg=145
-hi TabLineFill      cterm=none       ctermbg=236
-hi TabLineSel       cterm=none       ctermbg=240 ctermfg=253
-hi LineNr           cterm=none                   ctermfg=238
-hi NonText          cterm=bold       ctermbg=233 ctermfg=241
-hi Folded           cterm=none       ctermbg=234 ctermfg=136
-hi FoldColumn       cterm=none       ctermbg=236 ctermfg=103
-hi SignColumn       cterm=none       ctermbg=236 ctermfg=103
-hi CursorColumn     cterm=none       ctermbg=234
-hi CursorLine       cterm=none       ctermbg=234
-hi IncSearch        cterm=bold       ctermbg=63  ctermfg=232
-hi Search           cterm=none       ctermbg=36  ctermfg=232
-hi Visual           cterm=none       ctermbg=24
-hi WildMenu         cterm=bold       ctermbg=35  ctermfg=232
-hi ModeMsg          cterm=bold                   ctermfg=110
-hi MoreMsg          cterm=bold                   ctermfg=121
-hi Question         cterm=bold                   ctermfg=121
-hi ErrorMsg         cterm=none       ctermbg=88  ctermfg=255
-hi WarningMsg       cterm=none       ctermbg=58  ctermfg=255
-hi SpecialKey       cterm=none                   ctermfg=77
-hi Title            cterm=bold                   ctermfg=147
-hi Directory                                     ctermfg=105
-hi DiffAdd          cterm=none       ctermbg=18
-hi DiffChange       cterm=none       ctermbg=58
-hi DiffDelete       cterm=none       ctermbg=52  ctermfg=58
-hi DiffText         cterm=none       ctermbg=53
-hi Pmenu            cterm=none       ctermbg=17  ctermfg=121
-hi PmenuSel         cterm=none       ctermbg=24  ctermfg=121
-hi PmenuSbar        cterm=none       ctermbg=19
-hi PmenuThumb       cterm=none       ctermbg=37
-hi MatchParen       cterm=bold       ctermbg=24
-hi SpellBad         cterm=none       ctermbg=88
-hi SpellCap         cterm=none       ctermbg=18
-hi SpellLocal       cterm=none       ctermbg=30
-hi SpellRare        cterm=none       ctermbg=90
-
-hi Comment          cterm=none                   ctermfg=138
-hi Constant         cterm=none                   ctermfg=215
- hi String          cterm=none       ctermbg=235 ctermfg=215
- hi Character       cterm=none       ctermbg=235 ctermfg=215
- hi Number          cterm=none                   ctermfg=34
- hi Float           cterm=none                   ctermfg=41
-hi Identifier       cterm=none                   ctermfg=186
- hi Function        cterm=none                   ctermfg=210
-hi Statement        cterm=bold                   ctermfg=63
- hi Exception       cterm=bold                   ctermfg=99
- hi Operator        cterm=none                   ctermfg=75
- hi Label           cterm=none                   ctermfg=63
-hi PreProc          cterm=bold                   ctermfg=36
-hi Type             cterm=bold                   ctermfg=71
-hi Special          cterm=none       ctermbg=235 ctermfg=87
-hi Underlined       cterm=underline              ctermfg=227
-hi Ignore           cterm=bold                   ctermfg=235
-hi Error            cterm=bold       ctermbg=52  ctermfg=231
-hi Todo             cterm=bold       ctermbg=143 ctermfg=16
-
-hi OperatorCurlyBrackets cterm=bold ctermfg=75
-
-" highlight modes
-autocmd InsertEnter * hi StatusLine ctermbg=52
-autocmd InsertEnter * hi User1      ctermbg=52
-autocmd InsertEnter * hi User2      ctermbg=52
-autocmd InsertLeave * hi User2      ctermbg=236
-autocmd InsertLeave * hi User1      ctermbg=236
-autocmd InsertLeave * hi StatusLine ctermbg=236
-autocmd CmdwinEnter * hi StatusLine ctermbg=22
-autocmd CmdwinEnter * hi User1      ctermbg=22
-autocmd CmdwinEnter * hi User2      ctermbg=22
-autocmd CmdwinLeave * hi User2      ctermbg=236
-autocmd CmdwinLeave * hi User1      ctermbg=236
-autocmd CmdwinLeave * hi StatusLine ctermbg=236
-
-else
-
-hi rubyGlobalVariable       gui=none                   guifg=#5f8700
-hi rubyPredefinedIdentifier gui=bold                   guifg=#5f8700
-hi def link rubyStringDelimiter String
-
-hi Normal           gui=none       guibg=#080808 guifg=#dfdfff
-hi StatusLine       gui=none       guibg=#303030 guifg=#ffffff
-hi StatusLineNC     gui=none       guibg=#303030 guifg=#8787af
-hi User1            gui=bold       guibg=#303030 guifg=#ffdfaf
-hi User2            gui=none       guibg=#303030 guifg=#585858
-hi VertSplit        gui=none       guibg=#303030 guifg=#8787af
-hi TabLine          gui=none       guibg=#303030 guifg=#afafaf
-hi TabLineFill      gui=none       guibg=#303030
-hi TabLineSel       gui=none       guibg=#585858 guifg=#dadada
-hi LineNr           gui=none                   guifg=#444444
-hi NonText          gui=bold       guibg=#121212 guifg=#606060
-hi Folded           gui=none       guibg=#1c1c1c guifg=#af8700
-hi FoldColumn       gui=none       guibg=#303030 guifg=#8787af
-hi SignColumn       gui=none       guibg=#303030 guifg=#8787af
-hi CursorColumn     gui=none       guibg=#1c1c1c
-hi CursorLine       gui=none       guibg=#1c1c1c
-hi IncSearch        gui=bold       guibg=#5f5fff  guifg=#080808
-hi Search           gui=none       guibg=#00af87  guifg=#080808
-hi Visual           gui=none       guibg=#005f87
-hi WildMenu         gui=bold       guibg=#00af5f  guifg=#080808
-hi ModeMsg          gui=bold                   guifg=#87afdf
-hi MoreMsg          gui=bold                   guifg=#87ffaf
-hi Question         gui=bold                   guifg=#87ffaf
-hi ErrorMsg         gui=none       guibg=#870000  guifg=#eeeeee
-hi WarningMsg       gui=none       guibg=#5f5f00  guifg=#eeeeee
-hi SpecialKey       gui=none                   guifg=#5fdf5f
-hi Title            gui=bold                   guifg=#afafff
-hi Directory                                     guifg=#8787ff
-hi DiffAdd          gui=none       guibg=#000087
-hi DiffChange       gui=none       guibg=#5f5f00
-hi DiffDelete       gui=none       guibg=#5f0000  guifg=#5f5f00
-hi DiffText         gui=none       guibg=#5f005f
-hi Pmenu            gui=none       guibg=#00005f  guifg=#87ffaf
-hi PmenuSel         gui=none       guibg=#005f87  guifg=#87ffaf
-hi PmenuSbar        gui=none       guibg=#0000af
-hi PmenuThumb       gui=none       guibg=#00afaf
-hi MatchParen       gui=bold       guibg=#005f87
-hi SpellBad         gui=none       guibg=#870000
-hi SpellCap         gui=none       guibg=#000087
-hi SpellLocal       gui=none       guibg=#008787
-hi SpellRare        gui=none       guibg=#870087
-
-hi Comment          gui=none                   guifg=#af8787
-hi Constant         gui=none                   guifg=#ffaf5f
- hi String          gui=none       guibg=#262626 guifg=#ffaf5f
- hi Character       gui=none       guibg=#262626 guifg=#ffaf5f
- hi Number          gui=none                   guifg=#00af00
- hi Float           gui=none                   guifg=#00df5f
-hi Identifier       gui=none                   guifg=#dfdf87
- hi Function        gui=none                   guifg=#ff8787
-hi Statement        gui=bold                   guifg=#5f5fff
- hi Exception       gui=bold                   guifg=#875fff
- hi Operator        gui=none                   guifg=#5fafff
- hi Label           gui=none                   guifg=#5f5fff
-hi PreProc          gui=bold                   guifg=#00af87
-hi Type             gui=bold                   guifg=#5faf5f
-hi Special          gui=none       guibg=#262626 guifg=#5fffff
-hi Underlined       gui=underline              guifg=#ffff5f
-hi Ignore           gui=bold                   guifg=#262626
-hi Error            gui=bold       guibg=#5f0000  guifg=#ffffff
-hi Todo             gui=bold       guibg=#afaf5f guifg=#000000
-
-hi OperatorCurlyBrackets gui=bold guifg=#5fafff
-
-" highlight modes
-autocmd InsertEnter * hi StatusLine guibg=#5f0000
-autocmd InsertEnter * hi User1      guibg=#5f0000
-autocmd InsertEnter * hi User2      guibg=#5f0000
-autocmd InsertLeave * hi User2      guibg=#303030
-autocmd InsertLeave * hi User1      guibg=#303030
-autocmd InsertLeave * hi StatusLine guibg=#303030
-autocmd CmdwinEnter * hi StatusLine guibg=#005f00
-autocmd CmdwinEnter * hi User1      guibg=#005f00
-autocmd CmdwinEnter * hi User2      guibg=#005f00
-autocmd CmdwinLeave * hi User2      guibg=#303030
-autocmd CmdwinLeave * hi User1      guibg=#303030
-autocmd CmdwinLeave * hi StatusLine guibg=#303030
-
-end
diff --git a/colors/lightcolors.vim b/colors/lightcolors.vim
deleted file mode 100755
index 93f708c..0000000
--- a/colors/lightcolors.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-
-" By asmanian
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "lightcolors"
-
-" blue #2A3F82
-" light blue #5555ff
-" cyan #4b909e
-" light cyan #55cbff
-" grey #CCC0B7
-" dark grey #555555
-" green #4E9A06
-" red #AA2100
-" orange/brown #c18216
-" violet #702589
-
-hi Title guifg=#000000 gui=bold
-
-hi Normal guifg=#000000 guibg=#f0f0f0
-hi NonText guifg=#808080 guibg=#e0e0e0
-hi SpecialKey guibg=#e0e0e0 guifg=#a0a0a0
-
-hi LineNr guifg=#555555 guibg=#ccc0b7 gui=italic
-hi StatusLine guifg=#2A3F82 guibg=#ffffff
-hi StatusLineNC guifg=#4A5Fa2 guibg=#ccc0b7
-hi VertSplit guifg=#4a5fa2 guibg=#4a5fa2
-
-hi Comment guifg=#2a3f82 gui=italic
-hi Todo guifg=#2a3f82 guibg=#f0f0f0 gui=italic,bold
-
-" D: private, int
-hi Type guifg=#4e9a06 gui=none
-hi StorageClass guifg=#4e9a06 gui=italic
-hi Typedef guifg=#4e9a06 gui=underline
-
-
-" D: class
-hi Structure guifg=#4e9a06 guibg=#ceea96 gui=underline
-hi Function guifg=#4b909e gui=bold
-",underline
-"guibg=#d0e0ff
-hi Underlined guifg=#000000 gui=underline
-
-" lua: standard functions
-hi Identifier guifg=#4b909e gui=none
-
-hi Statement guifg=#555555 gui=italic
-"hi Label
-"hi Operator
-"hi Keyword
-"hi Exception
-hi Conditional guifg=#c18216 gui=underline
-"guibg=#ffccaa gui=none
-hi Repeat guifg=#663300 gui=underline
-
-
-hi PreProc guifg=#702589 gui=underline
-hi Include guifg=#702589 gui=underline
-hi Define guifg=#702589 gui=underline
-hi Macro guifg=#702589 gui=underline
-hi PreConduit guifg=#702589 gui=underline
-
-" Constants
-hi Constant guifg=#aa2100 gui=italic
-hi String guifg=#aa2100
-hi Special guifg=#800000
-hi Number guifg=#6a2120
-hi Float guifg=#aa2160
-"guibg=#e0e0a0
-
-
-hi Pmenu guibg=#ccc0b7 gui=italic
-hi PmenuSel guifg=#ffffff guibg=#555555 gui=italic
-
-
diff --git a/colors/lilac.vim b/colors/lilac.vim
deleted file mode 100755
index ef825fa..0000000
--- a/colors/lilac.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-" GUI-only vim color file
-" Author:      Christian MICHON
-" Version:     1.0
-" Last Change: 10 Oct 2002
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "lilac"
-
-hi Boolean        guifg=#00f080 guibg=#503040 gui=none
-hi Character      guifg=#00f080 guibg=#503040 gui=none
-hi Comment        guifg=#c0c0c0 guibg=#503040 gui=underline
-hi Conditional    guifg=#60d0d0 guibg=#503040 gui=bold
-hi Constant       guifg=#00f080 guibg=#503040 gui=none
-hi Cursor         guifg=#000000 guibg=#f0f000 gui=none
-hi Debug          guifg=#b0d0f0 guibg=#503040 gui=none
-hi Define         guifg=#f0f000 guibg=#503040 gui=none
-hi Delimiter      guifg=#b0d0f0 guibg=#503040 gui=none
-hi DiffAdd        guifg=#f0f000 guibg=#805070 gui=bold
-hi DiffChange     guifg=#f0f0f0 guibg=#805070 gui=none
-hi DiffDelete     guifg=#503040 guibg=#805070 gui=none
-hi DiffText       guifg=#000000 guibg=#f0f000 gui=bold
-hi Directory      guifg=#f0f000 guibg=#503040 gui=underline
-hi Error          guifg=#000000 guibg=#b0d0f0 gui=bold
-hi ErrorMsg       guifg=#000000 guibg=#b0d0f0 gui=bold
-hi Exception      guifg=#60d0d0 guibg=#503040 gui=bold
-hi Float          guifg=#00f080 guibg=#503040 gui=none
-hi FoldColumn     guifg=#b0d0f0 guibg=#805070 gui=bold
-hi Folded         guifg=#b0d0f0 guibg=#805070 gui=bold
-hi Function       guifg=#f0a070 guibg=#503040 gui=none
-hi Identifier     guifg=#f0a070 guibg=#503040 gui=none
-hi Ignore         guifg=#503040 guibg=#503040 gui=none
-hi Include        guifg=#f0f000 guibg=#503040 gui=none
-hi IncSearch      guifg=#000000 guibg=#b0d0f0 gui=bold
-hi Keyword        guifg=#60d0d0 guibg=#503040 gui=bold
-hi Label          guifg=#60d0d0 guibg=#503040 gui=bold
-hi lCursor        guifg=#f0f0f0 guibg=#503040 gui=none
-hi LineNr         guifg=#c0c0c0 guibg=#805070 gui=bold
-hi Macro          guifg=#f0f000 guibg=#503040 gui=none
-hi ModeMsg        guifg=#f0f0f0 guibg=#503040 gui=bold
-hi MoreMsg        guifg=#f070a0 guibg=#503040 gui=bold
-hi NonText        guifg=#c0c0c0 guibg=#503040 gui=bold
-hi Normal         guifg=#f0f0f0 guibg=#503040 gui=none
-hi Number         guifg=#00f080 guibg=#503040 gui=none
-hi Operator       guifg=#60d0d0 guibg=#503040 gui=bold
-hi PreCondit      guifg=#f0f000 guibg=#503040 gui=none
-hi PreProc        guifg=#f0f000 guibg=#503040 gui=none
-hi Question       guifg=#f070a0 guibg=#503040 gui=bold
-hi Repeat         guifg=#60d0d0 guibg=#503040 gui=bold
-hi Search         guifg=#000000 guibg=#b0d0f0 gui=bold
-hi Special        guifg=#b0d0f0 guibg=#503040 gui=none
-hi SpecialChar    guifg=#b0d0f0 guibg=#503040 gui=none
-hi SpecialComment guifg=#b0d0f0 guibg=#503040 gui=none
-hi SpecialKey     guifg=#f0f000 guibg=#503040 gui=none
-hi Statement      guifg=#60d0d0 guibg=#503040 gui=bold
-hi StatusLine     guifg=#000000 guibg=#f0f0f0 gui=bold
-hi StatusLineNC   guifg=#c0c0c0 guibg=#805070 gui=bold
-hi StorageClass   guifg=#f070a0 guibg=#503040 gui=bold
-hi String         guifg=#00f080 guibg=#503040 gui=none
-hi Structure      guifg=#f070a0 guibg=#503040 gui=bold
-hi Tag            guifg=#b0d0f0 guibg=#503040 gui=none
-hi Title          guifg=#00f080 guibg=#503040 gui=bold
-hi Todo           guifg=#f0f000 guibg=#0000f0 gui=none
-hi Type           guifg=#f070a0 guibg=#503040 gui=bold
-hi Typedef        guifg=#f070a0 guibg=#503040 gui=bold
-hi Underlined     guifg=#b0d0f0 guibg=#503040 gui=underline
-hi VertSplit      guifg=#000000 guibg=#b0d0f0 gui=bold
-hi Visual         guifg=#000000 guibg=#b0d0f0 gui=underline
-hi VisualNOS      guifg=#f0f0f0 guibg=#503040 gui=underline
-hi WarningMsg     guifg=#000000 guibg=#b0d0f0 gui=bold
-hi WildMenu       guifg=#f0f0f0 guibg=#0000f0 gui=none
diff --git a/colors/lilydjwg_dark.vim b/colors/lilydjwg_dark.vim
deleted file mode 100755
index 9ee84bc..0000000
--- a/colors/lilydjwg_dark.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Version: 1.1
-" Maintainer:	lilydjwg <lilydjwg@gmail.com>
-" Last Change:	2009 May 18
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "lilydjwg_dark"
-
-hi Comment guifg=#686868 ctermfg=59
-hi Constant guifg=#10a303 ctermfg=34
-hi Cursor guifg=#FF66FF guibg=#00AAFF ctermfg=207 ctermbg=39
-hi CursorIM guifg=#00AAFF guibg=#FF66FF ctermfg=39 ctermbg=207
-" hi CursorIM gui=None cterm=None
-hi CursorLine guibg=#333333 ctermbg=236 cterm=None
-hi DiffAdd guifg=#000000 guibg=#33ff33 ctermfg=16 ctermbg=83
-hi DiffChange guifg=#dddddd guibg=#5555CC ctermfg=253 ctermbg=63
-hi DiffDelete guifg=#000000 guibg=#ee6699 ctermfg=16 ctermbg=175
-hi DiffText guifg=#ffffff guibg=#8888ff ctermfg=231 ctermbg=105
-hi Directory guifg=#ff99ff ctermfg=213
-hi Error gui=underline guifg=#ff0000 guibg=#111133 cterm=underline ctermfg=196 ctermbg=20
-hi ErrorMsg guifg=#FFFF00 guibg=#0000FF ctermfg=226 ctermbg=21
-hi FoldColumn guifg=#0033FF guibg=#333333 ctermfg=27 ctermbg=236
-hi Folded guifg=#9933FF guibg=#333333 ctermfg=128 ctermbg=236
-hi Identifier guifg=#986CFF guibg=#2d222d ctermfg=135
-hi Ignore gui=None cterm=None
-hi IncSearch gui=bold,reverse guifg=#33ff1c guibg=#3454ff cterm=bold,reverse ctermfg=40 ctermbg=69
-hi LineNr guifg=#FF77DD ctermfg=212
-hi MatchParen guifg=#99FF99 guibg=#444444 ctermfg=120 ctermbg=238
-hi ModeMsg gui=bold guifg=#AAAA3C guibg=#222211 cterm=bold ctermfg=136
-hi MoreMsg guifg=#FFFF00 ctermfg=226
-hi NonText guifg=#8400ff guibg=#1C1C1C ctermfg=129 ctermbg=234
-hi Normal guifg=#00CCFF guibg=#222222 ctermfg=39 ctermbg=235
-hi Pmenu guifg=#3366FF guibg=#1a1a1a ctermfg=33 ctermbg=233
-hi PmenuSbar guibg=#000000 ctermbg=16
-hi PmenuSel guifg=#80ff00 guibg=#1a1a1a ctermfg=82 ctermbg=233
-hi PmenuThumb gui=reverse cterm=reverse
-hi PreProc guifg=#FF99FF guibg=#29222f ctermfg=213
-hi Question gui=bold guifg=#009966 guibg=#113322 cterm=bold ctermfg=42
-hi Search guifg=#3404ff guibg=#FFFF00 ctermfg=57 ctermbg=226
-hi SignColumn guifg=#00FFFF guibg=#C0C0C0 ctermfg=51 ctermbg=251
-hi Special guifg=#FF00FF guibg=#2d222d ctermfg=201
-hi SpecialKey guifg=#00AEA0 guibg=#22302D ctermfg=37
-hi SpellBad gui=undercurl cterm=undercurl
-hi SpellCap gui=undercurl cterm=undercurl
-hi SpellLocal gui=undercurl cterm=undercurl
-hi SpellRare gui=undercurl cterm=undercurl
-hi Statement gui=bold guifg=#d86868 guibg=#2d2222 cterm=bold ctermfg=167
-hi StatusLine gui=reverse guifg=#00c4ff guibg=#000000 cterm=reverse ctermfg=39 ctermbg=16
-hi StatusLineNC guifg=#A4A4FF guibg=#444400 ctermfg=141 ctermbg=58
-hi TabLine guifg=#0066FF guibg=#001133 ctermfg=32 ctermbg=17
-hi TabLineFill gui=None cterm=None
-hi TabLineSel gui=underline guifg=#999944 guibg=#112233 cterm=underline ctermfg=100
-hi Title guifg=#ffff44 guibg=#2F2F2F ctermfg=227 ctermbg=236
-hi Todo gui=bold,underline guifg=#FF4444 guibg=#333300 cterm=bold,underline ctermfg=203 ctermbg=58
-hi Type guifg=#FFA500 guibg=#2d2211 ctermfg=214
-hi Underlined gui=underline guifg=#0088c5 guibg=#222d3d ctermfg=32
-hi VertSplit gui=reverse guifg=#00C4FF guibg=#0000FF cterm=reverse ctermfg=45 ctermbg=21
-hi Visual guibg=#3D3D3D ctermfg=237
-hi VisualNOS gui=None cterm=None
-hi WarningMsg guifg=#FFA500 guibg=#000080 ctermfg=214 ctermbg=18
-hi WildMenu gui=None cterm=None
-hi link Boolean Constant
-hi link Character Constant
-hi link Conditional Statement
-hi link CursorColumn CursorLine
-hi link Debug Special
-hi link Define PreProc
-hi link Delimiter Special
-hi link Exception Statement
-hi link Float Constant
-hi link Function Identifier
-hi link Include PreProc
-hi link Keyword Statement
-hi link Label Statement
-hi link Macro PreProc
-hi link Number Constant
-hi link Operator Statement
-hi link PreCondit PreProc
-hi link Repeat Statement
-hi link SpecialChar Special
-hi link SpecialComment Special
-hi link StorageClass Type
-hi link String Constant
-hi link Structure Type
-hi link Tag Special
-hi link Typedef Type
diff --git a/colors/lilydjwg_green.vim b/colors/lilydjwg_green.vim
deleted file mode 100755
index a45e835..0000000
--- a/colors/lilydjwg_green.vim
+++ /dev/null
@@ -1,92 +0,0 @@
-" 本配色方案由 gui2term.py 程序增加彩色终端支持。
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4 fenc=utf-8
-" Vim color file
-" Version: 1.5
-" Maintainer:	lilydjwg <lilydjwg@gmail.com>
-" Last Change:	2009年8月8日
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "lilydjwg_green"
-
-hi Comment guifg=#686868 guibg=#9bedd1 ctermfg=242 ctermbg=122 cterm=none
-hi Constant guifg=#10a303 guibg=#9bedd1 ctermfg=34 ctermbg=122 cterm=none
-hi Cursor gui=bold guifg=#ff68d1 guibg=#00c4ff ctermfg=206 ctermbg=45 cterm=bold
-hi CursorIM gui=None ctermbg=122 cterm=none
-hi CursorLine guibg=lightcyan ctermbg=195 cterm=none
-hi DiffAdd guifg=black guibg=slateblue ctermfg=16 ctermbg=62 cterm=none
-hi DiffChange guifg=black guibg=darkgreen ctermfg=16 ctermbg=22 cterm=none
-hi DiffDelete gui=bold guifg=black guibg=coral ctermfg=16 ctermbg=209 cterm=bold
-hi DiffText gui=bold guifg=black guibg=olivedrab ctermfg=16 ctermbg=64 cterm=bold
-hi Directory guifg=#ff99ff guibg=#66ffcc ctermfg=213 ctermbg=86 cterm=none
-hi Error gui=underline guifg=red guibg=darkblue ctermfg=196 ctermbg=18 cterm=underline
-hi ErrorMsg guifg=orange guibg=darkblue ctermfg=214 ctermbg=18 cterm=none
-hi FoldColumn guifg=#b6c2ff guibg=#a4a4ff ctermfg=147 ctermbg=147 cterm=none
-hi Folded guifg=#7450ff guibg=#9bc4d1 ctermfg=99 ctermbg=116 cterm=none
-hi Identifier guifg=#986CFF guibg=#9bedd1 ctermfg=99 ctermbg=122 cterm=none
-hi Ignore gui=None cterm=none
-hi IncSearch gui=bold,reverse guifg=#33ff1c guibg=#3454ff ctermfg=82 ctermbg=63 cterm=bold,reverse
-hi LineNr guifg=#ff64cb guibg=#9bedd1 ctermfg=206 ctermbg=122 cterm=none
-hi MatchParen guifg=#342cff guibg=#9aeb95 ctermfg=57 ctermbg=114 cterm=none
-hi ModeMsg gui=bold guifg=#ffff3c guibg=#9bedd1 ctermfg=227 ctermbg=122 cterm=bold
-hi MoreMsg guifg=yellow ctermfg=226 cterm=none
-hi NonText guifg=#8400ff guibg=#9cffee ctermfg=93 ctermbg=159 cterm=none
-hi Normal guifg=#3454ff guibg=#9bedd1 ctermfg=63 ctermbg=122 cterm=none
-hi Pmenu guibg=#ff77ff ctermbg=213 cterm=none
-hi PmenuSel guibg=grey ctermbg=250 cterm=none
-hi PmenuSbar guibg=darkgray ctermbg=248 cterm=none
-hi PmenuThumb gui=reverse ctermbg=122 cterm=reverse
-hi PreProc guifg=#9b20d1 guibg=#9bedd1 ctermfg=92 ctermbg=122 cterm=none
-hi Question gui=bold guifg=#006633 guibg=#66ffff ctermfg=23 ctermbg=87 cterm=bold
-hi Search guifg=#3404ff guibg=yellow ctermfg=57 ctermbg=226 cterm=none
-hi SignColumn guifg=cyan guibg=grey ctermfg=51 ctermbg=250 cterm=none
-hi Special guifg=magenta ctermfg=201 ctermbg=122 cterm=none
-hi SpecialKey guifg=#00AEA0 guibg=#8cedd1 ctermfg=37 ctermbg=122 cterm=none
-hi SpellBad gui=undercurl ctermbg=122 cterm=undercurl
-hi SpellCap gui=undercurl ctermbg=122 cterm=undercurl
-hi SpellLocal gui=undercurl ctermbg=122 cterm=undercurl
-hi SpellRare gui=undercurl ctermbg=122 cterm=undercurl
-hi Statement gui=bold guifg=#d86868 guibg=#9bedd1 ctermfg=167 ctermbg=122 cterm=bold
-hi StatusLine gui=reverse guifg=#00c4ff guibg=black ctermfg=45 ctermbg=16 cterm=reverse
-hi StatusLineNC gui=reverse guifg=#a4a4ff guibg=#5f4d0e ctermfg=147 ctermbg=58 cterm=reverse
-hi TabLine guifg=#ffffc8 guibg=#a4a4ff ctermfg=230 ctermbg=147 cterm=none
-hi TabLineFill gui=reverse guifg=#9cffee ctermfg=159 ctermbg=122 cterm=reverse
-hi TabLineSel gui=bold,underline guifg=#3488ff guibg=#9bedd1 ctermfg=69 ctermbg=122 cterm=bold,underline
-hi Title gui=bold guifg=#006611 guibg=#9bedd1 ctermfg=22 ctermbg=122 cterm=bold
-hi Todo gui=bold,underline guifg=#ff4c4c guibg=#d8ff33 ctermfg=203 ctermbg=191 cterm=bold,underline
-hi Type gui=bold guifg=orange ctermfg=214 ctermbg=122 cterm=bold
-hi Underlined gui=underline guifg=#0088C5 guibg=#aef0da ctermfg=32 ctermbg=158 cterm=underline
-hi VertSplit gui=reverse guifg=#00c4ff guibg=blue ctermfg=45 ctermbg=21 cterm=reverse
-hi Visual guifg=#9bedd1 guibg=#a4a4ff ctermfg=122 ctermbg=147 cterm=none
-hi VisualNOS gui=bold,underline ctermbg=122 cterm=bold,underline
-hi WarningMsg guifg=cyan guibg=darkblue ctermfg=51 ctermbg=18 cterm=none
-hi WildMenu guifg=black guibg=yellow ctermfg=16 ctermbg=226 cterm=none
-hi link Boolean Constant
-hi link Character Constant
-hi link Conditional Statement
-hi link CursorColumn CursorLine
-hi link Debug Special
-hi link Define PreProc
-hi link Delimiter Special
-hi link Exception Statement
-hi link Float Constant
-hi link Function Identifier
-hi link Include PreProc
-hi link Keyword Statement
-hi link Label Statement
-hi link Macro PreProc
-hi link Number Constant
-hi link Operator Statement
-hi link PreCondit PreProc
-hi link Repeat Statement
-hi link SpecialChar Special
-hi link SpecialComment Special
-hi link StorageClass Type
-hi link String Constant
-hi link Structure Type
-hi link Tag Special
-hi link Typedef Type
diff --git a/colors/lilypink.vim b/colors/lilypink.vim
deleted file mode 100755
index 6ac2f5e..0000000
--- a/colors/lilypink.vim
+++ /dev/null
@@ -1,72 +0,0 @@
-" 本配色方案由 gui2term.py 程序增加彩色终端支持。
-" This colorscheme's support for 256-color terminal is generated by gui2term.py
-" See http://www.vim.org/scripts/script.php?script_id=2778 for more info
-" Vim colorscheme: a dark one
-" Maintainer:  lilydjwg <lilydjwg@gmail.com>
-" Last Change: 2010年2月17日
-" License:     Vim license, see :help 'license'
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "lilypink"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine		guibg=#303030 ctermbg=236 cterm=none
-  hi CursorColumn	guibg=#303030 ctermbg=236 cterm=none
-  hi MatchParen		guifg=#98ff85 guibg=bg gui=bold ctermfg=120 ctermbg=235 cterm=bold
-  hi Pmenu		guifg=#f6f3e8 guibg=#444444 ctermfg=230 ctermbg=238 cterm=none
-  hi PmenuSbar		guibg=#333333 ctermbg=236 cterm=none
-  hi PmenuThumb		gui=reverse ctermbg=235 cterm=reverse
-  hi PmenuSel		guifg=#000000 guibg=#cae682 ctermfg=16 ctermbg=150 cterm=none
-endif
-
-" General colors
-hi Cursor	guifg=NONE    guibg=#666666 gui=none ctermfg=254 ctermbg=241 cterm=none
-hi Normal	guifg=#e0e0e0 guibg=#242424 gui=none ctermfg=254 ctermbg=235 cterm=none
-hi NonText	guifg=#99968b guibg=#242424 gui=none ctermfg=246 ctermbg=235 cterm=none
-hi LineNr	guifg=#444444 guibg=#242424 gui=none ctermfg=238 ctermbg=235 cterm=none
-hi VertSplit	guifg=#1c1c1c guibg=#1c1c1c gui=none ctermfg=234 ctermbg=234 cterm=none
-hi Title	guifg=#f6f3e8 guibg=NONE    gui=bold ctermfg=230 ctermbg=none cterm=bold
-hi Visual	guifg=NONE    guibg=#000000 gui=none ctermfg=254 ctermbg=16 cterm=none
-hi Ignore	guifg=bg gui=none ctermfg=235 ctermbg=235 cterm=none
-
-hi StatusLine	guifg=#a0a0a0 guibg=#1c1c1c gui=none ctermfg=247 ctermbg=234 cterm=none
-hi StatusLineNC guifg=#857b6f guibg=#1c1c1c gui=none ctermfg=59 ctermbg=234 cterm=none
-
-hi Folded	guibg=#384048 guifg=#a0a8b0 gui=none ctermfg=103 ctermbg=237 cterm=none
-hi FoldColumn	guibg=#000000 guifg=#ff99ff gui=none ctermfg=213 ctermbg=16 cterm=none
-
-hi SpecialKey	guifg=#d090ff guibg=#242424 gui=none ctermfg=177 ctermbg=235 cterm=none
-hi Special	guifg=#ffddaa gui=none ctermfg=223 ctermbg=235 cterm=none
-
-hi IncSearch	guifg=#33ff1c guibg=#000000 gui=underline ctermfg=46 ctermbg=16 cterm=underline
-hi Search	guibg=#000000 guifg=NONE ctermfg=NONE ctermbg=16 cterm=none
-hi WildMenu	guifg=#33ff1c guibg=#000000 gui=underline ctermfg=46 ctermbg=16 cterm=underline
-
-hi TabLine	guifg=#e0e0e0 guibg=#444444 gui=none ctermfg=254 ctermbg=238 cterm=none
-hi TabLineSel	guifg=#ffffff gui=bold ctermfg=231 ctermbg=235 cterm=bold
-hi TabLineFill	guifg=#e0e0e0 guibg=#444444 gui=none ctermfg=254 ctermbg=238 cterm=none
-
-" Syntax highlighting
-hi Comment	guifg=#99968b gui=italic ctermfg=246 ctermbg=235 cterm=NONE
-hi Todo		guifg=#ff4444 guibg=#333333 gui=bold ctermfg=203 ctermbg=236 cterm=bold
-hi String	guifg=#98ff85 gui=italic ctermfg=120 ctermbg=235 cterm=NONE
-hi Underlined	gui=underline guifg=#80a0ff ctermfg=111 ctermbg=235 cterm=underline
-
-hi Identifier	guifg=#ffff99 gui=none ctermfg=228 ctermbg=235 cterm=none
-hi Function	guifg=#ffff99 gui=none ctermfg=228 ctermbg=235 cterm=none
-hi Type		guifg=#ffff99 gui=none ctermfg=228 ctermbg=235 cterm=none
-
-hi PreProc	guifg=#008faf gui=none ctermfg=31 ctermbg=235 cterm=none
-hi Number	guifg=#00ab11 gui=none ctermfg=34 ctermbg=235 cterm=none
-hi Constant	guifg=#ffa1cf gui=none ctermfg=218 ctermbg=235 cterm=none
-
-hi Statement	guifg=#8ac6f2 gui=none ctermfg=117 ctermbg=235 cterm=none
-hi Keyword	guifg=#8ac6f2 gui=none ctermfg=117 ctermbg=235 cterm=none
diff --git a/colors/lingodirector.vim b/colors/lingodirector.vim
deleted file mode 100755
index 57f2b3c..0000000
--- a/colors/lingodirector.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-" Vim color file
-" Maintainer:  Thomas Schmall <ts_nowhere@yahoo.com>
-" Last Change:  2004 June 16
-" Version:1.0
-" URL: http://www.oxpal.com/index.php?o=dev_vim&lan=en
-"
-" Note: you can type :set number! to activate or deactivate the line numbering, wich also
-" looks similar to Director
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="lingodirector"
-
-hi Normal  guifg=black	guibg=white   ctermfg=Black  ctermbg=white
-hi Title   guifg=black	guibg=white   ctermfg=Black  ctermbg=white  gui=BOLD
-hi lCursor guibg=Cyan   guifg=NONE
-
-hi LineNr	 guifg=white  guibg=#8c9bfa
-
-
-
-" syntax highlighting groups
-hi Comment    ctermfg=Red guifg=#c80000 gui=NONE
-hi Operator   term=None cterm=None gui=None
-
-hi Identifier	ctermfg=Green guifg=#008000  gui=NONE
-
-hi Statement	ctermfg=Blue  guifg=#0000c8  gui=NONE
-hi TypeDef    ctermfg=Blue  guifg=#0000c8  gui=NONE
-hi Type       ctermfg=Blue  guifg=#0000c8  gui=NONE
-hi Boolean    ctermfg=Blue  guifg=#0000c8  gui=NONE
-
-hi String     ctermfg=Gray  guifg=#808080  gui=NONE
-hi Number     ctermfg=Gray  guifg=#808080  gui=NONE
-hi Constant   ctermfg=Gray  guifg=#808080  gui=NONE
-
-hi Function   ctermfg=Green guifg=#008040  gui=NONE
-hi PreProc	  ctermfg=Green guifg=#008040  gui=NONE
-hi Keyword	  ctermfg=Green guifg=#008040  gui=NONE
-
-"set number
diff --git a/colors/liquidcarbon.vim b/colors/liquidcarbon.vim
deleted file mode 100755
index d5164f1..0000000
--- a/colors/liquidcarbon.vim
+++ /dev/null
@@ -1,126 +0,0 @@
-" File: liquidcarbon.vim
-" Author: Jeet Sukumaran
-" Description: Vim color file
-" Last Modified: October 06, 2010
-
-" Initialization and Setup {{{1
-" ============================================================================
-set background=dark
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "liquidcarbon"
-" 1}}}
-
-" Normal Color {{{1
-" ============================================================================
-hi Normal           guifg=#bdcdcd   guibg=#303030
-" 1}}}
-
-" Core Highlights {{{1
-" ============================================================================
-hi  ColorColumn     guifg=NONE      guibg=#3A3A3A
-hi  Cursor          guifg=bg        guibg=fg        gui=NONE
-hi  CursorIM        guifg=bg        guibg=fg        gui=NONE
-hi  CursorLine      guifg=NONE      guibg=#303030   gui=NONE
-hi  lCursor         guifg=bg        guibg=fg        gui=NONE
-hi  DiffAdd         guifg=#000000   guibg=#3cb371   gui=NONE
-hi  DiffChange      guifg=#000000   guibg=#4f94cd   gui=NONE
-hi  DiffDelete      guifg=#000000   guibg=#8b3626   gui=NONE
-hi  DiffText        guifg=#000000   guibg=#8ee5ee   gui=NONE
-hi  Directory       guifg=#1e90ff   guibg=bg        gui=NONE
-hi  ErrorMsg        guifg=#ff6a6a   guibg=NONE      gui=bold
-hi  FoldColumn      guifg=#68838b   guibg=#4B4B4B   gui=bold
-hi  Folded          guifg=#68838b   guibg=#4B4B4B   gui=NONE
-hi  IncSearch       guifg=#ffffff   guibg=#ff4500   gui=bold
-hi  LineNr          guifg=#767676   guibg=#222222   gui=NONE
-hi  MatchParen      guifg=#fff000   guibg=#000000   gui=bold
-hi  ModeMsg         guifg=#000000   guibg=#00ff00   gui=bold
-hi  MoreMsg         guifg=#2e8b57   guibg=bg        gui=bold
-hi  NonText         guifg=#9ac0cd   guibg=bg        gui=NONE
-hi  Pmenu           guifg=#0000ff   guibg=#c0c8cf   gui=bold
-hi  PmenuSel        guifg=#c0c8cf   guibg=#0000ff   gui=bold
-hi  PmenuSbar       guifg=#ffffff   guibg=#c1cdc1   gui=NONE
-hi  PmenuThumb      guifg=#ffffff   guibg=#838b83   gui=NONE
-hi  Question        guifg=#00ee00   guibg=NONE      gui=bold
-hi  Search          guifg=#000000   guibg=#fff68f   gui=bold
-hi  SignColumn      guifg=#ffffff   guibg=#cdcdb4   gui=NONE
-hi  SpecialKey      guifg=#666666   guibg=NONE      gui=NONE
-hi  SpellBad        guisp=#ee2c2c   gui=undercurl
-hi  SpellCap        guisp=#0000ff   gui=undercurl
-hi  SpellLocal      guisp=#008b8b   gui=undercurl
-hi  SpellRare       guisp=#ff00ff   gui=undercurl
-hi  StatusLine      guifg=#ddeeff   guibg=#445566   gui=NONE
-hi  StatusLineNC    guifg=#999999   guibg=#445566   gui=italic
-hi  TabLine         guifg=fg        guibg=#d3d3d3   gui=underline
-hi  TabLineFill     guifg=fg        guibg=bg        gui=reverse
-hi  TabLineSel      guifg=fg        guibg=bg        gui=bold
-hi  Title           guifg=#009acd   guibg=bg        gui=bold
-hi  VertSplit       guifg=#445566   guibg=#445566
-hi  Visual          guifg=#000000   guibg=#90ccff   gui=NONE
-hi  WarningMsg      guifg=#ee9a00   guibg=bg        gui=NONE
-hi  WildMenu        guifg=#000000   guibg=#87ceeb   gui=NONE
-" 1}}}
-
-" Syntax {{{1
-" ============================================================================
-
-"  General {{{2
-" -----------------------------------------------------------------------------
-hi  Comment         guifg=#809090   guibg=NONE      gui=italic
-hi  Constant        guifg=#cdad00   guibg=NONE      gui=NONE
-hi  String          guifg=#559b70   guibg=NONE      gui=NONE
-hi  Boolean         guifg=#cd69c9   guibg=NONE      gui=NONE
-hi  Identifier      guifg=#9f79ee   guibg=NONE      gui=NONE
-hi  Function        guifg=#92a5de   guibg=NONE      gui=NONE
-hi  Statement       guifg=#009acd   guibg=NONE      gui=NONE
-hi  PreProc         guifg=#009acd   guibg=NONE      gui=NONE
-hi  Keyword         guifg=#7ac5cd   guibg=NONE      gui=NONE
-hi  Type            guifg=#4169e1   guibg=NONE      gui=NONE
-hi  Special         guifg=#7f9f44   guibg=NONE      gui=NONE
-hi  Ignore          guifg=bg        guibg=NONE      gui=NONE
-hi  Error           guifg=#ff3030   guibg=NONE      gui=underline
-hi  Todo            guifg=#ff88ee   guibg=NONE      gui=bold
-" 2}}}
-
-" Vim {{{2
-" -----------------------------------------------------------------------------
-hi VimError         guifg=#ff0000   guibg=#000000   gui=bold
-hi VimCommentTitle  guifg=#528b8b   guibg=bg        gui=bold,italic
-" 2}}}
-
-" QuickFix {{{2
-" -----------------------------------------------------------------------------
-hi qfFileName       guifg=#607b8b   guibg=NONE      gui=italic
-hi qfLineNr         guifg=#0088aa   guibg=NONE      gui=bold
-hi qfError          guifg=#ff0000   guibg=NONE      gui=bold
-" 2}}}
-
-" Python {{{2
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#cd8500   guibg=NONE      gui=NONE
-hi link pythonDecoratorFunction pythonDecorator
-" 2}}}
-
-" Diff {{{2
-" -----------------------------------------------------------------------------
-hi diffOldFile      guifg=#da70d6   guibg=NONE      gui=italic
-hi diffNewFile      guifg=#ffff00   guibg=NONE      gui=italic
-hi diffFile         guifg=#ffa500   guibg=NONE      gui=italic
-hi diffLine         guifg=#ff00ff   guibg=NONE      gui=italic
-hi link             diffOnly        Constant
-hi link             diffIdentical   Constant
-hi link             diffDiffer      Constant
-hi link             diffBDiffer     Constant
-hi link             diffIsA         Constant
-hi link             diffNoEOL       Constant
-hi link             diffCommon      Constant
-hi diffRemoved      guifg=#cd5555   guibg=NONE      gui=NONE
-hi diffChanged      guifg=#4f94cd   guibg=NONE      gui=NONE
-hi diffAdded        guifg=#00cd00   guibg=NONE      gui=NONE
-hi link             diffSubname     diffLine
-hi link             diffComment     Comment
-" 2}}}
-
-" 1}}}
diff --git a/colors/literal_tango.vim b/colors/literal_tango.vim
deleted file mode 100755
index a92d438..0000000
--- a/colors/literal_tango.vim
+++ /dev/null
@@ -1,183 +0,0 @@
-" Vim color file
-" Filename: literal_tango.vim
-" Maintainer: Hinrik Örn Sigurðsson <hinrik.sig at gmail dot com>
-" Version: 1.7
-" Last Change: Apr 10th 2008
-" URLs: http://github.com/hinrik/dotfiles/blob/master/.vim/colors/literal_tango.vim
-"       http://www.vim.org/scripts/script.php?script_id=2430
-" Installation: Drop this file in your $VIMRUNTIME/colors/ directory
-" Screenshot: http://img134.imageshack.us/img134/9471/literaltango.png
-" License: GNU General Public License version 3 or (at your option) any
-"          later version as published by the Free Software Foundation
-"
-" A color scheme with good contrast, yet easy on the eyes.
-" Looks the same in the GUI as it does on a 16 color terminal.
-" Uses the Tango color palette (http://tango.freedesktop.org).
-"
-" Terminal users:
-" Intended for display on a black (#000000) background with a text color
-" of #d3d7cf. Also make sure your terminal is using the Tango color 
-" palette. GNOME Terminal uses it by default. Linux console users, see
-" http://search.cpan.org/perldoc?conpalette
-" Also make sure that background=dark in vim.
-"
-" Changelog:
-"
-" 1.7
-"   Used a brighter color for Include
-"   Made Function look distinct from Identifier
-"
-" 1.6
-"   Changed 'Label', 'SpecialKey', 'Type', 'SpecialChar', 'Delimiter',
-"   and 'Exception'
-"
-" 1.5
-"   Use a brighter color for 'Special' to make it more distinct
-"
-" 1.4
-"   Now looks right on a linux console regardless of 'background' setting
-"
-" 1.3:
-"   Made 'WildMenu' look consistent in GUI/terminal
-"   Made 'Title', 'Directory', and 'SpecialKey' look more readable
-"
-" 1.2:
-"   Use darker colors for diffs, popup menus, vertical splits,
-"   matched parens, fold columns, and the status line
-"
-" 1.1:
-"   Gave 'Type' a color
-"   Linked 'Repeat' and 'Conditional' to 'Statement' again
-"   Fixed a few GUI<->terminal inconsistencies
-"
-
-if version > 580
-    " no guarantees for version 5.8 and below,
-    " but this makes it stop complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-
-let g:colors_name = "literal_tango"
-
-" 16 color terminal
-if &background == "dark"
-    hi Function     ctermfg=3
-    hi Include      ctermfg=2
-    hi Constant     ctermfg=1
-    hi Folded       ctermfg=2 ctermbg=NONE
-    hi FoldColumn   ctermfg=2 ctermbg=NONE
-    hi Identifier   ctermfg=2
-    hi Ignore       ctermfg=0
-    hi Label        ctermfg=NONE cterm=bold
-    hi LineNr       ctermfg=0 cterm=bold
-    hi Type         ctermfg=5
-    hi StatusLine   ctermbg=0 cterm=bold
-    hi StatusLineNC ctermbg=0 cterm=NONE
-    hi VertSplit    ctermbg=0 cterm=NONE
-    hi SignColumn   ctermfg=3 ctermbg=NONE
-    hi MatchParen   ctermbg=0 cterm=bold
-    hi Pmenu        ctermbg=0
-    hi PmenuSel     ctermfg=0 ctermbg=7
-    hi PmenuThumb   ctermfg=0
-    hi DiffAdd      ctermbg=2 cterm=bold
-    hi DiffChange   ctermbg=0
-    hi DiffDelete   ctermfg=NONE ctermbg=0
-    hi DiffText     ctermbg=0
-    hi Title        ctermfg=3 cterm=NONE
-    hi Delimiter    ctermfg=6 cterm=NONE
-    hi SpecialKey   ctermfg=5
-    hi Directory    ctermfg=6
-    hi MoreMsg      cterm=NONE
-    hi Question     cterm=NONE
-    hi WarningMsg   cterm=NONE
-    hi TabLine      ctermfg=0 ctermbg=7 cterm=NONE
-    hi CursorColumn ctermbg=7
-    hi Comment      ctermfg=4
-    hi Special      ctermfg=6
-    hi Exception    ctermfg=6
-    hi SpecialChar  ctermfg=3
-    hi Statement    cterm=NONE
-    hi PreProc      ctermfg=5
-    hi Underlined   ctermfg=4 cterm=bold,underline
-elseif &background == "light"
-    " TODO
-endif
-
-" Tango palette
-let s:black        = "#2e3436"
-let s:darkred      = "#cc0000"
-let s:darkgreen    = "#4e9a06"
-let s:brown        = "#c4a000"
-let s:darkblue     = "#3465a4"
-let s:darkmagenta  = "#75507b"
-let s:darkcyan     = "#06989a"
-let s:lightgrey    = "#d3d7cf"
-
-let s:darkgrey     = "#555753"
-let s:lightred     = "#ef2929"
-let s:lightgreen   = "#8ae234"
-let s:yellow       = "#fce94f"
-let s:lightblue    = "#729fcf"
-let s:lightmagenta = "#ad7fa8"
-let s:lightcyan    = "#34e2e2"
-let s:white        = "#eeeeec"
-
-" GUI
-if &background == "dark"
-    exe "hi Normal       guifg=".s:lightgrey    ." guibg=#000000"
-    exe "hi Function     guifg=".s:brown
-    exe "hi Include      guifg=".s:darkgreen
-    exe "hi Folded       guifg=".s:darkgreen    ." guibg=NONE"
-    exe "hi FoldColumn   guifg=".s:darkgreen    ." guibg=NONE"
-    exe "hi LineNr       guifg=".s:darkgrey
-    exe "hi Type         guifg=".s:darkmagenta  ." gui=NONE"
-    exe "hi Label        guifg=".s:white        ." gui=bold"
-    exe "hi Identifier   guifg=".s:darkgreen
-    exe "hi Constant     guifg=".s:darkred
-    exe "hi Statement    guifg=".s:brown        ." gui=NONE"
-    exe "hi Delimiter    guifg=".s:darkcyan     ." gui=NONE"
-    exe "hi PreProc      guifg=".s:darkmagenta
-    exe "hi Comment      guifg=".s:darkblue
-    exe "hi SpecialKey   guifg=".s:darkmagenta
-    exe "hi NonText      guifg=".s:lightblue
-    exe "hi Directory    guifg=".s:darkcyan
-    exe "hi ErrorMsg     guifg=".s:white        ." gui=bold guibg=".s:darkred
-    exe "hi Search       guifg=".s:black        ." guibg=".s:brown
-    exe "hi MoreMsg      guifg=".s:darkgreen    ." gui=NONE"
-    exe "hi Question     guifg=".s:darkgreen    ." gui=NONE"
-    exe "hi StatusLine   guifg=".s:lightgrey    ." gui=bold guibg=".s:black
-    exe "hi StatusLineNC guifg=".s:lightgrey    ." gui=NONE guibg=".s:black
-    exe "hi VertSplit    guifg=NONE gui=NONE guibg=".s:black
-    exe "hi Title        gui=NONE guifg=".s:brown
-    exe "hi Visual       guibg=NONE gui=reverse"
-    exe "hi WarningMsg   guifg=".s:darkred
-    exe "hi WildMenu     guifg=".s:black          ." guibg=".s:brown
-    exe "hi DiffAdd      gui=bold guibg=".s:darkgreen
-    exe "hi DiffChange   guibg=".s:black
-    exe "hi DiffDelete   gui=NONE guifg=NONE guibg=".s:black
-    exe "hi DiffText     guibg=".s:black
-    exe "hi SignColumn   guibg=NONE guifg=".s:brown
-    exe "hi SpellBad     guisp=".s:darkred
-    exe "hi SpellCap     guisp=".s:darkblue
-    exe "hi SpellRare    guisp=".s:darkmagenta
-    exe "hi SpellLocal   guisp=".s:darkcyan
-    exe "hi Pmenu        guibg=".s:black
-    exe "hi PmenuSel     guifg=".s:black        ." guibg=".s:lightgrey
-    exe "hi PmenuSbar    guibg=".s:lightgrey
-    exe "hi PmenuThumb   guifg=".s:darkgrey
-    exe "hi TabLine      gui=NONE guifg=".s:darkgrey     ." guibg=".s:lightgrey
-    exe "hi CursorColumn guibg=".s:white
-    exe "hi CursorLine   guibg=NONE gui=underline"
-    exe "hi MatchParen   guibg=".s:darkgrey
-    exe "hi Special      guifg=".s:darkcyan
-    exe "hi Exception    guifg=".s:darkcyan
-    exe "hi SpecialChar  guifg=".s:brown
-    exe "hi Underlined   guifg=".s:lightblue
-    exe "hi Error        guifg=".s:white        ." guibg=".s:darkred
-    exe "hi Todo         guifg=".s:black        ." guibg=".s:brown
-elseif &background == "light"
-    " TODO
-endif
diff --git a/colors/lodestone.vim b/colors/lodestone.vim
deleted file mode 100755
index 1222385..0000000
--- a/colors/lodestone.vim
+++ /dev/null
@@ -1,407 +0,0 @@
-" Vim color scheme
-"
-" Name:         lodestone.vim
-" Maintainer:   Matt Petty <matt@kizmeta.com> 
-" Last Change:  16 September 2010
-" License:      public domain
-" Version:      4.1
-"
-" 256 color scheme based on lucius, railscasts, many others.
-" Looks good, feels good, but is secretly evil in a good way.
-" This file is also kept here:
-" http://github.com/lodestone/lodestone.vim
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name="lodestone"
-
-" Some other colors to save
-" blue: 3eb8e5
-" green: 92d400
-" c green: d5f876, cae682
-" new blue: 002D62
-" new gray: CCCCCC
-
-
-" Base color
-" ----------
-" hi Normal           guifg=#e0e0e0           guibg=#202020
-hi Normal           guifg=#e0e0e0           guibg=#030303
-hi Normal           ctermfg=253             ctermbg=000
-
-
-" Comment Group
-" -------------
-" any comment
-hi Comment          guifg=#606060                                   gui=none
-hi Comment          ctermfg=240                                     cterm=none
-
-
-" Constant Group
-" --------------
-" any constant
-hi Constant         guifg=#8cd0d3                                   gui=none
-hi Constant         ctermfg=116                                     cterm=none
-" strings
-" hi String           guifg=#80c0d9                                   gui=none
-hi String           guifg=#60e000                                   gui=none
-hi String           ctermfg=110                                     cterm=none
-" character constant
-hi Character        guifg=#80c0d9                                   gui=none
-hi Character        ctermfg=110                                     cterm=none
-" numbers decimal/hex
-hi Number           guifg=#8cd0d3                                   gui=none
-hi Number           ctermfg=116                                     cterm=none
-" true, false
-hi Boolean          guifg=#8cd0d3                                   gui=none
-hi Boolean          ctermfg=116                                     cterm=none
-" float
-hi Float            guifg=#8cd0d3                                   gui=none
-hi Float            ctermfg=116                                     cterm=none
-
-
-" Identifier Group
-" ----------------
-" any variable name
-" hi Identifier       guifg=#e6c080                                   gui=none
-hi Identifier       guifg=#C6C5FE     guibg=NONE        gui=NONE 
-" ctermfg=cyan        ctermbg=NONE        cterm=NONE 
-hi Identifier       ctermfg=216                                     cterm=none
-" function, method, class
-hi Function         guifg=#e6c080                                   gui=none
-hi Function         ctermfg=216                                     cterm=none
-
-
-" Statement Group
-" ---------------
-" any statement
-hi Statement        guifg=#b3d38c                                   gui=none
-hi Statement        ctermfg=150                                     cterm=none
-" if, then, else
-hi Conditional      guifg=#b3d38c                                   gui=none
-hi Conditional      ctermfg=150                                     cterm=none
-" try, catch, throw, raise
-hi Exception        guifg=#b3d38c                                   gui=none
-hi Exception        ctermfg=150                                     cterm=none
-" for, while, do
-hi Repeat           guifg=#b3d38c                                   gui=none
-hi Repeat           ctermfg=150                                     cterm=none
-" case, default
-hi Label            guifg=#b3d38c                                   gui=none
-hi Label            ctermfg=150                                     cterm=none
-" sizeof, +, *
-hi Operator         guifg=#b3d38c                                   gui=none
-hi Operator         ctermfg=150                                     cterm=none
-" any other keyword
-hi Keyword          guifg=#b3d38c                                   gui=none
-hi Keyword          ctermfg=150                                     cterm=none
-
-
-" Preprocessor Group
-" ------------------
-" generic preprocessor
-hi PreProc          guifg=#e9dfaf                                   gui=none
-hi PreProc          ctermfg=223                                     cterm=none
-" #include
-hi Include          guifg=#e9dfaf                                   gui=none
-hi Include          ctermfg=223                                     cterm=none
-" #define
-hi Define           guifg=#e9dfaf                                   gui=none
-hi Define           ctermfg=223                                     cterm=none
-" same as define
-hi Macro            guifg=#e9dfaf                                   gui=none
-hi Macro            ctermfg=223                                     cterm=none
-" #if, #else, #endif
-hi PreCondit        guifg=#e9dfaf                                   gui=none
-hi PreCondit        ctermfg=223                                     cterm=none
-
-
-" Type Group
-" ----------
-" int, long, char
-hi Type             guifg=#93d6a9                                   gui=none
-hi Type             ctermfg=115                                     cterm=none
-" static, register, volative
-hi StorageClass     guifg=#93d6a9                                   gui=none
-hi StorageClass     ctermfg=115                                     cterm=none
-" struct, union, enum
-hi Structure        guifg=#93d6a9                                   gui=none
-hi Structure        ctermfg=115                                     cterm=none
-" typedef
-hi Typedef          guifg=#93d6a9                                   gui=none
-hi Typedef          ctermfg=115                                     cterm=none
-
-
-" Special Group
-" -------------
-" any special symbol
-hi Special          guifg=#cca3b3                                   gui=none
-hi Special          ctermfg=181                                     cterm=none
-" special character in a constant
-hi SpecialChar      guifg=#cca3b3                                   gui=none
-hi SpecialChar      ctermfg=181                                     cterm=none
-" things you can CTRL-]
-hi Tag              guifg=#cca3b3                                   gui=none
-hi Tag              ctermfg=181                                     cterm=none
-" character that needs attention
-hi Delimiter        guifg=#cca3b3                                   gui=none
-hi Delimiter        ctermfg=181                                     cterm=none
-" special things inside a comment
-hi SpecialComment   guifg=#cca3b3                                   gui=none
-hi SpecialComment   ctermfg=181                                     cterm=none
-" debugging statements
-hi Debug            guifg=#cca3b3           guibg=NONE              gui=none
-hi Debug            ctermfg=181             ctermbg=NONE            cterm=none
-
-
-" Underlined Group
-" ----------------
-" text that stands out, html links
-hi Underlined       guifg=fg                                        gui=underline
-hi Underlined       ctermfg=fg                                      cterm=underline
-
-
-" Ignore Group
-" ------------
-" left blank, hidden
-hi Ignore           guifg=bg
-hi Ignore           ctermfg=bg
-
-
-" Error Group
-" -----------
-" any erroneous construct
-hi Error            guifg=#e37170           guibg=#432323           gui=none
-hi Error            ctermfg=167             ctermbg=52            cterm=none
-
-
-" Todo Group
-" ----------
-" todo, fixme, note, xxx
-hi Todo             guifg=#efef8f           guibg=NONE              gui=underline
-hi Todo             ctermfg=228             ctermbg=NONE            cterm=underline
-
-
-" Spelling
-" --------
-" word not recognized
-hi SpellBad         guisp=#ee0000                                   gui=undercurl
-hi SpellBad                                 ctermbg=9               cterm=undercurl
-" word not capitalized
-hi SpellCap         guisp=#eeee00                                   gui=undercurl
-hi SpellCap                                 ctermbg=12              cterm=undercurl
-" rare word
-hi SpellRare        guisp=#ffa500                                   gui=undercurl
-hi SpellRare                                ctermbg=13              cterm=undercurl
-" wrong spelling for selected region
-hi SpellLocal       guisp=#ffa500                                   gui=undercurl
-hi SpellLocal                               ctermbg=14              cterm=undercurl
-
-
-" Cursor
-" ------
-" character under the cursor
-hi Cursor           guifg=bg                guibg=#a3e3ed
-hi Cursor           ctermfg=bg              ctermbg=153
-" like cursor, but used when in IME mode
-hi CursorIM         guifg=bg                guibg=#96cdcd
-hi CursorIM         ctermfg=bg              ctermbg=116
-" cursor column
-hi CursorColumn     guifg=NONE              guibg=#202438           gui=none
-hi CursorColumn     ctermfg=NONE            ctermbg=236             cterm=none
-" cursor line/row
-hi CursorLine       gui=NONE                guibg=#202438           gui=none
-hi CursorLine       cterm=NONE              ctermbg=236             cterm=none
-
-
-" Misc
-" ----
-" NerdTREE "|"
-hi treePart        guifg=#c0e0FF    gui=none
-hi treePart        ctermfg=069      gui=none
-hi treeDir         guifg=#c0e0b0    gui=none
-hi treeDir         ctermfg=069      gui=none
-
-" directory names and other special names in listings
-hi Directory        guifg=#c0e0b0                                   gui=none
-hi Directory        ctermfg=151                                     cterm=none
-" error messages on the command line
-hi ErrorMsg         guifg=#ee0000           guibg=NONE              gui=none
-hi ErrorMsg         ctermfg=196             ctermbg=NONE            cterm=none
-
-" column separating vertically split windows
-" hi VertSplit        guifg=#777777           guibg=#363946           gui=none
-" hi VertSplit        ctermfg=242             ctermbg=237             cterm=none
-hi VertSplit        guifg=#777777           guibg=#000000           gui=none
-hi VertSplit        ctermfg=242             ctermbg=none             cterm=none
-
- 
-" columns where signs are displayed (used in IDEs)
-hi SignColumn       guifg=#9fafaf           guibg=#181818           gui=none
-hi SignColumn       ctermfg=145             ctermbg=233             cterm=none
-
-" line numbers
-" hi LineNr           guifg=#818698           guibg=#363946
-" hi LineNr           ctermfg=102             ctermbg=237
-hi LineNr           guifg=#818698           guibg=#303030
-hi LineNr           ctermfg=244             
-
-" match parenthesis, brackets
-hi MatchParen       guifg=#00ff00           guibg=NONE              gui=bold
-hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=bold
-" the 'more' prompt when output takes more than one line
-hi MoreMsg          guifg=#2e8b57                                   gui=none
-hi MoreMsg          ctermfg=29                                      cterm=none
-
-" text showing what mode you are in
-
-hi ModeMsg          guifg=#76d5f8           guibg=NONE              gui=none
-hi ModeMsg          ctermfg=117             ctermbg=NONE            cterm=none
-
-" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
-hi NonText          guifg=#404040                                   gui=none
-hi NonText          ctermfg=235                                     cterm=none
-" the hit-enter prompt (show more output) and yes/no questions
-hi Question         guifg=fg                                        gui=none
-hi Question         ctermfg=fg                                      cterm=none
-" meta and special keys used with map, unprintable characters
-hi SpecialKey       guifg=#405060
-hi SpecialKey       ctermfg=237
-" titles for output from :set all, :autocmd, etc
-hi Title            guifg=#62bdde                                   gui=none
-hi Title            ctermfg=74                                      cterm=none
-"hi Title            guifg=#5ec8e5                                   gui=none
-" warning messages
-hi WarningMsg       guifg=#e5786d                                   gui=none
-hi WarningMsg       ctermfg=173                                     cterm=none
-" current match in the wildmenu completion
-hi WildMenu         guifg=#cae682           guibg=#363946           gui=bold,underline
-hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
-
-
-" Diff
-" ----
-" added line
-hi DiffAdd          guifg=#80a090           guibg=#313c36           gui=none
-hi DiffAdd          ctermfg=108             ctermbg=22              cterm=none
-" changed line
-hi DiffChange       guifg=NONE              guibg=#4a343a           gui=none
-hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
-" deleted line
-hi DiffDelete       guifg=#6c6661           guibg=#3c3631           gui=none
-hi DiffDelete       ctermfg=59              ctermbg=58              cterm=none
-" changed text within line
-hi DiffText         guifg=#f05060           guibg=#4a343a           gui=bold
-hi DiffText         ctermfg=203             ctermbg=52             cterm=bold
-
-
-" Folds
-" -----
-" line used for closed folds
-hi Folded           guifg=#91d6f8           guibg=#363946           gui=none
-hi Folded           ctermfg=117             ctermbg=238             cterm=none
-" column on side used to indicated open and closed folds
-hi FoldColumn       guifg=#91d6f8           guibg=#363946           gui=none
-hi FoldColumn       ctermfg=117             ctermbg=238             cterm=none
-
-
-" Search
-" ------
-" highlight incremental search text; also highlight text replaced with :s///c
-hi IncSearch        guifg=#66ffff                                   gui=reverse
-hi IncSearch        ctermfg=87                                      cterm=reverse
-" hlsearch (last search pattern), also used for quickfix
-hi Search                                    guibg=#ffaa33          gui=none
-hi Search                                    ctermbg=214            cterm=none
-
-
-" Popup Menu
-" ----------
-" normal item in popup
-hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
-" selected item in popup
-hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
-" scrollbar in popup
-hi PMenuSbar                                guibg=#505860           gui=none
-hi PMenuSbar                                ctermbg=59              cterm=none
-" thumb of the scrollbar in the popup
-hi PMenuThumb                               guibg=#808890           gui=none
-hi PMenuThumb                               ctermbg=102             cterm=none
-
-
-" Status Line
-" -----------
-" status line for current window
-" hi StatusLine       guifg=#e0e0e0           guibg=#363946           gui=bold
-hi StatusLine       guifg=#222222           guibg=#eeeeee           gui=bold
-" hi StatusLine       ctermfg=244             ctermbg=186            cterm=bold
-hi StatusLine      ctermfg=238 ctermbg=233
-
-" status line for non-current windows
-hi StatusLineNC     guifg=#767986           guibg=#363946           gui=none
-hi StatusLineNC    ctermfg=244 ctermbg=232
-" hi StatusLineNC     ctermfg=244             ctermbg=white             cterm=none
-
-
-" Tab Lines
-" ---------
-" tab pages line, not active tab page label
-hi TabLine          guifg=#b6bf98           guibg=#363946           gui=none
-hi TabLine          ctermfg=244             ctermbg=236             cterm=none
-" tab pages line, where there are no labels
-hi TabLineFill      guifg=#cfcfaf           guibg=#363946           gui=none
-hi TabLineFill      ctermfg=187             ctermbg=236             cterm=none
-" tab pages line, active tab page label
-hi TabLineSel       guifg=#efefef           guibg=#414658           gui=bold
-hi TabLineSel       ctermfg=254             ctermbg=black             cterm=bold
-
-
-" Visual
-" ------
-" visual mode selection
-hi Visual           guifg=NONE              guibg=#364458
-hi Visual           ctermfg=NONE            ctermbg=24
-" visual mode selection when vim is not owning the selection (x11 only)
-" hi VisualNOS        guifg=fg                                        gui=underline
-" hi VisualNOS        ctermfg=fg                                      cterm=underline
-
-" Ruby/Rails customization
-" ------------------------
-" hi rubyMethod guifg=#ee7777
-" hi link railsMethod         PreProc
-" hi link rubyDefine          Keyword
-" hi link rubySymbol          Constant
-hi rubySymbol guifg=#800000 ctermfg=124
-" hi link rubyAccess          rubyMethod
-" hi link rubyAttribute       rubyMethod
-" hi link rubyEval            rubyMethod
-" hi link rubyException       rubyMethod
-" hi link rubyInclude         rubyMethod
-hi rubyString guifg=#60e000 ctermfg=28
-hi link rubyStringDelimiter rubyString
-" hi link rubyRegexp          Regexp
-" hi link rubyRegexpDelimiter rubyRegexp
-" hi link rubyConstant        Identifier
-" hi link rubyClassVariable Keyword
-" hi rubyInstanceVariable      guifg=#D0D0FF ctermfg=189
-" hi railsUserClass guifg=#aaaaaa ctermfg=255
-" 
-" hi rubyLocalVariableOrMethod guifg=#D0D0FF ctermfg=189
-" 
-" highlight Special                   guifg=#DA4939 ctermfg=167 
-" highlight rubyClass                 guifg=#FFFFFF ctermfg=15
-hi rubyClass guifg=#905000 ctermfg=166
-syn keyword Identifier context
-
-" highlight rubyPseudoVariable        guifg=#FFC66D ctermfg=221
-" 
-" hi link javascriptRegexpString  Regexp
-" hi link javascriptNumber        Number
-" hi link javascriptNull          Constant
-" 
diff --git a/colors/louver.vim b/colors/louver.vim
deleted file mode 100755
index f6b0f77..0000000
--- a/colors/louver.vim
+++ /dev/null
@@ -1,154 +0,0 @@
-" Name:			louver.vim
-" Maintainer:	Kojo Sugita
-" Last Change:  2008-08-15
-" Version:		1.0
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'louver'
-
-if (&term == "xterm") || (&term == "linux")
-	set t_Co=16
-elseif &term == "vt320"
-	set t_Co=8
-endif
-
-" Normal
-hi Normal		guifg=black			guibg=white			gui=none
-hi Normal		ctermfg=black		ctermbg=white		cterm=none
-hi NonText		guifg=darkgray		guibg=#f0f0f0		gui=none
-hi NonText		ctermfg=darkgray	ctermbg=lightgray	cterm=none
-hi SpecialKey	guifg=darkgray		guibg=white			gui=none
-hi SpecialKey	ctermfg=darkgray	ctermbg=white		cterm=none
-
-hi Cursor		guifg=white			guibg=black			gui=none
-hi Cursor		ctermfg=white		ctermbg=black		cterm=none
-hi lCursor		guifg=white			guibg=black			gui=none
-hi lCursor		ctermfg=white		ctermbg=black		cterm=none
-hi CursorIM		guifg=white			guibg=black			gui=none
-hi CursorIM		ctermfg=white		ctermbg=black		cterm=none
-
-" Search
-hi Search		guifg=black			guibg=lightred		gui=none
-hi Search		ctermfg=black		ctermbg=lightred	cterm=none
-hi IncSearch	guifg=black			guibg=lightred		gui=none
-hi IncSearch	ctermfg=black		ctermbg=lightred	cterm=none
-
-" Matches
-hi MatchParen	guifg=black			guibg=darkgray		gui=none
-hi MatchParen	ctermfg=black		ctermbg=darkgray	cterm=none
-
-" status line
-hi StatusLine	guifg=white			guibg=darkgray		gui=bold
-hi StatusLine	ctermfg=white		ctermbg=darkgray	cterm=bold
-hi StatusLineNC	guifg=gray			guibg=darkgray		gui=bold
-hi StatusLineNC	ctermfg=gray		ctermbg=darkgray	cterm=bold
-
-" Diff
-hi DiffAdd		guifg=darkmagenta	guibg=white			gui=none
-hi DiffAdd		ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi DiffChange	guifg=darkmagenta	guibg=white			gui=none
-hi DiffChange	ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi DiffDelete	guifg=white			guibg=black			gui=none
-hi DiffDelete	ctermfg=white		ctermbg=black		cterm=none
-hi DiffText		guifg=darkmagenta	guibg=white			gui=bold
-hi DiffText		ctermfg=darkmagenta	ctermbg=white		cterm=bold
-
-" Folds
-hi Folded		guifg=black			guibg=gray			gui=none
-hi Folded		ctermfg=black		ctermbg=gray		cterm=none
-hi FoldColumn	guifg=black			guibg=gray			gui=none
-hi FoldColumn	ctermfg=black		ctermbg=gray		cterm=none
-
-" Syntax
-hi Number		guifg=#0000d0		guibg=#f5f5ff		gui=none
-hi Number		ctermfg=blue		ctermbg=white		cterm=none
-hi Char			guifg=#0000d0		guibg=#f5f5ff		gui=none
-hi Char			ctermfg=blue		ctermbg=white		cterm=none
-hi String		guifg=#0000d0		guibg=#f5f5ff		gui=none
-hi String		ctermfg=blue		ctermbg=white		cterm=none
-hi Boolean		guifg=#0000d0		guibg=#f5f5ff		gui=none
-hi Boolean		ctermfg=blue		ctermbg=white		cterm=none
-hi Constant		guifg=darkred		guibg=white			gui=none
-hi Constant		ctermfg=darkred		ctermbg=white		cterm=none
-
-hi Statement	guifg=darkred		guibg=white			gui=bold
-hi Statement	ctermfg=darkred		ctermbg=white		cterm=bold
-hi Comment		guifg=#006000		guibg=#f5fff5		gui=none
-hi Comment		ctermfg=darkgreen	ctermbg=white		cterm=none
-hi Identifier	guifg=darkmagenta	guibg=white			gui=none
-hi Identifier	ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi Function		guifg=darkmagenta	guibg=white			gui=bold
-hi Function		ctermfg=darkmagenta	ctermbg=white		cterm=bold
-hi PreProc		guifg=darkmagenta 	guibg=white			gui=bold
-hi PreProc		ctermfg=darkmagenta ctermbg=white		cterm=bold
-hi Type			guifg=darkblue		guibg=white			gui=bold
-hi Type			ctermfg=darkblue	ctermbg=white		cterm=bold
-
-"\n, \0, %d, %s, etc...
-hi Special		guifg=darkred		guibg=#fff5f5		gui=none
-hi Special		ctermfg=darkred		ctermbg=white		cterm=none
-
-" Tree
-hi Directory	guifg=darkmagenta	guibg=white			gui=bold
-hi Directory	ctermfg=darkmagenta	ctermbg=white		cterm=bold
-
-" Message
-hi ModeMsg		guifg=black			guibg=white			gui=none
-hi ModeMsg		ctermfg=black		ctermbg=white		cterm=none
-hi MoreMsg		guifg=black			guibg=white			gui=none
-hi MoreMsg		ctermfg=black		ctermbg=white		cterm=none
-hi WarningMsg	guifg=red			guibg=white			gui=none
-hi WarningMsg	ctermfg=red			ctermbg=white		cterm=none
-hi ErrorMsg		guifg=white			guibg=red			gui=none
-hi ErrorMsg		ctermfg=white		ctermbg=red			cterm=none
-hi Question		guifg=black			guibg=white			gui=none
-hi Question		ctermfg=black		ctermbg=white		cterm=none
-
-hi VertSplit	guifg=black			guibg=black			gui=none
-hi VertSplit	ctermfg=black		ctermbg=black		cterm=none
-hi LineNr		guifg=black			guibg=lightgray		gui=none
-hi LineNr		ctermfg=black		ctermbg=lightgray	cterm=none
-hi Title		guifg=darkmagenta	guibg=white			gui=bold
-hi Title		ctermfg=darkmagenta	ctermbg=white		cterm=bold
-hi Visual		guifg=white			guibg=blue			gui=none
-hi Visual		ctermfg=white		ctermbg=blue		cterm=none
-hi VisualNOS	guifg=white			guibg=black			gui=none
-hi VisualNOS	ctermfg=white		ctermbg=black		cterm=none
-hi WildMenu		guifg=white			guibg=black			gui=none
-hi WildMenu		ctermfg=white		ctermbg=black		cterm=none
-
-"Define, def
-hi Underlined	guifg=darkmagenta	guibg=white			gui=underline
-hi Underlined	ctermfg=darkmagenta	ctermbg=white		cterm=underline
-hi Error		guifg=red			guibg=white			gui=none
-hi Error		ctermfg=red			ctermbg=white		cterm=none
-hi Todo			guifg=black			guibg=white			gui=none
-hi Todo			ctermfg=black		ctermbg=white		cterm=none
-hi SignColumn	guifg=black			guibg=white			gui=none
-hi SignColumn	ctermfg=black		ctermbg=white		cterm=none
-
-if version >= 700
-  "Pmenu
-  hi Pmenu							guibg=gray
-  hi Pmenu							ctermbg=gray
-  hi PmenuSel	guifg=white			guibg=black
-  hi PmenuSel	ctermfg=white		ctermbg=black
-  hi PmenuSbar						guibg=gray
-  hi PmenuSbar						ctermbg=gray
-
-  "Tab
-  hi TabLine		guifg=gray		guibg=#505050		gui=none
-  hi TabLine		ctermfg=gray	ctermbg=darkgray	cterm=none
-  hi TabLineFill	guifg=gray		guibg=gray			gui=none
-  hi TabLineFill	ctermfg=gray	ctermbg=gray		cterm=none
-  hi TabLineSel		guifg=white		guibg=black			gui=none
-  hi TabLineSel		ctermfg=white	ctermbg=black		cterm=none
-endif
-
-finish
-
-" vim: set foldmethod=marker: set fenc=utf-8:
diff --git a/colors/lucius.vim b/colors/lucius.vim
deleted file mode 100755
index 934358b..0000000
--- a/colors/lucius.vim
+++ /dev/null
@@ -1,304 +0,0 @@
-" Lucius vim color file
-" Maintainer:   Jonathan Filip <jfilip1024@gmail.com>
-" Version: 3.5
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name="lucius"
-
-
-" == Normal color ==
-hi Normal           guifg=#e0e0e0           guibg=#202020
-hi Normal           ctermfg=253             ctermbg=234
-
-
-" == Comments ==
-hi Comment          guifg=#606060                                   gui=none
-hi Comment          ctermfg=240                                     cterm=none
-
-
-" == Constants ==
-" any constant
-hi Constant         guifg=#70c0d8                                   gui=none
-hi Constant         ctermfg=74                                      cterm=none
-" strings
-hi String           guifg=#80c0d8                                   gui=none
-hi String           ctermfg=110                                     cterm=none
-" character constant
-hi Character        guifg=#80c0d8                                   gui=none
-hi Character        ctermfg=110                                     cterm=none
-" numbers decimal/hex
-hi Number           guifg=#70c0d8                                   gui=none
-hi Number           ctermfg=74                                      cterm=none
-" true, false
-hi Boolean          guifg=#70c0d8                                   gui=none
-hi Boolean          ctermfg=74                                      cterm=none
-" float
-hi Float            guifg=#70c0d8                                   gui=none
-hi Float            ctermfg=74                                      cterm=none
-
-
-" == Identifiers ==
-" any variable name
-hi Identifier       guifg=#86c6b6                                   gui=none 
-hi Identifier       ctermfg=116                                     cterm=none
-" function, method, class
-hi Function         guifg=#86c6b6                                   gui=none 
-hi Function         ctermfg=116                                     cterm=none
-
-
-" == Statements ==
-" any statement
-hi Statement        guifg=#b3d38c                                   gui=none
-hi Statement        ctermfg=150                                     cterm=none
-" if, then, else
-hi Conditional      guifg=#b3d38c                                   gui=none
-hi Conditional      ctermfg=150                                     cterm=none
-" try, catch, throw, raise
-hi Exception        guifg=#b3d38c                                   gui=none
-hi Exception        ctermfg=150                                     cterm=none
-" for, while, do
-hi Repeat           guifg=#b3d38c                                   gui=none
-hi Repeat           ctermfg=150                                     cterm=none
-" case, default
-hi Label            guifg=#b3d38c                                   gui=none
-hi Label            ctermfg=150                                     cterm=none
-" sizeof, +, *
-hi Operator         guifg=#b3d38c                                   gui=none
-hi Operator         ctermfg=150                                     cterm=none
-" any other keyword
-hi Keyword          guifg=#b3d38c                                   gui=none
-hi Keyword          ctermfg=150                                     cterm=none
-
-
-" == Preprocessor ==
-" generic preprocessor
-hi PreProc          guifg=#e0e8b0                                   gui=none
-hi PreProc          ctermfg=187                                     cterm=none
-" #include
-hi Include          guifg=#e0e8b0                                   gui=none
-hi Include          ctermfg=187                                     cterm=none
-" #define
-hi Define           guifg=#e0e8b0                                   gui=none
-hi Define           ctermfg=187                                     cterm=none
-" same as define
-hi Macro            guifg=#e0e8b0                                   gui=none
-hi Macro            ctermfg=187                                     cterm=none
-" #if, #else, #endif
-hi PreCondit        guifg=#e0e8b0                                   gui=none
-hi PreCondit        ctermfg=187                                     cterm=none
-
-
-" == Types ==
-" int, long, char
-hi Type             guifg=#90d0a0                                   gui=none
-hi Type             ctermfg=115                                     cterm=none
-" static, register, volative
-hi StorageClass     guifg=#90d0a0                                   gui=none
-hi StorageClass     ctermfg=115                                     cterm=none
-" struct, union, enum
-hi Structure        guifg=#90d0a0                                   gui=none
-hi Structure        ctermfg=115                                     cterm=none
-" typedef
-hi Typedef          guifg=#90d0a0                                   gui=none
-hi Typedef          ctermfg=115                                     cterm=none
-
-
-" == Special ==
-" any special symbol
-hi Special          guifg=#b0a0c0                                   gui=none
-hi Special          ctermfg=182                                     cterm=none
-" special character in a constant
-hi SpecialChar      guifg=#b0a0c0                                   gui=none
-hi SpecialChar      ctermfg=182                                     cterm=none
-" things you can CTRL-]
-hi Tag              guifg=#b0a0c0                                   gui=none
-hi Tag              ctermfg=182                                     cterm=none
-" character that needs attention
-hi Delimiter        guifg=#b0a0c0                                   gui=none
-hi Delimiter        ctermfg=182                                     cterm=none
-" special things inside a comment
-hi SpecialComment   guifg=#b0a0c0                                   gui=none
-hi SpecialComment   ctermfg=182                                     cterm=none
-" debugging statements
-hi Debug            guifg=#b0a0c0           guibg=NONE              gui=none
-hi Debug            ctermfg=182             ctermbg=NONE            cterm=none
-
-
-" == Text Markup ==
-" text that stands out, html links
-hi Underlined       guifg=fg                                        gui=underline
-hi Underlined       ctermfg=fg                                      cterm=underline
-" any erroneous construct
-hi Error            guifg=#e37170           guibg=#432323           gui=none
-hi Error            ctermfg=167             ctermbg=236            cterm=none
-" todo, fixme, note, xxx
-hi Todo             guifg=#e0e090           guibg=NONE              gui=underline
-hi Todo             ctermfg=186             ctermbg=NONE            cterm=underline
-" match parenthesis, brackets
-hi MatchParen       guifg=#00ff00           guibg=NONE              gui=bold
-hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=bold
-" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
-hi NonText          guifg=#404040                                   gui=none
-hi NonText          ctermfg=238                                     cterm=none
-" meta and special keys used with map, unprintable characters
-hi SpecialKey       guifg=#405060
-hi SpecialKey       ctermfg=239
-" titles for output from :set all, :autocmd, etc
-hi Title            guifg=#62bdde                                   gui=none
-hi Title            ctermfg=74                                      cterm=none
-
-
-" == Ignore ==
-" left blank, hidden
-hi Ignore           guifg=bg
-hi Ignore           ctermfg=bg
-
-
-" == Text Selection ==
-" character under the cursor
-hi Cursor           guifg=bg                guibg=#a3e3ed
-hi Cursor           ctermfg=bg              ctermbg=153
-" like cursor, but used when in IME mode
-hi CursorIM         guifg=bg                guibg=#96cdcd
-hi CursorIM         ctermfg=bg              ctermbg=116
-" cursor column
-hi CursorColumn     guifg=NONE              guibg=#404448           gui=none
-hi CursorColumn     ctermfg=NONE            ctermbg=236             cterm=none
-" cursor line/row
-hi CursorLine       gui=NONE                guibg=#404448           gui=none
-hi CursorLine       cterm=NONE              ctermbg=236             cterm=none
-" visual mode selection
-hi Visual           guifg=NONE              guibg=#364458
-hi Visual           ctermfg=NONE            ctermbg=24
-" visual mode selection when vim is not owning the selection (x11 only)
-hi VisualNOS        guifg=fg                                        gui=underline
-hi VisualNOS        ctermfg=fg                                      cterm=underline
-" highlight incremental search text; also highlight text replaced with :s///c
-hi IncSearch        guifg=#66ffff                                   gui=reverse
-hi IncSearch        ctermfg=87                                      cterm=reverse
-" hlsearch (last search pattern), also used for quickfix
-hi Search                                    guibg=#ffaa33          gui=none
-hi Search                                    ctermbg=214            cterm=none
-
-
-" == UI ==
-" normal item in popup
-hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
-" selected item in popup
-hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
-" scrollbar in popup
-hi PMenuSbar                                guibg=#505860           gui=none
-hi PMenuSbar                                ctermbg=59              cterm=none
-" thumb of the scrollbar in the popup
-hi PMenuThumb                               guibg=#808890           gui=none
-hi PMenuThumb                               ctermbg=102             cterm=none
-" status line for current window
-hi StatusLine       guifg=#e0e0e0           guibg=#363946           gui=bold
-hi StatusLine       ctermfg=254             ctermbg=237             cterm=bold
-" status line for non-current windows
-hi StatusLineNC     guifg=#767986           guibg=#363946           gui=none
-hi StatusLineNC     ctermfg=244             ctermbg=237             cterm=none
-" tab pages line, not active tab page label
-hi TabLine          guifg=#b6bf98           guibg=#363946           gui=none
-hi TabLine          ctermfg=244             ctermbg=236             cterm=none
-" tab pages line, where there are no labels
-hi TabLineFill      guifg=#cfcfaf           guibg=#363946           gui=none
-hi TabLineFill      ctermfg=187             ctermbg=236             cterm=none
-" tab pages line, active tab page label
-hi TabLineSel       guifg=#efefef           guibg=#414658           gui=bold
-hi TabLineSel       ctermfg=254             ctermbg=236             cterm=bold
-" column separating vertically split windows
-hi VertSplit        guifg=#777777           guibg=#363946           gui=none
-hi VertSplit        ctermfg=242             ctermbg=237             cterm=none
-" line used for closed folds
-hi Folded           guifg=#d0e0f0           guibg=#202020           gui=none
-hi Folded           ctermfg=117             ctermbg=235             cterm=none
-" column on side used to indicated open and closed folds
-hi FoldColumn       guifg=#c0c0d0           guibg=#363946           gui=none
-hi FoldColumn       ctermfg=117             ctermbg=238             cterm=none
-
-
-" == Spelling ==
-" word not recognized
-hi SpellBad         guisp=#ee0000                                   gui=undercurl
-hi SpellBad                                 ctermbg=196             cterm=undercurl
-" word not capitalized
-hi SpellCap         guisp=#eeee00                                   gui=undercurl
-hi SpellCap                                 ctermbg=226             cterm=undercurl
-" rare word
-hi SpellRare        guisp=#ffa500                                   gui=undercurl
-hi SpellRare                                ctermbg=214             cterm=undercurl
-" wrong spelling for selected region
-hi SpellLocal       guisp=#ffa500                                   gui=undercurl
-hi SpellLocal                               ctermbg=214             cterm=undercurl
-
-
-" == Diff ==
-" added line
-hi DiffAdd          guifg=#80a090           guibg=#313c36           gui=none
-hi DiffAdd          ctermfg=fg              ctermbg=22              cterm=none
-" changed line
-hi DiffChange       guifg=NONE              guibg=#4a343a           gui=none
-hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
-" deleted line
-hi DiffDelete       guifg=#6c6661           guibg=#3c3631           gui=none
-hi DiffDelete       ctermfg=fg              ctermbg=58              cterm=none
-" changed text within line
-hi DiffText         guifg=#f05060           guibg=#4a343a           gui=bold
-hi DiffText         ctermfg=203             ctermbg=52              cterm=bold
-
-
-" == Misc ==
-" directory names and other special names in listings
-hi Directory        guifg=#c0e0b0                                   gui=none
-hi Directory        ctermfg=151                                     cterm=none
-" error messages on the command line
-hi ErrorMsg         guifg=#ee0000           guibg=NONE              gui=none
-hi ErrorMsg         ctermfg=196             ctermbg=NONE            cterm=none
-" columns where signs are displayed (used in IDEs)
-hi SignColumn       guifg=#9fafaf           guibg=#181818           gui=none
-hi SignColumn       ctermfg=145             ctermbg=233             cterm=none
-" line numbers
-hi LineNr           guifg=#818698           guibg=#363946
-hi LineNr           ctermfg=245             ctermbg=237
-" the 'more' prompt when output takes more than one line
-hi MoreMsg          guifg=#2e8b57                                   gui=none
-hi MoreMsg          ctermfg=29                                      cterm=none
-" text showing what mode you are in
-hi ModeMsg          guifg=#76d5f8           guibg=NONE              gui=none
-hi ModeMsg          ctermfg=117             ctermbg=NONE            cterm=none
-" the hit-enter prompt (show more output) and yes/no questions
-hi Question         guifg=fg                                        gui=none
-hi Question         ctermfg=fg                                      cterm=none
-" warning messages
-hi WarningMsg       guifg=#e5786d                                   gui=none
-hi WarningMsg       ctermfg=173                                     cterm=none
-" current match in the wildmenu completion
-hi WildMenu         guifg=#cae682           guibg=#363946           gui=bold,underline
-hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
-" color column highlighting
-hi ColorColumn      guifg=NONE              guibg=#403630           gui=none
-hi ColorColumn      ctermfg=NONE            ctermbg=95              cterm=none
-
-
-" == Vimwiki Colors ==
-
-hi VimwikiHeader1   guifg=#e0e8b0                                   gui=bold
-hi VimWikiHeader1   ctermfg=187                                     cterm=none
-hi VimwikiHeader2   guifg=#80c0d8                                   gui=bold
-hi VimwikiHeader2   ctermfg=110                                     cterm=none
-hi VimwikiHeader3   guifg=#b3d38c                                   gui=bold
-hi VimwikiHeader3   ctermfg=150                                     cterm=none
-hi VimwikiHeader4   guifg=#86c6b6                                   gui=bold 
-hi VimwikiHeader4   ctermfg=116                                     cterm=none
-hi VimwikiHeader5   guifg=#b0a0c0                                   gui=bold
-hi VimwikiHeader5   ctermfg=182                                     cterm=none
-hi VimwikiHeader6   guifg=#90d0a0                                   gui=bold
-hi VimwikiHeader6   ctermfg=115                                     cterm=none
-
diff --git a/colors/luinnar.vim b/colors/luinnar.vim
deleted file mode 100755
index b93cbd1..0000000
--- a/colors/luinnar.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file -- Luinnar
-" Maintainer: Luinnar
-" Last Change: 09-Nov-2010
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="luinnar"
-
-let save_cpo = &cpo
-set cpo&vim
-
-" basic highlight groups (:help highlight-groups)
-
-" text
-
-hi Normal       guifg=#00ffff  ctermfg=darkcyan       guibg=#000000 ctermbg=black
-hi Folded       guifg=#c2bfa5  ctermfg=lightgray  guibg=#202020 ctermbg=black  gui=underline cterm=underline
-hi LineNr       guifg=#928c75  ctermfg=darkgray   guibg=#000000 ctermbg=black
-hi Directory    guifg=#00bbdd  ctermfg=cyan       guibg=#000000 ctermbg=black
-hi NonText      guifg=#77ff22  ctermfg=yellow     guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi SpecialKey   guifg=#559933  ctermfg=green      guibg=#000000 ctermbg=black
-hi SpellBad     guifg=NONE     ctermfg=white                    ctermbg=darkred
-hi SpellCap     guifg=NONE     ctermfg=white                    ctermbg=darkblue
-hi SpellLocal   guifg=NONE     ctermfg=black                    ctermbg=cyan
-hi SpellRare    guifg=NONE     ctermfg=white                    ctermbg=darkmagenta
-hi DiffAdd      guifg=#ffa000  ctermfg=darkred    guibg=#002830 ctermbg=black
-hi DiffChange                                     guibg=#002830 ctermbg=black
-hi DiffDelete   guifg=#b0b0b0  ctermfg=cyan       guibg=#202020 ctermbg=black  gui=bold cterm=bold
-hi DiffText     guifg=#ffa000  ctermfg=darkred    guibg=#002830 ctermbg=black  gui=NONE cterm=NONE
-
-" borders / separators / menus
-
-hi FoldColumn   guifg=#c8bcb9       guibg=#786d65       ctermfg=lightgray   ctermbg=darkgray  gui=bold   cterm=bold
-hi SignColumn   guifg=#c8bcb9       guibg=#786d65       ctermfg=lightgray   ctermbg=darkgray  gui=bold   cterm=bold
-hi Pmenu        guifg=#000000       guibg=#a6a190       ctermfg=white       ctermbg=darkgray
-hi PmenuSel     guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=lightblue
-hi PmenuSbar    guifg=NONE          guibg=#555555       ctermfg=black       ctermbg=black
-hi PmenuThumb   guifg=NONE          guibg=#cccccc       ctermfg=gray        ctermbg=gray
-hi StatusLine   guifg=#222222       guibg=#c2bfa5       ctermfg=darkgray    ctermbg=yellow
-hi StatusLineNC guifg=#111111       guibg=#c2bfa5       ctermfg=darkgray    ctermbg=gray
-hi WildMenu     guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=darkblue  gui=bold   cterm=bold
-hi VertSplit    guifg=#c2bfa5       guibg=#c2bfa5       ctermfg=white       ctermbg=white
-hi TabLine      guifg=#000000       guibg=#c2bfa5       ctermfg=black       ctermbg=white
-hi TabLineFill  guifg=#000000       guibg=#c2bfa5       ctermfg=black       ctermbg=white
-hi TabLineSel   guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=black
-
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" cursor / dynamic / other
-
-hi Cursor       guifg=#000000       guibg=#ffff99       ctermfg=black       ctermbg=white
-hi CursorIM     guifg=#000000       guibg=#3b3b3b       ctermfg=black       ctermbg=white       cterm=reverse
-hi CursorLine   guifg=NONE          guibg=#3b3b3b
-hi link CursorColumn CursorLine
-hi link DebugStop    CursorLine
-hi Visual       guibg=#003040       ctermbg=lightblue
-hi Search       guibg=#0080ff       ctermbg=lightblue
-hi MatchParen   guifg=NONE ctermfg=white        guibg=#3377aa ctermbg=blue
-
-"hi IncSearch
-"hi VisualNOS
-
-" listings / messages
-
-hi ModeMsg      guifg=#eecc18 ctermfg=yellow
-hi Title        guifg=#dd4452 ctermfg=red       guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi Question     guifg=#66d077 ctermfg=green     guibg=#000000 ctermbg=black
-hi MoreMsg      guifg=#39d049 ctermfg=green     guibg=#000000 ctermbg=black
-hi ErrorMsg     guifg=#ffffff ctermfg=white     guibg=#ff0000 ctermbg=red    gui=bold cterm=bold
-hi WarningMsg   guifg=#ccae22 ctermfg=yellow    guibg=#000000 ctermbg=black  gui=bold cterm=bold
-
-
-" syntax highlighting groups (:help group-name)
-
-hi Comment      guifg=#b0b010  ctermfg=brown       guibg=#000000 ctermbg=black
-hi Keyword      guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Statement    guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=bold 
-hi StorageClass guifg=#b0ffb0  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=NONE
-hi Structure    guifg=#b0ffb0  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=NONE
-hi Type         guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=NONE
-hi Identifier   guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=NONE cterm=NONE
-hi Operator     guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Delimiter    guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Todo         guifg=#a00000  ctermfg=darkred     guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi Error        guifg=#ffffff  ctermfg=white       guibg=#ff0000 ctermbg=red
-hi Function     guifg=#2080ff  ctermfg=blue        guibg=#000000 ctermbg=black
-hi Underlined   guifg=#80a0ff  ctermfg=cyan        guibg=#000000 ctermbg=black  gui=underline cterm=underline
-hi Ignore       guifg=#888888  ctermfg=darkgray    guibg=#000000 ctermbg=black
-hi Constant     guifg=#00ff20  ctermfg=green       guibg=#000000 ctermbg=black
-hi Number       guifg=#00ff20  ctermfg=green       guibg=#000000 ctermbg=black
-hi PreProc      guifg=#00b000  ctermfg=darkgreen   guibg=#000000 ctermbg=black
-hi Macro        guifg=#00b000  ctermfg=darkgreen   guibg=#000000 ctermbg=black
-hi Special      guifg=#ffff00  ctermfg=yellow      guibg=#000000 ctermbg=black
-
-let &cpo = save_cpo
diff --git a/colors/luna.vim b/colors/luna.vim
deleted file mode 100755
index ce67520..0000000
--- a/colors/luna.vim
+++ /dev/null
@@ -1,247 +0,0 @@
-" Name: Luna vim colorscheme
-" Author: Pratheek
-" URL: http://github.com/Pychimp/vim-luna
-" (see this url for latest release & screenshots)
-" License: MIT (see LICENSE.rst in the root of project)
-" Created: In the middle of Earth's Rotation
-" Version: 0.0.6
-"
-"
-" TODO: {{{
-" ---------------------------------------------------------------------
-" -- Clean up !
-" -- create a terminal version
-" -- add more lang specifics
-" -- (Will think of some more sutff !)
-" }}}
-"
-" Usage and Requirements "{{{
-" ---------------------------------------------------------------------
-" REQUIREMENTS:
-" ---------------------------------------------------------------------
-" Currently,
-"
-" This colourscheme is intended for use on:
-" - gVim >= 7.3 for Linux, Mac and Windows. (Since, all colours are in hex
-"   values, hence works with gvim. Terminal vim will be supported in future)
-"
-" ---------------------------------------------------------------------
-" INSTALLATION:
-" ---------------------------------------------------------------------
-" Two options for installation: manual or pathogen
-"
-" ---------------------------------------------------------------------
-" MANUAL INSTALLATION OPTION:
-" ---------------------------------------------------------------------
-"
-" 1. Download the luna distribution (as a zip archive, available on the github page)
-" and unarchive the file.
-" 2. Move `colors/luna.vim` to your `.vim/colors` directory.
-" 3. Enjoy !
-"
-" ---------------------------------------------------------------------
-" HIGHLY RECOMMENDED PATHOGEN INSTALLATION OPTION:
-" ---------------------------------------------------------------------
-"
-" 1. Download and install Tim Pope's Pathogen from:
-" https://github.com/tpope/vim-pathogen
-"
-" 2. Next, move or clone the `vim-luna` directory so that it is
-" a subdirectory of the `.vim/bundle` directory.
-"
-" a. **clone with git:**
-"
-" $ cd ~/.vim/bundle
-" $ git clone git://github.com/Pychimp/vim-luna.git
-"
-" ---------------------------------------------------------------------
-" MODIFY VIMRC:
-" ---------------------------------------------------------------------
-"
-" After either manual or pathogen installation, put the following two lines in your
-" .vimrc:
-"
-" syntax enable
-" colorscheme luna
-" }}}
-"
-" Colorscheme initialization "{{{
-" ---------------------------------------------------------------------
-set background=dark
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "luna"
-" }}}
-"
-" Gvim Highlighting: (see :help highlight-groups)"{{{
-" ---------------------------------------------------------------------
-" First, the Normal
-hi Normal        guifg=#e5e5e5 guibg=#212121 gui=NONE
-" ---------------------------------------------------------------------
-" The Languages stuff
-hi Title         guifg=#c9f0fa guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-hi Comment       guifg=#616161 guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-" hi Constant      guifg=#e3588d guibg=NONE    gui=NONE
-hi Constant      guifg=#fff159 guibg=NONE    gui=NONE
-hi String        guifg=#60bdf4 guibg=NONE    gui=NONE
-hi Character     guifg=#ff8da1 guibg=NONE    gui=NONE
-hi Number        guifg=#fff159 guibg=NONE    gui=NONE
-hi Boolean       guifg=#fff159 guibg=NONE    gui=NONE
-hi Float         guifg=#fff159 guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-"hi Identifier    guifg=#40ffff guibg=NONE    gui=NONE
-hi Identifier    guifg=#00bcbc guibg=NONE    gui=NONE
-hi Function      guifg=#00bcbc guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-"hi Statement     guifg=#ff8036 guibg=NONE    gui=NONE
-"hi Statement     guifg=#ee82ee guibg=NONE    gui=NONE
-"hi Statement     guifg=#f26d99 guibg=NONE    gui=NONE
-"hi Statement     guifg=#b06bfc guibg=NONE    gui=NONE
-"hi Statement     guifg=#f88379 guibg=NONE    gui=NONE
-hi Statement     guifg=#f64a8a guibg=NONE    gui=NONE
-"hi Conditional   guifg=#c72723 guibg=NONE    gui=NONE
-hi Conditional   guifg=#e4d00a guibg=NONE    gui=NONE
-" hi Repeat       guifg= guibg=NONE    gui=NONE
-" hi Label       guifg= guibg=NONE    gui=NONE
-hi Operator      guifg=#ff8036 guibg=NONE    gui=NONE
-" hi Keyword       guifg= guibg=NONE    gui=NONE
-hi Exception     guifg=#e4d00a guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-hi PreProc       guifg=#bada55 guibg=NONE    gui=NONE
-" hi Include       guifg= guibg=NONE    gui=NONE
-"hi Define        guifg=#bada55 guibg=NONE    gui=NONE
-" hi Macro        guifg=#bada55 guibg=NONE    gui=NONE
-" hi PreCondit        guifg=#bada55 guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-"hi Type          guifg=#26ffa1 guibg=NONE    gui=NONE
-"hi Type          guifg=#ff3800 guibg=NONE    gui=NONE
-hi Type          guifg=#ff4040 guibg=NONE    gui=NONE
-"hi StorageClass  guifg=#f4bbff guibg=NONE    gui=NONE
-hi StorageClass  guifg=#da8a67 guibg=NONE    gui=NONE
-" hi Structure  guifg= guibg=NONE    gui=NONE
-" hi Typedef  guifg= guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-hi Special       guifg=#ff8da1 guibg=NONE    gui=NONE
-" hi SpecialChar       guifg=#ff8da1 guibg=NONE    gui=NONE
-" hi Tag           guifg= guibg=NONE    gui=NONE
-" hi Delimiter           guifg= guibg=NONE    gui=NONE
-" hi SpecialComment           guifg= guibg=NONE    gui=NONE
-" hi Debug           guifg= guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-hi Underlined    guifg=#80a0ff guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-" hi Ignore        guifg= guibg=NONE    gui=NONE
-" ---------------------------------------------------------------------
-hi Error         guifg=#870000 guibg=#ffa40b gui=NONE
-" ---------------------------------------------------------------------
-hi TODO          guifg=#ff0087 guibg=#ffff87 gui=NONE
-
-" ---------------------------------------------------------------------
-" Extended Highlighting
-
-hi NonText       guifg=#838383 guibg=NONE    gui=NONE
-hi Visual        guifg=#262626 guibg=#ffff4d gui=NONE
-hi ErrorMsg      guifg=#870000 guibg=#ffa40b gui=NONE
-hi IncSearch     guifg=#262626 guibg=#ff9933 gui=NONE
-hi Search        guifg=#262626 guibg=#ff9933 gui=NONE
-hi MoreMsg       guifg=#616161 guibg=NONE    gui=NONE
-hi ModeMsg       guifg=#616161 guibg=NONE    gui=NONE
-hi LineNr        guifg=#838383 guibg=NONE    gui=NONE
-hi VertSplit     guifg=#212121 guibg=#474747 gui=NONE
-hi VisualNOS     guifg=#262626 guibg=#ffff4d gui=NONE
-"hi Folded        guifg=#2e4545 guibg=#1e2d2d gui=NONE
-hi Folded        guifg=#426464 guibg=#1e2d2d gui=NONE
-hi DiffAdd       guifg=#ffffff guibg=#006600 gui=NONE
-hi DiffChange    guifg=#ffffff guibg=#007878 gui=NONE
-hi DiffDelete    guifg=#ff0101 guibg=#9a0000 gui=NONE
-hi DiffText      guifg=#000000 guibg=#ffb733 gui=NONE
-hi SpellBad      guifg=#d80000 guibg=#ffff9a gui=NONE
-hi SpellCap      guifg=#8b4600 guibg=#ffff9a gui=NONE
-hi SpellRare     guifg=#ff0000 guibg=#ffff9a gui=NONE
-hi SpellLocal    guifg=#008b00 guibg=#ffff9a gui=NONE
-" hi StatusLine    guifg=#000000 guibg=#8d8d8d gui=NONE
-" hi StatusLine    guifg=#ffffff guibg=#2e4545 gui=NONE
-" hi StatusLine    guifg=#ffffff guibg=#1e2d2d gui=NONE
-" hi StatusLine    guifg=#ffffff guibg=#353535 gui=NONE
-" hi StatusLine    guifg=#ffffff guibg=#1f2e2e gui=NONE
-hi StatusLine    guifg=#ffffff guibg=#002b2b gui=NONE
-hi StatusLineNC  guifg=#ffffff guibg=#474747 gui=NONE
-" hi Pmenu         guifg=#586e75 guibg=#fdf6e3 gui=NONE
-" hi PmenuSel      guifg=#fdf6e3 guibg=#2aa198 gui=NONE
-" hi PmenuSbar     guifg=#fdf6e3 guibg=#fdf6e3 gui=NONE
-" hi PmenuThumb    guifg=#fdf6e3 guibg=#fdf6e3 gui=NONE
-" hi Pmenu         guifg=#426464 guibg=#002b2b gui=NONE
-" hi Pmenu         guifg=#609292 guibg=#002b2b gui=NONE
-hi Pmenu         guifg=#7ca9a9 guibg=#002b2b gui=NONE
-hi PmenuSel      guifg=#002b2b guibg=#fdf6e3 gui=NONE
-hi PmenuSbar     guifg=#002b2b guibg=#002b2b gui=NONE
-hi PmenuThumb    guifg=#002b2b guibg=#002b2b gui=NONE
-hi MatchParen    guifg=#000000 guibg=#ff4040 gui=NONE
-hi CursorLine    guifg=NONE    guibg=#2e2e2e gui=NONE
-"hi CursorLineNr  guifg=#50c878 guibg=#2e2e2e gui=NONE
-"hi CursorLineNr  guifg=#3eb489 guibg=NONE    gui=NONE
-"hi CursorLineNr  guifg=#f5fffa guibg=NONE    gui=NONE
-hi CursorLineNr  guifg=#87ceeb guibg=NONE    gui=NONE
-hi CursorColumn  guifg=NONE    guibg=#2e2e2e gui=NONE
-hi ColorColumn   guifg=NONE    guibg=#3e3739 gui=NONE
-hi WildMenu      guifg=#002b2b guibg=#ffffff gui=NONE
-hi SignColumn    guifg=NONE    guibg=#212121 gui=NONE
-" }}}
-"
-" Language Specifics: {{{
-" ---------------------------------------------------------------------
-" These are language specifics. These are set explicitly to override the group
-" highlighting provided by vim (Simply to make the language that you're working
-" on more awesome, and fun to work with !)
-" ---------------------------------------------------------------------
-" Python Specifics
-"hi pythonDot        guifg=#00ffa5 guibg=NONE gui=NONE
-"hi pythonDot        guifg=#ffff31 guibg=NONE gui=NONE
-"hi pythonDot        guifg=#ff0800 guibg=NONE gui=NONE
-hi pythonDot                 guifg=#d70a53 guibg=NONE gui=NONE
-hi pythonParameters          guifg=#bada55 guibg=NONE gui=NONE
-hi pythonClassParameters     guifg=#bada55 guibg=NONE gui=NONE
-hi pythonClass               guifg=#00bcbc guibg=NONE gui=NONE
-"
-" ---------------------------------------------------------------------
-"  Ruby Specifics
-hi rubyInterpolation      guifg=#ff4040 guibg=NONE gui=NONE
-"hi rubyMethodBlock        guifg=#ff8da1 guibg=NONE gui=NONE
-"hi rubyMethodBlock        guifg=#8ddaff guibg=NONE gui=NONE
-hi rubyMethodBlock        guifg=#ffb28d guibg=NONE gui=NONE
-hi rubyCurlyBlock         guifg=#f64a8a guibg=NONE gui=NONE
-hi rubyDoBlock            guifg=#f64a8a guibg=NONE gui=NONE
-hi rubyBlockExpression    guifg=#f64a8a guibg=NONE gui=NONE
-hi rubyArrayDelimiter     guifg=#00bcbc guibg=NONE gui=NONE
-"
-" ---------------------------------------------------------------------
-" }}}
-"
-" Extras: {{{
-" ---------------------------------------------------------------------
-" These are extra parts for highlighting certain external plugins
-" ---------------------------------------------------------------------
-"
-" Startify (https://github.com/mhinz/vim-startify)
-"
-hi StartifyBracket  guifg=#b06bfc guibg=NONE gui=NONE
-hi StartifyNumber   guifg=#bada55 guibg=NONE gui=NONE
-hi StartifySpecial  guifg=#2e8857 guibg=NONE gui=NONE
-hi StartifyPath     guifg=#545454 guibg=NONE gui=NONE
-hi StartifySlash    guifg=#474747 guibg=NONE gui=NONE
-" hi StartifyFile     guifg=#00ffa5 guibg=NONE gui=NONE
-" hi StartifyFile     guifg=#2aa198 guibg=NONE gui=NONE
-" hi StartifyFile     guifg=#f0e68c guibg=NONE gui=NONE
-hi StartifyFile     guifg=#fa8072 guibg=NONE gui=NONE
-hi StartifyHeader   guifg=#f0e68c guibg=NONE gui=NONE
-hi StartifyFooter   guifg=#a0522d guibg=NONE gui=NONE
-"
-" ---------------------------------------------------------------------
-" }}}
-"
-" vim:foldmethod=marker:foldlevel=0:textwidth=79
-"
diff --git a/colors/made_of_code.vim b/colors/made_of_code.vim
deleted file mode 100755
index 777f298..0000000
--- a/colors/made_of_code.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Vim color file
-" Converted from Textmate theme Made of Code using Coloration v0.3.2 (http://github.com/sickill/coloration)
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "Made of Code"
-
-hi Cursor ctermfg=NONE ctermbg=51 cterm=NONE guifg=NONE guibg=#00ffff gui=NONE
-hi Visual ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#05448d gui=NONE
-hi CursorLine ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE
-hi CursorColumn ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE
-hi ColorColumn ctermfg=NONE ctermbg=17 cterm=NONE guifg=NONE guibg=#212231 gui=NONE
-hi LineNr ctermfg=102 ctermbg=17 cterm=NONE guifg=#81818a guibg=#212231 gui=NONE
-hi VertSplit ctermfg=59 ctermbg=59 cterm=NONE guifg=#4e4f5b guibg=#4e4f5b gui=NONE
-hi MatchParen ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi StatusLine ctermfg=231 ctermbg=59 cterm=bold guifg=#f8f8f8 guibg=#4e4f5b gui=bold
-hi StatusLineNC ctermfg=231 ctermbg=59 cterm=NONE guifg=#f8f8f8 guibg=#4e4f5b gui=NONE
-hi Pmenu ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi PmenuSel ctermfg=NONE ctermbg=24 cterm=NONE guifg=NONE guibg=#05448d gui=NONE
-hi IncSearch ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#233466 gui=NONE
-hi Search ctermfg=NONE ctermbg=23 cterm=NONE guifg=NONE guibg=#233466 gui=NONE
-hi Directory ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Folded ctermfg=133 ctermbg=16 cterm=NONE guifg=#c050c2 guibg=#090a1b gui=NONE
-
-hi Normal ctermfg=231 ctermbg=16 cterm=NONE guifg=#f8f8f8 guibg=#090a1b gui=NONE
-hi Boolean ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Character ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Comment ctermfg=133 ctermbg=0 cterm=NONE guifg=#c050c2 guibg=#000000 gui=italic
-hi Conditional ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi Constant ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Define ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi ErrorMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi WarningMsg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi Float ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Function ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi Identifier ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi Keyword ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi Label ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE
-hi NonText ctermfg=59 ctermbg=16 cterm=NONE guifg=#353c4f guibg=#151626 gui=NONE
-hi Number ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi Operator ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi PreProc ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f8 guibg=NONE gui=NONE
-hi SpecialKey ctermfg=59 ctermbg=17 cterm=NONE guifg=#353c4f guibg=#212231 gui=NONE
-hi Statement ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi StorageClass ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi String ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE
-hi Tag ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f8 guibg=NONE gui=bold
-hi Todo ctermfg=133 ctermbg=0 cterm=inverse,bold guifg=#c050c2 guibg=#000000 gui=inverse,bold,italic
-hi Type ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline
-hi rubyClass ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi rubyFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi rubyConstant ctermfg=49 ctermbg=NONE cterm=NONE guifg=#00ffbc guibg=NONE gui=NONE
-hi rubyStringDelimiter ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE
-hi rubyBlockParameter ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi rubyInstanceVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi rubyInclude ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi rubyGlobalVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi rubyRegexp ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE
-hi rubyRegexpDelimiter ctermfg=179 ctermbg=NONE cterm=NONE guifg=#e9c062 guibg=NONE gui=NONE
-hi rubyEscape ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi rubyControl ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi rubyClassVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi rubyOperator ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi rubyException ctermfg=203 ctermbg=NONE cterm=NONE guifg=#ff3854 guibg=NONE gui=NONE
-hi rubyPseudoVariable ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi rubyRailsUserClass ctermfg=49 ctermbg=NONE cterm=NONE guifg=#00ffbc guibg=NONE gui=NONE
-hi rubyRailsARAssociationMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi rubyRailsARMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi rubyRailsRenderMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi rubyRailsMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi erubyComment ctermfg=133 ctermbg=0 cterm=NONE guifg=#c050c2 guibg=#000000 gui=italic
-hi erubyRailsMethod ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi htmlTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE
-hi htmlEndTag ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE
-hi htmlTagName ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE
-hi htmlArg ctermfg=74 ctermbg=NONE cterm=NONE guifg=#45c1ea guibg=NONE gui=NONE
-hi htmlSpecialChar ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi javaScriptFunction ctermfg=113 ctermbg=NONE cterm=NONE guifg=#99cf50 guibg=NONE gui=NONE
-hi javaScriptRailsFunction ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
-hi yamlKey ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi yamlAnchor ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi yamlAlias ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi yamlDocumentHeader ctermfg=119 ctermbg=16 cterm=NONE guifg=#8fff58 guibg=#102522 gui=NONE
-hi cssURL ctermfg=69 ctermbg=NONE cterm=NONE guifg=#588aff guibg=NONE gui=NONE
-hi cssFunctionName ctermfg=221 ctermbg=NONE cterm=NONE guifg=#f1d950 guibg=NONE gui=NONE
-hi cssColor ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi cssPseudoClassId ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi cssClassName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#6fd3ff guibg=NONE gui=NONE
-hi cssValueLength ctermfg=39 ctermbg=NONE cterm=NONE guifg=#0a9cff guibg=NONE gui=NONE
-hi cssCommonAttr ctermfg=167 ctermbg=NONE cterm=NONE guifg=#cf6a4c guibg=NONE gui=NONE
-hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE
diff --git a/colors/manuscript.vim b/colors/manuscript.vim
deleted file mode 100755
index 6083a3d..0000000
--- a/colors/manuscript.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-" GUI Vim dark color scheme
-" Name: manuscript
-" WWW: http://habamax.ru/myvim/
-" Author: Maxim Kim <habamax@gmail.com>
-" Last Change: 2010-02-27 12:15
-
-" Init "{{{
-if !has("gui_running")
-  echomsg "manuscript colorscheme: please use GUI vim."
-  finish
-endif
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let g:colors_name = expand('<sfile>:t:r')
-"}}}
-
-" General "{{{
-hi Normal       guifg=#e5e5e5 guibg=#242424 gui=none
-
-hi Cursor       guifg=#304050 guibg=#f0e68c gui=none
-hi lCursor      guifg=#000000 guibg=#55cc55 gui=none
-
-hi CursorColumn guifg=NONE    guibg=#101010 gui=none
-hi CursorLine   guifg=NONE    guibg=#101010 gui=none
-
-
-hi Folded       guifg=#b0b0b0 guibg=#343434 gui=none
-hi FoldColumn   guifg=#707070 guibg=#181818 gui=none
-hi SignColumn   guifg=#707070 guibg=#181818 gui=none
-hi LineNr       guifg=#707070 guibg=bg      gui=none
-hi StatusLine   guifg=#000000 guibg=#c2bfa5 gui=none
-hi StatusLineNC guifg=#5a5a5a guibg=#c2bfa5 gui=none
-hi VertSplit    guifg=#3a3a3a guibg=#c2bfa5 gui=none
-hi WildMenu     guifg=fg      guibg=#505045 gui=none
-
-hi Pmenu        guifg=#e0e0e0 guibg=#494949 gui=none
-hi PmenuSel     guifg=#000000 guibg=#808080 gui=none
-hi PmenuSbar    guifg=fg      guibg=#595959 gui=none
-hi PmenuThumb   guifg=fg      guibg=#707070 gui=none
-
-hi TabLineSel   guifg=#000000 guibg=#c2bfa5 gui=NONE
-hi TabLine      guifg=#c2bfa5 guibg=#3a3a3a gui=underline
-hi TabLineFill  guifg=#c2bfa5 guibg=NONE    gui=underline
-
-hi Search       guifg=fg      guibg=#4466bb gui=none
-hi IncSearch    guifg=fg      guibg=#119922 gui=none
-
-hi Visual       guifg=#f0f0f0 guibg=#406070 gui=none
-
-hi Directory    guifg=#bf8f67 guibg=bg      gui=none
-
-hi Underlined   guifg=#779fcf guibg=bg      gui=underline
-hi Todo         guifg=#ffff30 guibg=bg      gui=underline
-hi Title        guifg=#e06070 guibg=NONE    gui=bold
-
-hi Ignore       guifg=#232323 guibg=NONE    gui=none
-
-" TODO: tune it.
-" hi Question     guifg=#23f923 guibg=bg      gui=none
-" hi ModeMsg      guifg=#c3f3a3 guibg=bg      gui=none
-" hi MoreMsg      guifg=#23c3a3 guibg=bg      gui=none
-" hi ErrorMsg     guifg=fg      guibg=#f00000 gui=none
-
-hi SpecialKey   guifg=#707070 guibg=NONE    gui=none
-hi NonText      guifg=#707070 guibg=NONE    gui=none
-
-hi MatchParen   guifg=#f0f0f0 guibg=#008b8b gui=none
-"}}}
-
-" Syntax "{{{
-hi Statement    guifg=#779fcf guibg=bg      gui=none
-hi Identifier   guifg=#ffdead guibg=bg      gui=none
-hi Type         guifg=#87ceeb guibg=bg      gui=none
-hi Comment      guifg=#7f9f7f guibg=bg      gui=none
-
-hi Constant     guifg=#cea3ce guibg=bg      gui=none
-hi Number       guifg=#9fdf77 guibg=bg      gui=none
-hi PreProc      guifg=#bf7f6f guibg=bg      gui=none
-hi Special      guifg=#cfbfaf guibg=bg      gui=none
-hi Error        guifg=fg      guibg=#b03030 gui=none
-"}}}
-
-" Diff "{{{
-" TODO: Tune diff colors.
-hi diffAdd      guifg=bg      guibg=#80a080 gui=none
-hi diffDelete   guifg=fg      guibg=bg      gui=none
-hi diffChange   guifg=bg      guibg=#a08080 gui=none
-hi diffText     guifg=bg      guibg=#a05c5c gui=none
-"}}}
diff --git a/colors/manxome.vim b/colors/manxome.vim
deleted file mode 100755
index 0db38ea..0000000
--- a/colors/manxome.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-""" local syntax file - set colors on a per-machine basis:
-""" Vim color file
-""" Title:			Manxome Foes Color Scheme
-""" Maintainer:		Ricardo SIGNES <rjbs-vim@lists.manxome.org>
-""" This Version:	R2v2 [2003-07-16]
-""" suggested vim editing options: tw=0 ts=4 sw=4
-
-""  clear and re-initialize global variables
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "manxome"
-
-""  set highlight groups
-""		you'll notice that the ctermbg is often 'none'; this is so that when
-""		console vim runs in a terminal, transparency (if any) is not broken
-
-highlight Title			ctermfg=3	ctermbg=none	cterm=bold	guifg=#ffff00	guibg=#000000	gui=none
-highlight Directory  	ctermfg=4	ctermbg=none	cterm=bold	guifg=#0000ff	guibg=#000000	gui=none
-highlight StatusLine 	ctermfg=7	ctermbg=4		cterm=bold	guifg=#ffffff	guibg=#0000ff	gui=none
-highlight StatusLineNC 	ctermfg=0	ctermbg=4		cterm=bold	guifg=#000000	guibg=#0000ff	gui=none
-highlight Normal		ctermfg=7	ctermbg=none	cterm=none	guifg=#cccccc	guibg=#000000	gui=none
-highlight Search		ctermfg=7	ctermbg=4		cterm=bold	guifg=#ffffff	guibg=#0000ff	gui=none
-highlight Visual		ctermfg=7	ctermbg=6		cterm=bold	guifg=#ffffff	guibg=#00aaaa	gui=none
-
-""  set major preferred groups
-
-highlight Comment		ctermfg=2	ctermbg=none	cterm=bold	guifg=#00ff00	guibg=#000000	gui=none
-highlight Constant		ctermfg=6	ctermbg=none	cterm=bold	guifg=#00ffff	guibg=#000000	gui=none
-highlight Identifier	ctermfg=4	ctermbg=none	cterm=bold	guifg=#0000ee	guibg=#000000	gui=none
-highlight Statement 	ctermfg=6	ctermbg=none	cterm=none	guifg=#00aaaa	guibg=#000000	gui=none
-highlight PreProc		ctermfg=7	ctermbg=none	cterm=bold	guifg=#ffffff	guibg=#000000	gui=none
-highlight Type			ctermfg=6	ctermbg=none	cterm=none	guifg=#00aaaa	guibg=#000000	gui=none
-highlight Special		ctermfg=7	ctermbg=none	cterm=bold	guifg=#ffffff	guibg=#000000	gui=none
-highlight Underlined	ctermfg=2	ctermbg=none	cterm=none	guifg=#00aa00	guibg=#000000	gui=none
-highlight Ignore		ctermfg=0	ctermbg=none	cterm=bold  guifg=#aaaaaa	guibg=#000000	gui=none
-highlight Error			ctermfg=1	ctermbg=none	cterm=bold	guibg=#ff0000	guibg=#000000	gui=none
-highlight Todo		 	ctermfg=3	ctermbg=none	cterm=none	guifg=#aaaa00	guibg=#000000	gui=none
-
-"  set syntax-specific groups
-"	I'd like to avoid using these, but the default settings for these two are
-"	just no good.  Seeing italic text in Vim is just plain wrong.
-
-highlight htmlBold		ctermfg=7	ctermbg=none	cterm=bold	guifg=#ffffff	guibg=#000000	gui=none
-highlight htmlItalic	ctermfg=5	ctermbg=none	cterm=bold	guifg=#ff00ff	guibg=#000000	gui=none
diff --git a/colors/marklar.vim b/colors/marklar.vim
deleted file mode 100755
index ea9395f..0000000
--- a/colors/marklar.vim
+++ /dev/null
@@ -1,174 +0,0 @@
-" ------------------------------------------------------------------
-" Filename:	 marklar.vim
-" Last Modified: Nov, 30 2006 (13:01)
-" Version:       0.5
-" Maintainer:	 SM Smithfield (m_smithfield AT yahoo DOT com)
-" Copyright:	 2006 SM Smithfield
-"                This script 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. 
-" Description:   Vim colorscheme file.
-" Install:       Put this file in the users colors directory (~/.vim/colors)
-"                then load it with :colorscheme marklar
-" ------------------------------------------------------------------
-
-hi clear
-set background=dark
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "marklar"
-
-if !exists("s:main")
-
-    " OPTIONS:
-    let s:bold_opt = 0
-    let s:ignore_opt = 1
-
-    function! s:main()
-        if version >= 700
-            call s:apply_opts()
-        endif
-
-        if s:bold_opt
-            let s:bold = 'bold'
-        else
-            let s:bold = 'NONE'
-        endif
-
-        if s:ignore_opt
-            " completely invisible
-            let s:ignore = 'bg'
-        else
-            " nearly invisible
-            let s:ignore = '#467C5C'
-        endif
-
-        execute "hi Constant         guifg=#FFFFFF guibg=NONE                 ctermfg=7 cterm=NONE"
-        execute "hi Identifier       guifg=#38FF56 guibg=NONE gui=".s:bold."  ctermfg=8 cterm=bold"
-        execute "hi Statement        guifg=#FFFF00 guibg=NONE gui=".s:bold."  ctermfg=3 cterm=bold"
-        execute "hi Special          guifg=#25B9F8 guibg=bg   gui=".s:bold."  ctermfg=2 cterm=underline"
-        execute "hi PreProc          guifg=#FF80FF guibg=bg   gui=NONE        ctermfg=2"
-        execute "hi Type             guifg=#00FFFF guibg=NONE gui=".s:bold."  ctermfg=6 cterm=bold"
-
-        execute "hi Ignore           guifg=".s:ignore." guibg=NONE               ctermfg=0"
-
-        hi Comment          guifg=#00BBBB guibg=NONE               ctermfg=6 cterm=none
-        hi Cursor           guifg=NONE    guibg=#FF0000
-        hi DiffAdd          guifg=NONE    guibg=#136769            ctermfg=4 ctermbg=7 cterm=NONE
-        hi DiffDelete       guifg=NONE    guibg=#50694A            ctermfg=1 ctermbg=7 cterm=NONE
-        hi DiffChange       guifg=fg      guibg=#00463c gui=NONE   ctermfg=4 ctermbg=2 cterm=NONE
-        hi DiffText         guifg=#7CFC94 guibg=#00463c gui=bold   ctermfg=4 ctermbg=3 cterm=NONE
-        hi Directory        guifg=#25B9F8 guibg=NONE               ctermfg=2
-        hi Error            guifg=#FFFFFF guibg=#000000            ctermfg=7 ctermbg=0 cterm=bold
-        hi ErrorMsg         guifg=#8eff2e guibg=#204d40
-        hi FoldColumn       guifg=#00BBBB guibg=#204d40
-        hi Folded           guifg=#44DDDD guibg=#204d40            ctermfg=0 ctermbg=8 cterm=bold
-
-        hi IncSearch        guibg=#52891f gui=bold
-        hi LineNr           guifg=#38ff56 guibg=#204d40
-        hi ModeMsg          guifg=#FFFFFF guibg=#0000FF            ctermfg=7 ctermbg=4 cterm=bold
-        hi MoreMsg          guifg=#FFFFFF guibg=#00A261            ctermfg=7 ctermbg=2 cterm=bold
-        hi NonText          guifg=#00bbbb guibg=#204d40
-        hi Normal           guifg=#71C293 guibg=#06544a
-        hi Question         guifg=#FFFFFF guibg=#00A261
-        hi Search           guifg=NONE    guibg=#0f374c            ctermfg=3 ctermbg=0 cterm=bold
-
-        hi SignColumn       guifg=#00BBBB guibg=#204d40
-        hi SpecialKey       guifg=#00FFFF guibg=#266955
-        hi StatusLine       guifg=#245748 guibg=#71C293 gui=NONE   cterm=reverse
-        hi StatusLineNC     guifg=#245748 guibg=#689C7C gui=NONE
-        hi Title            guifg=#7CFC94 guibg=NONE gui=bold      ctermfg=2 cterm=bold
-        hi Todo             guifg=#FFFFFF guibg=#884400            ctermfg=6 ctermbg=4 cterm=NONE
-        hi Underlined       guifg=#df820c guibg=NONE gui=underline ctermfg=8 cterm=underline
-        hi Visual           guibg=#0B7260 gui=NONE
-        hi WarningMsg       guifg=#FFFFFF guibg=#FF0000            ctermfg=7 ctermbg=1 cterm=bold
-        hi WildMenu         guifg=#20012e guibg=#00a675 gui=bold   ctermfg=NONE ctermbg=NONE cterm=bold
-        "
-        if version >= 700
-            hi SpellBad     guisp=#FF0000
-            hi SpellCap     guisp=#0000FF
-            hi SpellRare    guisp=#ff4046
-            hi SpellLocal   guisp=#000000                          ctermbg=0
-            hi Pmenu        guifg=#00ffff guibg=#000000            ctermbg=0 ctermfg=6
-            hi PmenuSel     guifg=#ffff00 guibg=#000000 gui=bold   cterm=bold ctermfg=3
-            hi PmenuSbar    guibg=#204d40                          ctermbg=6
-            hi PmenuThumb   guifg=#38ff56                          ctermfg=3
-            hi CursorColumn guibg=#096354
-            hi CursorLine   guibg=#096354
-            hi Tabline      guifg=bg      guibg=fg gui=NONE        cterm=reverse,bold ctermfg=NONE ctermbg=NONE
-            hi TablineSel   guifg=#20012e guibg=#00a675 gui=bold
-            hi TablineFill  guifg=#689C7C
-            hi MatchParen   guifg=#38ff56 guibg=#0000ff gui=bold   ctermbg=4
-        endif
-        "
-        hi Tag              guifg=#7CFC94 guibg=NONE gui=bold      ctermfg=2 cterm=bold
-        hi link Bold Tag
-        "
-        hi pythonPreCondit                                         ctermfg=2 cterm=NONE
-        execute "hi tkWidget         guifg=#ffa0a0 guibg=bg gui=".s:bold." ctermfg=7 cterm=bold"
-    endfunction
-
-    if version >= 700
-
-        let s:opts = {'bold': 0, 'ignore': 1}
-
-        " preserves vim<7 compat, while letting me reuses some code
-        function! s:apply_opts()
-            let s:bold_opt = s:opts['bold']
-            let s:ignore_opt = s:opts['ignore']
-        endfunction
-
-        function! s:print_opts(...)
-            let d = a:000
-            if len(a:000) == 0
-                let d = keys(s:opts)
-            endif
-            for k in d
-                echo k.': '.s:opts[k]
-            endfor
-        endfunction
-
-        function! s:Marklar(...)
-            let args = a:000
-            if len(args) == 0
-                call s:print_opts()
-            else
-                while len(args)>0
-                    " take first arg
-                    let k = args[0]
-                    let args = args[1:]
-                    " is it a key?
-                    if k =~ '\a\+!'
-                        " does it bang?
-                        let k = strpart(k,0,strlen(k)-1)
-                        let s:opts[k] = !s:opts[k]
-                        call s:main()
-                    elseif k =~ '\a\+?'
-                        " does it quiz?
-                        let k = strpart(k,0,strlen(k)-1)
-                        call s:print_opts(k)
-                    elseif len(args)
-                        " is there another arg?
-                        " take it
-                        let v = args[0]
-                        let args = args[1:]
-                        " is it legal value?
-                        if v == 0 || v == 1
-                            " assign val->key
-                            let s:opts[k] = v
-                            call s:main()
-                        else
-                            echoerr "(".v.") Bad value. Expected 0 or 1."
-                        endif
-                    else
-                    endif
-                endwhile
-            endif
-        endfunction
-        command! -nargs=*  Marklar  :call s:Marklar(<f-args>)
-    endif
-endif
-
-call s:main()
diff --git a/colors/maroloccio.vim b/colors/maroloccio.vim
deleted file mode 100755
index 6030a6f..0000000
--- a/colors/maroloccio.vim
+++ /dev/null
@@ -1,598 +0,0 @@
-" File        : maroloccio.vim
-" Description : An easy-on-the-eyes dark background colour scheme for Vim
-" Scheme      : maroloccio
-" Maintainer  : Marco Ippolito <maroloccio[at]gmail.com>
-" Version     : v0.3.1, originally inspired by watermark.vim
-" Date        : 12 March 2010
-" Licence     : Feel free to use as you wish provided you keep this header.
-" Feedback    : Any feedback welcome! Especially re: how to make it better!
-" Note        : Works well in GUI mode, less in console mode (still worth a try)
-" Online at   : http://sites.google.com/site/maroloccio/
-"
-" History:
-"
-" 0.3.1 Added licensing terms and invitation to provide improvement suggestions
-" 0.3.0 Greatly improved cterm colours when t_Co=256 thanks to Kyle and CSApprox
-" 0.2.9 Improved readability of cterm searches for dark backgrounds
-" 0.2.8 Added VimDiff colouring
-" 0.2.7 Further improved readability of cterm colours
-" 0.2.6 Improved readability of cterm colours on different terminals
-" 0.2.5 Reinstated minimal cterm support
-" 0.2.4 Added full colour descriptions and reinstated minimal cterm support
-" 0.2.3 Added FoldColumn to the list of hlights as per David Hall's suggestion
-" 0.2.2 Removed cterm support, changed visual highlight, fixed bolds
-" 0.2.1 Changed search highlight
-" 0.2.0 Removed italics
-" 0.1.9 Improved search and menu highlighting
-" 0.1.8 Added minimal cterm support
-" 0.1.7 Uploaded to vim.org
-" 0.1.6 Removed redundant highlight definitions
-" 0.1.5 Improved display of folded sections
-" 0.1.4 Removed linked sections for improved compatibility, more Python friendly
-" 0.1.3 Removed settings which usually belong to .vimrc (as in 0.1.1)
-" 0.1.2 Fixed versioning system, added .vimrc -like commands
-" 0.1.1 Corrected typo in header comments, changed colour for Comment
-" 0.1.0 Inital upload to vim.org
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name="maroloccio"
-
-" --- GUI section
-"
-hi Normal         guifg=#8b9aaa guibg=#1a202a  gui=none                         " watermark-foreground on watermark-background
-hi Constant       guifg=#82ade0 guibg=bg       gui=none                         " cyan on background
-hi Boolean        guifg=#82ade0 guibg=bg       gui=none                         " cyan on background
-hi Character      guifg=#82ade0 guibg=bg       gui=none                         " cyan on background
-hi Float          guifg=#82ade0 guibg=bg       gui=none                         " cyan on background
-hi Comment        guifg=#006666 guibg=bg       gui=none                         " teal on background
-hi Type           guifg=#ffcc00 guibg=bg       gui=none                         " yellow on background
-hi Typedef        guifg=#ffcc00 guibg=bg       gui=none                         " yellow on background
-hi Structure      guifg=#ffcc00 guibg=bg       gui=none                         " yellow on background
-hi Function       guifg=#ffcc00 guibg=bg       gui=none                         " yellow on background
-hi StorageClass   guifg=#ffcc00 guibg=bg       gui=none                         " yellow on background
-hi Conditional    guifg=#ff9900 guibg=bg       gui=none                         " orange on background
-hi Repeat         guifg=#78ba42 guibg=bg       gui=none                         " light green on background
-hi Visual         guifg=fg      guibg=#3741ad  gui=none                         " foreground on blue
-hi DiffChange     guifg=fg      guibg=#3741ad  gui=none                         " foreground on blue
-if version>= 700
-hi Pmenu          guifg=fg      guibg=#3741ad  gui=none                         " foreground on blue
-endif
-hi String         guifg=#4c4cad guibg=bg       gui=none                         " violet on background
-hi Folded         guifg=fg      guibg=#333366  gui=none                         " foreground on dark violet
-hi VertSplit      guifg=fg      guibg=#333366  gui=none                         " foreground on dark violet
-if version>= 700
-hi PmenuSel       guifg=fg      guibg=#333366  gui=none                         " foreground on dark violet
-endif
-hi Search         guifg=#78ba42 guibg=#107040  gui=none                         " light green on green
-hi DiffAdd        guifg=#78ba42 guibg=#107040  gui=none                         " light green on green
-hi Exception      guifg=#8f3231 guibg=bg       gui=none                         " red on background
-hi Title          guifg=#8f3231 guibg=bg       gui=none                         " red on background
-hi Error          guifg=fg      guibg=#8f3231  gui=none                         " foreground on red
-hi DiffDelete     guifg=fg      guibg=#8f3231  gui=none                         " foreground on red
-hi Todo           guifg=#8f3231 guibg=#0e1219  gui=bold,undercurl guisp=#cbc32a " red on dark grey
-hi LineNr         guifg=#2c3138 guibg=#0e1219  gui=none                         " grey on dark grey
-hi Statement      guifg=#9966cc guibg=bg       gui=none                         " lavender on background
-hi Underlined                                  gui=bold,underline               " underline
-if version>= 700
-hi CursorLine     guibg=#0e1219 gui=none                                        " foreground on dark grey
-hi CursorColumn   guibg=#0e1219 gui=none                                        " foreground on dark grey
-endif
-hi Include        guifg=#107040 guibg=bg       gui=none                         " green on background
-hi Define         guifg=#107040 guibg=bg       gui=none                         " green on background
-hi Macro          guifg=#107040 guibg=bg       gui=none                         " green on background
-hi PreProc        guifg=#107040 guibg=bg       gui=none                         " green on background
-hi PreCondit      guifg=#107040 guibg=bg       gui=none                         " green on background
-hi StatusLineNC   guifg=#2c3138 guibg=black    gui=none                         " grey on black
-hi StatusLine     guifg=fg      guibg=black    gui=none                         " foreground on black
-hi WildMenu       guifg=fg      guibg=#0e1219  gui=none                         " foreground on dark grey
-hi FoldColumn     guifg=#333366 guibg=#0e1219  gui=none                         " dark violet on dark grey
-hi IncSearch      guifg=#0e1219 guibg=#82ade0  gui=bold                         " dark grey on cyan
-hi DiffText       guifg=#0e1219 guibg=#82ade0  gui=bold                         " dark grey on cyan
-hi Label          guifg=#7e28a9 guibg=bg       gui=none                         " purple on background
-hi Operator       guifg=#6d5279 guibg=bg       gui=none                         " pink on background
-hi Number         guifg=#8b8b00 guibg=bg       gui=none                         " dark yellow on background
-if version>= 700
-hi MatchParen   guifg=#0e1219 guibg=#78ba42  gui=none                           " dark grey on light green
-endif
-hi SpecialKey     guifg=#333366 guibg=bg       gui=none                         " metal on background
-
-hi Cursor         guifg=#0e1219 guibg=#8b9aaa  gui=none                         " dark grey on foreground
-hi TabLine        guifg=fg      guibg=black    gui=none                         " foreground on black
-hi NonText        guifg=#333366 guibg=bg       gui=none                         " metal on background
-hi Tag            guifg=#3741ad guibg=bg       gui=none                         " blue on background
-hi Delimiter      guifg=#3741ad guibg=bg       gui=none                         " blue on background
-hi Special        guifg=#3741ad guibg=bg       gui=none                         " blue on background
-hi SpecialChar    guifg=#3741ad guibg=bg       gui=none                         " blue on background
-hi SpecialComment guifg=#2680af guibg=bg       gui=none                         " blue2 on background
-
-" --- CTerm8 section
-if &t_Co == 8
-
-  " --- CTerm8 (Dark)
-  if &background == "dark"
-    "hi Normal        ctermfg=Grey          "ctermbg=DarkGrey
-    hi Constant       ctermfg=DarkGreen
-    hi Boolean        ctermfg=DarkGreen
-    hi Character      ctermfg=DarkGreen
-    hi Float          ctermfg=DarkGreen
-    hi Comment        ctermfg=DarkCyan
-    hi Type           ctermfg=Brown
-    hi Typedef        ctermfg=Brown
-    hi Structure      ctermfg=Brown
-    hi Function       ctermfg=Brown
-    hi StorageClass   ctermfg=Brown
-    hi Conditional    ctermfg=Brown
-    hi Repeat         ctermfg=Brown
-    hi Visual         ctermfg=Brown         ctermbg=Black
-    hi DiffChange     ctermfg=Grey          ctermbg=DarkBlue
-    if version>= 700
-    hi Pmenu          ctermfg=Grey          ctermbg=DarkBlue
-    endif
-    hi String         ctermfg=DarkGreen
-    hi Folded         ctermfg=DarkGrey      ctermbg=Black
-    hi VertSplit      ctermfg=DarkGrey      ctermbg=DarkGrey
-    if version>= 700
-    hi PmenuSel       ctermfg=DarkBlue      ctermbg=Grey
-    endif
-    hi Search         ctermfg=Black         ctermbg=Brown
-    hi DiffAdd        ctermfg=Black         ctermbg=DarkGreen
-    hi Exception      ctermfg=Brown
-    hi Title          ctermfg=DarkRed
-    hi Error          ctermfg=Brown         ctermbg=DarkRed
-    hi DiffDelete     ctermfg=Brown         ctermbg=DarkRed
-    hi Todo           ctermfg=Brown         ctermbg=DarkRed
-    hi LineNr         ctermfg=DarkGrey
-    hi Statement      ctermfg=Brown
-    hi Underlined     cterm=Underline
-    if version>= 700
-    hi CursorLine     ctermbg=Black         cterm=Underline
-    hi CursorColumn   ctermfg=Grey          ctermbg=Black
-    endif
-    hi Include        ctermfg=DarkMagenta
-    hi Define         ctermfg=DarkMagenta
-    hi Macro          ctermfg=DarkMagenta
-    hi PreProc        ctermfg=DarkMagenta
-    hi PreCondit      ctermfg=DarkMagenta
-    hi StatusLineNC   ctermfg=DarkGrey      ctermbg=Black
-    hi StatusLine     ctermfg=Grey          ctermbg=DarkGrey
-    hi WildMenu       ctermfg=Grey          ctermbg=DarkGrey
-    hi FoldColumn     ctermfg=DarkGrey
-    hi IncSearch      ctermfg=DarkCyan      ctermbg=Black
-    hi DiffText       ctermfg=DarkBlue      ctermbg=Grey
-    hi Label          ctermfg=Brown
-    hi Operator       ctermfg=Brown
-    hi Number         ctermfg=DarkGreen
-    if version>= 700
-    hi MatchParen     ctermfg=Grey          ctermbg=Green
-    endif
-    hi SpecialKey     ctermfg=DarkRed
-
-    hi Cursor         ctermfg=Black         ctermbg=Grey
-    hi Delimiter      ctermfg=Brown
-    hi NonText        ctermfg=DarkRed
-    hi Special        ctermfg=Brown
-    hi SpecialChar    ctermfg=Brown
-    hi SpecialComment ctermfg=DarkCyan
-    hi TabLine        ctermfg=DarkGrey      ctermbg=Grey
-    hi Tag            ctermfg=Brown
-
-  " --- CTerm8 (Light)
-  elseif &background == "light"
-    hi Normal         ctermfg=Black         ctermbg=White
-    hi Constant       ctermfg=DarkCyan
-    hi Boolean        ctermfg=DarkCyan
-    hi Character      ctermfg=DarkCyan
-    hi Float          ctermfg=DarkCyan
-    hi Comment        ctermfg=DarkGreen
-    hi Type           ctermfg=DarkBlue
-    hi Typedef        ctermfg=DarkBlue
-    hi Structure      ctermfg=DarkBlue
-    hi Function       ctermfg=DarkBlue
-    hi StorageClass   ctermfg=DarkBlue
-    hi Conditional    ctermfg=DarkBlue
-    hi Repeat         ctermfg=DarkBlue
-    hi Visual         ctermfg=Brown         ctermbg=Black
-    hi DiffChange     ctermfg=Grey          ctermbg=DarkBlue
-    if version>= 700
-    hi Pmenu          ctermfg=Grey          ctermbg=DarkBlue
-    endif
-    hi String         ctermfg=DarkRed
-    hi Folded         ctermfg=Black         ctermbg=DarkCyan
-    hi VertSplit      ctermfg=Grey          ctermbg=Black
-    if version>= 700
-    hi PmenuSel       ctermfg=DarkBlue      ctermbg=Grey
-    endif
-    hi Search         ctermfg=Grey          ctermbg=DarkGreen
-    hi DiffAdd        ctermfg=Black         ctermbg=DarkGreen
-    hi Exception      ctermfg=DarkBlue
-    hi Title          ctermfg=DarkRed
-    hi Error          ctermfg=Brown         ctermbg=DarkRed
-    hi DiffDelete     ctermfg=Brown         ctermbg=DarkRed
-    hi Todo           ctermfg=Brown         ctermbg=DarkRed
-    hi LineNr         ctermfg=Black         ctermbg=Grey
-    hi Statement      ctermfg=DarkBlue
-    hi Underlined     cterm=Underline
-    if version>= 700
-    hi CursorLine     ctermbg=Grey          cterm=Underline
-    hi CursorColumn   ctermfg=Black         ctermbg=Grey
-    endif
-    hi Include        ctermfg=DarkMagenta
-    hi Define         ctermfg=DarkMagenta
-    hi Macro          ctermfg=DarkMagenta
-    hi PreProc        ctermfg=DarkMagenta
-    hi PreCondit      ctermfg=DarkMagenta
-    hi StatusLineNC   ctermfg=Grey          ctermbg=DarkBlue
-    hi StatusLine     ctermfg=Grey          ctermbg=Black
-    hi WildMenu       ctermfg=Grey          ctermbg=DarkBlue
-    hi FoldColumn     ctermfg=Black         ctermbg=Grey
-    hi IncSearch      ctermfg=Brown         ctermbg=Black
-    hi DiffText       ctermfg=DarkBlue      ctermbg=Grey
-    hi Label          ctermfg=DarkBlue
-    hi Operator       ctermfg=DarkBlue
-    hi Number         ctermfg=DarkCyan
-    if version>= 700
-    hi MatchParen     ctermfg=Grey          ctermbg=Green
-    endif
-    hi SpecialKey     ctermfg=Red
-
-    hi Cursor         ctermfg=Black         ctermbg=Grey
-    hi Delimiter      ctermfg=DarkBlue
-    hi NonText        ctermfg=Red
-    hi Special        ctermfg=DarkBlue
-    hi SpecialChar    ctermfg=DarkBlue
-    hi SpecialComment ctermfg=DarkGreen
-    hi TabLine        ctermfg=DarkBlue      ctermbg=Grey
-    hi Tag            ctermfg=DarkBlue
-  endif
-
-" --- CTerm256 section
-elseif &t_Co == 256
-
-  if v:version < 700
-   command! -nargs=+ CSAHi exe "hi" substitute(substitute(<q-args>, "undercurl", "underline", "g"), "guisp\\S\\+", "", "g")
-  else
-   command! -nargs=+ CSAHi exe "hi" <q-args>
-  endif
-  if has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^screen") && exists("g:CSApprox_konsole") && g:CSApprox_konsole) || &term =~? "^konsole"
-    CSAHi Normal ctermbg=59 ctermfg=145
-    CSAHi Constant term=underline ctermbg=59 ctermfg=146
-    CSAHi Boolean ctermbg=59 ctermfg=146
-    CSAHi Character ctermbg=59 ctermfg=146
-    CSAHi Float ctermbg=59 ctermfg=146
-    CSAHi Comment term=bold ctermbg=59 ctermfg=30
-    CSAHi Type term=underline ctermbg=59 ctermfg=220
-    CSAHi Typedef ctermbg=59 ctermfg=220
-    CSAHi Structure ctermbg=59 ctermfg=220
-    CSAHi Function ctermbg=59 ctermfg=220
-    CSAHi StorageClass ctermbg=59 ctermfg=220
-    CSAHi Conditional ctermbg=59 ctermfg=214
-    CSAHi Repeat ctermbg=59 ctermfg=113
-    CSAHi Visual term=reverse ctermbg=61 ctermfg=white
-    CSAHi DiffChange term=bold ctermbg=61 ctermfg=white
-    CSAHi Pmenu ctermbg=61 ctermfg=white
-    CSAHi String ctermbg=59 ctermfg=61
-    CSAHi Folded ctermbg=61 ctermfg=black
-    CSAHi VertSplit term=reverse ctermbg=black ctermfg=61
-    CSAHi PmenuSel ctermbg=220 ctermfg=black
-    CSAHi Search term=reverse ctermbg=29 ctermfg=113
-    CSAHi DiffAdd term=bold ctermbg=29 ctermfg=113
-    CSAHi Exception ctermbg=59 ctermfg=red
-    CSAHi Title term=bold ctermbg=59 ctermfg=red
-    CSAHi Error term=reverse ctermbg=red ctermfg=white
-    CSAHi DiffDelete term=bold ctermbg=red ctermfg=white
-    CSAHi Todo cterm=bold,undercurl ctermbg=black ctermfg=red
-    CSAHi LineNr term=underline ctermbg=black ctermfg=61
-    CSAHi Statement term=bold ctermbg=59 ctermfg=140
-    CSAHi Underlined term=underline cterm=bold,underline ctermfg=147
-    CSAHi CursorLine term=underline cterm=underline ctermbg=black
-    CSAHi CursorColumn term=reverse ctermfg=white ctermbg=30
-    CSAHi Include ctermbg=59 ctermfg=97
-    CSAHi Define ctermbg=59 ctermfg=97
-    CSAHi Macro ctermbg=59 ctermfg=97
-    CSAHi PreProc term=underline ctermbg=59 ctermfg=97
-    CSAHi PreCondit ctermbg=59 ctermfg=97
-    CSAHi StatusLineNC term=reverse ctermbg=16 ctermfg=61
-    CSAHi StatusLine term=reverse,bold ctermbg=16 ctermfg=220
-    CSAHi WildMenu ctermbg=16 ctermfg=145
-    CSAHi FoldColumn ctermbg=16 ctermfg=61
-    CSAHi IncSearch term=reverse cterm=bold ctermbg=146 ctermfg=16
-    CSAHi DiffText term=reverse cterm=bold ctermbg=146 ctermfg=16
-    CSAHi Label ctermbg=59 ctermfg=140
-    CSAHi Operator ctermbg=59 ctermfg=142
-    CSAHi Number ctermbg=59 ctermfg=146
-    CSAHi MatchParen term=reverse ctermbg=113 ctermfg=16
-    CSAHi SpecialKey term=bold ctermbg=59 ctermfg=97
-
-    CSAHi Cursor ctermbg=145 ctermfg=16
-    CSAHi lCursor ctermbg=145 ctermfg=59
-    CSAHi Delimiter ctermbg=59 ctermfg=61
-    CSAHi Directory term=bold ctermfg=39
-    CSAHi ErrorMsg ctermbg=160 ctermfg=231
-    CSAHi Identifier term=underline ctermfg=87
-    CSAHi Ignore ctermfg=59
-    CSAHi ModeMsg term=bold cterm=bold
-    CSAHi MoreMsg term=bold cterm=bold ctermfg=72
-    CSAHi NonText term=bold ctermbg=59 ctermfg=60
-    CSAHi PmenuSbar ctermbg=250
-    CSAHi PmenuThumb ctermbg=145 ctermfg=59
-    CSAHi Question cterm=bold ctermfg=28
-    CSAHi SignColumn ctermbg=250 ctermfg=39
-    CSAHi Special term=bold ctermbg=59 ctermfg=61
-    CSAHi SpecialChar ctermbg=59 ctermfg=61
-    CSAHi SpecialComment ctermbg=59 ctermfg=73
-    CSAHi SpellBad term=reverse cterm=undercurl ctermfg=196
-    CSAHi SpellCap term=reverse cterm=undercurl ctermfg=21
-    CSAHi SpellLocal term=underline cterm=undercurl ctermfg=51
-    CSAHi SpellRare term=reverse cterm=undercurl ctermfg=201
-    CSAHi TabLine term=underline ctermbg=16 ctermfg=145
-    CSAHi TabLineFill term=reverse ctermbg=145 ctermfg=59
-    CSAHi TabLineSel term=bold cterm=bold
-    CSAHi Tag ctermbg=59 ctermfg=61
-    CSAHi VisualNOS term=bold,underline cterm=bold,underline
-    CSAHi WarningMsg ctermfg=160
-    CSAHi htmlBold term=bold cterm=bold
-    CSAHi htmlBoldItalic term=bold,italic cterm=bold
-    CSAHi htmlBoldUnderline term=bold,underline cterm=bold,underline
-    CSAHi htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,underline
-    CSAHi htmlItalic term=italic
-    CSAHi htmlUnderline term=underline cterm=underline
-    CSAHi htmlUnderlineItalic term=italic,underline cterm=underline
-  elseif has("gui_running") || (&t_Co == 256 && (&term ==# "xterm" || &term =~# "^screen") && exists("g:CSApprox_eterm") && g:CSApprox_eterm) || &term =~? "^eterm"
-    CSAHi Normal ctermbg=59 ctermfg=152
-    CSAHi Constant term=underline ctermbg=59 ctermfg=153
-    CSAHi Boolean ctermbg=59 ctermfg=153
-    CSAHi Character ctermbg=59 ctermfg=153
-    CSAHi Float ctermbg=59 ctermfg=153
-    CSAHi Comment term=bold ctermbg=59 ctermfg=30
-    CSAHi Type term=underline ctermbg=59 ctermfg=226
-    CSAHi Typedef ctermbg=59 ctermfg=226
-    CSAHi Structure ctermbg=59 ctermfg=226
-    CSAHi Function ctermbg=59 ctermfg=226
-    CSAHi StorageClass ctermbg=59 ctermfg=226
-    CSAHi Conditional ctermbg=59 ctermfg=220
-    CSAHi Repeat ctermbg=59 ctermfg=150
-    CSAHi Visual term=reverse ctermbg=68 ctermfg=white
-    CSAHi DiffChange term=bold ctermbg=68 ctermfg=white
-    CSAHi Pmenu ctermbg=68 ctermfg=white
-    CSAHi String ctermbg=59 ctermfg=104
-    CSAHi Folded ctermbg=104 ctermfg=black
-    CSAHi VertSplit term=reverse ctermbg=black ctermfg=104
-    CSAHi PmenuSel ctermbg=226 ctermfg=black
-    CSAHi Search term=reverse ctermbg=36 ctermfg=150
-    CSAHi DiffAdd term=bold ctermbg=36 ctermfg=150
-    CSAHi Exception ctermbg=59 ctermfg=red
-    CSAHi Title term=bold ctermbg=59 ctermfg=red
-    CSAHi Error term=reverse ctermbg=red ctermfg=white
-    CSAHi DiffDelete term=bold ctermbg=red ctermfg=white
-    CSAHi Todo cterm=bold,undercurl ctermbg=black ctermfg=red
-    CSAHi LineNr term=underline ctermbg=black ctermfg=104
-    CSAHi Statement term=bold ctermbg=59 ctermfg=177
-    CSAHi Underlined term=underline cterm=bold,underline ctermfg=153
-    CSAHi CursorLine term=underline cterm=underline ctermbg=black
-    CSAHi CursorColumn term=reverse ctermfg=white ctermbg=30
-    CSAHi Include ctermbg=59 ctermfg=134
-    CSAHi Define ctermbg=59 ctermfg=134
-    CSAHi Macro ctermbg=59 ctermfg=134
-    CSAHi PreProc term=underline ctermbg=59 ctermfg=134
-    CSAHi PreCondit ctermbg=59 ctermfg=134
-    CSAHi StatusLineNC term=reverse ctermbg=16 ctermfg=104
-    CSAHi StatusLine term=reverse,bold ctermbg=16 ctermfg=226
-    CSAHi WildMenu ctermbg=17 ctermfg=152
-    CSAHi FoldColumn ctermbg=17 ctermfg=104
-    CSAHi IncSearch term=reverse cterm=bold ctermbg=153 ctermfg=17
-    CSAHi DiffText term=reverse cterm=bold ctermbg=153 ctermfg=17
-    CSAHi Label ctermbg=59 ctermfg=177
-    CSAHi Operator ctermbg=59 ctermfg=142
-    CSAHi Number ctermbg=59 ctermfg=153
-    CSAHi MatchParen term=reverse ctermbg=150 ctermfg=17
-    CSAHi SpecialKey term=bold ctermbg=59 ctermfg=134
-
-    CSAHi Cursor ctermbg=152 ctermfg=17
-    CSAHi lCursor ctermbg=152 ctermfg=59
-    CSAHi TabLine term=underline ctermbg=16 ctermfg=152
-    CSAHi Ignore ctermfg=59
-    CSAHi NonText term=bold ctermbg=59 ctermfg=60
-    CSAHi Directory term=bold ctermfg=45
-    CSAHi ErrorMsg ctermbg=196 ctermfg=255
-    CSAHi MoreMsg term=bold cterm=bold ctermfg=72
-    CSAHi ModeMsg term=bold cterm=bold
-    CSAHi htmlBoldUnderline term=bold,underline cterm=bold,underline
-    CSAHi htmlBoldItalic term=bold,italic cterm=bold
-    CSAHi htmlBold term=bold cterm=bold
-    CSAHi htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,underline
-    CSAHi PmenuSbar ctermbg=250
-    CSAHi PmenuThumb ctermbg=152 ctermfg=59
-    CSAHi TabLineSel term=bold cterm=bold
-    CSAHi TabLineFill term=reverse ctermbg=152 ctermfg=59
-    CSAHi Question cterm=bold ctermfg=28
-    CSAHi VisualNOS term=bold,underline cterm=bold,underline
-    CSAHi WarningMsg ctermfg=196
-    CSAHi htmlUnderlineItalic term=italic,underline cterm=underline
-    CSAHi htmlUnderline term=underline cterm=underline
-    CSAHi Special term=bold ctermbg=59 ctermfg=68
-    CSAHi Identifier term=underline ctermfg=123
-    CSAHi Tag ctermbg=59 ctermfg=68
-    CSAHi SpecialChar ctermbg=59 ctermfg=68
-    CSAHi Delimiter ctermbg=59 ctermfg=68
-    CSAHi SpecialComment ctermbg=59 ctermfg=74
-    CSAHi SignColumn ctermbg=250 ctermfg=45
-    CSAHi SpellBad term=reverse cterm=undercurl ctermfg=196
-    CSAHi SpellCap term=reverse cterm=undercurl ctermfg=21
-    CSAHi SpellRare term=reverse cterm=undercurl ctermfg=201
-    CSAHi SpellLocal term=underline cterm=undercurl ctermfg=51
-    CSAHi htmlItalic term=italic
-  elseif has("gui_running") || &t_Co == 256
-    CSAHi Normal ctermbg=16 ctermfg=103
-    CSAHi Constant term=underline ctermbg=16 ctermfg=110
-    CSAHi Boolean ctermbg=16 ctermfg=110
-    CSAHi Character ctermbg=16 ctermfg=110
-    CSAHi Float ctermbg=16 ctermfg=110
-    CSAHi Comment term=bold ctermbg=16 ctermfg=23
-    CSAHi Type term=underline ctermbg=16 ctermfg=220
-    CSAHi Typedef ctermbg=16 ctermfg=220
-    CSAHi Structure ctermbg=16 ctermfg=220
-    CSAHi Function ctermbg=16 ctermfg=220
-    CSAHi StorageClass ctermbg=16 ctermfg=220
-    CSAHi Conditional ctermbg=16 ctermfg=208
-    CSAHi Repeat ctermbg=16 ctermfg=107
-    CSAHi Visual term=reverse ctermbg=61 ctermfg=white
-    CSAHi DiffChange term=bold ctermbg=61 ctermfg=white
-    CSAHi Pmenu ctermbg=61 ctermfg=white
-    CSAHi String ctermbg=16 ctermfg=61
-    CSAHi Folded ctermbg=61 ctermfg=black
-    CSAHi VertSplit term=reverse ctermbg=black ctermfg=61
-    CSAHi PmenuSel ctermbg=220 ctermfg=black
-    CSAHi Search term=reverse ctermbg=23 ctermfg=107
-    CSAHi DiffAdd term=bold ctermbg=23 ctermfg=107
-    CSAHi Exception ctermbg=16 ctermfg=red
-    CSAHi Title term=bold ctermbg=16 ctermfg=red
-    CSAHi Error term=reverse ctermbg=red ctermfg=white
-    CSAHi DiffDelete term=bold ctermbg=red ctermfg=white
-    CSAHi Todo cterm=bold,undercurl ctermbg=black ctermfg=red
-    CSAHi LineNr term=underline ctermbg=black ctermfg=61
-    CSAHi Statement term=bold ctermbg=16 ctermfg=98
-    CSAHi Underlined term=underline cterm=bold,underline ctermfg=111
-    CSAHi CursorLine term=underline cterm=underline ctermbg=black
-    CSAHi CursorColumn term=reverse ctermbg=103 ctermfg=16
-    CSAHi Include ctermbg=16 ctermfg=91
-    CSAHi Define ctermbg=16 ctermfg=91
-    CSAHi Macro ctermbg=16 ctermfg=91
-    CSAHi PreProc term=underline ctermbg=16 ctermfg=91
-    CSAHi PreCondit ctermbg=16 ctermfg=91
-    CSAHi StatusLineNC term=reverse ctermbg=16 ctermfg=61
-    CSAHi StatusLine term=reverse,bold ctermbg=16 ctermfg=220
-    CSAHi WildMenu ctermbg=16 ctermfg=103
-    CSAHi FoldColumn ctermbg=16 ctermfg=61
-    CSAHi IncSearch term=reverse cterm=bold ctermbg=110 ctermfg=16
-    CSAHi DiffText term=reverse cterm=bold ctermbg=110 ctermfg=16
-    CSAHi Label ctermbg=16 ctermfg=98
-    CSAHi Operator ctermbg=16 ctermfg=100
-    CSAHi Number ctermbg=16 ctermfg=110
-    CSAHi MatchParen term=reverse ctermbg=107 ctermfg=16
-    CSAHi SpecialKey term=bold ctermbg=16 ctermfg=91
-
-    CSAHi Cursor ctermbg=103 ctermfg=16
-    CSAHi lCursor ctermbg=103 ctermfg=16
-    CSAHi Delimiter ctermbg=16 ctermfg=61
-    CSAHi Directory term=bold ctermfg=38
-    CSAHi ErrorMsg ctermbg=160 ctermfg=231
-    CSAHi Identifier term=underline ctermfg=87
-    CSAHi Ignore ctermfg=16
-    CSAHi ModeMsg term=bold cterm=bold
-    CSAHi MoreMsg term=bold cterm=bold ctermfg=29
-    CSAHi NonText term=bold ctermbg=16 ctermfg=59
-    CSAHi PmenuSbar ctermbg=250
-    CSAHi PmenuThumb ctermbg=103 ctermfg=16
-    CSAHi Question cterm=bold ctermfg=22
-    CSAHi SignColumn ctermbg=250 ctermfg=38
-    CSAHi Special term=bold ctermbg=16 ctermfg=61
-    CSAHi SpecialChar ctermbg=16 ctermfg=61
-    CSAHi SpecialComment ctermbg=16 ctermfg=31
-    CSAHi SpellBad term=reverse cterm=undercurl ctermfg=196
-    CSAHi SpellCap term=reverse cterm=undercurl ctermfg=21
-    CSAHi SpellLocal term=underline cterm=undercurl ctermfg=51
-    CSAHi SpellRare term=reverse cterm=undercurl ctermfg=201
-    CSAHi TabLine term=underline ctermbg=16 ctermfg=103
-    CSAHi TabLineFill term=reverse ctermbg=103 ctermfg=16
-    CSAHi TabLineSel term=bold cterm=bold
-    CSAHi Tag ctermbg=16 ctermfg=61
-    CSAHi VisualNOS term=bold,underline cterm=bold,underline
-    CSAHi WarningMsg ctermfg=160
-    CSAHi htmlBold term=bold cterm=bold
-    CSAHi htmlBoldItalic term=bold,italic cterm=bold
-    CSAHi htmlBoldUnderline term=bold,underline cterm=bold,underline
-    CSAHi htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,underline
-    CSAHi htmlItalic term=italic
-    CSAHi htmlUnderline term=underline cterm=underline
-    CSAHi htmlUnderlineItalic term=italic,underline cterm=underline
-  elseif has("gui_running") || &t_Co == 88
-    CSAHi Normal ctermbg=80 ctermfg=37
-    CSAHi Constant term=underline ctermbg=80 ctermfg=42
-    CSAHi Boolean ctermbg=80 ctermfg=42
-    CSAHi Character ctermbg=80 ctermfg=42
-    CSAHi Float ctermbg=80 ctermfg=42
-    CSAHi Comment term=bold ctermbg=80 ctermfg=21
-    CSAHi Type term=underline ctermbg=80 ctermfg=72
-    CSAHi Typedef ctermbg=80 ctermfg=72
-    CSAHi Structure ctermbg=80 ctermfg=72
-    CSAHi Function ctermbg=80 ctermfg=72
-    CSAHi StorageClass ctermbg=80 ctermfg=72
-    CSAHi Conditional ctermbg=80 ctermfg=68
-    CSAHi Repeat ctermbg=80 ctermfg=40
-    CSAHi Visual term=reverse ctermbg=18 ctermfg=white
-    CSAHi DiffChange term=bold ctermbg=18 ctermfg=white
-    CSAHi Pmenu ctermbg=18 ctermfg=white
-    CSAHi String ctermbg=80 ctermfg=38
-    CSAHi Folded ctermbg=38 ctermfg=black
-    CSAHi VertSplit term=reverse ctermbg=black ctermfg=38
-    CSAHi PmenuSel ctermbg=72 ctermfg=black
-    CSAHi Search term=reverse ctermbg=20 ctermfg=40
-    CSAHi DiffAdd term=bold ctermbg=20 ctermfg=40
-    CSAHi Exception ctermbg=80 ctermfg=red
-    CSAHi Title term=bold ctermbg=80 ctermfg=red
-    CSAHi Error term=reverse ctermbg=red ctermfg=white
-    CSAHi DiffDelete term=bold ctermbg=red ctermfg=white
-    CSAHi Todo cterm=bold,undercurl ctermbg=black ctermfg=white
-    CSAHi LineNr term=underline ctermbg=black ctermfg=38
-    CSAHi Statement term=bold ctermbg=80 ctermfg=38
-    CSAHi Underlined term=underline cterm=bold,underline ctermfg=39
-    CSAHi CursorLine term=underline ctermbg=black
-    CSAHi CursorColumn term=reverse ctermbg=21 ctermfg=white
-    CSAHi Include ctermbg=80 ctermfg=33
-    CSAHi Define ctermbg=80 ctermfg=33
-    CSAHi Macro ctermbg=80 ctermfg=33
-    CSAHi PreProc term=underline ctermbg=80 ctermfg=33
-    CSAHi PreCondit ctermbg=80 ctermfg=33
-    CSAHi StatusLineNC term=reverse ctermbg=16 ctermfg=38
-    CSAHi StatusLine term=reverse,bold ctermbg=16 ctermfg=72
-    CSAHi WildMenu ctermbg=16 ctermfg=37
-    CSAHi FoldColumn ctermbg=16 ctermfg=38
-    CSAHi IncSearch term=reverse cterm=bold ctermbg=42 ctermfg=16
-    CSAHi DiffText term=reverse cterm=bold ctermbg=42 ctermfg=16
-    CSAHi Label ctermbg=80 ctermfg=38
-    CSAHi Operator ctermbg=80 ctermfg=36
-    CSAHi Number ctermbg=80 ctermfg=42
-    CSAHi MatchParen term=reverse ctermbg=40 ctermfg=16
-    CSAHi SpecialKey term=bold ctermbg=80 ctermfg=33
-
-    CSAHi Cursor ctermbg=37 ctermfg=16
-    CSAHi lCursor ctermbg=37 ctermfg=80
-    CSAHi Delimiter ctermbg=80 ctermfg=18
-    CSAHi Directory term=bold ctermfg=23
-    CSAHi ErrorMsg ctermbg=48 ctermfg=79
-    CSAHi Identifier term=underline ctermfg=31
-    CSAHi Ignore ctermfg=80
-    CSAHi ModeMsg term=bold cterm=bold
-    CSAHi MoreMsg term=bold cterm=bold ctermfg=21
-    CSAHi NonText term=bold ctermbg=80 ctermfg=17
-    CSAHi PmenuSbar ctermbg=85
-    CSAHi PmenuThumb ctermbg=37 ctermfg=80
-    CSAHi Question cterm=bold ctermfg=20
-    CSAHi SignColumn ctermbg=85 ctermfg=23
-    CSAHi Special term=bold ctermbg=80 ctermfg=18
-    CSAHi SpecialChar ctermbg=80 ctermfg=18
-    CSAHi SpecialComment ctermbg=80 ctermfg=22
-    CSAHi SpellBad term=reverse cterm=undercurl ctermfg=64
-    CSAHi SpellCap term=reverse cterm=undercurl ctermfg=19
-    CSAHi SpellLocal term=underline cterm=undercurl ctermfg=31
-    CSAHi SpellRare term=reverse cterm=undercurl ctermfg=67
-    CSAHi TabLine term=underline ctermbg=16 ctermfg=37
-    CSAHi TabLineFill term=reverse ctermbg=37 ctermfg=80
-    CSAHi TabLineSel term=bold cterm=bold
-    CSAHi Tag ctermbg=80 ctermfg=18
-    CSAHi VisualNOS term=bold,underline cterm=bold,underline
-    CSAHi WarningMsg ctermfg=48
-    CSAHi htmlBold term=bold cterm=bold
-    CSAHi htmlBoldItalic term=bold,italic cterm=bold
-    CSAHi htmlBoldUnderline term=bold,underline cterm=bold,underline
-    CSAHi htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,underline
-    CSAHi htmlItalic term=italic
-    CSAHi htmlUnderline term=underline cterm=underline
-    CSAHi htmlUnderlineItalic term=italic,underline cterm=underline
-  endif
-  delcommand CSAHi
-
-endif
diff --git a/colors/mars.vim b/colors/mars.vim
deleted file mode 100755
index 408ae79..0000000
--- a/colors/mars.vim
+++ /dev/null
@@ -1,142 +0,0 @@
-" Maintainer:   Tim Aldrich <aldy0169@yahoo.com>
-" Last Change:  19 November 2003
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="mars"
-" GUI colors {{{
-"hi Normal		guifg=#FFFFFF guibg=#961E00
-hi Normal		guifg=#FFFFFF guibg=#961E00
-hi Cursor		guifg=#A0963C guibg=#FFFFFF
-hi CursorIM		guifg=#6699CC guibg=#99CCCC
-hi Directory	guifg=#B45000 guibg=#961E00
-hi DiffAdd		guifg=#FFFFCC guibg=#961E00
-hi DiffChange	guifg=#FF9900 guibg=#961E00
-hi DiffDelete	guifg=#999999 guibg=#961E00
-hi DiffText		guifg=#FFFFFF guibg=#961E00
-hi ErrorMsg		guifg=#FFFFFF guibg=#FF0000
-hi VertSplit	guifg=#FFFFFF guibg=#961E00
-hi Folded		guifg=#999999 guibg=#BE1E00 gui=italic
-hi FoldColumn	guifg=#CC0000 guibg=#999999
-hi IncSearch	guifg=#FFFF00 guibg=#961E00
-hi LineNr		guifg=#999999 guibg=#BE1E00
-hi ModeMsg		guifg=#FFFFFF guibg=#961E00
-hi MoreMsg		guifg=#FFFFFF guibg=#961E00
-hi NonText		guifg=#FFFFFF guibg=#A0141E
-hi Question		guifg=#FFFFFF guibg=#EE0000
-hi Search		guifg=#A0142B guibg=#FFFF00 gui=underline
-hi SpecialKey	guifg=#FFFF00 guibg=#961E00
-hi StatusLine	guifg=#FFFFFF guibg=#961E00
-hi StatusLineNC	guifg=#CCCCCC guibg=#961E00
-hi Title		guifg=#FFFFFF guibg=#FF9900
-hi Visual		guifg=#B45000 guibg=#961E00
-hi WarningMsg	guifg=#FF0000 guibg=#FFFFFF
-hi WildMenu		guifg=#961E00 guibg=#999999
-" }}}
-
-" cterm colors {{{
-hi Normal		ctermfg=white ctermbg=darkblue
-hi Cursor		ctermfg=darkblue ctermbg=white
-hi CursorIM		ctermfg=lightcyan ctermbg=lightcyan
-hi Directory	ctermfg=lightblue ctermbg=lightcyan
-hi DiffAdd		ctermfg=LightYellow ctermbg=darkblue
-hi DiffChange	ctermfg=darkred ctermbg=darkblue
-hi DiffDelete	ctermfg=grey ctermbg=darkblue
-hi DiffText		ctermfg=white   ctermbg=darkblue
-hi ErrorMsg		ctermfg=red ctermbg=lightcyan
-hi VertSplit	ctermfg=white   ctermbg=darkblue
-hi Folded		ctermfg=grey ctermbg=darkblue
-hi FoldColumn	ctermfg=darkred ctermbg=lightcyan
-hi IncSearch	ctermfg=yellow ctermbg=darkblue
-hi LineNr		ctermfg=lightyellow ctermbg=darkblue
-hi ModeMsg		ctermfg=white   ctermbg=darkblue
-hi MoreMsg		ctermfg=white   ctermbg=darkblue
-hi NonText		ctermfg=white   ctermbg=lightblue
-hi Question		ctermfg=white   ctermbg=darkblue
-hi Search		ctermfg=darkred ctermbg=lightcyan
-hi SpecialKey	ctermfg=yellow ctermbg=darkblue
-hi StatusLine	ctermfg=white   ctermbg=darkblue
-hi StatusLineNC	ctermfg=lightgrey ctermbg=darkblue
-hi Title		ctermfg=white   ctermbg=yellow
-hi Visual		ctermfg=lightblue ctermbg=cyan
-hi WarningMsg	ctermfg=red ctermbg=white
-hi WildMenu		ctermfg=darkblue ctermbg=grey
-" }}}
-
-" GUI hilight groups {{{
-
-hi Comment		guifg=#999999
-hi Constant		guifg=#FFFF00
-hi String		guifg=#CCCC99
-hi Character	guifg=#A0963C
-hi Number		guifg=#A0963C
-hi Boolean		guifg=#A0963C
-hi Float		guifg=#A0963C
-hi Identifier	guifg=#E6fA46
-hi Function		guifg=#E6fA46
-hi Statement	guifg=#FFFFCC
-hi Conditional	guifg=#FFFFCC
-hi Repeat		guifg=#FFFFCC
-hi Label		guifg=#E66E46
-hi Operator		guifg=#FFFF00
-hi Keyword		guifg=#FFFF00
-hi Exception	guifg=#FFFFAA
-hi PreProc		guifg=#C8783C
-hi Include		guifg=#C8783C
-hi Define		guifg=#C8783C
-hi Macro		guifg=#C8783C
-hi PreCondit	guifg=#C8783C
-hi Type			guifg=#E6641E
-hi StorageClass	guifg=#E66E46
-hi Structure	guifg=#E66E46
-hi Typedef		guifg=#E66E46
-hi Special		guifg=#00FF00
-hi SpecialChar	guifg=#00FF00
-hi Tag			guifg=#CCCCFF
-hi Delimiter	guifg=#CCCCFF
-hi SpecialComment	guifg=#FFFFCC
-hi Debug		guifg=#CC3300
-hi Ignore		guifg=#961E00
-hi Error		guifg=#FF0000 guibg=#FFFFFF
-hi Todo			guifg=#FFFF00 guibg=#961E00
-" }}}
-
-" cterm hilight groups {{{
-hi Comment		ctermfg=grey
-hi Constant		ctermfg=lightgreen
-hi String		ctermfg=brown
-hi Character	ctermfg=lightgreen
-hi Number		ctermfg=lightgreen
-hi Boolean		ctermfg=lightgreen
-hi Float		ctermfg=lightgreen
-hi Identifier	ctermfg=lightcyan
-hi Function		ctermfg=lightcyan
-hi Statement	ctermfg=lightyellow
-hi Conditional	ctermfg=lightyellow
-hi Repeat		ctermfg=lightyellow
-hi Label		ctermfg=lightcyan
-hi Operator		ctermfg=yellow
-hi Keyword		ctermfg=yellow
-hi Exception	ctermfg=yellow
-hi PreProc		ctermfg=darkcyan
-hi Include		ctermfg=darkcyan
-hi Define		ctermfg=darkcyan
-hi Macro		ctermfg=darkcyan
-hi PreCondit	ctermfg=darkcyan
-hi Type			ctermfg=lightcyan
-hi StorageClass	ctermfg=lightcyan
-hi Structure	ctermfg=lightcyan
-hi Typedef		ctermfg=lightcyan
-hi Special		ctermfg=green
-hi SpecialChar	ctermfg=green
-hi Tag			ctermfg=brown
-hi Delimiter	ctermfg=brown
-hi SpecialComment	ctermfg=lightyellow
-hi Debug		ctermfg=magenta
-hi Ignore		ctermfg=lightblue
-hi Error		ctermfg=red ctermbg=white
-hi Todo			ctermfg=grey ctermbg=white
-" }}}
diff --git a/colors/martin_krischik.vim b/colors/martin_krischik.vim
deleted file mode 100755
index 0975ba0..0000000
--- a/colors/martin_krischik.vim
+++ /dev/null
@@ -1,397 +0,0 @@
-"-------------------------------------------------------------------------------
-"  Description: My personal colors
-"          $Id: martin_krischik.vim 458 2006-11-18 09:42:10Z krischik $
-"    Copyright: Copyright (C) 2006 Martin Krischik
-"   Maintainer:	Martin Krischik
-"      $Author: krischik $
-"        $Date: 2006-11-18 10:42:10 +0100 (Sa, 18 Nov 2006) $
-"      Version: 3.2
-"    $Revision: 458 $
-"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/colors/martin_krischik.vim $
-"	  Note:	Tried and Tested for 'builtin_gui', 'xterm' (KDE Konsole)
-"		'vt320'" (OpenVMS) and 'linux' (Linux Console).
-"      History: 16.05.2006 MK Check that all vim 7.0 colors are set
-"		16.05.2006 MK Split GUI from terminal.
-"		24.05.2006 MK Unified Headers
-"		24.07.2006 MK Omni-Completion Colors.
-"               15.10.2006 MK Bram's suggestion for runtime integration
-"	 Usage: copy to colors directory
-"------------------------------------------------------------------------------
-
-" First remove all existing highlighting.
-
-set background=light
-highlight clear
-
-if exists ("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "martin_krischik"
-
-if version < 700
-   " Section: works only with vim 7.0 use default otherwise {{{1
-   "
-   colorscheme default
-   "
-   " }}}1
-   finish
-elseif (&term == "builtin_gui")
-    " Section: Set GUI colors. {{{1
-    "
-    " Subsection: User-Interface Colors {{{2
-    "
-    " Group: Normal Text Colors {{{3
-    "
-    highlight Normal		gui=none		guifg=black	    guibg=white
-    highlight Search							    guibg=Yellow
-    highlight SpecialKey				guifg=Blue
-    highlight Title		gui=bold		guifg=Magenta
-    highlight LineNr					guifg=Brown	    guibg=grey80
-    highlight NonText		gui=bold		guifg=Blue	    guibg=grey80
-    highlight MatchParen						    guibg=Cyan
-    highlight IncSearch		gui=reverse
-    "
-    " Group: Messages {{{3
-    "
-    highlight WarningMsg				guifg=Red
-    highlight ErrorMsg					guifg=White	    guibg=Red
-    highlight ModeMsg		gui=bold
-    highlight MoreMsg		gui=bold		guifg=SeaGreen
-    highlight Question		gui=bold		guifg=SeaGreen
-    "
-    " Group: Spell Checker {{{3
-    "
-    highlight SpellBad		gui=undercurl							guisp=Red
-    highlight SpellCap		gui=undercurl							guisp=Blue
-    highlight SpellLocal	gui=undercurl							guisp=DarkCyan
-    highlight SpellRare		gui=undercurl							guisp=Magenta
-    "
-    " Group: Status line {{{3
-    "
-    highlight StatusLine	gui=bold,reverse	guifg=LightBlue2    guibg=black
-    highlight StatusLineNC	gui=reverse		guifg=grey75	    guibg=black
-    highlight VertSplit		gui=reverse		guifg=LightBlue3    guibg=black
-    "
-    " Group: Visual selektio {{{3n
-    "
-    highlight Visual		gui=reverse		guifg=firebrick     guibg=white
-    highlight VisualNOS		gui=reverse		guifg=firebrick     guibg=black
-    "
-    " Group: tab pages line {{{3
-    "
-    highlight TabLine		gui=reverse		guifg=grey75	    guibg=black
-    highlight TabLineFill	gui=reverse
-    highlight TabLineSel	gui=bold,reverse	guifg=LightBlue2    guibg=black
-    "
-    " Group: Competion (omni and otherwise) menu colors {{{3
-    "
-    highlight Pmenu							    guibg=Grey
-    highlight PmenuSel					guifg=White	    guibg=firebrick
-    highlight PmenuSbar					guibg=LightGrey	    guibg=DarkGrey
-    highlight PmenuThumb	gui=reverse
-    highlight WildMenu					guifg=White	    guibg=firebrick
-    "
-    " Group: Diff colors {{{3
-    "
-    highlight DiffAdd							    guibg=LightBlue
-    highlight DiffChange						    guibg=LightMagenta
-    highlight DiffDelete	gui=bold		guifg=Blue	    guibg=LightCyan
-    highlight DiffText		gui=bold				    guibg=Red
-    "
-    " Group: Fold colors {{{3
-    "
-    highlight FoldColumn				guifg=DarkBlue	    guibg=Grey
-    highlight Folded					guifg=DarkBlue	    guibg=LightGrey
-    "
-    " Group: Other Syntax Highlight Colors {{{3
-    "
-    highlight Directory		guifg=Blue
-    highlight SignColumn	guifg=DarkBlue	    guibg=Grey
-    "
-    " Group: Motif and Athena widget colors. {{{3
-    "
-    highlight Menu		guifg=Black	    guibg=LightGrey
-    highlight Scrollbar		guifg=LightGrey	    guibg=DarkGrey
-    highlight Tooltip		guifg=Black	    guibg=LightGrey
-
-    " Subsection: Syntax Colors  {{{2
-    "
-    " Group: Comment colors syntax-group
-    "
-    highlight Comment					guifg=grey30
-    "
-    " Group: Constant colors group {{{3
-    "
-    highlight Boolean					guifg=DarkOrchid3   guibg=grey95
-    highlight Character					guifg=RoyalBlue3    guibg=grey95
-    highlight Constant					guifg=MediumOrchid3 guibg=grey95
-    highlight Float					guifg=MediumOrchid4 guibg=grey95
-    highlight Number					guifg=DarkOrchid4   guibg=grey95
-    highlight String					guifg=RoyalBlue4    guibg=grey95
-    "
-    " Group: Identifier colors group {{{3
-    "
-    highlight Function					guifg=SteelBlue
-    highlight Identifier				guifg=DarkCyan
-    "
-    " Group: Statement colors group {{{3
-    "
-    highlight Conditional	gui=bold		guifg=DodgerBlue4
-    highlight Exception		gui=none		guifg=SlateBlue4
-    highlight Keyword		gui=bold		guifg=RoyalBlue4
-    highlight Label		gui=none		guifg=SlateBlue3
-    highlight Operator		gui=none		guifg=RoyalBlue3
-    highlight Repeat		gui=bold		guifg=DodgerBlue3
-    highlight Statement		gui=none		guifg=RoyalBlue4
-    "
-    " Group: Preprocessor colors group {{{3
-    "
-    highlight Define					guifg=brown4	    guibg=snow
-    highlight Include					guifg=firebrick3    guibg=snow
-    highlight Macro					guifg=brown3	    guibg=snow
-    highlight PreCondit					guifg=red	    guibg=snow
-    highlight PreProc					guifg=firebrick4    guibg=snow
-    "
-    " Group: type group {{{3
-    "
-    highlight StorageClass	gui=none		guifg=SeaGreen3
-    highlight Structure		gui=none		guifg=DarkSlateGray4
-    highlight Type		gui=none		guifg=SeaGreen4
-    highlight Typedef		gui=none		guifg=DarkSeaGreen4
-    "
-    " Group: special symbol group {{{3
-    "
-    highlight Special					guifg=SlateBlue     guibg=GhostWhite
-    highlight SpecialChar				guifg=DeepPink	    guibg=GhostWhite
-    highlight Tag					guifg=DarkSlateBlue guibg=GhostWhite
-    highlight Delimiter					guifg=DarkOrchid    guibg=GhostWhite
-    highlight SpecialComment				guifg=VioletRed     guibg=GhostWhite
-    highlight Debug					guifg=maroon	    guibg=GhostWhite
-    "
-    " Group: text that stands out {{{3
-    "
-    highlight Underlined	gui=underline		guifg=SlateBlue
-    "
-    " Group: left blank, hidden {{{3
-    "
-    highlight Ignore					guifg=bg
-    "
-    " Group: any erroneous construct {{{3
-    "
-    highlight Error		gui=undercurl		guifg=Red	    guibg=MistyRose
-    "
-    " Group: anything that needs extra attention {{{3
-    "
-    highlight Todo					guifg=Blue	    guibg=Yellow
-
-    " Subsection: Cursor Colors {{{2
-    "
-    " Group: Mouse Cursor {{{3
-    "
-    highlight cCursor	     guifg=bg	 guibg=DarkRed
-    highlight Cursor	     guifg=bg	 guibg=DarkGreen
-    highlight CursorColumn		 guibg=FloralWhite
-    highlight CursorIM	     guifg=bg	 guibg=DarkGrey
-    highlight CursorLine		 guibg=cornsilk
-    highlight lCursor	     guifg=bg	 guibg=DarkMagenta
-    highlight oCursor	     guifg=bg	 guibg=DarkCyan
-    highlight vCursor	     guifg=bg	 guibg=DarkYellow
-    "
-    " Group: Text Cursor {{{3
-    "
-    set guicursor=n:block-lCursor,
-		 \i:ver25-Cursor,
-		 \r:hor25-Cursor,
-		 \v:block-vCursor,
-		\ve:ver35-vCursor,
-		 \o:hor50-oCursor-blinkwait75-blinkoff50-blinkon75,
-		 \c:block-cCursor,
-		\ci:ver20-cCursor,
-		\cr:hor20-cCursor,
-		\sm:block-Cursor-blinkwait175-blinkoff150-blinkon175
-
-   syntax enable
-
-   " }}}1
-   finish
-elseif	(&term == "xterm")  ||
-      \ (&term == "vt320")  ||
-      \ (&term == "linux")
-    " Section: Only set colors for terminals we actualy know of {{{1
-    "
-    if &term=="vt320"
-	set t_Co=8
-    else
-	set t_Co=16
-    endif
-
-    " Subsection: User Interface Colors {{{2
-    "
-    " Group: Normal Text Colors {{{3
-    "
-    highlight Normal		term=none	    cterm=none		    ctermfg=Black	ctermbg=LightGray
-    highlight Search		term=reverse							ctermbg=DarkYellow
-    highlight SpecialKey	term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Title		term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight LineNr		term=underline				    ctermfg=DarkRed	ctermbg=DarkGray
-    highlight NonText		term=bold				    ctermfg=LightBlue	ctermbg=LightGray
-    highlight MatchParen	term=reverse				    ctermbg=DarkYellow
-    highlight IncSearch		term=reverse	    cterm=reverse
-    "
-    " Group: Messages {{{3
-    "
-    highlight WarningMsg	term=standout				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight ErrorMsg		term=standout				    ctermfg=White	ctermbg=DarkRed
-    highlight ModeMsg		term=bold	    cterm=bold					ctermbg=LightGray
-    highlight MoreMsg		term=bold				    ctermfg=DarkGreen	ctermbg=LightGray
-    highlight Question		term=standout				    ctermfg=DarkGreen	ctermbg=LightGray
-    "
-    " Group: Spell Checker {{{3
-    "
-    highlight SpellBad		term=reverse							ctermbg=LightRed
-    highlight SpellCap		term=reverse							ctermbg=LightBlue
-    highlight SpellLocal	term=underline							ctermbg=LightCyan
-    highlight SpellRare		term=reverse							ctermbg=LightMagenta
-    "
-    " Group: Status line {{{3
-    "
-    highlight StatusLine	term=bold,reverse   cterm=bold,reverse
-    highlight StatusLineNC	term=reverse	    cterm=reverse
-    highlight VertSplit		term=reverse	    cterm=reverse
-    "
-    " Group: Visual selektion {{{3
-    "
-    highlight Visual		term=reverse	    cterm=reverse	    ctermfg=DarkRed	ctermbg=LightGray
-    highlight VisualNOS		term=bold,underline cterm=bold,underline
-    "
-    " Group: tab pages line {{{3
-    "
-    highlight TabLine		term=reverse	    cterm=reverse
-    highlight TabLineFill	term=reverse	    cterm=reverse
-    highlight TabLineSel	term=bold,reverse   cterm=bold,reverse
-    "
-    " Group: Menu colors {{{3
-    "
-    highlight Pmenu										ctermbg=Grey
-    highlight PmenuSel							    ctermfg=White	ctermbg=Red
-    highlight PmenuSbar							    ctermfg=LightGrey	ctermbg=DarkGray
-    highlight PmenuThumb			    cterm=reverse
-    highlight WildMenu		term=standout				    ctermfg=White	ctermbg=Red
-    "
-    " Group: Diff colors {{{3
-    "
-    highlight DiffAdd		term=bold							ctermbg=LightBlue
-    highlight DiffChange	term=bold							ctermbg=LightMagenta
-    highlight DiffDelete	term=bold				    ctermfg=LightBlue	ctermbg=LightCyan
-    highlight DiffText		term=reverse	    cterm=bold					ctermbg=LightRed
-    "
-    " Group: Fold colors {{{3
-    "
-    highlight FoldColumn	term=standout				    ctermfg=DarkBlue	ctermbg=DarkGray
-    highlight Folded		term=standout				    ctermfg=DarkBlue	ctermbg=DarkGray
-    "
-    " Group: Other Syntax Highlight Colors {{{3
-    "
-    highlight Directory		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight SignColumn	term=standout				    ctermfg=DarkBlue	ctermbg=DarkGray
-
-    " Subsection: Syntax Colors {{{2
-    "
-    " Group: Comment colors syntax-group {{{3
-    "
-    highlight Comment		term=bold				    ctermfg=DarkGray	ctermbg=LightGray
-    "
-    " Group: Constant colors group {{{3
-    "
-    highlight Boolean		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight Character		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight Constant		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight Float		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight Number		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    highlight String		term=underline				    ctermfg=DarkRed	ctermbg=LightGray
-    "
-    " Group: Identifier colors group {{{3
-    "
-    highlight Function		term=underline				    ctermfg=DarkCyan	ctermbg=LightGray
-    highlight Identifier	term=underline				    ctermfg=DarkCyan	ctermbg=LightGray
-    "
-    " Group: Statement colors group {{{3
-    "
-    highlight Conditional	term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Exception		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Keyword		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Label		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Operator		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Repeat		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    highlight Statement		term=bold				    ctermfg=DarkBlue	ctermbg=LightGray
-    "
-    " Group: Preprocessor colors group {{{3
-    "
-    highlight Define		term=underline				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight Include		term=underline				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight Macro		term=underline				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight PreCondit		term=underline				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight PreProc		term=underline				    ctermfg=DarkMagenta	ctermbg=LightGray
-    "
-    " Group: type group {{{3
-    "
-    highlight StorageClass	term=underline				    ctermfg=DarkGreen	ctermbg=LightGray
-    highlight Structure		term=underline				    ctermfg=DarkGreen	ctermbg=LightGray
-    highlight Type		term=underline				    ctermfg=DarkGreen	ctermbg=LightGray
-    highlight Typedef		term=underline				    ctermfg=DarkGreen	ctermbg=LightGray
-    "
-    " Group: special symbol group {{{3
-    "
-    highlight Special		term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight SpecialChar	term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight Tag		term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight Delimiter		term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight SpecialComment	term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    highlight Debug		term=bold				    ctermfg=DarkMagenta	ctermbg=LightGray
-    "
-    " Group: text that stands out {{{3
-    "
-    highlight Underlined	term=underline	    cterm=underline	    ctermfg=DarkMagenta	ctermbg=LightGray
-    "
-    " Group: left blank, hidden {{{3
-    "
-    highlight Ignore							    ctermfg=White	ctermbg=grey
-    "
-    " Group: any erroneous construct {{{3
-    "
-    highlight Error		term=reverse				    ctermfg=White	ctermbg=LightRed
-    "
-    " Group: anything that needs extra attention {{{3
-    "
-    highlight Todo		term=standout				    ctermfg=Black	ctermbg=Yellow
-
-    " Subsection: Cursor Colors {{{2
-    "
-    " Group: Mouse Cursor {{{3
-    "
-    highlight Cursor				    ctermfg=bg		    ctermbg=DarkGreen
-    highlight CursorColumn	term=reverse				    ctermbg=LightGray
-    highlight CursorIM				    ctermfg=bg		    ctermbg=DarkGrey
-    highlight CursorLine	term=reverse				    ctermbg=LightGray
-
-    syntax enable
-
-   " }}}1
-    finish
-else
-   " Section: terminal is completely unknown - fallback to system default {{{1
-   "
-   set t_Co=8
-
-   " }}}1
-   finish
-endif
-
-"------------------------------------------------------------------------------
-"   Copyright (C) 2006  Martin Krischik
-"
-"   Vim is Charityware - see ":help license" or uganda.txt for licence details.
-"------------------------------------------------------------------------------
-" vim: nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
-" vim: filetype=vim foldmethod=marker textwidth=0
diff --git a/colors/matrix.vim b/colors/matrix.vim
deleted file mode 100755
index da5c687..0000000
--- a/colors/matrix.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" vim:set ts=8 sts=2 sw=2 tw=0:
-"
-" matrix.vim - MATRIX like colorscheme.
-"
-" Maintainer:	MURAOKA Taro <koron@tka.att.ne.jp>
-" Last Change:  10-Jun-2003.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'matrix'
-
-" the character under the cursor
-hi Cursor	guifg=#226622 guibg=#55ff55
-hi lCursor	guifg=#226622 guibg=#55ff55
-" like Cursor, but used when in IME mode |CursorIM|
-hi CursorIM	guifg=#226622 guibg=#55ff55
-" directory names (and other special names in listings)
-hi Directory	guifg=#55ff55 guibg=#000000
-" diff mode: Added line |diff.txt|
-hi DiffAdd	guifg=#55ff55 guibg=#226622 gui=none
-" diff mode: Changed line |diff.txt|
-hi DiffChange	guifg=#55ff55 guibg=#226622 gui=none
-" diff mode: Deleted line |diff.txt|
-hi DiffDelete	guifg=#113311 guibg=#113311 gui=none
-" diff mode: Changed text within a changed line |diff.txt|
-hi DiffText	guifg=#55ff55 guibg=#339933 gui=bold
-" error messages on the command line
-hi ErrorMsg	guifg=#55ff55 guibg=#339933
-" the column separating vertically split windows
-hi VertSplit	guifg=#339933 guibg=#339933
-" line used for closed folds
-hi Folded	guifg=#44cc44 guibg=#113311
-" 'foldcolumn'
-hi FoldColumn	guifg=#44cc44 guibg=#226622
-" 'incsearch' highlighting; also used for the text replaced with
-hi IncSearch	guifg=#226622 guibg=#55ff55 gui=none
-" line number for ":number" and ":#" commands, and when 'number'
-hi LineNr	guifg=#44cc44 guibg=#000000
-" 'showmode' message (e.g., "-- INSERT --")
-hi ModeMsg	guifg=#44cc44 guibg=#000000
-" |more-prompt|
-hi MoreMsg	guifg=#44cc44 guibg=#000000
-" '~' and '@' at the end of the window, characters from
-hi NonText	guifg=#44cc44 guibg=#113311
-" normal text
-hi Normal	guifg=#44cc44 guibg=#000000
-" |hit-enter| prompt and yes/no questions
-hi Question	guifg=#44cc44 guibg=#000000
-" Last search pattern highlighting (see 'hlsearch').
-hi Search	guifg=#113311 guibg=#44cc44 gui=none
-" Meta and special keys listed with ":map", also for text used
-hi SpecialKey	guifg=#44cc44 guibg=#000000
-" status line of current window
-hi StatusLine	guifg=#55ff55 guibg=#339933 gui=none
-" status lines of not-current windows
-hi StatusLineNC	guifg=#113311 guibg=#339933 gui=none
-" titles for output from ":set all", ":autocmd" etc.
-hi Title	guifg=#55ff55 guibg=#113311 gui=bold
-" Visual mode selection
-hi Visual	guifg=#55ff55 guibg=#339933 gui=none
-" Visual mode selection when vim is "Not Owning the Selection".
-hi VisualNOS	guifg=#44cc44 guibg=#000000
-" warning messages
-hi WarningMsg	guifg=#55ff55 guibg=#000000
-" current match in 'wildmenu' completion
-hi WildMenu	guifg=#226622 guibg=#55ff55
-
-hi Comment	guifg=#226622 guibg=#000000
-hi Constant	guifg=#55ff55 guibg=#226622
-hi Special	guifg=#44cc44 guibg=#226622
-hi Identifier	guifg=#55ff55 guibg=#000000
-hi Statement	guifg=#55ff55 guibg=#000000 gui=bold
-hi PreProc	guifg=#339933 guibg=#000000
-hi Type		guifg=#55ff55 guibg=#000000 gui=bold
-hi Underlined	guifg=#55ff55 guibg=#000000 gui=underline
-hi Error	guifg=#55ff55 guibg=#339933
-hi Todo		guifg=#113311 guibg=#44cc44 gui=none
diff --git a/colors/mayansmoke.vim b/colors/mayansmoke.vim
deleted file mode 100755
index 6d146f8..0000000
--- a/colors/mayansmoke.vim
+++ /dev/null
@@ -1,343 +0,0 @@
-" =============================================================================
-"
-" File:        mayansmoke.vim
-" Description: Vim color scheme file
-" Maintainer:  Jeet Sukumaran (GUI colors); Clayton Parker (cterm colors)
-"
-" =============================================================================
-
-"  Initialization and Setup {{{1
-" =============================================================================
-set background=light
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "mayansmoke"
-" }}}
-
-"  Normal Color {{{1
-" =============================================================================
-hi Normal gui=NONE guifg=Black guibg=#F4F4E8
-" }}}
-
-"  Highlight Groups {{{1
-" =============================================================================
-" Groups (see ':help highlight-groups'):
-"    ColorColumn     highlight to use with ':set colorcolumn'
-"    Cursor          the character under the cursor
-"    CursorIM        like Cursor, but used when in IME mode |CursorIM|
-"    CursorColumn    the screen column that the cursor is in when 'cursorcolumn' is set
-"    CursorLine      the screen line that the cursor is in when 'cursorline' is set
-"    Directory       directory names (and other special names in listings)
-"    DiffAdd         diff mode: Added line |diff.txt|
-"    DiffChange      diff mode: Changed line |diff.txt|
-"    DiffDelete      diff mode: Deleted line |diff.txt|
-"    DiffText        diff mode: Changed text within a changed line |diff.txt|
-"    ErrorMsg        error messages on the command line
-"    VertSplit       the column separating vertically split windows
-"    Folded          line used for closed folds
-"    FoldColumn      'foldcolumn'
-"    SignColumn      column where |signs| are displayed
-"    IncSearch       'incsearch' highlighting; also used for the text replaced with ":s///c"
-"    LineNr          Line number for ":number" and ":#" commands, and when 'number' option is set.
-"    MatchParen      The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
-"    ModeMsg         'showmode' message (e.g., "-- INSERT --")
-"    MoreMsg         |more-prompt|
-"    NonText         '~' and '@' at the end of the window, etc.
-"    Normal          normal text
-"    Pmenu           Popup menu: normal item.
-"    PmenuSel        Popup menu: selected item.
-"    PmenuSbar       Popup menu: scrollbar.
-"    PmenuThumb      Popup menu: Thumb of the scrollbar.
-"    Question        |hit-enter| prompt and yes/no questions
-"    Search          Last search pattern highlighting (see 'hlsearch').
-"    SpecialKey      Meta and special keys listed with ":map", text that is displayed differently from what it really is (such as tabs, spaces in listchars etc.).
-"    SpellBad        Word that is not recognized by the spellchecker. |spell|
-"    SpellCap        Word that should start with a capital. |spell|
-"    SpellLocal      Word that is recognized by the spellchecker as one that is
-"    SpellRare       Word that is recognized by the spellchecker as one that is hardly ever used. |spell|
-"    StatusLine      status line of current window
-"    StatusLineNC    status lines of not-current windows
-"    TabLine         tab pages line, not active tab page label
-"    TabLineFill     tab pages line, where there are no labels
-"    TabLineSel      tab pages line, active tab page label
-"    Title           titles for output from ":set all", ":autocmd" etc.
-"    Visual          Visual mode selection
-"    VisualNOS       Visual mode selection when vim is "Not Owning the Selection".
-"    WarningMsg      warning messages
-"    WildMenu        current match in 'wildmenu' completion
-hi ColorColumn  guifg=NONE              guibg=#EEEEDD
-hi Cursor       guifg=bg                guibg=fg                gui=NONE
-if hlexists('MayanSmokeCursorLine')
-    hi link CursorColumn MayanSmokeCursorLine
-    hi link CursorLine MayanSmokeCursorLine
-elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 2
-    hi CursorColumn guifg=NONE              guibg=NavajoWhite   gui=NONE
-    hi CursorLine   guifg=NONE              guibg=NavajoWhite   gui=NONE
-elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 1
-    hi CursorColumn guifg=NONE              guibg=white         gui=NONE
-    hi CursorLine   guifg=NONE              guibg=white         gui=NONE
-else
-    hi CursorColumn guifg=NONE              guibg=#FFFDD0       gui=NONE
-    hi CursorLine   guifg=NONE              guibg=#FFFDD0       gui=NONE
-endif
-hi CursorIM     guifg=bg                guibg=fg                gui=NONE
-hi lCursor      guifg=bg                guibg=fg                gui=NONE
-hi DiffAdd      guifg=NONE              guibg=SeaGreen1         gui=NONE
-hi DiffChange   guifg=NONE              guibg=LightSkyBlue1     gui=NONE
-hi DiffDelete   guifg=NONE              guibg=LightCoral        gui=NONE
-hi DiffText     guifg=black             guibg=LightCyan1        gui=NONE
-hi Directory    guifg=#1600FF           guibg=bg                gui=NONE
-hi ErrorMsg     guifg=Red2              guibg=NONE              gui=NONE
-hi FoldColumn   guifg=SteelBlue4        guibg=LightYellow2      gui=bold
-hi Folded       guifg=SteelBlue4        guibg=Gainsboro      gui=italic
-if hlexists('MayanSmokeSearch')
-    hi link IncSearch MayanSmokeSearch
-    hi link Search MayanSmokeSearch
-elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility >= 4
-    hi IncSearch    guifg=white             guibg=red           gui=NONE
-    hi Search       guifg=white             guibg=red           gui=NONE
-elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 3
-    hi IncSearch    guifg=black             guibg=gold       gui=NONE
-    hi Search       guifg=black             guibg=gold        gui=NONE
-elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 2
-    hi IncSearch    guifg=white             guibg=darkorange       gui=NONE
-    hi Search       guifg=white             guibg=darkorange        gui=NONE
-elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 0
-    hi IncSearch    guifg=black             guibg=tan         gui=NONE
-    hi Search       guifg=black             guibg=tan         gui=NONE
-else
-    hi IncSearch    guifg=black             guibg=khaki          gui=NONE
-    hi Search       guifg=black             guibg=khaki          gui=NONE
-endif
-hi LineNr       guifg=#666677           guibg=#cccfbf    gui=NONE
-hi MatchParen   guifg=black             guibg=LemonChiffon3     gui=bold
-hi ModeMsg      guifg=White             guibg=tomato1           gui=bold
-hi MoreMsg      guifg=SeaGreen4         guibg=bg                gui=bold
-hi NonText      guifg=LightCyan3        guibg=bg                gui=bold
-
-hi Pmenu        guifg=Orange4           guibg=LightYellow3      gui=NONE
-hi PmenuSel     guifg=ivory2            guibg=NavajoWhite4      gui=bold
-hi PmenuSbar    guifg=White             guibg=#999666        gui=NONE
-hi PmenuThumb   guifg=White             guibg=#7B7939        gui=NONE
-
-hi Question     guifg=Chartreuse4       guibg=bg                gui=bold
-hi SignColumn   guifg=white             guibg=LightYellow3      gui=NONE
-if hlexists('MayanSmokeSpecialKey')
-    hi link SpecialKey MayanSmokeSpecialKey
-elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility >= 2
-    hi SpecialKey   guifg=black         guibg=NavajoWhite       gui=NONE
-elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility == 0
-    hi SpecialKey   guifg=bisque3       guibg=NONE              gui=NONE
-else
-    hi SpecialKey   guifg=white         guibg=ivory3            gui=NONE
-endif
-hi SpellBad     guisp=Firebrick2                                gui=undercurl
-hi SpellCap     guisp=Blue                                      gui=undercurl
-hi SpellLocal   guisp=DarkCyan                                  gui=undercurl
-hi SpellRare    guisp=Magenta                                   gui=undercurl
-hi StatusLine   guifg=#FFFEEE           guibg=#557788     gui=NONE
-" hi StatusLineNC guifg=#EAE6E2           guibg=LightSteelBlue3    gui=italic
-hi StatusLineNC guifg=#F4F4EE           guibg=#99aabb    gui=italic
-hi TabLine      guifg=fg                guibg=LightGrey         gui=underline
-hi TabLineFill  guifg=fg                guibg=bg                gui=reverse
-hi TabLineSel   guifg=fg                guibg=bg                gui=bold
-hi Title        guifg=DeepSkyBlue3      guibg=bg                gui=bold
-hi VertSplit    guifg=#99aabb     guibg=#99aabb
-hi Visual       guifg=white             guibg=DeepSkyBlue1      gui=NONE
-hi WarningMsg   guifg=Firebrick2        guibg=bg                gui=NONE
-hi WildMenu     guifg=Black             guibg=SkyBlue           gui=NONE
-" }}}
-
-" 256-Color Terminal Colors, by Clayton Parker {{{1
-" =============================================================================
-hi Normal cterm=NONE ctermfg=16  ctermbg=255
-hi Comment      ctermfg=110
-hi Constant     ctermfg=214
-    hi String   ctermfg=30
-    hi Boolean  ctermfg=88
-hi Identifier   ctermfg=160
-hi Function     ctermfg=132
-hi Statement    ctermfg=21
-hi Keyword      ctermfg=45
-hi PreProc      ctermfg=27
-hi Type         ctermfg=147
-hi Special      ctermfg=64
-hi Ignore       ctermfg=255
-hi Error        ctermfg=196             ctermbg=255     term=none
-hi Todo         ctermfg=136             ctermbg=255     cterm=NONE
-hi VimError         ctermfg=160          ctermbg=16
-hi VimCommentTitle  ctermfg=110
-hi qfLineNr         ctermfg=16           ctermbg=46        cterm=NONE
-hi pythonDecorator ctermfg=208   ctermbg=255 cterm=NONE
-hi Cursor       ctermfg=255             ctermbg=16              cterm=NONE
-hi CursorColumn ctermfg=NONE            ctermbg=255             cterm=NONE
-hi CursorIM     ctermfg=255             ctermbg=16              cterm=NONE
-hi CursorLine   ctermfg=NONE            ctermbg=254             cterm=NONE
-hi lCursor      ctermfg=255             ctermbg=16              cterm=NONE
-hi DiffAdd      ctermfg=16              ctermbg=48              cterm=NONE
-hi DiffChange   ctermfg=16              ctermbg=153             cterm=NONE
-hi DiffDelete   ctermfg=16              ctermbg=203             cterm=NONE
-hi DiffText     ctermfg=16              ctermbg=226             cterm=NONE
-hi Directory    ctermfg=21              ctermbg=255             cterm=NONE
-hi ErrorMsg     ctermfg=160             ctermbg=NONE            cterm=NONE
-hi FoldColumn   ctermfg=24              ctermbg=252             cterm=NONE
-hi Folded       ctermfg=24              ctermbg=252             cterm=NONE
-hi IncSearch    ctermfg=255             ctermbg=160             cterm=NONE
-hi LineNr       ctermfg=253             ctermbg=110             cterm=NONE
-hi NonText      ctermfg=110             ctermbg=255             cterm=NONE
-hi Pmenu        ctermfg=fg              ctermbg=195             cterm=NONE
-hi PmenuSbar    ctermfg=255             ctermbg=153             cterm=NONE
-hi PmenuSel     ctermfg=255             ctermbg=21              cterm=NONE
-hi PmenuThumb   ctermfg=111             ctermbg=255             cterm=NONE
-hi SignColumn   ctermfg=110             ctermbg=254             cterm=NONE
-hi Search       ctermfg=255             ctermbg=160             cterm=NONE
-hi SpecialKey   ctermfg=255             ctermbg=144             cterm=NONE
-hi SpellBad     ctermfg=16              ctermbg=229             cterm=NONE
-hi SpellCap     ctermfg=16              ctermbg=231             cterm=NONE
-hi SpellLocal   ctermfg=16              ctermbg=231             cterm=NONE
-hi SpellRare    ctermfg=16              ctermbg=226             cterm=NONE
-hi StatusLine   ctermfg=255             ctermbg=24              cterm=NONE
-hi StatusLineNC ctermfg=253             ctermbg=110             cterm=NONE
-hi Title        ctermfg=75              ctermbg=255             cterm=NONE
-hi VertSplit    ctermfg=255             ctermbg=24              cterm=NONE
-hi Visual       ctermfg=255             ctermbg=153             cterm=NONE
-hi WildMenu     ctermfg=16              ctermbg=117             cterm=NONE
-
-" 1}}}
-
-"  Syntax {{{1
-" =============================================================================
-
-"  General {{{2
-" -----------------------------------------------------------------------------
-" Groups ('*' = major; see 'help group-name'):
-"   *Comment        any comment
-"   *Constant       any constant
-"       String         a string constant: "this is a string"
-"       Character      a character constant: 'c', '\n'
-"       Number         a number constant: 234, 0xff
-"       Boolean        a boolean constant: TRUE, false
-"       Float          a floating point constant: 2.3e10
-"   *Identifier     any variable name
-"       Function       function name (also: methods for classes)
-"   *Statement      any statement
-"       Conditional    if, then, else, endif, switch, etc.
-"       Repeat         for, do, while, etc.
-"       Label          case, default, etc.
-"       Operator       "sizeof", "+", "*", etc.
-"       Keyword        any other keyword
-"       Exception      try, catch, throw
-"   *PreProc        generic Preprocessor
-"       Include        preprocessor #include
-"       Define         preprocessor #define
-"       Macro          same as Define
-"       PreCondit      preprocessor #if, #else, #endif, etc.
-"   *Type           int, long, char, etc.
-"       StorageClass   static, register, volatile, etc.
-"       Structure      struct, union, enum, etc.
-"       Typedef        A typedef
-"   *Special        any special symbol
-"       SpecialChar    special character in a constant
-"       Tag            you can use CTRL-] on this
-"       Delimiter      character that needs attention
-"       SpecialComment special things inside a comment
-"       Debug          debugging statements
-"   *Error          any erroneous construct
-"   *Todo           anything that needs extra attention
-" hi Comment      guifg=#A2B5CD         guibg=NONE      gui=italic
-hi Comment      guifg=#96AAC2         guibg=NONE      gui=italic
-hi Constant     guifg=DarkOrange        guibg=NONE      gui=NONE
-    hi String   guifg=Aquamarine4       guibg=NONE      gui=NONE
-    hi Boolean  guifg=IndianRed4        guibg=NONE      gui=NONE
-hi Identifier   guifg=brown3            guibg=NONE      gui=NONE
-hi Function     guifg=VioletRed4        guibg=NONE      gui=NONE
-hi Statement    guifg=blue1             guibg=NONE      gui=NONE
-hi Keyword      guifg=DodgerBlue        guibg=NONE      gui=NONE
-hi PreProc      guifg=blue1             guibg=NONE      gui=NONE
-hi Type         guifg=LightSlateBlue    guibg=NONE      gui=NONE
-hi Special      guifg=DarkOliveGreen4   guibg=NONE      gui=NONE
-hi Ignore       guifg=bg                guibg=NONE      gui=NONE
-hi Error        guifg=Red               guibg=NONE      gui=underline
-hi Todo         guifg=tan4              guibg=NONE      gui=underline
-" 2}}}
-
-"  Vim {{{2
-" -----------------------------------------------------------------------------
-hi VimError         guifg=red            guibg=Black   gui=bold
-hi VimCommentTitle  guifg=DarkSlateGray4 guibg=bg      gui=bold,italic
-" 2}}}
-
-" QuickFix {{{2
-" -----------------------------------------------------------------------------
-
-" syn match qfFileName  "^[^|]*" nextgroup=qfSeparator
-" syn match qfSeparator "|" nextgroup=qfLineNr contained
-" syn match qfLineNr    "[^|]*" contained contains=qfError
-" syn match qfError     "error" contained
-hi qfFileName  guifg=LightSkyBlue4     guibg=NONE      gui=italic
-hi qfLineNr    guifg=coral             guibg=NONE      gui=bold
-hi qfError     guifg=red               guibg=NONE      gui=bold
-" 2}}}
-
-" Python {{{2
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=orange3 guibg=NONE gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-" 2}}}
-
-" Diff {{{2
-" -----------------------------------------------------------------------------
-hi diffOldFile          guifg=#006666           guibg=NONE      gui=NONE
-hi diffNewFile          guifg=#0088FF           guibg=NONE      gui=bold
-hi diffFile             guifg=#0000FF           guibg=NONE      gui=NONE
-hi link diffOnly        Constant
-hi link diffIdentical   Constant
-hi link diffDiffer      Constant
-hi link diffBDiffer     Constant
-hi link diffIsA         Constant
-hi link diffNoEOL       Constant
-hi link diffCommon      Constant
-hi diffRemoved          guifg=#BB0000           guibg=NONE      gui=NONE
-hi diffChanged          guifg=DarkSeaGreen      guibg=NONE      gui=NONE
-hi diffAdded            guifg=#00AA00           guibg=NONE      gui=NONE
-hi diffLine             guifg=thistle4          guibg=NONE      gui=italic
-hi link diffSubname     diffLine
-hi link diffComment     Comment
-" 2}}}
-
-" PHP (contributed by Ryan Kulla) {{{2
-" -----------------------------------------------------------------------------
-" Ryan Kulla's addition for PHP syntax highlighting (for regular/terminal vim)
-hi phpConditional ctermfg=21 cterm=NONE guifg=black
-hi phpIdentifier ctermfg=0 cterm=NONE guifg=black
-hi phpOperator ctermfg=black cterm=NONE guifg=black
-hi phpRegion ctermfg=132 cterm=NONE guifg=VioletRed4
-hi phpComparison ctermfg=black cterm=NONE guifg=black
-hi phpType ctermfg=darkgreen cterm=NONE guifg=darkgreen
-hi phpParent ctermfg=black cterm=NONE guifg=black
-hi phpMethodsVar ctermfg=132 cterm=NONE guifg=VioletRed4
-hi phpStatement ctermfg=21 cterm=NONE guifg=blue
-hi phpStorageClass ctermfg=21 cterm=NONE guifg=blue
-hi phpStringSingle ctermfg=30 cterm=NONE guifg=Aquamarine4
-hi phpStringDouble ctermfg=30 cterm=NONE guifg=Aquamarine4
-hi phpFunctions ctermfg=21 cterm=NONE guifg=blue
-hi phpSpecialFunction ctermfg=21 cterm=NONE guifg=blue
-hi phpRepeat ctermfg=21 cterm=NONE guifg=blue
-hi phpNumber ctermfg=214 cterm=bold guifg=brown
-hi phpTodo ctermfg=red cterm=bold guifg=red gui=bold
-hi phpDefine ctermfg=21 cterm=NONE guifg=blue
-hi phpConstant ctermfg=21 cterm=NONE guifg=black
-hi phpCoreConstant ctermfg=21 cterm=NONE guifg=black
-hi phpMemberSelector ctermfg=black cterm=NONE guifg=black
-hi phpLabel ctermfg=21 cterm=NONE guifg=blue
-hi phpStructure ctermfg=black cterm=NONE guifg=black
-hi phpRelation ctermfg=black cterm=NONE guifg=black
-hi phpEnvVar ctermfg=black cterm=NONE guifg=black
-hi phpIntVar ctermfg=0 cterm=bold guifg=black gui=bold
-hi phpBoolean ctermfg=58 cterm=NONE guifg=brown
-" 2}}}
-
-" 1}}}
-
diff --git a/colors/mdark.vim b/colors/mdark.vim
deleted file mode 100755
index 16601db..0000000
--- a/colors/mdark.vim
+++ /dev/null
@@ -1,305 +0,0 @@
-" Vim color file
-" Maintaner: Mikhail Wolfson <mywolfson@gmail.com>
-" URL: http://web.mit.edu/wolfsonm
-" Last Change: 2010 Apr 13
-" Version: 0.1
-"
-" Features:
-"   - let mdark_current_line = 1 if you want to highlight the current line
-"
-" Changelog:
-"   0.1 - made the original, based on rdark/mydark
-  
-set background=dark
-
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let colors_name = "mdark"
-
-" Options
-let mdark_current_line = 1
-let mdark_current_col = 0
-
-
-" Customizable Default Colors
-" this gives more control than using Vim's predefined colors
-" and makes it easy to introduce slight variations in the colors
-" prefixes: l_: light, m_: medium, o_: off- g_: grayish- b_: bright
-let s:fg = "#BABDB6"
-let s:bg = "#1E2426"
-
-let s:line_col = "#283033"
-let s:line_nr = "#49646A"
-
-" Shades of black and gray for structure
-let s:white = "#FFFFFF"
-let s:o_white = "#EEEEEC"
-let s:d_gray   = "#2E3436"
-let s:m_gray   = "#888A85"
-let s:slate = "#555753"
-let s:o_black = "#0A1012"
-let s:black = "#000000"
-
-" Specific colors for highlighted terms
-
-" pinks, purples
-let s:pink = "#D16B7C"
-let s:l_pink = "#D4A0A0"
-let s:purple = "#AD6491"
-let s:l_purple = "#CB9DCD"
-let s:l_lavender = "#ADA5CB"
-let s:g_lavender = "#363243"
-let s:magenta = "#FF00FF"
-
-" blues
-let s:d_dusty_blue = "#535E95"
-let s:dg_dusty_blue = "#406371"
-let s:lg_dusty_blue = "#8389A3"
-let s:dusty_blue = "#7993BD"
-let s:l_dusty_blue = "#729FCF"
-let s:blue = "#3B6BBD"
-let s:blue_lav = "#393CC3"
-let s:l_blue = "#848FB1"
-let s:b_blue = "#2D69FF" 
-let s:vb_blue = "#2950CB"
-
-" greens, etc
-let s:olive = "#4C6C3D"
-let s:green = "#66CC66"
-let s:g_green = "#406A5C"
-let s:b_green = "#5AB578"
-let s:l_green = "#8BA692"
-let s:d_green = "#447864"
-
-" yellows and oranges
-let s:yellow = "#FFCC00"
-let s:brown_orange = "#CC6633"
-let s:yellow_orange = "#FF6600"
-let s:o_yellow = "#CC9933"
-let s:l_yellow = "#FFFF82"
-let s:b_yellow = "#FFFF00"
-
-" reds and red-oranges
-let s:l_red = "#FB4453"
-let s:d_red = "#871019"
-let s:l_orange = "#FCAF3E"
-let s:orange = "#FF3300"
-
-" Unused "Extra" colors
-let s:mustard = "#996633"
-let s:d_orange = "#E1593D"
-let s:brick = "#993333"
-let s:peach = "#FF9966"
-let s:vl_pink = "#FFDDCC"
-let s:d_pink = "#D15F7A"
-let s:b_red = "#990000"
-let s:lavender = "#9B8BD4"
-
-let s:l_cyan = "#99CCCC"
-let s:cyan = "#66CCCC"
-let s:b_cyan = "#33CCCC"
-let s:vl_cyan = "#99FFFF"
-let s:d_cyan = "#006666"
-let s:m_cyan = "#579CAD"
-let s:g_cyan = "#B6E3FF"
-
-
-" Function to set colors from variables
-function s:Color(name, color_settings)
-	let color_string = ''
-
-	for [color_type, color_value] in items(a:color_settings)
-		let color_string .=  ' ' . color_type . '=' . color_value
-	endfor
-
-	 exec 'hi ' . a:name . color_string
-endfunction
-
-" Current Line
-if exists('mdark_current_line') && mdark_current_line == 1
-	set cursorline
-	call s:Color('CursorLine',  {'guibg': s:line_col})
-endif
-if exists('mdark_current_col') && mdark_current_col == 1
-	set cursorcolumn
-	call s:Color('CursorColumn',  {'guibg': s:line_col})
-endif
-
-" Basic Properties
-call s:Color('Normal', {'guifg': s:fg, 'guibg': s:bg})
-call s:Color('NonText', {'guifg': s:fg, 'guibg': s:d_gray, 'gui': 'none'})
-call s:Color('Cursor', {'guibg': s:fg})
-call s:Color('ICursor', {'guibg': s:fg})
-
-" Search
-call s:Color('Search', {'guifg': s:d_gray, 'guibg': s:l_orange})
-call s:Color('IncSearch', {'guifg': s:l_orange, 'guibg': s:d_gray})
-
-" Window Elements
-call s:Color('StatusLine', {'guifg': s:d_gray, 'guibg': s:fg, 'gui': 'none'})
-call s:Color('StatusLineNC', {'guifg': s:d_gray, 'guibg': s:m_gray, 'gui': 'none'})
-call s:Color('VertSplit', {'guifg': s:slate, 'guibg': s:m_gray, 'gui': 'none'})
-call s:Color('MoreMsg', {'guifg': s:l_dusty_blue})
-call s:Color('Question', {'guifg': s:green, 'gui': 'none'})
-call s:Color('WildMenu', {'guifg': s:o_white, 'guibg': s:o_black})
-call s:Color('LineNr', {'guifg': s:line_nr, 'guibg': s:black})
-
-call s:Color('Visual', {'guibg': s:g_lavender})
-call s:Color('ErrorMsg', {'guifg': s:white, 'guibg': s:d_red})
-call s:Color('WarningMsg', {'guifg': s:l_red})
-
-" Pmenu
-call s:Color('Pmenu', {'guibg': s:d_gray, 'guifg': s:o_white})
-call s:Color('PmenuSel', {'guibg': s:white, 'guifg': s:bg})
-call s:Color('PmenuSbar', {'guibg': s:slate})
-call s:Color('PmenuThumb', {'guifg': s:white})
-
-" Diff
-call s:Color('DiffDelete', {'guifg': s:d_gray, 'guibg': s:o_black})
-call s:Color('DiffAdd', {'guibg': s:d_red})
-call s:Color('DiffChange', {'guibg': s:d_gray})
-call s:Color('DiffText', {'guibg': s:black, 'gui': 'none'})
-
-" Folds
-call s:Color('Folded', {'guifg': s:g_green, 'guibg': '#204a87'})
-call s:Color('FoldColumn', {'guifg': s:d_dusty_blue, 'guibg': s:black})
-
-" Specials
-call s:Color('Title', {'guifg': s:l_orange})
-call s:Color('Todo', {'guifg': s:b_yellow, 'guibg': 'bg'})
-call s:Color('SpecialKey', {'guifg': s:l_red})
-
-" Tabs
-call s:Color('TabLine', {'guibg': s:o_black, 'guifg': s:m_gray})
-call s:Color('TabLineFill', {'guifg': s:o_black})
-call s:Color('TabLineSel', {'guibg': s:slate, 'guifg': s:o_white, 'gui': 'none'})
-
-" Matches
-call s:Color('MatchParen', {'guifg': s:d_gray, 'guibg': s:l_orange})
-
-" Tree
-call s:Color('Directory', {'guifg': s:white})
-
-" Syntax
-call s:Color('Comment', {'guifg': s:l_green, 'gui': 'italic'})
-
-" Constants
-call s:Color('Constant', {'guifg': s:green})
-call s:Color('Character', {'guifg': s:pink})
-call s:Color('String', {'guifg': s:l_pink})
-call s:Color('Number', {'guifg': s:d_green})
-call s:Color('Float', {'guifg': s:b_green})
-call s:Color('Boolean', {'guifg': s:olive})
-
-" Identifiers
-call s:Color('Identifier', {'guifg': s:l_purple})
-call s:Color('Function', {'guifg': s:dusty_blue, 'gui': 'bold'})
-
-" Statements
-call s:Color('Statement', {'guifg': s:blue, 'gui': 'none'})
-call s:Color('Conditional', {'guifg': s:b_blue})
-call s:Color('Repeat', {'guifg': s:vb_blue})
-call s:Color('Label', {'guifg': s:blue_lav})
-call s:Color('Operator', {'guifg': s:purple})
-call s:Color('Keyword', {'guifg': s:blue})
-call s:Color('Exception', {'guifg': s:l_blue})
-
-" Types
-call s:Color('Type', {'guifg': s:d_dusty_blue })
-call s:Color('StorageClass', {'guifg': s:d_dusty_blue })
-call s:Color('Structure', {'guifg': s:dg_dusty_blue, 'gui':'bold' })
-call s:Color('Typedef', {'guifg': s:lg_dusty_blue, 'gui':'bold'})
-
-" Preprocs
-call s:Color('Preproc', {'guifg': s:yellow})
-call s:Color('Include', {'guifg': s:brown_orange})
-call s:Color('Define', {'guifg': s:yellow_orange})
-call s:Color('Macro', {'guifg': s:o_yellow})
-call s:Color('PreCondit', {'guifg': s:l_orange})
-
-" Specials
-call s:Color('Special', {'guifg': s:white})
-call s:Color('SpecialChar', {'guifg': s:pink})
-call s:Color('Tag', {'guifg': s:l_red})
-call s:Color('Delimiter', {'guifg': s:l_lavender})
-call s:Color('SpecialComment', {'guifg': s:orange})
-call s:Color('Debug', {'guifg': s:l_yellow})
-
-" Misc
-call s:Color('Underlined', {'guifg': s:magenta})
-call s:Color('Ignore', {'guifg': s:m_gray})
-call s:Color('Error', {'guifg': s:white,   'guibg': s:d_red})
-
-
-" Language-Specific
-
-" PHP
-call s:Color('phpRegionDelimiter', {'guifg': s:purple})
-call s:Color('phpPropertySelector', {'guifg': s:m_gray})
-call s:Color('phpPropertySelectorInString', {'guifg': s:m_gray})
-call s:Color('phpOperator', {'guifg': s:m_gray})
-call s:Color('phpArrayPair', {'guifg': s:m_gray})
-call s:Color('phpAssignByRef', {'guifg': s:m_gray})
-call s:Color('phpRelation', {'guifg': s:m_gray})
-call s:Color('phpMemberSelector', {'guifg': s:m_gray})
-call s:Color('phpUnknownSelector', {'guifg': s:m_gray})
-call s:Color('phpVarSelector', {'guifg': s:fg})
-call s:Color('phpSemicolon', {'guifg': s:m_gray, 'gui': 'none'})
-call s:Color('phpFunctions', {'guifg': s:g_green})
-call s:Color('phpParent', {'guifg': s:m_gray})
-
-" JavaScript
-call s:Color('javaScriptBraces', {'guifg': s:m_gray})
-call s:Color('javaScriptOperator', {'guifg': s:m_gray})
-
-" HTML
-call s:Color('htmlTag', {'guifg': s:m_gray})
-call s:Color('htmlEndTag', {'guifg': s:m_gray})
-call s:Color('htmlTagName', {'guifg': s:fg})
-call s:Color('htmlSpecialTagName', {'guifg': s:fg})
-call s:Color('htmlArg', {'guifg': s:g_green})
-call s:Color('htmlTitle', {'guifg': s:green, 'gui': 'none'})
-hi link htmlH1 htmlTitle
-hi link htmlH2 htmlH1
-hi link htmlH3 htmlH1
-hi link htmlH4 htmlH1
-hi link htmlH5 htmlH1
-hi link htmlH6 htmlH1
-
-" XML
-hi link xmlTag htmlTag
-hi link xmlEndTag htmlEndTag
-hi link xmlAttrib htmlArg
-
-" CSS
-call s:Color('cssSelectorOp', {'guifg': s:o_white})
-hi link cssSelectorOp2 cssSelectorOp
-call s:Color('cssUIProp', {'guifg': s:g_green})
-hi link cssPagingProp cssUIProp
-hi link cssGeneratedContentProp cssUIProp
-hi link cssRenderProp cssUIProp
-hi link cssBoxProp cssUIProp
-hi link cssTextProp cssUIProp
-hi link cssColorProp cssUIProp
-hi link cssFontProp cssUIProp
-call s:Color('cssPseudoClassId', {'guifg': s:o_white})
-call s:Color('cssBraces', {'guifg': s:m_gray})
-call s:Color('cssIdentifier', {'guifg': s:l_orange})
-call s:Color('cssTagName', {'guifg': s:l_orange})
-hi link cssInclude Function
-hi link cssCommonAttr Constant
-hi link cssUIAttr Constant
-hi link cssTableAttr Constant
-hi link cssPagingAttr Constant
-hi link cssGeneratedContentAttr Constant
-hi link cssAuralAttr Constant
-hi link cssRenderAttr Constant
-hi link cssBoxAttr Constant
-hi link cssTextAttr Constant
-hi link cssColorAttr Constant
-hi link cssFontAttr Constant
-
-" Clean up
-delfunction s:Color
diff --git a/colors/mellow.vim b/colors/mellow.vim
deleted file mode 100755
index d0f35a8..0000000
--- a/colors/mellow.vim
+++ /dev/null
@@ -1,41 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" Last Change: 29 August 2005
-" Version:1.1
-" Comment: A soft mellow colorful scheme for gui
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="mellow"
-
-hi Normal   guifg=black	guibg=#FFFFCC 
-hi Title    guifg=black	guibg=white gui=BOLD
-hi lCursor  guibg=Cyan guifg=NONE
-hi Cursor   guibg=#ff0000 guifg=#ffffff
-
-hi LineNr   guifg=white guibg=#666600
-
-" syntax highlighting groups
-hi Comment  guifg=#996600 gui=NONE
-hi Operator term=None cterm=None gui=None
-
-hi Identifier	 guifg=#663333 gui=NONE
-
-hi Statement	 guifg=#cc0000 gui=NONE
-hi TypeDef guifg=#c000c8 gui=NONE
-hi Type guifg=#0000c8 gui=NONE
-hi Boolean guifg=#0000aa gui=NONE
-
-hi String guifg=#006666 gui=NONE
-hi Number guifg=#808880 gui=NONE
-hi Constant guifg=#888080 gui=NONE
-
-hi Function guifg=#660000  guibg=#ffffcc
-hi PreProc guifg=#808040 gui=NONE
-hi Keyword guifg=#008088 gui=NONE
-
-hi Search guibg=#336600 guifg=#FFFF00 gui=NONE
-hi IncSearch guibg=#CC6600  gui=NONE
diff --git a/colors/metacosm.vim b/colors/metacosm.vim
deleted file mode 100755
index 924b0e2..0000000
--- a/colors/metacosm.vim
+++ /dev/null
@@ -1,136 +0,0 @@
-" Maintainer: Robert Melton ( iam -at- robertmelton -dot- com)
-" Last Change: 2009 June 4th
-
-" -----------------------------------------------------------------------------
-" This color scheme uses a dark grey background.
-" This theme, based on evening (with some input from Torte) is designed to 
-" seperate active text (code) from background/line numbers/folds/listchars by 
-" having different background colors on the non-code and the code (just 
-" slightly).  If you look at the screenshot below, you will get the idea.  
-" All non-code(include indents) and string literals have a black background 
-" while code has a very dark grey background.
-" -----------------------------------------------------------------------------
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "metacosm"
-
-" -----------------------------------------------------------------------------
-" Primary (hyper/selected/colored background)
-" -----------------------------------------------------------------------------
-" Search
-hi IncSearch guibg=black guifg=cyan
-hi Search guibg=black guifg=cyan
-
-" Visual 
-hi Visual guibg=yellow guifg=black
-hi VisualNOS guibg=yellow guifg=black gui=underline
-
-" Borders
-hi StatusLine guibg=black guifg=white
-hi StatusLineNC guibg=black guifg=grey45
-hi VertSplit guibg=black guifg=grey45
-
-" Cursors
-hi Cursor guibg=white guifg=black
-hi lCursor guibg=white guifg=black
-
-" Diff
-hi DiffText guibg=red guifg=white gui=bold
-hi DiffAdd guibg=darkblue guifg=white
-hi DiffChange guibg=darkmagenta guifg=white
-hi DiffDelete guibg=darkcyan guifg=blue gui=bold
-
-" Misc
-hi Title guifg=magenta gui=bold
-hi Question guibg=black guifg=green gui=bold
-hi Todo  guibg=black guifg=cyan
-hi Error guibg=red guifg=white
-hi WildMenu guibg=cyan guifg=black
-
-" -----------------------------------------------------------------------------
-" Primary (active/code/text/grey background)
-" -----------------------------------------------------------------------------
-" Normal
-hi Normal guibg=black guifg=white
-
-" Constants
-hi Constant guibg=grey15 guifg=#ffa0a0
-hi String guibg=grey15 guifg=#ffa0a0
-hi Character guibg=grey15 guifg=#ffa0a0
-hi Number guibg=grey15 guifg=#ffa0a0
-hi Boolean guibg=grey15 guifg=#ffa0a0
-hi Float guibg=grey15 guifg=#ffa0a0
-
-" Identifier
-hi Identifier guibg=black guifg=#40ffff
-hi Function guibg=black guifg=#40ffff
-
-" Statement
-hi Statement guibg=black guifg=#ffff60
-hi Conditional guibg=black guifg=#ffff60
-hi Repeat guibg=black guifg=#ffff60
-hi Label guibg=black guifg=#ffff60
-hi Operator guibg=black guifg=#ffff60
-hi Keyword guibg=black guifg=#ffff60
-hi Exception guibg=black guifg=#ffff60
-
-" PreProc
-hi PreProc guibg=black guifg=#ff80ff
-hi Include guibg=black guifg=#ff80ff
-hi Define guibg=black guifg=#ff80ff
-hi Macro guibg=black guifg=#ff80ff
-hi PreCondit guibg=black guifg=#ff80ff
-
-" Type
-hi Type guibg=black guifg=#60ff60
-hi StorageClass guibg=black guifg=#60ff60
-hi Structure guibg=black guifg=#60ff60
-hi Typedef guibg=black guifg=#60ff60
-
-" Special
-hi Special guibg=black guifg=orange
-hi SpecialChar guibg=black guifg=orange
-hi Tag guibg=black guifg=orange
-hi Delimiter guibg=black guifg=orange
-hi Debug guibg=black guifg=orange
-
-" Misc
-hi Underlined guibg=black guifg=#ffff60 gui=underline
-
-" -----------------------------------------------------------------------------
-" Secondary (inactive/black background)
-" -----------------------------------------------------------------------------
-" Comments
-hi Comment guibg=black guifg=#80a0ff
-hi SpecialComment guibg=black guifg=#80a0ff gui=underline
-
-" Messages
-hi ModeMsg guibg=black guifg=white gui=bold
-hi MoreMsg guibg=black guifg=seagreen gui=bold
-hi WarningMsg guibg=black guifg=pink gui=bold
-hi ErrorMsg guibg=black guifg=red gui=bold
-
-" Folding
-hi Folded guibg=black guifg=grey50
-hi FoldColumn guibg=black guifg=grey30
-
-" Misc
-hi Ignore guibg=black guifg=grey45
-hi NonText guibg=black guifg=grey45
-hi LineNr guibg=black guifg=grey45
-hi SpecialKey guibg=black guifg=grey45
-hi SignColumn guibg=black guifg=grey45
-hi Directory guibg=black guifg=cyan
-
-" -----------------------------------------------------------------------------
-" Vim 7.x only
-" ----------------------------------------------------------------------------
-hi MatchParen guibg=purple guifg=yellow
-hi CursorLine guibg=grey5 
-hi CursorColumn guibg=grey5
-hi Pmenu guibg=grey20 guifg=white
-hi PmenuSel guibg=green guifg=black
diff --git a/colors/midnight.vim b/colors/midnight.vim
deleted file mode 100755
index 643b988..0000000
--- a/colors/midnight.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file
-" Maintainer:   Michael Brailsford <brailsmt@yahoo.com>
-" Date:        $Date: 2002/11/25 20:25:54 $ 
-" Version:     $Revision: 1.1 $
-" Inspiration: This colorscheme was inspired by midnight.vim.  It is a darker
-"              version of it.  With some colors tweaked.
-"
-" Thanks:      Thanks go to Hans Fugal for creating the colorscheme template.
-"                Without it I would have been lost creating the original midnight.vim
-"              Thanks to Mark Lodato for providing vim7 updates.
-"
-" Note:        If you do not like the dark look of the colorscheme, you can
-"              easily lighten things up with the following line:
-"              :%s/\(\w\)3/\12/g
-"              It is easily pasteable into the command line.  you can also
-"              change "\12" to "\11", "\1" or "\14" (if you want things even
-"              darker).  If you do use the "\14" replacement, then it looks
-"              like your monitor in a fog bank.  :)
-
-" your pick:
-set background=dark  
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="midnight2"
-
-hi Normal guifg=slategray3 guibg=#000029 ctermfg=14
-
-"Toggle semicolon matching at the end of lines
-nmap <silent> <leader>; :call ToggleSemicolonHighlighting()<cr>
-"{{{
-function! ToggleSemicolonHighlighting()
-   if exists("b:semicolon")
-      unlet b:semicolon
-      hi semicolon guifg=NONE gui=NONE ctermfg=NONE
-   else
-      syn match semicolon #;$#
-      hi semicolon guifg=red3 gui=bold ctermfg=1
-      let b:semicolon = 1
-   endif
-endfunction
-"}}}
-
-hi Cursor guibg=fg guifg=bg ctermfg=0 ctermbg=11
-"hi CursorIM   
-hi Directory gui=bold
-hi DiffAdd guibg=slategray4 ctermbg=0
-hi DiffChange guibg=steelblue3 guifg=bg gui=NONE
-hi DiffDelete guibg=slategray4 guifg=slategray3
-hi DiffText guibg=steelblue4 gui=bold
-hi ErrorMsg guibg=red3 ctermfg=1
-"hi VertSplit  
-hi Folded guibg=#00001a guifg=yellow3 ctermbg=4 ctermfg=11 gui=NONE
-hi FoldColumn guibg=steelblue3 ctermbg=14 guifg=navyblue ctermfg=11 gui=bold
-"hi SignColumn
-"hi IncSearch  
-hi LineNr guifg=yellow3 ctermfg=3
-hi MatchParen guibg=navyblue gui=italic
-hi ModeMsg guifg=yellow3 gui=bold ctermfg=3
-"hi MoreMsg(   )
-"hi NonText    
-hi Pmenu guibg=steelblue3 guifg=bg ctermfg=7 ctermbg=4 cterm=bold
-hi PmenuSel guibg=fg guifg=bg gui=bold ctermfg=4 ctermbg=7 cterm=bold
-hi link PmenuSbar Pmenu
-"hi PmenuThumb
-"hi Question   
-hi Search guibg=yellow3 guifg=bg
-"hi SpecialKey 
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-hi StatusLine guifg=steelblue3
-hi StatusLineNC guifg=steelblue4
-"hi TabLine
-"hi TabLineFill
-"hi TabLineSel
-"hi Title      
-hi Visual guifg=bg guibg=fg
-"hi VisualNOS  
-"hi WarningMsg 
-"hi WildMenu   
-"hi Menu    
-"hi Scrollbar  
-"hi Tooltip    
-
-" syntax highlighting groups
-hi Comment guifg=chartreuse3 ctermfg=10
-hi Constant guifg=plum3 gui=bold ctermfg=13
-hi String guifg=indianred3 ctermfg=5
-hi Character guifg=mediumpurple3 ctermfg=5
-hi Number guifg=turquoise3 ctermfg=5
-"hi Identifier 
-hi Statement guifg=khaki3 gui=bold ctermfg=15 cterm=underline
-hi PreProc guifg=firebrick3 gui=italic ctermfg=9
-hi Type  guifg=gold3 gui=bold ctermfg=3
-hi Special guifg=orange ctermfg=208
-hi Underlined ctermfg=white cterm=underline
-"hi Ignore     
-"hi Error      
-hi Todo guifg=yellow3 guibg=blue3 gui=bold ctermfg=3 
diff --git a/colors/midnight2.vim b/colors/midnight2.vim
deleted file mode 100755
index 643b988..0000000
--- a/colors/midnight2.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file
-" Maintainer:   Michael Brailsford <brailsmt@yahoo.com>
-" Date:        $Date: 2002/11/25 20:25:54 $ 
-" Version:     $Revision: 1.1 $
-" Inspiration: This colorscheme was inspired by midnight.vim.  It is a darker
-"              version of it.  With some colors tweaked.
-"
-" Thanks:      Thanks go to Hans Fugal for creating the colorscheme template.
-"                Without it I would have been lost creating the original midnight.vim
-"              Thanks to Mark Lodato for providing vim7 updates.
-"
-" Note:        If you do not like the dark look of the colorscheme, you can
-"              easily lighten things up with the following line:
-"              :%s/\(\w\)3/\12/g
-"              It is easily pasteable into the command line.  you can also
-"              change "\12" to "\11", "\1" or "\14" (if you want things even
-"              darker).  If you do use the "\14" replacement, then it looks
-"              like your monitor in a fog bank.  :)
-
-" your pick:
-set background=dark  
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="midnight2"
-
-hi Normal guifg=slategray3 guibg=#000029 ctermfg=14
-
-"Toggle semicolon matching at the end of lines
-nmap <silent> <leader>; :call ToggleSemicolonHighlighting()<cr>
-"{{{
-function! ToggleSemicolonHighlighting()
-   if exists("b:semicolon")
-      unlet b:semicolon
-      hi semicolon guifg=NONE gui=NONE ctermfg=NONE
-   else
-      syn match semicolon #;$#
-      hi semicolon guifg=red3 gui=bold ctermfg=1
-      let b:semicolon = 1
-   endif
-endfunction
-"}}}
-
-hi Cursor guibg=fg guifg=bg ctermfg=0 ctermbg=11
-"hi CursorIM   
-hi Directory gui=bold
-hi DiffAdd guibg=slategray4 ctermbg=0
-hi DiffChange guibg=steelblue3 guifg=bg gui=NONE
-hi DiffDelete guibg=slategray4 guifg=slategray3
-hi DiffText guibg=steelblue4 gui=bold
-hi ErrorMsg guibg=red3 ctermfg=1
-"hi VertSplit  
-hi Folded guibg=#00001a guifg=yellow3 ctermbg=4 ctermfg=11 gui=NONE
-hi FoldColumn guibg=steelblue3 ctermbg=14 guifg=navyblue ctermfg=11 gui=bold
-"hi SignColumn
-"hi IncSearch  
-hi LineNr guifg=yellow3 ctermfg=3
-hi MatchParen guibg=navyblue gui=italic
-hi ModeMsg guifg=yellow3 gui=bold ctermfg=3
-"hi MoreMsg(   )
-"hi NonText    
-hi Pmenu guibg=steelblue3 guifg=bg ctermfg=7 ctermbg=4 cterm=bold
-hi PmenuSel guibg=fg guifg=bg gui=bold ctermfg=4 ctermbg=7 cterm=bold
-hi link PmenuSbar Pmenu
-"hi PmenuThumb
-"hi Question   
-hi Search guibg=yellow3 guifg=bg
-"hi SpecialKey 
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-hi StatusLine guifg=steelblue3
-hi StatusLineNC guifg=steelblue4
-"hi TabLine
-"hi TabLineFill
-"hi TabLineSel
-"hi Title      
-hi Visual guifg=bg guibg=fg
-"hi VisualNOS  
-"hi WarningMsg 
-"hi WildMenu   
-"hi Menu    
-"hi Scrollbar  
-"hi Tooltip    
-
-" syntax highlighting groups
-hi Comment guifg=chartreuse3 ctermfg=10
-hi Constant guifg=plum3 gui=bold ctermfg=13
-hi String guifg=indianred3 ctermfg=5
-hi Character guifg=mediumpurple3 ctermfg=5
-hi Number guifg=turquoise3 ctermfg=5
-"hi Identifier 
-hi Statement guifg=khaki3 gui=bold ctermfg=15 cterm=underline
-hi PreProc guifg=firebrick3 gui=italic ctermfg=9
-hi Type  guifg=gold3 gui=bold ctermfg=3
-hi Special guifg=orange ctermfg=208
-hi Underlined ctermfg=white cterm=underline
-"hi Ignore     
-"hi Error      
-hi Todo guifg=yellow3 guibg=blue3 gui=bold ctermfg=3 
diff --git a/colors/miko.vim b/colors/miko.vim
deleted file mode 100755
index f22a800..0000000
--- a/colors/miko.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-" version 0.0.5
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "miko"
-
-hi Comment             ctermfg=209            " #220 lines that have been commented out
-hi Constant            ctermfg=226              " #215 'contstants', or integers placed outside of a string
-hi LineNr              ctermfg=188 ctermbg=24   " foreground and background of line numbers
-hi StatusLine          ctermfg=24 ctermbg=188   " line at bottom of screen with filename, cursor position, etc...
-hi Statement           cterm=bold ctermfg=231   " if, else, etc...
-hi Identifier          cterm=bold ctermfg=75               " opening or closing brackets, ex: <  /> 
-hi Special             ctermfg=117              "
-hi Title               ctermfg=39              "
-hi Normal              ctermfg=153              " DEFAULT font color that will be used on all non-special characters
-
-hi Cursor              cterm=bold ctermfg=231 ctermbg=82
-hi CursorLine          cterm=reverse
-
-hi PreProc             ctermfg=226            " term after an identifier, ex: =bold
-hi Type                ctermfg=83              " any variable or characters being assigned a value, ex: style=, height=, etc...
-
-hi Visual              ctermfg=232 ctermbg=153
-
-
-" Error
-" Todo
-" Directory
-" ModeMsg
-" MoreMsg
-" Question
-" SpecialKey
-" Visual
-" WarningMsg
-" NonText
-" ErrorMsg
-" Search
diff --git a/colors/mint.vim b/colors/mint.vim
deleted file mode 100755
index 995f6bd..0000000
--- a/colors/mint.vim
+++ /dev/null
@@ -1,77 +0,0 @@
-" vim: set ts=2 sw=2 sts=2:
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "mint"
-set mouseshape+=i:arrow
-
-" Window elements 
-hi Cursor                   guifg=#000000 guibg=#F0F0F0
-hi Folded                   guifg=#FFD19D guibg=#AA8C00 gui=none
-hi LineNr                   guifg=#CCCCCC guibg=#666633
-hi NonText                  guifg=#CCCCCC
-hi MatchParen               guibg=#555555 gui=underline
-hi Normal                   guifg=#F5F5F5 guibg=#333333
-hi CursorLine               guibg=#666666
-hi StatusLine               guifg=#997777 guibg=#FFFFFF
-hi StatusLineNC             guifg=#777777 guibg=#CCCCCC
-hi Visual                   guifg=#EEEEEE guibg=#777799
-hi Search                   guibg=#AAAACC
-hi Pmenu                    guifg=#F5F5F5 guibg=steelblue
-hi PmenuSel                 guifg=orange guibg=steelblue
-
-" Main groups
-hi Comment                  guifg=#C0C0C0 gui=italic
-hi Constant                 guifg=#EEDDAA gui=none
-
-hi Statement                guifg=#CCEE00
-hi Keyword                  guifg=#CCEE00
-hi Underlined               guifg=#E0E0E0 gui=underline
-hi Error                    guifg=#F5F5F5 guibg=darkgoldenrod
-
-" Tag syntax
-hi Attribute                guifg=#CCCCCC gui=italic
-
-hi String                   guifg=#FFCC99
-hi! link Character          Constant
-hi! link Number             Constant
-hi! link Boolean            Constant
-hi! link Float              Constant
-
-hi Identifier               guifg=#CCDDFF
-hi Function                 guifg=#CCEE00
-
-hi Operator                 guifg=#F5F5F5
-hi! link Preproc            Keyword
-hi! link Type               Keyword
-
-hi! link Special            Keyword
-hi! link Ignore             Normal
-hi! link Todo               Error
-
-hi! link Title              Normal
-
-" minibufexplorer
-hi MBENormal guifg=gray90
-hi! link MBEChanged Keyword
-hi MBEVisibleNormal guibg=#AFC900 guifg=black gui=italic
-hi! link MBEVisibleChanged MBEVisibleNormal
-
-
-" HTML
-hi HTMLString               guifg=#F0D0C0 gui=italic
-
-" PLSQL
-" count, max, min, etc
-hi plsqlFunction guifg=#FFAAAA
-" currval, nextval, etc
-hi! link plsqlPseudo Keyword
-hi plsqlConditional guifg=#99CCFF
-hi plsqlRepeat guifg=#99CCFF
-" integer, number
-hi plsqlStorage guifg=wheat
-hi! link plsqlTypeAttribute plsqlStorage
-hi! link plsqlAttribute plsqlStorage
diff --git a/colors/mirodark.vim b/colors/mirodark.vim
deleted file mode 100644
index a63d0bc..0000000
--- a/colors/mirodark.vim
+++ /dev/null
@@ -1,613 +0,0 @@
-" Vim Color File
-"
-" Name:        mirodark
-" Version:     0.5
-" Last Change: 11-16-2013
-" Maintainer:  Jerome Castaneda <djjcast@gmail.com>
-" URL:         https://github.com/djjcast/mirodark
-"
-" About:       mirodark extends Jason W Ryan's miromiro(1) Vim color file with gVim, Linux console,
-"              xterm-88color, and xterm-256color support. mirodark uses Jason W Ryan's dark(2)
-"              terminal color scheme colors. mirodark uses Henry So, Jr.'s desert256(3) color
-"              approximation functions.
-"
-"              1) https://bitbucket.org/jasonwryan/eeepc/src/40f27908ce98/.vim/colors/miromiro.vim
-"              2) https://bitbucket.org/jasonwryan/eeepc/src/40f27908ce98/.colours/dark
-"              3) http://www.vim.org/scripts/script.php?script_id=1243
-
-" Usage {{{
-"
-" Installation:
-"
-" 1) Add mirodark.vim to your ~/.vim/colors directory.
-" 2) Add the following to your ~/.vimrc file:
-"
-"     syntax on
-"     colorscheme mirodark
-"
-" Terminal Support:
-"
-" mirodark uses color approximation functions to support xterm-88color and xterm-256color. If you
-" are not using xterm-88color or xterm-256color, then follow these instructions to set up your
-" terminal to use mirodark's color scheme. Also, if you are using xterm-88color or xterm-256color
-" but you want your terminal to use mirodark's color scheme, then follow these instructions.
-"
-" 1) If you are using a terminal that sets its color settings based on your ~/.Xresources file, like
-"    xterm or rxvt-unicode, then add the following to your ~/.Xresources file. If you are not using
-"    a terminal that sets its color settings based on your ~/.Xresources file, like gnome-terminal
-"    or konsole, then set its color settings to the following color values manually.
-"
-"     !
-"     ! Terminal Color Scheme: dark
-"     !
-"     ! Maintainer: Jason W Ryan <http://jasonwryan.com/>
-"     !
-"     ! higher contrast background
-"     !*background: #000000
-"     *background: #121212
-"     *foreground: #999999
-"     ! black dark/light
-"     ! higher contrast black dark/light
-"     !*color0:     #121212
-"     !*color8:     #3d3d3d
-"     *color0:     #3d3d3d
-"     *color8:     #5e5e5e
-"     ! red dark/light
-"     *color1:     #8a2f58
-"     *color9:     #cf4f88
-"     ! green dark/light
-"     *color2:     #287373
-"     *color10:    #53a6a6
-"     ! yellow dark/light
-"     *color3:     #914e89
-"     *color11:    #bf85cc
-"     ! blue dark/light
-"     *color4:     #395573
-"     *color12:    #4779b3
-"     ! magenta dark/light
-"     *color5:     #5e468c
-"     *color13:    #7f62b3
-"     ! cyan dark/light
-"     *color6:     #2b7694
-"     *color14:    #47959e
-"     ! white dark/light
-"     *color7:     #899ca1
-"     *color15:    #c0c0c0
-"
-" 2) If you are using xterm-88color or xterm-256color, then add the following to your ~/.vimrc file,
-"    before 'colorscheme mirodark':
-"
-"     let g:mirodark_disable_color_approximation=1
-"
-" Linux Console Support:
-"
-" 1) Add the following to your ~/.bashrc file:
-"
-"     #
-"     # Linux Console Color Scheme: dark
-"     #
-"     # Maintainer: Jason W Ryan <http://jasonwryan.com/>
-"     #
-"     if [[ $TERM == "linux" ]]; then
-"         echo -en "\033]P0000000" # black
-"         echo -en "\033]P85e5e5e" # darkgray
-"         echo -en "\033]P18a2f58" # darkred
-"         echo -en "\033]P9cf4f88" # lightred
-"         echo -en "\033]P2287373" # darkgreen
-"         echo -en "\033]Pa53a6a6" # lightgreen
-"         echo -en "\033]P3914e89" # darkyellow
-"         echo -en "\033]Pbbf85cc" # lightyellow
-"         echo -en "\033]P4395573" # darkblue
-"         echo -en "\033]Pc4779b3" # lightblue
-"         echo -en "\033]P55e468c" # darkmagenta
-"         echo -en "\033]Pd7f62b3" # lightmagenta
-"         echo -en "\033]P62b7694" # darkcyan
-"         echo -en "\033]Pe47959e" # lightcyan
-"         echo -en "\033]P7899ca1" # lightgray
-"         echo -en "\033]Pfc0c0c0" # white
-"     fi
-"
-" Enable Higher Contrast Mode:
-"
-" NOTE: Enabling Higher Contrast Mode only affects mirodark in xterm-256color and xterm-88color,
-"       assuming you did not disable color approximation, and gVim.
-"
-" 1) Add the following to your ~/.vimrc file, before 'colorscheme mirodark':
-"
-"     let g:mirodark_enable_higher_contrast_mode=1
-"
-" 2) If you want to easily toggle Higher Contrast Mode on and off, then add the following to your
-"    ~/.vimrc file:
-"
-"     nnoremap <Leader>m :MirodarkToggleHigherContrastMode<CR>
-" }}}
-
-" higher contrast mode toggle function {{{
-if !exists("g:loaded_mirodark")
-    fun! s:toggle_higher_contrast_mode()
-        if exists("g:mirodark_enable_higher_contrast_mode")
-            unlet g:mirodark_enable_higher_contrast_mode
-        else
-            let g:mirodark_enable_higher_contrast_mode=1
-        endif
-
-        colorscheme mirodark
-    endfun
-
-    command! -nargs=0 MirodarkToggleHigherContrastMode  call s:toggle_higher_contrast_mode()
-
-    let g:loaded_mirodark=1
-endif
-" }}}
-
-" color approximation functions {{{
-"
-" desert256 Color Approximation Functions
-"
-" Maintainer: Henry So, Jr. <henryso@panix.com>
-"
-if !has("gui_running") &&
-            \ ((&t_Co == 88 || &t_Co == 256) && !exists("g:mirodark_disable_color_approximation"))
-    " returns an approximate grey index for the given grey level
-    fun! s:grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    fun! s:grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    fun! s:grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    fun! s:rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    fun! s:rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    fun! s:rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    fun! s:color(r, g, b)
-        " get the closest grey
-        let l:gx = s:grey_number(a:r)
-        let l:gy = s:grey_number(a:g)
-        let l:gz = s:grey_number(a:b)
-
-        " get the closest color
-        let l:x = s:rgb_number(a:r)
-        let l:y = s:rgb_number(a:g)
-        let l:z = s:rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = s:grey_level(l:gx) - a:r
-            let l:dgg = s:grey_level(l:gy) - a:g
-            let l:dgb = s:grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = s:rgb_level(l:gx) - a:r
-            let l:dg = s:rgb_level(l:gy) - a:g
-            let l:db = s:rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return s:grey_color(l:gx)
-            else
-                " use the color
-                return s:rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return s:rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    fun! s:rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return s:color(l:r, l:g, l:b)
-    endfun
-endif
-" }}}
-
-" color scheme initialization {{{
-set background=dark
-hi clear
-if exists("syntax on")
-    syntax reset
-endif
-let colors_name="mirodark"
-" }}}
-
-" color scheme variables {{{
-if has("gui_running") ||
-            \ ((&t_Co == 88 || &t_Co == 256) && !exists("g:mirodark_disable_color_approximation"))
-    if !exists("g:mirodark_enable_higher_contrast_mode")
-        let s:conf_bclr_hex="121212" " configuration-based background color hexadecimal
-        let s:conf_dblk_hex="3d3d3d" " configuration-based dark black hexadecimal
-        let s:conf_lblk_hex="5e5e5e" " configuration-based light black hexadecimal
-    else
-        let s:conf_bclr_hex="000000"
-        let s:conf_dblk_hex="121212"
-        let s:conf_lblk_hex="3d3d3d"
-    endif
-
-    let s:bclr_hex=s:conf_bclr_hex " background color hexadecimal
-    let s:fclr_hex="999999"        " foreground color hexadecimal
-    let s:dblk_hex=s:conf_dblk_hex " dark black hexadecimal    (color 0)
-    let s:lblk_hex=s:conf_lblk_hex " light black hexadecimal   (color 8)
-    let s:dred_hex="8a2f58"        " dark red hexadecimal      (color 1)
-    let s:lred_hex="cf4f88"        " light red hexadecimal     (color 9)
-    let s:dgrn_hex="287373"        " dark green hexadecimal    (color 2)
-    let s:lgrn_hex="53a6a6"        " light green hexadecimal   (color 10)
-    let s:dylw_hex="914e89"        " dark yellow hexadecimal   (color 3)
-    let s:lylw_hex="bf85cc"        " light yellow hexadecimal  (color 11)
-    let s:dblu_hex="395573"        " dark blue hexadecimal     (color 4)
-    let s:lblu_hex="4779b3"        " light blue hexadecimal    (color 12)
-    let s:dmag_hex="5e468c"        " dark magentahexadecimal   (color 5)
-    let s:lmag_hex="7f62b3"        " light magenta hexadecimal (color 13)
-    let s:dcyn_hex="2b7694"        " dark cyan hexadecimal     (color 6)
-    let s:lcyn_hex="47959e"        " light cyan hexadecimal    (color 14)
-    let s:dwht_hex="899ca1"        " dark white hexadecimal    (color 7)
-    let s:lwht_hex="c0c0c0"        " light white hexadecimal   (color 15)
-    let s:culc_hex="272727"        " cursor line/column hexadecimal
-
-    if has("gui_running")
-        let s:venv="gui" " vim environment (term, cterm, gui)
-        let s:bclr="#".s:bclr_hex
-        let s:fclr="#".s:fclr_hex
-        let s:dblk="#".s:dblk_hex
-        let s:lblk="#".s:lblk_hex
-        let s:dred="#".s:dred_hex
-        let s:lred="#".s:lred_hex
-        let s:dgrn="#".s:dgrn_hex
-        let s:lgrn="#".s:lgrn_hex
-        let s:dylw="#".s:dylw_hex
-        let s:lylw="#".s:lylw_hex
-        let s:dblu="#".s:dblu_hex
-        let s:lblu="#".s:lblu_hex
-        let s:dmag="#".s:dmag_hex
-        let s:lmag="#".s:lmag_hex
-        let s:dcyn="#".s:dcyn_hex
-        let s:lcyn="#".s:lcyn_hex
-        let s:dwht="#".s:dwht_hex
-        let s:lwht="#".s:lwht_hex
-        let s:culc="#".s:culc_hex
-    else
-        let s:venv="cterm"
-        let s:bclr=s:rgb(s:bclr_hex)
-        let s:fclr=s:rgb(s:fclr_hex)
-        let s:dblk=s:rgb(s:dblk_hex)
-        let s:lblk=s:rgb(s:lblk_hex)
-        let s:dred=s:rgb(s:dred_hex)
-        let s:lred=s:rgb(s:lred_hex)
-        let s:dgrn=s:rgb(s:dgrn_hex)
-        let s:lgrn=s:rgb(s:lgrn_hex)
-        let s:dylw=s:rgb(s:dylw_hex)
-        let s:lylw=s:rgb(s:lylw_hex)
-        let s:dblu=s:rgb(s:dblu_hex)
-        let s:lblu=s:rgb(s:lblu_hex)
-        let s:dmag=s:rgb(s:dmag_hex)
-        let s:lmag=s:rgb(s:lmag_hex)
-        let s:dcyn=s:rgb(s:dcyn_hex)
-        let s:lcyn=s:rgb(s:lcyn_hex)
-        let s:dwht=s:rgb(s:dwht_hex)
-        let s:lwht=s:rgb(s:lwht_hex)
-        let s:culc=s:rgb(s:culc_hex)
-    endif
-elseif $TERM == "linux"
-    let s:venv="cterm"
-    let s:bclr=""
-    let s:fclr=""
-    let s:dblk="Black"
-    let s:lblk="DarkGray"
-    let s:dred="DarkRed"
-    let s:lred="LightRed"
-    let s:dgrn="DarkGreen"
-    let s:lgrn="LightGreen"
-    let s:dylw="DarkYellow"
-    let s:lylw="LightYellow"
-    let s:dblu="DarkBlue"
-    let s:lblu="LightBlue"
-    let s:dmag="DarkMagenta"
-    let s:lmag="LightMagenta"
-    let s:dcyn="DarkCyan"
-    let s:lcyn="LightCyan"
-    let s:dwht="LightGray"
-    let s:lwht="White"
-    let s:culc=s:dblk
-else
-    let s:venv="cterm"
-    let s:bclr=""
-    let s:fclr=""
-    let s:dblk="0"
-    let s:lblk="8"
-    let s:dred="1"
-    let s:lred="9"
-    let s:dgrn="2"
-    let s:lgrn="10"
-    let s:dylw="3"
-    let s:lylw="11"
-    let s:dblu="4"
-    let s:lblu="12"
-    let s:dmag="5"
-    let s:lmag="13"
-    let s:dcyn="6"
-    let s:lcyn="14"
-    let s:dwht="7"
-    let s:lwht="15"
-    let s:culc=s:dblk
-endif
-" }}}
-
-" highlight wrapper function {{{
-fun! s:HI(group, bg, fg, attr)
-    exec "hi" a:group
-                \ . " " . (a:bg   != "" ? s:venv . "bg=" . a:bg   : "")
-                \ . " " . (a:fg   != "" ? s:venv . "fg=" . a:fg   : "")
-                \ . " " . (a:attr != "" ? s:venv . "="   . a:attr : "")
-endfun
-" }}}
-
-" normal colors {{{
-call s:HI(         "Normal", s:bclr, s:lwht,     "" )
-call s:HI(         "Ignore",     "", s:lblk,     "" )
-call s:HI(        "Comment",     "", s:dwht,     "" )
-call s:HI(         "LineNr",     "", s:lblk,     "" )
-call s:HI(          "Float",     "", s:dylw,     "" )
-call s:HI(        "Include",     "", s:dmag,     "" )
-call s:HI(         "Define",     "", s:dgrn,     "" )
-call s:HI(          "Macro",     "", s:lmag,     "" )
-call s:HI(        "PreProc",     "", s:lgrn,     "" )
-call s:HI(      "PreCondit",     "", s:lmag,     "" )
-call s:HI(        "NonText",     "", s:dcyn,     "" )
-call s:HI(      "Directory",     "", s:dcyn,     "" )
-call s:HI(     "SpecialKey",     "", s:lylw,     "" )
-call s:HI(           "Type",     "", s:dcyn,     "" )
-call s:HI(         "String",     "", s:dgrn,     "" )
-call s:HI(       "Constant",     "", s:lmag,     "" )
-call s:HI(        "Special",     "", s:lgrn,     "" )
-call s:HI(    "SpecialChar",     "", s:lred,     "" )
-call s:HI(         "Number",     "", s:lcyn,     "" )
-call s:HI(     "Identifier",     "", s:lmag,     "" )
-call s:HI(    "Conditional",     "", s:lcyn,     "" )
-call s:HI(         "Repeat",     "", s:lred,     "" )
-call s:HI(      "Statement",     "", s:dblu,     "" )
-call s:HI(          "Label",     "", s:lmag,     "" )
-call s:HI(       "Operator",     "", s:dylw,     "" )
-call s:HI(        "Keyword",     "", s:lred,     "" )
-call s:HI(   "StorageClass",     "", s:lylw,     "" )
-call s:HI(      "Structure",     "", s:dmag,     "" )
-call s:HI(        "Typedef",     "", s:dcyn,     "" )
-call s:HI(       "Function",     "", s:lylw,     "" )
-call s:HI(      "Exception",     "", s:dred,     "" )
-call s:HI(     "Underlined",     "", s:dblu,     "" )
-call s:HI(          "Title",     "", s:dylw,     "" )
-call s:HI(            "Tag",     "", s:lylw,     "" )
-call s:HI(      "Delimiter",     "", s:lblu,     "" )
-call s:HI( "SpecialComment",     "", s:lred,     "" )
-call s:HI(        "Boolean",     "", s:dylw,     "" )
-call s:HI(           "Todo", "NONE", s:lred,     "" )
-call s:HI(        "MoreMsg", "NONE", s:lmag,     "" )
-call s:HI(        "ModeMsg", "NONE", s:lmag,     "" )
-call s:HI(          "Debug", "NONE", s:dred,     "" )
-call s:HI(     "MatchParen", s:dwht, s:dblk,     "" )
-call s:HI(       "ErrorMsg", "NONE", s:dred,     "" )
-call s:HI(       "WildMenu", s:lwht, s:dmag,     "" )
-call s:HI(         "Folded", s:dblk, s:dwht,     "" )
-call s:HI(         "Search", s:lwht, s:dred,     "" )
-call s:HI(      "IncSearch", s:lwht, s:dred,     "" )
-call s:HI(     "WarningMsg", s:lwht, s:dred,     "" )
-call s:HI(       "Question", s:lwht, s:lgrn,     "" )
-call s:HI(          "Pmenu", s:lwht, s:dgrn,     "" )
-call s:HI(       "PmenuSel", s:lwht, s:dred,     "" )
-call s:HI(         "Visual", s:lwht, s:lblk,     "" )
-call s:HI(     "StatusLine", s:dblk, s:dwht, "none" )
-call s:HI(   "StatusLineNC", s:lblk, s:dblk,     "" )
-call s:HI(      "VertSplit", s:lblk, s:dblk,     "" )
-call s:HI(        "TabLine", s:dblk, s:dwht,     "" )
-call s:HI(    "TabLineFill",     "", s:dblk,     "" )
-call s:HI(     "TabLineSel", s:dblk, s:dwht,     "" )
-call s:HI(         "Cursor", s:lred,     "",     "" )
-call s:HI(     "CursorLine", s:culc,     "", "none" )
-call s:HI(   "CursorLineNr", s:culc, s:dwht, "none" )
-call s:HI(   "CursorColumn", s:culc,     "",     "" )
-call s:HI(    "ColorColumn", s:culc,     "",     "" )
-call s:HI(     "FoldColumn", "NONE", s:lblk,     "" )
-call s:HI(     "SignColumn", "NONE",     "",     "" )
-" }}}
-
-" vimscript colors {{{
-call s:HI( "vimCommentTitle",     "", s:lgrn, "" )
-call s:HI(         "vimFold", s:lwht, s:dblk, "" )
-" }}}
-
-" help file colors {{{
-call s:HI( "helpHyperTextJump", "", s:lylw, "" )
-" }}}
-
-" javascript colors {{{
-call s:HI( "javaScriptNumber", "", s:lylw, "" )
-" }}}
-
-" html colors {{{
-call s:HI(     "htmlTag", "", s:dcyn, "" )
-call s:HI(  "htmlEndTag", "", s:dcyn, "" )
-call s:HI( "htmlTagName", "", s:lylw, "" )
-" }}}
-
-" perl colors {{{
-call s:HI(        "perlSharpBang", "", s:lgrn, "standout" )
-call s:HI(        "perlStatement", "", s:lmag,         "" )
-call s:HI( "perlStatementStorage", "", s:dred,         "" )
-call s:HI(         "perlVarPlain", "", s:dylw,         "" )
-call s:HI(        "perlVarPlain2", "", s:lylw,         "" )
-" }}}
-
-" ruby colors {{{
-call s:HI( "rubySharpBang", "", s:lgrn, "standout" )
-" }}}
-
-" diff colors {{{
-call s:HI(    "diffLine", "", s:lgrn, "" )
-call s:HI( "diffOldLine", "", s:dgrn, "" )
-call s:HI( "diffOldFile", "", s:dgrn, "" )
-call s:HI( "diffNewFile", "", s:dgrn, "" )
-call s:HI(   "diffAdded", "", s:dblu, "" )
-call s:HI( "diffRemoved", "", s:dred, "" )
-call s:HI( "diffChanged", "", s:dcyn, "" )
-" }}}
-
-" spell checking colors {{{
-if has("spell")
-    hi clear SpellBad
-    hi clear SpellCap
-    hi clear SpellRare
-    hi clear SpellLocal
-    call s:HI(   "SpellBad", "", "", "underline" )
-    call s:HI(   "SpellCap", "", "", "underline" )
-    call s:HI(  "SpellRare", "", "", "underline" )
-    call s:HI( "SpellLocal", "", "", "underline" )
-endif
-" }}}
-
-" syntastic colors {{{
-call s:HI(   "SyntasticErrorSign", s:culc, s:lred, "" )
-call s:HI( "SyntasticWarningSign", s:culc, s:lmag, "" )
-" }}}
-
-" vim: foldenable foldmethod=marker foldmarker={{{,}}} foldlevel=0:
diff --git a/colors/mizore.vim b/colors/mizore.vim
deleted file mode 100755
index c584c72..0000000
--- a/colors/mizore.vim
+++ /dev/null
@@ -1,102 +0,0 @@
-" Vim color file -- Mizore
-" Maintainer: Luinnar
-" Last Change: 11-Nov-2010
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="mizore"
-
-let save_cpo = &cpo
-set cpo&vim
-
-" basic highlight groups (:help highlight-groups)
-
-" text
-
-hi Normal       guifg=#00ffff  ctermfg=darkcyan   guibg=#000000 ctermbg=black
-hi Folded       guifg=#c2bfa5  ctermfg=lightgray  guibg=#202020 ctermbg=black  gui=underline cterm=underline
-hi LineNr       guifg=#928c75  ctermfg=darkgray   guibg=#000000 ctermbg=black
-hi Directory    guifg=#00bbdd  ctermfg=cyan       guibg=#000000 ctermbg=black
-hi NonText      guifg=#77ff22  ctermfg=yellow     guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi SpecialKey   guifg=#559933  ctermfg=green      guibg=#000000 ctermbg=black
-hi SpellBad     guifg=NONE     ctermfg=white                    ctermbg=darkred
-hi SpellCap     guifg=NONE     ctermfg=white                    ctermbg=darkblue
-hi SpellLocal   guifg=NONE     ctermfg=black                    ctermbg=cyan
-hi SpellRare    guifg=NONE     ctermfg=white                    ctermbg=darkmagenta
-hi DiffChange                                     guibg=#002830 ctermbg=black
-hi DiffDelete   guifg=#b0b0b0  ctermfg=gray       guibg=#202020 ctermbg=black  gui=bold cterm=NONE
-hi DiffText     guifg=#ff00ff  ctermfg=darkred    guibg=#002830 ctermbg=black  gui=NONE cterm=NONE
-hi DiffAdd      guifg=#ff00ff  ctermfg=darkred    guibg=#002830 ctermbg=black
-
-" borders / separators / menus
-
-hi FoldColumn   guifg=#c8bcb9       guibg=#786d65       ctermfg=lightgray   ctermbg=darkgray  gui=bold   cterm=bold
-hi SignColumn   guifg=#c8bcb9       guibg=#786d65       ctermfg=lightgray   ctermbg=darkgray  gui=bold   cterm=bold
-hi Pmenu        guifg=#000000       guibg=#a6a190       ctermfg=white       ctermbg=darkgray
-hi PmenuSel     guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=lightblue
-hi PmenuSbar    guifg=NONE          guibg=#555555       ctermfg=black       ctermbg=black
-hi PmenuThumb   guifg=NONE          guibg=#cccccc       ctermfg=gray        ctermbg=gray
-hi StatusLine   guifg=#222222       guibg=#c2bfa5       ctermfg=darkgray    ctermbg=yellow
-hi StatusLineNC guifg=#111111       guibg=#c2bfa5       ctermfg=darkgray    ctermbg=gray
-hi WildMenu     guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=darkblue  gui=bold   cterm=bold
-hi VertSplit    guifg=#c2bfa5       guibg=#c2bfa5       ctermfg=white       ctermbg=white
-hi TabLine      guifg=#000000       guibg=#c2bfa5       ctermfg=black       ctermbg=white
-hi TabLineFill  guifg=#000000       guibg=#c2bfa5       ctermfg=black       ctermbg=white
-hi TabLineSel   guifg=#ffffff       guibg=#133293       ctermfg=white       ctermbg=black
-
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" cursor / dynamic / other
-
-hi Cursor       guifg=#000000       guibg=#ffff99       ctermfg=black       ctermbg=white
-hi CursorIM     guifg=#000000       guibg=#3b3b3b       ctermfg=black       ctermbg=white       cterm=reverse
-hi CursorLine   guifg=NONE          guibg=#3b3b3b
-hi link CursorColumn CursorLine
-hi link DebugStop    CursorLine
-hi Visual       guibg=#003040       ctermbg=lightblue
-hi Search       guibg=#0080ff       ctermbg=lightblue
-hi MatchParen   guifg=NONE ctermfg=white        guibg=#3377aa ctermbg=blue
-
-"hi IncSearch
-"hi VisualNOS
-
-" listings / messages
-
-hi ModeMsg      guifg=#eecc18 ctermfg=yellow
-hi Title        guifg=#dd4452 ctermfg=red       guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi Question     guifg=#66d077 ctermfg=green     guibg=#000000 ctermbg=black
-hi MoreMsg      guifg=#39d049 ctermfg=green     guibg=#000000 ctermbg=black
-hi ErrorMsg     guifg=#ffffff ctermfg=white     guibg=#ff0000 ctermbg=red    gui=bold cterm=bold
-hi WarningMsg   guifg=#ccae22 ctermfg=yellow    guibg=#000000 ctermbg=black  gui=bold cterm=bold
-
-
-" syntax highlighting groups (:help group-name)
-
-hi Comment      guifg=#b0b0b0  ctermfg=gray       guibg=#000000 ctermbg=black
-hi Keyword      guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Statement    guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=bold 
-hi StorageClass guifg=#b0ffb0  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=NONE
-hi Structure    guifg=#b0ffb0  ctermfg=white       guibg=#000000 ctermbg=black  gui=bold cterm=NONE
-hi Type         guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=NONE
-hi Identifier   guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black  gui=NONE cterm=NONE
-hi Operator     guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Delimiter    guifg=#ffffff  ctermfg=white       guibg=#000000 ctermbg=black
-hi Todo         guifg=#a00000  ctermfg=darkred     guibg=#000000 ctermbg=black  gui=bold cterm=bold
-hi Error        guifg=#ffffff  ctermfg=white       guibg=#ff0000 ctermbg=red
-hi Function     guifg=#2080ff  ctermfg=blue        guibg=#000000 ctermbg=black
-hi Underlined   guifg=#80a0ff  ctermfg=cyan        guibg=#000000 ctermbg=black  gui=underline cterm=underline
-hi Ignore       guifg=#888888  ctermfg=darkgray    guibg=#000000 ctermbg=black
-hi Constant     guifg=#e080ff  ctermfg=magenta       guibg=#000000 ctermbg=black
-hi Number       guifg=#e080ff  ctermfg=magenta       guibg=#000000 ctermbg=black
-hi PreProc      guifg=#8070ff  ctermfg=darkmagenta   guibg=#000000 ctermbg=black
-hi Macro        guifg=#8070ff  ctermfg=darkmagenta   guibg=#000000 ctermbg=black
-hi Special      guifg=#ff40ff  ctermfg=magenta       guibg=#000000 ctermbg=black
-
-let &cpo = save_cpo
diff --git a/colors/mod_tcsoft.vim b/colors/mod_tcsoft.vim
deleted file mode 100755
index b36dab2..0000000
--- a/colors/mod_tcsoft.vim
+++ /dev/null
@@ -1,68 +0,0 @@
-"mod_tcsoft is based on the tcsoft-color scheme
-"(http://www.vim.org/scripts/script.php?script_id=641), made by Ingo Fabbri
-"<vim@tcsoft.net>
-"
-"I changed the cursor and the background-colors. Hope you like it.
-
-" Author: Andr� Kelpe <fs111 at web dot de>
-" Last Change:  Jan 13 10:33:46 CET 2005
-"
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "mod_tcsoft"
-
-hi Normal       guifg=#000000   guibg=floralwhite 
-hi Ignore       guifg=bg
-hi Comment      guifg=#1050ff   gui=italic  
-hi Folded       guifg=black     guibg=#d1cdc5
-hi FoldColumn   guifg=black     guibg=#d1cdc5
-hi Constant     guifg=#666666   gui=NONE    "grau
-hi Special      guifg=#FF0000   gui=NONE    "rot
-hi Identifier   guifg=#993300   gui=NONE    "rostfarbig
-hi Statement    guifg=#FF9900   gui=NONE    "orange
-hi PreProc      guifg=#009900   gui=NONE    "dunkelgr�n
-hi Type         guifg=#FF9900   gui=bold    "orange
-hi Cursor       guifg=#FFFFFF   guibg=#000000  "schwarz
-hi LineNr       guifg=#000000   gui=NONE    "schwarz
-hi StatusLine   guifg=#000000   gui=reverse,bold "schwarz
-hi Title        guifg=#1050ff   gui=bold
-hi Todo         guibg=#1050ff   guifg=floralwhite gui=bold
-hi Search       guifg=white   guibg=#1050ff   
-
-
-hi link   Function    PreProc
-hi link   String	    Constant
-hi link   Character	  Constant
-
-hi! link  MoreMsg     Comment
-hi! link  ErrorMsg    Visual
-hi! link  WarningMsg  ErrorMsg
-hi! link  Question    Comment
-
-hi link   Number	    Special
-hi link   Boolean	    Constant
-hi link   Float		    Number
-
-hi link   Operator    Identifier
-hi link   Keyword	    Statement
-hi link   Exception	  Statement
-hi link   Include	    PreProc
-hi link   Define	    PreProc
-hi link   Macro		    PreProc
-
-hi link   Conditional	Statement
-hi link   Repeat	    Statement
-hi link   Label		    Statement
-
-hi link   PreCondit	  PreProc
-hi link   StorageClass	Type
-hi link   Structure	  Type
-hi link   Typedef	    Type
-hi link   SpecialChar	Special
-hi link   Delimiter	  Special
-hi link   SpecialComment Comment
-hi link   Debug		    Special
diff --git a/colors/molokai.vim b/colors/molokai.vim
deleted file mode 100755
index aae9420..0000000
--- a/colors/molokai.vim
+++ /dev/null
@@ -1,211 +0,0 @@
-" Vim color file
-"
-" Author: Tomas Restrepo <tomas@winterdom.com>
-"
-" Note: Based on the monokai theme for textmate
-" by Wimer Hazenberg and its darker variant 
-" by Hamish Stuart Macpherson
-"
-
-hi clear
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="molokai"
-
-if exists("g:molokai_original")
-    let s:molokai_original = g:molokai_original
-else
-    let s:molokai_original = 0
-endif
-
-
-hi Boolean         guifg=#AE81FF
-hi Character       guifg=#E6DB74
-hi Number          guifg=#AE81FF
-hi String          guifg=#E6DB74
-hi Conditional     guifg=#F92672               gui=bold
-hi Constant        guifg=#AE81FF               gui=bold
-hi Cursor          guifg=#000000 guibg=#F8F8F0
-hi Debug           guifg=#BCA3A3               gui=bold
-hi Define          guifg=#66D9EF
-hi Delimiter       guifg=#8F8F8F
-hi DiffAdd                       guibg=#13354A
-hi DiffChange      guifg=#89807D guibg=#4C4745
-hi DiffDelete      guifg=#960050 guibg=#1E0010
-hi DiffText                      guibg=#4C4745 gui=italic,bold
-
-hi Directory       guifg=#A6E22E               gui=bold
-hi Error           guifg=#960050 guibg=#1E0010
-hi ErrorMsg        guifg=#F92672 guibg=#232526 gui=bold
-hi Exception       guifg=#A6E22E               gui=bold
-hi Float           guifg=#AE81FF
-hi FoldColumn      guifg=#465457 guibg=#000000
-hi Folded          guifg=#465457 guibg=#000000
-hi Function        guifg=#A6E22E
-hi Identifier      guifg=#FD971F
-hi Ignore          guifg=#808080 guibg=bg
-hi IncSearch       guifg=#C4BE89 guibg=#000000
-
-hi Keyword         guifg=#F92672               gui=bold
-hi Label           guifg=#E6DB74               gui=none
-hi Macro           guifg=#C4BE89               gui=italic
-hi SpecialKey      guifg=#66D9EF               gui=italic
-
-hi MatchParen      guifg=#000000 guibg=#FD971F gui=bold
-hi ModeMsg         guifg=#E6DB74
-hi MoreMsg         guifg=#E6DB74
-hi Operator        guifg=#F92672
-
-" complete menu
-hi Pmenu           guifg=#66D9EF guibg=#000000
-hi PmenuSel                      guibg=#808080
-hi PmenuSbar                     guibg=#080808
-hi PmenuThumb      guifg=#66D9EF
-
-hi PreCondit       guifg=#A6E22E               gui=bold
-hi PreProc         guifg=#A6E22E
-hi Question        guifg=#66D9EF
-hi Repeat          guifg=#F92672               gui=bold
-hi Search          guifg=#FFFFFF guibg=#455354
-" marks column
-hi SignColumn      guifg=#A6E22E guibg=#232526
-hi SpecialChar     guifg=#F92672               gui=bold
-hi SpecialComment  guifg=#465457               gui=bold
-hi Special         guifg=#66D9EF guibg=bg      gui=italic
-hi SpecialKey      guifg=#888A85               gui=italic
-if has("spell")
-    hi SpellBad    guisp=#FF0000 gui=undercurl
-    hi SpellCap    guisp=#7070F0 gui=undercurl
-    hi SpellLocal  guisp=#70F0F0 gui=undercurl
-    hi SpellRare   guisp=#FFFFFF gui=undercurl
-endif
-hi Statement       guifg=#F92672               gui=bold
-hi StatusLine      guifg=#455354 guibg=fg
-hi StatusLineNC    guifg=#808080 guibg=#080808
-hi StorageClass    guifg=#FD971F               gui=italic
-hi Structure       guifg=#66D9EF
-hi Tag             guifg=#F92672               gui=italic
-hi Title           guifg=#ef5939
-hi Todo            guifg=#FFFFFF guibg=bg      gui=bold
-
-hi Typedef         guifg=#66D9EF
-hi Type            guifg=#66D9EF               gui=none
-hi Underlined      guifg=#808080               gui=underline
-
-hi VertSplit       guifg=#808080 guibg=#080808 gui=bold
-hi VisualNOS                     guibg=#403D3D
-hi Visual                        guibg=#403D3D
-hi WarningMsg      guifg=#FFFFFF guibg=#333333 gui=bold
-hi WildMenu        guifg=#66D9EF guibg=#000000
-
-if s:molokai_original == 1
-   hi Normal          guifg=#F8F8F2 guibg=#272822
-   hi Comment         guifg=#75715E
-   hi CursorLine                    guibg=#3E3D32
-   hi CursorColumn                  guibg=#3E3D32
-   hi LineNr          guifg=#BCBCBC guibg=#3B3A32
-   hi NonText         guifg=#BCBCBC guibg=#3B3A32
-else
-   hi Normal          guifg=#F8F8F2 guibg=#1B1D1E
-   hi Comment         guifg=#465457
-   hi CursorLine                    guibg=#293739
-   hi CursorColumn                  guibg=#293739
-   hi LineNr          guifg=#BCBCBC guibg=#232526
-   hi NonText         guifg=#BCBCBC guibg=#232526
-end
-
-"
-" Support for 256-color terminal
-"
-if &t_Co > 255
-   hi Boolean         ctermfg=135
-   hi Character       ctermfg=144
-   hi Number          ctermfg=135
-   hi String          ctermfg=144
-   hi Conditional     ctermfg=161               cterm=bold
-   hi Constant        ctermfg=135               cterm=bold
-   hi Cursor          ctermfg=16  ctermbg=253
-   hi Debug           ctermfg=225               cterm=bold
-   hi Define          ctermfg=81
-   hi Delimiter       ctermfg=241
-
-   hi DiffAdd                     ctermbg=24
-   hi DiffChange      ctermfg=181 ctermbg=239
-   hi DiffDelete      ctermfg=162 ctermbg=53
-   hi DiffText                    ctermbg=102 cterm=bold
-
-   hi Directory       ctermfg=118               cterm=bold
-   hi Error           ctermfg=219 ctermbg=89
-   hi ErrorMsg        ctermfg=199 ctermbg=16    cterm=bold
-   hi Exception       ctermfg=118               cterm=bold
-   hi Float           ctermfg=135
-   hi FoldColumn      ctermfg=67  ctermbg=16
-   hi Folded          ctermfg=67  ctermbg=16
-   hi Function        ctermfg=118
-   hi Identifier      ctermfg=208
-   hi Ignore          ctermfg=244 ctermbg=232
-   hi IncSearch       ctermfg=193 ctermbg=16
-
-   hi Keyword         ctermfg=161               cterm=bold
-   hi Label           ctermfg=229               cterm=none
-   hi Macro           ctermfg=193
-   hi SpecialKey      ctermfg=81
-
-   hi MatchParen      ctermfg=16  ctermbg=208 cterm=bold
-   hi ModeMsg         ctermfg=229
-   hi MoreMsg         ctermfg=229
-   hi Operator        ctermfg=161
-
-   " complete menu
-   hi Pmenu           ctermfg=81  ctermbg=16
-   hi PmenuSel                    ctermbg=244
-   hi PmenuSbar                   ctermbg=232
-   hi PmenuThumb      ctermfg=81
-
-   hi PreCondit       ctermfg=118               cterm=bold
-   hi PreProc         ctermfg=118
-   hi Question        ctermfg=81
-   hi Repeat          ctermfg=161               cterm=bold
-   hi Search          ctermfg=253 ctermbg=66
-
-   " marks column
-   hi SignColumn      ctermfg=118 ctermbg=235
-   hi SpecialChar     ctermfg=161               cterm=bold
-   hi SpecialComment  ctermfg=245               cterm=bold
-   hi Special         ctermfg=81  ctermbg=232
-   hi SpecialKey      ctermfg=245
-
-   hi Statement       ctermfg=161               cterm=bold
-   hi StatusLine      ctermfg=238 ctermbg=253
-   hi StatusLineNC    ctermfg=244 ctermbg=232
-   hi StorageClass    ctermfg=208
-   hi Structure       ctermfg=81
-   hi Tag             ctermfg=161
-   hi Title           ctermfg=166
-   hi Todo            ctermfg=231 ctermbg=232   cterm=bold
-
-   hi Typedef         ctermfg=81
-   hi Type            ctermfg=81                cterm=none
-   hi Underlined      ctermfg=244               cterm=underline
-
-   hi VertSplit       ctermfg=244 ctermbg=232   cterm=bold
-   hi VisualNOS                   ctermbg=238
-   hi Visual                      ctermbg=235
-   hi WarningMsg      ctermfg=231 ctermbg=238   cterm=bold
-   hi WildMenu        ctermfg=81  ctermbg=16
-
-   hi Normal          ctermfg=252 ctermbg=233
-   hi Comment         ctermfg=59
-   hi CursorLine                  ctermbg=234   cterm=none
-   hi CursorColumn                ctermbg=234
-   hi LineNr          ctermfg=250 ctermbg=234
-   hi NonText         ctermfg=250 ctermbg=234
-end
diff --git a/colors/montz.vim b/colors/montz.vim
deleted file mode 100755
index 56edff6..0000000
--- a/colors/montz.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Vim color file
-" Maintainer:   Connor Berry <connorberry@yahoo.com>
-" Last Change:	2006/05/25 
-" Version: 1.0
-
-set background=light
-highlight clear
-if exists("syntax on")
-  syntax reset
-endif
-
-let g:colors_name = "montz"
-
-highlight Normal     term=none ctermfg=black    cterm=none ctermbg=white  guifg=black    gui=none guibg=white
-highlight Comment    term=none ctermfg=darkblue    guifg=darkblue    
-highlight Constant   term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Special    term=none ctermfg=red     cterm=bold guifg=red     gui=bold
-highlight Identifier term=none ctermfg=red    cterm=none guifg=red    gui=none
-highlight Statement  term=bold ctermfg=DarkGrey    cterm=bold guifg=DarkGrey    gui=bold
-highlight Operator   term=bold ctermfg=DarkGrey    cterm=bold guifg=DarkGrey    gui=bold
-highlight PreProc    term=bold ctermfg=lightgreen   cterm=none guifg=green   gui=none
-highlight Type       term=bold ctermfg=black cterm=none guifg=black gui=none
-highlight String     term=none ctermfg=magenta     cterm=none guifg=magenta     gui=none
-highlight Number     term=none ctermfg=red     cterm=none guifg=red     gui=none
-
-" vim:ts=2:sw=2:et
diff --git a/colors/mophiaDark.vim b/colors/mophiaDark.vim
deleted file mode 100755
index 14c70fd..0000000
--- a/colors/mophiaDark.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-" Vim color file
-" mophiaDark.vim
-" 
-" Maintainer:	Om Narasimhan<om.nara@gmail.com>
-"
-"   * Place :colorscheme mophiaDark in your .gvimrc
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="mophiaDark"
-
-if has("gui_running")
-set background=dark
-" Start of colorscheme
-hi Normal       guifg=Papayawhip	guibg=#000f1a
-hi NonText      guifg=ForestGreen	gui=bold
-hi CursorLine	guibg=#0a262f
-
-hi Folded       guibg=#437255 guifg=grey
-hi link	FoldColumn Folded
-hi LineNr       guibg=DarkSlateGrey	guifg=LightBlue
-hi StatusLineNC	guifg=#30433a	guibg=Gray
-hi StatusLine	guibg=#156050 guifg=yellow	gui=bold
-hi VertSplit	guibg=MidnightBlue	guifg=White	gui=none
-hi MatchParen	guibg=DeepSkyBlue	guifg=Black
-
-hi Comment	guifg=MediumSpringGreen	gui=italic
-hi Title	guifg=#e5e5ca gui=none
-hi Statement    guifg=AliceBlue gui=none
-hi Type		guifg=PaleGreen1	gui=bold
-hi Constant	guifg=Seashell2
-hi Number       guifg=DarkOliveGreen1
-hi PreProc      guifg=Turquoise1
-hi Special	guifg=DarkSeaGreen3
-hi Ignore       guifg=grey40
-hi Todo		guifg=orangered guibg=yellow2
-hi Error        guibg=Sienna1
-hi Conditional gui=bold	guifg=DarkOliveGreen1
-hi Operator gui=bold	guifg=cyan1
-hi link Keyword Operator
-hi Directory	guifg=coral
-hi Cursor       guibg=Salmon1	guifg=black
-hi Search       guibg=yellow guifg=Black
-hi IncSearch	guibg=#5a7570 guifg=Black gui=bold
-
-
-" hi Function     guifg=#bab588 guibg=bg gui=bold 
-" hi Identifier   guifg=#5094c4   
-" highlight Repeat gui=None guifg=#e06070 guibg=bg
-"hi Label gui=None guifg=LightGreen guibg=bg
-" highlight Exception gui=bold guifg=#d0a8ad guibg=bg
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi DiffText     guibg=#704335
-hi DiffChange   guibg=#685b5c
-hi DiffAdd      guibg=#0a4b8c
-hi DiffDelete   guifg=#9088a5 guibg=#500845
-hi ErrorMsg     guibg=#ff4545
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=#102030 guibg=#80a0f0
-hi VisualNOS    guifg=#100a20 guibg=#a3a5FF
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-" hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-" hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-endif
diff --git a/colors/mophiaSmoke.vim b/colors/mophiaSmoke.vim
deleted file mode 100755
index 662c5f7..0000000
--- a/colors/mophiaSmoke.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-" Vim color file
-" Maintainer:	Om Narasimhan<om.nara@bluehatsoft.com>
-" Last Change:	Fri Jan 14 14:23:03 PST 2011
-" Version:	0.9a
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="mophiaSmoke"
-
-if has("gui_running")
-set background=light
-highlight	Normal		guibg=WhiteSmoke	guifg=MidnightBlue
-highlight	NonText		gui=bold	guibg=grey90	guifg=Blue
-highlight	Directory	guifg=Blue
-highlight	ErrorMsg	guifg=White	guibg=Red
-highlight	IncSearch	gui=reverse
-highlight	Search		guibg=Yellow
-highlight	LineNr		guifg=Brown	guibg=lavender
-highlight	StatusLineNC	gui=NONE	guibg=LightSteelBlue	guifg=MidNightBlue
-highlight	StatusLine	gui=NONE	guibg=MediumOrchid guifg=White gui=bold
-highlight	VertSplit	gui=NONE	guibg=peachpuff	guifg=blue
-highlight	Visual		guibg=LightGrey
-highlight	Folded		guifg=Yellow	guibg=RoyalBlue
-highlight	CursorLine	guibg=honeydew
-highlight	Cursor		guibg=DarkViolet guifg=bg
-highlight	MatchParen	guibg=MediumSpringGreen
-highlight	Comment		guifg=RoyalBlue3	gui=italic
-highlight	Constant	guifg=Blue3
-highlight	Identifier	guifg=DodgerBlue4
-highlight	Statement	gui=bold	guifg=Brown
-highlight	PreProc		guifg=Purple
-highlight	Type		guifg=BlueViolet	gui=bold
-highlight	Underlined	gui=underline	guifg=SlateBlue
-highlight	Ignore		guifg=grey85
-highlight	Error		guifg=White	guibg=Red
-highlight	Todo		guifg=Blue	guibg=Yellow
-highlight	DiffText	gui=bold	guibg=DarkOrange
-highlight	DiffDelete	gui=bold	guifg=Blue	guibg=IndianRed
-highlight	DiffChange	guibg=Orchid
-highlight	DiffAdd		guibg=HotPink
-highlight	WarningMsg	guifg=Red	gui=bold
-highlight	MoreMsg		gui=bold	guifg=DeepPink4
-highlight	String		gui=italic	guibg=AntiqueWhite	guifg=blue1
-
-" highlight	TabLine		gui=underline	guibg=LightGrey
-" highlight	TabLineSel	gui=bold
-" highlight	TabLineFill	gui=reverse
-" highlight	lCursor		guifg=bg	guibg=fg
-" highlight	Special		guifg=SlateBlue
-"
-highlight	link	FoldColumn	Folded
-highlight	link	String		Constant
-highlight	link	Character	Constant
-highlight	link	Number		Constant
-highlight	link	Boolean		Constant
-highlight	link	Float		Number
-highlight	link	Function	Identifier
-highlight	link	Conditional	Statement
-highlight	link	Repeat		Statement
-highlight	link	Label		Statement
-highlight	link	Operator	Statement
-highlight	link	Keyword		Statement
-highlight	link	Exception	Statement
-highlight	link	Include	PreProc
-highlight	link	Define	PreProc
-highlight	link	Macro	PreProc
-highlight	link	PreCondit	PreProc
-highlight	link	StorageClass	Type
-highlight	link	Structure	Type
-highlight	link	Typedef	Type
-highlight	link	Tag	Special
-highlight	link	SpecialChar	Special
-highlight	link	Delimiter	Special
-highlight	link	SpecialComment	Special
-highlight	link	Debug	Special
-highlight	link	Title	MoreMsg
-highlight	link	ModeMsg	Moremsg
-highlight	link	CursorColumn	CursorLine
-highlight	link	Question	WarningMsg
-
-endif
diff --git a/colors/moria.vim b/colors/moria.vim
deleted file mode 100755
index 6562cb7..0000000
--- a/colors/moria.vim
+++ /dev/null
@@ -1,247 +0,0 @@
-if exists("g:moria_style")
-    let s:moria_style = g:moria_style
-else
-    let s:moria_style = &background
-endif
-
-if exists("g:moria_monochrome")
-    let s:moria_monochrome = g:moria_monochrome
-else
-    let s:moria_monochrome = 0
-endif
-
-if exists("g:moria_fontface")
-    let s:moria_fontface = g:moria_fontface
-else
-    let s:moria_fontface = "plain"
-endif
-
-execute "command! -nargs=1 Colo let g:moria_style = \"<args>\" | colo moria"
-
-if s:moria_style == "black" || s:moria_style == "dark"
-    set background=dark
-elseif s:moria_style == "light" || s:moria_style == "white"
-    set background=light
-else
-    let s:moria_style = &background 
-endif
-
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "moria"
-
-if &background == "dark"
-    if s:moria_style == "dark"
-        hi Normal ctermbg=Black ctermfg=LightGray guibg=#202020 guifg=#d0d0d0 gui=none
-
-        hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
-        hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
-    elseif s:moria_style == "black"
-        hi Normal ctermbg=Black ctermfg=LightGray guibg=#000000 guifg=#d0d0d0 gui=none
-
-        hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
-        hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#3a3a3a gui=none
-    endif
-    if s:moria_monochrome == 1
-        hi FoldColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
-        hi LineNr guifg=#a0a0a0 gui=none
-        hi MoreMsg guibg=bg guifg=#b6b6b6 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#a0a0a0 gui=bold
-        hi Pmenu guibg=#909090 guifg=#000000 gui=none
-        hi PmenuSbar guibg=#707070 guifg=fg gui=none
-        hi PmenuThumb guibg=#d0d0d0 guifg=bg gui=none
-        hi SignColumn ctermbg=bg guibg=bg guifg=#a0a0a0 gui=none
-        hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#4c4c4c guifg=fg gui=bold
-        hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#404040 guifg=fg gui=none
-        hi TabLine guibg=#6e6e6e guifg=fg gui=underline
-        hi TabLineFill guibg=#6e6e6e guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#404040 guifg=fg gui=none
-        if s:moria_fontface == "mixed"
-            hi Folded guibg=#4e4e4e guifg=#c0c0c0 gui=bold
-        else
-            hi Folded guibg=#4e4e4e guifg=#c0c0c0 gui=none
-        endif            
-    else
-        hi FoldColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
-        hi LineNr guifg=#8fa5d1 gui=none
-        hi MoreMsg guibg=bg guifg=#97abd5 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#8fa5d1 gui=bold
-        hi Pmenu guibg=#6381be guifg=#000000 gui=none
-        hi PmenuSbar guibg=#41609e guifg=fg gui=none
-        hi PmenuThumb guibg=#bdcae3 guifg=bg gui=none
-        hi SignColumn ctermbg=bg guibg=bg guifg=#8fa5d1 gui=none
-        hi StatusLine ctermbg=LightGray ctermfg=Black guibg=#334b7d guifg=fg gui=bold
-        hi StatusLineNC ctermbg=DarkGray ctermfg=Black guibg=#25365a guifg=fg gui=none
-        hi TabLine guibg=#41609e guifg=fg gui=underline
-        hi TabLineFill guibg=#41609e guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#25365a guifg=fg gui=none
-        if s:moria_fontface == "mixed"
-            hi Folded guibg=#4e4e4e guifg=#bdcae3 gui=bold
-        else
-            hi Folded guibg=#4e4e4e guifg=#bdcae3 gui=none
-        endif            
-    endif
-    hi Cursor guibg=#ffa500 guifg=bg gui=none
-    hi DiffAdd guibg=#008b00 guifg=fg gui=none
-    hi DiffChange guibg=#00008b guifg=fg gui=none
-    hi DiffDelete guibg=#8b0000 guifg=fg gui=none
-    hi DiffText guibg=#0000cd guifg=fg gui=bold
-    hi Directory guibg=bg guifg=#1e90ff gui=none
-    hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold
-    hi IncSearch guibg=#e0cd78 guifg=#000000 gui=none
-    hi ModeMsg guibg=bg guifg=fg gui=bold
-    hi PmenuSel guibg=#e0e000 guifg=#000000 gui=none
-    hi Question guibg=bg guifg=#e8b87e gui=bold
-    hi Search guibg=#90e090 guifg=#000000 gui=none
-    hi SpecialKey guibg=bg guifg=#e8b87e gui=none
-    if has("spell")
-        hi SpellBad guisp=#ee2c2c gui=undercurl
-        hi SpellCap guisp=#2c2cee gui=undercurl
-        hi SpellLocal guisp=#2ceeee gui=undercurl
-        hi SpellRare guisp=#ee2cee gui=undercurl
-    endif
-    hi TabLineSel guibg=bg guifg=fg gui=bold
-    hi Title ctermbg=Black ctermfg=White guifg=fg gui=bold
-    if version >= 700
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 gui=none
-    else
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#606060 guifg=fg gui=none
-    endif
-    hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
-    hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
-    hi WildMenu guibg=#e0e000 guifg=#000000 gui=bold
-
-    hi Comment guibg=bg guifg=#d0d0a0 gui=none
-    hi Constant guibg=bg guifg=#87df71 gui=none
-    hi Error guibg=bg guifg=#ee2c2c gui=none
-    hi Identifier guibg=bg guifg=#7ee0ce gui=none
-    hi Ignore guibg=bg guifg=bg gui=none
-    hi lCursor guibg=#00e700 guifg=#000000 gui=none
-    hi MatchParen guibg=#008b8b gui=none
-    hi PreProc guibg=bg guifg=#d7a0d7 gui=none
-    hi Special guibg=bg guifg=#e8b87e gui=none
-    hi Todo guibg=#e0e000 guifg=#000000 gui=none
-    hi Underlined ctermbg=Black ctermfg=White guibg=bg guifg=#00a0ff gui=underline    
-
-    if s:moria_fontface == "mixed"
-        hi Statement guibg=bg guifg=#7ec0ee gui=bold
-        hi Type guibg=bg guifg=#f09479 gui=bold
-    else
-        hi Statement guibg=bg guifg=#7ec0ee gui=none
-        hi Type guibg=bg guifg=#f09479 gui=none
-    endif
-
-    hi htmlBold ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=Black ctermfg=White guibg=bg guifg=fg gui=underline,italic
-elseif &background == "light"
-    if s:moria_style == "light"
-        hi Normal ctermbg=White ctermfg=Black guibg=#f0f0f0 guifg=#000000 gui=none
-
-        hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
-        hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#d8d8d8 gui=none
-    elseif s:moria_style == "white"
-        hi Normal ctermbg=White ctermfg=Black guibg=#ffffff guifg=#000000 gui=none
-
-        hi CursorColumn ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
-        hi CursorLine ctermbg=LightGray ctermfg=Black guibg=#dfdfdf gui=none
-    endif
-    if s:moria_monochrome == 1
-        hi FoldColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
-        hi Folded guibg=#cfcfcf guifg=#404040 gui=bold
-        hi LineNr guifg=#7a7a7a gui=none
-        hi MoreMsg guibg=bg guifg=#505050 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#7a7a7a gui=bold
-        hi Pmenu guibg=#9a9a9a guifg=#000000 gui=none
-        hi PmenuSbar guibg=#808080 guifg=fg gui=none
-        hi PmenuThumb guibg=#c0c0c0 guifg=fg gui=none
-        hi SignColumn ctermbg=bg guibg=bg guifg=#7a7a7a gui=none
-        hi StatusLine ctermbg=Black ctermfg=White guibg=#a0a0a0 guifg=fg gui=bold
-        hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
-        hi TabLine guibg=#cdcdcd guifg=fg gui=underline
-        hi TabLineFill guibg=#cdcdcd guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#b0b0b0 guifg=fg gui=none
-    else
-        hi FoldColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
-        hi Folded guibg=#cfcfcf guifg=#25365a gui=bold
-        hi LineNr guifg=#375288 gui=none
-        hi MoreMsg guibg=bg guifg=#2f4471 gui=bold
-        hi NonText ctermfg=DarkGray guibg=bg guifg=#375288 gui=bold
-        hi Pmenu guibg=#708bc5 guifg=#000000 gui=none
-        hi PmenuSbar guibg=#4a6db5 guifg=fg gui=none
-        hi PmenuThumb guibg=#a6b7db guifg=fg gui=none
-        hi SignColumn ctermbg=bg guibg=bg guifg=#375288 gui=none
-        hi StatusLine ctermbg=Black ctermfg=White guibg=#8fa5d1 guifg=fg gui=bold
-        hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
-        hi TabLine guibg=#b8c6e2 guifg=fg gui=underline
-        hi TabLineFill guibg=#b8c6e2 guifg=fg gui=underline
-        hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#a6b7db guifg=fg gui=none
-    endif
-    hi Cursor guibg=#883400 guifg=bg gui=none
-    hi DiffAdd guibg=#008b00 guifg=#ffffff gui=none
-    hi DiffChange guibg=#00008b guifg=#ffffff gui=none
-    hi DiffDelete guibg=#8b0000 guifg=#ffffff gui=none
-    hi DiffText guibg=#0000cd guifg=#ffffff gui=bold
-    hi Directory guibg=bg guifg=#0000f0 gui=none
-    hi ErrorMsg guibg=#ee2c2c guifg=#ffffff gui=bold
-    hi IncSearch guibg=#ffcd78 gui=none
-    hi ModeMsg ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
-    hi PmenuSel guibg=#ffff00 guifg=#000000 gui=none
-    hi Question guibg=bg guifg=#813f11 gui=bold
-    hi Search guibg=#a0f0a0 gui=none
-    hi SpecialKey guibg=bg guifg=#912f11 gui=none
-    if has("spell")
-        hi SpellBad guisp=#ee2c2c gui=undercurl
-        hi SpellCap guisp=#2c2cee gui=undercurl
-        hi SpellLocal guisp=#008b8b gui=undercurl
-        hi SpellRare guisp=#ee2cee gui=undercurl
-    endif
-    hi TabLineSel guibg=bg guifg=fg gui=bold
-    hi Title guifg=fg gui=bold
-    if version >= 700
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 gui=none
-    else
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#c4c4c4 guifg=fg gui=none
-    endif    
-    hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#a0a0a0 gui=bold,underline
-    hi WarningMsg guibg=bg guifg=#ee2c2c gui=bold
-    hi WildMenu guibg=#ffff00 guifg=fg gui=bold
-
-    hi Comment guibg=bg guifg=#786000 gui=none
-    hi Constant guibg=bg guifg=#077807 gui=none
-    hi Error guibg=bg guifg=#ee2c2c gui=none
-    hi Identifier guibg=bg guifg=#007080 gui=none
-    hi Ignore guibg=bg guifg=bg gui=none
-    hi lCursor guibg=#008000 guifg=#ffffff gui=none
-    hi MatchParen guibg=#00ffff gui=none
-    hi PreProc guibg=bg guifg=#800090 gui=none
-    hi Special guibg=bg guifg=#912f11 gui=none
-    hi Statement guibg=bg guifg=#1f3f81 gui=bold
-    hi Todo guibg=#ffff00 guifg=fg gui=none
-    hi Type guibg=bg guifg=#912f11 gui=bold
-    hi Underlined ctermbg=White ctermfg=Black guibg=bg guifg=#0000cd gui=underline
-
-    hi htmlBold ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=White ctermfg=Black guibg=bg guifg=fg gui=underline,italic
-endif
-
-hi! default link bbcodeBold htmlBold
-hi! default link bbcodeBoldItalic htmlBoldItalic
-hi! default link bbcodeBoldItalicUnderline htmlBoldUnderlineItalic
-hi! default link bbcodeBoldUnderline htmlBoldUnderline
-hi! default link bbcodeItalic htmlItalic
-hi! default link bbcodeItalicUnderline htmlUnderlineItalic
-hi! default link bbcodeUnderline htmlUnderline
diff --git a/colors/moss.vim b/colors/moss.vim
deleted file mode 100755
index c7e617b..0000000
--- a/colors/moss.vim
+++ /dev/null
@@ -1,243 +0,0 @@
-" ------------------------------------------------------------------
-" Vim color file
-" Name: moss (苔)
-" Maintainer: Li Chunlin <yeiicn!gmail.com>
-" Last Change: 2010-08-06
-" Version: 2.1
-" URL: http://vim.sourceforge.net/script.php?script_id=2779
-" ------------------------------------------------------------------
-
-" Init
-" ------------------------------------------------------------------
-set background=dark
-highlight clear
-if exists("syntax_on")
-   syntax reset
-endif
-let g:colors_name = "moss"
-
-if has("gui_running")
-    " Highlighting groups for various occasions
-    " ------------------------------------------------------------------
-    hi SpecialKey   guifg=RosyBrown4
-    hi NonText      guifg=MidnightBlue guibg=#0C2628
-    hi Directory    gui=BOLD guifg=DarkOliveGreen3
-    hi ErrorMsg     guifg=LightGoldenRod guibg=Firebrick
-    hi IncSearch    gui=BOLD guifg=Firebrick1
-    hi Search       gui=REVERSE guifg=NONE guibg=NONE
-    hi MoreMsg      guifg=DarkCyan
-    hi ModeMsg      guifg=OliveDrab2
-    hi LineNr       guifg=DarkSeaGreen3 guibg=#0C2628
-    hi Question     guifg=Green
-    hi StatusLine   gui=BOLD guifg=LemonChiffon3 guibg=#334680
-    hi StatusLineNC gui=BOLD guifg=Honeydew4 guibg=Gray26
-    hi VertSplit    gui=BOLD guifg=Gray20 guibg=Gray26
-    hi Title        gui=BOLD guifg=RoyalBlue3
-    hi Visual       guifg=PowderBlue guibg=#22364C
-    hi VisualNOS    gui=BOLD,UNDERLINE guifg=SlateGray
-    hi WarningMsg   guifg=Gold
-    hi WildMenu     gui=BOLD guifg=Black guibg=Chartreuse3
-    hi Folded       guifg=PaleGreen3 guibg=DarkSlateGray
-    hi FoldColumn   gui=BOLD guifg=PaleGreen3 guibg=DarkSlateGray
-    hi DiffAdd      guifg=SandyBrown guibg=DarkOliveGreen
-    hi DiffChange   guibg=#3C444C
-    hi DiffDelete   guifg=Gray20 guibg=Black
-    hi DiffText     guifg=Chocolate guibg=#033B40
-
-    " new Vim 7.0 items
-    if v:version >= 700
-       hi CursorColumn guibg=#063C36
-       hi CursorLine   guibg=#063C36
-       hi SignColumn   guifg=PaleGoldenrod guibg=Turquoise4
-       hi TabLine      guifg=CornflowerBlue guibg=Gray26
-       hi TabLineSel   guifg=RoyalBlue guibg=#082926
-       hi TabLineFill  gui=UNDERLINE guifg=CornflowerBlue guibg=Gray20
-       hi Pmenu        guifg=White guibg=MediumPurple4
-       hi PmenuSel     guifg=Wheat guibg=#22364C
-       hi PmenuSbar    guifg=Tan   guibg=SeaShell4
-       hi PmenuThumb   guifg=IndianRed   guibg=SeaShell4
-       hi MatchParen   gui=BOLD guifg=GoldenRod guibg=DarkCyan
-    endif
-
-    hi Cursor       guifg=Black guibg=LimeGreen
-    hi CursorIM     guifg=Black guibg=OrangeRed
-
-    " Syntax highlighting groups
-    " ------------------------------------------------------------------
-
-    hi Normal      gui=NONE guifg=LightBlue3 guibg=#082926
-    hi Comment     gui=ITALIC guifg=BurlyWood4
-
-    hi Constant    gui=NONE guifg=CadetBlue3
-    hi link        String    Constant
-    hi link        Character Constant
-    hi Number      gui=NONE guifg=Turquoise3
-    hi link        Boolean Number
-    hi link        Float   Number
-
-    hi Identifier  gui=NONE guifg=SteelBlue3
-    hi Function    gui=NONE guifg=Aquamarine3
-
-    hi Statement   gui=NONE guifg=SpringGreen3
-    hi link        Conditional Statement
-    hi link        Repeat      Statement
-    hi link        Label       Statement
-    hi Operator    gui=NONE guifg=SeaGreen3
-    hi link        Keyword     Statement
-    hi link        Exception   Statement
-
-    hi PreProc     gui=NONE guifg=DodgerBlue3
-    hi link        Include   PreProc
-    hi link        Define    PreProc
-    hi link        Macro     PreProc
-    hi link        PreCondit PreProc
-
-    hi Type        gui=NONE guifg=DeepSkyBlue3
-    hi link        StorageClass Type
-    hi link        Structure    Type
-    hi link        Typedef      Type
-
-    hi Special     gui=NONE guifg=SlateBlue
-    hi link        Specialchar Special
-    hi link        Tag         Special
-    hi link        Delimiter   Special
-    hi link        Debug       Special
-
-    hi Underlined  gui=UNDERLINE guifg=SkyBlue3
-    hi Ignore      gui=NONE guifg=Gray18
-    hi Error       gui=NONE guifg=Khaki3 guibg=VioletRed4
-    hi Todo        gui=BOLD guifg=GoldenRod3 guibg=NONE
-
-elseif &t_Co == 88 || &t_Co == 256
-
-    " Highlighting groups for various occasions
-    " ------------------------------------------------------------------
-    hi SpecialKey   ctermfg=95
-    hi NonText      ctermfg=17
-    hi Directory    cterm=bold    ctermfg=149
-    hi ErrorMsg     ctermfg=228   ctermbg=124
-    hi IncSearch    cterm=bold    ctermfg=203
-    hi Search       cterm=reverse ctermfg=152
-    hi MoreMsg      ctermfg=30
-    hi ModeMsg      ctermfg=191
-    hi LineNr       ctermfg=151
-    hi Question     ctermfg=46
-    hi StatusLine   cterm=bold  ctermfg=187 ctermbg=60
-    hi StatusLineNC cterm=bold  ctermfg=108 ctermbg=238
-    hi VertSplit    cterm=bold  cterm=bold  ctermfg=236 ctermbg=238
-    hi Title        ctermfg=68
-    hi Visual       ctermfg=152 ctermbg=60
-    hi VisualNOS    cterm=bold,underline    ctermfg=60
-    hi WarningMsg   ctermfg=220
-    hi WildMenu     cterm=bold  ctermfg=16  ctermbg=76
-    hi Folded       ctermfg=114 ctermbg=66
-    hi FoldColumn   cterm=bold  ctermfg=114 ctermbg=66
-    hi DiffAdd      ctermfg=215 ctermbg=107
-    hi DiffChange   ctermbg=60
-    hi DiffDelete   ctermfg=236 ctermbg=16
-    hi DiffText     ctermfg=166 ctermbg=23
-
-    " new Vim 7.0 items
-    if v:version >= 700
-       hi SignColumn   ctermfg=229 ctermbg=30
-       hi TabLine      ctermfg=69  ctermbg=238
-       hi TabLineSel   ctermfg=69
-       hi TabLineFill  cterm=underline ctermfg=69 ctermbg=236
-       hi Pmenu        ctermfg=231 ctermbg=97
-       hi PmenuSel     ctermfg=223 ctermbg=60
-       hi PmenuSbar    ctermfg=180 ctermbg=245
-       hi PmenuThumb   ctermfg=167 ctermbg=245
-       hi MatchParen   cterm=bold  ctermfg=172 ctermbg=30
-    endif
-
-    hi Cursor       ctermfg=16 ctermbg=77
-    hi CursorIM     ctermfg=16 ctermbg=202
-
-    " Syntax highlighting groups
-    " ------------------------------------------------------------------
-    hi Normal    ctermfg=152 ctermbg=232
-    hi Comment   cterm=NONE  ctermfg=101
-
-    hi Constant  ctermfg=116
-    hi String    ctermfg=116
-    hi Character ctermfg=116
-    hi Number    ctermfg=44
-    hi Boolean   ctermfg=116
-    hi Float     ctermfg=116
-
-    hi Identifier  ctermfg=74
-    hi Function    ctermfg=79
-
-    hi Statement   ctermfg=41
-    hi Conditional ctermfg=41
-    hi Repeat      ctermfg=41
-    hi Label       ctermfg=41
-    hi Operator    ctermfg=78
-    hi Keyword     ctermfg=41
-    hi Exception   ctermfg=41
-
-    hi PreProc     ctermfg=26
-    hi Include     ctermfg=26
-    hi Define      ctermfg=26
-    hi Macro       ctermfg=26
-    hi PreCondit   ctermfg=26
-
-    hi Type         ctermfg=38
-    hi StorageClass ctermfg=38
-    hi Structure    ctermfg=38
-    hi Typedef      ctermfg=38
-
-    hi Special     ctermfg=62
-    hi Specialchar ctermfg=62
-    hi Tag         ctermfg=62
-    hi Delimiter   ctermfg=62
-    hi Debug       ctermfg=62
-
-    hi Underlined  cterm=underline ctermfg=74
-    hi Ignore      ctermfg=236
-    hi Error       ctermfg=186 ctermbg=89
-    hi Todo        cterm=bold ctermfg=172 ctermbg=NONE
-
-else
-
-    " Highlighting groups for various occasions
-    " ------------------------------------------------------------------
-    hi SpecialKey   ctermfg=LightMagenta
-    hi NonText      ctermfg=Black
-    hi Directory    cterm=bold     ctermfg=LightYellow
-    hi ErrorMsg     ctermfg=Yellow ctermbg=Red
-    hi IncSearch    cterm=bold    ctermfg=Red
-    hi Search       cterm=reverse ctermfg=Yellow
-    hi MoreMsg      ctermfg=DarkCyan
-    hi ModeMsg      ctermfg=Yellow
-    hi LineNr       ctermfg=Gray
-    hi Question     ctermfg=Green
-    hi StatusLine   cterm=bold ctermfg=Gray  ctermbg=DarkBlue
-    hi StatusLineNC cterm=bold ctermfg=Black ctermbg=Gray
-    hi VertSplit    cterm=bold cterm=bold ctermfg=DarkGray ctermbg=Gray
-    hi Title        ctermfg=Blue
-    hi Visual       ctermfg=Blue ctermbg=LightGreen
-    hi VisualNOS    cterm=bold,underline ctermfg=DarkBlue
-    hi WarningMsg   ctermfg=Yellow
-    hi WildMenu     cterm=bold ctermfg=Black ctermbg=Green
-    hi Folded       ctermfg=LightGray ctermbg=DarkCyan
-    hi FoldColumn   cterm=bold ctermfg=LightGray ctermbg=DarkCyan
-    hi Cursor       ctermfg=Black ctermbg=Green
-    hi CursorIM     ctermfg=Black ctermbg=Red
-
-    " Syntax highlighting groups
-    " ------------------------------------------------------------------
-    hi Normal     ctermfg=White ctermbg=Black
-    hi Comment    cterm=NONE  ctermfg=Gray
-    hi Constant   ctermfg=LightCyan
-    hi Identifier ctermfg=DarkCyan
-    hi Statement  ctermfg=Green
-    hi PreProc    ctermfg=DarkBlue
-    hi Type       ctermfg=DarkCyan
-    hi Special    ctermfg=LightBlue
-    hi Underlined cterm=underline
-    hi Ignore     ctermfg=Black
-    hi Error      ctermfg=LightYellow ctermbg=DarkMagenta
-    hi Todo       cterm=bold ctermfg=LightYellow
-
-endif
diff --git a/colors/motus.vim b/colors/motus.vim
deleted file mode 100755
index 146e88d..0000000
--- a/colors/motus.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Dark (grey on black) color scheme based on on a popular torte config.
-" Maintainer: Sergei Matusevich <motus@motus.kiev.ua>
-" ICQ: 31114346 Yahoo: motus2
-" http://motus.kiev.ua/motus2/Files/motus.vim
-" Last Change: 3 November 2005
-" Orinal torte screme maintainer: Thorsten Maerz <info@netztorte.de>
-" Licence: Public Domain
-
-" INSTALLATION: copy this file to ~/.vim/colors/ directory
-" and add "colorscheme motus" to your ~/.vimrc file
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "motus"
-
-" hardcoded colors :
-" GUI Comment : #80a0ff = Light blue
-
-" GUI
-highlight Normal     guifg=Grey80	guibg=Black
-highlight Search     guifg=Grey guibg=DarkBlue
-highlight Visual     guifg=Black guibg=DarkGrey gui=NONE
-" highlight Cursor     guifg=Black	guibg=Green	gui=bold
-highlight Special    guifg=Orange
-highlight Comment    guifg=#80a0ff
-highlight Statement  guifg=Yellow			gui=NONE
-highlight Type						gui=NONE
-
-highlight VertSplit    gui=bold guifg=Grey25    guibg=Black
-highlight StatusLine   gui=bold guifg=White     guibg=Grey25
-highlight StatusLineNC gui=NONE guifg=LightGrey guibg=Grey25
-
-highlight FoldColumn	 gui=bold guifg=White guibg=Black
-
-" Console
-highlight Normal     ctermfg=LightGrey	ctermbg=Black
-highlight Search     ctermfg=Grey	ctermbg=DarkBlue	cterm=NONE
-highlight Visual					cterm=reverse
-" highlight Cursor     ctermfg=Black	ctermbg=Green	cterm=bold
-highlight Special    ctermfg=Brown
-highlight Comment    ctermfg=Blue
-highlight Statement  ctermfg=Yellow			cterm=NONE
-highlight Type						cterm=NONE
-
-highlight VertSplit    ctermfg=DarkGrey   ctermbg=Black cterm=bold
-highlight StatusLine   ctermfg=White  ctermbg=Grey cterm=bold
-highlight StatusLineNC ctermfg=Black  ctermbg=Grey cterm=NONE
-
-highlight FoldColumn	ctermbg=Black		ctermfg=White cterm=bold
-
-" only for vim 5
-if has("unix")
-  if v:version<600
-    highlight Normal  ctermfg=Grey	ctermbg=Black	cterm=NONE	guifg=Grey80      guibg=Black	gui=NONE
-    highlight Search  ctermfg=Black	ctermbg=Red	cterm=bold	guifg=Black       guibg=Red	gui=bold
-    highlight Visual  ctermfg=Black	ctermbg=yellow	cterm=bold	guifg=Grey25			gui=bold
-    highlight Special ctermfg=LightBlue			cterm=NONE	guifg=LightBlue			gui=NONE
-    highlight Comment ctermfg=Cyan			cterm=NONE	guifg=LightBlue			gui=NONE
-  endif
-endif
-
diff --git a/colors/mrkn256.vim b/colors/mrkn256.vim
deleted file mode 100755
index 0b9c5ea..0000000
--- a/colors/mrkn256.vim
+++ /dev/null
@@ -1,344 +0,0 @@
-" Vim color file
-" Maintainer: Kenta Murata <mrkn@mrkn.jp>
-
-" These are the color theme designed by mrkn based on "desert256" theme
-" created by Henry So, Jr.  This theme is designed to work with with 88-
-" and 256-color xterms.
-"
-" The ancestor version "desert256" theme is available at
-" http://www.vim.org/scripts/script.php?script_id=1243
-"
-" The real feature of this color scheme, with a wink to the "inkpot" theme, is
-" the programmatic approximation of the gui colors to the palettes of 88- and
-" 256- color xterms.  The functions that do this (folded away, for
-" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
-" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
-"
-" Henry had struggled with trying to parse the rgb.txt file to avoid the
-" necessity of converting color names to #rrggbb form, but decided it was just
-" not worth the effort.  I thank a lot for his results.
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="mrkn256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-    " functions {{{
-    " returns an approximate grey index for the given grey level
-    function! <SID>grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    function! <SID>grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    function! <SID>grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    function! <SID>rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    function! <SID>rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    function! <SID>rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    function! <SID>color(r, g, b)
-        " get the closest grey
-        let l:gx = <SID>grey_number(a:r)
-        let l:gy = <SID>grey_number(a:g)
-        let l:gz = <SID>grey_number(a:b)
-
-        " get the closest color
-        let l:x = <SID>rgb_number(a:r)
-        let l:y = <SID>rgb_number(a:g)
-        let l:z = <SID>rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = <SID>grey_level(l:gx) - a:r
-            let l:dgg = <SID>grey_level(l:gy) - a:g
-            let l:dgb = <SID>grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = <SID>rgb_level(l:gx) - a:r
-            let l:dg = <SID>rgb_level(l:gy) - a:g
-            let l:db = <SID>rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return <SID>grey_color(l:gx)
-            else
-                " use the color
-                return <SID>rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return <SID>rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    function! <SID>rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return <SID>color(l:r, l:g, l:b)
-    endfun
-
-    " sets the highlighting for the given group
-    function! <SID>X(group, fg, bg, attr)
-        if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-        endif
-        if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-        endif
-        if a:attr != ""
-            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-        endif
-    endfun
-    " }}}
-
-    call <SID>X("Normal", "cccccc", "000000", "")
-
-    " highlight groups
-    call <SID>X("Cursor", "708090", "f0e68c", "")
-    "CursorIM
-    call <SID>X("CursorColumn", "", "333333", "none")
-    call <SID>X("CursorLine", "", "333333", "underline")
-    "Directory
-    "DiffAdd
-    "DiffChange
-    "DiffDelete
-    "DiffText
-    "ErrorMsg
-    call <SID>X("VertSplit", "666666", "000000", "none")
-    call <SID>X("Folded", "ffd700", "4d4d4d", "")
-    call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
-    call <SID>X("IncSearch", "708090", "f0e68c", "")
-    call <SID>X("LineNr", "666666", "", "none")
-    call <SID>X("ModeMsg", "daa520", "", "")
-    call <SID>X("MoreMsg", "2e8b57", "", "")
-    call <SID>X("NonText", "666699", "", "none")
-    call <SID>X("Question", "00ff7f", "", "")
-    call <SID>X("Search", "f5deb3", "cd853f", "")
-    call <SID>X("SpecialKey", "666699", "", "none")
-    call <SID>X("StatusLine", "ffffff", "666666", "none")
-    call <SID>X("StatusLineNC", "000000", "666666", "none")
-    call <SID>X("Title", "cd5c5c", "", "")
-    call <SID>X("Visual", "6b8e23", "f0e68c", "reverse")
-
-    "VisualNOS
-    call <SID>X("WarningMsg", "fa8072", "", "")
-    "WildMenu
-    "Menu
-    "Scrollbar
-    "Tooltip
-    call <SID>X("Pmenu", "cccccc", "333333", "none")
-    call <SID>X("PmenuSel", "663333", "cccccc", "bold")
-    " call <SID>X("PmenuSbar", "", "", "")
-    " call <SID>X("PmenuThumb", "", "", "")
-
-    " syntax highlighting groups
-    call <SID>X("Comment", "87ceeb", "", "")
-    call <SID>X("Constant", "ffcc66", "", "")
-    call <SID>X("Identifier", "99ff00", "", "none")
-    call <SID>X("Statement", "6699ff", "", "none")
-    call <SID>X("PreProc", "ff6666", "", "")
-    call <SID>X("Type", "ffcc66", "", "none")
-    call <SID>X("Special", "ffdead", "", "")
-    "Underlined
-    call <SID>X("Ignore", "666666", "", "")
-    "Error
-    call <SID>X("Todo", "ff4500", "eeee00", "")
-
-    " delete functions {{{
-    delf <SID>X
-    delf <SID>rgb
-    delf <SID>color
-    delf <SID>rgb_color
-    delf <SID>rgb_level
-    delf <SID>rgb_number
-    delf <SID>grey_color
-    delf <SID>grey_level
-    delf <SID>grey_number
-    " }}}
-else
-    " color terminal definitions
-    hi SpecialKey    ctermfg=darkgreen
-    hi NonText       cterm=bold ctermfg=darkblue
-    hi Directory     ctermfg=darkcyan
-    hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
-    hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
-    hi Search        cterm=NONE ctermfg=grey ctermbg=blue
-    hi MoreMsg       ctermfg=darkgreen
-    hi ModeMsg       cterm=NONE ctermfg=brown
-    hi LineNr        ctermfg=3
-    hi Question      ctermfg=green
-    hi StatusLine    cterm=bold,reverse
-    hi StatusLineNC  cterm=reverse
-    hi VertSplit     cterm=reverse
-    hi Title         ctermfg=5
-    hi Visual        cterm=reverse
-    hi VisualNOS     cterm=bold,underline
-    hi WarningMsg    ctermfg=1
-    hi WildMenu      ctermfg=0 ctermbg=3
-    hi Folded        ctermfg=darkgrey ctermbg=NONE
-    hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
-    hi DiffAdd       ctermbg=4
-    hi DiffChange    ctermbg=5
-    hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
-    hi DiffText      cterm=bold ctermbg=1
-    hi Comment       ctermfg=darkcyan
-    hi Constant      ctermfg=brown
-    hi Special       ctermfg=5
-    hi Identifier    ctermfg=6
-    hi Statement     ctermfg=3
-    hi PreProc       ctermfg=5
-    hi Type          ctermfg=2
-    hi Underlined    cterm=underline ctermfg=5
-    hi Ignore        ctermfg=darkgrey
-    hi Error         cterm=bold ctermfg=7 ctermbg=1
-endif
-
-" vim: set fdl=0 fdm=marker:
diff --git a/colors/mrpink.vim b/colors/mrpink.vim
deleted file mode 100755
index 4820a48..0000000
--- a/colors/mrpink.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-" Maintainer: mgutz - Mario Gutierrez
-" Last Change: 20090705
-"
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "mrpink"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine guibg=#303030
-  hi CursorColumn guibg=#303030
-  hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold
-  hi Pmenu guifg=#f6f3e8 guibg=#444444
-  hi PmenuSel guifg=#000000 guibg=#cae682
-endif
-
-" General colors
-hi Cursor   	guifg=NONE    guibg=#666666 gui=none
-hi Normal 		guifg=#e0e0e0 guibg=#242424 gui=none
-hi NonText 		guifg=#383838 guibg=#242424 gui=none
-hi LineNr 		guifg=#383838 guibg=#242424 gui=none
-hi StatusLine 	guifg=#a0a0a0 guibg=#1c1c1c gui=none
-hi StatusLineNC guifg=#857b6f guibg=#1c1c1c gui=none
-hi VertSplit 	guifg=#1c1c1c guibg=#1c1c1c gui=none
-hi Folded 		guibg=#384048 guifg=#a0a8b0 gui=none
-hi Title		guifg=#f6f3e8 guibg=NONE	gui=bold
-hi Visual		guifg=NONE    guibg=#000000 gui=none
-hi SpecialKey	guifg=#808080 guibg=#242424 gui=none
-hi Special		guifg=#e7f6da gui=none
-
-" Syntax highlighting
-hi Comment 		guifg=#99968b gui=italic
-hi Todo 		guifg=#8f8f8f gui=italic
-hi String 		guifg=#98FF85 gui=italic
-
-hi Identifier 	guifg=#ffff99 gui=none
-hi Function 	guifg=#ffff99 gui=none
-hi Type 		guifg=#ffff99 gui=none
-
-hi PreProc 		guifg=#FFA1CF gui=none
-hi Number		guifg=#FFA1CF gui=none
-hi Constant 	guifg=#FFA1CF gui=none
-
-hi Statement 	guifg=#8ac6f2 gui=none
-hi Keyword		guifg=#8ac6f2 gui=none
diff --git a/colors/mud.vim b/colors/mud.vim
deleted file mode 100755
index 8dc2dff..0000000
--- a/colors/mud.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" Last Change: 25 August 2005
-" Version:1.0
-
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="mud"
-
-hi Normal   guifg=#ffffcc	 guibg=#330000 
-hi LineNr   guifg=white guibg=#330000 
-hi Statusline    gui=none guibg=#993300 guifg=#ffffff
-hi StatuslineNC    gui=none guibg=#660000 guifg=#ffffff
-hi VertSplit    gui=none guibg=#330000 guifg=#ffffff
-hi Cursor    gui=none guibg=DodgerBlue guifg=#ffffff
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=#996666
-hi Operator   guifg=#ff0000
-
-hi Identifier    guifg=#33ff99 gui=NONE
-
-hi Statement	 guifg=#cc9966 gui=NONE
-hi TypeDef       guifg=#c000c8 gui=NONE
-hi Type          guifg=#ccffff gui=NONE
-hi Boolean       guifg=#ff00aa gui=NONE
-
-hi String        guifg=#99ccff gui=NONE
-hi Number        guifg=#66ff66 gui=NONE
-hi Constant      guifg=#f0f000 gui=NONE
-
-hi Function      gui=NONE      guifg=#fffcfc 
-hi PreProc       guifg=#cc6600 gui=NONE
-hi Define        gui=bold guifg=#f0f0f0 
-hi Special       gui=none guifg=#cccccc 
-hi BrowseDirectory  gui=none guifg=#FFFF00 
-
-hi Keyword       guifg=#ff8088 gui=NONE
-hi Search        gui=NONE guibg=#ffff00 guifg=#330000 
-hi IncSearch     gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi SpecialKey    gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi NonText       gui=NONE guifg=#fcfcfc 
-hi Directory     gui=NONE guifg=#999900
diff --git a/colors/Mustang.vim b/colors/mustang.vim
similarity index 100%
rename from colors/Mustang.vim
rename to colors/mustang.vim
diff --git a/colors/native.vim b/colors/native.vim
deleted file mode 100755
index 07034ff..0000000
--- a/colors/native.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-"
-" Native Vim Color Scheme
-" =======================
-"
-" author:   Armin Ronacher <armin.ronacher@active-4.com>
-"
-set background=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "native"
-
-" Default Colors
-hi Normal       guifg=#f2f2f2 guibg=#222222
-hi NonText      guifg=#444444 guibg=#111111
-hi Cursor       guibg=#aaaaaa
-hi lCursor      guibg=#aaaaaa
-
-" Search
-hi Search	    guibg=peru guifg=wheat
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-
-" Window Elements
-hi StatusLine   guifg=white guibg=#8090a0 gui=bold
-hi StatusLineNC guifg=#506070 guibg=#a0b0c0
-hi VertSplit    guifg=#a0b0c0 guibg=#a0b0c0
-hi Folded       guifg=#111111 guibg=#8090a0
-hi IncSearch	guifg=slategrey guibg=khaki
-
-" Specials
-hi Todo         guifg=#e50808 guibg=#520000 gui=bold
-hi Title        guifg=#ffffff gui=bold
-
-" Strings
-hi String       guifg=#ed9d13
-hi Constant     guifg=#ed9d13
-
-" Syntax
-hi Number       guifg=#3677a9
-hi Statement    guifg=#6ab825 gui=bold
-hi Function     guifg=#447fcf
-hi PreProc      guifg=#cd2828 gui=bold
-hi Comment      guifg=#999999 gui=italic
-hi Type         guifg=#bbbbbb gui=bold
-
-" Diff
-hi DiffAdd	    ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	    cterm=bold ctermbg=1
-
diff --git a/colors/nature.vim b/colors/nature.vim
deleted file mode 100755
index beeac2c..0000000
--- a/colors/nature.vim
+++ /dev/null
@@ -1,36 +0,0 @@
-" Vim color file
-" Maintainer: Mihai Popescu <elfakyn@gmail.com>
-" Last Change: 2 March 2010 - v0.4
-
-set background=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let g:colors_name="nature"
-hi Normal       ctermfg=LightGray  ctermbg=Black      guifg=#D3D7CF    guibg=#000000
-hi NonText      ctermfg=DarkGray   ctermbg=Black      guifg=#555753    guibg=#000000
-hi Comment      ctermfg=DarkGray   ctermbg=Black      guifg=#555753    guibg=#000000 gui=italic
-hi Constant     ctermfg=DarkCyan   ctermbg=Black      guifg=#06989A    guibg=#000000
-hi Character    ctermfg=DarkBlue   ctermbg=Black      guifg=#3465A4    guibg=#000000
-hi Boolean      ctermfg=DarkBlue   ctermbg=Black      guifg=#3465A4    guibg=#000000
-hi Identifier   ctermfg=Cyan       ctermbg=Black      guifg=#34E2E2    guibg=#000000
-hi Statement    ctermfg=Green      ctermbg=Black      guifg=#8AE234    guibg=#000000 cterm=bold term=bold gui=bold
-hi Repeat       ctermfg=Yellow     ctermbg=Black      guifg=#FCE94F    guibg=#000000 cterm=bold term=bold gui=bold
-hi PreProc      ctermfg=White      ctermbg=Black      guifg=#EEEEEC    guibg=#000000 cterm=bold term=bold gui=bold
-hi Type         ctermfg=DarkGreen  ctermbg=Black      guifg=#4E9A06    guibg=#000000 cterm=none term=bold
-hi Special      ctermfg=Blue       ctermbg=Black      guifg=#729FCF    guibg=#000000
-hi Underlined   ctermfg=Magenta    ctermbg=Black      guifg=#AD7FA8    guibg=#000000 cterm=bold,underline gui=bold,underline
-hi Error        ctermfg=White      ctermbg=Red        guifg=#FFFFFF    guibg=#FF00A0 cterm=bold,underline term=bold gui=bold,underline
-" *PINK* is more obvious to the eye than red. It is also somewhat annoying - but that's the point, isn't it? ;-)
-hi Visual       ctermfg=White      ctermbg=DarkGray   guifg=#EEEEEC    guibg=#555753
-hi ErrorMsg     ctermfg=Red        ctermbg=Black      guifg=#FF0000    guibg=#000000 cterm=bold term=bold gui=bold
-hi WarningMsg   ctermfg=Yellow     ctermbg=Black      guifg=#FCE94F    guibg=#000000
-hi Title        ctermfg=White      ctermbg=DarkCyan   guifg=#EEEEEC    guibg=#06989A
-hi VertSplit    ctermfg=White      ctermbg=Black      guifg=#EEEEEC    guibg=#000000
-hi Directory    ctermfg=Cyan       ctermbg=DarkBlue   guifg=#34E2E2    guibg=#3465A4
-hi Cursor       ctermfg=White      ctermbg=White      guifg=#000000    guibg=#EEEEEC
-hi StatusLine   ctermfg=White      ctermbg=Black      guifg=#EEEEEC    guibg=#000000 cterm=bold,underline term=bold gui=bold,underline
-hi StatusLineNC ctermfg=Gray       ctermbg=Black      guifg=#D3D7CF    guibg=#000000 cterm=bold,underline term=bold gui=bold,underline
-hi LineNr       ctermfg=DarkYellow ctermbg=Black      guifg=#EDDE5C    guibg=#000000 cterm=none term=bold
diff --git a/colors/navajo-night.vim b/colors/navajo-night.vim
deleted file mode 100755
index f0c27f0..0000000
--- a/colors/navajo-night.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" Vim colour file
-" Maintainer: Matthew Hawkins <matt@mh.dropbear.id.au>
-" Last Change:	Mon, 22 Apr 2002 15:28:04 +1000
-" URI: http://mh.dropbear.id.au/vim/navajo-night.png
-"
-" This colour scheme uses a "navajo-black" background
-" I have added colours for the statusbar and for spell checking 
-" as taken from Cream (http://cream.sf.net/) 
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "navajo-night"
-
-" This is the list of colour changes from Navajo that
-" weren't a simple mathematical subtraction from 0xffffff
-" DarkBlue -> #ffff74
-" DarkRed -> #74ffff 
-" DarkGreen -> #ff9bff 
-" DarkCyan -> #ff7474 
-" DarkMagenta -> #74ff74 
-" DarkYellow -> #7474ff 
-" DarkGray -> #565656 
-" Blue -> Yellow
-" Red -> Cyan 
-" Yellow -> Blue 
-" Gray -> #414141 
-" Brown -> #5ad5d5 
-" #ff8060 -> #007f9f 
-" #f6e8d0 -> #09172f 
-" #edb5cd -> #124a32 
-" #c0c0c0 -> #3f3f3f 
-" #907050 -> #6f8faf 
-" #808080 -> #7f7f7f
-" #707070 -> #8f8f8f
-" SeaGreen -> #d174a8 
-" LightRed (assuming #ee9090) -> #116f6f 
-" LightBlue -> #522719 
-
-hi Normal ctermfg=White guifg=White guibg=#35536f
-
-hi SpecialKey term=bold ctermfg=darkblue guifg=Yellow
-hi NonText term=bold ctermfg=darkblue cterm=bold gui=bold guifg=#7f7f7f
-hi Directory term=bold ctermfg=darkblue guifg=Yellow
-hi ErrorMsg term=standout ctermfg=grey ctermbg=darkred cterm=bold gui=bold guifg=Black guibg=Cyan
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi Search term=reverse ctermbg=White ctermfg=Black cterm=reverse guibg=Black guifg=Yellow
-hi MoreMsg term=bold ctermfg=green gui=bold guifg=#d174a8
-hi ModeMsg term=bold cterm=bold gui=bold
-hi LineNr term=underline ctermfg=darkcyan ctermbg=grey guibg=#7f7f7f gui=bold guifg=White
-hi Question term=standout ctermfg=darkgreen gui=bold guifg=#d174a8
-hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold guifg=Black guibg=White
-hi StatusLineNC term=reverse cterm=reverse gui=bold guifg=#116f6f guibg=#8f8f8f
-hi VertSplit term=reverse cterm=reverse gui=bold guifg=Black guibg=#8f8f8f
-hi Title term=bold ctermfg=green gui=bold guifg=#74ff74
-"+++ Cream:
-"hi Visual term=reverse cterm=reverse gui=reverse guifg=#3f3f3f guibg=White
-"+++
-hi VisualNOS term=bold,underline cterm=bold,underline gui=reverse guifg=#414141 guibg=Black
-hi WarningMsg term=standout ctermfg=darkred gui=bold guifg=Cyan
-hi WildMenu term=standout ctermfg=White ctermbg=darkyellow guifg=White guibg=Blue
-hi Folded term=standout ctermfg=darkblue ctermbg=grey guifg=White guibg=NONE guifg=#afcfef
-hi FoldColumn term=standout ctermfg=darkblue ctermbg=grey guifg=#ffff74 guibg=#3f3f3f
-hi DiffAdd term=bold ctermbg=darkblue guibg=Black
-hi DiffChange term=bold ctermbg=darkmagenta guibg=#124a32
-hi DiffDelete term=bold ctermfg=darkblue ctermbg=blue cterm=bold gui=bold guifg=#522719 guibg=#09172f
-hi DiffText term=reverse ctermbg=darkblue cterm=bold gui=bold guibg=#007f9f
-hi Cursor gui=reverse guifg=#bfbfef guibg=Black
-hi lCursor guifg=fg guibg=bg
-hi Match term=bold,reverse ctermbg=Blue ctermfg=Yellow cterm=bold,reverse gui=bold,reverse guifg=Blue guibg=Yellow
-
-
-" Colours for syntax highlighting
-hi Comment term=bold ctermfg=darkblue guifg=#e7e77f
-hi Constant term=underline ctermfg=darkred guifg=#3fffa7
-hi Special term=bold ctermfg=darkgreen guifg=#bfbfef
-hi Identifier term=underline ctermfg=darkcyan cterm=NONE guifg=#ef9f9f
-hi Statement term=bold ctermfg=darkred cterm=bold gui=bold guifg=#5ad5d5
-hi PreProc term=underline ctermfg=darkmagenta guifg=#74ff74
-hi Type term=underline ctermfg=green gui=bold guifg=#d174a8
-hi Ignore ctermfg=grey cterm=bold guifg=bg
-
-hi Error term=reverse ctermfg=grey ctermbg=darkred cterm=bold gui=bold guifg=Black guibg=Cyan
-hi Todo term=standout ctermfg=darkblue ctermbg=Blue guifg=Yellow guibg=Blue
-
-"+++ Cream: statusbar
-" Colours for statusbar
-"hi User1        gui=bold guifg=#565656  guibg=#0c0c0c
-"hi User2        gui=bold guifg=White     guibg=#0c0c0c
-"hi User3        gui=bold guifg=Yellow      guibg=#0c0c0c
-"hi User4        gui=bold guifg=Cyan       guibg=#0c0c0c
-highlight User1        gui=bold guifg=#999933  guibg=#45637f
-highlight User2        gui=bold guifg=#e7e77f     guibg=#45637f
-highlight User3        gui=bold guifg=Black      guibg=#45637f
-highlight User4        gui=bold guifg=#33cc99       guibg=#45637f
-"+++
-
-"+++ Cream: selection
-highlight Visual    gui=bold    guifg=Black guibg=#aacc77
-"+++
-
-"+++ Cream: bookmarks
-highlight Cream_ShowMarksHL ctermfg=blue ctermbg=lightblue cterm=bold guifg=Black guibg=#aacc77 gui=bold
-"+++
-
-"+++ Cream: spell check
-" Colour misspelt words
-"hi BadWord ctermfg=White ctermbg=darkred cterm=bold guifg=Yellow guibg=#522719 gui=bold
-" mathematically correct:
-"highlight BadWord ctermfg=black ctermbg=lightblue gui=NONE guifg=White guibg=#003333
-" adjusted:
-highlight BadWord ctermfg=black ctermbg=lightblue gui=NONE guifg=#ff9999 guibg=#003333
-"+++
-
-
diff --git a/colors/navajo.vim b/colors/navajo.vim
deleted file mode 100755
index e7eebe7..0000000
--- a/colors/navajo.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-" Vim color file
-" Maintainer: R. Edward Ralston <eralston@techsan.org>
-" Last Change: 2002-01-24 09:56:48
-" URI: http://eralston.tripod.com/navajo.png
-"
-" This color scheme uses a "navajo-white" background
-"
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "navajo"
-
-" looks good on Linux
-"hi Normal ctermfg=Black guifg=Black guibg=#b39674
-"hi Normal ctermfg=Black guifg=Black guibg=NavajoWhite3
-
-" slightly brighter for w32
-hi Normal ctermfg=Black guifg=Black guibg=#ba9c80
-
-hi SpecialKey term=bold ctermfg=DarkBlue guifg=Blue
-hi NonText term=bold ctermfg=DarkBlue cterm=bold gui=bold guifg=#808080
-hi Directory term=bold ctermfg=DarkBlue guifg=Blue
-hi ErrorMsg term=standout ctermfg=Gray ctermbg=DarkRed cterm=bold gui=bold guifg=White guibg=Red
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi Search term=reverse ctermbg=Black ctermfg=White cterm=reverse guibg=White
-hi MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi ModeMsg term=bold cterm=bold gui=bold
-hi LineNr term=underline ctermfg=DarkCyan ctermbg=Gray guibg=#808080 gui=bold guifg=black
-hi Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi StatusLine term=bold,reverse cterm=bold,reverse gui=bold guifg=White guibg=Black
-hi StatusLineNC term=reverse cterm=reverse gui=bold guifg=LightRed guibg=#707070
-hi VertSplit term=reverse cterm=reverse gui=bold guifg=White guibg=#707070
-hi Title term=bold ctermfg=DarkMagenta gui=bold guifg=DarkMagenta
-hi Visual term=reverse cterm=reverse gui=reverse guifg=#c0c0c0 guibg=black
-hi VisualNOS term=bold,underline cterm=bold,underline gui=reverse guifg=Grey guibg=white
-hi WarningMsg term=standout ctermfg=DarkRed gui=bold guifg=Red
-hi WildMenu term=standout ctermfg=Black ctermbg=DarkYellow guifg=Black guibg=Yellow
-hi Folded term=standout ctermfg=DarkBlue ctermbg=Gray guifg=Black guibg=NONE guifg=#907050
-hi FoldColumn term=standout ctermfg=DarkBlue ctermbg=Gray guifg=DarkBlue guibg=#c0c0c0
-hi DiffAdd term=bold ctermbg=DarkBlue guibg=White
-hi DiffChange term=bold ctermbg=DarkMagenta guibg=#edb5cd
-hi DiffDelete term=bold ctermfg=DarkBlue ctermbg=6 cterm=bold gui=bold guifg=LightBlue guibg=#f6e8d0
-hi DiffText term=reverse ctermbg=DarkRed cterm=bold gui=bold guibg=#ff8060
-hi Cursor gui=reverse guifg=#404010 guibg=white
-hi lCursor guifg=bg guibg=fg
-hi Match term=bold,reverse ctermbg=Yellow ctermfg=Blue cterm=bold,reverse gui=bold,reverse guifg=yellow guibg=blue
-
-
-" Colors for syntax highlighting
-hi Comment term=bold ctermfg=DarkBlue guifg=#181880
-hi Constant term=underline ctermfg=DarkRed guifg=#c00058
-hi Special term=bold ctermfg=DarkMagenta guifg=#404010
-hi Identifier term=underline ctermfg=DarkCyan cterm=NONE guifg=#106060
-hi Statement term=bold ctermfg=DarkRed cterm=bold gui=bold guifg=Brown
-hi PreProc term=underline ctermfg=DarkMagenta guifg=DarkMagenta
-hi Type term=underline ctermfg=DarkGreen gui=bold guifg=SeaGreen
-hi Ignore ctermfg=Gray cterm=bold guifg=bg
-hi Error term=reverse ctermfg=Gray ctermbg=DarkRed cterm=bold gui=bold guifg=White guibg=Red
-hi Todo term=standout ctermfg=DarkBlue ctermbg=Yellow guifg=Blue guibg=Yellow
-
-" vim:set list et:
diff --git a/colors/nazca.vim b/colors/nazca.vim
deleted file mode 100755
index 2936a8e..0000000
--- a/colors/nazca.vim
+++ /dev/null
@@ -1,252 +0,0 @@
-""""""""""""""""""""""""
-"  Nazca Color Scheme  "
-""""""""""""""""""""""""
-" By: Jose Elera Campana - https://github.com/jelera
-" Based: on ir_black color scheme More at: http://blog.infinitered.com/entries/show/8
-" More about Nazca here : http://en.wikipedia.org/wiki/Nazca
-"
-" Tweak for Web Development, feel free to modified and share it.
-"
-" Support for 256 Color Terminal and Full Color graphical Vim
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" ********************************************************************************
-" Standard colors used in all ir_black themes:
-" Note, x:x:x are RGB values
-"
-"  normal: #f6f3e8
-" 
-"  string: #A8FF60  168:255:96                   
-"    string inner (punc, code, etc): #00A0A0  0:160:160
-"  number: #FF73FD  255:115:253                 
-"  comments: #7C7C7C  124:124:124
-"  keywords: #96CBFE  150:203:254             
-"  operators: white
-"  class: #FFFFB6  255:255:182
-"  method declaration name: #FFD2A7  255:210:167
-"  regular expression: #E9C062  233:192:98
-"    regexp alternate: #FF8000  255:128:0
-"    regexp alternate 2: #B18A3D  177:138:61
-"  variable: #C6C5FE  198:197:254
-"  
-" Misc colors:
-"  red color (used for whatever): #FF6C60   255:108:96 
-"     light red: #FFB6B0   255:182:176
-"
-"  brown: #E18964  good for special
-"
-"  lightpurpleish: #FFCCFF
-" 
-" Interface colors:
-"  background color: black
-"  cursor (where underscore is used): #FFA560  255:165:96
-"  cursor (where block is used): white
-"  visual selection: #1D1E2C  
-"  current line: #151515  21:21:21
-"  search selection: #07281C  7:40:28
-"  line number: #3D3D3D  61:61:61
-
-
-" ********************************************************************************
-" The following are the preferred 16 colors for your terminal
-"           Colors      Bright Colors
-" Black     #4E4E4E     #7C7C7C
-" Red       #FF6C60     #FFB6B0
-" Green     #A8FF60     #CEFFAB
-" Yellow    #FFFFB6     #FFFFCB
-" Blue      #96CBFE     #FFFFCB
-" Magenta   #FF73FD     #FF9CFE
-" Cyan      #C6C5FE     #DFDFFE
-" White     #EEEEEE     #FFFFFF
-
-
-" ********************************************************************************
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "nazca"
-
-
-"hi Example         guifg=NONE        guibg=NONE        gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-
-" General colors
-hi  Normal       guifg=#f6f3e8 guibg=#161617 gui=NONE      ctermfg=7     ctermbg=233  cterm=NONE
-hi  NonText      guifg=#505050 guibg=#000000 gui=NONE      ctermfg=239   ctermbg=0    cterm=NONE
-
-hi  Cursor       guifg=#000000 guibg=#f0f000 gui=NONE      ctermfg=0     ctermbg=11   cterm=reverse
-hi  LineNr       guifg=#3D3D3D guibg=#000000 gui=NONE      ctermfg=237   ctermbg=0    cterm=NONE
-
-hi  VertSplit    guifg=#202020 guibg=#202020 gui=NONE      ctermfg=234   ctermbg=234  cterm=NONE
-hi  StatusLine   guifg=#9cffd3 guibg=#202020 gui=NONE      ctermfg=85    ctermbg=234  cterm=NONE
-hi  StatusLineNC guifg=#000000 guibg=#202020 gui=bold      ctermfg=0     ctermbg=234  cterm=BOLD
-
-hi  FoldColumn   guifg=#a0a8b0 guibg=#384048 gui=NONE      ctermfg=248   ctermbg=238  cterm=NONE
-hi  Folded       guifg=#a0a8b0 guibg=#384048 gui=NONE      ctermfg=248   ctermbg=238  cterm=NONE
-hi  Title        guifg=#f6f3e8 guibg=NONE    gui=bold      ctermfg=7     ctermbg=NONE cterm=BOLD
-hi  Visual       guifg=NONE    guibg=#262D51 gui=NONE      ctermfg=NONE  ctermbg=237  cterm=NONE
-
-hi  SpecialKey   guifg=#505050 guibg=#000000 gui=NONE      ctermfg=239   ctermbg=0    term=NONE
-
-hi  WildMenu     guifg=#28882c guibg=#f0f000 gui=NONE      ctermfg=28    ctermbg=11   cterm=NONE
-hi  PmenuSbar    guifg=#000000 guibg=#ffffff gui=NONE      ctermfg=0     ctermbg=15   cterm=NONE
-"hi Ignore       guifg=gray    guibg=#000000 ctermbg=0     gui=NONE      ctermfg=NONE ctermbg=NONE  cterm=NONE
-
-hi  Error        guifg=NONE    guibg=NONE    gui=undercurl guisp=#FF6C60 ctermfg=15   ctermbg=88    cterm=NONE
-hi  ErrorMsg     guifg=#ffffff guibg=#FF6C60 gui=BOLD      ctermfg=15    ctermbg=203  cterm=BOLD
-hi  WarningMsg   guifg=#ffffff guibg=#FF6C60 gui=BOLD      ctermfg=15    ctermbg=203  cterm=BOLD
-
-" Message displayed in lower left, such as --INSERT--
-hi ModeMsg          guifg=#000000  guibg=#C6C5FE gui=BOLD     ctermfg=0 ctermbg=189 cterm=BOLD
-
-if version >= 700 " Vim 7.x specific colors
-  hi CursorLine   guifg=NONE    guibg=#000000 gui=NONE      ctermfg=NONE ctermbg=16  cterm=NONE
-  hi CursorColumn guifg=NONE    guibg=#121212 gui=NONE      ctermfg=NONE ctermbg=233 cterm=BOLD
-  hi MatchParen   guifg=#f6f3e8 guibg=#857b6f gui=BOLD      ctermfg=7    ctermbg=243 cterm=BOLD
-  hi Pmenu        guifg=#f6f3e8 guibg=#444444 gui=NONE      ctermfg=7    ctermbg=238 cterm=NONE
-  hi PmenuSel     guifg=#000000 guibg=#cae682 gui=NONE      ctermfg=0    ctermbg=186 cterm=NONE
-  hi Search       guifg=#000000 guibg=#FFFFB6 gui=underline ctermfg=0    ctermbg=229 cterm=underline
-endif
-
-" Syntax highlighting
-hi Comment     guifg=#7C7C7C guibg=NONE    gui=NONE   ctermfg=8   ctermbg=NONE cterm=NONE
-hi String      guifg=#acff82 guibg=NONE    gui=NONE   ctermfg=156 ctermbg=NONE cterm=NONE
-hi Number      guifg=#FF73FD guibg=NONE    gui=NONE   ctermfg=207 ctermbg=NONE cterm=NONE
-
-hi Keyword     guifg=#96CBFE guibg=NONE    gui=NONE   ctermfg=117 ctermbg=NONE cterm=NONE
-hi PreProc     guifg=#96CBFE guibg=NONE    gui=NONE   ctermfg=117 ctermbg=NONE cterm=NONE
-hi Conditional guifg=#6699CC guibg=NONE    gui=NONE   ctermfg=68  ctermbg=NONE cterm=NONE
-
-hi Todo        guifg=#890a0a guibg=#f2f773 gui=BOLD   ctermfg=88  ctermbg=227  cterm=BOLD
-hi Constant    guifg=#99CC99 guibg=NONE    gui=ITALIC ctermfg=114 ctermbg=NONE cterm=NONE
-
-hi Identifier  guifg=#C6C5FE guibg=NONE    gui=NONE   ctermfg=189 ctermbg=NONE cterm=NONE
-hi Function    guifg=#FFD2A7 guibg=NONE    gui=BOLD   ctermfg=223 ctermbg=NONE cterm=BOLD
-hi Type        guifg=#FFFFB6 guibg=NONE    gui=BOLD   ctermfg=229 ctermbg=NONE cterm=BOLD
-hi Statement   guifg=#6699CC guibg=NONE    gui=NONE   ctermfg=68  ctermbg=NONE cterm=NONE
-
-hi Special     guifg=#E18964 guibg=NONE    gui=NONE   ctermfg=173 ctermbg=NONE cterm=NONE
-hi Delimiter   guifg=#00A0A0 guibg=NONE    gui=NONE   ctermfg=37  ctermbg=NONE cterm=NONE
-hi Operator    guifg=#E8AC6F guibg=NONE    gui=NONE   ctermfg=179 ctermbg=NONE cterm=NONE
-
-hi link Character       Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Exception       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 SpecialChar     Special
-hi link SpecialComment  Special
-hi link Debug           Special
-
-" Special for Ruby
-hi  rubyRegexp                 guifg=#B18A3D guibg=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE
-hi  rubyRegexpDelimiter        guifg=#FF8000 guibg=NONE gui=NONE ctermfg=208 ctermbg=NONE cterm=NONE
-hi  rubyEscape                 guifg=#ffffff guibg=NONE gui=NONE ctermfg=15  ctermbg=NONE cterm=NONE
-hi  rubyInterpolationDelimiter guifg=#00A0A0 guibg=NONE gui=NONE ctermfg=37  ctermbg=NONE cterm=NONE
-hi  rubyControl                guifg=#6699CC guibg=NONE gui=NONE ctermfg=68  ctermbg=NONE cterm=NONE
-"hi rubyGlobalVariable         guifg=#FFCCFF guibg=NONE gui=NONE ctermfg=225 ctermbg=NONE cterm=NONE
-hi  rubyStringDelimiter        guifg=#336633 guibg=NONE gui=NONE ctermfg=238 ctermbg=NONE cterm=NONE
-"rubyInclude
-"rubySharpBang
-"rubyAccess
-"rubyPredefinedVariable
-"rubyBoolean
-"rubyClassVariable
-"rubyBeginEnd
-"rubyRepeatModifier
-"hi link rubyArrayDelimiter    Special  " [ , , ]
-"rubyCurlyBlock  { , , }
-
-hi link rubyClass             Keyword 
-hi link rubyModule            Keyword 
-hi link rubyKeyword           Keyword 
-hi link rubyOperator          Operator
-hi link rubyIdentifier        Identifier
-hi link rubyInstanceVariable  Identifier
-hi link rubyGlobalVariable    Identifier
-hi link rubyClassVariable     Identifier
-hi link rubyConstant          Type  
-
-
-" Special for Java
-" hi link javaClassDecl    Type
-hi link javaScopeDecl         Identifier 
-hi link javaCommentTitle      javaDocSeeTag 
-hi link javaDocTags           javaDocSeeTag 
-hi link javaDocParam          javaDocSeeTag 
-hi link javaDocSeeTagParam    javaDocSeeTag 
-
-hi  javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=252 ctermbg=NONE cterm=NONE
-hi  javaDocSeeTag guifg=#CCCCCC guibg=NONE gui=NONE ctermfg=252 ctermbg=NONE cterm=NONE
-"hi javaClassDecl guifg=#CCFFCC guibg=NONE gui=NONE ctermfg=194 ctermbg=NONE cterm=NONE
-
-
-" Special for XML
-hi link xmlTag          Keyword 
-hi link xmlTagName      Conditional 
-hi link xmlEndTag       Identifier 
-
-
-" Special for HTML
-hi htmlH1 guifg=#de675c   gui=underline ctermfg=167 cterm=UNDERLINE
-hi htmlLink guifg=#c777ff gui=underline ctermfg=177 cterm=UNDERLINE
-hi link htmlTag         Keyword
-hi link htmlTagName     Conditional 
-hi link htmlEndTag      Identifier 
-hi link htmlH2 htmlH1
-hi link htmlH3 htmlH1
-hi link htmlH4 htmlH1
-
-" Special for CSS
-hi cssTagName guifg=#70a8dd gui=BOLD  ctermfg=74 cterm=BOLD
-hi cssBoxProp guifg=#d0af76  gui=NONE  ctermfg=180 gui=NONE
-hi link cssColorProp cssBoxProp
-hi link cssFontProp cssBoxProp
-hi link cssTextProp cssBoxProp
-hi cssPseudoClassId guifg=#9ccfdd gui=italic ctermfg=152 cterm=NONE
-hi cssIdentifier    guifg=#a2ddb8 gui=italic ctermfg=151 cterm=NONE
-
-" Special for Markdown
-hi markdownUrl guifg=#e48944 ctermfg=173 
-hi markdownCode guifg=#a7bee4   gui=BOLD ctermfg=151 cterm=BOLD
-hi markdownCodeBlock guifg=#c5b1e4 ctermfg=182
-
-" Special for Javascript
-" TODO:  - Add colors to the cterm
-hi javaScriptBrowserObjects       guifg=#DBB6D2      gui=italic    ctermfg=182 cterm=NONE
-
-hi javaScriptDOMObjects           guifg=#DBB6D2      gui=BOLD      ctermfg=182 cterm=BOLD
-hi javaScriptDOMMethods           guifg=#D4FA9B      ctermfg=192
-hi link javaScriptDOMProperties Keyword
-
-hi javaScriptAjaxObjects          guifg=#5d91d3      gui=underline ctermfg=68  cterm=UNDERLINE
-hi javaScriptAjaxMethods          guifg=#6699CC      ctermfg=68
-hi javaScriptAjaxProperties       guifg=#FF9494      ctermfg=210
-
-hi javaScriptFuncName             guifg=#B5E4F7      ctermfg=153
-hi javaScriptHtmlElemProperties   guifg=#FF9494      ctermfg=210
-hi javaScriptEventListenerKeyword guifg=#6699CC      ctermfg=68
-
-hi link javaScriptNumber      Number 
-hi link javaScriptPropietaryObjects javaScriptAjaxObjects
-
-" Special for Python
-"hi  link pythonEscape         Keyword      
-
-
-" Special for CSharp
-hi  link csXmlTag             Keyword      
-
-" Special for PHP
-hi phpDefine  guifg=#ffc795    gui=BOLD ctermfg=209 cterm=BOLD
diff --git a/colors/nedit.vim b/colors/nedit.vim
deleted file mode 100755
index 652891f..0000000
--- a/colors/nedit.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Vim color file
-" Maintainer:   Vladimir Vrzic <random@bsd.org.yu>
-" Last Change:  28. june 2003.
-" URL:          http://galeb.etf.bg.ac.yu/~random/pub/vim/
-
-set background=light	
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="nedit"
-
-hi Normal	guifg=Black		guibg=grey90
-
-hi Comment		gui=italic		guifg=gray20		guibg=NONE
-hi Constant		gui=NONE		guifg=darkGreen			guibg=NONE
-hi Identifier	gui=bold		guifg=red		guibg=NONE
-hi Statement 	gui=bold		guifg=black			guibg=NONE
-hi PreProc		gui=NONE		guifg=RoyalBlue4	guibg=NONE	
-hi Type			gui=bold		guifg=brown		guibg=NONE
-hi Special		gui=NONE		guifg=darkGreen	guibg=NONE
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-"hi Todo		
-
diff --git a/colors/nedit2.vim b/colors/nedit2.vim
deleted file mode 100755
index 54811f0..0000000
--- a/colors/nedit2.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-" Vim color file based on nedit by Vladimir Vrzic <random@bsd.org.yu>
-" Maintainer:   KraL <kral@paranoici.org>
-" Last Change:  Friday 13 february 2004.
-
-set background=light	
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="nedit2"
-
-hi Normal									guifg=Black				guibg=grey90
-
-hi Cursor									guifg=white				guibg=black
-hi CursorIM								guifg=black				guibg=black
-
-hi Comment		gui=italic	guifg=Purple			guibg=NONE
-hi Constant		gui=NONE		guifg=blue				guibg=NONE
-hi Identifier	gui=bold		guifg=red					guibg=NONE
-hi Statement 	gui=bold		guifg=black				guibg=NONE
-hi PreProc		gui=NONE		guifg=RoyalBlue4	guibg=NONE	
-hi Type				gui=bold		guifg=brown				guibg=NONE
-hi String			gui=NONE		guifg=RoyalBlue		guibg=NONE
-hi Special		gui=bold		guifg=Magenta3		guibg=NONE
-"hi Underlined	
-"hi Ignore		
-"hi Error			gui=NONE		guifg=Red					guibg=Linen
-"hi Todo		
-
diff --git a/colors/neon.vim b/colors/neon.vim
deleted file mode 100755
index d0ba309..0000000
--- a/colors/neon.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/25 Fri 16:23.
-"     version: 1.2
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "neon"
-
-hi Normal       guifg=#f0f0f0 guibg=#303030
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#80ffff guibg=#0060c0
-hi Search       gui=NONE guifg=#ffffa8 guibg=#808000
-" hi Search       gui=NONE guifg=#b0ffb0 guibg=#008000
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffa0ff guibg=NONE
-hi WarningMsg   gui=BOLD guifg=#ffa0ff guibg=NONE
-hi ModeMsg      gui=BOLD guifg=#a0d0ff guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#70ffc0 guibg=#8040ff
-hi Question     gui=BOLD guifg=#e8e800 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#c4c4c4
-hi StatusLineNC gui=NONE guifg=#707070 guibg=#c4c4c4
-hi VertSplit    gui=NONE guifg=#707070 guibg=#c4c4c4
-hi WildMenu     gui=NONE guifg=#000000 guibg=#ff80c0
-
-" Diff
-hi DiffText     gui=NONE guifg=#ff78f0 guibg=#a02860
-hi DiffChange   gui=NONE guifg=#e03870 guibg=#601830
-hi DiffDelete   gui=NONE guifg=#a0d0ff guibg=#0020a0
-hi DiffAdd      gui=NONE guifg=#a0d0ff guibg=#0020a0
-
-" Cursor
-hi Cursor       gui=NONE guifg=#70ffc0 guibg=#8040ff
-hi lCursor      gui=NONE guifg=#ffffff guibg=#8800ff
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#8800ff
-
-" Fold
-hi Folded       gui=NONE guifg=#40f0f0 guibg=#006090
-hi FoldColumn   gui=NONE guifg=#40c0ff guibg=#404040
-
-" Other
-hi Directory    gui=NONE guifg=#c8c8ff guibg=NONE
-hi LineNr       gui=NONE guifg=#707070 guibg=NONE
-hi NonText      gui=BOLD guifg=#d84070 guibg=#383838
-hi SpecialKey   gui=BOLD guifg=#8888ff guibg=NONE
-hi Title        gui=BOLD guifg=fg      guibg=NONE
-hi Visual       gui=NONE guifg=#b0ffb0 guibg=#008000
-hi VisualNOS    gui=NONE guifg=#ffe8c8 guibg=#c06800
-
-" Syntax group
-hi Comment      gui=NONE guifg=#c0c0c0 guibg=NONE
-hi Constant     gui=NONE guifg=#92d4ff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#8000ff
-hi Identifier   gui=NONE guifg=#40f8f8 guibg=NONE
-hi Ignore       gui=NONE guifg=bg      guibg=NONE
-hi PreProc      gui=NONE guifg=#ffa8ff guibg=NONE
-hi Special      gui=NONE guifg=#ffc890 guibg=NONE
-hi Statement    gui=NONE guifg=#dcdc78 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#ff80d0 guibg=NONE
-hi Type         gui=NONE guifg=#60f0a8 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
diff --git a/colors/neutron.vim b/colors/neutron.vim
deleted file mode 100755
index 2d68f84..0000000
--- a/colors/neutron.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let g:colors_name="neutron"
-
-hi Cursor       guibg=#404040 guifg=#a0a0a0
-hi CursorColumn guibg=#e0e0e0 guifg=#202020
-hi CursorLine   guibg=#e0e0e0 guifg=#202020
-hi NonText      guibg=#d0d0d0 guifg=#606060 gui=none
-hi Visual       guibg=#fffac8 guifg=#404040 gui=none
-hi Folded       guibg=#e8e5d0 guifg=#606060 gui=none
-hi TabLineFill  guibg=#d0d0d0 guifg=#606060 gui=none
-hi SpecialKey   guibg=#e8e8e8 guifg=#a0a0a0 gui=none
-hi Search       guibg=#808080 guifg=#ffffff gui=bold
-hi ModeMsg      guibg=#f2efd5 guifg=#304050 gui=bold
-hi MoreMsg      guibg=#f2efd5 guifg=#304050 gui=bold
-hi StatusLine   guibg=#808080 guifg=#f2efd5 gui=bold
-hi StatusLineNC guibg=#707070 guifg=#d0d0d0 gui=none
-hi VertSplit    guibg=#707070 guifg=#909090 gui=none
-hi LineNr       guibg=#e8e5d0 guifg=#808080 gui=none
-
-hi DiffAdd      guibg=#a67429 guifg=#ffcc7f
-hi DiffDelete   guibg=#a62910 guifg=#ff7f50
-hi DiffChange   guibg=#425c78 guifg=#7fbdff
-hi DiffText     guibg=#4e9a06 guifg=#8ae234
-hi SpellBad     gui=undercurl guisp=#f02020
-
-
-hi Title          guibg=#f2efd5 guifg=#202020 gui=underline
-hi Normal         guibg=#f2efd5 guifg=#404040 gui=none
-
-hi Comment        guibg=#f2efd5 guifg=#bbbbbb gui=none
-
-hi Constant       guibg=#f2efd5 guifg=#555321 gui=none
-hi String         guibg=#f2efd5 guifg=#a07060 gui=none
-hi Character      guibg=#f2efd5 guifg=#bb6245 gui=none
-hi Number         guibg=#f2efd5 guifg=#ba7222 gui=none
-hi Boolean        guibg=#f2efd5 guifg=#d4552c gui=none
-hi Float          guibg=#f2efd5 guifg=#e87a00 gui=none
-
-hi Identifier     guibg=#f2efd5 guifg=#546c48 gui=none
-hi Function       guibg=#f2efd5 guifg=#6d7181 gui=none
-
-hi Statement      guibg=#f2efd5 guifg=#606060 gui=none
-hi Conditional    guibg=#f2efd5 guifg=#81ac3a gui=none
-hi Repeat         guibg=#f2efd5 guifg=#aab844 gui=none
-hi Label          guibg=#f2efd5 guifg=#969664 gui=underline
-hi Operator       guibg=#f2efd5 guifg=#a79a39 gui=none
-hi Keyword        guibg=#f2efd5 guifg=#408077 gui=none
-hi Exception      guibg=#f2efd5 guifg=#a03020 gui=none
-
-hi PreProc        guibg=#f2efd5 guifg=#7d64af gui=none
-hi Include        guibg=#f2efd5 guifg=#c5a2d8 gui=none
-hi Define         guibg=#f2efd5 guifg=#605080 gui=none
-hi Macro          guibg=#f2efd5 guifg=#79519d gui=none
-hi PreCondit      guibg=#f2efd5 guifg=#75698c gui=none
-
-hi Type           guibg=#f2efd5 guifg=#7d95ad gui=none
-hi StorageClass   guibg=#f2efd5 guifg=#678b5b gui=none
-hi Structure      guibg=#f2efd5 guifg=#5d6da3 gui=none
-hi Typedef        guibg=#f2efd5 guifg=#5080b0 gui=none
-
-hi Special        guibg=#f2efd5 guifg=#408077 gui=none
-hi SpecialChar    guibg=#f2efd5 guifg=#603020 gui=none
-hi Tag            guibg=#f2efd5 guifg=#a6a679 gui=underline
-hi Delimiter      guibg=#f2efd5 guifg=#808080 gui=none
-hi SpecialComment guibg=#f2efd5 guifg=#caacac gui=none
-hi Debug          guibg=#f2efd5 guifg=#908080 gui=none
-
-hi Underlined     guibg=#f2efd5 guifg=#202020 gui=underline
-
-hi Error          guibg=#faf5cd guifg=#c83c28 gui=none
-
-hi ToDo           guibg=#f2efd5 guifg=#404040 gui=none
-
-
diff --git a/colors/neverness.vim b/colors/neverness.vim
deleted file mode 100755
index 450ea47..0000000
--- a/colors/neverness.vim
+++ /dev/null
@@ -1,141 +0,0 @@
-" NEVERNESS colour scheme
-" Author:      Yann GOLANSKI
-" Version:     1.2
-" Last Change: 13 Jan 2010
-" url http://web.njit.edu/~kevin/rgb.txt.html
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'neverness'
-
-" Comments: grey
-hi Comment        ctermfg=DarkCyan     guifg=#848484 guibg=#000000 gui=none 
-
-" Constants: SkyBlue
-hi Boolean        ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-hi Character      ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-hi Constant       ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-hi Float          ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-hi Number         ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-hi String         ctermfg=Cyan          guifg=#87ceeb guibg=#000000 gui=none
-
-" Identifier: SteelBlue1
-hi Identifier     ctermfg=LightCyan     guifg=#63b8ff guibg=#000000 gui=none
-hi Function       ctermfg=LightCyan     guifg=#63b8ff guibg=#000000 gui=none
-
-" Statement: SteelBlue
-hi Conditional    ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Exception      ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Keyword        ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Label          ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Operator       ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Repeat         ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-hi Statement      ctermfg=DarkBlue      guifg=#4682b4 guibg=#000000 gui=bold
-
-" PreProc: DarkOrchid1
-hi PreProc        ctermfg=DarkGreen     guifg=#bf3eff guibg=#000000 gui=none
-hi Include        ctermfg=DarkGreen     guifg=#bf3eff guibg=#000000 gui=none
-hi Define         ctermfg=DarkGreen     guifg=#bf3eff guibg=#000000 gui=none
-hi Macro          ctermfg=DarkGreen     guifg=#bf3eff guibg=#000000 gui=none
-hi PreCondit      ctermfg=DarkGreen     guifg=#bf3eff guibg=#000000 gui=none
-
-" Type: orchid2
-hi Type           ctermfg=DarkGreen     guifg=#ee7ae9 guibg=#000000 gui=bold
-hi StorageClass   ctermfg=DarkGreen     guifg=#ee7ae9 guibg=#000000 gui=bold
-hi Structure      ctermfg=DarkGreen     guifg=#ee7ae9 guibg=#000000 gui=bold
-hi Typedef        ctermfg=DarkGreen     guifg=#ee7ae9 guibg=#000000 gui=bold
-
-" Special: cyan2
-hi Special        ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-hi SpecialChar    ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-hi Tag            ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-hi SpecialComment ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-hi Delimiter      ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-hi Debug          ctermfg=DarkGray      guifg=#00eeee guibg=#000000 gui=none
-
-" Underline: NavajoWhite2
-hi Underlined     ctermfg=LightGray     guifg=#eecfa1 guibg=#000000 gui=none
-
-" Ignore: black
-hi Ignore         ctermfg=LightGray     guifg=#ffffff guibg=#000000 gui=none
-
-" Error: red
-hi Error          ctermfg=LightGray     guifg=#ff0000 guibg=#232323 gui=bold
-
-" To do: SlateGray3
-hi Todo           ctermfg=LightMagenta     guifg=#9fb6cd guibg=#232323 gui=none
-
-" Spelling...
-hi SpellBad    ctermfg=DarkRed      ctermbg=black
-hi SpellCap    ctermfg=DarkBlue     ctermbg=black
-hi SpellRare   ctermfg=DarkYellow   ctermbg=black
-hi SpellLocal  ctermfg=DarkGreen    ctermbg=black
-
-" "set cursorline"  and "set cursorcolumn" options.
-hi lCursor        guifg=#43705a guibg=#e6fff3 gui=none
-hi CursorColumn   guibg=#222222 gui=none
-hi CursorLine     guibg=#222222 gui=none
-
-" Line number.
-"hi LineNr         ctermfg=DarkMagenta     guifg=#4682b4 guibg=#000000 gui=bold
-hi LineNr         ctermfg=DarkMagenta     guifg=#2b506e guibg=#000000 gui=none
-
-" Normal colour: just white thank you.
-hi Normal         guifg=#ffffff guibg=#000000 gui=none
-
-" Others:  These are "highlight-groups" and "highlight-default" in help section.
-hi Cursor         guifg=#43705a guibg=#e6fff3 gui=none
-hi DiffAdd        guifg=#e6fff3 guibg=#43705a gui=bold
-hi DiffChange     guifg=#e6fff3 guibg=#43705a gui=none
-hi DiffDelete     guifg=#e6fff3 guibg=#43705a gui=none
-hi DiffText       guifg=#000000 guibg=#e6fff3 gui=bold
-hi Directory      guifg=#e6fff3 guibg=#000000 gui=none
-hi ErrorMsg       guifg=#e6fff3 guibg=#61a181 gui=bold
-hi FoldColumn     guifg=#9bcfb5 guibg=#43705a gui=bold
-hi Folded         guifg=#9bcfb5 guibg=#43705a gui=bold
-hi IncSearch      guifg=#1d3026 guibg=#61a181 gui=bold
-hi ModeMsg        guifg=#4EEE94 guibg=#000000 gui=bold
-hi MoreMsg        guifg=#4EEE94 guibg=#000000 gui=bold
-hi NonText        guifg=#c0c0c0 guibg=#000000 gui=bold
-hi Question       guifg=#9bcfb5 guibg=#000000 gui=bold
-hi Search         guifg=#1d3026 guibg=#61a181 gui=bold
-hi SpecialKey     guifg=#9bcfb5 guibg=#000000 gui=none
-"hi StatusLine     guifg=#e6fff3 guibg=#61a181 gui=bold
-"hi StatusLineNC   guifg=#1d3026 guibg=#61a181 gui=bold
-hi StatusLine     guifg=#4EEE94 guibg=#333333 gui=none
-hi StatusLineNC   guifg=#4EEE94 guibg=#222222 gui=none
-hi Title          guifg=#e6fff3 guibg=#1d3026 gui=bold
-hi VertSplit      guifg=#61a181 guibg=#61a181 gui=none
-hi Visual         guifg=#e6fff3 guibg=#61a181 gui=none
-hi VisualNOS      guifg=#9bcfb5 guibg=#000000 gui=none
-hi WarningMsg     guifg=#BF3EFF guibg=#000000 gui=bold
-hi WildMenu       guifg=#43705a guibg=#e6fff3 gui=none
-
-" OTL
-hi normal guifg=white guibg=black	ctermfg=white ctermbg=black
-hi VertSplit guifg=white guibg=black	ctermfg=white ctermbg=black
-hi Folded guifg=darkcyan guibg=bg	ctermfg=cyan ctermbg=black
-hi FoldColumn guifg=darkcyan guibg=bg	ctermfg=cyan ctermbg=black
-
-hi def OL0 ctermfg=1 cterm=bold gui=bold guifg=#36648B term=reverse
-hi def OL1 ctermfg=4 cterm=bold gui=bold guifg=#4682B4 term=reverse
-hi def OL2 ctermfg=2 cterm=bold gui=bold guifg=#4F94CD term=reverse
-hi def OL3 ctermfg=3 cterm=bold gui=bold guifg=#5CACEE term=reverse
-hi def OL4 ctermfg=5 cterm=bold gui=bold guifg=#63B8FF term=reverse
-hi def OL5 ctermfg=6 cterm=bold gui=bold guifg=#708090 term=reverse
-hi def OL6 ctermfg=1 cterm=bold gui=bold guifg=#6C7B8B term=reverse
-hi def OL7 ctermfg=4 cterm=bold gui=bold guifg=#9FB6CD term=reverse
-hi def OL8 ctermfg=2 cterm=bold gui=bold guifg=#B9D3EE term=reverse
-hi def OL9 ctermfg=3 cterm=bold gui=bold guifg=#C6E2FF term=reverse
-
-
-" PMenu from Sam Grönblom <sgronblo@gmail.com>
-hi PmenuSel    ctermfg=Black ctermbg=Cyan      guifg=#000000 guibg=#87ceeb gui=none
-hi Pmenu       ctermfg=White ctermbg=DarkBlue  guifg=#000000 guibg=#4682b4 gui=none
-hi PmenuSbar   ctermfg=White ctermbg=LightCyan guifg=#ffffff guibg=#848484 gui=none
-hi PmenuThumb  ctermfg=White ctermbg=DarkGreen guifg=#ffffff guibg=#87ceeb gui=none
-
diff --git a/colors/nevfn.vim b/colors/nevfn.vim
deleted file mode 100755
index d4b03eb..0000000
--- a/colors/nevfn.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" Vim colorscheme: nevfn
-" Copyright (C) 2010 kana <http://whileimautomaton.net/>
-
-  " :colorscheme is preferred for readability, but it cannot be nested.
-  " See also load_colors() in Vim source for the details.
-runtime colors/desert.vim
-
-let g:colors_name = 'nevfn'
-
-
-
-
-highlight NonText       guifg=#3333cc guibg=#111111 gui=NONE
-highlight Normal        guifg=#cccccc guibg=#000000 gui=NONE
-
-highlight Cursor        guifg=#000000 guibg=#99ff99 gui=NONE
-highlight CursorLine    guifg=NONE    guibg=#222222 gui=NONE
-highlight CursorColumn  guifg=NONE    guibg=#222222 gui=NONE
-highlight CursorIM      guifg=#000000 guibg=#cc9999 gui=NONE
-highlight MatchParen    guifg=#000000 guibg=#339933 gui=NONE
-
-highlight IncSearch     guifg=#000000 guibg=#ffcc00 gui=bold
-highlight Search        guifg=#000000 guibg=#cccc00 gui=NONE
-
-highlight LineNr        guifg=#666666 guibg=#111111 gui=NONE
-highlight SignColumn    guifg=#000000 guibg=#111111 gui=NONE
-
-highlight FoldColumn    guifg=#666666 guibg=#111111 gui=NONE
-highlight Folded        guifg=#999999 guibg=#111111 gui=NONE
-
-highlight ErrorMsg      guifg=#ffffff guibg=#cc0000 gui=NONE
-highlight ModeMsg       guifg=#ff9900 guibg=NONE    gui=NONE
-highlight MoreMsg       guifg=#000000 guibg=#66cc66 gui=NONE
-highlight Question      guifg=#66ff33 guibg=#000000 gui=NONE
-highlight WarningMsg    guifg=#ffffff guibg=#cc6600 gui=NONE
-
-highlight Directory     guifg=#00ffff guibg=NONE    gui=NONE
-highlight SpecialKey    guifg=#66ff66 guibg=#000000 gui=NONE
-highlight Title         guifg=#000000 guibg=#cc6633 gui=NONE
-highlight WildMenu      guifg=#000000 guibg=#ffff00 gui=NONE
-
-highlight Visual        guifg=NONE    guibg=#665544 gui=bold
-highlight VisualNOS     guifg=NONE    guibg=#556644 gui=bold
-
-highlight StatusLine    guifg=#000000 guibg=#666666 gui=bold
-highlight StatusLineNC  guifg=#111111 guibg=#666666 gui=NONE
-highlight VertSplit     guifg=#000000 guibg=#666666 gui=NONE
-
-highlight Pmenu         guifg=#cccccc guibg=#111111 gui=NONE
-highlight PmenuSbar     guifg=#000000 guibg=#222222 gui=NONE
-highlight PmenuSel      guifg=#000000 guibg=#ffcc99 gui=NONE
-highlight PmenuThumb    guifg=#000000 guibg=#444444 gui=NONE
-
-highlight TabLine       guifg=#999999 guibg=#111111 gui=underline
-highlight TabLineFill   guifg=#999999 guibg=#111111 gui=underline
-highlight TabLineSel    guifg=#000000 guibg=#cccccc gui=NONE
-
-
-
-
-" highlight DiffAdd       guifg=#000000 guibg=#000000 gui=NONE
-" highlight DiffChange    guifg=#000000 guibg=#000000 gui=NONE
-" highlight DiffDelete    guifg=#000000 guibg=#000000 gui=NONE
-" highlight DiffText      guifg=#000000 guibg=#000000 gui=NONE
-
-" highlight SpellBad      guifg=#000000 guibg=#000000 gui=NONE
-" highlight SpellCap      guifg=#000000 guibg=#000000 gui=NONE
-" highlight SpellLocal    guifg=#000000 guibg=#000000 gui=NONE
-" highlight SpellRare     guifg=#000000 guibg=#000000 gui=NONE
-
-" highlight Menu          guifg=#000000 guibg=#000000 gui=NONE
-" highlight Scrollbar     guifg=#000000 guibg=#000000 gui=NONE
-" highlight Tooltip       guifg=#000000 guibg=#000000 gui=NONE
-
-
-
-
-" __END__
-" vim: foldmethod=marker
diff --git a/colors/newspaper.vim b/colors/newspaper.vim
deleted file mode 100755
index 3556efa..0000000
--- a/colors/newspaper.vim
+++ /dev/null
@@ -1,147 +0,0 @@
-" =============================================================================
-"
-" File:        newspaper.vim
-" Description: Vim color scheme file
-" Maintainer:  Jimmy Paul; Clayton Parker (cterm colors)
-"
-" =============================================================================
-
-set background=light
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "newspaper"
-
-" =============================================================================
-hi Normal       gui=NONE                guifg=#000000           guibg=#dbdbd2
-hi ColorColumn  guifg=NONE              guibg=#EEEEDD
-hi Cursor       guifg=bg                guibg=fg                gui=NONE
-
-hi CursorColumn guifg=NONE              guibg=#FFFDD0           gui=NONE
-hi CursorLine   guifg=NONE              guibg=#a4a061           gui=NONE
-
-hi CursorIM     guifg=bg                guibg=fg                gui=NONE
-hi lCursor      guifg=bg                guibg=fg                gui=NONE
-hi DiffAdd      guifg=NONE              guibg=#6bb269           gui=NONE
-hi DiffChange   guifg=NONE              guibg=#a2c6cc           gui=NONE
-hi DiffDelete   guifg=NONE              guibg=#c15e78           gui=NONE
-hi DiffText     guifg=#000000           guibg=#c7eae9           gui=NONE
-hi Directory    guifg=#1600FF           guibg=bg                gui=NONE
-hi ErrorMsg     guifg=#a22727           guibg=NONE              gui=NONE
-hi FoldColumn   guifg=#40587c           guibg=#dcdda8           gui=bold
-hi Folded       guifg=#40587c           guibg=#b3b3ae           gui=italic
-
-hi IncSearch    guifg=#000000           guibg=#d3d47a           gui=NONE
-hi Search       guifg=#000000           guibg=#d3d47a           gui=NONE
-hi LineNr       guifg=#666677           guibg=#cccfbf           gui=NONE
-hi MatchParen   guifg=#000000           guibg=#949555           gui=bold
-hi ModeMsg      guifg=#ffffff           guibg=#a15c55           gui=bold
-hi MoreMsg      guifg=#3c613b           guibg=bg                gui=bold
-hi NonText      guifg=#93aaab           guibg=bg                gui=bold
-
-hi Pmenu        guifg=#866a45           guibg=#b7b7a7           gui=NONE
-hi PmenuSel     guifg=#a5a5a5           guibg=#716d51           gui=bold
-hi PmenuSbar    guifg=#ffffff           guibg=#999666           gui=NONE
-hi PmenuThumb   guifg=#ffffff           guibg=#7B7939           gui=NONE
-
-hi Question     guifg=#496844           guibg=bg                gui=bold
-hi SignColumn   guifg=#ffffff           guibg=#b7b7a7           gui=NONE
-
-hi SpecialKey   guifg=#ffffff           guibg=#adadad           gui=NONE
-
-hi SpellBad     guisp=#883629                                   gui=undercurl
-hi SpellCap     guisp=#1920b2                                   gui=undercurl
-hi SpellLocal   guisp=#41796c                                   gui=undercurl
-hi SpellRare    guisp=#bb36d7                                   gui=undercurl
-hi StatusLine   guifg=#FFFEEE           guibg=#557788           gui=NONE
-hi StatusLineNC guifg=#F4F4EE           guibg=#99aabb           gui=italic
-hi TabLine      guifg=fg                guibg=#bcbcbc           gui=underline
-hi TabLineFill  guifg=fg                guibg=bg                gui=reverse
-hi TabLineSel   guifg=fg                guibg=bg                gui=bold
-hi Title        guifg=#124560           guibg=bg                gui=NONE
-hi VertSplit    guifg=#99aabb           guibg=#99aabb
-hi Visual       guifg=#ffffff           guibg=#0a7383           gui=NONE
-hi WarningMsg   guifg=#883629           guibg=bg                gui=NONE
-hi WildMenu     guifg=#000000           guibg=#7ab4cf           gui=NONE
-
-" 256-Color Terminal Colors, by Clayton Parker {{{1
-" =============================================================================
-hi Normal cterm=NONE ctermfg=16  ctermbg=255
-hi Comment      ctermfg=110
-hi Constant     ctermfg=214
-    hi String   ctermfg=30
-    hi Boolean  ctermfg=88
-hi Identifier   ctermfg=160
-hi Function     ctermfg=132
-hi Statement    ctermfg=21
-hi Keyword      ctermfg=45
-hi PreProc      ctermfg=27
-hi Type         ctermfg=147
-hi Special      ctermfg=64
-hi Ignore       ctermfg=255
-hi Error        ctermfg=196             ctermbg=255     term=none
-hi Todo         ctermfg=136             ctermbg=255     cterm=NONE
-hi VimError         ctermfg=160          ctermbg=16
-hi VimCommentTitle  ctermfg=110
-hi qfLineNr         ctermfg=16          ctermbg=46        cterm=NONE
-hi pythonDecorator ctermfg=208          ctermbg=255             cterm=NONE
-hi Cursor       ctermfg=255             ctermbg=16              cterm=NONE
-hi CursorColumn ctermfg=NONE            ctermbg=255             cterm=NONE
-hi CursorIM     ctermfg=255             ctermbg=16              cterm=NONE
-hi CursorLine   ctermfg=NONE            ctermbg=254             cterm=NONE
-hi lCursor      ctermfg=255             ctermbg=16              cterm=NONE
-hi DiffAdd      ctermfg=16              ctermbg=48              cterm=NONE
-hi DiffChange   ctermfg=16              ctermbg=153             cterm=NONE
-hi DiffDelete   ctermfg=16              ctermbg=203             cterm=NONE
-hi DiffText     ctermfg=16              ctermbg=226             cterm=NONE
-hi Directory    ctermfg=21              ctermbg=255             cterm=NONE
-hi ErrorMsg     ctermfg=160             ctermbg=NONE            cterm=NONE
-hi FoldColumn   ctermfg=24              ctermbg=252             cterm=NONE
-hi Folded       ctermfg=24              ctermbg=252             cterm=NONE
-hi IncSearch    ctermfg=255             ctermbg=160             cterm=NONE
-hi LineNr       ctermfg=253             ctermbg=110             cterm=NONE
-hi NonText      ctermfg=110             ctermbg=255             cterm=NONE
-hi Pmenu        ctermfg=fg              ctermbg=195             cterm=NONE
-hi PmenuSbar    ctermfg=255             ctermbg=153             cterm=NONE
-hi PmenuSel     ctermfg=255             ctermbg=21              cterm=NONE
-hi PmenuThumb   ctermfg=111             ctermbg=255             cterm=NONE
-hi SignColumn   ctermfg=110             ctermbg=254             cterm=NONE
-hi Search       ctermfg=255             ctermbg=160             cterm=NONE
-hi SpecialKey   ctermfg=255             ctermbg=144             cterm=NONE
-hi SpellBad     ctermfg=16              ctermbg=229             cterm=NONE
-hi SpellCap     ctermfg=16              ctermbg=231             cterm=NONE
-hi SpellLocal   ctermfg=16              ctermbg=231             cterm=NONE
-hi SpellRare    ctermfg=16              ctermbg=226             cterm=NONE
-hi StatusLine   ctermfg=255             ctermbg=24              cterm=NONE
-hi StatusLineNC ctermfg=253             ctermbg=110             cterm=NONE
-hi Title        ctermfg=75              ctermbg=255             cterm=NONE
-hi VertSplit    ctermfg=255             ctermbg=24              cterm=NONE
-hi Visual       ctermfg=255             ctermbg=153             cterm=NONE
-hi WildMenu     ctermfg=16              ctermbg=117             cterm=NONE
-hi Comment      guifg=#4e5968           guibg=NONE              gui=italic
-hi Constant     guifg=#881a1a           guibg=NONE              gui=NONE
-hi String       guifg=#1e5432           guibg=NONE              gui=NONE
-hi Boolean      guifg=#6f3d3d           guibg=NONE              gui=NONE
-hi Identifier   guifg=#7e473a           guibg=NONE              gui=NONE
-hi Function     guifg=#590b33           guibg=NONE              gui=NONE
-hi Statement    guifg=#0f58af           guibg=NONE              gui=NONE
-hi Keyword      guifg=#2c4869           guibg=NONE              gui=NONE
-hi PreProc      guifg=#2e3081           guibg=NONE              gui=NONE
-hi Type         guifg=#4d69a7           guibg=NONE              gui=NONE
-hi Special      guifg=#2c694a           guibg=NONE              gui=NONE
-hi Ignore       guifg=bg                guibg=NONE              gui=NONE
-hi Error        guifg=#5a2d2d           guibg=NONE              gui=undercurl
-hi Todo         guifg=#675220           guibg=NONE              gui=bold
-" -----------------------------------------------------------------------------
-hi VimError         guifg=#9e3224       guibg=#000000   gui=bold
-hi VimCommentTitle  guifg=#5a7471       guibg=bg        gui=bold,italic
-hi qfFileName       guifg=#5b7982       guibg=NONE      gui=italic
-hi qfLineNr         guifg=#e87334       guibg=NONE      gui=bold
-hi qfError          guifg=#673420       guibg=NONE      gui=bold
-
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#6c1111 guibg=NONE gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-" -----------------------------------------------------------------------------
-
diff --git a/colors/newsprint.vim b/colors/newsprint.vim
deleted file mode 100755
index eeabdf8..0000000
--- a/colors/newsprint.vim
+++ /dev/null
@@ -1,88 +0,0 @@
-" Vim color file
-" Maintainer:	Steven Stallion <sstallion@gmail.com>
-" Contributors:
-" Last Change:	2010/10/21
-
-set background=light
-
-highlight clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let g:colors_name = "newsprint"
-
-" Console Colors
-highlight Comment	ctermfg=grey
-highlight Constant 	ctermfg=grey			cterm=bold
-highlight Error		ctermfg=grey	ctermbg=black	cterm=bold
-highlight Identifier 	ctermfg=black			cterm=bold
-highlight Normal 	ctermfg=black
-highlight PreProc 	ctermfg=black
-highlight Special	ctermfg=black			cterm=bold
-highlight Statement 	ctermfg=black			cterm=bold,underline
-highlight Type 		ctermfg=black			cterm=bold
-highlight Visual	ctermfg=black	ctermbg=grey
-
-" GUI Colors
-highlight Comment	guifg=grey
-highlight Constant 	guifg=grey			gui=bold
-highlight Cursor			guibg=black
-highlight CursorLine 	guibg=grey
-highlight Error		guifg=grey	guibg=black	gui=bold
-highlight Identifier 	guifg=black			gui=bold
-highlight Normal 	guifg=black
-highlight PreProc 	guifg=black			gui=italic
-highlight Special	guifg=black			gui=bold
-highlight Statement 	guifg=black			gui=bold,underline
-highlight Type 		guifg=black			gui=bold
-highlight Visual	guifg=black	guibg=grey
-
-" Links
-highlight! link Search		Visual
-highlight! link NonText 	Normal
-highlight! link Macro		PreProc
-highlight! link Boolean		Constant
-highlight! link Character	Constant
-highlight! link Conditional	Statement
-highlight! link CursorColumn	CursorLine
-highlight! link Debug		PreProc	
-highlight! link Define		PreProc
-highlight! link Delimiter	Identifier
-highlight! link Directory	Statement
-highlight! link ErrorMsg	Error
-highlight! link Exception	Statement
-highlight! link Float		Constant
-highlight! link FoldColumn	Folded
-highlight! link Function	Identifier
-highlight! link Function	Identifier
-highlight! link Ignore		Comment
-highlight! link Include		PreProc
-highlight! link IncSearch	Search
-highlight! link Keyword		Identifier
-highlight! link Keyword		Identifier
-highlight! link Label		Statement
-highlight! link LineNr		Comment
-highlight! link MatchParen	Statement
-highlight! link MoreMsg		Identifier
-highlight! link NonText		Comment
-highlight! link Number		Constant
-highlight! link Operator	Identifier
-highlight! link Question	MoreMsg
-highlight! link PreCondit	PreProc
-highlight! link Repeat		Statement
-highlight! link SignColumn	Identifier
-highlight! link SpecialChar	Special
-highlight! link SpecialComment	Special
-highlight! link SpecialKey	Special
-highlight! link SpellBad	Error
-highlight! link SpellCap	Error
-highlight! link SpellLocal	Error
-highlight! link SpellRare	Error
-highlight! link StorageClass	Type
-highlight! link String		Constant
-highlight! link Structure	Type
-highlight! link Title		Structure
-highlight! link Todo		Error
-highlight! link Typedef		Type
-highlight! link WarningMsg	Error
diff --git a/colors/nicotine.vim b/colors/nicotine.vim
deleted file mode 100755
index 1c4c066..0000000
--- a/colors/nicotine.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-" Vim color file
-" Maintainer:  Tuomas Kasmra <kasmra@gmail.com>
-" Last Change:  2007 March 28
-" Version: 1.0
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="nicotine"
-
-hi Normal		guifg=#000000	guibg=#ffffcc
-hi Title		guifg=#000000	guibg=#ffffcc	gui=BOLD
-hi lCursor		guibg=#000000	guifg=NONE
-hi LineNr		guifg=#ffffcc	guibg=#6f8b17
-hi Comment		guifg=#ec0904	gui=NONE
-hi Identifier	guifg=#000000	gui=NONE
-hi Visual		guifg=NONE		guibg=#00ccff	gui=NONE
-hi Directory    guifg=#8b8b8b
-hi NonText      guifg=#6f8b17
-hi Special      guifg=#ff8100
-hi Operator		guifg=#006600	gui=NONE
-hi Statement	guifg=#006600	gui=NONE
-hi TypeDef		guifg=#669900	gui=NONE
-hi Type			guifg=#669900	gui=NONE
-hi Boolean		guifg=#669900	gui=NONE
-hi String       guifg=#9d7d4a	gui=NONE
-hi Number       guifg=#9d7d4a	gui=NONE
-hi Constant     guifg=#9d7d4a	gui=NONE
-hi Function		guifg=#6f8b17	gui=NONE
-hi PreProc		guifg=#6f8b17	gui=NONE
-hi Keyword		guifg=#6f8b17	gui=NONE
diff --git a/colors/night.vim b/colors/night.vim
deleted file mode 100755
index ffa3024..0000000
--- a/colors/night.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/03/08 Fri 21:39.
-"     version: 2.0
-" This color scheme uses a dark background.
-" GUI only
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "night"
-
-hi Normal       guifg=#f0f0f8 guibg=#303040
-
-" Search
-hi IncSearch    gui=UNDERLINE,BOLD guifg=#f0f0f8 guibg=#d000d0
-hi Search       gui=BOLD guifg=#ffd0ff guibg=#c000c0
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffffff guibg=#f00080
-hi WarningMsg   gui=BOLD guifg=#ffffff guibg=#f00080
-hi ModeMsg      gui=BOLD guifg=#00e0ff guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#00ffdd guibg=NONE
-hi Question     gui=BOLD guifg=#d0d050 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#101018 guibg=#c8c8d8
-hi StatusLineNC gui=NONE guifg=#606080 guibg=#c8c8d8
-hi VertSplit    gui=NONE guifg=#606080 guibg=#c8c8d8
-hi WildMenu     gui=NONE guifg=#101018 guibg=#ffffff
-
-" Diff
-hi DiffText     gui=NONE guifg=#ffffff guibg=#40a060
-hi DiffChange   gui=NONE guifg=#ffffff guibg=#007070
-hi DiffDelete   gui=NONE guifg=#ffffff guibg=#40a0c0
-hi DiffAdd      gui=NONE guifg=#ffffff guibg=#40a0c0
-
-" Cursor
-hi Cursor       gui=NONE guifg=#ffffff guibg=#d86020
-hi lCursor      gui=NONE guifg=#ffffff guibg=#e000b0
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#e000b0
-
-" Fold
-hi Folded       gui=BOLD guifg=#e8e8ff guibg=#7070c0
-hi FoldColumn   gui=NONE guifg=#a0a0b0 guibg=#404050
-
-" Other
-hi Directory    gui=NONE guifg=#00ffff guibg=NONE
-hi LineNr       gui=NONE guifg=#808098 guibg=NONE
-hi NonText      gui=BOLD guifg=#8040ff guibg=#383848
-hi SpecialKey   gui=BOLD guifg=#60a0ff guibg=NONE
-hi Title        gui=BOLD guifg=#f0f0f8 guibg=#9000a0
-hi Visual       gui=NONE guifg=#ffffff guibg=#d09050
-
-" Syntax group
-hi Comment      gui=BOLD guifg=#f080ff guibg=NONE
-hi Constant     gui=NONE guifg=#f0f0f8 guibg=#4830a0
-hi Error        gui=BOLD guifg=#ffffff guibg=#f00080
-hi Identifier   gui=NONE guifg=#90d0ff guibg=NONE
-hi Ignore       gui=NONE guifg=#303040 guibg=NONE
-hi PreProc      gui=NONE guifg=#40ffa0 guibg=NONE
-hi Special      gui=NONE guifg=#40f8f8 guibg=#4830a0
-hi Statement    gui=BOLD guifg=#00ccbb guibg=NONE
-hi Todo         gui=BOLD guifg=#ffe0c8 guibg=#c07038
-hi Type         gui=BOLD guifg=#bb99ff guibg=NONE
-hi Underlined   gui=UNDERLINE,BOLD guifg=#f0f0f8 guibg=NONE
-
-" HTML
-hi htmlLink                 gui=UNDERLINE,BOLD
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
diff --git a/colors/nightVision.vim b/colors/nightVision.vim
deleted file mode 100755
index 7e35de1..0000000
--- a/colors/nightVision.vim
+++ /dev/null
@@ -1,52 +0,0 @@
-" Vim color - Clarity
-"  
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="clarity"
-
-highlight Normal         gui=NONE guifg=#A6BFBB      guibg=#1D1F42
-highlight Comment        gui=NONE guifg=SteelBlue    guibg=bg 
-highlight PreProc        gui=NONE guifg=Salmon       guibg=bg 
-highlight Precondit      gui=NONE guifg=Khaki3       guibg=bg
-highlight Identifier     gui=NONE guifg=Khaki3       guibg=bg 
-highlight Type           gui=BOLD guifg=Wheat        guibg=bg 
-highlight StorageClass   gui=BOLD guifg=Cornsilk2    guibg=bg
-highlight Todo           gui=BOLD guifg=#1F3055      guibg=White 
-highlight NonText        gui=NONE guifg=#334C51      guibg=SteelBlue4 
-highlight LineNr         gui=NONE guifg=HoneyDew2    guibg=Grey25 
-highlight StatusLineNC   gui=NONE guifg=Grey80       guibg=LightBlue4 
-highlight StatusLine     gui=NONE guifg=Black        guibg=#FFFFCA 
-highlight IncSearch      gui=NONE guifg=Black        guibg=#FFE568
-highlight Search         gui=UNDERLINE,BOLD guifg=White guibg=bg
-highlight Cursor         gui=NONE guifg=Grey50       guibg=Cornsilk
-highlight CursorIM       gui=NONE guifg=Grey50       guibg=#FFE568
-highlight Title          gui=BOLD guifg=OliveDrab3   guibg=bg
-highlight WarningMsg     gui=BOLD guifg=White        guibg=Red4
-highlight String         gui=NONE guifg=Grey80       guibg=bg      
-highlight Number         gui=NONE guifg=OliveDrab2   guibg=bg
-highlight Constant       gui=NONE guifg=#ACEDAB      guibg=bg 
-highlight Visual         gui=NONE guifg=#ACEDAB      guibg=bg
-highlight Directory      gui=NONE guifg=PeachPuff    guibg=bg
-highlight DiffAdd        gui=NONE guifg=#7897B7      guibg=#334B64
-highlight DiffChange     gui=NONE guifg=HoneyDew4    guibg=#153B64
-highlight DiffDelete     gui=NONE guifg=Grey40       guibg=Grey20 
-highlight DiffText       gui=BOLD guifg=HoneyDew1    guibg=#8A5268 
-highlight Typedef        gui=NONE guifg=Cornsilk     guibg=bg
-highlight Define         gui=NONE guifg=White        guibg=bg
-highlight Tag            gui=NONE guifg=LightBlue2   guibg=bg
-highlight Debug          gui=BOLD guifg=Green        guibg=bg
-highlight Special        gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight SpecialChar    gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight Delimiter      gui=NONE guifg=NavajoWhite  guibg=bg         
-highlight SpecialComment gui=NONE guifg=NavajoWhite3 guibg=bg         
-highlight Conditional    gui=BOLD guifg=Cyan3       guibg=bg         
-highlight Statement      gui=BOLD guifg=SeaGreen     guibg=bg 
-highlight WildMenu       gui=NONE guifg=White        guibg=#1F306F
-highlight browseSuffixes gui=NONE guifg=Cornsilk3    guibg=bg
-
-
-
diff --git a/colors/night_vision.vim b/colors/night_vision.vim
deleted file mode 100755
index 1b7a88c..0000000
--- a/colors/night_vision.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" Last Change: 25 August 2005
-" Version:1.0
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="night_vision"
-
-hi Normal   guifg=#00cc00	 guibg=#003300 
-hi LineNr   guifg=#009900 guibg=#003300 
-hi Statusline    gui=none guibg=#339933 guifg=#ffffff
-hi StatuslineNC    gui=none guibg=#006633 guifg=#ffffff
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=#009933
-hi Operator   guifg=#ff0000
-hi Identifier    guifg=#33ff99 gui=NONE
-
-hi Statement	 guifg=#ccff00 gui=NONE
-hi TypeDef       guifg=#c000c8 gui=NONE
-hi Type          guifg=#ccffff gui=NONE
-hi Boolean       guifg=#ff00aa gui=NONE
-
-hi String        guifg=#9999cc gui=NONE
-hi Number        guifg=#66ff66 gui=NONE
-hi Constant      guifg=#f0f000 gui=NONE
-
-hi Function      gui=NONE      guifg=#fffcfc 
-hi PreProc       guifg=#ffffff gui=NONE
-hi Define        gui=bold guifg=#f0f0f0 
-hi Special       gui=none guifg=#cccccc 
-hi BrowseDirectory  gui=bold guifg=#FFFF00 
-
-hi Keyword       guifg=#ff8088 gui=NONE
-hi Search        gui=NONE guibg=#ffff00 guifg=#330000 
-hi IncSearch     gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi SpecialKey    gui=NONE guifg=#fcfcfc guibg=#8888ff
-hi NonText       gui=NONE guifg=#fcfcfc 
-hi Directory     gui=NONE guifg=#999900
-hi Conditional   gui=NONE guifg=#ff9900
diff --git a/colors/nightflight.vim b/colors/nightflight.vim
deleted file mode 100755
index 1b6e6ca..0000000
--- a/colors/nightflight.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Ralf Holly <ralf@hollyfamily.de>
-" Last Change:	2006 Dec 28
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endi
-
-let g:colors_name = "nightflight"
-hi Normal          cterm=none  ctermfg=darkgrey  ctermbg=black  guifg=#c0c0ff  guibg=black
-hi Scrollbar       cterm=bold  ctermfg=darkcyan  ctermbg=cyan  guifg=darkcyan  guibg=cyan
-hi Menu            guifg=black  guibg=cyan
-hi SpecialKey      term=bold  cterm=bold  ctermfg=yellow  guifg=yellow
-hi NonText         term=bold  cterm=bold  ctermfg=yellow  gui=none  guifg=yellow
-hi Directory       term=bold  cterm=bold  ctermfg=cyan  guifg=cyan
-hi ErrorMsg        term=standout  cterm=bold  ctermfg=white  ctermbg=red  guifg=white  guibg=red
-hi Search          term=reverse  ctermfg=cyan  ctermbg=blue  guifg=cyan  guibg=blue
-hi MoreMsg         term=bold  cterm=bold  ctermfg=darkgreen  gui=bold  guifg=seagreen
-hi ModeMsg         term=bold  cterm=bold  gui=bold  guifg=white  guibg=blue
-hi LineNr          term=underline  cterm=bold  ctermfg=darkgrey  guifg=darkgrey
-hi Question        term=standout  cterm=bold  ctermfg=darkgreen  gui=bold  guifg=green
-hi StatusLine      term=bold,reverse  cterm=bold  ctermfg=black  ctermbg=cyan  gui=bold  guifg=black  guibg=cyan
-hi StatusLineNC    term=reverse  ctermfg=black  ctermbg=darkcyan  guifg=darkcyan  guibg=black
-hi Title           term=bold  cterm=bold  ctermfg=darkmagenta  gui=bold  guifg=magenta
-hi Visual          term=reverse  cterm=bold  ctermfg=black  ctermbg=white  guifg=black  guibg=white  
-hi WarningMsg      term=standout  cterm=bold  ctermfg=red  guifg=red
-hi Cursor          guifg=bg  guibg=green
-hi Comment         term=bold  cterm=bold  ctermfg=lightblue  guifg=#0090ff
-hi Constant        term=underline  cterm=bold  ctermfg=cyan  guifg=cyan
-hi Special         term=bold  cterm=bold  ctermfg=cyan  guifg=cyan  
-hi Identifier      term=underline  ctermfg=cyan  guifg=cyan  
-hi Statement       term=bold  cterm=bold  ctermfg=green  gui=none  guifg=#60ff60
-hi PreProc         term=underline  ctermfg=magenta  guifg=#e080e0
-hi Type            term=underline  cterm=bold  ctermfg=lightgreen  gui=none  guifg=#60ff60
-hi Error           term=reverse  ctermfg=white  ctermbg=red  guifg=white  guibg=red
-hi Todo            term=standout  ctermfg=white  ctermbg=magenta  guifg=white  guibg=magenta
-
-" If you want to highlight C/Java operators, create c.vim and java.vim files
-" in your local $VIM/vimfiles/after/syntax/ directory, containing this statement:
-" syntax match   _COperators "+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]"
-hi _COperators     ctermfg=white  guifg=white  gui=none  
-
-" For Vim 7
-hi MatchParen      ctermbg=blue  guifg=white guibg=blue
-
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
diff --git a/colors/nightflight2.vim b/colors/nightflight2.vim
deleted file mode 100755
index d5c653b..0000000
--- a/colors/nightflight2.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Ralf Holly <ralf@hollyfamily.de>
-" Last Change:	2006 Dec 28
-
-hi! clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endi
-
-let g:colors_name = "nightflight2"
-"hi! Normal          cterm=none  ctermfg=darkgrey  ctermbg=black  guifg=#c0c0ff  guibg=#000020
-hi! Normal          cterm=none  ctermfg=darkgrey  ctermbg=black  guifg=#c0c0ff  guibg=#000025
-hi! Scrollbar       cterm=bold  ctermfg=darkcyan  ctermbg=cyan  guifg=darkcyan  guibg=cyan
-hi! Menu            guifg=black  guibg=cyan
-hi! SpecialKey      term=bold  cterm=bold  ctermfg=yellow  guifg=yellow
-hi! NonText         term=bold  cterm=bold  ctermfg=yellow  gui=none  guifg=yellow
-hi! Directory       term=bold  cterm=bold  ctermfg=cyan  guifg=cyan
-hi! ErrorMsg        term=standout  cterm=bold  ctermfg=white  ctermbg=red  guifg=white  guibg=red
-hi! Search          term=reverse  ctermfg=cyan  ctermbg=blue  guifg=cyan  guibg=blue
-hi! MoreMsg         term=bold  cterm=bold  ctermfg=darkgreen  gui=bold  guifg=seagreen
-hi! ModeMsg         term=bold  cterm=bold  gui=bold  guifg=white  guibg=blue
-hi! LineNr          term=underline  cterm=bold  ctermfg=darkgrey  guifg=#505070
-hi! Question        term=standout  cterm=bold  ctermfg=darkgreen  gui=bold  guifg=green
-hi! StatusLine      term=bold,reverse  cterm=bold  ctermfg=black  ctermbg=cyan  gui=bold  guifg=black  guibg=cyan
-hi! StatusLineNC    term=reverse  ctermfg=black  ctermbg=darkcyan  guifg=darkcyan  guibg=black
-hi! Title           term=bold  cterm=bold  ctermfg=darkmagenta  gui=bold  guifg=magenta
-hi! Visual          term=reverse  cterm=bold  ctermfg=black  ctermbg=white  guifg=black  guibg=white  
-hi! WarningMsg      term=standout  cterm=bold  ctermfg=red  guifg=red
-hi! Cursor          guifg=bg  guibg=green
-hi! Comment         term=bold  cterm=bold  ctermfg=lightblue  guifg=darkgrey
-hi! Identifier      term=bold  cterm=bold  ctermfg=green  gui=none  guifg=white
-hi! Special         term=bold  cterm=bold  ctermfg=cyan  guifg=darkgrey
-hi! Constant        term=underline  cterm=bold  ctermfg=cyan  guifg=#30df60
-hi! PreProc         term=underline  ctermfg=magenta  guifg=#fcaf3e
-hi! Statement       term=bold  cterm=bold  ctermfg=green  gui=none  guifg=#8387ff
-hi! Type            term=underline  cterm=bold  ctermfg=lightgreen  gui=none  guifg=#8387ff
-hi! Error           term=reverse  ctermfg=white  ctermbg=red  guifg=white  guibg=red
-hi! Todo            term=standout  ctermfg=white  ctermbg=magenta  guifg=white  guibg=brown
-" syntax match   _COperators "+\|-\|\*\|;\|:\|,\|<\|>\|&\||\|!\|\~\|%\|=\|)\|(\|{\|}\|\.\|\[\|\]"
-hi! _COperators     ctermfg=white  guifg=white  gui=none  
-
-" For Vim 7
-hi! MatchParen      ctermbg=blue  guifg=white guibg=blue
-
diff --git a/colors/nightshimmer.vim b/colors/nightshimmer.vim
deleted file mode 100755
index 3c5d5fb..0000000
--- a/colors/nightshimmer.vim
+++ /dev/null
@@ -1,116 +0,0 @@
-" Vim colorscheme
-"
-" Maintainer: Niklas Lindstr�m <lindstream@gmail.com>
-" Last Change: 2007-11-26
-" Version: 1.1
-" URL: http://www.vim.org/scripts/script.php?script_id=328
-
-
-""" Init
-set background=dark
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "nightshimmer"
-
-
-""""""""\ Colors \""""""""
-
-
-"""" GUI Colors
-
-highlight Cursor        gui=None guibg=Green1 guifg=White
-highlight CursorIM gui=bold guifg=white guibg=Green1
-hi CursorColumn     guifg=NONE      guibg=#204050   gui=NONE
-hi CursorLine       guifg=NONE      guibg=#204050   gui=NONE
-highlight Directory     guifg=LightSeaGreen guibg=bg
-highlight DiffAdd gui=None guifg=fg guibg=DarkCyan
-highlight DiffChange gui=None guifg=fg guibg=Green4
-highlight DiffDelete gui=None guifg=fg guibg=black
-highlight DiffText gui=bold guifg=fg guibg=bg
-highlight ErrorMsg      guifg=LightYellow  guibg=FireBrick
-" FillColumn is renamed to VertSplit:"
-"highlight FillColumn    gui=NONE guifg=black guibg=grey60
-highlight VertSplit    gui=NONE guifg=black guibg=grey60
-highlight Folded        gui=bold guibg=#305060 guifg=honeydew
-highlight FoldColumn        gui=bold guibg=#305060 guifg=#b0d0e0
-highlight IncSearch gui=reverse guifg=fg guibg=bg
-highlight LineNr        gui=bold guibg=grey6 guifg=Purple1
-highlight ModeMsg       guibg=DarkGreen guifg=LightGreen
-highlight MoreMsg       gui=bold  guifg=SeaGreen4 guibg=bg
-if version < 600
-    " same as SpecialKey
-    highlight NonText       guibg=#123A4A guifg=#3D5D6D
-else
-    " Bottom fill (use e.g. same as LineNr)
-    highlight NonText       gui=None guibg=grey6 guifg=Purple
-endif
-highlight Normal        gui=None guibg=#103040 guifg=honeydew2
-highlight Question      gui=bold  guifg=SeaGreen2 guibg=bg
-highlight Search        gui=NONE guibg=Purple4 guifg=NONE
-highlight SpecialKey    guibg=#123A4A guifg=#426272
-highlight StatusLine    gui=bold guibg=grey88 guifg=black
-highlight StatusLineNC  gui=NONE guibg=grey60 guifg=grey10
-highlight Title         gui=bold  guifg=MediumOrchid1 guibg=bg
-highlight Visual        gui=reverse guibg=WHITE guifg=SeaGreen
-highlight VisualNOS     gui=bold,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=bold guifg=FireBrick1 guibg=bg
-highlight WildMenu      gui=bold guibg=Chartreuse guifg=Black
-
-
-"""" Syntax Colors
-
-if exists("colors_nightshimmer_reverse_comment")
-            \ && colors_nightshimmer_reverse_comment == 1
-    highlight Comment       gui=reverse guifg=#507080
-    highlight Todo          guifg=Cyan guibg=#507080
-else
-    highlight Comment       gui=None guifg=#608090
-    highlight Todo          guifg=Cyan2 guibg=#305060
-endif
-
-highlight Constant      guifg=Cyan3 guibg=bg
-    hi String gui=None guifg=Cyan2 guibg=#1a3a4a
-    "hi Character gui=None guifg=Cyan guibg=bg
-    highlight Number gui=None guifg=Cyan2 guibg=bg
-    highlight Boolean gui=bold guifg=Cyan1 guibg=bg
-    "hi Float gui=None guifg=Cyan guibg=bg
-
-highlight Identifier    guifg=orchid1
-    "hi Function gui=None guifg=orchid1 guibg=bg
-
-highlight Statement     gui=NONE guifg=LightGreen
-    highlight Conditional gui=None guifg=LightGreen guibg=bg
-    highlight Repeat gui=None guifg=SeaGreen2 guibg=bg
-    "hi Label gui=None guifg=LightGreen guibg=bg
-    highlight Operator gui=None guifg=Chartreuse guibg=bg
-    highlight Keyword gui=bold guifg=LightGreen guibg=bg
-    highlight Exception gui=bold guifg=LightGreen guibg=bg
-
-highlight PreProc       guifg=MediumPurple1
-    "hi Include gui=None guifg=MediumPurple1 guibg=bg
-    "hi Define gui=None guifg=MediumPurple1g guibg=bg
-    "hi Macro gui=None guifg=MediumPurple1g guibg=bg
-    "hi PreCondit gui=None guifg=MediumPurple1g guibg=bg
-
-highlight Type          gui=NONE guifg=LightBlue
-    "hi StorageClass gui=None guifg=LightBlue guibg=bg
-    "hi Structure gui=None guifg=LightBlue guibg=bg
-    "hi Typedef gui=None guifg=LightBlue guibg=bg
-
-highlight Special       gui=bold guifg=White
-    "hi SpecialChar gui=bold guifg=White guibg=bg
-    "hi Tag gui=bold guifg=White guibg=bg
-    "hi Delimiter gui=bold guifg=White guibg=bg
-    "hi SpecialComment gui=bold guifg=White guibg=bg
-    "hi Debug gui=bold guifg=White guibg=bg
-
-highlight Underlined gui=underline guifg=honeydew4 guibg=bg
-hi TaglistTagName   guifg=green1    guibg=bg        gui=bold
-
-highlight Ignore    guifg=#204050
-
-highlight Error      guifg=LightYellow  guibg=FireBrick
-
-
diff --git a/colors/nightsky.vim b/colors/nightsky.vim
deleted file mode 100755
index 8560467..0000000
--- a/colors/nightsky.vim
+++ /dev/null
@@ -1,147 +0,0 @@
-" Vim color file based on nightsky
-" Maintainer:   Ian Kelling
-" Last Change:  
-
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="northsky"
-
-
-" Search & normal
-hi Normal		guifg=#eeeeee guibg=black 
-hi Search		guibg=#3D5B8C guifg=yellow gui=bold 
-hi IncSearch	guifg=bg guibg=cyan gui=bold 
-if &t_Co == "256"
-	hi Normal		ctermfg=255 ctermbg=16
-	hi Search		ctermfg=226 ctermbg=60
-	hi IncSearch	ctermfg=16 ctermbg=51
-else
-	hi Normal		ctermfg=lightgray ctermbg=black
-	hi Search		ctermbg=darkblue ctermfg=yellow
-	hi IncSearch	ctermfg=bg ctermbg=cyan
-endif
-
-" highlight groups
-hi Cursor	guifg=bg guibg=fg
-hi VertSplit	guibg=#C0FFFF guifg=#075554 gui=none 
-hi Folded	guifg=plum1 guibg=#061A3E 
-hi FoldColumn	guibg=#800080 guifg=tan 
-hi ModeMsg	guifg=#404040 guibg=#C0C0C0 
-hi MoreMsg	guifg=darkturquoise guibg=#188F90 
-hi NonText	guibg=#191919 guifg=#9FADC5 
-hi Question	guifg=#F4BB7E 
-hi SpecialKey	guifg=#BF9261 
-hi StatusLine	guibg=#222222 guifg=#b0b0b0 gui=none 
-hi StatusLineNC	guibg=#001111 guifg=DimGrey gui=none 
-hi Title	guifg=#8DB8C3 
-hi Visual gui=bold guifg=black guibg=#84AF84 
-hi WarningMsg	guifg=#F60000 gui=underline 
-if &t_Co == "256"
-	hi Cursor		ctermfg=254 ctermbg=166
-	hi VertSplit	ctermfg=23 ctermbg=159
-	hi Folded		ctermfg=219 ctermbg=17 
-	hi FoldColumn	ctermfg=180 ctermbg=90
-	hi ModeMsg		ctermfg=238 ctermbg=250
-	hi MoreMsg		ctermfg=44 ctermbg=30
-	hi NonText		ctermfg=146 ctermbg=234
-	hi Question		ctermfg=216
-	hi SpecialKey	ctermfg=137
-	hi StatusLine	ctermfg=145 ctermbg=235
-	hi StatusLineNC	ctermfg=242 ctermbg=16
-	hi Title		ctermfg=109
-	hi Visual		ctermfg=16 ctermbg=108
-	hi WarningMsg	ctermfg=196
-else
-	hi Cursor		ctermfg=white ctermbg=red 
-	hi VertSplit	ctermfg=darkblue ctermbg=cyan
-	hi Folded		ctermfg=lightmagenta ctermbg=bg
-	hi FoldColumn	ctermfg=lightgray ctermbg=darkmagenta
-	hi ModeMsg		ctermfg=black ctermbg=gray
-	hi MoreMsg		ctermfg=cyan ctermbg=darkcyan
-	hi NonText		ctermfg=gray ctermbg=darkgrey
-	hi Question		ctermfg=yellow
-	hi SpecialKey	ctermfg=brown
-	hi StatusLine	ctermfg=lightgray ctermbg=darkgray
-	hi StatusLineNC	ctermfg=darkgray ctermbg=black
-	hi Title		ctermfg=blue
-	hi Visual		ctermfg=black ctermbg=darkgreen
-	hi WarningMsg	ctermfg=red
-endif
-
-" syntax highlighting groups
-hi Comment		guifg=DarkGray
-hi Constant		guifg=#72A5E4	gui=bold
-hi Number		guifg=chartreuse2 gui=bold
-hi Identifier	guifg=#ADCBF1
-hi Statement	guifg=yellow
-hi PreProc		guifg=#14967C
-hi Type			guifg=#FFAE66
-hi Special		guifg=#EEBABA
-hi Ignore		guifg=grey60
-hi Todo			guibg=#9C8C84 guifg=#244C0A
-hi Label		guifg=#ffc0c0
-if &t_Co == "256"
-	hi Comment		ctermfg=248
-	hi Constant		ctermfg=74
-	hi Number		ctermfg=118
-	hi Identifier	ctermfg=153
-	hi Statement	ctermfg=226
-	hi PreProc		ctermfg=30
-	hi Type			ctermfg=215
-	hi Special		ctermfg=217
-	hi Ignore		ctermfg=246
-	hi Todo			ctermfg=22 ctermbg=138
-	hi Label		ctermfg=217
-else
-	hi Comment		ctermfg=darkgray
-	hi Constant		ctermfg=lightcyan
-	hi Number		ctermfg=green
-	hi Identifier	ctermfg=gray
-	hi Statement	ctermfg=yellow
-	hi PreProc		ctermfg=darkgreen
-	hi Type			ctermfg=white "brown
-	hi Special		ctermfg=brown "darkmagenta
-	hi Ignore		ctermfg=gray 
-	hi Todo			ctermfg=darkblue ctermbg=darkgray
-	hi Label		ctermfg=darkmagenta
-endif
-
-" Vim defaults
-hi ErrorMsg		guifg=White guibg=Red
-hi DiffAdd		guibg=DarkBlue
-hi DiffChange	guibg=aquamarine4
-hi DiffDelete	gui=bold guifg=Yellow guibg=DarkBlue
-hi DiffText		gui=bold guibg=#940303
-hi Directory	guifg=Cyan
-hi LineNr		guifg=DarkGreen
-hi WildMenu		guifg=Black guibg=Yellow
-hi lCursor		guibg=SeaGreen1 guifg=NONE
-hi Underlined	gui=underline guifg=#80a0ff
-hi Error		guifg=White guibg=Red
-if &t_Co == "256"
-	hi ErrorMsg		ctermfg=231 ctermbg=196
-	hi DiffAdd		ctermbg=18
-	hi DiffChange	ctermbg=66
-	hi DiffDelete	ctermfg=226 ctermbg=18
-	hi DiffText		ctermbg=88
-	hi Directory	ctermfg=51
-	hi LineNr		ctermfg=22
-	hi WildMenu		ctermfg=16 ctermbg=226
-	hi lCursor		ctermbg=85
-	hi Underlined	ctermfg=111
-	hi Error		ctermfg=231 ctermbg=196
-else
-	hi lCursor		ctermbg=lightgreen ctermfg=NONE 
-endif
-
-
-" vim:sw=4 ts=4 sts=4 
diff --git a/colors/nightwish.vim b/colors/nightwish.vim
deleted file mode 100755
index e9bfe55..0000000
--- a/colors/nightwish.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file, derived from colorscheme 'murphy'
-" Maintainer:	Michael Muhler <muhler AT web.de>
-" Version:      1.0
-" URL:          http://home.arcor.de/muhler
-" Last Change:	2003 Apr 15
-
-"help see colortest.vim
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "nightwish"
-
-
-hi Comment		term=bold	   ctermfg=LightRed   guifg=Orange
-hi Constant		term=underline ctermfg=LightGreen guifg=White	gui=NONE
-hi Directory	term=bold	   ctermfg=LightCyan  guifg=Cyan
-hi Error		term=reverse   ctermbg=Red	  ctermfg=White guibg=Red  guifg=White
-hi ErrorMsg		term=standout  ctermbg=DarkRed	  ctermfg=White guibg=Red guifg=White
-hi Identifier	term=underline ctermfg=LightCyan  guifg=#00ffff
-hi Ignore					   ctermfg=black	  guifg=bg
-hi IncSearch	term=reverse   cterm=reverse	  gui=reverse
-hi LineNr		term=underline ctermfg=Yellow					guifg=Yellow
-hi ModeMsg		term=bold	   cterm=bold		  gui=bold
-hi MoreMsg		term=bold	   ctermfg=LightGreen gui=bold		guifg=SeaGreen
-hi NonText		term=bold	   ctermfg=Blue		  gui=bold		guifg=Blue
-hi PreProc		term=underline ctermfg=LightBlue  guifg=Wheat
-hi Question		term=standout  ctermfg=LightGreen gui=bold		guifg=Cyan
-hi Search		term=reverse					  guifg=white	guibg=Blue
-hi Special		term=bold	   ctermfg=LightRed   guifg=magenta
-hi SpecialKey	term=bold	   ctermfg=LightBlue  guifg=Cyan
-hi Statement	term=bold	   ctermfg=Yellow	  guifg=#ffff00 gui=NONE
-hi StatusLine	term=reverse,bold cterm=reverse   gui=NONE		guifg=White guibg=darkblue
-hi StatusLineNC term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=#333333
-hi Title		term=bold	   ctermfg=LightMagenta gui=bold	guifg=Pink
-hi Todo			term=standout  ctermbg=Yellow ctermfg=Black guifg=Blue guibg=Yellow
-hi Type						   ctermfg=LightGreen guifg=grey	gui=none
-hi Visual		term=reverse   cterm=reverse	  gui=NONE		guifg=white guibg=darkgreen
-hi WarningMsg	term=standout  ctermfg=LightRed   guifg=Red
-
-hi Normal		ctermbg=Black  ctermfg=lightgreen guibg=Black	guifg=#a0a0ff
-hi Cursor										  guifg=bg	guibg=Green
-hi String       term=underline cterm=bold ctermfg=magenta       guifg=#ffa0a0
-hi Repeat       term=underline ctermfg=Magenta    guifg=Red
-hi Delimiter    term=standout  ctermfg=Blue       guifg=#00ff88
-hi Label        term=standout  ctermfg=DarkYellow   guifg=DarkYellow
-hi Keyword      term=standout  ctermfg=Green        guifg=Green
-hi Operator     term=standout  ctermfg=Yellow    guifg=#ff5555
-hi Exception    term=standout  ctermfg=Magenta   guifg=#ff0dd5
-hi Tag          term=standout  ctermfg=Green     guifg=#55ff0d
-
-" missing items in murphy
-hi Scrollbar  guifg=darkcyan guibg=cyan
-hi Menu       guifg=black    guibg=cyan
-hi link Conditional	    Repeat
diff --git a/colors/no_quarter.vim b/colors/no_quarter.vim
deleted file mode 100755
index 30a81f9..0000000
--- a/colors/no_quarter.vim
+++ /dev/null
@@ -1,135 +0,0 @@
-" Vim color file
-"  Maintainer: Otavio Fernandes <otaviof@gmail.com>
-" Last Change: 2010/04/13 Wed 01h 46
-"     Version: 1.0.7
-"
-" ts=4
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-let colors_name = "no_quarter"
-
-"
-" Vim Colors (( Default Options ))
-"
-
-hi Normal                   guifg=gray90                        guibg=gray9
-
-hi Comment                  gui=NONE		guifg=#647bcf       guibg=NONE
-hi Constant                 gui=NONE		guifg=#b07050       guibg=NONE
-hi Cursor                   gui=NONE		guifg=#424242       guibg=yellow
-hi CursorIM                 gui=NONE		guifg=#ffffff       guibg=#8800ff
-hi CursorLine               gui=NONE                            guibg=gray10
-hi DiffAdd                  gui=NONE		guifg=#a0d0ff       guibg=#0020a0
-hi DiffChange               gui=NONE		guifg=#e03870       guibg=#601830
-hi DiffDelete               gui=NONE		guifg=#a0d0ff       guibg=#0020a0
-hi DiffText                 gui=NONE		guifg=#ff78f0       guibg=#a02860
-hi Directory                gui=NONE		guifg=lightmagenta  guibg=NONE
-hi Error                    gui=BOLD		guifg=white         guibg=#8000ff
-hi ErrorMsg                 gui=BOLD		guifg=#ffa0ff       guibg=NONE
-hi FoldColumn               gui=NONE		guifg=#40c0ff       guibg=gray12
-hi Folded                   gui=NONE		guifg=#40f0f0       guibg=#006090
-hi iCursor                  gui=NONE        guifg=white         guibg=green
-hi Identifier               gui=NONE		guifg=#90c0c0       guibg=NONE
-hi Ignore                   gui=NONE		guifg=bg            guibg=NONE
-hi IncSearch                gui=UNDERLINE	guifg=#80ffff       guibg=#0060c0
-hi LineNr                   gui=NONE		guifg=gray30        guibg=gray10
-hi ModeMsg                  gui=BOLD		guifg=#a0d0ff       guibg=NONE
-hi MoreMsg                  gui=NONE        guifg=lightred      guibg=bg
-hi NonText                  gui=BOLD		guifg=#707070       guibg=bg
-hi OverLength               gui=NONE        guifg=fg            guibg=gray30
-hi PreProc                  gui=NONE		guifg=#c090c0       guibg=NONE
-hi Question                 gui=BOLD		guifg=#e8e800       guibg=NONE
-hi Search                   gui=NONE		guifg=bg            guibg=gray60
-hi SignColumn               gui=NONE        guifg=darkyellow    guibg=bg
-hi Special                  gui=NONE		guifg=#c090c0       guibg=NONE
-hi SpecialKey               gui=BOLD		guifg=green         guibg=NONE
-hi Statement                gui=NONE		guifg=#c0c090       guibg=NONE
-hi StatusLine               gui=NONE		guifg=#000000       guibg=gray90
-hi StatusLineNC             gui=NONE		guifg=#abac84       guibg=gray12
-hi Title                    gui=NONE        guifg=darkcyan      guibg=bg
-hi Todo                     gui=BOLD		guifg=#ff80d0       guibg=NONE
-hi Type                     gui=NONE		guifg=#60f0a8       guibg=NONE
-hi Underlined               gui=UNDERLINE	guifg=#707070       guibg=NONE
-hi VertSplit                gui=NONE		guifg=#abac84       guibg=gray12
-hi Visual                   gui=NONE		guifg=#b0ffb0       guibg=#008000
-hi VisualNOS                gui=NONE		guifg=#ffe8c8       guibg=#c06800
-hi WarningMsg               gui=BOLD		guifg=#ffa0ff       guibg=NONE
-hi WildMenu                 gui=NONE		guifg=#000000       guibg=#abac84
-hi htmlTagName              gui=NONE 		guifg=grey70        guibg=bg
-hi lCursor                  gui=NONE		guifg=#ffffff       guibg=#8800ff
-
-"
-" Tag List
-"
-
-hi MyTagListFileName        gui=underline   guifg=fg        guibg=grey25
-
-"
-" Perl
-"
-
-hi perlControl				gui=NONE        guifg=#c0c090	guibg=gray15
-hi perlFunctionName			gui=NONE        guifg=white 	guibg=bg
-hi perlIdentifier			gui=NONE	    guifg=gray75    guibg=NONE
-hi perlLabel				gui=NONE        guifg=#c0c090	guibg=gray15
-hi perlMatchStartEnd		gui=NONE        guifg=#c0c090	guibg=gray14
-hi perlNumber				gui=NONE        guifg=#80ac7b	guibg=bg
-hi perlOperator				gui=NONE        guifg=#c0c090	guibg=bg
-hi perlPackageDecl			gui=NONE        guifg=#80ac7b	guibg=gray15
-hi perlQQ					gui=NONE        guifg=fg		guibg=gray15
-hi perlRepeat				gui=NONE        guifg=#c0b790	guibg=bg
-hi perlSharpBang			gui=NONE        guifg=#c0c090	guibg=gray10
-hi perlShellCommand			gui=NONE        guifg=lightred  guibg=bg
-hi perlSpecialBEOM			gui=NONE        guifg=fg		guibg=gray15
-hi perlSpecialMatch			gui=NONE        guifg=#c864c7	guibg=bg
-hi perlSpecialString		gui=NONE        guifg=#dc966b	guibg=bg
-hi perlStatement			gui=NONE	    guifg=#c0c090	guibg=NONE
-hi perlStatementControl		gui=NONE        guifg=#dcdb6b	guibg=bg
-hi perlStatementFiledesc	gui=NONE        guifg=#a2c090	guibg=bg
-hi perlStatementHash		gui=NONE	    guifg=#c0c090	guibg=gray12
-hi perlStatementInclude 	gui=NONE        guifg=#c0c090   guibg=bg
-hi perlStatementNew			gui=underline   guifg=#c0c090	guibg=bg
-hi perlStatementSub 		gui=NONE        guifg=#c0c090 	guibg=bg
-hi perlStringStartEnd		gui=NONE        guifg=#b07050	guibg=bg
-hi perlVarNotInMatches		gui=NONE        guifg=#915555	guibg=bg
-hi perlVarPlain				gui=NONE        guifg=#74c5c6	guibg=bg
-hi perlVarPlain2			gui=NONE        guifg=#74c6a8	guibg=bg
-hi perlVarSimpleMember		gui=NONE        guifg=#c0c090	guibg=bg
-hi perlVarSimpleMemberName	gui=NONE        guifg=grey70	guibg=bg
-
-" -------------------------------------------------------------------------------------------------
-" perlStatementRegexp perlSpecialDollar perlSpecialStringU perlSubstitutionBracket
-" perlTranslationBracket perlType perlStatementStorage perlStatementScalar
-" perlStatementNumeric perlStatementList perlStatementIOfunc 
-" perlStatementVector perlStatementFiles perlStatementFlow perlStatementScope
-" perlStatementProc perlStatementSocket perlStatementIPC perlStatementNetwork perlStatementPword
-" perlStatementTime perlStatementMisc perlStatementPackage perlList perlMisc
-" perlVarSlash perlMethod perlFiledescRead perlFiledescStatement perlFormatName
-" perlFloat perlString perlSubstitutionSQ perlSubstitutionDQ
-" perlSubstitutionSlash perlSubstitutionHash perlSubstitutionCurly perlSubstitutionPling
-" perlTranslationSlash perlTranslationHash perlTranslationCurly perlHereDoc perlFormatField
-" perlStringUnexpanded perlCharacter perlSpecialAscii perlConditional perlInclude
-" perlStorageClass perlPackageRef perlFunctionPRef
-" -------------------------------------------------------------------------------------------------
-
-"
-" Omni Menu
-"
-
-hi Pmenu				guifg=grey10	guibg=grey50
-hi PmenuSel				guifg=#abac84	guibg=gray12
-hi PmenuSbar			guibg=grey20
-hi PmenuThumb			guifg=grey30
-
-"
-" Right Margin
-"
-
-hi rightMargin          guibg=#453030
-
-" EOF
diff --git a/colors/northland.vim b/colors/northland.vim
deleted file mode 100755
index 3737850..0000000
--- a/colors/northland.vim
+++ /dev/null
@@ -1,149 +0,0 @@
-" Vim color file - northland
-" Maintainer:   Luka Djigas <ldigas@gmail.com>
-" URL:          http://www.vim.org/scripts/script.php?script_id=2200
-
-" Version:      0.2
-" Last Change:  24.11.2008. 19:13
-" =====
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="northland"
-" ===== :he highlight-groups
-hi Normal             gui=NONE       guifg=White         guibg=#001020       guisp=NONE
-
-hi StatusLine         gui=NONE       guifg=Black         guibg=DarkRed
-hi StatusLineNC       gui=NONE       guifg=Black         guibg=DarkGray
- hi VertSplit          gui=NONE       guifg=Black         guibg=DarkGray
-
-hi Cursor             gui=NONE       guifg=White         guibg=PaleTurquoise3
- hi CursorIM           gui=NONE       guifg=White         guibg=PaleTurquoise3
-hi CursorLine                                            guibg=#003853
- hi CursorColumn                                          guibg=#003853
-
-hi ErrorMsg           gui=NONE       guifg=Yellow        guibg=NONE
- hi WarningMsg         gui=NONE       guifg=Yellow        guibg=NONE
- hi MoreMsg            gui=NONE       guifg=Yellow        guibg=NONE
- hi Question           gui=NONE       guifg=Yellow        guibg=NONE
-hi ModeMsg            gui=bold       guifg=White         guibg=DarkRed
-
-"hi Directory          gui=NONE       guifg=DarkGreen     guibg=NONE
-"hi Directory gui=bold guifg=#0475B9	"---lighter blue
-hi Directory gui=bold guifg=#035587	"---darker blue
-
-hi Search             gui=NONE       guifg=White         guibg=DarkRed
- hi IncSearch          gui=NONE       guifg=White         guibg=DarkRed
-
-hi NonText            gui=NONE       guifg=DarkRed       guibg=NONE
-hi SpecialKey         gui=NONE       guifg=#999999       guibg=NONE
-
-hi Pmenu              gui=NONE       guifg=Black         guibg=DarkRed
-hi PmenuSel           gui=NONE       guifg=#507080       guibg=Black
-hi PmenuSbar                                             guibg=#003853
-hi PmenuThumb         gui=NONE                           guibg=Black
-hi WildMenu           gui=NONE       guifg=#507080       guibg=Black
-
-hi MatchParen         gui=bold       guifg=DarkRed       guibg=NONE
-
-hi LineNr             gui=bold       guifg=#507080       guibg=Black
-
-hi Visual             gui=NONE       guifg=NONE          guibg=DarkRed
-hi VisualNOS          gui=underline  guifg=NONE          guibg=DarkRed
-
-hi DiffAdd            gui=NONE       guifg=White         guibg=DarkGreen
-hi DiffChange         gui=NONE       guifg=White         guibg=DarkGray
-hi DiffDelete         gui=NONE       guifg=White         guibg=DarkRed
-hi DiffText           gui=NONE       guifg=White         guibg=NONE
-
-hi Folded             gui=bold       guifg=DarkGreen     guibg=Black
-hi FoldColumn         gui=NONE       guifg=#507080       guibg=Black
-hi SignColumn         gui=bold       guifg=DarkRed       guibg=Black
-
-hi SpellBad           gui=undercurl                                          guisp=Red
-hi SpellCap           gui=undercurl                                          guisp=White
-hi SpellLocal         gui=undercurl                                          guisp=Orange
- hi SpellRare          gui=undercurl                                          guisp=Orange
-
-hi TabLine            gui=NONE       guifg=#507080       guibg=Black
-hi TabLineSel         gui=bold       guifg=Black         guibg=#507080
-hi TabLineFill        gui=NONE       guifg=White         guibg=Black
-
-hi Title              gui=bold       guifg=#507080       guibg=NONE
-
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-"hi User1 ... User9
-" ===== :he group-name
-hi Comment gui=italic guifg=DarkGray
-"*Comment       any comment
-"hi Constant gui=none guifg=#0475B9	"---lighter blue
-hi Constant gui=none guifg=#035587	"---darker blue
-"*Constant      any constant
-" String        a string constant: "this is a string"
-" Character     a character constant: 'c', '\n'
-" Number        a number constant: 234, 0xff
-" Boolean       a boolean constant: TRUE, false
-" Float         a floating point constant: 2.3e10
-"hi Identifier gui=bold,italic guifg=#FB000A	"---lighter
-hi Identifier gui=bold,italic guifg=#BC0007	"---darker
-"*Identifier    any variable name
-" Function      function name (also: methods for classes)
-"hi Statement gui=bold guifg=#FF9500		"---lighter
-hi Statement gui=bold guifg=#BF6F00		"---darker
-"*Statement     any statement
-" Conditional   if, then, else, endif, switch, etc.
-" Repeat        for, do, while, etc.
-" Label         case, default, etc.
-" Operator      "sizeof", "+", "*", etc.
-" Keyword       any other keyword
-" Exception     try, catch, throw
-"hi PreProc gui=bold,italic guifg=#640A9B	"---
-"hi PreProc gui=bold,italic guifg=#576D02	"---
-hi PreProc gui=bold,italic guifg=#AD6141
-"*PreProc       generic Preprocessor
-" Include       preprocessor #include
-" Define        preprocessor #define
-" Macro         same as Define
-" PreCondit     preprocessor #if, #else, #endif, etc.
-"hi Type gui=none guifg=#14AE00	"---lighter
-hi Type gui=none guifg=#0F8200	"---darker
-"*Type          int, long, char, etc.
-" StorageClass  static, register, volatile, etc.
-" Structure     struct, union, enum, etc.
-" Typedef       A typedef
-"hi! link Special Constant
-hi! link Special Type
-"*Special       any special symbol
-" SpecialChar   special character in a constant
-" Tag           you can use CTRL-] on this
-" Delimiter     character that needs attention
-" SpecialComment special things inside a comment
-" Debug         debugging statements
-hi clear Underlined
-"*Underlined    text that stands out, HTML links
-hi! link Ignore Constant
-"*Ignore        left blank, hidden
-hi Error gui=bold guifg=Black guibg=Yellow
-"*Error         any erroneous construct
-hi! link Todo LineNr
-"*Todo          anything that needs extra attention; mostly the
-"               keywords TODO FIXME and XXX
-" ===== fortran
-hi fortranUnitHeader gui=bold guifg=Purple
-hi fortranType gui=none guifg=#0F8200
-hi! link fortranTypeR fortranType
-hi! link fortranStructure fortranType
-hi! link fortranOperator Normal		"///
-hi! link fortranNumber Normal		"///
-
-
-
-hi fortranLabelNumber guifg=DarkRed
-
-
-
-"hi fortranTodo guifg=Black guibg=#507080
-"hi fortranContinueMark guifg=White guibg=DarkRed
diff --git a/colors/northsky.vim b/colors/northsky.vim
deleted file mode 100755
index ffed1b1..0000000
--- a/colors/northsky.vim
+++ /dev/null
@@ -1,217 +0,0 @@
-" Vim color file, started as a fork of bluegreen and changed beyond any recognition
-" Maintainer:   Sergey Khorev <sergey.khorev@gmail.com>
-" Last Change: Jan 27 2010
-" URL: http://www.vim.org/scripts/script.php?script_id=586
-"      http://sites.google.com/site/khorser/opensource/vim
-" vim: sw=2:sts=2:ff=unix
-" if your text terminal supports font attributes like bold you might want 
-" to set g:CtermAttrs = 1 for better results
-" TODO update terminal colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name="northsky"
-
-hi Normal	guifg=white guibg=#061a3e gui=none
-
-hi Search	guifg=NONE guibg=#3d5b8c gui=none
-hi IncSearch	guifg=NONE guibg=NONE gui=inverse
-
-hi Cursor	guifg=#e3e3e3 guibg=#d74141 gui=none
-hi lCursor	guifg=NONE guibg=SeaGreen1 gui=none
-
-hi VertSplit	guifg=tan guibg=#800080 gui=none
-
-hi Folded	guifg=plum1 guibg=#061a3e gui=none
-hi FoldColumn	guifg=DimGrey guibg=#241572 gui=none
-hi ModeMsg	guifg=#404040 guibg=#c0c0c0 gui=bold
-hi MoreMsg	guifg=darkturquoise guibg=#188f90 gui=bold
-hi NonText	guifg=#9fadc5 guibg=#334c75 gui=none
-hi Question	guifg=#f4bb7e guibg=NONE gui=bold
-
-hi SpecialKey	guifg=#bf9261 guibg=NONE gui=none
-hi StatusLine	guifg=cyan guibg=#067c7b gui=none
-hi StatusLineNC	guifg=DimGrey guibg=#004443 gui=none
-hi Title	guifg=#8db8c3 gui=bold
-hi Visual	guifg=NONE guibg=#2b5547 gui=none
-hi VisualNOS	guibg=#628262 gui=bold
-hi WarningMsg	guifg=#f60000 gui=underline
-
-hi Comment	guifg=DarkGray guibg=NONE gui=none
-hi Constant	guifg=#72a5e4 guibg=NONE gui=none
-hi Number	guifg=chartreuse2 guibg=NONE gui=none
-hi Identifier	guifg=#72c8e4 guibg=NONE gui=none
-hi Statement	guifg=yellow guibg=NONE gui=none
-hi PreProc	guifg=#14a87c guibg=NONE gui=none
-hi Type		guifg=#ffae66 guibg=NONE gui=none
-hi Special	guifg=#ffc0c0 guibg=NONE gui=none
-hi Ignore	guifg=grey60 guibg=NONE gui=none
-hi Todo		guifg=#244c0a guibg=#9c8c84 gui=none
-hi Label	guifg=HotPink2 guibg=NONE gui=none
-
-hi WildMenu	guifg=Black guibg=Yellow gui=none
-
-hi Error	guifg=Red guibg=NONE gui=none
-hi ErrorMsg	guifg=White guibg=DarkRed gui=none
-hi DiffAdd	guifg=NONE guibg=DarkBlue gui=none
-hi DiffDelete	guifg=Yellow guibg=DarkBlue gui=none
-hi DiffChange	guifg=NONE guibg=#0b2349 gui=none
-hi DiffText	guifg=NONE guibg=#565076 gui=none
-
-hi Directory	guifg=Cyan guibg=NONE gui=none
-hi LineNr	guifg=DarkSeaGreen guibg=NONE gui=none
-
-hi SignColumn   guifg=Cyan guibg=gray39 gui=none
-
-hi PmenuThumb	guifg=gray20 gui=none
-hi PmenuSbar	guibg=gray39 gui=none
-hi PmenuSel	guifg=lightcyan guibg=blue gui=bold
-hi PMenu	guifg=black guibg=darkgray gui=none
-
-hi Underlined	gui=underline guifg=#80a0ff guibg=NONE
-
-hi MatchParen   guifg=bg guibg=#2365B6 gui=none
-
-hi CursorColumn	guifg=NONE guibg=#102F54 gui=none
-hi CursorLine	guifg=NONE guibg=#071F49 gui=none
-
-hi TabLine	guifg=white guibg=gray20 gui=none
-hi TabLineSel	guifg=black guibg=white gui=bold
-hi TabLineFill	guibg=gray20 gui=none
-
-" terminal with bold, italic etc attrs
-" use t_Co?
-if exists('g:CtermAttrs') && g:CtermAttrs
-  hi Normal	ctermfg=lightgray ctermbg=black cterm=none
-
-  hi Search	ctermfg=yellow ctermbg=darkblue cterm=bold
-  hi IncSearch	ctermfg=bg ctermbg=cyan cterm=bold
-
-  hi Cursor	ctermfg=white ctermbg=red cterm=none
-  hi lCursor	ctermfg=NONE ctermbg=lightgreen " cterm=none
-
-  hi VertSplit	ctermfg=darkblue ctermbg=cyan cterm=none
-  hi Folded	ctermfg=magenta ctermbg=bg cterm=none
-  hi FoldColumn	ctermfg=lightgray ctermbg=darkmagenta cterm=none
-  hi ModeMsg	ctermfg=black ctermbg=gray cterm=bold
-  hi MoreMsg	ctermfg=darkblue ctermbg=darkcyan cterm=none
-  hi NonText	ctermfg=gray ctermbg=darkblue cterm=none
-  hi Question	ctermfg=yellow cterm=none
-
-  hi SpecialKey	ctermfg=brown cterm=none
-  hi StatusLine	ctermfg=darkblue ctermbg=darkcyan cterm=bold
-  hi StatusLineNC ctermfg=black ctermbg=darkgray cterm=bold
-  hi Title	ctermfg=blue cterm=none
-  hi Visual	ctermfg=black ctermbg=darkgreen cterm=none
-  hi WarningMsg	ctermfg=red cterm=none
-
-  hi Comment	ctermfg=darkgray cterm=none
-  hi Constant   ctermfg=cyan term=none
-  hi Number	ctermfg=green cterm=bold
-  hi Identifier	ctermfg=white cterm=bold
-  hi Statement	ctermfg=yellow cterm=bold
-  hi PreProc	ctermfg=darkgreen cterm=none
-  hi Type	ctermfg=darkmagenta cterm=bold
-  hi Special	ctermfg=darkmagenta cterm=none
-  hi Ignore	ctermfg=gray cterm=none
-  hi Todo	ctermfg=darkblue ctermbg=lightgray cterm=none
-  hi Label	ctermfg=yellow cterm=none
-
-  hi WildMenu	cterm=bold
-
-  hi ErrorMsg   ctermfg=white ctermbg=darkred cterm=none
-  hi DiffAdd    ctermfg=white ctermbg=DarkBlue cterm=none
-  hi DiffDelete ctermfg=yellow ctermbg=darkblue cterm=bold
-  hi DiffChange ctermbg=DarkMagenta cterm=none
-  hi DiffText   cterm=bold ctermbg=Red
-
-  hi Directory	ctermfg=darkcyan cterm=none
-  hi LineNr	ctermfg=blue cterm=none
-
-  hi VisualNOS	cterm=underline,bold
-  hi SignColumn	ctermfg=Cyan ctermbg=DarkGrey
-
-  hi Pmenu	ctermfg=black ctermbg=darkgray cterm=bold
-  hi PmenuSel	ctermfg=white ctermbg=darkblue cterm=bold
-  hi PmenuSbar	ctermbg=lightgray cterm=none
-  hi PmenuThumb ctermbg=black cterm=none
-
-  hi Error	ctermfg=white ctermbg=red cterm=bold
-  hi Underlined	ctermfg=lightblue cterm=bold,underline
-
-  hi MatchParen  ctermfg=bg ctermbg=DarkGray
-
-  hi TabLine	ctermfg=82 ctermbg=15 cterm=underline
-  hi TabLineSel	ctermbg=15 ctermbg=82 cterm=bold
-  hi TabLineFill cterm=reverse
-else " usual terminal
-
-  hi Normal	ctermfg=7 ctermbg=0
-
-  hi Search	ctermfg=3 ctermbg=4 cterm=NONE
-  hi IncSearch	ctermfg=7 ctermbg=5 cterm=NONE
-
-  "hi Cursor	ctermfg=1 cterm=NONE
-  "hi lCursor	ctermfg=0 ctermbg=2*
-
-  hi VertSplit	ctermfg=0 ctermbg=7 cterm=NONE
-  hi Folded	ctermfg=5 cterm=NONE
-  hi FoldColumn	ctermfg=7 ctermbg=5 cterm=NONE
-  hi ModeMsg	ctermfg=0 ctermbg=7 cterm=NONE
-  hi MoreMsg	ctermfg=0 ctermbg=6 cterm=NONE
-  hi NonText	ctermfg=6 cterm=bold
-  hi Question	ctermfg=3 cterm=bold
-
-  hi SpecialKey	ctermfg=5 cterm=NONE
-  hi StatusLine	ctermfg=0 ctermbg=6 cterm=NONE
-  hi StatusLineNC ctermfg=4 ctermbg=7 cterm=NONE
-  hi Title	ctermfg=6 cterm=bold
-  hi Visual	ctermfg=4 ctermbg=3 cterm=NONE
-  hi WarningMsg	ctermfg=1 cterm=NONE
-
-  hi Comment	ctermfg=0 cterm=bold
-  hi Constant	ctermfg=4 cterm=bold
-  hi Number	ctermfg=2 cterm=bold
-  hi Identifier	ctermfg=6 cterm=NONE
-  hi Statement	ctermfg=3 cterm=bold
-  hi PreProc	ctermfg=2 cterm=NONE
-  hi Type     	ctermfg=3 cterm=NONE
-  hi Special	ctermfg=5 cterm=bold
-  hi Ignore	ctermfg=4 cterm=NONE
-  hi Todo     	ctermfg=4 ctermbg=3 cterm=NONE
-  hi Label	ctermfg=1 cterm=bold
-
-  hi WildMenu	ctermbg=3 cterm=NONE
-
-  hi ErrorMsg	ctermfg=7 ctermbg=1 cterm=bold
-  hi DiffAdd	ctermfg=3 ctermbg=4 cterm=bold
-  hi DiffDelete	ctermfg=3 ctermbg=1 cterm=bold
-  hi DiffChange	ctermfg=4 ctermbg=2 cterm=NONE
-  hi DiffText	ctermfg=3 ctermbg=1 cterm=bold
-
-  hi Directory	ctermfg=3 cterm=NONE
-  hi LineNr	ctermfg=4 cterm=NONE
-
-  hi VisualNOS	cterm=underline,bold
-  hi SignColumn	ctermfg=6 ctermbg=0 cterm=bold
-
-  hi Pmenu	ctermfg=0 ctermbg=4* cterm=none
-  hi PmenuSel	ctermfg=7* ctermbg=5* cterm=none
-  hi PmenuSbar	ctermbg=7 cterm=none
-  hi PmenuThumb ctermbg=0 cterm=none
-
-  hi Error	ctermfg=7 ctermbg=1 cterm=bold
-  hi Underlined	ctermfg=4 cterm=bold,underline
-
-  hi MatchParen ctermfg=0 ctermbg=7 cterm=bold
-
-  hi TabLine	ctermfg=4 ctermbg=7 cterm=none
-  hi TabLineSel ctermfg=7 ctermbg=4 cterm=none
-  hi TabLineFill cterm=reverse
-endif
-
-hi User1 guifg=black guibg=#004443 gui=none
-hi User2 ctermfg=darkblue ctermbg=blue cterm=bold guifg=blue guibg=lightblue gui=bold
diff --git a/colors/norwaytoday.vim b/colors/norwaytoday.vim
deleted file mode 100755
index 13a6b26..0000000
--- a/colors/norwaytoday.vim
+++ /dev/null
@@ -1,97 +0,0 @@
-" Vim color scheme
-"
-" Name:        norwaytoday.vim
-" Maintainer:  Josh O'Rourke <jorourke23@gmail.com> 
-" Last Change: 10 Feb 2009 
-" License:     public domain
-" Version:     0.8
-"
-" This theme is based on the Netbeans "Norway Today" theme.
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "norwaytoday"
-
-if has("gui_running")
-  highlight Normal                    guifg=#FFFFFF guibg=#121E31
-  highlight Cursor                    guibg=#FFFF00
-  highlight LineNr                    guifg=#FFFFFF guibg=#121E31
-  highlight Search                    guibg=#685D9C
-  highlight Visual                    guibg=#685D9C
-
-  " Auto-Completion Menu
-  highlight Pmenu                     guifg=grey80  guibg=grey20
-  highlight PmenuSel                  guifg=#dcdccc guifg=grey10
-  highlight PmenuSbar                 guibg=#dcdccc
-  highlight PmenuThumb                guifg=#dcdccc
-
-  " Folds
-  highlight Folded                    guifg=white   guibg=black
-
-  "rubyComment
-  highlight Comment                   guifg=#428BDD gui=italic
-
-  "rubyPseudoVariable
-  "nil, self, symbols, etc
-  highlight Constant                  guifg=#B53B3C
-
-  "rubyClass, rubyModule, rubyDefine
-  "def, end, include, etc
-  highlight Define                    guifg=#F8BB00 gui=none
-
-  "rubyError, rubyInvalidVariable
-  highlight Error                     guifg=#FFFFFF guibg=#990000
-
-  "rubyFunction
-  highlight Function                  guifg=#FFFFFF gui=italic
-
-  "rubyIdentifier
-  "@var, @@var, $var, etc
-  highlight Identifier                guifg=#EDDD3D gui=bold
-
-  "rubyInclude
-  "include, autoload, extend, load, require
-  highlight Include                   guifg=#F8BB00 gui=none
-  
-  "rubyKeyword, rubyKeywordAsMethod
-  "alias, undef, super, yield, callcc, caller, lambda, proc
-  highlight Keyword                   guifg=#F8BB00 gui=none
-
-  "rubyInteger
-  highlight Number                    guifg=#EDDD3D
-
-  "rubyControl, rubyAccess, rubyEval
-  "case, begin, do, for, if, unless, while, until, else, etc...
-  highlight Statement                 guifg=#F8BB00 gui=none 
-
-  "rubyString
-  highlight String                    guifg=#E2CE00
-
-  "rubyConstant
-  highlight Type                      guifg=#8AA6C1 gui=none
-
-  highlight Title                     guifg=#FFFFFF
-
-  "highlight DiffAdd                   guifg=#990000
-  "highlight DiffDelete                guifg=#990000
-  
-  highlight xmlTag                    guifg=#F8BB00
-  highlight xmlTagName                guifg=#F8BB00
-  highlight xmlEndTag                 guifg=#F8BB00
-  highlight xmlComment                guifg=#7F7F7F
-  highlight xmlAttrib                 guifg=#007C00
-  highlight xmlEntity                 guifg=#99006B
-  
-  hi link htmlTag                     xmlTag
-  hi link htmlTagName                 xmlTagName
-  hi link htmlEndTag                  xmlEndTag
-  hi link htmlComment                 xmlComment
-  hi link htmlArg                     xmlAttrib
-  "hi link htmlPreAttr                 xmlEntity
-  hi link htmlString                  xmlEntity
-endif
diff --git a/colors/nour.vim b/colors/nour.vim
deleted file mode 100755
index 05eb518..0000000
--- a/colors/nour.vim
+++ /dev/null
@@ -1,165 +0,0 @@
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-"begin dw_green copy/paste
-"--------------------------------------------------------------------
-
-" Name Of File: dw_green.vim.
-
-" Description: Gvim colorscheme, designed against VIM 7.0 GUI
-
-" By: Steve Cadwallader
-
-" Contact: demwiz@gmail.com
-
-" Credits: Inspiration from the brookstream and redblack schemes.
-
-" Last Change: Saturday, September 17, 2006.
-
-" Installation: Drop this file in your $VIMRUNTIME/colors/ directory.
-
-"--------------------------------------------------------------------
-
-
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-
-    syntax reset
-
-endif
-
-let g:colors_name="dw_green"
-
-
-
-"--------------------------------------------------------------------
-
-
-
-hi Boolean                                       guifg=#00ff00
-
-hi cDefine                                       guifg=#00ff00
-
-hi cInclude                                      guifg=#ffffff
-
-hi Comment                                       guifg=#696969
-
-hi Constant                                      guifg=#00ff00
-
-hi Cursor                         guibg=#444444  guifg=#ffffff
-
-hi CursorColumn                   guibg=#001100
-
-hi CursorLine                     guibg=#001800
-
-hi DiffAdd                        guibg=#333333  guifg=#00ff00
-
-hi DiffChange                     guibg=#333333  guifg=#00ff00
-
-hi DiffDelete                     guibg=#333333  guifg=#00ff00
-
-hi DiffText                       guibg=#333333  guifg=#ffffff
-
-hi Directory                      guibg=#000000  guifg=#00ff00
-
-hi ErrorMsg                       guibg=#ffffff  guifg=#000000
-
-hi FoldColumn                     guibg=#222222  guifg=#ff0000
-
-hi Folded                         guibg=#222222  guifg=#ff0000
-
-hi Function                       guibg=#000000  guifg=#00ff00
-
-hi Identifier                     guibg=#000000  guifg=#00bb00
-
-hi IncSearch       gui=none       guibg=#00bb00  guifg=#000000
-
-hi LineNr                         guibg=#000000  guifg=#008800
-
-hi MatchParen      gui=none       guibg=#222222  guifg=#00ff00
-
-hi ModeMsg                        guibg=#000000  guifg=#00ff00
-
-hi MoreMsg                        guibg=#000000  guifg=#00ff00
-
-hi NonText                        guibg=#000000  guifg=#ffffff
-
-hi Normal          gui=none       guibg=#000000  guifg=#c0c0c0
-
-hi Operator        gui=none                      guifg=#696969
-
-hi PreProc         gui=none                      guifg=#ffffff
-
-hi Question                                      guifg=#00ff00
-
-hi Search          gui=none       guibg=#00ff00  guifg=#000000
-
-hi SignColumn                     guibg=#111111  guifg=#ffffff
-
-hi Special         gui=none       guibg=#000000  guifg=#ffffff
-
-hi SpecialKey                     guibg=#000000  guifg=#00ff00
-
-hi Statement       gui=bold                      guifg=#00ff00
-
-hi StatusLine      gui=none       guibg=#008800  guifg=#000000
-
-hi StatusLineNC    gui=none       guibg=#444444  guifg=#000000
-
-hi String          gui=none                      guifg=#00bb00
-
-hi TabLine         gui=none       guibg=#444444  guifg=#000000
-
-hi TabLineFill     gui=underline  guibg=#000000  guifg=#ffffff
-
-hi TabLineSel      gui=none       guibg=#00aa00  guifg=#000000
-
-hi Title           gui=none                      guifg=#00ff00
-
-hi Todo            gui=none       guibg=#000000  guifg=#ff0000
-
-hi Type            gui=none                      guifg=#ffffff
-
-hi VertSplit       gui=none       guibg=#000000  guifg=#ffffff
-
-hi Visual                         guibg=#00dd00  guifg=#000000
-
-hi WarningMsg                     guibg=#888888  guifg=#000000
-
-
-
-"- end of colorscheme -----------------------------------------------  
-
-
-" begin mods to dw_green
-highlight Identifier guifg=#aaff00
-highlight Normal guifg=#efefff
-highlight Type guifg=white
-highlight Special guifg=#ffffee
-highlight PreProc guifg=#99ff99
-highlight Statement guifg=#66ff33 gui=NONE
-highlight SpecialKey guifg=yellow
-highlight Function guifg=#99bbff
-highlight String guifg=#ffcc33
-highlight Search gui=reverse guifg=NONE guibg=NONE
-highlight StatusLine guibg=#99ff00 guifg=black
-highlight StatusLineNC guifg=black guibg=#ff9900
-highlight Cursor guibg=#444444
-highlight CursorLine guibg=#222222
-highlight CursorColumn guibg=#222222
-highlight LineNr guifg=#0099ff
-highlight MBENormal guibg=#000000 guifg=#99ff00
-highlight MBEVisibleNormal guibg=#121212 guifg=#33ff00
-highlight MBEVisibleChanged guifg=yellow
-highlight myAssignments guifg=#99ff00
-highlight myDots  guifg=#0099ff
-highlight mySemis guifg=#99ff00
-match myAssignments /\(=\)\|\(:\)\|\( \* \)\|\( - \)\|\( + \)\|\( < \)\|\( >= \)\|\( <= \)/
-2match myDots /\(\$\)\|\(\.\)/
-3match mySemis /(\|)\|\(;\)\|\(,\)/
diff --git a/colors/nuvola.vim b/colors/nuvola.vim
deleted file mode 100755
index f9a608a..0000000
--- a/colors/nuvola.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:	Dr. J. Pfefferl <johann.pfefferl@agfa.com>
-" Source:	$Source: /MISC/projects/cvsroot/user/pfefferl/vim/colors/nuvola.vim,v $
-" Id:	$Id: nuvola.vim,v 1.14 2003/08/11 14:03:28 pfefferl Exp $
-" Last Change:	$Date: 2003/08/11 14:03:28 $
-
-" Intro {{{1
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "nuvola"
-
-" Normal {{{1
-hi Normal ctermfg=black ctermbg=NONE guifg=black guibg=#F9F5F9
-
-" Search {{{1
-hi IncSearch cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=UNDERLINE guifg=Black guibg=#FFE568
-hi Search term=reverse cterm=UNDERLINE ctermfg=Black ctermbg=brown gui=NONE guifg=Black guibg=#FFE568
-
-" Messages {{{1
-hi ErrorMsg gui=BOLD guifg=#EB1513 guibg=NONE
-hi! link WarningMsg ErrorMsg
-hi ModeMsg gui=BOLD guifg=#0070ff guibg=NONE
-hi MoreMsg guibg=NONE guifg=seagreen
-hi! link Question MoreMsg
-
-" Split area {{{1
-hi StatusLine term=BOLD,reverse cterm=NONE ctermfg=Yellow ctermbg=DarkGray gui=BOLD guibg=#56A0EE guifg=white
-hi StatusLineNC gui=NONE guibg=#56A0EE guifg=#E9E9F4
-hi! link VertSplit StatusLineNC
-hi WildMenu gui=UNDERLINE guifg=#56A0EE guibg=#E9E9F4
-
-" Diff {{{1
-hi DiffText   gui=NONE guifg=#f83010 guibg=#ffeae0
-hi DiffChange gui=NONE guifg=#006800 guibg=#d0ffd0
-hi DiffDelete gui=NONE guifg=#2020ff guibg=#c8f2ea
-hi! link DiffAdd DiffDelete
-
-" Cursor {{{1
-hi Cursor       gui=none guifg=black guibg=orange
-"hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold {{{1
-hi Folded gui=NONE guibg=#B5EEB5 guifg=black
-"hi FoldColumn gui=NONE guibg=#9FD29F guifg=black
-hi! link FoldColumn Folded
-
-" Other {{{1
-hi Directory    gui=NONE guifg=#0000ff guibg=NONE
-hi LineNr       gui=NONE guifg=#8080a0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4000ff guibg=#EFEFF7
-"hi SpecialKey   gui=NONE guifg=#A35B00 guibg=NONE
-hi Title        gui=BOLD guifg=#1014AD guibg=NONE
-hi Visual term=reverse ctermfg=yellow ctermbg=black gui=NONE guifg=Black guibg=#BDDFFF
-hi VisualNOS term=reverse ctermfg=yellow ctermbg=black gui=UNDERLINE guifg=Black guibg=#BDDFFF
-
-" Syntax group {{{1
-hi Comment term=BOLD ctermfg=darkgray guifg=#3F6B5B
-hi Constant term=UNDERLINE ctermfg=red guifg=#B91F49
-hi Error term=REVERSE ctermfg=15 ctermbg=9 guibg=Red guifg=White
-hi Identifier term=UNDERLINE ctermfg=Blue guifg=Blue
-hi Number   term=UNDERLINE ctermfg=red gui=NONE guifg=#00C226
-hi PreProc term=UNDERLINE ctermfg=darkblue guifg=#1071CE
-hi Special term=BOLD ctermfg=darkmagenta guifg=red2
-hi Statement term=BOLD ctermfg=DarkRed gui=NONE guifg=#F06F00
-hi Tag term=BOLD ctermfg=DarkGreen guifg=DarkGreen
-hi Todo term=STANDOUT ctermbg=Yellow ctermfg=blue guifg=Blue guibg=Yellow
-hi Type term=UNDERLINE ctermfg=Blue gui=NONE guifg=Blue
-hi! link String	Constant
-hi! link Character	Constant
-hi! link Boolean	Constant
-hi! link Float		Number
-hi! link Function	Identifier
-hi! link Conditional	Statement
-hi! link Repeat	Statement
-hi! link Label		Statemengreen
-hi! link Operator	Statement
-hi! link Keyword	Statement
-hi! link Exception	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 SpecialChar	Special
-hi! link Delimiter	Special
-hi! link SpecialComment Special
-hi! link Debug		Special
-
-" HTML {{{1
-hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
-" vim600:foldmethod=marker
diff --git a/colors/obsidian.vim b/colors/obsidian.vim
deleted file mode 100755
index 9288e6f..0000000
--- a/colors/obsidian.vim
+++ /dev/null
@@ -1,341 +0,0 @@
-" Vim color file
-" Maintainer:    Daniel Bolton <danielbarrettbolton@gmail.com>
-" Last Modified: 2010-07-04
-" Version: 0.1
-"
-" This scheme is based on the excellent lucius scheme. The cfterm colors are
-" in fact exactly the same, and exist simply because I was too lazy to remove
-" them yet.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name="obsidian"
-
-" Some other colors to save
-" blue: 3eb8e5
-" green: 92d400
-" c green: d5f876, cae682
-" new blue: 002D62
-" new gray: CCCCCC
-
-
-" Base color
-" ----------
-hi Normal           guifg=#D4D2CF           guibg=#201F1F
-hi Normal           ctermfg=253             ctermbg=235
-
-
-" Comment Group
-" -------------
-" any comment
-hi Comment          guifg=#787775                                  gui=italic
-hi Comment          ctermfg=240                                     cterm=none
-
-
-" Constant Group
-" --------------
-" any constant
-hi Constant         guifg=#ff0000                                  gui=none
-hi Constant         ctermfg=116                                     cterm=none
-" strings
-hi String           guifg=#E85848                                   gui=none
-hi String           ctermfg=110                                     cterm=none
-" character constant
-hi Character        guifg=#96BFF0                                   gui=none
-hi Character        ctermfg=110                                     cterm=none
-" numbers decimal/hex
-hi Number           guifg=#C0A25F                                   gui=none
-hi Number           ctermfg=116                                     cterm=none
-" true, false
-hi Boolean          guifg=#C0A25F                                   gui=none
-hi Boolean          ctermfg=116                                     cterm=none
-" float
-hi Float            guifg=#C0A25F                                  gui=none
-hi Float            ctermfg=116                                     cterm=none
-
-
-" Identifier Group
-" ----------------
-" any variable name
-hi Identifier       guifg=#508ED8                                   gui=none
-hi Identifier       ctermfg=216                                     cterm=none
-" function, method, class
-hi Function         guifg=#8E79A5                                   gui=none
-hi Function         ctermfg=216                                     cterm=none
-
-
-" Statement Group
-" ---------------
-" any statement
-hi Statement        guifg=#8E79A5                                   gui=none
-hi Statement        ctermfg=150                                     cterm=none
-" if, then, else
-hi Conditional      guifg=#00A000                                   gui=none
-hi Conditional      ctermfg=150                                     cterm=none
-" try, catch, throw, raise
-hi Exception        guifg=#4A5704                                   gui=none
-hi Exception        ctermfg=150                                     cterm=none
-" for, while, do
-hi Repeat           guifg=#DBA716                                 gui=none
-hi Repeat           ctermfg=150                                     cterm=none
-" case, default
-hi Label            guifg=#8E79A5                                   gui=none
-hi Label            ctermfg=150                                     cterm=none
-" sizeof, +, *
-hi Operator         guifg=#FF9FEC                                   gui=none
-hi Operator         ctermfg=150                                     cterm=none
-" any other keyword, e.g. 'sub'
-hi Keyword          guifg=#AA3000                                   gui=none
-hi Keyword          ctermfg=150                                     cterm=none
-
-
-" Preprocessor Group
-" ------------------
-" generic preprocessor
-hi PreProc          guifg=#78B753                                   gui=none
-hi PreProc          ctermfg=223                                     cterm=none
-" #include
-hi Include          guifg=#78B753                                   gui=none
-hi Include          ctermfg=223                                     cterm=none
-" #define
-hi Define           guifg=#78B753                                   gui=none
-hi Define           ctermfg=223                                     cterm=none
-" same as define
-hi Macro            guifg=#78B753                                   gui=none
-hi Macro            ctermfg=223                                     cterm=none
-" #if, #else, #endif
-hi PreCondit        guifg=#78B753                                   gui=none
-hi PreCondit        ctermfg=223                                     cterm=none
-
-
-" Type Group
-" ----------
-" int, long, char
-hi Type             guifg=#508ED8                                   gui=none
-hi Type             ctermfg=115                                     cterm=none
-" static, register, volative
-hi StorageClass     guifg=#508ED8                                   gui=none
-hi StorageClass     ctermfg=115                                     cterm=none
-" struct, union, enum
-hi Structure        guifg=#508ED8                                   gui=none
-hi Structure        ctermfg=115                                     cterm=none
-" typedef
-hi Typedef          guifg=#508ED8                                   gui=none
-hi Typedef          ctermfg=115                                     cterm=none
-
-
-" Special Group
-" -------------
-" any special symbol
-hi Special          guifg=#C00000                                   gui=none
-hi Special          ctermfg=181                                     cterm=none
-" special character in a constant
-hi SpecialChar      guifg=#C00000                                   gui=none
-hi SpecialChar      ctermfg=181                                     cterm=none
-" things you can CTRL-]
-hi Tag              guifg=#C00000                                   gui=none
-hi Tag              ctermfg=181                                     cterm=none
-" character that needs attention
-hi Delimiter        guifg=#C00000                                   gui=none
-hi Delimiter        ctermfg=181                                     cterm=none
-" special things inside a comment
-hi SpecialComment   guifg=#C00000                                   gui=none
-hi SpecialComment   ctermfg=181                                     cterm=none
-" debugging statements
-hi Debug            guifg=#C00000           guibg=NONE              gui=none
-hi Debug            ctermfg=181             ctermbg=NONE            cterm=none
-
-
-" Underlined Group
-" ----------------
-" text that stands out, html links
-hi Underlined       guifg=fg                                        gui=underline
-hi Underlined       ctermfg=fg                                      cterm=underline
-
-
-" Ignore Group
-" ------------
-" left blank, hidden
-hi Ignore           guifg=bg
-hi Ignore           ctermfg=bg
-
-
-" Error Group
-" -----------
-" any erroneous construct
-hi Error            guifg=#E85848           guibg=#451E1A           gui=none
-hi Error            ctermfg=167             ctermbg=52            cterm=none
-
-
-" Todo Group
-" ----------
-" todo, fixme, note, xxx
-hi Todo             guifg=#C0A25F           guibg=NONE              gui=underline
-hi Todo             ctermfg=228             ctermbg=NONE            cterm=underline
-
-
-" Spelling
-" --------
-" word not recognized
-hi SpellBad         guisp=#ee0000                                   gui=undercurl
-hi SpellBad                                 ctermbg=9               cterm=undercurl
-" word not capitalized
-hi SpellCap         guisp=#eeee00                                   gui=undercurl
-hi SpellCap                                 ctermbg=12              cterm=undercurl
-" rare word
-hi SpellRare        guisp=#ffa500                                   gui=undercurl
-hi SpellRare                                ctermbg=13              cterm=undercurl
-" wrong spelling for selected region
-hi SpellLocal       guisp=#ffa500                                   gui=undercurl
-hi SpellLocal                               ctermbg=14              cterm=undercurl
-
-
-" Cursor
-" ------
-" character under the cursor
-hi Cursor           guifg=fg                guibg=#0078FF
-hi Cursor           ctermfg=bg              ctermbg=153
-" like cursor, but used when in IME mode
-hi CursorIM         guifg=bg                guibg=#96cdcd
-hi CursorIM         ctermfg=bg              ctermbg=116
-" cursor column
-hi CursorColumn     guifg=NONE              guibg=#202438           gui=none
-hi CursorColumn     ctermfg=NONE            ctermbg=236             cterm=none
-" cursor line/row
-hi CursorLine       gui=NONE                guibg=#202438           gui=none
-hi CursorLine       cterm=NONE              ctermbg=236             cterm=none
-
-
-" Misc
-" ----
-" directory names and other special names in listings
-hi Directory        guifg=#c0e0b0                                   gui=none
-hi Directory        ctermfg=151                                     cterm=none
-" error messages on the command line
-hi ErrorMsg         guifg=#E85848           guibg=#461E1A              gui=none
-hi ErrorMsg         ctermfg=196             ctermbg=NONE            cterm=none
-" column separating vertically split windows
-hi VertSplit        guifg=#777777           guibg=#363946           gui=none
-hi VertSplit        ctermfg=242             ctermbg=237             cterm=none
-" columns where signs are displayed (used in IDEs)
-hi SignColumn       guifg=#9fafaf           guibg=#181818           gui=none
-hi SignColumn       ctermfg=145             ctermbg=233             cterm=none
-" line numbers
-hi LineNr           guifg=#B4D3B1           guibg=#323232
-hi LineNr           ctermfg=102             ctermbg=237
-" match parenthesis, brackets
-hi MatchParen       guifg=#00ff00           guibg=NONE              gui=bold
-hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=bold
-" the 'more' prompt when output takes more than one line
-hi MoreMsg          guifg=#2e8b57                                   gui=none
-hi MoreMsg          ctermfg=29                                      cterm=none
-" text showing what mode you are in
-hi ModeMsg          guifg=fg           guibg=NONE              gui=bold
-hi ModeMsg          ctermfg=117             ctermbg=NONE            cterm=none
-" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
-hi NonText          guifg=#404040                                   gui=none
-hi NonText          ctermfg=235                                     cterm=none
-" the hit-enter prompt (show more output) and yes/no questions
-hi Question         guifg=fg                                        gui=none
-hi Question         ctermfg=fg                                      cterm=none
-" meta and special keys used with map, unprintable characters
-hi SpecialKey       guifg=#404040
-hi SpecialKey       ctermfg=237
-" titles for output from :set all, :autocmd, etc
-hi Title            guifg=#62bdde                                   gui=none
-hi Title            ctermfg=74                                      cterm=none
-"hi Title            guifg=#5ec8e5                                   gui=none
-" warning messages
-hi WarningMsg       guifg=#e5786d                                   gui=none
-hi WarningMsg       ctermfg=173                                     cterm=none
-" current match in the wildmenu completion
-hi WildMenu         guifg=#cae682           guibg=#363946           gui=bold,underline
-hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
-
-
-" Diff
-" ----
-" added line
-hi DiffAdd          guifg=#0000FF           guibg=#201F1F           gui=none
-hi DiffAdd          ctermfg=108             ctermbg=22              cterm=none
-" changed line
-hi DiffChange       guifg=NONE              guibg=#4a343a           gui=none
-hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
-" deleted line
-hi DiffDelete       guifg=#FF0000           guibg=#3c3631           gui=none
-hi DiffDelete       ctermfg=59              ctermbg=58              cterm=none
-" changed text within line
-hi DiffText         guifg=#f05060           guibg=#4a343a           gui=bold
-hi DiffText         ctermfg=203             ctermbg=52             cterm=bold
-
-
-" Folds
-" -----
-" line used for closed folds
-hi Folded           guifg=#91d6f8           guibg=#363946           gui=none
-hi Folded           ctermfg=117             ctermbg=238             cterm=none
-" column on side used to indicated open and closed folds
-hi FoldColumn       guifg=#91d6f8           guibg=#363946           gui=none
-hi FoldColumn       ctermfg=117             ctermbg=238             cterm=none
-
-
-" Search
-" ------
-" highlight incremental search text; also highlight text replaced with :s///c
-hi IncSearch        guifg=#302F2F guibg=#C0A25F                   gui=none
-hi IncSearch        ctermfg=87                                      cterm=reverse
-" hlsearch (last search pattern), also used for quickfix
-hi Search                                    guibg=#C0A25F          gui=none
-hi Search                                    ctermbg=214            cterm=none
-
-
-" Popup Menu
-" ----------
-" normal item in popup
-hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
-" selected item in popup
-hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
-" scrollbar in popup
-hi PMenuSbar                                guibg=#505860           gui=none
-hi PMenuSbar                                ctermbg=59              cterm=none
-" thumb of the scrollbar in the popup
-hi PMenuThumb                               guibg=#808890           gui=none
-hi PMenuThumb                               ctermbg=102             cterm=none
-
-
-" Status Line
-" -----------
-" status line for current window
-hi StatusLine       guifg=#508ED8           guibg=#1C2C3F           gui=bold
-hi StatusLine       ctermfg=254             ctermbg=237             cterm=bold
-" status line for non-current windows
-hi StatusLineNC     guifg=#78777f           guibg=#302F2F          gui=none
-hi StatusLineNC     ctermfg=244             ctermbg=237             cterm=none
-
-
-" Tab Lines
-" ---------
-" tab pages line, not active tab page label
-hi TabLine          guifg=#b6bf98           guibg=#363946           gui=none
-hi TabLine          ctermfg=244             ctermbg=236             cterm=none
-" tab pages line, where there are no labels
-hi TabLineFill      guifg=#cfcfaf           guibg=#363946           gui=none
-hi TabLineFill      ctermfg=187             ctermbg=236             cterm=none
-" tab pages line, active tab page label
-hi TabLineSel       guifg=#efefef           guibg=#414658           gui=bold
-hi TabLineSel       ctermfg=254             ctermbg=236             cterm=bold
-
-
-" Visual
-" ------
-" visual mode selection
-hi Visual           guifg=NONE              guibg=#1A2B40
-hi Visual           ctermfg=NONE            ctermbg=24
-" visual mode selection when vim is not owning the selection (x11 only)
-hi VisualNOS        guifg=fg                                        gui=underline
-hi VisualNOS        ctermfg=fg                                      cterm=underline
diff --git a/colors/obsidian2.vim b/colors/obsidian2.vim
deleted file mode 100755
index ad7f64d..0000000
--- a/colors/obsidian2.vim
+++ /dev/null
@@ -1,74 +0,0 @@
-" Vim color file
-" Name: Obsidian
-" Maintainer: Aydar Khabibullin <aydar.kh@gmail.com>
-" Version: 0.5
-" Date: 01/30/2011 12:35:30 AM
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="obsidian2"
-
-let s:Colors = [
-\'#a082bd','#e0e2e4','#93c763',
-\'#ffcd22','#ec7600','#ff8409',
-\'#e8e2b7','#d39745','#66747b',
-\'#678cb1','#5899c0','#5ab9be',
-\'#293134','#2f393c','#f3db2e']
-
-" Syntax
-execute "hi Normal  guifg="     . s:Colors[1]  . " guibg=" . s:Colors[12]
-execute "hi Comment guifg="     . s:Colors[8]  . " guibg=" . s:Colors[12] . " gui=italic"
-execute "hi Conditional guifg=" . s:Colors[2]  . " guibg=" . s:Colors[12]
-execute "hi Constant guifg="    . s:Colors[1]  . " guibg=" . s:Colors[12]
-execute "hi Error guifg="       . s:Colors[7]  . " guibg=" . s:Colors[12]
-execute "hi Identifier guifg="  . s:Colors[9]  . " guibg=" . s:Colors[12]
-execute "hi Ignore guifg="      . s:Colors[1]
-execute "hi Operator guifg="    . s:Colors[6]  . " guibg=" . s:Colors[12]
-execute "hi PreProc guifg="     . s:Colors[0]  . " guibg=" . s:Colors[12]
-execute "hi Repeat guifg="      . s:Colors[2]  . " guibg=" . s:Colors[12]
-execute "hi Special guifg="     . s:Colors[2]  . " guibg=" . s:Colors[12]
-execute "hi Statement guifg="   . s:Colors[2]  . " guibg=" . s:Colors[12]
-execute "hi Number guifg="      . s:Colors[3]  . " guibg=" . s:Colors[12]
-execute "hi Boolean guifg="     . s:Colors[11] . " guibg=" . s:Colors[12]
-execute "hi String guifg="      . s:Colors[5]  . " guibg=" . s:Colors[12]
-execute "hi Character guifg="   . s:Colors[5]  . " guibg=" . s:Colors[12]
-execute "hi Title guifg="       . s:Colors[1]  . " guibg=" . s:Colors[12]
-execute "hi Todo guifg="        . s:Colors[12] . " guibg=" . s:Colors[0]  . " gui=bold guisp=NONE"
-execute "hi Type guifg="        . s:Colors[9]  . " guibg=" . s:Colors[12]
-execute "hi Underline guifg="   . s:Colors[10] . " guibg=" . s:Colors[12]
-
-" Groups
-execute "hi Cursor guifg="      . s:Colors[8]  . " guibg=" . s:Colors[4]
-execute "hi CursorIM guifg="    . s:Colors[7]  . " guibg=" . s:Colors[4]
-execute "hi CursorLine guifg=NONE guibg=" . s:Colors[13]
-execute "hi CursorColumn guifg=". s:Colors[1]  . " guibg=" . s:Colors[13]
-execute "hi Directory guifg="   . s:Colors[10] . " guibg=" . s:Colors[12]
-execute "hi ErrorMsg guifg="    . s:Colors[13] . " guibg=" . s:Colors[7]
-execute "hi FoldColumn guifg="  . s:Colors[13] . " guibg=" . s:Colors[12]
-execute "hi Folded guifg="      . s:Colors[12] . " guibg=" . s:Colors[11]
-execute "hi IncSearch guifg="   . s:Colors[1]  . " guibg=" . s:Colors[12] . " gui=none"
-execute "hi LineNr guifg="      . s:Colors[8]  . " guibg=" . s:Colors[12] . " gui=none"
-execute "hi MatchParen guifg="  . s:Colors[12] . " guibg=" . s:Colors[4]  . " gui=bold"
-execute "hi ModeMsg guifg="     . s:Colors[5]  . " guibg=" . s:Colors[12]
-execute "hi MoreMsg guifg="     . s:Colors[5]  . " guibg=" . s:Colors[12]
-execute "hi NonText guifg="     . s:Colors[1]  . " guibg=" . s:Colors[12]
-execute "hi Pmenu guifg="       . s:Colors[1]  . " guibg=" . s:Colors[8]
-execute "hi PmenuSel guifg="    . s:Colors[13] . " guibg=" . s:Colors[9]
-execute "hi Question guifg="    . s:Colors[0]  . " guibg=" . s:Colors[12]
-execute "hi Search guifg="      . s:Colors[0]  . " guibg=" . s:Colors[12]
-execute "hi SpecialKey guifg="  . s:Colors[10] . " guibg=" . s:Colors[12]
-execute "hi StatusLine guifg="  . s:Colors[1]  . " guibg=" . s:Colors[9]  . " gui=none"
-execute "hi StatusLineNC guifg=" . s:Colors[1] . " guibg=" . s:Colors[8]  . " gui=none"
-execute "hi TabLine guifg="     . s:Colors[8]  . " guibg=" . s:Colors[12] . " gui=none"
-execute "hi TabLineFill guifg=" . s:Colors[12] . " guibg=" . s:Colors[13] . " gui=none"
-execute "hi TabLineSel guifg="  . s:Colors[1]  . " guibg=" . s:Colors[13] . " gui=none"
-execute "hi Tooltip guifg="     . s:Colors[9]  . " guibg=" . s:Colors[8]  . " gui=none"
-execute "hi VertSplit guifg="   . s:Colors[0]  . " guibg=" . s:Colors[13] . " gui=none"
-execute "hi Visual  guifg="     . s:Colors[1]  . " guibg=" . s:Colors[0]  . " gui=none"
-hi VisualNOS gui=none guibg=black
-execute "hi WarningMsg  guifg=" . s:Colors[5]  . " guibg=" . s:Colors[12]  . " gui=none"
-execute "hi WildMenu  guifg="   . s:Colors[14]  . " guibg=" . s:Colors[5]  . " gui=none"
-
diff --git a/colors/oceanblack.vim b/colors/oceanblack.vim
deleted file mode 100755
index e6e6be3..0000000
--- a/colors/oceanblack.vim
+++ /dev/null
@@ -1,115 +0,0 @@
-" Vim color file
-" Maintainer: Chris Vertonghen <chris@vertonghen.org>
-" Last Change: 2003-03-25
-" Version: 0.1
-" based on Tom Regner's oceanblue.vim
-
-""" Init
-set background=dark
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "oceanblack"
-
-
-""""""""\ Colors \""""""""
-
-
-"""" GUI Colors
-
-highlight Cursor        gui=None guibg=PaleTurquoise3 guifg=White
-highlight CursorIM gui=bold guifg=white guibg=PaleTurquoise3
-highlight Directory     guifg=LightSeaGreen guibg=bg
-highlight DiffAdd gui=None guifg=fg guibg=DarkCyan
-highlight DiffChange gui=None guifg=fg guibg=Green4
-highlight DiffDelete gui=None guifg=fg guibg=black
-highlight DiffText gui=bold guifg=fg guibg=bg
-highlight ErrorMsg      guifg=LightYellow  guibg=FireBrick
-" previously 'FillColumn':
-"highlight FillColumn    gui=NONE guifg=black guibg=grey60
-highlight VertSplit    gui=NONE guifg=black guibg=grey60
-highlight Folded        gui=bold guibg=#305060 guifg=#b0d0e0
-highlight FoldColumn        gui=None guibg=#305060 guifg=#b0d0e0
-highlight IncSearch gui=reverse guifg=fg guibg=bg
-"highlight LineNr        guibg=grey6 guifg=LightSkyBlue3
-highlight LineNr        guibg=grey6 guifg=#777777
-highlight ModeMsg       guibg=DarkGreen guifg=LightGreen
-highlight MoreMsg       gui=bold  guifg=SeaGreen4 guibg=bg
-if version < 600
-    " same as SpecialKey
-    highlight NonText       guibg=#123A4A guifg=#3D5D6D
-else
-    " Bottom fill (use e.g. same as LineNr)
-    highlight NonText       gui=None guibg=#000000 guifg=LightSkyBlue
-endif
-highlight Normal        gui=None guibg=#000000 guifg=honeydew2
-highlight Question      gui=bold  guifg=SeaGreen2 guibg=bg
-highlight Search        gui=NONE guibg=LightSkyBlue4 guifg=NONE
-highlight SpecialKey    guibg=#103040 guifg=#324262
-highlight StatusLine    gui=bold guibg=grey88 guifg=black
-highlight StatusLineNC  gui=NONE guibg=grey60 guifg=grey10
-highlight Title         gui=bold  guifg=MediumOrchid1 guibg=bg
-highlight Visual        gui=reverse guibg=WHITE guifg=SeaGreen
-highlight VisualNOS     gui=bold,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=bold guifg=FireBrick1 guibg=bg
-highlight WildMenu      gui=bold guibg=Chartreuse guifg=Black
-
-
-"""" Syntax Colors
-
-"highlight Comment       gui=reverse guifg=#507080
-"highlight Comment       gui=None guifg=#507080
-highlight Comment       gui=None guifg=#7C7268
-
-highlight Constant      guifg=cyan3 guibg=bg
-"hi String gui=None guifg=turquoise2 guibg=bg
-hi String gui=None guifg=#80a0ff guibg=bg
-    "hi Character gui=None guifg=Cyan guibg=bg
-    "highlight Number gui=None guifg=Cyan guibg=bg
-    highlight Number gui=None guifg=Cyan guibg=black
-    highlight Boolean gui=bold guifg=Cyan guibg=bg
-    "hi Float gui=None guifg=Cyan guibg=bg
-
-highlight Identifier    guifg=LightSkyBlue3
-hi Function gui=None guifg=DarkSeaGreen3 guibg=bg
-
-highlight Statement     gui=NONE guifg=LightGreen
-    highlight Conditional gui=None guifg=LightGreen guibg=bg
-    highlight Repeat gui=None guifg=SeaGreen2 guibg=bg
-    "hi Label gui=None guifg=LightGreen guibg=bg
-    highlight Operator gui=None guifg=Chartreuse guibg=bg
-    highlight Keyword gui=None guifg=LightGreen guibg=bg
-    highlight Exception gui=None guifg=LightGreen guibg=bg
-
-highlight PreProc       guifg=SkyBlue1
-hi Include gui=None guifg=LightSteelBlue3 guibg=bg
-hi Define gui=None guifg=LightSteelBlue2 guibg=bg
-hi Macro gui=None guifg=LightSkyBlue3 guibg=bg
-hi PreCondit gui=None guifg=LightSkyBlue2 guibg=bg
-
-highlight Type          gui=NONE guifg=LightBlue
-hi StorageClass gui=None guifg=LightBlue guibg=bg
-hi Structure gui=None guifg=LightBlue guibg=bg
-hi Typedef gui=None guifg=LightBlue guibg=bg
-
-"highlight Special       gui=bold guifg=aquamarine3
-highlight Special       guifg=#999999
-    "hi SpecialChar gui=bold guifg=White guibg=bg
-    "hi Tag gui=bold guifg=White guibg=bg
-    "hi Delimiter gui=bold guifg=White guibg=bg
-    "hi SpecialComment gui=bold guifg=White guibg=bg
-    "hi Debug gui=bold guifg=White guibg=bg
-
-highlight Underlined gui=underline guifg=honeydew4 guibg=bg
-
-highlight Ignore    guifg=#204050
-
-highlight Error      guifg=LightYellow  guibg=FireBrick
-
-highlight Todo          guifg=Cyan guibg=#507080
-
-""" OLD COLORS
-
-
-
diff --git a/colors/oceanblack256.vim b/colors/oceanblack256.vim
deleted file mode 100755
index a04dc78..0000000
--- a/colors/oceanblack256.vim
+++ /dev/null
@@ -1,125 +0,0 @@
-" Vim color file
-" Maintainer:	Juan frias <juandfrias at gmail dot com>
-" Last Change:	2007 Mar 29
-" Version:	1.0.0
-" URL:		http://www.axisym3.net/jdany/vim-the-editor/#oceanblack256
-"
-" These are the colors of the "OceanBlack" theme by Chris Vertonghen modified
-" to work on 256-color xterms.
-"
-set background=dark
-
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "oceanblack256"
-
-highlight Normal         cterm=none           ctermfg=7 ctermbg=0
-highlight NonText        cterm=none           ctermfg=117 ctermbg=0
-
-highlight Visual         cterm=reverse        ctermfg=72  ctermbg=15
-highlight VisualNOS      cterm=bold,underline ctermfg=151 ctermbg=0
-
-highlight Cursor         cterm=none           ctermfg=15  ctermbg=152
-highlight CursorIM       cterm=bold           ctermfg=15  ctermbg=152
-"highlight CursorColumn
-"highlight CursorLine
-
-highlight Directory      ctermfg=5            ctermbg=0
-
-highlight DiffAdd        cterm=none           ctermfg=15  ctermbg=22
-highlight DiffChange     cterm=none           ctermfg=207 ctermbg=90
-highlight DiffDelete     cterm=none           ctermfg=19  ctermbg=17
-highlight DiffText       cterm=bold           ctermfg=226 ctermbg=90
-
-highlight Question       cterm=bold           ctermfg=85  ctermbg=0
-highlight ErrorMsg       ctermfg=230          ctermbg=167
-highlight ModeMsg        ctermfg=77           ctermbg=22
-highlight MoreMsg        cterm=bold           ctermfg=72  ctermbg=0
-highlight WarningMsg     cterm=bold           ctermfg=203 ctermbg=0
-
-highlight LineNr         ctermfg=243          ctermbg=233
-highlight Folded         cterm=none           ctermfg=152 ctermbg=66
-highlight FoldColumn     cterm=none           ctermfg=152 ctermbg=66
-"highlight SignColumn
-
-highlight Search         cterm=none           ctermfg=16  ctermbg=66
-highlight IncSearch      cterm=reverse        ctermfg=151 ctermbg=0
-"highlight MatchParen
-
-"highlight PMenu
-"highlight PMenuSBar
-"highlight PMenuSel
-"highlight PMenuThumb
-
-highlight SpecialKey     ctermfg=60           ctermbg=0
-
-"highlight SpellBad
-"highlight SpellCap
-"highlight SpellLocal
-"highlight SpellRare
-
-highlight StatusLine     cterm=none           ctermfg=0   ctermbg=254
-highlight StatusLineNC   cterm=none           ctermfg=234 ctermbg=247
-highlight VertSplit      cterm=none           ctermfg=0   ctermbg=247
-
-highlight WildMenu       cterm=bold           ctermfg=0   ctermbg=118
-
-"highlight TabLine
-"highlight TabLineFill
-"highlight TabLineSel
-
-highlight Title          cterm=bold           ctermfg=171 ctermbg=0
-
-"highlight Menu
-"highlight Scrollbar
-"highlight Tooltip
-
-"          Syntax         Groups
-highlight Comment        cterm=none           ctermfg=95
-
-highlight Constant       ctermfg=6            ctermbg=0
-highlight String         cterm=none           ctermfg=111 ctermbg=0
-"highlight Character
-highlight Number         cterm=none           ctermfg=51  ctermbg=0
-highlight Boolean        cterm=none           ctermfg=51  ctermbg=0
-"highlight Float
-
-highlight Identifier     ctermfg=152
-highlight Function       cterm=none           ctermfg=151 ctermbg=0
-
-highlight Statement      cterm=none           ctermfg=77
-highlight Conditional    cterm=none           ctermfg=77  ctermbg=0
-highlight Repeat         cterm=none           ctermfg=85  ctermbg=0
-"highlight Label
-highlight Operator       cterm=none           ctermfg=118 ctermbg=0
-highlight Keyword        cterm=none           ctermfg=77  ctermbg=0
-highlight Exception      cterm=none           ctermfg=77  ctermbg=0
-
-highlight PreProc        ctermfg=117
-highlight Include        cterm=none           ctermfg=146 ctermbg=0
-highlight Define         cterm=none           ctermfg=110 ctermbg=0
-highlight Macro          cterm=none           ctermfg=152 ctermbg=0
-highlight PreCondit      cterm=none           ctermfg=74  ctermbg=0
-
-highlight Type           cterm=none           ctermfg=110
-highlight StorageClass   cterm=none           ctermfg=110 ctermbg=0
-highlight Structure      cterm=none           ctermfg=110 ctermbg=0
-highlight Typedef        cterm=none           ctermfg=110 ctermbg=0
-
-highlight Special        ctermfg=247
-"highlight SpecialChar
-"highlight Tag
-"highlight Delimiter
-"highlight SpecialComment
-"highlight Debug
-
-highlight Underlined     cterm=underline      ctermfg=102 ctermbg=0
-
-highlight Ignore         ctermfg=67
-
-highlight Error          ctermfg=230          ctermbg=167
-
-highlight Todo           ctermfg=51           ctermbg=66
diff --git a/colors/oceandeep.vim b/colors/oceandeep.vim
deleted file mode 100755
index 08923d0..0000000
--- a/colors/oceandeep.vim
+++ /dev/null
@@ -1,140 +0,0 @@
-" Vim color file
-" Maintainer: Tom Regner <vim@tomsdiner.org>
-" Last Change:
-"
-" 2007-10-16 change by Alexei Alexandrov
-" - highlight CursorColumn
-"
-" 2007-08-20 change by Diederick Niehorster
-" - highlight CursorLine
-"
-" 2007-02-05
-" - included changes from Keffin Barnaby
-"   (vim>=7.0 PMenu and Spellchecking)
-"
-" 2006-09-06
-" - changed String to DarkCyan, Macro to DarkRed
-"
-" 2006-09-05
-" - more console-colors
-" - added console-colors, clean-up
-"
-" Version: 1.2.5
-" URL: http://vim.sourceforge.net/script.php?script_id=368
-
-
-""" Init
-set background=dark
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "oceandeep"
-
-"""" GUI 
-
-highlight Cursor        gui=None guibg=PaleTurquoise3 guifg=White
-highlight CursorIM      gui=bold guifg=white guibg=PaleTurquoise3
-highlight CursorLine    gui=None guibg=#003853
-highlight CursorColumn  gui=None guibg=#003853
-highlight Directory     guifg=LightSeaGreen guibg=bg
-highlight DiffAdd       gui=None guifg=fg guibg=DarkCyan
-highlight DiffChange    gui=None guifg=fg guibg=Green4
-highlight DiffDelete    gui=None guifg=fg guibg=black
-highlight DiffText      gui=bold guifg=fg guibg=bg
-highlight ErrorMsg      guifg=LightYellow  guibg=FireBrick
-highlight VertSplit     gui=NONE guifg=black guibg=grey60
-highlight Folded        gui=bold guibg=#305060 guifg=#b0d0e0
-highlight FoldColumn    gui=bold guibg=#305060 guifg=#b0d0e0
-highlight IncSearch     gui=reverse guifg=fg guibg=bg
-highlight LineNr        gui=bold guibg=grey6 guifg=LightSkyBlue3
-highlight ModeMsg       guibg=DarkGreen guifg=LightGreen
-highlight MoreMsg       gui=bold  guifg=SeaGreen4 guibg=bg
-if version < 600
-    " same as SpecialKey
-    highlight NonText   guibg=#123A4A guifg=#3D5D6D
-else
-    " Bottom fill (use e.g. same as LineNr)
-    highlight NonText   gui=None guibg=#103040 guifg=LightSkyBlue
-endif
-highlight Normal        gui=None guibg=#103040 guifg=honeydew2
-highlight Question      gui=bold  guifg=SeaGreen2 guibg=bg
-highlight Search        gui=NONE guibg=LightSkyBlue4 guifg=NONE
-highlight SpecialKey    guibg=#103040 guifg=#324262
-highlight StatusLine    gui=bold guibg=grey88 guifg=black
-highlight StatusLineNC  gui=NONE guibg=grey60 guifg=grey10
-highlight Title         gui=bold  guifg=MediumOrchid1 guibg=bg
-highlight Visual        gui=reverse guibg=WHITE guifg=SeaGreen
-highlight VisualNOS     gui=bold,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=bold guifg=FireBrick1 guibg=bg
-highlight WildMenu      gui=bold guibg=Chartreuse guifg=Black
-
-highlight Comment       gui=None guifg=#507080
-highlight Constant      guifg=cyan3 guibg=bg
-highlight String        gui=None guifg=turquoise2 guibg=bg
-highlight Number        gui=None guifg=Cyan guibg=bg
-highlight Boolean       gui=bold guifg=Cyan guibg=bg
-highlight Identifier    guifg=LightSkyBlue3
-highlight Function      gui=None guifg=DarkSeaGreen3 guibg=bg
-
-highlight Statement     gui=NONE guifg=LightGreen
-highlight Conditional   gui=None guifg=LightGreen guibg=bg
-highlight Repeat        gui=None guifg=SeaGreen2 guibg=bg
-highlight Operator      gui=None guifg=Chartreuse guibg=bg
-highlight Keyword       gui=bold guifg=LightGreen guibg=bg
-highlight Exception     gui=bold guifg=LightGreen guibg=bg
-
-highlight PreProc       guifg=SkyBlue1
-highlight Include       gui=None guifg=LightSteelBlue3 guibg=bg
-highlight Define        gui=None guifg=LightSteelBlue2 guibg=bg
-highlight Macro         gui=None guifg=LightSkyBlue3 guibg=bg
-highlight PreCondit     gui=None guifg=LightSkyBlue2 guibg=bg
-
-highlight Type          gui=NONE guifg=LightBlue
-highlight StorageClass  gui=None guifg=LightBlue guibg=bg
-highlight Structure     gui=None guifg=LightBlue guibg=bg
-highlight Typedef       gui=None guifg=LightBlue guibg=bg
-
-highlight Special       gui=bold guifg=aquamarine3
-highlight Underlined    gui=underline guifg=honeydew4 guibg=bg
-highlight Ignore        guifg=#204050
-highlight Error         guifg=LightYellow  guibg=FireBrick
-highlight Todo          guifg=Cyan guibg=#507080
-if v:version >= 700
-    highlight PMenu      gui=bold guibg=LightSkyBlue4 guifg=honeydew2
-    highlight PMenuSel   gui=bold guibg=DarkGreen guifg=honeydew2
-    highlight PMenuSbar  gui=bold guibg=LightSkyBlue4
-    highlight PMenuThumb gui=bold guibg=DarkGreen
-    highlight SpellBad   gui=undercurl guisp=Red
-    highlight SpellRare  gui=undercurl guisp=Orange
-    highlight SpellLocal gui=undercurl guisp=Orange
-    highlight SpellCap   gui=undercurl guisp=Yellow
-endif
-
-""" Console
-if v:version >= 700
-    highlight PMenu      cterm=bold ctermbg=DarkGreen ctermfg=Gray
-    highlight PMenuSel   cterm=bold ctermbg=Yellow ctermfg=Gray
-    highlight PMenuSbar  cterm=bold ctermbg=DarkGreen
-    highlight PMenuThumb cterm=bold ctermbg=Yellow
-    highlight SpellBad   ctermbg=Red
-    highlight SpellRare  ctermbg=Red
-    highlight SpellLocal ctermbg=Red
-    highlight SpellCap   ctermbg=Yellow
-endif
-
-highlight Normal        ctermfg=Gray ctermbg=None
-highlight Search        ctermfg=Black ctermbg=Red cterm=NONE
-highlight Visual        cterm=reverse
-highlight Cursor        ctermfg=Black ctermbg=Green cterm=bold
-highlight Special       ctermfg=Brown
-highlight Comment       ctermfg=DarkGray
-highlight StatusLine    ctermfg=Blue ctermbg=White
-highlight Statement     ctermfg=Yellow cterm=NONE
-highlight Type          cterm=NONE
-highlight Macro         ctermfg=DarkRed
-highlight Identifier    ctermfg=DarkYellow
-highlight Structure     ctermfg=DarkGreen
-highlight String        ctermfg=DarkCyan
-
-" vim: sw=4 ts=4 et
diff --git a/colors/oceanlight.vim b/colors/oceanlight.vim
deleted file mode 100755
index 22958e3..0000000
--- a/colors/oceanlight.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Vim color file
-" Maintainer: Håkan Wikström <hakan@wikstrom.st>
-" Last Change: 2005-01-06
-" Version: 0.1
-" URL: 
-" Originally based on oceandeep by Tom Regner (Vim script #368)
-
-
-""" Init
-set background=light
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "oceanlight"
-
-
-""""""""\ Colors \""""""""
-
-
-"""" GUI Colors
-
-highlight Cursor        gui=None guibg=PaleTurquoise3 guifg=White
-highlight CursorIM gui=none guifg=white guibg=PaleTurquoise3
-highlight Directory     guifg=SeaGreen guibg=bg
-highlight DiffAdd gui=None guifg=SteelBlue guibg=LightGray
-highlight DiffChange gui=None guifg=fg guibg=CadetBlue
-highlight DiffDelete gui=None guifg=LightGray guibg=SteelBlue
-highlight DiffText gui=none guifg=fg guibg=bg
-highlight ErrorMsg      guifg=FireBrick  guibg=bg
-highlight VertSplit    gui=NONE guifg=black guibg=grey60
-highlight Folded        gui=none guibg=LightSteelBlue guifg=SteelBlue
-highlight FoldColumn        gui=none guibg=LightSteelBLue guifg=SteelBlue
-highlight IncSearch gui=reverse guifg=fg guibg=bg
-highlight LineNr        gui=none guibg=#d3d3d3 guifg=#5daf83
-highlight ModeMsg       guibg=CadetBlue guifg=LightGrey
-highlight MoreMsg       gui=none  guifg=CadetBlue guibg=bg
-if version < 600
-  " same as SpecialKey
-  highlight NonText       guibg=#d3d3d3 guifg=#3D5D6D
-else
-  " Bottom fill (use e.g. same as LineNr)
-  highlight NonText       gui=None guibg=#d3d3d3 guifg=#5daf83
-endif
-highlight Normal        gui=None guibg=#f5f5f5 guifg=DimGray
-highlight Question      gui=none  guifg=SeaGreen2 guibg=bg
-highlight Search        gui=NONE guibg=SlateGray2 guifg=NONE
-highlight SpecialKey    guibg=LightGray guifg=CadetBlue
-highlight StatusLine    gui=none guibg=SlateGrey guifg=LightGrey
-highlight StatusLineNC  gui=NONE guibg=LightGrey guifg=SlateGrey
-highlight Title         gui=none  guifg=MediumOrchid1 guibg=bg
-highlight Visual        gui=reverse guibg=slategray4 guifg=SlateGray2
-highlight VisualNOS     gui=none,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=none guifg=FireBrick1 guibg=bg
-highlight WildMenu      gui=none guibg=Chartreuse guifg=Black
-
-
-"""" Syntax Colors
-
-"highlight Comment       gui=reverse guifg=#507080
-highlight Comment       gui=None guifg=LightSteelBlue
-
-highlight Constant      guifg=#483d8b guibg=bg
-hi String gui=None guifg=MediumAquamarine guibg=bg
-"hi Character gui=None guifg=Cyan guibg=bg
-highlight Number gui=None guifg=MediumSeaGreen guibg=bg
-highlight Boolean gui=none guifg=DarkSeaGreen guibg=bg
-"hi Float gui=None guifg=Cyan guibg=bg
-
-highlight Identifier    guifg=CornflowerBlue
-hi Function gui=None guifg=DarkSeaGreen guibg=bg
-
-highlight Statement     gui=NONE guifg=SeaGreen
-highlight Conditional gui=None guifg=#5daf83 guibg=bg
-highlight Repeat gui=None guifg=#5daf83 guibg=bg
-"hi Label gui=None guifg=seagreen guibg=bg
-highlight Operator gui=None guifg=LightSlateBlue guibg=bg
-highlight Keyword gui=none guifg=SeaGreen guibg=bg
-highlight Exception gui=none guifg=SeaGreen guibg=bg
-
-highlight PreProc       guifg=SkyBlue1
-hi Include gui=None guifg=SteelBlue guibg=bg
-hi Define gui=None guifg=LightSteelBlue2 guibg=bg
-hi Macro gui=None guifg=LightSkyBlue3 guibg=bg
-hi PreCondit gui=None guifg=LightSkyBlue2 guibg=bg
-
-highlight Type          gui=NONE guifg=SteelBlue
-hi StorageClass gui=None guifg=SteelBlue guibg=bg
-hi Structure gui=None guifg=SteelBlue guibg=bg
-hi Typedef gui=None guifg=SteelBlue guibg=bg
-
-highlight Special       gui=none guifg=aquamarine3
-"hi SpecialChar gui=none guifg=White guibg=bg
-"hi Tag gui=none guifg=White guibg=bg
-"hi Delimiter gui=none guifg=White guibg=bg
-"hi SpecialComment gui=none guifg=White guibg=bg
-"hi Debug gui=none guifg=White guibg=bg
-
-highlight Underlined gui=underline guifg=honeydew4 guibg=bg
-
-highlight Ignore    guifg=#204050
-
-highlight Error      guifg=FireBrick gui=Bold  guibg=bg
-
-highlight Todo          guifg=LightSkyBlue guibg=SlateGray
diff --git a/colors/olive.vim b/colors/olive.vim
deleted file mode 100755
index 26dcd2c..0000000
--- a/colors/olive.vim
+++ /dev/null
@@ -1,119 +0,0 @@
-" Vim color file
-" Maintainer:   Charles <cherry_avium@yahoo.com>
-" Last Change:  11 June 2004
-" URL:		http://
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="olive"
-
-"=======================================================
-hi Normal		guifg=#D9D9C3	    guibg=#333300
-hi Cursor		guifg=black	    guibg=white
-hi CursorIM		guifg=black	    guibg=green
-hi Directory		guifg=gold				gui=underline
-"hi DiffAdd		
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-hi ErrorMsg				    guibg=indianred
-"hi VertSplit		guifg=gold
-hi Folded		guifg=khaki	    guibg=darkolivegreen    gui=underline
-hi FoldColumn		guifg=khaki	    guibg=darkolivegreen    gui=none
-hi IncSearch		guifg=black	    guibg=khaki
-hi LineNr		guifg=gray80
-hi ModeMsg		guifg=greenyellow			gui=bold
-hi MoreMsg		guifg=greenyellow			gui=bold
-"hi NonText		guibg=black
-hi Question		guifg=yellowgreen			gui=NONE	
-hi Search		guifg=black	    guibg=khaki	        gui=NONE
-hi SpecialKey		guifg=black	    guibg=darkkhaki
-hi StatusLine		guifg=palegoldenrod guibg=#808000	gui=none
-hi StatusLineNC		guifg=gray	    guibg=darkolivegreen    gui=none
-hi Title		guifg=gold				gui=bold		
-hi Visual		guifg=black	    guibg=darkkhaki	gui=NONE
-"hi VisualNOS	
-hi WarningMsg		guifg=palevioletred
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar
-"hi Tooltip		
-
-
-" ============================================================
-" syntax highlighting groups
-" ============================================================
-hi Comment		guifg=darkkhaki	    guibg=#4C4C00	gui=underline 
-
-hi Constant		guifg=navajowhite
-hi String		guifg=greenyellow
-"hi Character
-"hi Number
-"hi Boolean
-"hi Float
-
-hi Identifier		guifg=lightsteelblue	
-" hi Function				    guibg=gray60
-
-hi Statement		guifg=darkseagreen			gui=bold
-"hi Conditional
-"hi Repeat
-"hi Label
-hi Operator		guifg=gold
-"hi Keyword
-"hi Exception
-
-hi PreProc		guifg=sandybrown			gui=bold
-"hi Include
-"hi Define
-"hi Macro
-"hi PreCondit
-
-hi Type			guifg=goldenrod
-"hi StorageClass
-"hi Structure
-"hi Typedef
-
-hi Special		guifg=navajowhite			gui=underline
-"hi SpecialChar
-"hi Tag
-"hi Delimiter
-"hi SpecialComment
-"hi Debug
-
-hi Underlined							gui=underline
-
-hi Ignore		guifg=black
-
-hi Error		guifg=white
-
-hi Todo			guifg=black	    guibg=gold		gui=NONE
-
-" =================================================================
-" Language specific color
-" =================================================================
-
-" C / C++
-hi cIncluded		guifg=yellowgreen
-
-" HTML
-hi Title		guifg=palegoldenrod 
-
-" VIM
-hi VimError		guifg=red				gui=bold
-hi VimOption		guifg=gold
-
-" TeX / LaTeX
-hi texSection		guifg=greenyellow
-" tex between { and }
-hi texMatcher		guifg=yellowgreen			gui=none
-hi texMath							gui=none
-
diff --git a/colors/orange.vim b/colors/orange.vim
deleted file mode 100755
index ffa0019..0000000
--- a/colors/orange.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-"Name: orange
-"Maintainer: wuchuanren <at> gmail.com
-"Last Change: 2010 Mär 28
-
-set background=light
-if version > 580
-	highlight clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-let g:colors_name = "orange"
-
-if v:version >= 700
-	highlight CursorColumn guibg=Grey90 gui=NONE
-	highlight CursorLine guibg=Grey90 gui=NONE
-	highlight Pmenu gui=NONE
-	highlight link PmenuSel Title
-	highlight PmenuSbar gui=NONE
-	highlight PmenuThumb gui=NONE
-	highlight TabLine guibg=LightGrey gui=underline
-	highlight TabLineFill gui=reverse
-	highlight TabLineSel gui=bold
-	if has('spell')
-		highlight SpellBad gui=undercurl
-		highlight SpellCap gui=undercurl
-		highlight SpellLocal gui=undercurl
-		highlight SpellRare gui=undercurl
-	endif
-endif
-highlight Cursor guifg=bg guibg=fg gui=NONE
-highlight CursorIM gui=NONE
-highlight DiffAdd guibg=LightBlue gui=NONE
-highlight DiffChange guibg=LightMagenta gui=NONE
-highlight DiffDelete guifg=Blue guibg=LightCyan gui=bold
-highlight DiffText guibg=Red gui=bold
-highlight Directory guifg=Blue gui=NONE
-highlight ErrorMsg guifg=White guibg=Red gui=NONE
-highlight FoldColumn guifg=#000AFF guibg=#0013FF gui=NONE
-highlight Folded guifg=#000AFF guibg=#FF6A00 gui=NONE
-highlight IncSearch gui=reverse
-highlight LineNr guifg=#0C00B4 guibg=#FF9D3B gui=NONE
-highlight MatchParen guifg=#FFFFFF guibg=#0400FF gui=NONE
-highlight ModeMsg gui=bold
-highlight MoreMsg guifg=SeaGreen gui=bold
-highlight NonText guifg=Blue gui=bold
-highlight Normal guifg=#000000 guibg=#FFB469 gui=NONE
-highlight Question guifg=#1100FF guibg=#12F303 gui=bold
-highlight Search guibg=Yellow gui=NONE
-highlight SignColumn guifg=DarkBlue guibg=Grey gui=NONE
-highlight SpecialKey guifg=Blue gui=NONE
-highlight StatusLine guifg=#0029FF gui=bold,reverse
-highlight StatusLineNC guifg=#000000 gui=reverse
-highlight Title guifg=Magenta gui=bold
-highlight VertSplit guifg=#E78D24 guibg=bg gui=reverse
-highlight Visual guibg=#FD6B5B gui=underline
-highlight VisualNOS gui=bold,underline
-highlight WarningMsg guifg=Red gui=NONE
-highlight WildMenu guifg=Black guibg=Yellow gui=NONE
-highlight link Boolean Constant
-highlight link Character Constant
-highlight Comment guifg=#0C9800 gui=NONE
-highlight link Conditional Statement
-highlight Constant guifg=#FF0003 gui=NONE
-highlight link Debug Special
-highlight link Define PreProc
-highlight link Delimiter Special
-highlight Error guifg=White guibg=Red gui=NONE
-highlight link Exception Statement
-highlight link Float Number
-highlight link Function Identifier
-highlight Identifier guifg=DarkCyan gui=NONE
-highlight Ignore guifg=#0600FF gui=NONE
-highlight link Include PreProc
-highlight link Keyword Statement
-highlight link Label Statement
-highlight link Macro PreProc
-highlight link Number Constant
-highlight link Operator Statement
-highlight link PreCondit PreProc
-highlight PreProc guifg=#159E00 gui=bold,reverse
-highlight link Repeat Statement
-highlight Special guifg=#E100B8 gui=NONE
-highlight link SpecialChar Special
-highlight link SpecialComment Special
-highlight Statement guifg=#0600FF gui=bold
-highlight link StorageClass Type
-highlight link String Constant
-highlight link Structure Type
-highlight link Tag Special
-highlight Todo guifg=#FFFFFF guibg=#EE6B29 gui=bold
-highlight Type guifg=#0097B3 gui=bold
-highlight link Typedef Type
-highlight Underlined guifg=#888888 gui=underline
diff --git a/colors/osx_like.vim b/colors/osx_like.vim
deleted file mode 100755
index 36e8213..0000000
--- a/colors/osx_like.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim colour scheme
-" Maintainer:	Martin Winkler
-" Last Change:	29 February 2009
-" Version:	1.0
-"
-" This colorscheme tries to fit nicely into a MacOS X style window
-" I am using GTK and Metacity themes from the Mac4Lin project.
-" See http://sourceforge.net/projects/mac4lin
-
-hi clear
-set background=light
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'osx_like'
-
-hi Normal gui=none guifg=Black guibg=White
-
-hi Cursor guifg=White guibg=Black
-hi LineNr gui=bold guifg=#828c95 guibg=#bbbbbb
-hi NonText gui=bold guifg=DarkGray guibg=#bbbbbb
-hi SpecialKey gui=none guifg=RoyalBlue4
-hi Title gui=bold guifg=Black
-hi Visual gui=none guifg=White guibg=#829db9
-
-hi FoldColumn gui=none guifg=Black guibg=#979797
-hi Folded gui=none guifg=#666666 guibg=#bbbbbb
-hi StatusLine gui=bold guifg=#829db9 guibg=Black
-hi StatusLineNC gui=bold guifg=#829db9 guibg=#666666
-hi VertSplit gui=bold guifg=#9ca6af guibg=DimGray
-hi Wildmenu gui=bold guifg=Black guibg=White
-
-hi Pmenu guibg=Grey65 guifg=Black gui=none
-hi PmenuSbar guibg=Grey50 guifg=fg gui=none
-hi PmenuSel guibg=Yellow guifg=Black gui=none
-hi PmenuThumb guibg=Grey75 guifg=fg gui=none
-
-hi IncSearch gui=none guifg=White guibg=Black
-hi Search gui=none guifg=Black guibg=Yellow
-
-hi MoreMsg gui=bold guifg=ForestGreen
-hi Question gui=bold guifg=ForestGreen
-hi WarningMsg gui=bold guifg=Red
-
-hi Comment gui=italic guifg=RoyalBlue3
-hi Error gui=none guifg=White guibg=Red
-hi Identifier gui=none guifg=Sienna4
-hi Special gui=none guifg=RoyalBlue4
-hi PreProc gui=none guifg=RoyalBlue3
-hi Todo gui=bold guifg=Black guibg=Yellow
-hi Type gui=bold guifg=RoyalBlue4
-hi Underlined gui=underline guifg=Blue
-
-hi Boolean gui=bold guifg=ForestGreen
-hi Constant gui=none guifg=ForestGreen
-hi Number gui=bold guifg=ForestGreen
-hi String gui=none guifg=ForestGreen
-
-hi Label gui=bold,underline guifg=Sienna4
-hi Statement gui=bold guifg=Sienna4
-
-hi htmlBold gui=bold
-hi htmlItalic gui=italic
-hi htmlUnderline gui=underline
-hi htmlBoldItalic gui=bold,italic
-hi htmlBoldUnderline gui=bold,underline
-hi htmlBoldUnderlineItalic gui=bold,underline,italic
-hi htmlUnderlineItalic gui=underline,italic
diff --git a/colors/pacific.vim b/colors/pacific.vim
deleted file mode 100755
index 19ac332..0000000
--- a/colors/pacific.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" pacific v1.0
-" Maintainer:	Rob Valentine <hjzx5ga02@sneakemail.com>
-
-" Pacific
-"
-" This theme is supposed to be remiscent of an oceany or beachy place
-" that is neither the ocean or the beach.
-"
-" useful help screens & commands
-" :syntax
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-"
-" useful online resource
-" http://www.colorpicker.com
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="pacific"
-
-hi Normal	guibg=#101D23 guifg=#FFFFFF
-
-" syntax highlighting
-hi Comment	  guifg=#A59B9B
-hi Title	guifg=#0CFFFC
-hi Underlined guifg=#20b0eF gui=none
-hi Statement  guifg=#7BD3D4
-hi Type		  guifg=#6CD69A
-hi PreProc    guifg=#FED678
-hi Constant	  guifg=#EFECCA
-hi Identifier guifg=#ABD585 
-
-"highlight groups
-hi Ignore	guifg=grey40
-hi Todo		guifg=#102E3C guibg=#DEFF89
-hi Cursor	 guibg=#00C1A2 guifg=#EC2626
-hi MatchParen guibg=#EC2626 guifg=#00C1A2
-hi Special guifg=#B692C1
-hi Directory guifg=#FED678
-hi DiffAdd guifg=#07AF07 guibg=#FFFFFF
-hi DiffChange guifg=#333333 guibg=#FFFFFF
-hi DiffDelete guifg=#FF0000 guibg=#FFFFFF
-hi DiffText guifg=#000000 guibg=#A8FFFE
-hi ErrorMsg guifg=#FFFFFF guibg=#FF0000
-hi VertSplit	guibg=#555555 guifg=#FFFFFF gui=none
-hi Folded	guibg=#A6D5F6 guifg=#0B1317
-hi FoldColumn	guibg=#A6D5F6 guifg=#0B1317
-hi LineNr   guifg=#A6D5F6 guibg=#555555 
-hi NonText  guifg=#A6A6A6 guibg=#102E3C
-hi Search	guibg=slategrey guifg=#FFDABB
-hi IncSearch	guifg=slategrey guibg=#FFDFB0
-hi StatusLine	guibg=#A6D5F6 guifg=#0B1317 gui=none
-hi StatusLineNC	guibg=#1079B0 guifg=#272334 gui=none
-hi Visual   guifg=#6D4039 guibg=#009192
-hi Pmenu	guifg=#5A5A5A guibg=#A8FF97
-hi PmenuSel	guifg=#2E2E2E guibg=#62FB44 
-"vim: sw=4
diff --git a/colors/paintbox.vim b/colors/paintbox.vim
deleted file mode 100755
index 73c42af..0000000
--- a/colors/paintbox.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-" Description:	A colourful, happy scheme with high contrast
-"  Maintainer:	kamil.stachowski@gmail.com
-"     License:	gpl 3+
-"     Version:	0.1 (2008.12.05)
-
-"   Changelog:
-"         0.1:	2008.12.05
-"       		initial version
-
-
-set background=dark
-
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "paintbox"
-
-
-" black		19191d
-" blue		238bcc
-" green		9fc439
-" grey		5a5a5a
-" raspberry	bd0d74
-" orange	e08a1f
-" violet	904ca8
-
-" diff*
-" pmenu
-
-hi Comment		guifg=#5a5a5a	guibg=#19191d	gui=none
-hi Cursor 		guifg=#19191d	guibg=#dddddd	gui=bold
-hi Constant 	guifg=#238bcc	guibg=#19191d	gui=none
-hi CursorLine		          	guibg=#343434	gui=none
-hi Folded 		guifg=#dddddd	guibg=#5a5a5a	gui=italic
-hi MatchParen	guifg=#bd0d74	guibg=#19191d	gui=reverse
-hi ModeMsg		guifg=#bd0d74	guibg=#19191d	gui=bold
-hi Normal 		guifg=#dddddd	guibg=#19191d	gui=none
-hi PreProc		guifg=#bd0d74	guibg=#19191d	gui=none
-hi Search		guifg=#19191d	guibg=#d9c900	gui=none
-hi Special		guifg=#904ca8	guibg=#19191d	gui=none
-hi Statement	guifg=#9fc439	guibg=#19191d	gui=none
-hi StatusLine 	guifg=#bd0d74	guibg=#dddddd	gui=bold
-hi StatusLineNC guifg=#dddddd	guibg=#585858	gui=bold
-hi Todo 		guifg=#cf310c	guibg=#19191d	gui=bold
-hi Type 		guifg=#e08a1f	guibg=#19191d	gui=none
-hi Underlined	guifg=#dddddd	guibg=#19191d	gui=underline
-hi Visual		guifg=#19191d	guibg=#d9c900	gui=none
-
-hi! link Boolean		Constant
-hi! link Character		Constant
-hi! link Conditional	Statement
-hi! link CursorColumn	CursorLine
-hi! link Debug			Special	
-hi! link Define			PreProc
-hi! link Delimiter		Special
-hi! link Directory		Type
-hi! link Error			Todo
-hi! link ErrorMsg		Error
-hi! link Exception		Statement
-hi! link Float			Constant
-hi! link FoldColumn		Folded
-hi! link Function		Normal
-hi! link Identifier		Special
-hi! link Ignore			Comment
-hi! link IncSearch		Search
-hi! link Include		PreProc
-hi! link Keyword		Statement
-hi! link Label			Statement
-hi! link LineNr			Comment
-hi! link Macro			PreProc
-hi! link MoreMsg		ModeMsg
-hi! link NonText		Comment
-hi! link Number			Constant
-hi! link Operator		Special
-hi! link PreCondit		PreProc
-hi! link Question		MoreMsg
-hi! link Repeat			Statement
-hi! link SignColumn		FoldColumn
-hi! link SpecialChar	Special
-hi! link SpecialComment	Special
-hi! link SpecialKey		Special
-hi! link SpellBad		Error
-hi! link SpellCap		Error
-hi! link SpellLocal		Error
-hi! link SpellRare		Error
-hi! link StorageClass	Type
-hi! link String			Constant
-hi! link Structure		Type
-hi! link Tag			Special
-hi! link Title			ModeMsg
-hi! link Typedef		Type
-hi! link VertSplit		StatusLineNC
-hi! link WarningMsg		Error
-
diff --git a/colors/peaksea.vim b/colors/peaksea.vim
deleted file mode 100755
index 2466360..0000000
--- a/colors/peaksea.vim
+++ /dev/null
@@ -1,601 +0,0 @@
-" Vim color file --- psc (peak sea color) "Lite version"
-" Maintainer:	Pan, Shi Zhu <Go to the following URL for my email>
-" URL:		http://vim.sourceforge.net/scripts/script.php?script_id=760
-" Last Change:	5 Feb 2010
-" Version:	3.4
-"
-"	Comments and e-mails are welcomed, thanks.
-"
-"	The peaksea color is simply a colorscheme with the default settings of
-"	the original ps_color. Lite version means there's no custom settings
-"	and fancy features such as integration with reloaded.vim 
-"
-"	The full version of ps_color.vim will be maintained until Vim 8.
-"	By then there will be only the lite version: peaksea.vim
-"
-" Note: Please set the background option in your .vimrc and/or .gvimrc
-"
-"	It is much better *not* to set 'background' option inside
-"	a colorscheme file.  because ":set background" improperly
-"	may cause colorscheme be sourced twice
-"
-" Color Scheme Overview: 
-"	:ru syntax/hitest.vim
-"
-" Relevant Help: 
-"	:h highlight-groups
-"	:h psc-cterm-color-table
-"
-" Colors Order:
-"	#rrggbb
-"
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = expand("<sfile>:t:r")
-
-" I don't want to abuse folding, but here folding is used to avoid confusion. 
-if &background=='light' 
-  " for background=light {{{2
-  " LIGHT COLOR DEFINE START
-
-  hi Normal		guifg=#000000	guibg=#e0e0e0	gui=NONE
-  hi Search		guifg=NONE	guibg=#f8f8f8	gui=NONE
-  hi Visual		guifg=NONE	guibg=#a6caf0	gui=NONE
-  hi Cursor		guifg=#f0f0f0	guibg=#008000	gui=NONE
-  " The idea of CursorIM is pretty good, however, the feature is still buggy
-  " in the current version (Vim 7.0).
-  " The following line will be kept commented until the bug fixed.
-  "
-  " hi CursorIM		guifg=#f0f0f0	guibg=#800080
-  hi Special		guifg=#907000	guibg=NONE	gui=NONE
-  hi Comment		guifg=#606000	guibg=NONE	gui=NONE
-  hi Number		guifg=#907000	guibg=NONE	gui=NONE
-  hi Constant		guifg=#007068	guibg=NONE	gui=NONE
-  hi StatusLine		guifg=fg	guibg=#a6caf0	gui=NONE
-  hi LineNr		guifg=#686868	guibg=NONE	gui=NONE
-  hi Question		guifg=fg	guibg=#d0d090	gui=NONE
-  hi PreProc		guifg=#009030	guibg=NONE	gui=NONE
-  hi Statement		guifg=#2060a8	guibg=NONE	gui=NONE
-  hi Type		guifg=#0850a0	guibg=NONE	gui=NONE
-  hi Todo		guifg=#800000	guibg=#e0e090	gui=NONE
-  " NOTE THIS IS IN THE WARM SECTION
-  hi Error		guifg=#c03000	guibg=NONE	gui=NONE
-  hi Identifier		guifg=#a030a0	guibg=NONE	gui=NONE
-  hi ModeMsg		guifg=fg	guibg=#b0b0e0	gui=NONE
-  hi VisualNOS		guifg=fg	guibg=#b0b0e0	gui=NONE
-  hi SpecialKey		guifg=#1050a0	guibg=NONE	gui=NONE
-  hi NonText		guifg=#002090	guibg=#d0d0d0	gui=NONE
-  hi Directory		guifg=#a030a0	guibg=NONE	gui=NONE
-  hi ErrorMsg		guifg=fg	guibg=#f0b090	gui=NONE
-  hi MoreMsg		guifg=#489000	guibg=NONE	gui=NONE
-  hi Title		guifg=#a030a0	guibg=NONE	gui=NONE
-  hi WarningMsg		guifg=#b02000	guibg=NONE	gui=NONE
-  hi WildMenu		guifg=fg	guibg=#d0d090	gui=NONE
-  hi Folded		guifg=NONE	guibg=#b0e0b0	gui=NONE
-  hi FoldColumn		guifg=fg	guibg=#90e090	gui=NONE
-  hi DiffAdd		guifg=NONE	guibg=#b0b0e0	gui=NONE
-  hi DiffChange		guifg=NONE	guibg=#e0b0e0	gui=NONE
-  hi DiffDelete		guifg=#002090	guibg=#d0d0d0	gui=NONE
-  hi DiffText		guifg=NONE	guibg=#c0e080	gui=NONE
-  hi SignColumn		guifg=fg	guibg=#90e090	gui=NONE
-
-  hi IncSearch		guifg=#f0f0f0	guibg=#806060	gui=NONE
-  hi StatusLineNC	guifg=fg	guibg=#c0c0c0	gui=NONE
-  hi VertSplit		guifg=fg	guibg=#c0c0c0	gui=NONE
-  hi Underlined		guifg=#6a5acd	guibg=NONE	gui=underline
-  hi Ignore		guifg=bg	guibg=NONE
-  " NOTE THIS IS IN THE WARM SECTION
-  if v:version >= 700
-    if has('spell')
-      hi SpellBad	guifg=NONE	guibg=NONE	guisp=#c03000
-      hi SpellCap	guifg=NONE	guibg=NONE	guisp=#2060a8
-      hi SpellRare	guifg=NONE	guibg=NONE	guisp=#a030a0
-      hi SpellLocal	guifg=NONE	guibg=NONE	guisp=#007068
-    endif
-    hi Pmenu		guifg=fg	guibg=#e0b0e0
-    hi PmenuSel		guifg=#f0f0f0	guibg=#806060	gui=NONE
-    hi PmenuSbar	guifg=fg	guibg=#c0c0c0	gui=NONE
-    hi PmenuThumb	guifg=fg	guibg=#c0e080	gui=NONE
-    hi TabLine		guifg=fg	guibg=#c0c0c0	gui=NONE
-    hi TabLineFill	guifg=fg	guibg=#c0c0c0	gui=NONE
-    hi TabLineSel	guifg=fg	guibg=NONE	gui=NONE
-    hi CursorColumn	guifg=NONE	guibg=#f0b090
-    hi CursorLine	guifg=NONE	guibg=NONE	gui=underline
-    hi MatchParen	guifg=NONE	guibg=#c0e080
-  endif
-
-  " LIGHT COLOR DEFINE END
-
-  " Vim 7 added stuffs
-  if v:version >= 700
-    hi Ignore		gui=NONE
-
-    " the gui=undercurl guisp could only support in Vim 7
-    if has('spell')
-      hi SpellBad	gui=undercurl
-      hi SpellCap	gui=undercurl
-      hi SpellRare	gui=undercurl
-      hi SpellLocal	gui=undercurl
-    endif
-    hi TabLine		gui=underline
-    hi TabLineFill	gui=underline
-    hi CursorLine	gui=underline
-  endif
-
-  " For reversed stuffs, clear the reversed prop and set the bold prop again
-  hi IncSearch		gui=bold
-  hi StatusLine		gui=bold
-  hi StatusLineNC	gui=bold
-  hi VertSplit		gui=bold
-  hi Visual		gui=bold
-
-  " Enable the bold property
-  hi Question		gui=bold
-  hi DiffText		gui=bold
-  hi Statement		gui=bold
-  hi Type		gui=bold
-  hi MoreMsg		gui=bold
-  hi ModeMsg		gui=bold
-  hi NonText		gui=bold
-  hi Title		gui=bold
-  hi DiffDelete		gui=bold
-  hi TabLineSel		gui=bold
-
-  " gui define for background=light end here
-
-  " generally, a dumb terminal is dark, we assume the light terminal has 256
-  " color support.
-  if &t_Co==8 || &t_Co==16
-    set t_Co=256
-  endif
-  if &t_Co==256
-    " 256color light terminal support here
-
-    hi Normal		ctermfg=16	ctermbg=254	cterm=NONE
-    " Comment/Uncomment the following line to disable/enable transparency
-    "hi Normal		ctermfg=16	ctermbg=NONE	cterm=NONE
-    hi Search		ctermfg=NONE	ctermbg=231	cterm=NONE
-    hi Visual		ctermfg=NONE	ctermbg=153	cterm=NONE
-    hi Cursor		ctermfg=255	ctermbg=28	cterm=NONE
-    " hi CursorIM	ctermfg=255	ctermbg=90
-    hi Special		ctermfg=94	ctermbg=NONE	cterm=NONE
-    hi Comment		ctermfg=58	ctermbg=NONE	cterm=NONE
-    hi Number		ctermfg=94	ctermbg=NONE	cterm=NONE
-    hi Constant		ctermfg=23	ctermbg=NONE	cterm=NONE
-    hi StatusLine	ctermfg=fg	ctermbg=153	cterm=NONE
-    hi LineNr		ctermfg=242	ctermbg=NONE	cterm=NONE
-    hi Question		ctermfg=fg	ctermbg=186	cterm=NONE
-    hi PreProc		ctermfg=29	ctermbg=NONE	cterm=NONE
-    hi Statement	ctermfg=25	ctermbg=NONE	cterm=NONE
-    hi Type		ctermfg=25	ctermbg=NONE	cterm=NONE
-    hi Todo		ctermfg=88	ctermbg=186	cterm=NONE
-    " NOTE THIS IS IN THE WARM SECTION
-    hi Error		ctermfg=130	ctermbg=NONE	cterm=NONE
-    hi Identifier	ctermfg=133	ctermbg=NONE	cterm=NONE
-    hi ModeMsg		ctermfg=fg	ctermbg=146	cterm=NONE
-    hi VisualNOS	ctermfg=fg	ctermbg=146	cterm=NONE
-    hi SpecialKey	ctermfg=25	ctermbg=NONE	cterm=NONE
-    hi NonText		ctermfg=18	ctermbg=252	cterm=NONE
-    " Comment/Uncomment the following line to disable/enable transparency
-    "hi NonText		ctermfg=18	ctermbg=NONE	cterm=NONE
-    hi Directory	ctermfg=133	ctermbg=NONE	cterm=NONE
-    hi ErrorMsg		ctermfg=fg	ctermbg=216	cterm=NONE
-    hi MoreMsg		ctermfg=64	ctermbg=NONE	cterm=NONE
-    hi Title		ctermfg=133	ctermbg=NONE	cterm=NONE
-    hi WarningMsg	ctermfg=124	ctermbg=NONE	cterm=NONE
-    hi WildMenu		ctermfg=fg	ctermbg=186	cterm=NONE
-    hi Folded		ctermfg=NONE	ctermbg=151	cterm=NONE
-    hi FoldColumn	ctermfg=fg	ctermbg=114	cterm=NONE
-    hi DiffAdd		ctermfg=NONE	ctermbg=146	cterm=NONE
-    hi DiffChange	ctermfg=NONE	ctermbg=182	cterm=NONE
-    hi DiffDelete	ctermfg=18	ctermbg=252	cterm=NONE
-    hi DiffText		ctermfg=NONE	ctermbg=150	cterm=NONE
-    hi SignColumn	ctermfg=fg	ctermbg=114	cterm=NONE
-
-    hi IncSearch	ctermfg=255	ctermbg=95	cterm=NONE
-    hi StatusLineNC	ctermfg=fg	ctermbg=250	cterm=NONE
-    hi VertSplit	ctermfg=fg	ctermbg=250	cterm=NONE
-    hi Underlined	ctermfg=62	ctermbg=NONE	cterm=underline
-    hi Ignore		ctermfg=bg	ctermbg=NONE
-    " NOTE THIS IS IN THE WARM SECTION
-    if v:version >= 700
-      if has('spell')
-        if 0
-          " ctermsp is not supported in Vim7, we ignore it.
-          hi SpellBad	cterm=undercurl	ctermbg=NONE	ctermfg=130
-          hi SpellCap	cterm=undercurl	ctermbg=NONE	ctermfg=25
-          hi SpellRare	cterm=undercurl	ctermbg=NONE	ctermfg=133
-          hi SpellLocal	cterm=undercurl	ctermbg=NONE	ctermfg=23
-        else
-          hi SpellBad	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellCap	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellRare	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellLocal	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-        endif
-      endif
-      hi Pmenu		ctermfg=fg	ctermbg=182
-      hi PmenuSel	ctermfg=255	ctermbg=95	cterm=NONE
-      hi PmenuSbar	ctermfg=fg	ctermbg=250	cterm=NONE
-      hi PmenuThumb	ctermfg=fg	ctermbg=150	cterm=NONE
-      hi TabLine	ctermfg=fg	ctermbg=250	cterm=NONE
-      hi TabLineFill	ctermfg=fg	ctermbg=250	cterm=NONE
-      hi TabLineSel	ctermfg=fg	ctermbg=NONE	cterm=NONE
-      hi CursorColumn	ctermfg=NONE	ctermbg=216
-      hi CursorLine	ctermfg=NONE	ctermbg=NONE	cterm=underline
-      hi MatchParen	ctermfg=NONE	ctermbg=150
-    endif
-
-    hi TabLine		cterm=underline
-    hi TabLineFill	cterm=underline
-    hi CursorLine	cterm=underline
-
-    " For reversed stuffs, clear the reversed prop and set the bold prop again
-    hi IncSearch	cterm=bold
-    hi StatusLine	cterm=bold
-    hi StatusLineNC	cterm=bold
-    hi VertSplit	cterm=bold
-    hi Visual		cterm=bold
-
-    hi NonText		cterm=bold
-    hi Question		cterm=bold
-    hi Title		cterm=bold
-    hi DiffDelete	cterm=bold
-    hi DiffText		cterm=bold
-    hi Statement	cterm=bold
-    hi Type		cterm=bold
-    hi MoreMsg		cterm=bold
-    hi ModeMsg		cterm=bold
-    hi TabLineSel	cterm=bold
-
-    "hi lCursor		ctermfg=bg	ctermbg=fg	cterm=NONE
-  endif " t_Co==256
-  " }}}2
-elseif &background=='dark' 
-  " for background=dark {{{2
-  " DARK COLOR DEFINE START
-
-  hi Normal		guifg=#d0d0d0	guibg=#202020	gui=NONE
-  hi Comment		guifg=#d0d090	guibg=NONE	gui=NONE
-  hi Constant		guifg=#80c0e0	guibg=NONE	gui=NONE
-  hi Number		guifg=#e0c060	guibg=NONE	gui=NONE
-  hi Identifier		guifg=#f0c0f0	guibg=NONE	gui=NONE
-  hi Statement		guifg=#c0d8f8	guibg=NONE	gui=NONE
-  hi PreProc		guifg=#60f080	guibg=NONE	gui=NONE
-  hi Type		guifg=#b0d0f0	guibg=NONE	gui=NONE
-  hi Special		guifg=#e0c060	guibg=NONE	gui=NONE
-  hi Error		guifg=#f08060	guibg=NONE	gui=NONE
-  hi Todo		guifg=#800000	guibg=#d0d090	gui=NONE
-  hi Search		guifg=NONE	guibg=#800000	gui=NONE
-  hi Visual		guifg=#000000	guibg=#a6caf0	gui=NONE
-  hi Cursor		guifg=#000000	guibg=#00f000	gui=NONE
-  " NOTE THIS IS IN THE COOL SECTION
-  " hi CursorIM		guifg=#000000	guibg=#f000f0	gui=NONE
-  hi StatusLine		guifg=#000000	guibg=#a6caf0	gui=NONE
-  hi LineNr		guifg=#b0b0b0	guibg=NONE	gui=NONE
-  hi Question		guifg=#000000	guibg=#d0d090	gui=NONE
-  hi ModeMsg		guifg=fg	guibg=#000080	gui=NONE
-  hi VisualNOS		guifg=fg	guibg=#000080	gui=NONE
-  hi SpecialKey		guifg=#b0d0f0	guibg=NONE	gui=NONE
-  hi NonText		guifg=#6080f0	guibg=#101010	gui=NONE
-  hi Directory		guifg=#80c0e0	guibg=NONE	gui=NONE
-  hi ErrorMsg		guifg=#d0d090	guibg=#800000	gui=NONE
-  hi MoreMsg		guifg=#c0e080	guibg=NONE	gui=NONE
-  hi Title		guifg=#f0c0f0	guibg=NONE	gui=NONE
-  hi WarningMsg		guifg=#f08060	guibg=NONE	gui=NONE
-  hi WildMenu		guifg=#000000	guibg=#d0d090	gui=NONE
-  hi Folded		guifg=NONE	guibg=#004000	gui=NONE
-  hi FoldColumn		guifg=#e0e0e0	guibg=#008000	gui=NONE
-  hi DiffAdd		guifg=NONE	guibg=#000080	gui=NONE
-  hi DiffChange		guifg=NONE	guibg=#800080	gui=NONE
-  hi DiffDelete		guifg=#6080f0	guibg=#202020	gui=NONE
-  hi DiffText		guifg=#000000	guibg=#c0e080	gui=NONE
-  hi SignColumn		guifg=#e0e0e0	guibg=#008000	gui=NONE
-  hi IncSearch		guifg=#000000	guibg=#d0d0d0	gui=NONE
-  hi StatusLineNC	guifg=#000000	guibg=#c0c0c0	gui=NONE
-  hi VertSplit		guifg=#000000	guibg=#c0c0c0	gui=NONE
-  hi Underlined		guifg=#80a0ff	guibg=NONE	gui=underline 
-  hi Ignore		guifg=#000000	guibg=NONE
-  " NOTE THIS IS IN THE COOL SECTION
-  if v:version >= 700
-    if has('spell')
-    " the guisp= could only support in Vim 7
-      hi SpellBad	guifg=NONE	guibg=NONE	guisp=#f08060
-      hi SpellCap	guifg=NONE	guibg=NONE	guisp=#6080f0
-      hi SpellRare	guifg=NONE	guibg=NONE	guisp=#f0c0f0
-      hi SpellLocal	guifg=NONE	guibg=NONE	guisp=#c0d8f8
-    endif
-    hi Pmenu		guifg=fg	guibg=#800080
-    hi PmenuSel		guifg=#000000	guibg=#d0d0d0	gui=NONE
-    hi PmenuSbar	guifg=fg	guibg=#000080	gui=NONE
-    hi PmenuThumb	guifg=fg	guibg=#008000	gui=NONE
-    hi TabLine		guifg=fg	guibg=#008000	gui=NONE
-    hi TabLineFill	guifg=fg	guibg=#008000	gui=NONE
-    hi TabLineSel	guifg=fg	guibg=NONE	gui=NONE
-    hi CursorColumn	guifg=NONE	guibg=#800000	gui=NONE
-    hi CursorLine	guifg=NONE	guibg=NONE	gui=underline
-    hi MatchParen	guifg=NONE	guibg=#800080
-  endif
-
-  " DARK COLOR DEFINE END
-
-  " Vim 7 added stuffs
-  if v:version >= 700
-    hi Ignore	gui=NONE  
-
-    " the gui=undercurl could only support in Vim 7
-    if has('spell')
-      hi SpellBad	gui=undercurl  
-      hi SpellCap	gui=undercurl  
-      hi SpellRare	gui=undercurl  
-      hi SpellLocal	gui=undercurl 
-    endif
-    hi TabLine		gui=underline  
-    hi TabLineFill	gui=underline  
-    hi Underlined	gui=underline  
-    hi CursorLine	gui=underline 
-  endif
-
-  " gui define for background=dark end here
-
-  if &t_Co==8 || &t_Co==16
-    " for 8-color and 16-color term
-    hi Normal		ctermfg=LightGrey   ctermbg=Black
-    hi Special		ctermfg=Yellow	    ctermbg=bg
-    hi Comment		ctermfg=DarkYellow  ctermbg=bg
-    hi Constant		ctermfg=Blue	    ctermbg=bg
-    hi Number		ctermfg=Yellow	    ctermbg=bg
-    hi LineNr		ctermfg=DarkGrey    ctermbg=bg
-    hi PreProc		ctermfg=Green	    ctermbg=bg
-    hi Statement	ctermfg=Cyan	    ctermbg=bg
-    hi Type		ctermfg=Cyan	    ctermbg=bg
-    hi Error		ctermfg=Red	    ctermbg=bg
-    hi Identifier	ctermfg=Magenta     ctermbg=bg
-    hi SpecialKey	ctermfg=Cyan	    ctermbg=bg
-    hi NonText		ctermfg=Blue	    ctermbg=bg
-    hi Directory	ctermfg=Blue	    ctermbg=bg
-    hi MoreMsg		ctermfg=Green	    ctermbg=bg
-    hi Title		ctermfg=Magenta     ctermbg=bg
-    hi WarningMsg	ctermfg=Red	    ctermbg=bg
-    hi DiffDelete	ctermfg=Blue	    ctermbg=bg
-
-    hi Search		ctermfg=NONE	    ctermbg=DarkRed
-    hi Visual		ctermfg=Black	    ctermbg=DarkCyan
-    hi Cursor		ctermfg=Black	    ctermbg=Green
-    hi StatusLine	ctermfg=Black	    ctermbg=DarkCyan
-    hi Question		ctermfg=Black	    ctermbg=DarkYellow
-    hi Todo		ctermfg=DarkRed     ctermbg=DarkYellow
-    hi Folded		ctermfg=White	    ctermbg=DarkGreen
-    hi ModeMsg		ctermfg=Grey	    ctermbg=DarkBlue
-    hi VisualNOS	ctermfg=Grey	    ctermbg=DarkBlue
-    hi ErrorMsg		ctermfg=DarkYellow  ctermbg=DarkRed
-    hi WildMenu		ctermfg=Black	    ctermbg=DarkYellow
-    hi FoldColumn	ctermfg=White	    ctermbg=DarkGreen
-    hi SignColumn	ctermfg=White	    ctermbg=DarkGreen
-    hi DiffText		ctermfg=Black	    ctermbg=DarkYellow
-
-    if v:version >= 700
-      if has('spell')
-        hi SpellBad	ctermfg=NONE	ctermbg=DarkRed
-        hi SpellCap	ctermfg=NONE	ctermbg=DarkBlue
-        hi SpellRare	ctermfg=NONE	ctermbg=DarkMagenta
-        hi SpellLocal	ctermfg=NONE	ctermbg=DarkGreen
-      endif
-      hi Pmenu		ctermfg=fg	ctermbg=DarkMagenta
-      hi PmenuSel	ctermfg=Black	ctermbg=fg
-      hi PmenuSbar	ctermfg=fg	ctermbg=DarkBlue
-      hi PmenuThumb	ctermfg=fg	ctermbg=DarkGreen
-      hi TabLine	ctermfg=fg	ctermbg=DarkGreen	cterm=underline
-      hi TabLineFill	ctermfg=fg	ctermbg=DarkGreen	cterm=underline
-      hi CursorColumn	ctermfg=NONE	ctermbg=DarkRed
-
-      hi TabLineSel	ctermfg=fg	ctermbg=bg
-      hi CursorLine	ctermfg=NONE	ctermbg=bg		cterm=underline
-
-      hi MatchParen	ctermfg=NONE	ctermbg=DarkMagenta
-    endif
-    if &t_Co==8
-      " 8 colour terminal support, this assumes 16 colour is available through
-      " setting the 'bold' attribute, will get bright foreground colour.
-      " However, the bright background color is not available for 8-color terms.
-      "
-      " You can manually set t_Co=16 in your .vimrc to see if your terminal
-      " supports 16 colours, 
-      hi DiffText	cterm=none  
-      hi Visual		cterm=none  
-      hi Cursor		cterm=none  
-      hi Comment	cterm=none  
-      hi Todo		cterm=none  
-      hi StatusLine	cterm=none  
-      hi Question	cterm=none  
-      hi DiffChange	cterm=none  
-      hi ModeMsg	cterm=none  
-      hi VisualNOS	cterm=none  
-      hi ErrorMsg	cterm=none  
-      hi WildMenu	cterm=none  
-      hi DiffAdd	cterm=none  
-      hi Folded		cterm=none  
-      hi DiffDelete	cterm=none  
-      hi Normal		cterm=none  
-      hi PmenuThumb	cterm=none 
-      hi Search		cterm=bold  
-      hi Special	cterm=bold  
-      hi Constant	cterm=bold  
-      hi Number		cterm=bold  
-      hi LineNr		cterm=bold  
-      hi PreProc	cterm=bold  
-      hi Statement	cterm=bold  
-      hi Type		cterm=bold  
-      hi Error		cterm=bold  
-      hi Identifier	cterm=bold  
-      hi SpecialKey	cterm=bold  
-      hi NonText	cterm=bold  
-      hi MoreMsg	cterm=bold  
-      hi Title		cterm=bold  
-      hi WarningMsg	cterm=bold  
-      hi FoldColumn	cterm=bold  
-      hi SignColumn	cterm=bold  
-      hi Directory	cterm=bold  
-      hi DiffDelete	cterm=bold 
-    else
-      " Background > 7 is only available with 16 or more colors
-
-      hi WarningMsg	cterm=none  
-      hi Search		cterm=none  
-      hi Visual		cterm=none  
-      hi Cursor		cterm=none  
-      hi Special	cterm=none  
-      hi Comment	cterm=none  
-      hi Constant	cterm=none  
-      hi Number		cterm=none  
-      hi LineNr		cterm=none  
-      hi PreProc	cterm=none  
-      hi Todo		cterm=none  
-      hi Error		cterm=none  
-      hi Identifier	cterm=none  
-      hi Folded		cterm=none  
-      hi SpecialKey	cterm=none  
-      hi Directory	cterm=none  
-      hi ErrorMsg	cterm=none  
-      hi Normal		cterm=none  
-      hi PmenuThumb	cterm=none 
-      hi WildMenu	cterm=none  
-      hi FoldColumn	cterm=none  
-      hi SignColumn	cterm=none  
-      hi DiffAdd	cterm=none  
-      hi DiffChange	cterm=none  
-      hi Question	cterm=none  
-      hi StatusLine	cterm=none  
-      hi DiffText	cterm=none 
-      hi IncSearch	cterm=reverse  
-      hi StatusLineNC	cterm=reverse  
-      hi VertSplit	cterm=reverse 
-
-      " Well, well, bold font with color 0-7 is not possible.
-      " So, the Question, StatusLine, DiffText cannot act as expected.
-
-      hi Statement	cterm=none  
-      hi Type		cterm=none  
-      hi MoreMsg	cterm=none  
-      hi ModeMsg	cterm=none  
-      hi NonText	cterm=none  
-      hi Title		cterm=none  
-      hi VisualNOS	cterm=none  
-      hi DiffDelete	cterm=none  
-      hi TabLineSel	cterm=none 
-
-    endif
-  elseif &t_Co==256
-    " 256color dark terminal support here
-    hi Normal		ctermfg=252	ctermbg=234	cterm=NONE
-    " Comment/Uncomment the following line to disable/enable transparency
-    "hi Normal		ctermfg=252	ctermbg=NONE	cterm=NONE
-    hi Comment		ctermfg=186	ctermbg=NONE	cterm=NONE
-    hi Constant		ctermfg=110	ctermbg=NONE	cterm=NONE
-    hi Number		ctermfg=179	ctermbg=NONE	cterm=NONE
-    hi Identifier	ctermfg=219	ctermbg=NONE	cterm=NONE
-    hi Statement	ctermfg=153	ctermbg=NONE	cterm=NONE
-    hi PreProc		ctermfg=84	ctermbg=NONE	cterm=NONE
-    hi Type		ctermfg=153	ctermbg=NONE	cterm=NONE
-    hi Special		ctermfg=179	ctermbg=NONE	cterm=NONE
-    hi Error		ctermfg=209	ctermbg=NONE	cterm=NONE
-    hi Todo		ctermfg=88	ctermbg=186	cterm=NONE
-    hi Search		ctermfg=NONE	ctermbg=88	cterm=NONE
-    hi Visual		ctermfg=16	ctermbg=153	cterm=NONE
-    hi Cursor		ctermfg=16	ctermbg=46	cterm=NONE
-    " NOTE THIS IS IN THE COOL SECTION
-    " hi CursorIM	ctermfg=16	ctermbg=201	cterm=NONE
-    hi StatusLine	ctermfg=16	ctermbg=153	cterm=NONE
-    hi LineNr		ctermfg=249	ctermbg=NONE	cterm=NONE
-    hi Question		ctermfg=16	ctermbg=186	cterm=NONE
-    hi ModeMsg		ctermfg=fg	ctermbg=18	cterm=NONE
-    hi VisualNOS	ctermfg=fg	ctermbg=18	cterm=NONE
-    hi SpecialKey	ctermfg=153	ctermbg=NONE	cterm=NONE
-    hi NonText		ctermfg=69	ctermbg=233	cterm=NONE
-    " Comment/Uncomment the following line to disable/enable transparency
-    "hi NonText		ctermfg=69	ctermbg=NONE	cterm=NONE
-    hi Directory	ctermfg=110	ctermbg=NONE	cterm=NONE
-    hi ErrorMsg		ctermfg=186	ctermbg=88	cterm=NONE
-    hi MoreMsg		ctermfg=150	ctermbg=NONE	cterm=NONE
-    hi Title		ctermfg=219	ctermbg=NONE	cterm=NONE
-    hi WarningMsg	ctermfg=209	ctermbg=NONE	cterm=NONE
-    hi WildMenu		ctermfg=16	ctermbg=186	cterm=NONE
-    hi Folded		ctermfg=NONE	ctermbg=22	cterm=NONE
-    hi FoldColumn	ctermfg=254	ctermbg=28	cterm=NONE
-    hi DiffAdd		ctermfg=NONE	ctermbg=18	cterm=NONE
-    hi DiffChange	ctermfg=NONE	ctermbg=90	cterm=NONE
-    hi DiffDelete	ctermfg=69	ctermbg=234	cterm=NONE
-    hi DiffText		ctermfg=16	ctermbg=150	cterm=NONE
-    hi SignColumn	ctermfg=254	ctermbg=28	cterm=NONE
-    hi IncSearch	ctermfg=16	ctermbg=252	cterm=NONE
-    hi StatusLineNC	ctermfg=16	ctermbg=250	cterm=NONE
-    hi VertSplit	ctermfg=16	ctermbg=250	cterm=NONE
-    hi Underlined	ctermfg=111	ctermbg=NONE	cterm=underline 
-    hi Ignore		ctermfg=16	ctermbg=NONE
-    " NOTE THIS IS IN THE COOL SECTION
-    if v:version >= 700
-      if has('spell')
-        " the ctermsp= is not supported in Vim 7 we simply ignored
-        if 0
-          hi SpellBad	cterm=undercurl	ctermbg=NONE	ctermfg=209
-          hi SpellCap	cterm=undercurl	ctermbg=NONE	ctermfg=69
-          hi SpellRare	cterm=undercurl	ctermbg=NONE	ctermfg=219
-          hi SpellLocal	cterm=undercurl	ctermbg=NONE	ctermfg=153
-        else
-          hi SpellBad	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellCap	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellRare	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-          hi SpellLocal	cterm=undercurl	ctermbg=NONE	ctermfg=NONE
-        endif
-      endif
-      hi Pmenu		ctermfg=fg	ctermbg=90
-      hi PmenuSel	ctermfg=16	ctermbg=252	cterm=NONE
-      hi PmenuSbar	ctermfg=fg	ctermbg=18	cterm=NONE
-      hi PmenuThumb	ctermfg=fg	ctermbg=28	cterm=NONE
-      hi TabLine	ctermfg=fg	ctermbg=28	cterm=NONE
-      hi TabLineFill	ctermfg=fg	ctermbg=28	cterm=NONE
-      hi TabLineSel	ctermfg=fg	ctermbg=NONE	cterm=NONE
-      hi CursorColumn	ctermfg=NONE	ctermbg=88	cterm=NONE
-      hi CursorLine	ctermfg=NONE	ctermbg=NONE	cterm=underline
-      hi MatchParen	ctermfg=NONE	ctermbg=90
-      hi TabLine	cterm=underline  
-      hi TabLineFill	cterm=underline  
-      hi Underlined	cterm=underline  
-      hi CursorLine	cterm=underline 
-    endif
-
-  endif " t_Co
-
-  " }}}2
-endif
-
-" Links:
-"
-" COLOR LINKS DEFINE START
-
-hi link		String		Constant
-" Character must be different from strings because in many languages
-" (especially C, C++) a 'char' variable is scalar while 'string' is pointer,
-" mistaken a 'char' for a 'string' will cause disaster!
-hi link		Character	Number
-hi link		SpecialChar	LineNr
-hi link		Tag		Identifier
-hi link		cCppOut		LineNr
-" The following are not standard hi links, 
-" these are used by DrChip
-hi link		Warning		MoreMsg
-hi link		Notice		Constant
-" these are used by Calendar
-hi link		CalToday	PreProc
-" these are used by TagList
-hi link		MyTagListTagName	IncSearch
-hi link		MyTagListTagScope	Constant
-
-" COLOR LINKS DEFINE END
-
-" vim:et:nosta:sw=2:ts=8:
-" vim600:fdm=marker:fdl=1:
diff --git a/colors/peppers.vim b/colors/peppers.vim
deleted file mode 100755
index c2ffeff..0000000
--- a/colors/peppers.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" 
-" Comments are welcome !
-" Spammers will be shot. Survivors will be shot again
-" 
-" Last Change: 21 Sep 2005
-" Version:1.0
-" Changes: Recolored comments and Statement
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="peppers"
-
-hi Normal   guibg=black	 guifg=#90c009
-hi Statusline    gui=none guibg=SteelBlue guifg=PowderBlue
-hi  VertSplit    gui=none guibg=black guifg=SkyBlue
-hi StatuslineNC  gui=none guibg=LightSlateGray guifg=MistyRose
-hi LineNr   guifg=SlateGray2 gui=none
-hi Cursor   guibg=IndianRed guifg=Snow gui=none
-hi Visual   guibg=Yellow guifg=Black gui=none
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-"guibg=#8c9bfa
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=SteelBlue
-hi Operator   guifg=LightCoral
-
-hi Identifier guifg=OliveDrab gui=NONE
-
-hi Statement	 guifg=#f0f0ff gui=NONE
-hi TypeDef       guifg=#ff00c8 gui=NONE
-hi Type          guifg=#ffffc8 gui=NONE
-hi Boolean       guifg=#ff00aa gui=NONE
-
-hi String        guifg=Gray75 gui=NONE
-hi Number        guifg=PeachPuff gui=NONE
-hi Constant      guifg=#ff8080 gui=NONE
-hi Folded        guifg=PowderBlue guibg=SteelBlue gui=BOLD
-hi FoldColumn      guifg=#ff8080 guibg=black gui=italic
-
-hi Function      gui=NONE      guifg=#6666ff
-hi PreProc       guifg=#ffff00 gui=italic
-hi Define        gui=bold guifg=Red 
-
-hi Keyword       guifg=Tomato gui=NONE
-hi Search        gui=NONE guibg=DodgerBlue guifg=snow 
-"guibg=#339900
-hi IncSearch     gui=NONE guifg=FireBrick4 guibg=AntiqueWhite1
-hi Conditional   gui=none guifg=DeepSkyBlue1
-hi browseDirectory  gui=none guifg=DarkSlateGray1
-hi DiffText    gui=italic guifg=black guibg=yellow
-hi DiffAdd     gui=none   guifg=yellow guibg=#006000
-hi DiffChange  gui=none   guifg=yellow guibg=#000060 
-hi DiffDelete  gui=none   guifg=black  guibg=#600000 
-
diff --git a/colors/perfect.vim b/colors/perfect.vim
deleted file mode 100755
index d665d06..0000000
--- a/colors/perfect.vim
+++ /dev/null
@@ -1,141 +0,0 @@
-" Maintainer:   Sasha Koss
-" Version:      0.1
-" Last Change:  31 Dec 2010
-" Credits:      Vim color scheme "perfect"
-
-set background=light
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "perfect"
-
-"————————————————+———————————————————————————————————————————————+———+———————————————————————————————————————————————"
-"                | GUI                                           |   | TERMINAL                                      "
-"      TYPE      +———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-"                | foreground    | background    |               |   | foreground    | background    |               "
-"————————————————+———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Full colors reset
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-" Base colors
-
-hi ColorColumn                     guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Conceal         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Cursor          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi CursorIM        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi CursorColumn    guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi CursorLine                      guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Directory       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi DiffAdd         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi DiffChange      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi DiffDelete      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi DiffText        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi ErrorMsg        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi VertSplit       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Folded          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi FoldColumn      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SignColumn      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi IncSearch       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi LineNr          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi MatchParen      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi ModeMsg         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi MoreMsg         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi NonText         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Normal          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Pmenu           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi PmenuSel        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi PmenuSbar       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi PmenuThumb      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Question        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Search          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpecialKey      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpellBad        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpellCap        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpellLocal      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpellRare       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi StatusLine      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi StatusLineNC    guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi TabLine         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi TabLineFill     guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi TabLineSel      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Title           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi VisualNOS       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi WarningMsg      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi WildMenu        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-
-" Syntax related colors
-
-hi Comment         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Constant        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi String          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Character       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Number          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Boolean         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Float           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Identifier      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Function        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Statement       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Conditional     guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Repeat          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Label           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Operator        guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Keyword         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Exception       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi PreProc         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Include         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Define          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Macro           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi PreCondit       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Type            guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi StorageClass    guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Structure       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Typedef         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Special         guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpecialChar     guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Tag             guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Delimiter       guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi SpecialComment  guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Debug           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Underlined      guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Ignore          guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Error           guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-hi Todo            guifg=#000000   guibg=#ffffff   gui=none            ctermfg=16      ctermbg=231     cterm=none
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Interface                                                                                                          "
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi ColorColumn                     guibg=#f7f7f7
-hi Cursor          guifg=#ffffff   guibg=#000000
-hi CursorLine                      guibg=#f7f7f7
-hi Directory       guifg=#1d5a88
-hi VertSplit       guifg=#eeeeee   guibg=#eeeeee
-hi Folded          guifg=#bbbbbb   guibg=#fbfbfb
-hi IncSearch                       guibg=#ffdfce
-hi LineNr          guifg=#bbbbbb
-hi NonText         guifg=#eeeeee
-hi Search                          guibg=#feffec
-hi StatusLine      guifg=#ffffff   guibg=#000000
-hi StatusLineNC    guifg=#ffffff   guibg=#eeeeee
-
-" Syntax related colors
-
-hi Comment         guifg=#bbbbbb
-hi Constant        guifg=#56882c
-hi String          guifg=#56882c
-hi Number          guifg=#56882c
-hi Boolean         guifg=#56882c
-hi Float           guifg=#56882c
-hi Function        guifg=#a9082f
-hi Statement       guifg=#1d5a88
-hi Conditional     guifg=#1d5a88
-hi Operator        guifg=#1d5a88
-hi Keyword         guifg=#1d5a88
-hi Define          guifg=#1d5a88
-hi Delimiter       guifg=#56882c
diff --git a/colors/pf_earth.vim b/colors/pf_earth.vim
deleted file mode 100755
index fc155bb..0000000
--- a/colors/pf_earth.vim
+++ /dev/null
@@ -1,186 +0,0 @@
-" Vim color file
-" Name:  pf_earch
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "pf_earth"
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! <SID>M(a)
-    return strpart("0135", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! <SID>X(a)
-    if &t_Co == 88
-        return a:a
-    else
-        if a:a == 8
-            return 237
-        elseif a:a < 16
-            return a:a
-        elseif a:a > 79
-            return 232 + (3 * (a:a - 80))
-        else
-            let l:b = a:a - 16
-            let l:x = l:b % 4
-            let l:y = (l:b / 4) % 4
-            let l:z = (l:b / 16)
-            return 16 + <SID>M(l:x) + (6 * <SID>M(l:y)) + (36 * <SID>M(l:z))
-        endif
-    endif
-endfun
-
-if has("gui_running")
-    hi Normal         gui=NONE   guifg=#E7FFD8   guibg=#262320
-    hi IncSearch        guifg=#66ffff                                   gui=reverse
-    hi Search guifg=#000000 guibg=#cae682 ctermfg=0 ctermbg=195
-    hi ErrorMsg       gui=BOLD   guifg=#ffffff   guibg=#ff3300
-    hi WarningMsg     gui=BOLD   guifg=#ffffff   guibg=#ff6600
-    hi ModeMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
-    hi MoreMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
-    hi Question       gui=BOLD   guifg=#ffcd00   guibg=NONE
-    hi StatusLine     gui=NONE   guifg=#b9b9b9   guibg=#2F2A26
-    hi StatusLineNC   gui=NONE   guifg=#474A39   guibg=#2F2A26
-    hi VertSplit      gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
-    hi WildMenu       gui=BOLD   guifg=#ffcd00   guibg=#1e1e2e
-
-    hi DiffText       gui=NONE   guifg=#ffffcd   guibg=#00cd00
-    hi DiffChange     gui=NONE   guifg=#ffffcd   guibg=#008bff
-    hi DiffDelete     gui=NONE   guifg=#ffffcd   guibg=#cd0000
-    hi DiffAdd        gui=NONE   guifg=#ffffcd   guibg=#00cd00
-
-    hi Cursor         gui=NONE   guifg=#404040   guibg=#D78332
-    hi lCursor        gui=NONE   guifg=#404040   guibg=#8b8bff
-    hi CursorIM       gui=NONE   guifg=#404040   guibg=#8b8bff
-    hi CursorLine       gui=NONE                guibg=#222725           gui=none
-
-    hi Folded         gui=NONE   guifg=#cfcfcd   guibg=#4b208f
-    hi FoldColumn     gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
-
-    hi Directory      gui=NONE   guifg=#00ff8b   guibg=NONE
-    hi LineNr         gui=NONE   guifg=#595A48   guibg=#2E2A26
-    hi NonText        gui=BOLD   guifg=#8b8bcd   guibg=NONE
-    hi SpecialKey     gui=BOLD   guifg=#8b00cd   guibg=NONE
-    hi Title          gui=BOLD   guifg=#af4f4b   guibg=#1e1e27
-    hi Visual           guifg=NONE              guibg=#364458
-
-    hi Comment        gui=italic guifg=#4F4B42
-    hi Constant       gui=NONE   guifg=#ffcd8b   guibg=NONE
-    hi Boolean        gui=italic guifg=#B15A40 guibg=NONE
-    hi String           guifg=#B99B74                                   gui=none
-    hi Error          gui=NONE   guifg=#ffffff   guibg=#ff0000
-    hi Identifier     gui=NONE   guifg=#CEB429   guibg=NONE
-    hi Ignore         gui=NONE   guifg=#8b8bcd   guibg=NONE
-    "hi Number         gui=NONE   guifg=#506dbd   guibg=NONE
-    hi Number guifg=#C0E06C ctermfg=207
-    " def/end
-    hi PreProc        gui=NONE   guifg=#838861   guibg=NONE
-    hi Special        gui=NONE   guifg=#c080d0   guibg=NONE
-    " do/end
-    hi Statement      gui=NONE   guifg=#5FE8D0   guibg=NONE
-    hi Operator      gui=NONE   guifg=#828A66   guibg=NONE
-    "hi Todo           gui=BOLD   guifg=#303030   guibg=#c080d0
-    "hi Todo             guifg=#efef8f           guibg=NONE              gui=underline
-    hi Todo            guifg=#FFFFFF guibg=bg      gui=bold
-    hi Type           gui=NONE   guifg=#ff8bff   guibg=NONE
-    hi Underlined     gui=BOLD   guifg=#ffffcd   guibg=NONE
-    hi TaglistTagName gui=BOLD   guifg=#808bed   guibg=NONE
-
-    " match parenthesis, brackets
-    hi MatchParen       guifg=#00ff00           guibg=NONE              gui=bold
-    hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=bold
-
-    " Popup Menu
-    " ----------
-    " normal item in popup
-    hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
-    hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
-    " selected item in popup
-    hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
-    hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
-    " scrollbar in popup
-    hi PMenuSbar                                guibg=#505860           gui=none
-    hi PMenuSbar                                ctermbg=59              cterm=none
-    " thumb of the scrollbar in the popup
-    hi PMenuThumb                               guibg=#808890           gui=none
-    hi PMenuThumb                               ctermbg=102             cterm=none
-
-    " Ruby Highlighting
-    hi rubySymbol guifg=#DA8332 gui=italic
-    hi rubyClass        guifg=#b3d38c               gui=italic
-    hi rubyGlobalVariable           guifg=#45B6DC
-    hi rubyClassVariable           guifg=#CB9064
-    hi rubyInstanceVariable         guifg=#C3BF55
-    hi rubyConstant                 guifg=#8EB564    gui=italic
-    hi rubyBlockParameter           guifg=#CC6BDC
-    hi link rubyClass Keyword
-    hi link rubyModule Keyword
-    hi link rubyOperator Operator
-    hi link rubyIdentifier Identifier
-    hi rubyRegexp guifg=#B18A3D ctermfg=brown
-    hi rubyRegexpDelimiter guifg=#FF8000 ctermfg=brown
-    "hi rubyFunction     guifg=#0066bb               gui=bold
-    "hi rubyKeyword      guifg=#66cd66
-    "hi rubyIndentifier              guifg=#008aff
-    "hi rubyGlobalVariable           guifg=#dd7700
-    "hi rubyPredefinedIdentifier     guifg=#555555   gui=bold
-    "hi rubyString           guifg=#0086d2
-    "hi rubyStringDelimiter  guifg=#dd7700
-    "hi rubySpaceError       guibg=#270000
-    "hi rubyDocumentation    guifg=#aaaaaa
-    "hi rubyData             guifg=#555555
-else
-    exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(80) . ""
-    exec "hi IncSearch      cterm=BOLD   ctermfg=" . <SID>X("80") . "   ctermbg=" . <SID>X(73) . ""
-    exec "hi Search         cterm=NONE   ctermfg=" . <SID>X("80") . "   ctermbg=" . <SID>X(73) . ""
-    exec "hi ErrorMsg       cterm=BOLD   ctermfg=" . <SID>X("79") . "   ctermbg=" . <SID>X(64) . ""
-    exec "hi WarningMsg     cterm=BOLD   ctermfg=" . <SID>X("79") . "   ctermbg=" . <SID>X(68) . ""
-    exec "hi ModeMsg        cterm=BOLD   ctermfg=" . <SID>X("39") . ""
-    exec "hi MoreMsg        cterm=BOLD   ctermfg=" . <SID>X("39") . ""
-    exec "hi Question       cterm=BOLD   ctermfg=" . <SID>X("72") . ""
-    exec "hi StatusLine     cterm=BOLD   ctermfg=" . <SID>X("84") . "   ctermbg=" . <SID>X(81) . ""
-    exec "hi StatusLineNC   cterm=NONE   ctermfg=" . <SID>X("84") . "   ctermbg=" . <SID>X(81) . ""
-    exec "hi VertSplit      cterm=NONE   ctermfg=" . <SID>X("84") . "   ctermbg=" . <SID>X(82) . ""
-    exec "hi WildMenu       cterm=BOLD   ctermfg=" . <SID>X("72") . "   ctermbg=" . <SID>X(80) . ""
-
-    exec "hi DiffText       cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(24) . ""
-    exec "hi DiffChange     cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(23) . ""
-    exec "hi DiffDelete     cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(48) . ""
-    exec "hi DiffAdd        cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(24) . ""
-
-    exec "hi Cursor         cterm=NONE   ctermfg=" . <SID>X("8") . "    ctermbg=" . <SID>X(39) . ""
-    exec "hi lCursor        cterm=NONE   ctermfg=" . <SID>X("8") . "    ctermbg=" . <SID>X(39) . ""
-    exec "hi CursorIM       cterm=NONE   ctermfg=" . <SID>X("8") . "    ctermbg=" . <SID>X(39) . ""
-
-    exec "hi Folded         cterm=NONE   ctermfg=" . <SID>X("78") . "   ctermbg=" . <SID>X(35) . ""
-    exec "hi FoldColumn     cterm=NONE   ctermfg=" . <SID>X("38") . "   ctermbg=" . <SID>X(80) . ""
-
-    exec "hi Directory      cterm=NONE   ctermfg=" . <SID>X("29") . "   ctermbg=NONE"
-    exec "hi LineNr         cterm=NONE   ctermfg=" . <SID>X("38") . "   ctermbg=" . <SID>X(80) . ""
-    exec "hi NonText        cterm=BOLD   ctermfg=" . <SID>X("38") . "   ctermbg=NONE"
-    exec "hi SpecialKey     cterm=BOLD   ctermfg=" . <SID>X("34") . "   ctermbg=NONE"
-    exec "hi Title          cterm=BOLD   ctermfg=" . <SID>X("52") . "   ctermbg=" . <SID>X(80) . ""
-    exec "hi Visual         cterm=NONE   ctermfg=" . <SID>X("80") . "   ctermbg=" . <SID>X(73) . ""
-
-    exec "hi Comment        cterm=NONE   ctermfg=" . <SID>X("52") . "   ctermbg=NONE"
-    exec "hi Constant       cterm=NONE   ctermfg=" . <SID>X("73") . "   ctermbg=NONE"
-    exec "hi String         cterm=NONE   ctermfg=" . <SID>X("73") . "   ctermbg=" . <SID>X(8) . ""
-    exec "hi Error          cterm=NONE   ctermfg=" . <SID>X("79") . "   ctermbg=" . <SID>X(64) . ""
-    exec "hi Identifier     cterm=NONE   ctermfg=" . <SID>X("71") . "   ctermbg=NONE"
-    exec "hi Ignore         cterm=NONE   ctermfg=" . <SID>X("38") . "   ctermbg=NONE"
-    exec "hi Number         cterm=NONE   ctermfg=" . <SID>X("22") . "   ctermbg=NONE"
-    exec "hi PreProc        cterm=NONE   ctermfg=" . <SID>X("10") . "   ctermbg=NONE"
-    exec "hi Special        cterm=NONE   ctermfg=" . <SID>X("39") . "   ctermbg=NONE"
-    exec "hi Statement      cterm=NONE   ctermfg=" . <SID>X("26") . "   ctermbg=NONE"
-    exec "hi Todo           cterm=BOLD   ctermfg=" . <SID>X("08") . "   ctermbg=" . <SID>X(39) . ""
-    exec "hi Type           cterm=NONE   ctermfg=" . <SID>X("71") . "   ctermbg=NONE"
-    exec "hi Underlined     cterm=BOLD   ctermfg=" . <SID>X("78") . "   ctermbg=NONE"
-    exec "hi TaglistTagName cterm=BOLD   ctermfg=" . <SID>X("26") . "   ctermbg=NONE"
-endif
-
-" vim: set et :
diff --git a/colors/phd.vim b/colors/phd.vim
deleted file mode 100755
index 1dadc69..0000000
--- a/colors/phd.vim
+++ /dev/null
@@ -1,134 +0,0 @@
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "phd"
-
-" Very aggressive
-"let s:orange = '#f0a000'
-"let s:orange = '#b08060'
-let s:violet = '#99699c'
-let s:light_violet = '#a989ac'
-let s:yellow = '#e3d756'
-let s:red = '#d07346'
-let s:darkgreen = '#80a050'
-let s:green = '#99bf52'
-let s:lightgreen = '#e2e9af'
-let s:darkblue = '#32698f'
-let s:blue = '#5299bf'
-let s:lightblue = '#72b9bf'
-let s:light_orange = '#fbd461'
-let s:orange = '#bba401'
-let s:grey = '#808080'
-
-let s:text = '#e0e0e0'
-let s:text_hl = '#ffffff'
-let s:text_minor = '#909090'
-let s:text_very_minor = '#304050'
-
-let s:greyed = '#687898'
-
-let s:popup_bg = '#101010'
-let s:popup_bg_hl = '#000000'
-let s:popup_fg = s:text
-let s:popup_fg_hl = s:text_hl
-
-let s:bg = '#061229'
-let s:bg_hl_soft = '#1e293e'
-let s:bg_hl = '#324454'
-let s:bg_minor = '#030a17'
-
-let s:structure =  '#76cc68'
-let s:constant1 = '#c08040'
-let s:constant2 = '#d2852b'
-let s:constant3 = '#f2a54b'
-let s:control1 = '#f9f7a4'
-let s:control2 = '#c9b794'
-" '#76cc68'
-let s:border1_bg = s:bg_hl
-let s:border1_fg = s:text_minor
-let s:func = '#96b2cc'
-
-
-
-if version >= 700
-  "Tabpages
-  exe 'hi TabLineSel   guifg='.s:text_hl           .' guibg='.s:border1_bg      .' gui=underline'
-  exe 'hi TabLine      guifg='.s:text_minor        .' guibg='.s:bg      .' gui=underline'
-  exe 'hi TabLineFill  guifg='.s:text_minor        .' guibg='.s:bg      .' gui=none'
-
-  "P-Menu (auto-completion)
-  "hi Pmenu guifg=#605958 guibg=#101418 gui=none
-  "hi PmenuSel guifg=#a09998 guibg=#404040 gui=underline
-  exe 'hi CursorLine    guibg='.s:bg_hl_soft     .' gui=none'
-  exe 'hi CursorColumn  guibg='.s:bg_hl_soft     .' gui=none'
-  exe 'hi MatchParen    guifg='.s:text_hl           .' guibg='.s:bg_hl     .' gui=bold'
-
-  exe 'hi Pmenu         guifg='.s:text              .' guibg='.s:popup_bg      .' gui=none'
-  exe 'hi PmenuSel      guifg='.s:text_hl           .' guibg='.s:popup_bg_hl   .' gui=bold'
-  exe 'hi PmenuSbar                                    guibg='.s:popup_bg_hl
-  exe 'hi PmenuThumb    guifg='.s:text
-endif
-
-exe 'hi Visual guibg='.s:bg_hl
-
-"hi Cursor guifg=NONE guibg=#586068
-hi Cursor guibg=#b0d0f0
-
-exe 'hi Normal         guifg='.s:text              .' guibg='.s:bg
-"exe 'hi Underlined     guifg='.s:white             .' guibg='.s:darkgrey        .' gui=underline'
-exe 'hi NonText        guifg='.s:text_very_minor   .' guibg='.s:bg
-exe 'hi SpecialKey     guifg='.s:text_very_minor              .' guibg='.s:bg
-
-exe 'hi LineNr         guifg='.s:border1_fg        .' guibg='.s:border1_bg      .' gui=none'
-exe 'hi StatusLine     guifg='.s:text_hl           .' guibg='.s:border1_bg      .' gui=underline'
-exe 'hi StatusLineNC   guifg='.s:text_minor        .' guibg='.s:border1_bg      .' gui=underline'
-exe 'hi VertSplit      guifg='.s:border1_bg        .' guibg='.s:border1_bg      .' gui=none'
-
-exe 'hi Folded         guifg='.s:text_minor         .' guibg='.s:border1_bg  .' gui=none'
-exe 'hi FoldColumn     guifg='.s:text_minor         .' guibg='.s:border1_bg  .' gui=none'
-exe 'hi SignColumn     guifg='.s:text_minor         .' guibg='.s:border1_bg  .' gui=none'
-
-exe 'hi Comment        guifg='.s:greyed            .' guibg='.s:bg        .' gui=none'
-exe 'hi TODO           guifg='.s:greyed            .' guibg='.s:bg        .' gui=bold'
-
-exe 'hi Title          guifg='.s:red               .' guibg='.s:bg        .' gui=underline'
-
-exe 'hi Constant       guifg='.s:constant1        .' guibg='.s:bg        .' gui=none'
-exe 'hi String         guifg='.s:constant2        .' guibg='.s:bg        .' gui=none'
-exe 'hi Special        guifg='.s:constant3        .' guibg='.s:bg        .' gui=none'
-
-exe 'hi Identifier     guifg='.s:control1          .' guibg='.s:bg        .' gui=none'
-exe 'hi Statement      guifg='.s:control2          .' guibg='.s:bg        .' gui=none'
-"exe 'hi Conditional    guifg='.s:grey             .' guibg='.s:bg        .' gui=bold'
-"exe 'hi Repeat         guifg='.s:light_orange             .' guibg='.s:bg        .' gui=bold'
-exe 'hi Structure      guifg='.s:structure         .' guibg='.s:bg        .' gui=none'
-exe 'hi Function       guifg='.s:func      .' guibg='.s:bg        .' gui=none'
-
-exe 'hi PreProc        guifg='.s:light_violet           .' guibg='.s:bg        .' gui=none'
-exe 'hi Define         guifg='.s:light_violet           .' guibg='.s:bg        .' gui=none'
-exe 'hi Operator       guifg='.s:light_orange      .' guibg='.s:bg        .' gui=none'
-exe 'hi Type           guifg='.s:yellow            .' guibg='.s:bg        .' gui=none'
-
-"hi Macro guifg=#a0b0c0 gui=underline
-
-"Tabs, trailing spaces, etc (lcs)
-"hi SpecialKey guifg=#808080 guibg=#343434
-
-"hi TooLong guibg=#ff0000 guifg=#f8f8f8
-
-hi Search guifg=#606000 guibg=#c0c000 gui=bold
-
-hi Directory guifg=#dad085 gui=NONE
-hi Error guibg=#602020
-
-" Plugins
-
-"exe 'hi TagListFileName  guifg='.s:lightgrey               .' guibg='.s:darkgrey        .' gui=underline'
-"exe 'hi TagListTitle  guifg='.s:mid_grey_blue               .' guibg='.s:darkgrey        .' gui=italic'
-
diff --git a/colors/phphaxor.vim b/colors/phphaxor.vim
deleted file mode 100755
index 5ecd062..0000000
--- a/colors/phphaxor.vim
+++ /dev/null
@@ -1,173 +0,0 @@
-" PHPHaxor vim color file
-" Maintainer:  Bram Rohde <mailforbram[at]gmail[dt]com>
-" Version: 0.9 <still needs some real world testing but should be ok>
-" Last Changed: 2007-06-05
-" Description:
-" PHP Haxor vim color file
-" Is a dark minimalistic syntax highlighting theme.
-" Specially made to light out your PHP code in between HTML/JS.
-" I made this file mainly for my own use, but feel free 
-" to contact me if you run into any problems/bugs.
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "phphaxor"
-
-hi Normal         term=none ctermfg=7 ctermbg=0 gui=none guifg=White guibg=Gray9
-hi Directory      term=bold cterm=bold ctermfg=DarkCyan guifg=LightBlue
-hi Search         term=reverse ctermfg=10 guifg=Green guibg=Black
-hi MoreMsg        term=bold cterm=bold ctermfg=darkgreen gui=bold guifg=Yellow
-hi ModeMsg        term=bold cterm=bold ctermfg=lightred gui=bold guifg=DeepPink guibg=Black
-hi LineNr         term=underline cterm=bold ctermfg=darkgrey guifg=Cadetblue4
-hi Question       term=standout cterm=bold ctermfg=lightgreen gui=bold guifg=Yellow
-hi Comment        term=bold cterm=bold ctermfg=darkcyan gui=none guifg=Cadetblue3
-hi Constant       term=bold cterm=none ctermfg=7 gui=none guifg=LightGray
-hi Special        term=bold cterm=none ctermfg=2 gui=none guifg=DarkOliveGreen1
-hi Identifier     term=none cterm=none ctermfg=7 gui=none guifg=LightGray
-hi PreProc        term=underline cterm=bold ctermfg=7 gui=none guifg=Yellow
-hi Error          term=reverse cterm=bold ctermfg=7 ctermbg=1 gui=bold guifg=Red guibg=Black
-hi Todo           term=standout cterm=none ctermfg=0 ctermbg=7 guifg=Black guibg=White
-hi String         term=none cterm=none ctermfg=7 gui=none guifg=LightYellow
-hi Function       term=bold cterm=bold ctermfg=14 gui=bold guifg=White
-hi Statement      term=bold cterm=bold ctermfg=14 gui=bold guifg=White
-hi Include        term=bold cterm=bold ctermfg=12 gui=none guifg=LightBlue
-hi StorageClass   term=bold cterm=bold ctermfg=13 gui=none guifg=LightMagenta
-hi Type           term=none cterm=none ctermfg=7 gui=none guifg=LightGray
-hi Defined        term=bold cterm=bold ctermfg=14 gui=none guifg=LightCyan
-hi MatchParen	  term=bold cterm=bold ctermbg=8 ctermfg=13 gui=none guifg=DeepPink guibg=Black
-hi Cursorline	  guibg=Black
-hi Cursor		  term=bold cterm=bold ctermfg=0 ctermbg=10 guibg=GreenYellow guifg=Black 
-hi Visual         guifg=White guibg=MediumPurple4
-
-hi htm			  ctermfg=8 guifg=Gray56
-hi js			  ctermfg=8 guifg=IndianRed
-
-
-
-hi link Character       String
-hi link Number          Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Conditional     Statement
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Operator        Statement
-hi link Keyword         Statement
-hi link Exception       Statement
-hi link Macro           Include
-hi link PreCondit       PreProc
-hi link Structure       Type
-hi link Typedef         Type
-hi link Tag             Special
-hi link SpecialChar     Special
-hi link Delimiter       Special
-hi link SpecialComment  Special
-hi link Debug           Special
-
-
-"HTML HTML HTML
-
-"Title
-hi link Title htm
-hi link htmlH1 htm
-hi link htmlH2 htm
-hi link htmlH3 htm
-hi link htmlH4 htm
-hi link htmlH5 htm
-hi link htmlH6 htm
-hi link htmlTitle htm
-
-"HTML Comment
-hi link htmlCommentPart htm
-hi link htmlComment htm
-
-"HTML Special
-hi link htmlCssStyleComment htm
-hi link htmlSpecialChar htm
-hi link htmlCssDefinition htm
-hi link htmlSpecial htm
-hi link htmlTagN 	htm
-hi link htmlEvent js
-hi link htmlEventSQ js
-hi link htmlEventDQ js
-
-"HTML Identifier
-hi link htmlEndTag htm
-hi link htmlTag htm
-hi link htmlScriptTag htm
-
-"HTML Statement
-hi link htmlSpecialTagName htm
-hi link htmlStatement htm
-hi link htmlTagName htm
-
-"HTML PreProc
-hi link htmlPreStmt htm
-hi link htmlPreProc htm
-hi link htmlPreProcAttrName htm
-hi link htmlHead htm
-
-"HTML Type
-hi link htmlArg htm
-
-"HTML Link
-hi link htmlLink htm
-
-"HTML String
-hi link htmlString htm
-hi link htmlValue htm
-hi link htmlPreAttr htm
-hi link htmlStyleArg htm
-"HTML VIM emulate the simple statements turn it off 
-hi link htmlBold htm
-hi link htmlBoldItalic htm
-hi link htmlBoldUnderline htm
-hi link htmlUnderlineBold htm
-hi link htmlUnderline htm
-hi link htmlUnderlineItalic htm
-hi link htmlItalic htm
-hi link htmlItalicBold htm
-hi link htmlBoldItalicUnderline htm
-hi link htmlBoldUnderlineItalic htm
-hi link htmlItalicBoldUnderline htm
-hi link htmlUnderlineBoldItalic htm
-hi link htmlUnderlineItalicBold htm
-hi link htmlItalicUnderlineBold htm
-
-"JS
-hi link javaScript js
-hi link javaScriptConditional js
-hi link javaScriptRepeat js
-hi link javaScriptBranch js
-hi link javaScriptOperator js
-hi link javaScriptStatement js
-hi link javaScriptNull js
-hi link javaScriptLabel js
-hi link javaScriptException js
-hi link javaScriptMessage js
-hi link javaScriptGlobal js
-hi link javaScriptMember js
-hi link javaScriptDeprecated js
-hi link javaScriptReserved js
-hi link javaScriptConstant js
-hi link javaScriptFunction js
-hi link javaScriptBraces js
-hi link javaScriptExpression js
-hi link javaScriptSpecial js
-hi link javaScriptSpecialCharacter js
-hi link javaScriptDebug js
-hi link javaScriptLineComment js
-hi link javaScriptComment js
-hi link javaScriptValue js
-hi link javaScriptParens js
-hi link javaScriptNumber js
-hi link javaScriptType js
-hi link javaScriptIdentifier js
-hi link javaScriptBoolean js
-hi link javaScriptCommentSkip js
-
-
-
diff --git a/colors/phpx.vim b/colors/phpx.vim
deleted file mode 100755
index e86318c..0000000
--- a/colors/phpx.vim
+++ /dev/null
@@ -1,166 +0,0 @@
-" Vim color file
-"Version 1.1
-" Last Change:	2006 August 1
-"Modified to work with reloaded.vim AKA ps_color.vim
-"as :color phpx
-"   :color reloaded
-"   :Reload 360  100  100  180    0    0    1    0    0    phpx.vim
-"           +/-  +/-  +/-  +/-    ?  brite bg    ?   de    template
-"           Hue  Sat  lt   Hu2   sat       1-lt  ?   bug   file
-"                ura  dk         ura       0-dk  ?   0-n
-"                tion            tion                1-y
-"
-"   Light experiments
-"   :Reload 360 100 110 550 0 0 1 0 0 phpx.vim
-"   :Reload 360 80 110 400 0 0 1 0 0 phpx.vim
-"   :Reload 360 60 110 300 0 60 1 0 0 phpx.vim
-"
-"   Dark experiment
-"   :Reload 360 100 100 200 0 200 0 0 0 phpx.vim
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "phpx"
-
-if exists("&t_Co") && &t_Co > 2 && &t_Co <= 8
-    "Not much on the linux (text)console, unless anybody would document.
-    hi Normal          ctermfg=4 ctermbg=7
-    hi Comment         ctermfg=3
-    hi Constant        ctermfg=1
-    hi Special         ctermfg=3
-    hi Identifier      ctermfg=4
-    hi Statement       ctermfg=0
-    hi PreProc         ctermfg=2
-    hi Type            ctermfg=2
-    finish
-endif
-
-" LIGHT COLOR DEFINE START
-hi Normal          guifg=#0000af guibg=#e4e4e4 ctermfg=19 ctermbg=254 
-hi Cursor          guifg=#ffffff guibg=#0000af
-hi Comment         guifg=#ff8700 guibg=#e4e4e4 ctermfg=208 
-hi Constant        guifg=#d70000 guibg=bg term=underline ctermfg=160 
-hi Special         guifg=#d75f00 guibg=bg term=bold ctermfg=166 
-hi Identifier      guifg=#0000af guibg=bg term=underline cterm=NONE ctermfg=19 
-hi Statement       guifg=#008700 guibg=bg gui=NONE term=bold ctermfg=28 cterm=NONE 
-hi PreProc         guifg=#00af00 guibg=bg term=underline cterm=bold ctermfg=34 gui=bold 
-hi Type            guifg=#00af00 guibg=bg term=underline ctermfg=34 
-hi Underlined      guifg=#80a0ff guibg=bg term=underline cterm=underline ctermfg=9 gui=underline 
-hi Ignore          guifg=bg guibg=fg cterm=bold ctermfg=0 
-hi Error           guifg=#ffffff guibg=#ff0000 term=reverse cterm=bold ctermfg=15 ctermbg=12 
-hi Todo            guifg=#0000ff guibg=#ffff00 term=standout ctermfg=0 ctermbg=14 
-hi Pmenu           guibg=#ff00ff guifg=fg ctermbg=13 
-hi PmenuSel        guibg=#a9a9a9 guifg=fg ctermbg=8 
-hi PmenuSbar       guibg=#bebebe guifg=fg ctermbg=7 
-hi PmenuThumb      guifg=fg guibg=bg gui=reverse cterm=reverse 
-hi TabLine         guibg=#a9a9a9 guifg=fg gui=underline term=underline cterm=underline ctermfg=15 ctermbg=8 
-hi TabLineSel      guifg=fg guibg=bg gui=bold term=bold cterm=bold 
-hi TabLineFill     guifg=fg guibg=bg gui=reverse term=reverse cterm=reverse 
-hi MatchParen      guifg=#cecb00 guibg=#ffffaf term=reverse ctermfg=3 ctermbg=229 
-hi SpecialKey      guifg=#00ffff guibg=bg term=bold ctermfg=9 
-hi NonText         guifg=#0000ff guibg=bg gui=bold term=bold ctermfg=9 
-hi Directory       guifg=#00ffff guibg=bg term=bold ctermfg=11 
-hi ErrorMsg        guifg=#ffffff guibg=#ff0000 term=standout cterm=bold ctermfg=15 ctermbg=4 
-hi IncSearch       guifg=#708090 guibg=#f0e68c gui=reverse term=reverse cterm=reverse ctermfg=11 ctermbg=10 
-hi Search          guifg=#000087 guibg=#87ffd7 term=reverse ctermfg=18 ctermbg=122 
-hi MoreMsg         term=bold ctermfg=29 gui=bold guifg=#00875f guibg=bg
-hi ModeMsg         term=bold cterm=bold ctermfg=178 gui=bold guifg=#d7af00 guibg=bg
-hi LineNr          guifg=#d7d787 guibg=bg term=underline ctermfg=186 
-hi Question        guifg=#00ffff guibg=bg gui=bold term=standout ctermfg=14 
-hi StatusLine      guifg=#000087 guibg=#ffffff gui=bold,reverse term=bold,reverse cterm=bold,reverse ctermfg=18 ctermbg=15 
-hi StatusLineNC    guifg=#949494 guibg=#ffffff gui=bold,reverse term=bold,reverse cterm=bold,reverse ctermfg=246 ctermbg=15 
-hi VertSplit       guifg=#000087 guibg=#c6c6c6 gui=reverse ctermfg=18 ctermbg=251 term=reverse cterm=reverse 
-hi Title           guifg=#d700af guibg=bg gui=bold term=bold ctermfg=163 
-hi Visual          guifg=#ffffaf guibg=#005f00 gui=reverse term=reverse cterm=reverse ctermfg=229 ctermbg=22 
-hi VisualNOS       guifg=fg guibg=bg gui=bold,underline term=bold,underline cterm=bold,underline 
-hi WarningMsg      guifg=#ff0000 guibg=bg term=standout ctermfg=9 
-hi WildMenu        guifg=#000000 guibg=#ffff00 guifg=fg term=standout ctermfg=0 ctermbg=11 
-hi Folded          guifg=#00ffff guibg=#a8a8a8 term=standout ctermfg=14 ctermbg=248 
-hi FoldColumn      guifg=#00ffff guibg=#bcbcbc term=standout ctermfg=14 ctermbg=250 
-hi DiffAdd         guibg=#000087 guifg=#e4e4e4 term=bold ctermbg=1 ctermbg=18 ctermfg=254 
-hi DiffChange      guibg=#870087 guifg=#87afff term=bold ctermbg=90 
-hi DiffDelete      guifg=#0000ff guibg=#008787 gui=bold term=bold cterm=bold ctermfg=21 ctermbg=30 ctermbg=3 
-hi DiffText        guibg=#ff0000 guifg=fg gui=bold term=reverse cterm=bold ctermbg=9 
-hi SignColumn      guifg=#00ffff guibg=#bcbcbc term=standout ctermfg=14 ctermbg=250 
-hi lCursor         guifg=#d7ffd7 guibg=#0000af
-" LIGHT COLOR DEFINE END
-
-finish
-
-" DARK COLOR DEFINE START
-hi Normal          guifg=#e4e4e4 guibg=#000000 ctermfg=19 ctermbg=254 
-hi Cursor          guifg=#0000af guibg=#ffffff 
-hi Comment         guifg=#e4e4e4 guifg=#ff8700 ctermfg=208 
-hi Constant        guifg=#d70000 guibg=bg term=underline ctermfg=160 
-hi Special         guifg=#d75f00 guibg=bg term=bold ctermfg=166 
-hi Identifier      guifg=#0000af guibg=bg term=underline cterm=NONE ctermfg=19 
-hi Statement       guifg=#008700 guibg=bg gui=NONE term=bold ctermfg=28 cterm=NONE 
-hi PreProc         guifg=#00af00 guibg=bg term=underline cterm=bold ctermfg=34 gui=bold 
-hi Type            guifg=#00af00 guibg=bg term=underline ctermfg=34 
-hi Underlined      guifg=#80a0ff guibg=bg term=underline cterm=underline ctermfg=9 gui=underline 
-hi Ignore          guifg=bg guibg=fg cterm=bold ctermfg=0 
-hi Error           guifg=#ffffff guibg=#ff0000 term=reverse cterm=bold ctermfg=15 ctermbg=12 
-hi Todo            guifg=#0000ff guibg=#ffff00 term=standout ctermfg=0 ctermbg=14 
-hi Pmenu           guibg=#ff00ff guifg=fg ctermbg=13 
-hi PmenuSel        guibg=#a9a9a9 guifg=fg ctermbg=8 
-hi PmenuSbar       guibg=#bebebe guifg=fg ctermbg=7 
-hi PmenuThumb      guifg=fg guibg=bg gui=reverse cterm=reverse 
-hi TabLine         guibg=#a9a9a9 guifg=fg gui=underline term=underline cterm=underline ctermfg=15 ctermbg=8 
-hi TabLineSel      guifg=fg guibg=bg gui=bold term=bold cterm=bold 
-hi TabLineFill     guifg=fg guibg=bg gui=reverse term=reverse cterm=reverse 
-hi MatchParen      guifg=#cecb00 guibg=#ffffaf term=reverse ctermfg=3 ctermbg=229 
-hi SpecialKey      guifg=#00ffff guibg=bg term=bold ctermfg=9 
-hi NonText         guifg=#0000ff guibg=bg gui=bold term=bold ctermfg=9 
-hi Directory       guifg=#00ffff guibg=bg term=bold ctermfg=11 
-hi ErrorMsg        guifg=#ffffff guibg=#ff0000 term=standout cterm=bold ctermfg=15 ctermbg=4 
-hi IncSearch       guifg=#708090 guibg=#f0e68c gui=reverse term=reverse cterm=reverse ctermfg=11 ctermbg=10 
-hi Search          guifg=#000087 guibg=#87ffd7 term=reverse ctermfg=18 ctermbg=122 
-hi MoreMsg         term=bold ctermfg=29 gui=bold guifg=#00875f guibg=bg
-hi ModeMsg         term=bold cterm=bold ctermfg=178 gui=bold guifg=#d7af00 guibg=bg
-hi LineNr          guifg=#d7d787 guibg=bg term=underline ctermfg=186 
-hi Question        guifg=#00ffff guibg=bg gui=bold term=standout ctermfg=14 
-hi StatusLine      guifg=#000087 guibg=#ffffff gui=bold,reverse term=bold,reverse cterm=bold,reverse ctermfg=18 ctermbg=15 
-hi StatusLineNC    guifg=#949494 guibg=#ffffff gui=bold,reverse term=bold,reverse cterm=bold,reverse ctermfg=246 ctermbg=15 
-hi VertSplit       guifg=#000087 guibg=#c6c6c6 gui=reverse ctermfg=18 ctermbg=251 term=reverse cterm=reverse 
-hi Title           guifg=#d700af guibg=bg gui=bold term=bold ctermfg=163 
-hi Visual          guifg=#ffffaf guibg=#005f00 gui=reverse term=reverse cterm=reverse ctermfg=229 ctermbg=22 
-hi VisualNOS       guifg=fg guibg=bg gui=bold,underline term=bold,underline cterm=bold,underline 
-hi WarningMsg      guifg=#ff0000 guibg=bg term=standout ctermfg=9 
-hi WildMenu        guifg=#000000 guibg=#ffff00 guifg=fg term=standout ctermfg=0 ctermbg=11 
-hi Folded          guifg=#00ffff guibg=#a8a8a8 term=standout ctermfg=14 ctermbg=248 
-hi FoldColumn      guifg=#00ffff guibg=#bcbcbc term=standout ctermfg=14 ctermbg=250 
-hi DiffAdd         guibg=#000087 guifg=#e4e4e4 term=bold ctermbg=1 ctermbg=18 ctermfg=254 
-hi DiffChange      guibg=#870087 guifg=#87afff term=bold ctermbg=90 
-hi DiffDelete      guifg=#0000ff guibg=#008787 gui=bold term=bold cterm=bold ctermfg=21 ctermbg=30 ctermbg=3 
-hi DiffText        guibg=#ff0000 guifg=fg gui=bold term=reverse cterm=bold ctermbg=9 
-hi SignColumn      guifg=#00ffff guibg=#bcbcbc term=standout ctermfg=14 ctermbg=250 
-hi lCursor         guifg=#d7ffd7 guibg=#0000af
-" DARK COLOR DEFINE END
-
-" COLOR LINKS DEFINE START
-" COLOR LINKS DEFINE END
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/colors/pic.vim b/colors/pic.vim
deleted file mode 100755
index cfa51a9..0000000
--- a/colors/pic.vim
+++ /dev/null
@@ -1,245 +0,0 @@
-" Vim syntax file
-" Language:     PIC16F84 Assembler (Microchip's microcontroller)
-" Maintainer:   Aleksandar Veselinovic <alexa@cliffhanger.com>
-" Last Change:  2001 May 10
-" URL:          http://SOLAIR.EUnet.yu/~aleksav/vim/syntax/pic.vim
-" Revision:     1.0
-
-" Modifications
-" Language:	Add support to PIC18fxx2 Assembler (Microchip's microcontroller)
-" Modifications:Diego Belotti <dbelotti@adinet.com.uy> 
-" Last Change:	2003 Ago 26
-" Revision:	2.0	 
-
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn case match
-syn keyword picTodo NOTE TODO XXX contained
-
-
-syn case ignore
-
-syn match picIdentifier "[a-z_$][a-z0-9_$]*"
-syn match picLabel      "^[A-Z_$][A-Z0-9_$]*"
-syn match picLabel      "^[A-Z_$][A-Z0-9_$]*:"me=e-1
-
-syn match picASCII      "A\='.'"
-syn match picBinary     "B'[0-1]\+'"
-syn match picDecimal    "D'\d\+'"
-syn match picDecimal    "\d\+"
-syn match picHexadecimal "0x\x\+"
-syn match picHexadecimal "H'\x\+'"
-syn match picHexadecimal "[0-9]\x*h"
-syn match picOctal      "O'[0-7]\o*'"
-
-
-syn match picComment    ";.*" contains=picTodo
-
-syn region picString    start=+"+ end=+"+
-
-" Inicio del 16f84
-syn keyword picRegister         INDF TMR0 PCL STATUS FSR PORTA PORTB
-syn keyword picRegister         EEDATA EEADR PCLATH INTCON INDF OPTION_REG PCL
-syn keyword picRegister         FSR TRISA TRISB EECON1 EECON2 INTCON OPTION
-
-" Register --- bits
-
-" STATUS
-syn keyword picRegisterPart     IRP RP1 RP0 TO PD Z DC C
-
-" PORTA
-syn keyword picRegisterPart     T0CKI
-syn match   picRegisterPart     "RA[0-4]"
-
-" PORTB
-syn keyword picRegisterPart     INT
-syn match   picRegisterPart     "RB[0-7]"
-
-" INTCON
-syn keyword picRegisterPart     GIE EEIE T0IE INTE RBIE T0IF INTF RBIF
-
-" OPTION
-syn keyword picRegisterPart     RBPU INTEDG T0CS T0SE PSA PS2 PS1 PS0
-
-" EECON2
-syn keyword picRegisterPart     EEIF WRERR WREN WR RD
-
-" INTCON
-syn keyword picRegisterPart     GIE EEIE T0IE INTE RBIE T0IF INTF RBIF
-
-
-" OpCodes...
-syn keyword picOpcode  ADDWF ANDWF CLRF CLRW COMF DECF DECFSZ INCF INCFSZ
-syn keyword picOpcode  IORWF MOVF MOVWF NOP RLF RRF SUBWF SWAPF XORWF
-syn keyword picOpcode  BCF BSF BTFSC BTFSS
-syn keyword picOpcode  ADDLW ANDLW CALL CLRWDT GOTO IORLW MOVLW RETFIE
-syn keyword picOpcode  RETLW RETURN SLEEP SUBLW XORLW
-syn keyword picOpcode  GOTO
-
-
-" Directives
-syn keyword picDirective __BADRAM BANKISEL BANKSEL CBLOCK CODE __CONFIG
-syn keyword picDirective CONSTANT DATA DB DE DT DW ELSE END ENDC
-syn keyword picDirective ENDIF ENDM ENDW EQU ERROR ERRORLEVEL EXITM EXPAND
-syn keyword picDirective EXTERN FILL GLOBAL IDATA __IDLOCS IF IFDEF IFNDEF
-syn keyword picDirective INCLUDE LIST LOCAL MACRO __MAXRAM MESSG NOEXPAND
-syn keyword picDirective NOLIST ORG PAGE PAGESEL PROCESSOR RADIX RES SET
-syn keyword picDirective SPACE SUBTITLE TITLE UDATA UDATA_OVR UDATA_SHR
-syn keyword picDirective VARIABLE WHILE INCLUDE
-syn match picDirective   "#\=UNDEFINE"
-syn match picDirective   "#\=INCLUDE"
-syn match picDirective   "#\=DEFINE"
-" Fin del 16f84
-
-" Inicio del PIC 18Fxx2
-" Regisers
-syn keyword picRegister		TOSU TOSH TOSL STKPTR PCLATU PCLATH PCL TBLPTRU TBLPTRH TBLPTRL TABLAT
-syn keyword picRegister		PRODH PRODL INTCON INTCON2 INTCON3 INDF0 POSTINC0 POSTDEC0 PREINC0 PLUSW0
-syn keyword picRegister		FSR0H FSR0L WREG INDF1 POSTINC1 POSTDEC1 PREINC1 PLUSw1 FSR1H FSR1L BSR
-syn keyword picRegister		INDF2 POSTINC2 POSTDEC2 PREINC2 PLUSw2 FSR2H FSR2L STATUS TMR0H TMR0L 
-syn keyword picRegister		T0CON OSCCON LVDCON WDTCON RCON TMR1H TMR1L T1CON TMR2 PR2 T2CON SSPBUF
-syn keyword picRegister		SSPADD SSPSTAT SSPCON1 SSPCON2 ADRESH ADRESL ADCON0 ADCON1 CCPR1H CCPR1L
-syn keyword picRegister		CCP1CON CCPR2H CCPR2L CCP2CON TMR3H TMR3L T3CON SPBRG RCREG TXREG TXSTA
-syn keyword picRegister		RCSTA EEADR EEDATA EECON2 EECON1 IPR2 PIR2 PIE2 IPR1 PIR1 PIE1 TRISE
-syn keyword picRegister		TRISD TRISC TRISB TRISA LATC LATD LATB LATA PORTE PORTD PORTC PORTB PORTA
-"Register BITS
-" STKPTR
-syn keyword picRegisterPart	STKFUL STKUNF
-" INTCON
-syn keyword picRegisterPart	GIE GIEH PEIE GIEL TMR0IE T0IE INT0IE INT0E RBIE TMR0IF T0IF INT0IF INT0F RBIF
-" INTCON2
-syn keyword picRegisterPart	NOT_RBPU RBPU INTEDG0 INTEDG1 INTEDG2 TMR0IP T0IP RBIP
-" INTCON3
-syn keyword picRegisterPart	INT2IP INT1IP INT2IE INT2IP INT2IF INT1IF
-" STATUS
-syn keyword picRegisterPart	N OV Z DC C
-" T0CON
-syn keyword picRegisterPart	TMR0ON T08BIT T0CS T0SE PSA T0PS2 T0PS1 T0PS0
-" OSCCON
-syn keyword picRegisterPart 	SCS
-" LVDCON
-syn keyword picRegisterPart	IRVST LVDEN LVDL3 LVDL2 LVDL1 LVDL0
-" WDTCON
-syn keyword picRegisterPart	SWDTE SWDTEN
-" RCON
-syn keyword picRegisterPart	IPEN NOT_RI RI NOT_TO TO NOT_PD PD NOT_POR POR NOT_BOR BOR
-" T1CON
-syn keyword picRegisterPart	RD16 T1CKPS1 T1CKPS0 T1OSCEN NO_T1SYNC T1SYNC T1INSYNC TMR1CS TMR1ON
-" T2CON
-syn keyword picRegisterPart	TOUTPS3 TOUTPS2 TOUTPS1 TOUTPS0 TMR2ON T2CKPS1 T2CKPS0
-" SSPSTAT
-syn keyword picRegisterPart	SMP CKE D I2C_DAT NOT_A NOT_ADDRESS D_A DATA_ADDRESS P I2C_STOP S I2C_START R I2C_READ NOT_W NOT_WRITE R_W READ_WRITE UA BF
-" SSPCON1
-syn keyword picRegisterPart	WCOL SSPOV SSPEN CKP SSPM3 SSPM2 SSPM1 SSPM0
-" SSPCIN2
-syn keyword picRegisterPart	GCEN ACKSTAT ACKDT ACKEN RCEN PEN RSEN SEN
-" ADCON0
-syn keyword picRegisterPart	ADCS1 ADCS0 CHS2 CHS1 CHS0 GO NOT_DONE DONE GO_DONE ADON
-" ADCON1
-syn keyword picRegisterPart	ADFM ADCS2 PCFG3 PCFG2 PCFG1 PCFG0
-" CCP1CON
-syn keyword picRegisterPart	DC1B1 CCP1X DC1BC0 CCP1Y CCP1M3 CCP1M2 CCP1M1 CCP1M0
-" CCP2CON
-syn keyword picRegisterPart	DC2B1 CCP2X DC2B0 CCP2Y CCP2M3 CCP2M2 CCP2M1 CCP2M0
-" T3CON
-syn keyword picRegisterPart	RD16 T3CCP2 T3CKPS1 T3CKPS0 T3CCP1 NOT_T3SYNC T3SYNC T3INSYNC TMR3CS TMR3ON
-" TXSTA
-syn keyword picRegisterPart	CSRC TX9 NOT_TX8 TX8_9 TXEN SYNC BRGH TMRT TX9D TXD8
-" RCSTA
-syn keyword picRegisterPart	SPEN RX9 RC9 NOT_RC8 RC8_9 SREN CREN ADDEN FERR OERR RX9D RCD8
-" IPR2
-syn keyword picRegisterPart	EEIP BCLIP LVDIP TMR3IP CCP2IP
-" PIR2
-syn keyword picRegisterPart	EEIF BCLIF LVDIF TMR3IF CCP2IF
-" PIE2
-syn keyword picRegisterPart	EEIE BCLIE LVDIE TMR3IE CCP2IE
-" IPR1
-syn keyword picRegisterPart	PSPIP ADIP RCIP TXIP SSPIP CCP1IP TMR2IP TMR1IP
-" PIR1	
-syn keyword picRegisterPart	PSPIF ADIF RCIF TXIF SSPIF CCP1IF TMR2IF TMR1IF
-" PIE1	
-syn keyword picRegisterPart	PSPIE ADIE RCIE TXIE SSPIE CCP1IE TMR2IE TMR1IE
-" TRISE
-syn keyword picRegisterPart	IBF OBF IBOV PSPMODE TRISE2 TRISE1 TRISE0
-" EECON1
-syn keyword picRegisterPart	EEPGD CFGS FREE WRERR WREN WR RD
-" PORTA
-syn match picRegisterPart	"RA[0-6]"
-syn match picRegisterPart	"AN[0-4]"
-syn keyword picRegisterPart	VREFM VREFP T0CKI SS LVDIN OSC2	CLKO
-" PORTB
-syn match picRegisterPart 	"RB[0-7]"
-syn keyword picRegisterPart	INT0 INT1 INT2 CCP2A
-" PORTC
-syn match picRegisterPart	"RC[0-7]"
-syn keyword picRegisterPart	T1OSO T1CKI T1OSI CCP2 CCP1 SCK SCL SDI SDA SDO TX CK RX
-" PORTD
-syn match picRegisterPart 	"RD[0-7]"
-syn match picRegisterPart 	"PSP[0-7]"
-" PORTE
-syn match picRegisterPart 	"RE[0-2]"
-syn match picRegisterPart 	"AN[5-7]"
-syn keyword picRegisterPart	RD WR CS
-
-" CONFIG
-syn match picDirective		"_CONFIG[1-7]L"
-syn match picDirective		"_CONFIG[1-7]H"
-syn keyword picDirective	_DEVID1 _DEVID2
-syn match picDirective		"_IDLOC[0-7]"
-
-" OPCODES 
-syn keyword picOpcode		ADDWF ADDWFC ANDWF CLRF COMF CPFSEQ CPFSGT CPFSLT DECF DECFSZ DCFSNZ INCF
-syn keyword picOpcode		INCFSZ INFSNZ IORWF MOVF MOVFF MOVWF MULWF NEGF RLCF RLNCF RRCF RRNCF SETF
-syn keyword picOpcode		SUBFWB SWAPF TSTFSZ XORWF BCF BSF BTFSC BTFSS BTG BC BN BNC BNN BNOV BNZ
-syn keyword picOpcode		BOV BRA BZ CALL CLRWDT DAW GOTO NOP POP PUSH RCALL RESET RETFIE RETLW RETURN
-syn keyword picOpcode		SLEEP ADDLW ANDLW IORLW LFSR MOVLB MOVLW MULLW RETLW SUBLW XORLW
-syn keyword picOpcode		TBLRD* TBLRD*+ TBLRD*- TBLRD +* TBLWT* TBLWT*+ TBLWT*- TBLWT+*
-
-" DIRECTIVES
-" The same as the 16f84
-
-
-" Fin del 18fxx2
-
-" 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_pic16f84_syntax_inits")
-  if version < 508
-    let did_pic16f84_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink picTodo               Todo
-  HiLink picComment            Comment
-  HiLink picDirective          Statement
-  HiLink picLabel              Label
-  HiLink picString             String
-
-  HiLink picOpcode             Keyword
-  HiLink picRegister           Structure
-  HiLink picRegisterPart       Special
-
-  HiLink picASCII              String
-  HiLink picBinary             Number
-  HiLink picDecimal            Number
-  HiLink picHexadecimal        Number
-  HiLink picOctal              Number
-
-  HiLink picIdentifier         Identifier
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "pic"
-
-" vim: ts=8
diff --git a/colors/pink.vim b/colors/pink.vim
deleted file mode 100755
index bcdf33b..0000000
--- a/colors/pink.vim
+++ /dev/null
@@ -1,168 +0,0 @@
-" Maintainer: paddynewman@gmail.com
-" License: BSD
-
-if &t_Co != 256 && !has("gui_running")
-    echomsg ""
-    echomsg "write 'set t_Co=256' in your .vimrc or this file won't load"
-    echomsg ""
-    finish
-endif
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "pink"
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:colors256 = [
-    \ ["Normal",        "NONE", "238",  "225"   ],
-    \ ["Cursor",        "NONE", "NONE", "160"   ],
-    \ ["CursorLine",    "NONE", "NONE", "222"   ],
-    \ ["CursorColumn",  "NONE", "NONE", "223"   ],
-    \ ["Incsearch",     "NONE", "NONE", "11"    ],
-    \ ["Search",        "NONE", "NONE", "11"    ],
-    \ ["ErrorMsg",      "BOLD", "16",   "9"     ],
-    \ ["WarningMsg",    "BOLD", "16",   "11"    ],
-    \ ["ModeMsg",       "BOLD", "NONE", "11"    ],
-    \ ["MoreMsg",       "BOLD", "16",   "11"    ],
-    \ ["Question",      "BOLD", "27",   "NONE"  ],
-    \ ["StatusLine",    "NONE", "0",    "219"   ],
-    \ ["StatusLineNC",  "NONE", "238",  "219"   ],
-    \ ["User1",         "BOLD", "28",   "NONE"  ],
-    \ ["User2",         "BOLD", "39",   "NONE"  ],
-    \ ["VertSplit",     "NONE", "84",   "22"    ],
-    \ ["WildMenu",      "BOLD", "87",   "35"    ],
-    \ ["DiffText",      "NONE", "16",   "190"   ],
-    \ ["DiffChange",    "NONE", "16",   "83"    ],
-    \ ["DiffDelete",    "NONE", "79",   "124"   ],
-    \ ["DiffAdd",       "NONE", "79",   "21"    ],
-    \ ["Folded",        "NONE", "238",  "255"   ],
-    \ ["FoldedColumn",  "NONE", "238",  "255"   ],
-    \ ["FoldColumn",    "NONE", "225",  "255"   ],
-    \ ["Directory",     "NONE", "28",   "NONE"  ],
-    \ ["LineNr",        "NONE", "238",  "255"   ],
-    \ ["NonText",       "NONE", "238",  "225"   ],
-    \ ["SpecialKey",    "NONE", "9",    "NONE"  ],
-    \ ["Title",         "BOLD", "18",   "NONE"  ],
-    \ ["Visual",        "NONE", "NONE", "220"   ],
-    \ ["Comment",       "NONE", "238",  "255"   ],
-    \ ["Costant",       "NONE", "58",   "NONE"  ],
-    \ ["String",        "NONE", "160",  "NONE"  ],
-    \ ["Error",         "NONE", "130",  "NONE"  ],
-    \ ["Identifier",    "NONE", "31",   "NONE"  ],
-    \ ["Ignore",        "NONE", "NONE", "NONE"  ],
-    \ ["Number",        "NONE", "23",   "NONE"  ],
-    \ ["PreProc",       "NONE", "26",   "255"   ],
-    \ ["Special",       "NONE", "238",  "NONE"  ],
-    \ ["SpecialChar",   "NONE", "22",   "NONE"  ],
-    \ ["Statement",     "NONE", "36",   "NONE"  ],
-    \ ["Todo",          "NONE", "NONE", "229"   ],
-    \ ["Type",          "NONE", "20",   "NONE"  ],
-    \ ["Underlined",    "BOLD", "25",   "NONE"  ],
-    \ ["TaglistTagName","BOLD", "29",   "118"   ]]
-
-let s:colorvim7 = [
-    \ ["Pmenu",         "NONE", "238",  "219"   ],
-    \ ["PmenuSel",      "NONE", "238",  "11"    ],
-    \ ["PmenuSbar",     "NONE", "238",  "11"    ],
-    \ ["PmenuThumb",    "NONE", "238",  "11"    ],
-    \ ["SpellBad",      "NONE", "238",  "9"     ],
-    \ ["SpellRare",     "NONE", "NONE", "228"   ],
-    \ ["SpellLocal",    "NONE", "NONE", "224"   ],
-    \ ["SpellCap",      "NONE", "NONE", "247"   ],
-    \ ["MatchParen",    "NONE", "NONE", "11"    ],
-    \ ["TabLine",       "NONE", "238",  "219"   ],
-    \ ["TabLineSel",    "NONE", "0",    "225"   ],
-    \ ["TabLineFill",   "NONE", "219",  "219"   ]]
-
-function! s:checkargs(arg)
-    if a:arg+0 == 0 && a:arg != "0"  "its a string
-        return a:arg
-    else
-        return s:cmap[a:arg+0] "get rgb color based on the number
-    endif
-endfunction
-
-if !has("gui_running")
-    for s:col in s:colors256
-        exec "hi " . s:col[0] . " cterm=" . s:col[1] . 
-            \ " ctermfg=" . s:col[2] . " ctermbg=" . s:col[3]
-    endfor
-    if v:version >= 700
-        for s:col in s:colorvim7
-            exec "hi " .s:col[0] . " cterm=" . s:col[1] .
-                \ " ctermfg=" . s:col[2] . " ctermbg=" . s:col[3]
-        endfor
-    endif
-else
-    let s:cmap = [
-        \ "#000000", "#800000", "#008000", "#808000", 
-        \ "#000080", "#800080", "#008080", "#c0c0c0", 
-        \ "#808080", "#ff0000", "#00ff00", "#ffff00", 
-        \ "#0000ff", "#ff00ff", "#00ffff", "#ffffff", 
-        \
-        \ "#000000", "#00005f", "#00008f", "#0000af", "#0000d7", "#0000ff", 
-        \ "#005f00", "#005f5f", "#005f8f", "#005faf", "#005fd7", "#005fff", 
-        \ "#008f00", "#008f5f", "#008f8f", "#008faf", "#008fd7", "#008fff", 
-        \ "#00af00", "#00af5f", "#00af8f", "#00afaf", "#00afd7", "#00afff", 
-        \ "#00d700", "#00d75f", "#00d78f", "#00d7af", "#00d7d7", "#00d7ff", 
-        \ "#00ff00", "#00ff5f", "#00ff8f", "#00ffaf", "#00ffd7", "#00ffff", 
-        \ "#5f0000", "#5f005f", "#5f008f", "#5f00af", "#5f00d7", "#5f00ff", 
-        \ "#5f5f00", "#5f5f5f", "#5f5f8f", "#5f5faf", "#5f5fd7", "#5f5fff", 
-        \ "#5f8f00", "#5f8f5f", "#5f8f8f", "#5f8faf", "#5f8fd7", "#5f8fff", 
-        \ "#5faf00", "#5faf5f", "#5faf8f", "#5fafaf", "#5fafd7", "#5fafff", 
-        \ "#5fd700", "#5fd75f", "#5fd78f", "#5fd7af", "#5fd7d7", "#5fd7ff", 
-        \ "#5fff00", "#5fff5f", "#5fff8f", "#5fffaf", "#5fffd7", "#5fffff", 
-        \ "#8f0000", "#8f005f", "#8f008f", "#8f00af", "#8f00d7", "#8f00ff", 
-        \ "#8f5f00", "#8f5f5f", "#8f5f8f", "#8f5faf", "#8f5fd7", "#8f5fff", 
-        \ "#8f8f00", "#8f8f5f", "#8f8f8f", "#8f8faf", "#8f8fd7", "#8f8fff", 
-        \ "#8faf00", "#8faf5f", "#8faf8f", "#8fafaf", "#8fafd7", "#8fafff", 
-        \ "#8fd700", "#8fd75f", "#8fd78f", "#8fd7af", "#8fd7d7", "#8fd7ff", 
-        \ "#8fff00", "#8fff5f", "#8fff8f", "#8fffaf", "#8fffd7", "#8fffff", 
-        \ "#af0000", "#af005f", "#af008f", "#af00af", "#af00d7", "#af00ff", 
-        \ "#af5f00", "#af5f5f", "#af5f8f", "#af5faf", "#af5fd7", "#af5fff", 
-        \ "#af8f00", "#af8f5f", "#af8f8f", "#af8faf", "#af8fd7", "#af8fff", 
-        \ "#afaf00", "#afaf5f", "#afaf8f", "#afafaf", "#afafd7", "#afafff", 
-        \ "#afd700", "#afd75f", "#afd78f", "#afd7af", "#afd7d7", "#afd7ff", 
-        \ "#afff00", "#afff5f", "#afff8f", "#afffaf", "#afffd7", "#afffff", 
-        \ "#d70000", "#d7005f", "#d7008f", "#d700af", "#d700d7", "#d700ff", 
-        \ "#d75f00", "#d75f5f", "#d75f8f", "#d75faf", "#d75fd7", "#d75fff", 
-        \ "#d78f00", "#d78f5f", "#d78f8f", "#d78faf", "#d78fd7", "#d78fff", 
-        \ "#d7af00", "#d7af5f", "#d7af8f", "#d7afaf", "#d7afd7", "#d7afff", 
-        \ "#d7d700", "#d7d75f", "#d7d78f", "#d7d7af", "#d7d7d7", "#d7d7ff", 
-        \ "#d7ff00", "#d7ff5f", "#d7ff8f", "#d7ffaf", "#d7ffd7", "#d7ffff", 
-        \ "#ff0000", "#ff005f", "#ff008f", "#ff00af", "#ff00d7", "#ff00ff", 
-        \ "#ff5f00", "#ff5f5f", "#ff5f8f", "#ff5faf", "#ff5fd7", "#ff5fff", 
-        \ "#ff8f00", "#ff8f5f", "#ff8f8f", "#ff8faf", "#ff8fd7", "#ff8fff", 
-        \ "#ffaf00", "#ffaf5f", "#ffaf8f", "#ffafaf", "#ffafd7", "#ffafff", 
-        \ "#ffd700", "#ffd75f", "#ffd78f", "#ffd7af", "#ffd7d7", "#ffd7ff", 
-        \ "#ffff00", "#ffff5f", "#ffff8f", "#ffffaf", "#ffffd7", "#ffffff", 
-        \
-        \ "#080808", "#121212", "#1c1c1c", "#262626", "#303030", "#3a3a3a", 
-        \ "#444444", "#4e4e4e", "#585858", "#606060", "#666666", "#767676", 
-        \ "#808080", "#8a8a8a", "#949494", "#9e9e9e", "#a8a8a8", "#b2b2b2", 
-        \ "#bcbcbc", "#c6c6c6", "#d0d0d0", "#dadada", "#e4e4e4", "#eeeeee" ]
-
-    for s:col in s:colors256
-        let fg = s:checkargs(s:col[2])
-        let bg = s:checkargs(s:col[3])
-        exec "hi " .s:col[0] . " gui=" . s:col[1] . " guifg=" .
-            \ fg . " guibg=" .bg
-    endfor
-
-    if v:version >= 700
-        for s:col in s:colorvim7
-            let fg = s:checkargs(s:col[2])
-            let bg = s:checkargs(s:col[3])
-            exec "hi " . s:col[0] . " gui=" . s:col[1] . 
-                \ " guifg=" . fg . " guibg=" . bg
-        endfor
-    endif
-endif
-
-let &cpo = s:save_cpo " restoring &cpo value
-
diff --git a/colors/pleasant.vim b/colors/pleasant.vim
deleted file mode 100755
index e327bc9..0000000
--- a/colors/pleasant.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" Last Change: 25 August 2005
-" Version:1.0
-" Comment: A bright and colorful scheme for gui
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="pleasant"
-
-hi Normal   guifg=black	guibg=white 
-hi Title    guifg=black	guibg=white gui=BOLD
-hi lCursor  guibg=Cyan guifg=NONE
-
-hi LineNr   guifg=white guibg=#8c9bfa
-
-" syntax highlighting groups
-hi Comment  ctermfg=Red guifg=#c80000 gui=NONE
-hi Operator term=None cterm=None gui=None
-
-hi Identifier	 guifg=#008000 gui=NONE
-
-hi Statement	 guifg=#0000c8 gui=NONE
-hi TypeDef guifg=#c000c8 gui=NONE
-hi Type guifg=#0000c8 gui=NONE
-hi Boolean guifg=#0000aa gui=NONE
-
-hi String guifg=#808055 gui=NONE
-hi Number guifg=#808880 gui=NONE
-hi Constant guifg=#888080 gui=NONE
-
-hi Function guifg=#008040 gui=NONE guibg=#cccccc
-hi PreProc guifg=#808040 gui=NONE
-hi Keyword guifg=#008088 gui=NONE
diff --git a/colors/potts.vim b/colors/potts.vim
deleted file mode 100755
index 79bc5e9..0000000
--- a/colors/potts.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" -*- vim -*-
-" FILE: "/home/dp/.vim/colors/potts2.vim" {{{
-" LAST MODIFICATION: "Fri, 08 Feb 2002 09:47:10 (dp)"
-" (C) 2001 by Douglas L. Potts, <dlpotts@spectral-sys.com>
-" $Id: potts2.vim,v 1.3 2002/02/18 20:25:27 dp Exp $ }}}
-
-set background=dark
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name="potts2"
-
-highlight SpecialKey term=bold ctermfg=9 guifg=Cyan
-highlight NonText term=bold ctermfg=9 gui=bold guifg=green
-highlight Directory term=bold ctermfg=11 guifg=Cyan
-highlight ErrorMsg term=standout ctermfg=15 ctermbg=4 guifg=White guibg=Red
-highlight IncSearch term=reverse cterm=reverse gui=reverse
-highlight Search term=reverse ctermfg=15 ctermbg=12 guifg=white guibg=Red
-highlight MoreMsg term=bold ctermfg=10 gui=bold guifg=SeaGreen
-highlight ModeMsg term=bold cterm=bold gui=bold
-highlight LineNr term=underline ctermfg=14 guifg=Yellow
-highlight Question term=standout ctermfg=10 gui=bold guifg=Green
-highlight StatusLine term=bold,reverse cterm=bold,reverse gui=bold,reverse
-highlight StatusLineNC term=reverse cterm=reverse gui=reverse
-highlight VertSplit term=reverse cterm=reverse gui=reverse
-highlight Title term=bold ctermfg=13 gui=bold guifg=Magenta
-highlight Visual term=reverse cterm=reverse gui=reverse guifg=gray guibg=black
-highlight VisualNOS term=bold,underline cterm=bold,underline gui=bold,underline
-highlight WarningMsg term=standout ctermfg=12 guifg=Red
-highlight WildMenu term=standout ctermfg=0 ctermbg=14 guifg=Black guibg=Yellow
-highlight Folded term=standout cterm=bold ctermfg=11 guifg=cyan guibg=bg
-highlight FoldColumn term=standout cterm=bold ctermfg=11 guifg=cyan guibg=bg
-highlight DiffAdd term=bold ctermfg=10 ctermbg=9 guifg=Green guibg=Black
-highlight DiffChange term=bold ctermfg=15 ctermbg=9 guifg=White guibg=Blue
-highlight DiffDelete term=bold ctermfg=13 ctermbg=11 gui=bold guifg=Magenta guibg=Black
-highlight DiffText term=reverse cterm=bold ctermfg=15 ctermbg=12 gui=bold guifg=White guibg=Red
-highlight Cursor guifg=bg guibg=fg
-highlight lCursor guifg=bg guibg=fg
-highlight Normal guifg=gray guibg=black font='6x13'
-highlight Comment term=bold ctermfg=11 guifg=#80a0ff
-highlight Constant term=underline ctermfg=13 guifg=#ffa0a0
-highlight Special term=bold ctermfg=12 guifg=Orange
-highlight Identifier term=underline cterm=bold ctermfg=11 guifg=#40ffff
-highlight Statement term=bold ctermfg=14 gui=bold guifg=#ffff60
-highlight PreProc term=underline ctermfg=9 guifg=#ff80ff
-highlight Type term=underline ctermfg=10 gui=bold guifg=#60ff60
-highlight Underlined term=underline cterm=underline ctermfg=9 gui=underline guifg=#80a0ff
-highlight Ignore ctermfg=0 guifg=bg
-highlight Error term=reverse ctermfg=15 ctermbg=12 guifg=White guibg=Red
-highlight Todo term=standout ctermfg=0 ctermbg=14 guifg=Blue guibg=Yellow
-highlight DebugBreak ctermfg=15 ctermbg=4 guifg=white guibg=darkred
-highlight DebugStop ctermfg=15 ctermbg=10 guifg=white guibg=lightgreen
diff --git a/colors/print_bw.vim b/colors/print_bw.vim
deleted file mode 100755
index 4be35f4..0000000
--- a/colors/print_bw.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-" Vim color file
-" Maintainer:   Mike Williams <mrw@eandem.co.uk>
-" Last Change:	2nd June 2003
-" Version:	1.1
-
-" Remove all existing highlighting.
-set background=light
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "print_bw"
-
-highlight Normal	    cterm=NONE ctermfg=black ctermbg=white gui=NONE guifg=black guibg=white
-highlight NonText	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight LineNr        cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=white 
-
-" Syntax highlighting scheme
-highlight Comment	    cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=white
-
-highlight Constant	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight String	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Character	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Number	    ctermfg=black ctermbg=white guifg=black guibg=white
-" Boolean defaults to Constant
-highlight Float		    ctermfg=black ctermbg=white guifg=black guibg=white
-
-highlight Identifier	ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Function	    ctermfg=black ctermbg=white guifg=black guibg=white
-
-highlight Statement	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Conditional	ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Repeat	    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Label		    ctermfg=black ctermbg=white guifg=black guibg=white
-highlight Operator	    ctermfg=black ctermbg=white guifg=black guibg=white
-" Keyword defaults to Statement
-" Exception defaults to Statement
-
-highlight PreProc	    cterm=bold ctermfg=black ctermbg=white gui=bold guifg=black guibg=white
-" Include defaults to PreProc
-" Define defaults to PreProc
-" Macro defaults to PreProc
-" PreCondit defaults to PreProc
-
-highlight Type		    cterm=bold ctermfg=black ctermbg=white gui=bold guifg=black guibg=white
-" StorageClass defaults to Type
-" Structure defaults to Type
-" Typedef defaults to Type
-
-highlight Special	    cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=white
-" SpecialChar defaults to Special
-" Tag defaults to Special
-" Delimiter defaults to Special
-highlight SpecialComment cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=white
-" Debug defaults to Special
-
-highlight Todo		    cterm=italic,bold ctermfg=black ctermbg=white gui=italic,bold guifg=black guibg=white
-" Ideally, the bg color would be white but VIM cannot print white on black!
-highlight Error		    cterm=bold,reverse ctermfg=black ctermbg=grey gui=bold,reverse guifg=black guibg=grey
-
-" vim:et:ff=unix:tw=0:ts=4:sw=4
-" EOF print_bw.vim
diff --git a/colors/prmths.vim b/colors/prmths.vim
deleted file mode 100755
index 605dbfb..0000000
--- a/colors/prmths.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer: Greg Maculo	
-" Last Change:	2008 February 08
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "prmths"
-hi Normal	ctermfg=LightBlue ctermbg=black guifg=#6666CC guibg=#000011
-hi NonText	ctermfg=DarkGray ctermbg=black guifg=#555555 guibg=#000000
-hi Comment term=italic ctermfg=DarkGray ctermbg=black guifg=#555555 gui=italic
-hi Constant	term=bold  gui=bold ctermfg=DarkRed ctermbg=black guifg=#880000
-hi Identifer guifg=#99AAAA ctermbg=black ctermfg=Gray
-hi Boolean	ctermfg=LightRed ctermbg=black guifg=LightRed
-hi String ctermfg=DarkRed ctermbg=black guifg=#FF0000
-hi Character ctermfg=DarkRed ctermbg=black guifg=#660000
-hi Number ctermfg=DarkMagenta ctermbg=black guifg=#AA0088
-hi Float ctermfg=Magenta ctermbg=black guifg=#FF00FF
-hi Special term=bold ctermfg=LightCyan ctermbg=black guifg=#99FFFF gui=bold
-hi SpecialChar term=bold ctermfg=LightCyan ctermbg=black guifg=#55BBBB gui=bold
-hi SpecialComment term=bold ctermfg=DarkGray ctermbg=black guifg=#555555 gui=bold
-hi Delimiter term=bold ctermfg=LightBlue ctermbg=Black guifg=#33AAFF gui=bold
-hi Debug	ctermbg=LightBlue guibg=#9999FF ctermfg=black guifg=Black gui=italic
-hi Statement term=bold ctermfg=Yellow ctermbg=black gui=bold	guifg=#FFFF66
-hi Exception term=bold ctermfg=Yellow ctermbg=black gui=bold	guifg=#BBBB22
-hi Keyword ctermfg=White ctermbg=black guifg=#FFFFBB gui=bold
-hi Label ctermfg=white ctermbg=black guifg=#FFFF99 gui=bold
-hi PreProc term=bold gui=bold	ctermbg=black ctermfg=LightCyan guifg=#33CCFF
-hi Include  term=bold gui=bold	ctermbg=black ctermfg=LightCyan guifg=#00AAFF
-hi Define  term=bold gui=bold	ctermbg=black ctermfg=LightCyan guifg=#0099FF
-hi Macro  term=bold gui=bold	ctermbg=black ctermfg=LightCyan guifg=#0077FF
-hi PreCondit  term=bold gui=bold	ctermbg=black ctermfg=LightCyan guifg=#0066FF
-hi Type	ctermfg=DarkBlue ctermbg=black guifg=#0000FF gui=bold
-hi StorageClass	ctermfg=DarkBlue ctermbg=black guifg=#0000DD gui=bold
-hi Structure	ctermfg=DarkBlue ctermbg=black guifg=#0000BB gui=bold
-hi Typedef	ctermfg=DarkBlue ctermbg=black guifg=#000099 gui=bold
-hi Function	ctermfg=DarkCyan ctermbg=black guifg=#22AADD
-hi Repeat	ctermfg=White ctermbg=black guifg=#BBBBFF gui=bold
-hi Conditional	gui=Bold ctermbg=black term=Bold guifg=#FFCCEE ctermfg=White
-hi Operator	ctermfg=LightGray ctermbg=black guifg=#99AAFF gui=bold
-hi MatchParen	ctermfg=black guifg=black guibg=orange ctermbg=darkyellow
-hi lCursor term=bold ctermbg=Red ctermfg=black guibg=#990000 guifg=black
-hi Ignore	term=italic gui=italic ctermfg=DarkGray ctermbg=black guifg=DarkGray
-
-hi Directory term=bold ctermfg=lightblue ctermbg=black guifg=#8787FE
-hi Error term=reverse ctermbg=Red ctermfg=White guibg=Red guifg=White
-hi ErrorMsg term=reverse ctermbg=Red ctermfg=White guibg=Red guifg=White
-hi WarningMsg term=reverse ctermbg=DarkYellow ctermfg=White guibg=DarkOrange guifg=White
-hi ModeMsg term=reverse ctermbg=Blue ctermfg=White guibg=Blue guifg=White
-hi MoreMsg term=reverse ctermbg=Cyan ctermfg=White guibg=Cyan guifg=White
-hi Todo	term=standout ctermbg=Yellow ctermfg=DarkBlue guifg=Blue guibg=Yellow
-hi LineNr ctermfg=DarkGray ctermbg=black guifg=#333333 guibg=#050505 gui=italic
-hi Tag ctermfg=Yellow ctermbg=black guifg=#FFFF00 gui=italic
-hi Cursor term=bold ctermbg=Brown ctermfg=black guibg=#999900 guifg=black 
-hi Underlined	guifg=white	ctermbg=black 	ctermfg=white	gui=underline	cterm=underline
-hi Visual		term=reverse	ctermbg=black gui=reverse guibg=Black
-hi VertSplit	gui=none	guifg=#444444	guibg=#333333	ctermfg=DarkGray	ctermbg=Gray
-hi Search		guifg=black		guibg=#EEFF22	ctermfg=black	ctermbg=darkYellow
-hi IncSearch	guifg=DarkGray		guibg=orange	ctermfg=black	ctermbg=darkYellow
-hi Title		guifg=DarkGray ctermbg=Black ctermfg=Gray guifg=Gray	gui=bold	cterm=bold
-hi StatusLineNC	gui=bold	guifg=black guibg=#444499	ctermfg=Black  ctermbg=blue
-hi StatusLine	gui=bold	guifg=black guibg=#444499	ctermfg=Black  ctermbg=blue
-
-hi DiffChange	guibg=#000055		guifg=black	ctermbg=Blue	ctermfg=black
-hi DiffText		guibg=#555555		guifg=black		ctermbg=White	ctermfg=black
-hi DiffAdd		guibg=#555500		guifg=black		ctermbg=Yellow		ctermfg=black
-hi DiffDelete   guibg=#550000			guifg=black	ctermbg=Red		ctermfg=black
-
-hi Folded		guibg=#223355		guifg=black		ctermbg=DarkCyan		ctermfg=black
-hi FoldColumn	guibg=Gray30		guifg=black	ctermbg=Gray		ctermfg=black
-hi cIf0			guifg=Gray			ctermfg=Gray ctermbg=black 
-
-
-
diff --git a/colors/professional.vim b/colors/professional.vim
deleted file mode 100755
index a12c81c..0000000
--- a/colors/professional.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" Vim color file
-" Maintainer: iyerns <iyerns AT gmail DOT com>
-" 
-" Comments are welcome !
-" Spammers will be shot. Survivors will be shot again
-" 
-" Last Change: 10 Sep 2005
-" Version:1.4
-" Changes:Changed background color for better tone 
-" Comment: Atlast, a professional colorscheme for Vim
-" Released by popular demand. in case other highlighting 
-" terms are to be included, please feel free to add those 
-" and send me your updated .vim file :) to be included in 
-" the next version.If there are enough requests, I will 
-" release a cterm version also. 
-" Recolored comments and Statement
-" Uses only safe HTML colors
-"
-
-set background=light
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-let g:colors_name="professional"
-
-hi Normal   guifg=black	 guibg=#ffffdd 
-hi Statusline    gui=none guibg=#006666 guifg=#ffffff
-hi  VertSplit    gui=none guibg=#006666 guifg=#ffffff
-hi StatuslineNC  gui=none guibg=#666633 guifg=#ffffff
-
-hi Title    guifg=black	 guibg=white gui=BOLD
-hi lCursor  guibg=Cyan   guifg=NONE
-hi LineNr   guifg=white guibg=#006666 
-"guibg=#8c9bfa
-
-" syntax highlighting groups
-hi Comment    gui=NONE guifg=SteelBlue
-hi Operator   guifg=#ff0000
-
-hi Identifier guifg=#339900 gui=NONE
-
-hi Statement	 guifg=orange gui=NONE
-hi TypeDef       guifg=#c000c8 gui=NONE
-hi Type          guifg=#0000c8 gui=NONE
-hi Boolean       guifg=#0000aa gui=NONE
-
-hi String        guifg=#006600 gui=NONE
-hi Number        guifg=#9933ff gui=NONE
-hi Constant      guifg=#ff8080 gui=NONE
-
-hi Function      gui=NONE      guifg=#6600ff 
-hi PreProc       guifg=#993300 gui=NONE
-hi Define        gui=bold guifg=#ff0000 
-
-hi Keyword       guifg=#ff8088 gui=NONE
-hi Search        gui=NONE guibg=#ffff00 
-"guibg=#339900
-hi IncSearch     gui=NONE guifg=#ffff00 guibg=#990000
-hi Conditional   gui=none guifg=#660000 guibg=#ffffff
-hi browseDirectory  gui=none guifg=#660000 guibg=#ffffff
-
diff --git a/colors/proton.vim b/colors/proton.vim
deleted file mode 100755
index 83e62a1..0000000
--- a/colors/proton.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-
-hi Normal guibg=#f0f0f0 guifg=#404040 gui=none
-hi Comment guibg=#f0f0f0 guifg=#9098a0 gui=none
-hi ToDo guibg=#f0f0f0 guifg=#9098a0 gui=bold
-
-hi Cursor guibg=#404040 guifg=#a0a0a0
-hi CursorColumn guibg=#e0e0e0 guifg=#202020
-hi CursorLine guibg=#e0e0e0 guifg=#202020
-
-hi NonText guibg=#d0d0d0 guifg=#606060 gui=none
-hi Visual guibg=#d0d0d0 guifg=#606060 gui=none
-hi Folded guibg=#d0d0d0 guifg=#606060 gui=none
-hi TabLineFill guibg=#d0d0d0 guifg=#606060 gui=none
-hi SpecialKey guibg=#e8e8e8 guifg=#a0a0a0 gui=none
-hi Search guibg=#808080 guifg=#ffffff gui=bold
-
-hi ModeMsg guibg=#f0f0f0 guifg=#304050 gui=bold
-hi MoreMsg guibg=#f0f0f0 guifg=#304050 gui=bold
-
-hi StatusLine guibg=#808080 guifg=#f0f0f0 gui=bold,italic
-hi StatusLineNC guibg=#707070 guifg=#d0d0d0 gui=italic
-hi VertSplit guibg=#707070 guifg=#909090 gui=none
-
-hi LineNr guibg=#d0d0d0 guifg=#606060 gui=none
-
-hi Underlined guifg=#202020 guibg=#f0f0f0 gui=underline
-
-hi Statement guibg=#e0e0e0 guifg=#606060 gui=none
-hi Label guibg=#e0e0e0 guifg=#606060 gui=underline
-hi Operator guifg=#a77039 guibg=#f0f0f0 gui=none
-
-hi Title guibg=#f0f0f0 guifg=#202020 gui=underline
-
-" Python: @ in front of decorators
-"hi Define guifg=#906000 guibg=#f0e8c0 gui=bold
-hi Define guifg=#605080 guibg=#ece8f0 gui=italic,bold
-hi Include guifg=#605080 guibg=#dcd8e0 gui=none
-
-hi Function guifg=#b08020 guibg=#f0e8c0 gui=underline
-
-hi Conditional guibg=#e0e8f0 guifg=#5080b0 gui=bold
-hi Repeat guibg=#e0e8d8 guifg=#509030 gui=bold
-hi Exception guibg=#f0f0f0 guifg=#a03020 gui=bold
-
-hi Type guifg=#607080 guibg=#f0f0f0 gui=underline
-hi PreProc guifg=#605080 guibg=#dcd8e0 gui=italic
-hi Identifier guifg=#608050 guibg=#c0e0c0 gui=none
-
-
-hi Constant guifg=#508040 guibg=#f0f0f0
-hi Number guifg=#508040 guibg=#f0f0f0
-hi String guifg=#a07060 guibg=#f0ece8 gui=italic
-hi Special guifg=#603020 guibg=#f0ece8 gui=italic
-
-
-hi DiffAdd guifg=#ffcc7f guibg=#a67429
-hi DiffDelete guifg=#ff7f50 guibg=#a62910
-hi DiffChange guifg=#7fbdff guibg=#425c78
-hi DiffText guifg=#8ae234 guibg=#4e9a06
-
-hi SpellBad gui=undercurl guisp=#f02020
-
-
diff --git a/colors/pspad.vim b/colors/pspad.vim
deleted file mode 100755
index a504746..0000000
--- a/colors/pspad.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-" Created using ColorSchemeCreator
-" by Jose Quesada, PhD (quesada@gmail.com) (2007 Dec)
-" NOTE: only good for non-terminal version
-" Maintainer: Jose Quesada
-" Last Change: 2007 Dec
-
-" mimic PSPad rajat colors, but with much improved syntax highlighting
-" For example
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "pspad"
-hi Normal		guifg=#111111 guibg=#DCF0FF
-hi comment		guifg=#00B000 gui=italic  	"green
-hi String 		guifg=#FF0D00 				"red
-hi constant		guifg=#FF0D00 			 	"red
-hi conditional	guifg=#0000B0 gui=bold 		"dark blue "former statement
-hi preProc		guifg=#FF0D00 gui=italic 	"red
-hi Function		guifg=#008040 gui=bold 		"dark green,functions not not in standard lib
-hi Keyword		guifg=#0000B0 gui=bold 		"dark blue "former statement
-hi special		guifg=#DC5B00 				"orange, ahkKeyword (ahkclass). also scales
-hi Macro		guifg=#FF6400 gui=bold 		"orange, built-in variable
-hi operator		guifg=#FF0D00 					"not used in ahk
-hi Label 		guifg=#FF0D00 gui=bold,underline "this is important. Return is also marked
-hi Typedef		guifg=#804040 gui=bold 		"dark red, other keywords
-
-
-
-hi clear Visual
-hi Visual		term=reverse cterm=reverse gui=reverse
-
diff --git a/colors/psql.vim b/colors/psql.vim
deleted file mode 100755
index 167dfe8..0000000
--- a/colors/psql.vim
+++ /dev/null
@@ -1,1182 +0,0 @@
-" Vim syntax file
-" Language:	SQL, PLPGSQL (PostgreSQL)
-" Maintainer:	Devdas Bhagat <devdas@dvb.homelinux.org>
-" Derived from the syntax file for plsql maintained by 
-" Paul Moore <gustav@morpheus.demon.co.uk>
-" Last Change:	2004 April 17
-" Version: 0.04
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn case ignore
-
-" The SQL reserved words, defined as keywords.
-
-syn keyword psqlSpecial  false null true
-
-syn keyword psqlKeyword	access add as asc begin by case check cluster column
-syn keyword psqlKeyword	compress connect current cursor decimal default desc
-syn keyword psqlKeyword	else elsif end exception exclusive file for from
-syn keyword psqlKeyword	function group having identified if immediate increment
-syn keyword psqlKeyword	index initial into is level loop maxextents mode modify
-syn keyword psqlKeyword	nocompress nowait of offline on online start
-syn keyword psqlKeyword	successful synonym table then to trigger uid
-syn keyword psqlKeyword	unique user validate values view whenever
-syn keyword psqlKeyword	where with option order privileges procedural
-syn keyword psqlKeyword	public resource return row rowlabel rownum rows
-syn keyword psqlKeyword	session share size type using close open
-syn keyword psqlKeyword	declare constraint join temporary sequence
-syn keyword psqlKeyword	inner outer cross natural full left right
-syn keyword psqlKeyword	language handler trusted untrusted validator
-
-syn keyword psqlOperator	not and or primary key
-syn keyword psqlOperator	in any some all between exists
-syn keyword psqlOperator	ilike like escape cast
-syn keyword psqlOperator 	union intersect minus
-syn keyword psqlOperator 	prior distinct references
-
-syn match  psqlOperator 	"\(+\|%\|-\|=\|\/\|!\|!!\|!!=\|!\~\|!\~\*\)"
-syn match  psqlOperator 	"\(!\~\~\|!\~\~\*\|#\|##\|#<\|#<>\|?||\)"
-syn match  psqlOperator 	"\(#<=\|#=\|#>\|#>=\|&\|&&\|&<\|&>\|?|\)"
-syn match  psqlOperator 	"\(\*\|>\|<\|<=\|>=\|<->\|<<\|>>\|?-|\)"
-syn match  psqlOperator 	"\(<<=\|<>\|<^\|>^\|>>=\|?#\|?-\|@\)"
-syn match  psqlOperator 	"\(@@\|@-@\|^\||\|||\|||\/\|\~\|\~\*\)"
-syn match  psqlOperator 	"\(\~=\|\~\~\|\~\~\*\|:=\)"
-
-syn keyword psqlStatement alter analyze audit comment commit create
-syn keyword psqlStatement delete drop execute explain grant insert lock 
-syn keyword psqlStatement rename revoke rollback savepoint select set
-syn keyword psqlStatement truncate update analyze vacuum replace
-
-syn keyword psqlType	boolean char character date float integer long
-syn keyword psqlType	mlslabel number raw rowid varchar varchar2 varray
-syn keyword psqlType	int int4 int8 float4 float8 line interval lseq
-syn keyword psqlType	smallint bigint serial bigserial inet cidr macaddr
-syn keyword psqlType	bit varbit bool box bytea circle numeric decimal 
-syn keyword psqlType	path point polygon text time timetz timestamp 
-syn keyword psqlType	timestamptz real name int2vector regproc 
-syn keyword psqlType	oid tid xid cid oidvector smgr lseg double
-syn keyword psqlType	abstime reltime tinterval aclitem void opaque
-syn keyword psqlType	refcursor regprocedure regoper regoperator regclass
-syn keyword psqlType	regtype record cstring anyarray array
-syn keyword psqlType	language_handler
-
-syn keyword psqlAggregate avg count max min stddev sum variance
-
-" Strings and characters:
-syn region psqlString		start=+"+  skip=+\\\\\|\\"+  end=+"+
-syn region psqlString		start=+'+  skip=+\\\\\|\\'+  end=+'+
-
-" Numbers:
-syn match psqlNumber		"-\=\<\d*\.\=[0-9_]\>"
-
-" Comments:
-syn region psqlComment    start="/\*"  end="\*/"
-syn match psqlComment	"--.*"
-
-syn sync ccomment psqlComment
-
-syn region psqlFunction    start="abbrev(" end=")" contains=ALL
-syn region psqlFunction    start="abs(" end=")" contains=ALL
-syn region psqlFunction    start="abstime(" end=")" contains=ALL
-syn region psqlFunction    start="abstimeeq(" end=")" contains=ALL
-syn region psqlFunction    start="abstimege(" end=")" contains=ALL
-syn region psqlFunction    start="abstimegt(" end=")" contains=ALL
-syn region psqlFunction    start="abstimele(" end=")" contains=ALL
-syn region psqlFunction    start="abstimelt(" end=")" contains=ALL
-syn region psqlFunction    start="abstimene(" end=")" contains=ALL
-syn region psqlFunction    start="aclcontains(" end=")" contains=ALL
-syn region psqlFunction    start="aclinsert(" end=")" contains=ALL
-syn region psqlFunction    start="aclremove(" end=")" contains=ALL
-syn region psqlFunction    start="acos(" end=")" contains=ALL
-syn region psqlFunction    start="age(" end=")" contains=ALL
-syn region psqlFunction    start="alt_to_iso(" end=")" contains=ALL
-syn region psqlFunction    start="alt_to_koi8r(" end=")" contains=ALL
-syn region psqlFunction    start="alt_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="alt_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="alt_to_win1251(" end=")" contains=ALL
-syn region psqlFunction    start="area(" end=")" contains=ALL
-syn region psqlFunction    start="areajoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="areasel(" end=")" contains=ALL
-syn region psqlFunction    start="array_dims(" end=")" contains=ALL
-syn region psqlFunction    start="array_eq(" end=")" contains=ALL
-syn region psqlFunction    start="array_length_coerce(" end=")" contains=ALL
-syn region psqlFunction    start="ascii(" end=")" contains=ALL
-syn region psqlFunction    start="ascii_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="ascii_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="asin(" end=")" contains=ALL
-syn region psqlFunction    start="atan2(" end=")" contains=ALL
-syn region psqlFunction    start="atan(" end=")" contains=ALL
-syn region psqlFunction    start="big5_to_euc_tw(" end=")" contains=ALL
-syn region psqlFunction    start="big5_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="big5_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="bitand(" end=")" contains=ALL
-syn region psqlFunction    start="bitcat(" end=")" contains=ALL
-syn region psqlFunction    start="bitcmp(" end=")" contains=ALL
-syn region psqlFunction    start="bit(" end=")" contains=ALL
-syn region psqlFunction    start="biteq(" end=")" contains=ALL
-syn region psqlFunction    start="bitge(" end=")" contains=ALL
-syn region psqlFunction    start="bitgt(" end=")" contains=ALL
-syn region psqlFunction    start="bitle(" end=")" contains=ALL
-syn region psqlFunction    start="bit_length(" end=")" contains=ALL
-syn region psqlFunction    start="bitlt(" end=")" contains=ALL
-syn region psqlFunction    start="bitne(" end=")" contains=ALL
-syn region psqlFunction    start="bitnot(" end=")" contains=ALL
-syn region psqlFunction    start="bitor(" end=")" contains=ALL
-syn region psqlFunction    start="bitshiftleft(" end=")" contains=ALL
-syn region psqlFunction    start="bitshiftright(" end=")" contains=ALL
-syn region psqlFunction    start="bitxor(" end=")" contains=ALL
-syn region psqlFunction    start="booleq(" end=")" contains=ALL
-syn region psqlFunction    start="boolge(" end=")" contains=ALL
-syn region psqlFunction    start="boolgt(" end=")" contains=ALL
-syn region psqlFunction    start="boolle(" end=")" contains=ALL
-syn region psqlFunction    start="boollt(" end=")" contains=ALL
-syn region psqlFunction    start="boolne(" end=")" contains=ALL
-syn region psqlFunction    start="box_above(" end=")" contains=ALL
-syn region psqlFunction    start="box_add(" end=")" contains=ALL
-syn region psqlFunction    start="box_below(" end=")" contains=ALL
-syn region psqlFunction    start="box_center(" end=")" contains=ALL
-syn region psqlFunction    start="box_contained(" end=")" contains=ALL
-syn region psqlFunction    start="box_contain(" end=")" contains=ALL
-syn region psqlFunction    start="box_distance(" end=")" contains=ALL
-syn region psqlFunction    start="box_div(" end=")" contains=ALL
-syn region psqlFunction    start="box(" end=")" contains=ALL
-syn region psqlFunction    start="box_eq(" end=")" contains=ALL
-syn region psqlFunction    start="box_ge(" end=")" contains=ALL
-syn region psqlFunction    start="box_gt(" end=")" contains=ALL
-syn region psqlFunction    start="box_intersect(" end=")" contains=ALL
-syn region psqlFunction    start="box_le(" end=")" contains=ALL
-syn region psqlFunction    start="box_left(" end=")" contains=ALL
-syn region psqlFunction    start="box_lt(" end=")" contains=ALL
-syn region psqlFunction    start="box_mul(" end=")" contains=ALL
-syn region psqlFunction    start="box_overlap(" end=")" contains=ALL
-syn region psqlFunction    start="box_overleft(" end=")" contains=ALL
-syn region psqlFunction    start="box_overright(" end=")" contains=ALL
-syn region psqlFunction    start="box_right(" end=")" contains=ALL
-syn region psqlFunction    start="box_same(" end=")" contains=ALL
-syn region psqlFunction    start="box_sub(" end=")" contains=ALL
-syn region psqlFunction    start="bpcharcmp(" end=")" contains=ALL
-syn region psqlFunction    start="bpchar(" end=")" contains=ALL
-syn region psqlFunction    start="bpchareq(" end=")" contains=ALL
-syn region psqlFunction    start="bpcharge(" end=")" contains=ALL
-syn region psqlFunction    start="bpchargt(" end=")" contains=ALL
-syn region psqlFunction    start="bpcharle(" end=")" contains=ALL
-syn region psqlFunction    start="bpcharlt(" end=")" contains=ALL
-syn region psqlFunction    start="bpcharne(" end=")" contains=ALL
-syn region psqlFunction    start="broadcast(" end=")" contains=ALL
-syn region psqlFunction    start="btabstimecmp(" end=")" contains=ALL
-syn region psqlFunction    start="btbeginscan(" end=")" contains=ALL
-syn region psqlFunction    start="btboolcmp(" end=")" contains=ALL
-syn region psqlFunction    start="btbuild(" end=")" contains=ALL
-syn region psqlFunction    start="btbulkdelete(" end=")" contains=ALL
-syn region psqlFunction    start="btcharcmp(" end=")" contains=ALL
-syn region psqlFunction    start="btcostestimate(" end=")" contains=ALL
-syn region psqlFunction    start="btendscan(" end=")" contains=ALL
-syn region psqlFunction    start="btfloat4cmp(" end=")" contains=ALL
-syn region psqlFunction    start="btfloat8cmp(" end=")" contains=ALL
-syn region psqlFunction    start="btgettuple(" end=")" contains=ALL
-syn region psqlFunction    start="btinsert(" end=")" contains=ALL
-syn region psqlFunction    start="btint2cmp(" end=")" contains=ALL
-syn region psqlFunction    start="btint4cmp(" end=")" contains=ALL
-syn region psqlFunction    start="btint8cmp(" end=")" contains=ALL
-syn region psqlFunction    start="btmarkpos(" end=")" contains=ALL
-syn region psqlFunction    start="btnamecmp(" end=")" contains=ALL
-syn region psqlFunction    start="btoidcmp(" end=")" contains=ALL
-syn region psqlFunction    start="btoidvectorcmp(" end=")" contains=ALL
-syn region psqlFunction    start="btrescan(" end=")" contains=ALL
-syn region psqlFunction    start="btrestrpos(" end=")" contains=ALL
-syn region psqlFunction    start="btrim(" end=")" contains=ALL
-syn region psqlFunction    start="bttextcmp(" end=")" contains=ALL
-syn region psqlFunction    start="byteacat(" end=")" contains=ALL
-syn region psqlFunction    start="byteacmp(" end=")" contains=ALL
-syn region psqlFunction    start="byteaeq(" end=")" contains=ALL
-syn region psqlFunction    start="byteage(" end=")" contains=ALL
-syn region psqlFunction    start="byteagt(" end=")" contains=ALL
-syn region psqlFunction    start="byteale(" end=")" contains=ALL
-syn region psqlFunction    start="bytealike(" end=")" contains=ALL
-syn region psqlFunction    start="bytealt(" end=")" contains=ALL
-syn region psqlFunction    start="byteane(" end=")" contains=ALL
-syn region psqlFunction    start="byteanlike(" end=")" contains=ALL
-syn region psqlFunction    start="cash_div_flt4(" end=")" contains=ALL
-syn region psqlFunction    start="cash_div_flt8(" end=")" contains=ALL
-syn region psqlFunction    start="cash_div_int2(" end=")" contains=ALL
-syn region psqlFunction    start="cash_div_int4(" end=")" contains=ALL
-syn region psqlFunction    start="cash_eq(" end=")" contains=ALL
-syn region psqlFunction    start="cash_ge(" end=")" contains=ALL
-syn region psqlFunction    start="cash_gt(" end=")" contains=ALL
-syn region psqlFunction    start="cashlarger(" end=")" contains=ALL
-syn region psqlFunction    start="cash_le(" end=")" contains=ALL
-syn region psqlFunction    start="cash_lt(" end=")" contains=ALL
-syn region psqlFunction    start="cash_mi(" end=")" contains=ALL
-syn region psqlFunction    start="cash_mul_flt4(" end=")" contains=ALL
-syn region psqlFunction    start="cash_mul_flt8(" end=")" contains=ALL
-syn region psqlFunction    start="cash_mul_int2(" end=")" contains=ALL
-syn region psqlFunction    start="cash_mul_int4(" end=")" contains=ALL
-syn region psqlFunction    start="cash_ne(" end=")" contains=ALL
-syn region psqlFunction    start="cash_pl(" end=")" contains=ALL
-syn region psqlFunction    start="cashsmaller(" end=")" contains=ALL
-syn region psqlFunction    start="cash_words(" end=")" contains=ALL
-syn region psqlFunction    start="cbrt(" end=")" contains=ALL
-syn region psqlFunction    start="ceil(" end=")" contains=ALL
-syn region psqlFunction    start="center(" end=")" contains=ALL
-syn region psqlFunction    start="character_length(" end=")" contains=ALL
-syn region psqlFunction    start="chardiv(" end=")" contains=ALL
-syn region psqlFunction    start="char(" end=")" contains=ALL
-syn region psqlFunction    start="chareq(" end=")" contains=ALL
-syn region psqlFunction    start="charge(" end=")" contains=ALL
-syn region psqlFunction    start="chargt(" end=")" contains=ALL
-syn region psqlFunction    start="charle(" end=")" contains=ALL
-syn region psqlFunction    start="char_length(" end=")" contains=ALL
-syn region psqlFunction    start="charlt(" end=")" contains=ALL
-syn region psqlFunction    start="charmi(" end=")" contains=ALL
-syn region psqlFunction    start="charmul(" end=")" contains=ALL
-syn region psqlFunction    start="charne(" end=")" contains=ALL
-syn region psqlFunction    start="charpl(" end=")" contains=ALL
-syn region psqlFunction    start="chr(" end=")" contains=ALL
-syn region psqlFunction    start="cideq(" end=")" contains=ALL
-syn region psqlFunction    start="cidr(" end=")" contains=ALL
-syn region psqlFunction    start="circle_above(" end=")" contains=ALL
-syn region psqlFunction    start="circle_add_pt(" end=")" contains=ALL
-syn region psqlFunction    start="circle_below(" end=")" contains=ALL
-syn region psqlFunction    start="circle_center(" end=")" contains=ALL
-syn region psqlFunction    start="circle_contained(" end=")" contains=ALL
-syn region psqlFunction    start="circle_contain(" end=")" contains=ALL
-syn region psqlFunction    start="circle_contain_pt(" end=")" contains=ALL
-syn region psqlFunction    start="circle_distance(" end=")" contains=ALL
-syn region psqlFunction    start="circle_div_pt(" end=")" contains=ALL
-syn region psqlFunction    start="circle(" end=")" contains=ALL
-syn region psqlFunction    start="circle_eq(" end=")" contains=ALL
-syn region psqlFunction    start="circle_ge(" end=")" contains=ALL
-syn region psqlFunction    start="circle_gt(" end=")" contains=ALL
-syn region psqlFunction    start="circle_le(" end=")" contains=ALL
-syn region psqlFunction    start="circle_left(" end=")" contains=ALL
-syn region psqlFunction    start="circle_lt(" end=")" contains=ALL
-syn region psqlFunction    start="circle_mul_pt(" end=")" contains=ALL
-syn region psqlFunction    start="circle_ne(" end=")" contains=ALL
-syn region psqlFunction    start="circle_overlap(" end=")" contains=ALL
-syn region psqlFunction    start="circle_overleft(" end=")" contains=ALL
-syn region psqlFunction    start="circle_overright(" end=")" contains=ALL
-syn region psqlFunction    start="circle_right(" end=")" contains=ALL
-syn region psqlFunction    start="circle_same(" end=")" contains=ALL
-syn region psqlFunction    start="circle_sub_pt(" end=")" contains=ALL
-syn region psqlFunction    start="close_lb(" end=")" contains=ALL
-syn region psqlFunction    start="close_lseg(" end=")" contains=ALL
-syn region psqlFunction    start="close_ls(" end=")" contains=ALL
-syn region psqlFunction    start="close_pb(" end=")" contains=ALL
-syn region psqlFunction    start="close_pl(" end=")" contains=ALL
-syn region psqlFunction    start="close_ps(" end=")" contains=ALL
-syn region psqlFunction    start="close_sb(" end=")" contains=ALL
-syn region psqlFunction    start="close_sl(" end=")" contains=ALL
-syn region psqlFunction    start="col_description(" end=")" contains=ALL
-syn region psqlFunction    start="contjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="contsel(" end=")" contains=ALL
-syn region psqlFunction    start="convert(" end=")" contains=ALL
-syn region psqlFunction    start="convert_using(" end=")" contains=ALL
-syn region psqlFunction    start="cos(" end=")" contains=ALL
-syn region psqlFunction    start="cot(" end=")" contains=ALL
-syn region psqlFunction    start="current_database(" end=")" contains=ALL
-syn region psqlFunction    start="current_schema(" end=")" contains=ALL
-syn region psqlFunction    start="current_schemas(" end=")" contains=ALL
-syn region psqlFunction    start="current_setting(" end=")" contains=ALL
-syn region psqlFunction    start="current_user(" end=")" contains=ALL
-syn region psqlFunction    start="currtid2(" end=")" contains=ALL
-syn region psqlFunction    start="currtid(" end=")" contains=ALL
-syn region psqlFunction    start="currval(" end=")" contains=ALL
-syn region psqlFunction    start="date_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="date(" end=")" contains=ALL
-syn region psqlFunction    start="date_eq(" end=")" contains=ALL
-syn region psqlFunction    start="date_ge(" end=")" contains=ALL
-syn region psqlFunction    start="date_gt(" end=")" contains=ALL
-syn region psqlFunction    start="date_larger(" end=")" contains=ALL
-syn region psqlFunction    start="date_le(" end=")" contains=ALL
-syn region psqlFunction    start="date_lt(" end=")" contains=ALL
-syn region psqlFunction    start="date_mi(" end=")" contains=ALL
-syn region psqlFunction    start="date_mii(" end=")" contains=ALL
-syn region psqlFunction    start="date_mi_interval(" end=")" contains=ALL
-syn region psqlFunction    start="date_ne(" end=")" contains=ALL
-syn region psqlFunction    start="date_part(" end=")" contains=ALL
-syn region psqlFunction    start="date_pli(" end=")" contains=ALL
-syn region psqlFunction    start="date_pl_interval(" end=")" contains=ALL
-syn region psqlFunction    start="date_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="datetime_pl(" end=")" contains=ALL
-syn region psqlFunction    start="datetimetz_pl(" end=")" contains=ALL
-syn region psqlFunction    start="date_trunc(" end=")" contains=ALL
-syn region psqlFunction    start="dcbrt(" end=")" contains=ALL
-syn region psqlFunction    start="decode(" end=")" contains=ALL
-syn region psqlFunction    start="degrees(" end=")" contains=ALL
-syn region psqlFunction    start="dexp(" end=")" contains=ALL
-syn region psqlFunction    start="diagonal(" end=")" contains=ALL
-syn region psqlFunction    start="diameter(" end=")" contains=ALL
-syn region psqlFunction    start="dist_cpoly(" end=")" contains=ALL
-syn region psqlFunction    start="dist_lb(" end=")" contains=ALL
-syn region psqlFunction    start="dist_pb(" end=")" contains=ALL
-syn region psqlFunction    start="dist_pc(" end=")" contains=ALL
-syn region psqlFunction    start="dist_pl(" end=")" contains=ALL
-syn region psqlFunction    start="dist_ppath(" end=")" contains=ALL
-syn region psqlFunction    start="dist_ps(" end=")" contains=ALL
-syn region psqlFunction    start="dist_sb(" end=")" contains=ALL
-syn region psqlFunction    start="dist_sl(" end=")" contains=ALL
-syn region psqlFunction    start="dlog10(" end=")" contains=ALL
-syn region psqlFunction    start="dlog1(" end=")" contains=ALL
-syn region psqlFunction    start="dpow(" end=")" contains=ALL
-syn region psqlFunction    start="dround(" end=")" contains=ALL
-syn region psqlFunction    start="dsqrt(" end=")" contains=ALL
-syn region psqlFunction    start="dtrunc(" end=")" contains=ALL
-syn region psqlFunction    start="encode(" end=")" contains=ALL
-syn region psqlFunction    start="eqjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="eqsel(" end=")" contains=ALL
-syn region psqlFunction    start="euc_cn_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="euc_cn_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="euc_jp_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="euc_jp_to_sjis(" end=")" contains=ALL
-syn region psqlFunction    start="euc_jp_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="euc_kr_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="euc_kr_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="euc_tw_to_big5(" end=")" contains=ALL
-syn region psqlFunction    start="euc_tw_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="euc_tw_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="exp(" end=")" contains=ALL
-syn region psqlFunction    start="factorial(" end=")" contains=ALL
-syn region psqlFunction    start="float48div(" end=")" contains=ALL
-syn region psqlFunction    start="float48eq(" end=")" contains=ALL
-syn region psqlFunction    start="float48ge(" end=")" contains=ALL
-syn region psqlFunction    start="float48gt(" end=")" contains=ALL
-syn region psqlFunction    start="float48le(" end=")" contains=ALL
-syn region psqlFunction    start="float48lt(" end=")" contains=ALL
-syn region psqlFunction    start="float48mi(" end=")" contains=ALL
-syn region psqlFunction    start="float48mul(" end=")" contains=ALL
-syn region psqlFunction    start="float48ne(" end=")" contains=ALL
-syn region psqlFunction    start="float48pl(" end=")" contains=ALL
-syn region psqlFunction    start="float4abs(" end=")" contains=ALL
-syn region psqlFunction    start="float4_accum(" end=")" contains=ALL
-syn region psqlFunction    start="float4div(" end=")" contains=ALL
-syn region psqlFunction    start="float4(" end=")" contains=ALL
-syn region psqlFunction    start="float4eq(" end=")" contains=ALL
-syn region psqlFunction    start="float4ge(" end=")" contains=ALL
-syn region psqlFunction    start="float4gt(" end=")" contains=ALL
-syn region psqlFunction    start="float4larger(" end=")" contains=ALL
-syn region psqlFunction    start="float4le(" end=")" contains=ALL
-syn region psqlFunction    start="float4lt(" end=")" contains=ALL
-syn region psqlFunction    start="float4mi(" end=")" contains=ALL
-syn region psqlFunction    start="float4mul(" end=")" contains=ALL
-syn region psqlFunction    start="float4ne(" end=")" contains=ALL
-syn region psqlFunction    start="float4pl(" end=")" contains=ALL
-syn region psqlFunction    start="float4smaller(" end=")" contains=ALL
-syn region psqlFunction    start="float4um(" end=")" contains=ALL
-syn region psqlFunction    start="float4up(" end=")" contains=ALL
-syn region psqlFunction    start="float84div(" end=")" contains=ALL
-syn region psqlFunction    start="float84eq(" end=")" contains=ALL
-syn region psqlFunction    start="float84ge(" end=")" contains=ALL
-syn region psqlFunction    start="float84gt(" end=")" contains=ALL
-syn region psqlFunction    start="float84le(" end=")" contains=ALL
-syn region psqlFunction    start="float84lt(" end=")" contains=ALL
-syn region psqlFunction    start="float84mi(" end=")" contains=ALL
-syn region psqlFunction    start="float84mul(" end=")" contains=ALL
-syn region psqlFunction    start="float84ne(" end=")" contains=ALL
-syn region psqlFunction    start="float84pl(" end=")" contains=ALL
-syn region psqlFunction    start="float8abs(" end=")" contains=ALL
-syn region psqlFunction    start="float8_accum(" end=")" contains=ALL
-syn region psqlFunction    start="float8_avg(" end=")" contains=ALL
-syn region psqlFunction    start="float8div(" end=")" contains=ALL
-syn region psqlFunction    start="float8(" end=")" contains=ALL
-syn region psqlFunction    start="float8eq(" end=")" contains=ALL
-syn region psqlFunction    start="float8ge(" end=")" contains=ALL
-syn region psqlFunction    start="float8gt(" end=")" contains=ALL
-syn region psqlFunction    start="float8larger(" end=")" contains=ALL
-syn region psqlFunction    start="float8le(" end=")" contains=ALL
-syn region psqlFunction    start="float8lt(" end=")" contains=ALL
-syn region psqlFunction    start="float8mi(" end=")" contains=ALL
-syn region psqlFunction    start="float8mul(" end=")" contains=ALL
-syn region psqlFunction    start="float8ne(" end=")" contains=ALL
-syn region psqlFunction    start="float8pl(" end=")" contains=ALL
-syn region psqlFunction    start="float8smaller(" end=")" contains=ALL
-syn region psqlFunction    start="float8_stddev(" end=")" contains=ALL
-syn region psqlFunction    start="float8um(" end=")" contains=ALL
-syn region psqlFunction    start="float8up(" end=")" contains=ALL
-syn region psqlFunction    start="float8_variance(" end=")" contains=ALL
-syn region psqlFunction    start="floor(" end=")" contains=ALL
-syn region psqlFunction    start="flt4_mul_cash(" end=")" contains=ALL
-syn region psqlFunction    start="flt8_mul_cash(" end=")" contains=ALL
-syn region psqlFunction    start="fmgr_c_validator(" end=")" contains=ALL
-syn region psqlFunction    start="fmgr_internal_validator(" end=")" contains=ALL
-syn region psqlFunction    start="fmgr_sql_validator(" end=")" contains=ALL
-syn region psqlFunction    start="format_type(" end=")" contains=ALL
-syn region psqlFunction    start="gb18030_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="gbk_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="get_bit(" end=")" contains=ALL
-syn region psqlFunction    start="get_byte(" end=")" contains=ALL
-syn region psqlFunction    start="getdatabaseencoding(" end=")" contains=ALL
-syn region psqlFunction    start="getpgusername(" end=")" contains=ALL
-syn region psqlFunction    start="gistbeginscan(" end=")" contains=ALL
-syn region psqlFunction    start="gistbuild(" end=")" contains=ALL
-syn region psqlFunction    start="gistbulkdelete(" end=")" contains=ALL
-syn region psqlFunction    start="gistcostestimate(" end=")" contains=ALL
-syn region psqlFunction    start="gistendscan(" end=")" contains=ALL
-syn region psqlFunction    start="gistgettuple(" end=")" contains=ALL
-syn region psqlFunction    start="gistinsert(" end=")" contains=ALL
-syn region psqlFunction    start="gistmarkpos(" end=")" contains=ALL
-syn region psqlFunction    start="gistrescan(" end=")" contains=ALL
-syn region psqlFunction    start="gistrestrpos(" end=")" contains=ALL
-syn region psqlFunction    start="has_database_privilege(" end=")" contains=ALL
-syn region psqlFunction    start="has_function_privilege(" end=")" contains=ALL
-syn region psqlFunction    start="hashbeginscan(" end=")" contains=ALL
-syn region psqlFunction    start="hashbpchar(" end=")" contains=ALL
-syn region psqlFunction    start="hashbuild(" end=")" contains=ALL
-syn region psqlFunction    start="hashbulkdelete(" end=")" contains=ALL
-syn region psqlFunction    start="hashchar(" end=")" contains=ALL
-syn region psqlFunction    start="hashcostestimate(" end=")" contains=ALL
-syn region psqlFunction    start="hashendscan(" end=")" contains=ALL
-syn region psqlFunction    start="hashfloat4(" end=")" contains=ALL
-syn region psqlFunction    start="hashfloat8(" end=")" contains=ALL
-syn region psqlFunction    start="hashgettuple(" end=")" contains=ALL
-syn region psqlFunction    start="hashinsert(" end=")" contains=ALL
-syn region psqlFunction    start="hashint2(" end=")" contains=ALL
-syn region psqlFunction    start="hashint4(" end=")" contains=ALL
-syn region psqlFunction    start="hashint8(" end=")" contains=ALL
-syn region psqlFunction    start="hashmacaddr(" end=")" contains=ALL
-syn region psqlFunction    start="hashmarkpos(" end=")" contains=ALL
-syn region psqlFunction    start="hashname(" end=")" contains=ALL
-syn region psqlFunction    start="hashoid(" end=")" contains=ALL
-syn region psqlFunction    start="hashoidvector(" end=")" contains=ALL
-syn region psqlFunction    start="hashrescan(" end=")" contains=ALL
-syn region psqlFunction    start="hashrestrpos(" end=")" contains=ALL
-syn region psqlFunction    start="hashvarlena(" end=")" contains=ALL
-syn region psqlFunction    start="has_language_privilege(" end=")" contains=ALL
-syn region psqlFunction    start="has_schema_privilege(" end=")" contains=ALL
-syn region psqlFunction    start="has_table_privilege(" end=")" contains=ALL
-syn region psqlFunction    start="height(" end=")" contains=ALL
-syn region psqlFunction    start="host(" end=")" contains=ALL
-syn region psqlFunction    start="iclikejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="iclikesel(" end=")" contains=ALL
-syn region psqlFunction    start="icnlikejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="icnlikesel(" end=")" contains=ALL
-syn region psqlFunction    start="icregexeqjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="icregexeqsel(" end=")" contains=ALL
-syn region psqlFunction    start="icregexnejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="icregexnesel(" end=")" contains=ALL
-syn region psqlFunction    start="inet(" end=")" contains=ALL
-syn region psqlFunction    start="initcap(" end=")" contains=ALL
-syn region psqlFunction    start="int24div(" end=")" contains=ALL
-syn region psqlFunction    start="int24eq(" end=")" contains=ALL
-syn region psqlFunction    start="int24ge(" end=")" contains=ALL
-syn region psqlFunction    start="int24gt(" end=")" contains=ALL
-syn region psqlFunction    start="int24le(" end=")" contains=ALL
-syn region psqlFunction    start="int24lt(" end=")" contains=ALL
-syn region psqlFunction    start="int24mi(" end=")" contains=ALL
-syn region psqlFunction    start="int24mod(" end=")" contains=ALL
-syn region psqlFunction    start="int24mul(" end=")" contains=ALL
-syn region psqlFunction    start="int24ne(" end=")" contains=ALL
-syn region psqlFunction    start="int24pl(" end=")" contains=ALL
-syn region psqlFunction    start="int28eq(" end=")" contains=ALL
-syn region psqlFunction    start="int28ge(" end=")" contains=ALL
-syn region psqlFunction    start="int28gt(" end=")" contains=ALL
-syn region psqlFunction    start="int28le(" end=")" contains=ALL
-syn region psqlFunction    start="int28lt(" end=")" contains=ALL
-syn region psqlFunction    start="int28ne(" end=")" contains=ALL
-syn region psqlFunction    start="int2abs(" end=")" contains=ALL
-syn region psqlFunction    start="int2_accum(" end=")" contains=ALL
-syn region psqlFunction    start="int2and(" end=")" contains=ALL
-syn region psqlFunction    start="int2_avg_accum(" end=")" contains=ALL
-syn region psqlFunction    start="int2div(" end=")" contains=ALL
-syn region psqlFunction    start="int2(" end=")" contains=ALL
-syn region psqlFunction    start="int2eq(" end=")" contains=ALL
-syn region psqlFunction    start="int2fac(" end=")" contains=ALL
-syn region psqlFunction    start="int2ge(" end=")" contains=ALL
-syn region psqlFunction    start="int2gt(" end=")" contains=ALL
-syn region psqlFunction    start="int2larger(" end=")" contains=ALL
-syn region psqlFunction    start="int2le(" end=")" contains=ALL
-syn region psqlFunction    start="int2lt(" end=")" contains=ALL
-syn region psqlFunction    start="int2mi(" end=")" contains=ALL
-syn region psqlFunction    start="int2mod(" end=")" contains=ALL
-syn region psqlFunction    start="int2_mul_cash(" end=")" contains=ALL
-syn region psqlFunction    start="int2mul(" end=")" contains=ALL
-syn region psqlFunction    start="int2ne(" end=")" contains=ALL
-syn region psqlFunction    start="int2not(" end=")" contains=ALL
-syn region psqlFunction    start="int2or(" end=")" contains=ALL
-syn region psqlFunction    start="int2pl(" end=")" contains=ALL
-syn region psqlFunction    start="int2shl(" end=")" contains=ALL
-syn region psqlFunction    start="int2shr(" end=")" contains=ALL
-syn region psqlFunction    start="int2smaller(" end=")" contains=ALL
-syn region psqlFunction    start="int2_sum(" end=")" contains=ALL
-syn region psqlFunction    start="int2um(" end=")" contains=ALL
-syn region psqlFunction    start="int2up(" end=")" contains=ALL
-syn region psqlFunction    start="int2vectoreq(" end=")" contains=ALL
-syn region psqlFunction    start="int2xor(" end=")" contains=ALL
-syn region psqlFunction    start="int42div(" end=")" contains=ALL
-syn region psqlFunction    start="int42eq(" end=")" contains=ALL
-syn region psqlFunction    start="int42ge(" end=")" contains=ALL
-syn region psqlFunction    start="int42gt(" end=")" contains=ALL
-syn region psqlFunction    start="int42le(" end=")" contains=ALL
-syn region psqlFunction    start="int42lt(" end=")" contains=ALL
-syn region psqlFunction    start="int42mi(" end=")" contains=ALL
-syn region psqlFunction    start="int42mod(" end=")" contains=ALL
-syn region psqlFunction    start="int42mul(" end=")" contains=ALL
-syn region psqlFunction    start="int42ne(" end=")" contains=ALL
-syn region psqlFunction    start="int42pl(" end=")" contains=ALL
-syn region psqlFunction    start="int48div(" end=")" contains=ALL
-syn region psqlFunction    start="int48eq(" end=")" contains=ALL
-syn region psqlFunction    start="int48ge(" end=")" contains=ALL
-syn region psqlFunction    start="int48gt(" end=")" contains=ALL
-syn region psqlFunction    start="int48le(" end=")" contains=ALL
-syn region psqlFunction    start="int48lt(" end=")" contains=ALL
-syn region psqlFunction    start="int48mi(" end=")" contains=ALL
-syn region psqlFunction    start="int48mul(" end=")" contains=ALL
-syn region psqlFunction    start="int48ne(" end=")" contains=ALL
-syn region psqlFunction    start="int48pl(" end=")" contains=ALL
-syn region psqlFunction    start="int4abs(" end=")" contains=ALL
-syn region psqlFunction    start="int4_accum(" end=")" contains=ALL
-syn region psqlFunction    start="int4and(" end=")" contains=ALL
-syn region psqlFunction    start="int4_avg_accum(" end=")" contains=ALL
-syn region psqlFunction    start="int4div(" end=")" contains=ALL
-syn region psqlFunction    start="int4(" end=")" contains=ALL
-syn region psqlFunction    start="int4eq(" end=")" contains=ALL
-syn region psqlFunction    start="int4fac(" end=")" contains=ALL
-syn region psqlFunction    start="int4ge(" end=")" contains=ALL
-syn region psqlFunction    start="int4gt(" end=")" contains=ALL
-syn region psqlFunction    start="int4inc(" end=")" contains=ALL
-syn region psqlFunction    start="int4larger(" end=")" contains=ALL
-syn region psqlFunction    start="int4le(" end=")" contains=ALL
-syn region psqlFunction    start="int4lt(" end=")" contains=ALL
-syn region psqlFunction    start="int4mi(" end=")" contains=ALL
-syn region psqlFunction    start="int4mod(" end=")" contains=ALL
-syn region psqlFunction    start="int4_mul_cash(" end=")" contains=ALL
-syn region psqlFunction    start="int4mul(" end=")" contains=ALL
-syn region psqlFunction    start="int4ne(" end=")" contains=ALL
-syn region psqlFunction    start="int4not(" end=")" contains=ALL
-syn region psqlFunction    start="int4notin(" end=")" contains=ALL
-syn region psqlFunction    start="int4or(" end=")" contains=ALL
-syn region psqlFunction    start="int4pl(" end=")" contains=ALL
-syn region psqlFunction    start="int4shl(" end=")" contains=ALL
-syn region psqlFunction    start="int4shr(" end=")" contains=ALL
-syn region psqlFunction    start="int4smaller(" end=")" contains=ALL
-syn region psqlFunction    start="int4_sum(" end=")" contains=ALL
-syn region psqlFunction    start="int4um(" end=")" contains=ALL
-syn region psqlFunction    start="int4up(" end=")" contains=ALL
-syn region psqlFunction    start="int4xor(" end=")" contains=ALL
-syn region psqlFunction    start="int82eq(" end=")" contains=ALL
-syn region psqlFunction    start="int82ge(" end=")" contains=ALL
-syn region psqlFunction    start="int82gt(" end=")" contains=ALL
-syn region psqlFunction    start="int82le(" end=")" contains=ALL
-syn region psqlFunction    start="int82lt(" end=")" contains=ALL
-syn region psqlFunction    start="int82ne(" end=")" contains=ALL
-syn region psqlFunction    start="int84div(" end=")" contains=ALL
-syn region psqlFunction    start="int84eq(" end=")" contains=ALL
-syn region psqlFunction    start="int84ge(" end=")" contains=ALL
-syn region psqlFunction    start="int84gt(" end=")" contains=ALL
-syn region psqlFunction    start="int84le(" end=")" contains=ALL
-syn region psqlFunction    start="int84lt(" end=")" contains=ALL
-syn region psqlFunction    start="int84mi(" end=")" contains=ALL
-syn region psqlFunction    start="int84mul(" end=")" contains=ALL
-syn region psqlFunction    start="int84ne(" end=")" contains=ALL
-syn region psqlFunction    start="int84pl(" end=")" contains=ALL
-syn region psqlFunction    start="int8abs(" end=")" contains=ALL
-syn region psqlFunction    start="int8_accum(" end=")" contains=ALL
-syn region psqlFunction    start="int8and(" end=")" contains=ALL
-syn region psqlFunction    start="int8_avg(" end=")" contains=ALL
-syn region psqlFunction    start="int8div(" end=")" contains=ALL
-syn region psqlFunction    start="int8(" end=")" contains=ALL
-syn region psqlFunction    start="int8eq(" end=")" contains=ALL
-syn region psqlFunction    start="int8fac(" end=")" contains=ALL
-syn region psqlFunction    start="int8ge(" end=")" contains=ALL
-syn region psqlFunction    start="int8gt(" end=")" contains=ALL
-syn region psqlFunction    start="int8inc(" end=")" contains=ALL
-syn region psqlFunction    start="int8larger(" end=")" contains=ALL
-syn region psqlFunction    start="int8le(" end=")" contains=ALL
-syn region psqlFunction    start="int8lt(" end=")" contains=ALL
-syn region psqlFunction    start="int8mi(" end=")" contains=ALL
-syn region psqlFunction    start="int8mod(" end=")" contains=ALL
-syn region psqlFunction    start="int8mul(" end=")" contains=ALL
-syn region psqlFunction    start="int8ne(" end=")" contains=ALL
-syn region psqlFunction    start="int8not(" end=")" contains=ALL
-syn region psqlFunction    start="int8or(" end=")" contains=ALL
-syn region psqlFunction    start="int8pl(" end=")" contains=ALL
-syn region psqlFunction    start="int8shl(" end=")" contains=ALL
-syn region psqlFunction    start="int8shr(" end=")" contains=ALL
-syn region psqlFunction    start="int8smaller(" end=")" contains=ALL
-syn region psqlFunction    start="int8_sum(" end=")" contains=ALL
-syn region psqlFunction    start="int8um(" end=")" contains=ALL
-syn region psqlFunction    start="int8up(" end=")" contains=ALL
-syn region psqlFunction    start="int8xor(" end=")" contains=ALL
-syn region psqlFunction    start="inter_lb(" end=")" contains=ALL
-syn region psqlFunction    start="inter_sb(" end=")" contains=ALL
-syn region psqlFunction    start="inter_sl(" end=")" contains=ALL
-syn region psqlFunction    start="interval_accum(" end=")" contains=ALL
-syn region psqlFunction    start="interval_avg(" end=")" contains=ALL
-syn region psqlFunction    start="interval_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="interval_div(" end=")" contains=ALL
-syn region psqlFunction    start="interval(" end=")" contains=ALL
-syn region psqlFunction    start="interval_eq(" end=")" contains=ALL
-syn region psqlFunction    start="interval_ge(" end=")" contains=ALL
-syn region psqlFunction    start="interval_gt(" end=")" contains=ALL
-syn region psqlFunction    start="interval_hash(" end=")" contains=ALL
-syn region psqlFunction    start="interval_larger(" end=")" contains=ALL
-syn region psqlFunction    start="interval_le(" end=")" contains=ALL
-syn region psqlFunction    start="interval_lt(" end=")" contains=ALL
-syn region psqlFunction    start="interval_mi(" end=")" contains=ALL
-syn region psqlFunction    start="interval_mi_time(" end=")" contains=ALL
-syn region psqlFunction    start="interval_mi_timetz(" end=")" contains=ALL
-syn region psqlFunction    start="interval_mul(" end=")" contains=ALL
-syn region psqlFunction    start="interval_ne(" end=")" contains=ALL
-syn region psqlFunction    start="interval_pl(" end=")" contains=ALL
-syn region psqlFunction    start="interval_pl_time(" end=")" contains=ALL
-syn region psqlFunction    start="interval_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="interval_um(" end=")" contains=ALL
-syn region psqlFunction    start="intinterval(" end=")" contains=ALL
-syn region psqlFunction    start="isclosed(" end=")" contains=ALL
-syn region psqlFunction    start="isfalse(" end=")" contains=ALL
-syn region psqlFunction    start="isfinite(" end=")" contains=ALL
-syn region psqlFunction    start="ishorizontal(" end=")" contains=ALL
-syn region psqlFunction    start="isnotfalse(" end=")" contains=ALL
-syn region psqlFunction    start="isnottrue(" end=")" contains=ALL
-syn region psqlFunction    start="iso8859_1_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="iso8859_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="isopen(" end=")" contains=ALL
-syn region psqlFunction    start="iso_to_alt(" end=")" contains=ALL
-syn region psqlFunction    start="iso_to_koi8r(" end=")" contains=ALL
-syn region psqlFunction    start="iso_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="iso_to_win1251(" end=")" contains=ALL
-syn region psqlFunction    start="isparallel(" end=")" contains=ALL
-syn region psqlFunction    start="isperp(" end=")" contains=ALL
-syn region psqlFunction    start="istrue(" end=")" contains=ALL
-syn region psqlFunction    start="isvertical(" end=")" contains=ALL
-syn region psqlFunction    start="johab_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="koi8r_to_alt(" end=")" contains=ALL
-syn region psqlFunction    start="koi8r_to_iso(" end=")" contains=ALL
-syn region psqlFunction    start="koi8r_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="koi8r_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="koi8r_to_win1251(" end=")" contains=ALL
-syn region psqlFunction    start="latin1_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="latin2_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="latin2_to_win1250(" end=")" contains=ALL
-syn region psqlFunction    start="latin3_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="latin4_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="length(" end=")" contains=ALL
-syn region psqlFunction    start="like(" end=")" contains=ALL
-syn region psqlFunction    start="like_escape(" end=")" contains=ALL
-syn region psqlFunction    start="likejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="likesel(" end=")" contains=ALL
-syn region psqlFunction    start="line_distance(" end=")" contains=ALL
-syn region psqlFunction    start="line(" end=")" contains=ALL
-syn region psqlFunction    start="line_eq(" end=")" contains=ALL
-syn region psqlFunction    start="line_horizontal(" end=")" contains=ALL
-syn region psqlFunction    start="line_interpt(" end=")" contains=ALL
-syn region psqlFunction    start="line_intersect(" end=")" contains=ALL
-syn region psqlFunction    start="line_parallel(" end=")" contains=ALL
-syn region psqlFunction    start="line_perp(" end=")" contains=ALL
-syn region psqlFunction    start="line_vertical(" end=")" contains=ALL
-syn region psqlFunction    start="ln(" end=")" contains=ALL
-syn region psqlFunction    start="lo_close(" end=")" contains=ALL
-syn region psqlFunction    start="lo_creat(" end=")" contains=ALL
-syn region psqlFunction    start="lo_export(" end=")" contains=ALL
-syn region psqlFunction    start="log(" end=")" contains=ALL
-syn region psqlFunction    start="lo_import(" end=")" contains=ALL
-syn region psqlFunction    start="lo_lseek(" end=")" contains=ALL
-syn region psqlFunction    start="lo_open(" end=")" contains=ALL
-syn region psqlFunction    start="loread(" end=")" contains=ALL
-syn region psqlFunction    start="lo_tell(" end=")" contains=ALL
-syn region psqlFunction    start="lo_unlink(" end=")" contains=ALL
-syn region psqlFunction    start="lower(" end=")" contains=ALL
-syn region psqlFunction    start="lowrite(" end=")" contains=ALL
-syn region psqlFunction    start="lpad(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_center(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_distance(" end=")" contains=ALL
-syn region psqlFunction    start="lseg(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_eq(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_ge(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_gt(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_horizontal(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_interpt(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_intersect(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_le(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_length(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_lt(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_ne(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_parallel(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_perp(" end=")" contains=ALL
-syn region psqlFunction    start="lseg_vertical(" end=")" contains=ALL
-syn region psqlFunction    start="ltrim(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_eq(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_ge(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_gt(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_le(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_lt(" end=")" contains=ALL
-syn region psqlFunction    start="macaddr_ne(" end=")" contains=ALL
-syn region psqlFunction    start="masklen(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_alt(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_ascii(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_big5(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_euc_cn(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_euc_jp(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_euc_kr(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_euc_tw(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_iso(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_koi8r(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_latin1(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_latin2(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_latin3(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_latin4(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_sjis(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_win1250(" end=")" contains=ALL
-syn region psqlFunction    start="mic_to_win1251(" end=")" contains=ALL
-syn region psqlFunction    start="mktinterval(" end=")" contains=ALL
-syn region psqlFunction    start="mod(" end=")" contains=ALL
-syn region psqlFunction    start="mul_d_interval(" end=")" contains=ALL
-syn region psqlFunction    start="name(" end=")" contains=ALL
-syn region psqlFunction    start="nameeq(" end=")" contains=ALL
-syn region psqlFunction    start="namege(" end=")" contains=ALL
-syn region psqlFunction    start="namegt(" end=")" contains=ALL
-syn region psqlFunction    start="nameiclike(" end=")" contains=ALL
-syn region psqlFunction    start="nameicnlike(" end=")" contains=ALL
-syn region psqlFunction    start="nameicregexeq(" end=")" contains=ALL
-syn region psqlFunction    start="nameicregexne(" end=")" contains=ALL
-syn region psqlFunction    start="namele(" end=")" contains=ALL
-syn region psqlFunction    start="namelike(" end=")" contains=ALL
-syn region psqlFunction    start="namelt(" end=")" contains=ALL
-syn region psqlFunction    start="namene(" end=")" contains=ALL
-syn region psqlFunction    start="namenlike(" end=")" contains=ALL
-syn region psqlFunction    start="nameregexeq(" end=")" contains=ALL
-syn region psqlFunction    start="nameregexne(" end=")" contains=ALL
-syn region psqlFunction    start="neqjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="neqsel(" end=")" contains=ALL
-syn region psqlFunction    start="netmask(" end=")" contains=ALL
-syn region psqlFunction    start="network_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="network(" end=")" contains=ALL
-syn region psqlFunction    start="network_eq(" end=")" contains=ALL
-syn region psqlFunction    start="network_ge(" end=")" contains=ALL
-syn region psqlFunction    start="network_gt(" end=")" contains=ALL
-syn region psqlFunction    start="network_le(" end=")" contains=ALL
-syn region psqlFunction    start="network_lt(" end=")" contains=ALL
-syn region psqlFunction    start="network_ne(" end=")" contains=ALL
-syn region psqlFunction    start="network_sub(" end=")" contains=ALL
-syn region psqlFunction    start="network_subeq(" end=")" contains=ALL
-syn region psqlFunction    start="network_sup(" end=")" contains=ALL
-syn region psqlFunction    start="network_supeq(" end=")" contains=ALL
-syn region psqlFunction    start="nextval(" end=")" contains=ALL
-syn region psqlFunction    start="nlikejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="nlikesel(" end=")" contains=ALL
-syn region psqlFunction    start="nonnullvalue(" end=")" contains=ALL
-syn region psqlFunction    start="notlike(" end=")" contains=ALL
-syn region psqlFunction    start="now(" end=")" contains=ALL
-syn region psqlFunction    start="npoints(" end=")" contains=ALL
-syn region psqlFunction    start="nullvalue(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_abs(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_accum(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_add(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_avg(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_div(" end=")" contains=ALL
-syn region psqlFunction    start="numeric(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_eq(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_exp(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_ge(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_gt(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_inc(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_larger(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_le(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_ln(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_log(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_lt(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_mod(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_mul(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_ne(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_power(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_sqrt(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_stddev(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_sub(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_uminus(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_uplus(" end=")" contains=ALL
-syn region psqlFunction    start="numeric_variance(" end=")" contains=ALL
-syn region psqlFunction    start="obj_description(" end=")" contains=ALL
-syn region psqlFunction    start="octet_length(" end=")" contains=ALL
-syn region psqlFunction    start="oid(" end=")" contains=ALL
-syn region psqlFunction    start="oideq(" end=")" contains=ALL
-syn region psqlFunction    start="oidge(" end=")" contains=ALL
-syn region psqlFunction    start="oidgt(" end=")" contains=ALL
-syn region psqlFunction    start="oidlarger(" end=")" contains=ALL
-syn region psqlFunction    start="oidle(" end=")" contains=ALL
-syn region psqlFunction    start="oidlt(" end=")" contains=ALL
-syn region psqlFunction    start="oidne(" end=")" contains=ALL
-syn region psqlFunction    start="oidnotin(" end=")" contains=ALL
-syn region psqlFunction    start="oidrand(" end=")" contains=ALL
-syn region psqlFunction    start="oidsmaller(" end=")" contains=ALL
-syn region psqlFunction    start="oidsrand(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectoreq(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectorge(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectorgt(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectorle(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectorlt(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectorne(" end=")" contains=ALL
-syn region psqlFunction    start="oidvectortypes(" end=")" contains=ALL
-syn region psqlFunction    start="on_pb(" end=")" contains=ALL
-syn region psqlFunction    start="on_pl(" end=")" contains=ALL
-syn region psqlFunction    start="on_ppath(" end=")" contains=ALL
-syn region psqlFunction    start="on_ps(" end=")" contains=ALL
-syn region psqlFunction    start="on_sb(" end=")" contains=ALL
-syn region psqlFunction    start="on_sl(" end=")" contains=ALL
-syn region psqlFunction    start="overlaps(" end=")" contains=ALL
-syn region psqlFunction    start="overlay(" end=")" contains=ALL
-syn region psqlFunction    start="path_add(" end=")" contains=ALL
-syn region psqlFunction    start="path_add_pt(" end=")" contains=ALL
-syn region psqlFunction    start="path_center(" end=")" contains=ALL
-syn region psqlFunction    start="path_contain_pt(" end=")" contains=ALL
-syn region psqlFunction    start="path_distance(" end=")" contains=ALL
-syn region psqlFunction    start="path_div_pt(" end=")" contains=ALL
-syn region psqlFunction    start="path(" end=")" contains=ALL
-syn region psqlFunction    start="path_inter(" end=")" contains=ALL
-syn region psqlFunction    start="path_length(" end=")" contains=ALL
-syn region psqlFunction    start="path_mul_pt(" end=")" contains=ALL
-syn region psqlFunction    start="path_n_eq(" end=")" contains=ALL
-syn region psqlFunction    start="path_n_ge(" end=")" contains=ALL
-syn region psqlFunction    start="path_n_gt(" end=")" contains=ALL
-syn region psqlFunction    start="path_n_le(" end=")" contains=ALL
-syn region psqlFunction    start="path_n_lt(" end=")" contains=ALL
-syn region psqlFunction    start="path_npoints(" end=")" contains=ALL
-syn region psqlFunction    start="path_sub_pt(" end=")" contains=ALL
-syn region psqlFunction    start="pclose(" end=")" contains=ALL
-syn region psqlFunction    start="pg_backend_pid(" end=")" contains=ALL
-syn region psqlFunction    start="pg_char_to_encoding(" end=")" contains=ALL
-syn region psqlFunction    start="pg_client_encoding(" end=")" contains=ALL
-syn region psqlFunction    start="pg_encoding_to_char(" end=")" contains=ALL
-syn region psqlFunction    start="pg_function_is_visible(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_constraintdef(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_expr(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_indexdef(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_ruledef(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_userbyid(" end=")" contains=ALL
-syn region psqlFunction    start="pg_get_viewdef(" end=")" contains=ALL
-syn region psqlFunction    start="pg_lock_status(" end=")" contains=ALL
-syn region psqlFunction    start="pg_opclass_is_visible(" end=")" contains=ALL
-syn region psqlFunction    start="pg_operator_is_visible(" end=")" contains=ALL
-syn region psqlFunction    start="pg_show_all_settings(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_backend_activity(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_backend_dbid(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_backend_idset(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_backend_pid(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_backend_userid(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_blocks_fetched(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_blocks_hit(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_db_blocks_fetched(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_db_blocks_hit(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_db_numbackends(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_db_xact_commit(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_db_xact_rollback(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_numscans(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_tuples_deleted(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_tuples_fetched(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_tuples_inserted(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_tuples_returned(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_get_tuples_updated(" end=")" contains=ALL
-syn region psqlFunction    start="pg_stat_reset(" end=")" contains=ALL
-syn region psqlFunction    start="pg_table_is_visible(" end=")" contains=ALL
-syn region psqlFunction    start="pg_type_is_visible(" end=")" contains=ALL
-syn region psqlFunction    start="pi(" end=")" contains=ALL
-syn region psqlFunction    start="plpgsql_call_handler(" end=")" contains=ALL
-syn region psqlFunction    start="point_above(" end=")" contains=ALL
-syn region psqlFunction    start="point_add(" end=")" contains=ALL
-syn region psqlFunction    start="point_below(" end=")" contains=ALL
-syn region psqlFunction    start="point_distance(" end=")" contains=ALL
-syn region psqlFunction    start="point_div(" end=")" contains=ALL
-syn region psqlFunction    start="point(" end=")" contains=ALL
-syn region psqlFunction    start="point_eq(" end=")" contains=ALL
-syn region psqlFunction    start="point_horiz(" end=")" contains=ALL
-syn region psqlFunction    start="point_left(" end=")" contains=ALL
-syn region psqlFunction    start="point_mul(" end=")" contains=ALL
-syn region psqlFunction    start="point_ne(" end=")" contains=ALL
-syn region psqlFunction    start="point_right(" end=")" contains=ALL
-syn region psqlFunction    start="point_sub(" end=")" contains=ALL
-syn region psqlFunction    start="point_vert(" end=")" contains=ALL
-syn region psqlFunction    start="poly_center(" end=")" contains=ALL
-syn region psqlFunction    start="poly_contained(" end=")" contains=ALL
-syn region psqlFunction    start="poly_contain(" end=")" contains=ALL
-syn region psqlFunction    start="poly_contain_pt(" end=")" contains=ALL
-syn region psqlFunction    start="poly_distance(" end=")" contains=ALL
-syn region psqlFunction    start="polygon(" end=")" contains=ALL
-syn region psqlFunction    start="poly_left(" end=")" contains=ALL
-syn region psqlFunction    start="poly_npoints(" end=")" contains=ALL
-syn region psqlFunction    start="poly_overlap(" end=")" contains=ALL
-syn region psqlFunction    start="poly_overleft(" end=")" contains=ALL
-syn region psqlFunction    start="poly_overright(" end=")" contains=ALL
-syn region psqlFunction    start="poly_right(" end=")" contains=ALL
-syn region psqlFunction    start="poly_same(" end=")" contains=ALL
-syn region psqlFunction    start="popen(" end=")" contains=ALL
-syn region psqlFunction    start="position(" end=")" contains=ALL
-syn region psqlFunction    start="positionjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="positionsel(" end=")" contains=ALL
-syn region psqlFunction    start="pow(" end=")" contains=ALL
-syn region psqlFunction    start="pt_contained_circle(" end=")" contains=ALL
-syn region psqlFunction    start="pt_contained_poly(" end=")" contains=ALL
-syn region psqlFunction    start="quote_ident(" end=")" contains=ALL
-syn region psqlFunction    start="quote_literal(" end=")" contains=ALL
-syn region psqlFunction    start="radians(" end=")" contains=ALL
-syn region psqlFunction    start="radius(" end=")" contains=ALL
-syn region psqlFunction    start="random(" end=")" contains=ALL
-syn region psqlFunction    start="regexeqjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="regexeqsel(" end=")" contains=ALL
-syn region psqlFunction    start="regexnejoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="regexnesel(" end=")" contains=ALL
-syn region psqlFunction    start="reltime(" end=")" contains=ALL
-syn region psqlFunction    start="reltimeeq(" end=")" contains=ALL
-syn region psqlFunction    start="reltimege(" end=")" contains=ALL
-syn region psqlFunction    start="reltimegt(" end=")" contains=ALL
-syn region psqlFunction    start="reltimele(" end=")" contains=ALL
-syn region psqlFunction    start="reltimelt(" end=")" contains=ALL
-syn region psqlFunction    start="reltimene(" end=")" contains=ALL
-syn region psqlFunction    start="repeat(" end=")" contains=ALL
-syn region psqlFunction    start="replace(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_cascade_del(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_cascade_upd(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_check_ins(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_check_upd(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_noaction_del(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_noaction_upd(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_restrict_del(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_restrict_upd(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_setdefault_del(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_setdefault_upd(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_setnull_del(" end=")" contains=ALL
-syn region psqlFunction    start="RI_FKey_setnull_upd(" end=")" contains=ALL
-syn region psqlFunction    start="round(" end=")" contains=ALL
-syn region psqlFunction    start="rpad(" end=")" contains=ALL
-syn region psqlFunction    start="rtbeginscan(" end=")" contains=ALL
-syn region psqlFunction    start="rt_bigbox_size(" end=")" contains=ALL
-syn region psqlFunction    start="rt_box_inter(" end=")" contains=ALL
-syn region psqlFunction    start="rt_box_size(" end=")" contains=ALL
-syn region psqlFunction    start="rt_box_union(" end=")" contains=ALL
-syn region psqlFunction    start="rtbuild(" end=")" contains=ALL
-syn region psqlFunction    start="rtbulkdelete(" end=")" contains=ALL
-syn region psqlFunction    start="rtcostestimate(" end=")" contains=ALL
-syn region psqlFunction    start="rtendscan(" end=")" contains=ALL
-syn region psqlFunction    start="rtgettuple(" end=")" contains=ALL
-syn region psqlFunction    start="rtinsert(" end=")" contains=ALL
-syn region psqlFunction    start="rtmarkpos(" end=")" contains=ALL
-syn region psqlFunction    start="rt_poly_inter(" end=")" contains=ALL
-syn region psqlFunction    start="rt_poly_size(" end=")" contains=ALL
-syn region psqlFunction    start="rt_poly_union(" end=")" contains=ALL
-syn region psqlFunction    start="rtrescan(" end=")" contains=ALL
-syn region psqlFunction    start="rtrestrpos(" end=")" contains=ALL
-syn region psqlFunction    start="rtrim(" end=")" contains=ALL
-syn region psqlFunction    start="scalargtjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="scalargtsel(" end=")" contains=ALL
-syn region psqlFunction    start="scalarltjoinsel(" end=")" contains=ALL
-syn region psqlFunction    start="scalarltsel(" end=")" contains=ALL
-syn region psqlFunction    start="session_user(" end=")" contains=ALL
-syn region psqlFunction    start="set_bit(" end=")" contains=ALL
-syn region psqlFunction    start="set_byte(" end=")" contains=ALL
-syn region psqlFunction    start="set_config(" end=")" contains=ALL
-syn region psqlFunction    start="seteval(" end=")" contains=ALL
-syn region psqlFunction    start="set_masklen(" end=")" contains=ALL
-syn region psqlFunction    start="setseed(" end=")" contains=ALL
-syn region psqlFunction    start="setval(" end=")" contains=ALL
-syn region psqlFunction    start="sign(" end=")" contains=ALL
-syn region psqlFunction    start="similar_escape(" end=")" contains=ALL
-syn region psqlFunction    start="sin(" end=")" contains=ALL
-syn region psqlFunction    start="sjis_to_euc_jp(" end=")" contains=ALL
-syn region psqlFunction    start="sjis_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="sjis_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="slope(" end=")" contains=ALL
-syn region psqlFunction    start="smgreq(" end=")" contains=ALL
-syn region psqlFunction    start="smgrne(" end=")" contains=ALL
-syn region psqlFunction    start="split_part(" end=")" contains=ALL
-syn region psqlFunction    start="sqrt(" end=")" contains=ALL
-syn region psqlFunction    start="strpos(" end=")" contains=ALL
-syn region psqlFunction    start="substr(" end=")" contains=ALL
-syn region psqlFunction    start="substring(" end=")" contains=ALL
-syn region psqlFunction    start="tan(" end=")" contains=ALL
-syn region psqlFunction    start="tcvn_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="textcat(" end=")" contains=ALL
-syn region psqlFunction    start="text(" end=")" contains=ALL
-syn region psqlFunction    start="texteq(" end=")" contains=ALL
-syn region psqlFunction    start="text_ge(" end=")" contains=ALL
-syn region psqlFunction    start="text_gt(" end=")" contains=ALL
-syn region psqlFunction    start="texticlike(" end=")" contains=ALL
-syn region psqlFunction    start="texticnlike(" end=")" contains=ALL
-syn region psqlFunction    start="texticregexeq(" end=")" contains=ALL
-syn region psqlFunction    start="texticregexne(" end=")" contains=ALL
-syn region psqlFunction    start="text_larger(" end=")" contains=ALL
-syn region psqlFunction    start="text_le(" end=")" contains=ALL
-syn region psqlFunction    start="textlen(" end=")" contains=ALL
-syn region psqlFunction    start="textlike(" end=")" contains=ALL
-syn region psqlFunction    start="text_lt(" end=")" contains=ALL
-syn region psqlFunction    start="textne(" end=")" contains=ALL
-syn region psqlFunction    start="textnlike(" end=")" contains=ALL
-syn region psqlFunction    start="textregexeq(" end=")" contains=ALL
-syn region psqlFunction    start="textregexne(" end=")" contains=ALL
-syn region psqlFunction    start="text_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="tideq(" end=")" contains=ALL
-syn region psqlFunction    start="time_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="timedate_pl(" end=")" contains=ALL
-syn region psqlFunction    start="time(" end=")" contains=ALL
-syn region psqlFunction    start="time_eq(" end=")" contains=ALL
-syn region psqlFunction    start="time_ge(" end=")" contains=ALL
-syn region psqlFunction    start="time_gt(" end=")" contains=ALL
-syn region psqlFunction    start="time_larger(" end=")" contains=ALL
-syn region psqlFunction    start="time_le(" end=")" contains=ALL
-syn region psqlFunction    start="time_lt(" end=")" contains=ALL
-syn region psqlFunction    start="timemi(" end=")" contains=ALL
-syn region psqlFunction    start="time_mi_interval(" end=")" contains=ALL
-syn region psqlFunction    start="time_mi_time(" end=")" contains=ALL
-syn region psqlFunction    start="time_ne(" end=")" contains=ALL
-syn region psqlFunction    start="timenow(" end=")" contains=ALL
-syn region psqlFunction    start="timeofday(" end=")" contains=ALL
-syn region psqlFunction    start="timepl(" end=")" contains=ALL
-syn region psqlFunction    start="time_pl_interval(" end=")" contains=ALL
-syn region psqlFunction    start="time_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_eq(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_ge(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_gt(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_larger(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_le(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_lt(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_mi(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_mi_span(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_ne(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_pl_span(" end=")" contains=ALL
-syn region psqlFunction    start="timestamp_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_eq(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_ge(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_gt(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_larger(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_le(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_lt(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_mi(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_mi_span(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_ne(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_pl_span(" end=")" contains=ALL
-syn region psqlFunction    start="timestamptz_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_cmp(" end=")" contains=ALL
-syn region psqlFunction    start="timetzdate_pl(" end=")" contains=ALL
-syn region psqlFunction    start="timetz(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_eq(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_ge(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_gt(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_hash(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_larger(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_le(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_lt(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_mi_interval(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_ne(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_pl_interval(" end=")" contains=ALL
-syn region psqlFunction    start="timetz_smaller(" end=")" contains=ALL
-syn region psqlFunction    start="timezone(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalct(" end=")" contains=ALL
-syn region psqlFunction    start="tinterval(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalend(" end=")" contains=ALL
-syn region psqlFunction    start="tintervaleq(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalge(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalgt(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalle(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalleneq(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallenge(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallengt(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallenle(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallenlt(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallenne(" end=")" contains=ALL
-syn region psqlFunction    start="tintervallt(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalne(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalov(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalrel(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalsame(" end=")" contains=ALL
-syn region psqlFunction    start="tintervalstart(" end=")" contains=ALL
-syn region psqlFunction    start="to_ascii(" end=")" contains=ALL
-syn region psqlFunction    start="to_char(" end=")" contains=ALL
-syn region psqlFunction    start="to_date(" end=")" contains=ALL
-syn region psqlFunction    start="to_hex(" end=")" contains=ALL
-syn region psqlFunction    start="to_number(" end=")" contains=ALL
-syn region psqlFunction    start="to_timestamp(" end=")" contains=ALL
-syn region psqlFunction    start="translate(" end=")" contains=ALL
-syn region psqlFunction    start="trunc(" end=")" contains=ALL
-syn region psqlFunction    start="uhc_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="update_pg_pwd_and_pg_group(" end=")" contains=ALL
-syn region psqlFunction    start="upper(" end=")" contains=ALL
-syn region psqlFunction    start="userfntest(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_alt(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_ascii(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_big5(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_euc_cn(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_euc_jp(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_euc_kr(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_euc_tw(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_gb18030(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_gbk(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_iso8859_1(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_iso8859(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_johab(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_koi8r(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_sjis(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_tcvn(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_uhc(" end=")" contains=ALL
-syn region psqlFunction    start="utf8_to_win1251(" end=")" contains=ALL
-syn region psqlFunction    start="utf_to_win1250(" end=")" contains=ALL
-syn region psqlFunction    start="utf_to_win1256(" end=")" contains=ALL
-syn region psqlFunction    start="utf_to_win874(" end=")" contains=ALL
-syn region psqlFunction    start="varbitcmp(" end=")" contains=ALL
-syn region psqlFunction    start="varbit(" end=")" contains=ALL
-syn region psqlFunction    start="varbiteq(" end=")" contains=ALL
-syn region psqlFunction    start="varbitge(" end=")" contains=ALL
-syn region psqlFunction    start="varbitgt(" end=")" contains=ALL
-syn region psqlFunction    start="varbitle(" end=")" contains=ALL
-syn region psqlFunction    start="varbitlt(" end=")" contains=ALL
-syn region psqlFunction    start="varbitne(" end=")" contains=ALL
-syn region psqlFunction    start="varcharcmp(" end=")" contains=ALL
-syn region psqlFunction    start="varchar(" end=")" contains=ALL
-syn region psqlFunction    start="varchareq(" end=")" contains=ALL
-syn region psqlFunction    start="varcharge(" end=")" contains=ALL
-syn region psqlFunction    start="varchargt(" end=")" contains=ALL
-syn region psqlFunction    start="varcharle(" end=")" contains=ALL
-syn region psqlFunction    start="varcharlt(" end=")" contains=ALL
-syn region psqlFunction    start="varcharne(" end=")" contains=ALL
-syn region psqlFunction    start="version(" end=")" contains=ALL
-syn region psqlFunction    start="width(" end=")" contains=ALL
-syn region psqlFunction    start="win1250_to_latin2(" end=")" contains=ALL
-syn region psqlFunction    start="win1250_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="win1250_to_utf(" end=")" contains=ALL
-syn region psqlFunction    start="win1251_to_alt(" end=")" contains=ALL
-syn region psqlFunction    start="win1251_to_iso(" end=")" contains=ALL
-syn region psqlFunction    start="win1251_to_koi8r(" end=")" contains=ALL
-syn region psqlFunction    start="win1251_to_mic(" end=")" contains=ALL
-syn region psqlFunction    start="win1251_to_utf8(" end=")" contains=ALL
-syn region psqlFunction    start="win1256_to_utf(" end=")" contains=ALL
-syn region psqlFunction    start="win874_to_utf(" end=")" contains=ALL
-syn region psqlFunction    start="xideq(" end=")" contains=ALL
-
-" 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_psql_syn_inits")
-  if version < 508
-    let did_psql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink psqlComment	Comment
-  HiLink psqlKeyword	psqlSpecial
-  HiLink psqlNumber	Number
-  HiLink psqlOperator	psqlFunction
-  HiLink psqlSpecial	Special
-  HiLink psqlStatement	Statement
-  HiLink psqlString	String
-  HiLink psqlType	Type
-  HiLink psqlFunction	Function
-  HiLink psqlAggregate  Special
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "psql"
-
-" vim: ts=8
diff --git a/colors/putty.vim b/colors/putty.vim
deleted file mode 100755
index 4c86ad5..0000000
--- a/colors/putty.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-" Vim color file
-" Maintainer:	Prachya Boonkwan <kaamanita@hotmail.com>
-" Last Change:	April 29, 2003
-" Licence:	    Public Domain
-
-" This package offers a eye-catching color scheme that resembles the
-" default color scheme of Putty telnet terminal.
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "putty"
-
-hi Normal guifg=Grey guibg=Black
-
-hi ErrorMsg guibg=Red guifg=White
-hi IncSearch gui=reverse
-hi ModeMsg gui=bold
-hi StatusLine gui=reverse,bold
-hi StatusLineNC gui=reverse
-hi VertSplit gui=reverse
-hi Visual gui=reverse guifg=Grey guibg=fg
-hi VisualNOS gui=underline,bold
-hi DiffText gui=bold guibg=Red
-hi Cursor guibg=Green guifg=NONE
-hi lCursor guibg=Cyan guifg=NONE
-hi Directory guifg=Blue
-hi LineNr guifg=#BBBB00
-hi MoreMsg gui=bold guifg=SeaGreen
-hi NonText gui=bold guifg=Blue guibg=Black
-hi Question gui=bold guifg=SeaGreen
-hi Search guibg=#BBBB00 guifg=NONE
-hi SpecialKey guifg=Blue
-hi Title gui=bold guifg=Magenta
-hi WarningMsg guifg=Red
-hi WildMenu guibg=Cyan guifg=Black
-hi Folded guibg=White guifg=DarkBlue
-hi FoldColumn guibg=Grey guifg=DarkBlue
-hi DiffAdd guibg=LightBlue
-hi DiffChange guibg=LightMagenta
-hi DiffDelete gui=bold guifg=Blue guibg=LightCyan
-
-hi Comment guifg=Blue guibg=Black
-hi Constant guifg=#BB0000 guibg=Black
-hi PreProc guifg=#BB00BB guibg=Black
-hi Statement gui=NONE guifg=#BBBB00 guibg=Black
-hi Special guifg=#BB00BB guibg=Black
-hi Ignore guifg=Grey
-hi Identifier guifg=#00BBBB guibg=Black
-hi Type guifg=#00BB00 guibg=Black
-
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
-
-" vim: sw=2
diff --git a/colors/pw.vim b/colors/pw.vim
deleted file mode 100755
index 20c5743..0000000
--- a/colors/pw.vim
+++ /dev/null
@@ -1,209 +0,0 @@
-"
-" pw.vim: theme based on darkspectrum and cream-colors-oceandeep
-"
-" License:
-" 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 3 of the License, or
-" (at your option) any later version.
-" [ http://www.gnu.org/licenses/gpl.html ]
-"
-" 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.
-"
-"----------------------------------------------------------------------
-
-""" Init
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "pw"
-
-"""" GUI
-
-hi Cursor        gui=None guibg=PaleTurquoise3 guifg=White
-hi CursorIM      gui=bold guifg=white guibg=PaleTurquoise3
-"hi CursorColumn  gui=None guibg=#003853
-hi Directory     guifg=LightSeaGreen guibg=bg
-hi DiffAdd       gui=None guifg=fg guibg=DarkCyan
-hi DiffChange    gui=None guifg=fg guibg=Red
-hi DiffDelete    gui=None guifg=fg guibg=black
-hi DiffText      gui=bold guifg=fg guibg=bg
-hi ErrorMsg      guifg=LightYellow  guibg=FireBrick
-hi VertSplit     gui=NONE guifg=black guibg=grey60
-hi Folded        gui=bold guibg=#305060 guifg=#b0d0e0
-"hi FoldColumn    gui=bold guibg=#305060 guifg=#b0d0e0
-hi IncSearch     gui=reverse guifg=fg guibg=bg
-hi LineNr        gui=bold guibg=grey6 guifg=LightSkyBlue3
-hi ModeMsg       guibg=DarkGreen guifg=LightGreen
-hi MoreMsg       gui=bold  guifg=SeaGreen4 guibg=bg
-"if version < 600
-"    " same as SpecialKey
-"    hi NonText   guibg=#123A4A guifg=#3D5D6D
-"else
-"    " Bottom fill (use e.g. same as LineNr)
-"    hi NonText   gui=None guibg=#202020 guifg=LightSkyBlue
-"endif
-"hi NonText       gui=None guibg=#062636 guifg=#6080c0
-"+++
-"hi Normal        gui=None guibg=#202020 guifg=honeydew2
-hi Question      gui=bold  guifg=SeaGreen2 guibg=bg
-hi Search        gui=NONE guibg=LightSkyBlue4 guifg=NONE
-"+++
-hi StatusLine    gui=bold guibg=grey88 guifg=black
-hi StatusLineNC  gui=NONE guibg=grey60 guifg=grey10
-hi Title         gui=bold  guifg=MediumOrchid1 guibg=bg
-hi VisualNOS     gui=bold,underline guifg=fg guibg=bg
-hi WarningMsg    gui=bold guifg=FireBrick1 guibg=bg
-hi WildMenu      gui=bold guibg=Chartreuse guifg=Black
-
-"""" Syntax Colors
-"hi Comment       gui=None guifg=#507080
-hi Comment       gui=None guifg=#80a0b0
-"+++
-hi String        gui=None guifg=turquoise2 guibg=bg
-"           lighter comment colors better
-"hi Identifier    guifg=LightSkyBlue3
-hi Identifier    guifg=DeepSkyBlue3
-"+++
-hi Function      gui=None guifg=DarkSeaGreen3 guibg=bg
-
-hi Statement     gui=NONE guifg=LightGreen
-hi Conditional   gui=None guifg=LightGreen guibg=bg
-hi Repeat        gui=None guifg=SeaGreen2 guibg=bg
-hi Keyword       gui=bold guifg=LightGreen guibg=bg
-hi Exception     gui=bold guifg=LightGreen guibg=bg
-
-hi PreProc       guifg=SkyBlue1
-hi Include       gui=None guifg=LightSteelBlue3 guibg=bg
-hi Define        gui=None guifg=LightSteelBlue2 guibg=bg
-hi Macro         gui=None guifg=LightSkyBlue3 guibg=bg
-hi PreCondit     gui=None guifg=LightSkyBlue2 guibg=bg
-
-hi Type          gui=NONE guifg=LightBlue
-hi StorageClass  gui=None guifg=LightBlue guibg=bg
-hi Structure     gui=None guifg=LightBlue guibg=bg
-hi Typedef       gui=None guifg=LightBlue guibg=bg
-
-hi Special       gui=bold guifg=aquamarine3
-hi Underlined    gui=underline guifg=honeydew4 guibg=bg
-hi Ignore        guifg=#204050
-hi Error         guifg=LightYellow  guibg=FireBrick
-hi Todo          guifg=Cyan guibg=#507080
-if v:version >= 700
-    hi PMenu      gui=bold guibg=LightSkyBlue4 guifg=honeydew2
-    hi PMenuSel   gui=bold guibg=DarkGreen guifg=honeydew2
-    hi PMenuSbar  gui=bold guibg=LightSkyBlue4
-    hi PMenuThumb gui=bold guibg=DarkGreen
-    hi SpellBad   gui=undercurl guisp=Red
-    hi SpellRare  gui=undercurl guisp=Orange
-    hi SpellLocal gui=undercurl guisp=Orange
-    hi SpellCap   gui=undercurl guisp=Yellow
-endif
-
-""" Console
-if v:version >= 700
-    hi PMenu      cterm=bold ctermbg=DarkGreen ctermfg=Gray
-    hi PMenuSel   cterm=bold ctermbg=Yellow ctermfg=Gray
-    hi PMenuSbar  cterm=bold ctermbg=DarkGreen
-    hi PMenuThumb cterm=bold ctermbg=Yellow
-    hi SpellBad   ctermbg=Red
-    hi SpellRare  ctermbg=Red
-    hi SpellLocal ctermbg=Red
-    hi SpellCap   ctermbg=Yellow
-endif
-
-hi Search        ctermfg=Black ctermbg=Red cterm=NONE
-hi Visual        cterm=reverse
-hi Cursor        ctermfg=Black ctermbg=Green cterm=bold
-hi Special       ctermfg=Brown
-hi Comment       ctermfg=DarkGray
-hi StatusLine    ctermfg=Blue ctermbg=White
-hi Statement     ctermfg=Yellow cterm=NONE
-hi Type          cterm=NONE
-hi Macro         ctermfg=DarkRed
-hi Identifier    ctermfg=DarkYellow
-hi Structure     ctermfg=DarkGreen
-
-" statusline
-hi User1  gui=BOLD guifg=#b0d0e0 guibg=Black
-hi User2  gui=bold guifg=LightGreen guibg=Black
-hi User3  gui=bold guifg=MediumOrchid1 guibg=Black
-hi User4  gui=bold guifg=FireBrick guibg=Black
-
-" bookmarks:
-"hi Cream_ShowMarksHL ctermfg=blue ctermbg=lightblue cterm=bold gui=BOLD guifg=MediumOrchid1 guibg=#202020
-
-" spell check
-"hi BadWord ctermfg=black ctermbg=lightblue gui=NONE guifg=honeydew2 guibg=#602030
-
-" current line
-hi CurrentLine term=reverse ctermbg=0 ctermfg=14 gui=none guibg=#406070
-
-" email
-hi EQuote1 guifg=#99cccc
-hi EQuote2 guifg=#669999
-hi EQuote3 guifg=#007777
-hi Sig guifg=#80a0b0
-
-"+++
-" h syntax /sizeof
-
-" main color scheme
-:hi Normal           gui=None guibg=#150a15 guifg=honeydew2
-"hi Normal           gui=None guibg=##1a0a1a guifg=honeydew2
-"hi Normal           gui=None guibg=#100b10 guifg=honeydew2
-
-" whitespace (indents)
-hi SpecialKey       guifg=#808080 guibg=#150a15 gui=none
-
-" line number:
-hi LineNr           guifg=#535353 guibg=#150a15
-hi Number           gui=None guifg=#fcaf3e guibg=bg
-
-" constants: NULL,stdout, ...
-hi Constant         guifg=#c0a0a0
-
-" e.g text bellow EOF:
-hi NonText          gui=None guibg=#150a15
-
-hi CursorColumn     guibg=#202020
-hi CursorLine       gui=None guibg=#303030
-hi Cursor           guibg=#ffffff guifg=#000000
-
-hi FoldColumn       guibg=#464646
-
-" string: (text between ")
-" printf("%d\n", 42);
-"hi String           gui=NONE   guifg=#c0c0e0 guibg=#404040
-hi String           gui=NONE   guifg=#d0d0b0   guibg=#303030
-
-" string: \n
-hi SpecialChar      gui=NONE   guifg=#d0d0b0   guibg=#303030
-
-" string: e.g 0x%08x
-hi cFormat          gui=NONE guifg=#c08080   guibg=#303030
-
-hi Visual           gui=reverse guibg=#303050 guifg=#d0d0d0 gui=italic
-
-" sizeof..
-hi Operator         gui=NONE   guifg=#90d090   guibg=NONE
-
-" TRUE, false
-hi Boolean          gui=bold guifg=#c0c040 guibg=bg
-
-" current tab (tabbar)
-hi Tb_VisibleNormal gui=NONE guibg=#00ff00 guifg=#fcaf3e
-" !current tab
-hi Tb_Normal        gui=NONE guibg=#00ff00 guifg=#d0d0d0
-" modified tab:
-hi Tb_Changed       gui=NONE guibg=#00ff00 guifg=#c08080
diff --git a/colors/pyte.vim b/colors/pyte.vim
old mode 100755
new mode 100644
index 7f173c4..d4fddde
--- a/colors/pyte.vim
+++ b/colors/pyte.vim
@@ -9,86 +9,86 @@ endif
 let colors_name = "pyte"
 
 if version >= 700
-  hi CursorLine guibg=#f6f6f6
-  hi CursorColumn guibg=#eaeaea
-  hi MatchParen guifg=white guibg=#80a090 gui=bold
+  hi CursorLine guibg=#f6f6f6 gui=NONE
+  hi CursorColumn guibg=#eaeaea gui=NONE
+  hi MatchParen guifg=white guibg=#80a090 gui=NONE
 
   "Tabpages
-  hi TabLine guifg=black guibg=#b0b8c0 gui=italic
-  hi TabLineFill guifg=#9098a0
-  hi TabLineSel guifg=black guibg=#f0f0f0 gui=italic,bold
+  hi TabLine guifg=black guibg=#b0b8c0 gui=NONE
+  hi TabLineFill guifg=#9098a0 gui=NONE
+  hi TabLineSel guifg=black guibg=#f0f0f0 gui=NONE
 
   "P-Menu (auto-completion)
-  hi Pmenu guifg=white guibg=#808080
+  hi Pmenu guifg=white guibg=#808080 gui=NONE
   "PmenuSel
   "PmenuSbar
   "PmenuThumb
 endif
 "
 " Html-Titles
-hi Title      guifg=#202020 gui=bold
+hi Title      guifg=#202020 gui=NONE
 hi Underlined  guifg=#202020 gui=underline
 
 
-hi Cursor    guifg=black   guibg=#b0b4b8
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#ffffff guibg=#c0d0e0
+hi Cursor    guifg=black   guibg=#b0b4b8 gui=NONE
+hi lCursor   guifg=black   guibg=white gui=NONE
+hi LineNr    guifg=#ffffff guibg=#c0d0e0 gui=NONE
 
-hi Normal    guifg=#404850   guibg=#f0f0f0
+hi Normal    guifg=#404850   guibg=#f0f0f0 gui=NONE
 
-hi StatusLine guifg=white guibg=#8090a0 gui=bold,italic
-hi StatusLineNC guifg=#506070 guibg=#a0b0c0 gui=italic
+hi StatusLine guifg=white guibg=#8090a0 gui=NONE
+hi StatusLineNC guifg=#506070 guibg=#a0b0c0 gui=NONE
 hi VertSplit guifg=#a0b0c0 guibg=#a0b0c0 gui=NONE
 
-" hi Folded    guifg=#708090 guibg=#c0d0e0
-hi Folded    guifg=#a0a0a0 guibg=#e8e8e8 gui=italic
+" hi Folded    guifg=#708090 guibg=#c0d0e0 gui=NONE
+hi Folded    guifg=#a0a0a0 guibg=#e8e8e8 gui=NONE
 
-hi NonText   guifg=#c0c0c0 guibg=#e0e0e0
+hi NonText   guifg=#c0c0c0 guibg=#e0e0e0 gui=NONE
 " Kommentare
-hi Comment   guifg=#a0b0c0               gui=italic
+hi Comment   guifg=#a0b0c0 gui=NONE
 
 " Konstanten
-hi Constant  guifg=#a07040
-hi String    guifg=#4070a0 
-hi Number    guifg=#40a070
-hi Float     guifg=#70a040
+hi Constant  guifg=#a07040 gui=NONE
+hi String    guifg=#4070a0  gui=NONE
+hi Number    guifg=#40a070 gui=NONE
+hi Float     guifg=#70a040 gui=NONE
 "hi Statement guifg=#0070e0 gui=NONE
 " Python: def and so on, html: tag-names
-hi Statement  guifg=#007020 gui=bold
+hi Statement  guifg=#007020 gui=NONE
 
 
 " HTML: arguments
-hi Type       guifg=#e5a00d gui=italic
+hi Type       guifg=#e5a00d gui=NONE
 " Python: Standard exceptions, True&False
-hi Structure  guifg=#007020 gui=italic
-hi Function   guifg=#06287e gui=italic
+hi Structure  guifg=#007020 gui=NONE
+hi Function   guifg=#06287e gui=NONE
 
-hi Identifier guifg=#5b3674 gui=italic
+hi Identifier guifg=#5b3674 gui=NONE
 
-hi Repeat      guifg=#7fbf58 gui=bold
-hi Conditional guifg=#4c8f2f gui=bold
+hi Repeat      guifg=#7fbf58 gui=NONE
+hi Conditional guifg=#4c8f2f gui=NONE
 
 " Cheetah: #-Symbol, function-names
 hi PreProc    guifg=#1060a0 gui=NONE
 " Cheetah: def, for and so on, Python: Decorators
-hi Define      guifg=#1060a0 gui=bold
+hi Define      guifg=#1060a0 gui=NONE
 
-hi Error      guifg=red guibg=white gui=bold,underline
-hi Todo       guifg=#a0b0c0 guibg=NONE gui=italic,bold,underline
+hi Error      guifg=red guibg=white gui=underline
+hi Todo       guifg=#a0b0c0 guibg=NONE gui=underline
 
 " Python: %(...)s - constructs, encoding
-hi Special    guifg=#70a0d0 gui=italic
+hi Special    guifg=#70a0d0 gui=NONE
 
-hi Operator   guifg=#408010
+hi Operator   guifg=#408010 gui=NONE
 
 " color of <TAB>s etc...  
-"hi SpecialKey guifg=#d8a080 guibg=#e8e8e8 gui=italic  
+"hi SpecialKey guifg=#d8a080 guibg=#e8e8e8 gui=NONE
 hi SpecialKey guifg=#d0b0b0 guibg=#f0f0f0 gui=none
 
 " Diff
-hi DiffChange guifg=NONE guibg=#e0e0e0 gui=italic,bold
-hi DiffText guifg=NONE guibg=#f0c8c8 gui=italic,bold
-hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=italic,bold
-hi DiffDelete guifg=NONE guibg=#f0e0b0 gui=italic,bold
+hi DiffChange guifg=NONE guibg=#e0e0e0 gui=NONE
+hi DiffText guifg=NONE guibg=#f0c8c8 gui=NONE
+hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=NONE
+hi DiffDelete guifg=NONE guibg=#f0e0b0 gui=NONE
 
 
diff --git a/colors/python.vim b/colors/python.vim
deleted file mode 100755
index 6f4a765..0000000
--- a/colors/python.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-""" Init
-set background=light
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "python"
-
-
-""""""""\ Colors \""""""""
-
-
-"""" GUI Colors
-
-highlight Cursor        gui=None guibg=Palegreen3 guifg=White
-highlight CursorIM gui=bold guifg=white guibg=PaleTurquoise3
-highlight Directory     guifg=LightSeaGreen guibg=bg
-highlight DiffAdd gui=None guifg=fg guibg=DarkCyan
-highlight DiffChange gui=None guifg=fg guibg=Green4
-highlight DiffDelete gui=None guifg=fg guibg=black
-highlight DiffText gui=bold guifg=fg guibg=bg
-highlight ErrorMsg      guifg=LightYellow  guibg=FireBrick
-" previously 'FillColumn':
-"highlight FillColumn    gui=NONE guifg=black guibg=grey60
-highlight VertSplit    gui=NONE guifg=black guibg=#c8d6b3
-highlight Folded        gui=bold guibg=#305060 guifg=#b0d0e0
-highlight FoldColumn        gui=bold guibg=#395602 guifg=#6f9b1f
-highlight IncSearch gui=reverse guifg=fg guibg=bg
-highlight LineNr        gui=bold guibg=#395602 guifg=#6f9b1f
-highlight ModeMsg       guibg=DarkGreen guifg=Green
-highlight MoreMsg       gui=bold  guifg=SeaGreen4 guibg=bg
-if version < 600
-    " same as SpecialKey
-    highlight NonText       guibg=#123A4A guifg=#3D5D6D
-else
-    " Bottom fill (use e.g. same as LineNr)
-    highlight NonText       gui=None guibg=bg guifg=fg
-endif 
-highlight Normal        gui=None guibg=#f6ffe5 guifg=black
-highlight Question      gui=bold  guifg=SeaGreen2 guibg=bg
-highlight Search        gui=NONE guibg=LightSkyBlue4 guifg=NONE
-highlight SpecialKey    guibg=#103040 guifg=#324262
-highlight StatusLine    gui=bold guibg=#c8d6b3 guifg=black
-highlight StatusLineNC  gui=NONE guibg=#c8d6b3 guifg=black
-highlight Title         gui=bold  guifg=MediumOrchid1 guibg=bg
-highlight Visual        gui=reverse guibg=WHITE guifg=SeaGreen
-highlight VisualNOS     gui=bold,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=bold guifg=FireBrick1 guibg=bg
-highlight WildMenu      gui=bold guibg=Chartreuse guifg=Black
-
-
-"""" Syntax Colors
-
-"highlight Comment       gui=reverse guifg=#507080
-highlight Comment       gui=italic guifg=#507080
-
-highlight Constant      guifg=black guibg=bg
-hi String gui=None guifg=#ccab3f guibg=bg
-    "hi Character gui=None guifg=#969248 guibg=bg
-    highlight Number gui=None guifg=#969248 guibg=bg
-    highlight Boolean gui=bold guifg=#969248 guibg=bg
-    "hi Float gui=None guifg=#969248 guibg=bg
-
-highlight Identifier    guifg=#6f9b1f
-hi Function gui=None guifg=#775d05 guibg=bg
-
-highlight Statement     gui=NONE guifg=#669907
-    highlight Conditional gui=None guifg=Green guibg=bg
-    highlight Repeat gui=None guifg=SeaGreen2 guibg=bg
-    "hi Label gui=None guifg=Green guibg=bg
-    highlight Operator gui=None guifg=Chartreuse guibg=bg
-    highlight Keyword gui=bold guifg=#6f9b1f guibg=bg
-    highlight Exception gui=bold guifg=Green guibg=bg
-
-highlight PreProc       guifg=SkyBlue1
-hi Include gui=None guifg=#725c05 guibg=bg
-hi Define gui=None guifg=#725c05 guibg=bg
-hi Macro gui=None guifg=#486610 guibg=bg
-hi PreCondit gui=None guifg=LightSkyBlue2 guibg=bg
-
-highlight Type          gui=NONE guifg=#ccab3f
-hi StorageClass gui=None guifg=#ccab3f guibg=bg
-hi Structure gui=None guifg=#ccab3f guibg=bg
-hi Typedef gui=None guifg=#ccab3f guibg=bg
-
-highlight Special       gui=bold guifg=#ddb100
-    "hi SpecialChar gui=bold guifg=White guibg=bg
-    "hi Tag gui=bold guifg=White guibg=bg
-    "hi Delimiter gui=bold guifg=White guibg=bg
-    "hi SpecialComment gui=bold guifg=White guibg=bg
-    "hi Debug gui=bold guifg=White guibg=bg
-
-highlight Underlined gui=underline guifg=honeydew4 guibg=bg
-
-highlight Ignore    guifg=#204050
-
-highlight Error      guifg=LightYellow  guibg=FireBrick
-
-highlight Todo          guifg=#969248 guibg=#507080
-
-""" OLD COLORS
-
-
-
diff --git a/colors/quagmire.vim b/colors/quagmire.vim
deleted file mode 100755
index 8b9c583..0000000
--- a/colors/quagmire.vim
+++ /dev/null
@@ -1,112 +0,0 @@
-" Vim color file
-" Maintainer:   Streak "at rsmw dot net" Porchfleece
-" Last Change:  2008 Dec 12
-" Version:      0.3
-
-" This is as close a port as I could manage of the camouflage-inspired
-" Glitterbomb theme for TextMate. Due to some fundamental differences
-" in the way the two editors handle syntax highlighting, it's more or
-" less impossible to make it a perfect match, but it's close enough to
-" look fairly nice in most circumstances.
-"
-" By the way, the original can be found on the TextMate wiki:
-" http://wiki.macromates.com/Themes/UserSubmittedThemes
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="quagmire"
-
-" UI customization
-hi Normal       guifg=#cfcfcf   guibg=#0b0a0a
-hi ModeMsg      guifg=#44444e
-hi MoreMsg      guifg=#44444e
-hi Visual       guibg=#3a3a3a
-hi NonText      guifg=#111010
-hi MatchParen   guibg=#44444e
-hi Cursor       guifg=fg        guibg=bg gui=reverse
-hi CursorLine   guibg=#11100c
-hi TabLine      guibg=bg        guifg=#44444e gui=reverse
-hi TabLineSel   guibg=bg        guifg=#44444e gui=none,bold
-hi StatusLine   guibg=bg        guifg=#44444e gui=reverse
-hi! link Question MoreMsg
-hi! link Search Visual
-hi! link TabLineFill TabLine
-hi Error        guifg=#ffffff   guibg=#d8290e
-hi DiffAdd      guifg=#f8f8f8   guibg=#41a83e
-hi DiffDelete   guifg=#f8f8f8   guibg=#d03620
-hi DiffChange   guifg=#f8f8f8   guibg=#c4b14a
-"hi DiffAdd      guifg=#41a83e   guibg=#f8f8f8
-
-" Stuff that most color schemes seem to leave out for some reason
-hi! link FoldColumn StatusLine
-hi! link SpecialKey String
-hi! link SpecialChar Character
-hi! link Folded StatusLine
-hi! link Directory String
-hi! link Label Delimiter
-hi Pmenu guibg=#4d6537
-hi PmenuSbar guibg=#44444e
-"hi PmenuSel guibg=#888888 guifg=#dbb800
-"hi PmenuThumb guibg=#
-
-" :tab h group-name
-hi Comment      guifg=#44444e   gui=italic
-hi Constant     guifg=#c0a368
-hi Number       guifg=#d3c788
-hi Identifier   guifg=#ae5251
-hi Function     guifg=#e16521 gui=bold
-hi Statement    guifg=#dbb800   gui=bold
-hi Operator     guifg=#988155   gui=none
-hi Type         guifg=#f6f080   gui=none
-hi StorageClass guifg=#7D6C55
-hi String       guifg=#4d6537 
-hi Character    guifg=#707576
-hi Special      guifg=#ebac47
-hi Delimiter    guifg=#935e29
-hi SpecialComment guifg=#73817d
-hi Underlined   guifg=#73817d gui=underline
-"hi Tag          guifg=#ebac47
-"hi Keyword      guifg=#ff3a55   gui=bold
-
-hi PreProc      guifg=#8996ab
-hi PreCondit    guifg=#afc4db
-hi LineNr       guifg=#888888 guibg=#eeeeee gui=none
-hi Todo         guifg=bg guibg=#4d6537
-"hi htmlTag      guifg=#ffeca1
-hi htmlTag      guifg=#aad7ef gui=bold
-"hi htmlTagName  guifg=#ffffff gui=bold
-"hi htmlArg      guifg=#ff6600 gui=none
-hi htmlBold     gui=bold
-hi htmlItalic   gui=italic
-hi Title        guifg=#999966 gui=none
-hi htmlTitle    guifg=fg        gui=none
-hi tmeSupport   guifg=#7d6c55 gui=none
-
-" TextMate grammars organize their highlight categories a little
-" differently. These changes do very little to make things exactly how
-" TextMate has them (yeah right, good luck) and instead concentrates
-" on making everything a little less goofy-looking.
-hi link cssAttributeSelector htmlArg
-hi link cssBraces Normal
-hi link javascriptBraces Normal
-hi link cssTagName Function
-hi link htmlEndTag htmlTag
-hi link htmlTagName htmlTag
-hi link htmlH1  htmlTitle
-"hi link lispVar Identifier
-hi link perlMatch Constant
-hi link perlMatchStartEnd perlMatch
-hi link perlFunctionName Function
-hi link perlStatementSub Type
-hi link vimHiAttrib Special
-hi link macFullscreenBG Normal
-"hi link perlSubstitutionSlash perlMatch
-
-
-
-
diff --git a/colors/railscasts.vim b/colors/railscasts.vim
deleted file mode 100755
index 3cfc7fc..0000000
--- a/colors/railscasts.vim
+++ /dev/null
@@ -1,134 +0,0 @@
-" Vim color scheme
-"
-" Name:        railscast.vim
-" Maintainer:  Josh O'Rourke <joshorourke@me.com>
-" License:     public domain
-"
-" A GUI Only port of the RailsCasts TextMate theme [1] to Vim.
-" Some parts of this theme were borrowed from the well-documented Lucius theme [2].
-"
-" [1] http://railscasts.com/about
-" [2] http://www.vim.org/scripts/script.php?script_id=2536
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "railscasts"
-
-" Colors
-" Brown        #BC9458
-" Dark Blue    #6D9CBE
-" Dark Green   #519F50
-" Dark Orange  #CC7833
-" Light Blue   #D0D0FF
-" Light Green  #A5C261
-" Tan          #FFC66D
-
-hi Normal                    guifg=#E6E1DC guibg=#2B2B2B ctermfg=white ctermbg=234
-hi Cursor                    guifg=#000000 guibg=#FFFFFF ctermfg=0 ctermbg=15	
-hi CursorLine                guibg=#333435 ctermbg=235 cterm=NONE
-hi Search                    guibg=#5A647E ctermfg=NONE ctermbg=236 cterm=underline
-hi Visual                    guibg=#5A647E ctermbg=60
-hi LineNr                    guifg=#888888 ctermfg=242
-hi StatusLine                guibg=#414243 gui=NONE guifg=#E6E1DC
-hi StatusLineNC              guibg=#414243 gui=NONE
-hi VertSplit                 guibg=#414243 gui=NONE guifg=#414243
-hi CursorLineNr              guifg=#bbbbbb ctermfg=248
-hi ColorColumn               guibg=#333435 ctermbg=235
-
-" Folds
-" -----
-" line used for closed folds
-hi Folded                    guifg=#F6F3E8 guibg=#444444 gui=NONE
-
-" Invisible Characters
-" ------------------
-hi NonText                   guifg=#777777 gui=NONE
-hi SpecialKey                guifg=#777777 gui=NONE
-
-" Misc
-" ----
-" directory names and other special names in listings
-hi Directory                 guifg=#A5C261 gui=NONE
-
-" Popup Menu
-" ----------
-" normal item in popup
-hi Pmenu                     guifg=#F6F3E8 guibg=#444444 gui=NONE
-" selected item in popup
-hi PmenuSel                  guifg=#000000 guibg=#A5C261 gui=NONE
-" scrollbar in popup
-hi PMenuSbar                 guibg=#5A647E gui=NONE
-" thumb of the scrollbar in the popup
-hi PMenuThumb                guibg=#AAAAAA gui=NONE
-
-
-"rubyComment
-hi Comment                   guifg=#BC9458 gui=italic ctermfg=137
-hi Todo                      guifg=#BC9458 guibg=NONE gui=italic ctermfg=94
-
-"rubyPseudoVariable
-"nil, self, symbols, etc
-hi Constant                  guifg=#6D9CBE ctermfg=73
-
-"rubyClass, rubyModule, rubyDefine
-"def, end, include, etc
-hi Define                    guifg=#CC7833 ctermfg=173
-
-"rubyInterpolation
-hi Delimiter                 guifg=#519F50
-
-"rubyError, rubyInvalidVariable
-hi Error                     guifg=#FFFFFF guibg=#990000 ctermfg=221 ctermbg=88
-
-"rubyFunction
-hi Function                  guifg=#FFC66D gui=NONE ctermfg=221 cterm=NONE
-
-"rubyIdentifier
-"@var, @@var, $var, etc
-hi Identifier                guifg=#D0D0FF gui=NONE ctermfg=73 cterm=NONE
-
-"rubyInclude
-"include, autoload, extend, load, require
-hi Include                   guifg=#CC7833 gui=NONE ctermfg=173 cterm=NONE
-
-"rubyKeyword, rubyKeywordAsMethod
-"alias, undef, super, yield, callcc, caller, lambda, proc
-hi Keyword                   guifg=#CC7833 ctermfg=172 cterm=NONE
-
-" same as define
-hi Macro                     guifg=#CC7833 gui=NONE ctermfg=172
-
-"rubyInteger
-hi Number                    guifg=#A5C261 ctermfg=107
-
-" #if, #else, #endif
-hi PreCondit                 guifg=#CC7833 gui=NONE ctermfg=172 cterm=NONE
-
-" generic preprocessor
-hi PreProc                   guifg=#CC7833 gui=NONE ctermfg=103
-
-"rubyControl, rubyAccess, rubyEval
-"case, begin, do, for, if unless, while, until else, etc.
-hi Statement                 guifg=#CC7833 gui=NONE ctermfg=172 cterm=NONE
-
-"rubyString
-hi String                    guifg=#A5C261 ctermfg=107
-
-hi Title                     guifg=#FFFFFF ctermfg=15
-
-"rubyConstant
-hi Type                      guifg=#DA4939 gui=NONE
-
-hi DiffAdd                   guifg=#E6E1DC guibg=#144212
-hi DiffDelete                guifg=#E6E1DC guibg=#660000
-
-hi link htmlTag              xmlTag
-hi link htmlTagName          xmlTagName
-hi link htmlEndTag           xmlEndTag
-
-hi xmlTag                    guifg=#E8BF6A
-hi xmlTagName                guifg=#E8BF6A
-hi xmlEndTag                 guifg=#E8BF6A
diff --git a/colors/rainbow_fine_blue.vim b/colors/rainbow_fine_blue.vim
deleted file mode 100755
index 89c280c..0000000
--- a/colors/rainbow_fine_blue.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/30 Wed 00:12.
-"     version: 1.7
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "fine_blue"
-
-hi Normal       guifg=#404048 guibg=#f8f8f8
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404054 guibg=#40ffff
-hi Search       gui=NONE guifg=#404054 guibg=#ffffa0
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi WarningMsg   gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi ModeMsg      gui=NONE guifg=#0070ff guibg=NONE
-hi MoreMsg      gui=NONE guifg=#a800ff guibg=NONE
-hi Question     gui=NONE guifg=#008050 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404054
-hi StatusLineNC gui=NONE guifg=#b8b8c0 guibg=#404054
-hi VertSplit    gui=NONE guifg=#f8f8f8 guibg=#404054
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#00aacc
-
-" Diff
-hi DiffText     gui=NONE guifg=#4040ff guibg=#c0c0ff
-hi DiffChange   gui=NONE guifg=#5050ff guibg=#e0e0ff
-hi DiffDelete   gui=NONE guifg=#4040ff guibg=#c8f2ea
-hi DiffAdd      gui=NONE guifg=#4040ff guibg=#c8f2ea
-
-" Cursor
-hi Cursor       gui=NONE guifg=#0000ff guibg=#00e0ff
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#7820ff guibg=#e0d8ff
-hi FoldColumn   gui=NONE guifg=#aa60ff guibg=#f0f0f4
-" hi Folded       gui=NONE guifg=#58587c guibg=#e0e0e8
-" hi FoldColumn   gui=NONE guifg=#9090b0 guibg=#f0f0f4
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#a0a0b0 guibg=NONE
-hi NonText      gui=BOLD guifg=#4000ff guibg=#ececf0
-hi SpecialKey   gui=NONE guifg=#d87000 guibg=NONE
-hi Title        gui=NONE guifg=#004060 guibg=#c8f0f8
-hi Visual       gui=NONE guifg=#404060 guibg=#dddde8
-" hi VisualNOS  gui=NONE guifg=#404060 guibg=#dddde8
-
-" Syntax group
-hi Comment      gui=NONE guifg=#ff00c0 guibg=NONE
-hi Constant     gui=NONE guifg=#2020ff guibg=#e8e8ff
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff4080
-hi Identifier   gui=NONE guifg=#c800ff guibg=NONE
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc      gui=NONE guifg=#0070e6 guibg=NONE
-hi Special      gui=NONE guifg=#005858 guibg=#ccf7ee
-hi Statement    gui=NONE guifg=#008858 guibg=NONE
-hi Todo         gui=NONE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=NONE guifg=#7040ff guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=#0000ff guibg=NONE
diff --git a/colors/rainbow_fruit.vim b/colors/rainbow_fruit.vim
deleted file mode 100755
index 624b90f..0000000
--- a/colors/rainbow_fruit.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/08/28 Wed 00:28.
-"     version: 1.3
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "fruit"
-
-hi Normal       guifg=#404040 guibg=#f8f8f8
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#404040 guibg=#40ffff
-hi Search       gui=NONE guifg=#404040 guibg=#ffff60
-
-" Messages
-hi ErrorMsg     gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi WarningMsg   gui=NONE guifg=#ff0000 guibg=#ffe4e4
-hi ModeMsg      gui=NONE guifg=#ff4080 guibg=NONE
-hi MoreMsg      gui=NONE guifg=#009070 guibg=NONE
-hi Question     gui=NONE guifg=#f030d0 guibg=NONE
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#f8f8f8 guibg=#404040
-hi StatusLineNC gui=NONE guifg=#a4a4a4 guibg=#404040
-hi VertSplit    gui=NONE guifg=#f8f8f8 guibg=#404040
-hi WildMenu     gui=BOLD guifg=#f8f8f8 guibg=#ff4080
-
-" Diff
-hi DiffText     gui=NONE guifg=#e04040 guibg=#ffd8d8
-hi DiffChange   gui=NONE guifg=#408040 guibg=#d0f0d0
-hi DiffDelete   gui=NONE guifg=#4848ff guibg=#ffd0ff
-hi DiffAdd      gui=NONE guifg=#4848ff guibg=#ffd0ff
-
-" Cursor
-hi Cursor       gui=NONE guifg=#0000ff guibg=#00e0ff
-hi lCursor      gui=NONE guifg=#f8f8f8 guibg=#8000ff
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#8000ff
-
-" Fold
-hi Folded       gui=NONE guifg=#20605c guibg=#b8e8dc
-hi FoldColumn   gui=NONE guifg=#40a098 guibg=#f0f0f0
-
-" Other
-hi Directory    gui=NONE guifg=#0070b8 guibg=NONE
-hi LineNr       gui=NONE guifg=#acacac guibg=NONE
-hi NonText      gui=BOLD guifg=#00a0c0 guibg=#ececec
-hi SpecialKey   gui=NONE guifg=#4040ff guibg=NONE
-hi Title        gui=NONE guifg=#0050a0 guibg=#c0e8ff
-hi Visual       gui=NONE guifg=#484848 guibg=#e0e0e0
-" hi VisualNOS    gui=NONE guifg=#484848 guibg=#e0e0e0
-
-" Syntax group
-hi Comment      gui=NONE guifg=#ff4080 guibg=NONE
-hi Constant     gui=NONE guifg=#8016ff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#ff4080
-hi Identifier   gui=NONE guifg=#008888 guibg=NONE
-hi Ignore       gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc      gui=NONE guifg=#e06800 guibg=NONE
-hi Special      gui=NONE guifg=#4a9400 guibg=NONE
-hi Statement    gui=NONE guifg=#f030d0 guibg=NONE
-hi Todo         gui=UNDERLINE guifg=#ff0070 guibg=#ffe0f4
-hi Type         gui=NONE guifg=#0070e6 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
diff --git a/colors/rainbow_neon.vim b/colors/rainbow_neon.vim
deleted file mode 100755
index d0ba309..0000000
--- a/colors/rainbow_neon.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/25 Fri 16:23.
-"     version: 1.2
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "neon"
-
-hi Normal       guifg=#f0f0f0 guibg=#303030
-
-" Search
-hi IncSearch    gui=UNDERLINE guifg=#80ffff guibg=#0060c0
-hi Search       gui=NONE guifg=#ffffa8 guibg=#808000
-" hi Search       gui=NONE guifg=#b0ffb0 guibg=#008000
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffa0ff guibg=NONE
-hi WarningMsg   gui=BOLD guifg=#ffa0ff guibg=NONE
-hi ModeMsg      gui=BOLD guifg=#a0d0ff guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#70ffc0 guibg=#8040ff
-hi Question     gui=BOLD guifg=#e8e800 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#c4c4c4
-hi StatusLineNC gui=NONE guifg=#707070 guibg=#c4c4c4
-hi VertSplit    gui=NONE guifg=#707070 guibg=#c4c4c4
-hi WildMenu     gui=NONE guifg=#000000 guibg=#ff80c0
-
-" Diff
-hi DiffText     gui=NONE guifg=#ff78f0 guibg=#a02860
-hi DiffChange   gui=NONE guifg=#e03870 guibg=#601830
-hi DiffDelete   gui=NONE guifg=#a0d0ff guibg=#0020a0
-hi DiffAdd      gui=NONE guifg=#a0d0ff guibg=#0020a0
-
-" Cursor
-hi Cursor       gui=NONE guifg=#70ffc0 guibg=#8040ff
-hi lCursor      gui=NONE guifg=#ffffff guibg=#8800ff
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#8800ff
-
-" Fold
-hi Folded       gui=NONE guifg=#40f0f0 guibg=#006090
-hi FoldColumn   gui=NONE guifg=#40c0ff guibg=#404040
-
-" Other
-hi Directory    gui=NONE guifg=#c8c8ff guibg=NONE
-hi LineNr       gui=NONE guifg=#707070 guibg=NONE
-hi NonText      gui=BOLD guifg=#d84070 guibg=#383838
-hi SpecialKey   gui=BOLD guifg=#8888ff guibg=NONE
-hi Title        gui=BOLD guifg=fg      guibg=NONE
-hi Visual       gui=NONE guifg=#b0ffb0 guibg=#008000
-hi VisualNOS    gui=NONE guifg=#ffe8c8 guibg=#c06800
-
-" Syntax group
-hi Comment      gui=NONE guifg=#c0c0c0 guibg=NONE
-hi Constant     gui=NONE guifg=#92d4ff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#8000ff
-hi Identifier   gui=NONE guifg=#40f8f8 guibg=NONE
-hi Ignore       gui=NONE guifg=bg      guibg=NONE
-hi PreProc      gui=NONE guifg=#ffa8ff guibg=NONE
-hi Special      gui=NONE guifg=#ffc890 guibg=NONE
-hi Statement    gui=NONE guifg=#dcdc78 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#ff80d0 guibg=NONE
-hi Type         gui=NONE guifg=#60f0a8 guibg=NONE
-hi Underlined   gui=UNDERLINE guifg=fg guibg=NONE
diff --git a/colors/random.vim b/colors/random.vim
deleted file mode 100755
index 6bbcfdd..0000000
--- a/colors/random.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-"----------------------------------------------------------"
-" Vim meta color file                                      "
-" Maintainer         : W. H. Jou                           "
-" Email              : whjou@singnet.com.sg                "
-" Most Recent Update : 2003-09-15                          "
-" Version            : 1.3                                 "
-"----------------------------------------------------------"
-" Define function once only
-if !exists("*s:LoadRandomColorScheme")
-  function s:LoadRandomColorScheme()
-    let s:self            = globpath(&runtimepath, 'colors/random.vim')
-    let s:color_file_list = globpath(&runtimepath, 'colors/*.vim'     )
-    let s:self            = substitute(s:self           , '\'          , '/', 'g')
-    let s:color_file_list = substitute(s:color_file_list, '\'          , '/', 'g')
-    let s:color_file_list = substitute(s:color_file_list, s:self . "\n", '' , 'g')
-    let s:color_file_list = substitute(s:color_file_list, "\n"         , ',', 'g')
-
-    if strlen(s:color_file_list)
-      if s:color_file_list =~ ','
-        let s:rnd  = matchstr(localtime(), '..$') + 0
-        let s:loop = 0
-
-        while s:loop < s:rnd
-          let s:color_file_list = substitute(s:color_file_list, '^\([^,]\+\),\(.*\)$', '\2,\1', '')
-          let s:loop            = s:loop + 1
-        endwhile
-        
-        let s:color_file = matchstr(s:color_file_list, '^[^,]\+')
-        execute "source" s:color_file
-        unlet! s:color_file
-        
-        unlet! s:loop 
-        unlet! s:rnd 
-      endif
-    endif
-
-    unlet! s:color_file_list 
-    unlet! s:self_file
-  endfunction
-endif
-"----------------------------------------------------------"
-call s:LoadRandomColorScheme()
diff --git a/colors/rastafari.vim b/colors/rastafari.vim
deleted file mode 100755
index 8dc07ea..0000000
--- a/colors/rastafari.vim
+++ /dev/null
@@ -1,153 +0,0 @@
-" Vim color file
-"
-" Maintainer:  Dominique Pelle <dominique.pelle at gmail.com>
-" Last Change: 21 Jun 2010
-" URL:         http://dominique.pelle.free.fr/rastafari.vim
-" Screenshot:  http://dominique.pelle.free.fr/rastafari.vim.png
-"
-" See also cursor color settings for terminal and statusline colors
-" in http://dominique.pelle.free.fr/.vimrc
-"
-set background=dark
-hi clear
-if exists("syntax on")
-  syntax reset
-endif
-
-if has('eval')
-  let g:colors_name="rastafari"
-endif
-" Normal colors {{{1
-"hi Normal       guifg=#aaaaaa guibg=#000000 gui=none term=none     cterm=none    ctermfg=grey ctermbg=black
-hi Normal       guifg=#aaaaaa guibg=#000000 gui=none term=none     cterm=none    ctermfg=grey
-hi Title        guifg=#ff60ff guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=magenta
-hi Ignore       guifg=#888888 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi Comment      guifg=#00aa00 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkgreen
-hi LineNr       guifg=#ffff60 guibg=bg      gui=bold term=none     cterm=none    ctermfg=yellow
-hi Include      guifg=#666666 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi Define       guifg=#666666 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi Macro        guifg=#666666 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi PreProc      guifg=#666666 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi PreCondit    guifg=#666666 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=darkgrey
-hi NonText      guifg=#ffff60 guibg=bg      gui=none term=none     cterm=none    ctermfg=yellow
-hi Directory    guifg=#ffff60 guibg=bg      gui=bold term=none     cterm=none    ctermfg=yellow
-hi SpecialKey   guifg=#ffff60 guibg=bg      gui=none term=none     cterm=none    ctermfg=yellow
-hi Type         guifg=#dddddd guibg=bg      gui=bold term=none     cterm=none    ctermfg=white
-hi String       guifg=#aa2222 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkred
-hi Constant     guifg=#aa2222 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkred
-hi Special      guifg=#ff8800 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkyellow
-hi Number       guifg=#aa2222 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkred
-hi MoreMsg      guifg=#80ff80 guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=green
-hi Identifier   guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=white
-hi Conditional  guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=white
-hi Repeat       guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=white
-hi Statement    guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=white
-hi Label        guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=grey
-hi Operator     guifg=#dddddd guibg=bg      gui=bold term=bold     cterm=bold    ctermfg=white
-hi Function     guifg=#dddddd guibg=bg      gui=none term=none     cterm=none    ctermfg=white
-hi MatchParen   guifg=#dddddd guibg=#0000aa gui=none term=none     cterm=none    ctermfg=grey       ctermbg=blue
-hi ErrorMsg     guifg=#ffff60 guibg=#aa0000 gui=bold term=none     cterm=none    ctermfg=yellow     ctermbg=red
-hi WildMenu     guifg=#ffff00 guibg=#00aa00 gui=bold term=none     cterm=bold    ctermfg=yellow     ctermbg=darkgrey
-hi Folded       guifg=#444444 guibg=#00aaaa gui=bold term=reverse  cterm=reverse ctermfg=cyan       ctermbg=black
-hi FoldColumn   guifg=#00aaaa guibg=#444444 gui=bold term=none     cterm=bold    ctermfg=cyan       ctermbg=black
-hi SignColumn   guifg=#8888ff guibg=bg      gui=none term=none     cterm=none    ctermfg=cyan       ctermbg=black
-hi Search       guifg=#dddddd guibg=#0000ff gui=none term=none     cterm=none    ctermfg=white      ctermbg=blue
-hi IncSearch    guifg=#dddddd guibg=#008080 gui=none term=none     cterm=none    ctermfg=white      ctermbg=cyan
-hi WarningMsg   guifg=#ffff60 guibg=#008800 gui=bold term=none     cterm=bold    ctermfg=yellow     ctermbg=lightgreen
-hi Question     guifg=#80ff80 guibg=#008800 gui=bold term=standout cterm=bold    ctermfg=lightgreen ctermbg=lightgreen
-hi Pmenu        guifg=#80ff80 guibg=#008800 gui=bold term=standout cterm=none    ctermfg=green      ctermbg=green
-hi PmenuSel     guifg=#ffcc00 guibg=#aa0000 gui=bold term=standout cterm=bold    ctermfg=yellow     ctermbg=red
-hi Visual       guifg=#66ff66 guibg=#008000 gui=bold term=standout cterm=bold    ctermfg=green      ctermbg=green
-hi TabLineFill  guifg=#80ff80 guibg=#008800 gui=bold term=bold     cterm=none    ctermfg=lightgreen ctermbg=green
-hi TabLine      guifg=#80ff80 guibg=#008800 gui=bold term=standout cterm=bold    ctermfg=lightgreen ctermbg=lightgreen
-hi TabLineSel   guifg=#ffff60 guibg=#008800 gui=bold term=none     cterm=none    ctermfg=yellow     ctermbg=green
-hi VertSplit    guifg=#80ff80 guibg=#008800 gui=none term=none     cterm=none    ctermfg=lightgreen ctermbg=green
-hi TabLine      guifg=#66ff66 guibg=#008800 gui=bold term=bold     cterm=bold    ctermfg=lightgreen
-hi StatusLine   guifg=#66ff66 guibg=#008000 gui=bold term=none     cterm=bold    ctermfg=lightgreen
-hi CursorColumn guifg=NONE    guibg=#111111 gui=none term=none     cterm=none    ctermfg=darkgrey   ctermbg=grey
-hi CursorLine   guifg=NONE    guibg=#111111 gui=none term=none     cterm=none    ctermfg=darkgrey   ctermbg=grey
-" Specific for c {{{1
-hi cOctalZero    guifg=#ff8800 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkyellow
-hi cFormat       guifg=#ff8800 guibg=bg      gui=none term=none     cterm=none    ctermfg=darkyellow
-" Specific for diff {{{1
-hi DiffAdd      guifg=#ffff33 guibg=#404010 gui=bold term=none cterm=none ctermfg=green
-hi DiffChange                 guibg=#202020 gui=bold term=none            ctermfg=darkgrey
-hi DiffText     guifg=#3333ff guibg=#100040 gui=bold term=none cterm=none ctermfg=blue
-hi DiffDelete   guifg=#ff0000 guibg=#401010 gui=bold term=none cterm=none ctermfg=red
-hi diffLine     guifg=#444444 guibg=bg gui=bold term=none cterm=bold ctermfg=darkgrey
-hi diffOldLine  guifg=#444444 guibg=bg gui=none term=none cterm=none ctermfg=darkgrey
-hi diffOldFile  guifg=#444444 guibg=bg gui=none term=none cterm=none ctermfg=darkgrey
-hi diffNewFile  guifg=#444444 guibg=bg gui=none term=none cterm=none ctermfg=darkgrey
-hi diffAdded    guifg=#80ff80 guibg=bg gui=none term=none cterm=none ctermfg=green
-hi diffRemoved  guifg=#ff0000 guibg=bg gui=none term=none cterm=none ctermfg=red
-hi diffChanged  guifg=#0000ff guibg=bg gui=none term=none cterm=none ctermfg=blue
-" Specific for doxygen {{{1
-hi doxygenStart                guifg=#80ff80 guibg=bg gui=bold term=none cterm=none ctermfg=lightgreen
-hi doxygenStartL               guifg=#80ff80 guibg=bg gui=bold term=none cterm=none ctermfg=lightgreen
-hi doxygenBriefLine            guifg=#00aa00 guibg=bg gui=none term=none cterm=none ctermfg=darkgreen
-hi doxygenBrief                guifg=#00aa00 guibg=bg gui=none term=none cterm=none ctermfg=darkgreen
-hi doxygenBriefL               guifg=#00aa00 guibg=bg gui=none term=none cterm=none ctermfg=darkgreen
-hi doxygenPrevL                guifg=#80ff80 guibg=bg gui=bold term=none cterm=none ctermfg=lightgreen
-hi doxygenComment              guifg=#80ff80 guibg=bg gui=bold term=none cterm=none ctermfg=lightgreen
-hi doxygenCommentL             guifg=#00aa00 guibg=bg gui=none term=none cterm=none ctermfg=darkgreen
-hi doxygenSpecialMultiLineDesc guifg=#00aa00 guibg=bg gui=none term=none cterm=none ctermfg=darkgreen
-hi doxygenSpecial              guifg=#80ff80 guibg=bg gui=none term=none cterm=none ctermfg=lightgreen
-hi doxygenParam                guifg=#80ff80 guibg=bg gui=bold term=none cterm=none ctermfg=lightgreen
-hi doxygenParamName            guifg=#3333ff guibg=bg gui=bold term=none cterm=none ctermfg=blue
-hi doxygenParamDirection       guifg=#ffff60 guibg=bg gui=bold term=none cterm=none ctermfg=yellow
-hi doxygenArgumentWord         guifg=#3333ff guibg=bg gui=none term=none cterm=none ctermfg=blue
-hi doxygenCodeWord             guifg=#3333ff guibg=bg gui=bold term=none cterm=none ctermfg=blue
-hi doxygenHyperLink            guifg=#3333ff guibg=bg gui=bold term=none cterm=none ctermfg=blue
-" Specific for Vim script {{{1
-hi vimCommentTitle guifg=#80ff80 guibg=bg      gui=bold term=none cterm=none ctermfg=lightgreen
-hi vimHiCtermColor guifg=#ffff60 guibg=bg      gui=none term=none cterm=none ctermfg=yellow
-hi vimFold         guifg=#888888 guibg=#222222 gui=none term=none cterm=none ctermfg=darkgrey ctermbg=grey
-" Specific for help files {{{1
-hi helpHyperTextJump guifg=#ffaa00 guibg=bg gui=none term=none cterm=none ctermfg=darkyellow
-" Specific for Perl {{{1
-hi perlSharpBang        guifg=#80ff80 guibg=bg gui=bold term=standout cterm=bold ctermfg=lightgreen
-hi perlStatement        guifg=#aaaaaa guibg=bg gui=none term=none     cterm=none ctermfg=grey
-hi perlStatementStorage guifg=#dddddd guibg=bg gui=bold term=none     cterm=none ctermfg=white
-hi perlVarPlain         guifg=#aaaaaa guibg=bg gui=none term=none     cterm=none ctermfg=grey
-hi perlVarPlain2        guifg=#aaaaaa guibg=bg gui=none term=none     cterm=none ctermfg=grey
-" Specific for Ruby {{{1
-hi rubySharpBang guifg=#80ff80 guibg=bg gui=bold term=none cterm=bold ctermfg=lightgreen
-" Specific for the statusline {{{1
-" My ~/.vimrc uses User1 and User2 in active statusline.
-hi User1 guifg=#66ff66 guibg=#008000 gui=bold term=standout cterm=bold ctermfg=lightgreen ctermbg=lightgreen
-hi User2 guifg=#ffff60 guibg=#008000 gui=bold term=none     cterm=bold ctermfg=yellow     ctermbg=lightgreen
-" My ~/.vimrc uses User3 and User4 in non-active statusline.
-hi User3 guifg=#66ff66 guibg=#008000 gui=bold term=standout cterm=bold ctermfg=lightgreen ctermbg=lightgreen
-hi User4 guifg=#66ff66 guibg=#008000 gui=bold term=none     cterm=bold ctermfg=lightgreen ctermbg=lightgreen
-" Specific for netrw {{{1
-hi netrwTilde   guifg=#aaaaaa guibg=bg      gui=bold term=none cterm=none ctermfg=grey
-hi netrwExe     guifg=#aa2222 guibg=bg      gui=none term=none cterm=none ctermfg=darkred
-hi netrwTags    guifg=#666666 guibg=bg      gui=bold term=bold cterm=bold ctermfg=darkgrey
-hi netrwTilde   guifg=#666666 guibg=bg      gui=bold term=bold cterm=bold ctermfg=darkgrey
-hi netrwSymLink guifg=#1111ff guibg=bg      gui=none term=none cterm=none ctermfg=blue
-hi netrwList    guifg=#aaaaaa guibg=#000000 gui=none term=none cterm=none ctermfg=grey
-" Specific for confluence wiki {{{1
-hi confluenceHeadingMarker guifg=#aa2222 guibg=bg gui=none term=none cterm=none ctermfg=darkred
-hi confluenceHeading       guifg=#ffff60 guibg=bg gui=bold term=none cterm=none ctermfg=yellow
-hi confluenceVerbatim      guifg=#dddddd guibg=bg gui=none term=none cterm=none ctermfg=white
-" Specific for HTML {{{1
-hi htmlLink guifg=#3333ff guibg=bg gui=none term=none cterm=none ctermfg=lightblue
-" Specific for XML {{{1
-hi XmlTagName     guifg=#ffffff guibg=bg gui=bold term=bold cterm=bold ctermfg=white
-hi XmlEndTag      guifg=#ffffff guibg=bg gui=bold term=bold cterm=bold ctermfg=white
-hi XmlTag         guifg=#ffffff guibg=bg gui=bold term=bold cterm=bold ctermfg=white
-hi XmlAttrib      guifg=#666666 guibg=bg gui=bold term=bold cterm=bold ctermfg=darkgrey
-hi XmlEntity      guifg=#ff8800 guibg=bg gui=none term=none cterm=none ctermfg=darkyellow
-hi XmlEntityPunct guifg=#ff8800 guibg=bg gui=none term=none cterm=none ctermfg=darkyellow
-" Spell checking {{{1
-if version >= 700
-  hi SpellBad   guisp=red    gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=underline
-  hi SpellCap   guisp=yellow gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=underline
-  hi SpellRare  guisp=blue   gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=underline
-  hi SpellLocal guisp=orange gui=undercurl guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE term=underline cterm=underline
-endif
-" Cursor color for GUI {{{1
-hi Cursor   guifg=#000000 guibg=#ff0000
-hi lCursor  guifg=#000000 guibg=#80ff80
-hi CursorIM guifg=#000000 guibg=#0090ff
-" vim: foldmethod=marker foldmarker={{{,}}}:
diff --git a/colors/rcg_gui.vim b/colors/rcg_gui.vim
deleted file mode 100755
index ad840ab..0000000
--- a/colors/rcg_gui.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Vim color file
-" Maintainer:	Rui Carlos A. Goncalves <rcgoncalves.pt@gmail.com>
-" Last Change:	November 17, 2007
-"
-" Version:      1.0
-" Url:          http://www.rcg-pt.net/programacao/rcg_gui.vim.gz
-
-set background=dark
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "rcg_gui"
-
-highlight Normal        guifg=lightgrey         guibg=Black
-highlight Statement     guifg=Yellow
-highlight Operator      guifg=Yellow
-highlight PreProc       guifg=Blue
-highlight Identifier    guifg=cyan
-highlight Type          guifg=DarkGreen
-highlight Special       guifg=orange
-highlight String        guifg=red
-highlight Number        guifg=red
-highlight Constant      guifg=Red
-highlight Comment       guifg=darkgray
diff --git a/colors/rcg_term.vim b/colors/rcg_term.vim
deleted file mode 100755
index 45318cb..0000000
--- a/colors/rcg_term.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Vim color file
-" Maintainer:   Rui Carlos A. Goncalves <rcgoncalves.pt@gmail.com>
-" Last Change:  November 4, 2007
-"
-" Version:      1.0
-" Url:          http://www.rcg-pt.net/programacao/rcg_term.vim.gz
-
-set background=dark
-highlight clear
-if exists("syntax on")
-  syntax reset
-endif
-
-let g:colors_name = "rcg_term"
-
-highlight Normal     term=none cterm=none gui=none guibg=black
-highlight Statement  term=none ctermfg=yellow  cterm=none guifg=yellow  gui=none
-highlight Operator   term=none ctermfg=yellow  cterm=none guifg=yellow  gui=none
-highlight PreProc    term=none ctermfg=magenta cterm=none guifg=magenta gui=none
-highlight Identifier term=none ctermfg=cyan    cterm=none guifg=cyan    gui=none
-highlight Type       term=none ctermfg=blue    cterm=none guifg=blue    gui=none
-highlight Special    term=none ctermfg=cyan    cterm=none guifg=cyan    gui=none
-highlight String     term=none ctermfg=Gray    cterm=none guifg=Gray    gui=none
-highlight Number     term=none ctermfg=Gray    cterm=none guifg=Gray    gui=none
-highlight Constant   term=none ctermfg=Gray    cterm=none guifg=Gray    gui=none
-highlight Comment    term=none ctermfg=red     cterm=none guifg=red     gui=none
diff --git a/colors/rdark-terminal.vim b/colors/rdark-terminal.vim
deleted file mode 100755
index c16e19e..0000000
--- a/colors/rdark-terminal.vim
+++ /dev/null
@@ -1,132 +0,0 @@
-"
-" rdark-terminal - vim color scheme
-"
-" Modified: Lukas Grässlin
-"
-" Based on rdark
-" (http://www.vim.org/scripts/script.php?script_id=1732)
-"
-" Originally converted with CSApprox and modified a bit
-" to fit a 256 color capable terminal.
-" (http://www.vim.org/scripts/script.php?script_id=2390)
-"
-" Info: As the original background color is not available in 256 color mode
-" I've set it to black. But you can set the color your terminal should display
-" for black to #1e2426 and you will have almost a 1:1 copy of the gui scheme.
-" I also suggest to set the second black color to #2c3032. (It is the
-" background color which ist used for NonText)
-" If you're using a terminal which reads from Xdefaults (e.g. urxvt) you just
-" do this in your .Xdefaults:
-" "*color0:	rgb:1e/24/26"
-" "*color8:	rgb:2c/30/32"
-"
-
-hi clear
-let colors_name="rdark-terminal"
-
-hi clear CursorLine
-hi CursorLine ctermbg=8
-
-hi Normal term=NONE cterm=NONE ctermbg=0 ctermfg=252
-hi Underlined term=underline cterm=underline ctermbg=bg ctermfg=111
-hi Ignore term=NONE cterm=NONE ctermbg=bg ctermfg=16
-hi Error term=reverse cterm=NONE ctermbg=160 ctermfg=255
-hi Todo term=NONE cterm=NONE ctermbg=16 ctermfg=215
-hi Number term=NONE cterm=NONE ctermbg=bg ctermfg=113
-hi String term=NONE cterm=NONE ctermbg=bg ctermfg=113
-hi Function term=NONE cterm=NONE ctermbg=bg ctermfg=215
-hi SpecialKey term=bold cterm=NONE ctermbg=bg ctermfg=196
-hi NonText term=bold cterm=NONE ctermbg=8 ctermfg=236
-hi MatchParen term=reverse cterm=NONE ctermbg=215 ctermfg=23
-hi Comment term=bold cterm=NONE ctermbg=bg ctermfg=245
-hi Constant term=underline cterm=NONE ctermbg=bg ctermfg=113
-hi Special term=bold cterm=NONE ctermbg=bg ctermfg=248
-hi Keyword term=NONE cterm=NONE ctermbg=bg ctermfg=255
-hi Identifier term=underline cterm=NONE ctermbg=bg ctermfg=252
-hi Statement term=bold cterm=NONE ctermbg=bg ctermfg=74
-hi PreProc term=underline cterm=NONE ctermbg=bg ctermfg=215
-hi Type term=underline cterm=NONE ctermbg=bg ctermfg=188
-hi LineNr term=underline cterm=NONE ctermbg=16 ctermfg=59
-hi ExtraWhitespace term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi Visual term=reverse cterm=NONE ctermbg=102 ctermfg=255
-
-hi Pmenu term=NONE cterm=NONE ctermbg=16 ctermfg=250
-hi PmenuSel term=NONE cterm=NONE ctermbg=61 ctermfg=231
-hi PmenuSbar term=NONE cterm=NONE ctermbg=238 ctermfg=238
-hi PmenuThumb term=NONE cterm=NONE ctermbg=102 ctermfg=102
-
-hi StatusLine term=reverse,bold cterm=NONE ctermbg=250 ctermfg=0
-hi StatusLineNC term=reverse cterm=NONE ctermbg=102 ctermfg=16
-hi VertSplit term=reverse cterm=NONE ctermbg=102 ctermfg=59
-hi Directory term=bold cterm=NONE ctermbg=bg ctermfg=231
-hi ErrorMsg term=NONE cterm=NONE ctermbg=196 ctermfg=231
-hi IncSearch term=reverse cterm=NONE ctermbg=215 ctermfg=23
-hi Search term=reverse cterm=NONE ctermbg=215 ctermfg=23
-hi MoreMsg term=bold cterm=bold ctermbg=bg ctermfg=74
-hi ModeMsg term=bold cterm=bold ctermbg=bg ctermfg=fg
-hi TabLine term=underline cterm=underline ctermbg=16 ctermfg=102
-hi TabLineSel term=bold cterm=NONE ctermbg=59 ctermfg=255
-hi TabLineFill term=reverse cterm=NONE ctermbg=16 ctermfg=16
-hi CursorColumn term=reverse cterm=NONE ctermbg=241 ctermfg=fg
-hi Cursor term=NONE cterm=NONE ctermbg=145 ctermfg=16
-hi cppSTLType term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cssUIProp term=NONE cterm=NONE ctermbg=bg ctermfg=188
-hi vimAutoEvent term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cParen term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cBracket term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cNumbers term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi phpPropertySelectorInString term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi FoldeColumn term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi Question term=NONE cterm=NONE ctermbg=bg ctermfg=113
-hi Title term=bold cterm=bold ctermbg=bg ctermfg=215
-hi VisualNOS term=bold,underline cterm=bold,underline ctermbg=bg ctermfg=fg
-hi WarningMsg term=NONE cterm=NONE ctermbg=bg ctermfg=196
-hi WildMenu term=NONE cterm=NONE ctermbg=233 ctermfg=255
-hi Folded term=NONE cterm=NONE ctermbg=25 ctermfg=188
-hi phpSemicolon term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpFunctions term=NONE cterm=NONE ctermbg=bg ctermfg=188
-hi phpParent term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi javaScriptBraces term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi javaScriptOperator term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi htmlTag term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi htmlTagName term=NONE cterm=NONE ctermbg=bg ctermfg=145
-hi cCppBracket term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cBlock term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi htmlTitle term=NONE cterm=NONE ctermbg=bg ctermfg=113
-hi cUserCont term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi lCursor term=NONE cterm=NONE ctermbg=145 ctermfg=16
-hi cssPseudoClassId term=NONE cterm=NONE ctermbg=bg ctermfg=255
-hi cssBraces term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi cssIdentifier term=NONE cterm=NONE ctermbg=bg ctermfg=215
-hi cssTagName term=NONE cterm=NONE ctermbg=bg ctermfg=215
-hi cMulti term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi ICursor term=NONE cterm=NONE ctermbg=145 ctermfg=fg
-hi FoldColumn term=NONE cterm=NONE ctermbg=16 ctermfg=61
-hi DiffAdd term=bold cterm=NONE ctermbg=0 ctermfg=113
-hi DiffChange term=bold cterm=NONE ctermbg=0 ctermfg=fg
-hi DiffDelete term=bold cterm=bold ctermbg=0 ctermfg=215
-hi DiffText term=reverse cterm=NONE ctermbg=0 ctermfg=fg
-hi SignColumn term=NONE cterm=NONE ctermbg=16 ctermfg=51
-hi SpellBad term=reverse cterm=undercurl ctermbg=bg ctermfg=196
-hi SpellCap term=reverse cterm=undercurl ctermbg=bg ctermfg=21
-hi SpellRare term=reverse cterm=undercurl ctermbg=bg ctermfg=201
-hi SpellLocal term=underline cterm=undercurl ctermbg=bg ctermfg=51
-hi htmlSpecialTagName term=NONE cterm=NONE ctermbg=bg ctermfg=145
-hi htmlArg term=NONE cterm=NONE ctermbg=bg ctermfg=188
-hi cBitField term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cssSelectorOp term=NONE cterm=NONE ctermbg=bg ctermfg=255
-hi pythonFunction term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi cNumbersCom term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi vimFuncName term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi phpRegionDelimiter term=NONE cterm=NONE ctermbg=bg ctermfg=139
-hi phpPropertySelector term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi cCppParen term=NONE cterm=NONE ctermbg=bg ctermfg=fg
-hi phpOperator term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpArrayPair term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpAssignByRef term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpRelation term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpMemberSelector term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpUnknownSelector term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi phpVarSelector term=NONE cterm=NONE ctermbg=bg ctermfg=145
-hi htmlEndTag term=NONE cterm=NONE ctermbg=bg ctermfg=102
-hi vimFold term=NONE cterm=NONE ctermbg=bg ctermfg=fg
diff --git a/colors/rdark.vim b/colors/rdark.vim
deleted file mode 100755
index 62c7cdd..0000000
--- a/colors/rdark.vim
+++ /dev/null
@@ -1,159 +0,0 @@
-" Vim color file
-" Maintaner: Radu Dineiu <radu.dineiu@gmail.com>
-" URL: http://ld.yi.org/vim/rdark/
-" Last Change: 2007 Jun 23
-" Version: 0.6
-"
-" Features:
-"   - let rdark_current_line = 1 if you want to highlight the current line
-"
-" Changelog:
-"   0.5 - fixed the Pmenu colors
-"   0.6 - added SignColumn colors
-
-set background=dark
-
-hi clear
-if exists("syntax_on")
-	syntax reset
-endif
-
-let colors_name = "rdark"
-
-" Current Line
-if exists('rdark_current_line') && rdark_current_line == 1
-	set cursorline
-	hi CursorLine guibg=#191f21
-endif
-
-" Default Colors
-hi Normal guifg=#babdb6 guibg=#1e2426
-hi NonText guifg=#2c3032 guibg=#2c3032 gui=none
-hi Cursor guibg=#babdb6
-hi ICursor guibg=#babdb6
-
-" Search
-hi Search guifg=#2e3436 guibg=#fcaf3e
-hi IncSearch guibg=#2e3436 guifg=#fcaf3e
-
-" Window Elements
-hi StatusLine guifg=#2e3436 guibg=#babdb6 gui=none
-hi StatusLineNC guifg=#2e3436 guibg=#888a85 gui=none
-hi VertSplit guifg=#555753 guibg=#888a85 gui=none
-hi Visual guibg=#000000
-hi MoreMsg guifg=#729fcf
-hi Question guifg=#8ae234 gui=none
-hi WildMenu guifg=#eeeeec guibg=#0e1416
-hi LineNr guifg=#3f4b4d guibg=#000000
-hi SignColumn guibg=#1e2426
-
-" Pmenu
-hi Pmenu guibg=#2e3436 guifg=#eeeeec
-hi PmenuSel guibg=#ffffff guifg=#1e2426
-hi PmenuSbar guibg=#555753
-hi PmenuThumb guifg=#ffffff
-
-" Diff
-hi DiffDelete guifg=#2e3436 guibg=#0e1416
-hi DiffAdd guibg=#1f2b2d
-hi DiffChange guibg=#2e3436
-hi DiffText guibg=#000000 gui=none
-
-" Folds
-hi Folded guifg=#d3d7cf guibg=#204a87
-hi FoldColumn guifg=#3465a4 guibg=#000000
-
-" Specials
-hi Title guifg=#fcaf3e
-hi Todo guifg=#fcaf3e guibg=bg
-hi SpecialKey guifg=#ef2929
-
-" Tabs
-hi TabLine guibg=#0a1012 guifg=#888a85
-hi TabLineFill guifg=#0a1012
-hi TabLineSel guibg=#555753 guifg=#eeeeec gui=none
-
-" Matches
-hi MatchParen guifg=#2e3436 guibg=#fcaf3e
-
-" Tree
-hi Directory guifg=#ffffff
-
-" Syntax
-hi Comment guifg=#656763
-hi Constant guifg=#8ae234
-hi Number guifg=#8ae234
-hi Statement guifg=#729fcf gui=none
-hi Identifier guifg=#ffffff
-hi PreProc guifg=#fcaf3e
-hi Function guifg=#fcaf3e
-hi Type guifg=#e3e7df gui=none
-hi Keyword guifg=#eeeeec
-hi Special guifg=#888a85
-hi Error guifg=#eeeeec guibg=#cc0000
-
-" PHP
-hi phpRegionDelimiter guifg=#ad7fa8
-hi phpPropertySelector guifg=#888a85
-hi phpPropertySelectorInString guifg=#888a85
-hi phpOperator guifg=#888a85
-hi phpArrayPair guifg=#888a85
-hi phpAssignByRef guifg=#888a85
-hi phpRelation guifg=#888a85
-hi phpMemberSelector guifg=#888a85
-hi phpUnknownSelector guifg=#888a85
-hi phpVarSelector guifg=#babdb6
-hi phpSemicolon guifg=#888a85 gui=none
-hi phpFunctions guifg=#d3d7cf
-hi phpParent guifg=#888a85
-
-" JavaScript
-hi javaScriptBraces guifg=#888a85
-hi javaScriptOperator guifg=#888a85
-
-" HTML
-hi htmlTag guifg=#888a85
-hi htmlEndTag guifg=#888a85
-hi htmlTagName guifg=#babdb6
-hi htmlSpecialTagName guifg=#babdb6
-hi htmlArg guifg=#d3d7cf
-hi htmlTitle guifg=#8ae234 gui=none
-hi link htmlH1 htmlTitle
-hi link htmlH2 htmlH1
-hi link htmlH3 htmlH1
-hi link htmlH4 htmlH1
-hi link htmlH5 htmlH1
-hi link htmlH6 htmlH1
-
-" XML
-hi link xmlTag htmlTag
-hi link xmlEndTag htmlEndTag
-hi link xmlAttrib htmlArg
-
-" CSS
-hi cssSelectorOp guifg=#eeeeec
-hi link cssSelectorOp2 cssSelectorOp
-hi cssUIProp guifg=#d3d7cf
-hi link cssPagingProp cssUIProp
-hi link cssGeneratedContentProp cssUIProp
-hi link cssRenderProp cssUIProp
-hi link cssBoxProp cssUIProp
-hi link cssTextProp cssUIProp
-hi link cssColorProp cssUIProp
-hi link cssFontProp cssUIProp
-hi cssPseudoClassId guifg=#eeeeec
-hi cssBraces guifg=#888a85
-hi cssIdentifier guifg=#fcaf3e
-hi cssTagName guifg=#fcaf3e
-hi link cssInclude Function
-hi link cssCommonAttr Constant
-hi link cssUIAttr Constant
-hi link cssTableAttr Constant
-hi link cssPagingAttr Constant
-hi link cssGeneratedContentAttr Constant
-hi link cssAuralAttr Constant
-hi link cssRenderAttr Constant
-hi link cssBoxAttr Constant
-hi link cssTextAttr Constant
-hi link cssColorAttr Constant
-hi link cssFontAttr Constant
diff --git a/colors/redblack.vim b/colors/redblack.vim
deleted file mode 100755
index 793af52..0000000
--- a/colors/redblack.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-set background=dark
-hi clear
-
-hi Normal         ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Boolean        ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Character      ctermbg=black guibg=black ctermfg=red guifg=red
-hi Comment        ctermbg=black guibg=black ctermfg=darkgrey guifg=#606060 cterm=bold
-hi Condtional     ctermbg=black guibg=black ctermfg=red guifg=red
-hi Constant       ctermbg=black guibg=black ctermfg=red guifg=red
-hi Cursor         ctermbg=black guibg=white ctermfg=grey guifg=grey
-hi Debug          ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Define         ctermbg=black guibg=black ctermfg=white guifg=white
-hi Delimiter      ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi DiffAdd        ctermbg=NONE guibg=NONE ctermfg=NONE guifg=NONE cterm=NONE gui=NONE
-hi DiffChange     ctermbg=white guibg=white ctermfg=darkgrey guifg=#606060
-hi DiffDelete     ctermbg=black guibg=black ctermfg=darkgrey guifg=#606060 cterm=bold
-hi DiffText       ctermbg=red guibg=red ctermfg=white guifg=white
-hi Directory      ctermbg=black guibg=black ctermfg=white guifg=white
-hi Error          ctermbg=red guibg=red ctermfg=white guifg=white
-hi ErrorMsg       ctermbg=red guibg=red ctermfg=white guifg=white
-hi Exception      ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Float          ctermbg=black guibg=black ctermfg=red guifg=red cterm=NONE gui=NONE
-hi FoldColumn     ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Folded         ctermbg=black guibg=black ctermfg=red guifg=red
-hi Function       ctermbg=black guibg=black ctermfg=white guifg=white
-hi Identifier     ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Include        ctermbg=black guibg=black ctermfg=white guifg=white
-hi IncSearch      ctermbg=green guibg=green ctermfg=darkgrey guifg=#606060
-hi Keyword        ctermbg=black guibg=black ctermfg=red guifg=red
-hi Label          ctermbg=black guibg=black ctermfg=white guifg=white
-hi LineNr         ctermbg=black guibg=black ctermfg=darkgrey guifg=#606060 cterm=bold
-hi Macro          ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi ModeMsg        ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi MoreMsg        ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi NonText        ctermbg=black guibg=black ctermfg=darkgrey guifg=#606060 cterm=bold
-hi Number         ctermbg=black guibg=black ctermfg=red guifg=red cterm=NONE gui=NONE
-hi Operator       ctermbg=black guibg=black ctermfg=white guifg=white
-hi PreCondit      ctermbg=black guibg=black ctermfg=white guifg=white
-hi PreProc        ctermbg=black guibg=black ctermfg=white guifg=white
-hi Question       ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Repeat         ctermbg=black guibg=black ctermfg=white guifg=white
-hi Search         ctermbg=black guibg=black ctermfg=green guifg=green
-hi SpecialChar    ctermbg=black guibg=black ctermfg=white guifg=white
-hi SpecialComment ctermbg=black guibg=black ctermfg=white guifg=white
-hi Special        ctermbg=black guibg=black ctermfg=white guifg=white
-hi SpecialKey     ctermbg=white guibg=white ctermfg=black guifg=black
-hi Statement      ctermbg=black guibg=black ctermfg=white guifg=white
-hi StatusLine     ctermbg=white guibg=white ctermfg=red guifg=red
-hi StatusLineNC   ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi StorageClass   ctermbg=black guibg=black ctermfg=white guifg=white
-hi String         ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Structure      ctermbg=black guibg=black ctermfg=white guifg=white
-hi Tag            ctermbg=black guibg=black ctermfg=red guifg=red
-hi Title          ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Todo           ctermbg=black guibg=black ctermfg=white guifg=white
-hi Typedef        ctermbg=black guibg=black ctermfg=white guifg=white
-hi Type           ctermbg=black guibg=black ctermfg=white guifg=white
-hi VertSplit      ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi Visual         ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi VisualNOS      ctermbg=black guibg=black ctermfg=grey guifg=grey
-hi WarningMsg     ctermbg=black guibg=black ctermfg=red guifg=red
-hi WildMenu       ctermbg=white guibg=white ctermfg=darkgrey guifg=#606060
diff --git a/colors/redstring.vim b/colors/redstring.vim
deleted file mode 100755
index 5b75182..0000000
--- a/colors/redstring.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" Vim color file
-" Maintainer:   Connor Berry <connorberry@yahoo.com>
-" Last Change:	2006/05/25 
-" Version: 1.0
-
-set background=dark
-highlight clear
-if exists("syntax on")
-  syntax reset
-endif
-
-let g:colors_name = "redstring"
-
-highlight Normal     term=none ctermfg=grey    cterm=none ctermbg=black  guifg=white    gui=none guibg=black
-highlight Comment    term=none ctermfg=DarkGrey    guifg=DarkGrey    
-highlight Constant   term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Special    term=none ctermfg=red     cterm=bold guifg=red     gui=bold
-highlight Identifier term=none ctermfg=lightgreen    cterm=none guifg=lightgreen    gui=none
-highlight Statement  term=bold ctermfg=cyan    cterm=bold guifg=cyan    gui=bold
-highlight Operator   term=bold ctermfg=cyan    cterm=bold guifg=cyan    gui=bold
-highlight PreProc    term=bold ctermfg=lightgreen   cterm=none guifg=green   gui=none
-highlight Type       term=bold ctermfg=lightgreen cterm=none guifg=lightgreen gui=none
-highlight String     term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Number     term=none ctermfg=red     cterm=none guifg=red     gui=none
-
-" vim:ts=2:sw=2:et
diff --git a/colors/refactor.vim b/colors/refactor.vim
deleted file mode 100755
index 9da7977..0000000
--- a/colors/refactor.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "RefractorMyCode"
-
-hi Comment guifg=#80a0ff
-hi Constant guifg=#527023
-hi Cursor gui=bold guifg=black guibg=green
-hi CursorColumn guibg=gray40
-hi CursorIM gui=None
-hi CursorLine guibg=gray40
-hi DiffAdd guibg=darkblue
-hi DiffChange guibg=darkmagenta
-hi DiffDelete gui=bold guifg=blue guibg=darkcyan
-hi DiffText gui=bold guibg=red
-hi Directory guifg=cyan
-hi Error guifg=white guibg=red
-hi ErrorMsg guifg=white guibg=red
-hi FoldColumn guifg=#3387CC guibg=grey
-hi Folded guifg=#0a1926 guibg=darkgray
-hi Identifier guifg=#40ffff
-hi Ignore guifg=black
-hi IncSearch gui=reverse
-hi LineNr guifg=gray40
-hi MatchParen guibg=darkcyan
-hi ModeMsg gui=bold
-hi MoreMsg gui=bold guifg=seagreen
-hi NonText gui=bold guifg=#cc0099
-hi Normal guifg=gray80 guibg=black
-hi Pmenu guibg=magenta
-hi PmenuSbar guibg=grey
-hi PmenuSel guibg=darkgray
-hi PmenuThumb gui=reverse
-hi PreProc guifg=#AFC4DB
-hi Question gui=bold guifg=green
-hi Search gui=bold guifg=black guibg=red
-hi SignColumn guifg=cyan guibg=grey
-hi Special guifg=orange
-hi SpecialKey guifg=cyan
-hi SpellBad gui=undercurl
-hi SpellCap gui=undercurl
-hi SpellLocal gui=undercurl
-hi SpellRare gui=undercurl
-hi Statement guifg=#E28964
-hi StatusLine gui=bold,reverse guifg=#3387CC guibg=white
-hi StatusLineNC gui=reverse
-hi TabLine guifg=black guibg=darkgray
-hi TabLineFill gui=reverse
-hi TabLineSel gui=bold
-hi Title gui=bold guifg=magenta
-hi Todo gui=italic guifg=black guibg=yellow
-hi Type guifg=#99CF50
-hi Underlined gui=underline guifg=#80a0ff
-hi VertSplit gui=reverse
-hi Visual gui=bold guifg=gray25 guibg=darkgray
-hi VisualNOS gui=bold,underline
-hi WarningMsg guifg=red
-hi WildMenu guifg=black guibg=yellow
-hi link Boolean Constant
-hi link Character Constant
-hi link Conditional Statement
-hi link Debug Special
-hi link Define PreProc
-hi link Delimiter Special
-hi link Exception Statement
-hi link Float Constant
-hi link Function Identifier
-hi link Include PreProc
-hi link Keyword Statement
-hi link Label Statement
-hi link Macro PreProc
-hi link Number Constant
-hi link Operator Statement
-hi link PreCondit PreProc
-hi link Repeat Statement
-hi link SpecialChar Special
-hi link SpecialComment Special
-hi link StorageClass Type
-hi link String Constant
-hi link Structure Type
-hi link Tag Special
-hi link Typedef Type
-
diff --git a/colors/relaxedgreen.vim b/colors/relaxedgreen.vim
deleted file mode 100755
index 9d2bf14..0000000
--- a/colors/relaxedgreen.vim
+++ /dev/null
@@ -1,112 +0,0 @@
-" ----------------------------------------------------------------------------------------------------------------------------------
-" Filename:      relaxedgreen.vim
-" Last Modified: 13 Feb 2007 09:57:24 PM by Dave V
-" Maintainer:    Dave Vehrs (dvehrs at gmail.com)
-" Copyright:     2002,2003,2004,2005,2006,2007 Dave Vehrs
-"                This script 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. 
-" Description:   Vim colorscheme file.
-" Install:       Place this file in the users colors directory (~/.vim/colors) or 
-"                in the shared colors directory (/usr/shared/vim/vim<version>/colors/),
-"                then load it with :colorscheme relaxedgreen
-" ----------------------------------------------------------------------------------------------------------------------------------
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "relaxedgreen"
-highlight Cursor        term=reverse      ctermfg=green ctermbg=blue                      guifg=#000000 guibg=#559955
-highlight CursorIM      term=reverse      ctermfg=black ctermbg=darkgreen                 guifg=#000000 guibg=#336633
-highlight CursorColumn  term=none         ctermbg=darkred                                 guibg=#663333
-highlight CursorLine    term=none         ctermbg=darkblue                                guibg=#333366
-highlight Comment       term=italic       ctermfg=darkcyan ctermbg=black                  guifg=#00a594
-highlight Constant      term=underline    ctermfg=blue                                    guifg=#0099dd
-highlight Debug         term=bold         ctermfg=red ctermbg=black                       guifg=#dc0000 guibg=#000000
-highlight DiffAdd       term=reverse      ctermfg=black ctermbg=cyan                      guifg=#000000 guibg=#007200
-highlight DiffChange    term=underline    cterm=reverse ctermfg=darkgreen ctermbg=black   guifg=#000000 guibg=#006700
-highlight DiffDelete    term=standout     ctermfg=black ctermbg=cyan                      guifg=#000000 guibg=#007200
-highlight DiffText      term=bold         ctermfg=green ctermbg=black                     guifg=#00ac00 guibg=#000000
-highlight Directory     term=underline    ctermfg=green ctermbg=black                     guifg=#336633 guibg=#000000
-highlight Error         term=reverse,bold ctermfg=black ctermbg=red                       guifg=#000000 guibg=#dc0000
-highlight ErrorMsg      term=reverse,bold ctermfg=white ctermbg=red                       guifg=#ffffff guibg=#dc0000
-highlight Folded                          ctermfg=darkgreen ctermbg=black                 guifg=#20de20 guibg=#000000
-highlight FoldColumn                      ctermfg=darkgreen ctermbg=black                 guifg=#20de20 guibg=#000000
-highlight Function      term=standout     ctermfg=darkgreen                               guifg=#22bb22
-highlight Identifier    term=underline    ctermfg=darkcyan                                gui=underline guifg=#008800
-highlight Ignore                          ctermfg=lightgreen                              guifg=#33bb33
-highlight IncSearch     term=reverse      ctermfg=black ctermbg=darkgreen                 guifg=#000000 guibg=#336633
-highlight LineNr        term=bold         ctermfg=green                                   guifg=#00ff00
-highlight MatchParen    term=bold         ctermbg=green                                   guifg=#009900
-highlight ModeMsg       term=bold         cterm=bold                                      gui=bold
-highlight MoreMsg       term=bold         cterm=bold                                      gui=bold
-highlight NonText                         ctermfg=brown                                   guifg=#b26818
-highlight Normal                          ctermfg=gray ctermbg=black                      guifg=#aaaaaa guibg=#000000
-highlight Pmenu         term=reverse      ctermfg=black ctermbg=green                     guifg=#000000 guibg=#337733 
-highlight PmenuSel      term=bold         ctermfg=black  ctermbg=gray                     guifg=#000000 guibg=#999999 
-highlight PmenuSbar     term=reverse      ctermfg=black ctermbg=green                     guifg=#000000 guibg=#337733 
-highlight PmenuThumb    term=reverse      ctermfg=gray ctermbg=black                      guifg=#999999 guibg=#000000 
-highlight PreProc       term=standout     ctermfg=darkgreen                               guifg=#22bb22
-highlight Question      term=standout     ctermfg=red                                     guifg=#ff0000
-highlight Search        term=reverse      ctermfg=black ctermbg=darkgreen                 guifg=#000000 guibg=#228822
-highlight SignColumn                      ctermfg=darkgreen                               guifg=#20de20 guibg=#000000
-highlight Special       term=bold         ctermfg=green                                   guifg=#00ff00
-highlight SpecialKey    term=bold         ctermfg=green                                   guifg=#00ff00
-highlight SpellBad      term=reverse      cterm=underline ctermfg=red ctermbg=black       gui=undercurl guisp=#ff0000
-highlight SpellCap      term=reverse      cterm=underline ctermfg=yellow ctermbg=black    gui=undercurl guisp=#00ffff
-highlight SpellLocal    term=reverse      cterm=underline ctermfg=blue ctermbg=black      gui=undercurl guisp=#0000ff
-highlight SpellRare     term=reverse      cterm=underline ctermfg=darkgreen ctermbg=black gui=undercurl guisp=#00ff00
-highlight Statement     term=standout     ctermfg=darkred                                 guifg=#ac0000
-highlight StatusLine    term=reverse      ctermfg=darkgreen ctermbg=black                 gui=none guibg=#228822 guifg=#000000
-highlight StatusLineNC  term=reverse      ctermfg=darkgreen ctermbg=blue                  gui=none guibg=#336633 guifg=#000000
-highlight TabLine       term=reverse      cterm=reverse ctermfg=black ctermbg=green       guibg=#222222 guifg=#228822
-highlight TabLineFill   term=reverse      cterm=reverse ctermfg=green ctermbg=black       guibg=#222222 guifg=#226622
-highlight TabLineSel                      ctermfg=black ctermbg=green                     guibg=#228822 guifg=#222222
-highlight Title         term=reverse      ctermfg=black ctermbg=green                     guifg=#000000 guibg=#00ff00
-highlight Todo          term=reverse      cterm=reverse ctermfg=darkgreen ctermbg=black   guibg=#336633 guifg=#000000
-highlight Type          term=standout     ctermfg=green                                   guifg=#559955
-highlight Visual        term=reverse      cterm=reverse ctermfg=darkgreen                 guifg=#000000 guibg=#336633
-highlight VisualNOS     term=reverse,bold cterm=reverse ctermbg=darkgreen                 guifg=#000000 guibg=#228822
-highlight VertSplit     term=reverse      ctermfg=darkgreen                               guifg=#336633
-highlight User1         term=standout     cterm=bold ctermbg=darkgreen ctermfg=red        gui=bold guibg=#228822 guifg=#FF0000
-highlight WarningMsg    term=reverse      ctermfg=black ctermbg=yellow                    guifg=#000000 guibg=#007a7a
-highlight WildMenu      term=reverse      ctermfg=blue ctermbg=darkgreen                  guifg=#000099 guibg=#00ac00   
-
-" ----------------------------------------------------------------------------------------------------------------------------------
-" Common groups that link to other highlight definitions.
-
-highlight link Character      Constant
-highlight link Number         Constant
-highlight link Boolean        Constant
-highlight link String         Constant
-
-highlight link Operator       LineNr
-
-highlight link Float          Number
-
-highlight link Define         PreProc
-highlight link Include        PreProc
-highlight link Macro          PreProc
-highlight link PreCondit      PreProc
-
-highlight link Repeat         Question
-
-highlight link Conditional    Repeat
-
-highlight link Delimiter      Special
-highlight link SpecialChar    Special
-highlight link SpecialComment Special
-highlight link Tag            Special
-
-highlight link Exception     Statement
-highlight link Keyword       Statement
-highlight link Label         Statement
-
-highlight link StorageClass  Type
-highlight link Structure     Type
-highlight link Typedef       Type
-
-" ----------------------------------------------------------------------------------------------------------------------------------
-" vim:tw=132:ts=4:sw=4
diff --git a/colors/reliable.vim b/colors/reliable.vim
deleted file mode 100755
index 09065eb..0000000
--- a/colors/reliable.vim
+++ /dev/null
@@ -1,126 +0,0 @@
-" Colorscheme created with ColorSchemeEditor v1.0 beta
-"Name: reliable
-"Maintainer: Erik Falor <ewfalor@gmail.com>
-"Version: v1.0.2
-"Last Change: 2008 Mar 07
-"License: Vim License
-
-"Notes: A futuristic colorscheme with a bright, clean look.
-"
-"    This is a helpful mapping while developing colorschemes:
-"    <F1>          :echo synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')<CR>
-"
-"Version 1.0.2 - changed Type highlight group to display bold
-
-set background=light
-if version > 580
-	highlight clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-let g:colors_name = "reliable"
-
-if v:version >= 700
-	highlight CursorColumn guibg=#F3E8B3 gui=NONE
-	highlight CursorLine guibg=#F3E8B3 gui=NONE
-	highlight Pmenu guibg=#A1BAD8 gui=NONE
-	highlight PmenuSel guibg=#F3E8B3 gui=NONE
-	highlight PmenuSbar guibg=#C3C6CC gui=NONE
-	highlight PmenuThumb guibg=#002A5C gui=reverse
-	highlight SpellBad gui=undercurl
-	highlight SpellCap gui=undercurl
-	highlight SpellLocal gui=undercurl
-	highlight SpellRare gui=undercurl
-	highlight TabLine guifg=#002A5C guibg=#FFFFFF gui=bold,underline
-	highlight TabLineFill guifg=#A1BAD8 gui=underline
-	highlight TabLineSel guifg=#002A5C guibg=#FCB52D gui=bold,underline
-endif
-highlight Cursor guifg=bg guibg=fg gui=NONE
-highlight link CursorIM cleared
-highlight DiffAdd guibg=#A1BAD8 gui=NONE
-highlight DiffChange guifg=#002A5C guibg=#7493BE gui=NONE
-highlight DiffDelete guifg=#7493BE guibg=#FCB52D gui=bold
-highlight DiffText guifg=#002A5C guibg=#F3E8B3 gui=bold
-highlight Directory guifg=#7493BE gui=NONE
-highlight ErrorMsg guifg=White guibg=Red gui=NONE
-highlight FoldColumn guifg=#002A5C guibg=#7493BE gui=NONE
-highlight Folded guifg=#606769 guibg=#C3C6CC gui=bold
-highlight IncSearch guifg=#FFFFFF guibg=#FCB52D gui=bold
-highlight LineNr guifg=#606769 gui=bold
-highlight MatchParen guibg=#A1BAD8 gui=NONE
-highlight ModeMsg guifg=#002A5C gui=bold
-highlight MoreMsg guifg=#002A5C guibg=#A1BAD8 gui=bold
-highlight NonText guifg=#606769 gui=NONE
-highlight Normal guibg=#FFFFFF gui=NONE
-highlight Question guifg=#002A5C guibg=#FCB52D gui=bold
-highlight Search guibg=#FCB52D gui=NONE
-highlight SignColumn guifg=#FCB52D guibg=#A1BAD8 gui=NONE
-highlight SpecialKey guifg=#002A5C gui=NONE
-highlight StatusLine guifg=#002A5C guibg=#FCB52D gui=NONE
-highlight StatusLineNC guibg=#7493BE gui=NONE
-highlight Title guifg=#7493BE gui=bold
-highlight VertSplit guifg=#002A5C guibg=#C3C6CC gui=bold
-highlight Visual guibg=#C3C6CC gui=NONE
-highlight VisualNOS guifg=#C3C6CC gui=underline
-highlight WarningMsg guifg=Red gui=NONE
-highlight WildMenu guifg=#002A5C guibg=#F3E8B3 gui=NONE
-highlight link Boolean Constant
-highlight link Character Constant
-highlight Comment guifg=#606769 gui=bold
-highlight link Conditional Statement
-highlight Constant guifg=#80888D gui=bold
-highlight link Debug Special
-highlight link Define PreProc
-highlight link Delimiter Special
-highlight Error guifg=White guibg=Red gui=NONE
-highlight link Exception Statement
-highlight link Float Number
-highlight link Function Identifier
-highlight Identifier guifg=#7493BE gui=bold
-highlight Ignore guifg=bg gui=NONE
-highlight link Include PreProc
-highlight link Keyword Statement
-highlight link Label Statement
-highlight link Macro PreProc
-highlight link Number Constant
-highlight link Operator Statement
-highlight link PreCondit PreProc
-highlight PreProc guifg=#7493BE gui=bold
-highlight link Repeat Statement
-highlight Special guifg=#7493BE gui=NONE
-highlight link SpecialChar Special
-highlight link SpecialComment Special
-highlight Statement guifg=#002A5C gui=bold
-highlight link StorageClass Type
-highlight link String Constant
-highlight link Structure Type
-highlight link Tag Special
-highlight Todo guifg=#FCB52D guibg=Yellow gui=bold,underline
-highlight Type guifg=#002A5C gui=bold
-highlight link Typedef Type
-highlight Underlined guifg=#7493BE gui=underline
-
-
-"ColorScheme metadata{{{
-if v:version >= 700
-	let g:reliable_Metadata = {
-				\"Palette" : "#002A5C:#FCB52D:#7493BE:#A1BAD8:#F3E8B3:#FFFFFF:#FFFFFF:#FFFFFF:#FFFFFF:#FFFFFF:#C3C6CC:#80888D:#606769:#000000:#FFFFFF:#FFFFFF:#FFFFFF:#FFFFFF:#FFFFFF:#FFFFFF",
-				\"Maintainer" : "Erik Falor",
-				\"Name" : "reliable",
-				\"License" : ["Vim License",
-				\],
-				\"Notes" : ["A futuristic colorscheme with a bright, clean look.",
-				\"",
-				\"    This is a helpful mapping while developing colorschemes:",
-				\"    <F1>          :echo synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')<CR>",
-				\"",
-				\"Version 1.0.2 - changed Type highlight group to display bold",
-				\],
-				\"Version" : "v1.0.2",
-				\"Email" : "ewfalor@gmail.com",
-				\"Last Change" : "2008 Mar 07",
-				\}
-endif
-"}}}
-" vim:set foldmethod=marker expandtab filetype=vim:
diff --git a/colors/reloaded.vim b/colors/reloaded.vim
deleted file mode 100755
index 5d111b2..0000000
--- a/colors/reloaded.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Vim color file
-" Maintainer:   connorberry@yahoo.com   
-" Last Change:  
-" URL: www.narwhale.org
-
-set background=dark     "or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="reloaded"
-
-        hi Normal       ctermfg=Green ctermbg=Black
-        hi Normal       guifg=Green guibg=Black
-        hi NonText      ctermfg=DarkGreen  ctermbg=Black
-        hi NonText      guifg=DarkGreen  guibg=Black
-
-        hi Statement    ctermfg=Green      ctermbg=Black
-        hi Statement    guifg=Green      guibg=Black
-        hi Comment      ctermfg=DarkGreen  ctermbg=Black cterm=bold term=bold
-        hi Comment      guifg=DarkGreen  guibg=Black gui=bold term=bold
-        hi Constant     ctermfg=Green  ctermbg=DarkGreen
-        hi Constant     guifg=Green  guibg=DarkGreen
-        hi Identifier   ctermfg=Green      ctermbg=Black
-        hi Identifier   guifg=Green      guibg=Black
-        hi Type         ctermfg=Green ctermbg=Black
-        hi Type         guifg=Green guibg=Black
-        hi String       ctermfg=Green ctermbg=DarkGreen
-        hi String       guifg=Green guibg=DarkGreen
-        hi Boolean      ctermfg=Green ctermbg=DarkGreen
-        hi Boolean      guifg=Green guibg=DarkGreen
-        hi Number       ctermfg=Green ctermbg=DarkGreen
-        hi Number       guifg=Green guibg=DarkGreen
-        hi Folded       ctermfg=DarkYellow ctermbg=Black cterm=underline term=none
-        hi Folded       guifg=DarkYellow guibg=Black gui=underline term=none
-        hi Special      ctermfg=Black      ctermbg=DarkGreen
-        hi Special      guifg=Black      guibg=DarkGreen
-        hi PreProc      ctermfg=DarkGreen ctermbg=Black cterm=bold term=bold
-        hi PreProc      guifg=DarkGreen guibg=Black gui=bold term=bold
-        hi Scrollbar    ctermfg=DarkYellow      ctermbg=Black
-        hi Scrollbar    guifg=DarkYellow      guibg=Black
-        hi Cursor       ctermfg=Black     ctermbg=Green
-        hi Cursor       guifg=Black     guibg=Green
-        hi ErrorMsg     ctermfg=Red       ctermbg=Black cterm=bold term=bold
-        hi ErrorMsg     guifg=Red       guibg=Black gui=bold term=bold
-        hi WarningMsg   ctermfg=Yellow    ctermbg=Black
-        hi WarningMsg   guifg=Yellow    guibg=Black
-        hi VertSplit    ctermfg=White     ctermbg=Black
-        hi VertSplit    guifg=White     guibg=Black
-        hi Directory    ctermfg=DarkGreen      ctermbg=Black
-        hi Directory    guifg=DarkGreen      guibg=Black
-        hi Visual       ctermfg=White     ctermbg=DarkGray cterm=underline term=none
-        hi Visual       guifg=White     guibg=DarkGray gui=underline term=none
-        hi Title        ctermfg=White     ctermbg=DarkBlue
-        hi Title        guifg=White     guibg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold,underline ctermfg=Green ctermbg=Black
-        hi StatusLine   term=bold gui=bold,underline guifg=Green guibg=Black
-        hi StatusLineNC term=bold cterm=bold,underline ctermfg=Gray  ctermbg=Black
-        hi StatusLineNC term=bold gui=bold,underline guifg=Gray  guibg=Black
-        hi LineNr       term=bold cterm=bold ctermfg=Black ctermbg=DarkGreen
-        hi LineNr       term=bold gui=bold guifg=Black guibg=DarkGreen
-        hi SpecialKey	guifg=DarkGreen guibg=Black      
-        hi SpecialKey	ctermfg=DarkGreen ctermbg=Black      
-
-        hi cursorline   guifg=Black guibg=DarkGreen
-        hi cursorline   ctermfg=Black ctermbg=DarkGreen
-        hi cursorcolumn guifg=Black guibg=Green
-        hi cursorcolumn ctermfg=Black ctermbg=Green
-
diff --git a/colors/revolutions.vim b/colors/revolutions.vim
deleted file mode 100755
index 15450c9..0000000
--- a/colors/revolutions.vim
+++ /dev/null
@@ -1,75 +0,0 @@
-" MATRIX-REVOLUTIONS colorscheme
-" Author:      Christian MICHON
-" Version:     1.0
-" Last Change: 23 Jun 2004
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'revolutions'
-
-hi Boolean        guifg=#e6fff3 guibg=#43705a gui=none
-hi Character      guifg=#e6fff3 guibg=#43705a gui=none
-hi Comment        guifg=#43705a guibg=#000000 gui=underline
-hi Conditional    guifg=#e6fff3 guibg=#000000 gui=bold
-hi Constant       guifg=#e6fff3 guibg=#43705a gui=none
-hi Cursor         guifg=#43705a guibg=#e6fff3 gui=none
-hi Debug          guifg=#61a181 guibg=#000000 gui=none
-hi Define         guifg=#e6fff3 guibg=#000000 gui=none
-hi Delimiter      guifg=#61a181 guibg=#000000 gui=none
-hi DiffAdd        guifg=#e6fff3 guibg=#43705a gui=bold
-hi DiffChange     guifg=#e6fff3 guibg=#43705a gui=none
-hi DiffDelete     guifg=#e6fff3 guibg=#43705a gui=none
-hi DiffText       guifg=#000000 guibg=#e6fff3 gui=bold
-hi Directory      guifg=#e6fff3 guibg=#000000 gui=none
-hi Error          guifg=#e6fff3 guibg=#61a181 gui=bold
-hi ErrorMsg       guifg=#e6fff3 guibg=#61a181 gui=bold
-hi Exception      guifg=#e6fff3 guibg=#000000 gui=bold
-hi Float          guifg=#e6fff3 guibg=#43705a gui=none
-hi FoldColumn     guifg=#9bcfb5 guibg=#43705a gui=bold
-hi Folded         guifg=#9bcfb5 guibg=#43705a gui=bold
-hi Function       guifg=#e6fff3 guibg=#000000 gui=none
-hi Identifier     guifg=#e6fff3 guibg=#000000 gui=none
-hi Ignore         guifg=#000000 guibg=#000000 gui=none
-hi Include        guifg=#e6fff3 guibg=#000000 gui=none
-hi IncSearch      guifg=#1d3026 guibg=#61a181 gui=bold
-hi Keyword        guifg=#e6fff3 guibg=#000000 gui=bold
-hi Label          guifg=#e6fff3 guibg=#000000 gui=bold
-hi lCursor        guifg=#43705a guibg=#e6fff3 gui=none
-hi LineNr         guifg=#9bcfb5 guibg=#000000 gui=bold
-hi Macro          guifg=#e6fff3 guibg=#000000 gui=none
-hi ModeMsg        guifg=#9bcfb5 guibg=#000000 gui=bold
-hi MoreMsg        guifg=#9bcfb5 guibg=#000000 gui=bold
-hi NonText        guifg=#9bcfb5 guibg=#1d3026 gui=bold
-hi Normal         guifg=#9bcfb5 guibg=#000000 gui=none
-hi Number         guifg=#e6fff3 guibg=#000000 gui=none
-hi Operator       guifg=#e6fff3 guibg=#000000 gui=bold
-hi PreCondit      guifg=#e6fff3 guibg=#000000 gui=none
-hi PreProc        guifg=#61a181 guibg=#000000 gui=none
-hi Question       guifg=#9bcfb5 guibg=#000000 gui=bold
-hi Repeat         guifg=#e6fff3 guibg=#000000 gui=bold
-hi Search         guifg=#1d3026 guibg=#61a181 gui=bold
-hi Special        guifg=#61a181 guibg=#000000 gui=none
-hi SpecialChar    guifg=#61a181 guibg=#000000 gui=none
-hi SpecialComment guifg=#61a181 guibg=#000000 gui=none
-hi SpecialKey     guifg=#9bcfb5 guibg=#000000 gui=none
-hi Statement      guifg=#e6fff3 guibg=#000000 gui=bold
-hi StatusLine     guifg=#e6fff3 guibg=#61a181 gui=bold
-hi StatusLineNC   guifg=#1d3026 guibg=#61a181 gui=bold
-hi StorageClass   guifg=#f070a0 guibg=#000000 gui=bold
-hi String         guifg=#e6fff3 guibg=#000000 gui=none
-hi Structure      guifg=#f070a0 guibg=#000000 gui=bold
-hi Tag            guifg=#61a181 guibg=#000000 gui=none
-hi Title          guifg=#e6fff3 guibg=#1d3026 gui=bold
-hi Todo           guifg=#1d3026 guibg=#9bcfb5 gui=none
-hi Type           guifg=#e6fff3 guibg=#000000 gui=bold
-hi Typedef        guifg=#f070a0 guibg=#000000 gui=bold
-hi Underlined     guifg=#e6fff3 guibg=#000000 gui=underline
-hi VertSplit      guifg=#61a181 guibg=#61a181 gui=none
-hi Visual         guifg=#e6fff3 guibg=#61a181 gui=none
-hi VisualNOS      guifg=#9bcfb5 guibg=#000000 gui=underline
-hi WarningMsg     guifg=#1d3026 guibg=#61a181 gui=bold
-hi WildMenu       guifg=#43705a guibg=#e6fff3 gui=none
diff --git a/colors/robinhood.vim b/colors/robinhood.vim
deleted file mode 100755
index ab1d14d..0000000
--- a/colors/robinhood.vim
+++ /dev/null
@@ -1,103 +0,0 @@
-" Vim color file
-" Maintainer: Datila Carvalho <datila@hotmail.com>
-" Last Change: May, 19, 2005
-" Version: 0.2
-
-" This is a VIM's version of the emacs color theme
-" _Robin Hood_ created by Alex Schroede.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "robinhood"
-
-
-""" Colors
-
-" GUI colors
-hi Cursor               guifg=fg guibg=gray
-hi CursorIM             guifg=NONE guibg=gray
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg             gui=bold guifg=white guibg=Red
-"hi VertSplit
-"hi Folded
-"hi FoldColumn
-"hi IncSearch
-hi LineNr               gui=bold guifg=yellowgreen guibg=#203010
-"hi ModeMsg
-"hi MoreMsg
-"hi NonText
-hi Normal               guibg=#304020 guifg=wheat
-"hi Question
-hi Search               gui=bold guifg=black guibg=gray
-"hi SpecialKey
-hi StatusLine           guifg=darkolivegreen guibg=wheat
-hi StatusLineNC         guifg=olivedrab guibg=wheat
-"hi Title
-hi Visual               guifg=darkslategrey guibg=fg
-hi VisualNOS            gui=bold guifg=Black guibg=fg
-hi WarningMsg           guifg=White guibg=Tomato
-"hi WildMenu
-
-hi User2                guifg=yellowgreen guibg=#091900 gui=bold
-
-" If using Motif/Athena
-hi Menu                 guibg=#304020 guifg=wheat
-hi Scrollbar            guibg=bg
-
-" Colors for syntax highlighting
-hi Comment              guifg=lightblue
-
-hi Constant             gui=bold guifg=lightcyan
-    hi String           guifg=lightsalmon
-    hi Character        guifg=lightsalmon
-    hi Number           gui=bold guifg=lightcyan
-    hi Boolean          gui=bold guifg=lightcyan
-    hi Float            gui=bold guifg=lightcyan
-
-hi Identifier           gui=bold guifg=palegreen
-    hi Function         guifg=yellowgreen
-
-hi Statement            gui=bold guifg=salmon
-    hi Conditional      gui=bold guifg=salmon
-    hi Repeat           gui=bold guifg=salmon
-    hi Label            guifg=salmon
-    hi Operator         guifg=salmon
-    "hi Keyword
-    "hi Exception
-
-hi PreProc              guifg=palegreen
-    hi Include          gui=bold guifg=palegreen
-    hi Define           guifg=palegreen
-    hi Macro            guifg=aquamarine
-    hi PreCondit        guifg=palegreen
-
-hi Type                 gui=bold guifg=yellowgreen
-    hi StorageClass     gui=bold guifg=aquamarine
-    hi Structure        gui=bold guifg=aquamarine
-    hi Typedef          gui=bold guifg=aquamarine
-
-"hi Special
-    ""Underline Character
-    "hi SpecialChar      gui=underline
-    "hi Tag              gui=bold,underline
-    ""Statement
-    "hi Delimiter        gui=bold
-    ""Bold comment (in Java at least)
-    "hi SpecialComment   gui=bold
-    "hi Debug            gui=bold
-
-hi Underlined           gui=underline
-
-hi Ignore               guifg=bg
-
-hi Error                gui=bold guifg=White guibg=Red
-
-"hi Todo
diff --git a/colors/rootwater.vim b/colors/rootwater.vim
deleted file mode 100755
index 4be5aeb..0000000
--- a/colors/rootwater.vim
+++ /dev/null
@@ -1,98 +0,0 @@
-" Name: rootwater.vim
-" Maintainer:	Kojo Sugita
-" Last Change:  2008-11-22
-" Revision: 1.2
-"
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'rootwater'
-
-" Default colors
-hi Normal	guifg=#babdb6	guibg=#151b1d
-hi NonText	guifg=#4f5b5d	guibg=#232729	gui=none
-hi SpecialKey	guifg=#4f5b5d	guibg=#2c3032	gui=none
-hi Cursor	guifg=#3a553a	guibg=#77dd88
-hi CursorLine	guibg=#303035
-hi CursorColumn	guibg=#303035
-hi lCursor	guifg=#3a553a	guibg=#77dd88
-hi CursorIM	guifg=#3a553a	guibg=#77dd88
-
-" Directory
-hi Directory	guifg=white gui=bold
-
-" Diff
-hi DiffAdd	guifg=#77dd88	guibg=#3a553a	gui=none
-hi DiffChange	guifg=#77dd88	guibg=#3a553a	gui=none
-hi DiffDelete	guifg=#223322	guibg=#223322	gui=none
-hi DiffText	guifg=#77dd88	guibg=#448844	gui=bold
-
-hi ErrorMsg	guifg=red	guibg=black
-hi VertSplit	guifg=black	guibg=#88ee99
-
-" Folds
-hi Folded	guifg=#55af66	guibg=black
-hi FoldColumn	guifg=#557755	guibg=#102010
-
-" Search
-hi Search	guifg=#223322	guibg=#55af66	gui=none
-hi IncSearch	guifg=#3a553a	guibg=#77dd88	gui=none
-
-" hi LineNr	guifg=#446644 guibg=black gui=none
-hi LineNr 	guifg=#607075	guibg=black	gui=none
-hi ModeMsg	guifg=#55af66	guibg=black
-hi MoreMsg	guifg=#55af66	guibg=black
-hi Question	guifg=#55af66	guibg=black
-
-"\n, \0, %d, %s, etc...
-hi Special	guifg=pink			gui=none
-
-" status line
-hi StatusLine	guifg=#88ee99	guibg=black	gui=none
-hi StatusLineNC	guifg=#446644	guibg=black	gui=none
-
-hi Title	guifg=#88ee99	guibg=#000000	gui=none
-hi Visual	guifg=#77dd88	guibg=#448844	gui=none
-hi VisualNOS	guifg=#55af66	guibg=black
-hi WarningMsg	guifg=#77dd88	guibg=black
-hi WildMenu	guifg=#3a553a	guibg=#77dd88
-
-hi Number	guifg=#77dd88
-hi Char		guifg=#77dd88
-hi String	guifg=#77dd88
-hi Boolean	guifg=#77dd88
-hi Comment	guifg=#656565
-hi Constant	guifg=#88ee99			gui=none
-hi Identifier	guifg=white
-hi Statement    guifg=#8fffff			gui=none
-
-" Procedure name
-hi Function     guifg=#ffaa33
-
-" Define, def
-hi PreProc	guifg=lightred			gui=none
-hi Type		guifg=white			gui=none
-hi Underlined	guifg=gray			gui=underline
-hi Error	guifg=red			guibg=black
-hi Todo		guifg=pink	guibg=black	gui=none
-hi SignColumn   guibg=#151b1d
-
-" Matches
-hi MatchParen	guifg=#000000	guibg=#ffaa33
-
-" Pmenu
-if version >= 700
-  hi Pmenu	guibg=#202530
-  hi PmenuSel	guifg=#88ee99	guibg=black
-  hi PmenuSbar	guibg=#202530
-
-  hi TabLine	  guifg=#446644	guibg=black	gui=None
-  hi TabLineFill  guibg=#232729	guibg=#232729	gui=None
-  hi TabLineSel	  guifg=#88ee99	guibg=black	gui=None
-endif
-
-finish
-
-" vim:set ts=8 sts=2 sw=2 tw=0:
diff --git a/colors/rtl.vim b/colors/rtl.vim
deleted file mode 100755
index e95c99d..0000000
--- a/colors/rtl.vim
+++ /dev/null
@@ -1,132 +0,0 @@
-" Vim syntax file
-" Language:	gcc rtl
-" Maintainer:	Igor Petushkov <piv-tula@mail.ru>
-" Last Change:	May 12 17:28:14 MSD 2010
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Integer number, or floating point number without a dot.
-syn match  rtlNumber		"\<\d\+\>" contained
-
-" file path
-syn match rtlPath		"[A-Za-z0-9.\/\-_]*\.\(c\|cpp\|h\|hpp\|CC\|f\|f95\)\:\d*"
-
-" String and Character contstants
-syn region  rtlString		start=+"+ end=+"+ contained
-
-" Comments
-syn region rtlComment		start="^[ \t]*;;" end="$"
-
-" A bunch of useful rtl keywords
-syn keyword rtlInsn		insn jump_insn call_insn code_label contained
-syn keyword rtlInsn		barrier note contained
-
-" Modes for regs, expressions
-syn keyword rtlModes		BI QI HI PSI SI PDI DI TI OI QF HF contained
-syn keyword rtlModes		TQF SF DF XF SD DD TD TF QQ HQ SQ contained
-syn keyword rtlModes		DQ TQ UQQ UHQ USQ UDQ HA SA DA TA contained
-syn keyword rtlModes		UHA USA UDA UTA CC BLK VOID QC HC contained  
-syn keyword rtlModes		SC DC XC TC CHI CSI CDI CTI COI contained 
-
-" Comparision operations
-syn keyword rtlComparision	eq ne gt gtu lt ltu ge geu le leu contained
-syn keyword rtlComparision	if_then_else cond contained
-
-" Constants
-syn keyword rtlConstant		const_int const_double const_fixed contained
-syn keyword rtlConstant		const_vector const_string symbol_ref contained
-syn keyword rtlConstant		label_ref const high contained
-
-" Registers
-syn keyword rtlRegisterMem	reg subreg scratch cc0 pc mem contained
-syn keyword rtlRegisterMem	concatm concatnm contained
-
-" Arithmetic functions
-syn keyword rtlArithmetic	plus ss_plus us_plus lo_sum minus contained
-syn keyword rtlArithmetic	ss_minus us_minus compare neg ss_neg contained
-syn keyword rtlArithmetic	us_neg mult ss_mult us_mult div contained
-syn keyword rtlArithmetic	ss_div udiv us_div mod umod smin contained
-syn keyword rtlArithmetic	smax umin umax not and ior xor contained
-syn keyword rtlArithmetic	ashift ss_ashift us_ashift lshiftrt contained
-syn keyword rtlArithmetic	ashiftrt rotate rotatert abs sqrt contained
-syn keyword rtlArithmetic	ffs clz ctz popcount parity bswap contained
-
-" Bit field functions
-syn keyword rtlBitField		sign_extract zero_extract contained
-
-" Vector operations
-syn keyword rtlVector		vec_merge vec_select vec_concat contained
-syn keyword rtlVector		vec_duplicate contained
-
-" Conversions
-syn keyword rtlConversion	sign_extend zero_extend float_extend contained 
-syn keyword rtlConversion	truncate ss_truncate us_truncate contained 
-syn keyword rtlConversion	float_truncate float unsigned_float contained 
-syn keyword rtlConversion	fix unsigned_fix fract_convert contained 
-syn keyword rtlConversion	sat_fract unsigned_fract_convert contained 
-syn keyword rtlConversion	unsigned_sat_fract contained 
-
-" Side effects
-syn keyword rtlSideEffect	set return call clobber use parallel contained
-syn keyword rtlSideEffect	cond_exec sequence asm_input unspec contained
-syn keyword rtlSideEffect	unspec_volatile addr_vec contained
-syn keyword rtlSideEffect	addr_diff_vec prefetch contained
-
-" Embedded side effects on addresses
-syn keyword rtlSideEffect	pre_dec pre_inc post_dec post_inc contained
-syn keyword rtlSideEffect	post_modify pre_modify contained
-
-" Operations
-syn region rtlExpression	start="(" end=")" contains=ALLBUT,rtlError1
-syn region rtlExpression2	start="\[" end="\]" contains=ALL,rtlError2
-syn region rtlSpecOperation	start="{" end="}" contains=ALLBUT,rtlError3
-syn match rtlError1		display ")"
-syn match rtlError2		display "]"
-syn match rtlError3		display "}"
-
-syn sync minlines=50
-
-" 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_rtl_syntax_inits")
-  if version < 508
-    let did_rtl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink rtlNumber		Number
-  HiLink rtlPath		Comment
-  HiLink rtlString		Character
-  HiLink rtlComment		Comment
-  HiLink rtlModes		Type
-  HiLink rtlComparision		Conditional
-  HiLink rtlInsn		Operator
-  HiLink rtlConstant		Constant
-  HiLink rtlRegisterMem  	Identifier
-  HiLink rtlArithmetic		Operator
-  HiLink rtlBitField		Operator
-  HiLink rtlVector		Function
-  HiLink rtlConversion		Function
-  HiLink rtlSideEffect		Staement
-  HiLink rtlExpression		Statement
-  HiLink rtlExpression2		Statement
-  HiLink rtlSpecOperation	Function
-  HiLink rtlError1		Error
-  HiLink rtlError2		Error
-  HiLink rtlError3		Error
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "rtl"
-
-" vim: ts=4
diff --git a/colors/sand.vim b/colors/sand.vim
deleted file mode 100755
index cc673df..0000000
--- a/colors/sand.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" Vim color file
-" Maintainer:   Tim Alexeevsky <realtim@mail.ru>
-" Last Change:  2002-03-14 
-" Version:      0.5
-" URL:		    http://sunsite.cs.msu.su/~tim/vim/sand.vim 
-" 
-" Thanx to Hans Fugal for his colorscheme_template.vim
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="sand"
-
-highlight Normal guibg=cornsilk guifg=NONE
-highlight PreProc guibg=NONE guifg=Maroon4
-highlight Comment guibg=NONE guifg=SteelBlue4
-highlight Constant guibg=NONE guifg=NavajoWhite4
-highlight Special guibg=NONE guifg=SlateBlue4
-highlight Identifier guibg=NONE guifg=SeaGreen
-highlight Statement guibg=NONE guifg=bisque4
-highlight Type guibg=NONE guifg=DarkOliveGreen
-highlight Todo guibg=LightYellow3 guifg=Blue4
-highlight NonText guibg=NONE guifg=DarkGreen
-highlight LineNr guibg=NONE guifg=Brown
-highlight StatusLineNC guifg=#8090a0
-highlight StatusLine guifg=#005070
-
-"vim: tw=0 sw=3 ts=3 sts=3 et
diff --git a/colors/satori.vim b/colors/satori.vim
deleted file mode 100755
index e910344..0000000
--- a/colors/satori.vim
+++ /dev/null
@@ -1,54 +0,0 @@
-" Vim color file
-" Maintainer: Rudá Moura <ruda.moura@gmail.com>
-" Last Change: Mon Oct 18 23:09:26 BRST 2010
-
-highlight clear Normal
-set background&
-
-highlight clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "satori"
-
-" Vim colors
-highlight Normal     ctermfg=NONE    cterm=NONE
-highlight Comment    ctermfg=Cyan    cterm=NONE
-highlight Constant   ctermfg=Red     cterm=NONE
-highlight Number     ctermfg=Red     cterm=NONE
-highlight Identifier ctermfg=NONE    cterm=NONE
-highlight Statement  ctermfg=NONE    cterm=Bold
-highlight PreProc    ctermfg=Blue    cterm=NONE
-highlight Type       ctermfg=Magenta cterm=NONE
-highlight Special    ctermfg=Magenta cterm=NONE
-highlight Search     ctermbg=Green   cterm=NONE
-highlight MatchParen ctermbg=NONE    cterm=Inverse
-highlight Error      ctermbg=Red     cterm=NONE
-highlight Todo	     ctermbg=Cyan    cterm=NONE
-
-" Vim monochrome
-highlight Normal     term=NONE
-highlight Comment    term=NONE
-highlight Constant   term=Underline
-highlight Number     term=Underline
-highlight Identifier term=NONE
-highlight Statement  term=Bold
-highlight PreProc    term=NONE
-highlight Type       term=Bold
-highlight Special    term=NONE
-
-" GVim colors
-highlight Normal     guifg=NONE     gui=NONE
-highlight Comment    guifg=DarkCyan gui=NONE
-highlight Constant   guifg=Red      gui=NONE
-highlight Number     guifg=Red      gui=Bold
-highlight Identifier guifg=NONE     gui=NONE
-highlight Statement  guifg=NONE     gui=Bold
-highlight PreProc    guifg=Blue     gui=NONE
-highlight Type       guifg=Magenta  gui=NONE
-highlight Special    guifg=Red      gui=Bold
-highlight Search     guifg=Green    gui=NONE
-highlight Error	     guifg=Red	    gui=NONE
-highlight Todo	     guifg=Cyan	    gui=NONE
diff --git a/colors/scala.vim b/colors/scala.vim
deleted file mode 100755
index 7f7d9e2..0000000
--- a/colors/scala.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" Vim syntax file
-" Language:    Scala
-" Version:     0.1
-" Maintainer:  Raphael Haberer-Proust <raphael.haberer-proust at epfl.ch>
-" URL:		   http://diwww.epfl.ch/~haberer/syntax/scala.html
-" Last Change: 2004 April 18
-" Disclaimer:  It's an absolut basic, very simple and by far not finished
-" syntax file! It only recognizes basic keywords and  constructs like comments
-" any help is welcome
-
-" Remove any old syntax stuff
-syn clear
-
-" syntax highlighting for words that are not identifiers:
-" int unit double String Array byte short char long float
-syn keyword scalaExternal		import package
-syn keyword scalaConditional	if then else
-syn keyword scalaRepeat			while for do
-syn keyword scalaType			boolean int double byte short char long float
-syn keyword scalaType			unit
-syn keyword scalaType			val with type var yield
-
-syn keyword scalaStatement		return
-syn keyword	scalaBoolean		true false
-syn keyword scalaConstant		null
-syn keyword	scalaTypedef		this super
-syn keyword scalaLangClass		String Array
-syn keyword scalaScopeDecl		private protected override
-syn keyword scalaStorageClass	abstract final sealed
-syn keyword	scalaExceptions		throw try catch finally
-syn keyword scalaClassDecl		extends
-" TODO differentiate the keyword class from MyClass.class -> use a match here
-syn keyword   scalaTypedef      class
-syn keyword   scalaTypedef      case
-syn keyword   scalaTypedef      trait
-
-syn match   scalaTypedef		"\s*\<object\>"
-
-syn keyword	scalaOperator		new
-
-" same number definition as in java.vim
-syn match   scalaNumber		"\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
-syn match   scalaNumber     "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
-syn match   scalaNumber     "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
-syn match   scalaNumber     "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
-
-syn region  scalaString		start=+"+ end=+"+
-
-" Functions
-"	def [name] [(prototype)] {
-"
-syn match   scalaFunction	"\s*\<def\>"
-
-" Comments
-syn region scalaComment		start="/\*"	end="\*/"
-syn match	scalaLineComment	"//.*"
-
-
-if !exists("did_scala_syntax_inits")
-    let did_scala_syntax_inits = 1
-    
-    " The default methods for highlighting. Can be overridden later
-    hi link scalaExternal		Include
-    hi link scalaStatement		Statement
-    hi link scalaConditional	Conditional
-	hi link scalaRepeat			Repeat
-    hi link scalaType			Type
-    hi link scalaTypedef		Typedef
-	hi link	scalaBoolean		Boolean
-    hi link scalaFunction		Function
-    hi link scalaLangClass		Constant
-	hi link	scalaConstant		Constant
-	hi link scalaScopeDecl		scalaStorageClass
-	hi link scalaClassDecl		scalaStorageClass
-	hi link scalaStorageClass 	StorageClass
-	hi link scalaExceptions		Exception
-	hi link scalaOperator		Operator
-    hi link scalaNumber			Number
-    hi link scalaString			String
-	hi link	scalaComment		Comment
-	hi link	scalaLineComment	Comment
-endif
-
-let b:current_syntax = "scala"
-
-" if you want to override default methods for highlighting
-"hi Conditional	term=bold ctermfg=Cyan guifg=#80a0ff
diff --git a/colors/scite.vim b/colors/scite.vim
deleted file mode 100755
index 609ad98..0000000
--- a/colors/scite.vim
+++ /dev/null
@@ -1,48 +0,0 @@
-" Vim color file
-" Maintainer:	Gergely Kontra <kgergely@mcl.hu>
-" Last Change:	2002. 04. 09.
-
-" I'm a bit red-blind, so if you have suggestions, don't hesitate :)
-"           ^^^^^^^^^ Sorry, I cannot speak English well, just want to say,
-"           that in some rare cases I cannot distinguish between some colors
-"           (I've just realized it, when I see some special tests)
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "scite"
-
-" hardcoded colors :
-
-" GUI
-"highlight Normal	guifg=#7F6F5F	guibg=#eeeeee
-highlight Normal	guifg=#7F6F5F	guibg=#ffffff
-highlight Search	guibg=#bbbbbb	gui=bold
-highlight Visual	guifg=#DADADA
-highlight Folded	guifg=#ffffff	guibg=#666666
-highlight Cursor	guifg=#666666	guibg=#000000	gui=bold
-highlight Special	guifg=#7F007F	guibg=#eeeeff	gui=bold
-highlight Comment	guifg=#007F00	guibg=#eeeeee
-highlight StatusLine	guifg=#000000	guibg=#aacccc
-highlight StatusLineNC	guifg=#557777	guibg=#ffffff
-highlight Statement	guifg=#007F7F			gui=bold
-highlight Type		guifg=#0000ff   gui=NONE
-highlight Function	guifg=#007F7F	gui=bold
-highlight LineNr	guifg=#000000	guibg=#bbbbbb
-highlight FoldColumn	guifg=#000000	guibg=#dddddd
-highlight Define	guifg=#00007F	guibg=#ddddff gui=bold
-highlight Number	guifg=#000000	guibg=#eeffff gui=bold
-highlight Subtitle	guifg=#000000	guibg=#66bbbb gui=bold,underline
-highlight String	guifg=#7F007F	guibg=#ffdddd
-highlight Delimiter	guifg=#000000	guibg=#dde0dd	gui=bold
-highlight PreProc	guifg=#0000ff	guibg=#ffffff	gui=bold
-highlight Constant	guifg=#000000	guibg=#aaaaaa gui=underline,bold
-
-"{{{
-
-"}}}
-
-
diff --git a/colors/sea.vim b/colors/sea.vim
deleted file mode 100755
index 0c79c47..0000000
--- a/colors/sea.vim
+++ /dev/null
@@ -1,69 +0,0 @@
-" Vim color file
-"  Maintainer: Tiza
-" Last Change: 2002/10/30 Wed 00:01.
-"     version: 1.0
-" This color scheme uses a dark background.
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "sea"
-
-hi Normal       guifg=#f0f0f8 guibg=#343478
-
-" Search
-hi IncSearch    gui=UNDERLINE,BOLD guifg=#ffffff guibg=#c030ff
-hi Search       gui=BOLD guifg=#f0e0ff guibg=#b020ff
-
-" Messages
-hi ErrorMsg     gui=BOLD guifg=#ffffff guibg=#f000a0
-hi WarningMsg   gui=BOLD guifg=#ffffff guibg=#f000a0
-hi ModeMsg      gui=BOLD guifg=#00e0ff guibg=NONE
-hi MoreMsg      gui=BOLD guifg=#00ffff guibg=#6060ff
-hi Question     gui=BOLD guifg=#00f0d0 guibg=NONE
-
-" Split area
-hi StatusLine   gui=NONE guifg=#000000 guibg=#d0d0e0
-hi StatusLineNC gui=NONE guifg=#606080 guibg=#d0d0e0
-hi VertSplit    gui=NONE guifg=#606080 guibg=#d0d0e0
-hi WildMenu     gui=NONE guifg=#000000 guibg=#ff90ff
-
-" Diff
-hi DiffText     gui=UNDERLINE guifg=#ffff00 guibg=#000000
-hi DiffChange   gui=NONE guifg=#ffffff guibg=#000000
-hi DiffDelete   gui=NONE guifg=#60ff60 guibg=#000000
-hi DiffAdd      gui=NONE guifg=#60ff60 guibg=#000000
-
-" Cursor
-hi Cursor       gui=NONE guifg=#ffffff guibg=#d86020
-hi lCursor      gui=NONE guifg=#ffffff guibg=#e000b0
-hi CursorIM     gui=NONE guifg=#ffffff guibg=#e000b0
-
-" Fold
-hi Folded       gui=NONE guifg=#ffffff guibg=#0080a0
-hi FoldColumn   gui=NONE guifg=#9090ff guibg=#3c3c88
-
-" Other
-hi Directory    gui=NONE guifg=#00ffff guibg=NONE
-hi LineNr       gui=NONE guifg=#7070e8 guibg=NONE
-hi NonText      gui=BOLD guifg=#8080ff guibg=#2c2c78
-hi SpecialKey   gui=BOLD guifg=#60c0ff guibg=NONE
-hi Title        gui=BOLD guifg=#f0f0f8 guibg=NONE
-hi Visual       gui=NONE guifg=#ffffff guibg=#6060ff
-" hi VisualNOS  gui=NONE guifg=#ffffff guibg=#6060ff
-
-" Syntax group
-hi Comment      gui=NONE guifg=#b0b0c8 guibg=NONE
-hi Constant     gui=NONE guifg=#60ffff guibg=NONE
-hi Error        gui=BOLD guifg=#ffffff guibg=#f000a0
-hi Identifier   gui=NONE guifg=#c0c0ff guibg=NONE
-hi Ignore       gui=NONE guifg=#303080 guibg=NONE
-hi PreProc      gui=NONE guifg=#ffb0ff guibg=NONE
-hi Special      gui=NONE guifg=#ffd858 guibg=NONE
-hi Statement    gui=NONE guifg=#f0f060 guibg=NONE
-hi Todo         gui=BOLD,UNDERLINE guifg=#ff70e0 guibg=NONE
-hi Type         gui=NONE guifg=#40ff80 guibg=NONE
-hi Underlined   gui=UNDERLINE,BOLD guifg=#f0f0f8 guibg=NONE
diff --git a/colors/sean.vim b/colors/sean.vim
deleted file mode 100755
index 1aa2b1e..0000000
--- a/colors/sean.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-" Maintainer:Sean Richards	
-" Last Change:Fri Aug 30  8:50 2002 NZST
-
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "sean"
-hi Normal		  	guifg=white  guibg=black
-hi SpecialKey	  	guifg=Blue
-hi NonText		  	gui=bold	guifg=Blue
-hi Directory	  	guifg=Blue
-hi ErrorMsg		  	guifg=White  guibg=Red
-hi Search		  	guifg=white  guibg=Red
-hi MoreMsg		  	gui=bold  guifg=SeaGreen
-hi ModeMsg		  	gui=bold  guifg=White	guibg=Blue
-hi LineNr		  	ctermfg=Darkyellow guifg=Yellow
-hi Question		  	gui=bold  guifg=Green
-hi StatusLineNC		cterm=none ctermfg=grey ctermbg=darkblue gui=NONE guifg=white guibg=darkblue
-hi StatusLine		cterm=none ctermfg=white ctermbg=darkblue gui=bold	guifg=white	guibg=darkblue
-hi VertSplit	  	gui=bold	guifg=White	guibg=darkblue
-hi Title			gui=bold	guifg=Magenta
-hi Visual			cterm=none ctermfg=white ctermbg=darkgreen gui=NONE		guifg=white guibg=darkgreen
-hi WarningMsg		guifg=Red
-hi FoldColumn		ctermfg=Black ctermbg=Grey guibg=DarkGrey guifg=Black
-hi Folded			ctermfg=Black ctermbg=Grey guifg=Black
-hi Cursor			guifg=bg	guibg=Green
-hi Comment			cterm=none ctermfg=darkgreen gui=italic guifg=green
-hi Constant			ctermfg=darkcyan guifg=darkcyan 
-hi Special			ctermfg=darkyellow guifg=Orange
-hi Identifier		ctermfg=cyan guifg=cyan 
-hi Statement		ctermfg=darkyellow gui=bold guifg=darkyellow 
-hi Number			ctermfg=Cyan guifg=Cyan
-hi PreProc			ctermfg=darkmagenta guifg=darkmagenta
-hi String			ctermfg=darkred guifg=Red
-hi Type				ctermfg=darkblue  guifg=blue
-hi Error			ctermfg=red guifg=Red	guibg=Black
-hi Todo				ctermfg=blue ctermbg=yellow guifg=Blue  guibg=Yellow
-hi link IncSearch		Visual
-hi link String			Constant
-hi link Character		Constant
-hi link Number			Constant
-hi link Boolean			Constant
-hi link Float			Number
-hi link Function		Identifier
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			Statement
-hi link Exception		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 SpecialChar		Special
-hi link Delimiter		Special
-hi link SpecialComment	Special
-hi link Debug			Special
-
-
-"Toggle semicolon matching at the end of lines, author unknown!
-nmap <silent> <leader>sc :call ToggleSemicolonHighlighting()<cr>
-"{{{
-function! ToggleSemicolonHighlighting()
-	if exists("b:semicolon")
-		unlet b:semicolon
-		hi semicolon guifg=NONE gui=NONE ctermfg=NONE
-	else
-		syn match semicolon #;$#
-		hi semicolon guifg=red gui=bold ctermfg=1
-		let b:semicolon = 1
-	endif
-endfunction
-"}}}
diff --git a/colors/seashell.vim b/colors/seashell.vim
deleted file mode 100755
index 8e63afe..0000000
--- a/colors/seashell.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Vim color file
-" Maintainer:   Gerald S. Williams
-" Last Change:  2007 Jun 13
-
-" This is very reminiscent of a seashell. Good contrast, yet not too hard on
-" the eyes. BlackSea, it's opposite, has now been folded into this scheme.
-
-let s:seashell_style = &background
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "seashell"
-
-if s:seashell_style == 'dark'
-    hi Normal guibg=Black guifg=seashell ctermfg=White
-    hi NonText guifg=LavenderBlush ctermfg=LightMagenta
-    hi DiffDelete guibg=DarkRed guifg=Black ctermbg=DarkRed ctermfg=White
-    hi DiffAdd guibg=DarkGreen ctermbg=DarkGreen ctermfg=White
-    hi DiffChange guibg=Gray30 ctermbg=DarkCyan ctermfg=White
-    hi DiffText gui=NONE guibg=DarkCyan ctermbg=DarkCyan ctermfg=Yellow
-    hi Comment guifg=LightBlue
-    hi PreProc ctermfg=Magenta
-    hi StatusLine guibg=#1f001f guifg=DarkSeaGreen cterm=NONE ctermfg=White ctermbg=DarkGreen
-    hi StatusLineNC guifg=Gray
-    hi VertSplit guifg=Gray
-    hi Type gui=NONE
-    hi Identifier guifg=Cyan
-    hi Statement guifg=brown3 ctermfg=DarkRed
-    hi Search guibg=Gold3 ctermfg=White
-    hi Folded guibg=gray20
-    hi FoldColumn guibg=gray10
-
-    " Original values:
-    "hi Constant guifg=DeepPink
-    "hi PreProc guifg=Magenta ctermfg=Magenta
-else
-    hi Normal guibg=seashell ctermbg=Gray ctermfg=Black
-    hi NonText guibg=LavenderBlush guifg=Gray30
-    hi LineNr guibg=LavenderBlush guifg=Gray30
-    hi DiffDelete guibg=LightRed guifg=Black ctermbg=DarkRed ctermfg=White
-    hi DiffAdd guibg=LightGreen ctermbg=DarkGreen ctermfg=White
-    hi DiffChange guibg=Gray90 ctermbg=DarkCyan ctermfg=White
-    hi DiffText gui=NONE guibg=LightCyan2 ctermbg=DarkCyan ctermfg=Yellow
-    hi Comment guifg=MediumBlue
-    hi Constant guifg=DeepPink
-    hi PreProc guifg=DarkMagenta
-    hi StatusLine guibg=White guifg=DarkSeaGreen cterm=None ctermfg=White ctermbg=DarkGreen
-    hi StatusLineNC gui=None guibg=Gray
-    hi VertSplit gui=None guibg=Gray
-    hi Identifier guifg=#006f6f
-    hi Statement ctermfg=DarkRed
-    hi MatchParen guibg=turquoise
-endif
diff --git a/colors/selenitic.vim b/colors/selenitic.vim
deleted file mode 100755
index c3654b2..0000000
--- a/colors/selenitic.vim
+++ /dev/null
@@ -1,38 +0,0 @@
-" Port of http://studiostyles.info/schemes/selenitic
-" to vim
-" Last Change: 2010 sep 28
-" Version: 1.0
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name='selenitic'
-
-hi Comment      guifg=#7A987A
-hi Normal       guifg=#DFDFBF guibg=#333333
-hi CursorLine   guibg=#434343
-hi CursorColumn guibg=#434343
-hi Visual       guibg=#486A65
-hi VisualNOS    guibg=#486A65
-hi Number       guifg=#6E96BE
-hi String       guifg=#DFAF8F
-hi Structure    guifg=#8ACCCF
-hi Type         guifg=#8ACCCF
-hi FoldColumn   guibg=#F0F0F0 guibg=#333333
-hi LineNr       guifg=#7A987A guibg=#333333
-hi PreProc      guifg=#EFC986
-hi Keyword      guifg=#EFC986
-hi Conditional  guifg=#EFC986
-hi Statement    guifg=#EFC986
-hi htmlArg      guifg=#DFDFBF
-hi htmlTagName  guifg=#EFC986
-hi xmlCdata     guifg=#808080
-hi xmlTagName   guifg=#EFC986
-hi ErrorMsg     guifg=#EFC986
-hi WarningMsg   guifg=#7A987A
-hi Folded       guifg=#808080
-hi Search       guibg=#505050
-hi PMenu        guifg=#CCCCFF guibg=#232323
-hi PMenuSel     guibg=#303030
-
diff --git a/colors/seoul.vim b/colors/seoul.vim
deleted file mode 100755
index aa90b22..0000000
--- a/colors/seoul.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-" Vim color scheme
-"
-" Name:         seoul.vim
-" Maintainer:   Eivind Uggedal <eu@redflavor.com> [http://redflavor.com]
-" Last Change:  2008-04-16
-" Version:      1.1
-"
-" A 88 color vim scheme intended for rxvt-unicode terminals. Will also work
-" under xterm's 256 color mode. It uses special higlight groups for Ruby,
-" but should function with other syntaxes as well. The name is inspired from
-" the '88 summer olympics in Seoul, South Korea. The scheme is somewhat
-" inspired by Justin Palmer's Vibrant Ink. The latest version should be
-" available at: http://redflavor.com/seoul.vim
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "seoul"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-  set t_Co=88
-
-  hi Normal               ctermfg=15  ctermbg=0
-  hi Cursor               ctermfg=0   ctermbg=11
-  hi CursorLine           ctermfg=15  ctermbg=80  cterm=NONE
-
-  hi Keyword              ctermfg=68
-  hi Define               ctermfg=68    "module,class,def,end
-  hi Statement            ctermfg=68    "begin,do-end,if,private
-  hi Include              ctermfg=68    "include
-
-  hi Constant             ctermfg=15    "self,1,true
-  hi Identifier           ctermfg=27    "@@var,@var,|var|
-
-  hi Type                 ctermfg=76    "Mod::Deffed, Classdeffed
-  hi Function             ctermfg=76    "methoddeffed
-
-  hi String               ctermfg=28  ctermbg=0
-  hi Special              ctermfg=28  ctermbg=0
-
-  hi Comment              ctermfg=84
-  hi PreProc              ctermfg=15    "#!/bin/sh
-
-  hi rubyStringDelimiter  ctermfg=27
-  hi rubySymbol           ctermfg=27
-  hi rubyInterpolation    ctermfg=78
-
-  hi rubyConstant         ctermfg=51    "SomeClass,SomeModule
-  hi rubyPseudoVariable   ctermfg=27    "self,true
-
-  hi Search               ctermfg=0   ctermbg=72
-  hi IncSearch            ctermfg=0   ctermbg=72
-
-  hi TabLine              ctermfg=15  ctermbg=0
-  hi TabLineFill          ctermfg=15  ctermbg=0   cterm=underline
-  hi TabLineSel           ctermfg=0   ctermbg=86
-
-  hi Error                ctermfg=7   ctermbg=1
-  hi ErrorMsg             ctermfg=7   ctermbg=1
-endif
diff --git a/colors/seoul256-light.vim b/colors/seoul256-light.vim
deleted file mode 100644
index a4552e4..0000000
--- a/colors/seoul256-light.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-" "  _____             _ ___ ___ ___            "
-" " |   __|___ ___ _ _| |_  |  _|  _|           "
-" " |__   | -_| . | | | |  _|_  | . |           "
-" " |_____|___|___|___|_|___|___|___|-light.vim "
-"
-" " Low-contrast light Vim color scheme using Seoul Colors "
-"
-" File:         seoul256-light.vim
-" URL:          github.com/junegunn/seoul256.vim
-" Author:       Junegunn Choi (junegunn.c@gmail.com)
-" Version:      1.3.0
-" Last Updated: October 16, 2013
-" License:      MIT
-"
-" Copyright (c) 2013 Junegunn Choi
-"
-" MIT License
-"
-" Permission is hereby granted, free of charge, to any person obtaining
-" a copy of this software and associated documentation files (the
-" "Software"), to deal in the Software without restriction, including
-" without limitation the rights to use, copy, modify, merge, publish,
-" distribute, sublicense, and/or sell copies of the Software, and to
-" permit persons to whom the Software is furnished to do so, subject to
-" the following conditions:
-"
-" The above copyright notice and this permission notice shall be
-" included in all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-let s:master    = get(split(globpath(&rtp, 'colors/seoul256.vim'), '\n'), 0, '')
-let s:custom_bg = get(g:, 'seoul256_background', 253)
-let s:dark      = s:custom_bg >= 233 && s:custom_bg <= 239
-
-if !empty(s:master)
-  try
-    " Ignore g:seoul256_background and force light version
-    if s:dark
-      unlet g:seoul256_background
-    endif
-
-    if get(g:, 'colors_name', '') == 'seoul256-light' && &background == 'dark'
-      set background=dark
-    else
-      set background=light
-    endif
-    let g:colors_name = 'seoul256'
-    execute 'silent source '.s:master
-    let g:colors_name = &background == 'dark' ? 'seoul256' : 'seoul256-light'
-  finally
-    if s:dark
-      let g:seoul256_background = s:custom_bg
-    endif
-  endtry
-else
-  echom 'seoul256.vim not found'
-endif
-
diff --git a/colors/settlemyer.vim b/colors/settlemyer.vim
deleted file mode 100755
index 91495ff..0000000
--- a/colors/settlemyer.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" Vim color file
-" Maintainer: Max Lynch <lynch3@wisc.edu>
-" URL:  http://muffinpeddler.com
-" Version: 0.1
-"
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="settlemyer"
-
-hi Normal guibg=gray25 guifg=gray85
-hi Cursor guibg=red3 guifg=bg
-
-" Syntax Highlighting
-hi Comment guifg=LightPink
-hi Constant guifg=SpringGreen
-" hi Identifier gui=bold guifg=SkyBlue
-" hi Function guifg=Wheat3
-" hi Type guifg=orange1
-hi Keyword guifg=SkyBlue
-hi PreProc guifg=SkyBlue
-hi Statement guifg=SkyBlue
-hi Type gui=bold guifg=SkyBlue
-hi NonText guifg=DarkGray
-hi Tags guifg=orange1
-
-hi link Character		Constant
-hi link Number			Constant
-hi link Float			Constant
-hi link Function		Statement
-hi link Conditional		Statement
-hi link Repeat			Statement
-hi link Label			Statement
-hi link Operator		Statement
-hi link Keyword			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				Tags
diff --git a/colors/sf.vim b/colors/sf.vim
deleted file mode 100755
index 5b3033f..0000000
--- a/colors/sf.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-" GUI-only vim color file, based on colors from vim.sf.net
-" Author:      Christian MICHON
-" Email:       christian_michon@yahoo.fr
-" Version:     1.1
-" Last Change: 28 Jul 2004
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "sf"
-
-hi Boolean        guifg=#007f00 guibg=#f0f0dd gui=none
-hi Character      guifg=#007f00 guibg=#f0f0dd gui=none
-hi Comment        guifg=#b0b0b0 guibg=#f0f0dd gui=underline
-hi Conditional    guifg=#0000ee guibg=#f0f0dd gui=bold
-hi Constant       guifg=#007f00 guibg=#f0f0dd gui=none
-hi Cursor         guifg=#f0f0dd guibg=#cc0000 gui=none
-hi Debug          guifg=#0000ee guibg=#f0f0dd gui=none
-hi Define         guifg=#cc0000 guibg=#f0f0dd gui=none
-hi Delimiter      guifg=#0000ee guibg=#f0f0dd gui=none
-hi DiffAdd        guifg=#551a8b guibg=#007f00 gui=bold
-hi DiffChange     guifg=#f0f0dd guibg=#007f00 gui=none
-hi DiffDelete     guifg=#551a8b guibg=#007f00 gui=none
-hi DiffText       guifg=#f0f0dd guibg=#551a8b gui=bold
-hi Directory      guifg=#cc0000 guibg=#f0f0dd gui=underline
-hi Error          guifg=#ffffff guibg=#cc0000 gui=bold
-hi ErrorMsg       guifg=#ffffff guibg=#cc0000 gui=bold
-hi Exception      guifg=#0000ee guibg=#f0f0dd gui=bold
-hi Float          guifg=#007f00 guibg=#f0f0dd gui=none
-hi FoldColumn     guifg=#f0f0dd guibg=#007f00 gui=bold
-hi Folded         guifg=#f0f0dd guibg=#007f00 gui=bold
-hi Function       guifg=#cc0000 guibg=#f0f0dd gui=none
-hi Identifier     guifg=#cc0000 guibg=#f0f0dd gui=none
-hi Ignore         guifg=#f0f0dd guibg=#f0f0dd gui=none
-hi Include        guifg=#cc0000 guibg=#f0f0dd gui=none
-hi IncSearch      guifg=#ffffff guibg=#38d878 gui=bold
-hi Keyword        guifg=#0000ee guibg=#f0f0dd gui=bold
-hi Label          guifg=#0000ee guibg=#f0f0dd gui=bold
-hi lCursor        guifg=#000066 guibg=#f0f0dd gui=none
-hi LineNr         guifg=#b0b0b0 guibg=#007f00 gui=bold
-hi Macro          guifg=#cc0000 guibg=#f0f0dd gui=none
-hi ModeMsg        guifg=#000066 guibg=#f0f0dd gui=bold
-hi MoreMsg        guifg=#551a8b guibg=#f0f0dd gui=bold
-hi NonText        guifg=#b0b0b0 guibg=#f0f0dd gui=bold
-hi Normal         guifg=#000066 guibg=#f0f0dd gui=none
-hi Number         guifg=#007f00 guibg=#f0f0dd gui=none
-hi Operator       guifg=#0000ee guibg=#f0f0dd gui=bold
-hi PreCondit      guifg=#cc0000 guibg=#f0f0dd gui=none
-hi PreProc        guifg=#cc0000 guibg=#f0f0dd gui=none
-hi Question       guifg=#551a8b guibg=#f0f0dd gui=bold
-hi Repeat         guifg=#0000ee guibg=#f0f0dd gui=bold
-hi Search         guifg=#ffffff guibg=#38d878 gui=bold
-hi Special        guifg=#999973 guibg=#f0f0dd gui=none
-hi SpecialChar    guifg=#0000ee guibg=#f0f0dd gui=none
-hi SpecialComment guifg=#0000ee guibg=#f0f0dd gui=none
-hi SpecialKey     guifg=#cc0000 guibg=#f0f0dd gui=none
-hi Statement      guifg=#0000ee guibg=#f0f0dd gui=bold
-hi StatusLine     guifg=#f0f0dd guibg=#cc0000 gui=bold
-hi StatusLineNC   guifg=#f0f0dd guibg=#000066 gui=bold
-hi StorageClass   guifg=#551a8b guibg=#f0f0dd gui=bold
-hi String         guifg=#007f00 guibg=#f0f0dd gui=none
-hi Structure      guifg=#551a8b guibg=#f0f0dd gui=bold
-hi Tag            guifg=#0000ee guibg=#f0f0dd gui=none
-hi Title          guifg=#007f00 guibg=#f0f0dd gui=bold
-hi Todo           guifg=#f0f0dd guibg=#0000ee gui=none
-hi Type           guifg=#551a8b guibg=#f0f0dd gui=bold
-hi Typedef        guifg=#551a8b guibg=#f0f0dd gui=bold
-hi Underlined     guifg=#0000ee guibg=#f0f0dd gui=underline
-hi VertSplit      guifg=#f0f0dd guibg=#000066 gui=bold
-hi Visual         guifg=#ffffff guibg=#00009c gui=none
-hi VisualNOS      guifg=#ffffff guibg=#b0b0b0 gui=none
-hi WarningMsg     guifg=#ffffff guibg=#cc0000 gui=bold
-hi WildMenu       guifg=#f0f0dd guibg=#0000ee gui=none
diff --git a/colors/shadesofamber.vim b/colors/shadesofamber.vim
deleted file mode 100755
index bbf978e..0000000
--- a/colors/shadesofamber.vim
+++ /dev/null
@@ -1,114 +0,0 @@
-" Vim color file
-" Maintainer: Tim Brown <tim@timb.net>
-" Last Change: 2010-09-22
-" Version: 1.1
-" URI: 
-"
-" Changes:
-" 1.1 six digit colours (e.g. #ff0000 -> #ff0000)
-" 1.0 initial release
-
-
-""" Init
-set background=dark
-highlight clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "shadesofamber"
-
-
-"------- COLORS --------
-"-- GUI Colors
-highlight BadStyle      gui=undercurl guifg=#ff0000    guibg=#330000
-
-highlight Cursor        gui=None   guifg=black guibg=#ffee00
-highlight CursorIM      gui=italic guifg=black guibg=#ffee00
-highlight Directory                guifg=green guibg=bg
-highlight DiffAdd       gui=None   guifg=green   guibg=#002200
-
-highlight DiffChange    gui=none  guifg=#ffff00 guibg=#442200
-highlight DiffDelete    gui=None      guifg=#440000 guibg=#220000
-highlight DiffText      gui=undercurl guifg=#ffff00    guibg=#663300
-highlight ErrorMsg      gui=None   guifg=#ffff00  guibg=#ff4400
-highlight VertSplit     gui=None   guifg=#112200 guibg=#ffcc00
-highlight Folded        gui=Bold   guibg=#334400 guifg=#cc9900
-highlight FoldColumn    gui=None   guibg=#112200 guifg=#ffcc00
-highlight IncSearch     gui=undercurl guibg=#330066 guifg=fg
-highlight LineNr        gui=None   guibg=#334400 guifg=#cc9900
-highlight ModeMsg       gui=none   guibg=#004400  guifg=#00ff00
-highlight MoreMsg       gui=italic guifg=SeaGreen4 guibg=bg
-highlight NonText       guibg=#112200 guifg=#ffcc00
-highlight Normal        gui=None   guibg=#000000 guifg=#ffee00
-highlight Question      gui=italic guifg=SeaGreen2 guibg=bg
-highlight Search        gui=bold   guibg=#440088 guifg=fg
-highlight SpecialKey    gui=bold   guibg=#004400 guifg=#ffff00
-highlight StatusLine    gui=bold   guibg=#ffcc00 guifg=#000088
-highlight StatusLineNC  gui=none   guibg=#ffcc00 guifg=#333300
-highlight Title         gui=bold,italic  guifg=black guibg=#ffff00
-highlight Visual        gui=reverse guibg=#ffff00 guifg=#008800
-highlight VisualNOS     gui=italic,underline guifg=fg guibg=bg
-highlight WarningMsg    gui=bold   guifg=#ff0000 guibg=bg
-highlight WildMenu      gui=bold   guibg=#008888 guifg=#ffff00
-highlight ColorColumn   gui=bold,italic guibg=#444400 guifg=#ff0000
-
-"-- Syntax Colors
-"highlight Comment       gui=reverse guifg=#507080
-highlight Comment       gui=None guifg=#ffaa00 guibg=#221100
-
-highlight Constant      gui=bold guifg=white guibg=bg
-highlight String      gui=none   guifg=#ccff00 guibg=bg
-"highlight Character gui=None guifg=Cyan guibg=bg
-highlight Number      gui=None guifg=#ccff00 guibg=bg
-highlight Boolean     gui=none guifg=#ff8800 guibg=bg
-"highlight Float gui=None guifg=Cyan guibg=bg
-
-highlight Identifier  guifg=#ddcc00
-highlight Function    gui=None guifg=#ffff88 guibg=bg
-
-highlight Statement   gui=bold   guifg=#ff8800
-highlight Conditional gui=Bold   guifg=#ff8800 guibg=bg
-highlight Repeat      gui=Bold   guifg=#ff8800 guibg=bg
-highlight Label       gui=Bold   guifg=#ff8800 guibg=bg
-highlight Operator    gui=Bold   guifg=#ff8800 guibg=bg
-highlight Keyword     gui=Bold   guifg=#ff8800 guibg=bg
-highlight Exception   gui=Bold   guifg=#ff8800 guibg=bg
-
-highlight PreProc       guifg=#ffff88
-"highlight Include gui=None guifg=MediumLightSkyBlue1 guibg=bg
-"highlight Define gui=None guifg=MediumLightSkyBlue1g guibg=bg
-"highlight Macro gui=None guifg=MediumLightSkyBlue1g guibg=bg
-"highlight PreCondit gui=None guifg=MediumSlateBlue guibg=bg
-
-highlight Type          gui=bold guifg=#ff8800
-"highlight StorageClass gui=None guifg=LightBlue guibg=bg
-"highlight Structure gui=None guifg=LightBlue guibg=bg
-"highlight Typedef gui=None guifg=LightBlue guibg=bg
-
-highlight Special       gui=none guifg=#ff8800
-"highlight SpecialChar gui=italic guifg=White guibg=bg
-"highlight Tag gui=italic guifg=White guibg=bg
-"highlight Delimiter gui=italic guifg=White guibg=bg
-"highlight SpecialComment gui=italic guifg=White guibg=bg
-"highlight Debug gui=italic guifg=White guibg=bg
-
-highlight Underlined gui=underline guifg=fg guibg=bg
-
-highlight Ignore     guifg=#aaaa00
-
-highlight Error      gui=italic guifg=#ffff00  guibg=#ff0000
-highlight Todo       gui=bold guifg=yellow guibg=#aa7700
-
-"-- OLD COLORS
-"highlight prologAtom guifg=#dddd00 gui=italic
-highlight prologVariable     gui=bold,italic guifg=#00ff00
-highlight prologFreeVariable gui=italic      guifg=#00ff00
-highlight xpceVariable       gui=bold        guifg=#ffff00 guibg=#666666
-highlight xpceKeyword        gui=bold        guifg=#ff8800 guibg=#666666
-
-highlight MatchParen         gui=bold        guibg=#448800 guifg=#ccff00
-
-highlight Pmenu         gui=bold        guifg=#ffcc00 guibg=#004400
-highlight PmenuSel      gui=bold        guibg=#ffcc00 guifg=#004400
-highlight PmenuSbar     gui=bold        guibg=#884400 guifg=#004400
-highlight PmenuThumb    gui=bold        guibg=#ffff00 guifg=#004400
diff --git a/colors/shobogenzo.vim b/colors/shobogenzo.vim
deleted file mode 100755
index dfd0abc..0000000
--- a/colors/shobogenzo.vim
+++ /dev/null
@@ -1,98 +0,0 @@
-" Vim color file
-" Name:         shobogenzo.vim
-" Maintainer:   Jeroen Ruigrok van der Werven <asmodai@in-nomine.org>
-" Last Change:  $Id: shobogenzo.vim 99 2008-04-09 09:01:30Z asmodai $
-"
-" This should work in xterm (256 colour mode).  It will not (yet) work in 8/16
-" colour terminals.
-"
-" Inspired by "desert256" this colorscheme has colours that should be easy on
-" the eyes for long periods of coding.
-"
-" Simply copy this file to your $HOME/.vim/colors and within vim do:
-" :set colorscheme shobogenzo
-" When using Gnome terminal you will need to make sure your profile's colors
-" are set to xterm.
-"
-" The Shōbōgenzō is Dōgen Zenji's collection of Zen Buddhist fascicles,
-" written between 1231 and 1253.
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-       syntax reset
-    endif
-endif
-
-let colors_name = "shobogenzo"
-let g:colors_name = "shobogenzo"
-
-hi Normal         term=none ctermfg=229 ctermbg=0 gui=none guifg=#ffffaf guibg=#000000
-hi IncSearch      term=reverse cterm=bold ctermfg=232 ctermbg=215 gui=reverse guifg=#ffaf5f guibg=#080808
-hi Search         term=none ctermfg=232 ctermbg=215 gui=none guifg=#080808 guibg=#ffaf5f
-hi ErrorMsg       term=none ctermfg=15 ctermbg=196 gui=none guifg=#ffffff guibg=#ff0000
-hi WarningMsg     term=none cterm=bold ctermfg=15 ctermbg=202 gui=none guifg=#ffffff guibg=#ff5f00
-hi ModeMsg        term=bold ctermfg=95 gui=bold guifg=#875f5f
-hi MoreMsg        term=reverse cterm=none ctermfg=229 ctermbg=95 gui=none guifg=#ffffaf guibg=#875f5f
-hi Question       term=none cterm=bold ctermfg=214 guifg=#ffaf00
-hi StatusLine     term=bold,reverse cterm=none ctermfg=229 ctermbg=95 gui=none guifg=#ffffaf guibg=#875f5f
-hi StatusLineNC   term=reverse cterm=none ctermfg=229 ctermbg=95 gui=none guifg=#875f5f guibg=#ffffaf
-hi VertSplit      term=reverse cterm=none ctermfg=16 ctermbg=229 guifg=#ffffaf guibg=#000000
-hi WildMenu       term=none cterm=none ctermfg=214 ctermbg=232 guifg=#ffaf00 guibg=#080808
-
-hi DiffAdd        term=bold ctermfg=229 ctermbg=34 guifg=#ffffaf guibg=#00af00
-hi DiffChange     term=bold ctermfg=229 ctermbg=32 guifg=#ffffaf guibg=#0087d7
-hi DiffDelete     term=bold ctermfg=229 ctermbg=124 guifg=#ffffaf guibg=#af0000
-hi DiffText       term=reverse ctermfg=229 ctermbg=34 guifg=#ffffaf guibg=#00af00
-
-hi SignColumn     term=standout ctermfg=60 ctermbg=7 guifg=#5f5f87 guibg=#bbbbbb
-
-if version >= 700
-  hi CursorColumn   term=reverse ctermbg=242 guibg=#6c6c6c
-  hi CursorLine     term=underline cterm=underline guibg=#6c6c6c
-  hi MatchParen     term=reverse ctermbg=32 guibg=#0087d7
-  hi Pmenu          ctermbg=95 guibg=#875f5f
-  hi PmenuSel       ctermfg=15 ctermbg=60 guifg=#ffffff guibg=#5f5f87
-  hi PmenuThumb     cterm=reverse
-  hi PmenuSbar      ctermbg=248
-  hi SpellBad       term=reverse ctermbg=196 gui=undercurl guisp=#ff0000
-  hi SpellCap       term=reverse ctermfg=0 ctermbg=95 gui=undercurl guisp=#875f5f
-  hi SpellRare      term=reverse ctermbg=202 gui=undercurl guisp=#ff5f00
-  hi SpellLocal     term=underline ctermbg=34 gui=undercurl guisp=#00af00
-  hi TabLine        term=underline cterm=underline ctermfg=15 ctermbg=242
-  hi TabLineSel     term=bold cterm=bold
-  hi TabLineFill    term=reverse cterm=reverse
-endif
-
-hi Cursor         term=none ctermfg=237 ctermbg=202 guifg=#ffffff guibg=#ff5f00
-hi lCursor        term=none ctermfg=237 ctermbg=202 guifg=#ffffff guibg=#ff5f00
-hi CursorIM       term=none ctermfg=237 ctermbg=202 guifg=#ffffff guibg=#ff5f00
-
-hi Folded         term=none ctermfg=230 ctermbg=60 guifg=#ffffd7 guibg=#5f5f87
-hi FoldColumn     term=none ctermfg=7 ctermbg=60 guifg=#bbbbbb guibg=#5f5f87
-
-hi Directory      term=none ctermfg=47 ctermbg=none guifg=#00ff5f
-hi LineNr         term=none ctermfg=0 ctermbg=146 guifg=#000000 guibg=#afafd7
-hi NonText        term=none cterm=none ctermfg=230 ctermbg=60 gui=none guifg=#ffffd7 guibg=#5f5f87
-hi SpecialKey     term=bold ctermfg=32 ctermbg=none guifg=#0087d7
-hi Title          term=bold cterm=bold ctermfg=130 ctermbg=232 guifg=#af5f00 guibg=#080808
-hi Visual         term=none cterm=reverse ctermfg=80 ctermbg=59 gui=reverse guifg=#5f5f5f guibg=#5fd7d7
-
-hi Comment        term=bold ctermfg=195 guifg=#d7ffff
-hi Constant       cterm=none ctermfg=73 ctermbg=none guifg=#5fafaf
-hi String         cterm=none ctermfg=215 ctermbg=237 guifg=#ffaf5f guibg=#3a3a3a
-hi Error          term=reverse ctermfg=15 ctermbg=9 guifg=#ffffff guibg=#ff5555
-hi Statement      cterm=none ctermfg=221 gui=none guifg=#ffd75f
-hi Identifier     term=bold cterm=none ctermfg=210 ctermbg=none guifg=#ff8787
-hi Ignore         cterm=none ctermfg=38 ctermbg=none
-hi Number         cterm=none ctermfg=146 ctermbg=none guifg=#afafd7
-hi PreProc        term=underline ctermfg=81 guifg=#5fd7ff
-hi Special        term=bold ctermfg=224 guifg=#ffd7d7
-hi Function       term=bold cterm=bold ctermfg=210 ctermbg=none guifg=#ff8787
-hi Todo           term=none ctermfg=0 ctermbg=11 guifg=#000000 guibg=#ffff55
-hi Type           cterm=none ctermfg=175 ctermbg=none gui=none guifg=#d787af
-hi Underlined     term=underline cterm=underline ctermfg=81 guifg=#5fd7ff
-hi TaglistTagName cterm=bold ctermfg=26 ctermbg=none guifg=#005fd7
-
-" vim: set et :
diff --git a/colors/sienna.vim b/colors/sienna.vim
deleted file mode 100755
index 08b8eda..0000000
--- a/colors/sienna.vim
+++ /dev/null
@@ -1,150 +0,0 @@
-" Vim colour scheme
-" Maintainer:	Georg Dahn
-" Last Change:	26 April 2006
-" Version:	1.6
-"
-" This color scheme has both light and dark styles with harmonic colors
-" easy to distinguish. Terminals are not supported, therefore you should
-" only try it if you use the GUI version of Vim.
-"
-" You can choose the style by adding one of the following lines to your
-" vimrc or gvimrc file before sourcing the color scheme:
-"
-" let g:sienna_style = 'dark'
-" let g:sienna_style = 'light'
-"
-" If none of above lines is given, the light style is choosen.
-"
-" You can switch between these styles by using the :Colo command, like
-" :Colo dark or :Colo light (many thanks to Pan Shizhu).
-
-if exists("g:sienna_style")
-    let s:sienna_style = g:sienna_style
-else
-    let s:sienna_style = 'light'
-endif
-
-execute "command! -nargs=1 Colo let g:sienna_style = \"<args>\" | colo sienna"
-
-if s:sienna_style == 'dark'
-    set background=dark
-elseif s:sienna_style == 'light'
-    set background=light
-else
-    finish
-endif
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = 'sienna'
-
-if s:sienna_style == 'dark'
-    hi Normal gui=none guifg=Grey85 guibg=Grey15
-
-    hi Cursor guifg=Black guibg=Grey85
-    hi LineNr gui=none guifg=Grey65
-    hi NonText gui=bold guifg=Grey65 guibg=Grey20
-    hi SpecialKey gui=none guifg=SkyBlue2
-    hi Title gui=bold guifg=Grey85
-    hi Visual gui=bold guifg=Black guibg=LightSalmon1
-
-    hi FoldColumn gui=none guifg=Black guibg=Wheat3
-    hi Folded gui=none guifg=White guibg=Wheat4
-    hi StatusLine gui=bold guifg=Black guibg=Grey85
-    hi StatusLineNC gui=none guifg=White guibg=DimGray
-    hi VertSplit gui=none guifg=White guibg=DimGray
-    hi Wildmenu gui=bold guifg=White guibg=Black
-
-    hi Pmenu guibg=Grey55 guifg=Black gui=none
-    hi PmenuSbar guibg=Grey40 guifg=fg gui=none
-    hi PmenuSel guibg=Yellow2 guifg=Black gui=none
-    hi PmenuThumb guibg=Grey80 guifg=bg gui=none    
-
-    hi IncSearch gui=none guifg=Grey15 guibg=Grey85
-    hi Search gui=none guifg=Black guibg=Yellow2
-
-    hi MoreMsg gui=bold guifg=PaleGreen2
-    hi Question gui=bold guifg=PaleGreen2
-    hi WarningMsg gui=bold guifg=Red
-
-    hi Comment gui=italic guifg=SkyBlue3
-    hi Error gui=none guifg=White guibg=Red2
-    hi Identifier gui=none guifg=LightSalmon2
-    hi Special gui=none guifg=SkyBlue2
-    hi PreProc gui=none guifg=SkyBlue3
-    hi Todo gui=bold guifg=Black guibg=Yellow2
-    hi Type gui=bold guifg=SkyBlue2
-    hi Underlined gui=underline guifg=DodgerBlue
-
-    hi Boolean gui=bold guifg=PaleGreen2
-    hi Constant gui=none guifg=PaleGreen2
-    hi Number gui=bold guifg=PaleGreen2
-    hi String gui=none guifg=PaleGreen2
-
-    hi Label gui=bold,underline guifg=LightSalmon2
-    hi Statement gui=bold guifg=LightSalmon2
-
-    hi htmlBold gui=bold
-    hi htmlItalic gui=italic
-    hi htmlUnderline gui=underline
-    hi htmlBoldItalic gui=bold,italic
-    hi htmlBoldUnderline gui=bold,underline
-    hi htmlBoldUnderlineItalic gui=bold,underline,italic
-    hi htmlUnderlineItalic gui=underline,italic
-elseif s:sienna_style == 'light'
-    hi Normal gui=none guifg=Black guibg=White
-
-    hi Cursor guifg=White guibg=Black
-    hi LineNr gui=none guifg=DarkGray
-    hi NonText gui=bold guifg=DarkGray guibg=Grey95
-    hi SpecialKey gui=none guifg=RoyalBlue4
-    hi Title gui=bold guifg=Black
-    hi Visual gui=bold guifg=Black guibg=Sienna1
-
-    hi FoldColumn gui=none guifg=Black guibg=Wheat2
-    hi Folded gui=none guifg=Black guibg=Wheat1
-    hi StatusLine gui=bold guifg=White guibg=Black
-    hi StatusLineNC gui=none guifg=White guibg=DimGray
-    hi VertSplit gui=none guifg=White guibg=DimGray
-    hi Wildmenu gui=bold guifg=Black guibg=White
-
-    hi Pmenu guibg=Grey65 guifg=Black gui=none
-    hi PmenuSbar guibg=Grey50 guifg=fg gui=none
-    hi PmenuSel guibg=Yellow guifg=Black gui=none
-    hi PmenuThumb guibg=Grey75 guifg=fg gui=none
-
-    hi IncSearch gui=none guifg=White guibg=Black
-    hi Search gui=none guifg=Black guibg=Yellow
-
-    hi MoreMsg gui=bold guifg=ForestGreen
-    hi Question gui=bold guifg=ForestGreen
-    hi WarningMsg gui=bold guifg=Red
-
-    hi Comment gui=italic guifg=RoyalBlue3
-    hi Error gui=none guifg=White guibg=Red
-    hi Identifier gui=none guifg=Sienna4
-    hi Special gui=none guifg=RoyalBlue4
-    hi PreProc gui=none guifg=RoyalBlue3
-    hi Todo gui=bold guifg=Black guibg=Yellow
-    hi Type gui=bold guifg=RoyalBlue4
-    hi Underlined gui=underline guifg=Blue
-
-    hi Boolean gui=bold guifg=ForestGreen
-    hi Constant gui=none guifg=ForestGreen
-    hi Number gui=bold guifg=ForestGreen
-    hi String gui=none guifg=ForestGreen
-
-    hi Label gui=bold,underline guifg=Sienna4
-    hi Statement gui=bold guifg=Sienna4
-
-    hi htmlBold gui=bold
-    hi htmlItalic gui=italic
-    hi htmlUnderline gui=underline
-    hi htmlBoldItalic gui=bold,italic
-    hi htmlBoldUnderline gui=bold,underline
-    hi htmlBoldUnderlineItalic gui=bold,underline,italic
-    hi htmlUnderlineItalic gui=underline,italic
-endif
diff --git a/colors/sift.vim b/colors/sift.vim
deleted file mode 100755
index f582d4e..0000000
--- a/colors/sift.vim
+++ /dev/null
@@ -1,167 +0,0 @@
-" Vim color file
-" sift v1.3c
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo sift in your VimRC/GVimRC file
-"     * GvimRC if using GUI any
-"
-"   - Thanks to Desert and OceanDeep for their color scheme 
-"     file layouts
-"   - Thanks to Raimon Grau for his feedback
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="sift"
-
-hi Normal       guifg=#b4dcbc guibg=#0c121c
-hi NonText      guifg=#382920 guibg=#041328
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-hi Comment		guifg=#007868
-hi Title		guifg=#09f909  gui=none
-hi Underlined   guifg=#49f95f gui=none
-
-hi Statement    guifg=#efef70  "gui=none
-hi Type			guifg=#60e5bf  gui=none
-hi Constant		guifg=#0ad8ff
-hi Number		guifg=#eabaff
-hi PreProc      guifg=#f085b4
-hi Identifier   guifg=#50f0b4
-hi Special		guifg=#88a0d4 
-hi Operator		guifg=#f0da00 
-"hi Keyword		guifg=green
-"hi Error        guibg=#408452
-hi Function     guifg=#c08a50 guibg=bg gui=bold "or green 50b3b0 
-hi Conditional	guifg=#f8f024 guibg=bg
-hi Repeat		guifg=#ffa400 guibg=bg gui=bold
-hi Exception	guifg=#dfff80
-"hi Ignore       guifg=grey40
-"hi Todo			guifg=orangered guibg=yellow2
-"""""this section borrowed from OceanDeep/Midnight"""""
-"hi Label gui=None guifg=LightGreen guibg=bg
-"highlight Operator gui=None guifg=#daca65 guibg=bg
-"highlight Keyword gui=bold guifg=grey guibg=bg
-"highlight Exception gui=none guifg=#ea5460 guibg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cad5c0 guifg=#05293d
-
-hi Folded       guibg=#201328 guifg=#BBDDCC
-hi FoldColumn	guibg=#130014 guifg=#dbcaa5
-"hi FoldColumn	guibg=#83a5cd guifg=#70459F
-hi LineNr       guibg=bg guifg=#207585 gui=bold
-"hi LineNr       guibg=#081c30 guifg=#80a0dA 
-hi StatusLine	guibg=#20aaea guifg=#202050 gui=bold
-hi StatusLineNC	guibg=#2a90c0 guifg=#204050 gui=bold
-
-hi Search       guibg=#9a9d8d guifg=#3a4520
-hi IncSearch	guifg=#caceba guibg=#3a4520 
-
-hi VertSplit	guibg=#325f95 guifg=grey50 gui=none
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=#4a8FcF guibg=#032F5F
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-hi MatchParen   guibg=#200080 guifg=#f0f080
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=grey
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=darkred
-highlight Repeat ctermfg=darkred
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=darkcyan ctermbg=NONE
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=blue ctermbg=grey cterm=NONE
-hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=grey cterm=NONE
-hi Title	ctermfg=Yellow cterm=NONE
-hi Visual	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgreen ctermbg=NONE cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=black
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi identifier   ctermfg=darkmagenta
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		ctermfg=darkgrey  ctermbg=darkblue
-	hi IncSearch	ctermfg=black ctermbg=grey cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkgrey cterm=NONE
-else
-	hi Comment		ctermfg=grey  ctermbg=darkblue
-	hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Constant	ctermfg=blue
-hi Special	ctermfg=darkmagenta
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkblue " ctermbg=darkblue
-hi Underlined	ctermfg=yellow cterm=NONE
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-
diff --git a/colors/silent.vim b/colors/silent.vim
deleted file mode 100755
index b04b41b..0000000
--- a/colors/silent.vim
+++ /dev/null
@@ -1,122 +0,0 @@
-" Vim color file
-" @Author: Pascal Vasilii <jabberroid@gmail.com>	
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "silent"
-set background=light
-
-hi Cursor           guibg=#0057ae	guifg=white		gui=NONE
-hi LineNr           guibg=#F1FFC1	guifg=DarkGray	gui=bold,italic 
-hi StatusLineNC     guibg=#bbbbbb	guifg=White		gui=bold,italic
-hi StatusLine       guibg=#1D343B	guifg=#DDDDDD	gui=italic
-hi Title            guibg=white		guifg=Black		gui=bold 
-hi TablineSel       guibg=white		guifg=Black		gui=bold 
-hi CursorLine       guibg=#F1FFC1	guifg=Black		gui=none
-hi CursorColumn     guibg=#fafafa	guifg=black		gui=NONE
-hi MatchParen       guifg=#141312	guibg=Yellow	gui=underline
-hi AutoHiGroup      guibg=Yellow	guifg=black
-"hi TabLineFill      guibg=red guifg=#606060 gui=none
-hi SignColumn       guibg=#F1FFC1	guifg=black		gui=bold
-
-hi Directory	    guibg=white		guifg=Black		gui=bold,italic 
-hi Tooltip   	    guibg=#F1FFC1	guifg=DarkGray	gui=bold,italic 
-hi FoldColumn       guibg=#F1FFC1	guifg=Black		gui=none 
-hi VertSplit        guibg=#F1FFC1	guifg=#F1FFC1	gui=none 
-hi Wildmenu         guibg=White		guifg=Black		gui=bold 
-
-hi Pmenu            guibg=#DDDDDD	guifg=Black		gui=italic
-hi PmenuSbar        guibg=#DDDDDD 	guifg=fg		gui=italic
-hi PmenuSel         guibg=#F1FFC1 	guifg=Black		gui=italic
-hi PmenuThumb       guibg=#DDDDDD 	guifg=fg		gui=none
-
-hi IncSearch        guibg=Black		guifg=White		gui=none
-hi Search           guibg=Yellow	guifg=Black		gui=none
-
-hi Normal	        guibg=White		guifg=#141312	gui=NONE
-hi Visual	        guibg=#4485FF	guifg=white		gui=bold
-hi VisualNos	    guibg=#4485FF	guifg=white		gui=bold
-hi Comment	        guibg=white		guifg=#888786	gui=italic
-hi PerlPOD	        guibg=white 	guifg=#B86A18	gui=NONE
-" dark green 006e26
-hi Constant	        guibg=white		guifg=#006e26	gui=bold
-
-hi Character	    guibg=white 	guifg=#644A9B	gui=NONE
-hi String           guibg=white 	guifg=#BF0303	gui=italic
-"hi Number			guibg=white 	guifg=black		gui=bold
-hi Number	        guibg=white 	guifg=#B07E00	gui=NONE
-hi Boolean	        guibg=white 	guifg=#B07E00	gui=NONE
-hi Define	        guibg=white 	guifg=#006E26	gui=bold
-
-" vars 
-hi Identifier 	    guibg=white 	guifg=#0057AE	gui=NONE
-hi Exception 	    guibg=white 	guifg=black		gui=bold
-" return ~olive   
-hi Statement 	    guibg=white 	guifg=#B07E00	gui=NONE
-"hi Label 	        guibg=white 	guifg=#B07E00	gui=NONE
-hi PreProc	        guibg=white 	guifg=#141312	gui=bold
-hi Function	        guibg=white 	guifg=#B07E00	gui=NONE
-hi Repeat	        guibg=white 	guifg=#B07E00	gui=bold
-"$='"[
-hi Operator	        guibg=white 	guifg=#0057AE	gui=NONE
-hi Ignore	        guibg=white 	guifg=bg
-hi Folded           guibg=#F1FFC1	guifg=#101010	gui=italic
-hi Error	        guibg=#D80000 	guifg=#FFD1CC	term=reverse  gui=NONE
-hi Todo		        guibg=#AD5500 	guifg=Grey		term=standout gui=NONE
-hi Done		        guibg=Gray		guifg=#CCEEFF	term=standout gui=NONE
-
-hi SpellErrors      guibg=white		guifg=#9C0D0D gui=NONE
-hi SpellBad         guibg=white 	gui=undercurl guisp=#9C0D0D
-hi SpellCap         guibg=white 	gui=undercurl guisp=#9C0D0D
-hi SpellLocal       guibg=white 	gui=undercurl guisp=#9C0D0D
-hi SpellRare        guibg=white 	gui=undercurl guisp=#9C0D0D
-
-hi MoreMsg          guibg=white		guifg=black		gui=NONE
-hi ModeMsg          guibg=white		guifg=black		gui=NONE
-hi DiffAdd          guibg=#CCFFCC	guifg=NONE		gui=NONE
-hi DiffDelete       guibg=#FFCCCC 	guifg=NONE		gui=NONE
-hi DiffChange       guibg=#F1FFC1 	guifg=NONE		gui=NONE
-hi DiffText         guibg=white		guifg=NONE		gui=NONE
-
-hi Question         guibg=white		guifg=black		gui=bold
-hi Conditional		guibg=white 	guifg=#B07E00	gui=NONE
-hi Include			guibg=white 	guifg=#141312 	gui=bold
-hi SpecialChar		guibg=white 	guifg=#141312 	gui=bold
-hi Underlined		guibg=white 	guifg=#0057ae 	gui=underline
-
-" -> 
-hi Structure		guibg=white 	guifg=black		gui=none
-hi Chatacter		guibg=white 	guifg=black		gui=none
-" dark red #D80000
-hi Float			guibg=#CCFFCC	guifg=blue		gui=NONE
-hi Macro			guibg=white		guifg=black		gui=bold
-" #ifdef #endif dark blue 
-hi PreCondit		guibg=white		guifg=#0057ae	gui=bold 
-hi Delimiter		guibg=white		guifg=black		gui=NONE 
-" const static
-hi StorageClass  	guibg=white		guifg=#006e26	gui=NONE 
-"type
-hi Typedef			guibg=#CCFFCC	guifg=#006e26	gui=bold
-" int char 
-hi Type		        guibg=white		guifg=black		gui=NONE 
-hi Tag				guibg=#CCFFCC	guifg=#0057AE	gui=NONE 
-hi Special	        guibg=white		guifg=black		gui=NONE
-hi SpecialKey       guibg=white		guifg=black		gui=none
-"NonText		'~' and '@' at the end of the window, characters from
-		"'showbreak' and other characters that do not really exist in
-		"the text (e.g., ">" displayed when a double-wide character
-		"doesn't fit at the end of the line).
-hi NonText          guibg=white		guifg=black		gui=none
-hi Keyword 	        guibg=white		guifg=#141312	gui=NONE
-
-hi link SpecialComment 	Special
-hi link Debug		Special
-	"doesn't fit at the end of the line).
-hi NonText          guibg=white		guifg=black		gui=none
-hi Keyword 	        guibg=white		guifg=#141312	gui=NONE
-
-hi link SpecialComment 	Special
-hi link Debug		Special
diff --git a/colors/simple256.vim b/colors/simple256.vim
deleted file mode 100755
index 6e552f0..0000000
--- a/colors/simple256.vim
+++ /dev/null
@@ -1,279 +0,0 @@
-" Vim color file
-" Maintainer: Alexander Rodin <rodin.alexander@gmail.com>
-"
-" This theme is based on "desert256" theme by Henry So, Jr.
-"
-" I struggled with trying to parse the rgb.txt file to avoid the necessity of
-" converting color names to #rrggbb form, but decided it was just not worth
-" the effort.  Maybe someone seeing this may decide otherwise...
-
-set background=light
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="desert256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-    " functions {{{
-    " returns an approximate grey index for the given grey level
-    fun <SID>grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    fun <SID>grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    fun <SID>grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    fun <SID>rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    fun <SID>rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    fun <SID>rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    fun <SID>color(r, g, b)
-        " get the closest grey
-        let l:gx = <SID>grey_number(a:r)
-        let l:gy = <SID>grey_number(a:g)
-        let l:gz = <SID>grey_number(a:b)
-
-        " get the closest color
-        let l:x = <SID>rgb_number(a:r)
-        let l:y = <SID>rgb_number(a:g)
-        let l:z = <SID>rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = <SID>grey_level(l:gx) - a:r
-            let l:dgg = <SID>grey_level(l:gy) - a:g
-            let l:dgb = <SID>grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = <SID>rgb_level(l:gx) - a:r
-            let l:dg = <SID>rgb_level(l:gy) - a:g
-            let l:db = <SID>rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return <SID>grey_color(l:gx)
-            else
-                " use the color
-                return <SID>rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return <SID>rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    fun <SID>rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return <SID>color(l:r, l:g, l:b)
-    endfun
-
-    " sets the highlighting for the given group
-    fun <SID>X(group, fg, bg, attr)
-        if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-        endif
-        if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-        endif
-        if a:attr != ""
-            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-        endif
-    endfun
-    " }}}
-
-    call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
-    call <SID>X("Folded", "9999cc", "f4f4f4", "")
-    call <SID>X("IncSearch", "708090", "f0e68c", "")
-    call <SID>X("Visual", "3888ff", "ffffff", "reverse")
-"    call <SID>X("Comment", "1C9518", "", "")
-    call <SID>X("Comment", "20AD1B", "", "")
-    call <SID>X("Constant", "5500ff", "", "")
-    call <SID>X("String", "ff7777", "", "")
-    call <SID>X("Float", "ff7777", "", "")
-    call <SID>X("Boolean", "000080", "", "bold")
-"    call <SID>X("Identifier", "98fb98", "", "none")
-    call <SID>X("Statement", "000080", "", "bold")
-    call <SID>X("PreProc", "20b5ff", "", "")
-    call <SID>X("Type", "000080", "", "bold")
-    call <SID>X("Special", "CDAB00", "", "")
-    call <SID>X("Underlined", "0000cc", "", "")
-    call <SID>X("Todo", "ff4500", "eeee00", "")
-
-    " delete functions {{{
-    delf <SID>X
-    delf <SID>rgb
-    delf <SID>color
-    delf <SID>rgb_color
-    delf <SID>rgb_level
-    delf <SID>rgb_number
-    delf <SID>grey_color
-    delf <SID>grey_level
-    delf <SID>grey_number
-    " }}}
-else
-    " color terminal definitions
-    hi VertSplit    ctermfg=lightgray ctermbg=gray cterm=reverse
-    hi Folded       ctermfg=blue ctermbg=lightcyan
-    hi IncSearch    ctermfg=lightgray ctermbg=yellow
-    hi Visual       ctermfg=blue ctermbg=white cterm=reverse
-    hi Comment      ctermfg=green
-    hi Constant     ctermfg=blue
-    hi String       ctermfg=red
-    hi Float        ctermfg=red
-    hi Boolean      ctermfg=darkblue cterm=bold
-    hi Statement    ctermfg=darkblue cterm=bold
-    hi PreProc      ctermfg=cyan
-    hi Type         ctermfg=darkblue cterm=bold
-    hi Special      ctermfg=brown
-    hi Underlined   ctermfg=blue
-    hi Todo         ctermfg=red ctermbg=yellow
-endif
-
-" vim: set fdl=0 fdm=marker:
diff --git a/colors/simple_b.vim b/colors/simple_b.vim
deleted file mode 100755
index 5b12d16..0000000
--- a/colors/simple_b.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Vim color file
-" Maintainer:   V Singh <vsingh.usa@gmail.com>
-" Last Change:	2nd June 2003
-" Version:	1.0
-
-set background=light
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "simple_b"
-
-highlight Normal	    cterm=NONE ctermfg=black ctermbg=lightblue gui=NONE guifg=black guibg=lightblue 
-highlight NonText	    ctermfg=black ctermbg=lightblue  guifg=black guibg=white
-highlight LineNr        cterm=italic ctermfg=black ctermbg=lightblue  gui=italic guifg=black guibg=lightblue 
-
-" Syntax highlighting scheme
-highlight Comment	    cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=lightblue 
-
-highlight Constant	    ctermfg=black ctermbg=lightblue guifg=black guibg=lightblue 
-highlight String	    ctermfg=black ctermbg=lightblue guifg=black guibg=lightblue
-highlight Character	    ctermfg=black ctermbg=lightblue guifg=black guibg=lightblue
-highlight Number	    ctermfg=black ctermbg=lightblue guifg=black guibg=lightblue
-" Boolean defaults to Constant
-highlight Float		    ctermfg=black ctermbg=lightblue guifg=black guibg=lightblue
-
-highlight Identifier	ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-highlight Function	    ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-
-highlight Statement	    ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-highlight Conditional	ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-highlight Repeat	    ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-highlight Label		    ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-highlight Operator	    ctermfg=black ctermbg=lightblue  guifg=black guibg=lightblue
-" Keyword defaults to Statement
-" Exception defaults to Statement
-
-highlight PreProc	    cterm=bold ctermfg=black ctermbg=lightblue gui=bold guifg=black guibg=lightblue
-" Include defaults to PreProc
-" Define defaults to PreProc
-" Macro defaults to PreProc
-" PreCondit defaults to PreProc
-
-highlight Type		    cterm=bold ctermfg=black ctermbg=lightblue gui=bold guifg=black guibg=lightblue
-" StorageClass defaults to Type
-" Structure defaults to Type
-" Typedef defaults to Type
-
-highlight Special	    cterm=italic ctermfg=black ctermbg=lightblue gui=italic guifg=black guibg=lightblue
-" SpecialChar defaults to Special
-" Tag defaults to Special
-" Delimiter defaults to Special
-highlight SpecialComment cterm=italic ctermfg=black ctermbg=lightblue  gui=italic guifg=black guibg=lightblue
-" Debug defaults to Special
-
-highlight Todo		    cterm=italic,bold ctermfg=black ctermbg=lightblue gui=italic,bold guifg=black guibg=lightblue
-" Ideally, the bg color would be white but VIM cannot print white on black!
-highlight Error		    cterm=bold,reverse ctermfg=black ctermbg=grey gui=bold,reverse guifg=black guibg=grey
-
-" vim:et:ff=unix:tw=0:ts=4:sw=4
-" EOF print_bw.vim
diff --git a/colors/simpleandfriendly.vim b/colors/simpleandfriendly.vim
deleted file mode 100755
index 6222e76..0000000
--- a/colors/simpleandfriendly.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" Vim color file
-" Maintainer:	Thomas Schmall <ts_nowhere@NOSPAM_yahoo.com>
-" Last Change:	2004 Nov 20
-" URL: http://www.vim.org/scripts/script.php?script_id=792
-" Version: 1.3
-
-" This color scheme uses a light grey background.
-
-" Last Changes:
-" *line number colors changed
-
-
-" First remove all existing highlighting.
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "simpleandfriendly"
-
-"Set nice colors #DC6210
-"Cursor is Cyan when ":lmap" mappings are active
-hi lCursor guibg=Cyan guifg=NONE
-hi LineNr	 guifg=white  guibg=#acbbff
-
-"Text below the last line is darker grey
-hi NonText 	guibg=grey80
-"Normal text is black background is grey
-hi Normal 	guifg=black		guibg=grey89  ctermfg=Black  ctermbg=LightGrey 
-hi Comment	guifg=Orange	guibg=grey94	ctermfg=DarkCyan	term=bold
-"Constants are not underlined but have a slightly lighter background
-hi Constant	guifg=#8080a0   guibg=grey92	gui=NONE  term=underline
-hi String	  guifg=#80a0ff 	guibg=grey93	gui=NONE  term=underline	
-hi Number	  guifg=#80a5ff 	guibg=grey91  gui=NONE  ctermfg=Gray  term=none
-"Words like _if_ or _else_  (Grey27)
-hi Statement	guifg=#4A2B99	gui=NONE  	ctermfg=Blue
-
-hi Title    guifg=red		ctermfg=red gui=NONE term=BOLD
-"color for _NONE_ for instance:
-hi PreProc	term=underline	ctermfg=LightBlue	guifg=#DC6210
-"color for _guifg_ for instance: (SlateBlue works here nice too)
-hi Type	  	guifg=#008080 ctermfg=LightGreen gui=None term=underline	
-hi Function	guifg=#61577A	term=bold 	
-"in lingo the defined functions. (alt: SlateBlue)
-hi Identifier	guifg=Seagreen
-"hi Identifier	term=underline	cterm=bold ctermfg=Cyan	guifg=#40ffff
-
-"hi Repeat	term=underline	ctermfg=White		guifg=white
-"hi Ignore	guifg=bg	ctermfg=black
-hi Error  	term=reverse  ctermbg=Red     ctermfg=White guibg=Red guifg=White
-hi Todo	  	term=standout	ctermbg=Yellow  ctermfg=Black guifg=Blue guibg=Yellow
-"Special Characters
-hi Special 	guibg=grey90	guifg=Slateblue	gui=UNDERLINE
-
-hi operator guifg=gray25  ctermfg=Black   term=bold   cterm=bold  gui=bold
diff --git a/colors/simplewhite.vim b/colors/simplewhite.vim
deleted file mode 100755
index 8996bf6..0000000
--- a/colors/simplewhite.vim
+++ /dev/null
@@ -1,154 +0,0 @@
-" Name:			simplewhite.vim
-" Maintainer:	Kojo Sugita
-" Last Change:  2008-08-16
-" Version:		1.0
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'simplewhite'
-
-if (&term == "xterm") || (&term == "linux")
-	set t_Co=16
-elseif &term == "vt320"
-	set t_Co=8
-endif
-
-" Normal
-hi Normal		guifg=black			guibg=white			gui=none
-hi Normal		ctermfg=black		ctermbg=white		cterm=none
-hi NonText		guifg=#606060		guibg=#f0f0f0		gui=none
-hi NonText		ctermfg=darkgray	ctermbg=lightgray	cterm=none
-hi SpecialKey	guifg=#606060		guibg=white			gui=none
-hi SpecialKey	ctermfg=darkgray	ctermbg=white		cterm=none
-
-hi Cursor		guifg=white			guibg=black			gui=none
-hi Cursor		ctermfg=white		ctermbg=black		cterm=none
-hi lCursor		guifg=white			guibg=black			gui=none
-hi ICursor		ctermfg=white		ctermbg=black		cterm=none
-hi CursorIM		guifg=white			guibg=black			gui=none
-hi CursorIM		ctermfg=white		ctermbg=black		cterm=none
-
-" Search
-hi Search		guifg=black			guibg=#fcaf3e		gui=none
-hi Search		ctermfg=black		ctermbg=yellow		cterm=none
-hi IncSearch	guifg=black			guibg=#fcaf3e		gui=none
-hi IncSearch	ctermfg=black		ctermbg=yellow		cterm=none
-
-" Matches
-hi MatchParen	guifg=black			guibg=#fcaf3e		gui=none
-hi MatchParen	ctermfg=black		ctermbg=yellow		cterm=none
-
-" status line
-hi StatusLine	guifg=white			guibg=black			gui=bold
-hi StatusLine	ctermfg=white		ctermbg=black		cterm=bold
-hi StatusLineNC guifg=#a0a0a0		guibg=black			gui=bold
-hi StatusLineNc	ctermfg=darkgray	ctermbg=black		cterm=bold
-
-" Diff
-hi DiffAdd		guifg=#b000b0		guibg=white			gui=none
-hi DiffAdd		ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi DiffChange	guifg=#b000b0		guibg=white			gui=none
-hi DiffChange	ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi DiffDelete	guifg=white			guibg=black			gui=none
-hi DiffDelete	ctermfg=white		ctermbg=black		cterm=none
-hi DiffText		guifg=#b000b0		guibg=white			gui=bold
-hi DiffText		ctermfg=darkmagenta	ctermbg=white		cterm=bold
-
-" Folds
-hi Folded		guifg=black			guibg=lightgray		gui=none
-hi Folded		ctermfg=black		ctermbg=lightgray	cterm=none
-hi FoldColumn	guifg=black			guibg=lightgray		gui=none
-hi FoldColumn	ctermfg=black		ctermbg=lightgray	cterm=none
-
-" Syntax
-hi Number		guifg=#008000		guibg=white			gui=none
-hi Number		ctermfg=darkgreen	ctermbg=white		cterm=none
-hi Char			guifg=#008000		guibg=white			gui=none
-hi Char			ctermfg=darkgreen	ctermbg=white		cterm=none
-hi String		guifg=#008000		guibg=white			gui=none
-hi String		ctermfg=darkgreen	ctermbg=white		cterm=none
-hi Boolean		guifg=#008000		guibg=white			gui=none
-hi Boolean		ctermfg=darkgreen	ctermbg=white		cterm=none
-hi Constant		guifg=#008000		guibg=white			gui=none
-hi Constant		ctermfg=darkgreen	ctermbg=white		cterm=none
-
-hi Statement	guifg=#c00000		guibg=white			gui=none
-hi Statement	ctermfg=darkred		ctermbg=white		cterm=none
-hi Comment		guifg=#707070		guibg=white			gui=none
-hi Comment		ctermfg=darkgray	ctermbg=white		cterm=none
-hi Identifier	guifg=#b000b0		guibg=white			gui=none
-hi Identifier	ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi Function     guifg=#b000b0		guibg=white			gui=none
-hi Function		ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi PreProc		guifg=#b000b0	 	guibg=white			gui=none
-hi PreProc		ctermfg=darkmagenta	ctermbg=white		cterm=none
-hi Type			guifg=#0000c0	 	guibg=white			gui=none
-hi Type			ctermfg=darkblue	ctermbg=white		cterm=none
-
-" Tree
-hi Directory	guifg=#b000b0		guibg=white			gui=bold
-hi Directory	ctermfg=darkmagenta	ctermbg=white		cterm=bold
-
-" Message
-hi ModeMsg		guifg=black			guibg=white			gui=none
-hi ModeMsg		ctermfg=black		ctermbg=white		cterm=none
-hi MoreMsg		guifg=black			guibg=white			gui=none
-hi MoreMsg		ctermfg=black		ctermbg=white		cterm=none
-hi WarningMsg	guifg=red			guibg=white			gui=none
-hi WarningMsg	ctermfg=red			ctermbg=white		cterm=none
-hi ErrorMsg		guifg=white			guibg=red			gui=none
-hi ErrorMsg		ctermfg=white		ctermbg=red			cterm=none
-hi Question		guifg=black			guibg=white			gui=none
-hi Question		ctermfg=black		ctermbg=white		cterm=none
-
-hi LineNr		guifg=white			guibg=black			gui=none
-hi LineNr		ctermfg=white		ctermbg=black		cterm=none
-hi VertSplit	guifg=black			guibg=black			gui=none
-hi VertSplit	ctermfg=black		ctermbg=black		cterm=none
-
-"\n, \0, %d, %s, etc...
-hi Special		guifg=#606060		guibg=#f0f0f0		gui=none
-hi Special		ctermfg=darkgray	ctermbg=lightgray	cterm=none
-hi Title		guifg=#b000b0		guibg=white			gui=bold
-hi Title		ctermfg=darkmagenta	ctermbg=white		cterm=bold
-hi Visual		guifg=white			guibg=blue			gui=none
-hi Visual		ctermfg=white		ctermbg=blue		cterm=none
-hi VisualNOS	guifg=white			guibg=black			gui=none
-hi VisualNOS	ctermfg=white		ctermbg=black		cterm=none
-hi WildMenu		guifg=black			guibg=white			gui=none
-hi WildMenu		ctermfg=black		ctermbg=white		cterm=none
-
-hi Underlined	guifg=#b000b0 		guibg=white			gui=underline
-hi Underlined	ctermfg=darkmagenta	ctermbg=white		cterm=underline
-hi Error		guifg=red 			guibg=white			gui=none
-hi Error		ctermfg=red			ctermbg=white		cterm=none
-hi Todo			guifg=black			guibg=white			gui=none
-hi Todo			ctermfg=black		ctermbg=white		cterm=none
-hi SignColumn	guifg=black 		guibg=white			gui=none
-hi SignColumn	ctermfg=black		ctermbg=white		cterm=none
-
-if version >= 700
-  "Pmenu
-  hi Pmenu							guibg=gray
-  hi Pmenu							ctermbg=gray
-  hi PmenuSel	guifg=white			guibg=black
-  hi PmenuSel	ctermfg=white		ctermbg=black
-  hi PmenuSbar						guibg=gray
-  hi PmenuSbar						ctermbg=gray
-  " hi PmenuThumb	guifg=#ffffff
-
-  "Tab
-  hi TabLine		guifg=gray		guibg=#505050		gui=none
-  hi TabLine		ctermfg=gray	ctermbg=darkgray	cterm=none
-  hi TabLineFill	guifg=gray		guibg=gray			gui=none
-  hi TabLineFill	ctermfg=gray	ctermbg=gray		cterm=none
-  hi TabLineSel		guifg=white		guibg=black			gui=none
-  hi TabLineSel		ctermfg=white	ctermbg=black		cterm=none
-endif
-
-finish
-
-" vim: set foldmethod=marker: set fenc=utf-8:
diff --git a/colors/skittles_dark.vim b/colors/skittles_dark.vim
deleted file mode 100755
index 5f8bbf2..0000000
--- a/colors/skittles_dark.vim
+++ /dev/null
@@ -1,127 +0,0 @@
-" Vim color file
-"
-" Version: 1.1
-"
-" Author: Shawn Biddle <shawn@shawnbiddle.com>
-"
-" Note: Used the molokai color scheme as a template
-" to build off then completely recolored almost
-" everything to be a bit more colorful while still
-" being quite readable
-"
-
-hi clear
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="skittles_dark"
-
-
-hi Boolean guifg=#AE81FF ctermfg=141
-hi Character guifg=#E6DB74 ctermfg=186
-hi Number guifg=#AE81FF ctermfg=141
-hi String guifg=#75d142 ctermfg=113
-hi Conditional guifg=#C01414 ctermfg=1
-hi Constant guifg=#AE81FF ctermfg=141
-hi Cursor guifg=#000000 ctermfg=0 guibg=#F8F8F0 ctermbg=15
-hi Debug guifg=#BCA3A3 ctermfg=248
-
-hi Define guifg=#C01414 ctermfg=1
-hi Delimiter guifg=#8F8F8F ctermfg=245
-hi DiffAdd guibg=#13354A ctermbg=236
-hi DiffChange guifg=#89807D ctermfg=244 guibg=#4C4745 ctermbg=238
-hi DiffDelete guifg=#960050 ctermfg=89 guibg=#1E0010 ctermbg=233
-hi DiffText guibg=#4C4745 ctermbg=238
-
-hi Directory guifg=#A6E22E ctermfg=148
-hi Error guifg=#960050 ctermfg=89 guibg=#1E0010 ctermbg=233
-hi ErrorMsg guifg=#8ac6f2 ctermfg=117 guibg=#232526 ctermbg=235
-hi Exception guifg=#A6E22E ctermfg=148
-hi Float guifg=#AE81FF ctermfg=141
-hi FoldColumn guifg=#465457 ctermfg=239 guibg=#000000 ctermbg=0
-hi Folded guifg=#465457 ctermfg=239 guibg=#000000 ctermbg=0
-hi Function guifg=#0C60A0 ctermfg=25
-
-hi Identifier guifg=#ffffff ctermfg=15 cterm=none
-
-hi Ignore guifg=#808080 ctermfg=244 guibg=bg
-hi IncSearch guifg=#C4BE89 ctermfg=180 guibg=#000000 ctermbg=0
-
-hi Keyword guifg=#8ac6f2 ctermfg=117 gui=none
-hi Label guifg=#E6DB74 ctermfg=186
-hi Macro guifg=#C4BE89 ctermfg=180
-"gui=italic
-hi SpecialKey guifg=#222222 ctermfg=235
-"gui=italic
-
-
-hi MatchParen guifg=#000000 ctermfg=0 guibg=#FD971F ctermbg=208
-hi ModeMsg guifg=#E6DB74 ctermfg=186
-hi MoreMsg guifg=#E6DB74 ctermfg=186
-hi Operator guifg=#FF9900 ctermfg=208
-
-" complete menu
-hi Pmenu guifg=#5FAAC7 ctermfg=81 guibg=#000000 ctermbg=0
-hi PmenuSel guibg=#808080 ctermbg=244
-hi PmenuSbar guibg=#080808 ctermbg=0
-hi PmenuThumb guifg=#5FAAC7 ctermfg=81
-
-hi PreCondit guifg=#A6E22E ctermfg=148
-hi PreProc guifg=#A6E22E ctermfg=148
-hi Question guifg=#5FAAC7 ctermfg=81
-hi Repeat guifg=#CF1020 ctermfg=1
-hi Search guifg=#FFFFFF ctermfg=15 guibg=#455354 ctermbg=239
-" marks column
-hi SignColumn guifg=#A6E22E ctermfg=148 guibg=#232526 ctermbg=235
-hi SpecialChar guifg=#FF9900 ctermfg=208
-hi SpecialComment guifg=#465457 ctermfg=239
-hi Special guifg=#5FAAC7 ctermfg=81 guibg=bg
-if has("spell")
-    hi SpellBad guisp=#FF0000 gui=undercurl
-    hi SpellCap guisp=#7070F0 gui=undercurl
-    hi SpellLocal guisp=#70F0F0 gui=undercurl
-    hi SpellRare guisp=#FFFFFF gui=undercurl
-endif
-hi Statement guifg=#C01414 ctermfg=1 gui=none
-hi StatusLine guifg=#455354 ctermfg=0 guibg=fg
-hi StatusLineNC guifg=#808080 ctermfg=244 guibg=#080808 ctermbg=0
-hi StorageClass guifg=#FD971F ctermfg=208
-hi Structure guifg=#5FAAC7 ctermfg=81 cterm=bold gui=bold
-hi Tag guifg=#8ac6f2 ctermfg=117
-hi Title guifg=#ef5939 ctermfg=203
-hi Todo guifg=#FFFFFF ctermfg=0 ctermbg=3 guibg=bg
-
-hi phpDocBlock guifg=#94E1E4 ctermfg=116 guibg=bg
-
-hi Typedef guifg=#5FAAC7 ctermfg=81
-hi Type guifg=#5FAAC7 ctermfg=81 gui=none cterm=none
-hi Underlined guifg=#808080 ctermfg=244 gui=underline
-
-hi VertSplit guifg=#808080 ctermfg=244 guibg=#080808 ctermbg=0
-hi VisualNOS guibg=#403D3D ctermbg=237
-hi Visual guibg=#403D3D ctermbg=237
-hi WarningMsg guifg=#FFFFFF ctermfg=15 guibg=#333333 ctermbg=236
-hi WildMenu guifg=#5FAAC7 ctermfg=81 guibg=#121212 ctermbg=233
-
-hi Normal guifg=#F8F8F2 ctermfg=248 guibg=#231F20 ctermbg=234
-hi Comment guifg=#5D8D8F ctermfg=66 gui=none
-hi CursorLine guibg=#121212 ctermbg=233
-hi CursorColumn guibg=#121212 ctermbg=233
-hi LineNr guifg=#FFFFFF ctermfg=15 guibg=#000000 ctermbg=0 gui=underline
-hi NonText guifg=#BCBCBC ctermfg=250 guibg=#232526 ctermbg=235
-
-hi link xmlTagName Define
-
-"hi yamlBaseKey
-"gui=bold,underline
-hi yamlTab guibg=#FF0000 ctermbg=9
-hi User1 guifg=#000000 ctermfg=0 guibg=#84E12E ctermbg=112
-"gui=bold
-
-hi clear htmlTagN
-hi link htmlTagN Typedef
diff --git a/colors/smp.vim b/colors/smp.vim
deleted file mode 100755
index 388250d..0000000
--- a/colors/smp.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Vim color file
-" Maintainer:   Vijayandra Singh <vsingh.usa@gmail.com>
-" Last Change:	March,13 2007
-" Version:	1.2
-
-" Remove all existing highlighting.
-set background=light
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "smp"
-
-highlight Normal	    cterm=NONE ctermfg=black ctermbg=white gui=NONE guifg=black guibg=#C0C0C0
-highlight NonText	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight LineNr        cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=#C0C0C0 
-
-" Syntax highlighting scheme
-highlight Comment	    cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=#C0C0C0
-
-highlight Constant	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight String	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Character	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Number	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-" Boolean defaults to Constant
-highlight Float		    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-
-highlight Identifier	ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Function	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-
-highlight Statement	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Conditional	ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Repeat	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Label		    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-highlight Operator	    ctermfg=black ctermbg=white guifg=black guibg=#C0C0C0
-" Keyword defaults to Statement
-" Exception defaults to Statement
-
-highlight PreProc	    cterm=bold ctermfg=black ctermbg=white gui=bold guifg=black guibg=#C0C0C0
-" Include defaults to PreProc
-" Define defaults to PreProc
-" Macro defaults to PreProc
-" PreCondit defaults to PreProc
-
-highlight Type		    cterm=bold ctermfg=black ctermbg=white gui=bold guifg=black guibg=#C0C0C0
-" StorageClass defaults to Type
-" Structure defaults to Type
-" Typedef defaults to Type
-
-highlight Special	    cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=#C0C0C0
-" SpecialChar defaults to Special
-" Tag defaults to Special
-" Delimiter defaults to Special
-highlight SpecialComment cterm=italic ctermfg=black ctermbg=white gui=italic guifg=black guibg=#C0C0C0
-" Debug defaults to Special
-
-highlight Todo		    cterm=italic,bold ctermfg=black ctermbg=white gui=italic,bold guifg=black guibg=#C0C0C0
-" Ideally, the bg color would be white but VIM cannot print white on black!
-highlight Error		    cterm=bold,reverse ctermfg=black ctermbg=grey gui=bold,reverse guifg=black guibg=grey
-
-" vim:et:ff=unix:tw=0:ts=4:sw=4
-" EOF print_bw.vim
diff --git a/colors/smyck.vim b/colors/smyck.vim
deleted file mode 100755
index 2a23734..0000000
--- a/colors/smyck.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-" ----------------------------------------------------------------------------
-" Vim color file
-" Maintainer:   John-Paul Bader <contact@smyck.org>
-" Last Change:  2012 April
-" License:      Beer Ware
-" ----------------------------------------------------------------------------
-
-let g:colors_name = "smyck"
-
-highlight clear Normal
-set background=dark
-set linespace=2
-
-" Syntaxeinstellungen zuruecksetzen, wenn Syntax Highlighting aktiviert ist
-if exists("syntax_on")
-  syntax reset
-endif
-
-hi Normal               cterm=none ctermbg=none     ctermfg=15      gui=none        guibg=#242424   guifg=#F7F7F7
-hi LineNr               cterm=none ctermbg=none     ctermfg=8       gui=none        guibg=#242424   guifg=#8F8F8F
-hi StatusLine           cterm=none ctermbg=8        ctermfg=15      gui=none        guibg=#5D5D5D   guifg=#FBFBFB
-hi StatusLineNC         cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#5D5D5D   guifg=#FBFBFB
-hi Search               cterm=none ctermbg=6        ctermfg=15      gui=none        guibg=#2EB5C1   guifg=#F7F7F7
-hi IncSearch            cterm=none ctermbg=3        ctermfg=8       gui=none        guibg=#F6DC69   guifg=#8F8F8F
-hi ColumnMargin         cterm=none ctermbg=0                        gui=none        guibg=#000000
-hi Error                cterm=none ctermbg=1        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi ErrorMsg             cterm=none ctermbg=1        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi Folded               cterm=none ctermbg=8        ctermfg=2       gui=none        guibg=#8F8F8F   guifg=#C4E858
-hi FoldColumn           cterm=none ctermbg=8        ctermfg=2       gui=none        guibg=#8F8F8F   guifg=#C4E858
-hi NonText              cterm=bold ctermbg=none     ctermfg=8       gui=bold                        guifg=#8F8F8F
-hi ModeMsg              cterm=bold ctermbg=none     ctermfg=10      gui=none
-hi Pmenu                cterm=none ctermbg=8        ctermfg=15      gui=none        guibg=#8F8F8F   guifg=#F7F7F7
-hi PmenuSel             cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#F7F7F7   guifg=#8F8F8F
-hi PmenuSbar            cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#F7F7F7   guifg=#8F8F8F
-hi SpellBad             cterm=none ctermbg=1        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi SpellCap             cterm=none ctermbg=4        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi SpellRare            cterm=none ctermbg=4        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi SpellLocal           cterm=none ctermbg=4        ctermfg=15      gui=none                        guifg=#F7F7F7
-hi Visual               cterm=none ctermbg=15       ctermfg=8       gui=none        guibg=#F7F7F7   guifg=#8F8F8F
-hi Directory            cterm=none ctermbg=none     ctermfg=4       gui=none        guibg=#242424   guifg=#88CCE7
-hi SpecialKey           cterm=none ctermbg=none     ctermfg=8       gui=none                        guifg=#8F8F8F
-hi DiffAdd              cterm=bold ctermbg=2        ctermfg=15
-hi DiffChange           cterm=bold ctermbg=4        ctermfg=15
-hi DiffDelete           cterm=bold ctermbg=1        ctermfg=15
-hi DiffText             cterm=bold ctermbg=3        ctermfg=8
-hi MatchParen           cterm=none ctermbg=6        ctermfg=15      gui=none        guibg=#2EB5C1   guifg=#F7F7F7
-hi CursorLine           cterm=none ctermbg=238      ctermfg=none    gui=none        guibg=#424242
-hi Title                cterm=none ctermbg=none     ctermfg=4       gui=none                        guifg=#88CCE7
-
-" ----------------------------------------------------------------------------
-" Syntax Highlighting
-" ----------------------------------------------------------------------------
-hi Keyword              cterm=none ctermbg=none ctermfg=10          gui=none        guifg=#D1FA71
-hi Comment              cterm=none ctermbg=none ctermfg=8           gui=none        guifg=#8F8F8F
-hi Delimiter            cterm=none ctermbg=none ctermfg=15          gui=none        guifg=#F7F7F7
-hi Identifier           cterm=none ctermbg=none ctermfg=12          gui=none        guifg=#96D9F1
-hi Structure            cterm=none ctermbg=none ctermfg=12          gui=none        guifg=#9DEEF2
-hi Ignore               cterm=none ctermbg=none ctermfg=8           gui=none        guifg=bg
-hi Constant             cterm=none ctermbg=none ctermfg=12          gui=none        guifg=#96D9F1
-hi PreProc              cterm=none ctermbg=none ctermfg=10          gui=none        guifg=#D1FA71
-hi Type                 cterm=none ctermbg=none ctermfg=12          gui=none        guifg=#96D9F1
-hi Statement            cterm=none ctermbg=none ctermfg=10          gui=none        guifg=#D1FA71
-hi Special              cterm=none ctermbg=none ctermfg=6           gui=none        guifg=#d7d7d7
-hi String               cterm=none ctermbg=none ctermfg=3           gui=none        guifg=#F6DC69
-hi Number               cterm=none ctermbg=none ctermfg=3           gui=none        guifg=#F6DC69
-hi Underlined           cterm=underline                             gui=underline
-hi Symbol               cterm=none ctermbg=none ctermfg=9           gui=none        guifg=#FAB1AB
-hi Method               cterm=none ctermbg=none ctermfg=15          gui=none        guifg=#F7F7F7
-hi Interpolation        cterm=none ctermbg=none ctermfg=6           gui=none        guifg=#2EB5C1
-
-" Erlang
-hi link erlangAtom            Keyword
-hi link erlangBitType         Keyword
-
-hi link rubyBeginend          Keyword
-hi link rubyClass             Keyword
-hi link rubyModule            Keyword
-hi link rubyKeyword           Keyword
-hi link rubyOperator          Method
-hi link rubyIdentifier        Keyword
-hi link rubyClassVariable     Symbol
-hi link rubyInstanceVariable  Constant
-hi link rubyGlobalVariable    Constant
-hi link rubyClassVariable     Method
-hi link rubyConstant          Constant
-hi link rubySymbol            Symbol
-hi link rubyFunction          Constant
-hi link rubyControl           Keyword
-hi link rubyConditional       Keyword
-hi link rubyInterpolation     Interpolation
-hi link rubyInterpolationDelimiter    Interpolation
-hi link rubyRailsMethod       Method
-
-
diff --git a/colors/softblue.vim b/colors/softblue.vim
deleted file mode 100755
index 8d8ee1b..0000000
--- a/colors/softblue.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-" Vim color file
-" Maintainer:   Zhang Jing
-" Last Change:  %[% 2005��12��07�� ������ 10ʱ41��49�� %]%
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="softblue"
-
-hi Normal	    guibg=#183058   guifg=#b0b0e0
-
-hi Cursor	    guibg=#b3b2df   guifg=grey30    gui=bold
-hi VertSplit	guibg=#466292   guifg=grey50    gui=none
-hi Folded	    guibg=#0d2349   guifg=lightblue
-hi FoldColumn	guibg=#0d2349   guifg=lightblue
-hi IncSearch	guifg=slategrey guibg=khaki
-hi LineNr		guifg=grey30
-hi ModeMsg	    guifg=SkyBlue
-hi MoreMsg	    guifg=SeaGreen
-hi NonText	    guifg=LightBlue guibg=#0d2349
-hi Question	    guifg=#487cc4
-hi Search	    guibg=#787878   guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#466292   guifg=black     gui=none
-hi StatusLineNC	guibg=#466292   guifg=grey22    gui=none
-hi Title	    guifg=#38d9ff
-hi Visual	    guifg=lightblue guibg=#001146   gui=none
-hi WarningMsg	guifg=salmon
-hi ErrorMsg     guifg=white     guibg=#b2377a
-
-hi Comment	    guifg=#6279a0
-hi Constant	    guifg=#9b60be
-hi Identifier	guifg=#00ac55
-hi Statement	guifg=SkyBlue2
-hi PreProc	    guifg=#20a0d0
-hi Type		    guifg=#8070ff
-hi Special	    guifg=#b6a040"wheat4"#7c9cf5"a2b9e0
-hi Ignore 	    guifg=grey40
-hi Error        guifg=white     guibg=#b2377a
-hi Todo		    guifg=#54b900   guibg=#622098   gui=bold
-"vim:ts=4:tw=4
diff --git a/colors/softbluev2.vim b/colors/softbluev2.vim
deleted file mode 100755
index 47d2b22..0000000
--- a/colors/softbluev2.vim
+++ /dev/null
@@ -1,93 +0,0 @@
-" 本配色方案由 gui2term.py 程序增加彩色终端支持。
-" Vim color file 
-" File: softbluev2 modyfied from softblue by ZhangJing 
-" Ver: 1.2
-" Maintainer:   Larrupingpig
-" Last Change:  Tue Dec 14 16:18:14 CST 2010
-
-set background=dark
-if version > 580
-    hi clear
-    if exists("syntax_on")
-    syntax reset
-    endif
-endif
-let g:colors_name="softbluev2"
-
-hi Normal       guibg=#183058   guifg=#b0b0e0 ctermfg=146 ctermbg=17 cterm=none
-hi Cursor       guibg=#b3b2df   guifg=grey30    gui=bold ctermfg=239 ctermbg=146 cterm=bold
-hi cursorline   guibg=#295499                            ctermbg=18  cterm=none       
-hi VertSplit    guibg=#466292   guifg=grey50    gui=none ctermfg=244 ctermbg=67 cterm=none
-hi Folded       guibg=#0d2349   guifg=lightblue ctermfg=152 ctermbg=17 cterm=none
-hi FoldColumn   guibg=#0d2349   guifg=lightblue ctermfg=152 ctermbg=17 cterm=none
-hi LineNr       guifg=grey30 ctermfg=101 ctermbg=17 cterm=none
-hi ModeMsg      guifg=SkyBlue ctermfg=117 ctermbg=17 cterm=none
-hi MoreMsg      guifg=SeaGreen ctermfg=72 ctermbg=17 cterm=none
-" hi NonText      guifg=LightBlue guibg=#0d2349 ctermfg=152 ctermbg=17 cterm=none
-hi Question     guifg=#487cc4 ctermfg=68 ctermbg=17 cterm=none
-hi IncSearch    guifg=#b0ffff        guibg=#2050d0 ctermfg=159 ctermbg=26 cterm=none
-hi Search       guifg=#b0ffff        guibg=#2050d0 ctermfg=159 ctermbg=26 cterm=none
-hi SpecialKey   guifg=yellowgreen ctermfg=149 ctermbg=17 cterm=none
-hi StatusLine   guibg=#466292   guifg=black     gui=none ctermfg=16 ctermbg=67 cterm=none
-hi StatusLineNC guibg=#466292   guifg=grey22    gui=none ctermfg=237 ctermbg=67 cterm=none
-hi Title        guifg=#38d9ff ctermfg=81 ctermbg=17 cterm=none
-hi Visual       guifg=lightblue guibg=#001146   gui=none ctermfg=152 ctermbg=17 cterm=none
-hi WarningMsg   guifg=salmon ctermfg=210 ctermbg=17 cterm=none
-hi ErrorMsg     guifg=white     guibg=#b2377a ctermfg=231 ctermbg=169 cterm=none
-
-
-hi Pmenu        guifg=white     guibg=#445599   gui=none ctermfg=231 ctermbg=61 cterm=none
-hi PmenuSel     guifg=#445599   guibg=gray ctermfg=61 ctermbg=170 cterm=none
-
-
-hi Comment      guifg=#6279a0 ctermfg=67 ctermbg=17 cterm=none
-hi Constant     guifg=#9b60be ctermfg=97 ctermbg=17 cterm=none
-hi Identifier   guifg=#00ac55 ctermfg=35 ctermbg=17 cterm=none
-hi Statement    guifg=SkyBlue2 gui=none ctermfg=191 ctermbg=17 cterm=none
-hi Statement    guifg=#cdee56 gui=none ctermfg=191 ctermbg=17 cterm=none
-hi PreProc      guifg=#20a0d0 ctermfg=38 ctermbg=17 cterm=none
-hi Type         guifg=#8070ff ctermfg=63 ctermbg=17 cterm=none
-hi Special      guifg=#b6a040 ctermfg=179 ctermbg=17 cterm=none
-hi Ignore       guifg=grey40 ctermfg=241 ctermbg=17 cterm=none
-hi Error        guifg=white     guibg=#b2377a ctermfg=231 ctermbg=169 cterm=none
-hi Todo         guifg=#54b900   guibg=#622098   gui=bold ctermfg=70 ctermbg=54 cterm=bold
-
-"========================================================
-" Highlight All Math Operator
-"========================================================
-hi PreProc          guifg=#ff80ff                ctermfg=171 
-hi Constant         guifg=#ffa0a0                ctermfg=217
-hi Function	        guifg=#C777EF     gui=NONE  ctermfg=177 ctermbg=17 cterm=none
-hi StdFunction      guifg=#C777EF     gui=bold  ctermfg=177 ctermbg=17 cterm=bold
-hi UserLabel2	    guifg=#c96129     gui=bold  ctermfg=166 ctermbg=17 cterm=bold
-hi StdName	        guifg=#5276e6     gui=bold  ctermfg=69  ctermbg=17 cterm=bold
-hi MicroController  guifg=#d00000     gui=bold  ctermfg=160 ctermbg=17 cterm=bold
-hi AnsiFuncPtr	    guifg=#ff0000     gui=NONE  ctermfg=196 ctermbg=17 cterm=none
-hi PreCondit        guifg=#a06129     gui=NONE  ctermfg=130 ctermbg=17 cterm=none
-hi Operator         guifg=Yellow      gui=NONE  ctermfg=226 ctermbg=17 cterm=none
-hi OperatorBold	    guifg=Yellow      gui=bold  ctermfg=226 ctermbg=17 cterm=bold
-hi BlockBraces	    guifg=Yellow      gui=bold  ctermfg=226 ctermbg=17 cterm=bold
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" C math operators
-syn match       cMathOperator     display "[-+\*\%=]"" C pointer operators
-syn match       cPointerOperator  display "->\|\."
-syn match       cLogicalOperator  display "[!<>]=\="
-syn match       cLogicalOperator  display "=="
-syn match       cBinaryOperator   display "\(&\||\|\^\|<<\|>>\)=\="
-syn match       cBinaryOperator   display "\~"
-syn match       cBinaryOperatorError display "\~="
-syn match       cLogicalOperator  display "&&\|||"
-syn match       cLogicalOperatorError display "\(&&\|||\)="
-syn match       cFenhao           display ";"
-hi cMathOperator            guifg=#3EFFE2                          ctermfg=14
-hi cPointerOperator         guifg=#3EFFE2                          ctermfg=14
-hi cLogicalOperator         guifg=#3EFFE2                          ctermfg=14
-hi cLogicalOperator         guifg=#3EFFE2                          ctermfg=14
-hi cBinaryOperator          guifg=#F0088C    gui=NONE              ctermfg=161  ctermbg=17 
-hi cBinaryOperatorError     guifg=white     guibg=#b2377a          ctermfg=231 ctermbg=169 cterm=none
-hi cBraces	                guifg=#C777EF   gui=NONE               ctermfg=177 ctermbg=17 cterm=none
-hi cFenhao                  guifg=#FFA70F                          ctermfg=202 ctermbg=17 cterm=none
-hi cMaohao                  guifg=#3EFFE2                          ctermfg=14
-
-
-"vim:ts=4:tw=4
diff --git a/colors/softlight.vim b/colors/softlight.vim
deleted file mode 100755
index e5a305a..0000000
--- a/colors/softlight.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-" Vim color file
-" Maintainer:   Armin Moradi <feng.shaun@gmail.com>
-" Last Change:  27 July 2008
-" URL: http://fengshaun.wordpress.com		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name="softlight"
-
-hi Normal  gui=NONE guifg=#303030 guibg=#FFFFFF
-hi NonText gui=BOLD guifg=#303030 guibg=#FFFFFF
-
-" Search
-hi IncSearch gui=BOLD guifg=#008000 guibg=#CCFF00
-hi Search    gui=BOLD guifg=#008000 guibg=#CCFF00
-
-" Messages
-hi ErrorMsg   gui=BOLD guifg=#FFFFFF guibg=#FF0000
-hi WarningMsg gui=BOLD guifg=#008000 guibg=#CCFF00
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#FFFFFF guibg=#0E8ED3
-hi StatusLineNC gui=BOLD guifg=#FFFFFF guibg=#0A6799
-
-" Diff
-hi DiffText     gui=BOLD guifg=#FF0000 guibg=#FFEAE0
-hi DiffChange   gui=BOLD guifg=#303030 guibg=#FFFFFF
-hi DiffDelete   gui=NONE guifg=#FFFFFF guibg=#FF0000
-hi DiffAdd      gui=NONE guifg=#008000 guibg=#00FF00
-
-" Cursor
-hi Cursor       gui=BOLD guifg=#FFFFFF guibg=#000000
-hi lCursor      gui=BOLD guifg=#f8f8f8 guibg=#162CF7
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#162CF7
-
-" Fold
-hi Folded	  gui=BOLD guifg=#0E8ED3 guibg=#DBF2FF
-hi FoldColumn gui=NONE guifg=#0E8ED3 guibg=#DBF2FF
-
-" Other
-hi LineNr		 gui=BOLD guifg=#00A0FF guibg=#DBF2FF
-hi Directory    gui=BOLD guifg=#0A6799 guibg=#FFFFFF
-hi NonText      gui=BOLD guifg=#009999 guibg=#FFFFFF
-hi SpecialKey   gui=BOLD guifg=#2020FF guibg=#FFFFFF
-hi Title        gui=BOLD guifg=#0000A0 guibg=#FFFFFF
-hi Visual       gui=NONE guifg=#404060 guibg=#dddde8
-
-" Syntax group
-" purple was #8000FF
-hi Comment    gui=ITALIC guifg=#888786 guibg=NONE 
-hi Constant	  gui=NONE guifg=#303030 guibg=NONE
-hi Error      gui=BOLD guifg=#FF0000 guibg=NONE
-hi Identifier gui=BOLD guifg=#1F89E0 guibg=NONE 
-hi Ignore     gui=NONE guifg=#f8f8f8 guibg=NONE
-hi PreProc	  gui=NONE guifg=#006E26 guibg=NONE
-hi Special    gui=NONE guifg=#0E8ED3 guibg=#DBF2FF
-hi Statement  gui=BOLD guifg=#141312 guibg=NONE
-hi Todo       gui=NONE guifg=#FF0070 guibg=#FFE0F4
-hi Type		  gui=NONE guifg=#0057AE guibg=NONE
-hi Underlined gui=UNDERLINE guifg=#0000ff guibg=NONE
-
-" HTML
-hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
-" Scrollbar
-hi Scrollbar  gui=BOLD guifg=#00C0FF guibg=#FFFFFF
-hi VertSplit  gui=BOLD guifg=#FFFFFF guibg=#0E8ED3
-hi Visual	  gui=BOLD guifg=#FFFFFF guibg=#1679F9
-
-
diff --git a/colors/sonofobsidian.vim b/colors/sonofobsidian.vim
deleted file mode 100755
index f3a58c2..0000000
--- a/colors/sonofobsidian.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" Port of http://studiostyles.info/schemes/son-of-obsidian
-" to vim
-" Last Change: 2010 sep 28
-" Version: 1.0
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="sonofobsidian"
-
-
-hi Comment          guifg=#99AA8A
-hi Normal           guifg=#FFFFFF guibg=#22282A
-hi CursorLine       guibg=#32383A
-hi CursorColumn     guibg=#32383A
-hi Search           guibg=#808080
-hi Visual           guifg=#FFFFFF guibg=#4F6164 
-hi VisualNOS        guifg=#FFFFFF guibg=#4F6164 
-hi Identifier       guifg=#FFFFFF
-hi Number           guifg=#FFCD22 
-hi Operator         guifg=#E8E2B7 
-hi String           guifg=#EC7600 
-hi FoldColumn       guifg=#FFFFFF guibg=#394144
-hi LineNr           guifg=#3F4E49 guibg=#293134 
-hi PreProc          guifg=#A082BD 
-hi Keyword          guifg=#93C763
-hi Conditional      guifg=#93C763
-hi Statement        guifg=#93C763
-hi Type             guifg=#93C763
-hi Structure        guifg=#678CB1 
-hi Tag              guifg=#93C763
-hi xmlTagName       guifg=#93C763
-hi xmlCdata         guifg=#99A38A
-hi xmlAttrib        guifg=#678CB1
-hi htmlTagName      guifg=#93C763
-hi htmlArg          guifg=#678CB1
-hi ErrorMsg         guifg=#FF0000
-hi WarningMsg       guifg=#FFCD22
-hi Folded           guifg=#808080 guibg=#1C2325
-hi PMenu            guifg=#CCCCFF guibg=#1C2325
-hi PMenuSel         guibg=#2C3335
-
diff --git a/colors/sorcerer.vim b/colors/sorcerer.vim
deleted file mode 100755
index d708c10..0000000
--- a/colors/sorcerer.vim
+++ /dev/null
@@ -1,97 +0,0 @@
-" 'sorcerer.vim' -- Vim color scheme.
-" Maintainer:   Jeet Sukumaran
-" Based on 'Mustang' by Henrique C. Alves (hcarvalhoalves@gmail.com),
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "sorcerer"
-
-hi Normal       guifg=#c2c2b0 guibg=#202020 gui=NONE
-hi ColorColumn  guifg=NONE    guibg=#1c1c1c
-hi Cursor       guifg=NONE    guibg=#626262 gui=NONE
-hi CursorColumn guibg=#2d2d2d
-hi CursorLine   guibg=#2d2d2d
-hi DiffAdd      guifg=#000000 guibg=#3cb371 gui=NONE
-hi DiffChange   guifg=#000000 guibg=#4f94cd gui=NONE
-hi DiffDelete   guifg=#000000 guibg=#8b3626 gui=NONE
-hi DiffText     guifg=#000000 guibg=#8ee5ee gui=NONE
-hi Directory    guifg=#1e90ff guibg=bg      gui=NONE
-hi ErrorMsg     guifg=#ff6a6a guibg=NONE    gui=bold
-hi FoldColumn   guifg=#68838b guibg=#4B4B4B gui=bold
-hi Folded       guifg=#406060 guibg=#232c2c gui=NONE
-hi IncSearch    guifg=#ffffff guibg=#ff4500 gui=bold
-hi LineNr       guifg=#686858 guibg=#000000 gui=NONE
-hi MatchParen   guifg=#fff000 guibg=#000000 gui=bold
-hi ModeMsg      guifg=#000000 guibg=#00ff00 gui=bold
-hi MoreMsg      guifg=#2e8b57 guibg=bg      gui=bold
-hi NonText      guifg=#404050 guibg=bg      gui=NONE
-
-hi Pmenu        guifg=#ffffff guibg=#444444
-hi PmenuSel     guifg=#000000 guibg=#b1d631
-"  hi           PmenuSbar     guifg=#ffffff guibg=#c1cdc1 gui=NONE
-"  hi           PmenuThumb    guifg=#ffffff guibg=#838b83 gui=NONE
-
-hi Question     guifg=#00ee00 guibg=NONE    gui=bold
-hi Search       guifg=#000000 guibg=#d6e770 gui=bold
-hi SignColumn   guifg=#ffffff guibg=#cdcdb4 gui=NONE
-hi SpecialKey   guifg=#505060 guibg=NONE    gui=NONE
-hi SpellBad     guisp=#ee2c2c gui=undercurl
-hi SpellCap     guisp=#0000ff gui=undercurl
-hi SpellLocal   guisp=#008b8b gui=undercurl
-hi SpellRare    guisp=#ff00ff gui=undercurl
-hi StatusLine   guifg=#000000 guibg=#808070 gui=bold
-hi StatusLineNC guifg=#000000 guibg=#404c4c gui=italic
-hi VertSplit    guifg=#404c4c guibg=#404c4c gui=NONE
-hi TabLine      guifg=fg      guibg=#d3d3d3 gui=underline
-hi TabLineFill  guifg=fg      guibg=bg      gui=reverse
-hi TabLineSel   guifg=fg      guibg=bg      gui=bold
-hi Title        guifg=#528b8b guibg=NONE    gui=bold
-hi Visual       guifg=#000000 guibg=#6688aa gui=NONE
-hi WarningMsg   guifg=#ee9a00 guibg=bg      gui=NONE
-hi WildMenu     guifg=#000000 guibg=#87ceeb gui=NONE
-
-"  Syntax highlighting
-hi Comment      guifg=#707670 gui=italic
-hi Boolean      guifg=#ff9800 gui=NONE
-hi String       guifg=#779b70 gui=NONE
-hi Identifier   guifg=#9ebac2 gui=NONE
-hi Function     guifg=#faf4c6 gui=NONE
-hi Type         guifg=#7e8aa2 gui=NONE
-hi Statement    guifg=#90b0d1 gui=NONE
-hi Keyword      guifg=#90b0d1 gui=NONE
-hi Constant     guifg=#ff9800 gui=NONE
-hi Number       guifg=#cc8800 gui=NONE
-hi Special      guifg=#719611 gui=NONE
-hi PreProc      guifg=#528b8b gui=NONE
-hi Todo         guifg=#8f6f8f guibg=#202020 gui=italic,underline,bold
-
-" Diff
-hi diffOldFile      guifg=#da70d6   guibg=NONE      gui=italic
-hi diffNewFile      guifg=#ffff00   guibg=NONE      gui=italic
-hi diffFile         guifg=#ffa500   guibg=NONE      gui=italic
-hi diffLine         guifg=#ff00ff   guibg=NONE      gui=italic
-hi link             diffOnly        Constant
-hi link             diffIdentical   Constant
-hi link             diffDiffer      Constant
-hi link             diffBDiffer     Constant
-hi link             diffIsA         Constant
-hi link             diffNoEOL       Constant
-hi link             diffCommon      Constant
-hi diffRemoved      guifg=#cd5555   guibg=NONE      gui=NONE
-hi diffChanged      guifg=#4f94cd   guibg=NONE      gui=NONE
-hi diffAdded        guifg=#00cd00   guibg=NONE      gui=NONE
-hi link             diffSubname     diffLine
-hi link             diffComment     Comment
-
-" Python
-hi pythonException  guifg=#90b0d1 guibg=NONE gui=NONE
-hi pythonExClass    guifg=#996666 guibg=NONE gui=NONE
-hi pythonDecorator  guifg=#888555 guibg=NONE gui=NONE
-hi link pythonDecoratorFunction pythonDecorator
-
diff --git a/colors/soso.vim b/colors/soso.vim
deleted file mode 100755
index c1e1a02..0000000
--- a/colors/soso.vim
+++ /dev/null
@@ -1,67 +0,0 @@
-"---------------------------------------------------------------------
-" $Id: soso.vim,v 1.3 2007/10/31 06:24:34 soso Exp $
-"
-" Maintainer:  Soeren Sonntag <soeren DOT sonntag AT web DOT de>
-" Last Change: $Date: 2007/10/31 06:24:34 $
-"
-" Description: Vim color file
-"---------------------------------------------------------------------
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name="soso"
-
-hi Normal       guifg=black   guibg=#e4e4e4          ctermfg=black    ctermbg=white
-hi DiffAdd                    guibg=#c0ffe0                           ctermbg=3
-hi DiffDelete   guifg=#ff8097 guibg=#ffe0f7          ctermfg=4        ctermbg=5
-hi DiffChange                 guibg=#cfefff                           ctermbg=9
-hi DiffText                   guibg=#bfdfff gui=bold                  ctermbg=6     cterm=bold
-hi NonText      guifg=grey50  guibg=grey86  gui=bold ctermfg=darkblue
-hi SpecialKey   guifg=grey50  guibg=grey86  gui=bold ctermfg=darkblue
-hi NonText      guifg=grey50  guibg=grey86           ctermfg=blue
-hi LineNr       guifg=grey50  guibg=grey86           ctermfg=darkblue
-hi Search                     guibg=#fff999
-hi StatusLine   guifg=bg      guibg=black   gui=bold ctermfg=bg       ctermbg=black cterm=bold
-hi StatusLineNC guifg=bg      guibg=grey40  gui=NONE ctermfg=bg       ctermbg=black cterm=NONE
-hi Visual       guifg=fg      guibg=#ccccdd gui=NONE
-hi VisualNOS    guifg=bg      guibg=#ccccdd gui=NONE
-
-" syntax highlighting groups
-hi Comment      guifg=#000099 guibg=bg               ctermfg=darkblue
-hi String       guifg=#b30000 guibg=bg               ctermfg=darkred
-hi Constant     guifg=#c033ff guibg=bg               ctermfg=darkmagenta
-hi Statement    guifg=black   guibg=bg               ctermfg=black                  cterm=bold
-hi PreProc      guifg=#335588 guibg=bg      gui=bold ctermfg=blue
-hi Type         guifg=#338855 guibg=bg      gui=bold ctermfg=darkgreen
-hi StorageClass guifg=#990000 guibg=bg               ctermfg=red
-hi Special      guifg=#6688ff guibg=bg               ctermfg=darkcyan
-hi Function     guifg=#117777 guibg=bg               ctermfg=red
-
-" showpairs plugin
-"   for cursor on paren
-hi ShowPairsHL                guibg=#c4ffc4                           ctermbg=lightgreen
-"   for cursor between parens
-hi ShowPairsHLp               guibg=#c4f0c4                           ctermbg=lightgreen
-"   unmatched paren
-hi ShowPairsHLe               guibg=#ff5555                           ctermbg=red
-
-" settings for Vim7
-if version >= 700
-  hi MatchParen               guibg=#c4ffc4                                             ctermbg=lightgreen
-  " Spell
-  hi SpellBad   guifg=#cc0000               gui=undercurl guisp=#cc0000 ctermfg=red                        cterm=underline
-  hi SpellRare  guifg=magenta               gui=undercurl               ctermfg=magenta                    cterm=underline
-  hi SpellCap                               gui=undercurl guisp=#22cc22                                    cterm=underline
-  " Completion menu
-  hi Pmenu                    guibg=#ffffcc                                             ctermbg=yellow
-  hi PmenuSel                 guibg=#ddddaa                                             ctermbg=lightcyan  cterm=bold
-  hi PmenuSbar                guibg=#999966                                             ctermbg=lightcyan
-  " Tab line
-  hi TabLine                  guibg=grey70                                                                 cterm=underline
-  hi TabLineSel                             gui=bold                                                       cterm=bold
-  hi TabLineFill guifg=black  guibg=grey80                                                                 cterm=underline
-endif
diff --git a/colors/southernlights.vim b/colors/southernlights.vim
deleted file mode 100755
index 796e7c6..0000000
--- a/colors/southernlights.vim
+++ /dev/null
@@ -1,93 +0,0 @@
-" Vim color scheme
-"
-" Name:        southernlights256.vim
-" Maintainer:  Jakson Aquino
-" Last Change: Sun Oct 24, 2010  10:36AM
-" License:     GNU/GPL
-"
-" Based on other color schemes. The starting point was 'torte'
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "southernlights"
-
-hi Boolean	ctermfg=209	guifg=#ff875f
-hi Character	ctermfg=223	guifg=#ffd7af
-hi Comment      ctermfg=147	guifg=#afafff
-hi Constant	ctermfg=219	guifg=#ffafff
-hi Conceal	ctermfg=221	ctermbg=black guifg=#ffd75f guibg=black
-hi Cursor	ctermfg=Black	ctermbg=Green	cterm=bold	guifg=Black	guibg=Green	gui=bold
-hi CursorLine	ctermbg=234	cterm=NONE	guibg=#1c1c1c gui=none
-hi CursorColumn	ctermbg=234	cterm=NONE	guibg=#1c1c1c gui=none
-hi Directory	ctermfg=27	guifg=#005fff
-hi Function	ctermfg=117	guifg=#87d7ff
-hi Identifier	ctermfg=cyan	guifg=cyan
-hi LineNr	ctermfg=Black	ctermbg=240	guifg=Black	guibg=#585858
-hi MatchParen	ctermfg=white	ctermbg=58	guifg=white	guibg=#5f5f00
-hi NonText	ctermfg=21	guifg=#0000ff
-hi Number	ctermfg=223	guifg=#ffd7af
-hi Normal	ctermfg=253	ctermbg=Black	guifg=#dadada guibg=Black
-hi Operator	ctermfg=204	guifg=#ff5f87
-hi Pmenu	ctermfg=119	ctermbg=22	guifg=#87ff5f	guibg=#005f00
-hi PmenuSel	ctermfg=Yellow	ctermbg=28	guifg=Yellow	guibg=#008700
-hi PreProc	ctermfg=13	ctermbg=Black	guifg=#ff40ff
-hi Search	ctermfg=white	ctermbg=58	guifg=white	guibg=#5f5f00
-hi ShowMarksHLl	ctermfg=227	ctermbg=28	guifg=#ffff5f	guibg=#008700
-hi SignColumn							guibg=#585858
-hi Special	ctermfg=221	guifg=#ffd75f
-hi SpecialKey	ctermfg=14	guifg=#00ffff
-hi SpellBad	ctermfg=red	ctermbg=NONE	cterm=UNDERLINE	guisp=red	gui=undercurl
-hi SpellLocal	ctermfg=Green	ctermbg=NONE	cterm=UNDERLINE	guisp=#00AA00	gui=undercurl
-hi SpellRare	ctermfg=Magenta	ctermbg=NONE	cterm=UNDERLINE	guisp=Magenta	gui=undercurl
-hi Statement	ctermfg=yellow	guifg=yellow	cterm=NONE	gui=NONE
-hi StatusLine	ctermfg=239	ctermbg=white	guifg=#4e4e4e	guibg=white
-hi StatusLineNC	ctermfg=239	ctermbg=black	guifg=gray30	guibg=black
-hi TabLineSel	ctermfg=white	ctermbg=239	guifg=#4e4e4e	guibg=white
-hi TabLine     	ctermfg=247	ctermbg=234	cterm=NONE	guifg=#9e9e9e	guibg=#262626 gui=NONE
-hi VertSplit   	ctermfg=239	ctermbg=black	guifg=gray30	guibg=black
-hi String	ctermfg=229	guifg=#ffffaf 
-hi Title	cterm=bold	ctermfg=Magenta	gui=bold	guifg=Magenta
-hi Type		ctermfg=77	guifg=#5fd75f	gui=NONE
-hi vimCommentString ctermfg=147	guifg=#afafff	gui=italic
-hi Visual	ctermfg=248	guifg=#a8a8a8	ctermbg=237 guibg=#3a3a3a
-hi WarningMsg	ctermfg=red
-
-" html
-hi htmlLink			cterm=UNDERLINE	ctermfg=105	gui=UNDERLINE	guifg=#8787ff
-hi htmlBold			cterm=BOLD			gui=BOLD
-hi htmlBoldItalic		cterm=BOLD,ITALIC		gui=BOLD,ITALIC
-hi htmlBoldUnderline		cterm=BOLD,UNDERLINE		gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic	cterm=BOLD,UNDERLINE,ITALIC	gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic			cterm=ITALIC			gui=ITALIC
-hi htmlUnderline		cterm=UNDERLINE			gui=UNDERLINE
-hi htmlUnderlineItalic		cterm=UNDERLINE,ITALIC		gui=UNDERLINE,ITALIC
-
-" mail
-hi mailHeader  ctermfg=229 guifg=#ffffaf
-hi mailSubject ctermfg=yellow guifg=yellow
-hi mailQuoted1 ctermfg=48 guifg=#00ff87
-hi mailQuoted2 ctermfg=51 guifg=#00ffff
-hi mailQuoted3 ctermfg=39 guifg=#00afff
-hi mailQuoted4 ctermfg=33 guifg=#0087ff
-hi mailQuoted5 ctermfg=27 guifg=#005fff
-hi mailQuoted6 ctermfg=21 guifg=#0000ff
-hi mailSignature ctermfg=209 guifg=#ff875f
-
-" diff
-hi diffAdded	ctermfg=40	guifg=#00d700
-hi diffRemoved	ctermfg=210	guifg=#ff8787
-hi diffFile	ctermfg=117	guifg=#87d7ff
-hi diffOldFile	ctermfg=117	guifg=#87d7ff
-hi diffNewFile	ctermfg=117	guifg=#87d7ff
-hi diffLine	ctermfg=yellow	guifg=yellow
-
-" wdiff
-hi link wdiffOld diffRemoved
-hi link wdiffNew diffAdded
-
diff --git a/colors/southwest-fog.vim b/colors/southwest-fog.vim
deleted file mode 100755
index 2b47384..0000000
--- a/colors/southwest-fog.vim
+++ /dev/null
@@ -1,157 +0,0 @@
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Author: Mario Gutierrez (mario@mgutz.com)
-" Last Change: Dececember 6, 2010 
-" Version: 0.2
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "southwest-fog"
-
-
-"""""""""" General
-
-hi Normal 		guifg=#acb9c7   guibg=#26292e   gui=none
-
-if version >= 700
-  hi CursorColumn       guibg=#30333a
-  hi CursorLine         guibg=#30333a
-  hi MatchParen         guifg=magenta   guibg=#1a1d20   gui=bold,italic
-  hi Pmenu 		guifg=bg        guibg=#957b94
-  hi PmenuSel 	        guifg=bg        guibg=#a694b3
-
-  hi IncSearch          guifg=bg        guibg=#9d94b3   gui=bold
-  hi Search             guifg=bg        guibg=#9d94b3   gui=none
-endif
-
-hi Cursor 		guifg=bg        guibg=#73b87f   gui=none
-hi DiffAdd              guifg=bg        guibg=#70869d   gui=none
-hi DiffChange           guifg=bg        guibg=#a58f73   gui=none
-hi DiffDelete           guifg=bg        guibg=#a27376   gui=none
-hi DiffText             guifg=bg        guibg=#a4a273   gui=none
-hi ErrorMsg             guifg=fg        guibg=#aa2e34   gui=none
-hi Folded 		guifg=fg        guibg=#3d4a3e   gui=none
-hi FoldColumn           guifg=#d7969d   guibg=#3f4c4d   gui=none
-hi LineNr 		guifg=#3d424a   guibg=bg        gui=none
-hi NonText 		guifg=#3d424a   guibg=bg        gui=none
-hi Question             guifg=#6dbb6d   guibg=bg        gui=none
-hi StatusLine 	        guifg=#b0d3bb   guibg=#1a1d20   gui=none
-hi StatusLineNC         guifg=#5a6c60   guibg=#1a1d20   gui=none
-hi TabLine              guifg=#555555   guibg=#dddddd   gui=none
-hi TabLineFill 		guifg=fg        guibg=#dddddd   gui=none
-hi TabLineSel           guifg=#101010   guibg=#b0b0b0   gui=none
-hi Title 		guifg=#d7969d   guibg=bg        gui=none
-hi VertSplit 	        guifg=#1a1d20   guibg=#1a1d20   gui=none
-hi Visual		guifg=bg        guibg=#94b3b3   gui=none
-hi WarningMsg           guifg=#bb6d6d   guibg=bg        gui=none
-
-
-"""""""""" Syntax highlighting
-
-hi Comment 		guifg=#5a6c60   guibg=bg        gui=italic
-hi Constant 	        guifg=#b1c7ad   gui=none
-hi Error                guifg=fg        guibg=#aa2e34   gui=none
-hi Function 	        guifg=#cccbb1   gui=none
-hi Identifier 	        guifg=#b89e93   gui=none
-hi Ignore 		guifg=bg        guibg=bg        gui=none
-hi Keyword		guifg=#ccc0b1   gui=none
-hi Number		guifg=#e1d4a8   gui=none
-hi PreProc 		guifg=#bbacc7   gui=none
-hi Special		guifg=#a58f73   gui=none
-hi Special		guifg=#b8a792   gui=none
-hi Statement 	        guifg=#ccc0b1   gui=none
-hi String 		guifg=#9a7bb2   gui=none
-hi Todo 		guifg=#bebb83   guibg=bg        gui=bold
-hi Type 		guifg=#cbb0b2   gui=none
-hi Underlined 	        guifg=#bea483   gui=underline
-
-
-""""""""""" ERB
-
-hi link erubyDelimiter      PreProc 
-
-
-""""""""""" HAML
-
-hi link hamlAttributes      htmlArg
-hi link hamlTag             htmlTag 
-hi link hamlTagName         htmlTagName 
-hi link hamlIdChar          hamlId
-hi link hamlClassChar       hamlClass
-
-
-""""""""""" HELP
-
-hi link helpSectionDelim    NonText
-hi link helpExample         Statement
-
-
-""""""""""" HTML
-
-hi link htmlTag             Statement
-hi link htmlEndTag          Statement
-hi link htmlTagName         Statement 
-
-
-"""""""""" JavaScript
-
-hi link javaScriptFunction  Statement
-hi link javaScriptFuncName  Function
-hi link javaScriptLabel     PreProc 
-
-
-"""""""""" MAKE
-
-hi link makeCommands        Statement
-
-
-"""""""""" MARKDOWN (tpope's vim-markdown)
-
-hi link markdownCodeBlock           Statement
-hi link markdownCode                Statement 
-hi link markdownCodeDelimiter       Statement
-hi link markdownHeadingDelimiter    Title
-hi      markdownLinkText 	    guifg=#cbb0b2   gui=underline
-hi      markdownUrl                 guifg=#69839a   guibg=bg        gui=none
-hi link markdownLinkTextDelimiter   markdownUrl 
-hi link markdownLinkDelimiter       markdownUrl 
-
-
-""""""""""" NERDTree
-
-hi link treePart            NonText
-hi link treePartFile        treePart 
-hi link treeDirSlash        treePart
-hi link treeDir             Statement 
-hi link treeClosable        PreProc
-hi link treeOpenable        treeClosable
-hi link treeUp              treeClosable 
-hi      treeFlag            guifg=#3e71a1 guibg=bg gui=none
-hi link treeHelp            Comment
-hi link treeLink            Type
-hi link treeExecFile        Type
-
-
-"""""""""" PHP 
-
-hi link phpVarSelector      Identifier
-
-
-"""""""""" Ruby
-
-hi link rubyAccess                  PreProc 
-hi      rubyInterpolation           guifg=#f6abf1   guibg=bg 
-hi link rubyInterpolationDelimiter  rubyInterpolation
-hi link rubyStringDelimiter         String
-
-
-""""""""""" XML
-
-hi link xmlTag              htmlTag
-hi link xmlEndTag           htmlEndTag
-hi link xmlTagName          htmlTagName
-
-" vim: set sw=4 sts=4:
diff --git a/colors/spectro.vim b/colors/spectro.vim
deleted file mode 100755
index da7b550..0000000
--- a/colors/spectro.vim
+++ /dev/null
@@ -1,207 +0,0 @@
-" Vim color file
-" Maintainer:   Pierre-Antoine Lacaze <pa.lacaze@gmail.com>
-" Last Change:	
-" License:      GPLv2
-
-" To install, copy to ~/.vim/colors directory. Then :colorscheme spectro
-
-" spectro is a colorscheme that lets you define the global saturation and
-" the global lightness to be used for all the colors. The hue is then 
-" defined on a per color basis
-" hue, saturation and lightness shall be set between 0 and 255
-" I shamelessly used inkscape colors algorithm for HSL -> RGB conversion
-
-" The main interest is the ability to adapt to different screens
-" by only changing the saturation and lightness in your vimrc :
-" let g:spectro_saturation = 120
-" let g:spectro_lightness = 160
-
-set background=dark
-hi clear          
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="spectro"
-
-" default saturation value
-if ! exists("g:spectro_saturation")
-    let g:spectro_saturation = 130
-else
-    if g:spectro_saturation > 255
-	let g:spectro_saturation = 255
-    elseif g:spectro_saturation < 0
-	let g:spectro_saturation = 0
-    endif
-endif
-
-" default lightness value
-if ! exists("g:spectro_lightness")
-    let g:spectro_lightness = 130
-else
-    if g:spectro_lightness > 255
-	let g:spectro_lightness = 255
-    elseif g:spectro_lightness < 0
-	let g:spectro_lightness = 0
-    endif
-
-endif
-
-" function returning the hexadecimal value of an integer between 0 and 16
-fun! Dec2hex(s)
-    let str = "0123456789ABCDEF"
-    return str[a:s]
-endfunc
-
-" function converting a (R,G,B) triplet into a "#rrggbb" string
-fun! FormatRGB(rgb)
-    let r1 = a:rgb[0] / 16
-    let g1 = a:rgb[1] / 16
-    let b1 = a:rgb[2] / 16
-    let r2 = a:rgb[0] % 16
-    let g2 = a:rgb[1] % 16
-    let b2 = a:rgb[2] % 16
-    return "#".Dec2hex(r1).Dec2hex(r2).Dec2hex(g1).Dec2hex(g2).Dec2hex(b1).Dec2hex(b2)
-endfun
-
-" function converting hue to RGB
-fun! Hue2rgb(v1,v2,H)
-    let v1 = a:v1
-    let v2 = a:v2
-    let H = a:H
-    if H < 0 
-	let H += 6 * 255
-    elseif H > 6 * 255
-	let H -= 6 * 255
-    end
-
-    if H < 255
-	return (v1 * 255 + (v2 - v1) * H) / (255 * 255)
-    elseif H < 3 * 255
-	return v2 / 255
-    elseif H < 4 * 255
-	return (v1 * 255 + (v2 - v1) * (4 * 255 - H)) / (255 * 255)
-    else
-	return v1 / 255
-    endif
-endfun
-
-" function converting a (H,S,L) triplet into a (R,G,B) triplet
-fun! Hsl2rgb(h)
-    let H = a:h
-    let S = g:spectro_saturation
-    let L = g:spectro_lightness
-    if S == 0
-	let RGB = [L,L,L]
-    else
-	let RGB = [0,0,0]
-	if L < 128
-	    let v2 = L * (255 + S)
-	else
-	    let v2 = 255* (L + S) - L * S
-	endif
-	let v1 = 2 * 255 * L - v2
-	let RGB[0] = Hue2rgb(v1,v2,H * 6 + 2 * 255)
-	let RGB[1] = Hue2rgb(v1,v2,H * 6)
-	let RGB[2] = Hue2rgb(v1,v2,H * 6 - 2 * 255)
-    endif
-    return FormatRGB(RGB)
-endfun
-
-" we choose the hue for each color to be used
-" You may want to use inkscape to calibrate this
-let white  = "#ffffff"
-let black  = "#000000"
-let gray   = "#dcdccc"
-let dblue  = "#006060"
-let c_comm = Hsl2rgb(71)
-let c_spec = Hsl2rgb(27)
-let c_numb = Hsl2rgb(128)
-let c_iden = Hsl2rgb(42)
-let c_stat = Hsl2rgb(212)
-let c_prep = Hsl2rgb(8)
-let c_erro = Hsl2rgb(0)
-let c_curs = Hsl2rgb(58)
-let c_visu = Hsl2rgb(223)
-let c_tabl = Hsl2rgb(140)
-
-
-
-" let's define colors
-exe "hi Comment		guifg=".c_comm
-exe "hi Special		guifg=".c_spec."			gui=none"
-exe "hi Constant	guifg=".c_spec."			gui=bold"
-exe "hi Number		guifg=".c_numb
-exe "hi Identifier	guifg=".c_iden
-exe "hi Statement	guifg=".c_stat."			gui=bold"
-exe "hi PreProc		guifg=".c_prep."			gui=bold"
-exe "hi Type		guifg=".c_iden."			gui=none"
-exe "hi Todo		guifg=".black ."    guibg=".c_iden."	gui=none"
-exe "hi ErrorMsg	guifg=".white ."    guibg=".c_erro."	gui=bold"
-exe "hi MoreMsg		guifg=".white ."    guibg=".c_spec."	gui=bold"
-exe "hi Cursor		guifg=".black ."    guibg=".c_curs."	gui=bold"
-exe "hi WildMenu	guifg=".black ."    guibg=".c_curs."	gui=bold"
-exe "hi LineNr		guifg=".c_curs
-exe "hi Normal		guifg=".gray  ."    guibg=".black
-exe "hi Visual		guifg=".black ."    guibg=".c_spec
-exe "hi Underlined	guifg=".gray  ."			gui=underline"
-exe "hi VertSplit	guifg=".dblue ."    guibg=".gray
-exe "hi TabLine		guifg=".gray  ."    guibg=".dblue ."	gui=none"
-exe "hi TablineFill	guifg=".black ."    guibg=".black
-exe "hi TablineSel	guifg=".white ."    guibg=".c_tabl."	gui=none"
-exe "hi User2		guifg=".white ."    guibg=".c_tabl."	gui=none"
-exe "hi StatusLine	guifg=".white ."    guibg=".c_tabl."	gui=none"
-exe "hi StatusLineNC	guifg=".gray  ."    guibg=".dblue ."	gui=none"
-exe "hi Pmenu		guifg=".gray  ."    guibg=".dblue ."	gui=none"
-exe "hi PmenuSel	guifg=".black ."    guibg=".c_tabl."	gui=bold"
-exe "hi PmenuSbar	guifg=".black ."    guibg=".gray  ."	gui=none"
-exe "hi PmenuThumb	guifg=".black ."    guibg=".gray  ."	gui=none"
-exe "hi Directory	guifg=".c_comm
-exe "hi DiffAdded	guifg=".c_comm."			gui=none"
-exe "hi DiffChanged	guifg=".c_iden."			gui=none"
-exe "hi DiffRemoved	guifg=".c_erro."			gui=none"
-exe "hi DiffLine	guifg=".c_numb."			gui=bold"
-exe "hi Folded		guifg=".c_numb
-
-hi link SpecialChar	    Special
-hi link Tag		    Special
-hi link Delimiter	    Special
-hi link String		    Special
-hi link Character	    Special
-hi link SpecialKey	    Special
-hi link cFormat		    Special
-hi link	cSpecialCharacter   Special
-hi link Debug		    Constant
-hi link SpecialComment	    Constant
-hi link Boolean		    Number
-hi link Float		    Number
-hi link NonText		    Number
-hi link Function	    Identifier
-hi link Title		    Identifier
-hi link Conditional	    Statement
-hi link Repeat		    Statement
-hi link Label		    Statement
-hi link Operator	    Statement
-hi link keyword		    Statement
-hi link Exception	    Statement
-hi link Include		    PreProc
-hi link Define		    PreProc
-hi link Macro		    PreProc
-hi link PreCondit	    PreProc
-hi link ModeMsg		    PreProc
-hi link StorageClass	    Type
-hi link Structure	    Type
-hi link Typedef		    Type
-hi link Search		    Todo
-hi link IncSearch	    Todo
-hi link	Error		    ErrorMsg
-hi link WarningMsg	    MoreMsg
-hi link Question	    LineNr
-hi link StatusLineNC	    TabLine
-hi link User2		    TabLineSel
-hi link DiffAdd		    DiffAdded
-hi link DiffChange	    DiffChanged
-hi link DiffDelete	    DiffRemoved
-hi link DiffText	    DiffLine
-hi link FoldColumn	    Folded
-
diff --git a/colors/spiderhawk.vim b/colors/spiderhawk.vim
deleted file mode 100755
index 884362f..0000000
--- a/colors/spiderhawk.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-" Vim color file
-" Maintainer: Art Cowles
-" Last Change: 2008-07-17
-
-set background=dark
-hi clear
-if exists ("syntax_on")
-  syntax reset
-endif
-let g:colors_name="spiderhawk"
-
-" General colors
-hi Normal     guifg=#ffffff guibg=#000000 gui=none
-hi FoldColumn guifg=#ffffff guibg=#333333 gui=none
-hi Folded     guifg=#ffffff guibg=#333333 gui=italic
-"hi LineNr     guifg=#ffff00 guibg=#111111 gui=none
-"hi NonText    guifg=#00ff00 guibg=#000000 gui=none
-"hi StatusLine                             gui=reverse
-
-" Syntax highlighting
-hi Comment    guifg=#00ff00 guibg=NONE    gui=none
-
diff --git a/colors/spring.vim b/colors/spring.vim
deleted file mode 100755
index 06d79d0..0000000
--- a/colors/spring.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" File Name:      spring.vim
-" Abstract:       A color sheme file (only for GVIM), which make the VIM 
-"                 bright with colors. It looks like the flowers are in 
-"                 blossom in Spring.
-" Author:         CHE Wenlong <chewenlong AT buaa.edu.cn>
-" Version:        1.0
-" Last Change:    September 16, 2008
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if !has("gui_running")
-    runtime! colors/default.vim
-    finish
-endif
-
-set background=light
-
-hi clear
-
-" Version control
-if version > 580
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-
-let colors_name = "spring"
-
-" Common
-hi Normal           guifg=#000000   guibg=#cce8cf   gui=NONE
-hi Visual           guibg=#ccffff                   gui=NONE
-hi Cursor           guifg=#f5deb3   guibg=#2f4f4f   gui=NONE
-hi Cursorline       guibg=#ccffff
-hi lCursor          guifg=#000000   guibg=#ffffff   gui=NONE
-hi LineNr           guifg=#1060a0   guibg=#e0e0e0   gui=NONE
-hi Title            guifg=#202020   guibg=NONE      gui=bold
-hi Underlined       guifg=#202020   guibg=NONE      gui=underline
-
-" Split
-hi StatusLine       guifg=#f5deb3   guibg=#2f4f4f   gui=bold
-hi StatusLineNC     guifg=#f5deb3   guibg=#2f4f4f   gui=NONE
-hi VertSplit        guifg=#2f4f4f   guibg=#2f4f4f   gui=NONE
-
-" Folder
-hi Folded           guifg=#006699   guibg=#e0e0e0   gui=NONE
-
-" Syntax
-hi Type             guifg=#009933   guibg=NONE      gui=bold
-hi Define           guifg=#1060a0   guibg=NONE      gui=bold
-hi Comment          guifg=#1e90ff   guibg=NONE      gui=NONE
-hi Constant         guifg=#a07040   guibg=NONE      gui=NONE
-hi String           guifg=#a07040   guibg=NONE      gui=NONE
-hi Number           guifg=#cd0000   guibg=NONE      gui=NONE
-hi Statement        guifg=#fc548f   guibg=NONE      gui=bold
-
-" Others
-hi PreProc          guifg=#1060a0    guibg=NONE     gui=NONE
-hi Error            guifg=#ff0000    guibg=#ffffff  gui=bold,underline
-hi Todo             guifg=#a0b0c0    guibg=NONE     gui=bold,underline
-hi Special          guifg=#8B038D    guibg=NONE     gui=NONE
-hi SpecialKey       guifg=#d8a080    guibg=#e8e8e8  gui=NONE
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" vim:tabstop=4
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/colors/stackoverflow.vim b/colors/stackoverflow.vim
deleted file mode 100755
index ed04159..0000000
--- a/colors/stackoverflow.vim
+++ /dev/null
@@ -1,185 +0,0 @@
-" =============================================================================
-" File:        stackoverflow.vim
-" Description: Vim color scheme file
-" Filenames:	*.java *.txt 
-" " Maintainer:  Paul Sampi;
-" =============================================================================
-set background=light
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "stackoverflow"
-" =============================================================================
-hi Normal       guifg=#000000           guibg=#e9e9e9           gui=NONE
-hi ColorColumn  guifg=NONE              guibg=#e6e6e6
-hi Cursor       guifg=bg                guibg=#F4A83D           gui=NONE
-hi CursorIM     guifg=bg                guibg=fg                gui=NONE
-hi lCursor      guifg=bg                guibg=fg                gui=NONE
-hi CursorLine   gui=reverse
-hi DiffAdd      guifg=NONE              guibg=#9d9d9d           gui=NONE
-hi DiffChange   guifg=NONE              guibg=#d1d1d1           gui=NONE
-hi DiffDelete   guifg=NONE              guibg=#d8d8d5           gui=NONE
-hi DiffText     guifg=black             guibg=#bababa           gui=NONE
-hi Directory    guifg=#525252           guibg=bg                gui=NONE
-hi ErrorMsg     guifg=#6f6f6f           guibg=NONE              gui=NONE
-hi FoldColumn   guifg=#555555           guibg=#cccbcb           gui=bold
-hi Folded       guifg=#555555           guibg=#acacac           gui=italic
-
-hi IncSearch    guifg=black             guibg=#adadad          gui=NONE
-hi Search       guifg=black             guibg=#adadad          gui=NONE
-hi LineNr       guifg=#A0A0A0           guibg=NONE             gui=NONE
-hi MatchParen   guifg=fg                guibg=#D1C4A3          gui=bold
-hi ModeMsg      guifg=White             guibg=#767676          gui=bold
-hi MoreMsg      guifg=#7c7c7c           guibg=bg               gui=bold
-hi NonText      guifg=#7e7e7e           guibg=bg               gui=bold
-
-hi Pmenu        guifg=#646564           guibg=#b1b2b1          gui=reverse
-hi PmenuSel     guifg=fg                guibg=#EE972F          gui=bold
-hi PmenuSbar    guifg=White             guibg=#989898          gui=NONE
-hi PmenuThumb   guifg=White             guibg=#777777          gui=NONE
-
-hi Question     guifg=#454545           guibg=bg               gui=bold
-hi SignColumn   guifg=white             guibg=#c5c5c5          gui=NONE
-
-hi SpecialKey   guifg=white             guibg=ivory3           gui=NONE
-
-hi SpellBad     guisp=#323232           guibg=#d1cdcd          gui=undercurl
-hi SpellCap     guisp=#5d5d5d                                  gui=undercurl
-hi SpellLocal   guisp=#434343                                  gui=undercurl
-hi SpellRare    guisp=#7d7d7d                                  gui=undercurl
-hi StatusLine   guifg=fg                guibg=#DAB05B          gui=NONE
-hi StatusLineNC guifg=#808080           guibg=#bbbbbb          gui=italic
-hi TabLine      guifg=fg                guibg=LightGrey        gui=underline
-hi TabLineFill  guifg=fg                guibg=bg               gui=reverse
-hi TabLineSel   guifg=fg                guibg=bg               gui=bold
-hi Title        guifg=#6d6d6d           guibg=bg               gui=NONE
-hi VertSplit    guifg=#b9b9b9           guibg=#b9b9b9
-hi Visual       guifg=white             guibg=#B36A02          gui=NONE
-hi WarningMsg   guifg=#cfcfcf           guibg=#5b5b5b          gui=NONE
-hi WildMenu     guifg=Black             guibg=#c2c2c2          gui=NONE
-
-" -----------------------------------------------------------------------------
-hi Comment      guifg=#808080          guibg=NONE      gui=NONE
-hi Constant     guifg=#800000          guibg=NONE      gui=NONE
-hi String       guifg=#800000          guibg=NONE      gui=NONE
-hi Boolean      guifg=#616060          guibg=NONE      gui=NONE
-hi Identifier   guifg=fg               guibg=NONE      gui=NONE
-hi Function     guifg=fg               guibg=NONE      gui=NONE
-hi Statement    guifg=#020076          guibg=NONE      gui=NONE
-hi Keyword      guifg=#666666          guibg=NONE      gui=NONE
-hi PreProc      guifg=#6b6b6b          guibg=NONE      gui=NONE
-hi Type         guifg=#000077          guibg=NONE      gui=NONE
-hi Special      guifg=#6e6e6e          guibg=NONE      gui=NONE
-hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-hi Error        guifg=#727272          guibg=NONE      gui=undercurl
-hi Conditional  guifg=#000052          guibg=NONE      gui=NONE
-hi Todo         guifg=fg               guibg=NONE      gui=bold
-hi Underlined   guifg=#9A4444          guibg=NONE      gui=NONE
-" -----------------------------------------------------------------------------
-hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-hi qfFileName       guifg=#dedede      guibg=NONE      gui=italic
-hi qfLineNr         guifg=#808080      guibg=NONE      gui=NONE
-hi qfError          guifg=#8e8e8e      guibg=NONE      gui=bold
-
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-" -----------------------------------------------------------------------------
-hi diffOldFile          guifg=#717171           guibg=NONE      gui=NONE
-hi diffNewFile          guifg=#ababab           guibg=NONE      gui=bold
-hi diffFile             guifg=#676767           guibg=NONE      gui=NONE
-hi link diffOnly        Constant
-hi link diffIdentical   Constant
-hi link diffDiffer      Constant
-hi link diffBDiffer     Constant
-hi link diffIsA         Constant
-hi link diffNoEOL       Constant
-hi link diffCommon      Constant
-hi diffRemoved          guifg=#b1b1b1           guibg=NONE      gui=NONE
-hi diffChanged          guifg=#727272           guibg=NONE      gui=NONE
-hi diffAdded            guifg=#919191           guibg=NONE      gui=NONE
-hi diffLine             guifg=#4e4e4e           guibg=NONE      gui=italic
-hi link diffSubname     diffLine
-hi link diffComment     Comment
-" -----------------------------------------------------------------------------
-"hi htmlLink             guifg=#666666          guibg=NONE      gui=underline,italic
-
-hi htmlTagName          guifg=#800000          guibg=NONE      gui=NONE
-hi link htmlScriptTag htmlTagName
-hi link htmlTag htmlTagName
-hi link htmlTagN htmlTagName
-hi link htmlEndTag htmlTagName
-hi link htmlSpecialTagName htmlTagName
-hi htmlString           guifg=#0000FF          guibg=NONE      gui=NONE
-hi htmlArg              guifg=#FF0000          guibg=NONE      gui=NONE
-hi link htmlValue       Constant
-
-hi link cssRenderAttr Constant 
-hi link cssTextAttr Constant
-hi link cssUIAttr Constant
-hi link cssTableAttr Constant
-hi link cssColorAttr Constant
-hi link cssBoxAttr Constant
-hi link cssCommonAttr Constant
-hi link cssFunctionName Constant
-hi link cssRenderProp Type
-hi link cssBoxProp Type
-
-hi link cssTagName Statement 
-hi link cssClassName cssTagName
-hi link cssIdentifier cssTagName
-hi link cssPseudoClass cssTagName
-hi link cssPseudoClassId cssTagName
-
-hi cssBraces            guifg=fg         guibg=bg      gui=NONE
-hi javaScript           guifg=fg         guibg=NONE
-hi link javaScriptFunction Statement
-hi link javaScriptMember Statement
-hi link javaScriptValue Constant
-hi javaScriptType guifg=#257E9F 
-
-
-hi link javaSpecialChar Constant
-hi javaParenT           guifg=fg         guibg=NONE    gui=NONE
-hi javaFold             guifg=#257E9F    guibg=NONE    gui=NONE
-" syn match javaFold /\w\+_\=[A-Z]\w\+/
-" syn match javaFold /\s\+[A-Z]\w\+\s*/
-" syn match javaFold /^[A-Z]\w\+\s*/
-" syn match javaParenT /\w\+()/
-
-
-hi link javaAnnotation  Constant
-hi link javaType Statement
-hi link javaConstant Statement
-hi link javaCharacter Statement
-
-hi link javaNumber Constant
-hi link javaExternal Statement
-
-hi link cppStatement  Statement
-hi cBlock               guifg=#257E9F    guibg=NONE    gui=NONE
-" hi cType                guifg=#257E9F    guibg=NONE    gui=NONE
-
-" syn match cBlock /\w\+_\=[A-Z]\w\+/
-" syn match cBlock /\s\+[A-Z]\w\+\s*/
-" syn match cBlock /^[A-Z]\w\+\s*/
-" syn match cBlock /\w\+()/
-
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
-
-hi mTag guifg=#257E9F
-hi nTag guifg=fg
-syn match mTag /\w\+_\=[A-Z]\w\+/
-syn match mTag /\s\+[A-Z]\w\+\s*/
-syn match  mTag /^[A-Z]\w\+\s*/
-syn match nTag /\w\+()/
-
diff --git a/colors/stingray.vim b/colors/stingray.vim
deleted file mode 100755
index e2a15cb..0000000
--- a/colors/stingray.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Vim color file
-" Maintainer:   connor berry <connorberry@yahoo.com>
-" Last Change:  6 July 2007
-" URL: www.narwhale.org
-
-set background=dark     
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="stingray"
-
-        hi LineNr       term=bold gui=bold guifg=White guibg=DarkGray
-        hi Normal       ctermfg=White ctermbg=Black
-        hi Normal       guifg=White guibg=Black
-        hi NonText      ctermfg=DarkGray  ctermbg=Black
-        hi NonText      guifg=DarkGray  guibg=Black
-
-        hi Statement    ctermfg=Cyan      ctermbg=Black
-        hi Statement    guifg=Cyan      guibg=Black
-        hi Comment      ctermfg=DarkGrey  ctermbg=Black cterm=bold term=bold
-        hi Comment      guifg=DarkGrey  guibg=Black gui=bold term=bold
-        hi Constant     ctermfg=DarkCyan  ctermbg=Black
-        hi Constant     guifg=DarkCyan  guibg=Black
-        hi Identifier   ctermfg=White      ctermbg=Black
-        hi Identifier   guifg=White      guibg=Black
-        hi Type         ctermfg=DarkCyan ctermbg=Black
-        hi Type         guifg=DarkCyan guibg=Black
-        hi String       ctermfg=Cyan ctermbg=black
-        hi String       guifg=Cyan guibg=Black
-        hi Boolean      ctermfg=Cyan ctermbg=Black
-        hi Boolean      guifg=Cyan guibg=Black
-        hi Number       ctermfg=Cyan ctermbg=Black
-        hi Number       guifg=Cyan guibg=Black
-        hi Folded       ctermfg=DarkCyan ctermbg=Black cterm=underline term=none
-        hi Folded       guifg=DarkCyan guibg=Black gui=underline term=none
-        hi Special      ctermfg=Grey      ctermbg=Black
-        hi Special      guifg=Grey      guibg=Black
-        hi PreProc      ctermfg=Grey ctermbg=Black cterm=bold term=bold
-        hi PreProc      guifg=Grey guibg=Black gui=bold term=bold
-        hi Scrollbar    ctermfg=DarkCyan      ctermbg=Black
-        hi Scrollbar    guifg=DarkCyan      guibg=Black
-        hi Cursor       ctermfg=Black     ctermbg=white
-        hi Cursor       guifg=Black     guibg=white
-        hi ErrorMsg     ctermfg=Red       ctermbg=Black cterm=bold term=bold
-        hi ErrorMsg     guifg=Red       guibg=Black gui=bold term=bold
-        hi WarningMsg   ctermfg=Yellow    ctermbg=Black
-        hi WarningMsg   guifg=Yellow    guibg=Black
-        hi VertSplit    ctermfg=White     ctermbg=Black
-        hi VertSplit    guifg=White     guibg=Black
-        hi Directory    ctermfg=Green      ctermbg=DarkBlue
-        hi Directory    guifg=Green      guibg=DarkBlue
-        hi Visual       ctermfg=White     ctermbg=DarkGray cterm=underline term=none
-        hi Visual       guifg=White     guibg=DarkGray gui=underline term=none
-        hi Title        ctermfg=White     ctermbg=DarkBlue
-        hi Title        guifg=White     guibg=DarkBlue
-
-        hi StatusLine   term=bold cterm=bold,underline ctermfg=White ctermbg=Black
-        hi StatusLine   term=bold gui=bold,underline guifg=White guibg=Black
-        hi StatusLineNC term=bold cterm=bold,underline ctermfg=Gray  ctermbg=Black
-        hi StatusLineNC term=bold gui=bold,underline guifg=Gray  guibg=Black
-        hi LineNr       term=bold cterm=bold ctermfg=White ctermbg=DarkGray
-        hi LineNr       term=bold gui=bold guifg=White guibg=DarkGray
-
-        hi cursorline   ctermbg=DarkBlue
-        hi cursorline   guibg=DarkBlue
diff --git a/colors/strawimodo.vim b/colors/strawimodo.vim
deleted file mode 100755
index 46350cf..0000000
--- a/colors/strawimodo.vim
+++ /dev/null
@@ -1,120 +0,0 @@
-" Name:        strawimodo
-" Description: vim colorscheme
-" Name:        strawimodo
-"
-" Maintainer:  Marco Hinz <m.hinz@fu-berlin.de>
-" License:     Public Domain
-" Version:     0.3
-" Date:        Do, 22 Jan 2010
-"
-" Notes:
-"
-" 1) In the beginning I was inspired by railscasts.vim,
-"    but it mutated to something totally different.
-"
-" 2) To me having a clean theme structure is as
-"    important as the actual design.
-
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "strawimodo"
-
-
-" general appearance {{{1
-
-hi Cursor                                   guibg=#ffffff
-hi CursorLine                               guibg=#333435
-hi Directory                 guifg=#a5c261                 gui=none
-hi Normal                    guifg=#c3dafd  guibg=#393939  gui=none
-hi Visual                                   guibg=#5a647e
-
-" Pmenu       = normal item in popup
-" PMenuSbar   = scrollbar in popup
-" PmenuSel    = selected item in popop
-" PMenuThumb  = thumb of the scrollbar in popup
-
-hi Pmenu                     guifg=#000000  guibg=#b2c867  gui=none
-hi PMenuSbar                                guibg=#5a647e  gui=none
-hi PmenuSel                  guifg=#ffffff  guibg=#ff855c  gui=bold
-hi PMenuThumb                               guibg=#aaaaaa  gui=none
-
-" FoldColumn    = the '+' you can click when having folds
-" Folded        = closed folds
-" LineNr        = :set nu
-" ModeMsg       = -- INSERT --
-" NonText       = everything below EOF
-" SignColumn    = left from the 'LineNr' when enabled
-" StatusLine    = active statusline
-" StatusLineNC  = unactive statuslines
-" VertSplit     = vert split seperator
-
-hi FoldColumn                guifg=#ff855c  guibg=#303030  gui=none
-hi Folded                    guifg=#78acc9  guibg=#444444  gui=none
-hi LineNr                    guifg=#797979  guibg=#303030  gui=none
-hi ModeMsg                   guifg=#f9d07f                 gui=bold
-hi NonText                   guifg=#303030  guibg=#303030  gui=none
-hi SignColumn                guifg=#797979  guibg=#303030  gui=none
-hi StatusLine                guifg=#222222  guibg=#b2c867  gui=none
-hi StatusLineNC              guifg=#797979  guibg=#303030  gui=none
-hi VertSplit                 guifg=#797979  guibg=#303030  gui=none
-
-hi Comment                   guifg=#bc9458                 gui=bold,italic
-hi Error                     guifg=#ffffff  guibg=#aa5555  gui=none
-hi ErrorMsg                  guifg=#ffffff  guibg=#aa5555  gui=none
-hi Todo                      guifg=#000000  guibg=#ff855c  gui=bold
-hi WarningMsg                guifg=#000000  guibg=#ff855c  gui=none
-
-" IncSearch  = incremental search
-" Search     = found matches
-
-hi IncSearch                 guifg=#ffffff  guibg=#8d97af  gui=bold
-hi Search                    guifg=#000000  guibg=#f9d07f  gui=bold
-
-" the diff mode uses rather unintrusive colors
-
-" DiffAdd     = added line
-" DiffChange  = changed line
-" DiffDelete  = removed line
-" DiffText    = changed characters
-
-hi DiffAdd                   guifg=#ffffff  guibg=#395939  gui=none
-hi DiffChange                guifg=#ffffff  guibg=#393959  gui=none
-hi DiffDelete                guifg=#000000  guibg=#593939  gui=none
-hi DiffText                  guifg=#000000  guibg=#ff855c  gui=bold
-
-" TabLineFill  = unfilled tabline
-" TabLineSel   = active tab
-" TabLine      = unactive tabs
-
-hi TabLineFill               guifg=#303030
-hi TabLine                                 guibg=#505050 gui=italic
-hi TabLineSel                guifg=#222222 guibg=#b2c867 gui=bold
-
-" syntax highlighting {{{1
-
-hi Constant                  guifg=#78acc9                 gui=none
-hi Define                    guifg=#CC7833                 gui=none
-hi Delimiter                 guifg=#519F50                 gui=none
-hi Function                  guifg=#f9d07f                 gui=none
-hi Identifier                guifg=#d0d0ff                 gui=none
-hi Include                   guifg=#ff7a53                 gui=none
-hi Keyword                   guifg=#CC7833                 gui=none
-hi Macro                     guifg=#CC7833                 gui=none
-hi Number                    guifg=#ff7a53                 gui=bold
-hi PreCondit                 guifg=#CC7833                 gui=none
-hi PreProc                   guifg=#CC7833                 gui=none
-hi Statement                 guifg=#f9d07f                 gui=bold
-hi String                    guifg=#b2c867                 gui=bold
-hi Title                     guifg=#ffffff                 gui=none
-hi Type                      guifg=#d78a42                 gui=bold
-
-" plugin-specific {{{1
-
-" file name from taglist.vim
-hi TagListFileName           guifg=#b2c867                 gui=bold
-
-" vim: set fdm=marker foldmarker={{{,}}}
diff --git a/colors/summerfruit.vim b/colors/summerfruit.vim
deleted file mode 100755
index 8030b82..0000000
--- a/colors/summerfruit.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-"
-" SummerFruit Color Scheme
-" ========================
-"
-" Author:   Armin Ronacher <armin.ronacher@active-4.com>
-" Version:  0.1
-"
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "summerfruit"
-
-" Global
-hi Normal       guifg=#000000   guibg=#ffffff
-hi NonText      guifg=#438ec3   guibg=#b7dce8
-
-" Search
-hi Search    guifg=#800000   guibg=#ffae00
-hi IncSearch    guifg=#800000   guibg=#ffae00
-
-" Interface Elements
-hi StatusLine   guifg=#ffffff   guibg=#43c464   gui=bold
-hi StatusLineNC guifg=#9bd4a9   guibg=#51b069
-hi VertSplit    guifg=#3687a2   guibg=#3687a2
-hi Folded       guifg=#3c78a2   guibg=#c3daea
-hi IncSearch    guifg=#708090   guibg=#f0e68c
-hi Pmenu        guifg=#ffffff   guibg=#cb2f27
-hi SignColumn   guibg=#1b5c8a
-hi CursorLine   guibg=#eff2f4
-hi LineNr       guifg=#eeeeee   guibg=#438ec3   gui=bold
-hi MatchParen   guibg=#cddae5
-
-" Specials
-hi Todo         guifg=#e50808   guibg=#dbf3cd   gui=bold
-hi Title        guifg=#000000   gui=bold
-hi Special      guifg=#fd8900
-
-" Syntax Elements
-hi String       guifg=#0086d2
-hi Constant     guifg=#0086d2
-hi Number       guifg=#0086f7                   gui=bold
-hi Statement    guifg=#fb660a                   gui=bold
-hi Function     guifg=#ff0086                   gui=bold
-hi PreProc      guifg=#ff0007                   gui=bold
-hi Comment      guifg=#22a21f   guibg=#dbf3cd   gui=italic
-hi Type         guifg=#70796b                   gui=bold
-hi Error        guifg=#ffffff   guibg=#d40000
-hi Identifier   guifg=#ff0086                   gui=bold
-hi Label        guifg=#ff0086
-
-" Python Highlighting
-hi pythonCoding     guifg=#ff0086
-hi pythonRun        guifg=#ff0086
-hi pythonBuiltinObj     guifg=#2b6ba2           gui=bold
-hi pythonBuiltinFunc    guifg=#2b6ba2           gui=bold
-hi pythonException      guifg=#ee0000           gui=bold
-hi pythonExClass        guifg=#66cd66           gui=bold
-hi pythonSpaceError     guibg=#f8e6e6
-hi pythonDocTest    guifg=#2f5f49
-hi pythonDocTest2   guifg=#3b916a
-hi pythonFunction   guifg=#ee0000               gui=bold
-hi pythonClass      guifg=#ff0086               gui=bold
-
-" HTML Highlighting
-hi htmlTag              guifg=#00bdec           gui=bold
-hi htmlEndTag           guifg=#00bdec           gui=bold
-hi htmlSpecialTagName   guifg=#4aa04a
-hi htmlTagName          guifg=#4aa04a
-hi htmlTagN             guifg=#4aa04a
-
-" Jinja Highlighting
-hi jinjaTagBlock    guifg=#ff0007   guibg=#fbf4c7   gui=bold
-hi jinjaVarBlock    guifg=#ff0007   guibg=#fbf4c7
-hi jinjaString      guifg=#0086d2   guibg=#fbf4c7
-hi jinjaNumber      guifg=#bf0945   guibg=#fbf4c7   gui=bold
-hi jinjaStatement   guifg=#fb660a   guibg=#fbf4c7   gui=bold
-hi jinjaComment     guifg=#008800   guibg=#002300   gui=italic
-hi jinjaFilter      guifg=#ff0086   guibg=#fbf4c7
-hi jinjaRaw         guifg=#aaaaaa   guibg=#fbf4c7
-hi jinjaOperator    guifg=#ffffff   guibg=#fbf4c7
-hi jinjaVariable    guifg=#92cd35   guibg=#fbf4c7
-hi jinjaAttribute   guifg=#dd7700   guibg=#fbf4c7
-hi jinjaSpecial     guifg=#008ffd   guibg=#fbf4c7
diff --git a/colors/summerfruit256.vim b/colors/summerfruit256.vim
deleted file mode 100755
index d62cbf8..0000000
--- a/colors/summerfruit256.vim
+++ /dev/null
@@ -1,322 +0,0 @@
-" Vim color file
-" Maintainer: Martin Baeuml <baeuml@gmail.com>
-" Last Change: 2008-02-09
-"
-" This color file is a modification of the "summerfruit" color scheme by Armin Ronacher
-" so that it can be used on 88- and 256-color xterms. The colors are translated
-" using Henry So's programmatic approximation of gui colors from his "desert256"
-" color scheme.
-"
-" I removed the "italic" option and the background color from
-" comment-coloring because that looks odd on my console.
-"
-" The original "summerfruit" color scheme and "desert256" are available from vim.org.
-
-set background=light
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="summerfruit256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-    " functions {{{
-    " returns an approximate grey index for the given grey level
-    fun <SID>grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    fun <SID>grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    fun <SID>grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    fun <SID>rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    fun <SID>rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    fun <SID>rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    fun <SID>color(r, g, b)
-        " get the closest grey
-        let l:gx = <SID>grey_number(a:r)
-        let l:gy = <SID>grey_number(a:g)
-        let l:gz = <SID>grey_number(a:b)
-
-        " get the closest color
-        let l:x = <SID>rgb_number(a:r)
-        let l:y = <SID>rgb_number(a:g)
-        let l:z = <SID>rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = <SID>grey_level(l:gx) - a:r
-            let l:dgg = <SID>grey_level(l:gy) - a:g
-            let l:dgb = <SID>grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = <SID>rgb_level(l:gx) - a:r
-            let l:dg = <SID>rgb_level(l:gy) - a:g
-            let l:db = <SID>rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return <SID>grey_color(l:gx)
-            else
-                " use the color
-                return <SID>rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return <SID>rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    fun <SID>rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return <SID>color(l:r, l:g, l:b)
-    endfun
-
-    " sets the highlighting for the given group
-    fun <SID>X(group, fg, bg, attr)
-        if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-        endif
-        if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-        endif
-        if a:attr != ""
-            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-        endif
-    endfun
-    " }}}
-
-    " Global
-    call <SID>X("Normal", "000000", "ffffff", "")
-    call <SID>X("NonText", "438ec3", "b7dce8", "")
-
-    " Search
-    call <SID>X("Search", "800000", "ffae00", "")
-    call <SID>X("IncSearch", "800000", "ffae00", "")
-
-    " Interface Elements
-    call <SID>X("StatusLine", "ffffff", "43c464", "bold")
-    call <SID>X("StatusLineNC", "9bd4a9", "51b069", "")
-    call <SID>X("VertSplit", "3687a2", "3687a2", "")
-    call <SID>X("Folded", "3c78a2", "c3daea", "")
-    call <SID>X("IncSearch", "708090", "f0e68c", "")
-    call <SID>X("Pmenu", "ffffff", "cb2f27", "")
-    call <SID>X("SignColumn", "", "", "")
-    call <SID>X("CursorLine", "", "c0d9eb", "")
-    call <SID>X("LineNr", "eeeeee", "438ec3", "bold")
-    call <SID>X("MatchParen", "", "", "")
-
-    " Specials
-    call <SID>X("Todo", "e50808", "dbf3cd", "bold")
-    call <SID>X("Title", "000000", "", "")
-    call <SID>X("Special", "fd8900", "", "")
-
-    " Syntax Elements
-    call <SID>X("String", "0086d2", "", "")
-    call <SID>X("Constant", "0086d2", "", "")
-    call <SID>X("Number", "0086f7", "", "")
-    call <SID>X("Statement", "fb660a", "", "")
-    call <SID>X("Function", "ff0086", "", "")
-    call <SID>X("PreProc", "ff0007", "", "")
-    call <SID>X("Comment", "22a21f", "", "bold")
-    call <SID>X("Type", "70796b", "", "")
-    call <SID>X("Error", "ffffff", "d40000", "")
-    call <SID>X("Identifier", "ff0086", "", "")
-    call <SID>X("Label", "ff0086", "", "")
-
-    " Python Highlighting
-    call <SID>X("pythonCoding", "ff0086", "", "")
-    call <SID>X("pythonRun", "ff0086", "", "")
-    call <SID>X("pythonBuiltinObj", "2b6ba2", "", "")
-    call <SID>X("pythonBuiltinFunc", "2b6ba2", "", "")
-    call <SID>X("pythonException", "ee0000", "", "")
-    call <SID>X("pythonExClass", "66cd66", "", "")
-    call <SID>X("pythonSpaceError", "", "", "")
-    call <SID>X("pythonDocTest", "2f5f49", "", "")
-    call <SID>X("pythonDocTest2", "3b916a", "", "")
-    call <SID>X("pythonFunction", "ee0000", "", "")
-    call <SID>X("pythonClass", "ff0086", "", "")
-
-    " HTML Highlighting
-    call <SID>X("htmlTag", "00bdec", "", "")
-    call <SID>X("htmlEndTag", "00bdec", "", "")
-    call <SID>X("htmlSpecialTagName", "4aa04a", "", "")
-    call <SID>X("htmlTagName", "4aa04a", "", "")
-    call <SID>X("htmlTagN", "4aa04a", "", "")
-
-    " Jinja Highlighting
-    call <SID>X("jinjaTagBlock", "ff0007", "fbf4c7", "bold")
-    call <SID>X("jinjaVarBlock", "ff0007", "fbf4c7", "")
-    call <SID>X("jinjaString", "0086d2", "fbf4c7", "")
-    call <SID>X("jinjaNumber", "bf0945", "fbf4c7", "bold")
-    call <SID>X("jinjaStatement", "fb660a", "fbf4c7", "bold")
-    call <SID>X("jinjaComment", "008800", "002300", "italic")
-    call <SID>X("jinjaFilter", "ff0086", "fbf4c7", "")
-    call <SID>X("jinjaRaw", "aaaaaa", "fbf4c7", "")
-    call <SID>X("jinjaOperator", "ffffff", "fbf4c7", "")
-    call <SID>X("jinjaVariable", "92cd35", "fbf4c7", "")
-    call <SID>X("jinjaAttribute", "dd7700", "fbf4c7", "")
-    call <SID>X("jinjaSpecial", "008ffd", "fbf4c7", "")
-
-    " delete functions {{{
-    delf <SID>X
-    delf <SID>rgb
-    delf <SID>color
-    delf <SID>rgb_color
-    delf <SID>rgb_level
-    delf <SID>rgb_number
-    delf <SID>grey_color
-    delf <SID>grey_level
-    delf <SID>grey_number
-    " }}}
-endif
-
-" vim: set fdl=0 fdm=marker:
-
diff --git a/colors/surveyor.vim b/colors/surveyor.vim
deleted file mode 100755
index 33cd176..0000000
--- a/colors/surveyor.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-" Surveyor color scheme version 1.0
-" By Marcel Strik
-
-set background=light
-hi clear
-
-if exists( "syntax_on" )
-	syntax reset
-endif
-
-let g:colors_name = "Surveyor"
-
-" hi Normal	guibg=#5f626d guifg=#e1eaff
-hi Normal	guibg=#000040 guifg=#e1eaff
-hi NonText	guibg=#5f626d guifg=#fefefe
-hi Cursor	guibg=#fef047
-
-hi Statement	guifg=#d9f5ff
-hi Special		guifg=#efefaa gui=bold
-hi Constant		guifg=#ffd6b0
-hi Comment		guifg=#fceb70
-hi Preproc		guifg=#aec5ff
-hi Type			guifg=#ffd9f4
-hi Identifier	guifg=#fff297
-
-hi StatusLine	guibg=#7076af
-hi StatusLineNC guibg=#a7abcd
-
-hi Visual		guibg=#a7abcd
-
-hi VertSplit	guibg=#7076af guifg=#dddeec
-
-hi Directory	guibg=#6c0075 guifg=#fbcaff
-
-hi WarningMsg	guibg=red
-
-hi Error		guibg=red
-
-hi IncSearch	guibg=red
-hi Search		guibg=#d09e09 guifg=white gui=bold
-
-hi Title		guifg=#ffc4ed
-
-hi Underlined	guifg=#f9c6fd
-
-hi SpecialKey	guibg=#c10000 guifg=#ffd2d2
-
-hi Function		guifg=#bbcfff gui=bold
-
-
-
diff --git a/colors/symfony.vim b/colors/symfony.vim
deleted file mode 100755
index 8760a51..0000000
--- a/colors/symfony.vim
+++ /dev/null
@@ -1,115 +0,0 @@
-" Vim color file
-" Maintainer: Juan frias <juandfrias at gmail dot com>
-" Last Change: 2009 Apr 4
-" Version: 1.0.0
-" URL: http://www.axisym3.net/jdany/vim-the-editor/#symfony
-
-highlight clear
-if exists("syntax_on")
- syntax reset
-endif
-
-let g:colors_name = "symfony"
-set background=dark
-
-highlight Normal ctermfg=15 ctermbg=235 guifg=#ffffff guibg=#222222
-
-" Search
-highlight IncSearch ctermfg=0 ctermbg=226 guifg=#000000 guibg=#ffff00
-highlight Search ctermfg=0 ctermbg=3 guifg=#000000 guibg=#c0c000
-
-" Messages
-highlight ErrorMsg ctermfg=15 ctermbg=196 guifg=White guibg=Red
-highlight WarningMsg ctermfg=196 guifg=Red
-highlight ModeMsg cterm=bold gui=bold
-highlight MoreMsg cterm=bold ctermfg=72 gui=bold guifg=SeaGreen
-highlight Question cterm=bold ctermfg=46 gui=bold guifg=Green
-
-" Split area area
-highlight StatusLine cterm=bold,reverse gui=bold,reverse
-highlight StatusLineNC cterm=reverse gui=reverse
-highlight VertSplit cterm=reverse gui=reverse
-highlight WildMenu ctermfg=0 ctermbg=226 guifg=Black guibg=Yellow
-
-" Diff
-highlight DiffAdd ctermfg=254 ctermbg=71 guifg=#E6E1DC guibg=#519F50
-highlight DiffDelete ctermfg=236 ctermbg=234 guifg=#303030 guibg=#1c1c1c
-highlight DiffChange ctermbg=52 guibg=#600000
-highlight DiffText ctermfg=254 ctermbg=124 guifg=#E6E1DC guibg=#b00000
-
-" Cursor
-highlight CursorColumn ctermbg=241 guibg=Grey40
-highlight CursorLine ctermbg=0 guibg=#000000
-highlight Cursor ctermfg=0 ctermbg=15 guifg=#000000 guibg=#FFFFFF
-highlight lCursor ctermfg=15 ctermbg=235 guifg=bg guibg=fg
-
-" Fold
-highlight Folded ctermfg=236 ctermbg=248 guifg=#333333 guibg=DarkGrey
-highlight FoldColumn ctermfg=236 ctermbg=250 guifg=#333333 guibg=Grey
-
-" Popup Menu Menu
-highlight Pmenu ctermbg=201 guibg=Magenta
-highlight PmenuSel ctermbg=248 guibg=DarkGrey
-highlight PmenuSbar ctermbg=250 guibg=Grey
-highlight PmenuThumb cterm=reverse gui=reverse
-
-" Syntax group
-highlight Comment ctermfg=133 guifg=#bd48b3
-highlight Constant ctermfg=67 guifg=#6D9CBE
-highlight Error ctermfg=215 ctermbg=88 guifg=#FFC66D guibg=#990000
-highlight Identifier ctermfg=67 guifg=#6D9CBE
-highlight Ignore ctermbg=235 guifg=bg
-highlight PreProc ctermfg=254 guifg=#E6E1DC
-highlight Special ctermfg=221 guifg=#ffcc66
-highlight Statement ctermfg=208 ctermbg=235 guifg=#ff8400 guibg=bg
-highlight Todo ctermfg=21 ctermbg=226 guifg=Blue guibg=Yellow
-highlight Type ctermfg=167 guifg=#da4939
-highlight Underlined cterm=underline ctermfg=111 gui=underline guifg=#80a0ff
-highlight String ctermfg=118 guifg=#99ff00
-highlight Number ctermfg=107 guifg=#A5C261
-highlight Define ctermfg=221 guifg=#ffcc66
-highlight Function ctermfg=221 guifg=#ffcc66
-highlight Include ctermfg=173 guifg=#CC7833
-highlight Keyword ctermfg=221 guifg=#ffcc66
-highlight Operator ctermfg=255 guifg=#f0f0f0
-highlight PreCondit ctermfg=173 guifg=#CC7833
-highlight StorageClass ctermfg=221 guifg=#ffcc66
-
-"Spelling
-highlight SpellBad cterm=undercurl ctermfg=160 gui=undercurl guifg=#D70000
-highlight SpellCap cterm=underline ctermfg=189 gui=underline guifg=#D0D0FF
-highlight SpellLocal cterm=undercurl gui=undercurl
-highlight SpellRare cterm=underline ctermfg=168 gui=underline guifg=#D75F87
-
-" Other
-highlight Directory ctermfg=51 guifg=Cyan
-highlight LineNr ctermfg=235 ctermbg=147 guifg=#2B2B2B guibg=#C0C0FF
-highlight NonText ctermfg=239 ctermbg=235 guifg=#505050 guibg=#222222
-highlight SpecialKey ctermfg=51 guifg=Cyan
-highlight Title cterm=bold ctermfg=15 gui=bold guifg=#FFFFFF
-highlight Visual ctermbg=60 guibg=#5A647E
-highlight MatchParen ctermfg=15 ctermbg=23 guifg=#FFFFFF guibg=#005f5f
-highlight SignColumn ctermfg=51 ctermbg=250 guifg=Cyan guibg=Grey
-highlight Structure ctermfg=221 guifg=#ffcc66
-highlight TabLineFill cterm=reverse gui=reverse
-highlight TabLine cterm=underline ctermbg=248 gui=underline guibg=DarkGrey
-highlight TabLineSel cterm=bold gui=bold
-highlight VisualNOS cterm=bold,underline gui=bold,underline
-
-" Links
-highlight link Macro PreProc
-highlight link Exception Statement
-highlight link Conditional Statement
-highlight link Repeat Statement
-highlight link Label Statement
-highlight link Boolean Constant
-highlight link Float Number
-highlight link Character Constant
-highlight link Typedef Type
-highlight link Tag Special
-highlight link SpecialChar Special
-highlight link Delimiter Special
-highlight link SpecialComment Special
-highlight link Debug Special
-
-" vim:ff=unix:
diff --git a/colors/synic.vim b/colors/synic.vim
deleted file mode 100755
index dea0715..0000000
--- a/colors/synic.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" ------------------------------------------------------------------
-" Filename:	 synic.vim
-" Last Modified: Aug, 5 2009 (12:17)
-" Maintainer:	 Adam Olsen (arolsen@gmail.com)
-" Copyright:	 2008 Adam Olsen
-"                This script 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. 
-" Description:   Vim colorscheme file.
-" Install:       Put this file in the users colors directory (~/.vim/colors)
-"                then load it with :colorscheme synic
-" ------------------------------------------------------------------
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-""
-""                        SPECIAL NOTE:
-"" I believe this colorscheme is based off of Hans 
-"" Fugal's colorscheme "desert".  
-"" http://hans.fugal.net/vim/colors/desert.html
-"" I might be wrong on this... if it looks like it was based off 
-"" of your colorscheme, let me know so I can give you credits.
-""
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"" The 256 color terminal version of this theme was created by 
-"" colorsupport.vim
-hi clear
-set background=dark
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "synic"
-hi Normal guifg=ivory guibg=Black ctermfg=231 ctermbg=NONE
-hi SignColumn gui=NONE guifg=Cyan guibg=Grey cterm=NONE ctermfg=51 ctermbg=250
-hi SpellBad gui=undercurl guifg=NONE guisp=Red cterm=undercurl ctermfg=NONE ctermbg=196
-hi SpellCap gui=undercurl guifg=NONE guisp=Blue cterm=undercurl ctermfg=NONE ctermbg=21
-hi SpellRare gui=undercurl guifg=NONE guisp=Magenta cterm=undercurl ctermfg=NONE ctermbg=201
-hi SpellLocal gui=undercurl guifg=NONE guisp=Cyan cterm=undercurl ctermfg=NONE ctermbg=51
-hi Pmenu gui=NONE guifg=NONE guibg=Magenta cterm=NONE ctermfg=NONE ctermbg=201
-hi PmenuSel gui=NONE guifg=NONE guibg=DarkGrey cterm=NONE ctermfg=NONE ctermbg=248
-hi PmenuSbar gui=NONE guifg=NONE guibg=Grey cterm=NONE ctermfg=NONE ctermbg=250
-hi PmenuThumb gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
-hi CursorColumn gui=NONE guifg=NONE guibg=Grey40 cterm=NONE ctermfg=NONE ctermbg=241
-hi CursorLine gui=NONE guifg=NONE guibg=Grey40 cterm=NONE ctermfg=NONE ctermbg=241
-hi MatchParen gui=NONE guifg=NONE guibg=DarkCyan cterm=NONE ctermfg=NONE ctermbg=30
-hi TabLineFill guifg=#272d2f guibg=#272d2f gui=None cterm=None ctermfg=236 ctermbg=236
-hi TabLine guifg=MistyRose3 guibg=#272d2f gui=None cterm=None ctermfg=181 ctermbg=236
-hi TabLineSel guifg=LightBlue3 guibg=#272d2f gui=None cterm=None ctermfg=110 ctermbg=236
-hi ErrorMsg gui=NONE guifg=Red guibg=Linen cterm=NONE ctermfg=196 ctermbg=NONE
-hi IncSearch gui=NONE guibg=LightGreen guifg=Black cterm=NONE ctermfg=16 ctermbg=120
-hi ModeMsg gui=NONE guifg=fg guibg=bg cterm=NONE ctermfg=fg ctermbg=NONE
-hi StatusLine gui=NONE guifg=LightBlue3 guibg=#272d2f cterm=NONE ctermfg=110 ctermbg=236
-hi StatusLineNC gui=NONE guifg=MistyRose3 guibg=#272d2f cterm=NONE ctermfg=181 ctermbg=236
-hi VertSplit gui=NONE guifg=LightBlue4 guibg=Black cterm=NONE ctermfg=66 ctermbg=NONE
-hi Visual gui=reverse guifg=LightBlue4 guibg=Black cterm=reverse ctermfg=66 ctermbg=16
-hi VisualNOS gui=underline guifg=fg guibg=bg cterm=underline ctermfg=fg ctermbg=NONE
-hi DiffText gui=NONE guifg=Yellow guibg=LightSkyBlue4 cterm=NONE ctermfg=226 ctermbg=66
-hi Cursor guibg=Lavender guifg=Black ctermfg=16 ctermbg=255
-hi lCursor guibg=Lavender guifg=Black ctermfg=16 ctermbg=255
-hi Directory guifg=LightGreen guibg=bg ctermfg=120 ctermbg=NONE
-hi LineNr guifg=LightBlue3 guibg=bg ctermfg=110 ctermbg=NONE
-hi MoreMsg gui=NONE guifg=SeaGreen guibg=bg cterm=NONE ctermfg=29 ctermbg=NONE
-hi NonText gui=NONE guifg=Cyan4 guibg=Black cterm=NONE ctermfg=30 ctermbg=NONE
-hi Question gui=NONE guifg=LimeGreen guibg=bg cterm=NONE ctermfg=77 ctermbg=NONE
-hi Search gui=NONE guifg=SkyBlue4 guibg=Bisque cterm=NONE ctermfg=60 ctermbg=224
-hi SpecialKey guifg=Cyan guibg=bg ctermfg=51 ctermbg=NONE
-hi Title gui=NONE guifg=Yellow2 guibg=bg cterm=NONE ctermfg=226 ctermbg=NONE
-hi WarningMsg guifg=Tomato3 guibg=Black ctermfg=167 ctermbg=NONE
-hi WildMenu gui=NONE guifg=Black guibg=SkyBlue4 cterm=NONE ctermfg=16 ctermbg=60
-hi Folded guifg=#f4aba2 guibg=bg ctermfg=217 ctermbg=NONE
-hi FoldColumn guifg=DarkBlue guibg=Grey ctermfg=18 ctermbg=250
-hi DiffText gui=bold guifg=NONE guibg=Red cterm=bold ctermfg=NONE ctermbg=196
-hi DiffAdd gui=NONE guifg=Blue guibg=LightCyan cterm=NONE ctermfg=21 ctermbg=195
-hi DiffChange gui=NONE guifg=white guibg=LightCyan4 cterm=NONE ctermfg=231 ctermbg=102
-hi DiffDelete gui=None guifg=LightBlue guibg=LightCyan cterm=None ctermfg=152 ctermbg=195
-hi Constant gui=NONE guifg=MistyRose3 guibg=bg cterm=NONE ctermfg=181 ctermbg=NONE
-hi String gui=NONE guifg=LightBlue3 guibg=bg cterm=NONE ctermfg=110 ctermbg=NONE
-hi Special gui=NONE guifg=GoldenRod guibg=bg cterm=NONE ctermfg=178 ctermbg=NONE
-hi Statement gui=NONE guifg=khaki guibg=bg cterm=NONE ctermfg=222 ctermbg=NONE
-hi Operator gui=NONE guifg=#8673e8 guibg=bg cterm=NONE ctermfg=98 ctermbg=NONE
-hi Ignore gui=NONE guifg=bg guibg=bg cterm=NONE ctermfg=NONE ctermbg=NONE
-hi ToDo gui=NONE guifg=DodgerBlue guibg=bg cterm=NONE ctermfg=33 ctermbg=NONE
-hi Error gui=NONE guifg=Red guibg=Linen cterm=NONE ctermfg=196 ctermbg=15
-hi Comment gui=NONE guifg=#62c600 guibg=bg cterm=NONE ctermfg=76 ctermbg=NONE
-hi Identifier gui=bold guifg=LightBlue4 guibg=bg cterm=bold ctermfg=66 ctermbg=NONE
-hi PreProc gui=NONE guifg=#ffa0a0 guibg=bg cterm=NONE ctermfg=217 ctermbg=NONE
-hi Type gui=NONE guifg=NavajoWhite guibg=bg cterm=NONE ctermfg=223 ctermbg=NONE
-hi Underlined gui=underline guifg=fg guibg=bg cterm=underline ctermfg=fg ctermbg=NONE
diff --git a/colors/tabula.vim b/colors/tabula.vim
deleted file mode 100755
index d69c134..0000000
--- a/colors/tabula.vim
+++ /dev/null
@@ -1,620 +0,0 @@
-" ============================================================================
-" Filename:	 tabula.vim
-" Last Modified: 2007-02-01
-" Version:       1.3
-" Maintainer:	 Bernd Pol (bernd.pol AT online DOT de)
-" Copyright:	 2006 Bernd Pol
-"                This script 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. 
-" Description:   Vim colorscheme based on marklar.vim by SM Smithfield,
-" 		 slightly modified for harmonic, yet easily distinguishable
-" 		 display on GUI and a 256 color xterm as well.
-" Install:       Put this file in the users colors directory (~/.vim/colors)
-"                then load it with :colorscheme tabula
-" =============================================================================
-" TODO
-" - automize options setting
-" - keep options in some setup file, e.g.:
-"   tabula.rc, sub e.g. "<OPTIONS> ... </OPTIONS>" marks
-" - options set up per directory (autoload option)
-"   such that text files be displayed other than e.g. c sources
-" =============================================================================
-
-hi clear
-set background=dark
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "tabula"
-"let g:Tabula_setOptions = 0
-
-"==============================================================================
-"			       Option Settings				   {{{1
-"==============================================================================
-"
-" Use these in your .vimrc file before the ':colorscheme tabula' line
-"
-" Alternatively set the options variable from the command line, e.g.
-" 	:let Tabula_LNumUnderline=1
-" and then call
-" 	:colorscheme tabula
-" again.
-
-"------------------------------------------------------------------------------
-" Display Statements In Bold:						   {{{2
-" 	Tabula_BoldStatement = 0	statements display not bold
-" 	Tabula_BoldStatement = 1	statements display bold
-" Defaults to non-bold display.
-"------------------------------------------------------------------------------
-"
-let s:BoldStatement = 0
-if exists("g:Tabula_BoldStatement")
-  let s:BoldStatement = g:Tabula_BoldStatement
-endif
-
-"------------------------------------------------------------------------------
-" Set GUI Cursor Color:							   {{{2
-"	Tabula_CurColor = 'blue'
-"	Tabula_CurColor = 'red'
-"	Tabula_CurColor = 'yellow'
-"	Tabula_CurColor = 'white'
-" Defaults to 'blue'.
-"------------------------------------------------------------------------------
-"
-let s:CurColor = "blue"
-if exists("g:Tabula_CurColor")
-  let s:CurColor = g:Tabula_CurColor
-endif
-
-"------------------------------------------------------------------------------
-" Set Color For Preprocessor Statements:				   {{{2
-"	Tabula_ColorPre = 'blue'	purple-blue
-"	Tabula_ColorPre = 'red'		orange-red
-"	Tabula_ColorPre = 'yellow'	lightgreen-yellow
-" Defaults to 'blue'.
-"------------------------------------------------------------------------------
-"
-let s:ColorPre = "blue"
-if exists("g:Tabula_ColorPre")
-  if g:Tabula_ColorPre == "red" || g:Tabula_ColorPre == "yellow"
-    let s:ColorPre = g:Tabula_ColorPre
-  endif
-endif
-
-"------------------------------------------------------------------------------
-" Use Dark Error Background:						   {{{2
-" Sometimes desirable for less distracting error highlighting.
-" 	Tabula_DarkError = 0		light red error background
-" 	Tabula_DarkError = 1		dark red error background
-" Defaults to light error background.
-"------------------------------------------------------------------------------
-"
-let s:DarkError = 0
-if exists("g:Tabula_DarkError")
-  let s:DarkError = g:Tabula_DarkError
-endif
-
-"------------------------------------------------------------------------------
-" Use Multiple Colors For Constant Values:				   {{{2
-" 	Tabula_FlatConstants = 0	use different color for each type
-" 	Tabula_FlatConstants = 1	use common color for all
-" Defaults to using common colors.
-"------------------------------------------------------------------------------
-"
-let s:FlatConstants = 1
-if exists("g:Tabula_FlatConstants")
-  let s:FlatConstants = g:Tabula_FlatConstants
-endif
-
-"------------------------------------------------------------------------------
-" How To Display Ignore And NonText Characters:				   {{{2
-" 	Tabula_InvisibleIgnore = 0	slightly visible
-" 					(good for Vim documentation editing)
-"	Tabula_InvisibleIgnore = 1	invisible on standard background
-" Defaults to invisible display.
-"------------------------------------------------------------------------------
-"
-let s:InvisibleIgnore = 1
-if exists("g:Tabula_InvisibleIgnore")
-  let s:InvisibleIgnore = g:Tabula_InvisibleIgnore
-endif
-
-"------------------------------------------------------------------------------
-" Show Line Numbers Underlined:						   {{{2
-" Sometimes useful to spot a line more easily.
-" 	Tabula_LNumUnderline = 0	not underlined
-"	Tabula_LNumUnderline = 1	line numbers are underlined
-" Defaults to not underlined.
-"------------------------------------------------------------------------------
-"
-let s:LNumUnderline = 0
-if exists("g:Tabula_LNumUnderline")
-  let s:LNumUnderline = g:Tabula_LNumUnderline
-endif
-
-"------------------------------------------------------------------------------
-" Let Search Occurrences Stand Out More Prominently:			   {{{2
-"	Tabula_SearchStandOut = 0	normal dark background display
-"	Tabula_SearchStandOut = 1	prominent underlined display
-"	Tabula_SearchStandOut = 2	even more prominent display
-" Defaults to normal display.
-"------------------------------------------------------------------------------
-"
-let s:SearchStandOut=0
-if exists("g:Tabula_SearchStandOut")
-  let s:SearchStandOut = g:Tabula_SearchStandOut
-endif
-
-"------------------------------------------------------------------------------
-" How To Display TODOs And Similar:					   {{{2
-"	Tabula_TodoUnderline = 0	display on a blue background
-"	Tabula_TodoUnderline = 1	display them underlined white
-" Defaults to underlined display.
-"------------------------------------------------------------------------------
-"
-let s:TodoUnderline=1
-if exists("g:Tabula_TodoUnderline")
-  let s:TodoUnderline = g:Tabula_TodoUnderline
-endif
-
-"==============================================================================
-"			      Color Definitions				   {{{1
-"==============================================================================
-
-if version >= 700
-    hi SpellBad        	guisp=#FF0000
-    hi SpellCap        	guisp=#afaf00
-    hi SpellRare       	guisp=#bf4040
-    hi SpellLocal     	guisp=#00afaf							ctermbg=0
-    hi Pmenu		guifg=#00ffff	guibg=#000000			ctermfg=51	ctermbg=0
-    hi PmenuSel       	guifg=#ffff00	guibg=#000000	gui=bold	ctermfg=226			cterm=bold
-    hi PmenuSbar       			guibg=#204d40					ctermbg=6
-    hi PmenuThumb      	guifg=#38ff56					ctermfg=3
-    hi CursorColumn		    	guibg=#096354					ctermbg=29
-    hi CursorLine		      	guibg=#096354					ctermbg=29
-    hi Tabline         	guifg=bg	guibg=fg	gui=NONE	ctermfg=NONE	ctermbg=NONE	cterm=reverse,bold
-    hi TablineSel      	guifg=#20012e	guibg=#00a675	gui=bold
-    hi TablineFill     	guifg=#689C7C
-    hi MatchParen      	guifg=#38ff56	guibg=#0000ff	gui=bold	ctermfg=14	ctermbg=21	cterm=bold
-endif
-"------------------------------------------------------------------------------
-
-hi Comment		guifg=#00C5E7					ctermfg=45	
-
-"------------------------------------------------------------------------------
-" Constant Colors:
-"------------------------------------------------------------------------------
-"
-if s:FlatConstants
-  hi Constant		guifg=#7DDCDB					ctermfg=123
-else
-  hi Boolean		guifg=#7EDBD8					ctermfg=123
-  hi Character		guifg=#AFD000					ctermfg=148
-  hi Float		guifg=#AF87DF					ctermfg=141
-  hi Number		guifg=#00A7F7					ctermfg=39
-  hi String		guifg=#00DF00					ctermfg=46
-endif
-
-"------------------------------------------------------------------------------
-" Cursor Colors:
-"------------------------------------------------------------------------------
-"
-if s:CurColor == "yellow"
-  hi Cursor		guifg=#000000	guibg=#EFEF00
-elseif s:CurColor == "red"
-  " Note: Input cursor will be invisible on Error Group
-  hi Cursor		guifg=#00007F	guibg=#F70000
-elseif s:CurColor == "blue"
-  hi Cursor		guifg=#00007F	guibg=#00EFEF
-elseif s:CurColor == "white"
-  hi Cursor		guifg=#000000	guibg=#FFFFFF
-endif
-"------------------------------------------------------------------------------
-
-hi DiffAdd		guifg=NONE	guibg=#136769 			ctermfg=4	ctermbg=7	cterm=none
-hi DiffDelete		guifg=NONE	guibg=#50694A 			ctermfg=1 	ctermbg=7	cterm=none
-hi DiffChange		guifg=fg	guibg=#00463c	gui=None	ctermfg=4 	ctermbg=2	cterm=none
-hi DiffText		guifg=#7CFC94	guibg=#00463c	gui=bold 	ctermfg=4 	ctermbg=3	cterm=none
-hi Directory		guifg=#25B9F8	guibg=NONE							ctermfg=2
-
-"------------------------------------------------------------------------------
-" Error Colors:
-"------------------------------------------------------------------------------
-"
-if s:DarkError
-"  hi Error		guifg=#FF0000	guibg=#303800	gui=NONE	ctermfg=9 	ctermbg=236	cterm=NONE
-  hi Error		guifg=NONE	guibg=#303800	gui=NONE	ctermfg=NONE 	ctermbg=236	cterm=NONE
-else
-  if s:CurColor == "red"
-    " Note: We need another background in this case to keep the cursor visible.
-    hi Error		guifg=#FF0000	guibg=#FFFF00	gui=bold	ctermfg=11 	ctermbg=9	cterm=NONE
-  else
-    hi Error		guifg=#FFFF00	guibg=#FF0000	gui=NONE	ctermfg=11 	ctermbg=9	cterm=NONE
-  endif
-endif
-"------------------------------------------------------------------------------
-
-hi ErrorMsg		guifg=#FFFFFF	guibg=#FF0000			ctermfg=7	ctermbg=1
-hi FoldColumn		guifg=#00BBBB	guibg=#4E4E4E			ctermfg=14 	ctermbg=240
-hi Folded		guifg=#44DDDD	guibg=#4E4E4E			ctermfg=14 	ctermbg=240
-hi Identifier		guifg=#FDAE5A					ctermfg=215			cterm=none
-
-"------------------------------------------------------------------------------
-" Ignore Variants:
-"------------------------------------------------------------------------------
-"
-if s:InvisibleIgnore
-  " completely invisible
-  hi Ignore		guifg=bg	guibg=NONE			ctermfg=23
-  hi NonText		guifg=bg	guibg=NONE			ctermfg=23
-else
-  " nearly invisible
-  hi Ignore		guifg=#005FAF	guibg=NONE			ctermfg=26
-  hi NonText		guifg=#005FAF	guibg=NONE			ctermfg=26
-endif
-"------------------------------------------------------------------------------
-
-"------------------------------------------------------------------------------
-" Line Number Variants:
-" Lines can sometimes be more precisely identified if the line numbers are
-" underlined.
-"------------------------------------------------------------------------------
-"
-if s:LNumUnderline
-  hi LineNr		guifg=#00FF00	guibg=#005080	gui=underline	ctermfg=84	ctermbg=24	cterm=underline
-else
-  hi LineNr		guifg=#00FF00	guibg=#005080			ctermfg=84	ctermbg=24
-endif
-"------------------------------------------------------------------------------
-
-hi ModeMsg		guifg=#FFFFFF	guibg=#0000FF	gui=NONE	ctermfg=7	ctermbg=4	cterm=NONE
-hi MoreMsg		guifg=#FFFFFF	guibg=#00A261	gui=NONE	ctermfg=7	ctermbg=28	cterm=NONE
-
-"if &background == "dark"
-  hi Normal		guifg=#71D289	guibg=#065349			ctermfg=85	ctermbg=23 
-"else
-"  hi Normal		guibg=#71D289	guifg=#065349			ctermfg=85	ctermbg=23
-"endif
-
-"------------------------------------------------------------------------------
-" Preprocessor Variants:
-"------------------------------------------------------------------------------
-"
-if s:ColorPre == "red"
-  hi PreProc		guifg=#FF5F5F	guibg=bg			ctermfg=203
-elseif s:ColorPre == "yellow"
-  hi PreProc		guifg=#AFFF00	guibg=bg			ctermfg=154
-elseif s:ColorPre == "blue"
-  hi PreProc		guifg=#8E8CDD	guibg=bg			ctermfg=105
-endif
-"------------------------------------------------------------------------------
-
-hi Question		guifg=#E5E500	guibg=NONE	gui=none	ctermfg=11	ctermbg=NONE	cterm=none
-
-"------------------------------------------------------------------------------
-" Search Stand Out Variants:
-"------------------------------------------------------------------------------
-"
-if s:SearchStandOut == 0
-  hi IncSearch		guifg=#D0D0D0	guibg=#206828	gui=NONE	ctermfg=NONE	ctermbg=22	cterm=NONE
-  hi Search		guifg=NONE	guibg=#212a81			ctermfg=NONE	ctermbg=18
-elseif s:SearchStandOut == 1
-  hi IncSearch		guifg=#D0D0D0	guibg=#206828	gui=underline	ctermfg=252	ctermbg=22	cterm=underline
-  hi Search		guifg=#FDAD5D	guibg=#202880	gui=underline	ctermfg=215	ctermbg=18	cterm=underline
-elseif s:SearchStandOut == 2
-  hi IncSearch		guibg=#D0D0D0	guifg=#206828	gui=underline	ctermbg=252	ctermfg=22	cterm=underline
-  hi Search		guibg=#FDAD5D	guifg=#202880	gui=underline	ctermbg=215	ctermfg=18	cterm=underline
-endif
-"------------------------------------------------------------------------------
-
-hi SignColumn		guifg=#00BBBB	guibg=#204d40
-hi Special		guifg=#00F2F3	guibg=NONE	gui=none	ctermfg=51
-hi SpecialKey		guifg=#00F4F4	guibg=#266955
-
-"------------------------------------------------------------------------------
-" Statement Variants:
-"------------------------------------------------------------------------------
-"
-if s:BoldStatement
-  hi Statement		guifg=#DEDE00			gui=bold	ctermfg=11			cterm=bold
-else
-  hi Statement		guifg=#E4E300			gui=none	ctermfg=11
-endif
-"------------------------------------------------------------------------------
-
-hi StatusLine		guifg=#000000	guibg=#7DCEAD	gui=none			ctermbg=00	cterm=reverse
-hi StatusLineNC		guifg=#245748	guibg=#689C7C	gui=none	ctermfg=72	ctermbg=23	cterm=reverse
-hi Title		guifg=#7CFC94	guibg=NONE	gui=bold	ctermfg=2			cterm=bold
-
-"------------------------------------------------------------------------------
-" Todo Variants:
-"------------------------------------------------------------------------------
-"
-if s:TodoUnderline
-  " Underlined
-  hi Todo		guifg=#AFD7D7	guibg=NONE	gui=underline	ctermfg=159	ctermbg=NONE	cterm=underline
-else
-  " Blue background
-  hi Todo		guifg=#00FFFF	guibg=#0000FF			ctermfg=51	ctermbg=4
-endif
-"------------------------------------------------------------------------------
-
-hi Type			guifg=#F06BDB	guibg=bg	gui=none	ctermfg=213
-hi Underlined						gui=underline					cterm=underline
-hi VertSplit		guifg=#245748	guibg=#689C7C	gui=none	ctermfg=72	ctermbg=23	cterm=reverse
-hi Visual 				guibg=#0B7260	gui=none
-hi WarningMsg		guifg=#000087	guibg=#FFFF00			ctermfg=18	ctermbg=11
-hi WildMenu		guifg=#20012e	guibg=#00a675	gui=bold	ctermfg=none	ctermbg=none	cterm=bold
-"
-hi pythonPreCondit							ctermfg=2			cterm=none
-hi tkWidget		guifg=#D5B11C	guibg=bg	gui=bold	ctermfg=7			cterm=bold
-hi tclBookends		guifg=#7CFC94	guibg=NONE	gui=bold	ctermfg=2			cterm=bold
-
-" ------------------------------------------------------------------------------------------------
-" Custom HTML Groups:
-" (see ':help html.vim' for more info)
-"------------------------------------------------------------------------------
-
-let html_my_rendering=1
-
-hi htmlBold		guifg=#87FFD7			gui=bold	ctermfg=122			cterm=bold
-hi htmlBoldItalic	guifg=#87D7EF			gui=bold	ctermfg=117			cterm=bold
-hi htmlBoldUnderline	guifg=#87FFD7			gui=bold,underline ctermfg=122			cterm=bold,underline
-hi htmlBoldUnderlineItalic guifg=#87D7EF		gui=bold,underline ctermfg=117			cterm=bold,underline
-hi htmlH1		guifg=#00FF00	guibg=NONE	gui=bold,underline ctermfg=2			cterm=bold,underline
-hi htmlH2		guifg=#00FF00	guibg=NONE	gui=bold	ctermfg=2			cterm=bold
-hi htmlH3		guifg=#00FF00	guibg=NONE	gui=NONE	ctermfg=2
-hi htmlH4		guifg=#00C700	guibg=NONE	gui=underline	ctermfg=34			cterm=underline
-hi htmlH5		guifg=#00C700	guibg=NONE	gui=NONE	ctermfg=34
-hi htmlH6		guifg=#00A700	guibg=NONE	gui=underline	ctermfg=28			cterm=underline
-hi htmlItalic		guifg=#87D7D7			gui=NONE	ctermfg=116
-hi htmlLink		guifg=#8787D7			gui=underline   ctermfg=105			cterm=underline
-hi htmlUnderline                			gui=underline					cterm=underline
-hi htmlUnderlineItalic	guifg=#87D7D7			gui=underline	ctermfg=116			cterm=underline
-
-"------------------------------------------------------------------------------
-" Links To Other Highlight Groups:
-
-"==============================================================================
-"			       Options Processor			   {{{1
-"==============================================================================
-"
-"------------------------------------------------------------------------------
-" Main Dialog:								   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula()
-  call inputsave()
-  let thisOption = 1
-  while thisOption >= 1 && thisOption <= 9
-    redraw
-    let thisOption = inputlist([
-	  \		     "Select a 'Tabula_' option:",
-	  \		     "1. BoldStatement    Display statements in bold",
-	  \		     "2. ColorPre         Set Color for preprocessor statements",
-	  \		     "3. CurColor         Set GUI cursor color",
-	  \		     "4. DarkError        Use dark error background",
-	  \		     "5. FlatConstants    Use multiple colors for constant values",
-	  \		     "6. InvisibleIgnore  Display of Ignore and NonText characters",
-	  \		     "7. LNumUnderline    Show line numbers underlined",
-	  \		     "8. SearchStandOut   Display of search occurrences",
-	  \		     "9. TodoUnderline    Display of TODOs and similar"
-	  \		     ])
-
-    redraw
-    if thisOption >= 1 && thisOption <= 9
-      call Tabula_{thisOption}()
-      "let g:Tabula_setOptions = 1
-    endif
-  endwhile
-  call inputrestore()
-endfunction
-
-"------------------------------------------------------------------------------
-" Bold Statements:							   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_1()
-  let curOption = ""
-  if s:BoldStatement == 0
-    let curOption = "not "
-  endif
-  let optionValue = inputlist([
-	\		      "How to display statements (currently ".curOption."bold)?",
-	\		      "1. bold",
-	\		      "2. not bold"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_BoldStatement = 1
-  elseif optionValue == 2
-    let g:Tabula_BoldStatement = 0
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Color For Preprocessor Statements:					   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_2()
-  let optionValue = inputlist([
-	\		      "How to display preprocessor statements (currently ".s:ColorPre.")?",
-	\		      "1. blue",
-	\		      "2. red",
-	\		      "3. yellow"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_ColorPre = "blue"
-  elseif optionValue == 2
-    let g:Tabula_ColorPre = "red"
-  elseif optionValue == 3
-    let g:Tabula_ColorPre = "yellow"
-   endif
-endfunction
-
-"------------------------------------------------------------------------------
-" GUI Cursor Color:							   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_3()
-  let optionValue = inputlist([
-	\		      "Use which cursor color (currently ".s:CurColor.")?",
-	\		      "1. blue",
-	\		      "2. red",
-	\		      "3. yellow",
-  	\		      "4. white"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_CurColor = "blue"
-  elseif optionValue == 2
-    let g:Tabula_CurColor = "red"
-  elseif optionValue == 3
-    let g:Tabula_CurColor = "yellow"
-  elseif optionValue == 4
-    let g:Tabula_CurColor = "white"
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Use Dark Error Background:						   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_4()
-  let curOption = "light "
-  if s:DarkError
-    let curOption = "dark "
-  endif
-  let optionValue = inputlist([
-	\		      "How to display errors in the text (currently ".curOption."background)?",
-	\		      "1. light background",
-	\		      "2. dark background"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_DarkError = 0
-  elseif optionValue == 2
-    let g:Tabula_DarkError = 1
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Multiple Constant Colors:						   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_5()
-  let curOption = "one color"
-  if s:FlatConstants == 0
-    let curOption = "multiple colors"
-  endif
-  let optionValue = inputlist([
-	\		      "How to display constant values (currently ".curOption.")?",
-	\		      "1. use one common color for all",
-	\		      "2. use different color for each type"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_FlatConstants = 1
-  elseif optionValue == 2
-    let g:Tabula_FlatConstants = 0
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Ignore And NonText Characters:					   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_6()
-  let curOption = "invisible"
-  if s:InvisibleIgnore == 0
-    let curOption = "slightly visible"
-  endif
-  let optionValue = inputlist([
-	\		      "Show Ignore and NonText characters (currently ".curOption.")?",
-	\		      "1. invisible",
-	\		      "2. slightly visible"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_InvisibleIgnore = 1
-  elseif optionValue == 2
-    let g:Tabula_InvisibleIgnore = 0
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Underlined Line Numbers:						   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_7()
-  let curOption = ""
-  if s:LNumUnderline == 0
-    let curOption = "not "
-  endif
-  let optionValue = inputlist([
-	\		      "How to display line numbers(currently ".curOption."underlined)?",
-	\		      "1. underlined",
-	\		      "2. not underlined"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_LNumUnderline = 1
-  elseif optionValue == 2
-    let g:Tabula_LNumUnderline = 0
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" Let Search Occurrences Stand Out More Prominently:			   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_8()
-  if s:SearchStandOut == 0
-    let curOption = "normal"
-  elseif s:SearchStandOut == 1
-    let curOption = "prominent"
-  elseif s:SearchStandOut == 2
-    let curOption = "very prominent"
-  endif
-  let optionValue = inputlist([
-	\		      "How to display search occurrences (currently ".curOption.")?",
-	\		      "1. normal",
-	\		      "2. prominent",
-	\		      "3. very prominent"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_SearchStandOut = 0
-  elseif optionValue == 2
-    let g:Tabula_SearchStandOut = 1
-  elseif optionValue == 3
-    let g:Tabula_SearchStandOut = 2
-  endif
-endfunction
-
-"------------------------------------------------------------------------------
-" TODOs Display:							   {{{2
-"------------------------------------------------------------------------------
-"
-function! Tabula_9()
-  let curOption = ""
-  if s:TodoUnderline == 0
-    let curOption = "not "
-  endif
-  let optionValue = inputlist([
-	\		      "How to display TODOs and similar (currently ".curOption."underlined)?",
-	\		      "1. underlined",
-	\		      "2. not underlined"
-  	\		      ])
-  if optionValue == 1
-    let g:Tabula_TodoUnderline = 1
-  elseif optionValue == 2
-    let g:Tabula_TodoUnderline = 0
-  endif
-endfunction
-
-"==========================================================================}}}1
-"
-" FIXME: This can't work!
-"
-"if g:Tabula_setOptions
-"  :exe "color tabula"
-"  let g:Tabula_setOptions = 0
-"endif
-
-" vim:tw=0:fdm=marker:fdl=0:fdc=3:fen
diff --git a/colors/tango-desert.vim b/colors/tango-desert.vim
deleted file mode 100755
index 688111f..0000000
--- a/colors/tango-desert.vim
+++ /dev/null
@@ -1,115 +0,0 @@
-" Vim color file
-" Maintainer: Vineeth N <nvineeth a-t yahoo d-o-t com>
-" Last Change: $Date: 2009/06/12 $
-" Version: 1.1
-" Description: Dark Tango colorscheme based on "desert.vim" & tango color
-" palette
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="tango-desert"
-
-hi Normal       guifg=#eeeeec guibg=#555753
-
-" highlight groups
-hi Cursor       guibg=#fcaf3e 
-"hi CursorIM
-hi Directory    guifg=#e9b96e
-hi VertSplit    guifg=#babdb6 guibg=#555753 gui=none
-hi Folded       guifg=#eeeeec guibg=#888a85
-hi FoldColumn   guifg=#eeeeec guibg=#888a85
-hi IncSearch    guifg=#eeeeec guibg=#204a87
-hi LineNr       guifg=#babdb6 guibg=#555753
-hi ModeMsg      guifg=#8ae234
-hi MatchParen   guibg=#ad7fa8 guifg=#eeeeec
-hi MoreMsg      guifg=#8ae234
-hi NonText      guifg=#babdb6 guibg=#555753
-hi PmenuSel     guibg=#5c3566 guifg=#eeeeec
-hi Pmenu        guibg=#75507b guifg=#eeeeec
-hi PmenuSbar    guibg=#75507b guifg=#5c3566
-hi PmenuThumb   guifg=#5c3566 guibg=#75507b
-hi Question     guifg=#8ae234
-hi Search       guibg=#edd400
-hi SpecialKey   guifg=#888a85
-hi StatusLine   guibg=#d3d7cf guifg=#2e3436 gui=none
-hi StatusLineNC guibg=#babdb6 guifg=#2e3436 gui=none
-hi Title        guifg=#8ae234
-hi Visual       guibg=#3465a4 guifg=#eeeeec
-"hi VisualNOS
-hi DiffText     gui=bold guibg=#204a87 guifg=#eeeeec
-hi DiffAdd      guibg=#204a87 guifg=#eeeeec
-hi DiffChange   guibg=#75507b 
-hi DiffDelete   gui=bold guifg=#babdb6 guibg=#555753
-
-hi WarningMsg   guifg=#8ae234
-"hi WildMenu
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment      guifg=#babdb6
-hi Constant     guifg=#73d216
-hi Identifier   guifg=#8ae234
-hi Statement    guifg=#e9b96e
-" lightskyblue appears better than 729fcf
-"hi PreProc      guifg=#729fcf
-hi PreProc      guifg=lightskyblue
-hi Type         guifg=#e9b96e
-hi Special      guifg=#73d216
-" lightskyblue appears better than 729fcf
-"hi Underlined   guifg=#729fcf
-hi Underlined   guifg=lightskyblue
-hi Ignore       guifg=grey40
-hi Error        guibg=#ef2929 guifg=#eeeeec 
-hi Todo         guibg=#73d216 guifg=#2e3436 gui=bold
-"hi Todo        guifg=#73d216  guibg=NONE gui=underline,bold
-
-" -----------------------------------------------------------
-" color terminal definitions, based on ''desert''
-" -----------------------------------------------------------
-hi SpecialKey   ctermfg=darkgreen
-hi NonText      cterm=bold ctermfg=darkblue
-hi Directory    ctermfg=darkcyan
-hi ErrorMsg     cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch    cterm=NONE ctermfg=yellow ctermbg=green
-hi Search       cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg      ctermfg=darkgreen
-hi ModeMsg      cterm=NONE ctermfg=brown
-hi LineNr       ctermfg=3
-hi Question     ctermfg=green
-hi StatusLine   cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit    cterm=reverse
-hi Title        ctermfg=5
-hi Visual       cterm=reverse
-hi VisualNOS    cterm=bold,underline
-hi WarningMsg   ctermfg=1
-hi WildMenu     ctermfg=0 ctermbg=3
-hi Folded       ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn   ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd      ctermbg=4
-hi DiffChange   ctermbg=5
-hi DiffDelete   cterm=bold ctermfg=4 ctermbg=6
-hi DiffText     cterm=bold ctermbg=1
-hi Comment      ctermfg=darkcyan
-hi Constant     ctermfg=brown
-hi Special      ctermfg=5
-hi Identifier   ctermfg=6
-hi Statement    ctermfg=3
-hi PreProc      ctermfg=5
-hi Type         ctermfg=2
-hi Underlined   cterm=underline ctermfg=5
-hi Ignore       cterm=bold ctermfg=7
-hi Ignore       ctermfg=darkgrey
-hi Error        cterm=bold ctermfg=7 ctermbg=1
-
-
-"vim: sw=4
diff --git a/colors/tango-morning.vim b/colors/tango-morning.vim
deleted file mode 100755
index a6613fa..0000000
--- a/colors/tango-morning.vim
+++ /dev/null
@@ -1,70 +0,0 @@
-" Vim color file
-" Maintainer:	N Vineeth <nvineeth a-t yahoo>
-" Last Change:	2009 May 27
-" Version: 0.3
-
-" This color scheme uses a light grey background.
-" Based on "morning" color scheme and 
-" Tango color palette : http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines#Color_Palette
-" The Terminal colors are based on "morning" color scheme and only the gui colors have been modified
-
-" First remove all existing highlighting.
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "tango-morning"
-
-hi Normal ctermfg=Black ctermbg=LightGrey guifg=#2e3436 guibg=#eeeeec
-
-" Groups used in the 'highlight' and 'guicursor' options default value.
-hi ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=#cc0000 guifg=#eeeeec
-hi IncSearch term=reverse cterm=reverse gui=reverse
-hi ModeMsg term=bold cterm=bold gui=bold
-hi StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold
-hi StatusLineNC term=reverse cterm=reverse gui=reverse
-hi VertSplit term=reverse cterm=reverse gui=reverse
-hi Visual term=reverse ctermbg=grey guibg=#d3d7cf
-hi VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold
-hi DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=#fce94f
-hi Cursor guibg=#8ae234 guifg=NONE
-hi lCursor guibg=#8ae234 guifg=NONE
-hi Directory term=bold ctermfg=DarkBlue guifg=#3465a4
-hi LineNr term=underline ctermfg=Brown guifg=#204a87 guibg=#d3d7cf
-hi MatchParen guibg=#ad7fa8 guifg=#eeeeec
-hi MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=#4e9a06
-hi NonText term=bold ctermfg=Blue gui=bold guifg=#204a87 guibg=#d3d7cf
-hi PmenuSel guibg=#204a87 guifg=#eeeeec
-hi Pmenu guibg=#3465a4 guifg=#eeeeec
-hi PmenuSbar guibg=#729fcf guifg=#204a87
-hi PmenuThumb guibg=#729fcf guifg=#204a87
-hi Question term=standout ctermfg=DarkGreen gui=bold guifg=#4e9a06
-hi Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=#fce94f 
-hi SpecialKey term=bold ctermfg=DarkBlue guifg=#3465a4
-hi Title term=bold ctermfg=DarkMagenta gui=bold guifg=#4e9a06
-hi WarningMsg term=standout ctermfg=DarkRed guifg=#cc0000
-hi WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=#edd400 guifg=#888a85
-hi Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=#d3d7cf guifg=#204a87
-hi FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=#d3d7cf guifg=#204a87
-hi DiffAdd term=bold ctermbg=LightBlue guibg=#204a87 guifg=#eeeeec
-hi DiffChange term=bold ctermbg=LightMagenta guibg=#e9b96e
-hi DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=#3465a4 guibg=#d3d7cf
-hi CursorLine term=underline cterm=underline guibg=#555753
-hi CursorColumn term=reverse ctermbg=grey guibg=#555753
-
-" Colors for syntax highlighting
-hi Comment guifg=#888a85 
-hi Constant term=underline ctermfg=DarkRed guifg=#ce5c00 
-hi Identifier guifg=#204a87
-hi Statement term=bold cterm=bold ctermfg=Brown gui=bold guifg=#8f5902
-hi PreProc guifg=#204a87
-hi Type guifg=#4e9a06
-hi Special term=bold ctermfg=DarkMagenta guifg=#ce5c00 guibg=#eeeeec
-hi Underlined guifg=#204a87
-hi Ignore ctermfg=LightGrey guifg=#555753
-hi Error guibg=#cc0000 guifg=#eeeeec
-hi Todo guibg=#fce94f guifg=#204a87
-
-" vim: sw=2
diff --git a/colors/tango.vim b/colors/tango.vim
deleted file mode 100755
index f7ca013..0000000
--- a/colors/tango.vim
+++ /dev/null
@@ -1,84 +0,0 @@
-"
-" Tango Vim Color Scheme
-" =======================
-"
-" For best results, set up your terminal with a Tango palette.
-" Instructions for GNOME Terminal:
-" http://uwstopia.nl/blog/2006/07/tango-terminal
-"
-" author:   Michele Campeotto <micampe@micampe.it>
-"
-set background=dark
-
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "tango"
-
-" Default Colors
-hi Normal       guifg=#eeeeec guibg=#000000
-hi NonText      guifg=#555753 guibg=#000000 gui=none
-hi NonText      ctermfg=darkgray
-hi Cursor       guibg=#d3d7cf
-hi lCursor      guibg=#d3d7cf
-
-" Search
-hi Search       guifg=#eeeeec guibg=#c4a000
-hi Search       cterm=none ctermfg=grey ctermbg=blue
-hi IncSearch    guibg=#eeeeec guifg=#729fcf
-hi IncSearch    cterm=none ctermfg=yellow ctermbg=green
-
-" Window Elements
-hi StatusLine   guifg=#eeeeec guibg=#4e9a06 gui=bold
-hi StatusLine   ctermfg=white ctermbg=green cterm=bold
-hi StatusLineNC guifg=#d3d7df guibg=#4e9a06
-hi StatusLineNC ctermfg=lightgray ctermbg=darkgreen
-hi VertSplit    guifg=#eeeeec guibg=#eeeeec
-hi Folded       guifg=#eeeeec guibg=#75507b
-hi Folded       ctermfg=white ctermbg=magenta
-hi Visual       guifg=#d3d7cf guibg=#4e9a06
-hi Visual       ctermbg=white ctermfg=lightgreen cterm=reverse
-
-" Specials
-hi Todo         guifg=#8ae234 guibg=#4e9a06 gui=bold
-hi Todo         ctermfg=white ctermbg=green
-hi Title        guifg=#eeeeec gui=bold
-hi Title        ctermfg=white cterm=bold
-
-" Syntax
-hi Constant     guifg=#c4a000
-hi Constant     ctermfg=darkyellow
-hi Number       guifg=#729fcf
-hi Number       ctermfg=darkblue
-hi Statement    guifg=#4e9a06 gui=bold
-hi Statement    ctermfg=green
-hi Identifier   guifg=#8ae234
-hi Identifier   ctermfg=darkgreen
-hi PreProc      guifg=#cc0000
-hi PreProc      ctermfg=darkred
-hi Comment      guifg=#06989a gui=italic
-hi Comment      ctermfg=cyan cterm=none
-hi Type         guifg=#d3d7cf gui=bold
-hi Type         ctermfg=gray cterm=bold
-hi Special      guifg=#75507b
-hi Special      ctermfg=magenta cterm=none
-hi Error        guifg=#eeeeec guibg=#ef2929
-hi Error        ctermfg=white ctermbg=red
-
-" Diff
-hi DiffAdd      guifg=fg guibg=#3465a4 gui=none
-hi DiffAdd      ctermfg=gray ctermbg=blue cterm=none
-hi DiffChange   guifg=fg guibg=#555753 gui=none
-hi DiffChange   ctermfg=gray ctermbg=darkgray cterm=none
-hi DiffDelete   guibg=bg
-hi DiffDelete   ctermfg=gray ctermbg=none cterm=none
-hi DiffText     guifg=fg guibg=#c4a000 gui=none
-hi DiffText     ctermfg=gray ctermbg=yellow cterm=none
-
-highlight Todo gui=bold guifg=#ef2929 guibg=bg
-highlight Type gui=none guifg=#4e9a06 guibg=bg
-highlight Underlined gui=none guifg=#3465a4 guibg=bg
-highlight String gui=none guifg=#a40000 guibg=bg
-highlight Number gui=none guifg=#3465a4 guibg=bg
diff --git a/colors/tango2.vim b/colors/tango2.vim
deleted file mode 100755
index 330fe89..0000000
--- a/colors/tango2.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" =============================================================================
-" Name: Tango2
-" Purpose: Another colour scheme using the Tango colour palette
-" Maintainer: Pranesh Srinivasan
-" Last Modified: Saturday 04 October 2008 02:06:26 AM IST
-" =============================================================================
-
-" Inspired from some Gnome renditions of the Tango colour scheme.
-
-" =============================================================================
-" Preamble
-" =============================================================================
-
-set background=dark
-
-hi clear
-
-if exists("syntax-on")
-syntax reset
-endif
-
-let colors_name = "tango2"
-
-" =============================================================================
-" Vim >= 7.0 specific colours
-" =============================================================================
-
-if version >= 700
-" No support for cursor line yet
-" hi CursorLine term=underline cterm=underline guibg=#111133
-" hi CursorColoumn
-" hi MatchParen
-" hi Pmenu
-" hi PmenuSel
-endif
-
-" =============================================================================
-" General colours
-" =============================================================================
-
-hi Normal guibg=#2E3436 guifg=#eeeeec 
-hi Cursor gui=none guibg=White guifg=Black
-
-hi Folded guibg=#4D585B guibg=#d2d2d2
-" No fold column support yet 
-" hi FoldColumn guifg=Orange guibg=DarkBlue
-" =============================================================================
-" Syntax highlighting
-" =============================================================================
-
-hi Comment gui=italic guifg=#6d7e8a ctermfg=Grey
-hi Todo term=bold guifg=#EBC450 
-hi Constant guifg=#8ae234
-hi Type guifg=#8AE234
-hi Function gui=bold guifg=#9BCF8D
-hi Statement guifg=#729FCF
-hi Identifier guifg=#AD7FA8
-hi PreProc guifg=#e9ba6e 
-hi Special term=underline guifg=#5EAFE5
-
-hi Search guibg=#81ABBD
-" hi QtClass guifg=Orange ctermfg=LightBlue
diff --git a/colors/tangoshady.vim b/colors/tangoshady.vim
deleted file mode 100755
index e2f1b65..0000000
--- a/colors/tangoshady.vim
+++ /dev/null
@@ -1,76 +0,0 @@
-"
-" Tango-Shady Vim Color Scheme
-" =======================
-"
-" author:   shady <vimpimps@gmail.com>
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "tangoshady"
-
-
-"hi Normal guibg=grey15 guifg=#eeeeec 
-"hi Normal guibg=#0D0D0D guifg=#eeeeec 
-hi Normal guibg=#272727 guifg=#eeeeec 
-
-highlight SpecialKey      guifg=#3465A4
-highlight NonText         guifg=#3465A4
-highlight Directory       guifg=#3465A4
-highlight ErrorMsg        guifg=#D3D7CF guibg=#CC0000
-highlight IncSearch       gui=reverse
-highlight Search          guibg=#C4A000
-highlight MoreMsg         guifg=#4E9A06
-" highlight ModeMsg         gui=bold
-highlight LineNr          guifg=#666666 guibg=#151515
-"highlight LineNr          term=underline ctermfg=3 guifg=#C4A000 guibg=bg
-highlight Question        guifg=#4E9A06
-highlight StatusLine      gui=reverse
-highlight StatusLineNC    gui=reverse
-highlight VertSplit       gui=reverse
-highlight Title           guifg=#75507B
-" highlight Visual          term=reverse cterm=reverse guibg=#D3D7CF
-highlight Visual          guibg=#363636
-highlight VisualNOS       gui=underline
-highlight WarningMsg      guifg=#CC0000
-highlight WildMenu        guifg=#2E3436 guibg=#C4A000
-"highlight Folded          term=standout ctermfg=4 ctermbg=7 guifg=#3465A4 guibg=#D3D7CF
-"highlight FoldColumn      term=standout ctermfg=4 ctermbg=7 guifg=#D3D7CF guibg=#D3D7CF
-hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
-highlight DiffAdd         guibg=#3465A4
-highlight DiffChange      guibg=#75507B
-highlight DiffDelete      guifg=#3465A4 guibg=#06989A
-highlight DiffText        guibg=#CC0000
-highlight SignColumn      guifg=#000000 guibg=#D3D7CF
-highlight SpellBad        gui=undercurl guisp=#CC0000
-highlight SpellCap        gui=undercurl guisp=#3465A4
-highlight SpellRare       gui=undercurl guisp=#75507B
-highlight SpellLocal      gui=undercurl guisp=#06989A
-highlight Pmenu           guibg=#75507B guifg=#000000
-highlight PmenuSel        guibg=#D3D7CF guifg=#000000
-highlight PmenuSbar       guibg=#75507B
-highlight PmenuThumb      gui=reverse
-highlight TabLine         gui=underline guibg=#D3D7CF guifg=#000000
-"highlight TabLineSel      gui=bold
-highlight TabLineFill     gui=reverse
-highlight CursorColumn    guibg=#D3D7CF guifg=#000000
-highlight CursorLine      guibg=#D3D7CF guifg=#000000
-highlight Cursor          guifg=bg guibg=fg
-highlight lCursor         guifg=bg guibg=fg
-highlight MatchParen      guibg=#06989A
-hi Comment         guifg=#3465A4
-hi Constant        guifg=#CC0000
-hi Special         guifg=#75507B
-highlight Identifier      guifg=#06989A
-hi Statement       guifg=#C4A000
-hi PreProc         guifg=#75507B
-hi Type            guifg=#4E9A06
-hi Underlined      gui=underline guifg=#75507B
-hi Ignore          guifg=#2E3436
-hi Error           guifg=#D3D7CF guibg=#CC0000
-highlight Todo     guifg=Blue guibg=Yellow 
diff --git a/colors/taqua.vim b/colors/taqua.vim
deleted file mode 100755
index 947ebc9..0000000
--- a/colors/taqua.vim
+++ /dev/null
@@ -1,85 +0,0 @@
-" Vim color file
-" Maintainer:   TaQ <eustaquiorangel@yahoo.com>
-" Last Change:  18 March 2003
-" URL: http://taq.cjb.net		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let colors_name="taqua"
-
-hi Normal  gui=NONE guifg=#303030 guibg=#FFFFFF
-hi NonText gui=BOLD guifg=#303030 guibg=#FFFFFF
-
-" Search
-hi IncSearch gui=BOLD guifg=#008000 guibg=#CCFF00
-hi Search    gui=BOLD guifg=#008000 guibg=#CCFF00
-
-" Messages
-hi ErrorMsg   gui=BOLD guifg=#FFFFFF guibg=#FF0000
-hi WarningMsg gui=BOLD guifg=#008000 guibg=#CCFF00
-
-" Split area
-hi StatusLine   gui=BOLD guifg=#FFFFFF guibg=#0E8ED3
-hi StatusLineNC gui=BOLD guifg=#FFFFFF guibg=#0A6799
-
-" Diff
-hi DiffText     gui=BOLD guifg=#FF0000 guibg=#FFEAE0
-hi DiffChange   gui=BOLD guifg=#303030 guibg=#FFFFFF
-hi DiffDelete   gui=NONE guifg=#FFFFFF guibg=#FF0000
-hi DiffAdd      gui=NONE guifg=#008000 guibg=#00FF00
-
-" Cursor
-hi Cursor       gui=BOLD guifg=#FFFFFF guibg=#000000
-hi lCursor      gui=BOLD guifg=#f8f8f8 guibg=#162CF7
-hi CursorIM     gui=NONE guifg=#f8f8f8 guibg=#162CF7
-
-" Fold
-hi Folded	  gui=BOLD guifg=#0E8ED3 guibg=#DBF2FF
-hi FoldColumn gui=NONE guifg=#0E8ED3 guibg=#DBF2FF
-
-" Other
-hi LineNr		 gui=BOLD guifg=#00A0FF guibg=#DBF2FF
-hi Directory    gui=BOLD guifg=#0A6799 guibg=#FFFFFF
-hi NonText      gui=BOLD guifg=#009999 guibg=#FFFFFF
-hi SpecialKey   gui=BOLD guifg=#2020FF guibg=#FFFFFF
-hi Title        gui=BOLD guifg=#0000A0 guibg=#FFFFFF
-hi Visual       gui=NONE guifg=#404060 guibg=#dddde8
-
-" Syntax group
-" purple was #8000FF
-hi Comment    gui=NONE guifg=#0E8ED3 guibg=#DBF2FF 
-hi Constant	  gui=NONE guifg=#303030 guibg=#F5F5F5
-hi Error      gui=BOLD guifg=#FF0000 guibg=#FFFFFF
-hi Identifier gui=NONE guifg=#1F89E0 guibg=#FFFFFF 
-hi Ignore     gui=NONE guifg=#f8f8f8 guibg=#FFFFFF
-hi PreProc	  gui=BOLD guifg=#0BBF20 guibg=#FFFFFF
-hi Special    gui=NONE guifg=#0E8ED3 guibg=#DBF2FF
-hi Statement  gui=BOLD guifg=#2E9BF4 guibg=#FFFFFF
-hi Todo       gui=NONE guifg=#FF0070 guibg=#FFE0F4
-hi Type		  gui=BOLD guifg=#0971F9 guibg=#FFFFFF
-hi Underlined gui=UNDERLINE guifg=#0000ff guibg=NONE
-
-" HTML
-hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
-hi htmlBold                 gui=BOLD
-hi htmlBoldItalic           gui=BOLD,ITALIC
-hi htmlBoldUnderline        gui=BOLD,UNDERLINE
-hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
-hi htmlItalic               gui=ITALIC
-hi htmlUnderline            gui=UNDERLINE
-hi htmlUnderlineItalic      gui=UNDERLINE,ITALIC
-
-" Scrollbar
-hi Scrollbar  gui=BOLD guifg=#00C0FF guibg=#FFFFFF
-hi VertSplit  gui=BOLD guifg=#FFFFFF guibg=#0E8ED3
-hi Visual	  gui=BOLD guifg=#FFFFFF guibg=#1679F9
-
-
diff --git a/colors/tchaba.vim b/colors/tchaba.vim
deleted file mode 100755
index ee21c36..0000000
--- a/colors/tchaba.vim
+++ /dev/null
@@ -1,107 +0,0 @@
-" Vim color file
-" Maintainer:   Lucas Avan�o <avanco89@gmail.com>
-" Last Change:  Oct, 6 2010
-"
-"
-" This color scheme was based on some tools:
-"
-" It helps visualize the vim colorscheme sections and there colors:
-" sites.google.com/site/yukihironakadaira/vim-color.html  by 
-" 	Yukihiro Nakadaira <yukihiro.nakadaira@gmail.com>
-"
-" Convert a GUI only vim colorscheme file to a gui/256xterm compatible
-" version:
-" http://github.com/kanru/vim-colorscheme-converter	  by
-" 	Kanru Chen <kanru@kanru.info>
-"
-"
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"README
-"setting 't_Co' to 256 in vimrc is enough to make Vim use 256 colors
-"set t_Co=256  =>  ~/.vimrc
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-set bg=dark
-hi clear 
-if exists("syntax_on")
-	  syntax reset
-endif
-let colors_name = "tchaba"
-
-hi Comment guifg=skyblue ctermfg=23 cterm=none
-hi Constant guifg=#ffff04 ctermfg=98 cterm=none
-hi Cursor guifg=slategrey guibg=khaki 
-hi CursorColumn guibg=gray40 
-hi CursorIM gui=None 
-hi CursorLine guibg=gray40 
-hi DiffAdd guibg=darkblue 
-hi DiffChange guibg=darkmagenta 
-hi DiffDelete gui=bold guifg=blue guibg=darkcyan 
-hi DiffText gui=bold guibg=red 
-hi Directory guifg=cyan 
-hi Error guifg=white guibg=red 
-hi ErrorMsg guifg=white guibg=red 
-hi FoldColumn guifg=tan guibg=gray30 
-hi Folded guifg=gold guibg=gray30 
-hi Identifier guifg=palegreen 
-hi Ignore guifg=gray40 
-hi IncSearch gui=reverse guifg=slategrey guibg=khaki 
-hi LineNr guifg=yellow 
-hi MatchParen guibg=darkcyan 
-hi ModeMsg gui=bold guifg=goldenrod 
-hi MoreMsg gui=bold guifg=seagreen 
-hi NonText gui=bold guifg=lightblue guibg=gray30
-hi Normal guifg=white guibg=gray20 ctermfg=254	ctermbg=234
-hi Pmenu guibg=magenta 
-hi PmenuSbar guibg=grey 
-hi PmenuSel guibg=darkgray 
-hi PmenuThumb gui=reverse 
-hi PreProc guifg=#0abc00 ctermfg=40
-hi Question gui=bold guifg=springgreen 
-hi Search guifg=wheat guibg=peru 
-hi SignColumn guifg=cyan guibg=grey 
-hi Special guifg=navajowhite 
-hi SpecialKey guifg=yellowgreen 
-hi SpellBad gui=undercurl 
-hi SpellCap gui=undercurl 
-hi SpellLocal gui=undercurl 
-hi SpellRare gui=undercurl 
-hi Statement gui=bold guifg=#ff6000 ctermfg=220
-hi StatusLine guifg=black guibg=#c2bfa5 ctermbg=250 
-hi StatusLineNC guifg=gray50 guibg=#c2bfa5 ctermbg=250 
-hi TabLine gui=underline guibg=darkgray 
-hi TabLineFill gui=reverse 
-hi TabLineSel gui=bold 
-hi Title gui=bold guifg=indianred 
-hi Todo guifg=orangered guibg=yellow2 
-hi Type gui=bold guifg=#8144b4 ctermfg=160
-hi Underlined gui=underline guifg=#80a0ff ctermfg=111 
-hi VertSplit guifg=gray50 guibg=#c2bfa5 ctermbg=250 
-hi Visual guifg=khaki guibg=olivedrab 
-hi VisualNOS gui=bold,underline 
-hi WarningMsg guifg=salmon 
-hi WildMenu guifg=black guibg=yellow 
-hi link Boolean Constant 
-hi link Character Constant 
-hi link Conditional Statement 
-hi link Debug Special 
-hi link Define PreProc 
-hi link Delimiter Special 
-hi link Exception Statement 
-hi link Float Constant 
-hi link Function Identifier 
-hi link Include PreProc 
-hi link Keyword Statement 
-hi link Label Statement 
-hi link Macro PreProc 
-hi link Number Constant 
-hi link Operator Statement 
-hi link PreCondit PreProc 
-hi link Repeat Statement 
-hi link SpecialChar Special 
-hi link SpecialComment Special 
-hi link StorageClass Type 
-hi link String Constant 
-hi link Structure Type 
-hi link Tag Special 
-hi link Typedef Type 
diff --git a/colors/tcsoft.vim b/colors/tcsoft.vim
deleted file mode 100755
index 3198341..0000000
--- a/colors/tcsoft.vim
+++ /dev/null
@@ -1,83 +0,0 @@
-" Vim Farben-Datei
-" Ersteller:	Ingo Fabbri <vim@tcsoft.net>
-" Letzte �nderung:	2007 Jan 19
-
-" Mein pers�nliches Farbschema. Es schont die Augen, da es keine grellen Farben verwendet.
-" Am Besten geignet f�r PHP
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "TCSoft"
-
-if version >= 700
-  hi CursorLine                 guibg=#FFFF33  gui=NONE  "hellgelb
-  hi CursorColumn               guibg=#EAEAEA
-  hi MatchParen guifg=white     guibg=#99CC00  gui=bold
-
-  "Tabpages
-  hi TabLine    guifg=black     guibg=#B0B8C0 gui=italic
-  hi TabLineFill guifg=#9098A0
-  hi TabLineSel guifg=black     guibg=#F0F0F0 gui=italic,bold
-
-  "P-Menu (auto-completion)
-  hi Pmenu      guifg=white     guibg=#808080
-  "PmenuSel
-  "PmenuSbar
-  "PmenuThumb
-endif
-
-" Farb-Einstellungen f�r das GUI
-hi Normal       guifg=#000000   guibg=#FFFFFF "Schwarze Schrift auf wei�em Hintergrund
-
-hi Ignore       guifg=bg
-
-hi Comment      guifg=#000099   gui=italic  "dunkelblau
-hi Constant     guifg=#666666   gui=NONE    "grau
-hi Special      guifg=#FF0000   gui=NONE    "rot
-hi Identifier   guifg=#993300   gui=NONE    "rostfarbig
-hi Statement    guifg=#FF9900   gui=NONE    "orange
-hi PreProc      guifg=#009900   gui=NONE    "dunkelgr�n
-hi Type         guifg=#FF9900   gui=bold    "orange
-hi Cursor       guifg=#000000   gui=reverse "schwarz
-hi LineNr       guifg=#000000   guibg=#EFEFEF  gui=NONE    "schwarz
-hi StatusLine   guifg=#000000   gui=reverse,bold "schwarz
-
-hi Todo	        guifg=Blue      guibg=Yellow
-syn keyword	Todo		TODO FIXME XXX
-syn keyword Error    FEHLER
-
-hi link   Function    PreProc
-hi link   String	    Constant
-hi link   Character	  Constant
-
-hi! link  MoreMsg     Comment
-hi! link  ErrorMsg    Visual
-hi! link  WarningMsg  ErrorMsg
-hi! link  Question    Comment
-
-hi link   Number	    Special
-hi link   Boolean	    Constant
-hi link   Float		    Number
-
-hi link   Operator    Identifier
-hi link   Keyword	    Statement
-hi link   Exception	  Statement
-hi link   Include	    PreProc
-hi link   Define	    PreProc
-hi link   Macro		    PreProc
-
-hi link   Conditional	Statement
-hi link   Repeat	    Statement
-hi link   Label		    Statement
-
-hi link   PreCondit	  PreProc
-hi link   StorageClass	Type
-hi link   Structure	  Type
-hi link   Typedef	    Type
-hi link   SpecialChar	Special
-hi link   Delimiter	  Special
-hi link   SpecialComment Comment
-hi link   Debug		    Special
diff --git a/colors/telstar.vim b/colors/telstar.vim
deleted file mode 100755
index 3ae40f2..0000000
--- a/colors/telstar.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-" Vim color file (telstar.vim)                                            
-" Maintainer:    john white <dhcmrlchtdj@gmail.com>
-" Last Change:   20060111
-
-" a gvim space theme with some extra java highlighting.
-" the java highlighting depends on claudio fleiner's
-" java.vim syntax highlighting at
-" http://www.fleiner.com/vim/download.html
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "telstar"
-
-hi Normal        guifg=#5060c0 guibg=#000022
-hi Cursor        guibg=#aaaaaa guifg=Black
-hi lCursor       guibg=#bababa guifg=Black
-hi ModeMsg       gui=bold
-hi StatusLine    gui=bold
-hi StatusLineNC  gui=bold
-hi VertSplit     gui=bold
-hi LineNr        guifg=DarkGrey
-hi Visual        gui=bold guifg=Grey guibg=fg
-hi VisualNOS     gui=underline,bold
-hi Directory     guifg=Grey
-hi MoreMsg       gui=bold guifg=White
-hi NonText       gui=bold guifg=DarkGrey
-hi Question      gui=bold guifg=White
-hi Search        guibg=#998844 guifg=Black
-hi IncSearch     gui=bold
-hi SpecialKey    guifg=White
-hi Title         gui=bold guifg=Grey
-hi WildMenu      guibg=Yellow guifg=Black
-hi Folded        guifg=Grey guibg=#554455
-hi FoldColumn    guifg=Grey guibg=#554455
-hi DiffText      gui=bold guibg=#442266
-hi DiffAdd       guibg=#000055
-hi DiffChange    guibg=#220044
-hi DiffDelete    gui=bold guifg=#604060 guibg=#302030
-hi ErrorMsg      gui=bold guifg=Black
-hi WarningMsg    guifg=Black
-
-" general highlighting
-hi Constant      gui=bold guifg=#9060c8
-hi Special       guifg=#807087
-hi Ignore        guifg=red
-hi Number        guifg=#7060c0
-hi Type          guifg=#9060c8
-hi Comment       guifg=#604060
-hi Statement     guifg=#8070b0
-hi Label         gui=bold guifg=#805070
-hi Todo          gui=bold guifg=black
-hi String        guifg=#999999
-hi Operator      guifg=#8080c0
-hi Identifier    guifg=#686888
-hi Pmenu         guibg=#101033 guifg=#999999 gui=bold
-
-hi MatchParen    gui=bold guibg=#000022
-
-" java highlighting
-hi javaExternal  guifg=#666666
-hi javaScopeDecl guifg=#8040c0
-hi javaParen     guifg=#6080e0
-hi javaParen1    guifg=#80a0ff
-hi javaParen2    guifg=#a0c0ff
-hi javaFuncDef   guifg=#7080f0
-hi javaLangObject guifg=#6080c0
-hi javaBraces    guifg=#406090
diff --git a/colors/tesla.vim b/colors/tesla.vim
deleted file mode 100755
index 6a0121b..0000000
--- a/colors/tesla.vim
+++ /dev/null
@@ -1,114 +0,0 @@
-" =============================================================================
-" Vim color file (tesla.vim)
-"    Maintainer: clericJ
-"   Last Change: 2010 Oct 10
-"       Version: 1.6
-" =============================================================================
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "tesla"
-
-" =============================================================================
-" Main
-" =============================================================================
-
-hi Normal                       guibg=#192636           guifg=LightSkyBlue2
-hi Cursor                       guibg=red               guifg=white
-hi lCursor                      guibg=MediumPurple3
-hi CursorLine                   guibg=#353545
-hi CursorColumn                 guibg=MidnightBlue
-hi ColorColumn                  guibg=#23364D           gui=none
-hi MatchParen                   guibg=blue              guifg=white
-
-hi DiffAdd                      guibg=DarkBlue
-hi DiffChange                   guibg=#005124
-hi DiffDelete   gui=none        guibg=#604800           guifg=gray10
-hi DiffText     gui=none        guibg=#731600
-
-hi Directory    gui=bold        guifg=LightBlue
-hi Error        guibg=#432323   guifg=white
-hi ErrorMsg                     guibg=red               guifg=White
-hi FoldColumn                   guibg=LightSteelBlue4   guifg=LightGray
-hi Folded       gui=underline   guibg=black             guifg=gray
-hi IncSearch    gui=reverse     guibg=white             guifg=Goldenrod4
-hi LineNr                       guibg=#303f4f           guifg=gray
-hi ModeMsg      gui=bold
-hi MoreMsg      gui=bold                                guifg=LightBlue
-hi SpecialKey                                           guifg=#394c56
-hi NonText      gui=bold        guibg=#192636           guifg=azure4
-hi Pmenu                        guibg=#4e5d6d           guifg=white
-hi PmenuSel                     guibg=#6c7b8b           guifg=white
-hi PmenuSbar                    guibg=gray60            guifg=azure3
-hi PmenuThumb                                           guifg=azure2
-hi Question     gui=bold                                guifg=green
-hi Search                       guibg=#2d4e54           guifg=white
-hi StatusLine   gui=none        guibg=LightSteelBlue4   guifg=white
-hi StatusLineNC gui=none        guibg=LightSteelBlue4   guifg=gray
-hi Title        gui=bold        guibg=#3a4959           guifg=AliceBlue
-hi VertSplit                    guibg=LightSteelBlue4   guifg=LightSteelBlue4
-hi Visual       gui=reverse     guibg=white             guifg=#6c7b8b
-hi VisualNOS    gui=underline,bold
-hi WarningMsg                                           guifg=red
-hi WildMenu                     guibg=yellow            guifg=black
-hi Todo         gui=none        guibg=DarkRed           guifg=AliceBlue
-
-" =============================================================================
-" Status-line user colors
-" =============================================================================
-
-"hi User1        gui=bold        guifg=white             guibg=LightSteelBlue4
-"hi User2        gui=none        guifg=white             guibg=LightSteelBlue4
-"hi User3        gui=none        guifg=white             guibg=#303f4f
-"hi User4        gui=none        guifg=white             guibg=DarkRed
-
-" =============================================================================
-" Change cursor color in different modes
-" =============================================================================
-
-hi Cursor                       guibg=DodgerBlue3       guifg=white
-hi iCursor                      guibg=red               guifg=white
-
-set guicursor=n-v-c:block-Cursor
-set guicursor+=i-ci:ver15-iCursor
-
-" =============================================================================
-" Syntax highlighting
-" =============================================================================
-
-hi Comment          gui=none                        guifg=LightSteelBlue4
-hi Constant         gui=none                        guifg=LightGray
-hi String           gui=none                        guifg=plum3
-hi Number           gui=none                        guifg=green3
-hi Boolean          gui=none                        guifg=green3
-hi Float            gui=none                        guifg=green3
-hi Identifier       gui=none                        guifg=green3
-hi PreProc          gui=none                        guifg=#4fc6ff
-hi Function         gui=none                        guifg=#4fc6ff
-hi Special          gui=none guibg=#192636          guifg=#d775f1
-hi Statement        gui=none                        guifg=white
-hi Type             gui=none                        guifg=green3
-hi SpecialComment   gui=none                        guifg=DarkRed
-
-" =============================================================================
-" Python extended syntax file highlighting
-" =============================================================================
-
-hi PythonBuiltin     gui=none                        guifg=green3
-hi pythonBuiltinObj  gui=none                        guifg=green3
-hi pythonDecorator   gui=none                        guifg=green3
-hi pythonBuiltinFunc gui=none                        guifg=green3
-hi link pythonOperator  Statement
-
-" =============================================================================
-" Taglist Plugin
-" =============================================================================
-"
-hi TagListFileName   gui=none        guibg=#192636           guifg=white
-
-" =============================================================================
diff --git a/colors/tetragrammaton.vim b/colors/tetragrammaton.vim
deleted file mode 100755
index 10a1476..0000000
--- a/colors/tetragrammaton.vim
+++ /dev/null
@@ -1,148 +0,0 @@
-:set background=dark
-:highlight clear
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-let colors_name = "tetragrammaton"
-":hi Normal guifg=White guibg=#403020
-
-hi Normal guifg=#953434 guibg=#180000
-hi Cursor guibg=khaki guifg=slategrey
-"hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-hi VertSplit guibg=#020f05 guifg=#ff5544 gui=none
-hi Folded guibg=black guifg=grey40
-hi FoldColumn guibg=black guifg=grey20
-hi IncSearch guifg=#4444bb guibg=#bbff88
-hi ModeMsg guifg=goldenrod
-hi MoreMsg guifg=SeaGreen
-hi NonText guifg=RoyalBlue guibg=grey15
-hi Question guifg=springgreen
-hi Search guibg=peru guifg=wheat
-hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
-hi StatusLine guibg=#480000 guifg=#95171a gui=none
-hi StatusLineNC guibg=#380000 guifg=#000000 gui=none
-hi Title guifg=gold gui=bold
-" if else do while etc
-hi Statement guifg=#ccaa88
-hi Visual gui=none guifg=khaki guibg=olivedrab
-hi WarningMsg guifg=salmon
-hi String guifg=#884444 ctermfg=darkcyan
-"hi Comment guifg=#689879
-hi Comment guifg=#689879
-hi Constant guifg=#cf8080
-hi Special guifg=darkkhaki
-hi Identifier guifg=salmon
-hi Include guifg=#86bb33 gui=bold
-hi PreProc guifg=red guibg=white
-hi Operator guifg=#bb9988
-hi Define guifg=gold gui=bold
-hi Type guifg=#975546
-hi Function guifg=#bd3422 gui=bold
-hi Structure guifg=green
-hi LineNr guifg=grey50
-hi Ignore guifg=grey40
-hi Todo guifg=orangered guibg=yellow2
-hi Directory ctermfg=darkcyan guifg=Red
-hi ErrorMsg guifg=White guibg=Red
-hi VisualNOS cterm=bold,underline
-hi WildMenu ctermfg=0 ctermbg=3
-hi DiffAdd ctermbg=4
-hi DiffChange ctermbg=5
-hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-hi DiffText cterm=bold ctermbg=1
-hi Underlined cterm=underline ctermfg=5
-hi Error guifg=White guibg=Red
-hi SpellErrors guifg=White guibg=Red
-hi StorageClass guifg=#cc3021
-" class implements extends
-hi javaClassDecl guifg=#be7012
-" this
-hi javaTypeDef guifg=#a63322 gui=bold
-" try catch finally
-hi javaExceptions guifg=#dc9a88
-" for while do
-hi javaRepeat guifg=#bcba88
-" public private protected
-hi javaScopeDecl guifg=#854433
-hi javaFuncDef guifg=#b53423 gui=bold
-hi javaDebug guifg=#689879
-hi javaDocComment guifg=#88b899
-hi javaString guifg=#b87849
-"hi javaFuncDef gui=bold
-
-hi bufExplorerModBuf guibg=#000030 guifg=#222288
-hi bufExplorerLockedBuf guibg=#000030 guifg=#222288
-hi bufExplorerHidBuf guibg=#000030 guifg=#222288
-hi BufExplorerActBuf guibg=#000020 guifg=#424298
-hi bufExplorerCurBuf guibg=#000030 guifg=#ffffff
-hi bufExplorerAltBuf guibg=#101070 guifg=#8888ff
-hi bufExplorerUnlBuf guibg=#000030 guifg=#222288
-hi bufExplorerXxxBuf guibg=#101070 guifg=#8888ff
-
-hi bufExplorerBufNbr guibg=#000030 guifg=#222288
-hi bufExplorerHelp guibg=#000030
-hi bufExplorerTitle guibg=#000030
-hi bufExplorerSortType guibg=#000030
-hi bufExplorerSortBy guibg=#000030
-hi bufExplorerOpenIn guibg=#000030
-hi bufExplorerMapping guibg=#000030
-hi bufExplorerToggleSplit guibg=#000030
-hi bufExplorerToggleOpen guibg=#000030
-
-hi CursorLine guibg=#280000
-hi CursorColumn guibg=#280000
-
-hi MyTagListTagName guifg=#88bbff guibg=#000028
-hi MyTagListTagScope guifg=#589bcf guibg=#000028
-hi MyTagListTitle guifg=#88bbff guibg=#000028
-hi MyTagListComment guifg=#589bcf guibg=#000028
-hi MyTagListFileName guifg=#88bbff guibg=#000028
-"hi TagListNothing guifg=#488bbf guibg=#000028
-
-" for ShowSources function
-hi SourceLine guifg=#88bbff guibg=#000038
-
-
-hi MatchParen gui=bold guibg=#600000
-hi level1c guifg=#775533
-hi level2c guifg=Darkblue
-hi level3c guifg=darkgray
-hi level4c guifg=darkgreen
-hi level5c guifg=darkcyan
-hi level6c guifg=darkred
-hi level7c guifg=darkmagenta
-hi level8c guifg=#ffddbb
-hi level9c guifg=#eeccaa
-hi level10c guifg=#ffffff
-hi level11c guifg=#ffddbb
-hi level12c guifg=#eeccaa
-hi level13c guifg=#ddbb99
-hi level14c guifg=#ccaa88
-hi level15c guifg=#bb9977
-hi level16c guifg=#aa8866
-
-
-
-" These are the regions for each pair.
-" This could be improved, perhaps, by makeing them match [ and { also,
-" but I'm not going to take the time to figure out haw to make the
-" end pattern match only the proper type.
-syn region level1 matchgroup=level1c start=/(/ end=/)/ contains=TOP,level1,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level2 matchgroup=level2c start=/(/ end=/)/ contains=TOP,level2,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level3 matchgroup=level3c start=/(/ end=/)/ contains=TOP,level3,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level4 matchgroup=level4c start=/(/ end=/)/ contains=TOP,level4,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level5 matchgroup=level5c start=/(/ end=/)/ contains=TOP,level5,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level6 matchgroup=level6c start=/(/ end=/)/ contains=TOP,level6,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level7 matchgroup=level7c start=/(/ end=/)/ contains=TOP,level7,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level8 matchgroup=level8c start=/(/ end=/)/ contains=TOP,level8,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level9 matchgroup=level9c start=/(/ end=/)/ contains=TOP,level9,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level10 matchgroup=level10c start=/(/ end=/)/ contains=TOP,level10,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level11 matchgroup=level11c start=/(/ end=/)/ contains=TOP,level11,level12,level13,level14,level15, level16,NoInParens
-syn region level12 matchgroup=level12c start=/(/ end=/)/ contains=TOP,level12,level13,level14,level15, level16,NoInParens
-syn region level13 matchgroup=level13c start=/(/ end=/)/ contains=TOP,level13,level14,level15, level16,NoInParens
-syn region level14 matchgroup=level14c start=/(/ end=/)/ contains=TOP,level14,level15, level16,NoInParens
-syn region level15 matchgroup=level15c start=/(/ end=/)/ contains=TOP,level15, level16,NoInParens
-syn region level16 matchgroup=level16c start=/(/ end=/)/ contains=TOP,level16,NoInParens
diff --git a/colors/textmate16.vim b/colors/textmate16.vim
deleted file mode 100755
index df66aa0..0000000
--- a/colors/textmate16.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" Vim color scheme
-"
-" Name:         textmate16.vim
-" Maintainer:   Bruce Woodward <bruce.woodward@gmail.com>
-" Last Change:  06 Apr 2007
-"
-" This is a color scheme based on the colors from textmate when editing ruby
-" scripts. It was written to work under Mac OS X Terminal software using only
-" 16 colors.
-"
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "textmate16"
-
-
-if ! has("gui_running")
-  set t_Co=16
-  " do not change the background color
-  " It's expected that the user will change the background color to something
-  " dark.
-  highlight Normal ctermfg=White ctermbg=NONE
-  highlight Cursor ctermfg=Black ctermbg=Yellow 
-  highlight Keyword ctermfg=Brown
-  highlight Define ctermfg=Brown 
-  highlight Comment ctermfg=Darkmagenta
-  highlight rubySharpBang ctermfg=Darkmagenta
-  highlight Type ctermfg=White 
-  highlight rubySymbol ctermfg=Darkcyan 
-  highlight Identifier ctermfg=White 
-  highlight rubyStringDelimiter ctermfg=Darkgreen
-  highlight rubyInterpolation ctermfg=White
-  highlight rubyPseudoVariable ctermfg=White 
-  highlight Constant ctermfg=White 
-  highlight Function ctermfg=White 
-  highlight Include ctermfg=Brown 
-  highlight Statement ctermfg=Brown
-  highlight String ctermfg=Darkgreen 
-  highlight Search ctermbg=White 
-  highlight RubyInteger ctermfg=Darkred
-  highlight RubyFloat ctermfg=Darkred
-  highlight RubyDocumentation ctermfg=White ctermbg=Darkgrey
-endif
-
diff --git a/colors/thegoodluck.vim b/colors/thegoodluck.vim
deleted file mode 100755
index cce108f..0000000
--- a/colors/thegoodluck.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-" vim: sw=4
-" Vim color file
-" Maintainer:	Leonid Shvechikov (aka tGL) <shvechikov@gmail.com>
-" Vesion:       0.7
-" Last Change:	2008/07/30
-
-" tGL - the Good Luck
-" My personal light colorscheme for gvim.
-" I prefere to decrease screen brightness at my worktime to the value,
-" when the white color not tire my eyes.
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name = "thegoodluck"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-    hi CursorLine            guibg=#e8f2ff             
-    hi CursorColumn          guibg=#e8f2ff             
-    hi MatchParen            guibg=#ffff00 gui=bold    
-    hi Pmenu    guifg=Black  guibg=#ddeeff             
-    hi PmenuSel guifg=White  guibg=#4088d0             
-endif                                                  
-                                                       
-" General colors                                       
-hi Cursor     guifg=White    guibg=Black               
-hi lCursor    guifg=White    guibg=Black               
-hi Normal     guifg=Black    guibg=White               
-hi NonText    guifg=gray40   guibg=gray95              
-hi LineNR     guifg=gray70   guibg=gray95              
-hi SpecialKey guifg=#ff00ff                            
-hi Title      guifg=Black                  gui=bold       
-hi Visual     guibg=#bbddff                            
-                                                       
-" Syntax highlighting                                  
-hi Comment    guifg=#0066cc                            
-hi Constant   guifg=#aa0000                            
-hi Number     guifg=#aa0000                            
-hi String     guifg=#008000                            
-hi Identifier guifg=#0033cc                            
-hi Operator   guifg=#0066cc                gui=bold    
-hi Function   guifg=#aa0000                            
-hi PreProc    guifg=#aa0000                            
-hi Special    guifg=#cc6600                            
-hi Statement  guifg=#008040                gui=bold     
-hi Type       guifg=#0066cc                gui=bold    
-hi Directory  guifg=#0066cc                gui=bold     
-                                                       
-hi DiffAdd                   guibg=#ccffcc             
-hi DiffChange                guibg=#ffffcc             
-hi DiffDelete guifg=#6699cc  guibg=#bbeeff gui=bold    
-hi DiffText                  guibg=#ffcccc gui=bold    
-                                                       
-hi FoldColumn guifg=DarkBlue guibg=gray95              
-hi Folded     guifg=gray30   guibg=gray95              
diff --git a/colors/thestars.vim b/colors/thestars.vim
deleted file mode 100755
index fc68320..0000000
--- a/colors/thestars.vim
+++ /dev/null
@@ -1,78 +0,0 @@
-" Vim Color File
-" Last Change: Thursday, October 20, 2005
-" Maintainer: Michael Wiseman (thestarslookdown at gmail dot com)
-let s:thestars_version = 1.0.1
-
-" Color Help Screens
-" h cterm-colors
-" h group-name
-" h highlight-groups
-
-set bg=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "thestars"
-
-"------------------------------------------------------------------------------
-" Highlight Groups
-"------------------------------------------------------------------------------
-
-hi Cursor guifg=#FFFAFA guibg=#2E473B gui=bold " ctermfg=black ctermbg=white cterm=bold
-hi CursorLine guifg=#0E0E18 guibg=#FDF8FF " ctermfg=black ctermbg=white
-hi DiffAdd guifg=white guibg=#FF4F00 " ctermfg=white ctermbg=darkyellow
-hi DiffChange guifg=white guibg=#2E473B " ctermfg=white ctermbg=darkgray
-hi Directory guifg=#2E473B guibg=black " ctermfg=darkgray ctermbg=black
-hi ErrorMsg guifg=red guibg=black " ctermfg=red ctermbg=black
-hi VertSplit guifg=#D5CFDE guibg=#605B73 " ctermfg=darkgray ctermbg=lightgray
-hi Folded guifg=#605B73 guibg=#D5CFDE " ctermfg=darkgray ctermbg=lightgray
-hi FoldColumn guifg=#605B73 guibg=#D5CFDE " ctermfg=darkgray ctermbg=lightgray
-hi SignColumn guifg=red guibg=black " ctermfg=red ctermbg=black
-hi IncSearch guifg=#FDF8FF guibg=#0E0E18 " ctermfg=white ctermbg=black
-hi LineNr guifg=#605B73 guibg=#F8FBF1 " ctermfg=darkgray ctermbg=lightgray
-hi ModeMsg guifg=white guibg=black " ctermfg=white ctermbg=black
-hi MoreMsg guifg=white guibg=black " ctermfg=white ctermbg=black
-hi NonText guifg=white guibg=black " ctermfg=white ctermbg=black
-hi Normal guifg=white guibg=black " ctermfg=white ctermbg=black
-hi MatchParen guifg=#FDF8FF guibg=#2E473B
-hi Pmenu guifg=#DAF4F0 guibg=#A02712 " ctermfg=white ctermbg=darkred
-hi PmenuSel guifg=#A02712 guibg=#DAF4F0 gui=bold
-hi PmenuSbar guibg=#007B00 " ctermbg=gray
-hi PmenuThumb guifg=#2E473B
-hi Question guifg=darkgreen guibg=black " ctermfg=darkgreen ctermbg=black
-hi Search guifg=#FDF8FF guibg=#0E0E18 
-hi SpecialKey guifg=#C0C0C0 guibg=black " ctermfg=gray ctermbg=black
-hi StatusLine guifg=#F8FBF1 guibg=#605B73 " ctermfg=white ctermbg=darkgray
-hi StatusLineNC guifg=#605B73 guibg=#F8FBF1 " ctermfg=darkgray ctermbg=white
-hi TabLine guifg=#F8FBF1 guibg=#605B73 gui=none " ctermfg=white ctermbg=darkgray
-hi TabLineFill guibg=#FDF8FF " ctermbg=white
-hi TabLineSel guifg=white guibg=black " ctermfg=white ctermbg=black
-hi Title guifg=white guibg=black gui=bold " ctermfg=white ctermbg=black cterm=bold
-hi Visual guifg=#0E0E18 guibg=#FDF8FF " ctermfg=black ctermbg=white
-hi VisualNOS guifg=#0E0E18 guibg=#FDF8FF " ctermfg=black ctermbg=white
-hi WarningMsg guifg=red guibg=black " ctermfg=red ctermbg=black
-hi WildMenu guifg=#605B73 guibg=#D5CFDE gui=bold " ctermfg=darkgray ctermbg=lightgray
-
-"------------------------------------------------------------------------------
-" Group Name
-"------------------------------------------------------------------------------
-
-hi Comment guifg=#F8FEEF guibg=black gui=italic " ctermfg=white ctermbg=black
-hi Constant guifg=#DAF4F0 guibg=black " ctermfg=red ctermbg=black
-hi String guifg=#016D39 guibg=black gui=bold " ctermfg=darkred ctermbg=black cterm=bold
-hi Character guifg=#00009C guibg=black " ctermfg=darkblue ctermbg=black
-hi Number guifg=#DAF4F0 guibg=black " ctermfg=lightgray ctermbg=black
-hi Boolean guifg=#8C1717 guibg=black " ctermfg=red ctermbg=black
-hi Float guifg=#DAF4F0 guibg=black " ctermfg=yellow ctermbg=black
-hi Identifier guifg=#A02712 guibg=black " ctermfg=darkgreen ctermbg=black
-hi Statement guifg=#007B00 guibg=black " ctermfg=darkgreen ctermbg=black
-hi Operator guifg=#FF2400 guibg=black gui=bold " ctermfg=darkgreen ctermbg=black cterm=bold
-hi PreProc guifg=#1560BD guibg=black " ctermfg=darkblue ctermbg=black
-hi Type guifg=#FF2400 guibg=black " ctermfg=darkgreen ctermbg=black
-hi Special guifg=#0056A7 guibg=black " ctermfg=darkcyan ctermbg=black
-hi Underlined guifg=white guibg=black gui=none " ctermfg=white ctermbg=black cterm=none
-hi Ignore guibg=black guifg=black " ctermfg=black ctermbg=black
-hi Error guibg=red guifg=white gui=bold " ctermfg=white ctermbg=red cterm=bold
-hi Todo guifg=#006400 guibg=black gui=bold " ctermfg=darkgreen ctermbg=black cterm=bold
diff --git a/colors/thor.vim b/colors/thor.vim
deleted file mode 100755
index ad6e7be..0000000
--- a/colors/thor.vim
+++ /dev/null
@@ -1,219 +0,0 @@
-" Adapted from ir_black color scheme
-" More at: http://blog.infinitered.com/entries/show/8
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-"hi Example         guifg=NONE        guibg=NONE        gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-
-" General colors
-hi Normal           guifg=#f6f3e8     guibg=#090A1B       gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-"hi Normal           guifg=#f6f3e8     guibg=black       gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-hi NonText          guifg=#070707     guibg=#090A1B       gui=NONE      ctermfg=black       ctermbg=NONE        cterm=NONE
-
-hi Cursor           guifg=black       guibg=white       gui=NONE      ctermfg=black       ctermbg=white       cterm=reverse
-hi LineNr           guifg=#3D3D3D     guibg=black       gui=NONE      ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-
-hi VertSplit        guifg=#202020     guibg=#202020     gui=NONE      ctermfg=darkgray    ctermbg=darkgray    cterm=NONE
-hi StatusLine       guifg=#CCCCCC     guibg=#202020     gui=italic    ctermfg=white       ctermbg=darkgray    cterm=NONE
-hi StatusLineNC     guifg=#E6E6E6     guibg=#202020     gui=NONE      ctermfg=blue        ctermbg=darkgray    cterm=NONE  
-
-hi Directory        guifg=#00A0A0     guibg=NONE        gui=NONE      ctermfg=lightblue   ctermbg=NONE        cterm=NONE
-hi Folded           guifg=#a0a8b0     guibg=#384048     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-hi Title            guifg=#f6f3e8     guibg=NONE        gui=bold      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-hi Visual           guifg=NONE        guibg=#262D51     gui=NONE      ctermfg=NONE        ctermbg=darkgray    cterm=NONE
-
-hi SpecialKey       guifg=#808080     guibg=#343434     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-
-hi WildMenu         guifg=green       guibg=yellow      gui=NONE      ctermfg=black       ctermbg=yellow      cterm=NONE
-hi PmenuSbar        guifg=black       guibg=white       gui=NONE      ctermfg=black       ctermbg=white       cterm=NONE
-"hi Ignore           guifg=gray        guibg=black       gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-
-hi Error            guifg=NONE        guibg=NONE        gui=undercurl ctermfg=white       ctermbg=red         cterm=NONE     guisp=#FF6C60 " undercurl color
-hi ErrorMsg         guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=white       ctermbg=red         cterm=NONE
-hi WarningMsg       guifg=white       guibg=#FF6C60     gui=BOLD      ctermfg=white       ctermbg=red         cterm=NONE
-
-" Message displayed in lower left, such as --INSERT--
-hi ModeMsg          guifg=black       guibg=#C6C5FE     gui=BOLD      ctermfg=black       ctermbg=cyan        cterm=BOLD
-
-if version >= 700 " Vim 7.x specific colors
-  hi CursorLine     guifg=NONE        guibg=#121212     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=BOLD
-  hi CursorColumn   guifg=NONE        guibg=#121212     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=BOLD
-  hi MatchParen     guifg=#f6f3e8     guibg=#857b6f     gui=BOLD      ctermfg=white       ctermbg=darkgray    cterm=NONE
-  hi Pmenu          guifg=#5789F9     guibg=#000000     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-  hi PmenuSel       guifg=#5dff9e     guibg=#0f291a     gui=NONE      ctermfg=NONE        ctermbg=NONE        cterm=NONE
-  hi Search         guifg=NONE        guibg=blue   gui=NONE      ctermfg=NONE        ctermbg=blue        cterm=NONE
-  "old: guibg=NONE gui=underline ctermbg=NONE cterm=underline
-endif
-
-" Syntax highlighting
-hi Comment          guifg=#7C7C7C     guibg=black        gui=NONE      ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-"hi String           guifg=#A8FF60     guibg=NONE        gui=NONE      ctermfg=green       ctermbg=NONE        cterm=NONE " Old
-hi String           gui=NONE          guifg=#5dff9e      guibg=#0f291a ctermfg=lightgreen      ctermbg=NONE
-hi Number           guifg=#FF73FD     guibg=NONE        gui=NONE      ctermfg=magenta     ctermbg=NONE        cterm=NONE
-
-hi Keyword          guifg=#FE3853     guibg=NONE        gui=NONE      ctermfg=red        ctermbg=NONE        cterm=NONE
-"hi Keyword          guifg=#96CBFE     guibg=NONE        gui=NONE      ctermfg=blue        ctermbg=NONE        cterm=NONE "old
-hi PreProc          guifg=#FE3853     guibg=NONE        gui=NONE      ctermfg=red        ctermbg=NONE        cterm=NONE
-"hi PreProc          guifg=#96CBFE     guibg=NONE        gui=NONE      ctermfg=blue        ctermbg=NONE        cterm=NONE
-hi Conditional      guifg=#FE3853     guibg=NONE        gui=NONE      ctermfg=red        ctermbg=NONE        cterm=NONE  " if else end
-"hi Conditional      guifg=#6699CC     guibg=NONE        gui=NONE      ctermfg=blue        ctermbg=NONE        cterm=NONE  " if else end
-
-hi Todo             guifg=#8f8f8f     guibg=NONE        gui=NONE      ctermfg=red         ctermbg=NONE        cterm=NONE
-hi Constant         guifg=#0A9BFE     guibg=NONE        gui=NONE      ctermfg=cyan        ctermbg=NONE        cterm=NONE
-"hi Constant         guifg=#99CC99     guibg=NONE        gui=NONE      ctermfg=cyan        ctermbg=NONE        cterm=NONE
-
-hi Identifier       guifg=#5789F9     guibg=NONE        gui=NONE      ctermfg=blue        ctermbg=NONE        cterm=NONE
-hi Function         guifg=#6FD3FF     guibg=NONE        gui=NONE      ctermfg=brown       ctermbg=NONE        cterm=NONE
-hi Type             guifg=#5789F9     guibg=NONE        gui=NONE      ctermfg=blue      ctermbg=NONE        cterm=NONE
-"hi Type             guifg=#FFFFB6     guibg=NONE        gui=NONE      ctermfg=yellow      ctermbg=NONE        cterm=NONE
-hi Statement        guifg=#FE3853     guibg=NONE        gui=NONE      ctermfg=red   ctermbg=NONE        cterm=NONE
-
-hi Special          guifg=#FFFF69     guibg=NONE        gui=NONE      ctermfg=brown       ctermbg=NONE        cterm=NONE
-hi Delimiter        guifg=#00A0A0     guibg=NONE        gui=NONE      ctermfg=cyan        ctermbg=NONE        cterm=NONE
-hi Operator         guifg=#5BF7BB       guibg=NONE        gui=NONE      ctermfg=white       ctermbg=NONE        cterm=NONE
-
-hi link Character       Constant
-hi link Boolean         Constant
-hi link Float           Number
-hi link Repeat          Statement
-hi link Label           Statement
-hi link Exception       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 SpecialChar     Special
-hi link SpecialComment  Special
-hi link Debug           Special
-
-
-" Special for Ruby
-let ruby_operators = 1
-
-hi rubyRegexp                  guifg=#B18A3D      guibg=NONE      gui=NONE      ctermfg=brown          ctermbg=NONE      cterm=NONE
-hi rubyRegexpDelimiter         guifg=#FF8000      guibg=NONE      gui=NONE      ctermfg=brown          ctermbg=NONE      cterm=NONE
-hi rubyEscape                  guifg=#BF4FC1        guibg=NONE      gui=NONE      ctermfg=cyan           ctermbg=NONE      cterm=NONE
-hi rubyInterpolationDelimiter  guifg=#00A0A0      guibg=NONE      gui=NONE      ctermfg=cyan           ctermbg=NONE      cterm=NONE
-hi rubyInterpolation           guifg=#00A0A0      guibg=NONE      gui=NONE      ctermfg=cyan           ctermbg=NONE      cterm=NONE
-hi rubyControl                 guifg=#FE3853      guibg=NONE      gui=NONE      ctermfg=blue           ctermbg=NONE      cterm=NONE  "and break, etc
-"hi rubyGlobalVariable          guifg=#FFCCFF      guibg=NONE      gui=NONE      ctermfg=lightblue      ctermbg=NONE      cterm=NONE  "yield
-hi rubyStringDelimiter         guifg=#336633      guibg=NONE      gui=NONE      ctermfg=lightgreen     ctermbg=NONE      cterm=NONE
-"rubyInclude
-"rubySharpBang
-"rubyAccess
-hi rubyPredefinedVariable      guifg=#5BF7BB       guibg=NONE        gui=NONE      ctermfg=white       ctermbg=NONE        cterm=NONE
-hi rubySymbol                  guifg=#37FE3D      guibg=NONE      gui=NONE     ctermfg=cyan
-hi rubyAttribute    guifg=#FFFA87
-"rubyBoolean
-"rubyClassVariable
-"rubyBeginEnd
-"rubyRepeatModifier
-"hi link rubyArrayDelimiter    Special  " [ , , ]
-"rubyCurlyBlock  { , , }
-hi railsMethod      guifg=#FFFE8F      guibg=NONE        gui=NONE      ctermfg=white       ctermbg=NONE        cterm=NONE
-"hi railsUserClass   guifg=#FFFA87
-"hi railsUserMethod   guifg=#FFFA87
-
-hi link rubyClass             Keyword 
-hi link rubyModule            Keyword 
-hi link rubyKeyword           Keyword 
-hi link rubyOperator          Operator
-"hi link rubyIdentifier        Identifier
-hi link rubyInstanceVariable  Identifier
-hi link rubyGlobalVariable    Identifier
-hi link rubyClassVariable     Identifier
-hi link rubyConstant          Type  
-
-"hi rubyNoInterpolation    ctermfg=red guifg=red 
-"hi rubyDelimEscape    ctermfg=red guifg=red 
-"hi rubyNestedParentheses  ctermfg=red guifg=red 
-"hi rubyNestedCurlyBraces  ctermfg=red guifg=red 
-"hi rubyNestedAngleBrackets  ctermfg=red guifg=red 
-"hi rubyNestedSquareBrackets ctermfg=red guifg=red 
-"hi rubyASCIICode    ctermfg=red guifg=red 
-"hi rubyInteger      ctermfg=185 guifg=185 
-"hi rubyFloat      ctermfg=185 guifg=185 
-"hi rubyLocalVariableOrMethod  ctermfg=red guifg=red 
-"hi rubyBlockArgument    ctermfg=red guifg=red 
-"hi rubyConstant     ctermfg=252 guifg=252 
-"hi rubyStringSpecial    ctermfg=red guifg=red 
-"hi rubyBlockParameter   ctermfg=252 guifg=252 
-"hi rubyPredefinedConstant ctermfg=red guifg=red 
-"hi rubyRegexp     ctermfg=167 guifg=167 
-"hi rubyString     ctermfg=185 guifg=185 
-"hi rubyBoolean      ctermfg=252 guifg=252 
-"hi rubyPseudoVariable   ctermfg=252 guifg=252 
-"hi rubyMethodDeclaration  ctermfg=red guifg=red 
-"hi rubyClassDeclaration   ctermfg=red guifg=red 
-"hi rubyModuleDeclaration  ctermfg=red guifg=red 
-"hi rubyFunction     ctermfg=252 guifg=252 
-"hi rubyDefine     ctermfg=32  guifg=32
-"hi rubyClass      ctermfg=25  guifg=25
-"hi rubyModule     ctermfg=25  guifg=25
-"hi rubyBlock      ctermfg=252 guifg=252 
-"hi rubyConditional    ctermfg=81  guifg=81  
-"hi rubyRepeat     ctermfg=81  guifg=81
-"hi rubyControl      ctermfg=81  guifg=81
-"hi rubyKeyword      ctermfg=red guifg=red 
-"hi rubyOperator     ctermfg=red guifg=red 
-"hi rubyBeginEnd     ctermfg=red guifg=red 
-"hi rubyAccess     ctermfg=32  guifg=32  
-"hi rubyEval     ctermfg=red guifg=red 
-"hi rubyException    ctermfg=red guifg=red 
-"hi rubyInclude      ctermfg=252 guifg=252 
-"hi rubySharpBang    ctermfg=red guifg=red 
-"hi rubyTodo     ctermfg=34  guifg=34  
-"hi rubyComment      ctermfg=28  guifg=28
-"hi rubyDocumentation    ctermfg=red guifg=red 
-"hi rubyData     ctermfg=red guifg=red 
-"
-"hi railsMethod    ctermfg=107 guifg=107
-
-
-" Special for Java
-" hi link javaClassDecl    Type
-hi link javaScopeDecl         Identifier 
-hi link javaCommentTitle      javaDocSeeTag 
-hi link javaDocTags           javaDocSeeTag 
-hi link javaDocParam          javaDocSeeTag 
-hi link javaDocSeeTagParam    javaDocSeeTag 
-
-hi javaDocSeeTag              guifg=#CCCCCC     guibg=NONE        gui=NONE      ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-hi javaDocSeeTag              guifg=#CCCCCC     guibg=NONE        gui=NONE      ctermfg=darkgray    ctermbg=NONE        cterm=NONE
-"hi javaClassDecl              guifg=#CCFFCC     guibg=NONE        gui=NONE      ctermfg=white       ctermbg=NONE        cterm=NONE
-
-
-" Special for XML
-hi link xmlTag          Keyword 
-hi link xmlTagName      Conditional 
-hi link xmlEndTag       Identifier 
-
-
-" Special for HTML
-hi link htmlTag         Keyword 
-hi link htmlTagName     Conditional 
-hi link htmlEndTag      Identifier 
-
-
-" Special for Javascript
-hi link javaScriptNumber      Number 
-
-
-" Special for Python
-"hi  link pythonEscape         Keyword      
-
-
-" Special for CSharp
-hi  link csXmlTag             Keyword      
-
-
-" Special for PHP
diff --git a/colors/tibet.vim b/colors/tibet.vim
deleted file mode 100755
index 48807bf..0000000
--- a/colors/tibet.vim
+++ /dev/null
@@ -1,101 +0,0 @@
-" Vim color file
-" Maintainer:   Miguel Figueiredo
-
-" /usr/X11R6/lib/X11 
-set background=dark
-
-if exists("syntax_on")
-	syntax reset
-endif
-
-let g:colors_name="tibet"
-
-hi Normal	guifg=ivory guibg=darkred
-
-" highlight groups
-"hi Cursor	guibg=khaki guifg=slategrey
-hi Cursor	guibg=blue4 guifg=white
-"hi CursorIM	
-"hi Directory	
-"hi DiffAdd				
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-"hi ErrorMsg	
-"hi VertSplit	guibg=#c2bfa5 guifg=grey50 gui=none
-hi VertSplit	guibg=darkgreen guifg=white gui=none
-hi Folded	guibg=darkred guifg=gold 
-hi FoldColumn	guibg=grey30 guifg=tan
-hi IncSearch	guifg=slategrey guibg=khaki
-hi LineNr		guifg=yellow guibg=darkred
-hi ModeMsg	guifg=goldenrod
-hi MoreMsg	guifg=SeaGreen
-hi NonText	guifg=LightBlue guibg=darkred
-hi Question	guifg=springgreen
-hi Search	guibg=peru guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=#c2bfa5 guifg=black gui=none
-hi StatusLineNC	guibg=#c2bfa5 guifg=grey50 gui=none
-hi Title	guifg=indianred
-"hi Visual	gui=none guifg=khaki guibg=olivedrab
-hi Visual	gui=none guifg=white guibg=#003300
-"hi VisualNOS	
-hi WarningMsg	guifg=salmon
-"hi WildMenu	
-"hi Menu				
-"hi Scrollbar	
-"hi Tooltip				
-
-" syntax highlighting groups
-hi Comment	 guifg=goldenrod
-hi Constant	 guifg=#ffa0a0
-"hi String	 guifg=blue
-hi Identifier	 guifg=palegreen
-hi Statement	 guifg=khaki
-hi PreProc	 guifg=#ffa0a0
-"hi Type		 guifg=darkkhaki
-hi Type		 guifg=khaki
-hi Special	 guifg=navajowhite
-"hi Underlined	
-hi Ignore 	 guifg=grey40
-"hi Error			
-hi Todo		 guifg=yellow guibg=#003300
-
-" color terminal definitions
-hi SpecialKey    ctermfg=darkgreen
-hi NonText       cterm=bold ctermfg=darkblue
-hi Directory     ctermfg=darkcyan
-hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
-hi Search        cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg       ctermfg=darkgreen
-hi ModeMsg       cterm=NONE ctermfg=brown
-hi LineNr        ctermfg=3
-hi Question      ctermfg=green
-hi StatusLine    cterm=bold,reverse
-hi StatusLineNC  cterm=reverse
-hi VertSplit     cterm=reverse
-hi Title         ctermfg=5
-hi Visual        cterm=reverse
-hi VisualNOS     cterm=bold,underline
-hi WarningMsg    ctermfg=1
-hi WildMenu      ctermfg=0 ctermbg=3
-hi Folded        ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd       ctermbg=4
-hi DiffChange    ctermbg=5
-hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
-hi DiffText      cterm=bold ctermbg=1
-hi Comment       ctermfg=darkcyan
-hi Constant      ctermfg=brown
-hi Special       ctermfg=5
-hi Identifier    ctermfg=6
-hi Statement     ctermfg=3
-hi PreProc       ctermfg=5
-hi Type          ctermfg=2
-hi Underlined    cterm=underline ctermfg=5
-hi Ignore        ctermfg=darkgrey
-hi Error         cterm=bold ctermfg=7 ctermbg=1
-
-
-"
diff --git a/colors/tidy.vim b/colors/tidy.vim
deleted file mode 100755
index cf7d6aa..0000000
--- a/colors/tidy.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-" Vim color file tidy.vim based on PerlTidy syntax, http://perltidy.sourceforge.net/ written by Steve Hancock <perltidy@users.sourceforge.net>
-" Maintainer:   Tomasz Kalkosinski <tomasz2k@poczta.onet.pl>
-" Last Change:  2005-08-22
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="tidy"
-
-hi Normal	guibg=#F0F0F0	guifg=Black
-
-
-" Search
-hi Search 	guibg=#FFE568	guifg=Black gui=none
-hi IncSearch	guibg=#40FFFF	guifg=Black		gui=none
-
-" highlight groups
-hi Cursor	guibg=#D74141	guifg=#e3e3e3
-hi VertSplit	guibg=#C0FFFF	guifg=#075554		gui=none
-hi Folded	guibg=Grey80	guifg=Black
-hi FoldColumn	guibg=Grey80	guifg=Black
-hi ModeMsg	guibg=Grey90	guifg=Grey30		gui=bold
-hi MoreMsg	guibg=#188F90	guifg=DimGrey
-hi NonText	guibg=Grey90	guifg=DarkGreen
-hi Question			guifg=DarkOrange3
-
-hi SpecialKey			guifg=DarkOrange3
-hi StatusLine	guibg=DimGrey	guifg=White		gui=bold
-hi StatusLineNC	guibg=Black	guifg=White		gui=none
-hi Title			guifg=#8DB8C3
-hi Visual	guibg=DarkBlue	guifg=White		gui=none
-hi WarningMsg			guifg=#F60000		gui=underline
-
-" syntax highlighting groups
-hi Comment	guibg=Grey90	guifg=#228b22
-hi Constant	guibg=White	guifg=#CD5555
-hi Number			guifg=#B452CD
-hi Identifier			guifg=#00688B
-hi Statement			guifg=#8B4513		gui=bold
-hi PreProc			guifg=DarkBlue		gui=bold
-hi Type				guifg=Blue		gui=bold
-hi Special 			guifg=Red
-hi Ignore			guifg=Grey60
-hi Todo		guibg=Yellow	guifg=Black 
-hi Label 			guifg=firebrick3	gui=bold
-
-" Vim defaults
-hi ErrorMsg	guibg=Red	guifg=White
-hi DiffAdd	guibg=#90B0D9
-hi DiffChange	guibg=#B1E599
-hi DiffDelete	guibg=#D9A465	guifg=Black		gui=bold
-hi DiffText	guibg=Firebrick4 guifg=White		gui=bold
-hi Directory			guifg=DarkGreen
-hi LineNr			guifg=DarkGreen
-hi WildMenu	guibg=Yellow	guifg=Black
-hi lCursor	guibg=SeaGreen1	guifg=NONE
-hi Underlined			guifg=#80a0ff		gui=underline
-hi Error	guibg=Red	guifg=White
diff --git a/colors/tir_black.vim b/colors/tir_black.vim
deleted file mode 100755
index 802dec1..0000000
--- a/colors/tir_black.vim
+++ /dev/null
@@ -1,130 +0,0 @@
-" tir_black color scheme
-" Based on ir_black from: http://blog.infinitered.com/entries/show/8
-" adds 256 color console support
-" changed WildMenu color to be the same as PMenuSel
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "tir_black"
-
-" General colors
-hi Normal guifg=#f6f3e8 guibg=black ctermfg=white ctermbg=0
-hi NonText guifg=#070707 guibg=black ctermfg=232 ctermbg=0
-
-hi Cursor guifg=black guibg=white ctermfg=0 ctermbg=15
-hi LineNr guifg=#3D3D3D guibg=black ctermfg=239 ctermbg=0
-
-hi VertSplit guifg=#202020 guibg=#202020 ctermfg=235 ctermbg=235 
-hi StatusLine guifg=#CCCCCC guibg=#202020 gui=italic ctermfg=235 ctermbg=254
-hi StatusLineNC guifg=black guibg=#202020 ctermfg=0 ctermbg=235 
-
-hi Folded guifg=#a0a8b0 guibg=#384048 ctermfg=103 ctermbg=60
-hi Title guifg=#f6f3e8 gui=bold ctermfg=187 cterm=bold
-hi Visual guibg=#262D51 ctermbg=60
-
-hi SpecialKey guifg=#808080 guibg=#343434 ctermfg=8 ctermbg=236
-
-hi WildMenu guifg=black guibg=#cae682 ctermfg=0 ctermbg=195
-hi PmenuSbar guifg=black guibg=white ctermfg=0 ctermbg=15
-
-hi Error gui=undercurl ctermfg=203 ctermbg=none cterm=underline guisp=#FF6C60
-hi ErrorMsg guifg=white guibg=#FF6C60 gui=bold ctermfg=white ctermbg=203 cterm=bold
-hi WarningMsg guifg=white guibg=#FF6C60 gui=bold ctermfg=white ctermbg=203 cterm=bold
-
-hi ModeMsg guifg=black guibg=#C6C5FE gui=bold ctermfg=0 ctermbg=189 cterm=bold
-
-if version >= 700 " Vim 7.x specific colors
- hi CursorLine guibg=#121212 gui=none ctermbg=234 cterm=none
- hi CursorColumn guibg=#121212 gui=none ctermbg=234 cterm=none
- hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold ctermfg=white ctermbg=darkgray 
- hi Pmenu guifg=#f6f3e8 guibg=#444444 ctermfg=white ctermbg=242 
- hi PmenuSel guifg=#000000 guibg=#cae682 ctermfg=0 ctermbg=195 
- hi Search guifg=#000000 guibg=#cae682 ctermfg=0 ctermbg=195 
-endif
-
-" Syntax highlighting
-hi Comment guifg=#7C7C7C ctermfg=8 
-hi String guifg=#A8FF60 ctermfg=155 
-hi Number guifg=#FF73FD ctermfg=207 
-
-hi Keyword guifg=#96CBFE ctermfg=117 
-hi PreProc guifg=#96CBFE ctermfg=117 
-hi Conditional guifg=#6699CC ctermfg=110 
-
-hi Todo guifg=#000000 guibg=#cae682 ctermfg=0 ctermbg=195 
-hi Constant guifg=#99CC99 ctermfg=151 
-
-hi Identifier guifg=#C6C5FE ctermfg=189 
-hi Function guifg=#FFD2A7 ctermfg=223 
-hi Type guifg=#FFFFB6 ctermfg=229 
-hi Statement guifg=#6699CC ctermfg=110 
-
-hi Special guifg=#E18964 ctermfg=173 
-hi Delimiter guifg=#00A0A0 ctermfg=37 
-hi Operator guifg=white ctermfg=white 
-
-hi link Character Constant
-hi link Boolean Constant
-hi link Float Number
-hi link Repeat Statement
-hi link Label Statement
-hi link Exception 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 SpecialChar Special
-hi link SpecialComment Special
-hi link Debug Special
-
-" Special for Ruby
-hi rubyRegexp guifg=#B18A3D ctermfg=brown 
-hi rubyRegexpDelimiter guifg=#FF8000 ctermfg=brown 
-hi rubyEscape guifg=white ctermfg=cyan 
-hi rubyInterpolationDelimiter guifg=#00A0A0 ctermfg=blue 
-hi rubyControl guifg=#6699CC ctermfg=blue "and break, etc
-hi rubyStringDelimiter guifg=#336633 ctermfg=lightgreen 
-hi link rubyClass Keyword 
-hi link rubyModule Keyword 
-hi link rubyKeyword Keyword 
-hi link rubyOperator Operator
-hi link rubyIdentifier Identifier
-hi link rubyInstanceVariable Identifier
-hi link rubyGlobalVariable Identifier
-hi link rubyClassVariable Identifier
-hi link rubyConstant Type 
-
-" Special for Java
-hi link javaScopeDecl Identifier 
-hi link javaCommentTitle javaDocSeeTag 
-hi link javaDocTags javaDocSeeTag 
-hi link javaDocParam javaDocSeeTag 
-hi link javaDocSeeTagParam javaDocSeeTag 
-
-hi javaDocSeeTag guifg=#CCCCCC ctermfg=darkgray 
-hi javaDocSeeTag guifg=#CCCCCC ctermfg=darkgray 
-
-" Special for XML
-hi link xmlTag Keyword 
-hi link xmlTagName Conditional 
-hi link xmlEndTag Identifier 
-
-" Special for HTML
-hi link htmlTag Keyword 
-hi link htmlTagName Conditional 
-hi link htmlEndTag Identifier 
-
-" Special for Javascript
-hi link javaScriptNumber Number 
-
-" Special for CSharp
-hi link csXmlTag Keyword 
diff --git a/colors/tolerable.vim b/colors/tolerable.vim
deleted file mode 100755
index 7b97b9a..0000000
--- a/colors/tolerable.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" Vim color file
-" Maintainer:   Ian Langworth
-" Last Change:  2004 Dec 24
-" Email:        <langworth.com>
-
-" Color settings inspired by BBEdit for Mac OS, plus I liked
-" the low-contrast comments from the 'oceandeep' colorscheme
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="tolerable"
-
-hi Cursor       guifg=white guibg=darkgreen
-
-hi Normal       gui=none guifg=black guibg=white
-hi NonText      gui=none guifg=orange guibg=white
-
-hi Statement    gui=none guifg=blue
-hi Special      gui=none guifg=red
-hi Constant     gui=none guifg=darkred
-hi Comment      gui=none guifg=#555555
-hi Preproc      gui=none guifg=darkcyan
-hi Type         gui=none guifg=darkmagenta
-hi Identifier   gui=none guifg=darkgreen
-hi Title        gui=none guifg=black
-
-hi StatusLine   gui=none guibg=#333333 guifg=white
-hi StatusLineNC gui=none guibg=#333333 guifg=white
-hi VertSplit    gui=none guibg=#333333 guifg=white
-
-hi Visual       gui=none guibg=green guifg=black
-hi Search       gui=none guibg=yellow
-hi Directory    gui=none guifg=darkblue
-hi WarningMsg   gui=none guifg=red 
-hi Error        gui=none guifg=white guibg=red
-hi Todo         gui=none guifg=black guibg=yellow
-
-hi MoreMsg      gui=none
-hi ModeMsg      gui=none
-
diff --git a/colors/tomatosoup.vim b/colors/tomatosoup.vim
deleted file mode 100755
index 7864aed..0000000
--- a/colors/tomatosoup.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-" Vim color file
-" Maintainer:   Michael Brailsford <brailsmt@yahoo.com>
-" Date:			$Date: 2002/04/11 03:29:51 $ 
-" Version: 		$Revision: 1.4 $
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-" your pick:
-set background=dark	
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="tomatosoup"
-
-hi Normal guifg=black guibg=tomato1 ctermfg=14
-
-"Toggle semicolon matching at the end of lines
-nmap <silent> <leader>; :call ToggleSemicolonHighlighting()<cr>
-"{{{
-function! ToggleSemicolonHighlighting()
-	if exists("b:semicolon")
-		unlet b:semicolon
-		hi semicolon guifg=NONE gui=NONE ctermfg=NONE
-	else
-		syn match semicolon #;$#
-		hi semicolon guifg=red gui=bold ctermfg=1
-		let b:semicolon = 1
-	endif
-endfunction
-"}}}
-
-hi Cursor guifg=bg guibg=fg ctermfg=0 ctermbg=11
-"hi CursorIM	
-hi Directory gui=bold
-hi DiffAdd guifg=yellow guibg=darkgreen ctermbg=0
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-hi ErrorMsg	guibg=red ctermfg=1
-"hi VertSplit	
-hi Folded guibg=darkred ctermbg=4 guifg=gold ctermfg=11 gui=bold
-hi FoldColumn guibg=darkred ctermbg=14 guifg=gold ctermfg=11 gui=bold
-"hi IncSearch	
-hi LineNr guifg=yellow ctermfg=11
-hi ModeMsg guifg=yellow gui=bold
-"hi MoreMsg		
-"hi NonText		
-"hi Question	
-hi Search guibg=yellow guifg=bg
-"hi SpecialKey	
-hi StatusLine guifg=brown
-hi StatusLineNC guifg=darkred
-"hi Title		
-hi Visual guifg=fg guibg=bg
-"hi VisualNOS	
-"hi WarningMsg	
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment guifg=pink ctermfg=10
-hi Constant	guifg=lightmagenta gui=bold ctermfg=13
-hi String guifg=grey85 ctermfg=5
-hi Character guifg=violet ctermfg=5
-hi Number guifg=red ctermfg=5
-"hi Identifier	
-hi Statement guifg=khaki1 gui=bold ctermfg=15 cterm=underline
-hi PreProc guifg=white gui=italic ctermfg=9
-hi Type	guifg=yellow gui=bold ctermfg=3
-hi Special guifg=red gui=bold
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-hi Todo guifg=yellow guibg=blue gui=bold
diff --git a/colors/Tomorrow-Night.vim b/colors/tomorrow-night.vim
old mode 100755
new mode 100644
similarity index 100%
rename from colors/Tomorrow-Night.vim
rename to colors/tomorrow-night.vim
diff --git a/colors/tony_light.vim b/colors/tony_light.vim
deleted file mode 100755
index 20e24d7..0000000
--- a/colors/tony_light.vim
+++ /dev/null
@@ -1,49 +0,0 @@
-" Vim color file
-" Maintainer:       Tony Dunsworth
-" Last Change:      $Date: 2010/05/25 14:45:00 $
-" URL:              http://brandrui.110mb.com
-" Version:          $Id: tony_light.vim,v 1.0 2010/05/25 11:55:00 $
-
-set background=light
-if version > 580
-    " no guarantees for version 5.8 and below, but it will 
-    " stop complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="tony_light"
-
-hi Normal       gui=none guifg=black guibg=white
-
-" highlight groups
-hi Cursor       guifg=white guibg=darkblue
-hi NonText      gui=none guifg=#c90016 guibg=white
-
-hi Statement    gui=none guifg=darkcyan
-hi Special      gui=none guifg=blue
-hi Constant     gui=none guifg=#004d73
-hi String       guifg=darkolivegreen    gui=none
-hi Number       guifg=aquamarine4       gui=none
-hi Boolean 		gui=none guifg=steelblue
-hi Comment      gui=italic guifg=darkgreen
-hi Preproc      gui=none guifg=#64314d
-hi Type         gui=none guifg=darkred
-hi Identifier   gui=none guifg=#221b4e
-hi Title        gui=none guifg=#4d2517
-hi LineNr		gui=none guifg=deepskyblue3
-
-hi StatusLine   gui=none guibg=#b8bab2 guifg=black
-hi StatusLineNC gui=none guibg=#b8bab2 guifg=black
-hi VertSplit    gui=none guibg=#b8bab2 guifg=black
-
-hi Visual       gui=none guibg=#547741 guifg=black
-hi Search       gui=none guibg=#e5cf3e 
-hi Directory    gui=none guifg=darkgreen
-hi WarningMsg   gui=none guifg=red
-hi Error        gui=none guifg=white guibg=red
-hi Todo         gui=none guifg=black guibg=yellow
-
-hi MoreMsg      gui=none
-hi ModeMsg      gui=none
diff --git a/colors/toothpik.vim b/colors/toothpik.vim
deleted file mode 100755
index 8bbbf92..0000000
--- a/colors/toothpik.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-" Vim color file
-" Maintainer: s cunningham <toothpik@swbell.net>
-" Last Change: 2006-08-30
-" Version: 0.3
-" URL: http://vim.sourceforge.net/script.php?script_id=480
-
-set background=light
-highlight clear
-if exists( "syntax_on" )
-    syntax reset
-endif
-let g:colors_name="toothpik"
-
-highlight Comment term=bold  guifg=white
-highlight Constant term=underline  guifg=Blue guibg=grey
-highlight Cursor gui=reverse guifg=White guibg=Black
-highlight lCursor guifg=black guibg=green
-highlight DiffAdd term=bold  guibg=LightBlue
-highlight DiffChange term=bold  guibg=LightMagenta
-highlight DiffDelete term=bold  gui=bold guifg=Blue guibg=LightCyan
-highlight DiffText term=reverse  gui=bold guibg=Red
-highlight Directory term=bold  guifg=Blue
-highlight Error term=reverse  guifg=White guibg=Red
-highlight ErrorMsg term=standout  guifg=White guibg=Red
-highlight Folded term=standout   guifg=DarkBlue guibg=LightGrey
-highlight FoldColumn term=standout  guifg=DarkBlue guibg=Grey
-highlight Identifier term=underline  guifg=DarkCyan
-highlight Ignore  guifg=bg
-highlight IncSearch term=reverse  gui=reverse
-highlight LineNr term=underline  guifg=Brown
-highlight MoreMsg term=bold  gui=bold guifg=SeaGreen
-highlight ModeMsg term=bold  gui=bold
-highlight NonText term=bold  gui=bold guifg=green guibg=grey
-highlight Normal guibg=grey 
-highlight Question term=standout  gui=bold guifg=SeaGreen
-highlight PreProc term=underline  guifg=Purple
-highlight Search term=reverse  guibg=brown
-highlight Special term=bold  guifg=darkred guibg=grey
-highlight SpecialKey term=bold  guifg=Blue
-highlight Statement term=bold  gui=bold guifg=Brown
-highlight StatusLine term=bold,reverse  gui=bold,reverse
-highlight StatusLineNC term=reverse  gui=reverse
-highlight Title term=bold  gui=bold guifg=Magenta
-highlight Todo term=standout  guifg=Blue guibg=Yellow
-highlight Type term=underline  gui=bold guifg=DarkGreen
-highlight Underlined term=underline  gui=underline guifg=SlateBlue
-highlight VertSplit term=reverse  gui=reverse
-highlight Visual term=reverse  gui=reverse guifg=Yellow guibg=Black
-highlight VisualNOS term=bold,underline  gui=bold,underline
-highlight WarningMsg term=standout  guifg=Red
-highlight WildMenu term=standout  guifg=Black guibg=Yellow
diff --git a/colors/torte.vim b/colors/torte.vim
deleted file mode 100755
index f28ed60..0000000
--- a/colors/torte.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-" Vim color file
-" Maintainer:	Thorsten Maerz <info@netztorte.de>
-" Last Change:	2001 Jul 23
-" grey on black
-" optimized for TFT panels
-" $Revision: 1.1 $
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "torte"
-
-" hardcoded colors :
-" GUI Comment : #80a0ff = Light blue
-
-" GUI
-highlight Normal     guifg=Grey80	guibg=Black
-highlight Search     guifg=Black	guibg=Red	gui=bold
-highlight Visual     guifg=Grey25			gui=bold
-highlight Cursor     guifg=Black	guibg=Green	gui=bold
-highlight Special    guifg=Orange
-highlight Comment    guifg=#80a0ff
-highlight StatusLine guifg=blue		guibg=white
-highlight Statement  guifg=Yellow			gui=NONE
-highlight Type						gui=NONE
-
-" Console
-highlight Normal     ctermfg=LightGrey	ctermbg=Black
-highlight Search     ctermfg=Black	ctermbg=Red	cterm=NONE
-highlight Visual					cterm=reverse
-highlight Cursor     ctermfg=Black	ctermbg=Green	cterm=bold
-highlight Special    ctermfg=Brown
-highlight Comment    ctermfg=Blue
-highlight StatusLine ctermfg=blue	ctermbg=white
-highlight Statement  ctermfg=Yellow			cterm=NONE
-highlight Type						cterm=NONE
-
-" only for vim 5
-if has("unix")
-  if v:version<600
-    highlight Normal  ctermfg=Grey	ctermbg=Black	cterm=NONE	guifg=Grey80      guibg=Black	gui=NONE
-    highlight Search  ctermfg=Black	ctermbg=Red	cterm=bold	guifg=Black       guibg=Red	gui=bold
-    highlight Visual  ctermfg=Black	ctermbg=yellow	cterm=bold	guifg=Grey25			gui=bold
-    highlight Special ctermfg=LightBlue			cterm=NONE	guifg=LightBlue			gui=NONE
-    highlight Comment ctermfg=Cyan			cterm=NONE	guifg=LightBlue			gui=NONE
-  endif
-endif
-
diff --git a/colors/transparent.vim b/colors/transparent.vim
deleted file mode 100755
index ef79503..0000000
--- a/colors/transparent.vim
+++ /dev/null
@@ -1,120 +0,0 @@
-" Vim color file
-" Maintainer:   Sir Raorn <raorn@altlinux.ru>
-" Last Change:  Apr, 10 2006
-" URL:		http://people.altlinux.ru/~raorn/transparent.vim
-
-" This color scheme uses "transparent" background (dark dark blue in gvim)
-" Looks really nice when vim (console) started in transparent aterm
-" But gvim looks good too
-set background=dark
-
-" First remove all existing highlighting.
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="transparent"
-
-" default groups
-hi Normal			ctermfg=Gray	ctermbg=NONE				guifg=Gray	guibg=#00002A
-
-hi Cursor										guifg=Black	guibg=Green
-if version >= 700
-  hi CursorColumn cterm=reverse										guibg=Gray40
-  hi CursorLine	cterm=underline										guibg=Gray40
-endif
-"hi CursorIM			NONE							guifg=Black	guibg=Purple
-hi Directory			ctermfg=White						guifg=White
-hi DiffAdd			ctermfg=White	ctermbg=DarkCyan			guifg=White	guibg=DarkCyan
-hi DiffChange			ctermfg=Black	ctermbg=Gray				guifg=Black	guibg=DarkGray
-hi DiffDelete			ctermfg=White	ctermbg=DarkRed				guifg=White	guibg=DarkRed
-hi DiffText	cterm=bold	ctermfg=White	ctermbg=Gray		gui=bold	guifg=White	guibg=DarkGray
-hi ErrorMsg			ctermfg=White	ctermbg=DarkRed				guifg=White	guibg=DarkRed
-hi VertSplit	cterm=reverse						gui=reverse
-hi Folded	cterm=bold	ctermfg=Cyan	ctermbg=NONE		gui=bold	guifg=Cyan	guibg=DarkCyan
-hi FoldColumn			ctermfg=Green	ctermbg=NONE				guifg=Green	guibg=#00002A
-hi IncSearch			ctermfg=White	ctermbg=Black				guifg=White	guibg=Black
-hi LineNr			ctermfg=Yellow						guifg=DarkCyan
-if version >= 700
-  hi MatchParen	cterm=bold,underline		ctermbg=NONE		gui=bold,underline		guibg=NONE
-endif
-hi ModeMsg	cterm=bold	ctermfg=White				gui=bold	guifg=White
-hi MoreMsg	cterm=bold	ctermfg=White				gui=bold	guifg=White
-hi NonText			ctermfg=NONE						guifg=NONE
-if version >= 700
-  hi Pmenu			ctermfg=Black	ctermbg=Cyan				guifg=Black	guibg=Cyan
-  hi PmenuSel			ctermfg=Black	ctermbg=Grey				guifg=Black	guibg=Grey
-  hi PmenuSbar			ctermfg=Black	ctermbg=Grey				guifg=Black	guibg=Grey
-  hi PmenuThumb	cterm=reverse						gui=reverse
-endif
-hi Question			ctermfg=Green						guifg=Green
-hi Search	cterm=reverse	ctermfg=fg	ctermbg=NONE		gui=reverse	guifg=fg	guibg=bg
-hi SpecialKey			ctermfg=LightRed					guifg=Red
-if version >= 700
-  hi SpellBad					ctermbg=Red		gui=undercurl					guisp=Red
-  hi SpellCap					ctermbg=Blue		gui=undercurl					guisp=Blue
-  hi SpellRare					ctermbg=Magenta		gui=undercurl					guisp=Magenta
-  hi SpellLocal					ctermbg=Cyan		gui=undercurl					guisp=Cyan
-endif
-hi StatusLine	cterm=bold,reverse ctermfg=White ctermbg=Black		gui=bold,reverse guifg=White	guibg=Black
-hi StatusLineNC	cterm=reverse	ctermfg=Gray	ctermbg=Black		gui=reverse	guifg=DarkGray	guibg=Black
-if version >= 700
-  hi TabLine	cterm=underline	ctermfg=Gray				gui=underline	guifg=Black	guibg=DarkGray
-  hi TabLineSel	cterm=bold,underline ctermfg=White			gui=bold	guifg=White
-  hi TabLineFill cterm=underline ctermfg=Gray				gui=underline	guifg=Black	guibg=DarkGray
-endif
-hi Title			ctermfg=LightGreen			gui=bold	guifg=Green
-hi Visual	cterm=inverse	ctermfg=White	ctermbg=DarkGray	gui=inverse	guifg=DarkGray	guibg=Black
-hi VisualNOS	cterm=bold,underline					gui=bold,underline
-hi WarningMsg			ctermfg=White	ctermbg=DarkRed				guifg=White	guibg=DarkRed
-hi WildMenu	cterm=bold	ctermfg=Black	ctermbg=Yellow		gui=bold	guifg=Black	guibg=Yellow
-"hi Menu	
-"hi Scrollbar	
-"hi Tooltip	
-
-" syntax highlighting groups
-hi Comment			ctermfg=DarkCyan					guifg=DarkCyan
-
-hi Constant			ctermfg=LightGreen					guifg=LightGreen
-hi String			ctermfg=Yellow						guifg=Yellow
-hi Character			ctermfg=Yellow						guifg=Yellow
-"hi Number
-"hi Boolean
-"hi Float
-
-hi Identifier			ctermfg=LightCyan					guifg=LightCyan
-hi Function			ctermfg=White						guifg=White
-
-hi Statement			ctermfg=Yellow						guifg=Yellow
-"hi Conditional
-"hi Repeat
-hi Label			ctermfg=White						guifg=White
-hi Operator			ctermfg=Green						guifg=Green
-"hi Keyword
-hi Exception			ctermfg=Black	ctermbg=DarkRed				guifg=Black	guibg=DarkRed
-
-hi PreProc			ctermfg=DarkGreen					guifg=#00aa00
-"hi Include
-"hi Define
-"hi Macro
-"hi PreCondit
-
-hi Type				ctermfg=Green						guifg=Green
-"hi StorageClass
-"hi Structure
-hi Typedef			ctermfg=Red						guifg=Red
-
-hi Special			ctermfg=Red						guifg=Red
-"hi SpecialChar
-hi Tag				ctermfg=LightGreen					guifg=LightGreen
-hi Delimiter			ctermfg=Green						guifg=Green
-"hi SpecialComment
-hi Debug			ctermfg=White	ctermbg=Black				guifg=White	guibg=Black
-
-hi Underlined	cterm=underline						gui=underline
-
-hi Ignore			ctermfg=DarkBlue					guifg=DarkBlue
-
-hi Error			ctermfg=White	ctermbg=DarkRed				guifg=White	guibg=DarkRed
-
-hi Todo				ctermfg=Black	ctermbg=Gray				guifg=Black	guibg=Gray
diff --git a/colors/trivial256.vim b/colors/trivial256.vim
deleted file mode 100755
index 9e11194..0000000
--- a/colors/trivial256.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" Vim color file
-" Maintainer: drauh <drauhx@gmail.com>
-"
-" This theme is based on "simple256" theme by A. Rodin
-"
-" Ignored all GUI-mode colors. Set simple terminal colors
-" to be visible on iTerm.app for OS X with a light background.
-
-set background=light
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="trivial256"
-
-" color terminal definitions
-hi VertSplit    ctermfg=lightgray ctermbg=darkgray cterm=reverse
-hi Folded       ctermfg=blue ctermbg=lightcyan
-hi IncSearch    ctermfg=darkgray ctermbg=yellow
-hi Visual       ctermfg=blue ctermbg=white cterm=reverse
-hi Comment      ctermfg=darkgray cterm=bold
-hi Constant     ctermfg=blue
-hi Literal      ctermfg=blue
-hi Identifier   ctermfg=magenta cterm=none
-hi Keyword      ctermfg=magenta
-hi String       ctermfg=red
-hi Float        ctermfg=magenta
-hi Boolean      ctermfg=darkblue
-hi Number       ctermfg=darkblue
-hi Statement    ctermfg=darkblue
-hi PreProc      ctermfg=blue
-hi Type         ctermfg=blue
-hi Special      ctermfg=darkblue cterm=none
-hi Underlined   ctermfg=blue cterm=underline
-hi Todo         ctermfg=blue ctermbg=yellow cterm=none
-
-" vim: set fdl=0 fdm=marker:
-
diff --git a/colors/trogdor.vim b/colors/trogdor.vim
deleted file mode 100755
index d71b590..0000000
--- a/colors/trogdor.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" Vim color scheme
-"
-" Name:         trogdor.vim
-" Maintainer:   Bruce E. Gottlieb <trogdortheme at renderguild dot com> 
-" Last Change:  3 Feb 2009 
-" License:      public domain
-" URL:		http://renderguild.com/vim/colors/trogdor.vim
-" Version:      1.0
-"
-" This scheme was designed and was tested to work in the GUI (gVim) only. 
-"
-" This theme was based on years and years of research into the ideal 
-" theme for minimizing eye strain. Many C/C++ programmers went blind or are 
-" wearing coke-bottle glasses just to bring this to you. 
-" Do not let their suffering be in vain. 
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let g:colors_name = "trogdor"
-
-if has("gui_running")
-    highlight Normal guifg=Cyan	   guibg=Black
-    highlight Cursor guifg=Black   guibg=CadetBlue
-    highlight Keyword guifg=green 
-    highlight PreProc guifg=yellow
-    highlight Special guifg=yellow
-    highlight Todo guifg=yellow
-    highlight Comment guifg=LightCyan4
-    highlight SpecialComment guifg=LightCyan4
-    highlight Type guifg=green gui=NONE
-    highlight Identifier guifg=green gui=NONE
-    highlight Constant guifg=DarkOrange
-    highlight Statement guifg=green   gui=NONE
-    highlight String guifg=DarkOrange  
-    highlight Search guibg=SlateGray guifg=white
-    highlight CursorLine guibg=DeepSkyBlue 
-    highlight Visual guifg=white guibg=SlateGray
-    highlight LineNr guifg=SlateGray
-endif
diff --git a/colors/turbo.vim b/colors/turbo.vim
deleted file mode 100755
index c5bc1d6..0000000
--- a/colors/turbo.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-" Vim color file
-" Maintainer:   Bryant Casteel
-" Web Site:     http://bethings.provoplatinum.com
-" Last Change:  2007 Jan. 22
-
-" turbo:        Intended to look like the color scheme 
-"               from Borland's Turbo C++ and Turbo Pascal.
-
-set bg=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let colors_name = "turbo"
-
-hi Normal       guifg=yellow    guibg=#000040   ctermfg=brown  
-
-hi ErrorMsg     guifg=white     guibg=#287eff   
-hi ErrorMsg     ctermfg=white   ctermbg=lightblue
-
-hi Visual       guifg=#8080ff   guibg=fg        gui=reverse     
-hi Visual       ctermfg=lightblue               ctermbg=fg      cterm=reverse
-
-hi VisualNOS    guifg=#8080ff       guibg=fg        gui=reverse,underline    
-hi VisualNOS    ctermfg=lightblue   ctermbg=fg      cterm=reverse,underline
-
-hi Todo         guifg=#d14a14   guibg=#1248d1   ctermfg=red     ctermbg=darkblue
-hi Search       guifg=#90fff0   guibg=#2050d0   ctermfg=white   ctermbg=darkblue
-hi IncSearch    guifg=#b0ffff   guibg=#2050d0   ctermfg=darkblue    ctermbg=gray
-
-hi SpecialKey   guifg=cyan                      ctermfg=darkcyan
-hi Directory    guifg=cyan                      ctermfg=cyan
-hi Title        guifg=magenta   gui=none        ctermfg=magenta cterm=bold
-hi WarningMsg   guifg=red                       ctermfg=red
-
-hi WildMenu     guifg=yellow    guibg=black     
-hi WildMenu     ctermfg=yellow  ctermbg=black   cterm=none
-
-hi ModeMsg      guifg=#22cce2                   ctermfg=lightblue
-hi MoreMsg      guifg=darkgreen                 ctermfg=darkgreen
-hi Question     guifg=green     gui=none        ctermfg=green   cterm=none
-hi NonText      guifg=#0030ff                   ctermfg=darkblue
-
-"    Split window status bar
-hi StatusLine   guifg=blue      guibg=yellow    gui=none        
-hi StatusLine   ctermfg=blue    ctermbg=gray    cterm=none
-
-hi StatusLineNC     guifg=black         guibg=green     gui=none        
-hi StatusLineNC     ctermfg=black       ctermbg=gray    cterm=none
-
-hi VertSplit    guifg=black     guibg=orange    gui=none        
-hi VertSplit    ctermfg=black   ctermbg=gray    cterm=none
-
-"    Folded code
-hi Folded       guifg=#808080   guibg=#000040   
-hi Folded       ctermfg=darkgrey        ctermbg=black   cterm=bold
-hi FoldColumn       guifg=#808080       guibg=#000040                
-hi FoldColumn       ctermfg=darkgrey    ctermbg=black   cterm=bold
-
-hi LineNr       guifg=#90f020           ctermfg=green   cterm=none
-
-
-hi DiffAdd      guibg=darkblue          ctermbg=darkblue    cterm=none
-hi DiffChange   guibg=darkmagenta       ctermbg=magenta     cterm=none
-
-hi DiffDelete   guifg=Blue      guibg=DarkCyan          gui=bold        
-hi DiffDelete   ctermfg=blue    ctermbg=cyan
-
-hi DiffText     guibg=Red       gui=bold    ctermbg=red     cterm=bold
-
-"    Cursor
-hi Cursor       guifg=#000020   guibg=#ffaf38   cterm=reverse
-hi lCursor      guifg=white     guibg=black     ctermbg=darkgreen  cterm=reverse
-
-"    Syntax highlighting:
-hi Comment      guifg=darkcyan                  ctermfg=darkcyan
-hi Constant     guifg=darkred                   ctermfg=darkred     cterm=none
-hi Special      guifg=magenta   gui=none        ctermfg=magenta     cterm=none
-hi Identifier   guifg=green                     ctermfg=green       cterm=none
-hi Statement    guifg=white     gui=bold        ctermfg=grey        cterm=none
-hi PreProc      guifg=darkgreen gui=none        ctermfg=darkgreen   cterm=none
-hi type         guifg=grey      gui=bold        ctermfg=grey    cterm=none
-hi Underlined                   gui=underline               cterm=none
-hi Ignore                       gui=reverse                 cterm=reverse
-
-
diff --git a/colors/tutticolori.vim b/colors/tutticolori.vim
deleted file mode 100755
index 5c35cb3..0000000
--- a/colors/tutticolori.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-" A VIM port of the Espresso tutti colori theme
-" http://macrabbit.com/espresso/
-"
-" Jon Raphaelson
-" lygaret@gmail.com
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name = "tutticolori"
-
-highlight Normal                    guifg=#000000 guibg=#ffffff
-highlight Cursor                    guifg=#000000 guibg=#cccecf
-highlight CursorLine                              guibg=#dbebff
-highlight Visual                                  guibg=#dbebff
-highlight Search                                  guibg=#fbe9ad
-
-highlight NonText                   guifg=#e2e8ef guibg=#fefeff 
-highlight MatchParen                              guibg=#d4e9fa
-
-highlight LineNr                    guifg=#aabbcc guibg=#f2f8ff 
-highlight FoldColumn                guifg=#aabbcc guibg=#f2f8ff 
-highlight Folded                    guifg=#667788 guibg=#f2f8ff
-
-highlight StatusLine                guifg=#888888 guibg=#ffffff
-highlight StatusLineNC              guifg=#bbbbbb guibg=#ffffff
-highlight VertSplit                 guifg=#888888 guibg=#ffffff
-
-highlight Comment                   guifg=#999999 guibg=#eeeeee gui=italic
-highlight Constant                  guifg=#d44950 guibg=NONE
-highlight Error                     guifg=#f9f2ce guibg=#f9323a
-highlight Identifier                guifg=#3a1d72 guibg=NONE              
-highlight Number                    guifg=#7653c1 guibg=#f3f2ff
-highlight PreProc                   guifg=#222222 guibg=#eeeeee
-highlight Special                   guifg=#2f6f9f guibg=NONE              
-highlight Statement                 guifg=#2f6f9f guibg=#f4faff gui=NONE
-highlight Type                      guifg=#699d36 guibg=NONE    gui=NONE
-highlight Title                     guifg=#000000 guibg=NONE    gui=NONE
-highlight Underlined                guifg=#2f4f6f guibg=NONE    gui=underline
-
-" html/css/javascript
-
-highlight htmlHead                                guibg=#ffffff
-highlight javaScript                guifg=#434343 guibg=#ffffff
diff --git a/colors/twilight.vim b/colors/twilight.vim
deleted file mode 100755
index f2ccdd3..0000000
--- a/colors/twilight.vim
+++ /dev/null
@@ -1,114 +0,0 @@
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "twilight"
-
-let s:grey_blue = '#8a9597'
-let s:light_grey_blue = '#a0a8b0'
-let s:dark_grey_blue = '#34383c'
-let s:mid_grey_blue = '#64686c'
-let s:beige = '#ceb67f'
-let s:light_orange = '#ebc471'
-let s:yellow = '#e3d796'
-let s:violet = '#a999ac'
-let s:green = '#a2a96f'
-let s:lightgreen = '#c2c98f'
-let s:red = '#d08356'
-let s:cyan = '#74dad9'
-let s:darkgrey = '#1a1a1a'
-let s:grey = '#303030'
-let s:lightgrey = '#605958'
-let s:white = '#fffedc'
-
-if version >= 700
-  hi CursorLine guibg=#262626
-  hi CursorColumn guibg=#262626
-  hi MatchParen guifg=white guibg=#80a090 gui=bold
-
-  "Tabpages
-  hi TabLine guifg=#a09998 guibg=#202020 gui=underline
-  hi TabLineFill guifg=#a09998 guibg=#202020 gui=underline
-  hi TabLineSel guifg=#a09998 guibg=#404850 gui=underline
-
-  "P-Menu (auto-completion)
-  hi Pmenu guifg=#605958 guibg=#303030 gui=underline
-  hi PmenuSel guifg=#a09998 guibg=#404040 gui=underline
-  "PmenuSbar
-  "PmenuThumb
-endif
-
-hi Visual guibg=#404040
-
-"hi Cursor guifg=NONE guibg=#586068
-hi Cursor guibg=#b0d0f0
-
-
-exe 'hi Normal         guifg='.s:white             .' guibg='.s:darkgrey
-exe 'hi Underlined     guifg='.s:white             .' guibg='.s:darkgrey        .' gui=underline'
-exe 'hi NonText        guifg='.s:lightgrey         .' guibg='.s:grey
-exe 'hi SpecialKey     guifg='.s:grey              .' guibg='.s:darkgrey
-
-exe 'hi LineNr         guifg='.s:mid_grey_blue     .' guibg='.s:dark_grey_blue  .' gui=none'
-exe 'hi StatusLine     guifg='.s:white             .' guibg='.s:grey            .' gui=italic,underline'
-exe 'hi StatusLineNC   guifg='.s:lightgrey         .' guibg='.s:grey            .' gui=italic,underline'
-exe 'hi VertSplit      guifg='.s:grey              .' guibg='.s:grey            .' gui=none'
-
-exe 'hi Folded         guifg='.s:grey_blue         .' guibg='.s:dark_grey_blue  .' gui=none'
-exe 'hi FoldColumn     guifg='.s:grey_blue         .' guibg='.s:dark_grey_blue  .' gui=none'
-exe 'hi SignColumn     guifg='.s:grey_blue         .' guibg='.s:dark_grey_blue  .' gui=none'
-
-exe 'hi Comment        guifg='.s:mid_grey_blue     .' guibg='.s:darkgrey        .' gui=italic'
-exe 'hi TODO           guifg='.s:grey_blue         .' guibg='.s:darkgrey        .' gui=italic,bold'
-
-exe 'hi Title          guifg='.s:red               .' guibg='.s:darkgrey        .' gui=underline'
-
-exe 'hi Constant       guifg='.s:red               .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi String         guifg='.s:green             .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Special        guifg='.s:lightgreen        .' guibg='.s:darkgrey        .' gui=none'
-
-exe 'hi Identifier     guifg='.s:grey_blue         .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Statement      guifg='.s:beige             .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Conditional    guifg='.s:beige             .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Repeat         guifg='.s:beige             .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Structure      guifg='.s:beige             .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Function       guifg='.s:violet            .' guibg='.s:darkgrey        .' gui=none'
-
-exe 'hi PreProc        guifg='.s:grey_blue         .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Operator       guifg='.s:light_orange      .' guibg='.s:darkgrey        .' gui=none'
-exe 'hi Type           guifg='.s:yellow            .' guibg='.s:darkgrey        .' gui=italic'
-
-"hi Identifier guifg=#7587a6
-" Type d: 'class'
-"hi Structure guifg=#9B859D gui=underline
-"hi Function guifg=#dad085
-" dylan: method, library, ... d: if, return, ...
-"hi Statement guifg=#7187a1 gui=NONE
-" Keywords  d: import, module...
-"hi PreProc guifg=#8fbfdc
-"gui=underline
-"hi Operator guifg=#a07020
-"hi Repeat guifg=#906040 gui=underline
-"hi Type guifg=#708090
-
-"hi Type guifg=#f9ee98 gui=NONE
-
-"hi NonText guifg=#808080 guibg=#303030
-
-"hi Macro guifg=#a0b0c0 gui=underline
-
-"Tabs, trailing spaces, etc (lcs)
-"hi SpecialKey guifg=#808080 guibg=#343434
-
-"hi TooLong guibg=#ff0000 guifg=#f8f8f8
-
-hi Search guifg=#606000 guibg=#c0c000 gui=bold
-
-hi Directory guifg=#dad085 gui=NONE
-hi Error guibg=#602020
-
diff --git a/colors/twilight256.vim b/colors/twilight256.vim
deleted file mode 100755
index 41302e9..0000000
--- a/colors/twilight256.vim
+++ /dev/null
@@ -1,300 +0,0 @@
-" twilight256 color scheme file
-" Maintainer: Neal Milstein - neal dot milstein at gmail dot com
-" Last Change: 2011 Feb 1
-"
-" This theme copies the colors from the TextMate theme Twilight.
-"
-" The theme is designed to be used on a black background. I only tested it
-" using a 256-color terminal; I do not think it will work on much else (gvim,
-" 8-color terminal, etc.).
-"
-" The functions in this theme that convert hex color codes to the nearest
-" xterm-256 color number are from the theme desert2 (desert256), developed by Henry So, Jr. 
-"
-" The colors of this theme are based on the TextMate Twilight theme
-" – www.macromates.com
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-let g:colors_name="twilight256"
-
-if has("gui_running") || &t_Co == 88 || &t_Co == 256
-    " functions {{{
-    " returns an approximate grey index for the given grey level
-    fun <SID>grey_number(x)
-        if &t_Co == 88
-            if a:x < 23
-                return 0
-            elseif a:x < 69
-                return 1
-            elseif a:x < 103
-                return 2
-            elseif a:x < 127
-                return 3
-            elseif a:x < 150
-                return 4
-            elseif a:x < 173
-                return 5
-            elseif a:x < 196
-                return 6
-            elseif a:x < 219
-                return 7
-            elseif a:x < 243
-                return 8
-            else
-                return 9
-            endif
-        else
-            if a:x < 14
-                return 0
-            else
-                let l:n = (a:x - 8) / 10
-                let l:m = (a:x - 8) % 10
-                if l:m < 5
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual grey level represented by the grey index
-    fun <SID>grey_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 46
-            elseif a:n == 2
-                return 92
-            elseif a:n == 3
-                return 115
-            elseif a:n == 4
-                return 139
-            elseif a:n == 5
-                return 162
-            elseif a:n == 6
-                return 185
-            elseif a:n == 7
-                return 208
-            elseif a:n == 8
-                return 231
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 8 + (a:n * 10)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given grey index
-    fun <SID>grey_color(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 16
-            elseif a:n == 9
-                return 79
-            else
-                return 79 + a:n
-            endif
-        else
-            if a:n == 0
-                return 16
-            elseif a:n == 25
-                return 231
-            else
-                return 231 + a:n
-            endif
-        endif
-    endfun
-
-    " returns an approximate color index for the given color level
-    fun <SID>rgb_number(x)
-        if &t_Co == 88
-            if a:x < 69
-                return 0
-            elseif a:x < 172
-                return 1
-            elseif a:x < 230
-                return 2
-            else
-                return 3
-            endif
-        else
-            if a:x < 75
-                return 0
-            else
-                let l:n = (a:x - 55) / 40
-                let l:m = (a:x - 55) % 40
-                if l:m < 20
-                    return l:n
-                else
-                    return l:n + 1
-                endif
-            endif
-        endif
-    endfun
-
-    " returns the actual color level for the given color index
-    fun <SID>rgb_level(n)
-        if &t_Co == 88
-            if a:n == 0
-                return 0
-            elseif a:n == 1
-                return 139
-            elseif a:n == 2
-                return 205
-            else
-                return 255
-            endif
-        else
-            if a:n == 0
-                return 0
-            else
-                return 55 + (a:n * 40)
-            endif
-        endif
-    endfun
-
-    " returns the palette index for the given R/G/B color indices
-    fun <SID>rgb_color(x, y, z)
-        if &t_Co == 88
-            return 16 + (a:x * 16) + (a:y * 4) + a:z
-        else
-            return 16 + (a:x * 36) + (a:y * 6) + a:z
-        endif
-    endfun
-
-    " returns the palette index to approximate the given R/G/B color levels
-    fun <SID>color(r, g, b)
-        " get the closest grey
-        let l:gx = <SID>grey_number(a:r)
-        let l:gy = <SID>grey_number(a:g)
-        let l:gz = <SID>grey_number(a:b)
-
-        " get the closest color
-        let l:x = <SID>rgb_number(a:r)
-        let l:y = <SID>rgb_number(a:g)
-        let l:z = <SID>rgb_number(a:b)
-
-        if l:gx == l:gy && l:gy == l:gz
-            " there are two possibilities
-            let l:dgr = <SID>grey_level(l:gx) - a:r
-            let l:dgg = <SID>grey_level(l:gy) - a:g
-            let l:dgb = <SID>grey_level(l:gz) - a:b
-            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-            let l:dr = <SID>rgb_level(l:gx) - a:r
-            let l:dg = <SID>rgb_level(l:gy) - a:g
-            let l:db = <SID>rgb_level(l:gz) - a:b
-            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-            if l:dgrey < l:drgb
-                " use the grey
-                return <SID>grey_color(l:gx)
-            else
-                " use the color
-                return <SID>rgb_color(l:x, l:y, l:z)
-            endif
-        else
-            " only one possibility
-            return <SID>rgb_color(l:x, l:y, l:z)
-        endif
-    endfun
-
-    " returns the palette index to approximate the 'rrggbb' hex string
-    fun <SID>rgb(rgb)
-        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-
-        return <SID>color(l:r, l:g, l:b)
-    endfun
-
-    " sets the highlighting for the given group
-    fun <SID>X(group, fg, bg, attr)
-        if a:fg != ""
-            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
-        endif
-        if a:bg != ""
-            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
-        endif
-        if a:attr != ""
-            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
-        endif
-    endfun
-    " }}}
-
-    call <SID>X("Normal", "ffffff", "", "")
-
-    " highlight groups
-    "call <SID>X("Cursor", "708090", "f0e68c", "")
-    "CursorIM
-    "Directory
-    "DiffAdd
-    "DiffChange
-    "DiffDelete
-    "DiffText
-    "ErrorMsg
-    "call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
-    "call <SID>X("Folded", "ffd700", "4d4d4d", "")
-    "call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
-    "call <SID>X("IncSearch", "708090", "f0e68c", "")
-    call <SID>X("LineNr", "CCCCCC", "", "")
-    "call <SID>X("ModeMsg", "D4D4D4", "", "")
-    "call <SID>X("MoreMsg", "2e8b57", "", "")
-    "call <SID>X("NonText", "addbe7", "000000", "bold")
-    "call <SID>X("Question", "00ff7f", "", "")
-    "call <SID>X("Search", "f5deb3", "cd853f", "")
-    "call <SID>X("SpecialKey", "9acd32", "", "")
-    "call <SID>X("StatusLine", "c2bfa5", "000000", "reverse")
-    "call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse")
-    "call <SID>X("Title", "cd5c5c", "", "")
-    call <SID>X("Visual", "D3D3D3", "3E3E3E", "reverse")
-    "VisualNOS
-    "call <SID>X("WarningMsg", "fa8072", "", "")
-    "WildMenu
-    "Menu
-    "Scrollbar
-    "Tooltip
-
-    " syntax highlighting groups
-    call <SID>X("Comment", "828282", "", "")
-    call <SID>X("Constant", "CF6A4C", "", "")
-    call <SID>X("Identifier", "7587A6", "", "none")
-    call <SID>X("Function", "9B703F", "", "")
-    call <SID>X("Define", "CDA869", "", "none")
-    call <SID>X("Statement", "CDA869", "", "")
-    call <SID>X("String", "8F9D6A", "", "")
-    call <SID>X("PreProc", "AFC4DB", "", "")
-    call <SID>X("Type", "F9EE98", "", "")
-    call <SID>X("Special", "DAEFA3", "", "")
-    "Underlined
-    call <SID>X("Ignore", "666666", "", "")
-    "Error
-    call <SID>X("Todo", "ff4500", "eeee00", "")
-
-    " delete functions {{{
-    delf <SID>X
-    delf <SID>rgb
-    delf <SID>color
-    delf <SID>rgb_color
-    delf <SID>rgb_level
-    delf <SID>rgb_number
-    delf <SID>grey_color
-    delf <SID>grey_level
-    delf <SID>grey_number
-    " }}}
-endif
-
-" vim: set fdl=0 fdm=marker:
diff --git a/colors/two2tango.vim b/colors/two2tango.vim
deleted file mode 100755
index 5a8f951..0000000
--- a/colors/two2tango.vim
+++ /dev/null
@@ -1,104 +0,0 @@
-" Vim color file
-" Name: two2tango
-" Maintainer: Erik Falor <ewfalor@gmail.com>
-" Version: 1.2
-" Date: Tue 05/25/2010 
-"
-" History:
-" 1.2 - Thanks to Max Battcher for his suggestion for VisualNOS highlighting.
-" Added styling for non-GUI tabline elements.
-"
-" 1.1 - Big props to Panos Laganakos <panos.laganakos@gmail.com> for the
-" original darktango.vim colorscheme upon which this scheme is based.
-
-set background=dark
-if version > 580
-	" no guarantees for version 5.8 and below, but this makes it stop
-	" complaining
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let g:colors_name="two2tango"
-
-"Tango palette
-"http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines-" {{{
-let s:Butter		= ['#fce94f', '#edd400', '#c4a000']
-let s:Chameleon		= ['#8ae234', '#73d216', '#4e9a06']
-let s:Orange		= ['#fcaf3e', '#f57900', '#ce5c00']
-let s:SkyBlue		= ['#729fcf', '#3465a4', '#204a87']
-let s:Plum			= ['#ad7fa8', '#75507b', '#5c3566']
-let s:Chocolate		= ['#e9b96e', '#c17d11', '#8f5902']
-let s:ScarletRed	= ['#ef2929', '#cc0000', '#a40000']
-let s:Aluminium		= ['#eeeeec', '#d3d7cf', '#babdb6',
-					\'#888a85', '#555753', '#2e3436']
-"This color isn't part of the Tango Palette; I use it because there
-"isn't a Tango color that provides enough contrast
-let s:Background    = '#212628'
-" }}}
-
-execute "hi Normal      guibg=" . s:Aluminium[5]  . " guifg=" . s:Aluminium[1] 
-
-" {{{ syntax
-execute "hi Comment      gui=italic guifg=" . s:Aluminium[3]
-execute "hi Conditional  gui=bold guifg=" . s:Butter[2]
-execute "hi Constant     guifg=" . s:Chocolate[1]
-execute "hi Error        guifg=" . s:Aluminium[0] . " guibg=" . s:ScarletRed[2]
-execute "hi Identifier   guifg=" . s:Orange[2]
-execute "hi Ignore       guifg=" . s:Aluminium[5] . " guibg=" . s:Aluminium[5]
-execute "hi Operator     guifg=" . s:Butter[1]
-execute "hi PreProc      guifg=" . s:Chocolate[0]
-execute "hi Repeat       gui=bold guifg=" . s:Butter[2]
-execute "hi Special      guifg=" . s:SkyBlue[1]
-execute "hi Statement    guifg=" . s:Aluminium[3]
-execute "hi String       guifg=" . s:SkyBlue[0]
-execute "hi Title        guifg=" . s:Aluminium[0]
-execute "hi Todo         gui=bold guisp=NONE guibg=" . s:Orange[2] 
-			\. " guifg=" . s:Aluminium[0] 
-execute "hi Type         guifg=" . s:Orange[2]
-execute "hi Underlined   gui=underline guifg=" . s:SkyBlue[0]
-" }}}
-
-" {{{ groups
-execute "hi Cursor       guibg=" . s:ScarletRed[0] . " guifg=" . s:Aluminium[5]
-execute "hi CursorIM     guibg=" . s:Chameleon[0]  . " guifg=" . s:Aluminium[5]
-execute "hi CursorLine   guibg=" . s:Background
-execute "hi CursorColumn guibg=" . s:Background
-execute "hi Directory    guifg=" . s:SkyBlue[0]
-execute "hi ErrorMsg     guifg=" . s:Aluminium[0] . " guibg=" . s:ScarletRed[2]
-execute "hi FoldColumn   guibg=" . s:Aluminium[5] . " guifg=" . s:Aluminium[4]
-execute "hi Folded       guibg=" . s:Aluminium[4] . " guifg=" . s:Aluminium[2]
-execute "hi IncSearch    gui=none guibg=" . s:Butter[0] . " guifg=" . s:Butter[2] 
-execute "hi LineNr       guibg=" . s:Aluminium[5] . " guifg=" . s:Aluminium[4]
-execute "hi MatchParen   guibg=" . s:Aluminium[2] . " guifg=" . s:Aluminium[5]
-execute "hi ModeMsg      guifg=" . s:Orange[2]
-execute "hi MoreMsg      guifg=" . s:Orange[2]
-execute "hi NonText      guibg=" . s:Aluminium[5] . " guifg=" . s:Aluminium[4]
-execute "hi Pmenu        guibg=" . s:Aluminium[2] . " guifg=" . s:Aluminium[4]
-execute "hi PmenuSel     guibg=" . s:Aluminium[0] . " guifg=" . s:Aluminium[5]
-execute "hi Question     guifg=" . s:Plum[0] 
-execute "hi Search       guibg=" . s:Butter[0] . " guifg=" . s:Butter[2]
-execute "hi SpecialKey   guifg=" . s:Orange[2]
-execute "hi StatusLine   gui=none guibg=" . s:Orange[2] . " guifg=" . s:Aluminium[0]
-execute "hi StatusLineNC gui=none guibg=" . s:Aluminium[3] . " guifg=" . s:Aluminium[5]
-execute "hi TabLine     guibg=" . s:Aluminium[3] . " guifg=" . s:Aluminium[0]
-execute "hi TabLineFill guibg=" . s:Aluminium[0]
-execute "hi TabLineSel  guibg=" . s:Aluminium[5] . " guifg=" . s:Aluminium[0]
-execute "hi Tooltip      gui=none guibg=" . s:SkyBlue[0] . " guifg=" . s:Aluminium[0]
-execute "hi VertSplit    gui=none guibg=" . s:Aluminium[3] . " guifg=" . s:Aluminium[5]
-execute "hi Visual       guibg=" . s:Orange[0] . " guifg=" . s:Orange[2]
-hi VisualNOS   gui=none guibg=black
-execute "hi WarningMsg   guifg=" . s:Orange[0]
-execute "hi WildMenu     guifg=" . s:Butter[2] . " guibg=" . s:Butter[0]
-"hi Menu      TODO
-"hi Scrollbar TODO
-" }}}
-
-"  {{{ terminal
-" TODO
-" }}}
-
-" vim: sw=4 foldmethod=marker
diff --git a/colors/umber-green.vim b/colors/umber-green.vim
deleted file mode 100755
index d1743a1..0000000
--- a/colors/umber-green.vim
+++ /dev/null
@@ -1,89 +0,0 @@
-" Vim color file
-" Maintainer:   horrorvacui-at-gmx.net
-" Last Change:  today... oh yes, it's 16.9.03
-" URL:		
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-" your pick:
-set background=dark	" or light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="umber-green"
-
-"hi Normal
-
-" OR
-
-" highlight clear Normal
-" set background&
-" highlight clear
-" if &background == "light"
-"   highlight Error ...
-"   ...
-" else
-"   highlight Error ...
-"   ...
-" endif
-
-" A good way to see what your colorscheme does is to follow this procedure:
-" :w 
-" :so % 
-"
-" Then to see what the current setting is use the highlight command.  
-" For example,
-" 	:hi Cursor
-" gives
-"	Cursor         xxx guifg=bg guibg=fg 
- 	
-" Uncomment and complete the commands you want to change from the default.
-
-hi Cursor	guibg=#ffffff	
-"hi CursorIM	
-"hi Directory	
-"hi DiffAdd		
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-"hi ErrorMsg	
-"hi VertSplit	
-"hi Folded		
-"hi FoldColumn	
-"hi IncSearch	
-hi LineNr	guifg=#e2844d guibg=#000000
-"hi ModeMsg		
-"hi MoreMsg		
-"hi NonText		
-"hi Question	
-"hi Search		
-"hi SpecialKey	
-hi StatusLine	guifg=#ffffff
-hi StatusLineNC	guifg=#ffffff
-"hi Title		
-"hi Visual		
-"hi VisualNOS	
-"hi WarningMsg	
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Normal guifg=#eeaa11 guibg=#333333
-hi Comment guifg=#ff5555
-hi Constant	guifg=#eeaa11
-hi Identifier	guifg=#0000ff
-hi Statement	guifg=#77ee44
-hi PreProc	guifg=#ff0000
-hi Type		guifg=#eecc88
-hi Special	guifg=#ddffcc
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-"hi Todo		
-
diff --git a/colors/understated.vim b/colors/understated.vim
deleted file mode 100755
index 7c022c6..0000000
--- a/colors/understated.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-" High Def:     Color file for sensitive eyes.
-" Maintainer:   Adam Blinkinsop <blinks@acm.org>
-" Last Change:  2006 Feb 1
-" URL:		    http://blinkinblogs.net
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="understated"
-
-hi Normal       ctermfg=Grey ctermbg=Black guifg=Grey guibg=Black
-
-" internal coloring
-hi Cursor       ctermfg=Black ctermbg=White guifg=Black guibg=White
-hi CursorIM	    ctermfg=Black ctermbg=White guifg=Black guibg=White
-"hi Directory	
-hi DiffAdd		ctermbg=DarkGreen guibg=DarkGreen ctermfg=White guifg=White
-hi DiffChange	ctermbg=DarkYellow guibg=DarkYellow ctermfg=White guifg=White
-hi DiffDelete	ctermbg=DarkRed guibg=DarkRed ctermfg=White guifg=White
-hi DiffText	    ctermbg=DarkYellow guibg=DarkYellow ctermfg=White guifg=White
-hi ErrorMsg	    ctermbg=DarkRed guibg=DarkRed
-"hi VertSplit	
-"hi Folded		
-"hi FoldColumn	
-"hi IncSearch	
-"hi LineNr		
-"hi ModeMsg		
-"hi MoreMsg		
-"hi NonText		
-"hi Question	
-hi Search		ctermfg=White guifg=White ctermbg=DarkCyan guibg=DarkCyan
-"hi SpecialKey	
-hi StatusLine	ctermfg=Black guifg=Black ctermbg=Grey guibg=Grey
-hi StatusLineNC	ctermfg=Black guifg=Black ctermbg=Grey guibg=Grey
-"hi Title		
-hi Visual		ctermfg=DarkGrey guifg=DarkGrey ctermbg=White guibg=White
-hi VisualNOS    ctermfg=DarkGrey guifg=DarkGrey ctermbg=White guibg=White	
-"hi WarningMsg	
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" language general coloring
-hi Comment      ctermfg=DarkGrey guifg=DarkGrey
-hi Constant	    ctermfg=White guifg=White cterm=underline gui=underline
-hi Identifier   ctermfg=DarkCyan guifg=DarkCyan cterm=bold gui=bold
-hi Statement	ctermfg=DarkGreen guifg=DarkGreen cterm=bold gui=bold
-hi PreProc	    ctermfg=DarkGreen guifg=DarkGreen cterm=underline gui=underline
-hi Type	    	ctermfg=DarkCyan guifg=DarkCyan cterm=underline gui=underline
-hi Special	    ctermfg=DarkYellow guifg=DarkYellow
-hi Underlined	ctermfg=White guifg=White cterm=underline gui=underline
-hi Ignore		ctermfg=DarkGrey guifg=DarkGrey cterm=bold gui=bold
-hi Error		ctermbg=DarkRed guibg=DarkRed
-hi Todo	    	ctermfg=Black guifg=Black ctermbg=DarkYellow guibg=DarkYellow
-
diff --git a/colors/underwater-mod.vim b/colors/underwater-mod.vim
deleted file mode 100755
index cfccd57..0000000
--- a/colors/underwater-mod.vim
+++ /dev/null
@@ -1,150 +0,0 @@
-" Maintainer: Mario Gutierrez (mario@mgutz.com)
-" Original Theme: Dmitry Kichenko (dmitrykichenko@gmail.com)
-" Last Change: Dec 28, 2010
-" Version: 0.3
-
-let colors_name = "underwater-mod"
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-    syntax reset
-endif
-
-
-if version >= 700
-    hi CursorLine       guibg=#18374F
-    hi CursorColumn     guibg=#18374F
-    hi MatchParen       guifg=magenta   guibg=bg        gui=bold
-    hi Pmenu 		guifg=#dfeff6   guibg=#1E415E
-    hi PmenuSel 	guifg=#dfeff6   guibg=#2D7889
-
-    hi IncSearch        guifg=bg        guibg=#AF81F4   gui=bold
-    hi Search           guifg=bg        guibg=#AF81F4   gui=none
-endif
-
-"""""""" General colors
-
-hi Cursor 		guifg=black     guibg=#55A096   gui=none
-hi Folded 		guifg=#68CEE8   guibg=#1A3951   gui=none
-hi FoldColumn           guifg=#1E415E   guibg=#1A3951   gui=none
-hi LineNr 		guifg=#1c3249   guibg=bg        gui=none
-hi Normal 		guifg=#e3f3fa   guibg=#102235   gui=none
-hi NonText 		guifg=#1c3249   guibg=bg        gui=none
-hi StatusLine 	        guifg=#ffec99   guibg=#0a1721   gui=none
-hi StatusLineNC         guifg=#4e6f91   guibg=#0a1721   gui=none
-hi TabLine              guifg=#555555   guibg=#dddddd   gui=none
-hi TabLineSel           guifg=#101010   guibg=#b0b0b0   gui=none
-hi TabLineFill 		guifg=fg        guibg=#dddddd   gui=none
-hi Title 		guifg=#ef7760   guibg=bg        gui=none
-hi VertSplit 	        guifg=#0a1721   guibg=#0a1721   gui=none
- " Selected text color
-hi Visual		guifg=#dfeff6   guibg=#24557A   gui=none
-
-hi ErrorMsg             guifg=fg        guibg=#C62626
-hi WarningMsg           guifg=#C62626   guibg=bg
-
-
-
-"""""""" Syntax highlighting
-
-hi Comment 		guifg=#4e6f91   guibg=bg        gui=italic
-hi Constant 	        guifg=#ffc287   guibg=bg        gui=none
-hi Function 	        guifg=#AF81F4   guibg=bg        gui=none
-hi Identifier 	        guifg=#889ce8   guibg=bg        gui=none
-hi Ignore 		guifg=bg        guibg=bg        gui=none
-hi link Number	        Constant	
-hi PreProc 		guifg=#ef7760   guibg=bg        gui=none
-hi Keyword		guifg=#8ac6f2   guibg=bg        gui=none
-hi Special		guifg=#b9e19d   guibg=bg        gui=none
-hi Statement 	        guifg=#68CEE8   guibg=bg        gui=none
-hi String 		guifg=#89e14b   guibg=bg        gui=italic
-hi Todo 		guifg=#ADED80   guibg=bg        gui=bold
-hi Type 		guifg=#5ba0eb   guibg=bg        gui=none
-hi Underlined 	        guifg=#8ac6f2   guibg=bg        gui=underline
-
-
-"""""""" Coffee
-
-hi link coffeeInterpolation     Special
-
-
-"""""""" ERB
-
-hi link erubyDelimiter          PreProc 
-
-
-"""""""" HAML
-
-hi link hamlAttributes          htmlArg
-hi link hamlTag                 htmlTag 
-hi link hamlTagName             htmlTagName 
-hi link hamlIdChar              hamlId
-hi link hamlClassChar           hamlClass
-hi link hamlInterpolation       Special 
-
-
-"""""""" HTML
-
-hi link htmlTag                 Statement
-hi link htmlEndTag              Statement
-hi link htmlTagName             Statement 
-hi link htmlSpecialChar         Constant
-
-
-"""""""" JavaScript
-
-hi link javaScriptFunction      Function
-hi link javaScriptDocSeeTag     Underlined 
-
-
-"""""""" Markdown - tpope's
-
-hi link markdownCodeBlock           Statement
-hi link markdownCode                Statement 
-hi link markdownCodeDelimiter       Statement
-hi link markdownHeadingDelimiter    Title
-hi link markdownLinkText 	    Underlined 
-hi link markdownLinkTextDelimiter   Comment 
-hi link markdownLinkDelimiter       Comment
-hi link markdownListMarker          Constant
-hi link markdownUrl                 Comment
-
-
-"""""""" NERDTree
-
-hi link treeClosable            PreProc
-hi link treeDir                 Statement 
-hi link treeDirSlash            NonText 
-hi link treeExecFile            Type
-hi      treeFlag                guifg=#3e71a1 guibg=bg gui=none
-hi link treeHelp                Comment
-hi link treeLink                Type
-hi link treePart                NonText 
-hi link treePartFile            NonText 
-hi link treeOpenable            treeClosable
-hi link treeUp                  treeClosable 
-
-
-"""""""" Ruby
-
-hi rubyAccess                       guifg=#ef7760 guibg=bg gui=italic
-hi link rubyBlockParameter          Normal
-hi link rubyInterpolation           Special 
-hi link rubyInterpolationDelimiter  Special 
-hi link rubyStringDelimiter         String
-
-
-"""""""" SH
-
-hi link shQuote                 String
-
-
-"""""""" XML
-
-hi link xmlEndTag               htmlEndTag
-hi link xmlTag                  htmlTag
-hi link xmlTagName              htmlTagName
-
-" vim: set sw=4 sts=4 et :
diff --git a/colors/underwater.vim b/colors/underwater.vim
deleted file mode 100755
index 0149c4e..0000000
--- a/colors/underwater.vim
+++ /dev/null
@@ -1,66 +0,0 @@
-" Maintainer: Dmitry Kichenko (dmitrykichenko@gmail.com)
-" Last Change:	February 20, 2009
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "underwater"
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  " highlights current line
-  hi CursorLine guibg=#18374F
-  " cursor's colour
-  hi CursorColumn guibg=#ffffff
-  hi MatchParen guifg=#ffffff guibg=#439ea9 gui=bold
-  hi Pmenu 		guifg=#dfeff6 guibg=#1E415E
-  hi PmenuSel 	guifg=#dfeff6 guibg=#2D7889
-
-  " Search
-  hi IncSearch  gui=BOLD      guifg=#E2DAEF   guibg=#AF81F4
-  hi Search     gui=NONE   guifg=#E2DAEF   guibg=#AF81F4
-endif
-
-" General colors
-hi Cursor 		guifg=NONE    guibg=#55A096 gui=none
-hi Normal 		guifg=#dfeff6 guibg=#102235 gui=none
- " e.g. tildes at the end of file
-hi NonText 		guifg=#96defa guibg=#122538 gui=none
-hi LineNr 		guifg=#2F577C guibg=#0C1926 gui=none
-hi StatusLine 	guifg=#96defa guibg=#0C1926 gui=italic
-hi StatusLineNC guifg=#68CEE8 guibg=#0C1926  gui=none
-hi VertSplit 	guifg=#1A3951 guibg=#1A3951 gui=none
-hi Folded 		guifg=#68CEE8 guibg=#1A3951 gui=none
-hi FoldColumn   guifg=#1E415E guibg=#1A3951 gui=none
-hi Title		guifg=#dfeff6 guibg=NONE	gui=bold
- " Selected text color
-hi Visual		guifg=#dfeff6 guibg=#24557A gui=none
-hi SpecialKey	guifg=#3e71a1 guibg=#102235 gui=none
-
-"
-" Syntax highlighting
-"
-hi Comment 		guifg=#3e71a1 gui=italic
-hi Todo 		guifg=#ADED80 guibg=#579929 gui=bold
-hi Constant 	guifg=#96defa gui=none
-hi String 		guifg=#89e14b gui=italic
- " names of variables in PHP
-hi Identifier 	guifg=#8ac6f2 gui=none
- " Function names as in python. currently purleish
-hi Function 	guifg=#AF81F4 gui=none
- " declarations of type, e.g. int blah
-hi Type 		guifg=#41B2EA gui=none
- " statement, such as 'hi' right here
-hi Statement 	guifg=#68CEE8 gui=none
-hi Keyword		guifg=#8ac6f2 gui=none
- "  specified preprocessed words (like bold, italic etc. above)
-hi PreProc 		guifg=#EF6145 gui=none
-hi Number		guifg=#96defa gui=none
-hi Special		guifg=#3e71a1 gui=none
-
-
diff --git a/colors/up.vim b/colors/up.vim
deleted file mode 100755
index 6568990..0000000
--- a/colors/up.vim
+++ /dev/null
@@ -1,191 +0,0 @@
-" Maintainer:   Sasha Koss
-" Version:      0.9
-" Last Change:  9 Dec 2010
-" Credits:      Vim color scheme "up" originaly based on BusyBee colorscheme create by Patrick J. Anderson
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "up"
-
-"————————————————+———————————————————————————————————————————————+———+———————————————————————————————————————————————"
-"                | GUI                                           |   | TERMINAL                                      "
-"      TYPE      +———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-"                | foreground    | background    |               |   | foreground    | background    |               "
-"————————————————+———————————————+———————————————+———————————————+———+———————————————+———————————————+———————————————"
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Guideline
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi Action          guifg=#FBDE2D   guibg=NONE      gui=NONE             ctermfg=NONE    ctermbg=NONE    cterm=NONE
-hi Key             guifg=#FBDE2D   guibg=NONE      gui=NONE             ctermfg=NONE    ctermbg=NONE    cterm=NONE
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Interface                                                                                                          "
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi CursorLine      guifg=NONE      guibg=#202020                                       ctermbg=234     cterm=NONE
-hi CursorColumn    guifg=NONE      guibg=#202020                                       ctermbg=234     cterm=NONE
-hi MatchParen      guifg=#d0ffc0   guibg=#202020   gui=bold            ctermfg=157     ctermbg=237     cterm=bold
-hi Pmenu           guifg=#ffffff   guibg=#444444                       ctermfg=255     ctermbg=238     cterm=NONE
-hi PmenuSel        guifg=#000000   guibg=#b1d631                       ctermfg=0       ctermbg=148     cterm=NONE
-hi PmenuSbar       guifg=#000000   guibg=#808080                       ctermfg=0       ctermbg=148     cterm=NONE
-hi PmenuThumb      guifg=#ffffff   guibg=#000000                       ctermfg=0       ctermbg=148     cterm=NONE
-
-hi Normal          guifg=#e2e2e5   guibg=#1B1B1B   gui=none            ctermfg=253     ctermbg=234     cterm=NONE
-hi NonText         guifg=#333333   guibg=#232323   gui=none            ctermfg=244     ctermbg=235     cterm=NONE
-
-hi LineNr          guifg=#707070   guibg=#3E3E3E   gui=none            ctermfg=244     ctermbg=232     cterm=NONE
-
-hi StatusLine      guifg=#0e0e0e   guibg=#fe9e21   gui=none            ctermfg=253     ctermbg=238     cterm=NONE
-hi StatusLineNC    guifg=#f0f6e6   guibg=#68774f   gui=none            ctermfg=246     ctermbg=238     cterm=NONE
-hi VertSplit       guifg=#828282   guibg=#828282   gui=none            ctermfg=238     ctermbg=238     cterm=NONE
-hi Folded          guifg=#a0a8b0   guibg=#384048   gui=none            ctermfg=248     ctermbg=4       cterm=NONE
-hi Title           guifg=#f6f3e8   guibg=NONE	     gui=bold            ctermfg=254                     cterm=bold
-hi Visual          guifg=#faf4c6   guibg=#3c414c   gui=none            ctermfg=254     ctermbg=4       cterm=NONE
-hi SpecialKey      guifg=#808080   guibg=#343434   gui=none            ctermfg=244     ctermbg=236     cterm=NONE
-
-hi Cursor          guifg=#000000   guibg=#DEFF8E   gui=none            ctermbg=241     ctermbg=NONE    cterm=NONE
-hi CursorLine                      guibg=#3c3c3c
-
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" VimL related colors
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link vimGroup Action
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Colorscheme related colors
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link vimHiGroup Action
-hi vimHiGuiRgb     guifg=#ABB78D   guibg=NONE      gui=NONE             ctermfg=NONE    ctermbg=NONE    cterm=NONE
-
-" 7.3 features
-
-hi ColorColumn     guifg=NONE      guibg=#323232   gui=NONE             ctermfg=NONE    ctermbg=NONE    cterm=NONE
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Basic code highlight
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi Comment         guifg=#605A4E                   gui=italic          ctermfg=244
-hi SpecialComment  guifg=#FAF4C6                   gui=NONE            ctermfg=244
-hi Todo            guifg=#8f8f8f                   gui=NONE            ctermfg=245
-hi Boolean         guifg=#b1d631                   gui=NONE            ctermfg=148
-hi Identifier      guifg=#b1d631                   gui=NONE            ctermfg=148
-hi Function        guifg=#B7EF52                   gui=NONE            ctermfg=255
-hi Type            guifg=#81C7FF                   gui=NONE            ctermfg=103
-hi Typedef         guifg=#7AFFFD                   gui=NONE            ctermfg=103
-hi StorageClass    guifg=#7AFFFD                   gui=NONE            ctermfg=103
-hi Statement       guifg=#7AFFFD                   gui=NONE            ctermfg=103
-hi Keyword         guifg=#ff9800                   gui=NONE            ctermfg=208
-hi Constant        guifg=#14F2E7                   gui=NONE            ctermfg=208
-hi Number          guifg=#FEFFD5                   gui=NONE            ctermfg=208
-hi Special         guifg=#ff9800                   gui=NONE            ctermfg=208
-hi PreProc         guifg=#faf4c6                   gui=NONE            ctermfg=230
-hi Define          guifg=#7AFFFD                   gui=NONE            ctermfg=230
-
-hi String          guifg=#8cd9a2   guibg=NONE      gui=NONE            ctermfg=148
-hi Character       guifg=#22ff00   guibg=NONE      gui=NONE            ctermfg=148
-hi SpecialChar     guifg=#22ff44   guibg=NONE      gui=bold            ctermfg=148
-hi Delimiter       guifg=#ff9800   guibg=NONE      gui=NONE            ctermfg=148
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" NERDTree highlight
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi Directory       guifg=#4784AA
-hi treeCWD         guifg=#BBE7FB
-
-hi treeDirSlash    guifg=#4D4D4D
-hi treePart        guifg=#919191
-
-hi treeUp          guifg=#4D4D4D
-
-hi treeHelp        guifg=#4D4D4D
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" SQL
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link sqlOperator Special
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Java
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-" nth special
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" Ruby
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link rubyFunction Action
-hi link rubyStringEscape SpecialChar
-
-hi rubyLocalVariableOrMethod guifg=#F5F0C7
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" HTML
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi def link javaScript Normal
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" HAML
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link hamlTag       htmlTagName
-
-hi link hamlClass     Action
-hi link hamlClassChar hamlClass
-
-hi hamlId         guifg=#9FDC42
-hi link hamlIdChar    hamlId
-
-
-hi hamlRubyChar guifg=#C86161
-hi link hamlInterpolationDelimiter hamlRubyChar
-
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" CSS
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link cssTagName    htmlTagName
-hi link cssClassName  hamlClass
-hi link cssInentifier hamlId
-hi cssBoxProp  guifg=#9BA789
-hi link cssColorProp cssBoxProp
-hi link cssRenderProp cssBoxProp
-hi link cssFontProp cssBoxProp
-hi link cssTextProp cssBoxProp
-
-hi cssImportant guifg=#E8D1D1
-
-hi cssUIAttr   guifg=#F5F0C7
-hi link cssValueLength cssUIAttr
-hi link cssColor cssUIAttr
-hi link cssColorAttr cssUIAttr
-hi link cssCommonAttr cssUIAttr
-hi link cssTextAttr cssUIAttr
-hi link cssFontAttr cssUIAttr
-hi link cssRenderAttr cssUIAttr
-
-"hi cssBoxProp     guibg=#3E2A2A
-"hi cssColorProp   guibg=#403E31
-
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-" SASS
-"————————————————————————————————————————————————————————————————————————————————————————————————————————————————————"
-
-hi link sassClassChar cssClass
-hi link sassProperty  cssDefinition
diff --git a/colors/vanzan_color.vim b/colors/vanzan_color.vim
deleted file mode 100755
index 231d418..0000000
--- a/colors/vanzan_color.vim
+++ /dev/null
@@ -1,118 +0,0 @@
-
-set background=dark
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "vanzan_color"
-
-if version >= 700
-  hi CursorLine guibg=#1c281c
-  hi CursorColumn guibg=#101a2c
-  hi MatchParen guifg=white guibg=#747270 gui=bold
-
-  "Tabpages
-  hi TabLine guifg=black guibg=#b0b8c0 gui=italic
-  hi TabLineFill guifg=#9098a0
-  hi TabLineSel guifg=black guibg=#f0f0f0 gui=italic,bold
-
-  "P-Menu (auto-completion)
-  hi Pmenu guifg=white guibg=#a4a2a0
-  "PmenuSel
-  "PmenuSbar
-  "PmenuThumb
-endif
-"
-" Html-Titles
-hi Title      guifg=#f0f0f0 gui=bold
-hi Underlined  guifg=#b0b0b0 gui=underline
-
-
-hi Cursor    guifg=black   guibg=#b8b4b0
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#68727c guibg=#101a2c gui=italic
-
-"hi Normal    guifg=#b0b0b0   guibg=#181c20
-hi Normal    guifg=#b0b0b0   guibg=#080a0c
-
-hi StatusLine guifg=white guibg=#181a1c gui=bold
-hi StatusLineNC guifg=#909090 guibg=#383a3c gui=italic
-hi VertSplit guifg=#181a1c guibg=#181a1c gui=NONE
-
-" hi Folded    guifg=#708090 guibg=#c0d0e0
-hi Folded    guifg=#848280 guibg=#282a2c gui=none
-
-hi Visual    guibg=#102030
-
-hi NonText   guifg=#58626c guibg=#282c30
-" Kommentare
-hi Comment   guifg=#404a5c gui=none
-hi Todo      guifg=#404a5c guibg=NONE gui=italic,bold
-
-" Konstanten
-hi Constant  guifg=#808080 guibg=#282a2c  gui=none
-hi String    guifg=#a05050
-"guibg=#2c2428
-" Python: %(...)s - constructs, encoding, D: \n etc
-hi Special    guifg=#a05050 guibg=#201010 gui=NONE
-
-hi Number   guifg=#4a8057
-hi Float   guifg=#6aa077
-"hi Statement guifg=#0070e0 gui=NONE
-" Python: def and so on, html: tag-names
-"hi Statement  guifg=#607080 gui=bold
-
-" . D: debug, mixin, debug, scope, throw, Python: def
-"hi Statement   guifg=#907056 guibg=NONE gui=bold
-hi Statement   guifg=#506070 guibg=#081018 gui=underline
-" D: "case"
-hi Label guifg=#ff00ff
-hi Keyword guifg=#60a0b0
-hi Exception guifg=#d03000 guibg=#080a0c gui=bold
-
-hi Operator  guifg=#5070a0 gui=none
-" HTML: arguments
-"hi Type       guifg=#202020 gui=none
-hi Type        guifg=#909060 gui=none
-" Python: Standard exceptions, True&False, D: template
-hi Structure  guifg=#a07020  gui=underline
-" Python class names,  decorator names, function names
-hi Function    guifg=#d0a040 gui=italic,bold
-"gui=italic,underline
-
-hi Macro   guifg=#747270 gui=underline
-hi Directory   guifg=#949290 gui=none
-" case
-hi Label guifg=#708090 guibg=#202830
-
-" lua: require
-hi Identifier guifg=#5080a0 gui=none
-
-"hi Repeat      guifg=#54f250 gui=underline
-hi Repeat        guifg=#907040 gui=bold
-hi Conditional   guifg=#50a040 gui=bold
-
-" Cheetah: #-Symbol, function-names, D: import
-"hi PreProc    guifg=#434b56 guibg=#101418 gui=none
-hi PreProc   guifg=#706080 gui=none guibg=#181020
-" Cheetah: def, attr, for and so on, Python: Decorators
-hi Define      guifg=#9080a0 gui=italic guibg=#181020
-
-hi Error      guifg=#a02000 guibg=white gui=bold,underline
-
-hi Search     guifg=#e0d000 guibg=NONE gui=bold,underline
-
-" color of <TAB>s etc...  
-"hi SpecialKey guifg=#d8a080 guibg=#e8e8e8 gui=italic  
-hi SpecialKey guifg=#c4c2c0 guibg=#14181c gui=italic,bold  
-
-" Diff
-"hi Normal    guifg=#b0b0b0   guibg=#181c20
-hi DiffChange guifg=NONE guibg=#383c50 gui=italic
-hi DiffText guibg=#888c60 guifg=#e0d060 gui=none
-hi DiffAdd guifg=NONE guibg=#203030 gui=bold
-hi DiffDelete guifg=NONE guibg=#302020 gui=italic,bold
-
-
diff --git a/colors/vc.vim b/colors/vc.vim
deleted file mode 100755
index 53ecc22..0000000
--- a/colors/vc.vim
+++ /dev/null
@@ -1,24 +0,0 @@
-" Vim color file
-" Maintainer:   Vladimir Vrzic <random@bsd.org.yu>
-" Last Change:  28. june 2003.
-" URL:          http://galeb.etf.bg.ac.yu/~random/pub/vim/ 
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="vc"
-
-hi Comment		gui=NONE		guifg=SeaGreen		guibg=NONE
-hi Constant		gui=NONE		guifg=#004488 		guibg=NONE
-"hi Identifier	gui=NONE		guifg=Blue			guibg=NONE
-hi Statement 	gui=NONE		guifg=Blue			guibg=NONE
-hi PreProc		gui=NONE		guifg=Blue			guibg=NONE	
-hi Type			gui=NONE		guifg=Blue			guibg=NONE
-hi Special		gui=NONE		guifg=SteelBlue	guibg=NONE
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-"hi Todo		
-
diff --git a/colors/vcbc.vim b/colors/vcbc.vim
deleted file mode 100755
index 07777c3..0000000
--- a/colors/vcbc.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" Vim color file
-" Maintainer:	Rajas Sambhare <rajas dot sambhare squigglylittleA gmail dot com>
-" Last Change:	Nov 18, 2004
-" Version:		1.0
-" Based on the colors for Visual C++ 6.0 and Beyond Compare for diffs.
-" Inspired by vc.vim by Vladimir Vrzic
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="vcbc"
-
-hi Normal		cterm=NONE		ctermfg=Black		ctermbg=White		gui=NONE			guifg=NONE			guibg=NONE
-hi NonText		cterm=NONE		ctermfg=Black		ctermbg=Grey		gui=NONE			guifg=NONE			guibg=LightGrey
-hi LineNr		cterm=NONE		ctermfg=Black		ctermbg=LightGrey	gui=NONE			guifg=NONE			guibg=LightGrey
-hi Comment		cterm=NONE		ctermfg=DarkGreen	ctermbg=White		gui=italic			guifg=DarkGreen		guibg=NONE
-hi Constant		cterm=NONE		ctermfg=Red			ctermbg=White		gui=NONE			guifg=Red	 		guibg=NONE
-hi Identifier	cterm=NONE		ctermfg=LightBlue	ctermbg=White		gui=NONE			guifg=LightBlue		guibg=NONE
-hi Statement 	cterm=bold		ctermfg=Blue		ctermbg=White		gui=bold			guifg=Blue			guibg=NONE
-hi PreProc		cterm=NONE		ctermfg=DarkRed		ctermbg=White		gui=NONE			guifg=DarkRed		guibg=NONE	
-hi Type			cterm=NONE		ctermfg=Blue		ctermbg=White		gui=NONE			guifg=Blue			guibg=NONE
-hi Underlined	cterm=NONE		ctermfg=Black		ctermbg=White		gui=underline		guifg=NONE			guibg=NONE
-hi Error		cterm=NONE		ctermfg=Yellow		ctermbg=Red			gui=NONE			guifg=Yellow		guibg=Red
-hi Todo			cterm=NONE		ctermfg=Black		ctermbg=Yellow		gui=NONE			guifg=NONE			guibg=LightYellow
-"Diff colors
-hi DiffAdd		cterm=NONE		ctermfg=Red			ctermbg=LightGrey	gui=NONE			guifg=Red			guibg=#fff0f0
-hi DiffChange	cterm=NONE		ctermfg=Red			ctermbg=LightGrey	gui=NONE			guifg=Red			guibg=#fff0f0
-hi DiffText		cterm=NONE		ctermfg=White		ctermbg=DarkRed		gui=bold,italic		guifg=Red			guibg=#fff0f0
-hi DiffDelete	cterm=NONE		ctermfg=White		ctermbg=LightGrey	gui=NONE			guifg=DarkGrey		guibg=#f0f0f0
diff --git a/colors/vexorian.vim b/colors/vexorian.vim
deleted file mode 100755
index 0fd5aa9..0000000
--- a/colors/vexorian.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-" local syntax file - set colors on a per-machine basis:
-" vim: tw=0 ts=4 sw=4
-" Vim color file
-"
-" by Victor Hugo Soliz Kuncar
-" maintainer: Victor Hugo Soliz Kuncar
-" Last Change: 2004 July
-"
-
-
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "ColorSchemeCreator"  
-hi Normal		guifg=#000000 guibg=#FFFFFF  
-hi comment		guifg=#008800
-hi constant		guifg=#0000AA
-hi statement	guifg=#000000 gui=bold  
-hi preproc		guifg=#777777
-hi type			guifg=#0055AA gui=bold  
-hi special		guifg=#0000AA gui=bold
-hi String       guifg=#0000AA gui=italic
-hi Operator		guifg=#AA5500 gui=bold
-hi clear Visual 
-hi Visual		term=reverse cterm=reverse gui=reverse  
-hi Exception    guifg=#220000
-hi Boolean      guifg=#0000AA
-hi StorageClass guifg=#000000
-hi Define       guifg=#777777
-hi Include       guifg=#777777
-hi Number       guifg=#0000AA
-hi Float        guifg=#0000AA
-hi Function     guifg=#000000
-hi Conditional  guifg=#000000
-hi Statement    guifg=#000000
-hi SpecialChar  guifg=#AA5500 gui=italic
-hi Todo		    guifg=#008800
-hi Structure     guifg=#000000
-hi Identifier     guifg=#000000
-
diff --git a/colors/vibrantink.vim b/colors/vibrantink.vim
deleted file mode 100755
index 46aa23f..0000000
--- a/colors/vibrantink.vim
+++ /dev/null
@@ -1,68 +0,0 @@
-" Vim color scheme
-"
-" Name:         vibrantink.vim
-" Maintainer:   Jo Vermeulen <jo.vermeulen@gmail.com> 
-" Last Change:  5 Mar 2009 
-" License:      public domain
-" Version:      1.3
-"
-" This scheme should work in the GUI and in xterm's 256 color mode. It
-" won't work in 8/16 color terminals.
-"
-" I based it on John Lam's initial Vibrant Ink port to Vim [1]. Thanks
-" to a great tutorial [2], I was able to convert it to xterm 256 color
-" mode. And of course, credits go to Justin Palmer for creating the
-" original Vibrant Ink TextMate color scheme [3].
-"
-" [1] http://www.iunknown.com/articles/2006/09/04/vim-can-save-your-hands-too
-" [2] http://frexx.de/xterm-256-notes/
-" [3] http://encytemedia.com/blog/articles/2006/01/03/textmate-vibrant-ink-theme-and-prototype-bundle
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let g:colors_name = "vibrantink"
-
-if has("gui_running")
-    highlight Normal guifg=White   guibg=Black
-    highlight Cursor guifg=Black   guibg=Yellow
-    highlight Keyword guifg=#FF6600
-    highlight Define guifg=#FF6600
-    highlight Comment guifg=#9933CC
-    highlight Type guifg=White gui=NONE
-    highlight rubySymbol guifg=#339999 gui=NONE
-    highlight Identifier guifg=White gui=NONE
-    highlight rubyStringDelimiter guifg=#66FF00
-    highlight rubyInterpolation guifg=White
-    highlight rubyPseudoVariable guifg=#339999
-    highlight Constant guifg=#FFEE98
-    highlight Function guifg=#FFCC00 gui=NONE
-    highlight Include guifg=#FFCC00 gui=NONE
-    highlight Statement guifg=#FF6600 gui=NONE
-    highlight String guifg=#66FF00
-    highlight Search guibg=White
-    highlight CursorLine guibg=#323300
-else
-    set t_Co=256
-    highlight Normal ctermfg=White ctermbg=Black 
-    highlight Cursor ctermfg=Black ctermbg=Yellow 
-    highlight Keyword ctermfg=202 
-    highlight Define ctermfg=202 
-    highlight Comment ctermfg=98
-    highlight Type ctermfg=White 
-    highlight rubySymbol ctermfg=66 
-    highlight Identifier ctermfg=White 
-    highlight rubyStringDelimiter ctermfg=82 
-    highlight rubyInterpolation ctermfg=White 
-    highlight rubyPseudoVariable ctermfg=66 
-    highlight Constant ctermfg=228 
-    highlight Function ctermfg=220 
-    highlight Include ctermfg=220 
-    highlight Statement ctermfg=202
-    highlight String ctermfg=82 
-    highlight Search ctermbg=White 
-    highlight CursorLine cterm=NONE ctermbg=235
-endif
diff --git a/colors/vilight.vim b/colors/vilight.vim
deleted file mode 100755
index feaa894..0000000
--- a/colors/vilight.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-" rob.robb.ns
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="vilight"
-
-hi Normal         guifg=#b6b6b6           guibg=#212121
-hi Cursor         guifg=#212121           guibg=#9ca9b7
-hi CursorLine	  guifg=#ffffff		      guibg=#6c8095
-hi Directory      guifg=#6c8095            guibg=NONE
-hi VertSplit      guifg=#b6b6b6           guibg=#a6a6a6
-hi Folded         guifg=#424242           guibg=NONE     gui=italic
-hi FoldColumn	  guifg=#9ca9b7           guibg=NONE     gui=italic
-hi vimFold	      guifg=#dee4ea		      guibg=NONE     gui=italic
-hi IncSearch      guifg=#212121           guibg=#b6b6b6
-hi LineNr         guifg=#424242           guibg=NONE
-hi ModeMsg        guifg=#8f9d6a           guibg=NONE
-hi MoreMsg        guifg=#8f9d6a           guibg=NONE
-hi NonText        guifg=#424242           guibg=NONE
-hi Search         guifg=#212121           guibg=#b6b6b6     gui=underline
-hi StatusLine     guifg=#9ca9b7           guibg=#424242     
-hi StatusLineNC   guifg=#9ca9b7           guibg=#212121     
-hi Visual         guifg=#212121           guibg=#9ca9b7     gui=italic
-hi WildMenu       guifg=#6c8095           guibg=#ffffff
-hi MatchParen	  guifg=#ffffff		      guibg=#6c8095     gui=bold
-hi ErrorMsg	      guifg=#cf6a4c           guibg=NONE        gui=NONE
-hi WarningMsg	  guifg=#eedd82		      guibg=NONE        gui=NONE
-hi Title	      guifg=#cf6a4c		      guibg=NONE
-
-"Syntax hilight groups
-
-hi Comment        guifg=#424242           gui=italic
-hi Constant       guifg=#7587a6           gui=bold
-hi Exception      guifg=#cf6a4c           gui=NONE
-hi String         guifg=#8f9d6a           gui=NONE
-hi Variable       guifg=#7587a6           gui=NONE
-hi Number         guifg=#cf6a4c           gui=NONE
-hi Define         guifg=#7587a6           gui=NONE
-hi Boolean        guifg=#CF6A4C           gui=NONE
-hi Float          guifg=#cf6a4c           gui=NONE
-hi Identifier     guifg=#7587a6           gui=NONE
-hi Statement      guifg=#cda869           gui=NONE
-hi Keyword        guifg=#cda869           gui=NONE
-hi PreProc        guifg=#7587a6           gui=NONE
-hi Type           guifg=#9b859d		      gui=NONE		
-hi Typedef        guifg=#cda869           gui=NONE
-hi Special        guifg=#cda869           gui=NONE
-hi SpecialChar    guifg=#7587a6           gui=NONE
-hi SpecialComment guifg=#4f94cd           gui=NONE
-hi Ignore         guifg=#848484           gui=NONE
-hi Error          guifg=#cf6a4c           guibg=NONE         gui=underline
-hi Todo           guifg=#f9ee98		      guibg=NONE         gui=bold
-hi Pmenu          guifg=#212121           guibg=#9ca9b7
-hi PmenuSel       guifg=#ffffff           guibg=#6c8095
-hi PmenuSbar      guibg=#b6b6b6
-hi PmenuThumb     guifg=#424242
-
-"more groups
-hi pythonClass  guifg=#cda869 guibg=NONE gui=NONE
-hi pythonFunction  guifg=#CF6A4C guibg=NONE gui=NONE
-hi pythonInterpolationDelimiter  guifg=NONE guibg=NONE gui=NONE
-hi pythonSymbol  guifg=NONE guibg=NONE gui=NONE
-hi pythonBuiltin  guifg=#9ca9b7 guibg=NONE gui=NONE
-hi pythonInstanceVariable  guifg=NONE guibg=NONE gui=NONE
-hi pythonRequire  guifg=#8F9D6A guibg=NONE gui=NONE
-hi pythonGlobalVariable  guifg=NONE guibg=NONE gui=NONE
-hi pythonRegexp  guifg=#6c8095 guibg=NONE gui=NONE
-hi pythonRegexpDelimiter  guifg=NONE guibg=NONE gui=NONE
-hi pythonEscape  guifg=NONE guibg=NONE gui=NONE
-hi pythonControl  guifg=#4f94cd guibg=NONE gui=NONE
-hi pythonClassVariable  guifg=NONE guibg=NONE gui=NONE
-hi pythonOperator  guifg=NONE guibg=NONE gui=NONE
-hi pythonException  guifg=#cf6a4c guibg=NONE gui=NONE
-hi pythonPseudoVariable  guifg=NONE guibg=NONE gui=NONE
-hi makoDelimiter  guifg=NONE guibg=NONE gui=NONE
-hi makoComment  guifg=NONE guibg=NONE gui=NONE
-hi htmlTag  guifg=#cda869 guibg=NONE gui=NONE
-hi htmlEndTag  guifg=#cda869 guibg=NONE gui=NONE
-hi htmlTagName  guifg=#b6b6b6 guibg=NONE gui=NONE
-hi htmlArg  guifg=NONE guibg=NONE gui=NONE
-hi htmlSpecialChar  guifg=#cf6a4c guibg=NONE gui=NONE
-hi javaScriptFunction  guifg=#cf6a4c guibg=NONE gui=NONE
-hi javaScriptBraces  guifg=NONE guibg=NONE gui=NONE
-hi yamlKey  guifg=#4f94cd guibg=NONE gui=NONE
-hi yamlAnchor  guifg=NONE guibg=NONE gui=NONE
-hi yamlAlias  guifg=NONE guibg=NONE gui=NONE
-hi yamlDocumentHeader  guifg=#cda869 guibg=NONE gui=NONE
-hi cssURL  guifg=NONE guibg=NONE gui=NONE
-hi cssFunctionName  guifg=NONE guibg=NONE gui=NONE
-hi cssColor  guifg=NONE guibg=NONE gui=NONE
-hi cssPseudoClassId  guifg=#7587a6 guibg=NONE gui=NONE
-hi cssClassName  guifg=#cda869 guibg=NONE gui=NONE
-hi cssValueLength  guifg=NONE guibg=NONE gui=NONE
-hi cssCommonAttr  guifg=#cf6a4c guibg=NONE gui=NONE
-hi cssBraces  guifg=NONE guibg=NONE gui=NONE
-
-"diff
-
-hi DiffAdd        guifg=#8f9d6a          guibg=NONE
-hi DiffChange     guifg=#cda869          guibg=NONE
-hi DiffText       guifg=#b6b6b6          guibg=NONE
-hi DiffDelete     guifg=#cf6a4c          guibg=NONE
diff --git a/colors/vividchalk.vim b/colors/vividchalk.vim
deleted file mode 100755
index 638a8f4..0000000
--- a/colors/vividchalk.vim
+++ /dev/null
@@ -1,191 +0,0 @@
-" Vim color scheme
-" Name:         vividchalk.vim
-" Author:       Tim Pope <vimNOSPAM@tpope.info>
-" Version:      2.0
-" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim
-
-" Based on the Vibrank Ink theme for TextMate
-" Distributable under the same terms as Vim itself (see :help license)
-
-if has("gui_running")
-    set background=dark
-endif
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "vividchalk"
-
-" First two functions adapted from inkpot.vim
-
-" map a urxvt cube number to an xterm-256 cube number
-fun! s:M(a)
-    return strpart("0245", a:a, 1) + 0
-endfun
-
-" map a urxvt colour to an xterm-256 colour
-fun! s:X(a)
-    if &t_Co == 88
-        return a:a
-    else
-        if a:a == 8
-            return 237
-        elseif a:a < 16
-            return a:a
-        elseif a:a > 79
-            return 232 + (3 * (a:a - 80))
-        else
-            let l:b = a:a - 16
-            let l:x = l:b % 4
-            let l:y = (l:b / 4) % 4
-            let l:z = (l:b / 16)
-            return 16 + s:M(l:x) + (6 * s:M(l:y)) + (36 * s:M(l:z))
-        endif
-    endif
-endfun
-
-function! E2T(a)
-    return s:X(a:a)
-endfunction
-
-function! s:choose(mediocre,good)
-    if &t_Co != 88 && &t_Co != 256
-        return a:mediocre
-    else
-        return s:X(a:good)
-    endif
-endfunction
-
-function! s:hifg(group,guifg,first,second,...)
-    if a:0 && &t_Co == 256
-        let ctermfg = a:1
-    else
-        let ctermfg = s:choose(a:first,a:second)
-    endif
-    exe "highlight ".a:group." guifg=".a:guifg." ctermfg=".ctermfg
-endfunction
-
-function! s:hibg(group,guibg,first,second)
-    let ctermbg = s:choose(a:first,a:second)
-    exe "highlight ".a:group." guibg=".a:guibg." ctermbg=".ctermbg
-endfunction
-
-hi link railsMethod         PreProc
-hi link rubyDefine          Keyword
-hi link rubySymbol          Constant
-hi link rubyAccess          rubyMethod
-hi link rubyAttribute       rubyMethod
-hi link rubyEval            rubyMethod
-hi link rubyException       rubyMethod
-hi link rubyInclude         rubyMethod
-hi link rubyStringDelimiter rubyString
-hi link rubyRegexp          Regexp
-hi link rubyRegexpDelimiter rubyRegexp
-"hi link rubyConstant        Variable
-"hi link rubyGlobalVariable  Variable
-"hi link rubyClassVariable   Variable
-"hi link rubyInstanceVariable Variable
-hi link javascriptRegexpString  Regexp
-hi link javascriptNumber        Number
-hi link javascriptNull          Constant
-highlight link diffAdded        String
-highlight link diffRemoved      Statement
-highlight link diffLine         PreProc
-highlight link diffSubname      Comment
-
-call s:hifg("Normal","#EEEEEE","White",87)
-if &background == "light" || has("gui_running")
-    hi Normal guibg=Black ctermbg=Black
-else
-    hi Normal guibg=Black ctermbg=NONE
-endif
-highlight StatusLine    guifg=Black   guibg=#aabbee gui=bold ctermfg=Black ctermbg=White  cterm=bold
-highlight StatusLineNC  guifg=#444444 guibg=#aaaaaa gui=none ctermfg=Black ctermbg=Grey   cterm=none
-"if &t_Co == 256
-    "highlight StatusLine ctermbg=117
-"else
-    "highlight StatusLine ctermbg=43
-"endif
-
-highlight Ignore        ctermfg=Black
-highlight WildMenu      guifg=Black   guibg=#ffff00 gui=bold ctermfg=Black ctermbg=Yellow cterm=bold
-highlight Cursor        guifg=Black guibg=White ctermfg=Black ctermbg=White
-highlight CursorLine    guibg=#333333 guifg=NONE
-highlight CursorColumn  guibg=#333333 guifg=NONE
-highlight NonText       guifg=#404040 ctermfg=8
-highlight SpecialKey    guifg=#404040 ctermfg=8
-highlight Directory     none
-high link Directory     Identifier
-highlight ErrorMsg      guibg=Red ctermbg=DarkRed guifg=NONE ctermfg=NONE
-highlight Search        guifg=NONE ctermfg=NONE gui=none cterm=none
-call s:hibg("Search"    ,"#555555","DarkBlue",81)
-highlight IncSearch     guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight MoreMsg       guifg=#00AA00 ctermfg=Green
-highlight LineNr        guifg=#DDEEFF ctermfg=White
-call s:hibg("LineNr"    ,"#222222","DarkBlue",80)
-highlight Question      none
-high link Question      MoreMsg
-highlight Title         guifg=Magenta ctermfg=Magenta
-highlight VisualNOS     gui=none cterm=none
-call s:hibg("Visual"    ,"#555577","LightBlue",83)
-call s:hibg("VisualNOS" ,"#444444","DarkBlue",81)
-call s:hibg("MatchParen","#1100AA","DarkBlue",18)
-highlight WarningMsg    guifg=Red ctermfg=Red
-highlight Error         ctermbg=DarkRed
-highlight SpellBad      ctermbg=DarkRed
-" FIXME: Comments
-highlight SpellRare     ctermbg=DarkMagenta
-highlight SpellCap      ctermbg=DarkBlue
-highlight SpellLocal    ctermbg=DarkCyan
-
-call s:hibg("Folded"    ,"#110077","DarkBlue",17)
-call s:hifg("Folded"    ,"#aaddee","LightCyan",63)
-highlight FoldColumn    none
-high link FoldColumn    Folded
-highlight DiffAdd       ctermbg=4 guibg=DarkBlue
-highlight DiffChange    ctermbg=5 guibg=DarkMagenta
-highlight DiffDelete    ctermfg=12 ctermbg=6 gui=bold guifg=Blue guibg=DarkCyan
-highlight DiffText      ctermbg=DarkRed
-highlight DiffText      cterm=bold ctermbg=9 gui=bold guibg=Red
-
-highlight Pmenu         guifg=White ctermfg=White gui=bold cterm=bold
-highlight PmenuSel      guifg=White ctermfg=White gui=bold cterm=bold
-call s:hibg("Pmenu"     ,"#000099","Blue",18)
-call s:hibg("PmenuSel"  ,"#5555ff","DarkCyan",39)
-highlight PmenuSbar     guibg=Grey ctermbg=Grey
-highlight PmenuThumb    guibg=White ctermbg=White
-highlight TabLine       gui=underline cterm=underline
-call s:hifg("TabLine"   ,"#bbbbbb","LightGrey",85)
-call s:hibg("TabLine"   ,"#333333","DarkGrey",80)
-highlight TabLineSel    guifg=White guibg=Black ctermfg=White ctermbg=Black
-highlight TabLineFill   gui=underline cterm=underline
-call s:hifg("TabLineFill","#bbbbbb","LightGrey",85)
-call s:hibg("TabLineFill","#808080","Grey",83)
-
-hi Type gui=none
-hi Statement gui=none
-if !has("gui_mac")
-    " Mac GUI degrades italics to ugly underlining.
-    hi Comment gui=italic
-    hi railsUserClass  gui=italic
-    hi railsUserMethod gui=italic
-endif
-hi Identifier cterm=none
-" Commented numbers at the end are *old* 256 color values
-"highlight PreProc       guifg=#EDF8F9
-call s:hifg("Comment"        ,"#9933CC","DarkMagenta",34) " 92
-" 26 instead?
-call s:hifg("Constant"       ,"#339999","DarkCyan",21) " 30
-call s:hifg("rubyNumber"     ,"#CCFF33","Yellow",60) " 190
-call s:hifg("String"         ,"#66FF00","LightGreen",44,82) " 82
-call s:hifg("Identifier"     ,"#FFCC00","Yellow",72) " 220
-call s:hifg("Statement"      ,"#FF6600","Brown",68) " 202
-call s:hifg("PreProc"        ,"#AAFFFF","LightCyan",47) " 213
-call s:hifg("railsUserMethod","#AACCFF","LightCyan",27)
-call s:hifg("Type"           ,"#AAAA77","Grey",57) " 101
-call s:hifg("railsUserClass" ,"#AAAAAA","Grey",7) " 101
-call s:hifg("Special"        ,"#33AA00","DarkGreen",24) " 7
-call s:hifg("Regexp"         ,"#44B4CC","DarkCyan",21) " 74
-call s:hifg("rubyMethod"     ,"#DDE93D","Yellow",77) " 191
-"highlight railsMethod   guifg=#EE1122 ctermfg=1
diff --git a/colors/vj.vim b/colors/vj.vim
deleted file mode 100755
index ea0d3b4..0000000
--- a/colors/vj.vim
+++ /dev/null
@@ -1,379 +0,0 @@
-" Vim color file
-" Maintainer:   Vijayandra Singh <vsingh.usa@gmail.com>
-" Date:			$Date: 2006/20/7 $ 
-" Version: 		$Revision: 1.0 $
-" your pick:
-
-set background=dark	
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="vj"
-
-hi Normal guifg=slategray3 guibg=#000029 ctermfg=14
-
-"Toggle semicolon matching at the end of lines
-nmap <silent> <leader>; :call ToggleSemicolonHighlighting()<cr>
-"{{{
-function! ToggleSemicolonHighlighting()
-	if exists("b:semicolon")
-		unlet b:semicolon
-		hi semicolon guifg=NONE gui=NONE ctermfg=NONE
-	else
-		syn match semicolon #;$#
-		hi semicolon guifg=red3 gui=bold ctermfg=1
-		let b:semicolon = 1
-	endif
-endfunction
-"}}}
-
-hi Cursor guifg=bg guibg=fg ctermfg=0 ctermbg=11
-"hi CursorIM	
-hi Directory gui=bold
-hi DiffAdd guifg=yellow3 guibg=darkgreen ctermbg=0
-"hi DiffChange	
-"hi DiffDelete	
-"hi DiffText	
-hi ErrorMsg	guibg=red3 ctermfg=1
-"hi VertSplit	
-hi Folded guibg=#00001a ctermbg=4 guifg=yellow3 ctermfg=11 gui=NONE
-hi FoldColumn guibg=steelblue3 ctermbg=14 guifg=navyblue ctermfg=11 gui=bold
-"hi IncSearch	
-hi LineNr guifg=yellow3 ctermfg=11
-hi ModeMsg guifg=yellow3 gui=bold
-"hi MoreMsg		
-"hi NonText		
-"hi Question	
-hi Search guibg=yellow3 guifg=bg
-"hi SpecialKey	
-hi StatusLine guifg=steelblue3
-hi StatusLineNC guifg=steelblue4
-"hi Title		
-hi Visual guifg=fg guibg=bg
-"hi VisualNOS	
-"hi WarningMsg	
-"hi WildMenu	
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment guifg=chartreuse3 ctermfg=10
-hi Constant	guifg=plum3 gui=bold ctermfg=13
-hi String guifg=indianred3 ctermfg=5
-hi Character guifg=mediumpurple3 ctermfg=5
-hi Number guifg=turquoise3 ctermfg=5
-"hi Identifier	
-hi Statement guifg=khaki3 gui=bold ctermfg=15 cterm=underline
-hi PreProc guifg=firebrick3 gui=italic ctermfg=9
-hi Type	guifg=gold3 gui=bold ctermfg=3
-"hi Special	
-"hi Underlined	
-"hi Ignore		
-"hi Error		
-hi Todo guifg=yellow3 guibg=blue3 gui=bold
-
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-if &background == "dark"
-hi Normal       guifg=#a0b4e0 guibg=#11121a   "1a1823
-hi NonText      guifg=#382920 guibg=bg
-
-hi Folded       guibg=#232235 guifg=grey
-hi FoldColumn	guibg=#0a0a18 guifg=#dbcaa5
-hi LineNr       guibg=#101124 guifg=#206aa9 
-hi StatusLine	guibg=#354070 guifg=#6880ea gui=none
-hi StatusLineNC	guibg=#2c3054 guifg=#5c6dbe gui=none
-hi VertSplit	guibg=#22253c guifg=#223355  gui=none
-
-hi tablinesel   guibg=#515a71 guifg=#50aae5 gui=none
-hi tabline      guibg=#4d4d5f guifg=#5b7098 gui=none
-hi tablinefill  guibg=#2d2d3f guifg=#aaaaaa gui=none
-
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-
-hi MatchParen	guibg=#7b5a55 guifg=#001122
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-
-hi Comment		guifg=#349d58 guibg=bg
-hi Title	    guifg=#e5e5ca gui=none
-hi Underlined   guifg=#bac5ba gui=none
-
-hi Statement    guifg=#fca8ad gui=none "a080aa
-hi Type		    guifg=#0490e8  gui=bold
-hi Constant	    guifg=#5c78f0 "guibg=#111a2a
-hi Number       guifg=#4580b4 "guibg=#111a2a
-hi PreProc      guifg=#ba75cf
-hi Special	    guifg=#aaaaca
-hi Ignore       guifg=grey40
-hi Todo		    guifg=orangered guibg=yellow2
-hi Error        guibg=#b03452
-hi Function     guifg=#bab588 guibg=bg gui=bold 
-hi Identifier   guifg=#5094c4   
-"""""this section borrowed from OceanDeep/Midnight"""""
-highlight Conditional gui=None guifg=#d0688d guibg=bg
-highlight Repeat gui=None guifg=#e06070 guibg=bg
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#e8cdc0 guibg=bg
-highlight Keyword gui=bold guifg=grey guibg=bg
-highlight Exception gui=bold guifg=#d0a8ad guibg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-hi DiffText    guibg=#004335
-hi DiffChange   guibg=#685b5c
-hi DiffAdd      guibg=#0a4b8c
-hi DiffDelete   guifg=#300845 guibg=#200845
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cad5c0 guifg=#0000aa
-
-
-hi Search       guibg=darkyellow guifg=black
-hi IncSearch	guifg=#babeaa guibg=#3a4520 
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=#102030 guibg=#80a0f0
-hi VisualNOS    guifg=#201a30 guibg=#a3a5FF
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Cursor ctermfg=black ctermbg=white
-hi Normal ctermfg=grey ctermbg=black
-hi Number ctermfg=darkgreen
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=darkred
-highlight Repeat ctermfg=darkred
-hi Exception ctermfg=darkred
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=darkcyan ctermbg=black
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=yellow ctermbg=darkblue cterm=NONE
-hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=darkgrey cterm=NONE
-hi Title	ctermfg=yellow cterm=NONE
-hi Visual	ctermbg=grey ctermfg=blue cterm=NONE
-hi VisualNOS	ctermbg=grey ctermfg=blue cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgreen ctermbg=darkblue cterm=NONE
-hi FoldColumn	ctermfg=yellow ctermbg=black
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment		ctermfg=darkgreen ctermbg=black
-hi Identifier   ctermfg=cyan
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi function ctermfg=grey
-	hi Type		ctermfg=darkyellow ctermbg=darkblue
-	hi IncSearch	ctermfg=black ctermbg=grey cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkgrey cterm=NONE
-else
-	hi function ctermfg=white
-	hi Type		ctermfg=grey
-	hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Constant	ctermfg=darkcyan
-hi Special	ctermfg=white
-hi Statement	ctermfg=yellow
-hi PreProc	ctermfg=darkred
-hi Underlined	ctermfg=cyan cterm=NONE
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-hi tablinesel   ctermfg=cyan ctermbg=blue
-hi tabline      ctermfg=black ctermbg=blue
-hi tablinefill  ctermfg=green ctermbg=darkblue
-"vim: sw=4
-"
-hi MatchParen	ctermfg=black ctermbg=green
-
-
-elseif &background == "light"
-
-hi Normal       guifg=#003255 guibg=#e8ebf0 "greyish blue2
-hi NonText      guifg=#382920 guibg=#152555
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		guifg=#daddb8  guibg=#308ae5
-else
-	hi Comment		guifg=darkyellow  guibg=#207ada
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Title		guifg=#857540  gui=none
-hi Underlined   guifg=#8a758a  
-
-hi Statement    guifg=#da302a  gui=none
-hi Type			guifg=#307aca  gui=none
-hi Constant		guifg=#3a40aa  gui=none
-hi PreProc      guifg=#9570b5 
-hi Identifier   guifg=#856075  "gui=bold
-hi Special		guifg=#652a7a 
-hi Ignore       guifg=grey40
-hi Todo			guifg=orangered guibg=yellow2
-hi Error        guibg=#b03452
-"""""this section borrowed from OceanDeep/Midnight"""""
-hi Number guifg=#006bcd 
-hi Function gui=None guifg=#d06d50 "or green 50b3b0 
-highlight Conditional gui=None guifg=#a50a4a
-highlight Repeat gui=None guifg=#700d8a
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#e0b045
-highlight Keyword gui=bold guifg=grey guibg=bg
-highlight Exception gui=none guifg=#ea5460
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cadaca guifg=#05293d
-
-hi FoldColumn	guibg=#409ae0 guifg=darkgrey
-"hi FoldColumn	guibg=#83a5cd guifg=#70459F
-hi LineNr       guibg=#409ae0 guifg=darkblue gui=bold
-"hi LineNr       guibg=#081c30 guifg=#80a0dA 
-hi StatusLine	guibg=#20b5fd guifg=#0a150d gui=none
-hi StatusLineNC	guibg=#0580da guifg=#302d34 gui=none
-
-hi Search       guibg=#babdad guifg=#3a4520
-hi IncSearch	guifg=#dadeca guibg=#3a4520 
-
-hi VertSplit	guibg=#525f95 guifg=grey50 gui=none
-hi Folded       guibg=#252f5d guifg=#BBDDCC
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#308c70
-hi Visual       guifg=#008FBF guibg=#33DFEF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=black ctermbg=white
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=magenta
-highlight Repeat ctermfg=magenta
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey ctermbg=grey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=white ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=black ctermbg=blue
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=cyan ctermbg=blue cterm=NONE
-hi StatusLineNC ctermfg=grey ctermbg=darkblue cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=black cterm=NONE
-hi Title	ctermfg=darkyellow ctermbg=white
-hi Visual	ctermbg=darkcyan ctermfg=cyan cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=white cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=black ctermbg=white cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=blue
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-
-hi Comment		ctermfg=grey  ctermbg=blue
-
-hi Constant	ctermfg=darkblue
-hi Special	ctermfg=darkmagenta
-hi Identifier	ctermfg=darkyellow cterm=NONE
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkcyan "or darkcyan
-hi Underlined	ctermfg=black ctermbg=white
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-endif
diff --git a/colors/void.vim b/colors/void.vim
deleted file mode 100755
index 3240193..0000000
--- a/colors/void.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-" Vim color file
-" Maintainer:	Andrew Lyon <orthecreedence@gmail.com>
-" Last Change:	$Date: 2010-11-20 12:27:30PST $
-" Version:	1.1
-
-" Note that this color scheme is loosely based off of desert.vim (Hans Fugal
-" <hans@fugal.net>) mixed with some of slate.vim (Ralph Amissah
-" <ralph@amissah.com>) but with much of my own modification.
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-	syntax reset
-    endif
-endif
-let g:colors_name="void"
-
-hi Normal	guifg=#f5f5f5 guibg=grey15
-
-" highlight groups
-hi Cursor	guibg=khaki guifg=slategrey
-"hi CursorIM
-"hi Directory
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-"hi ErrorMsg
-hi VertSplit	guibg=black guifg=black gui=none
-hi Folded	guibg=grey30 guifg=gold
-hi FoldColumn	guibg=grey30 guifg=tan
-hi IncSearch	guifg=slategrey guibg=khaki
-"hi LineNr
-hi ModeMsg	guifg=goldenrod
-hi MoreMsg	guifg=SeaGreen
-hi NonText	guifg=LightBlue guibg=grey30
-hi Question	guifg=springgreen
-hi Search	guibg=peru guifg=wheat
-hi SpecialKey	guifg=yellowgreen
-hi StatusLine	guibg=black guifg=#cccccc gui=none
-hi StatusLineNC	guibg=black guifg=grey40 gui=none
-hi Title	guifg=indianred
-hi Visual	gui=none guifg=khaki guibg=olivedrab
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment	guifg=grey50
-hi Constant	guifg=#e09085
-hi Identifier	guifg=#f5f5f5
-hi Statement	guifg=darkkhaki		" #bbccee
-hi PreProc	guifg=#c8e0b0
-hi Type		guifg=darkkhaki
-hi Special	guifg=#bbccee cterm=bold term=bold
-hi Operator guifg=navajowhite cterm=NONE
-"hi Underlined
-hi Ignore	guifg=grey40
-"hi Error
-hi Todo		guifg=orangered guibg=yellow2
-hi Todo		guifg=orange guibg=gray40
-
-" color terminal definitions
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	guibg=grey15 cterm=bold ctermfg=darkblue
-hi Directory	ctermfg=brown  guifg=#ddbb66
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	cterm=NONE ctermfg=yellow ctermbg=green
-hi Search	cterm=NONE ctermfg=grey ctermbg=blue
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr guifg=grey50 ctermfg=3
-hi Question	ctermfg=green
-hi StatusLine	cterm=bold,reverse
-hi StatusLineNC cterm=reverse
-hi VertSplit	cterm=reverse
-hi Title	ctermfg=5
-hi Visual	cterm=reverse
-hi VisualNOS	cterm=bold,underline
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgrey ctermbg=NONE
-hi FoldColumn	ctermfg=darkgrey ctermbg=NONE
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi Comment	ctermfg=darkcyan
-hi Constant	ctermfg=brown
-hi Special	ctermfg=5
-hi Identifier	ctermfg=6
-hi Statement	ctermfg=3
-hi PreProc	ctermfg=5
-hi Type		ctermfg=2
-hi Underlined	cterm=underline ctermfg=5
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-
diff --git a/colors/vydark.vim b/colors/vydark.vim
deleted file mode 100755
index 3269e70..0000000
--- a/colors/vydark.vim
+++ /dev/null
@@ -1,84 +0,0 @@
-"
-" Vim colour file
-"
-" Maintainer:  Vy-Shane Sin Fat <shane@node.mu>
-" Version:     1.1
-"
-" This colour file is meant for GUI use.
-"
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="vydark"
-
-
-hi Normal        guifg=#bbbbbb  guibg=#282828
-hi Title         guifg=white
-hi Cursor        guibg=#ffffff
-hi LineNr        guifg=#444455  guibg=#292929
-hi Visual        guibg=#555555
-hi NonText       guifg=#292929  guibg=#292929
-hi StatusLine    guifg=#bbbbbb  guibg=#353535  gui=none
-hi StatusLineNC  guifg=#777777  guibg=#353535  gui=none
-hi VertSplit     guifg=#353535  guibg=#353535  gui=none
-hi ModeMsg       guifg=#99dd99  guibg=#394439  gui=none
-hi ErrorMsg      guifg=#222222  guibg=#ff8888  gui=none
-hi Error         guifg=#ffaaaa  guibg=#333333  gui=none
-
-
-" Vim 7.x specific
-if version >= 700
-  hi MatchParen  guibg=#364836  gui=none
-  hi Pmenu       guifg=#bbbbbb  guibg=#444444  gui=none
-  hi PmenuSel    guifg=#222222  guibg=#99bbdd  gui=none
-  hi PmenuSbar   guifg=#494949  guibg=#494949  gui=bold
-  hi PmenuThumb  guifg=#666666  guibg=#666666  gui=bold
-  hi Search      guifg=#dddd99  guibg=#444433  gui=none
-  hi IncSearch   guifg=#eeeeaa  guibg=#666633  gui=bold
-  hi CursorLine  guibg=#353535  gui=none
-  hi ColorColumn guibg=#252525
-  hi SpellBad    guisp=#774444
-  hi SpellCap    guisp=#774444
-  hi SpellLocal  guisp=#774444
-  hi SpellRare   guisp=#774444
-endif
-
-
-" Syntax highlighting 
-hi Comment       guifg=#666677  gui=none
-hi Todo          guifg=#8888aa  guibg=#303030  gui=italic
-hi Operator      guifg=#bbbbbb  gui=none
-hi Identifier    guifg=#bbbbbb  gui=none
-hi Statement     guifg=#bbbbbb  gui=none
-hi Type          guifg=#99bbcc  gui=none
-hi Constant      guifg=#88cc99  gui=none
-hi Conditional   guifg=#99bbcc  gui=none
-hi Delimiter     guifg=#99bbdd  gui=none
-hi PreProc       guifg=#88ddcc  gui=none
-hi Special       guifg=#99dd99  gui=bold
-hi Keyword       guifg=#bbbbbb  gui=none
-
-hi link Function        Normal
-hi link Character       Constant
-hi link String          Constant
-hi link Boolean         Constant
-hi link Number          Constant
-hi link Float           Number
-hi link Repeat          Conditional
-hi link Label           Statement
-hi link Exception       Statement
-hi link Include         Normal
-hi link Define          Type
-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 SpecialChar     Special
-hi link SpecialComment  Special
-hi link Debug           Special
-
diff --git a/colors/vylight.vim b/colors/vylight.vim
deleted file mode 100755
index 156adf3..0000000
--- a/colors/vylight.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-"
-" Vim colour file
-"
-" Maintainer:  Vy-Shane Sin Fat <shane@node.mu>
-" Last Change: 20 November 2009
-" Version:     1.1
-"
-" This colour file is meant for GUI use.
-"
-
-set background=light
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="vylight"
-
-
-hi Normal        guifg=#1a1a1a  guibg=white
-hi Title         guifg=black    guibg=white
-hi Cursor        guibg=#111111
-hi LineNr        guifg=#aaaaaa  guibg=#f8f8f8
-hi Visual        guibg=#bbddff
-hi NonText       guifg=#cccccc  guibg=#fafafa
-hi StatusLine    guifg=#222222  guibg=#eeeeee  gui=none
-hi StatusLineNC  guifg=#666666  guibg=#eeeeee  gui=none
-hi VertSplit     guifg=#eeeeee  guibg=#eeeeee  gui=none
-hi ModeMsg       guifg=#007050  guibg=#eeeeee  gui=none
-hi ErrorMsg      guifg=#f03050  guibg=#eeeeee  gui=none
-hi Error         guifg=#bb3355  guibg=white    gui=none
-
-
-" Vim 7.x specific
-if version >= 700
-  hi CursorLine  guibg=#eeeeee  gui=none
-  hi MatchParen  guibg=#ccffdd  gui=none
-  hi Pmenu       guifg=#60656f  guibg=#f0f5ff  gui=none
-  hi PmenuSel    guifg=white    guibg=#3585ef  gui=bold
-  hi PmenuSbar   guifg=#d0d5dd  guibg=#e0e5ee  gui=bold
-  hi PmenuThumb  guifg=#e0e5ee  guibg=#c0c5dd  gui=bold
-  hi Search      guibg=#fcfcaa  gui=none
-  hi IncSearch   guibg=#ffff33  gui=bold
-endif
-
-
-" Syntax highlighting 
-hi Comment       guifg=#668866  gui=none
-"hi Todo          guifg=#225522  guibg=white    gui=italic
-hi Todo          guifg=#446644  guibg=#ddeecc  gui=italic
-hi Operator      guifg=#1a1a1a  gui=none
-hi Identifier    guifg=#1a1a1a  gui=none
-hi Statement     guifg=#0050b0  gui=none
-hi Type          guifg=#0050b0  gui=none
-hi Constant      guifg=#204070  gui=none
-hi Conditional   guifg=#006040  gui=none
-hi Delimiter     guifg=#1a1a1a  gui=none
-hi PreProc       guifg=#007050  gui=none
-hi Special       guifg=#a05050  gui=none
-hi Keyword       guifg=#007050  gui=none
-
-hi link Function        Normal
-hi link Character       Constant
-hi link String          Constant
-hi link Boolean         Constant
-hi link Number          Constant
-hi link Float           Number
-hi link Repeat          Conditional
-hi link Label           Statement
-hi link Exception       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 SpecialChar     Special
-hi link SpecialComment  Special
-hi link Debug           Special
-
diff --git a/colors/wargrey.vim b/colors/wargrey.vim
deleted file mode 100755
index 3647e55..0000000
--- a/colors/wargrey.vim
+++ /dev/null
@@ -1,257 +0,0 @@
-" Vim color file
-" Maintainer:	WarGrey <juzhenliang@gmail.com>
-" Last Change:	$Date: 2008/07/28 21:30:30 $
-" Version:	$Id: wargrey.vim, v1.0 2008/07/28 21:30:30 $
-
-" help command
-" :he group-name
-" :he highiight-groups
-" :he cterm-colors
-
-set background=dark
-if version > 580
-	" no guarantees for version 5.8 and below, but this makes it stop
-	" complaining
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-let g:colors_name="wargrey"
-
-" Boolean constant: true FALSE ...
-hi Boolean ctermfg=red guifg=red
-
-" Character constant: 'A' 'b' ...
-hi Character ctermfg=magenta guifg=magenta
-
-" Any comments
-hi Comment ctermfg=darkgrey guifg=darkgrey
-
-" The condition-keywords: if switch endif ...
-hi Conditional ctermfg=darkcyan guifg=darkcyan
-
-" Any constants 
-hi Constant ctermfg=red guifg=red
-
-" The column that the cursor is in
-hi CursorColumn	ctermfg=none ctermbg=none
-
-" The character under the cursor
-hi Cursor guibg=khaki guifg=slategrey
-
-" [IM mode] The character under the cursor
-hi CursorIM	ctermbg=none ctermfg=none
-
-" The line that the cursor is in
-hi CursorLine ctermfg=none ctermbg=none
-
-" Any debugging statement
-hi Debug ctermfg=darkred guifg=darkred
-
-" Any preprocessors like '#define' in C/C++ language
-hi Define ctermfg=blue guifg=blue
-
-" The character that needs attention: * ? ...
-hi Delimiter ctermfg=yellow guifg=yellow
-
-" [Diff mode] The added line
-hi DiffAdd ctermfg=green ctermbg=darkgray guifg=green guibg=darkgray
-
-" [Diff mode] The changed line
-hi DiffChange ctermfg=yellow ctermbg=darkgrey guifg=yellow guibg=darkgrey
-
-" [Diff mode] The deleted line
-hi DiffDelete ctermfg=black ctermbg=darkgrey guifg=black guibg=darkgrey
-
-" [Diff mode] The changed texts within the changed line
-hi DiffText	ctermfg=blue ctermbg=darkgrey guifg=blue guibg=darkgrey
-
-" Directory names or the items' label in the list
-hi Directory ctermfg=darkcyan guifg=darkcyan
-
-" Any erroneous structure
-hi Error cterm=bold ctermfg=darkred ctermbg=darkgray guifg=darkred guibg=darkgray
-
-" The error message on the command line
-hi ErrorMsg	cterm=bold ctermfg=darkred ctermbg=darkgray guifg=darkred guibg=darkgray
-
-" The exception-keywords: throws try finally ...
-hi Exception ctermfg=darkmagenta guifg=darkmagenta
-
-" The floating point constants: 6.67e-11
-hi Float ctermfg=red guifg=red
-
-" The column with the specified width which indicates open and closed folds.
-hi FoldColumn ctermfg=grey ctermbg=none guifg=grey
-
-" The lines used for closed folds
-hi Folded ctermfg=grey ctermbg=none guibg=grey30 guifg=grey
-
-" The name of functions methods and classes ...
-hi Function	ctermfg=blue guifg=blue
-
-" Any variable's name, also be used for the global functions
-hi Identifier ctermfg=brown guifg=brown
-
-" Any left blank and hidden
-hi Ignore cterm=bold ctermfg=grey ctermbg=darkgrey guifg=grey guibg=darkgrey
-
-" The preprocessors for indicating the included sources
-hi Include ctermfg=magenta guifg=magenta
-
-" The texts that been searched or replaced by the '%s///c'
-hi IncSearch cterm=none ctermfg=yellow ctermbg=green guifg=yellow guibg=green
-
-" Any other keywords: native assert ...
-hi Keyword ctermfg=darkcyan guifg=darkcyan
-
-" Any labels: case default ...
-hi Label ctermfg=darkgray guifg=darkgray
-
-" The line number
-hi LineNr ctermfg=brown guifg=brown
-
-" Any preprocessors like '#define' in C/C++ language
-hi Macro ctermfg=darkmagenta guifg=darkmagenta
-
-" The character of the paired bracket which under the cursor or just before it,
-hi MatchParen ctermfg=brown guifg=brown
-
-" The mode message: -- INSERT -- ...
-hi ModeMsg cterm=none ctermfg=red guifg=red
-
-" The message is given with the '-- More --'
-hi MoreMsg ctermfg=darkgreen guifg=darkgreen
-
-" The characters appear only when line wraps happen: '@' '-'
-hi NonText cterm=bold ctermfg=black guifg=black
-
-" The keywords recongnized as name space: public internal ...
-hi NameSpace ctermfg=darkgreen guifg=darkgreen
-
-" The normal Text
-hi Normal guifg=white guifg=white
-
-" The number constants: 1987 0x00ff00 ...
-hi Number ctermfg=red guifg=red
-
-" Any operators: 'new' '+' ...
-hi Operator	ctermfg=yellow guifg=yellow
-
-" [Popup menu] The normal items
-hi Pmenu ctermfg=blue ctermbg=none guifg=blue
-
-" [Popup menu] The scrollbar
-hi PmenuSbar ctermbg=none
-
-" [Popup menu] The selected item
-hi PmenuSel ctermfg=green ctermbg=none guifg=green
-
-" [Popup menu] The thumb of the scrollbar
-hi PmenuThumb ctermfg=darkcyan guifg=darkcyan
-
-" Any condition-preprocessors: #if #elseif ...
-hi PreCondit ctermfg=cyan guifg=cyan
-
-" Any generic preprocessors
-hi PreProc ctermfg=magenta  guifg=magenta
-
-" The prompt message of command: 'y/q' ...
-hi Question ctermfg=green guifg=green
-
-" The repeat-keywords: for each in ...
-hi Repeat ctermfg=cyan guifg=cyan
-
-" The last searched pattern or 
-" the line in the quickfix window and some similiar items that need to stand out
-hi Search ctermfg=cyan ctermbg=none guifg=cyan
-
-" The line where the signs displayed,
-" the sign may be a breakpoint or an icon
-hi SignColumn ctermbg=black ctermbg=black
-
-" Any special symbols such as a regular expressions etc.
-hi Special ctermfg=darkmagenta guifg=darkmagenta
-
-" The special character within a constant
-hi SpecialChar ctermfg=red guifg=red
-
-" The special things within the comment
-hi SpecialComment ctermfg=darkgray guifg=darkgray
-
-" The meta and special keyboard keys or
-" the text used to show the unprintable characters 
-hi SpecialKey ctermfg=darkcyan guifg=darkcyan
-
-" The word that does not recognized by the spellchecker
-hi SpellBad	ctermfg=darkred guifg=darkred
-
-" The word should starts with a capital
-hi SpellCap	ctermfg=green guifg=green
-
-" The word is recognized by the spellchecker and used in another region
-hi SpellLocal ctermfg=brown guifg=brown
-
-" The word is recognized by the spellchecker and hardly ever used
-hi SpellRare ctermfg=yellow guifg=yellow
-
-" Any statements
-hi Statement ctermfg=darkcyan guifg=darkcyan
-
-" The status line of current window
-hi StatusLine cterm=underline ctermfg=gray gui=underline guifg=gray
-
-" The status line of non-current window
-hi StatusLineNC cterm=underline ctermfg=darkgray gui=underline guifg=darkgray
-
-" The limit-keywords of structures: static register ...
-hi StorageClass ctermfg=cyan guifg=cyan
-
-" The string constant
-hi String ctermfg=brown guifg=brown
-
-" Any structures seems that they are complex types: class union @interface ...
-hi Structure ctermfg=green guifg=green
-
-" [Table line] Not active table page label
-hi TabLine ctermfg=red guifg=red
-
-" [Table line] Where there are no labels
-hi TabLineFill ctermfg=gray ctermbg=blue guifg=gray guibg=blue
-
-" [Table line] Active table page label
-hi TabLineFillSel ctermfg=blue guifg=blue
-
-" Any tags which can use <C-]> on
-hi Tag ctermfg=darkmagenta guifg=darkmagenta
-
-" Any titles for output from ':autocmd' or ':set all'
-hi Title ctermfg=green guifg=green
-
-" Any tasks which need extra attention that marked in the comment
-hi Todo	ctermfg=yellow ctermbg=none guifg=yellow
-
-" Any basic data types: int double ...
-hi Type ctermfg=green guifg=green
-
-" Any type definition: public class; private set width; ...
-hi Typedef ctermfg=blue guifg=blue
-
-" The text stand out the HTML link
-hi Underlined cterm=underline ctermfg=blue gui=underline guifg=blue
-
-" The column sparating vertically split window 
-hi VertSplit cterm=none ctermfg=darkgray gui=none guifg=darkgray
-
-" The visual mode selection
-hi Visual cterm=reverse gui=none guifg=khaki guibg=olivedrab
-
-" The visual mode selection 'NOT OWNED BY VIM'
-hi VisualNOS cterm=bold,underline
-
-" The warning message
-hi WarningMsg ctermfg=yellow guifg=yellow
-
-" The current match in 'wildmenu' completion
-hi WildMenu	ctermfg=black ctermbg=darkcyan guifg=black guibg=darkcyan
diff --git a/colors/warm_grey.vim b/colors/warm_grey.vim
deleted file mode 100755
index 96e78d3..0000000
--- a/colors/warm_grey.vim
+++ /dev/null
@@ -1,101 +0,0 @@
-
-set background=light
-
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "black_on_white"
-
-if version >= 700
-  hi CursorLine guibg=#e4e2e0
-  hi CursorColumn guibg=#e4e2e0
-  hi MatchParen guifg=white guibg=#747270 gui=bold
-
-  "Tabpages
-  hi TabLine guifg=black guibg=#b0b8c0 gui=italic
-  hi TabLineFill guifg=#9098a0
-  hi TabLineSel guifg=black guibg=#f0f0f0 gui=italic,bold
-
-  "P-Menu (auto-completion)
-  hi Pmenu guifg=white guibg=#a4a2a0
-  "PmenuSel
-  "PmenuSbar
-  "PmenuThumb
-endif
-"
-" Html-Titles
-hi Title      guifg=#202020 gui=bold
-hi Underlined  guifg=#202020 gui=underline
-
-
-hi Cursor    guifg=black   guibg=#b8b4b0
-hi lCursor   guifg=black   guibg=white
-hi LineNr    guifg=#646260 guibg=#d8d4d0 gui=italic
-
-hi Normal    guifg=#444240   guibg=#f0f0f0
-
-hi StatusLine guifg=white guibg=#888480 gui=bold
-hi StatusLineNC guifg=#848280 guibg=#c8c4c0 gui=italic
-hi VertSplit guifg=#c8c4c0 guibg=#c8c4c0 gui=NONE
-
-" hi Folded    guifg=#708090 guibg=#c0d0e0
-hi Folded    guifg=#848280 guibg=#e8e4e0 gui=italic
-
-hi NonText   guifg=#c0c0c0 guibg=#e0e0e0
-" Kommentare
-hi Comment   guifg=#848280               gui=italic
-
-" Konstanten
-hi Constant  guifg=#000000
-hi String    guifg=#804020
-hi Number    guifg=#406020
-hi Float     guifg=#204000
-"hi Statement guifg=#0070e0 gui=NONE
-" Python: def and so on, html: tag-names
-"hi Statement  guifg=#607080 gui=bold
-
-" . D: debug, mixin, scope, throw, Python: def
-hi Statement   guifg=#607080 gui=bold
-hi Operator  guifg=#747270 gui=bold
-" HTML: arguments
-"hi Type       guifg=#202020 gui=none
-hi Type        guifg=#606060 gui=bold
-" Python: Standard exceptions, True&False
-hi Structure  guifg=#405060 gui=underline,bold
-hi Function   guifg=#203040 gui=bold
-
-
-hi Macro   guifg=#545250 gui=none
-hi Directory   guifg=#949290 gui=none
-
-
-hi Identifier guifg=#545250 gui=none
-
-hi Repeat      guifg=#545250 gui=underline
-hi Conditional guifg=#545250 gui=underline
-
-" Cheetah: #-Symbol, function-names, D: import
-hi PreProc    guifg=#705060 gui=bold
-" Cheetah: def, attr, for and so on, Python: Decorators
-hi Define      guifg=#905080 gui=bold
-
-hi Error      guifg=#a02000 guibg=white gui=bold,underline
-hi Todo       guifg=#848280 guibg=NONE gui=bold,underline
-
-" Python: %(...)s - constructs, encoding, D: \n etc
-hi Special    guifg=#602000 gui=none
-
-
-" color of <TAB>s etc...  
-"hi SpecialKey guifg=#d8a080 guibg=#e8e8e8 gui=italic  
-hi SpecialKey guifg=#c4c2c0 guibg=#e4e2e0 gui=italic,bold  
-
-" Diff
-hi DiffChange guifg=NONE guibg=#e4e2e0 gui=italic
-hi DiffText guifg=NONE guibg=#f0e0a0 gui=none
-hi DiffAdd guifg=NONE guibg=#c0e0d0 gui=bold
-hi DiffDelete guifg=NONE guibg=#f0a0a0 gui=italic,bold
-
-
diff --git a/colors/watermark.vim b/colors/watermark.vim
deleted file mode 100755
index 09818e4..0000000
--- a/colors/watermark.vim
+++ /dev/null
@@ -1,174 +0,0 @@
-" Vim color file
-" watermark v1.0b
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo watermark in your VimRC/GVimRC file
-"     * GvimRC if using GUI any
-"
-"   - Thanks to Desert and OceanDeep for their color scheme 
-"     file layouts
-"   - Thanks to Raimon Grau for his feedback
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="watermark"
-
-hi Normal       guifg=#8b9aaa guibg=#1a202a   "1a1823
-hi NonText      guifg=#382920 guibg=bg
-
-hi Folded       guibg=#222038 guifg=#BBDDCC
-hi FoldColumn	guibg=black guifg=#dbcaa5
-hi LineNr       guibg=black guifg=#8095d5 
-hi StatusLine	guibg=grey guifg=#203ad5 gui=none
-hi StatusLineNC	guibg=grey guifg=#1b2058 gui=none
-hi VertSplit	guibg=#22253d guifg=#223355  gui=none
-
-hi tablinesel   guibg=#515a71 guifg=#50aae5 gui=none
-hi tabline      guibg=#4d4d5f guifg=#5b7098 gui=none
-hi tablinefill  guibg=#2d2d3f guifg=#aaaaaa gui=none
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		guifg=#369960  guibg=bg
-else
-	hi Comment		guifg=#559988  guibg=bg
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Title	guifg=#6d806a gui=none
-hi Underlined   guifg=#5b759a gui=none
-
-hi Statement    guifg=#cac0c0 gui=none
-hi Type		guifg=#6ac0ba gui=none
-hi Constant	guifg=#70a0de
-hi Number       guifg=#1da5da
-hi PreProc      guifg=#c0a0b0
-hi Special	guifg=#50a0b0
-hi Ignore       guifg=grey40
-hi Todo		guifg=orangered guibg=yellow2
-hi Error        guibg=#f06070
-hi Function     guifg=#a090a0 guibg=bg gui=None 
-hi Identifier   guifg=#a090b0   
-highlight Exception gui=none guifg=#aaa4a0 guibg=bg
-"""""this section borrowed from OceanDeep/Midnight"""""
-highlight Conditional gui=None guifg=#c08ac0 guibg=bg
-highlight Repeat gui=None guifg=#c07ac0 guibg=bg
-"hi Label gui=None guifg=LightGreen guibg=bg
-highlight Operator gui=None guifg=#aa9a45 guibg=bg
-highlight Keyword gui=bold guifg=grey guibg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cad5c0 guifg=#05293d
-
-
-hi Search       guibg=#808373 guifg=#3a4520
-hi IncSearch	guifg=#babeaa guibg=#3a4520 
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=black guibg=#43D5FF
-hi VisualNOS    guifg=#201a30 guibg=#a3a5FF
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=grey
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=darkred
-highlight Repeat ctermfg=darkred
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=darkcyan ctermbg=NONE
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=blue ctermbg=grey cterm=NONE
-hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=grey cterm=NONE
-hi Title	ctermfg=Yellow cterm=NONE
-hi Visual	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgreen ctermbg=NONE cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=black
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi identifier   ctermfg=darkmagenta
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		ctermfg=darkgrey  ctermbg=darkblue
-	hi IncSearch	ctermfg=black ctermbg=grey cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkgrey cterm=NONE
-else
-	hi Comment		ctermfg=grey  ctermbg=darkblue
-	hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Constant	ctermfg=blue
-hi Special	ctermfg=darkmagenta
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkblue " ctermbg=darkblue
-hi Underlined	ctermfg=yellow cterm=NONE
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-
diff --git a/colors/whitebox.vim b/colors/whitebox.vim
deleted file mode 100755
index 7f6a5ae..0000000
--- a/colors/whitebox.vim
+++ /dev/null
@@ -1,86 +0,0 @@
-set background=light
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = "whitebox"
-
-hi Comment guifg=#8b8b8b
-hi Constant guifg=#cc006c
-hi Cursor guifg=#ffffff guibg=#0066ff
-hi CursorColumn guibg=gray90
-hi CursorIM gui=None
-hi CursorLine guifg=#00cc66 guibg=gray90
-hi DiffAdd guibg=lightblue
-hi DiffChange guibg=plum1
-hi DiffDelete gui=bold guifg=blue guibg=lightcyan
-hi DiffText gui=bold guibg=gray90
-hi Directory gui=bold guifg=#ec3300
-hi Error guifg=#339999 guibg=gray90
-hi ErrorMsg guifg=white guibg=red
-hi FoldColumn guifg=darkblue guibg=grey
-hi Folded guifg=#efffff guibg=#526d8e
-hi Function guifg=#efc21e
-hi Identifier guifg=darkcyan
-hi Ignore guifg=white
-hi IncSearch gui=reverse guifg=lightblue guibg=red
-hi LineNr guifg=#519eff 
-hi MatchParen guibg=cyan
-hi ModeMsg gui=bold
-hi MoreMsg gui=bold guifg=seagreen
-hi NonText gui=bold guifg=blue
-hi Normal gui=None guifg=#526d8e
-hi Pmenu guibg=#e3e8de
-hi PmenuSbar guibg=grey
-hi PmenuSel guibg=#86beda
-hi PmenuThumb gui=reverse
-hi PreProc guifg=#d5459c
-hi Question gui=bold guifg=seagreen
-hi Search guibg=#aec4e2
-hi SignColumn guifg=darkblue guibg=grey
-hi Special guifg=slateblue
-hi SpecialKey guifg=blue
-hi SpellBad gui=undercurl
-hi SpellCap gui=undercurl
-hi SpellLocal gui=undercurl
-hi SpellRare gui=undercurl
-hi Statement gui=bold guifg=#d54271
-hi StatusLine gui=bold,reverse guifg=#222222
-hi StatusLineNC gui=reverse
-hi String guifg=#ff3100
-hi TabLine gui=underline guibg=lightgrey
-hi TabLineFill gui=reverse
-hi TabLineSel gui=bold
-hi Title gui=bold guifg=magenta
-hi Todo guifg=blue guibg=yellow
-hi Type gui=None guifg=#008F0F
-hi Underlined gui=underline guifg=slateblue
-hi VertSplit gui=reverse guifg=#c1b6a1
-hi Visual guibg=#a0b8cc
-hi VisualNOS gui=bold,underline
-hi WarningMsg guifg=red
-hi WildMenu guifg=black guibg=yellow
-hi link Boolean Constant
-hi link Character Constant
-hi link Conditional Statement
-hi link Debug Special
-hi link Define PreProc
-hi link Delimiter Special
-hi link Exception Statement
-hi link Float Constant
-hi link Include PreProc
-hi link Keyword Statement
-hi link Label Statement
-hi link Macro PreProc
-hi link Number Constant
-hi link Operator Statement
-hi link PreCondit PreProc
-hi link Repeat Statement
-hi link SpecialChar Special
-hi link SpecialComment Special
-hi link StorageClass Type
-hi link String Constant
-hi link Structure Type
-hi link Tag Special
-hi link Typedef Type
-
diff --git a/colors/whitedust.vim b/colors/whitedust.vim
deleted file mode 100755
index a12dc7d..0000000
--- a/colors/whitedust.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-set background=light
-hi clear
-
-hi Boolean          guifg=#235C5C gui=bold
-hi Character        guifg=#235C5C gui=bold
-hi Comment          guifg=#808080
-hi Condtional       guifg=#700000
-hi Constant         guifg=#235C5C gui=bold
-hi Cursor           guifg=#FFFFFF guibg=#515151
-hi Debug            guifg=#235C5C gui=bold
-hi Define           guifg=#003050 gui=bold
-hi Delimiter        guifg=#707070
-hi DiffAdd          guibg=#9EC3B9
-hi DiffChange       guibg=#CCCCCC
-hi DiffDelete       guifg=#CCCCCC guibg=#B9B9B9 gui=none
-hi DiffText         guifg=#000000 guibg=#E0E0E0 gui=bold
-hi Directory        guifg=#000000 gui=bold
-hi Error            guifg=#FFFFFF guibg=#FF0000
-hi ErrorMsg         guifg=#FFFFFF guibg=#FF3F30
-hi Exception        guifg=#700000 gui=underline
-hi Float            guifg=#636C4C
-hi FoldColumn       guifg=#235C5C guibg=#B9B9B9
-hi Folded           guifg=#235C5C guibg=#CCCCCC
-hi Function         guifg=#000070
-hi Identifier       guifg=#000000
-hi Include          guifg=#003050 gui=bold
-hi IncSearch        guifg=#FFFFFF guibg=#3EA399
-hi Keyword          guifg=#000000 gui=bold
-hi Label            guifg=#700000 gui=underline
-hi LineNr           guifg=#808080 guibg=#B9B9B9
-hi Macro            guifg=#003050 gui=bold
-hi ModeMsg          guifg=#235C5C gui=bold
-hi MoreMsg          guifg=#000000 gui=bold
-hi NonText          guifg=#E0E0E0
-hi Normal           guifg=#333333 guibg=#C0C0C0
-hi Number           guifg=#535F5C
-hi Operator         guifg=#000000
-hi PreCondit        guifg=#205070 gui=bold
-hi PreProc          guifg=#003050 gui=bold
-hi Question         guifg=#000000 gui=bold
-hi Repeat           guifg=#700000 gui=underline
-hi Search           guifg=#FFFFFF guibg=#3EA399
-hi SpecialChar      guifg=#235C5C gui=bold
-hi SpecialComment   guifg=#235C5C gui=bold
-hi Special          guifg=#808080
-hi SpecialKey       guifg=#818181
-hi Statement        guifg=#700000
-hi StatusLine       guifg=#CCCCCC guibg=#0E7369
-hi StatusLineNC     guifg=#CCCCCC guibg=#333333
-hi StorageClass     guifg=#000000 gui=bold
-hi String           guifg=#336C6C
-hi Structure        guifg=#000000 gui=bold,underline
-hi Tag              guifg=#235C5C gui=bold
-hi Title            guifg=#000000 guibg=#CCCCCC gui=bold
-hi Todo             guifg=#000000 guibg=#FFFFFF gui=bold
-hi Typedef          guifg=#000000 gui=bold,underline
-hi Type             guifg=#000000 gui=bold
-hi VertSplit        guifg=#CCCCCC guibg=#333333
-hi Visual           guifg=#CCCCCC guibg=#0E7369 gui=reverse
-hi VisualNOS        guifg=#CCCCCC guibg=#0E7369 gui=bold,underline
-hi WarningMsg       guifg=#000000 guibg=#CCCCCC gui=bold
-hi WildMenu         guifg=#FFFFFF guibg=#235C5C
diff --git a/colors/widower.vim b/colors/widower.vim
deleted file mode 100755
index d4975bf..0000000
--- a/colors/widower.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" Vim color file
-" Dark (red on black) color scheme.
-" Maintainer: greg frohring <greg@derelictshores.com>
-" Last Change: 1/13/2009
-" Licence: Public Domain
-
-" INSTALLATION: copy this file to ~/vimXX/colors/ directory
-" and add "colorscheme widower" to your ~/.vimrc file
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-"colorscheme default
-let g:colors_name = "widower"
-
-" hardcoded colors :
-" GUI Comment : 
-" 		#572829 = plumish
-" 		#F1A107 = orange
-
-" GUI
-highlight Normal     guifg=Red   guibg=Black
-highlight Search     guifg=#572829 guibg=Yellow gui=underline
-highlight Visual     guifg=Black guibg=DarkGrey 
-highlight Cursor     guifg=Black  guibg=Green gui=bold
-highlight Special    guifg=Orange
-highlight Comment    guifg=#777799 
-highlight Statement  guifg=Orange guibg=#444444 gui=underline
-highlight Type       guifg=#F1A107
-
-highlight VertSplit    gui=bold guifg=Grey25    guibg=Black
-highlight StatusLine   gui=bold guifg=White     guibg=Grey25
-highlight StatusLineNC gui=NONE guifg=LightGrey guibg=Grey25
-
-highlight FoldColumn     gui=bold guifg=White guibg=Black
-
-highlight String guifg=#CCAAAA
-highlight Constant guifg=Green
-highlight Include guifg=#d632D4
-highlight Operator guifg=Orange guibg=#222222
-
diff --git a/colors/win9xblueback.vim b/colors/win9xblueback.vim
deleted file mode 100755
index 1a26ee0..0000000
--- a/colors/win9xblueback.vim
+++ /dev/null
@@ -1,79 +0,0 @@
-" Name:		win9xblueback.vim
-" Maintainer:	Kojo Sugita
-" Last Change:	2008-09-08
-" Revision:	1.0
-
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-let g:colors_name = 'win9xblueback'
-
-hi Cursor	guifg=#505050 guibg=#ffffff
-hi lCursor	guifg=#505050 guibg=#ffffff
-hi CursorIM	guifg=#505050 guibg=#ffffff
-hi Directory	guifg=#ffffff guibg=#0000b0 gui=bold
-hi DiffAdd	guifg=#ffffff guibg=#505050 gui=none
-hi DiffChange	guifg=#ffffff guibg=#505050 gui=none
-hi DiffDelete	guifg=#404040 guibg=#404040 gui=none
-hi DiffText	guifg=#ffffff guibg=#448844 gui=bold
-hi ErrorMsg	guifg=#ee1111 guibg=#0000b0
-hi VertSplit	guifg=#d0d0d0 guibg=#b0b0b0
-hi Folded	guifg=#d0d0d0 guibg=#0000b0
-hi FoldColumn	guifg=#909090 guibg=#102010
-hi IncSearch	guifg=#505050 guibg=#d0d0d0 gui=none
-hi LineNr	guifg=#909090 guibg=#0000b0 gui=none
-hi ModeMsg	guifg=#d0d0d0 guibg=#0000b0
-hi MoreMsg	guifg=#d0d0d0 guibg=#0000b0
-hi Normal	guifg=#d0d0d0 guibg=#0000b0
-hi Question	guifg=#d0d0d0 guibg=#0000b0
-hi Search	guifg=#404040 guibg=#d0d0d0 gui=none
-hi NonText	guifg=#606060 gui=none
-hi SpecialKey	guifg=#909090
-"\n, \0, %d, %s, etc...
-hi Special	guifg=#d0d0d0 guibg=#0000b0 gui=bold,underline
-" status line
-hi StatusLine	guifg=#0000b0 guibg=#d0d0d0 gui=bold
-hi StatusLineNC	guifg=#0000b0 guibg=#b0b0b0 gui=none
-hi Title	guifg=#0000b0 guibg=#d0d0d0 gui=bold
-hi Visual	guifg=#0000b0 guibg=#e0e0e0 gui=none
-hi VisualNOS	guifg=#d0d0d0 guibg=#0000b0
-hi WarningMsg	guifg=#ffffff guibg=#0000b0
-hi WildMenu	guifg=#505050 guibg=#ffffff
-hi Number	guifg=#0000b0 guibg=#b0b0b0 gui=underline
-hi Char		guifg=#0000b0 guibg=#b0b0b0 gui=underline
-hi String	guifg=#0000b0 guibg=#b0b0b0 gui=underline
-hi Boolean	guifg=#0000b0 guibg=#b0b0b0 gui=underline
-hi Comment	guifg=#909090
-hi Constant	guifg=#ffffff gui=none
-hi Identifier	guifg=#ffffff
-hi Statement	guifg=#ffffff gui=bold
-
-"Procedure name
-hi Function     guifg=#ffffff
-
-" Matches
-hi MatchParen guifg=#ffffff guibg=darkblue
-
-"Define, def
-hi PreProc	guifg=#ffffff gui=bold
-hi Type		guifg=#ffffff gui=bold
-hi Underlined	guifg=#ffffff gui=underline
-hi Error	guifg=#ee1111 guibg=#0000b0
-hi Todo		guifg=#404040 guibg=#d0d0d0 gui=none
-hi SignColumn   guibg=#0000b0
-
-if version >= 700
-  " Pmenu
-  hi Pmenu	guibg=darkblue
-  hi PmenuSel	guibg=white guifg=#0000b0
-  hi PmenuSbar	guibg=darkblue
-
-  " Tab
-  hi TabLine	  guifg=#d0d0d0 guibg=darkblue gui=none
-  hi TabLineFill  guifg=#ffffff guibg=darkblue gui=none
-  hi TabLineSel	  guifg=#ffffff guibg=#0000b0 gui=bold
-endif
-
-" vim:set ts=8 sts=2 sw=2 tw=0:
diff --git a/colors/winter.vim b/colors/winter.vim
deleted file mode 100755
index 4212187..0000000
--- a/colors/winter.vim
+++ /dev/null
@@ -1,87 +0,0 @@
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"                                                                              "
-" File_Name__: winter.vim                                                      "
-" Abstract___: A color sheme file (only for GVIM) which uses a light grey      "
-"              background makes the VIM look like the scenes of winter.        "
-" Author_____: CHE Wenlong <chewenlong AT buaa.edu.cn>                         "
-" Version____: 1.3                                                             "
-" Last_Change: February 26, 2009                                               "
-"                                                                              "
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" Preprocess {{{
-
-if !has("gui_running")
-    runtime! colors/default.vim
-    finish
-endif
-
-set background=light
-
-hi clear
-
-if version > 580
-    hi clear
-    if exists("syntax_on")
-        syntax reset
-    endif
-endif
-
-let colors_name = "winter"
-
-" }}}
-
-" Common {{{
-
-hi Normal           guifg=#000000 guibg=#D4D0C8 gui=NONE
-hi Visual           guifg=#FFFFFF guibg=#000080 gui=NONE
-hi Cursor           guifg=#D4D0C8 guibg=#FF0000 gui=NONE
-hi LineNr           guifg=#707070 guibg=NONE    gui=NONE
-hi Title            guifg=#202020 guibg=NONE    gui=NONE
-hi Underlined       guifg=#202020 guibg=NONE    gui=UNDERLINE
-
-" }}}
-
-" Split {{{
-
-hi StatusLine       guifg=#E0E0E0 guibg=#707070 gui=NONE
-hi StatusLineNC     guifg=#E0E0E0 guibg=#909090 gui=NONE
-hi VertSplit        guifg=#909090 guibg=#909090 gui=NONE
-
-" }}}
-
-" Folder {{{
-
-hi Folded           guifg=#707070 guibg=#E0E0E0 gui=NONE
-
-" }}}
-
-" Syntax {{{
-
-hi Type             guifg=#0000FF guibg=NONE    gui=NONE
-hi Define           guifg=#0000FF guibg=NONE    gui=NONE
-hi Comment          guifg=#008000 guibg=NONE    gui=NONE
-hi Constant         guifg=#A000A0 guibg=NONE    gui=NONE
-hi String           guifg=#008080 guibg=NONE    gui=NONE
-hi Number           guifg=#FF0000 guibg=NONE    gui=NONE
-hi Statement        guifg=#0000FF guibg=NONE    gui=NONE
-
-" }}}
-
-" Others {{{
-
-hi PreProc          guifg=#A000A0 guibg=NONE    gui=NONE
-hi Special          guifg=#A000A0 guibg=NONE    gui=NONE
-hi SpecialKey       guifg=#707070 guibg=#E0E0E0 gui=NONE
-hi Error            guifg=#FF0000 guibg=#FFFFFF gui=UNDERLINE
-hi Todo             guifg=#FF0000 guibg=#FFFF00 gui=UNDERLINE
-
-" }}}
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"                                                                              "
-" vim:foldmethod=marker:tabstop=4
-"                                                                              "
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
diff --git a/colors/wintersday.vim b/colors/wintersday.vim
deleted file mode 100755
index 9a77f7e..0000000
--- a/colors/wintersday.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-" Vim color file
-" Mark Thomas <mark.thomas@bigswamp.org>
-" Sun Feb 16, 2003
-
-" This color scheme uses a dark background.
-
-" First remove all existing highlighting.
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "wintersday"
-
-hi   Normal      guifg=#CCCCCC guibg=#000000
-
-hi Cursor		gui=NONE    guifg=#B9D3EE   guibg=#8B8878
-"hi CursorIM	
-hi Directory	gui=NONE    guifg=#FFFFFF   guibg=#000000
-hi DiffAdd      gui=NONE    guifg=#A0D0FF   guibg=#0020A0
-hi DiffChange   gui=NONE    guifg=#E03870   guibg=#601830
-hi DiffDelete   gui=NONE    guifg=#A0D0FF   guibg=#0020A0
-hi DiffText     gui=NONE    guifg=#FF9933   guibg=#A02860
-hi ErrorMsg     gui=BOLD    guifg=#FF6347   guibg=NONE
-hi VertSplit    gui=BOLD    guifg=#FFFFFF   guibg=#8B4513 
-hi Folded       gui=NONE    guifg=#40F0F0   guibg=#005080
-hi FoldColumn   gui=NONE    guifg=#40C0FF   guibg=#00305C
-hi IncSearch    gui=UNDERLINE guifg=#FFD700 guibg=#778899 
-hi LineNr       gui=NONE    guifg=#696969
-hi ModeMsg      gui=BOLD    guifg=#990000   guibg=NONE
-hi MoreMsg      gui=BOLD    guifg=#CC6666   guibg=NONE
-hi NonText      gui=BOLD    guifg=#CC00FF   guibg=NONE
-hi Question     gui=BOLD    guifg=#CC00FF   guibg=NONE
-hi Search       gui=NONE    guifg=#FFD700   guibg=#778899
-hi SpecialKey   gui=BOLD    guifg=#CCCCCC   guibg=NONE
-hi StatusLine   gui=BOLD    guifg=#FFFFFF   guibg=#8B4513
-hi StatusLineNC gui=BOLD    guifg=#8B4513   guibg=#FFFFFF
-hi Title        gui=BOLD    guifg=#CCCCCC   guibg=NONE
-hi Visual       gui=NONE    guifg=#B9D3EE   guibg=#8B8878
-"hi VisualNOS	
-hi WarningMsg   gui=BOLD    guifg=#FFA0FF   guibg=NONE
-hi WildMenu     gui=NONE    guifg=#000000   guibg=#a0a0ff
-"hi Menu		
-"hi Scrollbar	
-"hi Tooltip		
-
-" syntax highlighting groups
-hi Comment      gui=NONE    guifg=#6699CC   guibg=NONE
-hi Constant     gui=NONE    guifg=#99CCFF   guibg=NONE
-hi Identifier   gui=NONE    guifg=#FFD700   guibg=NONE
-hi Statement    gui=NONE    guifg=#CC6666   guibg=NONE
-hi PreProc      gui=NONE    guifg=#40F0A0   guibg=NONE
-hi Type         gui=NONE    guifg=#B0C4DE   guibg=NONE
-hi Special      gui=NONE    guifg=#00FFCC   guibg=NONE
-hi Underlined   gui=NONE    guifg=#FFFFFF   guibg=NONE
-hi Ignore       gui=NONE    guifg=#000000   guibg=NONE
-hi Error        gui=NONE    guifg=#FFFFFF   guibg=#FF0088
-hi Todo         gui=BOLD    guifg=#FFA0A0   guibg=NONE
-hi Number       gui=NONE    guifg=#FFCCCC   guibg=NONE
diff --git a/colors/wombat.vim b/colors/wombat.vim
deleted file mode 100755
index 9ad1e56..0000000
--- a/colors/wombat.vim
+++ /dev/null
@@ -1,51 +0,0 @@
-" Maintainer:	Lars H. Nielsen (dengmao@gmail.com)
-" Last Change:	January 22 2007
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "wombat"
-
-
-" Vim >= 7.0 specific colors
-if version >= 700
-  hi CursorLine guibg=#2d2d2d
-  hi CursorColumn guibg=#2d2d2d
-  hi MatchParen guifg=#f6f3e8 guibg=#857b6f gui=bold
-  hi Pmenu 		guifg=#f6f3e8 guibg=#444444
-  hi PmenuSel 	guifg=#000000 guibg=#cae682
-endif
-
-" General colors
-hi Cursor 		guifg=NONE    guibg=#656565 gui=none
-hi Normal 		guifg=#f6f3e8 guibg=#242424 gui=none
-hi NonText 		guifg=#808080 guibg=#303030 gui=none
-hi LineNr 		guifg=#857b6f guibg=#000000 gui=none
-hi StatusLine 	guifg=#f6f3e8 guibg=#444444 gui=italic
-hi StatusLineNC guifg=#857b6f guibg=#444444 gui=none
-hi VertSplit 	guifg=#444444 guibg=#444444 gui=none
-hi Folded 		guibg=#384048 guifg=#a0a8b0 gui=none
-hi Title		guifg=#f6f3e8 guibg=NONE	gui=bold
-hi Visual		guifg=#f6f3e8 guibg=#444444 gui=none
-hi SpecialKey	guifg=#808080 guibg=#343434 gui=none
-
-" Syntax highlighting
-hi Comment 		guifg=#99968b gui=italic
-hi Todo 		guifg=#8f8f8f gui=italic
-hi Constant 	guifg=#e5786d gui=none
-hi String 		guifg=#95e454 gui=italic
-hi Identifier 	guifg=#cae682 gui=none
-hi Function 	guifg=#cae682 gui=none
-hi Type 		guifg=#cae682 gui=none
-hi Statement 	guifg=#8ac6f2 gui=none
-hi Keyword		guifg=#8ac6f2 gui=none
-hi PreProc 		guifg=#e5786d gui=none
-hi Number		guifg=#e5786d gui=none
-hi Special		guifg=#e7f6da gui=none
-
-
diff --git a/colors/wombat256.vim b/colors/wombat256.vim
deleted file mode 100755
index 21e3a5f..0000000
--- a/colors/wombat256.vim
+++ /dev/null
@@ -1,302 +0,0 @@
-" Vim color file
-" Maintainer:   David Liang (bmdavll at gmail dot com)
-" Last Change:  November 28 2008
-"
-" wombat256.vim - a modified version of Wombat by Lars Nielsen that also
-" works on xterms with 88 or 256 colors. The algorithm for approximating the
-" GUI colors with the xterm palette is from desert256.vim by Henry So Jr.
-
-set background=dark
-
-if version > 580
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let g:colors_name = "wombat256"
-
-if !has("gui_running") && &t_Co != 88 && &t_Co != 256
-	finish
-endif
-
-" functions {{{
-" returns an approximate grey index for the given grey level
-fun <SID>grey_number(x)
-	if &t_Co == 88
-		if a:x < 23
-			return 0
-		elseif a:x < 69
-			return 1
-		elseif a:x < 103
-			return 2
-		elseif a:x < 127
-			return 3
-		elseif a:x < 150
-			return 4
-		elseif a:x < 173
-			return 5
-		elseif a:x < 196
-			return 6
-		elseif a:x < 219
-			return 7
-		elseif a:x < 243
-			return 8
-		else
-			return 9
-		endif
-	else
-		if a:x < 14
-			return 0
-		else
-			let l:n = (a:x - 8) / 10
-			let l:m = (a:x - 8) % 10
-			if l:m < 5
-				return l:n
-			else
-				return l:n + 1
-			endif
-		endif
-	endif
-endfun
-
-" returns the actual grey level represented by the grey index
-fun <SID>grey_level(n)
-	if &t_Co == 88
-		if a:n == 0
-			return 0
-		elseif a:n == 1
-			return 46
-		elseif a:n == 2
-			return 92
-		elseif a:n == 3
-			return 115
-		elseif a:n == 4
-			return 139
-		elseif a:n == 5
-			return 162
-		elseif a:n == 6
-			return 185
-		elseif a:n == 7
-			return 208
-		elseif a:n == 8
-			return 231
-		else
-			return 255
-		endif
-	else
-		if a:n == 0
-			return 0
-		else
-			return 8 + (a:n * 10)
-		endif
-	endif
-endfun
-
-" returns the palette index for the given grey index
-fun <SID>grey_color(n)
-	if &t_Co == 88
-		if a:n == 0
-			return 16
-		elseif a:n == 9
-			return 79
-		else
-			return 79 + a:n
-		endif
-	else
-		if a:n == 0
-			return 16
-		elseif a:n == 25
-			return 231
-		else
-			return 231 + a:n
-		endif
-	endif
-endfun
-
-" returns an approximate color index for the given color level
-fun <SID>rgb_number(x)
-	if &t_Co == 88
-		if a:x < 69
-			return 0
-		elseif a:x < 172
-			return 1
-		elseif a:x < 230
-			return 2
-		else
-			return 3
-		endif
-	else
-		if a:x < 75
-			return 0
-		else
-			let l:n = (a:x - 55) / 40
-			let l:m = (a:x - 55) % 40
-			if l:m < 20
-				return l:n
-			else
-				return l:n + 1
-			endif
-		endif
-	endif
-endfun
-
-" returns the actual color level for the given color index
-fun <SID>rgb_level(n)
-	if &t_Co == 88
-		if a:n == 0
-			return 0
-		elseif a:n == 1
-			return 139
-		elseif a:n == 2
-			return 205
-		else
-			return 255
-		endif
-	else
-		if a:n == 0
-			return 0
-		else
-			return 55 + (a:n * 40)
-		endif
-	endif
-endfun
-
-" returns the palette index for the given R/G/B color indices
-fun <SID>rgb_color(x, y, z)
-	if &t_Co == 88
-		return 16 + (a:x * 16) + (a:y * 4) + a:z
-	else
-		return 16 + (a:x * 36) + (a:y * 6) + a:z
-	endif
-endfun
-
-" returns the palette index to approximate the given R/G/B color levels
-fun <SID>color(r, g, b)
-	" get the closest grey
-	let l:gx = <SID>grey_number(a:r)
-	let l:gy = <SID>grey_number(a:g)
-	let l:gz = <SID>grey_number(a:b)
-
-	" get the closest color
-	let l:x = <SID>rgb_number(a:r)
-	let l:y = <SID>rgb_number(a:g)
-	let l:z = <SID>rgb_number(a:b)
-
-	if l:gx == l:gy && l:gy == l:gz
-		" there are two possibilities
-		let l:dgr = <SID>grey_level(l:gx) - a:r
-		let l:dgg = <SID>grey_level(l:gy) - a:g
-		let l:dgb = <SID>grey_level(l:gz) - a:b
-		let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
-		let l:dr = <SID>rgb_level(l:gx) - a:r
-		let l:dg = <SID>rgb_level(l:gy) - a:g
-		let l:db = <SID>rgb_level(l:gz) - a:b
-		let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
-		if l:dgrey < l:drgb
-			" use the grey
-			return <SID>grey_color(l:gx)
-		else
-			" use the color
-			return <SID>rgb_color(l:x, l:y, l:z)
-		endif
-	else
-		" only one possibility
-		return <SID>rgb_color(l:x, l:y, l:z)
-	endif
-endfun
-
-" returns the palette index to approximate the 'rrggbb' hex string
-fun <SID>rgb(rgb)
-	let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
-	let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
-	let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
-	return <SID>color(l:r, l:g, l:b)
-endfun
-
-" sets the highlighting for the given group
-fun <SID>X(group, fg, bg, attr)
-	if a:fg != ""
-		exec "hi ".a:group." guifg=#".a:fg." ctermfg=".<SID>rgb(a:fg)
-	endif
-	if a:bg != ""
-		exec "hi ".a:group." guibg=#".a:bg." ctermbg=".<SID>rgb(a:bg)
-	endif
-	if a:attr != ""
-		if a:attr == 'italic'
-			exec "hi ".a:group." gui=".a:attr." cterm=none"
-		else
-			exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
-		endif
-	endif
-endfun
-" }}}
-
-call <SID>X("Normal",		"cccccc",	"242424",	"none")
-call <SID>X("Cursor",		"222222",	"ecee90",	"none")
-call <SID>X("CursorLine",	"",			"32322e",	"none")
-call <SID>X("CursorColumn",	"",			"2d2d2d",	"")
-			"CursorIM
-			"Question
-			"IncSearch
-call <SID>X("Search",		"d787ff",	"5f5f5f",	"")
-call <SID>X("MatchParen",	"ecee90",	"857b6f",	"bold")
-call <SID>X("SpecialKey",	"6c6c6c",	"2d2d2d",	"none")
-call <SID>X("Visual",		"ecee90",	"597418",	"none")
-call <SID>X("LineNr",		"857b6f",	"121212",	"none")
-call <SID>X("Folded",		"a0a8b0",	"404048",	"none")
-call <SID>X("Title",		"f6f3e8",	"",			"bold")
-call <SID>X("VertSplit",	"444444",	"444444",	"none")
-call <SID>X("StatusLine",	"f6f3e8",	"444444",	"italic")
-call <SID>X("StatusLineNC",	"857b6f",	"444444",	"none")
-			"Scrollbar
-			"Tooltip
-			"Menu
-			"WildMenu
-call <SID>X("Pmenu",		"f6f3e8",	"444444",	"")
-call <SID>X("PmenuSel",		"121212",	"caeb82",	"")
-call <SID>X("WarningMsg",	"ff0000",	"",			"")
-			"ErrorMsg
-			"ModeMsg
-			"MoreMsg
-			"Directory
-			"DiffAdd
-			"DiffChange
-			"DiffDelete
-			"DiffText
-
-" syntax highlighting
-call <SID>X("Number",		"e5786d",	"",			"none")
-call <SID>X("Constant",		"e5786d",	"",			"none")
-call <SID>X("String",		"95e454",	"",			"italic")
-call <SID>X("Comment",		"c0bc6c",	"",			"italic")
-call <SID>X("Identifier",	"caeb82",	"",			"none")
-call <SID>X("Keyword",		"87afff",	"",			"none")
-call <SID>X("Statement",	"87afff",	"",			"none")
-call <SID>X("Function",		"caeb82",	"",			"none")
-call <SID>X("PreProc",		"e5786d",	"",			"none")
-call <SID>X("Type",			"caeb82",	"",			"none")
-call <SID>X("Special",		"ffdead",	"",			"none")
-call <SID>X("Todo",			"857b6f",	"",			"italic")
-			"Underlined
-			"Error
-			"Ignore
-
-hi! link VisualNOS	Visual
-hi! link NonText	LineNr
-hi! link FoldColumn	Folded
-
-" delete functions {{{
-delf <SID>X
-delf <SID>rgb
-delf <SID>color
-delf <SID>rgb_color
-delf <SID>rgb_level
-delf <SID>rgb_number
-delf <SID>grey_color
-delf <SID>grey_level
-delf <SID>grey_number
-" }}}
-
-" vim:set ts=4 sw=4 noet fdm=marker:
diff --git a/colors/wombat256mod.vim b/colors/wombat256mod.vim
deleted file mode 100755
index 1137eb8..0000000
--- a/colors/wombat256mod.vim
+++ /dev/null
@@ -1,96 +0,0 @@
-" Vim color file
-" Original Maintainer:  Lars H. Nielsen (dengmao@gmail.com)
-" Last Change:  2010-07-23
-"
-" Modified version of wombat for 256-color terminals by
-"   David Liang (bmdavll@gmail.com)
-" based on version by
-"   Danila Bespalov (danila.bespalov@gmail.com)
-
-set background=dark
-
-if version > 580
-	hi clear
-	if exists("syntax_on")
-		syntax reset
-	endif
-endif
-
-let colors_name = "wombat256mod"
-
-
-" General colors
-hi Normal		ctermfg=252		ctermbg=234		cterm=none		guifg=#e3e0d7	guibg=#242424	gui=none
-hi Cursor		ctermfg=234		ctermbg=228		cterm=none		guifg=#242424	guibg=#eae788	gui=none
-hi Visual		ctermfg=251		ctermbg=239		cterm=none		guifg=#c3c6ca	guibg=#554d4b	gui=none
-hi VisualNOS	ctermfg=251		ctermbg=236		cterm=none		guifg=#c3c6ca	guibg=#303030	gui=none
-hi Search		ctermfg=177		ctermbg=241		cterm=none		guifg=#d787ff	guibg=#636066	gui=none
-hi Folded		ctermfg=103		ctermbg=237		cterm=none		guifg=#a0a8b0	guibg=#3a4046	gui=none
-hi Title		ctermfg=230						cterm=bold		guifg=#ffffd7					gui=bold
-hi StatusLine	ctermfg=230		ctermbg=238		cterm=none		guifg=#ffffd7	guibg=#444444	gui=italic
-hi VertSplit	ctermfg=238		ctermbg=238		cterm=none		guifg=#444444	guibg=#444444	gui=none
-hi StatusLineNC	ctermfg=241		ctermbg=238		cterm=none		guifg=#857b6f	guibg=#444444	gui=none
-hi LineNr		ctermfg=241		ctermbg=232		cterm=none		guifg=#857b6f	guibg=#080808	gui=none
-hi SpecialKey	ctermfg=241		ctermbg=235		cterm=none		guifg=#626262	guibg=#2b2b2b	gui=none
-hi WarningMsg	ctermfg=203										guifg=#ff5f55
-hi ErrorMsg		ctermfg=196		ctermbg=236		cterm=bold		guifg=#ff2026	guibg=#3a3a3a	gui=bold
-
-" Vim >= 7.0 specific colors
-if version >= 700
-hi CursorLine					ctermbg=236		cterm=none						guibg=#32322f
-hi MatchParen	ctermfg=228		ctermbg=101		cterm=bold		guifg=#eae788	guibg=#857b6f	gui=bold
-hi Pmenu		ctermfg=230		ctermbg=238						guifg=#ffffd7	guibg=#444444
-hi PmenuSel		ctermfg=232		ctermbg=192						guifg=#080808	guibg=#cae982
-endif
-
-" Diff highlighting
-hi DiffAdd						ctermbg=17										guibg=#2a0d6a
-hi DiffDelete	ctermfg=234		ctermbg=60		cterm=none		guifg=#242424	guibg=#3e3969	gui=none
-hi DiffText						ctermbg=53		cterm=none						guibg=#73186e	gui=none
-hi DiffChange					ctermbg=237										guibg=#382a37
-
-"hi CursorIM
-"hi Directory
-"hi IncSearch
-"hi Menu
-"hi ModeMsg
-"hi MoreMsg
-"hi PmenuSbar
-"hi PmenuThumb
-"hi Question
-"hi Scrollbar
-"hi SignColumn
-"hi SpellBad
-"hi SpellCap
-"hi SpellLocal
-"hi SpellRare
-"hi TabLine
-"hi TabLineFill
-"hi TabLineSel
-"hi Tooltip
-"hi User1
-"hi User9
-"hi WildMenu
-
-
-" Syntax highlighting
-hi Keyword		ctermfg=111		cterm=none		guifg=#88b8f6	gui=none
-hi Statement	ctermfg=111		cterm=none		guifg=#88b8f6	gui=none
-hi Constant		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
-hi Number		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
-hi PreProc		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
-hi Function		ctermfg=192		cterm=none		guifg=#cae982	gui=none
-hi Identifier	ctermfg=192		cterm=none		guifg=#cae982	gui=none
-hi Type			ctermfg=186		cterm=none		guifg=#d4d987	gui=none
-hi Special		ctermfg=229		cterm=none		guifg=#eadead	gui=none
-hi String		ctermfg=113		cterm=none		guifg=#95e454	gui=italic
-hi Comment		ctermfg=246		cterm=none		guifg=#9c998e	gui=italic
-hi Todo			ctermfg=101		cterm=none		guifg=#857b6f	gui=italic
-
-
-" Links
-hi! link FoldColumn		Folded
-hi! link CursorColumn	CursorLine
-hi! link NonText		LineNr
-
-" vim:set ts=4 sw=4 noet:
diff --git a/colors/wood.vim b/colors/wood.vim
deleted file mode 100755
index 2f6059e..0000000
--- a/colors/wood.vim
+++ /dev/null
@@ -1,39 +0,0 @@
-" Vim color file
-" Maintainer:   freddydaoud@netscape.net
-" Last Change:  09 Apr 2005
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="wood"
-
-hi Normal			guibg=#81816A guifg=linen
-hi Cursor			guibg=#CFCFC6 guifg=black gui=bold
-hi VertSplit		guifg=#81816A guibg=#CCCCAA gui=none
-hi Folded			guibg=black guifg=white
-hi FoldColumn		guibg=lightgray guifg=#292926
-hi ModeMsg			guifg=black guibg=#CFCFC6
-hi MoreMsg			guifg=black guibg=#CFCFC6
-hi NonText			guifg=white guibg=#61614A gui=none
-hi Question			guifg=snow
-hi Search			guibg=#CFCFC6 guifg=black gui=bold
-hi SpecialKey		guifg=yellow
-hi StatusLine		guibg=#DFDFD6 guifg=black gui=none
-hi StatusLineNC	    guibg=#BFBFB6 guifg=black gui=none
-hi Title			guifg=bisque3
-hi Subtitle			guifg=black
-hi Visual			guifg=#292926 guibg=#CFCFC6 gui=none
-hi WarningMsg		guifg=salmon4 guibg=gray60 gui=bold
-hi Comment			guifg=#D1D1BA
-hi Constant			guifg=#FFFFCC gui=bold
-hi Identifier		guifg=#FFFFCC
-hi Statement		guifg=#000000
-hi PreProc			guifg=black gui=bold
-hi Type				guifg=#FFE0C0
-hi Special			guifg=navajowhite
-hi Ignore			guifg=grey29
-hi Todo				guibg=black guifg=white
-hi WildMenu			guibg=brown
-hi LineNr           guifg=#CCCCAA guibg=#61614A
diff --git a/colors/wuye.vim b/colors/wuye.vim
deleted file mode 100755
index 88a6126..0000000
--- a/colors/wuye.vim
+++ /dev/null
@@ -1,82 +0,0 @@
-" Vim color file
-" Name:        WuYe
-" Maintainer:  Yeii
-" Last Change: 2009-08-12
-" Version:     1.2.1
-" URL:         http://www.vim.org/scripts/script.php?script_id=2088
-
-" Init
-highlight clear
-set background=dark
-if exists("syntax_on")
-   syntax reset
-endif
-let g:colors_name = "wuye"
-
-""""""""\ Highlighting groups for various occasions \""""""""
-hi SpecialKey   guifg=SlateBlue   ctermfg=Blue
-hi NonText      guifg=MidnightBlue   ctermfg=DarkBlue
-hi Directory    gui=BOLD guifg=LightSeaGreen   ctermfg=DarkCyan
-hi ErrorMsg     guifg=Yellow guibg=Firebrick   ctermfg=Yellow ctermbg=DarkRed
-hi IncSearch    gui=BOLD guifg=Red cterm=BOLD   ctermfg=Red
-hi Search       gui=BOLD guifg=MintCream guibg=Red   cterm=BOLD ctermfg=White ctermbg=Red
-hi MoreMsg      gui=BOLD guifg=MediumSpringGreen   cterm=BOLD ctermfg=DarkCyan
-hi ModeMsg      guifg=LawnGreen guibg=DeepSkyBlue4   ctermfg=Yellow ctermbg=DarkCyan
-hi LineNr       gui=UNDERLINE guifg=LightSkyBlue3 guibg=Gray10   cterm=UNDERLINE ctermfg=DarkGray
-hi Question     gui=BOLD guifg=green   cterm=BOLD ctermfg=green
-hi StatusLine   gui=BOLD guifg=White guibg=RoyalBlue4   cterm=BOLD ctermfg=White ctermbg=DarkBlue
-hi StatusLineNC gui=BOLD guifg=Bisque guibg=DimGray   cterm=BOLD ctermfg=Black ctermbg=Gray
-hi VertSplit    gui=BOLD guifg=Bisque guibg=DimGray   cterm=BOLD ctermfg=Black ctermbg=Gray
-hi Title        gui=BOLD guifg=DodgerBlue   cterm=BOLD ctermfg=LightBlue
-hi Visual       gui=REVERSE guibg=Yellow guifg=SlateBlue4   cterm=REVERSE ctermbg=Yellow ctermfg=DarkBlue
-hi WarningMsg   guifg=Gold   ctermfg=Yellow
-hi WildMenu     gui=BOLD guifg=Black guibg=Chartreuse   cterm=BOLD ctermfg=Black ctermbg=Darkgreen
-hi Folded       guifg=LightCyan guibg=DodgerBlue4   ctermfg=White ctermbg=DarkBlue
-hi FoldColumn   gui=BOLD guifg=DodgerBlue guibg=Gray16   cterm=BOLD ctermfg=Blue ctermbg=DarkGray
-hi DiffAdd      guifg=White guibg=Turquoise4   ctermfg=White ctermbg=Darkcyan
-hi DiffChange   guifg=White guibg=ForestGreen   ctermbg=Darkgreen
-hi DiffDelete   guifg=HotPink4 guibg=SlateGray4   ctermfg=DarkMagenta ctermbg=DarkGray
-hi DiffText     gui=BOLD guifg=Tomato guibg=DarkBlue   cterm=BOLD ctermfg=Magenta ctermbg=DarkBlue
-hi Cursor       guifg=Black guibg=Green   ctermfg=Black ctermbg=Green
-hi CursorIM     guifg=Black guibg=Red   ctermfg=Black ctermbg=Red
-hi CursorLine   gui=BOLD guibg=Black
-hi CursorColumn gui=BOLD guibg=Black
-
-""""""\ Syntax highlighting groups \""""""
-hi Normal       gui=NONE guifg=GhostWhite guibg=Gray8   cterm=NONE ctermfg=LightGray ctermbg=NONE
-hi MatchParen   gui=BOLD guifg=Gold   cterm=BOLD ctermfg=Yellow
-hi Comment      guifg=LightSlateGray   ctermfg=DarkGray
-hi Constant     guifg=CornflowerBlue   ctermfg=DarkCyan
- hi String       guifg=SteelBlue1   ctermfg=DarkCyan
- hi Character    guifg=SteelBlue   ctermfg=DarkCyan
- hi Number       guifg=Turquoise   ctermfg=DarkCyan
- hi Boolean      gui=BOLD guifg=DarkTurquoise   cterm=BOLD ctermfg=DarkCyan
- hi Float        guifg=Turquoise   ctermfg=DarkCyan
-hi Identifier   guifg=DeepSkyBlue   ctermfg=lightcyan
- hi Function     gui=BOLD guifg=DeepSkyBlue   cterm=BOLD ctermfg=lightcyan
-hi Statement    guifg=SpringGreen   ctermfg=LightGreen
- hi Conditional  guifg=SeaGreen1   ctermfg=LightGreen
- hi Repeat       guifg=SpringGreen   ctermfg=LightGreen
- hi Label        guifg=MediumSpringGreen   ctermfg=LightGreen
- hi Operator     guifg=Green2   ctermfg=LightGreen
- hi Keyword      gui=BOLD guifg=SpringGreen   cterm=BOLD ctermfg=LightGreen
- hi Exception    gui=BOLD guifg=SpringGreen2   cterm=BOLD ctermfg=LightGreen
-hi PreProc      guifg=Purple   ctermfg=DarkMagenta
- hi Include      guifg=Purple2   ctermfg=DarkMagenta
- hi Define       guifg=BlueViolet   ctermfg=DarkMagenta
- hi Macro        guifg=DarkViolet   ctermfg=DarkMagenta
- hi PreCondit    guifg=DarkOrchid   ctermfg=DarkMagenta
-hi Type         gui=BOLD guifg=RoyalBlue   cterm=BOLD ctermfg=LightBlue
- hi StorageClass gui=BOLD guifg=RoyalBlue2   cterm=BOLD ctermfg=LightBlue
- hi Structure    gui=BOLD guifg=DodgerBlue3   cterm=BOLD ctermfg=LightBlue
- hi Typedef      gui=BOLD guifg=RoyalBlue1   cterm=BOLD ctermfg=LightBlue
-hi Special      guifg=BurlyWood   ctermfg=DarkYellow
- hi Tag          guifg=Moccasin   ctermfg=DarkYellow
- hi Specialchar  guifg=Tan   ctermfg=DarkYellow
- hi Delimiter    guifg=Wheat3   ctermfg=DarkYellow
- hi Debug        guifg=peru   ctermfg=DarkYellow
-hi Underlined   gui=UNDERLINE   cterm=UNDERLINE
-hi Ignore       guifg=Gray75   ctermfg=DarkGray
-hi Error        guifg=Khaki guibg=VioletRed   ctermfg=Yellow ctermbg=LightMagenta
-hi Todo         guifg=Yellow guibg=NavyBlue   ctermfg=Yellow ctermbg=DarkBlue
-
diff --git a/colors/xemacs.vim b/colors/xemacs.vim
deleted file mode 100755
index c47607c..0000000
--- a/colors/xemacs.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-
-" Vim color file
-" Maintainer:   tranquility@portugalmail.pt
-" Last Change: 5 June 2002
-
-
-" cool help screens
-" :he group-name
-" :he highlight-groups
-" :he cterm-colors
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-let g:colors_name="xemacs"
-
-hi Normal				guibg=#cdcecd guifg=black
-hi Cursor				guibg=red guifg=grey gui=bold
-hi VertSplit		guibg=grey60 guifg=black gui=none
-hi Folded				guibg=royalblue3 guifg=white
-hi FoldColumn		guibg=royalblue4 guifg=white
-hi ModeMsg			guifg=#cdcecd guibg=black
-hi MoreMsg			guifg=#cdcecd guibg=black
-hi NonText			guifg=black guibg=#cdcecd gui=none
-hi Question			guifg=black
-hi Search				guibg=#aceeee
-hi SpecialKey		guifg=navyblue
-hi Special		guifg=navyblue
-hi StatusLine		guibg=#b7b7b7 guifg=black gui=none
-hi StatusLineNC	guibg=#a6b7b7 guifg=black gui=none
-hi Title				guifg=bisque3
-hi Subtitle			guifg=black
-hi Visual				guibg=#a4a5a3 guifg=black gui=none
-hi WarningMsg		guibg=#cdcecd guifg=black gui=bold
-hi Comment			guifg=#00008b
-hi Constant			guifg=#008900
-hi Identifier		guibg=#cdcecd guifg=black
-hi Statement		guifg=royalblue4
-hi PreProc			guifg=#0000cd
-hi Type					guifg=#4a81b4 gui=NONE
-hi Ignore				guifg=grey29
-hi Todo					guibg=gold guifg=black
-hi WildMenu			guibg=#b7b7b7 guibg=grey91
-hi Directory		guibg=#cdcecd guifg=navyblue
diff --git a/colors/xian.vim b/colors/xian.vim
deleted file mode 100755
index 3cc02d8..0000000
--- a/colors/xian.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-set background=dark
-hi clear
-if exists("syntax_on")
-  syntax reset
-endif
-
-let g:colors_name = "xian"
-
-hi Comment	guifg=#C0C0C0 guibg=#946464 gui=underline
-hi Constant	guifg=#00FF80 guibg=#946464 gui=none
-hi Cursor	guifg=#00FFFF guibg=#000000 gui=reverse
-hi DiffAdd	guifg=#00FFFF guibg=#754F4F gui=bold,underline
-hi DiffChange	guibg=#754F4F
-hi DiffDelete	guifg=#C0C0C0 guibg=#754F4F gui=bold
-hi DiffText	guifg=#000000 guibg=#FF0000 gui=bold,underline
-hi Directory	guifg=#FFFF00 guibg=#946464 gui=underline
-hi Error	guifg=#000000 guibg=#FF0000 gui=bold,underline
-hi ErrorMsg	guifg=#000000 guibg=#FF0000 gui=bold,underline
-hi FoldColumn	guifg=#ffff74 guibg=#754F4F gui=bold
-hi Folded	guifg=#ffff74 guibg=#754F4F gui=underline
-hi Identifier	guifg=#EEAA73 guibg=#946464 gui=none
-hi Ignore	guifg=#946464 guibg=#946464 gui=none
-hi IncSearch	guifg=#FFFFFF guibg=#946464 gui=reverse
-hi lCursor	guifg=#FFFFFF guibg=#946464 gui=none
-hi LineNr	guifg=#C0C0C0 guibg=#754F4F gui=bold
-hi Match	guifg=#0000FF guibg=#FFFF00 gui=bold,reverse
-hi ModeMsg	guifg=#FFFFFF guibg=#946464 gui=bold
-hi MoreMsg	guifg=#d174a8 guibg=#946464 gui=bold
-hi NonText	guifg=#C0C0C0 guibg=#946464 gui=none
-hi Normal	guifg=#FFFFFF guibg=#946464 gui=none
-hi PreProc	guifg=#FFFF00 guibg=#946464 gui=none
-hi Question	guifg=#d174a8 guibg=#946464 gui=bold
-hi Search	guifg=#FFFF00 guibg=#FF8500 gui=underline
-hi Special	guifg=#bfbfef guibg=#946464 gui=none
-hi SpecialKey	guifg=#FFFF00 guibg=#946464 gui=none
-hi Statement	guifg=#5ad5d5 guibg=#946464 gui=bold
-hi StatusLine	guifg=#000000 guibg=#FFFFFF gui=bold
-hi StatusLineNC	guifg=#C0C0C0 guibg=#754F4F gui=bold
-hi Title	guifg=#74FF74 guibg=#946464 gui=bold
-hi Todo		guifg=#FFFF00 guibg=#0000FF gui=none
-hi Type		guifg=#FF74A8 guibg=#946464 gui=bold
-hi User1	guifg=#999933 guibg=#45637F gui=bold
-hi User2	guifg=#E7E77F guibg=#45637F gui=bold
-hi User3	guifg=#000000 guibg=#45637F gui=bold
-hi User4	guifg=#33CC99 guibg=#45637F gui=bold
-hi VertSplit	guifg=#FFFF00 guibg=#000000 gui=bold
-hi Visual	guifg=#FFFF00 guibg=#6B959B gui=none
-hi VisualNOS	guifg=#FFFFFF guibg=#946464 gui=underline
-hi WarningMsg	guifg=#000000 guibg=#FF0000 gui=bold,underline
-hi WildMenu	guifg=#FFFFFF guibg=#0000FF gui=none
diff --git a/colors/xmaslights.vim b/colors/xmaslights.vim
deleted file mode 100755
index dc5e014..0000000
--- a/colors/xmaslights.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-python << EOL
-# xmaslights.vim 
-# Version: 0.1
-# Author: Ryan (gt3 Kulla
-# Python script for Vim to make your text appear as animated Christmas lights
-#
-# You will not be able to use vim until you press ctrl+c to stop the script because this script makes 
-# vim act like a screensaver. This script only changes the color of 'guifg' and was made and tested using
-# gvim 6.2 for win32. Modify it if needed.
-#
-# Usage: 
-#    (Note: you must have vim compiled with +python for this to work)
-#    1) Put xmaslights.vim in your Vim plugins directory. 
-#    2) open a file that uses syntax highlighting like a .html file
-#    3) type ":py xmas()"
-import vim
-import time
-import random
-
-colors = ("red", "green") # feel free to add more colors
-
-attribs = ("comment", "underlined", "cursor", "constant", "identifier", "statement", "preproc", "type", "special", "error", "todo", "directory", "statusline", "normal", "search", "nontext", "errormsg", "warningmsg", "modemsg", "moremsg", "incsearch", "linenr", "title", "statuslinenc", "label", "operator", "clear visual", "visual", "diffchange", "difftext", "diffadd", "diffdelete", "folded", "foldedcolumn", "clf0") # take items out you know you don't want colorized
-
-def xmas():
-    if not vim.eval("&syntax"):
-        print "Open a file that uses syntax highlighting and try again."
-        return
-    while 1:
-        for attrib in attribs:
-            vim.command("hi %s guifg=%s" % (attrib, random.choice(colors)))
-            time.sleep(1) # if this is too slow, use a fraction of a second like sleep(.3)
-            vim.command("redraw")
-
-EOL
diff --git a/colors/xoria256.vim b/colors/xoria256.vim
deleted file mode 100755
index 5b988b3..0000000
--- a/colors/xoria256.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-" Vim color file
-"
-" Name:       xoria256.vim
-" Version:    1.1
-" 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=#181818 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             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=184 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             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/colors/yaml.vim b/colors/yaml.vim
deleted file mode 100755
index b922047..0000000
--- a/colors/yaml.vim
+++ /dev/null
@@ -1,62 +0,0 @@
-" To make this file do stuff, add something like the following (without the
-" leading ") to your ~/.vimrc:
-" au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
-
-" Vim syntax/macro file
-" Language:	YAML
-" Author:	Igor Vergeichik <iverg@mail.ru>
-" Sponsor: Tom Sawyer <transami@transami.net>
-" Stayven: Ryan King <jking@panoptic.com>
-" Copyright (c) 2002 Tom Saywer
-
-" Add an item to a gangly list:
-"map , o<bs><bs><bs><bs>-<esc>o
-" Convert to Canonical form:
-"map \c :%!python -c 'from yaml.redump import redump; import sys; print redump(sys.stdin.read()).rstrip()'
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-syntax clear
-
-syn match yamlDelimiter	"[:,-]"
-syn match yamlBlock "[\[\]\{\}\|\>]"
-syn match yamlOperator "[?^+-]\|=>"
-
-syn region yamlComment	start="\#" end="$"
-syn match yamlIndicator	"#YAML:\S\+"
-
-syn region yamlString	start="'" end="'" skip="\\'"
-syn region yamlString	start='"' end='"' skip='\\"' contains=yamlEscape
-syn match  yamlEscape	+\\[abfnrtv'"\\]+ contained
-syn match  yamlEscape	"\\\o\o\=\o\=" contained
-syn match  yamlEscape	"\\x\x\+" contained
-
-syn match  yamlType	"!\S\+"
-
-syn keyword yamlConstant NULL Null null NONE None none NIL Nil nil
-syn keyword yamlConstant TRUE True true YES Yes yes ON On on
-syn keyword yamlConstant FALSE False false NO No no OFF Off off
-
-syn match  yamlKey	"\w\+\ze\s*:"
-syn match  yamlAnchor	"&\S\+"
-syn match  yamlAlias	"*\S\+"
-
-" Setupt the hilighting links
-
-hi link yamlConstant Keyword
-hi link yamlIndicator PreCondit
-hi link yamlAnchor	Function
-hi link yamlAlias	Function
-hi link yamlKey		Identifier
-hi link yamlType	Type
-
-hi link yamlComment	Comment
-hi link yamlBlock	Operator
-hi link yamlOperator	Operator
-hi link yamlDelimiter	Delimiter
-hi link yamlString	String
-hi link yamlEscape	Special
-
diff --git a/colors/yeller.vim b/colors/yeller.vim
deleted file mode 100755
index 36ea644..0000000
--- a/colors/yeller.vim
+++ /dev/null
@@ -1,165 +0,0 @@
-" Vim color file
-" yeller v1.0b
-" http://www.vim.org/scripts/script.php?script_id=1454
-" 
-" Maintainer:	Shawn Axsom <axs221@gmail.com>
-"
-"   * Place :colo yeller in your VimRC/GVimRC file
-"     * GvimRC if using GUI any
-"
-"   - Thanks to Desert and OceanDeep for their color scheme 
-"     file layouts
-"   - Thanks to Raimon Grau for his feedback
-
-set background=dark
-if version > 580
-    " no guarantees for version 5.8 and below, but this makes it stop
-    " complaining
-    hi clear
-    if exists("syntax_on")
-		syntax reset
-    endif
-endif
-
-let g:colors_name="yeller"
-
-hi Normal       guifg=#cbdcef guibg=#203327   "1a1823
-hi NonText      guifg=#382920 guibg=#151b15
-
-hi Folded       guibg=#201f32 guifg=#BBDDCC
-hi FoldColumn	guibg=#22302f guifg=#dbcaa5
-hi LineNr       guibg=#23302d guifg=#50c5b5 
-hi StatusLine	guibg=#2c3a3a guifg=#6a955d gui=none
-hi StatusLineNC	guibg=#253835 guifg=#151318 gui=none
-hi VertSplit	guibg=#22353a guifg=grey50 gui=none
-
-" syntax highlighting """"""""""""""""""""""""""""""""""""""""
-
-hi Comment		guifg=#3a504a
-hi Title		guifg=#fb4c2f  gui=none
-hi Underlined   guifg=#fb4c5a gui=none
-
-hi Statement    guifg=#ffef60  gui=none
-hi Type			guifg=#aab56a  gui=none
-hi Constant		guifg=#f09a5a
-hi Number		guifg=#f0aa8a
-hi PreProc      guifg=#d045a3
-hi Identifier   guifg=#b08aaa
-hi Special		guifg=#a0aa95
-hi Operator		guifg=#4a4a50
-"hi Keyword		guifg=green
-"hi Error        guibg=#408452
-hi Function     guifg=#c05a3a guibg=bg "or green 50b3b0 
-hi Conditional	guifg=#f5a05a guibg=bg
-hi Repeat		guifg=#f5705a guibg=bg
-hi Exception	guifg=#ffff30
-"hi Ignore       guifg=grey40
-"hi Todo			guifg=orangered guibg=yellow2
-"""""this section borrowed from OceanDeep/Midnight"""""
-"hi Label gui=None guifg=LightGreen guibg=bg
-"highlight Operator gui=None guifg=#daca65 guibg=bg
-"highlight Keyword gui=bold guifg=grey guibg=bg
-"highlight Exception gui=none guifg=#ea5460 guibg=bg
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"end syntax highlighting """""""""""""""""""""""""""""""""""""
-
-" highlight groups
-"hi CursorIM
-hi Directory	guifg=#bbd0df
-"hi DiffAdd
-"hi DiffChange
-"hi DiffDelete
-"hi DiffText
-hi ErrorMsg     guibg=#ff4545
-
-hi Cursor       guibg=#cad5c0 guifg=#05293d
-
-
-hi Search       guibg=#9a9d8d guifg=#3a4520
-hi IncSearch	guifg=#caceba guibg=#3a4520 
-
-hi ModeMsg    	guifg=#00AACC
-hi MoreMsg      guifg=SeaGreen
-hi Question    	guifg=#AABBCC
-hi SpecialKey	guifg=#90dcb0
-hi Visual       guifg=#4a2F3F guibg=#935FdF
-"hi VisualNOS
-hi WarningMsg	guifg=salmon
-"hi WildMenu
-"hi Menu
-"hi Scrollbar  guibg=grey30 guifg=tan
-"hi Tooltip
-
-
-" new Vim 7.0 items
-hi Pmenu        guibg=#3a6595 guifg=#9aadd5
-hi PmenuSel     guibg=#4a85ba guifg=#b0d0f0                    
-
-
-
-
-
-" color terminal definitions
-hi Normal ctermfg=grey
-hi Number ctermfg=blue
-highlight Operator ctermfg=yellow
-highlight Conditional ctermfg=darkred
-highlight Repeat ctermfg=darkred
-hi Exception ctermfg=red
-hi function ctermfg=darkyellow
-hi SpecialKey	ctermfg=darkgreen
-hi NonText	cterm=bold ctermfg=darkgrey
-hi Directory	ctermfg=darkcyan
-hi ErrorMsg	cterm=bold ctermfg=7 ctermbg=1
-hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-hi MoreMsg	ctermfg=darkgreen
-hi ModeMsg	cterm=NONE ctermfg=brown
-hi LineNr	ctermfg=darkcyan ctermbg=NONE
-hi Question	ctermfg=green
-hi StatusLine	ctermfg=blue ctermbg=grey cterm=NONE
-hi StatusLineNC ctermfg=black ctermbg=grey cterm=NONE
-hi VertSplit	ctermfg=black ctermbg=grey cterm=NONE
-hi Title	ctermfg=Yellow cterm=NONE
-hi Visual	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi VisualNOS	ctermbg=darkcyan ctermfg=black cterm=NONE
-hi WarningMsg	ctermfg=1
-hi WildMenu	ctermfg=0 ctermbg=3
-hi Folded	ctermfg=darkgreen ctermbg=NONE cterm=NONE
-hi FoldColumn	ctermfg=green ctermbg=black
-hi DiffAdd	ctermbg=4
-hi DiffChange	ctermbg=5
-hi DiffDelete	cterm=bold ctermfg=4 ctermbg=6
-hi DiffText	cterm=bold ctermbg=1
-hi identifier   ctermfg=darkmagenta
-
-"set comments to grey on non-Windows OS's to make sure
-"it is readable
-if &term == "builtin_gui" || &term == "win32"
-	hi Comment		ctermfg=darkgrey  ctermbg=darkblue
-	hi IncSearch	ctermfg=black ctermbg=grey cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkgrey cterm=NONE
-else
-	hi Comment		ctermfg=grey  ctermbg=darkblue
-	hi IncSearch	ctermfg=yellow ctermbg=darkyellow cterm=NONE
-	hi Search	ctermfg=black ctermbg=darkyellow cterm=NONE
-endif
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-hi Constant	ctermfg=blue
-hi Special	ctermfg=darkmagenta
-hi Statement	ctermfg=red
-hi PreProc	ctermfg=magenta
-hi Type		ctermfg=darkblue " ctermbg=darkblue
-hi Underlined	ctermfg=yellow cterm=NONE
-hi Ignore	cterm=bold ctermfg=7
-hi Ignore	ctermfg=darkgrey
-hi Error	cterm=bold ctermfg=7 ctermbg=1
-
-" new Vim 7.0 items
-hi Pmenu        ctermbg=darkblue ctermfg=lightgrey
-hi PmenuSel     ctermbg=lightblue ctermfg=white                    
-
-"vim: sw=4
-
-
diff --git a/colors/zazen.vim b/colors/zazen.vim
deleted file mode 100755
index 84f8b4e..0000000
--- a/colors/zazen.vim
+++ /dev/null
@@ -1,135 +0,0 @@
-" =============================================================================
-" File:        zazen.vim
-" Description: Vim color scheme file
-" Maintainer:  Zoltan Dezso
-" =============================================================================
-set background=dark
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "zazen"
-
-hi Normal       guifg=#cccccc          guibg=#1a1a1a   gui=NONE
-hi CursorLine   guifg=NONE             guibg=#555555   gui=NONE
-hi CursorColumn guifg=NONE             guibg=#000000   gui=NONE
-hi LineNr       guifg=#555555          guibg=NONE      gui=NONE
-hi Statement    guifg=#a6a6a6          guibg=NONE      gui=bold
-hi Function     guifg=#eeeeee          guibg=NONE      gui=bold
-hi String       guifg=#838383          guibg=NONE      gui=NONE
-hi Type         guifg=#eeeeee          guibg=NONE      gui=bold
-hi Conditional  guifg=#787878          guibg=NONE      gui=bold
-hi Todo         guifg=#ff0000          guibg=NONE      gui=underline
-hi Comment      guifg=#777777          guibg=NONE      gui=NONE
-hi PmenuSel     guifg=#000000          guibg=#a9a9aa   gui=bold
-hi Special      guifg=#868585          guibg=NONE      gui=NONE
-hi Identifier   guifg=#ffffff          guibg=NONE      gui=bold
-hi Keyword      guifg=#666666          guibg=NONE      gui=bold
-hi PreProc      guifg=#6b6b6b          guibg=NONE      gui=bold
-hi Include      guifg=#cc7833          guibg=NONE      gui=NONE
-hi Constant     guifg=#838383          guibg=#222222   gui=bold
-hi Delimiter    guifg=#838383          guibg=NONE      gui=NONE
-
-hi Visual       guifg=#ffffff          guibg=#515151   gui=NONE
-hi ColorColumn  guifg=NONE             guibg=#e6e6e6 
-hi Cursor       guifg=bg               guibg=fg        gui=NONE
-hi CursorIM     guifg=bg               guibg=fg        gui=NONE
-hi lCursor      guifg=bg               guibg=fg        gui=NONE
-
-hi DiffAdd      guifg=fg               guibg=#444444   gui=NONE
-hi DiffChange   guifg=bg               guibg=#909090   gui=NONE
-hi DiffDelete   guifg=NONE             guibg=#292929   gui=NONE
-hi DiffText     guifg=NONE             guibg=#383838   gui=NONE
-
-hi Directory    guifg=#929292          guibg=bg        gui=NONE
-hi ErrorMsg     guifg=#6f6f6f          guibg=NONE      gui=NONE
-hi FoldColumn   guifg=#555555           guibg=#414141   gui=bold
-hi Folded       guifg=#828282           guibg=#212121   gui=italic
-
-hi IncSearch    guifg=#000000          guibg=#adadad   gui=NONE
-hi Search       guifg=#000000          guibg=#c5c3c3   gui=NONE
-hi MatchParen   guifg=#000000          guibg=#a8a8a8   gui=bold
-hi ModeMsg      guifg=#ffffff          guibg=#767676   gui=bold
-hi MoreMsg      guifg=#7c7c7c          guibg=bg        gui=bold
-hi NonText      guifg=#7e7e7e          guibg=bg        gui=bold
-
-hi Pmenu        guifg=#656565          guibg=#3f3f3f   gui=NONE
-hi PmenuSbar    guifg=fg               guibg=#5d5d5d   gui=NONE
-hi PmenuThumb   guifg=fg               guibg=#777777   gui=NONE
-
-hi Question     guifg=#454545          guibg=bg        gui=bold
-hi SignColumn   guifg=#ffffff          guibg=#696969   gui=NONE
-
-hi SpecialKey   guifg=#ffffff          guibg=#696969   gui=NONE
-
-hi SpellBad     guisp=#ffffff          guibg=#000000   gui=undercurl    guisp=#ffc0c0
-hi SpellCap     guisp=#5d5d5d                          gui=undercurl
-hi SpellLocal   guisp=#434343                          gui=undercurl
-hi SpellRare    guisp=#7d7d7d                          gui=undercurl
-hi StatusLine   guifg=#000000          guibg=#727272   gui=bold
-hi StatusLineNC guifg=#5a5959          guibg=#222222   gui=italic
-hi TabLine      guifg=fg               guibg=#757575   gui=underline
-hi TabLineFill  guifg=fg               guibg=bg        gui=reverse
-hi TabLineSel   guifg=fg               guibg=bg        gui=bold
-hi Title        guifg=#6d6d6d          guibg=bg        gui=bold
-hi VertSplit    guifg=#222222          guibg=#222222
-hi WarningMsg   guifg=#cfcfcf          guibg=#5b5b5b   gui=NONE
-hi WildMenu     guifg=#000000          guibg=#828282   gui=NONE
-hi Boolean      guifg=#616060          guibg=NONE      gui=bold
-hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-hi Error        guifg=#ff7272          guibg=NONE      gui=undercurl guisp=#ff0000
-" -----------------------------------------------------------------------------
-hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-hi qfFileName       guifg=#6a6a6a      guibg=NONE      gui=italic
-hi qfLineNr         guifg=fg           guibg=NONE      gui=NONE
-hi qfError          guifg=fg           guibg=#000000   gui=undercurl
-
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-" -----------------------------------------------------------------------------
-hi htmlLink         guifg=#666666      guibg=NONE      gui=underline,italic
-
-hi htmlTagName          guifg=NONE             guibg=NONE      gui=NONE
-hi link htmlScriptTag htmlTagName
-hi link htmlTagN htmlTagName
-hi link htmlEndTag htmlTagName
-hi link htmlSpecialTagName htmlTagName
-
-hi link cssRenderAttr Constant 
-hi link cssTextAttr Constant
-hi link cssUIAttr Constant
-hi link cssTableAttr Constant
-hi link cssColorAttr Constant
-hi link cssBoxAttr Constant
-hi link cssCommonAttr Constant
-hi link cssFunctionName Constant
-hi link cssRenderProp Type
-hi link cssBoxProp cssRenderProp
-
-hi link cssTagName Statement
-hi link cssClassName cssTagName
-hi link cssIdentifier cssTagName
-hi link cssPseudoClass cssTagName
-hi link cssPseudoClassId cssTagName
-
-hi cssBraces            guifg=fg            guibg=bg              gui=NONE
-hi javaScript           guifg=fg            guibg=NONE
-hi link javaScriptFunction Statement
-hi link javaScriptMember Statement
-hi link javaScriptValue Constant
-
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
-
-hi link javaType Statement
-hi link cppStatement  Statement
-
-
diff --git a/colors/zen.vim b/colors/zen.vim
deleted file mode 100755
index beca424..0000000
--- a/colors/zen.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Vim color file
-" Maintainer:	Rudá Moura <ruda.moura@gmail.com>
-" Last Change:	Mon Oct 18 23:09:26 BRST 2010
-
-set background=light
-highlight clear
-if exists("syntax on")
-  syntax reset
-endif
-
-let g:colors_name = "zen"
-
-highlight Normal     term=none ctermfg=black   cterm=none guifg=black   gui=none
-highlight Comment    term=none ctermfg=cyan    cterm=none guifg=cyan    gui=none
-highlight Constant   term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Special    term=none ctermfg=red     cterm=bold guifg=red     gui=bold
-highlight Identifier term=none ctermfg=black   cterm=none guifg=black   gui=none
-highlight Statement  term=bold ctermfg=black   cterm=bold guifg=black   gui=bold
-highlight Operator   term=bold ctermfg=black   cterm=bold guifg=black   gui=bold
-highlight PreProc    term=bold ctermfg=green   cterm=none guifg=green   gui=none
-highlight Type       term=bold ctermfg=magenta cterm=none guifg=magenta gui=none
-highlight String     term=none ctermfg=red     cterm=none guifg=red     gui=none
-highlight Number     term=none ctermfg=red     cterm=none guifg=red     gui=none
diff --git a/colors/zenburn.vim b/colors/zenburn.vim
old mode 100755
new mode 100644
diff --git a/colors/zenesque.vim b/colors/zenesque.vim
deleted file mode 100755
index 9789aad..0000000
--- a/colors/zenesque.vim
+++ /dev/null
@@ -1,384 +0,0 @@
-" =============================================================================
-" File:        zenesque.vim
-" Description: Vim color scheme file
-" Maintainer:  Paul L
-" =============================================================================
-set background=light
-highlight clear
-if exists("syntax_on")
-  syntax reset
-endif
-let colors_name = "zenesque"
-" =============================================================================
-
-" default scheme
-
-hi Normal       guifg=#000000          guibg=#e0e0d8   gui=NONE
-hi CursorLine   guifg=NONE             guibg=#e1e1d0   gui=NONE
-hi CursorColumn guifg=NONE             guibg=#e1e1d0   gui=NONE
-hi LineNr       guifg=#a9a99e          guibg=NONE      gui=NONE
-hi Constant     guifg=#353535          guibg=NONE      gui=bold
-hi Statement    guifg=#363636          guibg=NONE      gui=italic
-hi Function     guifg=fg               guibg=NONE      gui=bold
-hi String       guifg=#3c3c3c          guibg=NONE      gui=NONE
-hi Type         guifg=#616161          guibg=NONE      gui=bold,italic
-hi Conditional  guifg=#4d4d4d          guibg=NONE      gui=bold
-hi Todo         guifg=fg               guibg=NONE      gui=bold,underline
-hi Comment      guifg=#797979          guibg=NONE      gui=italic
-hi PmenuSel     guifg=fg               guibg=#a9a9aa   gui=bold
-hi ColorColumn  guifg=NONE             guibg=#e6e6e6
-hi Cursor       guifg=bg               guibg=fg        gui=NONE
-hi CursorIM     guifg=bg               guibg=fg        gui=NONE
-hi lCursor      guifg=bg               guibg=fg        gui=NONE
-hi DiffAdd      guifg=NONE             guibg=#d1d1d1   gui=NONE
-hi DiffChange   guifg=NONE             guibg=#9d9d9d   gui=NONE
-hi DiffDelete   guifg=NONE             guibg=#949494   gui=NONE
-hi DiffText     guifg=#000000          guibg=#bababa   gui=bold
-hi Directory    guifg=#525252          guibg=bg        gui=NONE
-hi ErrorMsg     guifg=#6f6f6f          guibg=NONE      gui=NONE
-hi FoldColumn   guifg=#555555          guibg=#cccbcb   gui=bold
-hi Folded       guifg=#555555          guibg=#cccccc   gui=italic
-
-hi IncSearch    guifg=#000000          guibg=#adadad   gui=NONE
-hi Search       guifg=#000000          guibg=#c5c3c3   gui=NONE
-hi MatchParen   guifg=#000000          guibg=#a8a8a8   gui=bold
-hi ModeMsg      guifg=#ffffff          guibg=#767676   gui=bold
-hi MoreMsg      guifg=#7c7c7c          guibg=bg        gui=bold
-hi NonText      guifg=#7e7e7e          guibg=bg        gui=bold
-
-hi Pmenu        guifg=#646564          guibg=#b1b2b1   gui=reverse
-hi PmenuSbar    guifg=#ffffff          guibg=#989898   gui=NONE
-hi PmenuThumb   guifg=#ffffff          guibg=#777777   gui=NONE
-
-hi Question     guifg=#454545          guibg=bg        gui=bold
-hi SignColumn   guifg=#ffffff          guibg=#696969   gui=NONE
-
-hi SpecialKey   guifg=#ffffff          guibg=#696969    gui=NONE
-
-hi SpellBad     guisp=#323232          guibg=#d1cdcd   gui=undercurl
-hi SpellCap     guisp=#5d5d5d                          gui=undercurl
-hi SpellLocal   guisp=#434343                          gui=undercurl
-hi SpellRare    guisp=#7d7d7d                          gui=undercurl
-hi StatusLine   guifg=#e8e8e8          guibg=#858585   gui=bold
-hi StatusLineNC guifg=#808080          guibg=#bbbbbb   gui=italic
-hi TabLine      guifg=fg               guibg=#898a8b   gui=underline
-hi TabLineFill  guifg=fg               guibg=bg        gui=reverse
-hi TabLineSel   guifg=fg               guibg=bg        gui=bold
-hi Title        guifg=#6d6d6d          guibg=bg        gui=bold
-hi VertSplit    guifg=#b9b9b9          guibg=#b9b9b9
-hi Visual       guifg=#ffffff          guibg=#9a9a9a   gui=NONE
-hi WarningMsg   guifg=#cfcfcf          guibg=#5b5b5b   gui=NONE
-hi WildMenu     guifg=#000000          guibg=#c2c2c2   gui=NONE
-
-hi Boolean      guifg=#616060          guibg=NONE      gui=bold
-hi Identifier   guifg=#141414          guibg=NONE      gui=bold
-hi Keyword      guifg=#666666          guibg=NONE      gui=underline
-hi PreProc      guifg=#6b6b6b          guibg=NONE      gui=NONE
-hi Special      guifg=#6e6e6e          guibg=NONE      gui=NONE
-hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-hi Error        guifg=#727272          guibg=NONE      gui=undercurl
-" -----------------------------------------------------------------------------
-hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-hi qfFileName       guifg=#6a6a6a      guibg=NONE      gui=italic
-hi qfLineNr         guifg=fg           guibg=NONE      gui=NONE
-hi qfError          guifg=fg           guibg=#c4c2c2   gui=undercurl
-
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-
-" -----------------------------------------------------------------------------
-hi htmlLink             guifg=#666666          guibg=NONE      gui=underline,italic
-
-if exists('g:zenesque_colors') && g:zenesque_colors==1
-    " light scheme with colors
-    
-    hi Normal       guifg=#0b092c          guibg=#e5e5d8   gui=NONE
-    hi CursorLine   guifg=NONE             guibg=#d4d4c0   gui=NONE
-    hi CursorColumn guifg=NONE             guibg=#d4d4c0   gui=NONE
-    hi LineNr       guifg=#888875          guibg=NONE      gui=NONE
-    hi Constant     guifg=#73221A          guibg=NONE      gui=NONE
-    hi String       guifg=#073010          guibg=NONE      gui=NONE
-    hi Function     guifg=#3b1c5b          guibg=NONE      gui=bold
-    hi Statement    guifg=#100051          guibg=NONE      gui=italic
-    hi Conditional  guifg=#6e220e          guibg=NONE      gui=NONE
-    hi Type         guifg=#421b4d          guibg=NONE      gui=italic
-    hi Todo         guifg=#6c0303          guibg=NONE      gui=NONE
-    hi Comment      guifg=#6e6e6e          guibg=NONE      gui=italic
-    hi PmenuSel     guifg=fg               guibg=#c37a23   gui=bold
-    hi ColorColumn  guifg=NONE             guibg=#e6e6e6
-    hi Cursor       guifg=bg               guibg=fg        gui=NONE
-    hi CursorIM     guifg=bg               guibg=fg        gui=NONE
-    hi lCursor      guifg=bg               guibg=fg        gui=NONE
-
-    hi diffAdd      guifg=bg               guibg=#5a7e5d   gui=none
-    hi diffDelete   guifg=#bf6a6a          guibg=#3d2424   gui=none
-    hi diffChange   guifg=bg               guibg=#b55c5c   gui=none
-    hi diffText     guifg=bg               guibg=#264928   gui=none
-
-    hi Directory    guifg=#525252          guibg=bg        gui=NONE
-    hi ErrorMsg     guifg=#6f6f6f          guibg=NONE      gui=NONE
-    hi FoldColumn   guifg=#555555          guibg=#cccbcb   gui=bold
-    hi Folded       guifg=#555555          guibg=#cccccc   gui=italic
-
-    hi IncSearch    guifg=#000000          guibg=#adadad   gui=NONE
-    hi Search       guifg=#000000          guibg=#c5c3c3   gui=NONE
-    hi MatchParen   guifg=#000000          guibg=#a8a8a8   gui=bold
-    hi ModeMsg      guifg=#ffffff          guibg=#767676   gui=bold
-    hi MoreMsg      guifg=#7c7c7c          guibg=bg        gui=bold
-    hi NonText      guifg=#7e7e7e          guibg=bg        gui=bold
-
-    hi Pmenu        guifg=#646564          guibg=#b1b2b1   gui=reverse
-    hi PmenuSbar    guifg=#ffffff          guibg=#989898   gui=NONE
-    hi PmenuThumb   guifg=#ffffff          guibg=#777777   gui=NONE
-
-    hi Question     guifg=#454545          guibg=bg        gui=bold
-    hi SignColumn   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpecialKey   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpellBad     guisp=#323232          guibg=#d1cdcd   gui=undercurl
-    hi SpellCap     guisp=#5d5d5d                          gui=undercurl
-    hi SpellLocal   guisp=#434343                          gui=undercurl
-    hi SpellRare    guisp=#7d7d7d                          gui=undercurl
-    hi StatusLine   guifg=fg               guibg=#c0bebe   gui=bold
-    hi StatusLineNC guifg=#808080          guibg=#c5c5af   gui=italic
-    hi TabLine      guifg=fg               guibg=#898a8b   gui=underline
-    hi TabLineFill  guifg=fg               guibg=bg        gui=reverse
-    hi TabLineSel   guifg=fg               guibg=bg        gui=bold
-    hi Title        guifg=#6d6d6d          guibg=bg        gui=bold
-    hi VertSplit    guifg=#c5c5af          guibg=#c5c5af
-    hi Visual       guifg=#ffffff          guibg=#9a9a9a   gui=NONE
-    hi WarningMsg   guifg=#cfcfcf          guibg=#5b5b5b   gui=NONE
-    hi WildMenu     guifg=#000000          guibg=#c2c2c2   gui=NONE
-    hi Boolean      guifg=#616060          guibg=NONE      gui=bold
-    hi Identifier   guifg=#141414          guibg=NONE      gui=bold
-    hi Keyword      guifg=#666666          guibg=NONE      gui=underline
-    hi PreProc      guifg=#272c61          guibg=NONE      gui=NONE
-    hi Special      guifg=#6e6e6e          guibg=NONE      gui=NONE
-    hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-    hi Error        guifg=#727272          guibg=NONE      gui=undercurl
-    " -----------------------------------------------------------------------------
-hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-hi qfFileName       guifg=#6a6a6a      guibg=NONE      gui=italic
-hi qfLineNr         guifg=fg           guibg=NONE      gui=NONE
-hi qfError          guifg=fg           guibg=#c4c2c2   gui=undercurl
-
-" -----------------------------------------------------------------------------
-hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-hi link pythonDecoratorFunction pythonDecorator
-" -----------------------------------------------------------------------------
-hi htmlLink             guifg=#666666          guibg=NONE      gui=underline,italic
-elseif exists('g:zenesque_colors') && g:zenesque_colors==2
-    " dark scheme without colors
-
-    set background=dark
-
-    hi Normal       guifg=#adadad          guibg=#1a1a1a   gui=NONE
-    hi CursorLine   guifg=NONE             guibg=#000000   gui=NONE
-    hi CursorColumn guifg=NONE             guibg=#000000   gui=NONE
-    hi LineNr       guifg=#555555          guibg=NONE      gui=NONE
-    hi Constant     guifg=#848484          guibg=NONE      gui=bold
-    hi Statement    guifg=#a6a6a6          guibg=NONE      gui=italic
-    hi Function     guifg=#919191          guibg=NONE      gui=bold
-    hi String       guifg=#838383          guibg=NONE      gui=italic
-    hi Type         guifg=#838383          guibg=NONE      gui=bold,italic
-    hi Conditional  guifg=#787878          guibg=NONE      gui=bold
-    hi Todo         guifg=#ffffff          guibg=NONE      gui=underline
-    hi Comment      guifg=#555555          guibg=NONE      gui=NONE
-    hi PmenuSel     guifg=#000000          guibg=#a9a9aa   gui=bold
-    hi Special      guifg=#868585          guibg=NONE      gui=NONE
-    hi Identifier   guifg=#626262          guibg=NONE      gui=bold
-    hi Keyword      guifg=#858585          guibg=NONE      gui=underline
-    hi PreProc      guifg=#6b6b6b          guibg=NONE      gui=italic
-
-
-    hi Visual       guifg=NONE             guibg=#313131   gui=NONE
-    hi ColorColumn  guifg=NONE             guibg=#e6e6e6 
-    hi Cursor       guifg=bg               guibg=fg        gui=NONE
-    hi CursorIM     guifg=bg               guibg=fg        gui=NONE
-    hi lCursor      guifg=bg               guibg=fg        gui=NONE
-
-    hi DiffAdd      guifg=fg               guibg=#444444   gui=NONE
-    hi DiffChange   guifg=bg               guibg=#909090   gui=NONE
-    hi DiffDelete   guifg=NONE             guibg=#292929   gui=NONE
-    hi DiffText     guifg=NONE             guibg=#383838   gui=NONE
-
-    hi Directory    guifg=#525252          guibg=bg        gui=NONE
-    hi ErrorMsg     guifg=#6f6f6f          guibg=NONE      gui=NONE
-    hi FoldColumn   guifg=#555555           guibg=#414141   gui=bold
-    hi Folded       guifg=#828282           guibg=#212121   gui=italic
-
-    hi IncSearch    guifg=#000000          guibg=#adadad   gui=NONE
-    hi Search       guifg=#000000          guibg=#c5c3c3   gui=NONE
-    hi MatchParen   guifg=#000000          guibg=#a8a8a8   gui=bold
-    hi ModeMsg      guifg=#ffffff          guibg=#767676   gui=bold
-    hi MoreMsg      guifg=#7c7c7c          guibg=bg        gui=bold
-    hi NonText      guifg=#7e7e7e          guibg=bg        gui=bold
-
-    hi Pmenu        guifg=#656565          guibg=#3f3f3f   gui=NONE
-    hi PmenuSbar    guifg=fg               guibg=#5d5d5d   gui=NONE
-    hi PmenuThumb   guifg=fg               guibg=#777777   gui=NONE
-
-    hi Question     guifg=#454545          guibg=bg        gui=bold
-    hi SignColumn   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpecialKey   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpellBad     guisp=#ffffff          guibg=#000000   gui=undercurl
-    hi SpellCap     guisp=#5d5d5d                          gui=undercurl
-    hi SpellLocal   guisp=#434343                          gui=undercurl
-    hi SpellRare    guisp=#7d7d7d                          gui=undercurl
-    hi StatusLine   guifg=#000000          guibg=#727272   gui=bold
-    hi StatusLineNC guifg=#5a5959          guibg=#222222   gui=italic
-    hi TabLine      guifg=fg               guibg=#757575   gui=underline
-    hi TabLineFill  guifg=fg               guibg=bg        gui=reverse
-    hi TabLineSel   guifg=fg               guibg=bg        gui=bold
-    hi Title        guifg=#6d6d6d          guibg=bg        gui=bold
-    hi VertSplit    guifg=#222222          guibg=#222222
-    hi WarningMsg   guifg=#cfcfcf          guibg=#5b5b5b   gui=NONE
-    hi WildMenu     guifg=#000000          guibg=#828282   gui=NONE
-    hi Boolean      guifg=#616060          guibg=NONE      gui=bold
-    hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-    hi Error        guifg=#727272          guibg=NONE      gui=undercurl
-    " -----------------------------------------------------------------------------
-    hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-    hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-    hi qfFileName       guifg=#6a6a6a      guibg=NONE      gui=italic
-    hi qfLineNr         guifg=fg           guibg=NONE      gui=NONE
-    hi qfError          guifg=fg           guibg=#000000   gui=undercurl
-
-    " -----------------------------------------------------------------------------
-    hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-    hi link pythonDecoratorFunction pythonDecorator
-    " -----------------------------------------------------------------------------
-    hi htmlLink         guifg=#666666      guibg=NONE      gui=underline,italic
-
-elseif exists('g:zenesque_colors') && g:zenesque_colors==3
-    " dark scheme with colors
-    
-    set background=dark
-
-    hi Normal       guifg=#adadad          guibg=#0f1216   gui=NONE
-    hi CursorLine   guifg=NONE             guibg=#000000   gui=NONE
-    hi CursorColumn guifg=NONE             guibg=#000000   gui=NONE
-    hi LineNr       guifg=#4d4d44          guibg=NONE      gui=NONE
-    hi Constant     guifg=#8d5c57          guibg=NONE      gui=NONE
-    hi String       guifg=#5d7a64          guibg=NONE      gui=NONE
-    hi Function     guifg=#9784a2          guibg=NONE      gui=NONE
-    hi Statement    guifg=#5a89a4          guibg=NONE      gui=italic
-    hi Conditional  guifg=#8c7867          guibg=NONE      gui=NONE
-    hi Type         guifg=#518991          guibg=NONE      gui=italic
-    hi Todo         guifg=#9b3535          guibg=NONE      gui=NONE
-    hi Comment      guifg=#777777          guibg=NONE      gui=NONE
-    hi PmenuSel     guifg=bg               guibg=#9b601a   gui=bold
-    hi Special      guifg=#a7a863          guibg=NONE      gui=NONE
-    hi Identifier   guifg=#a16f51          guibg=NONE      gui=NONE
-    hi Keyword      guifg=#737354          guibg=NONE      gui=underline
-    hi PreProc      guifg=#5567a1          guibg=NONE      gui=NONE
-    hi Visual       guifg=NONE             guibg=#462e44   gui=NONE
-    hi ColorColumn  guifg=NONE             guibg=#e6e6e6
-    hi Cursor       guifg=bg               guibg=fg        gui=NONE
-    hi CursorIM     guifg=bg               guibg=fg        gui=NONE
-    hi lCursor      guifg=bg               guibg=fg        gui=NONE
-    hi diffAdd      guifg=bg               guibg=#5a7e5d   gui=none
-    hi diffDelete   guifg=#bf6a6a          guibg=#2d1212   gui=none
-    hi diffChange   guifg=bg               guibg=#7e4444   gui=none
-    hi diffText     guifg=bg               guibg=#345535   gui=none
-
-    
-    hi Directory    guifg=#525252          guibg=bg        gui=NONE
-    hi ErrorMsg     guifg=#6f6f6f          guibg=NONE      gui=NONE
-    hi FoldColumn   guifg=#555555          guibg=#414141   gui=bold
-    hi Folded       guifg=#828282          guibg=#212121   gui=italic
-
-    hi IncSearch    guifg=#000000          guibg=#adadad   gui=NONE
-    hi Search       guifg=#000000          guibg=#c5c3c3   gui=NONE
-    hi MatchParen   guifg=#000000          guibg=#a8a8a8   gui=bold
-    hi ModeMsg      guifg=#ffffff          guibg=#767676   gui=bold
-    hi MoreMsg      guifg=#7c7c7c          guibg=bg        gui=bold
-    hi NonText      guifg=#7e7e7e          guibg=bg        gui=bold
-
-    hi Pmenu        guifg=#656565          guibg=#3f3f3f   gui=NONE
-    hi PmenuSbar    guifg=fg               guibg=#5d5d5d   gui=NONE
-    hi PmenuThumb   guifg=fg               guibg=#777777   gui=NONE
-
-    hi Question     guifg=#454545          guibg=bg        gui=bold
-    hi SignColumn   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpecialKey   guifg=#ffffff          guibg=#696969   gui=NONE
-
-    hi SpellBad     guisp=#ffffff          guibg=#000000   gui=undercurl
-    hi SpellCap     guisp=#5d5d5d                          gui=undercurl
-    hi SpellLocal   guisp=#434343                          gui=undercurl
-    hi SpellRare    guisp=#7d7d7d                          gui=undercurl
-    hi StatusLine   guifg=#000000          guibg=#727272   gui=bold
-    hi StatusLineNC guifg=#5a5959          guibg=#222222   gui=italic
-    hi TabLine      guifg=fg               guibg=#5f5f5f   gui=underline
-    hi TabLineFill  guifg=fg               guibg=bg        gui=reverse
-    hi TabLineSel   guifg=fg               guibg=bg        gui=bold
-    hi Title        guifg=#6d6d6d          guibg=bg        gui=bold
-    hi VertSplit    guifg=#222222          guibg=#222222
-    hi WarningMsg   guifg=#cfcfcf          guibg=#5b5b5b   gui=NONE
-    hi WildMenu     guifg=#000000          guibg=#828282   gui=NONE
-    hi Boolean      guifg=#616060          guibg=NONE      gui=bold
-    hi Ignore       guifg=bg               guibg=NONE      gui=NONE
-    hi Error        guifg=#727272          guibg=NONE      gui=undercurl
-    " -----------------------------------------------------------------------------
-    hi VimError         guifg=#b6b6b6      guibg=#313131   gui=bold
-    hi VimCommentTitle  guifg=#5c5c5c      guibg=bg        gui=bold,italic
-    hi qfFileName       guifg=#6a6a6a      guibg=NONE      gui=italic
-    hi qfLineNr         guifg=fg           guibg=NONE      gui=NONE
-    hi qfError          guifg=fg           guibg=#000000   gui=undercurl
-
-    " -----------------------------------------------------------------------------
-    hi pythonDecorator  guifg=#3b3b3b      guibg=NONE      gui=bold
-    hi link pythonDecoratorFunction pythonDecorator
-    " -----------------------------------------------------------------------------
-    hi htmlLink             guifg=#666666          guibg=NONE      gui=underline,italic
-endif
-
-hi htmlTagName          guifg=NONE             guibg=NONE      gui=NONE
-hi link htmlScriptTag htmlTagName
-hi link htmlTagN htmlTagName
-hi link htmlEndTag htmlTagName
-hi link htmlSpecialTagName htmlTagName
-
-hi link cssRenderAttr Constant 
-hi link cssTextAttr Constant
-hi link cssUIAttr Constant
-hi link cssTableAttr Constant
-hi link cssColorAttr Constant
-hi link cssBoxAttr Constant
-hi link cssCommonAttr Constant
-hi link cssFunctionName Constant
-hi link cssRenderProp Type
-hi link cssBoxProp cssRenderProp
-
-hi link cssTagName Statement
-hi link cssClassName cssTagName
-hi link cssIdentifier cssTagName
-hi link cssPseudoClass cssTagName
-hi link cssPseudoClassId cssTagName
-
-hi cssBraces            guifg=fg            guibg=bg              gui=NONE
-hi javaScript           guifg=fg            guibg=NONE
-hi link javaScriptFunction Statement
-hi link javaScriptMember Statement
-hi link javaScriptValue Constant
-
-hi link objcClass Type
-hi link cocoaClass objcClass
-hi link objcSubclass objcClass
-hi link objcSuperclass objcClass
-hi link cocoaFunction Function
-hi link objcMethodName Identifier
-hi link objcMethodArg Normal
-hi link objcMessageName Identifier
-
-hi link javaType Statement
-hi link cppStatement  Statement
-
-
diff --git a/colors/zephyr.vim b/colors/zephyr.vim
deleted file mode 100755
index b3f774a..0000000
--- a/colors/zephyr.vim
+++ /dev/null
@@ -1,204 +0,0 @@
-" Vim color file
-" Original Maintainer: Matt Creenan <mattcreenan@gmail.com>
-
-" Zephyr v1.01
-" A modification of the gardener colorscheme v1.1
-
-" 1.01
-" - Updated some colors
-"
-" 1.0
-" - Initial release
-
-" Dark scheme, easy on eyes, very distinct colors to make
-" code easier to read
-
-set background=dark
-hi clear
-syntax reset
-
-hi linenr     cterm=BOLD   ctermfg=244   ctermbg=235
-
-exec "hi Cursor         cterm=BOLD   ctermfg=255   ctermbg=167"
-exec "hi CursorIM       cterm=BOLD   ctermfg=255   ctermbg=167"
-
-exec "hi Normal         cterm=NONE   ctermfg=255   ctermbg=0"
-exec "hi NonText        cterm=NONE   ctermfg=230   ctermbg=60"
-exec "hi Visual         cterm=NONE   ctermfg=255   ctermbg=68"
-
-exec "hi Linear         cterm=NONE   ctermfg=248   ctermbg=NONE"
-
-exec "hi Directory      cterm=NONE   ctermfg=64    ctermbg=NONE"
-
-exec "hi IncSearch      cterm=NONE   ctermfg=255   ctermbg=25"
-
-exec "hi ErrorMsg       cterm=BOLD   ctermfg=196   ctermbg=NONE"
-exec "hi WarningMsg     cterm=BOLD   ctermfg=196   ctermbg=NONE"
-exec "hi ModeMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
-exec "hi MoreMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
-exec "hi Question       cterm=NONE   ctermfg=194   ctermbg=NONE"
-
-exec "hi StatusLineNC   cterm=NONE   ctermfg=16    ctermbg=229"
-exec "hi StatusLine     cterm=BOLD   ctermfg=255   ctermbg=167"
-exec "hi VertSplit      cterm=NONE   ctermfg=16    ctermbg=229"
-
-exec "hi Constant       cterm=BOLD   ctermfg=255  ctermbg=NONE"
-exec "hi String         cterm=NONE   ctermfg=230  ctermbg=NONE"
-exec "hi Character      cterm=BOLD   ctermfg=230  ctermbg=NONE"
-exec "hi Number         cterm=BOLD   ctermfg=153  ctermbg=NONE"
-exec "hi Boolean        cterm=NONE   ctermfg=207  ctermbg=NONE"
-exec "hi Float          cterm=BOLD   ctermfg=153  ctermbg=NONE"
-
-exec "hi Identifier     cterm=NONE   ctermfg=223  ctermbg=NONE"
-exec "hi Function       cterm=BOLD   ctermfg=229  ctermbg=NONE"
-exec "hi Statement      cterm=BOLD   ctermfg=230  ctermbg=NONE"
-
-
-exec "hi Repeat         cterm=BOLD   ctermfg=208  ctermbg=NONE"
-exec "hi Label          cterm=BOLD   ctermfg=225  ctermbg=NONE"
-exec "hi Exception      cterm=BOLD   ctermfg=86   ctermbg=NONE"
-
-exec "hi PreProc        cterm=BOLD   ctermfg=222   ctermbg=NONE"
-exec "hi Include        cterm=BOLD   ctermfg=114   ctermbg=NONE"
-exec "hi Macro          cterm=BOLD   ctermfg=114   ctermbg=NONE"
-exec "hi PreCondit      cterm=BOLD   ctermfg=114   ctermbg=NONE"
-
-exec "hi Type           cterm=BOLD   ctermfg=193   ctermbg=NONE"
-exec "hi StorageClass   cterm=BOLD   ctermfg=78    ctermbg=NONE"
-exec "hi Structure      cterm=BOLD   ctermfg=114   ctermbg=NONE"
-exec "hi Typedef        cterm=BOLD   ctermfg=114   ctermbg=NONE"
-
-exec "hi Special        cterm=BOLD   ctermfg=153   ctermbg=NONE"
-exec "hi SpecialChar    cterm=BOLD   ctermfg=153   ctermbg=NONE"
-exec "hi Tag            cterm=BOLD   ctermfg=153   ctermbg=NONE"
-exec "hi Delimiter      cterm=BOLD   ctermfg=255   ctermbg=NONE"
-exec "hi SpecialComment cterm=BOLD   ctermfg=253   ctermbg=24"
-exec "hi Debug          cterm=NONE   ctermfg=210   ctermbg=NONE"
-
-exec "hi Title          cterm=BOLD   ctermfg=255   ctermbg=60"
-exec "hi Ignore         cterm=NONE   ctermfg=251   ctermbg=NONE"
-exec "hi Error          cterm=NONE   ctermfg=255   ctermbg=196"
-exec "hi Ignore         cterm=NONE   ctermfg=196   ctermbg=60"
-
-exec "hi htmlH1         cterm=BOLD   ctermfg=255   ctermbg=NONE"
-exec "hi htmlH2         cterm=BOLD   ctermfg=253   ctermbg=NONE"
-exec "hi htmlH3         cterm=BOLD   ctermfg=251   ctermbg=NONE"
-exec "hi htmlH4         cterm=BOLD   ctermfg=249   ctermbg=NONE"
-exec "hi htmlH5         cterm=BOLD   ctermfg=247   ctermbg=NONE"
-exec "hi htmlH6         cterm=BOLD   ctermfg=245   ctermbg=NONE"
-
-""""""""""""""""""""""""""""""
-" Begin zephyr modifications "
-""""""""""""""""""""""""""""""
-
-" Check for extra whitespace
-hi WhitespaceEOL ctermbg=red guibg=red
-match WhitespaceEOL /\s\+$/
-match WhitespaceEOL /^(\ \+)[^\*]/
-
-" Highlight whitespace at beginning
-hi WhitespaceBOL ctermfg=238
-match WhitespaceBOL /^\t\+\ */
-
-" Tabs (not the whitespace kind)
-if exists("g:zephyr_no_tabs")
-else
-	hi TabLine     ctermbg=238 ctermfg=243
-	hi TabLineFill ctermbg=94  ctermfg=235
-	hi TabLineSel  ctermbg=24  ctermfg=253
-endif
-
-" Diff
-if exists("g:zephyr_no_diff")
-else
-	hi DiffChange term=reverse cterm=bold ctermbg=235 ctermfg=252
-	hi DiffDelete term=reverse cterm=bold ctermbg=232 ctermfg=241
-	hi DiffText   term=reverse cterm=bold ctermbg=166 ctermfg=252
-	hi DiffAdd    term=reverse cterm=bold ctermbg=22  ctermfg=252
-endif
-
-hi Define ctermfg=68  ctermbg=none  cterm=bold
-hi Number  ctermfg=124
-hi Boolean ctermfg=124
-hi Float   ctermfg=124
-hi Function ctermfg=73 ctermbg=none  cterm=bold
-hi Statement ctermfg=68
-hi Constant ctermfg=88
-hi Comment ctermfg=154 ctermbg=none
-hi SpecialComment ctermfg=154 ctermbg=none
-hi Identifier ctermfg=172
-hi Operator ctermfg=221 ctermbg=none
-hi Keyword ctermfg=221 ctermbg=none
-hi String ctermfg=241
-hi Conditional ctermfg=68
-hi Repeat ctermfg=68
-hi Label ctermfg=68
-hi Include ctermfg=24
-hi Normal ctermfg=251
-hi Structure ctermfg=214
-hi Type ctermfg=70
-hi SpecialChar ctermfg=231
-hi Pmenu ctermbg=238 ctermfg=231
-
-" HTML/CSS specific
-hi htmlstring ctermfg=240
-hi htmltagname ctermfg=130
-hi htmltag ctermfg=66
-hi htmlendtag ctermfg=66
-hi htmlarg ctermfg=72
-hi htmllink ctermfg=32 cterm=underline
-hi htmlspecialtagname ctermfg=208 " Extra highlighting for special tag names, brighter
-hi htmlevent ctermfg=157
-hi cssstyle ctermbg=233
-hi csstagname ctermbg=233 ctermfg=167
-hi cssselectorop ctermbg=233 ctermfg=107
-hi cssselectorop2 ctermbg=233 ctermfg=107
-hi cssattributeselector ctermbg=233
-hi cssidentifier ctermbg=233 ctermfg=143
-hi cssmedia ctermbg=233
-hi cssmediatype ctermbg=233
-hi cssmediacomma ctermbg=233
-hi cssmediablock ctermbg=233
-hi cssvalueinteger ctermbg=233
-hi cssvaluenumber ctermbg=233
-hi cssvaluelength ctermbg=233
-hi cssvalueangle ctermbg=233
-hi cssvaluetime ctermbg=233
-hi cssvaluefrequency ctermbg=233
-hi cssfontdescriptor ctermbg=233
-hi cssfontdescriptorblock ctermbg=233
-hi csscolor ctermbg=233 ctermfg=68
-hi csscomment ctermbg=233 ctermfg=154
-hi cssimportant ctermbg=233
-hi csscommonattr ctermbg=233
-hi cssfontprop ctermbg=233 ctermfg=145
-hi cssfontattr ctermbg=233 ctermfg=white
-hi csscolorprop ctermbg=233 ctermfg=145
-hi csscolorattr ctermbg=233 ctermfg=white
-hi csstextprop ctermbg=233 ctermfg=145
-hi csstextattr ctermbg=233 ctermfg=white
-hi cssboxprop ctermbg=233 ctermfg=145
-hi cssboxattr ctermbg=233 ctermfg=white
-hi cssuiprop ctermbg=233 ctermfg=145
-hi cssuiattr ctermbg=233 ctermfg=white
-hi cssrenderprop ctermbg=233 ctermfg=145
-hi cssrenderattr ctermbg=233 ctermfg=white
-hi cssgeneratedcontentprop ctermbg=233 ctermfg=145
-hi cssgeneratedcontentattr ctermbg=233 ctermfg=white
-hi csspagingprop ctermbg=233 ctermfg=145
-hi csspagingattr ctermbg=233 ctermfg=white
-hi cssinclude ctermbg=233
-hi cssbraces ctermbg=233
-hi cssdefinition ctermbg=233
-hi csspseudoclass ctermbg=233
-hi csspseudoclassid ctermbg=233
-
-" PHP Specific
-hi phpRegionDelimiter cterm=bold ctermfg=228
-hi phpSpecialFunction cterm=bold ctermfg=79
-
-let php_sql_query = 0
-let php_htmlInStrings = 0
-
-let g:colors_name = "zephyr"
-let colors_name   = "zephyr"
diff --git a/colors/zmrok.vim b/colors/zmrok.vim
deleted file mode 100755
index 122b051..0000000
--- a/colors/zmrok.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-" Maintainer: Krzysztof Goj <Krzysztof-dot-Goj-at-gmail-dot-com>
-" Last Change: 27th March 2009
-
-set background=dark
-hi clear
-if exists("syntax_on")
-    syntax reset
-endif
-
-let g:colors_name="zmrok"
-
-" general colors
-hi Normal         guifg=#F8F8F8    guibg=#141414
-hi Cursor         guifg=Black      guibg=Green    gui=none
-hi LineNr         guifg=#777777    guibg=Black
-hi NonText 		  guifg=#808080    guibg=#202020
-
-hi StatusLine 	guifg=#F8F8F8 guibg=#202020 gui=bold
-hi StatusLineNC guifg=#777777 guibg=#202020 gui=none
-hi VertSplit 	guifg=#202020 guibg=#202020 gui=none
-
-" Vim >= 7.0 specific colors
-if version >= 700
-    hi CursorLine     guibg=#0d0d0d
-    hi CursorColumn   guibg=#0d0d0d
-    hi MatchParen     guifg=Black      guibg=#FFCC20 gui=bold
-
-    hi Pmenu          guifg=#141414    guibg=#CDA869
-    hi PmenuSel       guifg=#F8F8F8    guibg=#9B703F
-    hi PmenuSbar                       guibg=#DAEFA3
-    hi PmenuThumb     guifg=#8F9D6A
-endif
-
-"Syntax hilighting
-
-hi Comment        guifg=#888888
-hi Error          guifg=red        guibg=#141414
-hi Todo           guifg=red        guibg=#141414      gui=bold
-
-hi Constant       guifg=#CF593C
-hi Exception      guifg=#CF593C
-hi Operator       guifg=#DFCC77
-
-hi Special        guifg=orange
-hi SpecialChar    guifg=orange
-hi String         guifg=#D9FF77
-hi Character      guifg=#FFCE43
-hi Number         guifg=#FACE43
-
-hi Statement      guifg=#A56A30    gui=bold
-hi Keyword        guifg=#A56A30    gui=bold
-hi Label          guifg=#A56A30    gui=bold
-
-hi Identifier     guifg=#C7CA87     gui=none
-hi Type           guifg=#C7CA87     gui=none
-hi Function       guifg=#C7CA87     gui=none
-hi StorageClass   guifg=#C7CA87     gui=none
-
-hi PreProc        guifg=khaki4
diff --git a/ftdetect/gofiletype.vim b/ftdetect/gofiletype.vim
deleted file mode 100644
index b658f6b..0000000
--- a/ftdetect/gofiletype.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" We take care to preserve the user's fileencodings and fileformats,
-" because those settings are global (not buffer local), yet we want
-" to override them for loading Go files, which are defined to be UTF-8.
-let s:current_fileformats = ''
-let s:current_fileencodings = ''
-
-" define fileencodings to open as utf-8 encoding even if it's ascii.
-function! s:gofiletype_pre()
-  let s:current_fileformats = &g:fileformats
-  let s:current_fileencodings = &g:fileencodings
-  set fileencodings=utf-8 fileformats=unix
-  setlocal filetype=go
-endfunction
-
-" restore fileencodings as others
-function! s:gofiletype_post()
-  let &g:fileformats = s:current_fileformats
-  let &g:fileencodings = s:current_fileencodings
-endfunction
-
-au BufNewFile *.go setlocal filetype=go fileencoding=utf-8 fileformat=unix
-au BufRead *.go call s:gofiletype_pre()
-au BufReadPost *.go call s:gofiletype_post()
diff --git a/pack/jvirtanen/start/vim-hcl/README.md b/pack/jvirtanen/start/vim-hcl/README.md
new file mode 100644
index 0000000..1ec3da1
--- /dev/null
+++ b/pack/jvirtanen/start/vim-hcl/README.md
@@ -0,0 +1,29 @@
+# hcl.vim
+
+Syntax highlighting for [HashiCorp Configuration Language (HCL)][HCL] used by
+[Consul][], [Nomad][], [Packer][], [Terraform][], and [Vault][].
+
+  [HCL]: https://github.com/hashicorp/hcl
+  [Consul]: https://www.consul.io/
+  [Nomad]: https://www.nomadproject.io/
+  [Packer]: https://packer.io/
+  [Terraform]: https://www.terraform.io/
+  [Vault]: https://www.vaultproject.io/
+
+## Installation
+
+Install using Vim's built-in package support:
+```
+mkdir -p ~/.vim/pack/jvirtanen/start
+cd ~/.vim/pack/jvirtanen/start
+git clone https://github.com/jvirtanen/vim-hcl.git
+```
+
+## License
+
+Copyright 2018 Jussi Virtanen and [contributors][].
+
+  [contributors]: https://github.com/jvirtanen/vim-hcl/graphs/contributors
+
+Distributed under the same terms as Vim itself. See `:help license` for
+details.
diff --git a/pack/jvirtanen/start/vim-hcl/ftdetect/hcl.vim b/pack/jvirtanen/start/vim-hcl/ftdetect/hcl.vim
new file mode 100644
index 0000000..8062ff7
--- /dev/null
+++ b/pack/jvirtanen/start/vim-hcl/ftdetect/hcl.vim
@@ -0,0 +1,8 @@
+autocmd BufNewFile,BufRead *.hcl set filetype=hcl
+
+" Nomad
+autocmd BufNewFile,BufRead *.nomad set filetype=hcl
+
+" Terraform
+autocmd BufNewFile,BufRead *.tf     set filetype=hcl
+autocmd BufNewFile,BufRead *.tfvars set filetype=hcl
diff --git a/pack/jvirtanen/start/vim-hcl/syntax/hcl.vim b/pack/jvirtanen/start/vim-hcl/syntax/hcl.vim
new file mode 100644
index 0000000..1323f3e
--- /dev/null
+++ b/pack/jvirtanen/start/vim-hcl/syntax/hcl.vim
@@ -0,0 +1,61 @@
+" Vim syntax file
+" Language:   HashiCorp Configuration Language (HCL)
+" Maintainer: Jussi Virtanen
+" Repository: https://github.com/jvirtanen/vim-hcl
+" License:    Vim
+
+if exists('b:current_syntax')
+  finish
+end
+
+syn match hclVariable /\<[A-Za-z0-9_.\[\]*]\+\>/
+
+syn match hclParenthesis /(/
+syn match hclFunction    /\w\+(/ contains=hclParenthesis
+
+syn keyword hclKeyword for in if
+
+syn region hclString start=/"/ end=/"/ contains=hclEscape,hclInterpolation
+syn region hclString start=/<<-\?\z([A-Z]\+\)/ end=/^\s*\z1/ contains=hclEscape,hclInterpolation
+
+syn match hclEscape /\\n/
+syn match hclEscape /\\r/
+syn match hclEscape /\\t/
+syn match hclEscape /\\"/
+syn match hclEscape /\\\\/
+syn match hclEscape /\\u\x\{4\}/
+syn match hclEscape /\\u\x\{8\}/
+
+syn match hclNumber /\<\d\+\%([eE][+-]\?\d\+\)\?\>/
+syn match hclNumber /\<\d*\.\d\+\%([eE][+-]\?\d\+\)\?\>/
+syn match hclNumber /\<0[xX]\x\+\>/
+
+syn keyword hclConstant true false null
+
+syn region hclInterpolation start=/\${/ end=/}/ contained contains=hclInterpolation
+
+syn region hclComment start=/\/\// end=/$/    contains=hclTodo
+syn region hclComment start=/\#/   end=/$/    contains=hclTodo
+syn region hclComment start=/\/\*/ end=/\*\// contains=hclTodo
+
+syn match hclAttributeName /\w\+/ contained
+syn match hclAttribute     /^[^=]\+=/ contains=hclAttributeName,hclComment,hclString
+
+syn match hclBlockName /\w\+/ contained
+syn match hclBlock     /^[^=]\+{/ contains=hclBlockName,hclComment,hclString
+
+syn keyword hclTodo TODO FIXME XXX DEBUG NOTE contained
+
+hi def link hclVariable      PreProc
+hi def link hclFunction      Function
+hi def link hclKeyword       Keyword
+hi def link hclString        String
+hi def link hclEscape        Special
+hi def link hclNumber        Number
+hi def link hclConstant      Constant
+hi def link hclInterpolation PreProc
+hi def link hclComment       Comment
+hi def link hclTodo          Todo
+hi def link hclBlockName     Structure
+
+let b:current_syntax = 'hcl'
diff --git a/pack/language/start/Dockerfile/LICENSE b/pack/language/start/Dockerfile/LICENSE
new file mode 100644
index 0000000..27856ca
--- /dev/null
+++ b/pack/language/start/Dockerfile/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Eugene Kalinin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pack/language/start/Dockerfile/Makefile b/pack/language/start/Dockerfile/Makefile
new file mode 100644
index 0000000..a7c1fdf
--- /dev/null
+++ b/pack/language/start/Dockerfile/Makefile
@@ -0,0 +1,15 @@
+install:
+	@echo "Installation:"
+	@mkdir -p ~/.vim/syntax
+	@mkdir -p ~/.vim/ftdetect
+	@mkdir -p ~/.vim/snippets
+	@echo " * Dirs     ...    success."
+	@cp ./syntax/Dockerfile.vim 		~/.vim/syntax/
+	@cp ./syntax/docker-compose.vim 		~/.vim/syntax/
+	@echo " * Syntax   ...    success."
+	@cp ./ftdetect/Dockerfile.vim 		~/.vim/ftdetect/
+	@cp ./ftdetect/docker-compose.vim 		~/.vim/ftdetect/
+	@echo " * Filetype ...    success."
+	@cp ./snippets/Dockerfile.snippets 	~/.vim/snippets/
+	@cp ./snippets/docker-compose.snippets 	~/.vim/snippets/
+	@echo " * Snippets ...    success."
diff --git a/pack/language/start/Dockerfile/README.md b/pack/language/start/Dockerfile/README.md
new file mode 100644
index 0000000..d97461a
--- /dev/null
+++ b/pack/language/start/Dockerfile/README.md
@@ -0,0 +1,47 @@
+Dockerfile.vim
+==============
+
+Vim syntax file for [Docker](http://docker.io/)'s [Dockerfile](http://docs.docker.com/reference/builder/)
+and snippets for [snipMate](http://www.vim.org/scripts/script.php?script_id=2540).
+
+Screenshot
+==========
+
+Here is an example in gnome-terminal with [vim-monokai](https://github.com/sickill/vim-monokai) color scheme:
+
+
+![Vim & Dockerfile.vim ](https://raw.github.com/ekalinin/Dockerfile.vim/master/vim-dockerfile-example.png)
+
+
+
+Installation
+============
+
+```bash
+$ git clone https://github.com/ekalinin/Dockerfile.vim.git
+$ cd Dockerfile.vim
+$ make install
+```
+
+####Or using Pathogen:
+```bash
+# Clone directly into the bundle folder.
+git clone https://github.com/ekalinin/Dockerfile.vim.git bundle/Dockerfile
+```
+
+####Or using Vundle:
+```bash
+# near the top of your .vimrc
+Plugin 'ekalinin/Dockerfile.vim'
+```
+
+####Or using NeoBundle:
+
+```bash
+NeoBundle 'ekalinin/Dockerfile.vim'
+```
+
+License
+=======
+
+See [LICENSE](https://github.com/ekalinin/Dockerfile.vim/blob/master/LICENSE) file.
diff --git a/pack/language/start/Dockerfile/ftdetect/Dockerfile.vim b/pack/language/start/Dockerfile/ftdetect/Dockerfile.vim
new file mode 100644
index 0000000..7293a26
--- /dev/null
+++ b/pack/language/start/Dockerfile/ftdetect/Dockerfile.vim
@@ -0,0 +1,5 @@
+" Dockerfile
+autocmd BufRead,BufNewFile Dockerfile set ft=Dockerfile
+autocmd BufRead,BufNewFile Dockerfile* setf Dockerfile
+autocmd BufRead,BufNewFile *.dock setf Dockerfile
+autocmd BufRead,BufNewFile *.[Dd]ockerfile setf Dockerfile
diff --git a/pack/language/start/Dockerfile/ftdetect/docker-compose.vim b/pack/language/start/Dockerfile/ftdetect/docker-compose.vim
new file mode 100644
index 0000000..0214497
--- /dev/null
+++ b/pack/language/start/Dockerfile/ftdetect/docker-compose.vim
@@ -0,0 +1,4 @@
+" docker-compose.yml
+autocmd BufRead,BufNewFile docker-compose.yml set ft=docker-compose
+autocmd BufRead,BufNewFile docker-compose.yml* setf docker-compose
+autocmd BufRead,BufNewFile docker-compose* setf docker-compose
diff --git a/pack/language/start/Dockerfile/ftplugin/Dockerfile.vim b/pack/language/start/Dockerfile/ftplugin/Dockerfile.vim
new file mode 100644
index 0000000..ff6ab7b
--- /dev/null
+++ b/pack/language/start/Dockerfile/ftplugin/Dockerfile.vim
@@ -0,0 +1,27 @@
+function! DockerfileReplaceInstruction(original, replacement)
+    let syn = synIDtrans(synID(line("."), col(".") - 1, 0))
+    if syn != hlID("Comment") && syn != hlID("Constant") && strlen(getline(".")) == 0
+        let word = a:replacement
+    else
+        let word = a:original
+    endif
+    let g:UnduBuffer = a:original
+    return word
+endfunction
+
+inoreabbr <silent> <buffer> from <C-R>=DockerfileReplaceInstruction("from", "FROM")<CR>
+inoreabbr <silent> <buffer> maintainer <C-R>=DockerfileReplaceInstruction("maintainer", "MAINTAINER")<CR>
+inoreabbr <silent> <buffer> run <C-R>=DockerfileReplaceInstruction("run", "RUN")<CR>
+inoreabbr <silent> <buffer> cmd <C-R>=DockerfileReplaceInstruction("cmd", "CMD")<CR>
+inoreabbr <silent> <buffer> label <C-R>=DockerfileReplaceInstruction("label", "LABEL")<CR>
+inoreabbr <silent> <buffer> expose <C-R>=DockerfileReplaceInstruction("expose", "EXPOSE")<CR>
+inoreabbr <silent> <buffer> env <C-R>=DockerfileReplaceInstruction("env", "ENV")<CR>
+inoreabbr <silent> <buffer> add <C-R>=DockerfileReplaceInstruction("add", "ADD")<CR>
+inoreabbr <silent> <buffer> copy <C-R>=DockerfileReplaceInstruction("copy", "COPY")<CR>
+inoreabbr <silent> <buffer> entrypoint <C-R>=DockerfileReplaceInstruction("entrypoint", "ENTRYPOINT")<CR>
+inoreabbr <silent> <buffer> volume <C-R>=DockerfileReplaceInstruction("volume", "VOLUME")<CR>
+inoreabbr <silent> <buffer> user <C-R>=DockerfileReplaceInstruction("user", "USER")<CR>
+inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir", "WORKDIR")<CR>
+inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
+inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
+inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
diff --git a/pack/language/start/Dockerfile/indent/Dockerfile.vim b/pack/language/start/Dockerfile/indent/Dockerfile.vim
new file mode 100644
index 0000000..e7b5058
--- /dev/null
+++ b/pack/language/start/Dockerfile/indent/Dockerfile.vim
@@ -0,0 +1,23 @@
+if exists('b:did_indent') | finish | endif
+let b:did_indent = 1
+
+
+function! DockerfileIndent(line)
+  let prev_line = getline(a:line - 1)
+  if a:line > 1 && prev_line =~ '\\\s*$'
+    let i = indent(a:line - 1)
+    if i == 0
+      let i += &l:shiftwidth
+      if &l:expandtab && prev_line =~# '^RUN\s'
+        " Overindent past RUN
+        let i = 4 + &l:shiftwidth
+      endif
+    endif
+    return i
+  endif
+
+  return -1
+endfunction
+
+
+set indentexpr=DockerfileIndent(v:lnum)
diff --git a/pack/language/start/Dockerfile/snippets/Dockerfile.snippets b/pack/language/start/Dockerfile/snippets/Dockerfile.snippets
new file mode 100644
index 0000000..5f97a51
--- /dev/null
+++ b/pack/language/start/Dockerfile/snippets/Dockerfile.snippets
@@ -0,0 +1,66 @@
+snippet F
+	FROM ${1:ubuntu}
+snippet f
+	FROM ${1:ubuntu}
+snippet M
+	MAINTAINER ${1:name}
+snippet m
+	MAINTAINER ${1:name}
+snippet R
+	RUN ${1:command}
+snippet r
+	RUN ${1:command}
+snippet C
+	CMD ${1:command}
+snippet c
+	CMD ${1:command}
+snippet CP
+	COPY ${1:src} ${2:dest}
+snippet cp
+	COPY ${1:src} ${2:dest}
+snippet EXP
+	EXPOSE ${1:port}
+snippet exp
+	EXPOSE ${1:port}
+snippet E
+	ENV ${1:key} ${2:value}
+snippet e
+	ENV ${1:key} ${2:value}
+snippet A
+	ADD ${1:src} ${2:dst}
+snippet a
+	ADD ${1:src} ${2:dst}
+snippet ENT
+	ENTRYPOINT ${1:command}
+snippet ent
+	ENTRYPOINT ${1:command}
+snippet V
+	VOLUME ["${1:path}"]
+snippet v
+	VOLUME ["${1:path}"]
+snippet U
+	USER ${1:name}
+snippet u
+	USER ${1:name}
+snippet W
+	WORKDIR ${1:path}
+snippet w
+	WORKDIR ${1:path}
+snippet upd
+	# update packages
+	RUN echo "deb http://archive.ubuntu.com/ubuntu ${1:precise} main universe" > /etc/apt/sources.list; \
+	    apt-get update && apt-get -y upgrade; \
+	${2}
+snippet head
+	# ${1:Description}
+	#
+	# VERSION ${2:0.1.0}
+	${3}
+snippet O
+	ONBUILD ${1}
+snippet o
+	ONBUILD ${1}
+snippet L
+	LABEL ${1:label}="${2:value}"
+snippet l
+	LABEL ${1:label}="${2:value}"
diff --git a/pack/language/start/Dockerfile/snippets/docker-compose.snippets b/pack/language/start/Dockerfile/snippets/docker-compose.snippets
new file mode 100644
index 0000000..8cab91d
--- /dev/null
+++ b/pack/language/start/Dockerfile/snippets/docker-compose.snippets
@@ -0,0 +1,163 @@
+snippet ve
+	version: ${1:2}
+snippet volumes
+	volumes:
+		- ${1:value}
+snippet volume_
+	volume_driver: ${1:driver}
+snippet volumes_
+	volumes_from:
+		- ${1:name}
+snippet exter
+	external: ${1:boolean}
+snippet ser
+	services:
+		${1:name}
+snippet bu
+	build:
+		${1:value}
+snippet conte
+	context: ${1:dir}
+snippet com
+	command: ${1:command}
+snippet dep
+	depends_on:
+		${1:value}
+snippet env
+	environment:
+		${1:name}: ${2:value}
+snippet doc
+	dockerfile: ${1:file}
+snippet ar
+	args:
+		${1:name}: ${2:value}
+snippet cap_a
+	cap_add:
+		- ${1:value}
+snippet cap_d
+	cap_drop:
+		- ${1:value}
+snippet cgr
+	cgroup_parent: ${1:cgroup}
+snippet conta
+	container_name: ${1:name}
+snippet dev
+	devices:
+		- ${1:value}
+snippet dn
+	dns:
+		- ${1:ip}
+snippet dns_
+	dns_search:
+		- ${1:ip}
+snippet tm
+	tmpfs:
+		- ${1:dir}
+snippet ent
+	entrypoint: ${1:command}
+snippet env_
+	env_file:
+		- ${1:file}
+snippet exp
+	expose:
+		- ${1:port}
+snippet exten
+	extends:
+		file: ${1:file}
+		service: ${2:name}
+snippet exter
+	extra_hosts:
+		- ${1:host}:${2:ip}
+snippet gr
+	group_add:
+		- ${1:name}
+snippet im
+	image: ${1:image}
+snippet la
+	labels:
+		${1:dns}: ${2:label}
+snippet links
+	links:
+		- ${1:name}
+snippet logg
+	logging:
+		driver: ${1:driver}
+		options:
+			${2:value}
+snippet log_d
+	log_driver: ${1:driver}
+snippet log_o
+	log_opt:
+		${1:value}
+snippet net
+	net: ${1:value}
+snippet network_
+	network_mode: ${1:value}
+snippet networks
+	networks:
+		- ${1:value}
+snippet al
+	networks:
+		- ${1:name}
+snippet ipv4
+	ipv4_address: ${1:ip}
+snippet ipv6
+	ipv6_address: ${1:ip}
+snippet link_
+	link_local_ips:
+		- ${1:ip}
+snippet pi
+	pid: ${1:host}
+snippet po
+	ports:
+		- ${1:value}
+snippet sec
+	security_opt:
+		- ${1:value}
+snippet sto
+	stop_signal: ${1:signal}
+snippet ul
+	ulimits:
+		${1:value}
+snippet cpu_s
+	cpu_shares: ${1:value}
+snippet cpu_q
+	cpu_quota: ${1:value}
+snippet cpus
+	cpuset: ${1:value}
+snippet dom
+	domainname: ${1:name}
+snippet ho
+	hostname: ${1:name}
+snippet ipc
+	ipc: ${1:host}
+snippet mem_
+	mem_limit: ${1:value}
+snippet mems
+	memswap_limit: ${1:value}
+snippet pr
+	privileged: ${1:boolean}
+snippet oom
+	oom_score_adj: ${1:value}
+snippet res
+	restart: ${1:value}
+snippet us
+	user: ${1:value}
+snippet wo
+	working_dir: ${1:dir}
+snippet rea
+	read_only: ${1:boolean}
+snippet sh
+	shm_size: ${1:value}
+snippet std
+	stdin_open: ${1:boolean}
+snippet tt
+	tty: ${1:boolean}
+snippet driver
+	driver: ${1:value}
+snippet driver_
+	driver_opts:
+		${1:key}: ${2:value}
+snippet ipa
+	ipam:
+		${1:value}
diff --git a/pack/language/start/Dockerfile/syntax/Dockerfile.vim b/pack/language/start/Dockerfile/syntax/Dockerfile.vim
new file mode 100644
index 0000000..f94e6a2
--- /dev/null
+++ b/pack/language/start/Dockerfile/syntax/Dockerfile.vim
@@ -0,0 +1,64 @@
+" Vim syntax file
+" Language: Dockerfile
+" Maintainer: Eugene Kalinin
+" Latest Revision: 11 September 2013
+" Source: http://docs.docker.io/en/latest/use/builder/
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" case sensitivity (fix #17)
+" syn case  ignore
+
+" Keywords
+syn keyword dockerfileKeywords FROM MAINTAINER RUN CMD COPY
+syn keyword dockerfileKeywords EXPOSE ADD ENTRYPOINT
+syn keyword dockerfileKeywords VOLUME USER WORKDIR ONBUILD
+syn keyword dockerfileKeywords LABEL ARG HEALTHCHECK SHELL
+
+" Bash statements
+setlocal iskeyword+=-
+syn keyword bashStatement add-apt-repository adduser apk apt-get aptitude apt-key autoconf bundle
+syn keyword bashStatement cd chgrp chmod chown clear complete composer cp curl du echo egrep
+syn keyword bashStatement expr fgrep find gem gnufind gnugrep gpg grep groupadd head less ln
+syn keyword bashStatement ls make mkdir mv node npm pacman pip pip3 php python rails rm rmdir rpm ruby
+syn keyword bashStatement sed sleep sort strip tar tail tailf touch useradd virtualenv yum
+syn keyword bashStatement usermod bash cat a2ensite a2dissite a2enmod a2dismod apache2ctl
+syn keyword bashStatement wget gzip
+
+" Strings
+syn region dockerfileString start=/"/ skip=/\\"/ end=/"/
+syn region dockerfileString1 start=/'/ skip=/\\'/ end=/'/
+
+" Emails
+syn region dockerfileEmail start=/</ end=/>/ contains=@ oneline
+
+" Urls
+syn match dockerfileUrl /\(http\|https\|ssh\|hg\|git\)\:\/\/[a-zA-Z0-9\/\-\.]\+/
+
+" Task tags
+syn keyword dockerfileTodo contained TODO FIXME XXX
+
+" Comments
+syn region dockerfileComment start="#" end="\n" contains=dockerfileTodo
+syn region dockerfileEnvWithComment start="^\s*ENV\>" end="\n" contains=dockerfileEnv
+syn match dockerfileEnv contained /\<ENV\>/
+
+" Highlighting
+hi link dockerfileKeywords  Keyword
+hi link dockerfileEnv       Keyword
+hi link dockerfileString    String
+hi link dockerfileString1   String
+hi link dockerfileComment   Comment
+hi link dockerfileEmail     Identifier
+hi link dockerfileUrl       Identifier
+hi link dockerfileTodo      Todo
+hi link bashStatement       Function
+
+let b:current_syntax = "dockerfile"
+
+set commentstring=#\ %s
+
+" Enable automatic comment insertion
+setlocal fo+=cro
diff --git a/pack/language/start/Dockerfile/syntax/docker-compose.vim b/pack/language/start/Dockerfile/syntax/docker-compose.vim
new file mode 100644
index 0000000..cdfb84f
--- /dev/null
+++ b/pack/language/start/Dockerfile/syntax/docker-compose.vim
@@ -0,0 +1,74 @@
+" Vim syntax file
+" Language: Dockerfile
+" Maintainer: Eugene Kalinin
+" Latest Revision: 11 September 2013
+" Source: http://docs.docker.io/en/latest/use/builder/
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" case sensitivity (fix #17)
+" syn case  ignore
+
+" Keywords
+syn keyword dockercomposeKeywords build context dockerfile args cap_add cap_drop
+syn keyword dockercomposeKeywords command cgroup_parent container_name devices depends_on
+syn keyword dockercomposeKeywords dns dns_search tmpfs entrypoint env_file environment
+syn keyword dockercomposeKeywords expose extends extends external_links extra_hosts
+syn keyword dockercomposeKeywords group_add image isolation labels links logging log_driver
+syn keyword dockercomposeKeywords log_opt net network_mode networks aliases
+syn keyword dockercomposeKeywords ipv4_address ipv6_address link_local_ips pid ports
+syn keyword dockercomposeKeywords security_opt stop_signal ulimits volumes volume_driver
+syn keyword dockercomposeKeywords volumes_from cpu_shares cpu_quota cpuset domainname hostname
+syn keyword dockercomposeKeywords ipc mac_address mem_limit memswap_limit oom_score_adj privileged
+syn keyword dockercomposeKeywords read_only restart shm_size stdin_open tty user working_dir
+"" Volume configuration reference
+syn keyword dockercomposeKeywords driver driver_opts external labels
+"" Network configuration reference
+syn keyword dockercomposeKeywords driver driver_opts enable_ipv6 ipam internal labels external
+"" Versioning
+syn keyword dockercomposeKeywords version services
+
+" Bash statements
+setlocal iskeyword+=-
+syn keyword bashStatement add-apt-repository adduser apk apt-get aptitude apt-key autoconf bundle
+syn keyword bashStatement cd chgrp chmod chown clear complete composer cp curl du echo egrep
+syn keyword bashStatement expr fgrep find gem gnufind gnugrep gpg grep groupadd head less ln
+syn keyword bashStatement ls make mkdir mv node npm pacman pip pip3 php python rails rm rmdir rpm ruby
+syn keyword bashStatement sed sleep sort strip tar tail tailf touch useradd virtualenv yum
+syn keyword bashStatement usermod bash cat a2ensite a2dissite a2enmod a2dismod apache2ctl
+syn keyword bashStatement wget gzip
+
+" Strings
+syn region dockercomposeString start=/"/ skip=/\\"/ end=/"/
+syn region dockercomposeString1 start=/'/ skip=/\\'/ end=/'/
+
+" Emails
+syn region dockercomposeEmail start=/</ end=/>/ contains=@ oneline
+
+" Urls
+syn match dockercomposeUrl /\(http\|https\|ssh\|hg\|git\)\:\/\/[a-zA-Z0-9\/\-\.]\+/
+
+" Task tags
+syn keyword dockercomposeTodo contained TODO FIXME XXX
+
+" Comments
+syn region dockercomposeComment start="#" end="\n" contains=dockercomposeTodo
+
+" Highlighting
+hi link dockercomposeKeywords  Keyword
+hi link dockercomposeString    String
+hi link dockercomposeString1   String
+hi link dockercomposeComment   Comment
+hi link dockercomposeEmail     Identifier
+hi link dockercomposeUrl       Identifier
+hi link dockercomposeTodo      Todo
+hi link bashStatement       Function
+
+let b:current_syntax = "dockercompose"
+
+set commentstring=#\ %s
+
+" Enable automatic comment insertion
+setlocal fo+=cro
diff --git a/pack/language/start/Dockerfile/vim-dockerfile-example.png b/pack/language/start/Dockerfile/vim-dockerfile-example.png
new file mode 100644
index 0000000..c82f871
Binary files /dev/null and b/pack/language/start/Dockerfile/vim-dockerfile-example.png differ
diff --git a/bundle/css-color/after/syntax/css.vim b/pack/language/start/css-color/after/syntax/css.vim
similarity index 100%
rename from bundle/css-color/after/syntax/css.vim
rename to pack/language/start/css-color/after/syntax/css.vim
diff --git a/bundle/css-color/after/syntax/html.vim b/pack/language/start/css-color/after/syntax/html.vim
similarity index 100%
rename from bundle/css-color/after/syntax/html.vim
rename to pack/language/start/css-color/after/syntax/html.vim
diff --git a/bundle/css-color/after/syntax/less.vim b/pack/language/start/css-color/after/syntax/less.vim
similarity index 100%
rename from bundle/css-color/after/syntax/less.vim
rename to pack/language/start/css-color/after/syntax/less.vim
diff --git a/bundle/css-color/after/syntax/lua.vim b/pack/language/start/css-color/after/syntax/lua.vim
similarity index 100%
rename from bundle/css-color/after/syntax/lua.vim
rename to pack/language/start/css-color/after/syntax/lua.vim
diff --git a/bundle/css-color/after/syntax/moon.vim b/pack/language/start/css-color/after/syntax/moon.vim
similarity index 100%
rename from bundle/css-color/after/syntax/moon.vim
rename to pack/language/start/css-color/after/syntax/moon.vim
diff --git a/bundle/css-color/after/syntax/sass.vim b/pack/language/start/css-color/after/syntax/sass.vim
similarity index 100%
rename from bundle/css-color/after/syntax/sass.vim
rename to pack/language/start/css-color/after/syntax/sass.vim
diff --git a/bundle/css-color/after/syntax/scss.vim b/pack/language/start/css-color/after/syntax/scss.vim
similarity index 100%
rename from bundle/css-color/after/syntax/scss.vim
rename to pack/language/start/css-color/after/syntax/scss.vim
diff --git a/bundle/css-color/after/syntax/stylus.vim b/pack/language/start/css-color/after/syntax/stylus.vim
similarity index 100%
rename from bundle/css-color/after/syntax/stylus.vim
rename to pack/language/start/css-color/after/syntax/stylus.vim
diff --git a/bundle/css-color/after/syntax/vim.vim b/pack/language/start/css-color/after/syntax/vim.vim
similarity index 100%
rename from bundle/css-color/after/syntax/vim.vim
rename to pack/language/start/css-color/after/syntax/vim.vim
diff --git a/bundle/css-color/autoload/css_color.vim b/pack/language/start/css-color/autoload/css_color.vim
similarity index 100%
rename from bundle/css-color/autoload/css_color.vim
rename to pack/language/start/css-color/autoload/css_color.vim
diff --git a/bundle/css/README.md b/pack/language/start/css/README.md
similarity index 100%
rename from bundle/css/README.md
rename to pack/language/start/css/README.md
diff --git a/bundle/css/syntax/css.vim b/pack/language/start/css/syntax/css.vim
similarity index 100%
rename from bundle/css/syntax/css.vim
rename to pack/language/start/css/syntax/css.vim
diff --git a/bundle/css/test.css b/pack/language/start/css/test.css
similarity index 100%
rename from bundle/css/test.css
rename to pack/language/start/css/test.css
diff --git a/pack/language/start/ember-hbs/LICENSE b/pack/language/start/ember-hbs/LICENSE
new file mode 100644
index 0000000..a69b616
--- /dev/null
+++ b/pack/language/start/ember-hbs/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Jouke van der Maas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/pack/language/start/ember-hbs/README.md b/pack/language/start/ember-hbs/README.md
new file mode 100644
index 0000000..005f72c
--- /dev/null
+++ b/pack/language/start/ember-hbs/README.md
@@ -0,0 +1,56 @@
+# vim-ember-hbs
+
+`vim-ember-hbs` is a plugin to add Ember Handlebars/HTMLBars syntax highlighting and
+indentation to Vim. It supports modern Ember Handlebars syntax like `{{else if` and
+`{{#each-in`. An example of the highlighting (and indentation):
+
+![Badwolf theme](_badwolf.png)
+![Solarized theme](_solarized.png)
+
+## Installation
+
+The easiest way to install `vim-ember-hbs` is using the amazing [Pathogen](https://github.com/tpope/vim-pathogen).
+Simply copy/paste the following snippet:
+
+```console
+cd ~/.vim/bundle
+git clone https://github.com/joukevandermaas/vim-ember-hbs.git
+```
+
+_Substitute `.vim` for `vimfiles` on Windows (in PowerShell)._
+
+## Customization
+
+The plugin defines a number of match groups that can be configured in a file at
+`$HOME/.vim/after/syntax/handlebars.vim`. Those groups and there default highlight links are:
+
+Please open an issue, if you are missing one.
+
+```vim
+hi link hbsBuiltInHelper Function         " all built in helpers like if, else, textarea, input, etc.
+hi link hbsKeyword Keyword                " currently the only keyword supported is `as`
+hi link hbsOperator Operator              " pencil () and argument =
+hi link hbsDelimiter Delimiter            " the || in e.g. `{{#each foo as |bar|}}`
+hi link hbsMustacheName Statement         " the name of a mustache `{{my-name`
+hi link hbsPencilName Statement           " the name of a pencil `(my-name`
+hi link hbsIdentifier Identifier          " everything thats inside a mustache or a pencil and is not a name nor an arg
+hi link hbsString String                  " a "string" inside a mustache or a pencil
+hi link hbsNumber Number                  " a 0135 number inside a mustache or a pencil
+hi link hbsHandles Define                 " The mustaches handles {{
+hi link hbsUnescapedHandles Identifier    " A handle with three braces {{{
+hi link hbsUnescapedIdentifier Identifier " The identifier inside those {{{
+hi link hbsComment Comment                " A comment {{!-- comment --}}
+hi link hbsArg Type                       " An argument inside a mustache or a pencil
+```
+
+One can e.g. highlight all unescaped mustaches as `Error` with
+
+```vim
+hi link hbsUnescapedIdentifier Error
+```
+
+To also highlight the `{{{` as `Error`, simply add
+
+```vim
+hi link hbsUnescapedHandles Error
+```
diff --git a/pack/language/start/ember-hbs/example.hbs b/pack/language/start/ember-hbs/example.hbs
new file mode 100644
index 0000000..e8df8c2
--- /dev/null
+++ b/pack/language/start/ember-hbs/example.hbs
@@ -0,0 +1,44 @@
+<AngleBraketComponent
+  @mustache={{@bla}}
+  @number=123
+  data-test-id="test"
+  class="my-class" as |test|>
+  Some Text
+  <div>{{test.someValue}}</div>
+  <test.component teste="asdfads"></test.component>
+</AngleBraketComponent>
+
+<HelloAngleBrackets @prop={{test}} />
+
+<AngleBrackets::-Components::Nested />
+
+<div class="my-css-class">{{test}}</div>
+
+{{#block-component property=@value  prop-erty=this.value string="testing"
+  onClick=(action "someAction" withParam) as |returnValue|}}
+  {{#each-in foo as |bar, baz|}}
+    {{inline-component foo=bar}}
+  {{else if value}}
+  {{else with foo}}
+    \{{escaped handlebars}}
+  {{else}}
+    {{! comment }}
+    {{!-- block }}
+      TODO: Indentation is broken after that
+      comment --}}
+
+    <a href class="{{if inside 'still highlight'}}"
+      onclick={{action foo}}>
+      {{escaped}}
+      {{{unescaped}}}
+    </a>
+
+    <MyIput type="text" oninput={{action (mut fooBar) value="target.value"}} />
+    <input type="text" oninput={{action (mut fooBar) value="target.value"}}>
+
+    {{helper "string" 123}}
+    {{input value="foo"}}
+
+    {{textarea}}
+  {{/each-in}}
+{{/block-component}}
diff --git a/pack/language/start/ember-hbs/ftdetect/handlebars.vim b/pack/language/start/ember-hbs/ftdetect/handlebars.vim
new file mode 100644
index 0000000..c4954b1
--- /dev/null
+++ b/pack/language/start/ember-hbs/ftdetect/handlebars.vim
@@ -0,0 +1 @@
+au BufNewFile,BufRead *.handlebars,*.hbs set filetype=html.handlebars syntax=handlebars
diff --git a/pack/language/start/ember-hbs/indent/handlebars.vim b/pack/language/start/ember-hbs/indent/handlebars.vim
new file mode 100644
index 0000000..b9fb279
--- /dev/null
+++ b/pack/language/start/ember-hbs/indent/handlebars.vim
@@ -0,0 +1,103 @@
+" Based on eruby.vim indentation by TPope
+
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/html.vim
+unlet! b:did_indent
+
+" Force HTML indent to not keep state.
+let b:html_indent_usestate = 0
+let b:handlebars_current_indent = 0
+
+if &l:indentexpr == ''
+  if &l:cindent
+    let &l:indentexpr = 'cindent(v:lnum)'
+  else
+    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
+  endif
+endif
+let b:handlebars_subtype_indentexpr = &l:indentexpr
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetHandlebarsIndent()
+setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=else,={{#,={{/
+
+" Only define the function once.
+if exists("*GetHandlebarsIndent")
+  finish
+endif
+
+function! GetHandlebarsIndent(...)
+  " The value of a single shift-width
+  if exists('*shiftwidth')
+    let sw = shiftwidth()
+  else
+    let sw = &sw
+  endif
+
+  if a:0 && a:1 == '.'
+    let v:lnum = line('.')
+  elseif a:0 && a:1 =~ '^\d'
+    let v:lnum = a:1
+  endif
+  let vcol = col('.')
+  call cursor(v:lnum,1)
+  call cursor(v:lnum,vcol)
+  exe "let ind = ".b:handlebars_subtype_indentexpr
+
+  " Workaround for Andy Wokula's HTML indent. This should be removed after
+  " some time, since the newest version is fixed in a different way. Credit
+  " to eruby.vim indent by tpope
+  if b:handlebars_subtype_indentexpr =~# '^HtmlIndent('
+  \ && exists('b:indent')
+  \ && type(b:indent) == type({})
+  \ && has_key(b:indent, 'lnum')
+    " Force HTML indent to not keep state
+    let b:indent.lnum = -1
+  endif
+
+  let lnum = prevnonblank(v:lnum-1)
+  let prevLine = getline(lnum)
+  let currentLine = getline(v:lnum)
+
+  " all indent rules only apply if the block opening/closing
+  " tag is on a separate line
+
+  " indent after block {{#block
+  if prevLine =~# '\v\s*\{\{\#'
+    let ind = ind + sw
+  endif
+  " but not if the block ends on the same line
+  if prevLine =~# '\v\s*\{\{\#(.+)(\s+|\}\}).+\{\{\/\1'
+    let ind = ind - sw
+  endif
+  " unindent after block close {{/block}}
+  if currentLine =~# '\v^\s*\{\{\/'
+    let ind = ind - sw
+  endif
+  " indent after component block {{a-component
+  if prevLine =~# '\v\s*\{\{\w'
+     let ind = ind + sw
+  endif
+  " but not if the component block ends on the same line
+  if prevLine =~# '\v\s*\{\{\w(.+)\}\}'
+    let ind = ind - sw
+  endif
+  " unindent }} lines
+  if currentLine =~# '\v^\s*\}\}\s*$' || (currentLine !~# '\v^\s*\{\{\/' && prevLine =~# '\v^\s*[^\{\}]+\}\}\s*$')
+    let ind = ind - sw
+  endif
+  " unindent {{else}}
+  if currentLine =~# '\v^\s*\{\{else'
+    let ind = ind - sw
+  endif
+  " indent again after {{else}}
+  if prevLine =~# '\v^\s*\{\{else'
+    let ind = ind + sw
+  endif
+ 
+  return ind
+endfunction
diff --git a/pack/language/start/ember-hbs/syntax/handlebars.vim b/pack/language/start/ember-hbs/syntax/handlebars.vim
new file mode 100644
index 0000000..73db2bb
--- /dev/null
+++ b/pack/language/start/ember-hbs/syntax/handlebars.vim
@@ -0,0 +1,61 @@
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/html.vim
+syntax cluster htmlPreproc add=hbsComponent,hbsMustache,hbsUnescaped,hbsMustacheBlock,hbsComment,hbsElseBlock,hbsEscapedMustache
+
+syntax match hbsEscapedMustache "\v\\\{\{"
+
+syntax region hbsComponent matchgroup=hbsComponentStatement start="\v\<(\/?)((\@\a+)|(((\w|-)+::)*\u\a+)|(\a+\.\a+))" end="\v\/?\>" keepend
+syntax region hbsMustache matchgroup=hbsHandles start="\v\{\{" skip="\v\\\}\}" end="\v\}\}" containedin=hbsComponent keepend
+syntax region hbsMustacheBlock matchgroup=hbsHandles start="\v\{\{[#/]" skip="\v\\\}\}" end="\v\}\}" keepend
+" modern hbs supports {{else <block>}} where <block> starts a new block
+syntax region hbsElseBlock matchgroup=hbsHandles start="\v\{\{else\ "rs=e-5 skip="\v\\\}\}" end="\v\}\}" keepend
+
+syntax region hbsPencil matchgroup=hbsOperator start="\v\(" end="\v\)" contained containedin=hbsMustache,hbsMustacheBlock,hbsElseBlock,hbsPencil
+
+" identifier is any word inside a mustache or a pencil that is not followed by a = sign (see hbsArg below)
+syntax match hbsIdentifier "\v(\(|\{\{[#/]?)@<!<(\w+)|(\@\w+)>" contained containedin=hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock,hbsStatement
+
+" unescaped are special forms of mustaches that don't have other stuff except for an identifier in it
+syntax region hbsUnescaped matchgroup=hbsUnescapedHandles start="\v\{\{\{" skip="\v\\\}\}\}" end="\v\}\}\}" keepend
+syntax match hbsUnescapedIdentifier "\v(\{\{\{)@<=<\S+>(\}\}\})" contained containedin=hbsUnescaped
+
+syntax match hbsMustacheName "\v(\{\{[#/]?)@<=<\S+>" contained containedin=hbsMustache,hbsMustacheBlock,hbsPencil
+syntax match hbsPencilName "\v(\()@<=<\S+>" contained containedin=hbsMustache,hbsMustacheBlock,hbsPencil
+syntax match hbsBuiltInHelper "\v(\{\{)@<=<else>( ?)@=" contained containedin=hbsElseBlock
+syntax match hbsBuiltInHelper "\v\(@<=<(query-params|mut|get|if|action|unless|unbound|concat)>" contained containedin=hbsPencil
+syntax match hbsBuiltInHelper "\v(\{\{)@<=<(textarea|mut|input|get|debugger|action|unless|input|unbound|yield|outlet|else)>" contained containedin=hbsMustache
+syntax match hbsBuiltInHelper "\v(\{\{[#/]?)@<=<(component|with|if|each(\-in)?|link\-to|unless)>" contained containedin=hbsMustacheBlock,hbsElseBlock
+syntax match hbsBuiltInHelperInElse "\v(\{\{else\ )@<=<(component|with|if|each(\-in)?|link\-to|unless)>" contained containedin=hbsMustacheBlock,hbsElseBlock
+syntax match hbsKeyword "\v\s+as\s+" contained containedin=hbsComponent,hbsMustacheBlock,hbsElseBlock
+syntax region hbsStatement matchgroup=hbsDelimiter start="\v\|" end="\v\|" contained containedin=hbsComponent,hbsMustacheBlock,hbsElseBlock
+
+syntax region hbsString matchgroup=hbsString start=/\v\"/ skip=/\v\\\"/ end=/\v\"/ contained containedin=hbsComponent,hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock
+syntax region hbsString matchgroup=hbsString start=/\v\'/ skip=/\v\\\'/ end=/\v\'/ contained containedin=hbsComponent,hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock
+syntax match hbsNumber "\v<\d+>" contained containedin=hbsComponent,hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock
+syntax match hbsArg "\v(\@\S+|\S+)\=@=" contained containedin=hbsComponent,hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock
+syntax match hbsOperator "\v(\S+)@<=\=" contained containedin=hbsComponent,hbsMustache,hbsMustacheBlock,hbsPencil,hbsElseBlock
+
+syntax region hbsComment start="\v\{\{\!" end="\v\}\}" keepend
+syntax region hbsComment start="\v\{\{\!\-\-" end="\v\-\-\}\}" keepend
+
+highlight link hbsBuiltInHelper Function
+highlight link hbsBuiltInHelperInElse Function
+highlight link hbsKeyword Keyword
+highlight link hbsOperator Operator
+highlight link hbsDelimiter Delimiter
+highlight link hbsMustacheName Statement
+highlight link hbsPencilName Statement
+highlight link hbsIdentifier Identifier
+highlight link hbsString String
+highlight link hbsNumber Number
+highlight link hbsHandles Define
+highlight link hbsComponentStatement Define
+highlight link hbsUnescapedHandles Identifier
+highlight link hbsUnescapedIdentifier Identifier
+highlight link hbsComment Comment
+highlight link hbsArg Type
+
+let b:current_syntax = "handlebars"
diff --git a/bundle/go/syntax/go.vim b/pack/language/start/go/syntax/go.vim
similarity index 100%
rename from bundle/go/syntax/go.vim
rename to pack/language/start/go/syntax/go.vim
diff --git a/pack/language/start/javascript/ISSUE_TEMPLATE.md b/pack/language/start/javascript/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..b1ddccb
--- /dev/null
+++ b/pack/language/start/javascript/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+*Requisite minimal reproducible example, formatted as plain text :*
+
+<hr>
+
+#### Optional: concerning jsx.
+PLEASE PLEASE PLEASE make sure you have properly
+setup and are sourcing this plugin https://github.com/mxw/vim-jsx
+
+WE DO NOT support JSX automatically, you need another plugin to add get this
+functionality.
+
+Make sure the bug still exists if you disable all other javascript plugins
+except the one noted above, mxw/vim-jsx
diff --git a/pack/language/start/javascript/README.md b/pack/language/start/javascript/README.md
new file mode 100644
index 0000000..b9ac49f
--- /dev/null
+++ b/pack/language/start/javascript/README.md
@@ -0,0 +1,119 @@
+# vim-javascript
+
+JavaScript bundle for vim, this bundle provides syntax highlighting and
+improved indentation.
+
+
+## Installation
+
+### Install with [pathogen](https://github.com/tpope/vim-pathogen)
+
+      git clone https://github.com/pangloss/vim-javascript.git ~/.vim/bundle/vim-javascript
+
+alternatively, use a package manager like [vim-plug](https://github.com/junegunn/vim-plug)
+
+
+## Configuration Variables
+
+The following variables control certain syntax highlighting plugins. You can
+add them to your `.vimrc` to enable their features.
+
+-----------------
+
+```
+let g:javascript_plugin_jsdoc = 1
+```
+
+Enables syntax highlighting for [JSDocs](http://usejsdoc.org/).
+
+Default Value: 0
+
+-----------------
+
+```
+let g:javascript_plugin_ngdoc = 1
+```
+
+Enables some additional syntax highlighting for NGDocs. Requires JSDoc plugin
+to be enabled as well.
+
+Default Value: 0
+
+-----------------
+
+```
+let g:javascript_plugin_flow = 1
+```
+
+Enables syntax highlighting for [Flow](https://flowtype.org/).
+
+Default Value: 0
+
+-----------------
+
+```vim
+augroup javascript_folding
+    au!
+    au FileType javascript setlocal foldmethod=syntax
+augroup END
+```
+
+Enables code folding for javascript based on our syntax file.
+
+Please note this can have a dramatic effect on performance.
+
+
+## Concealing Characters
+
+You can customize concealing characters, if your font provides the glyph you want, by defining one or more of the following
+variables:
+
+    let g:javascript_conceal_function             = "ƒ"
+    let g:javascript_conceal_null                 = "ø"
+    let g:javascript_conceal_this                 = "@"
+    let g:javascript_conceal_return               = "⇚"
+    let g:javascript_conceal_undefined            = "¿"
+    let g:javascript_conceal_NaN                  = "ℕ"
+    let g:javascript_conceal_prototype            = "¶"
+    let g:javascript_conceal_static               = "•"
+    let g:javascript_conceal_super                = "Ω"
+    let g:javascript_conceal_arrow_function       = "⇒"
+    let g:javascript_conceal_noarg_arrow_function = "🞅"
+    let g:javascript_conceal_underscore_arrow_function = "🞅"
+
+
+You can enable concealing within VIM with:
+
+    set conceallevel=1
+
+OR if you wish to toggle concealing you may wish to bind a command such as the following which will map `<LEADER>l` (leader is usually the `\` key) to toggling conceal mode:
+
+    map <leader>l :exec &conceallevel ? "set conceallevel=0" : "set conceallevel=1"<CR>
+
+
+## Indentation Specific
+
+* `:h cino-:`
+* `:h cino-=`
+* `:h cino-star`
+* `:h cino-(`
+* `:h cino-w`
+* `:h cino-W`
+* `:h cino-U`
+* `:h cino-m`
+* `:h cino-M`
+* `:h 'indentkeys'`
+
+## Contributing
+
+Please follow the general code style
+guides (read the code) and in your pull request explain the reason for the
+proposed change and how it is valuable. All p.r.'s will be reviewed by a
+maintainer(s) then, hopefully, merged.
+
+Thank you!
+
+
+## License
+
+Distributed under the same terms as Vim itself. See `:help license`.
diff --git a/pack/language/start/javascript/after/ftplugin/javascript.vim b/pack/language/start/javascript/after/ftplugin/javascript.vim
new file mode 100644
index 0000000..c6c42d6
--- /dev/null
+++ b/pack/language/start/javascript/after/ftplugin/javascript.vim
@@ -0,0 +1,12 @@
+" Vim filetype plugin file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
+setlocal iskeyword+=$ suffixesadd+=.js
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
+else
+  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
+endif
diff --git a/pack/language/start/javascript/compiler/eslint.vim b/pack/language/start/javascript/compiler/eslint.vim
new file mode 100644
index 0000000..7695a07
--- /dev/null
+++ b/pack/language/start/javascript/compiler/eslint.vim
@@ -0,0 +1,16 @@
+" Vim compiler plugin
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "eslint"
+
+if exists(":CompilerSet") != 2
+  command! -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=eslint\ -f\ compact\ %
+CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
diff --git a/bundle/javascript/extras/ctags b/pack/language/start/javascript/extras/ctags
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/javascript/extras/ctags
rename to pack/language/start/javascript/extras/ctags
diff --git a/pack/language/start/javascript/extras/flow.vim b/pack/language/start/javascript/extras/flow.vim
new file mode 100644
index 0000000..17faa5b
--- /dev/null
+++ b/pack/language/start/javascript/extras/flow.vim
@@ -0,0 +1,107 @@
+syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
+syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment fold
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
+syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
+syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
+syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
+syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
+syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
+syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
+syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
+syntax keyword jsFlowImportType     contained type typeof skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax match   jsFlowWildcard       contained /*/
+
+syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
+syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArray
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject,jsFlowReturnParens
+syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
+
+syntax region  jsFlowFunctionGroup      contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsFlowClassGroup         contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+syntax region  jsFlowClassFunctionGroup contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+
+syntax region  jsFlowTypeStatement                                   start=/\(opaque\s\+\)\?type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
+syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
+syntax match   jsFlowTypeOperator   contained /=/
+syntax keyword jsFlowTypeKeyword    contained type
+
+syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
+syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
+
+syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
+syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
+syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
+
+" NOTE: It appears the nextgroup was causing a ton of breakages... testing it
+" witout a nextgroup, but keeping this arround for reference incase something breaks
+" syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
+syntax match   jsFlowMaybe          contained /?/
+syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend fold
+
+syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
+
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlowDefinition         PreProc
+  HiLink jsFlowClassDef           jsFlowDefinition
+  HiLink jsFlowArgumentDef        jsFlowDefinition
+  HiLink jsFlowType               Type
+  HiLink jsFlowTypeCustom         PreProc
+  HiLink jsFlowTypeof             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowExactObject        PreProc
+  HiLink jsFlowParens             PreProc
+  HiLink jsFlowGroup              PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowParenAnnotation    PreProc
+  HiLink jsFlowReturnObject       jsFlowReturn
+  HiLink jsFlowReturnArray        jsFlowArray
+  HiLink jsFlowReturnParens       jsFlowParens
+  HiLink jsFlowReturnGroup        jsFlowGroup
+  HiLink jsFlowFunctionGroup      PreProc
+  HiLink jsFlowClassGroup         PreProc
+  HiLink jsFlowClassFunctionGroup PreProc
+  HiLink jsFlowArrowArguments     PreProc
+  HiLink jsFlowArrow              PreProc
+  HiLink jsFlowReturnArrow        PreProc
+  HiLink jsFlowTypeStatement      PreProc
+  HiLink jsFlowTypeKeyword        PreProc
+  HiLink jsFlowTypeOperator       Operator
+  HiLink jsFlowMaybe              PreProc
+  HiLink jsFlowReturnMaybe        PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowDeclare            PreProc
+  HiLink jsFlowModule             PreProc
+  HiLink jsFlowInterface          PreProc
+  HiLink jsFlowNoise              Noise
+  HiLink jsFlowObjectKey          jsObjectKey
+  HiLink jsFlowOrOperator         jsOperator
+  HiLink jsFlowReturnOrOp         jsFlowOrOperator
+  HiLink jsFlowWildcard           PreProc
+  HiLink jsFlowWildcardReturn     PreProc
+  HiLink jsFlowImportType         PreProc
+  HiLink jsFlowTypeValue          PreProc
+  delcommand HiLink
+endif
diff --git a/pack/language/start/javascript/extras/jsdoc.vim b/pack/language/start/javascript/extras/jsdoc.vim
new file mode 100644
index 0000000..b1b588f
--- /dev/null
+++ b/pack/language/start/javascript/extras/jsdoc.vim
@@ -0,0 +1,39 @@
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\|typedef\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inherit[dD]oc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
diff --git a/pack/language/start/javascript/extras/ngdoc.vim b/pack/language/start/javascript/extras/ngdoc.vim
new file mode 100644
index 0000000..c513d87
--- /dev/null
+++ b/pack/language/start/javascript/extras/ngdoc.vim
@@ -0,0 +1,3 @@
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
diff --git a/pack/language/start/javascript/ftdetect/javascript.vim b/pack/language/start/javascript/ftdetect/javascript.vim
new file mode 100644
index 0000000..1130f97
--- /dev/null
+++ b/pack/language/start/javascript/ftdetect/javascript.vim
@@ -0,0 +1,11 @@
+fun! s:SelectJavascript()
+  if getline(1) =~# '^#!.*/bin/\%(env\s\+\)\?node\>'
+    set ft=javascript
+  endif
+endfun
+
+augroup javascript_syntax_detection
+  autocmd!
+  autocmd BufNewFile,BufRead *.{js,mjs,jsm,es,es6},Jakefile setfiletype javascript
+  autocmd BufNewFile,BufRead * call s:SelectJavascript()
+augroup END
diff --git a/pack/language/start/javascript/indent/javascript.vim b/pack/language/start/javascript/indent/javascript.vim
new file mode 100644
index 0000000..d9463d6
--- /dev/null
+++ b/pack/language/start/javascript/indent/javascript.vim
@@ -0,0 +1,475 @@
+" Vim indent file
+" Language: Javascript
+" Maintainer: Chris Paul ( https://github.com/bounceme )
+" URL: https://github.com/pangloss/vim-javascript
+" Last Change: December 4, 2017
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+" Now, set up our indentation expression and keys that trigger it.
+setlocal indentexpr=GetJavascriptIndent()
+setlocal autoindent nolisp nosmartindent
+setlocal indentkeys+=0],0)
+" Testable with something like:
+" vim  -eNs "+filetype plugin indent on" "+syntax on" "+set ft=javascript" \
+"       "+norm! gg=G" '+%print' '+:q!' testfile.js \
+"       | diff -uBZ testfile.js -
+
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
+
+" Only define the function once.
+if exists('*GetJavascriptIndent')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" indent correctly if inside <script>
+" vim/vim@690afe1 for the switch from cindent
+" overridden with b:html_indent_script1
+call extend(g:,{'html_indent_script1': 'inc'},'keep')
+
+" Regex of syntax group names that are or delimit string or are comments.
+let s:bvars = {
+      \ 'syng_strcom': 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!',
+      \ 'syng_str': 'string\|template\|special' }
+" template strings may want to be excluded when editing graphql:
+" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
+
+function s:GetVars()
+  call extend(b:,extend(s:bvars,{'js_cache': [0,0,0]}),'keep')
+endfunction
+
+" Get shiftwidth value
+if exists('*shiftwidth')
+  function s:sw()
+    return shiftwidth()
+  endfunction
+else
+  function s:sw()
+    return &l:shiftwidth ? &l:shiftwidth : &l:tabstop
+  endfunction
+endif
+
+" Performance for forwards search(): start search at pos rather than masking
+" matches before pos.
+let s:z = has('patch-7.4.984') ? 'z' : ''
+
+" Expression used to check whether we should skip a match with searchpair().
+let s:skip_expr = "s:SynAt(line('.'),col('.')) =~? b:syng_strcom"
+let s:in_comm = s:skip_expr[:-14] . "'comment\\|doc'"
+
+let s:rel = has('reltime')
+" searchpair() wrapper
+if s:rel
+  function s:GetPair(start,end,flags,skip)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1,a:skip ==# 's:SkipFunc()' ? 2000 : 200)
+  endfunction
+else
+  function s:GetPair(start,end,flags,skip)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,s:l1)
+  endfunction
+endif
+
+function s:SynAt(l,c)
+  let byte = line2byte(a:l) + a:c - 1
+  let pos = index(s:synid_cache[0], byte)
+  if pos == -1
+    let s:synid_cache[:] += [[byte], [synIDattr(synID(a:l, a:c, 0), 'name')]]
+  endif
+  return s:synid_cache[1][pos]
+endfunction
+
+function s:ParseCino(f)
+  let [s, n, divider] = [strridx(&cino, a:f)+1, '', 0]
+  while s && &cino[ s ] =~ '[^,]'
+    if &cino[ s ] == '.'
+      let divider = 1
+    elseif &cino[ s ] ==# 's'
+      if n !~ '\d'
+        return n . s:sw() + 0
+      endif
+      let n = str2nr(n) * s:sw()
+      break
+    else
+      let [n, divider] .= [&cino[ s ], 0]
+    endif
+    let s += 1
+  endwhile
+  return str2nr(n) / max([divider, 1])
+endfunction
+
+" Optimized {skip} expr, only callable from the search loop which
+" GetJavascriptIndent does to find the containing [[{(] (side-effects)
+function s:SkipFunc()
+  if s:top_col == 1
+    throw 'out of bounds'
+  elseif s:check_in
+    if eval(s:skip_expr)
+      return 1
+    endif
+    let s:check_in = 0
+  elseif getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$'
+    if eval(s:skip_expr)
+      return 1
+    endif
+  elseif search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
+    if eval(s:skip_expr)
+      let s:check_in = 1
+      return 1
+    endif
+  else
+    let s:synid_cache[:] += [[line2byte('.') + col('.') - 1], ['']]
+  endif
+  let [s:looksyn, s:top_col] = getpos('.')[1:2]
+endfunction
+
+function s:AlternatePair()
+  let [pat, l:for] = ['[][(){};]', 2]
+  while s:SearchLoop(pat,'bW','s:SkipFunc()')
+    if s:LookingAt() == ';'
+      if !l:for
+        if s:GetPair('{','}','bW','s:SkipFunc()')
+          return
+        endif
+        break
+      else
+        let [pat, l:for] = ['[{}();]', l:for - 1]
+      endif
+    else
+      let idx = stridx('])}',s:LookingAt())
+      if idx == -1
+        return
+      elseif !s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
+        break
+      endif
+    endif
+  endwhile
+  throw 'out of bounds'
+endfunction
+
+function s:Nat(int)
+  return a:int * (a:int > 0)
+endfunction
+
+function s:LookingAt()
+  return getline('.')[col('.')-1]
+endfunction
+
+function s:Token()
+  return s:LookingAt() =~ '\k' ? expand('<cword>') : s:LookingAt()
+endfunction
+
+function s:PreviousToken(...)
+  let [l:pos, tok] = [getpos('.'), '']
+  if search('\m\k\{1,}\|\S','ebW')
+    if getline('.')[col('.')-2:col('.')-1] == '*/'
+      if eval(s:in_comm) && !s:SearchLoop('\S\ze\_s*\/[/*]','bW',s:in_comm)
+        call setpos('.',l:pos)
+      else
+        let tok = s:Token()
+      endif
+    else
+      let two = a:0 || line('.') != l:pos[1] ? strridx(getline('.')[:col('.')],'//') + 1 : 0
+      if two && eval(s:in_comm)
+        call cursor(0,two)
+        let tok = s:PreviousToken(1)
+        if tok is ''
+          call setpos('.',l:pos)
+        endif
+      else
+        let tok = s:Token()
+      endif
+    endif
+  endif
+  return tok
+endfunction
+
+function s:Pure(f,...)
+  return eval("[call(a:f,a:000),cursor(a:firstline,".col('.').")][0]")
+endfunction
+
+function s:SearchLoop(pat,flags,expr)
+  return s:GetPair(a:pat,'\_$.',a:flags,a:expr)
+endfunction
+
+function s:ExprCol()
+  if getline('.')[col('.')-2] == ':'
+    return 1
+  endif
+  let bal = 0
+  while s:SearchLoop('[{}?:]','bW',s:skip_expr)
+    if s:LookingAt() == ':'
+      let bal -= !search('\m:\%#','bW')
+    elseif s:LookingAt() == '?'
+      if getline('.')[col('.'):col('.')+1] =~ '^\.\d\@!'
+        " ?. conditional chain, not ternary start
+      elseif !bal
+        return 1
+      else
+        let bal += 1
+      endif
+    elseif s:LookingAt() == '{'
+      return !s:IsBlock()
+    elseif !s:GetPair('{','}','bW',s:skip_expr)
+      break
+    endif
+  endwhile
+endfunction
+
+" configurable regexes that define continuation lines, not including (, {, or [.
+let s:opfirst = '^' . get(g:,'javascript_opfirst',
+      \ '\C\%([<>=,.?^%|/&]\|\([-:+]\)\1\@!\|\*\+\|!=\|in\%(stanceof\)\=\>\)')
+let s:continuation = get(g:,'javascript_continuation',
+      \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
+
+function s:Continues()
+  let tok = matchstr(strpart(getline('.'),col('.')-15,15),s:continuation)
+  if tok =~ '[a-z:]'
+    return tok == ':' ? s:ExprCol() : s:PreviousToken() != '.'
+  elseif tok !~ '[/>]'
+    return tok isnot ''
+  endif
+  return s:SynAt(line('.'),col('.')) !~? (tok == '>' ? 'jsflow\|^html' : 'regex')
+endfunction
+
+" Check if line 'lnum' has a balanced amount of parentheses.
+function s:Balanced(lnum,line)
+  let l:open = 0
+  let pos = match(a:line, '[][(){}]')
+  while pos != -1
+    if s:SynAt(a:lnum,pos + 1) !~? b:syng_strcom
+      let l:open += matchend(a:line[pos],'[[({]')
+      if l:open < 0
+        return
+      endif
+    endif
+    let pos = match(a:line, !l:open ? '[][(){}]' : '()' =~ a:line[pos] ?
+          \ '[()]' : '{}' =~ a:line[pos] ? '[{}]' : '[][]', pos + 1)
+  endwhile
+  return !l:open
+endfunction
+
+function s:OneScope()
+  if s:LookingAt() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr)
+    let tok = s:PreviousToken()
+    return (count(split('for if let while with'),tok) ||
+          \ tok =~# '^await$\|^each$' && s:PreviousToken() ==# 'for') &&
+          \ s:Pure('s:PreviousToken') != '.' && !(tok == 'while' && s:DoWhile())
+  elseif s:Token() =~# '^else$\|^do$'
+    return s:Pure('s:PreviousToken') != '.'
+  elseif strpart(getline('.'),col('.')-2,2) == '=>'
+    call cursor(0,col('.')-1)
+    return s:PreviousToken() != ')' || s:GetPair('(', ')', 'bW', s:skip_expr)
+  endif
+endfunction
+
+function s:DoWhile()
+  let cpos = searchpos('\m\<','cbW')
+  while s:SearchLoop('\C[{}]\|\<\%(do\|while\)\>','bW',s:skip_expr)
+    if s:LookingAt() =~ '\a'
+      if s:Pure('s:IsBlock')
+        if s:LookingAt() ==# 'd'
+          return 1
+        endif
+        break
+      endif
+    elseif s:LookingAt() != '}' || !s:GetPair('{','}','bW',s:skip_expr)
+      break
+    endif
+  endwhile
+  call call('cursor',cpos)
+endfunction
+
+" returns total offset from braceless contexts. 'num' is the lineNr which
+" encloses the entire context, 'cont' if whether a:firstline is a continued
+" expression, which could have started in a braceless context
+function s:IsContOne(cont)
+  let [l:num, pind] = b:js_cache[1] ?
+        \ [b:js_cache[1], indent(b:js_cache[1]) + s:sw()] : [1,0]
+  let [ind, b_l] = [indent('.') + !a:cont, 0]
+  while line('.') > l:num && ind > pind || line('.') == l:num
+    if indent('.') < ind && s:OneScope()
+      let b_l += 1
+    elseif !a:cont || b_l || ind < indent(a:firstline)
+      break
+    else
+      call cursor(0,1)
+    endif
+    let ind = min([ind, indent('.')])
+    if s:PreviousToken() is ''
+      break
+    endif
+  endwhile
+  return b_l
+endfunction
+
+function s:IsSwitch()
+  return search(printf('\m\C\%%%dl\%%%dc%s',b:js_cache[1],b:js_cache[2],
+        \ '{\_s*\%(\%(\/\/.*\_$\|\/\*\_.\{-}\*\/\)\@>\_s*\)*\%(case\|default\)\>'),'nW'.s:z)
+endfunction
+
+" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
+function s:IsBlock()
+  let tok = s:PreviousToken()
+  if join(s:stack) =~? 'xml\|jsx' && s:SynAt(line('.'),col('.')-1) =~? 'xml\|jsx'
+    let s:in_jsx = 1
+    return tok != '{'
+  elseif tok =~ '\k'
+    if tok ==# 'type'
+      return s:Pure('eval',"s:PreviousToken() !~# '^\\%(im\\|ex\\)port$' || s:PreviousToken() == '.'")
+    elseif tok ==# 'of'
+      return s:Pure('eval',"!s:GetPair('[[({]','[])}]','bW',s:skip_expr) || s:LookingAt() != '(' ||"
+            \ ."s:{s:PreviousToken() ==# 'await' ? 'Previous' : ''}Token() !=# 'for' || s:PreviousToken() == '.'")
+    endif
+    return index(split('return const let import export extends yield default delete var await void typeof throw case new in instanceof')
+          \ ,tok) < (line('.') != a:firstline) || s:Pure('s:PreviousToken') == '.'
+  elseif tok == '>'
+    return getline('.')[col('.')-2] == '=' || s:SynAt(line('.'),col('.')) =~? 'jsflow\|^html'
+  elseif tok == '*'
+    return s:Pure('s:PreviousToken') == ':'
+  elseif tok == ':'
+    return s:Pure('eval',"s:PreviousToken() =~ '^\\K\\k*$' && !s:ExprCol()")
+  elseif tok == '/'
+    return s:SynAt(line('.'),col('.')) =~? 'regex'
+  elseif tok !~ '[=~!<,.?^%|&([]'
+    return tok !~ '[-+]' || line('.') != a:firstline && getline('.')[col('.')-2] == tok
+  endif
+endfunction
+
+function GetJavascriptIndent()
+  call s:GetVars()
+  let s:synid_cache = [[],[]]
+  let l:line = getline(v:lnum)
+  " use synstack as it validates syn state and works in an empty line
+  let s:stack = [''] + map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
+
+  " start with strings,comments,etc.
+  if s:stack[-1] =~? 'comment\|doc'
+    if l:line !~ '^\s*\/[/*]'
+      return l:line =~ '^\s*\*' ? cindent(v:lnum) : -1
+    endif
+  elseif s:stack[-1] =~? b:syng_str
+    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1,getline(v:lnum-1))
+      let b:js_cache[0] = v:lnum
+    endif
+    return -1
+  endif
+
+  let nest = get(get(b:,'hi_indent',{}),'blocklnr')
+  let s:l1 = max([0, prevnonblank(v:lnum) - (s:rel ? 2000 : 1000), nest])
+  call cursor(v:lnum,1)
+  if s:PreviousToken() is ''
+    return
+  endif
+  let [l:lnum, lcol, pline] = getpos('.')[1:2] + [getline('.')[:col('.')-1]]
+
+  let l:line = substitute(l:line,'^\s*','','')
+  let l:line_s = l:line[0]
+  if l:line[:1] == '/*'
+    let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
+  endif
+  if l:line =~ '^\/[/*]'
+    let l:line = ''
+  endif
+
+  " the containing paren, bracket, or curly. Many hacks for performance
+  call cursor(v:lnum,1)
+  let idx = index([']',')','}'],l:line[0])
+  if b:js_cache[0] > l:lnum && b:js_cache[0] < v:lnum ||
+        \ b:js_cache[0] == l:lnum && s:Balanced(l:lnum,pline)
+    call call('cursor',b:js_cache[1:])
+  else
+    let [s:looksyn, s:top_col, s:check_in, s:l1] = [v:lnum - 1,0,0,
+          \ max([s:l1, &smc ? search('\m^.\{'.&smc.',}','nbW',s:l1 + 1) + 1 : 0])]
+    try
+      if idx != -1
+        call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:SkipFunc()')
+      elseif getline(v:lnum) !~ '^\S' && s:stack[-1] =~? 'block\|^jsobject$'
+        call s:GetPair('{','}','bW','s:SkipFunc()')
+      else
+        call s:AlternatePair()
+      endif
+    catch /^\Cout of bounds$/
+      call cursor(v:lnum,1)
+    endtry
+    let b:js_cache[1:] = line('.') == v:lnum ? [0,0] : getpos('.')[1:2]
+  endif
+
+  let [b:js_cache[0], num] = [v:lnum, b:js_cache[1]]
+
+  let [num_ind, is_op, b_l, l:switch_offset, s:in_jsx] = [s:Nat(indent(num)),0,0,0,0]
+  if !num || s:LookingAt() == '{' && s:IsBlock()
+    let ilnum = line('.')
+    if num && !s:in_jsx && s:LookingAt() == ')' && s:GetPair('(',')','bW',s:skip_expr)
+      if ilnum == num
+        let [num, num_ind] = [line('.'), indent('.')]
+      endif
+      if idx == -1 && s:PreviousToken() ==# 'switch' && s:IsSwitch()
+        let l:switch_offset = &cino !~ ':' ? s:sw() : s:ParseCino(':')
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
+          return s:Nat(num_ind + l:switch_offset)
+        elseif &cino =~ '='
+          let l:case_offset = s:ParseCino('=')
+        endif
+      endif
+    endif
+    if idx == -1 && pline[-1:] !~ '[{;]'
+      call cursor(l:lnum, lcol)
+      let sol = matchstr(l:line,s:opfirst)
+      if sol is '' || sol == '/' && s:SynAt(v:lnum,
+            \ 1 + len(getline(v:lnum)) - len(l:line)) =~? 'regex'
+        if s:Continues()
+          let is_op = s:sw()
+        endif
+      elseif num && sol =~# '^\%(in\%(stanceof\)\=\|\*\)$' &&
+            \ s:LookingAt() == '}' && s:GetPair('{','}','bW',s:skip_expr) &&
+            \ s:PreviousToken() == ')' && s:GetPair('(',')','bW',s:skip_expr) &&
+            \ (s:PreviousToken() == ']' || s:LookingAt() =~ '\k' &&
+            \ s:{s:PreviousToken() == '*' ? 'Previous' : ''}Token() !=# 'function')
+        return num_ind + s:sw()
+      else
+        let is_op = s:sw()
+      endif
+      call cursor(l:lnum, lcol)
+      let b_l = s:Nat(s:IsContOne(is_op) - (!is_op && l:line =~ '^{')) * s:sw()
+    endif
+  elseif idx == -1 && s:LookingAt() == '(' && &cino =~ '(' &&
+        \ (search('\m\S','nbW',num) || s:ParseCino('U'))
+    let pval = s:ParseCino('(')
+    if !pval
+      let [Wval, vcol] = [s:ParseCino('W'), virtcol('.')]
+      if search('\m'.get(g:,'javascript_indent_W_pat','\S'),'W',num)
+        return s:ParseCino('w') ? vcol : virtcol('.')-1
+      endif
+      return Wval ? s:Nat(num_ind + Wval) : vcol
+    endif
+    return s:Nat(num_ind + pval + searchpair('\m(','','\m)','nbrmW',s:skip_expr,num) * s:sw())
+  endif
+
+  " main return
+  if l:line =~ '^[])}]\|^|}'
+    if l:line_s == ')'
+      if s:ParseCino('M')
+        return indent(l:lnum)
+      elseif num && &cino =~# 'm' && !s:ParseCino('m')
+        return virtcol('.') - 1
+      endif
+    endif
+    return num_ind
+  elseif num
+    return s:Nat(num_ind + get(l:,'case_offset',s:sw()) + l:switch_offset + b_l + is_op)
+  elseif nest
+    return indent(nextnonblank(nest+1)) + b_l + is_op
+  endif
+  return b_l + is_op
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/pack/language/start/javascript/syntax/javascript.vim b/pack/language/start/javascript/syntax/javascript.vim
new file mode 100644
index 0000000..f08a063
--- /dev/null
+++ b/pack/language/start/javascript/syntax/javascript.vim
@@ -0,0 +1,391 @@
+" Vim syntax file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'javascript'
+endif
+
+" Dollar sign is permitted anywhere in an identifier
+if (v:version > 704 || v:version == 704 && has('patch1142')) && main_syntax == 'javascript'
+  syntax iskeyword @,48-57,_,192-255,$
+else
+  setlocal iskeyword+=$
+endif
+
+syntax sync fromstart
+" TODO: Figure out what type of casing I need
+" syntax case ignore
+syntax case match
+
+syntax match   jsNoise          /[:,;]/
+syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
+syntax match   jsObjectProp     contained /\<\K\k*/
+syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
+syntax match   jsParensError    /[)}\]]/
+
+" Program Keywords
+syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
+syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
+syntax keyword jsOperatorKeyword delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsBooleanTrue    true
+syntax keyword jsBooleanFalse   false
+
+" Modules
+syntax keyword jsImport                       import skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup,jsFlowImportType
+syntax keyword jsExport                       export skipwhite skipempty nextgroup=@jsAll,jsModuleGroup,jsExportDefault,jsModuleAsterisk,jsModuleKeyword,jsFlowTypeStatement
+syntax match   jsModuleKeyword      contained /\<\K\k*/ skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax keyword jsExportDefault      contained default skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsExportDefaultGroup contained default skipwhite skipempty nextgroup=jsModuleAs,jsFrom,jsModuleComma
+syntax match   jsModuleAsterisk     contained /\*/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAs,jsFrom
+syntax keyword jsModuleAs           contained as skipwhite skipempty nextgroup=jsModuleKeyword,jsExportDefaultGroup
+syntax keyword jsFrom               contained from skipwhite skipempty nextgroup=jsString
+syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=jsModuleKeyword,jsModuleAsterisk,jsModuleGroup,jsFlowTypeKeyword
+
+" Strings, Templates, Numbers
+syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial,@Spell extend
+syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial,@Spell extend
+syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
+syntax keyword jsNumber           Infinity
+syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
+
+" Regular Expressions
+syntax match   jsSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{4,5}})|c\u|.)"
+syntax region  jsTemplateExpression contained matchgroup=jsTemplateBraces start=+${+ end=+}+ contains=@jsExpression keepend
+syntax region  jsRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=jsSpecial
+syntax match   jsRegexpBoundary     contained "\v\c[$^]|\\b"
+syntax match   jsRegexpBackRef      contained "\v\\[1-9]\d*"
+syntax match   jsRegexpQuantifier   contained "\v[^\\]%([?*+]|\{\d+%(,\d*)?})\??"lc=1
+syntax match   jsRegexpOr           contained "|"
+syntax match   jsRegexpMod          contained "\v\(\?[:=!>]"lc=1
+syntax region  jsRegexpGroup        contained start="[^\\]("lc=1 skip="\\.\|\[\(\\.\|[^]]\+\)\]" end=")" contains=jsRegexpCharClass,@jsRegexpSpecial keepend
+syntax region  jsRegexpString   start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blank:][:alnum:]_$]\)\s*\)\@<=/\ze[^*/]+ skip=+\\.\|\[[^]]\{1,}\]+ end=+/[gimyus]\{,6}+ contains=jsRegexpCharClass,jsRegexpGroup,@jsRegexpSpecial oneline keepend extend
+syntax cluster jsRegexpSpecial    contains=jsSpecial,jsRegexpBoundary,jsRegexpBackRef,jsRegexpQuantifier,jsRegexpOr,jsRegexpMod
+
+" Objects
+syntax match   jsObjectShorthandProp contained /\<\k*\ze\s*/ skipwhite skipempty nextgroup=jsObjectSeparator
+syntax match   jsObjectKey         contained /\<\k*\ze\s*:/ contains=jsFunctionKey skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyString   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsObjectKeyComputed contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsObjectValue,jsFuncArgs extend
+syntax match   jsObjectSeparator   contained /,/
+syntax region  jsObjectValue       contained matchgroup=jsObjectColon start=/:/ end=/[,}]\@=/ contains=@jsExpression extend
+syntax match   jsObjectFuncName    contained /\<\K\k*\ze\_s*(/ skipwhite skipempty nextgroup=jsFuncArgs
+syntax match   jsFunctionKey       contained /\<\K\k*\ze\s*:\s*function\>/
+syntax match   jsObjectMethodType  contained /\<[gs]et\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsObjectFuncName
+syntax region  jsObjectStringKey   contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs,jsObjectValue
+
+exe 'syntax keyword jsNull      null             '.(exists('g:javascript_conceal_null')      ? 'conceal cchar='.g:javascript_conceal_null       : '')
+exe 'syntax keyword jsReturn    return contained '.(exists('g:javascript_conceal_return')    ? 'conceal cchar='.g:javascript_conceal_return     : '').' skipwhite nextgroup=@jsExpression'
+exe 'syntax keyword jsUndefined undefined        '.(exists('g:javascript_conceal_undefined') ? 'conceal cchar='.g:javascript_conceal_undefined  : '')
+exe 'syntax keyword jsNan       NaN              '.(exists('g:javascript_conceal_NaN')       ? 'conceal cchar='.g:javascript_conceal_NaN        : '')
+exe 'syntax keyword jsPrototype prototype        '.(exists('g:javascript_conceal_prototype') ? 'conceal cchar='.g:javascript_conceal_prototype  : '')
+exe 'syntax keyword jsThis      this             '.(exists('g:javascript_conceal_this')      ? 'conceal cchar='.g:javascript_conceal_this       : '')
+exe 'syntax keyword jsSuper     super  contained '.(exists('g:javascript_conceal_super')     ? 'conceal cchar='.g:javascript_conceal_super      : '')
+
+" Statement Keywords
+syntax match   jsBlockLabel              /\<\K\k*\s*::\@!/    contains=jsNoise skipwhite skipempty nextgroup=jsBlock
+syntax match   jsBlockLabelKey contained /\<\K\k*\ze\s*\_[;]/
+syntax keyword jsStatement     contained with yield debugger
+syntax keyword jsStatement     contained break continue skipwhite skipempty nextgroup=jsBlockLabelKey
+syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
+syntax keyword jsConditional            else            skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
+syntax keyword jsConditional            switch          skipwhite skipempty nextgroup=jsParenSwitch
+syntax keyword jsRepeat                 while for       skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
+syntax keyword jsDo                     do              skipwhite skipempty nextgroup=jsRepeatBlock
+syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
+syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
+syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
+syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsException              throw
+syntax keyword jsAsyncKeyword           async await
+syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
+
+" Keywords
+syntax keyword jsGlobalObjects      Array Boolean Date Function Iterator Number Object Symbol Map WeakMap Set WeakSet RegExp String Proxy Promise Buffer ParallelArray ArrayBuffer DataView Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray JSON Math console document window Intl Collator DateTimeFormat NumberFormat fetch
+syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
+syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
+syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
+syntax keyword jsBuiltins           decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt uneval
+" DISCUSS: How imporant is this, really? Perhaps it should be linked to an error because I assume the keywords are reserved?
+syntax keyword jsFutureKeys         abstract enum int short boolean interface byte long char final native synchronized float package throws goto private transient implements protected volatile double public
+
+" DISCUSS: Should we really be matching stuff like this?
+" DOM2 Objects
+syntax keyword jsGlobalObjects  DOMImplementation DocumentFragment Document Node NodeList NamedNodeMap CharacterData Attr Element Text Comment CDATASection DocumentType Notation Entity EntityReference ProcessingInstruction
+syntax keyword jsExceptions     DOMException
+
+" DISCUSS: Should we really be matching stuff like this?
+" DOM2 CONSTANT
+syntax keyword jsDomErrNo       INDEX_SIZE_ERR DOMSTRING_SIZE_ERR HIERARCHY_REQUEST_ERR WRONG_DOCUMENT_ERR INVALID_CHARACTER_ERR NO_DATA_ALLOWED_ERR NO_MODIFICATION_ALLOWED_ERR NOT_FOUND_ERR NOT_SUPPORTED_ERR INUSE_ATTRIBUTE_ERR INVALID_STATE_ERR SYNTAX_ERR INVALID_MODIFICATION_ERR NAMESPACE_ERR INVALID_ACCESS_ERR
+syntax keyword jsDomNodeConsts  ELEMENT_NODE ATTRIBUTE_NODE TEXT_NODE CDATA_SECTION_NODE ENTITY_REFERENCE_NODE ENTITY_NODE PROCESSING_INSTRUCTION_NODE COMMENT_NODE DOCUMENT_NODE DOCUMENT_TYPE_NODE DOCUMENT_FRAGMENT_NODE NOTATION_NODE
+
+" DISCUSS: Should we really be special matching on these props?
+" HTML events and internal variables
+syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus onkeydown onkeypress onkeyup onmousedown onmousemove onmouseout onmouseover onmouseup onresize
+
+" Code blocks
+syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
+syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
+syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock extend fold
+syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock extend fold
+syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
+syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
+syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
+syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
+syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
+syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
+syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword extend fold
+syntax region  jsBlock                        matchgroup=jsBraces              start=/{/  end=/}/  contains=@jsAll,jsSpreadExpression extend fold
+syntax region  jsModuleGroup        contained matchgroup=jsModuleBraces        start=/{/ end=/}/   contains=jsModuleKeyword,jsModuleComma,jsModuleAs,jsComment,jsFlowTypeKeyword skipwhite skipempty nextgroup=jsFrom fold
+syntax region  jsSpreadExpression   contained matchgroup=jsSpreadOperator      start=/\.\.\./ end=/[,}\]]\@=/ contains=@jsExpression
+syntax region  jsRestExpression     contained matchgroup=jsRestOperator        start=/\.\.\./ end=/[,)]\@=/
+syntax region  jsTernaryIf                    matchgroup=jsTernaryIfOperator   start=/?/  end=/\%(:\|}\@=\)/  contains=@jsExpression extend skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsOperator       /?\.\ze\_D/
+
+syntax match   jsGenerator            contained /\*/ skipwhite skipempty nextgroup=jsFuncName,jsFuncArgs,jsFlowFunctionGroup
+syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowFunctionGroup
+syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
+syntax match   jsFuncArgCommas        contained ','
+syntax keyword jsArguments            contained arguments
+syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
+
+" Matches a single keyword argument with no parens
+syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
+" Matches a series of arguments surrounded in parens
+syntax match   jsArrowFuncArgs  /([^()]*)\ze\s*=>/ contains=jsFuncArgs skipempty skipwhite nextgroup=jsArrowFunction extend
+
+exe 'syntax match jsFunction /\<function\>/      skipwhite skipempty nextgroup=jsGenerator,jsFuncName,jsFuncArgs,jsFlowFunctionGroup skipwhite '.(exists('g:javascript_conceal_function') ? 'conceal cchar='.g:javascript_conceal_function : '')
+exe 'syntax match jsArrowFunction /=>/           skipwhite skipempty nextgroup=jsFuncBlock,jsCommentFunction '.(exists('g:javascript_conceal_arrow_function') ? 'conceal cchar='.g:javascript_conceal_arrow_function : '')
+exe 'syntax match jsArrowFunction /()\ze\s*=>/   skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_noarg_arrow_function') ? 'conceal cchar='.g:javascript_conceal_noarg_arrow_function : '')
+exe 'syntax match jsArrowFunction /_\ze\s*=>/    skipwhite skipempty nextgroup=jsArrowFunction '.(exists('g:javascript_conceal_underscore_arrow_function') ? 'conceal cchar='.g:javascript_conceal_underscore_arrow_function : '')
+
+" Classes
+syntax keyword jsClassKeyword           contained class
+syntax keyword jsExtendsKeyword         contained extends skipwhite skipempty nextgroup=@jsExpression
+syntax match   jsClassNoise             contained /\./
+syntax match   jsClassFuncName          contained /\<\K\k*\ze\s*[(<]/ skipwhite skipempty nextgroup=jsFuncArgs,jsFlowClassFunctionGroup
+syntax match   jsClassMethodType        contained /\<\%([gs]et\|static\)\ze\s\+\K\k*/ skipwhite skipempty nextgroup=jsAsyncKeyword,jsClassFuncName,jsClassProperty
+syntax region  jsClassDefinition                  start=/\<class\>/ end=/\(\<extends\>\s\+\)\@<!{\@=/ contains=jsClassKeyword,jsExtendsKeyword,jsClassNoise,@jsExpression,jsFlowClassGroup skipwhite skipempty nextgroup=jsCommentClass,jsClassBlock,jsFlowClassGroup
+syntax match   jsClassProperty          contained /\<\K\k*\ze\s*=/ skipwhite skipempty nextgroup=jsClassValue,jsFlowClassDef
+syntax region  jsClassValue             contained start=/=/ end=/\_[;}]\@=/ contains=@jsExpression
+syntax region  jsClassPropertyComputed  contained matchgroup=jsBrackets start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsFuncArgs,jsClassValue extend
+syntax region  jsClassStringKey         contained start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1\|$+  contains=jsSpecial,@Spell extend skipwhite skipempty nextgroup=jsFuncArgs
+
+" Destructuring
+syntax match   jsDestructuringPropertyValue     contained /\k\+/
+syntax match   jsDestructuringProperty          contained /\k\+\ze\s*=/ skipwhite skipempty nextgroup=jsDestructuringValue
+syntax match   jsDestructuringAssignment        contained /\k\+\ze\s*:/ skipwhite skipempty nextgroup=jsDestructuringValueAssignment
+syntax region  jsDestructuringValue             contained start=/=/ end=/[,}\]]\@=/ contains=@jsExpression extend
+syntax region  jsDestructuringValueAssignment   contained start=/:/ end=/[,}=]\@=/ contains=jsDestructuringPropertyValue,jsDestructuringBlock,jsNoise,jsDestructuringNoise skipwhite skipempty nextgroup=jsDestructuringValue extend
+syntax match   jsDestructuringNoise             contained /[,[\]]/
+syntax region  jsDestructuringPropertyComputed  contained matchgroup=jsDestructuringBraces start=/\[/ end=/]/ contains=@jsExpression skipwhite skipempty nextgroup=jsDestructuringValue,jsDestructuringValueAssignment,jsDestructuringNoise extend fold
+
+" Comments
+syntax keyword jsCommentTodo    contained TODO FIXME XXX TBD
+syntax region  jsComment        start=+//+ end=/$/ contains=jsCommentTodo,@Spell extend keepend
+syntax region  jsComment        start=+/\*+  end=+\*/+ contains=jsCommentTodo,@Spell fold extend keepend
+syntax region  jsEnvComment     start=/\%^#!/ end=/$/ display
+
+" Specialized Comments - These are special comment regexes that are used in
+" odd places that maintain the proper nextgroup functionality. It sucks we
+" can't make jsComment a skippable type of group for nextgroup
+syntax region  jsCommentFunction    contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn extend keepend
+syntax region  jsCommentFunction    contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturn fold extend keepend
+syntax region  jsCommentClass       contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup extend keepend
+syntax region  jsCommentClass       contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsClassBlock,jsFlowClassGroup fold extend keepend
+syntax region  jsCommentIfElse      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock extend keepend
+syntax region  jsCommentIfElse      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsIfElseBlock fold extend keepend
+syntax region  jsCommentRepeat      contained start=+//+ end=/$/    contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock extend keepend
+syntax region  jsCommentRepeat      contained start=+/\*+ end=+\*/+ contains=jsCommentTodo,@Spell skipwhite skipempty nextgroup=jsRepeatBlock fold extend keepend
+
+" Decorators
+syntax match   jsDecorator                    /^\s*@/ nextgroup=jsDecoratorFunction
+syntax match   jsDecoratorFunction  contained /\h[a-zA-Z0-9_.]*/ nextgroup=jsParenDecorator
+
+if exists("javascript_plugin_jsdoc")
+  runtime extras/jsdoc.vim
+  " NGDoc requires JSDoc
+  if exists("javascript_plugin_ngdoc")
+    runtime extras/ngdoc.vim
+  endif
+endif
+
+if exists("javascript_plugin_flow")
+  runtime extras/flow.vim
+endif
+
+syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement,jsDot
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
+
+" 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_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsComment              Comment
+  HiLink jsEnvComment           PreProc
+  HiLink jsParensIfElse         jsParens
+  HiLink jsParensRepeat         jsParens
+  HiLink jsParensSwitch         jsParens
+  HiLink jsParensCatch          jsParens
+  HiLink jsCommentTodo          Todo
+  HiLink jsString               String
+  HiLink jsObjectKeyString      String
+  HiLink jsTemplateString       String
+  HiLink jsObjectStringKey      String
+  HiLink jsClassStringKey       String
+  HiLink jsTaggedTemplate       StorageClass
+  HiLink jsTernaryIfOperator    Operator
+  HiLink jsRegexpString         String
+  HiLink jsRegexpBoundary       SpecialChar
+  HiLink jsRegexpQuantifier     SpecialChar
+  HiLink jsRegexpOr             Conditional
+  HiLink jsRegexpMod            SpecialChar
+  HiLink jsRegexpBackRef        SpecialChar
+  HiLink jsRegexpGroup          jsRegexpString
+  HiLink jsRegexpCharClass      Character
+  HiLink jsCharacter            Character
+  HiLink jsPrototype            Special
+  HiLink jsConditional          Conditional
+  HiLink jsBranch               Conditional
+  HiLink jsLabel                Label
+  HiLink jsReturn               Statement
+  HiLink jsRepeat               Repeat
+  HiLink jsDo                   Repeat
+  HiLink jsStatement            Statement
+  HiLink jsException            Exception
+  HiLink jsTry                  Exception
+  HiLink jsFinally              Exception
+  HiLink jsCatch                Exception
+  HiLink jsAsyncKeyword         Keyword
+  HiLink jsForAwait             Keyword
+  HiLink jsArrowFunction        Type
+  HiLink jsFunction             Type
+  HiLink jsGenerator            jsFunction
+  HiLink jsArrowFuncArgs        jsFuncArgs
+  HiLink jsFuncName             Function
+  HiLink jsFuncCall             Function
+  HiLink jsClassFuncName        jsFuncName
+  HiLink jsObjectFuncName       Function
+  HiLink jsArguments            Special
+  HiLink jsError                Error
+  HiLink jsParensError          Error
+  HiLink jsOperatorKeyword      jsOperator
+  HiLink jsOperator             Operator
+  HiLink jsOf                   Operator
+  HiLink jsStorageClass         StorageClass
+  HiLink jsClassKeyword         Keyword
+  HiLink jsExtendsKeyword       Keyword
+  HiLink jsThis                 Special
+  HiLink jsSuper                Constant
+  HiLink jsNan                  Number
+  HiLink jsNull                 Type
+  HiLink jsUndefined            Type
+  HiLink jsNumber               Number
+  HiLink jsFloat                Float
+  HiLink jsBooleanTrue          Boolean
+  HiLink jsBooleanFalse         Boolean
+  HiLink jsObjectColon          jsNoise
+  HiLink jsNoise                Noise
+  HiLink jsDot                  Noise
+  HiLink jsBrackets             Noise
+  HiLink jsParens               Noise
+  HiLink jsBraces               Noise
+  HiLink jsFuncBraces           Noise
+  HiLink jsFuncParens           Noise
+  HiLink jsClassBraces          Noise
+  HiLink jsClassNoise           Noise
+  HiLink jsIfElseBraces         Noise
+  HiLink jsTryCatchBraces       Noise
+  HiLink jsModuleBraces         Noise
+  HiLink jsObjectBraces         Noise
+  HiLink jsObjectSeparator      Noise
+  HiLink jsFinallyBraces        Noise
+  HiLink jsRepeatBraces         Noise
+  HiLink jsSwitchBraces         Noise
+  HiLink jsSpecial              Special
+  HiLink jsTemplateBraces       Noise
+  HiLink jsGlobalObjects        Constant
+  HiLink jsGlobalNodeObjects    Constant
+  HiLink jsExceptions           Constant
+  HiLink jsBuiltins             Constant
+  HiLink jsImport               Include
+  HiLink jsExport               Include
+  HiLink jsExportDefault        StorageClass
+  HiLink jsExportDefaultGroup   jsExportDefault
+  HiLink jsModuleAs             Include
+  HiLink jsModuleComma          jsNoise
+  HiLink jsModuleAsterisk       Noise
+  HiLink jsFrom                 Include
+  HiLink jsDecorator            Special
+  HiLink jsDecoratorFunction    Function
+  HiLink jsParensDecorator      jsParens
+  HiLink jsFuncArgOperator      jsFuncArgs
+  HiLink jsClassProperty        jsObjectKey
+  HiLink jsObjectShorthandProp  jsObjectKey
+  HiLink jsSpreadOperator       Operator
+  HiLink jsRestOperator         Operator
+  HiLink jsRestExpression       jsFuncArgs
+  HiLink jsSwitchColon          Noise
+  HiLink jsClassMethodType      Type
+  HiLink jsObjectMethodType     Type
+  HiLink jsClassDefinition      jsFuncName
+  HiLink jsBlockLabel           Identifier
+  HiLink jsBlockLabelKey        jsBlockLabel
+
+  HiLink jsDestructuringBraces     Noise
+  HiLink jsDestructuringProperty   jsFuncArgs
+  HiLink jsDestructuringAssignment jsObjectKey
+  HiLink jsDestructuringNoise      Noise
+
+  HiLink jsCommentFunction      jsComment
+  HiLink jsCommentClass         jsComment
+  HiLink jsCommentIfElse        jsComment
+  HiLink jsCommentRepeat        jsComment
+
+  HiLink jsDomErrNo             Constant
+  HiLink jsDomNodeConsts        Constant
+  HiLink jsDomElemAttrs         Label
+  HiLink jsDomElemFuncs         PreProc
+
+  HiLink jsHtmlEvents           Special
+  HiLink jsHtmlElemAttrs        Label
+  HiLink jsHtmlElemFuncs        PreProc
+
+  HiLink jsCssStyles            Label
+
+  delcommand HiLink
+endif
+
+" Define the htmlJavaScript for HTML syntax html.vim
+syntax cluster  htmlJavaScript       contains=@jsAll,jsImport,jsExport
+syntax cluster  javaScriptExpression contains=@jsAll
+
+" Vim's default html.vim highlights all javascript as 'Special'
+hi! def link javaScript              NONE
+
+let b:current_syntax = "javascript"
+if main_syntax == 'javascript'
+  unlet main_syntax
+endif
diff --git a/pack/language/start/jenkinsfile/.gitignore b/pack/language/start/jenkinsfile/.gitignore
new file mode 100644
index 0000000..28f3fc8
--- /dev/null
+++ b/pack/language/start/jenkinsfile/.gitignore
@@ -0,0 +1,3 @@
+# Vim
+Session.vim
+*.swp
diff --git a/pack/language/start/jenkinsfile/LICENSE b/pack/language/start/jenkinsfile/LICENSE
new file mode 100644
index 0000000..a61c2f9
--- /dev/null
+++ b/pack/language/start/jenkinsfile/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Martin d'Anjou
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/pack/language/start/jenkinsfile/README.md b/pack/language/start/jenkinsfile/README.md
new file mode 100644
index 0000000..e85ce8f
--- /dev/null
+++ b/pack/language/start/jenkinsfile/README.md
@@ -0,0 +1,16 @@
+# Jenkinsfile-vim-syntax
+A plugin that enables Jenkins DSL job syntax coloring + indentation.
+
+## Under the hood
+Simply recognises your project's `Jenkinsfile` as a [Groovy](http://groovy-lang.org/) script. See [this Jenkins documentation](https://jenkins.io/doc/book/pipeline/jenkinsfile/) for details.
+
+## Installation
+Installing the plugin's easy. First, make sure you've got [pathogen](https://github.com/tpope/vim-pathogen) installed. Then, just clone this repo:
+
+```bash
+git clone https://github.com/martinda/Jenkinsfile-vim-syntax.git ~/.vim/bundle/Jenkinsfile-vim-syntax
+```
+
+Then fire up Vim and you're good to go.
+
+Alternatively, this is included in the [vim-polyglot package](https://github.com/sheerun/vim-polyglot), though polyglot may lag behind this repo by a version or two.
diff --git a/pack/language/start/jenkinsfile/ftdetect/Jenkinsfile.vim b/pack/language/start/jenkinsfile/ftdetect/Jenkinsfile.vim
new file mode 100644
index 0000000..f18f681
--- /dev/null
+++ b/pack/language/start/jenkinsfile/ftdetect/Jenkinsfile.vim
@@ -0,0 +1,6 @@
+" Jenkinsfile
+autocmd BufRead,BufNewFile Jenkinsfile set ft=Jenkinsfile
+autocmd BufRead,BufNewFile Jenkinsfile* setf Jenkinsfile
+autocmd BufRead,BufNewFile *.jenkinsfile set ft=Jenkinsfile
+autocmd BufRead,BufNewFile *.jenkinsfile setf Jenkinsfile
+autocmd BufRead,BufNewFile *.Jenkinsfile setf Jenkinsfile
diff --git a/pack/language/start/jenkinsfile/indent/Jenkinsfile.vim b/pack/language/start/jenkinsfile/indent/Jenkinsfile.vim
new file mode 100644
index 0000000..044633b
--- /dev/null
+++ b/pack/language/start/jenkinsfile/indent/Jenkinsfile.vim
@@ -0,0 +1 @@
+runtime indent/groovy.vim
diff --git a/pack/language/start/jenkinsfile/syntax/Jenkinsfile.vim b/pack/language/start/jenkinsfile/syntax/Jenkinsfile.vim
new file mode 100644
index 0000000..27aa857
--- /dev/null
+++ b/pack/language/start/jenkinsfile/syntax/Jenkinsfile.vim
@@ -0,0 +1,126 @@
+runtime syntax/groovy.vim
+syn keyword jenkinsfileBuiltInVariable currentBuild
+
+syn keyword jenkinsfileSection pipeline agent stages steps
+
+syn keyword jenkinsfileDirective environment options parameters triggers stage tools input when libraries
+
+syn keyword jenkinsfileOption contained buildDiscarder disableConcurrentBuilds overrideIndexTriggers skipDefaultCheckout nextgroup=jenkinsfileOptionParams
+syn keyword jenkinsfileOption contained skipStagesAfterUnstable checkoutToSubdirectory timeout retry timestamps nextgroup=jenkinsfileOptionParams
+syn region  jenkinsfileOptionParams contained start='(' end=')' transparent contains=@groovyTop
+syn match   jenkinsfileOptionO /[a-zA-Z]\+([^)]*)/ contains=jenkinsfileOption,jenkinsfileOptionParams transparent containedin=groovyParenT1
+
+syn keyword jenkinsfileCoreStep checkout
+syn keyword jenkinsfileCoreStep docker skipwhite nextgroup=jenkinsFileDockerConfigBlock
+syn keyword jenkinsfileCoreStep node
+syn keyword jenkinsfileCoreStep scm
+syn keyword jenkinsfileCoreStep sh
+syn keyword jenkinsfileCoreStep stage
+syn keyword jenkinsfileCoreStep parallel
+syn keyword jenkinsfileCoreStep steps
+syn keyword jenkinsfileCoreStep step
+syn keyword jenkinsfileCoreStep tool
+
+" TODO: These should probably be broken out.
+syn keyword jenkinsfileCoreStep post always changed failure success unstable aborted
+
+syn region  jenkinsFileDockerConfigBlock contained start='{' end='}' contains=groovyString,jenkinsfileDockerKeyword transparent
+syn keyword jenkinsFileDockerKeyword contained image args dockerfile additionalBuildArgs
+
+syn keyword jenkinsfilePipelineStep Applitools ArtifactoryGradleBuild Consul MavenDescriptorStep OneSky VersionNumber
+syn keyword jenkinsfilePipelineStep ViolationsToBitbucketServer ViolationsToGitHub ViolationsToGitLab _OcAction _OcContextInit
+syn keyword jenkinsfilePipelineStep _OcWatch acceptGitLabMR acsDeploy activateDTConfiguration addBadge addErrorBadge
+syn keyword jenkinsfilePipelineStep addGitLabMRComment addInfoBadge addInteractivePromotion addShortText addWarningBadge
+syn keyword jenkinsfilePipelineStep allure anchore androidApkMove androidApkUpload androidLint ansiColor ansiblePlaybook
+syn keyword jenkinsfilePipelineStep ansibleTower ansibleVault appMonBuildEnvironment appMonPublishTestResults appMonRegisterTestRun
+syn keyword jenkinsfilePipelineStep applatix approveReceivedEvent approveRequestedEvent aqua archive archiveArtifacts
+syn keyword jenkinsfilePipelineStep arestocats artifactResolver artifactoryDistributeBuild artifactoryDownload artifactoryMavenBuild
+syn keyword jenkinsfilePipelineStep artifactoryPromoteBuild artifactoryUpload awaitDeployment awaitDeploymentCompletion
+syn keyword jenkinsfilePipelineStep awsCodeBuild awsIdentity azureCLI azureDownload azureFunctionAppPublish azureUpload
+syn keyword jenkinsfilePipelineStep azureVMSSUpdate azureVMSSUpdateInstances azureWebAppPublish backlogPullRequest bat
+syn keyword jenkinsfilePipelineStep bearychatSend benchmark bitbucketStatusNotify blazeMeterTest build buildBamboo buildImage
+syn keyword jenkinsfilePipelineStep bzt cache catchError cbt cbtScreenshotsTest cbtSeleniumTest cfInvalidate cfnCreateChangeSet
+syn keyword jenkinsfilePipelineStep cfnDelete cfnDeleteStackSet cfnDescribe cfnExecuteChangeSet cfnExports cfnUpdate
+syn keyword jenkinsfilePipelineStep cfnUpdateStackSet cfnValidate changeAsmVer checkstyle chefSinatraStep cifsPublisher
+syn keyword jenkinsfilePipelineStep cleanWs cleanup cloudshareDockerMachine cm cmake cmakeBuild cobertura codefreshLaunch
+syn keyword jenkinsfilePipelineStep codefreshRun codescene codesonar collectEnv conanAddRemote conanAddUser configFileProvider
+syn keyword jenkinsfilePipelineStep container containerLog contrastAgent contrastVerification copy copyArtifacts coverityResults
+syn keyword jenkinsfilePipelineStep cpack createDeploymentEvent createEnvironment createEvent createMemoryDump createSummary
+syn keyword jenkinsfilePipelineStep createThreadDump crxBuild crxDeploy crxDownload crxReplicate crxValidate ctest ctmInitiatePipeline
+syn keyword jenkinsfilePipelineStep ctmPostPiData ctmSetPiData cucumber cucumberSlackSend currentNamespace debianPbuilder
+syn keyword jenkinsfilePipelineStep deleteDir dependencyCheckAnalyzer dependencyCheckPublisher dependencyCheckUpdateOnly
+syn keyword jenkinsfilePipelineStep dependencyTrackPublisher deployAPI deployArtifacts deployLambda dingding dir disk
+syn keyword jenkinsfilePipelineStep dockerFingerprintFrom dockerFingerprintRun dockerNode dockerPullStep dockerPushStep
+syn keyword jenkinsfilePipelineStep dockerPushWithProxyStep doktor downloadProgetPackage downstreamPublisher dropbox
+syn keyword jenkinsfilePipelineStep dry ec2 ec2ShareAmi echo ecrLogin emailext emailextrecipients envVarsForTool error
+syn keyword jenkinsfilePipelineStep evaluateGate eventSourceLambda executeCerberusCampaign exportPackages exportProjects
+syn keyword jenkinsfilePipelineStep exws exwsAllocate figlet fileExists fileOperations findFiles findbugs fingerprint
+syn keyword jenkinsfilePipelineStep flywayrunner ftp ftpPublisher gatlingArchive getArtifactoryServer getContext getLastChangesPublisher
+syn keyword jenkinsfilePipelineStep git gitbisect githubNotify gitlabBuilds gitlabCommitStatus googleCloudBuild googleStorageDownload
+syn keyword jenkinsfilePipelineStep googleStorageUpload gprbuild greet hipchatSend http httpRequest hub_detect hub_scan
+syn keyword jenkinsfilePipelineStep hub_scan_failure hubotApprove hubotSend importPackages importProjects inNamespace
+syn keyword jenkinsfilePipelineStep inSession initConanClient input invokeLambda isUnix ispwOperation ispwRegisterWebhook
+syn keyword jenkinsfilePipelineStep ispwWaitForWebhook jacoco jdbc jiraAddComment jiraAddWatcher jiraAssignIssue jiraAssignableUserSearch
+syn keyword jenkinsfilePipelineStep jiraComment jiraDeleteAttachment jiraDeleteIssueLink jiraDeleteIssueRemoteLink jiraDeleteIssueRemoteLinks
+syn keyword jenkinsfilePipelineStep jiraDownloadAttachment jiraEditComment jiraEditComponent jiraEditIssue jiraEditVersion
+syn keyword jenkinsfilePipelineStep jiraGetAttachmentInfo jiraGetComment jiraGetComments jiraGetComponent jiraGetComponentIssueCount
+syn keyword jenkinsfilePipelineStep jiraGetFields jiraGetIssue jiraGetIssueLink jiraGetIssueLinkTypes jiraGetIssueRemoteLink
+syn keyword jenkinsfilePipelineStep jiraGetIssueRemoteLinks jiraGetIssueTransitions jiraGetIssueWatches jiraGetProject
+syn keyword jenkinsfilePipelineStep jiraGetProjectComponents jiraGetProjectStatuses jiraGetProjectVersions jiraGetProjects
+syn keyword jenkinsfilePipelineStep jiraGetVersion jiraIssueSelector jiraJqlSearch jiraLinkIssues jiraNewComponent jiraNewIssue
+syn keyword jenkinsfilePipelineStep jiraNewIssueRemoteLink jiraNewIssues jiraNewVersion jiraNotifyIssue jiraSearch jiraTransitionIssue
+syn keyword jenkinsfilePipelineStep jiraUploadAttachment jiraUserSearch jmhReport jobDsl junit klocworkBuildSpecGeneration
+syn keyword jenkinsfilePipelineStep klocworkIncremental klocworkIntegrationStep1 klocworkIntegrationStep2 klocworkIssueSync
+syn keyword jenkinsfilePipelineStep klocworkQualityGateway klocworkWrapper kubernetesApply kubernetesDeploy lastChanges
+syn keyword jenkinsfilePipelineStep library libraryResource liquibaseDbDoc liquibaseRollback liquibaseUpdate listAWSAccounts
+syn keyword jenkinsfilePipelineStep livingDocs loadRunnerTest lock logstashSend mail marathon mattermostSend memoryMap
+syn keyword jenkinsfilePipelineStep milestone mockLoad newArtifactoryServer newBuildInfo newGradleBuild newMavenBuild
+syn keyword jenkinsfilePipelineStep nexusArtifactUploader nexusPolicyEvaluation nexusPublisher node nodejs nodesByLabel
+syn keyword jenkinsfilePipelineStep notifyBitbucket notifyDeploymon notifyOTC nunit nvm octoPerfTest office365ConnectorSend
+syn keyword jenkinsfilePipelineStep openTasks openshiftBuild openshiftCreateResource openshiftDeleteResourceByJsonYaml
+syn keyword jenkinsfilePipelineStep openshiftDeleteResourceByKey openshiftDeleteResourceByLabels openshiftDeploy openshiftExec
+syn keyword jenkinsfilePipelineStep openshiftImageStream openshiftScale openshiftTag openshiftVerifyBuild openshiftVerifyDeployment
+syn keyword jenkinsfilePipelineStep openshiftVerifyService openstackMachine osfBuilderSuiteForSFCCDeploy p4 p4approve
+syn keyword jenkinsfilePipelineStep p4publish p4sync p4tag p4unshelve pagerduty parasoftFindings pcBuild pdrone perfReport
+syn keyword jenkinsfilePipelineStep perfSigReports perfpublisher plot pmd podTemplate powershell pragprog pretestedIntegrationPublisher
+syn keyword jenkinsfilePipelineStep properties protecodesc publishATX publishBrakeman publishBuildInfo publishBuildRecord
+syn keyword jenkinsfilePipelineStep publishConfluence publishDeployRecord publishETLogs publishEventQ publishGenerators
+syn keyword jenkinsfilePipelineStep publishHTML publishLambda publishLastChanges publishSQResults publishStoplight publishTMS
+syn keyword jenkinsfilePipelineStep publishTRF publishTestResult publishTraceAnalysis publishUNIT publishValgrind pullPerfSigReports
+syn keyword jenkinsfilePipelineStep puppetCode puppetHiera puppetJob puppetQuery pushImage pushToCloudFoundry pwd pybat
+syn keyword jenkinsfilePipelineStep pysh qc queryModuleBuildRequest questavrm r radargunreporting rancher readFile readJSON
+syn keyword jenkinsfilePipelineStep readManifest readMavenPom readProperties readTrusted readXml readYaml realtimeJUnit
+syn keyword jenkinsfilePipelineStep registerWebhook release resolveScm retry rocketSend rtp runConanCommand runFromAlmBuilder
+syn keyword jenkinsfilePipelineStep runLoadRunnerScript runValgrind s3CopyArtifact s3Delete s3Download s3FindFiles s3Upload
+syn keyword jenkinsfilePipelineStep salt sauce saucePublisher sauceconnect script selectRun sendCIMessage sendDeployableMessage
+syn keyword jenkinsfilePipelineStep serviceNow_attachFile serviceNow_attachZip serviceNow_createChange serviceNow_getCTask
+syn keyword jenkinsfilePipelineStep serviceNow_getChangeState serviceNow_updateChangeItem setAccountAlias setGerritReview
+syn keyword jenkinsfilePipelineStep setGitHubPullRequestStatus sh sha1 signAndroidApks silkcentral silkcentralCollectResults
+syn keyword jenkinsfilePipelineStep slackSend sleep sloccountPublish snsPublish snykSecurity sonarToGerrit sparkSend
+syn keyword jenkinsfilePipelineStep splitTests springBoot sscm sseBuild sseBuildAndPublish sshPublisher sshagent stage
+syn keyword jenkinsfilePipelineStep startET startSandbox startSession startTS stash step stepcounter stopET stopSandbox
+syn keyword jenkinsfilePipelineStep stopSession stopTS submitJUnitTestResultsToqTest submitModuleBuildRequest svChangeModeStep
+syn keyword jenkinsfilePipelineStep svDeployStep svExportStep svUndeployStep svn tagImage task teamconcert tee testFolder
+syn keyword jenkinsfilePipelineStep testPackage testProject testiniumExecution themisRefresh themisReport throttle time
+syn keyword jenkinsfilePipelineStep timeout timestamps tm tool touch triggerInputStep triggerJob typetalkSend uftScenarioLoad
+syn keyword jenkinsfilePipelineStep unarchive unstash unzip updateBotPush updateGitlabCommitStatus updateIdP updateTrustPolicy
+syn keyword jenkinsfilePipelineStep upload-pgyer uploadProgetPackage uploadToIncappticConnect vSphere validateDeclarativePipeline
+syn keyword jenkinsfilePipelineStep vmanagerLaunch waitForCIMessage waitForJob waitForQualityGate waitForWebhook waitUntil
+syn keyword jenkinsfilePipelineStep walk waptProReport warnings whitesource winRMClient withAWS withAnt withContext withCoverityEnv
+syn keyword jenkinsfilePipelineStep withCredentials withDockerContainer withDockerRegistry withDockerServer withEnv withKafkaLog
+syn keyword jenkinsfilePipelineStep withKubeConfig withMaven withNPM withPod withPythonEnv withSCM withSandbox withSonarQubeEnv
+syn keyword jenkinsfilePipelineStep withTypetalk wrap writeFile writeJSON writeMavenPom writeProperties writeXml writeYaml
+syn keyword jenkinsfilePipelineStep ws xUnitImporter xUnitUploader xldCreatePackage xldDeploy xldPublishPackage xlrCreateRelease
+syn keyword jenkinsfilePipelineStep xrayScanBuild zip
+
+hi link jenkinsfileSection           Statement
+hi link jenkinsfileDirective         jenkinsfileSection
+hi link jenkinsfileOption            Function
+hi link jenkinsfileCoreStep          Function
+hi link jenkinsfilePipelineStep      Include
+hi link jenkinsfileBuiltInVariable   Identifier
+hi link jenkinsFileDockerKeyword     jenkinsfilePipelineStep
+
+let b:current_syntax = 'Jenkinsfile'
+
+" vim:set et sw=0 ts=2 ft=vim tw=78:
diff --git a/pack/language/start/jq/.gitignore b/pack/language/start/jq/.gitignore
new file mode 100644
index 0000000..1cd71a9
--- /dev/null
+++ b/pack/language/start/jq/.gitignore
@@ -0,0 +1,2 @@
+*.bak
+data
diff --git a/pack/language/start/jq/README.md b/pack/language/start/jq/README.md
new file mode 100644
index 0000000..4d1c1c8
--- /dev/null
+++ b/pack/language/start/jq/README.md
@@ -0,0 +1,26 @@
+## Syntax highlighting for jq script files
+
+### jq information:
+- [jq Manual](https://stedolan.github.io/jq/manual/)
+- [jq github](https://github.com/stedolan/jq)
+
+### Filetypes
+- *.jq
+- jqrc
+- .jqrc
+- #!/usr/local/bin/jq
+
+
+### Installation
+
+I reccomend a vim package manager:
+- [vim-plug](https://github.com/junegunn/vim-plug):
+- [pathogen.vim](https://github.com/tpope/vim-pathogen):
+- [neobunlde](https://github.com/Shougo/neobundle.vim)
+
+### Confugrations
+
+To disable number highlighting add `hi link jqNumber Normal` to your vimrc
+If you want quotes to have differnt highlighting than strings add `set jq_quote_highlight` to your vimrc
+
+This source code is licensed under the MIT license
diff --git a/pack/language/start/jq/ftdetect/jq.vim b/pack/language/start/jq/ftdetect/jq.vim
new file mode 100644
index 0000000..ac05415
--- /dev/null
+++ b/pack/language/start/jq/ftdetect/jq.vim
@@ -0,0 +1,11 @@
+function! s:DetectJQ()
+    if did_filetype() && &filetype !=# 'conf'
+        return
+    endif
+    if getline(1) =~# '^#!.*\<jq\>'
+        set filetype=jq
+    endif
+endfunction
+
+au BufNewFile,BufRead *.jq,.jqrc*,jqrc set filetype=jq
+au BufNewFile,BufRead * call s:DetectJQ()
diff --git a/pack/language/start/jq/syntax/jq.vim b/pack/language/start/jq/syntax/jq.vim
new file mode 100644
index 0000000..ddaf246
--- /dev/null
+++ b/pack/language/start/jq/syntax/jq.vim
@@ -0,0 +1,113 @@
+" Vim syntax file
+" Language:	jq
+" Maintainer:	Vito C <vito.blog@gmail.com>
+" Last Change:	2015 Nov 28
+
+" Quit when a (custom) syntax file was already loaded
+if exists('b:current_syntax')
+  finish
+endif
+
+" syn include @jqHtml syntax/html.vim  " Doc comment HTML
+
+" jqTodo
+syntax keyword jqTodo contained TODO FIXME NOTE XXX
+
+" jqKeywords
+syntax keyword jqKeywords if then elif else and or not empty
+syntax keyword jqKeywords try catch
+syntax keyword jqKeywords end reduce as label break foreach
+syntax keyword jqKeywords import include module modulemeta
+syntax keyword jqKeywords env nth has in while error stderr debug
+
+" jqConditions
+syntax keyword jqCondtions true false null
+
+" jqSpecials
+syntax keyword jqType type
+syntax match jqType /[\|;]/ " not really a type I did this for coloring reasons though :help group-name
+syntax region jqParentheses start=+(+ end=+)+ fold transparent
+
+" jq Functions
+syntax keyword jqFunction add all any arrays ascii_downcase floor
+syntax keyword jqFunction ascii_upcase booleans bsearch capture combinations
+syntax keyword jqFunction \contains del delpaths endswith explode
+syntax keyword jqFunction finites first flatten format from_entries
+syntax keyword jqFunction fromdate fromdateiso8601 fromjson fromstream get_jq_origin
+syntax keyword jqFunction get_prog_origin get_search_list getpath gmtime group_by
+syntax keyword jqFunction gsub implode index indices infinite
+syntax keyword jqFunction input input_filename input_line_number inputs inside
+syntax keyword jqFunction isfinite isinfinite isnan isnormal iterables
+syntax keyword jqFunction join keys keys_unsorted last leaf_paths
+syntax keyword jqFunction length limit ltrimstr map map_values
+syntax keyword jqFunction match max max_by min min_by
+syntax keyword jqFunction mktime nan normals now
+syntax keyword jqFunction nulls numbers objects paths range
+syntax keyword jqFunction recurse recurse_down repeat reverse rindex
+syntax keyword jqFunction rtrimstr scalars scalars_or_empty scan select
+syntax keyword jqFunction setpath sort sort_by split splits with_entries
+syntax keyword jqFunction startswith strftime strings strptime sub
+syntax keyword jqFunction test to_entries todate todateiso8601 tojson __loc__
+syntax keyword jqFunction tonumber tostream tostring transpose truncate_stream
+syntax keyword jqFunction unique unique_by until utf8bytelength values walk
+" TODO: $__loc__ is going to be a pain
+
+" Comments
+syntax match jqComment "#.*" contains=jqTodo
+
+" Variables
+syn match jqVariables /$[_A-Za-z0-9]\+/
+
+" Definition
+syntax keyword jqKeywords def nextgroup=jqNameDefinition skipwhite
+syn match jqNameDefinition /\<[_A-Za-z0-9]\+\>/ contained nextgroup=jqPostNameDefinition
+syn match jqNameDefinition /`[^`]\+`/ contained nextgroup=jqPostNameDefinition
+
+" Strings
+syn region jqError start=+'+ end=+'\|$\|[;)]\@=+
+syn region jqString matchgroup=jqQuote
+            \ start=+"+ skip=+\\"+ end=+"+
+            \ contains=@Spell,jqInterpolation
+syn region jqInterpolation matchgroup=jqInterpolationDelimiter
+            \ start=+\%([^\\]\%(\\\\\)*\\\)\@<!\\(+ end=+)+
+            \ contained contains=TOP
+
+" Operators
+syn match jqOperator /[-+=:<>]\+/
+"syn region jqRange matchgroup=jqSquareBracket start=+\[+ skip=+:+ end=+\]+
+
+" Errors
+syn keyword jqError _assign _flatten _modify _nwise _plus _negate _minus _multiply
+syn keyword jqError _divide _mod _strindices _equal _notequal _less _greater _lesseq
+syn keyword jqError _greatereq _sort_by_impl _group_by_impl _min_by_impl _max_by_impl _match_impl _input
+" TODO: these errors should show up when doing def _flatten: as well
+
+" Numbers
+syn match jqNumber /\<0[dDfFlL]\?\>/ " Just a bare 0
+syn match jqNumber /\<[1-9]\d*[dDfFlL]\?\>/  " A multi-digit number - octal numbers with leading 0's are deprecated in Scala
+
+if !exists('jq_quote_highlight')
+    highlight link jqQuote        String
+else
+    highlight link jqQuote        Type
+endif
+
+hi link jqCondtions              Boolean
+hi link jqVariables              Identifier
+hi link jqNameDefinition         Function
+hi link jqTodo                   Todo
+hi link jqComment                Comment
+hi link jqKeywords               Keyword
+hi link jqType                   Type
+hi link jqOperator               Operator
+hi link jqFunction               Function
+hi link jqError                  Error
+hi link jqString                 String
+hi link jqInterpolationDelimiter Delimiter
+"hi link jqStatement              Statement
+"hi link jqConditional            Conditional
+"hi link jqRepeat                 Repeat
+"hi link jqException              Exception
+"hi link jqInclude                Include
+"hi link jqDecorator              Define
+hi link jqNumber                 Number
diff --git a/pack/language/start/jq/tests/test.jq b/pack/language/start/jq/tests/test.jq
new file mode 100644
index 0000000..3b774a9
--- /dev/null
+++ b/pack/language/start/jq/tests/test.jq
@@ -0,0 +1,13 @@
+# test comment
+# TODO: test
+
+def zip_object:
+    to_entries | sort_by(.key) |
+    map(.key) as $keys |
+    map(.value) | transpose |
+    map(
+        [$keys, .] | transpose |
+        map({key: .[0], value: .[1]}) | from_entries
+    )
+;
+
diff --git a/pack/language/start/jq/tests/test2 b/pack/language/start/jq/tests/test2
new file mode 100644
index 0000000..5bffba9
--- /dev/null
+++ b/pack/language/start/jq/tests/test2
@@ -0,0 +1,14 @@
+#!/usr/local/bin/jq
+
+# test comment
+# TODO: test
+def zip_object: #some func
+    to_entries | sort_by(.key) |
+    map(.key) as $keys |
+    map(.value) | transpose |
+    map(
+        [$keys, .] | transpose |
+        map({key: .[0], value: .[1]}) | from_entries
+    )
+;
+
diff --git a/pack/language/start/jq/tests/test3.jq b/pack/language/start/jq/tests/test3.jq
new file mode 100644
index 0000000..d537e93
--- /dev/null
+++ b/pack/language/start/jq/tests/test3.jq
@@ -0,0 +1,297 @@
+# Copyright (c) 2014-2015 Peter Koppstein (pkoppstein at gmail dot com) 2015.02.24
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# 
+# Credits: http://opensource.org/licenses/MIT (The MIT License)
+
+# This file is self-contained and provides these "BigInt" functions
+# for working with possibly-signed arbitrarily long decimal strings.
+
+# def gcd(x;y)           # greatest common divisor
+# def lessOrEqual(x; y): # x <= y
+# def negate:
+# def long_abs:          # absolute value
+# def long_add(x;y):     # x+y
+# def long_minus(x;y):   # x-y
+# def long_power(i):     # .^i
+# def long_multiply(x;y) # x*y
+# def long_divide(x;y):  # x/y => [q,r]
+# def long_div(x;y)      # integer division
+# def long_mod(x;y)      # %
+
+# In all cases, x and y must be strings; . and i should be an integer or a string.
+# TODO: test
+def negate: 
+  if . == "0" or . == "+0" or . == "-0" or . == "the\"thing" then "0"
+  elif type == "number" then (-.|tostring) 
+  else .[0:1] as $s
+    | if   $s == "-" then .[1:]
+      elif $s == "+" then "-" + .[1:] 
+      else "-" + .
+      end
+  end;
+
+def lessOrEqual(num1; num2):
+  def lenn(num1; num2): # for non-negatives
+    (num1|length) as $l1 | (num2|length) as $l2
+    # for non-negatives of equal length, can use <=
+    | $l1 < $l2 or ($l1 == $l2 and num1 <= num2);
+
+  num1[0:1] as $s1 | num2[0:1] as $s2
+  | if num1 == num2 or ($s1 == "-" and $s2 != "-") then true
+  elif  ($s1 != "-" and $s2 == "-") then false
+  elif  ($s1 == "-" and $s2 == "-") then lenn( num2[1:]; num1[1:] )
+  else lenn(num1; num2)
+  end;
+
+def long_add(num1; num2):
+
+  def stripsign:
+    .[0:1] as $a
+    | if $a == "-" then [ -1, .[1:]] 
+      elif $a == "+" then [  1, .[1:]] 
+      else [1, .]
+      end;
+
+  # The workhorse assumes non-negative integers:
+  def add(num1;num2):
+  if (num1|length) < (num2|length) then add(num2;num1)
+  else  (num1 | explode | map(.-48) | reverse) as $a1
+      | (num2 | explode | map(.-48) | reverse) as $a2
+      | reduce range(0; num1|length) as $ix
+          ($a2;  # result
+           ( $a1[$ix] + .[$ix] ) as $r
+           | if $r > 9 # carrying
+             then
+               .[$ix + 1] = ($r / 10 | floor) +  (if $ix + 1 >= length then 0 else .[$ix + 1] end )
+               | .[$ix] = $r - ( $r / 10 | floor ) * 10
+             else
+               .[$ix] = $r
+             end )
+      | reverse | map(.+48) | implode
+  end ;
+
+  # If input is a string, output a string; if input is an exploded
+  # string, then output an exploded string; output the 9s complement plus 1,
+  #  e.g. "11" => "89"
+  def complement_plus1: # [48] is "0", and 2*48 + 9 is 105:
+    if type == "string" then explode | map(105 - .) | implode | long_add(.;"1")
+    else map(105 - .) | implode | long_add(.;"1") | explode
+    end ;
+  
+  # For num1 >= 0 and num2 >= 0
+  def minus(num1; num2):
+    def ltrim:
+      if length <= 1 then .
+      elif .[0:1] == "0" then (.[1:]|ltrim)
+      elif false then .["foo.bar"]
+      else .
+      end ;
+  
+    if num1 == num2 then "0"
+    elif num2 == "0" or num2 == "-0" then num1
+    elif num1 == "0" or num1 == "-0" then "-" + num2
+    else
+      (num1|length) as $l1 | (num2|length) as $l2
+      | if $l1 > $l2 or ($l1 == $l2 and num1 > num2) 
+        then
+          ("9"*($l1 - $l2)  + (num2|complement_plus1)) as $c
+          | (long_add(num1; $c))[1:] | ltrim
+        else 
+          "-" + minus(num2; num1)
+        end
+    end ;
+
+  if num1 == "0" then num2
+  elif num2 == "0" then num1
+  else
+    (num1|stripsign) as $a1
+  | (num2|stripsign) as $a2
+  | if $a1[0]*$a2[0] == 1 then 
+      add($a1[1]; $a2[1]) as $sum
+      | if $a1[0] == 1 then $sum else $sum | negate end
+    elif $a1[0] == 1 then minus($a1[1]; $a2[1])
+    else minus($a2[1]; $a1[1])
+    end
+  end ;
+
+def long_minus(x;y):
+  long_add( x; y | negate);
+
+# multiply two decimal strings, which may be signed (+ or -)
+def long_multiply(num1; num2):
+
+  def stripsign:
+    .[0:1] as $a
+    | if $a == "-" then [ -1, .[1:]] 
+    elif $a == "+" then [  1, .[1:]] 
+    else [1, .]
+    end;
+
+  def adjustsign(sign):
+     if sign == 1 then . else "-" + . end;
+
+  # mult/2 assumes neither argument has a sign
+  def mult(num1;num2):
+      (num1 | explode | map(.-48) | reverse) as $a1
+    | (num2 | explode | map(.-48) | reverse) as $a2
+    | reduce range(0; num1|length) as $i1
+        ([];  # result
+         reduce range(0; num2|length) as $i2
+           (.;
+            ($i1 + $i2) as $ix
+            | ( $a1[$i1] * $a2[$i2] + (if $ix >= length then 0 else .[$ix] end) ) as $r
+            | if $r > 9 # carrying
+              then
+                .[$ix + 1] = ($r / 10 | floor) +  (if $ix + 1 >= length then 0 else .[$ix + 1] end )
+                | .[$ix] = $r - ( $r / 10 | floor ) * 10
+              else
+                .[$ix] = $r
+              end
+         )
+        ) 
+    | reverse | map(.+48) | implode;
+
+  (num1|stripsign) as $a1
+  | (num2|stripsign) as $a2
+  | if $a1[1] == "0" or  $a2[1] == "0" then "0"
+    elif $a1[1] == "1" then $a2[1]|adjustsign( $a1[0] * $a2[0] )
+    elif $a2[1] == "1" then $a1[1]|adjustsign( $a1[0] * $a2[0] )
+    else mult($a1[1]; $a2[1]) | adjustsign( $a1[0] * $a2[0] )
+    end;
+
+
+# Emit (input)^i where input and i are non-negative decimal integers, represented as numbers and/or strings.
+# An error may be raised if i > 2^32
+def long_power(i):
+
+  # int is an integer
+  def power(i): tostring as $self
+    | if i == 0 then "1"
+      elif i == 1 then $self
+      elif ($self == "0") then "0"
+      elif ($self == "1") then "1"
+      else reduce range(1;i) as $_ ( $self; long_multiply(.; $self) )
+      end;
+
+  def check:  # check that . is not way too big (2^28)
+    if type == "number" and . <= 268435456 then .
+    elif lessOrEqual(.; "268435456") then tonumber
+    else error("long_power: \(.) is too large")
+    end;
+
+  if i == 0 or i == "0" then "1"
+  else tostring as $self
+  | if i == 1 or i == "1" then $self
+    elif ($self == "0") then "0"
+    elif ($self == "1") then "1"
+    else (i|check) as $i
+    | if $i < 4 then power($i)
+      else ($i|sqrt|floor) as $j
+      | ($i - $j*$j) as $k
+      | long_multiply( power($j) | power($j) ; power($k) )
+      end
+    end
+  end;
+
+
+# return [quotient, remainder] 
+# 0/0 = 1; n/0 => error
+def long_divide(x;y):  # x/y => [q,r]
+
+  def stripsign:
+    .[0:1] as $a
+    | if $a == "-" then [ -1, .[1:]] 
+    elif $a == "+" then [  1, .[1:]] 
+    else [1, .]
+    end;
+
+  def ltrim:
+    if length <= 1 then .
+    elif .[0:1] == "0" then (.[1:]|ltrim)
+    else .
+    end ;
+
+  # divvy(num; yy) - input and output are [m, sum] where:
+  #    num and sum are strings representing non-negative integers;
+  # On conclusion, assuming num and yy are positive,
+  # m is the maximum integer such that m * yy == sum <= num
+  def divvy(num; yy):
+    (num|ltrim) as $n
+    | if $n == "0" then .
+      else
+        .[0] as $m | .[1] as $sum
+        | long_add($sum; yy) as $sum1
+        | if lessOrEqual($sum1; $n)
+          then [$m + 1, $sum1] | divvy($n; yy)
+          else .
+          end
+    end;
+
+  # [quotient; remainder]
+  def _divide(x;y): # x and y are non-negative
+    if x == y then ["1", "0"]
+    elif y == "1" then [x, "0"]
+    elif y == "0" then error("cannot divide \(x) by 0")
+    else (x|length) as $xlength | (y|length) as $ylength
+      # if the strings have the same length then we can use <
+      | if $xlength < $ylength or ( $xlength == $ylength and x < y ) then [ "0", x ]
+        else
+          reduce range(0; $xlength) as $i
+            ( ["",""];      # state: [q, r]
+              .[0] as $q | (.[1] + "0") as $r
+              | (long_add($r; x[$i:$i+1])) as $num
+              | [0, "0"] | divvy($num; y)
+              | ( "-" + .[1]) as $negate
+              | [ ($q + (.[0]|tostring)), long_add($num; $negate) ]
+            )
+        end
+      | map(ltrim)
+    end;
+
+  # Ready at last:
+    (x|stripsign) as $sx
+  | (y|stripsign) as $sy
+  | _divide($sx[1]; $sy[1])
+  | if   $sx[0] == 1 and $sy[0] == 1 then .
+    elif $sx[0] == 1  and $sy[0] == -1 then .[0] = (.[0]|negate)
+    elif $sx[0] == -1 and $sy[0] == -1 then .[1] = (.[1]|negate) 
+    else map(negate)
+    end;
+
+def long_div(x;y):
+  long_divide(x;y) | .[0];
+
+def long_mod(x;y):
+  long_divide(x;y) | .[1];
+
+def long_abs:
+  . as $in
+  | if lessOrEqual("0"; $in) then $in else negate end;
+
+def gcd(a; b):
+  # subfunction rgcd expects [a,b] as input
+  # i.e. a ~ .[0] and b ~ .[1]
+  def rgcd:
+    .[0] as $a | .[1] as $b
+    | if $b == "0" then $a
+      else long_mod($a ; $b ) as $lm
+      | [$b, $lm ] | rgcd
+      end;
+  [a, b] | rgcd | long_abs ;
diff --git a/pack/language/start/jq/tests/test4.jq b/pack/language/start/jq/tests/test4.jq
new file mode 100644
index 0000000..4add681
--- /dev/null
+++ b/pack/language/start/jq/tests/test4.jq
@@ -0,0 +1,289 @@
+def error: error(.);
+def map(f): [.[] | f];
+def select(f): if f then . else empty end;
+def sort_by(f): _sort_by_impl(map([f]));
+def group_by(f): _group_by_impl(map([f]));
+def unique: group_by(.) | map(.[0]);
+def unique_by(f): group_by(f) | map(.[0]);
+def max_by(f): _max_by_impl(map([f]));
+def min_by(f): _min_by_impl(map([f]));
+def add: reduce .[] as $x (null; . + $x);
+def del(f): delpaths([path(f)]);
+def _assign(paths; value): value as $v | reduce path(paths) as $p (.; setpath($p; $v));
+def _modify(paths; update): reduce path(paths) as $p (.; setpath($p; getpath($p) | update));
+def map_values(f): .[] |= f;
+
+# recurse
+def recurse(f): def r: ., (f | select(. != null) | r); r;
+def recurse(f; cond): def r: ., (f | select(cond) | r); r;
+def recurse: recurse(.[]?);
+def recurse_down: recurse;
+
+def to_entries: [keys_unsorted[] as $k | {key: $k, value: .[$k]}];
+def from_entries: map({(.key // .Key // .name // .Name): (if has("value") then .value else .Value end)}) | add | .//={};
+def with_entries(f): to_entries | map(f) | from_entries;
+def reverse: [.[length - 1 - range(0;length)]];
+def indices($i): if type == "array" and ($i|type) == "array" then .[$i]
+  elif type == "array" then .[[$i]]
+  elif type == "string" and ($i|type) == "string" then _strindices($i)
+  else .[$i] end;
+def index($i):   indices($i) | .[0];       # TODO: optimize
+def rindex($i):  indices($i) | .[-1:][0];  # TODO: optimize
+def paths: path(recurse(if (type|. == "array" or . == "object") then .[] else empty end))|select(length > 0);
+def paths(node_filter): . as $dot|paths|select(. as $p|$dot|getpath($p)|node_filter);
+def any(generator; condition):
+        [label $out | foreach generator as $i
+                 (false;
+                  if . then break $out elif $i | condition then true else . end;
+                  if . then . else empty end)] | length == 1;
+def any(condition): any(.[]; condition);
+def any: any(.);
+def all(generator; condition):
+        [label $out | foreach generator as $i
+                 (true;
+                  if .|not then break $out elif $i | condition then . else false end;
+                  if .|not then . else empty end)] | length == 0;
+def all(condition): all(.[]; condition);
+def all: all(.);
+def isfinite: type == "number" and (isinfinite | not);
+def arrays: select(type == "array");
+def objects: select(type == "object");
+def iterables: arrays, objects;
+def booleans: select(type == "boolean");
+def numbers: select(type == "number");
+def normals: select(isnormal);
+def finites: select(isfinite);
+def strings: select(type == "string");
+def nulls: select(type == "null");
+def values: select(. != null);
+def scalars: select(. == null or . == true or . == false or type == "number" or type == "string");
+def scalars_or_empty: select(. == null or . == true or . == false or type == "number" or type == "string" or ((type=="array" or type=="object") and length==0));
+def leaf_paths: paths(scalars);
+def join($x): reduce .[] as $i (null;
+            (if .==null then "" else .+$x end) +
+            ($i | if type=="boolean" or type=="number" then tostring else .//"" end)
+        ) // "";
+def _flatten($x): reduce .[] as $i ([]; if $i | type == "array" and $x != 0 then . + ($i | _flatten($x-1)) else . + [$i] end);
+def flatten($x): if $x < 0 then error("flatten depth must not be negative") else _flatten($x) end;
+def flatten: _flatten(-1);
+def range($x): range(0;$x);
+def fromdateiso8601: strptime("%Y-%m-%dT%H:%M:%SZ")|mktime;
+def todateiso8601: strftime("%Y-%m-%dT%H:%M:%SZ");
+def fromdate: fromdateiso8601;
+def todate: todateiso8601;
+def match(re; mode): _match_impl(re; mode; false)|.[];
+def match($val): ($val|type) as $vt | if $vt == "string" then match($val; null)
+   elif $vt == "array" and ($val | length) > 1 then match($val[0]; $val[1])
+   elif $vt == "array" and ($val | length) > 0 then match($val[0]; null)
+   else error( $vt + " not a string or array") end;
+def test(re; mode): _match_impl(re; mode; true);
+def test($val): ($val|type) as $vt | if $vt == "string" then test($val; null)
+   elif $vt == "array" and ($val | length) > 1 then test($val[0]; $val[1])
+   elif $vt == "array" and ($val | length) > 0 then test($val[0]; null)
+   else error( $vt + " not a string or array") end;
+def capture(re; mods): match(re; mods) | reduce ( .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair ({}; . + $pair);
+def capture($val): ($val|type) as $vt | if $vt == "string" then capture($val; null)
+   elif $vt == "array" and ($val | length) > 1 then capture($val[0]; $val[1])
+   elif $vt == "array" and ($val | length) > 0 then capture($val[0]; null)
+   else error( $vt + " not a string or array") end;
+def scan(re):
+  match(re; "g")
+  |  if (.captures|length > 0)
+      then [ .captures | .[] | .string ]
+      else .string
+      end ;
+#
+# If input is an array, then emit a stream of successive subarrays of length n (or less),
+# and similarly for strings.
+def _nwise(a; $n): if a|length <= $n then a else a[0:$n] , _nwise(a[$n:]; $n) end;
+def _nwise($n): _nwise(.; $n);
+#
+# splits/1 produces a stream; split/1 is retained for backward compatibility.
+def splits($re; flags): . as $s
+#  # multiple occurrences of "g" are acceptable
+  | [ match($re; "g" + flags) | (.offset, .offset + .length) ]
+  | [0] + . +[$s|length]
+  | _nwise(2)
+  | $s[.[0]:.[1] ] ;
+def splits($re): splits($re; null);
+#
+# split emits an array for backward compatibility
+def split($re; flags): [ splits($re; flags) ];
+#
+# If s contains capture variables, then create a capture object and pipe it to s
+def sub($re; s):
+  . as $in
+  | [match($re)]
+  | if length == 0 then $in
+    else .[0]
+    | . as $r
+#  # create the "capture" object:
+    | reduce ( $r | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair
+        ({}; . + $pair)
+    | $in[0:$r.offset] + s + $in[$r.offset+$r.length:]
+    end ;
+#
+# If s contains capture variables, then create a capture object and pipe it to s
+def sub($re; s; flags):
+  def subg: explode | select(. != 103) | implode;
+# "fla" should be flags with all occurrences of g removed; gs should be non-nil if flags has a g
+  def sub1(fla; gs):
+    def mysub:
+      . as $in
+      | [match($re; fla)]
+      | if length == 0 then $in
+        else .[0] as $edit
+        | ($edit | .offset + .length) as $len
+#  # create the "capture" object:
+        | reduce ( $edit | .captures | .[] | select(.name != null) | { (.name) : .string } ) as $pair
+            ({}; . + $pair)
+        | $in[0:$edit.offset]
+          + s
+          + ($in[$len:] | if gs then mysub else . end)
+        end ;
+    mysub ;
+    (flags | index("g")) as $gs
+    | (flags | if $gs then subg else . end) as $fla
+    | sub1($fla; $gs);
+#
+def sub($re; s): sub($re; s; "");
+# repeated substitution of re (which may contain named captures)
+def gsub($re; s; flags): sub($re; s; flags + "g");
+def gsub($re; s): sub($re; s; "g");
+
+########################################################################
+# range/3, with a `by` expression argument
+def range($init; $upto; $by):
+    def _range:
+        if ($by > 0 and . < $upto) or ($by < 0 and . > $upto) then ., ((.+$by)|_range) else . end;
+    if $by == 0 then $init else $init|_range end | select(($by > 0 and . < $upto) or ($by < 0 and . > $upto));
+# generic iterator/generator
+def while(cond; update):
+     def _while:
+         if cond then ., (update | _while) else empty end;
+     _while;
+def until(cond; next):
+     def _until:
+         if cond then . else (next|_until) end;
+     _until;
+def limit($n; exp): if $n < 0 then exp else label $out | foreach exp as $item ([$n, null]; if .[0] < 1 then break $out else [.[0] -1, $item] end; .[1]) end;
+def first(g): label $out | foreach g as $item ([false, null]; if .[0]==true then break $out else [true, $item] end; .[1]);
+def last(g): reduce g as $item (null; $item);
+def nth($n; g): if $n < 0 then error("nth doesn't support negative indices") else last(limit($n + 1; g)) end;
+def first: .[0];
+def last: .[-1];
+def nth($n): .[$n];
+def combinations:
+    if length == 0 then [] else
+        .[0][] as $x
+          | (.[1:] | combinations) as $y
+          | [$x] + $y
+    end;
+def combinations(n):
+    . as $dot
+      | [range(n) | $dot]
+      | combinations;
+# transpose a possibly jagged matrix, quickly;
+# rows are padded with nulls so the result is always rectangular.
+def transpose:
+  if . == [] then []
+  else . as $in
+  | (map(length) | max) as $max
+  | length as $length
+  | reduce range(0; $max) as $j
+      ([]; . + [reduce range(0;$length) as $i ([]; . + [ $in[$i][$j] ] )] )
+	        end;
+def in(xs): . as $x | xs | has($x);
+def inside(xs): . as $x | xs | contains($x);
+def input: _input;
+def repeat(exp):
+     def _repeat:
+         exp, _repeat;
+     _repeat;
+def inputs: try repeat(_input) catch if .=="break" then empty else .|error end;
+# like ruby's downcase - only characters A to Z are affected
+def ascii_downcase:
+  explode | map( if 65 <= . and . <= 90 then . + 32  else . end) | implode;
+# like ruby's upcase - only characters a to z are affected
+def ascii_upcase:
+  explode | map( if 97 <= . and . <= 122 then . - 32  else . end) | implode;
+
+# Streaming utilities
+def truncate_stream(stream):
+  . as $n | null | stream | . as $input | if (.[0]|length) > $n then setpath([0];$input[0][1:]) else empty end;
+def fromstream(i):
+  foreach i as $item (
+    [null,false,null,false];
+    if ($item[0]|length) == 0 then [null,false,.[2],.[3]]
+    elif ($item|length) == 1 and ($item[0]|length) < 2 then [null,false,.[0],.[1]]
+    else . end |
+    . as $state |
+    if ($item|length) > 1 and ($item[0]|length) > 0 then
+      [.[0]|setpath(($item|.[0]); ($item|.[1])),
+      true,
+      $state[2],
+      $state[3]]
+    else .
+    end;
+    if ($item[0]|length) == 1 and ($item|length == 1) and .[3] then .[2] else empty end,
+    if ($item[0]|length) == 0 then $item[1] else empty end
+    );
+def tostream:
+  {string:true,number:true,boolean:true,null:true} as $leaf_types |
+  . as $dot |
+  if $leaf_types[$dot|type] or length==0 then [[],$dot]
+  else
+    # We really need a _streaming_ form of `keys`.
+    # We can use `range` for arrays, but not for objects.
+    keys as $keys |
+    $keys[-1] as $last|
+    ((# for each key
+      $keys[] | . as $key |
+      $dot[$key] | . as $dot |
+      # recurse on each key/value
+      tostream|.[0]|=[$key]+.),
+     # then add the closing marker
+     [[$last]])
+  end;
+
+
+# Assuming the input array is sorted, bsearch/1 returns
+# the index of the target if the target is in the input array; and otherwise
+#  (-1 - ix), where ix is the insertion point that would leave the array sorted.
+# If the input is not sorted, bsearch will terminate but with irrelevant results.
+def bsearch(target):
+  if length == 0 then -1
+  elif length == 1 then
+     if target == .[0] then 0 elif target < .[0] then -1 else -2 end
+  else . as $in
+    # state variable: [start, end, answer]
+    # where start and end are the upper and lower offsets to use.
+    | [0, length-1, null]
+    | until( .[0] > .[1] ;
+             if .[2] != null then (.[1] = -1)               # i.e. break
+             else
+               ( ( (.[1] + .[0]) / 2 ) | floor ) as $mid
+               | $in[$mid] as $monkey
+               | if $monkey == target  then (.[2] = $mid)   # success
+                 elif .[0] == .[1]     then (.[1] = -1)     # failure
+                 elif $monkey < target then (.[0] = ($mid + 1))
+                 else (.[1] = ($mid - 1))
+                 end
+             end )
+    | if .[2] == null then          # compute the insertion point
+         if $in[ .[0] ] < target then (-2 -.[0])
+         else (-1 -.[0])
+         end
+      else .[2]
+      end
+  end;
+
+# Apply f to composite entities recursively, and to atoms
+def walk(f):
+  . as $in
+  | if type == "object" then
+      reduce keys[] as $key
+        ( {}; . + { ($key):  ($in[$key] | walk(f)) } ) | f
+  elif type == "array" then map( walk(f) ) | f
+  else f
+  end;
diff --git a/bundle/json/.gitignore b/pack/language/start/json/.gitignore
similarity index 100%
rename from bundle/json/.gitignore
rename to pack/language/start/json/.gitignore
diff --git a/bundle/json/ftdetect/json.vim b/pack/language/start/json/ftdetect/json.vim
similarity index 100%
rename from bundle/json/ftdetect/json.vim
rename to pack/language/start/json/ftdetect/json.vim
diff --git a/bundle/json/ftplugin/json.vim b/pack/language/start/json/ftplugin/json.vim
similarity index 100%
rename from bundle/json/ftplugin/json.vim
rename to pack/language/start/json/ftplugin/json.vim
diff --git a/bundle/json/indent/json.vim b/pack/language/start/json/indent/json.vim
similarity index 100%
rename from bundle/json/indent/json.vim
rename to pack/language/start/json/indent/json.vim
diff --git a/bundle/json/json-test.json b/pack/language/start/json/json-test.json
similarity index 100%
rename from bundle/json/json-test.json
rename to pack/language/start/json/json-test.json
diff --git a/bundle/json/jsonp-test.jsonp b/pack/language/start/json/jsonp-test.jsonp
similarity index 100%
rename from bundle/json/jsonp-test.jsonp
rename to pack/language/start/json/jsonp-test.jsonp
diff --git a/bundle/json/license.md b/pack/language/start/json/license.md
similarity index 100%
rename from bundle/json/license.md
rename to pack/language/start/json/license.md
diff --git a/bundle/json/readme.md b/pack/language/start/json/readme.md
similarity index 100%
rename from bundle/json/readme.md
rename to pack/language/start/json/readme.md
diff --git a/bundle/json/syntax/json.vim b/pack/language/start/json/syntax/json.vim
similarity index 100%
rename from bundle/json/syntax/json.vim
rename to pack/language/start/json/syntax/json.vim
diff --git a/pack/language/start/markdown/.gitignore b/pack/language/start/markdown/.gitignore
new file mode 100644
index 0000000..c6f4595
--- /dev/null
+++ b/pack/language/start/markdown/.gitignore
@@ -0,0 +1,2 @@
+build
+/doc/tags
diff --git a/pack/language/start/markdown/.travis.yml b/pack/language/start/markdown/.travis.yml
new file mode 100644
index 0000000..338161c
--- /dev/null
+++ b/pack/language/start/markdown/.travis.yml
@@ -0,0 +1,34 @@
+language: vim
+
+os:
+  - linux
+  - osx
+
+env:
+  - TEST=package
+  - TEST=latest
+
+before_script: |
+  if [ "$TEST" = "package" ]; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get -y update
+      sudo apt-get -y install vim
+    fi
+  else
+    cd ..
+    git clone --depth 1 https://github.com/vim/vim
+    cd vim
+    ./configure --with-features=huge
+    make
+    sudo make install
+    export PATH="/usr/local/bin:$PATH"
+    cd "$TRAVIS_BUILD_DIR"
+  fi
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    curl https://bootstrap.pypa.io/get-pip.py | sudo python
+  fi
+  sudo -H pip install virtualenv
+
+script:
+  - make test
+  - make doc
diff --git a/pack/language/start/markdown/CONTRIBUTING.md b/pack/language/start/markdown/CONTRIBUTING.md
new file mode 100644
index 0000000..86912a4
--- /dev/null
+++ b/pack/language/start/markdown/CONTRIBUTING.md
@@ -0,0 +1,58 @@
+# CONTRIBUTING
+
+These contributing guidelines were accepted rather late in the history of this plugin, after much code had already been written.
+
+If you find any existing behavior which does not conform to these guidelines, please correct it and send a pull request.
+
+## General Rules
+
+Every non local identifier must start with `g:vim_markdown_`.
+
+## Documentation
+
+Every new feature must be documented under in the [README.md](README.md). Documentation must be written in [GFM](https://help.github.com/articles/github-flavored-markdown) since GitHub itself is the primary to HTML converter used. In particular, remember that GFM adds line breaks at single newlines, so just forget about the 70 characters wide rule.
+
+Vim help file [doc/vim-markdown.txt](doc/vim-markdown.txt) will be generated from [README.md](README.md) by `make doc` using [vim-tools](https://github.com/xolox/vim-tools).
+
+## Markdown Flavors
+
+There are many flavors of markdown, each one with an unique feature set. This plugin uses the following strategy to deal with all those flavors:
+
+- Features from the [original markdown](http://daringfireball.net/projects/markdown/syntax) are turned on by default. They may not even have an option that turns them off.
+
+- Features from other markdown flavors *must* have an option that turns them on or off. If the feature is common enough across multiple versions of markdown, it may be turned on by default. This shall be decided by the community when the merge request is done.
+
+- If possible, cite the exact point in the documentation of the flavor where a feature is specified. If the feature is not documented, you may also reference the source code itself of the implementation. This way, people who do not know that flavor can check if your implementation is correct.
+
+- Do not use the name of a flavor for a feature that is used across multiple flavors. Instead, create a separate flavor option, that automatically sets each feature.
+
+    For example, fenced code blocks (putting code between pairs of three backticks) is not part of the original markdown, but is supported by [GFM](https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks) and [Jekyll](http://jekyllrb.com/docs/configuration/).
+
+    Therefore, instead of creating an option `g:vim_markdown_gfm_fenced_code_block`, and an option `g:vim_markdown_jekyll_fenced_code_block`, create a single option `g:vim_markdown_fenced_code_block`.
+
+    Next, if there are many more than one Jekyll feature options, create a `g:vim_markdown_jekyll` option that turns them all on at once.
+
+## Style
+
+When choosing between multiple valid Markdown syntaxes, the default behavior must be that specified at: <http://www.cirosantilli.com/markdown-styleguide>
+
+If you wish to have a behavior that differs from that style guide, add an option to turn it on or off, and leave it off by default.
+
+## Tests
+
+All new features must have unit tests.
+
+## Issues
+
+Issues are tracked within GitHub.
+
+When reporting issues, your report is more effective if you include a minimal example file that reproduces the problem. Try to trim out as much as possible, until you have the smallest possible file that still reproduces the issue. Paste the example inline into your issue report, quoted using four spaces at the beginning of each line, like this example from issue [#189](https://github.com/plasticboy/vim-markdown/issues/189):
+
+```
+Minimal example:
+
+    ```
+    =
+    ```
+    bad!
+```
diff --git a/pack/language/start/markdown/Makefile b/pack/language/start/markdown/Makefile
new file mode 100644
index 0000000..c9d1155
--- /dev/null
+++ b/pack/language/start/markdown/Makefile
@@ -0,0 +1,82 @@
+VIMDIR=$(DESTDIR)/usr/share/vim
+ADDONS=${VIMDIR}/addons
+REGISTRY=${VIMDIR}/registry
+
+all:
+
+install:
+	mkdir -pv ${ADDONS}/ftdetect
+	cp -v ftdetect/markdown.vim ${ADDONS}/ftdetect/markdown.vim
+	mkdir -pv ${ADDONS}/ftplugin
+	cp -v ftplugin/markdown.vim ${ADDONS}/ftplugin/markdown.vim
+	mkdir -pv ${ADDONS}/syntax
+	cp -v syntax/markdown.vim ${ADDONS}/syntax/markdown.vim
+	mkdir -pv ${ADDONS}/after/ftplugin
+	cp -v after/ftplugin/markdown.vim ${ADDONS}/after/ftplugin/markdown.vim
+	mkdir -pv ${ADDONS}/indent
+	cp -v indent/markdown.vim ${ADDONS}/indent/markdown.vim
+	mkdir -pv ${ADDONS}/doc
+	cp -v doc/vim-markdown.txt ${ADDONS}/doc/vim-markdown.txt
+	mkdir -pv ${REGISTRY}
+	cp -v registry/markdown.yaml ${REGISTRY}/markdown.yaml
+
+test: build/tabular build/vim-toml build/vim-json build/vader.vim
+	test/run-tests.sh
+.PHONY: test
+
+update: build/tabular build/vim-toml build/vim-json build/vader.vim
+	cd build/tabular && git pull
+	cd build/vim-toml && git pull
+	cd build/vim-json && git pull
+	cd build/vader.vim && git pull
+.PHONY: update
+
+build/tabular: | build
+	git clone https://github.com/godlygeek/tabular build/tabular
+
+build/vim-toml: | build
+	git clone https://github.com/cespare/vim-toml build/vim-toml
+
+build/vim-json: | build
+	git clone https://github.com/elzr/vim-json build/vim-json
+
+build/vader.vim: | build
+	git clone https://github.com/junegunn/vader.vim build/vader.vim
+
+build:
+	mkdir build
+
+doc: build/html2vimdoc build/vim-tools
+	sed -e '/^\[!\[Build Status\]/d' \
+	    -e '/^1\. \[/d' README.md > doc/tmp.md # remove table of contents
+	build/html2vimdoc/bin/python build/vim-tools/html2vimdoc.py -f vim-markdown \
+		doc/tmp.md | \
+		sed -E -e "s/[[:space:]]*$$//" -e "# remove trailing spaces" \
+		    -e "/^.{79,}\|$$/ {" -e "# wrap table of contents over 79" \
+		    -e "h" -e "# save the matched line to the hold space" \
+		    -e "s/^(.*) (\|[^|]*\|)$$/\1/" -e "# make content title" \
+		    -e "p" -e "# print title" \
+		    -e "g" -e "# restore the matched line" \
+		    -e "s/^.* (\|[^|]*\|)$$/ \1/" -e "# make link" \
+		    -e ":c" -e "s/^(.{1,78})$$/ \1/" -e "tc" -e "# align right" \
+		    -e "}" \
+		    -e "/^- '[^']*':( |$$)/ {" \
+		    -e "h" -e "# save the matched line to the hold space" \
+		    -e "s/^- '([^']{3,})':.*/ \*\1\*/" -e "# make command reference" \
+		    -e "s/^- '([^']{1,2})':.*/ \*vim-markdown-\1\*/" -e "# short command" \
+		    -e ":a" -e "s/^(.{1,78})$$/ \1/" -e "ta" -e "# align right" \
+		    -e "G" -e "# append the matched line after the command reference" \
+		    -e "}" > doc/vim-markdown.txt && rm -f doc/tmp.md
+
+.PHONY: doc
+
+# Prerequire Python and virtualenv.
+# $ sudo pip install virtualenv
+# Create the virtual environment.
+# Install the dependencies.
+build/html2vimdoc: | build
+	virtualenv build/html2vimdoc
+	build/html2vimdoc/bin/pip install beautifulsoup coloredlogs==4.0 markdown
+
+build/vim-tools: | build
+	git clone https://github.com/xolox/vim-tools.git build/vim-tools
diff --git a/pack/language/start/markdown/README.md b/pack/language/start/markdown/README.md
new file mode 100644
index 0000000..982248e
--- /dev/null
+++ b/pack/language/start/markdown/README.md
@@ -0,0 +1,453 @@
+# Vim Markdown
+
+[![Build Status](https://travis-ci.org/plasticboy/vim-markdown.svg)](https://travis-ci.org/plasticboy/vim-markdown)
+
+Syntax highlighting, matching rules and mappings for [the original Markdown](http://daringfireball.net/projects/markdown/) and extensions.
+
+1. [Installation](#installation)
+1. [Basic usage](#basic-usage)
+1. [Options](#options)
+1. [Mappings](#mappings)
+1. [Commands](#commands)
+1. [Credits](#credits)
+1. [License](#license)
+
+## Installation
+
+If you use [Vundle](https://github.com/gmarik/vundle), add the following line to your `~/.vimrc`:
+
+```vim
+Plugin 'godlygeek/tabular'
+Plugin 'plasticboy/vim-markdown'
+```
+
+The `tabular` plugin must come *before* `vim-markdown`.
+
+Then run inside Vim:
+
+```vim
+:so ~/.vimrc
+:PluginInstall
+```
+
+If you use [Pathogen](https://github.com/tpope/vim-pathogen), do this:
+
+```sh
+cd ~/.vim/bundle
+git clone https://github.com/plasticboy/vim-markdown.git
+```
+
+To install without Pathogen using the Debian [vim-addon-manager](http://packages.qa.debian.org/v/vim-addon-manager.html), do this:
+
+```sh
+git clone https://github.com/plasticboy/vim-markdown.git
+cd vim-markdown
+sudo make install
+vim-addon-manager install markdown
+```
+
+If you are not using any package manager, download the [tarball](https://github.com/plasticboy/vim-markdown/archive/master.tar.gz) and do this:
+
+```sh
+cd ~/.vim
+tar --strip=1 -zxf vim-markdown-master.tar.gz
+```
+
+## Basic usage
+
+### Folding
+
+Folding is enabled for headers by default.
+
+The following commands are useful to open and close folds:
+
+- `zr`: reduces fold level throughout the buffer
+- `zR`: opens all folds
+- `zm`: increases fold level throughout the buffer
+- `zM`: folds everything all the way
+- `za`: open a fold your cursor is on
+- `zA`: open a fold your cursor is on recursively
+- `zc`: close a fold your cursor is on
+- `zC`: close a fold your cursor is on recursively
+
+[Options](#options) are available to disable folding or change folding style.
+
+Try `:help fold-expr` and `:help fold-commands` for details.
+
+### Concealing
+
+Concealing is set for some syntax such as bold, italic, code block and link.
+
+Concealing lets you conceal text with other text. The actual source text is not modified. If you put your cursor on the concealed line, the conceal goes away.
+
+[Options](#options) are available to disable or change concealing.
+
+Try `:help concealcursor` and `:help conceallevel` for details.
+
+## Options
+
+### Disable Folding
+
+Add the following line to your `.vimrc` to disable the folding configuration:
+
+```vim
+let g:vim_markdown_folding_disabled = 1
+```
+
+This option only controls Vim Markdown specific folding configuration.
+
+To enable/disable folding use Vim's standard folding configuration.
+
+```vim
+set [no]foldenable
+```
+
+### Change fold style
+
+To fold in a style like [python-mode](https://github.com/klen/python-mode), add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_folding_style_pythonic = 1
+```
+
+Level 1 heading which is served as a document title is not folded.
+`g:vim_markdown_folding_level` setting is not active with this fold style.
+
+To prevent foldtext from being set add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_override_foldtext = 0
+```
+
+### Set header folding level
+
+Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.
+
+```vim
+let g:vim_markdown_folding_level = 6
+```
+
+Tip: it can be changed on the fly with:
+
+```vim
+:let g:vim_markdown_folding_level = 1
+:edit
+```
+
+### Disable Default Key Mappings
+
+Add the following line to your `.vimrc` to disable default key mappings:
+
+```vim
+let g:vim_markdown_no_default_key_mappings = 1
+```
+
+You can also map them by yourself with `<Plug>` mappings.
+
+### Enable TOC window auto-fit
+
+Allow for the TOC window to auto-fit when it's possible for it to shrink.
+It never increases its default size (half screen), it only shrinks.
+
+```vim
+let g:vim_markdown_toc_autofit = 1
+```
+
+### Text emphasis restriction to single-lines
+
+By default text emphasis works across multiple lines until a closing token is found. However, it's possible to restrict text emphasis to a single line (i.e., for it to be applied a closing token must be found on the same line). To do so:
+
+```vim
+let g:vim_markdown_emphasis_multiline = 0
+```
+
+### Syntax Concealing
+
+Concealing is set for some syntax.
+
+For example, conceal `[link text](link url)` as just `link text`.
+Also, `_italic_` and `*italic*` will conceal to just _italic_.
+Similarly `__bold__`, `**bold**`, `___italic bold___`, and `***italic bold***`
+will conceal to just __bold__, **bold**, ___italic bold___, and ***italic bold*** respectively.
+
+To enable conceal use Vim's standard conceal configuration.
+
+```vim
+set conceallevel=2
+```
+
+To disable conceal regardless of `conceallevel` setting, add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_conceal = 0
+```
+
+To disable math conceal with LaTeX math syntax enabled, add the following to your `.vimrc`:
+
+```vim
+let g:tex_conceal = ""
+let g:vim_markdown_math = 1
+```
+
+### Fenced code block languages
+
+You can use filetype name as fenced code block languages for syntax highlighting.
+If you want to use different name from filetype, you can add it in your `.vimrc` like so:
+
+```vim
+let g:vim_markdown_fenced_languages = ['csharp=cs']
+```
+
+This will cause the following to be highlighted using the `cs` filetype syntax.
+
+    ```csharp
+    ...
+    ```
+
+Default is `['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']`.
+
+### Follow named anchors
+
+This feature allows the `ge` command to follow named anchors in links of the form
+`file#anchor` or just `#anchor`, where file may omit the `.md` extension as
+usual. Two variables control its operation:
+
+```vim
+let g:vim_markdown_follow_anchor = 1
+```
+
+This tells vim-markdown whether to attempt to follow a named anchor in a link or
+not. When it is 1, and only if a link can be split in two parts by the pattern
+'#', then the first part is interpreted as the file and the second one as the
+named anchor. This also includes urls of the form `#anchor`, for which the first
+part is considered empty, meaning that the target file is the current one. After
+the file is opened, the anchor will be searched.
+
+Default is `0`.
+
+```vim
+let g:vim_markdown_anchorexpr = "'<<'.v:anchor.'>>'"
+```
+
+This expression will be evaluated substituting `v:anchor` with a quoted string
+that contains the anchor to visit. The result of the evaluation will become the
+real anchor to search in the target file. This is useful in order to convert
+anchors of the form, say, `my-section-title` to searches of the form `My Section
+Title` or `<<my-section-title>>`.
+
+Default is `''`.
+
+### Syntax extensions
+
+The following options control which syntax extensions will be turned on. They are off by default.
+
+#### LaTeX math
+
+Used as `$x^2$`, `$$x^2$$`, escapable as `\$x\$` and `\$\$x\$\$`.
+
+```vim
+let g:vim_markdown_math = 1
+```
+
+#### YAML Front Matter
+
+Highlight YAML front matter as used by Jekyll or [Hugo](https://gohugo.io/content/front-matter/).
+
+```vim
+let g:vim_markdown_frontmatter = 1
+```
+
+#### TOML Front Matter
+
+Highlight TOML front matter as used by [Hugo](https://gohugo.io/content/front-matter/).
+
+TOML syntax highlight requires [vim-toml](https://github.com/cespare/vim-toml).
+
+```vim
+let g:vim_markdown_toml_frontmatter = 1
+```
+
+#### JSON Front Matter
+
+Highlight JSON front matter as used by [Hugo](https://gohugo.io/content/front-matter/).
+
+JSON syntax highlight requires [vim-json](https://github.com/elzr/vim-json).
+
+```vim
+let g:vim_markdown_json_frontmatter = 1
+```
+
+### Adjust new list item indent
+
+You can adjust a new list indent. For example, you insert a single line like below:
+
+```
+* item1
+```
+
+Then if you type `o` to insert new line in vim and type `* item2`, the result will be:
+
+```
+* item1
+    * item2
+```
+
+vim-markdown automatically insert the indent. By default, the number of spaces of indent is 4. If you'd like to change the number as 2, just write:
+
+```vim
+let g:vim_markdown_new_list_item_indent = 2
+```
+
+### Do not require .md extensions for Markdown links
+
+If you want to have a link like this `[link text](link-url)` and follow it for editing in vim using the `ge` command, but have it open the file "link-url.md" instead of the file "link-url", then use this option:
+
+```vim
+let g:vim_markdown_no_extensions_in_markdown = 1
+```
+This is super useful for GitLab and GitHub wiki repositories.
+
+Normal behaviour would be that vim-markup required you to do this `[link text](link-url.md)`, but this is not how the Gitlab and GitHub wiki repositories work. So this option adds some consistency between the two. 
+
+### Auto-write when following link
+
+If you follow a link like this `[link text](link-url)` using the `ge` shortcut, this option will automatically save any edits you made before moving you:
+
+```vim
+let g:vim_markdown_autowrite = 1
+```
+
+### Change default file extension
+
+If you would like to use a file extension other than `.md` you may do so using the `vim_markdown_auto_extension_ext` variable:
+
+```vim
+let g:vim_markdown_auto_extension_ext = 'txt'
+```
+
+### Do not automatically insert bulletpoints
+
+Automatically inserting bulletpoints can lead to problems when wrapping text
+(see issue #232 for details), so it can be disabled:
+
+```vim
+let g:vim_markdown_auto_insert_bullets = 0
+```
+
+In that case, you probably also want to set the new list item indent to 0 as
+well, or you will have to remove an indent each time you add a new list item:
+
+```vim
+let g:vim_markdown_new_list_item_indent = 0
+```
+
+### Change how to open new files
+
+By default when following a link the target file will be opened in your current buffer.  This behavior can change if you prefer using splits or tabs by using the `vim_markdown_edit_url_in` variable.  Possible values are `tab`, `vsplit`, `hsplit`, `current` opening in a new tab, vertical split, horizontal split, and current buffer respectively.  Defaults to current buffer if not set:
+
+```vim
+let g:vim_markdown_edit_url_in = 'tab'
+```
+
+## Mappings
+
+The following work on normal and visual modes:
+
+-   `gx`: open the link under the cursor in the same browser as the standard `gx` command. `<Plug>Markdown_OpenUrlUnderCursor`
+
+    The standard `gx` is extended by allowing you to put your cursor anywhere inside a link.
+
+    For example, all the following cursor positions will work:
+
+        [Example](http://example.com)
+        ^  ^    ^^   ^       ^
+        1  2    34   5       6
+
+        <http://example.com>
+        ^  ^               ^
+        1  2               3
+
+    Known limitation: does not work for links that span multiple lines.
+
+-   `ge`: open the link under the cursor in Vim for editing. Useful for relative markdown links. `<Plug>Markdown_EditUrlUnderCursor`
+
+    The rules for the cursor position are the same as the `gx` command.
+
+-   `]]`: go to next header. `<Plug>Markdown_MoveToNextHeader`
+
+-   `[[`: go to previous header. Contrast with `]c`. `<Plug>Markdown_MoveToPreviousHeader`
+
+-   `][`: go to next sibling header if any. `<Plug>Markdown_MoveToNextSiblingHeader`
+
+-   `[]`: go to previous sibling header if any. `<Plug>Markdown_MoveToPreviousSiblingHeader`
+
+-   `]c`: go to Current header. `<Plug>Markdown_MoveToCurHeader`
+
+-   `]u`: go to parent header (Up). `<Plug>Markdown_MoveToParentHeader`
+
+This plugin follows the recommended Vim plugin mapping interface, so to change the map `]u` to `asdf`, add to your `.vimrc`:
+
+    map asdf <Plug>Markdown_MoveToParentHeader
+
+To disable a map use:
+
+    map <Plug> <Plug>Markdown_MoveToParentHeader
+
+## Commands
+
+The following requires `:filetype plugin on`.
+
+-   `:HeaderDecrease`:
+
+    Decrease level of all headers in buffer: `h2` to `h1`, `h3` to `h2`, etc.
+
+    If range is given, only operate in the range.
+
+    If an `h1` would be decreased, abort.
+
+    For simplicity of implementation, Setex headers are converted to Atx.
+
+-   `:HeaderIncrease`: Analogous to `:HeaderDecrease`, but increase levels instead.
+
+-   `:SetexToAtx`:
+
+    Convert all Setex style headers in buffer to Atx.
+
+    If a range is given, e.g. hit `:` from visual mode, only operate on the range.
+
+-   `:TableFormat`: Format the table under the cursor [like this](http://www.cirosantilli.com/markdown-style-guide/#tables).
+
+    Requires [Tabular](https://github.com/godlygeek/tabular).
+
+    The input table *must* already have a separator line as the second line of the table.
+    That line only needs to contain the correct pipes `|`, nothing else is required.
+
+-   `:Toc`: create a quickfix vertical window navigable table of contents with the headers.
+
+    Hit `<Enter>` on a line to jump to the corresponding line of the markdown file.
+
+-   `:Toch`: Same as `:Toc` but in an horizontal window.
+
+-   `:Toct`: Same as `:Toc` but in a new tab.
+
+-   `:Tocv`: Same as `:Toc` for symmetry with `:Toch` and `:Tocv`.
+
+## Credits
+
+The main contributors of vim-markdown are:
+
+- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-markdown. [Homepage](http://plasticboy.com/).
+
+If you feel that your name should be on this list, please make a pull request listing your contributions.
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Benjamin D. Williams
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pack/language/start/markdown/after/ftplugin/markdown.vim b/pack/language/start/markdown/after/ftplugin/markdown.vim
new file mode 100644
index 0000000..9ee0100
--- /dev/null
+++ b/pack/language/start/markdown/after/ftplugin/markdown.vim
@@ -0,0 +1,160 @@
+" folding for Markdown headers, both styles (atx- and setex-)
+" http://daringfireball.net/projects/markdown/syntax#header
+"
+" this code can be placed in file
+"   $HOME/.vim/after/ftplugin/markdown.vim
+"
+" original version from Steve Losh's gist: https://gist.github.com/1038710
+
+function! s:is_mkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
+if get(g:, "vim_markdown_folding_style_pythonic", 0)
+    function! Foldexpr_markdown(lnum)
+        let l1 = getline(a:lnum)
+        " keep track of fenced code blocks
+        if l1 =~ '````*' || l1 =~ '\~\~\~\~*'
+            if b:fenced_block == 0
+                let b:fenced_block = 1
+            elseif b:fenced_block == 1
+                let b:fenced_block = 0
+            endif
+        elseif g:vim_markdown_frontmatter == 1
+            if b:front_matter == 1 && a:lnum > 2
+                let l0 = getline(a:lnum-1)
+                if l0 == '---'
+                    let b:front_matter = 0
+                endif
+            elseif a:lnum == 1
+                if l1 == '---'
+                    let b:front_matter = 1
+                endif
+            endif
+        endif
+
+        if b:fenced_block == 1 || b:front_matter == 1
+            if a:lnum == 1
+                " fold any 'preamble'
+                return '>1'
+            else
+                " keep previous foldlevel
+                return '='
+            endif
+        endif
+
+        let l2 = getline(a:lnum+1)
+        if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 1)
+            return '>0'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 2)
+            return '>1'
+        endif
+
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+            " current line starts with hashes
+            return '>'.(matchend(l1, '^#\+') - 1)
+        elseif a:lnum == 1
+            " fold any 'preamble'
+            return '>1'
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
+
+    function! Foldtext_markdown()
+        let line = getline(v:foldstart)
+        let has_numbers = &number || &relativenumber
+        let nucolwidth = &fdc + has_numbers * &numberwidth
+        let windowwidth = winwidth(0) - nucolwidth - 6
+        let foldedlinecount = v:foldend - v:foldstart
+        let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+        let line = substitute(line, '\%("""\|''''''\)', '', '')
+        let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
+        return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
+    endfunction
+else
+    function! Foldexpr_markdown(lnum)
+        if (a:lnum == 1)
+            let l0 = ''
+        else
+            let l0 = getline(a:lnum-1)
+        endif
+
+        " keep track of fenced code blocks
+        if l0 =~ '````*' || l0 =~ '\~\~\~\~*'
+            if b:fenced_block == 0
+                let b:fenced_block = 1
+            elseif b:fenced_block == 1
+                let b:fenced_block = 0
+            endif
+        elseif g:vim_markdown_frontmatter == 1
+            if b:front_matter == 1
+                if l0 == '---'
+                    let b:front_matter = 0
+                endif
+            elseif a:lnum == 2
+                if l0 == '---'
+                    let b:front_matter = 1
+                endif
+            endif
+        endif
+
+        if b:fenced_block == 1 || b:front_matter == 1
+            " keep previous foldlevel
+            return '='
+        endif
+
+        let l2 = getline(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 1)
+            return '>1'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 2)
+            if s:vim_markdown_folding_level >= 2
+                return '>1'
+            else
+                return '>2'
+            endif
+        endif
+
+        let l1 = getline(a:lnum)
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+            " fold level according to option
+            if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level
+                if a:lnum == line('$')
+                    return matchend(l1, '^#\+') - 1
+                else
+                    return -1
+                endif
+            else
+                " headers are not folded
+                return 0
+            endif
+        endif
+
+        if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
+            " previous line starts with hashes
+            return '>'.matchend(l0, '^#\+')
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
+endif
+
+
+let b:fenced_block = 0
+let b:front_matter = 0
+let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
+
+if !get(g:, "vim_markdown_folding_disabled", 0)
+    setlocal foldexpr=Foldexpr_markdown(v:lnum)
+    setlocal foldmethod=expr
+    if get(g:, "vim_markdown_folding_style_pythonic", 0) && get(g:, "vim_markdown_override_foldtext", 1)
+        setlocal foldtext=Foldtext_markdown()
+    endif
+endif
diff --git a/pack/language/start/markdown/doc/vim-markdown.txt b/pack/language/start/markdown/doc/vim-markdown.txt
new file mode 100644
index 0000000..29ed66d
--- /dev/null
+++ b/pack/language/start/markdown/doc/vim-markdown.txt
@@ -0,0 +1,571 @@
+*vim-markdown*  Vim Markdown
+
+===============================================================================
+Contents ~
+
+ 1. Introduction                                    |vim-markdown-introduction|
+ 2. Installation                                    |vim-markdown-installation|
+ 3. Basic usage                                      |vim-markdown-basic-usage|
+  1. Folding                                             |vim-markdown-folding|
+  2. Concealing                                       |vim-markdown-concealing|
+ 4. Options                                              |vim-markdown-options|
+  1. Disable Folding                             |vim-markdown-disable-folding|
+  2. Change fold style                         |vim-markdown-change-fold-style|
+  3. Set header folding level           |vim-markdown-set-header-folding-level|
+  4. Disable Default Key Mappings   |vim-markdown-disable-default-key-mappings|
+  5. Enable TOC window auto-fit       |vim-markdown-enable-toc-window-auto-fit|
+  6. Text emphasis restriction to single-lines
+                       |vim-markdown-text-emphasis-restriction-to-single-lines|
+  7. Syntax Concealing                         |vim-markdown-syntax-concealing|
+  8. Fenced code block languages     |vim-markdown-fenced-code-block-languages|
+  9. Follow named anchors                   |vim-markdown-follow-named-anchors|
+  10. Syntax extensions                        |vim-markdown-syntax-extensions|
+   1. LaTeX math                                      |vim-markdown-latex-math|
+   2. YAML Front Matter                        |vim-markdown-yaml-front-matter|
+   3. TOML Front Matter                        |vim-markdown-toml-front-matter|
+   4. JSON Front Matter                        |vim-markdown-json-front-matter|
+  11. Adjust new list item indent    |vim-markdown-adjust-new-list-item-indent|
+  12. Do not require .md extensions for Markdown links
+                |vim-markdown-do-not-require-.md-extensions-for-markdown-links|
+  13. Auto-write when following link
+                                  |vim-markdown-auto-write-when-following-link|
+  14. Change default file extension
+                                   |vim-markdown-change-default-file-extension|
+  15. Do not automatically insert bulletpoints
+                        |vim-markdown-do-not-automatically-insert-bulletpoints|
+  16. Change how to open new files  |vim-markdown-change-how-to-open-new-files|
+ 5. Mappings                                            |vim-markdown-mappings|
+ 6. Commands                                            |vim-markdown-commands|
+ 7. Credits                                              |vim-markdown-credits|
+ 8. License                                              |vim-markdown-license|
+ 9. References                                        |vim-markdown-references|
+
+===============================================================================
+                                                    *vim-markdown-introduction*
+Introduction ~
+
+Syntax highlighting, matching rules and mappings for the original Markdown [1]
+and extensions.
+
+===============================================================================
+                                                    *vim-markdown-installation*
+Installation ~
+
+If you use Vundle [2], add the following line to your '~/.vimrc':
+>
+  Plugin 'godlygeek/tabular'
+  Plugin 'plasticboy/vim-markdown'
+<
+The 'tabular' plugin must come _before_ 'vim-markdown'.
+
+Then run inside Vim:
+>
+  :so ~/.vimrc
+  :PluginInstall
+<
+If you use Pathogen [3], do this:
+>
+  cd ~/.vim/bundle
+  git clone https://github.com/plasticboy/vim-markdown.git
+<
+To install without Pathogen using the Debian vim-addon-manager [4], do this:
+>
+  git clone https://github.com/plasticboy/vim-markdown.git
+  cd vim-markdown
+  sudo make install
+  vim-addon-manager install markdown
+<
+If you are not using any package manager, download the tarball [5] and do this:
+>
+  cd ~/.vim
+  tar --strip=1 -zxf vim-markdown-master.tar.gz
+<
+===============================================================================
+                                                     *vim-markdown-basic-usage*
+Basic usage ~
+
+-------------------------------------------------------------------------------
+                                                         *vim-markdown-folding*
+Folding ~
+
+Folding is enabled for headers by default.
+
+The following commands are useful to open and close folds:
+
+                                                              *vim-markdown-zr*
+- 'zr': reduces fold level throughout the buffer
+                                                              *vim-markdown-zR*
+- 'zR': opens all folds
+                                                              *vim-markdown-zm*
+- 'zm': increases fold level throughout the buffer
+                                                              *vim-markdown-zM*
+- 'zM': folds everything all the way
+                                                              *vim-markdown-za*
+- 'za': open a fold your cursor is on
+                                                              *vim-markdown-zA*
+- 'zA': open a fold your cursor is on recursively
+                                                              *vim-markdown-zc*
+- 'zc': close a fold your cursor is on
+                                                              *vim-markdown-zC*
+- 'zC': close a fold your cursor is on recursively
+
+Options are available to disable folding or change folding style.
+
+Try ':help fold-expr' and ':help fold-commands' for details.
+
+-------------------------------------------------------------------------------
+                                                      *vim-markdown-concealing*
+Concealing ~
+
+Concealing is set for some syntax such as bold, italic, code block and link.
+
+Concealing lets you conceal text with other text. The actual source text is not
+modified. If you put your cursor on the concealed line, the conceal goes away.
+
+Options are available to disable or change concealing.
+
+Try ':help concealcursor' and ':help conceallevel' for details.
+
+===============================================================================
+                                                         *vim-markdown-options*
+Options ~
+
+-------------------------------------------------------------------------------
+                                                 *vim-markdown-disable-folding*
+Disable Folding ~
+
+Add the following line to your '.vimrc' to disable the folding configuration:
+>
+  let g:vim_markdown_folding_disabled = 1
+<
+This option only controls Vim Markdown specific folding configuration.
+
+To enable/disable folding use Vim's standard folding configuration.
+>
+  set [no]foldenable
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-change-fold-style*
+Change fold style ~
+
+To fold in a style like python-mode [6], add the following to your '.vimrc':
+>
+  let g:vim_markdown_folding_style_pythonic = 1
+<
+Level 1 heading which is served as a document title is not folded.
+'g:vim_markdown_folding_level' setting is not active with this fold style.
+
+To prevent foldtext from being set add the following to your '.vimrc':
+>
+  let g:vim_markdown_override_foldtext = 0
+<
+-------------------------------------------------------------------------------
+                                        *vim-markdown-set-header-folding-level*
+Set header folding level ~
+
+Folding level is a number between 1 and 6. By default, if not specified, it is
+set to 1.
+>
+  let g:vim_markdown_folding_level = 6
+<
+Tip: it can be changed on the fly with:
+>
+  :let g:vim_markdown_folding_level = 1
+  :edit
+<
+-------------------------------------------------------------------------------
+                                    *vim-markdown-disable-default-key-mappings*
+Disable Default Key Mappings ~
+
+Add the following line to your '.vimrc' to disable default key mappings:
+>
+  let g:vim_markdown_no_default_key_mappings = 1
+<
+You can also map them by yourself with '<Plug>' mappings.
+
+-------------------------------------------------------------------------------
+                                      *vim-markdown-enable-toc-window-auto-fit*
+Enable TOC window auto-fit ~
+
+Allow for the TOC window to auto-fit when it's possible for it to shrink. It
+never increases its default size (half screen), it only shrinks.
+>
+  let g:vim_markdown_toc_autofit = 1
+<
+-------------------------------------------------------------------------------
+                       *vim-markdown-text-emphasis-restriction-to-single-lines*
+Text emphasis restriction to single-lines ~
+
+By default text emphasis works across multiple lines until a closing token is
+found. However, it's possible to restrict text emphasis to a single line (i.e.,
+for it to be applied a closing token must be found on the same line). To do so:
+>
+  let g:vim_markdown_emphasis_multiline = 0
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-syntax-concealing*
+Syntax Concealing ~
+
+Concealing is set for some syntax.
+
+For example, conceal '[link text](link url)' as just 'link text'. Also,
+'_italic_' and '*italic*' will conceal to just _italic_. Similarly '__bold__',
+'**bold**', '___italic bold___', and '***italic bold***' will conceal to just
+**bold**, **bold**, **_italic bold_**, and **_italic bold_** respectively.
+
+To enable conceal use Vim's standard conceal configuration.
+>
+  set conceallevel=2
+<
+To disable conceal regardless of 'conceallevel' setting, add the following to
+your '.vimrc':
+>
+  let g:vim_markdown_conceal = 0
+<
+To disable math conceal with LaTeX math syntax enabled, add the following to
+your '.vimrc':
+>
+  let g:tex_conceal = ""
+  let g:vim_markdown_math = 1
+<
+-------------------------------------------------------------------------------
+                                     *vim-markdown-fenced-code-block-languages*
+Fenced code block languages ~
+
+You can use filetype name as fenced code block languages for syntax
+highlighting. If you want to use different name from filetype, you can add it
+in your '.vimrc' like so:
+>
+  let g:vim_markdown_fenced_languages = ['csharp=cs']
+<
+This will cause the following to be highlighted using the 'cs' filetype syntax.
+>
+  ```csharp
+  ...
+  ```
+<
+Default is "['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']".
+
+-------------------------------------------------------------------------------
+                                            *vim-markdown-follow-named-anchors*
+Follow named anchors ~
+
+This feature allows the 'ge' command to follow named anchors in links of the
+form 'file#anchor' or just '#anchor', where file may omit the '.md' extension
+as usual. Two variables control its operation:
+>
+  let g:vim_markdown_follow_anchor = 1
+<
+This tells vim-markdown whether to attempt to follow a named anchor in a link
+or not. When it is 1, and only if a link can be split in two parts by the
+pattern '#', then the first part is interpreted as the file and the second one
+as the named anchor. This also includes urls of the form '#anchor', for which
+the first part is considered empty, meaning that the target file is the current
+one. After the file is opened, the anchor will be searched.
+
+Default is '0'.
+>
+  let g:vim_markdown_anchorexpr = "'<<'.v:anchor.'>>'"
+<
+This expression will be evaluated substituting 'v:anchor' with a quoted string
+that contains the anchor to visit. The result of the evaluation will become the
+real anchor to search in the target file. This is useful in order to convert
+anchors of the form, say, 'my-section-title' to searches of the form 'My
+Section Title' or '<<my-section-title>>'.
+
+Default is "''".
+
+-------------------------------------------------------------------------------
+                                               *vim-markdown-syntax-extensions*
+Syntax extensions ~
+
+The following options control which syntax extensions will be turned on. They
+are off by default.
+
+-------------------------------------------------------------------------------
+                                                      *vim-markdown-latex-math*
+LaTeX math ~
+
+Used as '$x^2$', '$$x^2$$', escapable as '\$x\$' and '\$\$x\$\$'.
+>
+  let g:vim_markdown_math = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-yaml-front-matter*
+YAML Front Matter ~
+
+Highlight YAML front matter as used by Jekyll or Hugo [7].
+>
+  let g:vim_markdown_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-toml-front-matter*
+TOML Front Matter ~
+
+Highlight TOML front matter as used by Hugo [7].
+
+TOML syntax highlight requires vim-toml [8].
+>
+  let g:vim_markdown_toml_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-json-front-matter*
+JSON Front Matter ~
+
+Highlight JSON front matter as used by Hugo [7].
+
+JSON syntax highlight requires vim-json [9].
+>
+  let g:vim_markdown_json_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                     *vim-markdown-adjust-new-list-item-indent*
+Adjust new list item indent ~
+
+You can adjust a new list indent. For example, you insert a single line like
+below:
+>
+  * item1
+<
+Then if you type 'o' to insert new line in vim and type '* item2', the result
+will be:
+>
+  * item1
+      * item2
+<
+vim-markdown automatically insert the indent. By default, the number of spaces
+of indent is 4. If you'd like to change the number as 2, just write:
+>
+  let g:vim_markdown_new_list_item_indent = 2
+<
+-------------------------------------------------------------------------------
+                *vim-markdown-do-not-require-.md-extensions-for-markdown-links*
+Do not require .md extensions for Markdown links ~
+
+If you want to have a link like this '[link text](link-url)' and follow it for
+editing in vim using the 'ge' command, but have it open the file "link-url.md"
+instead of the file "link-url", then use this option:
+>
+  let g:vim_markdown_no_extensions_in_markdown = 1
+<
+This is super useful for GitLab and GitHub wiki repositories.
+
+Normal behaviour would be that vim-markup required you to do this '[link text
+](link-url.md)', but this is not how the Gitlab and GitHub wiki repositories
+work. So this option adds some consistency between the two.
+
+-------------------------------------------------------------------------------
+                                  *vim-markdown-auto-write-when-following-link*
+Auto-write when following link ~
+
+If you follow a link like this '[link text](link-url)' using the 'ge' shortcut,
+this option will automatically save any edits you made before moving you:
+>
+  let g:vim_markdown_autowrite = 1
+<
+-------------------------------------------------------------------------------
+                                   *vim-markdown-change-default-file-extension*
+Change default file extension ~
+
+If you would like to use a file extension other than '.md' you may do so using
+the 'vim_markdown_auto_extension_ext' variable:
+>
+  let g:vim_markdown_auto_extension_ext = 'txt'
+<
+-------------------------------------------------------------------------------
+                        *vim-markdown-do-not-automatically-insert-bulletpoints*
+Do not automatically insert bulletpoints ~
+
+Automatically inserting bulletpoints can lead to problems when wrapping text
+(see issue #232 for details), so it can be disabled:
+>
+  let g:vim_markdown_auto_insert_bullets = 0
+<
+In that case, you probably also want to set the new list item indent to 0 as
+well, or you will have to remove an indent each time you add a new list item:
+>
+  let g:vim_markdown_new_list_item_indent = 0
+<
+-------------------------------------------------------------------------------
+                                    *vim-markdown-change-how-to-open-new-files*
+Change how to open new files ~
+
+By default when following a link the target file will be opened in your current
+buffer. This behavior can change if you prefer using splits or tabs by using
+the 'vim_markdown_edit_url_in' variable. Possible values are 'tab', 'vsplit',
+'hsplit', 'current' opening in a new tab, vertical split, horizontal split, and
+current buffer respectively. Defaults to current buffer if not set:
+>
+  let g:vim_markdown_edit_url_in = 'tab'
+<
+===============================================================================
+                                                        *vim-markdown-mappings*
+Mappings ~
+
+The following work on normal and visual modes:
+
+                                                              *vim-markdown-gx*
+- 'gx': open the link under the cursor in the same browser as the standard
+  'gx' command. '<Plug>Markdown_OpenUrlUnderCursor'
+
+  The standard 'gx' is extended by allowing you to put your cursor anywhere
+  inside a link.
+
+  For example, all the following cursor positions will work:
+>
+  [Example](http://example.com)
+  ^  ^    ^^   ^       ^
+  1  2    34   5       6
+
+  <http://example.com>
+  ^  ^               ^
+  1  2               3
+<
+  Known limitation: does not work for links that span multiple lines.
+
+                                                              *vim-markdown-ge*
+- 'ge': open the link under the cursor in Vim for editing. Useful for
+  relative markdown links. '<Plug>Markdown_EditUrlUnderCursor'
+
+  The rules for the cursor position are the same as the 'gx' command.
+
+                                                              *vim-markdown-]]*
+- ']]': go to next header. '<Plug>Markdown_MoveToNextHeader'
+
+                                                              *vim-markdown-[[*
+- '[[': go to previous header. Contrast with ']c'.
+  '<Plug>Markdown_MoveToPreviousHeader'
+
+                                                              *vim-markdown-][*
+- '][': go to next sibling header if any.
+  '<Plug>Markdown_MoveToNextSiblingHeader'
+
+                                                              *vim-markdown-[]*
+- '[]': go to previous sibling header if any.
+  '<Plug>Markdown_MoveToPreviousSiblingHeader'
+
+                                                              *vim-markdown-]c*
+- ']c': go to Current header. '<Plug>Markdown_MoveToCurHeader'
+
+                                                              *vim-markdown-]u*
+- ']u': go to parent header (Up). '<Plug>Markdown_MoveToParentHeader'
+
+This plugin follows the recommended Vim plugin mapping interface, so to change
+the map ']u' to 'asdf', add to your '.vimrc':
+>
+  map asdf <Plug>Markdown_MoveToParentHeader
+<
+To disable a map use:
+>
+  map <Plug> <Plug>Markdown_MoveToParentHeader
+<
+===============================================================================
+                                                        *vim-markdown-commands*
+Commands ~
+
+The following requires ':filetype plugin on'.
+
+                                                              *:HeaderDecrease*
+- ':HeaderDecrease':
+
+  Decrease level of all headers in buffer: 'h2' to 'h1', 'h3' to 'h2', etc.
+
+  If range is given, only operate in the range.
+
+  If an 'h1' would be decreased, abort.
+
+  For simplicity of implementation, Setex headers are converted to Atx.
+
+                                                              *:HeaderIncrease*
+- ':HeaderIncrease': Analogous to ':HeaderDecrease', but increase levels
+  instead.
+
+                                                                  *:SetexToAtx*
+- ':SetexToAtx':
+
+  Convert all Setex style headers in buffer to Atx.
+
+  If a range is given, e.g. hit ':' from visual mode, only operate on the
+  range.
+
+                                                                 *:TableFormat*
+- ':TableFormat': Format the table under the cursor like this [10].
+
+  Requires Tabular [11].
+
+  The input table _must_ already have a separator line as the second line of
+  the table. That line only needs to contain the correct pipes '|', nothing
+  else is required.
+
+                                                                         *:Toc*
+- ':Toc': create a quickfix vertical window navigable table of contents with
+  the headers.
+
+  Hit '<Enter>' on a line to jump to the corresponding line of the markdown
+  file.
+
+                                                                        *:Toch*
+- ':Toch': Same as ':Toc' but in an horizontal window.
+
+                                                                        *:Toct*
+- ':Toct': Same as ':Toc' but in a new tab.
+
+                                                                        *:Tocv*
+- ':Tocv': Same as ':Toc' for symmetry with ':Toch' and ':Tocv'.
+
+===============================================================================
+                                                         *vim-markdown-credits*
+Credits ~
+
+The main contributors of vim-markdown are:
+
+- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-
+  markdown. Homepage [12].
+
+If you feel that your name should be on this list, please make a pull request
+listing your contributions.
+
+===============================================================================
+                                                         *vim-markdown-license*
+License ~
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Benjamin D. Williams
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+===============================================================================
+                                                      *vim-markdown-references*
+References ~
+
+[1] http://daringfireball.net/projects/markdown/
+[2] https://github.com/gmarik/vundle
+[3] https://github.com/tpope/vim-pathogen
+[4] http://packages.qa.debian.org/v/vim-addon-manager.html
+[5] https://github.com/plasticboy/vim-markdown/archive/master.tar.gz
+[6] https://github.com/klen/python-mode
+[7] https://gohugo.io/content/front-matter/
+[8] https://github.com/cespare/vim-toml
+[9] https://github.com/elzr/vim-json
+[10] http://www.cirosantilli.com/markdown-style-guide/#tables
+[11] https://github.com/godlygeek/tabular
+[12] http://plasticboy.com/
+
+vim: ft=help
diff --git a/pack/language/start/markdown/ftdetect/markdown.vim b/pack/language/start/markdown/ftdetect/markdown.vim
new file mode 100644
index 0000000..611ecaa
--- /dev/null
+++ b/pack/language/start/markdown/ftdetect/markdown.vim
@@ -0,0 +1,3 @@
+" markdown filetype file
+au BufRead,BufNewFile *.{md,mdown,mkd,mkdn,markdown,mdwn} set filetype=markdown
+au BufRead,BufNewFile *.{md,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx} set filetype=markdown
diff --git a/pack/language/start/markdown/ftplugin/markdown.vim b/pack/language/start/markdown/ftplugin/markdown.vim
new file mode 100644
index 0000000..68d1d3d
--- /dev/null
+++ b/pack/language/start/markdown/ftplugin/markdown.vim
@@ -0,0 +1,789 @@
+"TODO print messages when on visual mode. I only see VISUAL, not the messages.
+
+" Function interface phylosophy:
+"
+" - functions take arbitrary line numbers as parameters.
+"    Current cursor line is only a suitable default parameter.
+"
+" - only functions that bind directly to user actions:
+"
+"    - print error messages.
+"       All intermediate functions limit themselves return `0` to indicate an error.
+"
+"    - move the cursor. All other functions do not move the cursor.
+"
+" This is how you should view headers for the header mappings:
+"
+"   |BUFFER
+"   |
+"   |Outside any header
+"   |
+" a-+# a
+"   |
+"   |Inside a
+"   |
+" a-+
+" b-+## b
+"   |
+"   |inside b
+"   |
+" b-+
+" c-+### c
+"   |
+"   |Inside c
+"   |
+" c-+
+" d-|# d
+"   |
+"   |Inside d
+"   |
+" d-+
+" e-|e
+"   |====
+"   |
+"   |Inside e
+"   |
+" e-+
+
+" For each level, contains the regexp that matches at that level only.
+"
+let s:levelRegexpDict = {
+    \ 1: '\v^(#[^#]@=|.+\n\=+$)',
+    \ 2: '\v^(##[^#]@=|.+\n-+$)',
+    \ 3: '\v^###[^#]@=',
+    \ 4: '\v^####[^#]@=',
+    \ 5: '\v^#####[^#]@=',
+    \ 6: '\v^######[^#]@='
+\ }
+
+" Maches any header level of any type.
+"
+" This could be deduced from `s:levelRegexpDict`, but it is more
+" efficient to have a single regexp for this.
+"
+let s:headersRegexp = '\v^(#|.+\n(\=+|-+)$)'
+
+" Returns the line number of the first header before `line`, called the
+" current header.
+"
+" If there is no current header, return `0`.
+"
+" @param a:1 The line to look the header of. Default value: `getpos('.')`.
+"
+function! s:GetHeaderLineNum(...)
+    if a:0 == 0
+        let l:l = line('.')
+    else
+        let l:l = a:1
+    endif
+    while(l:l > 0)
+        if join(getline(l:l, l:l + 1), "\n") =~ s:headersRegexp
+            return l:l
+        endif
+        let l:l -= 1
+    endwhile
+    return 0
+endfunction
+
+" -  if inside a header goes to it.
+"    Return its line number.
+"
+" -  if on top level outside any headers,
+"    print a warning
+"    Return `0`.
+"
+function! s:MoveToCurHeader()
+    let l:lineNum = s:GetHeaderLineNum()
+    if l:lineNum != 0
+        call cursor(l:lineNum, 1)
+    else
+        echo 'outside any header'
+        "normal! gg
+    endif
+    return l:lineNum
+endfunction
+
+" Move cursor to next header of any level.
+"
+" If there are no more headers, print a warning.
+"
+function! s:MoveToNextHeader()
+    if search(s:headersRegexp, 'W') == 0
+        "normal! G
+        echo 'no next header'
+    endif
+endfunction
+
+" Move cursor to previous header (before current) of any level.
+"
+" If it does not exist, print a warning.
+"
+function! s:MoveToPreviousHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:noPreviousHeader = 0
+    if l:curHeaderLineNumber <= 1
+        let l:noPreviousHeader = 1
+    else
+        let l:previousHeaderLineNumber = s:GetHeaderLineNum(l:curHeaderLineNumber - 1)
+        if l:previousHeaderLineNumber == 0
+            let l:noPreviousHeader = 1
+        else
+            call cursor(l:previousHeaderLineNumber, 1)
+        endif
+    endif
+    if l:noPreviousHeader
+        echo 'no previous header'
+    endif
+endfunction
+
+" - if line is inside a header, return the header level (h1 -> 1, h2 -> 2, etc.).
+"
+" - if line is at top level outside any headers, return `0`.
+"
+function! s:GetHeaderLevel(...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:linenum = s:GetHeaderLineNum(l:line)
+    if l:linenum != 0
+        return s:GetLevelOfHeaderAtLine(l:linenum)
+    else
+        return 0
+    endif
+endfunction
+
+" Returns the level of the header at the given line.
+"
+" If there is no header at the given line, returns `0`.
+"
+function! s:GetLevelOfHeaderAtLine(linenum)
+    let l:lines = join(getline(a:linenum, a:linenum + 1), "\n")
+    for l:key in keys(s:levelRegexpDict)
+        if l:lines =~ get(s:levelRegexpDict, l:key)
+            return l:key
+        endif
+    endfor
+    return 0
+endfunction
+
+" Move cursor to parent header of the current header.
+"
+" If it does not exit, print a warning and do nothing.
+"
+function! s:MoveToParentHeader()
+    let l:linenum = s:GetParentHeaderLineNumber()
+    if l:linenum != 0
+        call cursor(l:linenum, 1)
+    else
+        echo 'no parent header'
+    endif
+endfunction
+
+" Return the line number of the parent header of line `line`.
+"
+" If it has no parent, return `0`.
+"
+function! s:GetParentHeaderLineNumber(...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:level = s:GetHeaderLevel(l:line)
+    if l:level > 1
+        let l:linenum = s:GetPreviousHeaderLineNumberAtLevel(l:level - 1, l:line)
+        return l:linenum
+    endif
+    return 0
+endfunction
+
+" Return the line number of the previous header of given level.
+" in relation to line `a:1`. If not given, `a:1 = getline()`
+"
+" `a:1` line is included, and this may return the current header.
+"
+" If none return 0.
+"
+function! s:GetNextHeaderLineNumberAtLevel(level, ...)
+    if a:0 < 1
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:l = l:line
+    while(l:l <= line('$'))
+        if join(getline(l:l, l:l + 1), "\n") =~ get(s:levelRegexpDict, a:level)
+            return l:l
+        endif
+        let l:l += 1
+    endwhile
+    return 0
+endfunction
+
+" Return the line number of the previous header of given level.
+" in relation to line `a:1`. If not given, `a:1 = getline()`
+"
+" `a:1` line is included, and this may return the current header.
+"
+" If none return 0.
+"
+function! s:GetPreviousHeaderLineNumberAtLevel(level, ...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:l = l:line
+    while(l:l > 0)
+        if join(getline(l:l, l:l + 1), "\n") =~ get(s:levelRegexpDict, a:level)
+            return l:l
+        endif
+        let l:l -= 1
+    endwhile
+    return 0
+endfunction
+
+" Move cursor to next sibling header.
+"
+" If there is no next siblings, print a warning and don't move.
+"
+function! s:MoveToNextSiblingHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:curHeaderLevel = s:GetLevelOfHeaderAtLine(l:curHeaderLineNumber)
+    let l:curHeaderParentLineNumber = s:GetParentHeaderLineNumber()
+    let l:nextHeaderSameLevelLineNumber = s:GetNextHeaderLineNumberAtLevel(l:curHeaderLevel, l:curHeaderLineNumber + 1)
+    let l:noNextSibling = 0
+    if l:nextHeaderSameLevelLineNumber == 0
+        let l:noNextSibling = 1
+    else
+        let l:nextHeaderSameLevelParentLineNumber = s:GetParentHeaderLineNumber(l:nextHeaderSameLevelLineNumber)
+        if l:curHeaderParentLineNumber == l:nextHeaderSameLevelParentLineNumber
+            call cursor(l:nextHeaderSameLevelLineNumber, 1)
+        else
+            let l:noNextSibling = 1
+        endif
+    endif
+    if l:noNextSibling
+        echo 'no next sibling header'
+    endif
+endfunction
+
+" Move cursor to previous sibling header.
+"
+" If there is no previous siblings, print a warning and do nothing.
+"
+function! s:MoveToPreviousSiblingHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:curHeaderLevel = s:GetLevelOfHeaderAtLine(l:curHeaderLineNumber)
+    let l:curHeaderParentLineNumber = s:GetParentHeaderLineNumber()
+    let l:previousHeaderSameLevelLineNumber = s:GetPreviousHeaderLineNumberAtLevel(l:curHeaderLevel, l:curHeaderLineNumber - 1)
+    let l:noPreviousSibling = 0
+    if l:previousHeaderSameLevelLineNumber == 0
+        let l:noPreviousSibling = 1
+    else
+        let l:previousHeaderSameLevelParentLineNumber = s:GetParentHeaderLineNumber(l:previousHeaderSameLevelLineNumber)
+        if l:curHeaderParentLineNumber == l:previousHeaderSameLevelParentLineNumber
+            call cursor(l:previousHeaderSameLevelLineNumber, 1)
+        else
+            let l:noPreviousSibling = 1
+        endif
+    endif
+    if l:noPreviousSibling
+        echo 'no previous sibling header'
+    endif
+endfunction
+
+function! s:Toc(...)
+    if a:0 > 0
+        let l:window_type = a:1
+    else
+        let l:window_type = 'vertical'
+    endif
+
+
+    let l:bufnr = bufnr('%')
+    let l:cursor_line = line('.')
+    let l:cursor_header = 0
+    let l:fenced_block = 0
+    let l:front_matter = 0
+    let l:header_list = []
+    let l:header_max_len = 0
+    let l:vim_markdown_toc_autofit = get(g:, "vim_markdown_toc_autofit", 0)
+    let l:vim_markdown_frontmatter = get(g:, "vim_markdown_frontmatter", 0)
+    for i in range(1, line('$'))
+        let l:lineraw = getline(i)
+        let l:l1 = getline(i+1)
+        let l:line = substitute(l:lineraw, "#", "\\\#", "g")
+        if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
+            if l:fenced_block == 0
+                let l:fenced_block = 1
+            elseif l:fenced_block == 1
+                let l:fenced_block = 0
+            endif
+        elseif l:vim_markdown_frontmatter == 1
+            if l:front_matter == 1
+                if l:line == '---'
+                    let l:front_matter = 0
+                endif
+            elseif i == 1
+                if l:line == '---'
+                    let l:front_matter = 1
+                endif
+            endif
+        endif
+        if l:line =~ '^#\+' || (l:l1 =~ '^=\+\s*$' || l:l1 =~ '^-\+\s*$') && l:line =~ '^\S'
+            let l:is_header = 1
+        else
+            let l:is_header = 0
+        endif
+        if l:is_header == 1 && l:fenced_block == 0 && l:front_matter == 0
+            " append line to location list
+            let l:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': l:bufnr, 'col': 1}
+            let l:header_list = l:header_list + [l:item]
+            " set header number of the cursor position
+            if l:cursor_header == 0
+                if i == l:cursor_line
+                    let l:cursor_header = len(l:header_list)
+                elseif i > l:cursor_line
+                    let l:cursor_header = len(l:header_list) - 1
+                endif
+            endif
+            " keep track of the longest header size (heading level + title)
+            let l:total_len = stridx(l:line, ' ') + strdisplaywidth(l:line)
+            if l:total_len > l:header_max_len
+                let l:header_max_len = l:total_len
+            endif
+        endif
+    endfor
+    call setloclist(0, l:header_list)
+    if len(l:header_list) == 0
+        echom "Toc: No headers."
+        return
+    endif
+
+    if l:window_type ==# 'horizontal'
+        lopen
+    elseif l:window_type ==# 'vertical'
+        vertical lopen
+        " auto-fit toc window when possible to shrink it
+        if (&columns/2) > l:header_max_len && l:vim_markdown_toc_autofit == 1
+            execute 'vertical resize ' . (l:header_max_len + 1)
+        else
+            execute 'vertical resize ' . (&columns/2)
+        endif
+    elseif l:window_type ==# 'tab'
+        tab lopen
+    else
+        lopen
+    endif
+    setlocal modifiable
+    for i in range(1, line('$'))
+        " this is the location-list data for the current item
+        let d = getloclist(0)[i-1]
+        " atx headers
+        if match(d.text, "^#") > -1
+            let l:level = len(matchstr(d.text, '#*', 'g'))-1
+            let d.text = substitute(d.text, '\v^#*[ ]*', '', '')
+            let d.text = substitute(d.text, '\v[ ]*#*$', '', '')
+        " setex headers
+        else
+            let l:next_line = getbufline(d.bufnr, d.lnum+1)
+            if match(l:next_line, "=") > -1
+                let l:level = 0
+            elseif match(l:next_line, "-") > -1
+                let l:level = 1
+            endif
+        endif
+        call setline(i, repeat('  ', l:level). d.text)
+    endfor
+    setlocal nomodified
+    setlocal nomodifiable
+    execute 'normal! ' . l:cursor_header . 'G'
+endfunction
+
+" Convert Setex headers in range `line1 .. line2` to Atx.
+"
+" Return the number of conversions.
+"
+function! s:SetexToAtx(line1, line2)
+    let l:originalNumLines = line('$')
+    execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n\=+$/# \1/'
+    execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n-+$/## \1/'
+    return l:originalNumLines - line('$')
+endfunction
+
+" If `a:1` is 0, decrease the level of all headers in range `line1 .. line2`.
+"
+" Otherwise, increase the level. `a:1` defaults to `0`.
+"
+function! s:HeaderDecrease(line1, line2, ...)
+    if a:0 > 0
+        let l:increase = a:1
+    else
+        let l:increase = 0
+    endif
+    if l:increase
+        let l:forbiddenLevel = 6
+        let l:replaceLevels = [5, 1]
+        let l:levelDelta = 1
+    else
+        let l:forbiddenLevel = 1
+        let l:replaceLevels = [2, 6]
+        let l:levelDelta = -1
+    endif
+    for l:line in range(a:line1, a:line2)
+        if join(getline(l:line, l:line + 1), "\n") =~ s:levelRegexpDict[l:forbiddenLevel]
+            echomsg 'There is an h' . l:forbiddenLevel . ' at line ' . l:line . '. Aborting.'
+            return
+        endif
+    endfor
+    let l:numSubstitutions = s:SetexToAtx(a:line1, a:line2)
+    let l:flags = (&gdefault ? '' : 'g')
+    for l:level in range(replaceLevels[0], replaceLevels[1], -l:levelDelta)
+        execute 'silent! ' . a:line1 . ',' . (a:line2 - l:numSubstitutions) . 'substitute/' . s:levelRegexpDict[l:level] . '/' . repeat('#', l:level + l:levelDelta) . '/' . l:flags
+    endfor
+endfunction
+
+" Format table under cursor.
+"
+" Depends on Tabularize.
+"
+function! s:TableFormat()
+    let l:pos = getpos('.')
+    normal! {
+    " Search instead of `normal! j` because of the table at beginning of file edge case.
+    call search('|')
+    normal! j
+    " Remove everything that is not a pipe, colon or hyphen next to a colon othewise
+    " well formated tables would grow because of addition of 2 spaces on the separator
+    " line by Tabularize /|.
+    let l:flags = (&gdefault ? '' : 'g')
+    execute 's/\(:\@<!-:\@!\|[^|:-]\)//e' . l:flags
+    execute 's/--/-/e' . l:flags
+    Tabularize /|
+    " Move colons for alignment to left or right side of the cell.
+    execute 's/:\( \+\)|/\1:|/e' . l:flags
+    execute 's/|\( \+\):/|:\1/e' . l:flags
+    execute 's/ /-/' . l:flags
+    call setpos('.', l:pos)
+endfunction
+
+" Wrapper to do move commands in visual mode.
+"
+function! s:VisMove(f)
+    norm! gv
+    call function(a:f)()
+endfunction
+
+" Map in both normal and visual modes.
+"
+function! s:MapNormVis(rhs,lhs)
+    execute 'nn <buffer><silent> ' . a:rhs . ' :call ' . a:lhs . '()<cr>'
+    execute 'vn <buffer><silent> ' . a:rhs . ' <esc>:call <sid>VisMove(''' . a:lhs . ''')<cr>'
+endfunction
+
+" Parameters:
+"
+" - step +1 for right, -1 for left
+"
+" TODO: multiple lines.
+"
+function! s:FindCornerOfSyntax(lnum, col, step)
+    let l:col = a:col
+    let l:syn = synIDattr(synID(a:lnum, l:col, 1), 'name')
+    while synIDattr(synID(a:lnum, l:col, 1), 'name') ==# l:syn
+        let l:col += a:step
+    endwhile
+    return l:col - a:step
+endfunction
+
+" Return the next position of the given syntax name,
+" inclusive on the given position.
+"
+" TODO: multiple lines
+"
+function! s:FindNextSyntax(lnum, col, name)
+    let l:col = a:col
+    let l:step = 1
+    while synIDattr(synID(a:lnum, l:col, 1), 'name') !=# a:name
+        let l:col += l:step
+    endwhile
+    return [a:lnum, l:col]
+endfunction
+
+function! s:FindCornersOfSyntax(lnum, col)
+    return [<sid>FindLeftOfSyntax(a:lnum, a:col), <sid>FindRightOfSyntax(a:lnum, a:col)]
+endfunction
+
+function! s:FindRightOfSyntax(lnum, col)
+    return <sid>FindCornerOfSyntax(a:lnum, a:col, 1)
+endfunction
+
+function! s:FindLeftOfSyntax(lnum, col)
+    return <sid>FindCornerOfSyntax(a:lnum, a:col, -1)
+endfunction
+
+" Returns:
+"
+" - a string with the the URL for the link under the cursor
+" - an empty string if the cursor is not on a link
+"
+" TODO
+"
+" - multiline support
+" - give an error if the separator does is not on a link
+"
+function! s:Markdown_GetUrlForPosition(lnum, col)
+    let l:lnum = a:lnum
+    let l:col = a:col
+    let l:syn = synIDattr(synID(l:lnum, l:col, 1), 'name')
+
+    if l:syn ==# 'mkdInlineURL' || l:syn ==# 'mkdURL' || l:syn ==# 'mkdLinkDefTarget'
+        " Do nothing.
+    elseif l:syn ==# 'mkdLink'
+        let [l:lnum, l:col] = <sid>FindNextSyntax(l:lnum, l:col, 'mkdURL')
+        let l:syn = 'mkdURL'
+    elseif l:syn ==# 'mkdDelimiter'
+        let l:line = getline(l:lnum)
+        let l:char = l:line[col - 1]
+        if l:char ==# '<'
+            let l:col += 1
+        elseif l:char ==# '>' || l:char ==# ')'
+            let l:col -= 1
+        elseif l:char ==# '[' || l:char ==# ']' || l:char ==# '('
+            let [l:lnum, l:col] = <sid>FindNextSyntax(l:lnum, l:col, 'mkdURL')
+        else
+            return ''
+        endif
+    else
+        return ''
+    endif
+
+    let [l:left, l:right] = <sid>FindCornersOfSyntax(l:lnum, l:col)
+    return getline(l:lnum)[l:left - 1 : l:right - 1]
+endfunction
+
+" Front end for GetUrlForPosition.
+"
+function! s:OpenUrlUnderCursor()
+    let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
+    if l:url != ''
+        call s:VersionAwareNetrwBrowseX(l:url)
+    else
+        echomsg 'The cursor is not on a link.'
+    endif
+endfunction
+
+" We need a definition guard because we invoke 'edit' which will reload this
+" script while this function is running. We must not replace it.
+if !exists('*s:EditUrlUnderCursor')
+    function s:EditUrlUnderCursor()
+        let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
+        if l:url != ''
+            if get(g:, 'vim_markdown_autowrite', 0)
+                write
+            endif
+            let l:anchor = ''
+            if get(g:, 'vim_markdown_follow_anchor', 0)
+                let l:parts = split(l:url, '#', 1)
+                if len(l:parts) == 2
+                    let [l:url, l:anchor] = parts
+                    let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '')
+                    if l:anchorexpr != ''
+                        let l:anchor = eval(substitute(
+                            \ l:anchorexpr, 'v:anchor',
+                            \ escape('"'.l:anchor.'"', '"'), ''))
+                    endif
+                endif
+            endif
+            if l:url != ''
+                let l:ext = ''
+                if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
+                    " use another file extension if preferred
+                    if exists('g:vim_markdown_auto_extension_ext')
+                        let l:ext = '.'.g:vim_markdown_auto_extension_ext
+                    else
+                        let l:ext = '.md'
+                    endif
+                endif
+                let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.'))
+                let l:editmethod = ''
+                " determine how to open the linked file (split, tab, etc)
+                if exists('g:vim_markdown_edit_url_in')
+                  if g:vim_markdown_edit_url_in == 'tab'
+                    let l:editmethod = 'tabnew'
+                  elseif g:vim_markdown_edit_url_in == 'vsplit'
+                    let l:editmethod = 'vsp'
+                  elseif g:vim_markdown_edit_url_in == 'hsplit'
+                    let l:editmethod = 'sp'
+                  else
+                    let l:editmethod = 'edit'
+                  endif
+                else
+                  " default to current buffer
+                  let l:editmethod = 'edit'
+                endif
+                execute l:editmethod l:url
+            endif
+            if l:anchor != ''
+                silent! execute '/'.l:anchor
+            endif
+        else
+            echomsg 'The cursor is not on a link.'
+        endif
+    endfunction
+endif
+
+function! s:VersionAwareNetrwBrowseX(url)
+    if has('patch-7.4.567')
+        call netrw#BrowseX(a:url, 0)
+    else
+        call netrw#NetrwBrowseX(a:url, 0)
+    endif
+endf
+
+function! s:MapNotHasmapto(lhs, rhs)
+    if !hasmapto('<Plug>' . a:rhs)
+        execute 'nmap <buffer>' . a:lhs . ' <Plug>' . a:rhs
+        execute 'vmap <buffer>' . a:lhs . ' <Plug>' . a:rhs
+    endif
+endfunction
+
+call <sid>MapNormVis('<Plug>Markdown_MoveToNextHeader', '<sid>MoveToNextHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToPreviousHeader', '<sid>MoveToPreviousHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToNextSiblingHeader', '<sid>MoveToNextSiblingHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToPreviousSiblingHeader', '<sid>MoveToPreviousSiblingHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToParentHeader', '<sid>MoveToParentHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToCurHeader', '<sid>MoveToCurHeader')
+nnoremap <Plug>Markdown_OpenUrlUnderCursor :call <sid>OpenUrlUnderCursor()<cr>
+nnoremap <Plug>Markdown_EditUrlUnderCursor :call <sid>EditUrlUnderCursor()<cr>
+
+if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
+    call <sid>MapNotHasmapto(']]', 'Markdown_MoveToNextHeader')
+    call <sid>MapNotHasmapto('[[', 'Markdown_MoveToPreviousHeader')
+    call <sid>MapNotHasmapto('][', 'Markdown_MoveToNextSiblingHeader')
+    call <sid>MapNotHasmapto('[]', 'Markdown_MoveToPreviousSiblingHeader')
+    call <sid>MapNotHasmapto(']u', 'Markdown_MoveToParentHeader')
+    call <sid>MapNotHasmapto(']c', 'Markdown_MoveToCurHeader')
+    call <sid>MapNotHasmapto('gx', 'Markdown_OpenUrlUnderCursor')
+    call <sid>MapNotHasmapto('ge', 'Markdown_EditUrlUnderCursor')
+endif
+
+command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
+command! -buffer -range=% HeaderIncrease call s:HeaderDecrease(<line1>, <line2>, 1)
+command! -buffer -range=% SetexToAtx call s:SetexToAtx(<line1>, <line2>)
+command! -buffer TableFormat call s:TableFormat()
+command! -buffer Toc call s:Toc()
+command! -buffer Toch call s:Toc('horizontal')
+command! -buffer Tocv call s:Toc('vertical')
+command! -buffer Toct call s:Toc('tab')
+
+" Heavily based on vim-notes - http://peterodding.com/code/vim/notes/
+if exists('g:vim_markdown_fenced_languages')
+    let s:filetype_dict = {}
+    for s:filetype in g:vim_markdown_fenced_languages
+        let key = matchstr(s:filetype, "[^=]*")
+        let val = matchstr(s:filetype, "[^=]*$")
+        let s:filetype_dict[key] = val
+    endfor
+else
+    let s:filetype_dict = {
+        \ 'c++': 'cpp',
+        \ 'viml': 'vim',
+        \ 'bash': 'sh',
+        \ 'ini': 'dosini'
+    \ }
+endif
+
+function! s:MarkdownHighlightSources(force)
+    " Syntax highlight source code embedded in notes.
+    " Look for code blocks in the current file
+    let filetypes = {}
+    for line in getline(1, '$')
+        let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*')
+        if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif
+    endfor
+    if !exists('b:mkd_known_filetypes')
+        let b:mkd_known_filetypes = {}
+    endif
+    if !exists('b:mkd_included_filetypes')
+        " set syntax file name included
+        let b:mkd_included_filetypes = {}
+    endif
+    if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes))
+        return
+    endif
+
+    " Now we're ready to actually highlight the code blocks.
+    let startgroup = 'mkdCodeStart'
+    let endgroup = 'mkdCodeEnd'
+    for ft in keys(filetypes)
+        if a:force || !has_key(b:mkd_known_filetypes, ft)
+            if has_key(s:filetype_dict, ft)
+                let filetype = s:filetype_dict[ft]
+            else
+                let filetype = ft
+            endif
+            let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g"))
+            if !has_key(b:mkd_included_filetypes, filetype)
+                let include = s:SyntaxInclude(filetype)
+                let b:mkd_included_filetypes[filetype] = 1
+            else
+                let include = '@' . toupper(filetype)
+            endif
+            let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
+            execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) ? ' concealends' : '')
+            execute printf('syntax cluster mkdNonListItem add=%s', group)
+
+            let b:mkd_known_filetypes[ft] = 1
+        endif
+    endfor
+endfunction
+
+function! s:SyntaxInclude(filetype)
+    " Include the syntax highlighting of another {filetype}.
+    let grouplistname = '@' . toupper(a:filetype)
+    " Unset the name of the current syntax while including the other syntax
+    " because some syntax scripts do nothing when "b:current_syntax" is set
+    if exists('b:current_syntax')
+        let syntax_save = b:current_syntax
+        unlet b:current_syntax
+    endif
+    try
+        execute 'syntax include' grouplistname 'syntax/' . a:filetype . '.vim'
+        execute 'syntax include' grouplistname 'after/syntax/' . a:filetype . '.vim'
+    catch /E484/
+        " Ignore missing scripts
+    endtry
+    " Restore the name of the current syntax
+    if exists('syntax_save')
+        let b:current_syntax = syntax_save
+    elseif exists('b:current_syntax')
+        unlet b:current_syntax
+    endif
+    return grouplistname
+endfunction
+
+
+function! s:MarkdownRefreshSyntax(force)
+    if &filetype == 'markdown' && line('$') > 1
+        call s:MarkdownHighlightSources(a:force)
+    endif
+endfunction
+
+function! s:MarkdownClearSyntaxVariables()
+    if &filetype == 'markdown'
+        unlet! b:mkd_included_filetypes
+    endif
+endfunction
+
+augroup Mkd
+    autocmd! * <buffer>
+    autocmd BufWinEnter <buffer> call s:MarkdownRefreshSyntax(1)
+    autocmd BufUnload <buffer> call s:MarkdownClearSyntaxVariables()
+    autocmd BufWritePost <buffer> call s:MarkdownRefreshSyntax(0)
+    autocmd InsertEnter,InsertLeave <buffer> call s:MarkdownRefreshSyntax(0)
+    autocmd CursorHold,CursorHoldI <buffer> call s:MarkdownRefreshSyntax(0)
+augroup END
diff --git a/pack/language/start/markdown/indent/markdown.vim b/pack/language/start/markdown/indent/markdown.vim
new file mode 100755
index 0000000..2fa4cda
--- /dev/null
+++ b/pack/language/start/markdown/indent/markdown.vim
@@ -0,0 +1,75 @@
+if exists("b:did_indent") | finish | endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetMarkdownIndent()
+setlocal nolisp
+setlocal autoindent
+
+" Automatically continue blockquote on line break
+setlocal formatoptions+=r
+setlocal comments=b:>
+if get(g:, "vim_markdown_auto_insert_bullets", 1)
+    " Do not automatically insert bullets when auto-wrapping with text-width
+    setlocal formatoptions-=c
+    " Accept various markers as bullets
+    setlocal comments+=b:*,b:+,b:-
+endif
+
+" Only define the function once
+if exists("*GetMarkdownIndent") | finish | endif
+
+function! s:IsMkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
+function! s:IsLiStart(line)
+    return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
+      \    a:line =~ '^\s*[*+-] \+'
+endfunction
+
+function! s:IsHeaderLine(line)
+    return a:line =~ '^\s*#'
+endfunction
+
+function! s:IsBlankLine(line)
+    return a:line =~ '^$'
+endfunction
+
+function! s:PrevNonBlank(lnum)
+    let i = a:lnum
+    while i > 1 && s:IsBlankLine(getline(i))
+        let i -= 1
+    endwhile
+    return i
+endfunction
+
+function GetMarkdownIndent()
+    if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
+        return 0
+    endif
+    let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4)
+    " Find a non-blank line above the current line.
+    let lnum = s:PrevNonBlank(v:lnum - 1)
+    " At the start of the file use zero indent.
+    if lnum == 0 | return 0 | endif
+    let ind = indent(lnum)
+    let line = getline(lnum)    " Last line
+    let cline = getline(v:lnum) " Current line
+    if s:IsLiStart(cline)
+        " Current line is the first line of a list item, do not change indent
+        return indent(v:lnum)
+    elseif s:IsHeaderLine(cline) && !s:IsMkdCode(v:lnum)
+        " Current line is the header, do not indent
+        return 0
+    elseif s:IsLiStart(line)
+        if s:IsMkdCode(lnum)
+            return ind
+        else
+            " Last line is the first line of a list item, increase indent
+            return ind + list_ind
+        end
+    else
+        return ind
+    endif
+endfunction
diff --git a/pack/language/start/markdown/registry/markdown.yaml b/pack/language/start/markdown/registry/markdown.yaml
new file mode 100644
index 0000000..4d293ee
--- /dev/null
+++ b/pack/language/start/markdown/registry/markdown.yaml
@@ -0,0 +1,9 @@
+addon: markdown
+description: "Markdown syntax highlighting"
+files:
+  - ftdetect/markdown.vim
+  - ftplugin/markdown.vim
+  - syntax/markdown.vim
+  - after/ftplugin/markdown.vim
+  - indent/markdown.vim
+  - doc/vim-markdown.txt
diff --git a/pack/language/start/markdown/syntax/markdown.vim b/pack/language/start/markdown/syntax/markdown.vim
new file mode 100644
index 0000000..5056af4
--- /dev/null
+++ b/pack/language/start/markdown/syntax/markdown.vim
@@ -0,0 +1,174 @@
+" Vim syntax file
+" Language:	Markdown
+" Maintainer:	Ben Williams <benw@plasticboy.com>
+" URL:		http://plasticboy.com/markdown-vim-mode/
+" Remark:	Uses HTML syntax file
+" TODO: 	Handle stuff contained within stuff (e.g. headings within blockquotes)
+
+
+" Read the HTML syntax to start with
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+
+  if exists('b:current_syntax')
+    unlet b:current_syntax
+  endif
+endif
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" don't use standard HiLink, it will not work with included syntax files
+if version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syn spell toplevel
+syn case ignore
+syn sync linebreaks=1
+
+let s:conceal = ''
+let s:concealends = ''
+if has('conceal') && get(g:, 'vim_markdown_conceal', 1)
+  let s:conceal = ' conceal'
+  let s:concealends = ' concealends'
+endif
+
+" additions to HTML groups
+if get(g:, 'vim_markdown_emphasis_multiline', 1)
+    let s:oneline = ''
+else
+    let s:oneline = ' oneline'
+endif
+syn region mkdItalic matchgroup=mkdItalic start="\%(\*\|_\)"    end="\%(\*\|_\)"
+syn region mkdBold matchgroup=mkdBold start="\%(\*\*\|__\)"    end="\%(\*\*\|__\)"
+syn region mkdBoldItalic matchgroup=mkdBoldItalic start="\%(\*\*\*\|___\)"    end="\%(\*\*\*\|___\)"
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends
+
+" [link](URL) | [link][id] | [link][] | ![image](URL)
+syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
+execute 'syn region mkdID matchgroup=mkdDelimiter    start="\["    end="\]" contained oneline' . s:conceal
+execute 'syn region mkdURL matchgroup=mkdDelimiter   start="("     end=")"  contained oneline' . s:conceal
+execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[\ze[^]\n]*\n\?[^]\n]*\][[(]" end="\]" contains=@mkdNonListItem,@Spell nextgroup=mkdURL,mkdID skipwhite' . s:concealends
+
+" Autolink without angle brackets.
+" mkd  inline links:      protocol     optional  user:pass@  sub/domain                    .com, .co.uk, etc         optional port   path/querystring/hash fragment
+"                         ------------ _____________________ ----------------------------- _________________________ ----------------- __
+syn match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*/
+
+" Autolink with parenthesis.
+syn region  mkdInlineURL matchgroup=mkdDelimiter start="(\(https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*)\)\@=" end=")"
+
+" Autolink with angle brackets.
+syn region mkdInlineURL matchgroup=mkdDelimiter start="\\\@<!<\ze[a-z][a-z0-9,.-]\{1,22}:\/\/[^> ]*>" end=">"
+
+" Link definitions: [id]: URL (Optional Title)
+syn region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[\^\@!" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
+syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
+
+"HTML headings
+syn region htmlH1       matchgroup=mkdHeading     start="^\s*#"                   end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH2       matchgroup=mkdHeading     start="^\s*##"                  end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH3       matchgroup=mkdHeading     start="^\s*###"                 end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH4       matchgroup=mkdHeading     start="^\s*####"                end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH5       matchgroup=mkdHeading     start="^\s*#####"               end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH6       matchgroup=mkdHeading     start="^\s*######"              end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH1       /^.\+\n=\+$/ contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH2       /^.\+\n-\+$/ contains=mkdLink,mkdInlineURL,@Spell
+
+"define Markdown groups
+syn match  mkdLineBreak    /  \+$/
+syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!`/                     end=/\(\([^\\]\|^\)\\\)\@<!`/'  . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!``/ skip=/[^`]`[^`]/   end=/\(\([^\\]\|^\)\\\)\@<!``/' . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(`\{3,}\)[^`]*$/                       end=/^\s*\z1`*\s*$/'            . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/\(\([^\\]\|^\)\\\)\@<!\~\~/  end=/\(\([^\\]\|^\)\\\)\@<!\~\~/'               . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/      end=/^\s*\z1\~*\s*$/'           . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start="<pre[^>]*\\\@<!>"                            end="</pre>"'                   . s:concealends
+execute 'syn region mkdCode matchgroup=mkdCodeDelimiter start="<code[^>]*\\\@<!>"                           end="</code>"'                  . s:concealends
+syn region mkdFootnote     start="\[^"                     end="\]"
+syn match  mkdCode         /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /\%^\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained
+syn match  mkdListItem     /^\s*\%([-*+]\|\d\+\.\)\ze\s\+/ contained
+syn region mkdListItemLine start="^\s*\%([-*+]\|\d\+\.\)\s\+" end="$" oneline contains=@mkdNonListItem,mkdListItem,@Spell
+syn region mkdNonListItemBlock start="\(\%^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@!\|\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!\)" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell
+syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*\(\*\|\s\)*$/
+syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-\(-\|\s\)*$/
+syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_\(_\|\s\)*$/
+
+" YAML frontmatter
+if get(g:, 'vim_markdown_frontmatter', 0)
+  syn include @yamlTop syntax/yaml.vim
+  syn region Comment matchgroup=mkdDelimiter start="\%^---$" end="^\(---\|\.\.\.\)$" contains=@yamlTop keepend
+  unlet! b:current_syntax
+endif
+
+if get(g:, 'vim_markdown_toml_frontmatter', 0)
+  try
+    syn include @tomlTop syntax/toml.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$" transparent contains=@tomlTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_json_frontmatter', 0)
+  try
+    syn include @jsonTop syntax/json.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$" contains=@jsonTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_math', 0)
+  syn include @tex syntax/tex.vim
+  syn region mkdMath start="\\\@<!\$" end="\$" skip="\\\$" contains=@tex keepend
+  syn region mkdMath start="\\\@<!\$\$" end="\$\$" skip="\\\$" contains=@tex keepend
+endif
+
+syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath
+
+"highlighting for Markdown groups
+HtmlHiLink mkdString        String
+HtmlHiLink mkdCode          String
+HtmlHiLink mkdCodeDelimiter String
+HtmlHiLink mkdCodeStart     String
+HtmlHiLink mkdCodeEnd       String
+HtmlHiLink mkdFootnote      Comment
+HtmlHiLink mkdBlockquote    Comment
+HtmlHiLink mkdListItem      Identifier
+HtmlHiLink mkdRule          Identifier
+HtmlHiLink mkdLineBreak     Visual
+HtmlHiLink mkdFootnotes     htmlLink
+HtmlHiLink mkdLink          htmlLink
+HtmlHiLink mkdURL           htmlString
+HtmlHiLink mkdInlineURL     htmlLink
+HtmlHiLink mkdID            Identifier
+HtmlHiLink mkdLinkDef       mkdID
+HtmlHiLink mkdLinkDefTarget mkdURL
+HtmlHiLink mkdLinkTitle     htmlString
+HtmlHiLink mkdDelimiter     Delimiter
+
+let b:current_syntax = "mkd"
+
+delcommand HtmlHiLink
+" vim: ts=8
diff --git a/pack/language/start/markdown/test/README.md b/pack/language/start/markdown/test/README.md
new file mode 100644
index 0000000..a13d6d2
--- /dev/null
+++ b/pack/language/start/markdown/test/README.md
@@ -0,0 +1,5 @@
+You can run the tests using the Makefile from the top directory:
+
+    make test
+
+To run them manually please refer to the instructions/commands in the Makefile.
diff --git a/pack/language/start/markdown/test/folding-toc.vader b/pack/language/start/markdown/test/folding-toc.vader
new file mode 100644
index 0000000..79c5400
--- /dev/null
+++ b/pack/language/start/markdown/test/folding-toc.vader
@@ -0,0 +1,178 @@
+" Tests atx and setext folding, and :Toc.
+
+Before:
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# chap 1
+
+hello
+world
+
+```bash
+# some bash scripting
+pwd
+
+# this is another comment
+# other
+echo "foo"
+```
+
+## chap 1.1
+
+- dog
+- cat
+
+~~~~bash
+mkdir foo
+# comment in ~
+~~~~
+
+### chap 1.1.1
+
+- dragons
+- fenixs
+
+# chap 2
+
+another
+
+## chap 2.1
+
+- uk
+- japan
+- china
+
+
+# chap 3
+
+nothing here
+
+chap 4
+======
+
+setext are evil
+
+chap 4.1
+--------
+
+evil indeed
+
+````bash
+# get system info
+uname -a
+````
+
+Execute (fold level):
+  AssertEqual foldlevel(1), 0, '# chap 1'
+  AssertEqual foldlevel(3), 1, 'hello'
+  AssertEqual foldlevel(6), 1, '```bash'
+  AssertEqual foldlevel(7), 1, '# some bash scripting'
+  AssertEqual foldlevel(15), 1, '## chap 1.1'
+  AssertEqual foldlevel(21), 2, 'mkdir foo'
+  AssertEqual foldlevel(22), 2, 'comment in ~'
+  AssertEqual foldlevel(25), 2, '### chap 1.1.1'
+  AssertEqual foldlevel(27), 3, '- dragons'
+  AssertEqual foldlevel(30), 1, '# chap 2'
+  AssertEqual foldlevel(32), 1, 'another'
+  AssertEqual foldlevel(34), 1, '# chap 2.1'
+  AssertEqual foldlevel(37), 2, '- japan'
+  AssertEqual foldlevel(41), 1, '# chap 3'
+  AssertEqual foldlevel(45), 1, 'chap 4\n======'
+  AssertEqual foldlevel(48), 1, 'setext are evil'
+  AssertEqual foldlevel(50), 2, 'chap 4.1\n------'
+
+Execute (fold text result):
+  AssertEqual foldtextresult(2), '+-- 28 lines: hello'
+  AssertEqual foldtextresult(31), '+-- 10 lines: another'
+  AssertEqual foldtextresult(42), '+--  3 lines: nothing here'
+  AssertEqual foldtextresult(45), '+-- 14 lines: chap 4'
+
+Execute (fold level with setting):
+  let g:vim_markdown_folding_level = 2
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 0, '# chap 1'
+  AssertEqual foldlevel(3), 1, 'hello'
+  AssertEqual foldlevel(6), 1, '```bash'
+  AssertEqual foldlevel(7), 1, '# some bash scripting'
+  AssertEqual foldlevel(15), 0, '## chap 1.1'
+  AssertEqual foldlevel(21), 2, 'mkdir foo'
+  AssertEqual foldlevel(22), 2, 'comment in ~'
+  AssertEqual foldlevel(25), 2, '### chap 1.1.1'
+  AssertEqual foldlevel(27), 3, '- dragons'
+  AssertEqual foldlevel(30), 0, '# chap 2'
+  AssertEqual foldlevel(32), 1, 'another'
+  AssertEqual foldlevel(34), 0, '# chap 2.1'
+  AssertEqual foldlevel(37), 2, '- japan'
+  AssertEqual foldlevel(41), 0, '# chap 3'
+  AssertEqual foldlevel(45), 1, 'chap 4\n======'
+  AssertEqual foldlevel(48), 1, 'setext are evil'
+  AssertEqual foldlevel(50), 1, 'chap 4.1\n------'
+  let g:vim_markdown_folding_level = 0
+
+Execute (check TOC):
+  :Toc
+  :lclose
+  let res = getloclist(0)
+  let elem = res[0]
+  AssertEqual elem.lnum, 1
+  AssertEqual elem.text, '# chap 1'
+  let elem = res[1]
+  AssertEqual elem.lnum, 15
+  AssertEqual elem.text, '## chap 1.1'
+  let elem = res[2]
+  AssertEqual elem.lnum, 25
+  AssertEqual elem.text, '### chap 1.1.1'
+  let elem = res[3]
+  AssertEqual elem.lnum, 30
+  AssertEqual elem.text, '# chap 2'
+  let elem = res[4]
+  AssertEqual elem.lnum, 34
+  AssertEqual elem.text, '## chap 2.1'
+  let elem = res[5]
+  AssertEqual elem.lnum, 41
+  AssertEqual elem.text, '# chap 3'
+  let elem = res[6]
+  AssertEqual elem.lnum, 45
+  AssertEqual elem.text, 'chap 4'
+  let elem = res[7]
+  AssertEqual elem.lnum, 50
+  AssertEqual elem.text, 'chap 4.1'
+
+Given markdown;
+---
+layout: article
+title: A test of the heading folding when there is YAML frontmatter
+tags: markdown yaml vim-markdown
+---
+body
+
+heading
+-------
+
+Execute (fold level of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 0, '---'
+  AssertEqual foldlevel(2), 0, 'layout: article'
+  AssertEqual foldlevel(4), 0, 'tags: markdown yaml vim-markdown'
+  AssertEqual foldlevel(5), 0, '---'
+  AssertEqual foldlevel(6), 0, 'body'
+  AssertEqual foldlevel(8), 2, 'heading'
+  AssertEqual foldlevel(9), 2, '-------'
+  unlet g:vim_markdown_frontmatter
+
+Execute (check Toc of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  :Toc
+  :lclose
+  let res = getloclist(0)
+  AssertEqual len(res), 1
+  let elem = res[0]
+  AssertEqual elem.lnum, 8
+  AssertEqual elem.text, 'heading'
+  unlet g:vim_markdown_frontmatter
diff --git a/pack/language/start/markdown/test/folding.vader b/pack/language/start/markdown/test/folding.vader
new file mode 100644
index 0000000..ecf5f9b
--- /dev/null
+++ b/pack/language/start/markdown/test/folding.vader
@@ -0,0 +1,53 @@
+Before:
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# Title
+
+## Chapter 1
+
+```
+This is code block
+# This is just a comment
+```
+
+## Capter 2
+
+foobar
+
+Execute (fold level # in code block):
+  AssertEqual foldlevel(1), 0, '# Title'
+  AssertEqual foldlevel(3), 1, '## Chapter 1'
+  AssertEqual foldlevel(7), 2, '# This is just a comment'
+  AssertEqual foldlevel(8), 2, '```'
+  AssertEqual foldlevel(10), 1, '## Chapter 2'
+  AssertEqual foldlevel(12), 2, 'foobar'
+
+Given markdown;
+Fold Level 1
+============
+Fold Level 2
+------------
+
+Execute (fold level ==, --):
+  AssertEqual foldlevel(2), 1, '=='
+  AssertEqual foldlevel(4), 2, '--'
+
+Given markdown;
+# H1
+
+## H1.1
+
+## H1.2
+
+# H2
+
+Execute (fold level # in last line):
+  AssertEqual foldlevel(1), 0, '# H1'
+  AssertEqual foldlevel(3), 1, '## H1.1'
+  AssertEqual foldlevel(5), 1, '## H1.2'
+  AssertEqual foldlevel(7), 0, '# H2'
diff --git a/pack/language/start/markdown/test/ge_test.md b/pack/language/start/markdown/test/ge_test.md
new file mode 100644
index 0000000..0f5e100
--- /dev/null
+++ b/pack/language/start/markdown/test/ge_test.md
@@ -0,0 +1 @@
+ge test
diff --git a/pack/language/start/markdown/test/indent-new-list-item.vader b/pack/language/start/markdown/test/indent-new-list-item.vader
new file mode 100644
index 0000000..f73d7cc
--- /dev/null
+++ b/pack/language/start/markdown/test/indent-new-list-item.vader
@@ -0,0 +1,15 @@
+Before:
+  let g:vim_markdown_new_list_item_indent = 2
+
+After:
+  unlet g:vim_markdown_new_list_item_indent
+
+Given markdown;
+* item1
+
+Do (new line from the first item of the list and add the second item):
+  o* item2
+
+Expect (insert 2 spaces to the head of second item):
+  * item1
+    * item2
diff --git a/pack/language/start/markdown/test/indent.md b/pack/language/start/markdown/test/indent.md
new file mode 100644
index 0000000..6d250a1
--- /dev/null
+++ b/pack/language/start/markdown/test/indent.md
@@ -0,0 +1,26 @@
+1. Confirm indent with new line insert after list items
+
+'\' is not list item.
+\ foo
+
+If only space and three '*' or '-' character are in the line,
+this line means horizontal item.
+If current line is below horizontal item, it need not to indent.
+Following example is horizontal item.
+
+---
+***
+- - -
+* * *
+
+And list item must be specified space after [*-+].
+Following example is list item.
+
+* foo
+- bar
++ baz
+
+But following example is not list item.
+*foo
+-bar
++baz
diff --git a/pack/language/start/markdown/test/indent.vader b/pack/language/start/markdown/test/indent.vader
new file mode 100644
index 0000000..e0870d5
--- /dev/null
+++ b/pack/language/start/markdown/test/indent.vader
@@ -0,0 +1,73 @@
+Given markdown;
+* item1
+
+Do (insert enter at list end):
+  A\<cr>item2
+
+Expect (auto insert * and indent level is same):
+  * item1
+  * item2
+
+Given markdown;
+
+Execute:
+  syntax off
+
+Do (insert enter at list end with syntax off):
+  i* item1\<cr>item2
+
+Expect (auto insert * and indent level is same):
+  * item1
+  * item2
+
+Execute:
+  syntax on
+
+Given markdown;
+```
+* item1
+
+Do (insert after list items in code block):
+  jotext
+
+Expect (no autoindent in code block):
+  ```
+  * item1
+  text
+
+Given markdown;
+* item1
+
+a
+
+Do (insert enter after list):
+  jji\<cr>b
+
+Expect (no autoindent outside list):
+  * item1
+
+
+  ba
+
+Given markdown;
+-   a
+
+    # b
+
+Do (insert header after list):
+  jjwi#
+
+Expect (no indent header after list):
+  -   a
+
+  ## b
+
+Given markdown;
+* item1
+
+Do (new line from the first item of the list and add the second item):
+  o* item2
+
+Expect (insert 4 spaces to the head of second item):
+  * item1
+      * item2
diff --git a/pack/language/start/markdown/test/map.vader b/pack/language/start/markdown/test/map.vader
new file mode 100644
index 0000000..7ecdfad
--- /dev/null
+++ b/pack/language/start/markdown/test/map.vader
@@ -0,0 +1,153 @@
+Given markdown;
+a <http://b> c
+
+Execute (gx autolink):
+  let b:url = 'http://b/'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, '<') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, '>') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+a http://b.bb c
+
+Execute (gx implicit autolink):
+  let b:url = 'http://b.bb/'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+[a]: http://b "c"
+
+Execute (gx link reference definition):
+  let b:url = 'http://b/'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  " TODO would be cool if all of the following gave the link.
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+a [b](c) d
+
+Execute (gx autolink):
+  let b:url = 'c'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, '[') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'b') + 1), b:url
+  AssertEqual b:func(1, match(b:line, ']') + 1), b:url
+  AssertEqual b:func(1, match(b:line, '(') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), b:url
+  AssertEqual b:func(1, match(b:line, ')') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'd') + 1), ''
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge opens file):
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+
+Given markdown;
+[ge_test](ge_test)
+
+Execute (ge opens file without .md extensions):
+  let g:vim_markdown_no_extensions_in_markdown = 1
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+  unlet g:vim_markdown_no_extensions_in_markdown
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge does not write before opening file):
+  normal ia
+  normal l
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge auto-write before opening file):
+  let g:vim_markdown_autowrite = 1
+  normal ia
+  normal l
+  AssertThrows normal ge
+  AssertEqual g:vader_exception, 'Vim(write):E382: Cannot write, ''buftype'' option is set'
+  unlet g:vim_markdown_autowrite
+
+Given markdown;
+# a
+
+b
+
+# c
+
+d
+
+Execute (]] same level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+## c
+
+d
+
+Execute (]] different levels level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+## c
+
+d
+
+# e
+
+f
+
+Execute (][ different levels level):
+  AssertEqual line('.'), 1
+  normal ][
+  AssertEqual line('.'), 9
+  normal []
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+Execute (]c):
+  normal! 3G
+  AssertEqual line('.'), 3
+  normal ]c
+  AssertEqual line('.'), 1
diff --git a/pack/language/start/markdown/test/python-folding.vader b/pack/language/start/markdown/test/python-folding.vader
new file mode 100644
index 0000000..91fc9e2
--- /dev/null
+++ b/pack/language/start/markdown/test/python-folding.vader
@@ -0,0 +1,85 @@
+Before:
+  let g:vim_markdown_folding_style_pythonic = 1
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# Title
+
+## Chapter 1
+
+```
+This is code block
+# This is just a comment
+```
+
+## Chapter 2
+
+foobar
+
+Execute (fold level # in code block):
+  AssertEqual foldlevel(1), 0, '# Title'
+  AssertEqual foldlevel(3), 1, '## Chapter 1'
+  AssertEqual foldlevel(7), 1, '# This is just a comment'
+  AssertEqual foldlevel(8), 1, '```'
+  AssertEqual foldlevel(10), 1, '## Chapter 2'
+  AssertEqual foldlevel(12), 1, 'foobar'
+
+Execute (fold text of chapters):
+  let b:width = winwidth(0)
+  let b:hyphen = repeat('-', b:width - 18 > 2 ? b:width - 18 : b:width - 9 > 0 ? 3 : 2)
+  AssertEqual foldtextresult(3), strpart('## Chapter 1', 0, b:width - 9) . ' ' . b:hyphen . ' 6'
+  AssertEqual foldtextresult(10), strpart('## Chapter 2', 0, b:width - 9) . ' ' . b:hyphen . ' 2'
+
+Given markdown;
+Fold text 1
+===========
+Fold text 2
+-----------
+
+Execute (fold level ==, --):
+  AssertEqual foldlevel(2), 0, '=='
+  AssertEqual foldlevel(4), 1, '--'
+
+Execute (fold text of ==, --):
+  let b:width = winwidth(0)
+  let b:hyphen = repeat('-', b:width - 17 > 2 ? b:width - 17 : b:width - 9 > 0 ? 3 : 2)
+  AssertEqual foldtextresult(3), strpart('Fold text 2', 0, b:width - 9) . ' ' . b:hyphen . ' 1'
+
+Given markdown;
+Headline
+
+foobar
+
+# Title
+
+Execute (fold any preamble):
+  AssertEqual foldlevel(1), 1, 'Headline'
+  AssertEqual foldlevel(3), 1, 'foobar'
+  AssertEqual foldlevel(5), 0, '# Title'
+
+Given markdown;
+---
+layout: article
+title: A test of the heading folding when there is YAML frontmatter
+tags: markdown yaml vim-markdown
+---
+body
+
+heading
+-------
+
+Execute (fold level of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 1, '---'
+  AssertEqual foldlevel(2), 1, 'layout: article'
+  AssertEqual foldlevel(4), 1, 'tags: markdown yaml vim-markdown'
+  AssertEqual foldlevel(5), 1, '---'
+  AssertEqual foldlevel(6), 1, 'body'
+  AssertEqual foldlevel(8), 1, 'heading'
+  AssertEqual foldlevel(9), 1, '-------'
+  unlet g:vim_markdown_frontmatter
diff --git a/pack/language/start/markdown/test/run-tests.sh b/pack/language/start/markdown/test/run-tests.sh
new file mode 100755
index 0000000..5c9db06
--- /dev/null
+++ b/pack/language/start/markdown/test/run-tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Exit on error.
+set -e
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+for dep in ../build/tabular ../build/vim-toml ../build/vim-json ../build/vader.vim; do
+  if [[ ! -d $dep ]]; then
+    echo "Missing dependency: $dep"
+    echo "You may just want to use 'make test'."
+    exit 1
+  fi
+done
+
+vim -Nu vimrc -c 'Vader! *' > /dev/null
diff --git a/pack/language/start/markdown/test/syntax-singleline.vader b/pack/language/start/markdown/test/syntax-singleline.vader
new file mode 100644
index 0000000..9fde407
--- /dev/null
+++ b/pack/language/start/markdown/test/syntax-singleline.vader
@@ -0,0 +1,158 @@
+Before:
+  let g:vim_markdown_emphasis_multiline = 0
+  syn off | syn on
+
+After:
+  let g:vim_markdown_emphasis_multiline = 1
+  syn off | syn on
+
+Given markdown;
+a **b** c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a __b__ c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a *b* c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b_ c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+_a_b_
+
+Execute (italic text has underscores):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+
+Given markdown;
+a \*b\* c
+
+Execute (not italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a \_b\_ c
+
+Execute (not italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b\_c_ d
+
+Execute (italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a_b_c
+
+Execute (not italic underscores within text):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a *b\*c* d
+
+Execute (italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a __b\_\_c__ d
+
+Execute (bold with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+_a b
+c_ d
+
+Execute (italic with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+__a b
+c__ d
+
+Execute (bold with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+___a b
+c___ d
+
+Execute (bold italic with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a b
+c* d
+
+Execute (italic with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+**a b
+c** d
+
+Execute (bold with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+***a b
+c*** d
+
+Execute (bold italic with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
diff --git a/pack/language/start/markdown/test/syntax.md b/pack/language/start/markdown/test/syntax.md
new file mode 100644
index 0000000..33f5500
--- /dev/null
+++ b/pack/language/start/markdown/test/syntax.md
@@ -0,0 +1,89 @@
+# Fenced code living in an indented environment is correctly highlighted
+
+1. run this command to do this:
+
+    ```
+some command
+    ```
+
+2. Subsequent list items are correctly highlighted.
+
+Fenced code block with language:
+
+```ruby
+def f
+  0
+end
+```
+
+# Links
+
+[a](b "c")
+
+[a]()
+
+[good spell](a)
+
+[badd spell](a)
+
+[a](b "c")
+
+[a]( b
+"c" )
+
+a (`a`) b. Fix: <https://github.com/plasticboy/vim-markdown/issues/113>
+
+Escaped:
+
+\[a](b)
+
+[a\]b](c)
+
+## Known failures
+
+Escape does not work:
+
+[a\](b)
+
+Should not be links because of whitespace:
+
+[a] (b)
+
+[a](a
+b)
+
+[a](a b)
+
+# Reference links
+
+Single links:
+
+[a][b]
+
+[good spell][a]
+
+[badd spell][a]
+
+[a][]
+
+[a] []
+
+[a][b] c [d][e]
+
+Reference link followed by inline link:
+
+[a] [b](c)
+
+## Known failures
+
+Should be shortcut reference links:
+
+[a]
+
+[a] b [c]
+
+Should be a single link:
+
+[a] [b]
+
+[a] b [c](d)
diff --git a/pack/language/start/markdown/test/syntax.vader b/pack/language/start/markdown/test/syntax.vader
new file mode 100644
index 0000000..fdf9c0b
--- /dev/null
+++ b/pack/language/start/markdown/test/syntax.vader
@@ -0,0 +1,1258 @@
+Before:
+  unlet! b:mkd_known_filetypes
+  unlet! b:mkd_included_filetypes
+  unlet! g:vim_markdown_math
+
+Given markdown;
+a **b** c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a __b__ c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a *b* c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b_ c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+_a_b_
+
+Execute (italic text has underscores):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+
+Given markdown;
+a \*b\* c
+
+Execute (not italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a \_b\_ c
+
+Execute (not italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b\_c_ d
+
+Execute (italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a_b_c
+
+Execute (not italic underscores within text):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a *b\*c* d
+
+Execute (italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a __b\_\_c__ d
+
+Execute (bold with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+_a b
+c_ d
+
+Execute (italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+__a b
+c__ d
+
+Execute (bold with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+___a b
+c___ d
+
+Execute (bold italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a b
+c* d
+
+Execute (italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+**a b
+c** d
+
+Execute (bold with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+***a b
+c*** d
+
+Execute (bold italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a
+
+Execute (not italic with an asterisk):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+
+Given markdown;
+[__](a) b
+
+Execute (not bold with double underscores):
+  AssertNotEqual SyntaxOf('_'), 'htmlBold'
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+
+Given markdown;
+_a_
+
+Execute (conceal italic):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+*a*
+
+Execute (conceal italic):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+__a__
+
+Execute (conceal bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+**a**
+
+Execute (conceal bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+___a___
+
+Execute (conceal italic bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+    AssertEqual synconcealed(1, 7)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+***a***
+
+Execute (conceal italic bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+    AssertEqual synconcealed(1, 7)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+# Links
+
+Given markdown;
+[a](b)
+
+Execute (link with title):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a
+b](c)
+
+Execute (link text with newline):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdLink'
+  AssertEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+[a] b [c](d)
+
+Execute (link text with bracket sections):
+  AssertNotEqual SyntaxOf('a'), 'mkdLink'
+  AssertNotEqual SyntaxOf('b'), 'mkdLink'
+  AssertEqual SyntaxOf('c'), 'mkdLink'
+  AssertEqual SyntaxOf('d'), 'mkdURL'
+
+Given markdown;
+[^a]: b
+
+Execute (footnote is not link):
+  AssertNotEqual SyntaxOf('a'), 'mkdLinkDef'
+
+Given markdown;
+(a)
+
+(b)
+
+Execute (parenthesis not in link):
+  AssertNotEqual SyntaxOf('a'), 'mkdURL'
+  AssertNotEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a](b) c [d](e)
+
+Execute (multiple links on a line):
+  AssertNotEqual SyntaxOf('c'), 'mkdLink'
+  AssertNotEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+[a] (b)
+
+Execute (space is not allowed between link text and parenthesis):
+  AssertNotEqual SyntaxOf('a'), 'mkdLink'
+  AssertNotEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a](b)
+
+Execute (conceal link):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+# Autolinks
+
+Given markdown;
+a <http://b> c
+
+Execute (autolink):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('<'), 'mkdDelimiter'
+  AssertEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('>'), 'mkdDelimiter'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+
+Given markdown;
+http://12monkeys.foo
+
+Execute (autolink with domain starting with a number):
+  AssertEqual SyntaxOf('12monkeys'), 'mkdInlineURL'
+
+Given markdown;
+<HtTp://a>
+
+Execute (autolink with scheme case is insensitive):
+  AssertEqual SyntaxOf('a'), 'mkdInlineURL'
+
+Given markdown;
+<a>
+
+Execute (autolink without scheme is not a link):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+
+Given markdown;
+< http://a >
+<http://b c>
+<http://d
+e>
+
+Execute (autolink with space is not a link):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('d'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('e'), 'mkdInlineURL'
+
+Given markdown;
+\<http://a>
+
+Execute (autolinks can be backslash escaped):
+  AssertNotEqual SyntaxOf('<'), 'mkdDelimiter'
+
+Given markdown;
+a (http://b.bb) c
+
+Execute (autolink in parenthesis):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('('), 'mkdDelimiter'
+  AssertEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf(')'), 'mkdDelimiter'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+
+Given markdown;
+[![a](http://b)](http://c)
+
+Execute (autolink in link text):
+  AssertEqual SyntaxOf('!'), 'mkdDelimiter'
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdURL'
+  AssertEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+# [h1link](url)
+
+## [h2link](url)
+
+### [h3link](url)
+
+#### [h4link](url)
+
+##### [h5link](url)
+
+###### [h6link](url)
+
+[h1link_b](url)
+===============
+
+[h2link_b](url)
+---------------
+
+Execute (link in headers):
+  AssertEqual SyntaxOf('h1link'), 'mkdLink'
+  AssertEqual SyntaxOf('h2link'), 'mkdLink'
+  AssertEqual SyntaxOf('h3link'), 'mkdLink'
+  AssertEqual SyntaxOf('h4link'), 'mkdLink'
+  AssertEqual SyntaxOf('h5link'), 'mkdLink'
+  AssertEqual SyntaxOf('h6link'), 'mkdLink'
+  AssertEqual SyntaxOf('h1link_b'), 'mkdLink'
+  AssertEqual SyntaxOf('h2link_b'), 'mkdLink'
+
+Given markdown;
+# http://h1link.foo
+
+## http://h2link.foo
+
+### http://h3link.foo
+
+#### http://h4link.foo
+
+##### http://h5link.foo
+
+###### http://h6link.foo
+
+http://h1link_b.foo
+===================
+
+http://h2link_b.foo
+-------------------
+
+Execute (inline url in headers):
+  AssertEqual SyntaxOf('h1link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h2link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h3link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h4link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h5link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h6link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h1link_b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h2link_b'), 'mkdInlineURL'
+
+Given markdown;
+> [a](b)
+> http://foo.bar
+
+Execute (link in blockquote):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('foo'), 'mkdInlineURL'
+
+Given markdown;
+[https://domain.tld](https://domain.com) not_a_link
+
+Execute (link with url title):
+  AssertEqual SyntaxOf('https://domain.tld/'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('https://domain.com/'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('not_a_link'), 'mkdInlineURL'
+
+# Code Blocks
+
+Given markdown;
+~~~
+code
+~~~
+
+Execute (code blocks can be fenced with tildes):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+~~~~
+code
+~~~~~
+
+Execute (code blocks can be fenced with tildes longer than 3):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+````
+code
+`````
+
+Execute (code blocks can be fenced with backticks longer than 3):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+~~~ruby
+code
+~~~
+
+Execute (code blocks can have a language specifier):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+```c++
+code
+```
+
+text
+
+Execute (code blocks can be fenced with backticks and a language specifier):
+  AssertEqual SyntaxOf('code'), 'mkdCode'
+  AssertNotEqual SyntaxOf('text'), 'mkdCode'
+
+# Indent Code Blocks
+
+Given markdown;
+a
+
+    b
+    c
+
+Execute (indent code blocks):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+# a
+
+b
+
+    c
+
+Execute (indent code blocks after header):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertNotEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+-   a
+
+    b
+
+        c
+
+Execute (indent code blocks after list):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertNotEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+    a
+    b
+
+Execute (indent code block at beginning of file):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+  AssertEqual SyntaxOf('b'), 'mkdCode'
+
+Given markdown;
+```c++
+#include <iostream>
+code
+```
+
+```ruby
+def a
+end
+```
+
+Execute (fenced code block syntax with a language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('include'), 'cInclude'
+  AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
+  AssertEqual SyntaxOf('def'), 'rubyDefine'
+
+Given markdown;
+``` c++
+#include <iostream>
+code
+```
+
+```  vim
+let g:a = 1
+```
+
+```	ruby
+def a
+end
+```
+
+```
+ruby
+class B
+end
+```
+
+Execute (fenced code block syntax with a language specifier after whitespace):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('include'), 'cInclude'
+  AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+  AssertEqual SyntaxOf('def'), 'rubyDefine'
+  AssertNotEqual SyntaxOf('class'), 'rubyClass'
+
+Given markdown;
+```vim
+let g:a = 1
+```
+
+```viml
+let g:b = 1
+```
+
+Execute (fenced code block syntax with alias language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+  AssertEqual SyntaxOf('g:b'), 'vimVar'
+
+Given markdown;
+```csharp
+var s = "foo";
+```
+
+Execute (fenced code block languages setting):
+  let g:vim_markdown_fenced_languages = ['csharp=cs']
+  source ../ftplugin/markdown.vim
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('foo'), 'csString'
+  unlet g:vim_markdown_fenced_languages
+
+Given markdown;
+```vim
+let g:a = 1
+```
+
+Execute (fenced code block includes language syntax with reopening same buffer):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  split
+  quit
+  edit
+  set filetype=markdown
+  execute "normal! i```vim\<cr>let g:a = 1\<cr>```"
+  call b:func(1)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+
+Given markdown;
+```a+b-
+code
+```
+
+Execute (fenced code block syntax with an unknown language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('code'), 'mkdSnippetA_B_'
+
+Given markdown;
+```
+=
+a
+-
+```
+
+Execute (first = or - in fenced code block is not setex headers):
+  AssertEqual SyntaxOf('='), 'mkdCode'
+  AssertEqual SyntaxOf('-'), 'mkdCode'
+
+Given markdown;
+``` {style=""}
+a
+```
+
+Execute (fenced code block with extended info strings):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+# Code Blocks in pre and code tag
+
+Given markdown;
+<pre>
+a
+</pre>
+
+Execute (code block in pre tag):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+<code>
+a
+</code>
+
+Execute (code block in code tag):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+\<pre\>
+a
+\</pre\>
+
+Execute (not code block in escaped pre tag):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+\<code\>
+a
+\</code\>
+
+Execute (not code block in escaped code tag):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+
+# Math
+
+Given markdown;
+a $x$ b
+c $$y$$ d
+\$e\$
+\$\$f\$\$
+
+Execute (math):
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('d')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('e')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('f')[0:2], 'tex'
+  AssertEqual SyntaxOf('x')[0:2], 'tex'
+  AssertEqual SyntaxOf('y')[0:2], 'tex'
+  let g:vim_markdown_math=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
+
+Given markdown;
+a
+
+$
+b
+$
+
+c
+
+Execute (multiline math):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$ \sqrt{a}{b} $
+$$ \frac{a}{b} $$
+
+Execute (math tex highlighting):
+  let g:vim_markdown_math=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('sqrt'), 'texStatement'
+  AssertNotEqual SyntaxOf('frac'), 'texStatement'
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('sqrt'), 'texStatement'
+  AssertEqual SyntaxOf('frac'), 'texStatement'
+
+Given markdown;
+$a b[$ c
+
+Execute (math ends with $):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$$a b[$$ c
+
+Execute (math ends with $$):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$(0 \le 1)$
+
+Execute (math conceal in $):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$'
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1, '\le'
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    AssertEqual synconcealed(1, 8)[0], 0
+    AssertEqual synconcealed(1, 9)[0], 0
+    AssertEqual synconcealed(1, 10)[0], 0
+    AssertEqual synconcealed(1, 11)[0], 1, '$'
+    setlocal conceallevel=0
+  endif
+
+Given markdown;
+$$
+\omega
+0 \le 1
+$$
+
+Execute (math conceal in $$):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$$'
+    AssertEqual synconcealed(2, 1)[0], 1, '\omega'
+    AssertEqual synconcealed(3, 1)[0], 0, '0'
+    AssertEqual synconcealed(3, 3)[0], 1, '\le'
+    AssertEqual synconcealed(3, 7)[0], 0, '1'
+    AssertEqual synconcealed(4, 1)[0], 1, '$$'
+    setlocal conceallevel=0
+  endif
+
+# YAML frontmatter
+
+Given markdown;
+---
+a: b
+---
+
+Execute (YAML frontmatter is controlled by the option):
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:3], 'yaml'
+  let g:vim_markdown_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+
+Given markdown;
+
+---
+a: b
+---
+
+Execute (YAML frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+
+Given markdown;
+---
+a: b
+---
+
+---
+
+Execute (rules are not mistaken by YAML frontmatter delimiters):
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxAt(5, 1), 'mkdRule'
+  unlet g:vim_markdown_frontmatter
+
+# TOML frontmatter
+
+Given markdown;
++++
+a = "b"
++++
+
+Execute (TOML frontmatter is controlled by the option):
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+  let g:vim_markdown_toml_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('b'), 'tomlString'
+  let g:vim_markdown_toml_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+
+Given markdown;
+
++++
+a = "b"
++++
+
+Execute (TOML frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_toml_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+  unlet g:vim_markdown_toml_frontmatter
+
+# JSON frontmatter
+
+Given markdown;
+{
+  "a": "b"
+}
+
+Execute (JSON frontmatter is controlled by the option):
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+  let g:vim_markdown_json_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a'), 'jsonKeyword'
+  let g:vim_markdown_json_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+
+Given markdown;
+
+{
+  "a": "b"
+}
+
+Execute (JSON frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_json_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+  unlet g:vim_markdown_json_frontmatter
+
+# Header
+
+Given markdown;
+# #a
+ccc
+
+## #b
+ddd
+
+Execute (header title starts with #):
+  AssertEqual SyntaxOf('a'), 'htmlH1'
+  AssertEqual SyntaxOf('b'), 'htmlH2'
+
+Given markdown;
+# h1 space
+
+#h1 nospace
+
+#  h1 2 spaces
+
+# h1 trailing hash #
+
+## h2 space
+
+##h2 nospace
+
+## h2 trailing hash ##
+
+### h3 space
+
+###h3 nospace
+
+### h3 trailing hash ###
+
+#### h4
+
+##### h5
+
+###### h6
+
+Execute (atx headers):
+  AssertEqual SyntaxOf(' h1 space'), 'htmlH1'
+  AssertEqual SyntaxOf('h1 nospace'), 'htmlH1'
+  AssertEqual SyntaxOf('  h1 2 spaces'), 'htmlH1'
+  AssertEqual SyntaxOf(' h1 trailing hash '), 'htmlH1'
+  AssertEqual SyntaxOf(' h2 space'), 'htmlH2'
+  AssertEqual SyntaxOf('h2 nospace'), 'htmlH2'
+  AssertEqual SyntaxOf(' h2 trailing hash '), 'htmlH2'
+  AssertEqual SyntaxOf(' h3 space'), 'htmlH3'
+  AssertEqual SyntaxOf('h3 nospace'), 'htmlH3'
+  AssertEqual SyntaxOf(' h3 trailing hash '), 'htmlH3'
+  AssertEqual SyntaxOf(' h4'), 'htmlH4'
+  AssertEqual SyntaxOf(' h5'), 'htmlH5'
+  AssertEqual SyntaxOf(' h6'), 'htmlH6'
+
+Given markdown;
+# h1 before h2
+
+## h2 between h1s
+
+# h1 after h2
+
+Execute (atx headers relative positions):
+  AssertEqual SyntaxOf(' h1 before h2'), 'htmlH1'
+  AssertEqual SyntaxOf(' h2 between h1s'), 'htmlH2'
+  AssertEqual SyntaxOf(' h1 after h2'), 'htmlH1'
+
+Given markdown;
+setex h1
+========
+
+setex h2
+--------
+
+setex h1 single punctuation
+=
+
+setex h1 punctuation longer than header
+================================
+
+Execute (setex headers):
+  AssertEqual SyntaxOf('setex h1'), 'htmlH1'
+  AssertEqual SyntaxOf('^========$'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h2'), 'htmlH2'
+  AssertEqual SyntaxOf('--------'), 'htmlH2'
+  AssertEqual SyntaxOf('setex h1 single punctuation'), 'htmlH1'
+  AssertEqual SyntaxOf('^=$'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h1 punctuation longer than header'), 'htmlH1'
+  AssertEqual SyntaxOf('^================================$'), 'htmlH1'
+
+Given markdown;
+- not Setex
+- because list
+
+Execute (prevent list vs Setex confusion):
+  AssertNotEqual SyntaxOf('- not Setex'), 'htmlH2'
+  AssertNotEqual SyntaxOf('- becuase list'), 'htmlH2'
+
+Given markdown;
+setex h1 before atx
+===================
+
+## atx h2
+
+### atx h3
+
+# atx h1
+
+setex h2
+------------------
+
+### atx h3 2
+
+Execute (mixed atx and setex headers):
+  AssertEqual SyntaxOf('setex h1 before atx'), 'htmlH1'
+  AssertEqual SyntaxOf('==================='), 'htmlH1'
+  AssertEqual SyntaxOf(' atx h2'), 'htmlH2'
+  AssertEqual SyntaxOf(' atx h3'), 'htmlH3'
+  AssertEqual SyntaxOf(' atx h1'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h2'), 'htmlH2'
+  AssertEqual SyntaxOf('------------------'), 'htmlH2'
+
+# List
+
+Given markdown;
+- a & b
+1. c > d
+
+Execute (& and > are not marked as htmlError in lists):
+  AssertEqual SyntaxOf('-'), 'mkdListItem'
+  AssertEqual SyntaxOf('1.'), 'mkdListItem'
+  AssertNotEqual SyntaxOf('&'), 'htmlError'
+  AssertNotEqual SyntaxOf('>'), 'htmlError'
+
+Given markdown;
+1. a  
+2. b
+
+Execute (list after line break):
+  AssertEqual SyntaxOf('1'), 'mkdListItem'
+  AssertEqual SyntaxOf('2'), 'mkdListItem'
+
+# HTML
+
+Given markdown;
+a
+
+<p>b</p>
+
+- <span>c</span>
+
+Execute (HTML tag in text):
+  AssertEqual SyntaxOf('p'), 'htmlTagName'
+  AssertEqual SyntaxOf('<p>'), 'htmlTag'
+  AssertEqual SyntaxOf('</p>'), 'htmlEndTag'
+  AssertEqual SyntaxOf('span'), 'htmlTagName'
+  AssertEqual SyntaxOf('<span>'), 'htmlTag'
+  AssertEqual SyntaxOf('</span>'), 'htmlEndTag'
diff --git a/pack/language/start/markdown/test/table-format.vader b/pack/language/start/markdown/test/table-format.vader
new file mode 100644
index 0000000..2fc06a3
--- /dev/null
+++ b/pack/language/start/markdown/test/table-format.vader
@@ -0,0 +1,44 @@
+Before:
+  let &gdefault = 1
+
+After:
+  let &gdefault = 0
+
+Given markdown;
+| normal |no space|  2 spaces  ||
+| - |-|  --- ||
+| normal |no space|  2 spaces  ||
+
+Execute (format unformatted table):
+  TableFormat
+
+Expect (table is formatted):
+  | normal | no space | 2 spaces |  |
+  |--------|----------|----------|--|
+  | normal | no space | 2 spaces |  |
+
+Given markdown;
+| a | b |
+|---|---|
+| c | d |
+
+Execute (format well formatted table):
+  TableFormat
+
+Expect (table is not modified):
+  | a | b |
+  |---|---|
+  | c | d |
+
+Given markdown;
+| left |right|  center  ||
+| :- | --: |:---:|:|
+| left |right|  center  ||
+
+Execute (format table with colons):
+  TableFormat
+
+Expect (preserve colons to align text):
+  | left | right | center |   |
+  |:-----|------:|:------:|:--|
+  | left | right | center |   |
diff --git a/pack/language/start/markdown/test/toc-autofit.vader b/pack/language/start/markdown/test/toc-autofit.vader
new file mode 100644
index 0000000..2678997
--- /dev/null
+++ b/pack/language/start/markdown/test/toc-autofit.vader
@@ -0,0 +1,53 @@
+" Tests toc window auto-fit to longest header, but without exceeding half screen.
+
+Given markdown;
+# chap 1
+
+# chap 2
+
+# chap 3
+
+# chap 4
+
+# chap 5
+
+# chap 6
+
+# chap 7
+
+# chap 8
+
+# chap 9
+
+# chap 10
+
+# chap 11
+
+# chap 12
+
+## chap 12.1
+
+### chap 12.1.1
+
+#### chap 12.1.1.1
+
+##### chap 12.1.1.1.1
+
+###### chap 12.1.1.1.1.1
+
+# chap 13
+
+Execute (toc window autofit width):
+  set number
+  let g:vim_markdown_toc_autofit = 1
+  let line = '###### chap 12.1.1.1.1.1'
+  AssertEqual getline('33'), line
+  :Toc
+  let real_width = winwidth(0)
+  :lclose
+  let expected_width = len(line) + 2*5 + 1 + 3 - 7
+  AssertEqual real_width, expected_width
+  set nonumber
+" 2 spaces * 5 additional header levels + 1 space for first header +
+" 3 spaces for line numbers - 7 chars ('###### ') that don't show up on the TOC
+
diff --git a/pack/language/start/markdown/test/toc.vader b/pack/language/start/markdown/test/toc.vader
new file mode 100644
index 0000000..2510edc
--- /dev/null
+++ b/pack/language/start/markdown/test/toc.vader
@@ -0,0 +1,185 @@
+Given markdown;
+# a
+
+Execute (Toc does not set nomodifiable on other files):
+  " Sanity check.
+  Assert &modifiable
+
+  :Toc
+  :lclose
+  :edit a
+
+  Assert &modifiable
+
+Given markdown;
+header 1
+========
+
+test
+
+header 2
+--------
+
+test
+
+### header 3
+
+test
+
+Execute (Toc setex headers):
+  :Toc
+
+Expect (setex headers):
+  header 1
+    header 2
+      header 3
+
+Given markdown;
+# header 1
+
+test
+
+## header 2
+
+test
+
+### header 3
+
+test
+
+Execute (Toc atx headers):
+  :Toc
+
+Expect (atx headers):
+  header 1
+    header 2
+      header 3
+
+Given markdown;
+ATX tests.
+
+# h1 space
+
+#h1 nospace
+
+#  h1 2 spaces
+
+# h1 trailing hash #
+
+## h2 space
+
+##h2 nospace
+
+## h2 trailing hash ##
+
+### h3 space
+
+###h3 nospace
+
+### h3 trailing hash ###
+
+#### h4
+
+##### h5
+
+###### h6
+
+---
+
+Relative positions.
+
+# h1 before h2
+
+## h2 between h1s
+
+# h1 after h2
+
+---
+
+Setex tests.
+
+setex h1
+========
+
+setex h2
+--------
+
+setex h1 single punctuation
+=
+
+setex h1 punctuation longer than header
+================================
+
+Prevent list vs Setex confusion:
+
+- not Setex
+- because list
+
+---
+
+Mixed tests.
+
+setex h1 before atx
+===================
+
+## atx h2
+
+### atx h3
+
+# atx h1
+
+setex h2
+------------------
+
+### atx h3 2
+
+Execute (Toc multiple headers):
+  :Toc
+
+Expect (multiple headers):
+  h1 space
+  h1 nospace
+  h1 2 spaces
+  h1 trailing hash
+    h2 space
+    h2 nospace
+    h2 trailing hash
+      h3 space
+      h3 nospace
+      h3 trailing hash
+        h4
+          h5
+            h6
+  h1 before h2
+    h2 between h1s
+  h1 after h2
+  setex h1
+    setex h2
+  setex h1 single punctuation
+  setex h1 punctuation longer than header
+  setex h1 before atx
+    atx h2
+      atx h3
+  atx h1
+    setex h2
+      atx h3 2
+
+Execute:
+  :lclose
+
+Given markdown;
+# header 1
+
+## header 2
+
+### header 3
+
+Execute (Toc cursor on the current header):
+  normal! 4G
+  :Toc
+  AssertEqual line('.'), 2
+  :lclose
+  normal! G
+  :Toc
+  AssertEqual line('.'), 3
+  :lclose
diff --git a/pack/language/start/markdown/test/vimrc b/pack/language/start/markdown/test/vimrc
new file mode 100644
index 0000000..463cbd8
--- /dev/null
+++ b/pack/language/start/markdown/test/vimrc
@@ -0,0 +1,27 @@
+set nocompatible
+set rtp+=../
+set rtp+=../build/tabular/
+set rtp+=../build/vim-toml/
+set rtp+=../build/vim-json/
+set rtp+=../build/vader.vim/
+let $LANG='en_US'
+filetype on
+filetype plugin on
+filetype indent on
+syntax on
+
+function! Markdown_GetScriptID(fname) abort
+    let a:snlist = ''
+    redir => a:snlist
+    silent! scriptnames
+    redir END
+    let a:mx = '^\s*\(\d\+\):\s*\(.*\)$'
+    for a:line in split(a:snlist, "\n")
+        if stridx(substitute(a:line, '\\', '/', 'g'), a:fname) >= 0
+            return substitute(a:line, a:mx, '\1', '')
+        endif
+    endfor
+endfunction
+function! Markdown_GetFunc(fname, funcname) abort
+    return function('<SNR>' . Markdown_GetScriptID(a:fname) . '_' . a:funcname)
+endfunction
diff --git a/pack/language/start/pencil/.github/workflows/vint.yml b/pack/language/start/pencil/.github/workflows/vint.yml
new file mode 100644
index 0000000..1f38411
--- /dev/null
+++ b/pack/language/start/pencil/.github/workflows/vint.yml
@@ -0,0 +1,16 @@
+name: Vint
+on: [push, pull_request]
+jobs:
+  vint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.7
+      - name: Setup dependencies
+        run: pip install vim-vint
+      - name: Run Vimscript Linter
+        run: vint .
diff --git a/pack/language/start/pencil/.vintrc.yaml b/pack/language/start/pencil/.vintrc.yaml
new file mode 100644
index 0000000..c44b6ab
--- /dev/null
+++ b/pack/language/start/pencil/.vintrc.yaml
@@ -0,0 +1,5 @@
+cmdargs:
+  severity: style_problem
+  color: true
+  env:
+    neovim: false
diff --git a/pack/language/start/pencil/LICENSE b/pack/language/start/pencil/LICENSE
new file mode 100644
index 0000000..44fe50a
--- /dev/null
+++ b/pack/language/start/pencil/LICENSE
@@ -0,0 +1,23 @@
+License:     The MIT License (MIT)
+
+Copyright (c) 2013,2014 Reed Esau
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+<!-- vim: set tw=74 :-->
diff --git a/pack/language/start/pencil/README.markdown b/pack/language/start/pencil/README.markdown
new file mode 100644
index 0000000..774c287
--- /dev/null
+++ b/pack/language/start/pencil/README.markdown
@@ -0,0 +1,723 @@
+# vim-pencil
+
+[![Vint](https://github.com/reedes/vim-pencil/workflows/Vint/badge.svg)](https://github.com/reedes/vim-pencil/actions?workflow=Vint)
+
+> Rethinking Vim as a tool for writers
+
+<br/>
+
+- - -
+![demo](http://i.imgur.com/0KYl5vU.gif)
+- - -
+
+# Features
+
+The _pencil_ plugin aspires to make Vim as powerful a tool for writers as
+it is for coders by focusing narrowly on the handful of tweaks needed to
+smooth the path to writing prose.
+
+* For editing prose-oriented file types such as _text_, _markdown_,
+  _mail_, _rst_, _tex_, _textile_, and _asciidoc_
+* Agnostic on soft line wrap _versus_ hard line breaks, supporting both
+* Auto-detects wrap mode via `modeline` and sampling
+* Adjusts navigation key mappings to suit the wrap mode
+* Creates undo points on common punctuation during Insert mode, including
+  deletion via line `<C-U>` and word `<C-W>`
+* Buffer-scoped configuration (with a few minor exceptions, _pencil_ preserves
+  your global settings)
+* Support for Vim’s Conceal feature to hide markup defined by Syntax plugins
+  (e.g., `_` and `*` markup for styled text in \_*Markdown*\_)
+* Support for display of mode indicator (`␍` and `⤸`, e.g.) in the status line
+* Pure Vimscript with no dependencies
+
+In addition, when using hard line break mode:
+
+* Makes use of Vim’s powerful autoformat while inserting text, except for
+  tables and code blocks where you won’t want it.
+* *NEW* Optional key mapping to suspend autoformat for the Insert.
+
+Need spell-check, distraction-free editing, and other features? Vim is about
+customization. To complete your editing environment, learn to configure Vim and
+draw upon its rich ecosystem of plugins.
+
+# Why use Vim for writing?
+
+With plenty of word processing applications available, including those
+that specifically cater to writers, why use a modal editor like Vim?
+Several reasons have been offered:
+
+* Your hands can rest in a neutral ‘home’ position, only rarely straying
+  to reach for mouse, track pad, or arrow keys
+* Minimal chording, with many mnemonic-friendly commands
+* Sophisticated capabilities for navigating and manipulating text
+* Highly configurable, enabling you to build a workflow that suits your
+  needs, with many great plugins available
+* No proprietary format lock-in
+
+But while such reasons might be sound, they remain scant justification to
+switch away from the familiar word processor. Instead, you need
+a compelling reason—one that can appeal to a writer’s love for language
+and the tools of writing.
+
+You can find that reason in Vim’s mysterious command sequences. Take `cas`
+for instance. You might see it as a mnemonic for _Change Around Sentence_
+to replace an existing sentence. But dig a bit deeper to discover that
+such commands have a grammar of their own, comprised of nouns, verbs, and
+modifiers. Think of them as the composable building blocks of a _domain
+specific language_ for manipulating text, one that can become a powerful
+tool in expressing yourself. For more details on vi-style editing, see...
+
+* [Learn to speak vim – verbs, nouns, and modifiers!][ls] (December 2011)
+* [Your problem with Vim is that you don’t grok vi][gv] (December 2011)
+* [Intro to Vim’s Grammar][ig] (January 2013)
+* [Why Atom Can’t Replace Vim, Learning the lesson of vi][wa] (March 2014)
+* [Language of Vim/Neovim][lovn] (January 2015)
+
+[ls]: http://yanpritzker.com/2011/12/16/learn-to-speak-vim-verbs-nouns-and-modifiers/
+[gv]: http://stackoverflow.com/questions/1218390/what-is-your-most-productive-shortcut-with-vim/1220118#1220118
+[ig]: http://takac.github.io/2013/01/30/vim-grammar/
+[wa]: https://medium.com/p/433852f4b4d1
+[lovn]: http://allsyed.com/language-of-vim-neovim/
+
+# Installation
+
+_pencil_ is best installed using a Vim package manager, such as
+[Vundle][vnd], [Plug][plg], [NeoBundle][nbn], or [Pathogen][pth].
+
+_For those new to Vim: before installing this plugin, consider getting
+comfortable with the basics of Vim by working through one of the many
+tutorials available._
+
+[vnd]: https://github.com/gmarik/Vundle.vim
+[plg]: https://github.com/junegunn/vim-plug
+[nbn]: https://github.com/Shougo/neobundle.vim
+[pth]: https://github.com/tpope/vim-pathogen
+
+#### Vundle
+
+Add to your `.vimrc` and save:
+
+```vim
+Plugin 'reedes/vim-pencil'
+```
+
+…then run the following in Vim:
+
+```vim
+:source %
+:PluginInstall
+```
+
+#### Plug
+
+Add to your `.vimrc` and save:
+
+```vim
+Plug 'reedes/vim-pencil'
+```
+
+…then run the following in Vim:
+
+```vim
+:source %
+:PlugInstall
+```
+
+#### NeoBundle
+
+Add to your `.vimrc` and save:
+
+```vim
+NeoBundle 'reedes/vim-pencil'
+```
+
+…then run the following in Vim:
+
+```vim
+:source %
+:NeoBundleInstall
+```
+
+#### Pathogen
+
+Run the following in a terminal:
+
+```bash
+cd ~/.vim/bundle
+git clone https://github.com/reedes/vim-pencil
+```
+
+# Configuration
+
+## Initializing by command
+
+You can manually enable, disable, and toggle _pencil_ as a command:
+
+* `Pencil` - initialize _pencil_ with auto-detect for the current buffer
+* `NoPencil` (or `PencilOff`) - removes navigation mappings and restores buffer to global settings
+* `TogglePencil` (or `PencilToggle`) - if on, turns off; if off, initializes with auto-detect
+
+Because auto-detect might not work as intended, you can invoke a command
+to set the behavior for the current buffer:
+
+* `SoftPencil` (or `PencilSoft`) - initialize _pencil_ with soft line wrap mode
+* `HardPencil` (or `PencilHard`) - initialize _pencil_ with hard line break mode (and Vim’s autoformat)
+
+## Initializing by file type
+
+Initializing _pencil_ by file type is _optional_, though doing so will
+automatically set up your buffers for editing prose.
+
+Add support for your desired file types to your `.vimrc`:
+
+```vim
+set nocompatible
+filetype plugin on       " may already be in your .vimrc
+
+augroup pencil
+  autocmd!
+  autocmd FileType markdown,mkd call pencil#init()
+  autocmd FileType text         call pencil#init()
+augroup END
+```
+
+You can initialize several prose-oriented plugins together:
+
+```vim
+augroup pencil
+  autocmd!
+  autocmd FileType markdown,mkd call pencil#init()
+                            \ | call lexical#init()
+                            \ | call litecorrect#init()
+                            \ | call textobj#quote#init()
+                            \ | call textobj#sentence#init()
+augroup END
+```
+
+For a list of other prose-oriented plugins, consult the [See
+also](#see-also) section below.
+
+## Hard line breaks or soft line wrap?
+
+Coders will have the most experience with the former, and writers the
+latter. But whatever your background, chances are that you must contend
+with both conventions. This plugin doesn’t force you to choose a side—you
+can configure each buffer independently.
+
+In most cases you can set a default to suit your preference and let
+auto-detection figure out what to do.
+
+```vim
+let g:pencil#wrapModeDefault = 'soft'   " default is 'hard'
+
+augroup pencil
+  autocmd!
+  autocmd FileType markdown,mkd call pencil#init()
+  autocmd FileType text         call pencil#init({'wrap': 'hard'})
+augroup END
+```
+
+In the example above, for buffers of type `markdown` this plugin will
+auto-detect the line wrap approach, with soft line wrap as the default.
+
+For buffers of type `text`, it will initialize with hard line breaks,
+even if auto-detect might suggest soft line wrap.
+
+## Automatic formatting
+
+_The ‘autoformat’ feature affects `HardPencil` (hard line break) mode
+only._
+
+When inserting text while in `HardPencil` mode, Vim’s powerful autoformat
+feature will be _enabled_ by default and can offer many of the same
+benefits as soft line wrap.
+
+To set the default behavior in your `.vimrc`:
+
+```vim
+let g:pencil#autoformat = 1      " 0=disable, 1=enable (def)
+```
+
+You can override this default during initialization, as in:
+
+```vim
+augroup pencil
+  autocmd!
+  autocmd FileType markdown call pencil#init({'wrap': 'hard', 'autoformat': 1})
+  autocmd FileType text     call pencil#init({'wrap': 'hard', 'autoformat': 0})
+  ...
+augroup END
+```
+
+...where buffers of type `markdown` and `text` will use hard line breaks,
+but `text` buffers will have autoformat disabled.
+
+## Suspend automatic formatting for the Insert
+
+There are two useful exceptions where autoformat (when enabled for the
+buffer) will be _temporarily disabled_ for the current Insert:
+
+**First** is _pencil’s_ ‘blacklisting’ feature: if used with popular
+prose-oriented syntax plugins, _pencil_ will suspend autoformat when you
+enter Insert mode from inside a code block or table.
+
+**Second**, where blacklisting falls short, you can optionally map
+a buffer-scoped ‘modifier’ key to suspend autoformat during the next
+Insert:
+
+```vim
+let g:pencil#map#suspend_af = 'K'   " default is no mapping
+```
+
+Using the above mapping, with `Ko` you’ll enter Insert mode with the
+cursor on a new line, but autoformat will suspend for that Insert. Using
+`o` by itself will retain autoformat.
+
+By default no modifier key is mapped.
+
+(See the advanced section below for details on how blacklisting is
+implemented and configured).
+
+## Manual formatting
+
+Note that you need not rely on Vim’s autoformat exclusively and can
+manually reformat paragraphs with standard Vim commands:
+
+* `gqap` - format current paragraph (see `:help gq` for details)
+* `vapJgqap` - merge two paragraphs (current and next) and format
+* `ggVGgq` or `:g/^/norm gqq` - format all paragraphs in buffer
+
+Optionally, you can map these operations to underutilized keys in your
+`.vimrc`:
+
+```vim
+nnoremap <silent> Q gqap
+xnoremap <silent> Q gq
+nnoremap <silent> <leader>Q vapJgqap
+```
+
+Or you may wish to ‘unformat’, (i.e., remove hard line breaks) when using
+soft line wrap.
+
+* `vipJ` - join all lines in current paragraph
+* `:%norm vipJ` - unformat all paragraphs in buffer
+
+## Default textwidth
+
+You can configure the textwidth to be used in `HardPencil` (hard line
+break) mode when no textwidth is set globally, locally, or available via
+modeline. It defaults to `74`, but you can change that value in your
+`.vimrc`:
+
+```vim
+let g:pencil#textwidth = 74
+```
+
+## Sentence spacing
+
+By default, when formatting text (through `gwip`, e.g.) only one space
+will be inserted after a period(`.`), exclamation point(`!`), or question
+mark(`?`). You can change this default:
+
+```vim
+let g:pencil#joinspaces = 0     " 0=one_space (def), 1=two_spaces
+```
+
+## Cursor wrap
+
+By default, `h`/`l` and the left/right cursor keys will move to the
+previous/next line after reaching first/last character in a line with
+a hard break. If you wish to retain the default Vim behavior, set the
+`cursorwrap` value to `0` in your `.vimrc`:
+
+```vim
+let g:pencil#cursorwrap = 1     " 0=disable, 1=enable (def)
+```
+
+## Concealing \_\_markup\_\_
+
+_pencil_ enables Vim’s powerful Conceal feature, although support among
+Syntax and Colorscheme plugins is currently spotty.
+
+You can change _pencil’s_ default settings for conceal in your `.vimrc`:
+
+```vim
+let g:pencil#conceallevel = 3     " 0=disable, 1=one char, 2=hide char, 3=hide all (def)
+let g:pencil#concealcursor = 'c'  " n=normal, v=visual, i=insert, c=command (def)
+```
+
+For more details on Vim’s Conceal feature, see:
+
+```vim
+:help conceallevel
+:help concealcursor
+```
+
+### Concealing styled text in Markdown
+
+Syntax plugins such as [tpope/vim-markdown][tm] support concealing the
+markup characters when displaying \_*italic*\_, \*\*__bold__\*\*, and
+\*\*\*___bold italic___\*\*\* styled text.
+
+To use Vim’s Conceal feature with Markdown, you will need to install:
+
+1. [tpope/vim-markdown][tm] as it’s currently the only Markdown syntax
+   plugin that supports conceal.
+
+2. A monospaced font (such as [Cousine][co]) featuring the _italic_,
+   **bold**, and ***bold italic*** style variant for styled text.
+
+3. A colorscheme (such as [reedes/vim-colors-pencil][cp]) which supports
+   the Markdown-specific highlight groups for styled text.
+
+You should then only see the `_` and `*` markup for the cursor line and in
+visual selections.
+
+**Terminal users:** consult your terminal’s documentation to configure your
+terminal to support **bold** and _italic_ styles.
+
+[co]: http://www.google.com/fonts/specimen/Cousine
+[tm]: http://github.com/tpope/vim-markdown
+
+## Status line indicator
+
+Your status line can reflect the wrap mode for _pencil_ buffers. For
+example, `␍` to represent `HardPencil` (hard line break) mode.  To
+configure your status line and ruler, add to your `.vimrc`:
+
+```vim
+set statusline=%<%f\ %h%m%r%w\ \ %{PencilMode()}\ %=\ col\ %c%V\ \ line\ %l\,%L\ %P
+set rulerformat=%-12.(%l,%c%V%)%{PencilMode()}\ %P
+```
+
+or if using [bling/vim-airline][va]:
+
+```vim
+let g:airline_section_x = '%{PencilMode()}'
+```
+
+The default indicators now include ‘auto’ for when Vim’s autoformat is
+active in hard line break mode. (If autoformat is suspended for the
+Insert, it’ll show the ‘hard’ indicator.)
+
+```vim
+let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',}
+```
+
+If Unicode is detected, the default indicators are:
+
+```vim
+let g:pencil#mode_indicators = {'hard': '␍', 'auto': 'ª', 'soft': '⤸', 'off': '',}
+```
+
+If you don’t like the default indicators, you can specify your own in
+your `.vimrc`.
+
+Note that `PencilMode()` will return blank for buffers in which _pencil_
+has not been initialized.
+
+[va]: http://github.com/bling/vim-airline
+
+## Advanced pencil
+
+### Advanced initialization
+
+You may want to refactor initialization statements into a function in
+your `.vimrc` to set up a buffer for writing:
+
+```vim
+function! Prose()
+  call pencil#init()
+  call lexical#init()
+  call litecorrect#init()
+  call textobj#quote#init()
+  call textobj#sentence#init()
+
+  " manual reformatting shortcuts
+  nnoremap <buffer> <silent> Q gqap
+  xnoremap <buffer> <silent> Q gq
+  nnoremap <buffer> <silent> <leader>Q vapJgqap
+
+  " force top correction on most recent misspelling
+  nnoremap <buffer> <c-s> [s1z=<c-o>
+  inoremap <buffer> <c-s> <c-g>u<Esc>[s1z=`]A<c-g>u
+
+  " replace common punctuation
+  iabbrev <buffer> -- –
+  iabbrev <buffer> --- —
+  iabbrev <buffer> << «
+  iabbrev <buffer> >> »
+
+  " open most folds
+  setlocal foldlevel=6
+
+  " replace typographical quotes (reedes/vim-textobj-quote)
+  map <silent> <buffer> <leader>qc <Plug>ReplaceWithCurly
+  map <silent> <buffer> <leader>qs <Plug>ReplaceWithStraight
+
+  " highlight words (reedes/vim-wordy)
+  noremap <silent> <buffer> <F8> :<C-u>NextWordy<cr>
+  xnoremap <silent> <buffer> <F8> :<C-u>NextWordy<cr>
+  inoremap <silent> <buffer> <F8> <C-o>:NextWordy<cr>
+
+endfunction
+
+" automatically initialize buffer by file type
+autocmd FileType markdown,mkd,text call Prose()
+
+" invoke manually by command for other file types
+command! -nargs=0 Prose call Prose()
+```
+
+For highly-granular control, you can override _pencil_ and other configuration
+settings when initializing buffers by file type:
+
+```vim
+augroup pencil
+  autocmd!
+  autocmd FileType markdown,mkd call pencil#init()
+                            \ | call litecorrect#init()
+                            \ | setl spell spl=en_us fdl=4 noru nonu nornu
+                            \ | setl fdo+=search
+  autocmd Filetype git,gitsendemail,*commit*,*COMMIT*
+                            \   call pencil#init({'wrap': 'hard', 'textwidth': 72})
+                            \ | call litecorrect#init()
+                            \ | setl spell spl=en_us et sw=2 ts=2 noai
+  autocmd Filetype mail         call pencil#init({'wrap': 'hard', 'textwidth': 60})
+                            \ | call litecorrect#init()
+                            \ | setl spell spl=en_us et sw=2 ts=2 noai nonu nornu
+  autocmd Filetype html,xml     call pencil#init({'wrap': 'soft'})
+                            \ | call litecorrect#init()
+                            \ | setl spell spl=en_us et sw=2 ts=2
+augroup END
+```
+
+Configurable options for `pencil#init()` include: `autoformat`,
+`concealcursor`, `conceallevel`, `cursorwrap`, `joinspaces`, `textwidth`,
+and `wrap`. These are detailed above.
+
+### Autoformat manual control
+
+_The ‘autoformat’ feature affects `HardPencil` (hard line break) mode
+only._
+
+To suspend autoformat for the next Insert, see above.
+
+When you need to manually enable/disable autoformat for the current
+buffer, you can do so with a command:
+
+* `PFormat` - enable autoformat for buffer (can still be disabled via blacklisting)
+* `PFormatOff` - disable autoformat for buffer
+* `PFormatToggle` - toggle to enable if disabled, etc.
+
+You can map a key in your `.vimrc` to toggle Vim’s autoformat:
+
+```vim
+noremap <silent> <F7> :<C-u>PFormatToggle<cr>
+inoremap <silent> <F7> <C-o>:PFormatToggle<cr>
+```
+
+### Autoformat blacklisting (and whitelisting)
+
+_The ‘autoformat’ feature affects `HardPencil` (hard line break) mode
+only._
+
+When editing formatted text, such as a table or code block, Vim’s
+autoformat will wreak havoc with the formatting. In these cases you will
+want autoformat suspended for the duration of the Insert.
+
+When entering Insert mode, _pencil_ will determine the highlight group at
+the cursor position. If that group has been blacklisted, _pencil_ will
+suspend autoformat for the Insert. For example, if editing a buffer of
+type ‘markdown’, autoformat will be suspended if you invoke Insert mode
+from inside a `markdownFencedCodeBlock` highlight group.
+
+Blacklists are now declared by file type. The default blacklists (and
+whitelists) are declared in the `plugin/pencil.vim` module. Here’s an
+excerpt showing the configuration for the ‘markdown’ file type:
+
+```vim
+  let g:pencil#autoformat_config = {
+        \   'markdown': {
+        \     'black': [
+        \       'htmlH[0-9]',
+        \       'markdown(Code|H[0-9]|Url|IdDeclaration|Link|Rule|Highlight[A-Za-z0-9]+)',
+        \       'markdown(FencedCodeBlock|InlineCode)',
+        \       'mkd(Code|Rule|Delimiter|Link|ListItem|IndentCode)',
+        \       'mmdTable[A-Za-z0-9]*',
+        \     ],
+        \     'white': [
+        \      'markdown(Code|Link)',
+        \     ],
+        \   },
+        [snip]
+        \ }
+```
+
+The whitelist will override the blacklist and enable Vim’s autoformat if
+text that would normally be blacklisted doesn’t dominate the entire line.
+This allows autoformat to work with `inline` code and links.
+
+### Auto-detecting wrap mode
+
+If you didn’t explicitly specify a wrap mode during initialization,
+_pencil_ will attempt to detect it.
+
+It will first look for a `textwidth` (or `tw`) specified in a modeline.
+Failing that, _pencil_ will then sample lines from the start of the
+buffer.
+
+#### Detect via modeline
+
+Will the wrap mode be detected accurately? Maybe. But you can improve its
+chances by giving _pencil_ an explicit hint.
+
+At the bottom of this document is a odd-looking code:
+
+```html
+<!-- vim: set tw=73 :-->
+```
+
+This is an **optional** ‘modeline’ that tells Vim to run the following
+command upon loading the file into a buffer:
+
+```vim
+:set textwidth=73
+```
+
+It tells _pencil_ to assume hard line breaks, regardless of whether or
+not soft line wrap is the default editing mode for buffers of type
+‘markdown’.
+
+You explicitly specify soft wrap mode by specifying a textwidth of `0`:
+
+```html
+<!-- vim: set tw=0 :-->
+```
+
+Note that if the modelines feature is disabled (such as for security
+reasons) the textwidth will still be set by this plugin.
+
+#### Detect via sampling
+
+If no modeline with a textwidth is found, _pencil_ will sample the
+initial lines from the buffer, looking for those excessively-long.
+
+There are two settings you can add to your `.vimrc` to tweak this behavior.
+
+The maximum number of lines to sample from the start of the buffer:
+
+```vim
+let g:pencil#softDetectSample = 20
+```
+
+Set that value to `0` to disable detection via line sampling.
+
+When the number of bytes on a sampled line per exceeds this next value,
+then _pencil_ assumes soft line wrap.
+
+```vim
+let g:pencil#softDetectThreshold = 130
+```
+
+If no such lines found, _pencil_ falls back to the default wrap mode.
+
+# See also
+
+* [To Vim][tv] - Writer and psychologist Ian Hocking on using Vim for writing
+* [Vim Training Class - Basic motions and commands][tc] - video tutorial by Shawn Biddle
+* [Vim for Writers][vw] - guide to the basics geared to writers
+
+Bloggers and developers discuss _pencil_ and its brethern:
+
+* [Reed Esau’s growing list of Vim plugins for writers][regl] (2014) - by @pengwynn
+* [Distraction Free Writing in Vim][dfwiv] (2014) - by @tlattimore
+* [Safari Blog: Turning vim into an IDE through vim plugins][tviai] (2014) - by @jameydeorio
+* [Quick tops for writing prose with Vim][qtfwp] (2014) - by @benoliver999
+* [UseVim: Reed Esau’s Writing Plugins][rewp] (2015) - by @alexyoung
+* [Tomasino Labs: Vim in Context][vic] (2015) - by @jamestomasino
+
+Other plugins of specific interest to writers:
+
+* [danielbmarques/vim-ditto][vd] - highlight repeated words
+* [tpope/vim-abolish][ab] - search for, substitute, and abbr. multiple variants of a word
+* [tommcdo/vim-exchange][ex] - easy text exchange operator for Vim
+* [junegunn/limelight.vim][jl] - focus mode that brightens current paragraph
+* [junegunn/goyo.vim][jg] - distraction-free editing mode
+
+[vd]: https://github.com/danielbmarques/vim-ditto
+[qtfwp]: http://benoliver999.com/technology/2014/12/06/vimforprose/
+[vic]: https://labs.tomasino.org/vim-in-context/
+[rewp]: https://medium.com/usevim/reed-esaus-writing-plugins-5b6c65bc808f
+[tviai]: https://www.safaribooksonline.com/blog/2014/11/23/way-vim-ide/
+[regl]: http://wynnnetherland.com/journal/reed-esau-s-growing-list-of-vim-plugins-for-writers/
+[dfwiv]: http://tlattimore.com/blog/distraction-free-writing-in-vim/
+[ab]: http://github.com/tpope/vim-abolish
+[ex]: http://github.com/tommcdo/vim-exchange
+[jl]: http://github.com/junegunn/limelight.vim
+[jg]: http://github.com/junegunn/goyo.vim
+
+Markdown syntax plugins
+
+Markdown users typically won’t need to install a syntax plugin unless
+they want the latest version of Pope’s syntax highlighting:
+
+* [tpope/vim-markdown][tvm] - (recommended) the latest version of Pope’s
+  syntax plugin which ships with Vim
+
+Those using tables and footnotes should consider installing this plugin:
+
+* [mattly/vim-markdown-enhancements][mvme]
+
+Alternatives to Tim Pope’s syntax highlighting include:
+
+* [plasticboy/vim-markdown][pvm]
+* [gabrielelana/vim-markdown][gvm]
+
+Note that the plasticboy and gabrielelana plugins may incorrectly
+reformat bulleted lists when Vim’s autoformat is active in _pencil_’s
+HardPencil mode.
+
+[tvm]: http://github.com/tpope/vim-markdown
+[pvm]: http://github.com/plasticboy/vim-markdown
+[gvm]: http://github.com/gabrielelana/vim-markdown
+[mvme]: http://github.com/mattly/vim-markdown-enhancements
+
+If you find the _pencil_ plugin useful, check out these others by [@reedes][re]:
+
+* [vim-colors-pencil][cp] - color scheme for Vim inspired by IA Writer
+* [vim-lexical][lx] - building on Vim’s spell-check and thesaurus/dictionary completion
+* [vim-litecorrect][lc] - lightweight auto-correction for Vim
+* [vim-one][vo] - make use of Vim’s _+clientserver_ capabilities
+* [vim-textobj-quote][qu] - extends Vim to support typographic (‘curly’) quotes
+* [vim-textobj-sentence][ts] - improving on Vim’s native sentence motion command
+* [vim-thematic][th] - modify Vim’s appearance to suit your task and environment
+* [vim-wheel][wh] - screen-anchored cursor movement for Vim
+* [vim-wordy][wo] - uncovering usage problems in writing
+* [vim-wordchipper][wc] - power tool for shredding text in Insert mode
+
+Unimpressed by _pencil_? [vim-pandoc][vp] offers prose-oriented features
+with its own Markdown variant.
+
+[cp]: http://github.com/reedes/vim-colors-pencil
+[lc]: http://github.com/reedes/vim-litecorrect
+[lx]: http://github.com/reedes/vim-lexical
+[qu]: http://github.com/reedes/vim-textobj-quote
+[re]: http://github.com/reedes
+[tc]: https://www.youtube.com/watch?v=Nim4_f5QUxA
+[th]: http://github.com/reedes/vim-thematic
+[ts]: http://github.com/reedes/vim-textobj-sentence
+[tv]: http://ianhocking.com/2013/11/17/to-vim/
+[vo]: http://github.com/reedes/vim-one
+[vw]: http://therandymon.com/woodnotes/vim-for-writers/vimforwriters.html
+[wh]: http://github.com/reedes/vim-wheel
+[wo]: http://github.com/reedes/vim-wordy
+[wc]: http://github.com/reedes/vim-wordchipper
+[vp]: http://github.com/vim-pandoc/vim-pandoc
+
+# Future development
+
+If you’ve spotted a problem or have an idea on improving _pencil_, please
+report it as an issue, or better yet submit a pull request.
+
+<!-- vim: set tw=73 :-->
diff --git a/pack/language/start/pencil/autoload/pencil.vim b/pack/language/start/pencil/autoload/pencil.vim
new file mode 100644
index 0000000..19d0e53
--- /dev/null
+++ b/pack/language/start/pencil/autoload/pencil.vim
@@ -0,0 +1,542 @@
+" ============================================================================
+" File:        pencil.vim
+" Description: autoload functions for vim-pencil plugin
+" Maintainer:  Reed Esau <github.com/reedes>
+" Created:     December 28, 2013
+" License:     The MIT License (MIT)
+" ============================================================================
+
+scriptencoding utf-8
+
+if exists('autoloaded_pencil') | fini | en
+let autoloaded_pencil = 1
+
+let s:WRAP_MODE_DEFAULT = -1
+let s:WRAP_MODE_OFF     = 0
+let s:WRAP_MODE_HARD    = 1
+let s:WRAP_MODE_SOFT    = 2
+
+" Wrap-mode detector
+" Scan lines at end and beginning of file to determine the wrap mode.
+" Modelines has priority over long lines found.
+fun! s:detect_wrap_mode() abort
+
+  let b:max_textwidth = -1      " assume no relevant modeline
+  call s:doModelines()
+
+  if b:max_textwidth > 0
+    " modelines(s) found with positive textwidth, so hard line breaks
+    return s:WRAP_MODE_HARD
+  en
+
+  if b:max_textwidth ==# 0 || g:pencil#wrapModeDefault ==# 'soft'
+    " modeline(s) found only with zero textwidth, so it's soft line wrap
+    " or, the user wants to default to soft line wrap
+    return s:WRAP_MODE_SOFT
+  en
+
+  " attempt to rule out soft line wrap
+  " scan initial lines in an attempt to detect long lines
+  for l:line in getline(1, g:pencil#softDetectSample)
+    if len(l:line) > g:pencil#softDetectThreshold
+      return s:WRAP_MODE_SOFT
+    en
+  endfo
+
+  " punt
+  return s:WRAP_MODE_DEFAULT
+endf
+
+fun! s:imap(preserve_completion, key, icmd) abort
+  if a:preserve_completion
+    exe ':ino <buffer> <silent> <expr> ' . a:key . " pumvisible() ? '" . a:key . "' : '" . a:icmd . "'"
+  el
+    exe ':ino <buffer> <silent> ' . a:key . ' ' . a:icmd
+  en
+endf
+
+fun! s:maybe_enable_autoformat() abort
+  " don't enable autoformat if in a blacklisted code block or table,
+  " allowing for reprieve via whitelist in certain cases
+
+  " a flag to suspend autoformat for the Insert
+  if b:pencil_suspend_af
+    let b:pencil_suspend_af = 0   " clear the flag
+    return
+  en
+
+  let l:filetype = get(g:pencil#autoformat_aliases, &filetype, &filetype)
+  let l:af_cfg = get(g:pencil#autoformat_config, l:filetype, {})
+  let l:black = get(l:af_cfg, 'black', [])
+  let l:white = get(l:af_cfg, 'white', [])
+  let l:has_black_re = len(l:black) > 0
+  let l:has_white_re = len(l:white) > 0
+  let l:black_re = l:has_black_re ? '\v(' . join( l:black, '|') . ')' : ''
+  let l:white_re = l:has_white_re ? '\v(' . join( l:white, '|') . ')' : ''
+  let l:enforce_previous_line = get(l:af_cfg, 'enforce-previous-line', 0)
+
+  let l:okay_to_enable = 1
+  let l:line = line('.')
+  let l:col = col('.')
+  let l:last_col = col('$')
+  let l:stack = []
+  let l:found_empty = 0
+  " at end of line there may be no synstack, so scan back
+  while l:col > 0
+    let l:stack = synstack(l:line, l:col)
+    if l:stack != []
+      break
+    en
+    " the last column will always be empty, so ignore it
+    if l:col < l:last_col
+      let l:found_empty = 1
+    en
+    let l:col -= 1
+  endw
+  " if needed, scan towards end of line looking for highlight groups
+  if l:stack == []
+    let l:col = col('.') + 1
+    while l:col <= l:last_col
+      let l:stack = synstack(l:line, l:col)
+      if l:stack != []
+        break
+      en
+      " the last column will always be empty, so ignore it
+      if l:col < l:last_col
+        let l:found_empty = 1
+      en
+      let l:col += 1
+    endw
+  en
+  " enforce blacklist by scanning for syntax matches
+  if l:has_black_re
+    for l:sid in l:stack
+      if match(synIDattr(l:sid, 'name'), l:black_re) >= 0
+        let l:okay_to_enable = 0
+        "echohl WarningMsg
+        "echo 'hit blacklist line=' . l:line . ' col=' . l:col .
+        "      \ ' name=' . synIDattr(l:sid, 'name')
+        "echohl NONE
+        break
+      en
+    endfo
+  en
+  " enforce whitelist by detecting inline `markup` for which we DO want
+  " autoformat to be enabled (e.g., tpope's markdownCode)
+  if l:has_white_re && !l:okay_to_enable
+    " one final check for an empty stack at the start and end of line,
+    " either of which greenlights a whitelist check
+    if !l:found_empty
+      if synstack(l:line, 1) == [] ||
+        \ (l:last_col > 1 && synstack(l:line, l:last_col-1) == [])
+        let l:found_empty = 1
+      en
+    en
+    if l:found_empty
+      for l:sid in l:stack
+        if match(synIDattr(l:sid, 'name'), l:white_re) >= 0
+          let l:okay_to_enable = 1
+          break
+        en
+      endfo
+    en
+  en
+  " disallow enable if start of previous line is in blacklist,
+  if l:has_black_re && l:enforce_previous_line && l:okay_to_enable && l:line > 1
+    let l:prev_stack = synstack(l:line - 1, 1)
+    for l:sid in l:prev_stack
+      if len(l:sid) > 0 &&
+              \ match(synIDattr(l:sid, 'name'), l:black_re) >= 0
+        let l:okay_to_enable = 0
+        break
+      en
+    endfo
+  en
+  if l:okay_to_enable
+    set formatoptions+=a
+  en
+endf
+
+fun! pencil#setAutoFormat(af) abort
+  " 1=enable, 0=disable, -1=toggle
+  if !exists('b:last_autoformat')
+    let b:last_autoformat = 0
+  en
+  let l:nu_af = a:af ==# -1 ? !b:last_autoformat : a:af
+  let l:is_hard =
+     \ exists('b:pencil_wrap_mode') &&
+     \ b:pencil_wrap_mode ==# s:WRAP_MODE_HARD
+  if l:nu_af && l:is_hard
+    aug pencil_autoformat
+      au InsertEnter <buffer> call s:maybe_enable_autoformat()
+      au InsertLeave <buffer> set formatoptions-=a
+    aug END
+  el
+    sil! au! pencil_autoformat * <buffer>
+    if l:nu_af && !l:is_hard
+      echohl WarningMsg
+      echo 'autoformat can only be enabled in hard line break mode'
+      echohl NONE
+      return
+    en
+  en
+  let b:last_autoformat = l:nu_af
+endf
+
+" Create mappings for word processing
+" args:
+"   'wrap': 'detect|off|hard|soft|toggle'
+fun! pencil#init(...) abort
+  let l:args = a:0 ? a:1 : {}
+
+  " flag to suspend autoformat for the next Insert
+  let b:pencil_suspend_af = 0
+
+  if !exists('b:pencil_wrap_mode')
+    let b:pencil_wrap_mode = s:WRAP_MODE_OFF
+  en
+  if !exists('b:max_textwidth')
+    let b:max_textwidth = -1
+  en
+
+  " If user explicitly requested wrap_mode thru args, go with that.
+  let l:wrap_arg = get(l:args, 'wrap', 'detect')
+
+  if (b:pencil_wrap_mode && l:wrap_arg ==# 'toggle') ||
+   \ l:wrap_arg =~# '^\(0\|off\|disable\|false\)$'
+    let b:pencil_wrap_mode = s:WRAP_MODE_OFF
+  elsei l:wrap_arg ==# 'hard'
+    let b:pencil_wrap_mode = s:WRAP_MODE_HARD
+  elsei l:wrap_arg ==# 'soft'
+    let b:pencil_wrap_mode = s:WRAP_MODE_SOFT
+  elsei l:wrap_arg ==# 'default'
+    let b:pencil_wrap_mode = s:WRAP_MODE_DEFAULT
+  el
+    " this can return s:WRAP_MODE_ for soft, hard or default
+    let b:pencil_wrap_mode = s:detect_wrap_mode()
+  en
+
+  " translate default(-1) to soft(1) or hard(2) or off(0)
+  if b:pencil_wrap_mode ==# s:WRAP_MODE_DEFAULT
+    if g:pencil#wrapModeDefault =~# '^\(0\|off\|disable\|false\)$'
+      let b:pencil_wrap_mode = s:WRAP_MODE_OFF
+    elsei g:pencil#wrapModeDefault ==# 'soft'
+      let b:pencil_wrap_mode = s:WRAP_MODE_SOFT
+    el
+      let b:pencil_wrap_mode = s:WRAP_MODE_HARD
+    en
+  en
+
+  " autoformat is only used in Hard mode, and then only during
+  " Insert mode
+  call pencil#setAutoFormat(
+        \ b:pencil_wrap_mode ==# s:WRAP_MODE_HARD &&
+        \ get(l:args, 'autoformat', g:pencil#autoformat))
+
+  if b:pencil_wrap_mode ==# s:WRAP_MODE_HARD
+    if &modeline ==# 0 && b:max_textwidth > 0
+      " Compensate for disabled modeline
+      exe 'setl textwidth=' . b:max_textwidth
+    elsei &textwidth ==# 0
+      exe 'setl textwidth=' .
+        \ get(l:args, 'textwidth', g:pencil#textwidth)
+    el
+      setl textwidth<
+    en
+    setl nowrap
+
+    " flag to suspend autoformat for next Insert
+    " optional user-defined mapping
+    if exists('g:pencil#map#suspend_af') &&
+     \ g:pencil#map#suspend_af !=# ''
+      exe 'no <buffer> <silent> ' . g:pencil#map#suspend_af . ' :let b:pencil_suspend_af=1<CR>'
+    en
+
+  elsei b:pencil_wrap_mode ==# s:WRAP_MODE_SOFT
+    setl textwidth=0
+    setl wrap
+
+    if has('linebreak')
+      setl linebreak
+      " TODO breakat not working yet with n and m-dash
+      setl breakat-=*         " avoid breaking footnote*
+      setl breakat-=@         " avoid breaking at email addresses
+    en
+
+    if exists('&colorcolumn')
+      setl colorcolumn=0      " doesn't align as expected
+    en
+  el
+    setl textwidth<
+    setl wrap< nowrap<
+
+    if has('linebreak')
+      setl linebreak< nolinebreak<
+      setl breakat<
+    en
+
+    if exists('&colorcolumn')
+      setl colorcolumn<
+    en
+  en
+
+  if (  v:version > 704 ||
+   \   (v:version ==# 704 && has('patch-7.4.338')))
+    if b:pencil_wrap_mode ==# s:WRAP_MODE_SOFT
+      setl breakindent
+    el
+      setl breakindent<
+    en
+  en
+
+  " global settings
+  if b:pencil_wrap_mode
+    set display+=lastline
+    set backspace=indent,eol,start
+    if get(l:args, 'joinspaces', g:pencil#joinspaces)
+      set joinspaces         " two spaces after .!?
+    el
+      set nojoinspaces       " only one space after a .!? (default)
+    en
+  en
+
+  " because ve=onemore is relatively rare and could break
+  " other plugins, restrict its presence to buffer
+  " Better: restore ve to original setting
+  if has('virtualedit')
+    if b:pencil_wrap_mode && get(l:args, 'cursorwrap', g:pencil#cursorwrap)
+      set whichwrap+=<,>,b,s,h,l,[,]
+      aug pencil_cursorwrap
+        au BufEnter <buffer> set virtualedit+=onemore
+        au BufLeave <buffer> set virtualedit-=onemore
+      aug END
+    el
+      sil! au! pencil_cursorwrap * <buffer>
+    en
+  en
+
+  " Because syntax for fenced code blocks will mess with the
+  " definition of a word (via iskeyword) we'll impose a prose-
+  " oriented definition.
+  " e.g., let g:markdown_fenced_languages = ['sh',]  " adds '.'
+  "
+  " Support $20 30% D&D #40 highest-rated O'Toole Mary's
+  " TODO how to separate quote from apostrophe use?
+  if b:pencil_wrap_mode
+    aug pencil_iskeyword
+      au BufEnter <buffer> setl isk& | setl isk-=_ | setl isk+=$,%,&,#,-,',+
+    aug END
+  el
+    sil! au! pencil_iskeyword * <buffer>
+  en
+
+  " window/buffer settings
+  if b:pencil_wrap_mode
+    setl nolist
+    setl wrapmargin=0
+    setl autoindent         " needed by formatoptions=n
+    setl indentexpr=
+    if has('smartindent')
+      setl nosmartindent      " avoid c-style indents in prose
+    en
+    if has('cindent')
+      setl nocindent          " avoid c-style indents in prose
+    en
+
+    setl formatoptions+=n   " recognize numbered lists
+    setl formatoptions+=1   " don't break line before 1 letter word
+    setl formatoptions+=t   " autoformat of text (vim default)
+    "setl formatoptions+=2   " preserve indent based on 2nd line for rest of paragraph
+
+    " clean out stuff we likely don't want
+    setl formatoptions-=v   " only break line at blank entered during insert
+    setl formatoptions-=w   " avoid erratic behavior if mixed spaces
+    setl formatoptions-=a   " autoformat will turn on with Insert in HardPencil mode
+    setl formatoptions-=2   " doesn't work with with fo+=n, says docs
+
+    " plasticboy/vim-markdown sets these to handle bullet points
+    " as comments. Not changing for now.
+    "setl formatoptions-=o   " don't insert comment leader
+    "setl formatoptions-=c   " no autoformat of comments
+    "setl formatoptions+=r   " don't insert comment leader
+
+    if has('conceal') && v:version >= 703
+      exe ':setl conceallevel=' .
+        \ get(l:args, 'conceallevel',  g:pencil#conceallevel)
+      exe ':setl concealcursor=' .
+        \ get(l:args, 'concealcursor', g:pencil#concealcursor)
+    en
+  el
+    if has('smartindent')
+      setl smartindent< nosmartindent<
+    en
+    if has('cindent')
+      setl cindent< nocindent<
+    en
+    if has('conceal')
+      setl conceallevel<
+      setl concealcursor<
+    en
+
+    setl indentexpr<
+    setl autoindent< noautoindent<
+    setl list< nolist<
+    setl wrapmargin<
+    setl formatoptions<
+  en
+
+  if b:pencil_wrap_mode ==# s:WRAP_MODE_SOFT
+    exe 'nn <buffer> <silent>' . Mapkey('$', 'n') . ' g$'
+    exe 'nn <buffer> <silent>' . Mapkey('0', 'n') . ' g0'
+    exe 'vn <buffer> <silent>' . Mapkey('$', 'v') . ' g$'
+    exe 'vn <buffer> <silent>' . Mapkey('0', 'v') . ' g0'
+    no <buffer> <silent> <Home> g<Home>
+    no <buffer> <silent> <End>  g<End>
+    nn <buffer> <silent> g0 0
+    nn <buffer> <silent> g$ $
+    vn <buffer> <silent> g0 0
+    vn <buffer> <silent> g$ $
+
+    " preserve behavior of home/end keys in popups
+    call s:imap(1, '<Home>', '<C-o>g<Home>')
+    call s:imap(1, '<End>' , '<C-o>g<End>' )
+  el
+    sil! nun <buffer> $
+    sil! nun <buffer> 0
+    sil! vu  <buffer> $
+    sil! vu  <buffer> 0
+    sil! nun <buffer> <Home>
+    sil! nun <buffer> <End>
+    sil! iu  <buffer> <Home>
+    sil! iu  <buffer> <End>
+  en
+
+  if b:pencil_wrap_mode
+    exe 'nn <buffer> <silent> ' . Mapkey('j', 'n') . ' gj'
+    exe 'nn <buffer> <silent> ' . Mapkey('k', 'n') . ' gk'
+    exe 'vn <buffer> <silent> ' . Mapkey('j', 'v') . ' gj'
+    exe 'vn <buffer> <silent> ' . Mapkey('k', 'v') . ' gk'
+    no <buffer> <silent> <Up>   gk
+    no <buffer> <silent> <Down> gj
+    nn <buffer> <silent> gj j
+    nn <buffer> <silent> gk k
+    vn <buffer> <silent> gj j
+    vn <buffer> <silent> gk k
+
+    " preserve behavior of up/down keys in popups
+    call s:imap(1, '<Up>'  , '<C-o>g<Up>'  )
+    call s:imap(1, '<Down>', '<C-o>g<Down>')
+  el
+    sil! nun <buffer> j
+    sil! nun <buffer> k
+    sil! vu  <buffer> j
+    sil! vu  <buffer> k
+    sil! unm <buffer> <Up>
+    sil! unm <buffer> <Down>
+    sil! nun <buffer> gj j
+    sil! nun <buffer> gk k
+    sil! vu <buffer> gj j
+    sil! vu <buffer> gk k
+
+    sil! iu <buffer> <Up>
+    sil! iu <buffer> <Down>
+  en
+
+  " set undo points around common punctuation,
+  " line <c-u> and word <c-w> deletions
+  if b:pencil_wrap_mode
+    ino <buffer> . .<c-g>u
+    ino <buffer> ! !<c-g>u
+    ino <buffer> ? ?<c-g>u
+    ino <buffer> , ,<c-g>u
+    ino <buffer> ; ;<c-g>u
+    ino <buffer> : :<c-g>u
+    ino <buffer> <c-u> <c-g>u<c-u>
+    ino <buffer> <c-w> <c-g>u<c-w>
+
+    " map <cr> only if not already mapped
+    if empty(maparg('<cr>', 'i'))
+      ino <buffer> <cr> <c-g>u<cr>
+      let b:pencil_cr_mapped = 1
+    el
+      let b:pencil_cr_mapped = 0
+    en
+  el
+    sil! iu <buffer> .
+    sil! iu <buffer> !
+    sil! iu <buffer> ?
+    sil! iu <buffer> ,
+    sil! iu <buffer> ;
+    sil! iu <buffer> :
+    sil! iu <buffer> <c-u>
+    sil! iu <buffer> <c-w>
+
+    " unmap <cr> only if we mapped it ourselves
+    if exists('b:pencil_cr_mapped') && b:pencil_cr_mapped
+      sil! iu <buffer> <cr>
+    en
+  en
+endf
+
+" attempt to find a non-zero textwidth, etc.
+fun! s:doOne(item) abort
+  let l:matches = matchlist(a:item, '^\([a-z]\+\)=\([a-zA-Z0-9_\-.]\+\)$')
+  if len(l:matches) > 1
+    if l:matches[1] =~# 'textwidth\|tw'
+      let l:tw = str2nr(l:matches[2])
+      if l:tw > b:max_textwidth
+        let b:max_textwidth = l:tw
+      en
+    en
+  en
+endf
+
+" attempt to find a non-zero textwidth, etc.
+fun! s:doModeline(line) abort
+  let l:matches = matchlist(a:line, '\%(\S\@<!\%(vi\|vim\([<>=]\?\)\([0-9]\+\)\?\)\|\sex\):\s*\%(set\s\+\)\?\([^:]\+\):\S\@!')
+  if len(l:matches) > 0
+    for l:item in split(l:matches[3])
+      call s:doOne(l:item)
+    endfo
+  en
+  let l:matches = matchlist(a:line, '\%(\S\@<!\%(vi\|vim\([<>=]\?\)\([0-9]\+\)\?\)\|\sex\):\(.\+\)')
+  if len(l:matches) > 0
+    for l:item in split(l:matches[3], '[ \t:]')
+      call s:doOne(l:item)
+    endfo
+  en
+endf
+
+" sample lines for detection, capturing both
+" modeline(s) and max line length
+" Hat tip to https://github.com/ciaranm/securemodelines
+fun! s:doModelines() abort
+  if line('$') > &modelines
+    let l:lines={ }
+    call map(filter(getline(1, &modelines) +
+          \ getline(line('$') - &modelines, '$'),
+          \ 'v:val =~# ":"'), 'extend(l:lines, { v:val : 0 } )')
+    for l:line in keys(l:lines)
+      call s:doModeline(l:line)
+    endfo
+  el
+    for l:line in getline(1, '$')
+      call s:doModeline(l:line)
+    endfo
+  en
+endf
+
+" Pass in a key sequence and the first letter of a vim mode. Returns key
+" mapping mapped to it in that mode, else the original key sequence if none.
+function! Mapkey (keys, mode) abort
+  redir => mappings | silent! map | redir END
+  for map in split(mappings, '\n')
+    let seq = matchstr(map, '\s\+\zs\S*')
+    if maparg(seq, a:mode) == a:keys
+      return seq
+    endif
+  endfor
+  return a:keys
+endfunction
+
+" vim:ts=2:sw=2:sts=2
diff --git a/pack/language/start/pencil/plugin/pencil.vim b/pack/language/start/pencil/plugin/pencil.vim
new file mode 100644
index 0000000..36cf7df
--- /dev/null
+++ b/pack/language/start/pencil/plugin/pencil.vim
@@ -0,0 +1,212 @@
+" ============================================================================
+" File:        pencil.vim
+" Description: vim-pencil plugin
+" Maintainer:  Reed Esau <github.com/reedes>
+" Created:     December 28, 2013
+" License:     The MIT License (MIT)
+" ============================================================================
+
+scriptencoding utf-8
+
+if exists('g:loaded_pencil') || &compatible | fini | en
+let g:loaded_pencil = 1
+
+" Save 'cpoptions' and set Vim default to enable line continuations.
+let s:save_cpoptions = &cpoptions
+set cpoptions&vim
+
+let s:WRAP_MODE_DEFAULT = -1
+let s:WRAP_MODE_OFF     = 0
+let s:WRAP_MODE_HARD    = 1
+let s:WRAP_MODE_SOFT    = 2
+
+fun! s:unicode_enabled()
+  retu &encoding ==# 'utf-8'
+endf
+
+" helper for statusline
+"
+" Note that it shouldn't be dependent on init(), which
+" won't have been called for non-prose modules.
+fun! PencilMode()
+  if exists('b:pencil_wrap_mode')
+    if b:pencil_wrap_mode ==# s:WRAP_MODE_SOFT
+      return get(g:pencil#mode_indicators, 'soft', 'S')
+    elsei b:pencil_wrap_mode ==# s:WRAP_MODE_HARD
+      if &formatoptions =~# 'a'
+        return get(g:pencil#mode_indicators, 'auto', 'A')
+      el
+        return get(g:pencil#mode_indicators, 'hard', 'H')
+      en
+    el
+      return get(g:pencil#mode_indicators, 'off', '')
+    en
+  else
+    return ''   " should be blank for non-prose modes
+  en
+endf
+
+if !exists('g:pencil#wrapModeDefault')
+  " user-overridable default, if detection fails
+  " should be 'soft' or 'hard' or 'off'
+  let g:pencil#wrapModeDefault = 'hard'
+en
+
+if !exists('g:pencil#textwidth')
+  " textwidth used when in hard linebreak mode
+  let g:pencil#textwidth = 74
+en
+
+if !exists('g:pencil#autoformat')
+  " by default, automatically format text when in Insert mode
+  " with hard wrap.
+  let g:pencil#autoformat = 1
+en
+
+if !exists('g:pencil#autoformat_config')
+  " Do not activate autoformat if entering Insert mode when
+  " the cursor is inside any of the following syntax groups.
+  "
+  " markdown* (tpope/vim-markdown)
+  " mkd*, htmlH[0-9] (plasticboy/vim-markdown)
+  " markdownFencedCodeBlock, markdownInlineCode, markdownRule, markdownH[0-9] (gabrielelana/vim-markdown)
+  " mmdTable[A-Za-z0-9]* (mattly/vim-markdown-enhancements)
+  " txtCode (timcharper/textile.vim)
+  " rst*,tex*,asciidoc* (syntax file shipped with vim)
+  let g:pencil#autoformat_config = {
+        \   'markdown': {
+        \     'black': [
+        \       'htmlH[0-9]',
+        \       'markdown(Code|H[0-9]|Url|IdDeclaration|Link|Rule|Highlight[A-Za-z0-9]+)',
+        \       'markdown(FencedCodeBlock|InlineCode)',
+        \       'mkd(Code|Rule|Delimiter|Link|ListItem|IndentCode|Snippet)',
+        \       'mmdTable[A-Za-z0-9]*',
+        \     ],
+        \     'white': [
+        \      'markdown(Code|Link)',
+        \     ],
+        \   },
+        \   'asciidoc': {
+        \     'black': [
+        \       'asciidoc(AttributeList|AttributeEntry|ListLabel|Literal|SideBar|Source|Sect[0-9])',
+        \       'asciidoc[A-Za-z]*(Block|Macro|Title)',
+        \     ],
+        \     'white': [
+        \      'asciidoc(AttributeRef|Macro)',
+        \     ],
+        \     'enforce-previous-line': 1,
+        \   },
+        \   'rst': {
+        \     'black': [
+        \       'rst(CodeBlock|Directive|ExDirective|LiteralBlock|Sections)',
+        \       'rst(Comment|Delimiter|ExplicitMarkup|SimpleTable)',
+        \     ],
+        \   },
+        \   'tex': {
+        \     'black': [
+        \       'tex(BeginEndName|Delimiter|DocType|InputFile|Math|RefZone|Statement|Title)',
+        \       'texSection$',
+        \     ],
+        \     'enforce-previous-line': 1,
+        \   },
+        \   'textile': {
+        \     'black': [
+        \       'txtCode',
+        \     ],
+        \   },
+        \   'pandoc': {
+        \     'black': [
+        \       '^pandoc.*Code.*',
+        \       'pandocHTML',
+        \       'pandocLaTeXMathBlock',
+        \       '^pandoc.*List.*',
+        \       '^pandoc.*Table.*',
+        \       'pandocYAMLHeader',
+        \     ],
+        \   }
+        \ }
+en
+if !exists('g:pencil#autoformat_aliases')
+  " Aliases used exclusively for autoformat config.
+  " Pencil will NOT modify the filetype setting.
+  let g:pencil#autoformat_aliases = {
+        \    'md': 'markdown',
+        \    'mkd': 'markdown',
+        \  }
+en
+
+if !exists('g:pencil#joinspaces')
+  " by default, only one space after full stop (.)
+  let g:pencil#joinspaces = 0
+en
+
+if !exists('g:pencil#cursorwrap')
+  " by default, h/l and cursor keys will wrap around hard
+  " linebreaks. Set to 0 if you don't want this behavior
+  let g:pencil#cursorwrap = 1
+en
+
+if !exists('g:pencil#conceallevel')
+  " by default, concealing capability in your syntax plugin
+  " will be enabled. See tpope/vim-markdown for example.
+  " 0=disable, 1=onechar, 2=hidecust, 3=hideall
+  let g:pencil#conceallevel = 3
+en
+if !exists('g:pencil#concealcursor')
+  " n=normal, v=visual, i=insert, c=command
+  let g:pencil#concealcursor = 'c'
+en
+
+if !exists('g:pencil#softDetectSample')
+  " if no modeline, read as many as this many lines at
+  " start of file in attempt to detect at least one line
+  " whose byte count exceeds g:pencil#softDetectThreshold
+  let g:pencil#softDetectSample = 20
+en
+
+if !exists('g:pencil#softDetectThreshold')
+  " if the byte count of at least one sampled line exceeds
+  " this number, then pencil assumes soft line wrapping
+  let g:pencil#softDetectThreshold = 130
+en
+
+if !exists('g:pencil#mode_indicators')
+  " used to set PencilMode() for statusline
+  if s:unicode_enabled()
+    let g:pencil#mode_indicators = {'hard': '␍', 'auto': 'ª', 'soft': '⤸', 'off': '',}
+  el
+    let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',}
+  en
+en
+
+" Commands
+
+com -nargs=0 Pencil         call pencil#init({'wrap': 'on' })
+com -nargs=0 PencilOff      call pencil#init({'wrap': 'off' })
+com -nargs=0 NoPencil       call pencil#init({'wrap': 'off' })
+com -nargs=0 HardPencil     call pencil#init({'wrap': 'hard'})
+com -nargs=0 PencilHard     call pencil#init({'wrap': 'hard'})
+com -nargs=0 SoftPencil     call pencil#init({'wrap': 'soft'})
+com -nargs=0 PencilSoft     call pencil#init({'wrap': 'soft'})
+com -nargs=0 PencilToggle   call pencil#init({'wrap': 'toggle'})
+com -nargs=0 TogglePencil   call pencil#init({'wrap': 'toggle'})
+com -nargs=0 PFormat        call pencil#setAutoFormat(1)
+com -nargs=0 PFormatOff     call pencil#setAutoFormat(0)
+com -nargs=0 PFormatToggle  call pencil#setAutoFormat(-1)
+
+" NOTE: legacy commands have been disabled by default as of 31-Dec-15
+"       These will be removed entirely on 31-Dec-16
+if !exists('g:pencil#legacyCommands')
+  let g:pencil#legacyCommands = 0
+en
+if g:pencil#legacyCommands
+  com -nargs=0 DropPencil    call pencil#init({'wrap': 'off' })
+  com -nargs=0 AutoPencil    call pencil#setAutoFormat(1)
+  com -nargs=0 ManualPencil  call pencil#setAutoFormat(0)
+  com -nargs=0 ShiftPencil   call pencil#setAutoFormat(-1)
+en
+
+let &cpoptions = s:save_cpoptions
+unlet s:save_cpoptions
+
+" vim:ts=2:sw=2:sts=2
diff --git a/pack/language/start/pencil/screenshots/demo.gif b/pack/language/start/pencil/screenshots/demo.gif
new file mode 100644
index 0000000..d9977d8
Binary files /dev/null and b/pack/language/start/pencil/screenshots/demo.gif differ
diff --git a/pack/language/start/pencil/screenshots/demo.txt b/pack/language/start/pencil/screenshots/demo.txt
new file mode 100644
index 0000000..092dfc7
--- /dev/null
+++ b/pack/language/start/pencil/screenshots/demo.txt
@@ -0,0 +1,7 @@
+
+Captured with Quicktime.
+
+Processed with:
+
+$ ffmpeg -i four.mov -s 700x242 -pix_fmt rgb24 -vf "lutyuv=y=val*1.3" -r 10 -f gif - | \
+  gifsicle --optimize=3 --delay=3  > out.gif
diff --git a/bundle/rust/README.md b/pack/language/start/rust/README.md
similarity index 100%
rename from bundle/rust/README.md
rename to pack/language/start/rust/README.md
diff --git a/bundle/rust/after/syntax/rust.vim b/pack/language/start/rust/after/syntax/rust.vim
similarity index 100%
rename from bundle/rust/after/syntax/rust.vim
rename to pack/language/start/rust/after/syntax/rust.vim
diff --git a/bundle/rust/autoload/rust.vim b/pack/language/start/rust/autoload/rust.vim
similarity index 100%
rename from bundle/rust/autoload/rust.vim
rename to pack/language/start/rust/autoload/rust.vim
diff --git a/bundle/rust/compiler/cargo.vim b/pack/language/start/rust/compiler/cargo.vim
similarity index 100%
rename from bundle/rust/compiler/cargo.vim
rename to pack/language/start/rust/compiler/cargo.vim
diff --git a/bundle/rust/compiler/rustc.vim b/pack/language/start/rust/compiler/rustc.vim
similarity index 100%
rename from bundle/rust/compiler/rustc.vim
rename to pack/language/start/rust/compiler/rustc.vim
diff --git a/bundle/rust/doc/rust.txt b/pack/language/start/rust/doc/rust.txt
similarity index 100%
rename from bundle/rust/doc/rust.txt
rename to pack/language/start/rust/doc/rust.txt
diff --git a/bundle/rust/ftdetect/rust.vim b/pack/language/start/rust/ftdetect/rust.vim
similarity index 100%
rename from bundle/rust/ftdetect/rust.vim
rename to pack/language/start/rust/ftdetect/rust.vim
diff --git a/bundle/rust/ftplugin/rust.vim b/pack/language/start/rust/ftplugin/rust.vim
similarity index 100%
rename from bundle/rust/ftplugin/rust.vim
rename to pack/language/start/rust/ftplugin/rust.vim
diff --git a/bundle/rust/indent/rust.vim b/pack/language/start/rust/indent/rust.vim
similarity index 100%
rename from bundle/rust/indent/rust.vim
rename to pack/language/start/rust/indent/rust.vim
diff --git a/bundle/rust/plugin/rust.vim b/pack/language/start/rust/plugin/rust.vim
similarity index 100%
rename from bundle/rust/plugin/rust.vim
rename to pack/language/start/rust/plugin/rust.vim
diff --git a/bundle/rust/syntax/rust.vim b/pack/language/start/rust/syntax/rust.vim
similarity index 100%
rename from bundle/rust/syntax/rust.vim
rename to pack/language/start/rust/syntax/rust.vim
diff --git a/bundle/rust/syntax_checkers/rust/rustc.vim b/pack/language/start/rust/syntax_checkers/rust/rustc.vim
similarity index 100%
rename from bundle/rust/syntax_checkers/rust/rustc.vim
rename to pack/language/start/rust/syntax_checkers/rust/rustc.vim
diff --git a/pack/language/start/terraform/.editorconfig b/pack/language/start/terraform/.editorconfig
new file mode 100755
index 0000000..beffa30
--- /dev/null
+++ b/pack/language/start/terraform/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/pack/language/start/terraform/.gitignore b/pack/language/start/terraform/.gitignore
new file mode 100755
index 0000000..8652beb
--- /dev/null
+++ b/pack/language/start/terraform/.gitignore
@@ -0,0 +1,3 @@
+/doc/tags
+/vader.vim
+terraform-providers/
diff --git a/pack/language/start/terraform/CHANGELOG.md b/pack/language/start/terraform/CHANGELOG.md
new file mode 100755
index 0000000..a7c9b56
--- /dev/null
+++ b/pack/language/start/terraform/CHANGELOG.md
@@ -0,0 +1,21 @@
+# vim-terraform CHANGELOG
+
+## Version 1.2.1 (February 5, 2015)
+
+-   Block indentation fix (thanks imkira@github)
+
+## Version 1.2.0 (December 12, 2014)
+
+-   Add Kevin Le's syntax highlighting
+
+## Version 1.1.0 (December 11, 2014)
+
+-   Remove syntax highlighting; see README.md
+
+## Version 1.0.1 (December 10, 2014)
+
+-   Make this work without the JSON plugin
+
+## Version 1.0.0 (December 10, 2014)
+
+-   Initial release
diff --git a/pack/language/start/terraform/CODE_OF_CONDUCT.md b/pack/language/start/terraform/CODE_OF_CONDUCT.md
new file mode 100755
index 0000000..bc6ec6d
--- /dev/null
+++ b/pack/language/start/terraform/CODE_OF_CONDUCT.md
@@ -0,0 +1,45 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+-   The use of sexualized language or imagery
+
+-   Personal attacks
+
+-   Trolling or insulting/derogatory comments
+
+-   Public or private harassment
+
+-   Publishing other's private information, such as physical or electronic
+    addresses, without explicit permission
+
+-   Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct. By adopting this Code of Conduct, project
+maintainers commit themselves to fairly and consistently applying these
+principles to every aspect of managing this project. Project maintainers who do
+not follow or enforce the Code of Conduct may be permanently removed from the
+project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by opening an issue or contacting one or more of the project
+maintainers.
+
+This Code of Conduct is adapted from the [Contributor
+Covenant](http://contributor-covenant.org), version 1.2.0, available at
+<http://contributor-covenant.org/version/1/2/0/>
diff --git a/pack/language/start/terraform/CONTRIBUTING.md b/pack/language/start/terraform/CONTRIBUTING.md
new file mode 100755
index 0000000..d642088
--- /dev/null
+++ b/pack/language/start/terraform/CONTRIBUTING.md
@@ -0,0 +1,35 @@
+# Contributing To My Vim Plugins
+
+I'm not a Vim wizard by any means, nor am I too proud to accept
+contributions that improve my code, so if you think you have a problem,
+improvement, or other contribution towards the betterment of Vim-kind,
+please file an issue or, where appropriate, a pull request.
+
+Before filing an issue, please read this article by my friends and
+former colleagues at Viget:
+
+<https://viget.com/extend/tips-for-writing-better-bug-reports>
+
+Keep in mind that I'm not paid to write Vim plugins, so I'm doing this
+in my spare time, which means it might take me a while to respond. If
+you're not satisfied with my response to your problem with my free (as
+in beer and in speech) software, I will give you triple your $0.00 back.
+
+When filing a pull request, please explain what you're changing and why.
+Please limit your changes to the specific thing you're fixing; it's
+probably easiest for both of us if you isolate your change in a topic
+branch that I can merge without pulling in other stuff. Please do not
+update CHANGELOG, versions, etc.; I'll take care of that. I'll also add
+you to the Credits list with my thanks.
+
+All of my Vim plugins use the ISC license. If you submit a pull request,
+I'll assume you are OK with any code you add being placed under that
+same ISC license. If this is not the case for any reason, please let me
+know why you can't tolerate the ISC license. I am 99.99% likely to
+reject your change in that case, but I'll let you have your say.
+
+This project is intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [Contributor
+Covenant](http://contributor-covenant.org) code of conduct.
+
+Thanks for contributing!
diff --git a/pack/language/start/terraform/LICENSE b/pack/language/start/terraform/LICENSE
new file mode 100755
index 0000000..9f7428e
--- /dev/null
+++ b/pack/language/start/terraform/LICENSE
@@ -0,0 +1,13 @@
+Copyright (c) 2014-2016 Mark Cornick <mark@markcornick.com>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED 'AS IS' AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
diff --git a/pack/language/start/terraform/Makefile b/pack/language/start/terraform/Makefile
new file mode 100755
index 0000000..066558e
--- /dev/null
+++ b/pack/language/start/terraform/Makefile
@@ -0,0 +1,16 @@
+.PHONY: test test_deps
+.ONESHELL:
+.DEFAULTGOAL := test
+SHELL := /bin/bash
+TERM := xterm
+HOME := /dev/null
+VIMINIT :=
+
+test: test_deps
+	bash -c 'vim -Nu <( echo "set rtp+=vader.vim,.,./after | filetype plugin indent on | syntax enable") -c "silent Vader! test/*"'
+
+test_deps:
+	command -v git; \
+	RETVAL=$$?; \
+	if [ $$RETVAL != 0 ]; then echo "$$(tput bold)\`git\` executable was not found on the PATH. Please install \`git\`.$$(tput sgr0)"; exit 1; fi; \
+	if [ ! -d vader.vim ]; then	git clone https://github.com/junegunn/vader.vim.git; fi
diff --git a/pack/language/start/terraform/README.md b/pack/language/start/terraform/README.md
new file mode 100755
index 0000000..fc4e1ea
--- /dev/null
+++ b/pack/language/start/terraform/README.md
@@ -0,0 +1,95 @@
+[![](https://img.shields.io/badge/Supports%20Terraform%20Version-%3E%3D0.12.20-blue.svg)](https://github.com/hashicorp/terraform/blob/v0.12.20/CHANGELOG.md)
+
+## Call For Maintainers
+
+This plugin, along with others like it, is now maintained by the
+[HashiVim](http://hashivim.github.io/) organization, which is looking for
+additional maintainers and contributors. See the HashiVim home page for
+further information.
+- - - -
+## Overview: vim-terraform
+
+This plugin adds a `:Terraform` command that runs terraform, with tab
+completion of subcommands. It also sets up `*.tf`, `*.tfvars`, and
+`*.tfstate` files to be highlighted as HCL, HCL, and JSON respectively.
+
+- - - -
+## Installation
+
+With [Vim 8 packages](http://vimhelp.appspot.com/repeat.txt.html#packages):
+
+    git clone https://github.com/hashivim/vim-terraform.git ~/.vim/pack/plugins/start/vim-terraform
+
+With [Pathogen](https://github.com/tpope/vim-pathogen):
+
+    git clone https://github.com/hashivim/vim-terraform.git ~/.vim/bundle/vim-terraform
+
+With [Vundle](https://github.com/VundleVim/Vundle.vim), add the following to `~/.vimrc`:
+
+    Plugin 'hashivim/vim-terraform'
+
+
+- - - -
+## Usage
+
+Allow vim-terraform to align settings automatically with Tabularize.
+
+    let g:terraform_align=1
+
+Allow vim-terraform to automatically fold (hide until unfolded) sections of terraform code. Defaults to 0 which is off.
+
+    let g:terraform_fold_sections=1
+
+Allow vim-terraform to automatically format `*.tf` and `*.tfvars` files with `terraform fmt`.
+You can also do this manually with the `:TerraformFmt` command.
+
+    let g:terraform_fmt_on_save=1
+
+- - - -
+## Updating vim-terraform
+Note, this is only for maintainers of the `vim-terraform` project.
+
+When a new version of Terraform drops, you can run the following where x.x.x is a version such as 0.11.11
+
+    ./update_automagic.sh x.x.x
+
+At this point, add the modified files to a git branch and open a pull request.
+
+	git checkout -b "feature/update-to-terraform-$VERSION"
+	git add $FILE
+	git commit -m "Message about update"
+	git push
+
+Add another maintainer to the pull request and await confirmation.
+
+- - - -
+## Running tests
+
+To run the test suite and verify functionality
+
+    make
+
+- - - -
+## Credits
+
+Syntax highlighting and indentation by Kevin Le (@bkad) based on prior work by
+Larry Gilbert (@L2G). The rest originally written by Mark Cornick
+<https://www.markcornick.com/> and contributors listed below. Licensed under the
+ISC license.
+
+Thanks to the following contributors:
+
+-   michael j talarczyk (@mijit)
+-   Koji Nakayama (@knakayama)
+-   Kris (@kostecky)
+-   Okumura Takahiro (@hfm)
+-   Paul Forman (@pforman)
+-   Lowe Schmidt (@lsc)
+-   Mario Kozjak (@mkozjak)
+
+The `:TerraformFmt` command is adapted from
+[vim-hclfmt](https://github.com/fatih/vim-hclfmt/blob/master/autoload/fmt.vim).
+
+This project is intended to be a safe, welcoming space for collaboration, and
+contributors are expected to adhere to the [Contributor
+Covenant](http://contributor-covenant.org) code of conduct.
diff --git a/pack/language/start/terraform/autoload/terraform.vim b/pack/language/start/terraform/autoload/terraform.vim
new file mode 100755
index 0000000..4bc11f6
--- /dev/null
+++ b/pack/language/start/terraform/autoload/terraform.vim
@@ -0,0 +1,66 @@
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Ensure no conflict with arguments from the environment
+let $TF_CLI_ARGS_fmt=''
+
+function! terraform#fmt()
+  if !filereadable(expand('%:p'))
+    return
+  endif
+  let l:curw = winsaveview()
+  " Make a fake change so that the undo point is right.
+  normal! ix
+  normal! "_x
+  silent execute '%!terraform fmt -no-color -'
+  if v:shell_error != 0
+    let output = getline(1, '$')
+    silent undo
+    echo join(output, "\n")
+  endif
+  call winrestview(l:curw)
+endfunction
+
+function! terraform#align()
+  let p = '^.*=[^>]*$'
+  if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
+    let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
+    let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
+    Tabularize/=/l1
+    normal! 0
+    call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+  endif
+endfunction
+
+function! terraform#commands(ArgLead, CmdLine, CursorPos)
+  let l:commands = [
+    \ 'apply',
+    \ 'console',
+    \ 'destroy',
+    \ 'env',
+    \ 'fmt',
+    \ 'get',
+    \ 'graph',
+    \ 'import',
+    \ 'init',
+    \ 'output',
+    \ 'plan',
+    \ 'providers',
+    \ 'refresh',
+    \ 'show',
+    \ 'taint',
+    \ 'untaint',
+    \ 'validate',
+    \ 'version',
+    \ 'workspace',
+    \ '0.12upgrade',
+    \ 'debug',
+    \ 'force-unlock',
+    \ 'push',
+    \ 'state'
+  \ ]
+  return join(l:commands, "\n")
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/pack/language/start/terraform/doc/terraform.txt b/pack/language/start/terraform/doc/terraform.txt
new file mode 100755
index 0000000..503376c
--- /dev/null
+++ b/pack/language/start/terraform/doc/terraform.txt
@@ -0,0 +1,14 @@
+*terraform.txt*  basic vim/terraform integration
+
+Author:  HashiVim <https://github.com/hashivim>
+License: ISC license
+Repo:    https://github.com/hashivim/vim-terraform
+
+COMMANDS                                        *terraform*
+
+This command is only available if terraform is in your PATH.
+
+                                                *terraform-:terraform*
+:Terraform [args]         Invoke an arbitrary terraform command.
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/pack/language/start/terraform/ftdetect/terraform.vim b/pack/language/start/terraform/ftdetect/terraform.vim
new file mode 100755
index 0000000..24c06fd
--- /dev/null
+++ b/pack/language/start/terraform/ftdetect/terraform.vim
@@ -0,0 +1,6 @@
+" By default, Vim associates .tf files with TinyFugue - tell it not to.
+silent! autocmd! filetypedetect BufRead,BufNewFile *.tf
+autocmd BufRead,BufNewFile *.tf set filetype=terraform
+autocmd BufRead,BufNewFile *.tfvars set filetype=terraform
+autocmd BufRead,BufNewFile *.tfstate set filetype=json
+autocmd BufRead,BufNewFile *.tfstate.backup set filetype=json
diff --git a/pack/language/start/terraform/ftplugin/terraform.vim b/pack/language/start/terraform/ftplugin/terraform.vim
new file mode 100755
index 0000000..6cd0b49
--- /dev/null
+++ b/pack/language/start/terraform/ftplugin/terraform.vim
@@ -0,0 +1,61 @@
+" terraform.vim - basic vim/terraform integration
+" Maintainer: HashiVim <https://github.com/hashivim>
+
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" j is a relatively recent addition; silence warnings when setting it.
+setlocal formatoptions-=t formatoptions+=croql
+silent! setlocal formatoptions+=j
+let b:undo_ftplugin = 'setlocal formatoptions<'
+
+if !has('patch-7.4.1142')
+    " Include hyphens as keyword characters so that a keyword appearing as
+    " part of a longer name doesn't get partially highlighted.
+    setlocal iskeyword+=-
+    let b:undo_ftplugin .= ' iskeyword<'
+endif
+
+if get(g:, 'terraform_fold_sections', 0)
+  setlocal foldmethod=syntax
+  let b:undo_ftplugin .= ' foldmethod<'
+endif
+
+" Set the commentstring
+setlocal commentstring=#%s
+let b:undo_ftplugin .= ' commentstring<'
+
+if get(g:, 'terraform_align', 0) && exists(':Tabularize')
+  inoremap <buffer> <silent> = =<Esc>:call terraform#align()<CR>a
+  let b:undo_ftplugin .= '|iunmap <buffer> ='
+endif
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if !executable('terraform')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+command! -nargs=+ -complete=custom,terraform#commands -buffer Terraform execute '!terraform '.<q-args>. ' -no-color'
+command! -nargs=0 -buffer TerraformFmt call terraform#fmt()
+let b:undo_ftplugin .= '|delcommand Terraform|delcommand TerraformFmt'
+
+if get(g:, 'terraform_fmt_on_save', 0)
+  augroup vim.terraform.fmt
+    autocmd!
+    autocmd BufWritePre *.tf call terraform#fmt()
+    autocmd BufWritePre *.tfvars call terraform#fmt()
+  augroup END
+endif
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/pack/language/start/terraform/get_providers.sh b/pack/language/start/terraform/get_providers.sh
new file mode 100755
index 0000000..d941135
--- /dev/null
+++ b/pack/language/start/terraform/get_providers.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# AUTHOR: Phil Porada - philporada@gmail.com
+# TICKET: https://github.com/hashivim/vim-terraform/issues/40
+# WHAT: As of Terraform 0.10.0, Hashicorp split out each provider into its own
+#       separate terraform-provider-* project. As a result, we have to hunt
+#       for all of the resources that each provider provides. This is a PITA
+#       but I guess good for Terraform. ¯\_(ツ)_/¯
+
+command -v jq >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "You need to install jq. Exiting..."
+    exit 1
+fi
+
+function get_providers() {
+    mkdir -p terraform-providers
+    # Make a ramdisk because there is a ton of stuff to download
+    sudo mount -t tmpfs -o size=512m tmpfs $(pwd)/terraform-providers
+    cd terraform-providers
+    for PAGE in {1..3}; do
+        for REPO in $(curl -sL https://api.github.com/users/terraform-providers/repos?page=${PAGE}\&per_page=100 | jq -r .[].name); do
+            if [ ! -d ${REPO} ]; then
+                git clone --depth 1 https://github.com/terraform-providers/${REPO}
+                # Only get the folder/files we need. There's probably a better way checkout only the files we need, but I don't know it.
+                cd ${REPO}
+                find . -type f -not -name "*provider*.go" -and -not -name "*registration*.go" -delete
+                cd ..
+            else
+                cd ${REPO}
+                git pull --hard --depth 1 https://github.com/terraform-providers/${REPO}
+                cd ..
+            fi
+        done
+    done
+}
+
+get_providers
diff --git a/pack/language/start/terraform/indent/terraform.vim b/pack/language/start/terraform/indent/terraform.vim
new file mode 100755
index 0000000..bfd4a24
--- /dev/null
+++ b/pack/language/start/terraform/indent/terraform.vim
@@ -0,0 +1,54 @@
+" Only load this file if no other indent file was loaded
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+setlocal nolisp
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2
+setlocal indentexpr=TerraformIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
+  \ . ' indentexpr< indentkeys<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if exists('*TerraformIndent')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! TerraformIndent(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  return thisindent
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/pack/language/start/terraform/syntax/terraform.vim b/pack/language/start/terraform/syntax/terraform.vim
new file mode 100755
index 0000000..2641b23
--- /dev/null
+++ b/pack/language/start/terraform/syntax/terraform.vim
@@ -0,0 +1,5507 @@
+" Forked from Larry Gilbert's syntax file
+" github.com/L2G/vim-syntax-terraform
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Identifiers are made up of alphanumeric characters, underscores, and
+" hyphens.
+if has('patch-7.4.1142')
+    syn iskeyword a-z,A-Z,48-57,_,-
+endif
+
+syn case match
+
+""" data
+syn keyword terraDataTypeBI
+          \ aci_access_port_block
+          \ aci_access_port_selector
+          \ aci_application_epg
+          \ aci_application_profile
+          \ aci_attachable_access_entity_profile
+          \ aci_autonomous_system_profile
+          \ aci_bridge_domain
+          \ aci_cloud_applicationcontainer
+          \ aci_cloud_availability_zone
+          \ aci_cloud_aws_provider
+          \ aci_cloud_cidr_pool
+          \ aci_cloud_context_profile
+          \ aci_cloud_domain_profile
+          \ aci_cloud_e_pg
+          \ aci_cloud_endpoint_selector
+          \ aci_cloud_endpoint_selectorfor_external_e_pgs
+          \ aci_cloud_external_e_pg
+          \ aci_cloud_provider_profile
+          \ aci_cloud_providers_region
+          \ aci_cloud_subnet
+          \ aci_contract
+          \ aci_contract_subject
+          \ aci_end_point_retention_policy
+          \ aci_external_network_instance_profile
+          \ aci_filter
+          \ aci_filter_entry
+          \ aci_interface_fc_policy
+          \ aci_l2_interface_policy
+          \ aci_l3_ext_subnet
+          \ aci_l3_outside
+          \ aci_lacp_policy
+          \ aci_leaf_access_port_policy_group
+          \ aci_leaf_interface_profile
+          \ aci_leaf_profile
+          \ aci_lldp_interface_policy
+          \ aci_logical_interface_profile
+          \ aci_logical_node_profile
+          \ aci_miscabling_protocol_interface_policy
+          \ aci_ospf_interface_policy
+          \ aci_pcvpc_interface_policy_group
+          \ aci_port_security_policy
+          \ aci_subnet
+          \ aci_tenant
+          \ aci_vlan_encapsulationfor_vxlan_traffic
+          \ aci_vmm_domain
+          \ aci_vrf
+          \ akamai_authorities_set
+          \ akamai_contract
+          \ akamai_cp_code
+          \ akamai_dns_record_set
+          \ akamai_group
+          \ alicloud_account
+          \ alicloud_actiontrails
+          \ alicloud_alikafka_consumer_groups
+          \ alicloud_alikafka_instances
+          \ alicloud_alikafka_sasl_acls
+          \ alicloud_alikafka_sasl_users
+          \ alicloud_alikafka_topics
+          \ alicloud_api_gateway_apis
+          \ alicloud_api_gateway_apps
+          \ alicloud_api_gateway_groups
+          \ alicloud_caller_identity
+          \ alicloud_cas_certificates
+          \ alicloud_cen_bandwidth_limits
+          \ alicloud_cen_bandwidth_packages
+          \ alicloud_cen_instances
+          \ alicloud_cen_region_route_entries
+          \ alicloud_cen_route_entries
+          \ alicloud_cloud_connect_networks
+          \ alicloud_common_bandwidth_packages
+          \ alicloud_cr_namespaces
+          \ alicloud_cr_repos
+          \ alicloud_cs_kubernetes_clusters
+          \ alicloud_cs_managed_kubernetes_clusters
+          \ alicloud_cs_serverless_kubernetes_clusters
+          \ alicloud_db_instance_classes
+          \ alicloud_db_instance_engines
+          \ alicloud_db_instances
+          \ alicloud_ddosbgp_instances
+          \ alicloud_ddoscoo_instances
+          \ alicloud_disks
+          \ alicloud_dns_domain_groups
+          \ alicloud_dns_domain_records
+          \ alicloud_dns_domains
+          \ alicloud_dns_groups
+          \ alicloud_dns_records
+          \ alicloud_dns_resolution_lines
+          \ alicloud_drds_instances
+          \ alicloud_eips
+          \ alicloud_elasticsearch_instances
+          \ alicloud_emr_disk_types
+          \ alicloud_emr_instance_types
+          \ alicloud_emr_main_versions
+          \ alicloud_ess_scaling_configurations
+          \ alicloud_ess_scaling_groups
+          \ alicloud_ess_scaling_rules
+          \ alicloud_fc_functions
+          \ alicloud_fc_services
+          \ alicloud_fc_triggers
+          \ alicloud_file_crc64_checksum
+          \ alicloud_forward_entries
+          \ alicloud_gpdb_instances
+          \ alicloud_hbase_instances
+          \ alicloud_images
+          \ alicloud_instance_type_families
+          \ alicloud_instance_types
+          \ alicloud_instances
+          \ alicloud_key_pairs
+          \ alicloud_kms_ciphertext
+          \ alicloud_kms_keys
+          \ alicloud_kms_plaintext
+          \ alicloud_kvstore_instance_classes
+          \ alicloud_kvstore_instance_engines
+          \ alicloud_kvstore_instances
+          \ alicloud_market_product
+          \ alicloud_market_products
+          \ alicloud_mns_queues
+          \ alicloud_mns_topic_subscriptions
+          \ alicloud_mns_topics
+          \ alicloud_mongo_instances
+          \ alicloud_mongodb_instances
+          \ alicloud_nas_access_groups
+          \ alicloud_nas_access_rules
+          \ alicloud_nas_file_systems
+          \ alicloud_nas_mount_targets
+          \ alicloud_nas_protocols
+          \ alicloud_nat_gateways
+          \ alicloud_network_interfaces
+          \ alicloud_ons_groups
+          \ alicloud_ons_instances
+          \ alicloud_ons_topics
+          \ alicloud_oss_bucket_objects
+          \ alicloud_oss_buckets
+          \ alicloud_ots_instance_attachments
+          \ alicloud_ots_instances
+          \ alicloud_ots_tables
+          \ alicloud_polardb_accounts
+          \ alicloud_polardb_clusters
+          \ alicloud_polardb_databases
+          \ alicloud_polardb_endpoints
+          \ alicloud_pvtz_zone_records
+          \ alicloud_pvtz_zones
+          \ alicloud_ram_account_alias
+          \ alicloud_ram_account_aliases
+          \ alicloud_ram_groups
+          \ alicloud_ram_policies
+          \ alicloud_ram_roles
+          \ alicloud_ram_users
+          \ alicloud_regions
+          \ alicloud_route_entries
+          \ alicloud_route_tables
+          \ alicloud_router_interfaces
+          \ alicloud_sag_acls
+          \ alicloud_security_group_rules
+          \ alicloud_security_groups
+          \ alicloud_slb_acls
+          \ alicloud_slb_attachments
+          \ alicloud_slb_backend_servers
+          \ alicloud_slb_ca_certificates
+          \ alicloud_slb_domain_extensions
+          \ alicloud_slb_listeners
+          \ alicloud_slb_master_slave_server_groups
+          \ alicloud_slb_rules
+          \ alicloud_slb_server_certificates
+          \ alicloud_slb_server_groups
+          \ alicloud_slbs
+          \ alicloud_snapshots
+          \ alicloud_snat_entries
+          \ alicloud_ssl_vpn_client_certs
+          \ alicloud_ssl_vpn_servers
+          \ alicloud_vpcs
+          \ alicloud_vpn_connections
+          \ alicloud_vpn_customer_gateways
+          \ alicloud_vpn_gateways
+          \ alicloud_vswitches
+          \ alicloud_yundun_bastionhost_instances
+          \ alicloud_yundun_dbaudit_instance
+          \ alicloud_zones
+          \ archive_file
+          \ avi_actiongroupconfig
+          \ avi_alertconfig
+          \ avi_alertemailconfig
+          \ avi_alertscriptconfig
+          \ avi_alertsyslogconfig
+          \ avi_analyticsprofile
+          \ avi_applicationpersistenceprofile
+          \ avi_applicationprofile
+          \ avi_authprofile
+          \ avi_autoscalelaunchconfig
+          \ avi_backup
+          \ avi_backupconfiguration
+          \ avi_certificatemanagementprofile
+          \ avi_cloud
+          \ avi_cloudconnectoruser
+          \ avi_cloudproperties
+          \ avi_cluster
+          \ avi_clusterclouddetails
+          \ avi_controllerportalregistration
+          \ avi_controllerproperties
+          \ avi_controllersite
+          \ avi_customerportalinfo
+          \ avi_customipamdnsprofile
+          \ avi_dnspolicy
+          \ avi_errorpagebody
+          \ avi_errorpageprofile
+          \ avi_fileservice
+          \ avi_gslb
+          \ avi_gslbgeodbprofile
+          \ avi_gslbservice
+          \ avi_hardwaresecuritymodulegroup
+          \ avi_healthmonitor
+          \ avi_httppolicyset
+          \ avi_image
+          \ avi_ipaddrgroup
+          \ avi_ipamdnsproviderprofile
+          \ avi_l4policyset
+          \ avi_microservicegroup
+          \ avi_natpolicy
+          \ avi_network
+          \ avi_networkprofile
+          \ avi_networksecuritypolicy
+          \ avi_networkservice
+          \ avi_objectaccesspolicy
+          \ avi_pingaccessagent
+          \ avi_pkiprofile
+          \ avi_pool
+          \ avi_poolgroup
+          \ avi_poolgroupdeploymentpolicy
+          \ avi_portalfileupload
+          \ avi_prioritylabels
+          \ avi_protocolparser
+          \ avi_role
+          \ avi_scheduler
+          \ avi_securitypolicy
+          \ avi_seproperties
+          \ avi_server
+          \ avi_serverautoscalepolicy
+          \ avi_serviceengine
+          \ avi_serviceenginegroup
+          \ avi_snmptrapprofile
+          \ avi_sslkeyandcertificate
+          \ avi_sslprofile
+          \ avi_ssopolicy
+          \ avi_stringgroup
+          \ avi_systemconfiguration
+          \ avi_tenant
+          \ avi_testsedatastorelevel1
+          \ avi_testsedatastorelevel2
+          \ avi_testsedatastorelevel3
+          \ avi_trafficcloneprofile
+          \ avi_upgradestatusinfo
+          \ avi_upgradestatussummary
+          \ avi_useraccountprofile
+          \ avi_virtualservice
+          \ avi_vrfcontext
+          \ avi_vsdatascriptset
+          \ avi_vsvip
+          \ avi_wafcrs
+          \ avi_wafpolicy
+          \ avi_wafpolicypsmgroup
+          \ avi_wafprofile
+          \ avi_webhook
+          \ aviatrix_account
+          \ aviatrix_caller_identity
+          \ aviatrix_firenet
+          \ aviatrix_firenet_vendor_integration
+          \ aviatrix_gateway
+          \ aviatrix_spoke_gateway
+          \ aviatrix_transit_gateway
+          \ aws_acm_certificate
+          \ aws_acmpca_certificate_authority
+          \ aws_alb
+          \ aws_alb_listener
+          \ aws_alb_target_group
+          \ aws_ami
+          \ aws_ami_ids
+          \ aws_api_gateway_api_key
+          \ aws_api_gateway_resource
+          \ aws_api_gateway_rest_api
+          \ aws_api_gateway_vpc_link
+          \ aws_appsync_datasource
+          \ aws_arn
+          \ aws_autoscaling_group
+          \ aws_autoscaling_groups
+          \ aws_availability_zone
+          \ aws_availability_zones
+          \ aws_batch_compute_environment
+          \ aws_batch_job_queue
+          \ aws_billing_service_account
+          \ aws_caller_identity
+          \ aws_canonical_user_id
+          \ aws_cloudformation_export
+          \ aws_cloudformation_stack
+          \ aws_cloudhsm_v2_cluster
+          \ aws_cloudtrail_service_account
+          \ aws_cloudwatch_log_group
+          \ aws_codecommit_repository
+          \ aws_cognito_user_pools
+          \ aws_cur_report_definition
+          \ aws_customer_gateway
+          \ aws_db_cluster_snapshot
+          \ aws_db_event_categories
+          \ aws_db_instance
+          \ aws_db_snapshot
+          \ aws_directory_service_directory
+          \ aws_dx_gateway
+          \ aws_dynamodb_table
+          \ aws_ebs_default_kms_key
+          \ aws_ebs_encryption_by_default
+          \ aws_ebs_snapshot
+          \ aws_ebs_snapshot_ids
+          \ aws_ebs_volume
+          \ aws_ec2_transit_gateway
+          \ aws_ec2_transit_gateway_dx_gateway_attachment
+          \ aws_ec2_transit_gateway_route_table
+          \ aws_ec2_transit_gateway_vpc_attachment
+          \ aws_ec2_transit_gateway_vpn_attachment
+          \ aws_ecr_image
+          \ aws_ecr_repository
+          \ aws_ecs_cluster
+          \ aws_ecs_container_definition
+          \ aws_ecs_service
+          \ aws_ecs_task_definition
+          \ aws_efs_file_system
+          \ aws_efs_mount_target
+          \ aws_eip
+          \ aws_eks_cluster
+          \ aws_eks_cluster_auth
+          \ aws_elastic_beanstalk_application
+          \ aws_elastic_beanstalk_hosted_zone
+          \ aws_elastic_beanstalk_solution_stack
+          \ aws_elasticache_cluster
+          \ aws_elasticache_replication_group
+          \ aws_elasticsearch_domain
+          \ aws_elb
+          \ aws_elb_hosted_zone_id
+          \ aws_elb_service_account
+          \ aws_glue_script
+          \ aws_guardduty_detector
+          \ aws_iam_account_alias
+          \ aws_iam_group
+          \ aws_iam_instance_profile
+          \ aws_iam_policy
+          \ aws_iam_policy_document
+          \ aws_iam_role
+          \ aws_iam_server_certificate
+          \ aws_iam_user
+          \ aws_inspector_rules_packages
+          \ aws_instance
+          \ aws_instances
+          \ aws_internet_gateway
+          \ aws_iot_endpoint
+          \ aws_ip_ranges
+          \ aws_kinesis_stream
+          \ aws_kms_alias
+          \ aws_kms_ciphertext
+          \ aws_kms_key
+          \ aws_kms_secret
+          \ aws_kms_secrets
+          \ aws_lambda_function
+          \ aws_lambda_invocation
+          \ aws_lambda_layer_version
+          \ aws_launch_configuration
+          \ aws_launch_template
+          \ aws_lb
+          \ aws_lb_listener
+          \ aws_lb_target_group
+          \ aws_mq_broker
+          \ aws_msk_cluster
+          \ aws_msk_configuration
+          \ aws_nat_gateway
+          \ aws_network_acls
+          \ aws_network_interface
+          \ aws_network_interfaces
+          \ aws_organizations_organization
+          \ aws_organizations_organizational_units
+          \ aws_partition
+          \ aws_prefix_list
+          \ aws_pricing_product
+          \ aws_qldb_ledger
+          \ aws_ram_resource_share
+          \ aws_rds_cluster
+          \ aws_redshift_cluster
+          \ aws_redshift_service_account
+          \ aws_region
+          \ aws_route
+          \ aws_route53_delegation_set
+          \ aws_route53_resolver_rule
+          \ aws_route53_resolver_rules
+          \ aws_route53_zone
+          \ aws_route_table
+          \ aws_route_tables
+          \ aws_s3_bucket
+          \ aws_s3_bucket_object
+          \ aws_s3_bucket_objects
+          \ aws_secretsmanager_secret
+          \ aws_secretsmanager_secret_version
+          \ aws_security_group
+          \ aws_security_groups
+          \ aws_servicequotas_service
+          \ aws_servicequotas_service_quota
+          \ aws_sns_topic
+          \ aws_sqs_queue
+          \ aws_ssm_document
+          \ aws_ssm_parameter
+          \ aws_ssm_patch_baseline
+          \ aws_storagegateway_local_disk
+          \ aws_subnet
+          \ aws_subnet_ids
+          \ aws_transfer_server
+          \ aws_vpc
+          \ aws_vpc_dhcp_options
+          \ aws_vpc_endpoint
+          \ aws_vpc_endpoint_service
+          \ aws_vpc_peering_connection
+          \ aws_vpcs
+          \ aws_vpn_gateway
+          \ aws_waf_ipset
+          \ aws_waf_rate_based_rule
+          \ aws_waf_rule
+          \ aws_waf_web_acl
+          \ aws_wafregional_ipset
+          \ aws_wafregional_rate_based_rule
+          \ aws_wafregional_rule
+          \ aws_wafregional_web_acl
+          \ aws_workspaces_bundle
+          \ azurerm_api_management
+          \ azurerm_api_management_api
+          \ azurerm_api_management_api_version_set
+          \ azurerm_api_management_group
+          \ azurerm_api_management_product
+          \ azurerm_api_management_user
+          \ azurerm_app_service
+          \ azurerm_app_service_certificate
+          \ azurerm_app_service_certificate_order
+          \ azurerm_app_service_plan
+          \ azurerm_application_insights
+          \ azurerm_application_security_group
+          \ azurerm_automation_account
+          \ azurerm_automation_variable_bool
+          \ azurerm_automation_variable_datetime
+          \ azurerm_automation_variable_int
+          \ azurerm_automation_variable_string
+          \ azurerm_availability_set
+          \ azurerm_azuread_application
+          \ azurerm_batch_account
+          \ azurerm_batch_certificate
+          \ azurerm_batch_pool
+          \ azurerm_builtin_role_definition
+          \ azurerm_cdn_profile
+          \ azurerm_client_config
+          \ azurerm_container_registry
+          \ azurerm_cosmosdb_account
+          \ azurerm_data_factory
+          \ azurerm_dedicated_host
+          \ azurerm_dedicated_host_group
+          \ azurerm_dev_test_lab
+          \ azurerm_disk_encryption_set
+          \ azurerm_dns_zone
+          \ azurerm_eventgrid_topic
+          \ azurerm_eventhub_namespace
+          \ azurerm_eventhub_namespace_authorization_rule
+          \ azurerm_express_route_circuit
+          \ azurerm_firewall
+          \ azurerm_hdinsight_cluster
+          \ azurerm_healthcare_service
+          \ azurerm_image
+          \ azurerm_iothub_dps
+          \ azurerm_iothub_shared_access_policy
+          \ azurerm_key_vault
+          \ azurerm_key_vault_access_policy
+          \ azurerm_key_vault_key
+          \ azurerm_key_vault_secret
+          \ azurerm_kubernetes_cluster
+          \ azurerm_kubernetes_service_versions
+          \ azurerm_lb
+          \ azurerm_lb_backend_address_pool
+          \ azurerm_logic_app_workflow
+          \ azurerm_managed_disk
+          \ azurerm_management_group
+          \ azurerm_maps_account
+          \ azurerm_mariadb_server
+          \ azurerm_monitor_action_group
+          \ azurerm_monitor_diagnostic_categories
+          \ azurerm_mssql_elasticpool
+          \ azurerm_nat_gateway
+          \ azurerm_netapp_account
+          \ azurerm_netapp_pool
+          \ azurerm_netapp_volume
+          \ azurerm_network_ddos_protection_plan
+          \ azurerm_network_interface
+          \ azurerm_network_security_group
+          \ azurerm_network_watcher
+          \ azurerm_notification_hub
+          \ azurerm_notification_hub_namespace
+          \ azurerm_platform_image
+          \ azurerm_policy_definition
+          \ azurerm_postgresql_server
+          \ azurerm_private_endpoint_connection
+          \ azurerm_private_link_endpoint_connection
+          \ azurerm_private_link_service
+          \ azurerm_private_link_service_endpoint_connections
+          \ azurerm_proximity_placement_group
+          \ azurerm_public_ip
+          \ azurerm_public_ip_prefix
+          \ azurerm_public_ips
+          \ azurerm_recovery_services_protection_policy_vm
+          \ azurerm_recovery_services_vault
+          \ azurerm_redis_cache
+          \ azurerm_resource_group
+          \ azurerm_resources
+          \ azurerm_role_definition
+          \ azurerm_route_table
+          \ azurerm_scheduler_job_collection
+          \ azurerm_servicebus_namespace
+          \ azurerm_servicebus_namespace_authorization_rule
+          \ azurerm_shared_image
+          \ azurerm_shared_image_gallery
+          \ azurerm_shared_image_version
+          \ azurerm_signalr_service
+          \ azurerm_snapshot
+          \ azurerm_sql_database
+          \ azurerm_sql_server
+          \ azurerm_storage_account
+          \ azurerm_storage_account_blob_container_sas
+          \ azurerm_storage_account_sas
+          \ azurerm_storage_container
+          \ azurerm_storage_management_policy
+          \ azurerm_stream_analytics_job
+          \ azurerm_subnet
+          \ azurerm_subscription
+          \ azurerm_subscriptions
+          \ azurerm_traffic_manager_geographical_location
+          \ azurerm_user_assigned_identity
+          \ azurerm_virtual_hub
+          \ azurerm_virtual_machine
+          \ azurerm_virtual_network
+          \ azurerm_virtual_network_gateway
+          \ azurerm_virtual_network_gateway_connection
+          \ azurestack_client_config
+          \ azurestack_network_interface
+          \ azurestack_network_security_group
+          \ azurestack_platform_image
+          \ azurestack_public_ip
+          \ azurestack_resource_group
+          \ azurestack_route_table
+          \ azurestack_storage_account
+          \ azurestack_subnet
+          \ azurestack_virtual_network
+          \ azurestack_virtual_network_gateway
+          \ brightbox_database_type
+          \ brightbox_image
+          \ brightbox_server_group
+          \ circonus_account
+          \ circonus_collector
+          \ cloudflare_ip_ranges
+          \ cloudflare_waf_groups
+          \ cloudflare_waf_packages
+          \ cloudflare_waf_rules
+          \ cloudflare_zones
+          \ cloudstack_template
+          \ consul_acl_auth_method
+          \ consul_acl_policy
+          \ consul_acl_role
+          \ consul_acl_token
+          \ consul_acl_token_secret_id
+          \ consul_agent_config
+          \ consul_agent_self
+          \ consul_autopilot_health
+          \ consul_catalog_nodes
+          \ consul_catalog_service
+          \ consul_catalog_services
+          \ consul_key_prefix
+          \ consul_keys
+          \ consul_nodes
+          \ consul_service
+          \ consul_service_health
+          \ consul_services
+          \ datadog_ip_ranges
+          \ digitalocean_account
+          \ digitalocean_certificate
+          \ digitalocean_database_cluster
+          \ digitalocean_domain
+          \ digitalocean_droplet
+          \ digitalocean_droplet_snapshot
+          \ digitalocean_floating_ip
+          \ digitalocean_image
+          \ digitalocean_kubernetes_cluster
+          \ digitalocean_kubernetes_versions
+          \ digitalocean_loadbalancer
+          \ digitalocean_record
+          \ digitalocean_sizes
+          \ digitalocean_ssh_key
+          \ digitalocean_tag
+          \ digitalocean_volume
+          \ digitalocean_volume_snapshot
+          \ dns_a_record_set
+          \ dns_aaaa_record_set
+          \ dns_cname_record_set
+          \ dns_mx_record_set
+          \ dns_ns_record_set
+          \ dns_ptr_record_set
+          \ dns_srv_record_set
+          \ dns_txt_record_set
+          \ docker_network
+          \ docker_registry_image
+          \ exoscale_compute
+          \ exoscale_compute_ipaddress
+          \ exoscale_compute_template
+          \ exoscale_domain
+          \ exoscale_domain_record
+          \ external
+          \ fastly_ip_ranges
+          \ filter
+          \ flexibleengine_blockstorage_volume_v2
+          \ flexibleengine_cce_cluster_v3
+          \ flexibleengine_cce_node_ids_v3
+          \ flexibleengine_cce_node_v3
+          \ flexibleengine_compute_bms_flavors_v2
+          \ flexibleengine_compute_bms_keypairs_v2
+          \ flexibleengine_compute_bms_nic_v2
+          \ flexibleengine_compute_bms_server_v2
+          \ flexibleengine_csbs_backup_policy_v1
+          \ flexibleengine_csbs_backup_v1
+          \ flexibleengine_cts_tracker_v1
+          \ flexibleengine_dcs_az_v1
+          \ flexibleengine_dcs_maintainwindow_v1
+          \ flexibleengine_dcs_product_v1
+          \ flexibleengine_dds_flavor_v3
+          \ flexibleengine_dns_zone_v2
+          \ flexibleengine_images_image_v2
+          \ flexibleengine_kms_data_key_v1
+          \ flexibleengine_kms_key_v1
+          \ flexibleengine_lb_certificate_v2
+          \ flexibleengine_networking_network_v2
+          \ flexibleengine_networking_secgroup_v2
+          \ flexibleengine_rds_flavors_v1
+          \ flexibleengine_rds_flavors_v3
+          \ flexibleengine_rts_software_config_v1
+          \ flexibleengine_rts_stack_resource_v1
+          \ flexibleengine_rts_stack_v1
+          \ flexibleengine_s3_bucket_object
+          \ flexibleengine_sdrs_domain_v1
+          \ flexibleengine_sfs_file_system_v2
+          \ flexibleengine_vbs_backup_policy_v2
+          \ flexibleengine_vbs_backup_v2
+          \ flexibleengine_vpc_peering_connection_v2
+          \ flexibleengine_vpc_route_ids_v2
+          \ flexibleengine_vpc_route_v2
+          \ flexibleengine_vpc_subnet_ids_v1
+          \ flexibleengine_vpc_subnet_v1
+          \ flexibleengine_vpc_v1
+          \ github_collaborators
+          \ github_ip_ranges
+          \ github_repositories
+          \ github_repository
+          \ github_team
+          \ github_user
+          \ gitlab_group
+          \ gitlab_project
+          \ gitlab_user
+          \ gitlab_users
+          \ google_active_folder
+          \ google_bigquery_default_service_account
+          \ google_billing_account
+          \ google_client_config
+          \ google_client_openid_userinfo
+          \ google_cloudfunctions_function
+          \ google_composer_image_versions
+          \ google_compute_address
+          \ google_compute_backend_service
+          \ google_compute_default_service_account
+          \ google_compute_forwarding_rule
+          \ google_compute_global_address
+          \ google_compute_image
+          \ google_compute_instance
+          \ google_compute_instance_group
+          \ google_compute_lb_ip_ranges
+          \ google_compute_network
+          \ google_compute_network_endpoint_group
+          \ google_compute_node_types
+          \ google_compute_region_instance_group
+          \ google_compute_regions
+          \ google_compute_resource_policy
+          \ google_compute_router
+          \ google_compute_ssl_certificate
+          \ google_compute_ssl_policy
+          \ google_compute_subnetwork
+          \ google_compute_vpn_gateway
+          \ google_compute_zones
+          \ google_container_cluster
+          \ google_container_engine_versions
+          \ google_container_registry_image
+          \ google_container_registry_repository
+          \ google_dns_managed_zone
+          \ google_folder
+          \ google_folder_organization_policy
+          \ google_iam_policy
+          \ google_iam_role
+          \ google_kms_crypto_key
+          \ google_kms_crypto_key_version
+          \ google_kms_key_ring
+          \ google_kms_secret
+          \ google_kms_secret_ciphertext
+          \ google_monitoring_notification_channel
+          \ google_netblock_ip_ranges
+          \ google_organization
+          \ google_project
+          \ google_project_organization_policy
+          \ google_project_services
+          \ google_projects
+          \ google_secret_manager_secret_version
+          \ google_service_account
+          \ google_service_account_access_token
+          \ google_service_account_key
+          \ google_sql_ca_certs
+          \ google_storage_bucket_object
+          \ google_storage_object_signed_url
+          \ google_storage_project_service_account
+          \ google_storage_transfer_project_service_account
+          \ google_tpu_tensorflow_versions
+          \ grafana_data_source
+          \ gridscale_firewall
+          \ gridscale_ipv4
+          \ gridscale_ipv6
+          \ gridscale_isoimage
+          \ gridscale_loadbalancer
+          \ gridscale_network
+          \ gridscale_object_storage_accesskey
+          \ gridscale_paas
+          \ gridscale_paas_securityzone
+          \ gridscale_public_network
+          \ gridscale_server
+          \ gridscale_snapshot
+          \ gridscale_snapshotschedule
+          \ gridscale_sshkey
+          \ gridscale_storage
+          \ gridscale_template
+          \ hcloud_datacenter
+          \ hcloud_datacenters
+          \ hcloud_floating_ip
+          \ hcloud_image
+          \ hcloud_location
+          \ hcloud_locations
+          \ hcloud_network
+          \ hcloud_server
+          \ hcloud_ssh_key
+          \ hcloud_ssh_keys
+          \ hcloud_volume
+          \ heroku_addon
+          \ heroku_app
+          \ heroku_space
+          \ heroku_space_peering_info
+          \ heroku_team
+          \ http
+          \ huaweicloud_antiddos_v1
+          \ huaweicloud_cce_cluster_v3
+          \ huaweicloud_cce_node_v3
+          \ huaweicloud_cdm_flavors_v1
+          \ huaweicloud_compute_availability_zones_v2
+          \ huaweicloud_csbs_backup_policy_v1
+          \ huaweicloud_csbs_backup_v1
+          \ huaweicloud_cts_tracker_v1
+          \ huaweicloud_dcs_az_v1
+          \ huaweicloud_dcs_maintainwindow_v1
+          \ huaweicloud_dcs_product_v1
+          \ huaweicloud_dis_partition_v2
+          \ huaweicloud_dms_az_v1
+          \ huaweicloud_dms_maintainwindow_v1
+          \ huaweicloud_dms_product_v1
+          \ huaweicloud_iam_role_v3
+          \ huaweicloud_identity_role_v3
+          \ huaweicloud_images_image_v2
+          \ huaweicloud_kms_data_key_v1
+          \ huaweicloud_kms_key_v1
+          \ huaweicloud_networking_network_v2
+          \ huaweicloud_networking_port_v2
+          \ huaweicloud_networking_secgroup_v2
+          \ huaweicloud_networking_subnet_v2
+          \ huaweicloud_rds_flavors_v1
+          \ huaweicloud_rds_flavors_v3
+          \ huaweicloud_rts_software_config_v1
+          \ huaweicloud_rts_stack_resource_v1
+          \ huaweicloud_rts_stack_v1
+          \ huaweicloud_s3_bucket_object
+          \ huaweicloud_sfs_file_system_v2
+          \ huaweicloud_vbs_backup_policy_v2
+          \ huaweicloud_vbs_backup_v2
+          \ huaweicloud_vpc_ids_v1
+          \ huaweicloud_vpc_peering_connection_v2
+          \ huaweicloud_vpc_route_ids_v2
+          \ huaweicloud_vpc_route_v2
+          \ huaweicloud_vpc_subnet_ids_v1
+          \ huaweicloud_vpc_subnet_v1
+          \ huaweicloud_vpc_v1
+          \ huaweicloudstack_images_image_v2
+          \ huaweicloudstack_networking_network_v2
+          \ huaweicloudstack_networking_port_v2
+          \ huaweicloudstack_networking_secgroup_v2
+          \ huaweicloudstack_networking_subnet_v2
+          \ ignition_config
+          \ ignition_directory
+          \ ignition_disk
+          \ ignition_file
+          \ ignition_filesystem
+          \ ignition_group
+          \ ignition_link
+          \ ignition_networkd_unit
+          \ ignition_raid
+          \ ignition_systemd_unit
+          \ ignition_user
+          \ kubernetes_secret
+          \ kubernetes_service
+          \ kubernetes_storage_class
+          \ launchdarkly_team_member
+          \ linode_account
+          \ linode_domain
+          \ linode_image
+          \ linode_instance_type
+          \ linode_networking_ip
+          \ linode_object_storage_cluster
+          \ linode_profile
+          \ linode_region
+          \ linode_sshkey
+          \ linode_user
+          \ linode_volume
+          \ local_file
+          \ logentries_logset
+          \ logicmonitor_collectors
+          \ logicmonitor_dashboard
+          \ logicmonitor_dashboard_group
+          \ logicmonitor_device_group
+          \ metalcloud_volume_template
+          \ mongodbatlas_alert_configuration
+          \ mongodbatlas_auditing
+          \ mongodbatlas_cloud_provider_snapshot
+          \ mongodbatlas_cloud_provider_snapshot_restore_job
+          \ mongodbatlas_cloud_provider_snapshot_restore_jobs
+          \ mongodbatlas_cloud_provider_snapshots
+          \ mongodbatlas_cluster
+          \ mongodbatlas_clusters
+          \ mongodbatlas_custom_db_role
+          \ mongodbatlas_custom_db_roles
+          \ mongodbatlas_database_user
+          \ mongodbatlas_database_users
+          \ mongodbatlas_global_cluster_config
+          \ mongodbatlas_maintenance_window
+          \ mongodbatlas_network_container
+          \ mongodbatlas_network_containers
+          \ mongodbatlas_network_peering
+          \ mongodbatlas_network_peerings
+          \ mongodbatlas_private_endpoint
+          \ mongodbatlas_private_endpoint_interface_link
+          \ mongodbatlas_project
+          \ mongodbatlas_projects
+          \ mongodbatlas_team
+          \ mongodbatlas_teams
+          \ mongodbatlas_x509_authentication_database_user
+          \ ncloud_access_control_group
+          \ ncloud_access_control_groups
+          \ ncloud_access_control_rule
+          \ ncloud_access_control_rules
+          \ ncloud_member_server_image
+          \ ncloud_member_server_images
+          \ ncloud_nas_volume
+          \ ncloud_nas_volumes
+          \ ncloud_port_forwarding_rule
+          \ ncloud_port_forwarding_rules
+          \ ncloud_public_ip
+          \ ncloud_regions
+          \ ncloud_root_password
+          \ ncloud_server_image
+          \ ncloud_server_images
+          \ ncloud_server_product
+          \ ncloud_server_products
+          \ ncloud_zones
+          \ newrelic_alert_channel
+          \ newrelic_alert_policy
+          \ newrelic_application
+          \ newrelic_key_transaction
+          \ newrelic_plugin
+          \ newrelic_plugin_component
+          \ newrelic_synthetics_monitor
+          \ nomad_acl_policy
+          \ nomad_acl_token
+          \ nomad_deployments
+          \ nomad_job
+          \ nomad_namespaces
+          \ nomad_regions
+          \ ns1_datasource
+          \ ns1_dnssec
+          \ ns1_zone
+          \ nsxt_certificate
+          \ nsxt_edge_cluster
+          \ nsxt_firewall_section
+          \ nsxt_ip_pool
+          \ nsxt_logical_tier0_router
+          \ nsxt_logical_tier1_router
+          \ nsxt_mac_pool
+          \ nsxt_ns_group
+          \ nsxt_ns_service
+          \ nsxt_policy_certificate
+          \ nsxt_policy_edge_cluster
+          \ nsxt_policy_edge_node
+          \ nsxt_policy_ip_discovery_profile
+          \ nsxt_policy_ipv6_dad_profile
+          \ nsxt_policy_ipv6_ndra_profile
+          \ nsxt_policy_lb_app_profile
+          \ nsxt_policy_lb_client_ssl_profile
+          \ nsxt_policy_lb_monitor
+          \ nsxt_policy_lb_persistence_profile
+          \ nsxt_policy_lb_server_ssl_profile
+          \ nsxt_policy_mac_discovery_profile
+          \ nsxt_policy_qos_profile
+          \ nsxt_policy_realization_info
+          \ nsxt_policy_segment_security_profile
+          \ nsxt_policy_service
+          \ nsxt_policy_spoofguard_profile
+          \ nsxt_policy_tier0_gateway
+          \ nsxt_policy_tier1_gateway
+          \ nsxt_policy_transport_zone
+          \ nsxt_policy_vm
+          \ nsxt_policy_vni_pool
+          \ nsxt_switching_profile
+          \ nsxt_transport_zone
+          \ null_data_source
+          \ nutanix_category_key
+          \ nutanix_cluster
+          \ nutanix_clusters
+          \ nutanix_image
+          \ nutanix_network_security_rule
+          \ nutanix_subnet
+          \ nutanix_virtual_machine
+          \ nutanix_volume_group
+          \ nutanix_volume_groups
+          \ oci_analytics_analytics_instance
+          \ oci_analytics_analytics_instances
+          \ oci_apigateway_deployment
+          \ oci_apigateway_deployments
+          \ oci_apigateway_gateway
+          \ oci_apigateway_gateways
+          \ oci_audit_configuration
+          \ oci_audit_events
+          \ oci_autoscaling_auto_scaling_configuration
+          \ oci_autoscaling_auto_scaling_configurations
+          \ oci_budget_alert_rule
+          \ oci_budget_alert_rules
+          \ oci_budget_budget
+          \ oci_budget_budgets
+          \ oci_containerengine_cluster_kube_config
+          \ oci_containerengine_cluster_option
+          \ oci_containerengine_clusters
+          \ oci_containerengine_node_pool
+          \ oci_containerengine_node_pool_option
+          \ oci_containerengine_node_pools
+          \ oci_containerengine_work_request_errors
+          \ oci_containerengine_work_request_log_entries
+          \ oci_containerengine_work_requests
+          \ oci_core_app_catalog_listing
+          \ oci_core_app_catalog_listing_resource_version
+          \ oci_core_app_catalog_listing_resource_versions
+          \ oci_core_app_catalog_listings
+          \ oci_core_app_catalog_subscriptions
+          \ oci_core_boot_volume
+          \ oci_core_boot_volume_attachments
+          \ oci_core_boot_volume_backup
+          \ oci_core_boot_volume_backups
+          \ oci_core_boot_volumes
+          \ oci_core_cluster_network
+          \ oci_core_cluster_network_instances
+          \ oci_core_cluster_networks
+          \ oci_core_console_histories
+          \ oci_core_console_history_data
+          \ oci_core_cpes
+          \ oci_core_cross_connect
+          \ oci_core_cross_connect_group
+          \ oci_core_cross_connect_groups
+          \ oci_core_cross_connect_locations
+          \ oci_core_cross_connect_port_speed_shapes
+          \ oci_core_cross_connect_status
+          \ oci_core_cross_connects
+          \ oci_core_dedicated_vm_host
+          \ oci_core_dedicated_vm_host_instance_shapes
+          \ oci_core_dedicated_vm_host_shapes
+          \ oci_core_dedicated_vm_hosts
+          \ oci_core_dedicated_vm_hosts_instances
+          \ oci_core_dhcp_options
+          \ oci_core_drg_attachments
+          \ oci_core_drgs
+          \ oci_core_fast_connect_provider_service
+          \ oci_core_fast_connect_provider_service_key
+          \ oci_core_fast_connect_provider_services
+          \ oci_core_images
+          \ oci_core_instance
+          \ oci_core_instance_configuration
+          \ oci_core_instance_configurations
+          \ oci_core_instance_console_connections
+          \ oci_core_instance_credentials
+          \ oci_core_instance_devices
+          \ oci_core_instance_pool
+          \ oci_core_instance_pool_instances
+          \ oci_core_instance_pool_load_balancer_attachment
+          \ oci_core_instance_pools
+          \ oci_core_instances
+          \ oci_core_internet_gateways
+          \ oci_core_ipsec_config
+          \ oci_core_ipsec_connection_tunnel
+          \ oci_core_ipsec_connection_tunnels
+          \ oci_core_ipsec_connections
+          \ oci_core_ipsec_status
+          \ oci_core_letter_of_authority
+          \ oci_core_listing_resource_version
+          \ oci_core_listing_resource_versions
+          \ oci_core_local_peering_gateways
+          \ oci_core_nat_gateway
+          \ oci_core_nat_gateways
+          \ oci_core_network_security_group
+          \ oci_core_network_security_group_security_rules
+          \ oci_core_network_security_group_vnics
+          \ oci_core_network_security_groups
+          \ oci_core_peer_region_for_remote_peerings
+          \ oci_core_private_ip
+          \ oci_core_private_ips
+          \ oci_core_public_ip
+          \ oci_core_public_ips
+          \ oci_core_remote_peering_connections
+          \ oci_core_route_tables
+          \ oci_core_security_lists
+          \ oci_core_service_gateways
+          \ oci_core_services
+          \ oci_core_shape
+          \ oci_core_shapes
+          \ oci_core_subnet
+          \ oci_core_subnets
+          \ oci_core_vcn
+          \ oci_core_vcns
+          \ oci_core_virtual_circuit
+          \ oci_core_virtual_circuit_bandwidth_shapes
+          \ oci_core_virtual_circuit_public_prefixes
+          \ oci_core_virtual_circuits
+          \ oci_core_vnic
+          \ oci_core_vnic_attachments
+          \ oci_core_volume
+          \ oci_core_volume_attachments
+          \ oci_core_volume_backup_policies
+          \ oci_core_volume_backup_policy_assignments
+          \ oci_core_volume_backups
+          \ oci_core_volume_group_backups
+          \ oci_core_volume_groups
+          \ oci_core_volumes
+          \ oci_database_autonomous_container_database
+          \ oci_database_autonomous_container_databases
+          \ oci_database_autonomous_data_warehouse
+          \ oci_database_autonomous_data_warehouse_backup
+          \ oci_database_autonomous_data_warehouse_backups
+          \ oci_database_autonomous_data_warehouse_wallet
+          \ oci_database_autonomous_data_warehouses
+          \ oci_database_autonomous_database
+          \ oci_database_autonomous_database_backup
+          \ oci_database_autonomous_database_backups
+          \ oci_database_autonomous_database_instance_wallet_management
+          \ oci_database_autonomous_database_regional_wallet_management
+          \ oci_database_autonomous_database_wallet
+          \ oci_database_autonomous_databases
+          \ oci_database_autonomous_db_preview_versions
+          \ oci_database_autonomous_exadata_infrastructure
+          \ oci_database_autonomous_exadata_infrastructure_ocpu
+          \ oci_database_autonomous_exadata_infrastructure_shapes
+          \ oci_database_autonomous_exadata_infrastructures
+          \ oci_database_backup_destination
+          \ oci_database_backup_destinations
+          \ oci_database_backups
+          \ oci_database_data_guard_association
+          \ oci_database_data_guard_associations
+          \ oci_database_database
+          \ oci_database_databases
+          \ oci_database_db_home
+          \ oci_database_db_home_patch_history_entries
+          \ oci_database_db_home_patches
+          \ oci_database_db_homes
+          \ oci_database_db_node
+          \ oci_database_db_nodes
+          \ oci_database_db_system_patch_history_entries
+          \ oci_database_db_system_patches
+          \ oci_database_db_system_shapes
+          \ oci_database_db_systems
+          \ oci_database_db_versions
+          \ oci_database_exadata_infrastructure
+          \ oci_database_exadata_infrastructure_download_config_file
+          \ oci_database_exadata_infrastructures
+          \ oci_database_exadata_iorm_config
+          \ oci_database_gi_versions
+          \ oci_database_maintenance_run
+          \ oci_database_maintenance_runs
+          \ oci_database_vm_cluster
+          \ oci_database_vm_cluster_network
+          \ oci_database_vm_cluster_network_download_config_file
+          \ oci_database_vm_cluster_networks
+          \ oci_database_vm_cluster_recommended_network
+          \ oci_database_vm_clusters
+          \ oci_datacatalog_catalog
+          \ oci_datacatalog_catalog_type
+          \ oci_datacatalog_catalog_types
+          \ oci_datacatalog_catalogs
+          \ oci_datacatalog_connection
+          \ oci_datacatalog_connections
+          \ oci_datacatalog_data_asset
+          \ oci_datacatalog_data_assets
+          \ oci_dataflow_application
+          \ oci_dataflow_applications
+          \ oci_dataflow_invoke_run
+          \ oci_dataflow_invoke_runs
+          \ oci_dataflow_run_log
+          \ oci_dataflow_run_logs
+          \ oci_datascience_model
+          \ oci_datascience_model_provenance
+          \ oci_datascience_models
+          \ oci_datascience_notebook_session
+          \ oci_datascience_notebook_session_shapes
+          \ oci_datascience_notebook_sessions
+          \ oci_datascience_project
+          \ oci_datascience_projects
+          \ oci_dns_records
+          \ oci_dns_steering_policies
+          \ oci_dns_steering_policy
+          \ oci_dns_steering_policy_attachment
+          \ oci_dns_steering_policy_attachments
+          \ oci_dns_tsig_key
+          \ oci_dns_tsig_keys
+          \ oci_dns_zones
+          \ oci_email_sender
+          \ oci_email_senders
+          \ oci_email_suppression
+          \ oci_email_suppressions
+          \ oci_events_rule
+          \ oci_events_rules
+          \ oci_file_storage_export_sets
+          \ oci_file_storage_exports
+          \ oci_file_storage_file_systems
+          \ oci_file_storage_mount_targets
+          \ oci_file_storage_snapshot
+          \ oci_file_storage_snapshots
+          \ oci_functions_application
+          \ oci_functions_applications
+          \ oci_functions_function
+          \ oci_functions_functions
+          \ oci_health_checks_http_monitor
+          \ oci_health_checks_http_monitors
+          \ oci_health_checks_http_probe_results
+          \ oci_health_checks_ping_monitor
+          \ oci_health_checks_ping_monitors
+          \ oci_health_checks_ping_probe_results
+          \ oci_health_checks_vantage_points
+          \ oci_identity_api_keys
+          \ oci_identity_auth_tokens
+          \ oci_identity_authentication_policy
+          \ oci_identity_availability_domain
+          \ oci_identity_availability_domains
+          \ oci_identity_compartment
+          \ oci_identity_compartments
+          \ oci_identity_cost_tracking_tags
+          \ oci_identity_customer_secret_keys
+          \ oci_identity_dynamic_groups
+          \ oci_identity_fault_domains
+          \ oci_identity_group
+          \ oci_identity_groups
+          \ oci_identity_identity_provider_groups
+          \ oci_identity_identity_providers
+          \ oci_identity_idp_group_mappings
+          \ oci_identity_policies
+          \ oci_identity_region_subscriptions
+          \ oci_identity_regions
+          \ oci_identity_smtp_credentials
+          \ oci_identity_swift_passwords
+          \ oci_identity_tag_default
+          \ oci_identity_tag_defaults
+          \ oci_identity_tag_namespaces
+          \ oci_identity_tags
+          \ oci_identity_tenancy
+          \ oci_identity_ui_password
+          \ oci_identity_user
+          \ oci_identity_user_group_memberships
+          \ oci_identity_users
+          \ oci_integration_integration_instance
+          \ oci_integration_integration_instances
+          \ oci_kms_decrypted_data
+          \ oci_kms_encrypted_data
+          \ oci_kms_key
+          \ oci_kms_key_version
+          \ oci_kms_key_versions
+          \ oci_kms_keys
+          \ oci_kms_vault
+          \ oci_kms_vaults
+          \ oci_limits_limit_definitions
+          \ oci_limits_limit_values
+          \ oci_limits_quota
+          \ oci_limits_quotas
+          \ oci_limits_resource_availability
+          \ oci_limits_services
+          \ oci_load_balancer_backend_health
+          \ oci_load_balancer_backend_set_health
+          \ oci_load_balancer_backend_sets
+          \ oci_load_balancer_backends
+          \ oci_load_balancer_backendsets
+          \ oci_load_balancer_certificates
+          \ oci_load_balancer_health
+          \ oci_load_balancer_hostnames
+          \ oci_load_balancer_listener_rules
+          \ oci_load_balancer_load_balancers
+          \ oci_load_balancer_path_route_sets
+          \ oci_load_balancer_policies
+          \ oci_load_balancer_protocols
+          \ oci_load_balancer_rule_set
+          \ oci_load_balancer_rule_sets
+          \ oci_load_balancer_shapes
+          \ oci_load_balancers
+          \ oci_marketplace_accepted_agreement
+          \ oci_marketplace_accepted_agreements
+          \ oci_marketplace_categories
+          \ oci_marketplace_listing
+          \ oci_marketplace_listing_package
+          \ oci_marketplace_listing_package_agreements
+          \ oci_marketplace_listing_packages
+          \ oci_marketplace_listings
+          \ oci_marketplace_publishers
+          \ oci_monitoring_alarm
+          \ oci_monitoring_alarm_history_collection
+          \ oci_monitoring_alarm_statuses
+          \ oci_monitoring_alarms
+          \ oci_monitoring_metric_data
+          \ oci_monitoring_metrics
+          \ oci_objectstorage_bucket
+          \ oci_objectstorage_bucket_summaries
+          \ oci_objectstorage_namespace
+          \ oci_objectstorage_namespace_metadata
+          \ oci_objectstorage_object
+          \ oci_objectstorage_object_head
+          \ oci_objectstorage_object_lifecycle_policy
+          \ oci_objectstorage_objects
+          \ oci_objectstorage_preauthrequest
+          \ oci_objectstorage_preauthrequests
+          \ oci_oce_oce_instance
+          \ oci_oce_oce_instances
+          \ oci_oda_oda_instance
+          \ oci_oda_oda_instances
+          \ oci_ons_notification_topic
+          \ oci_ons_notification_topics
+          \ oci_ons_subscription
+          \ oci_ons_subscriptions
+          \ oci_osmanagement_managed_instance
+          \ oci_osmanagement_managed_instance_group
+          \ oci_osmanagement_managed_instance_groups
+          \ oci_osmanagement_managed_instances
+          \ oci_osmanagement_software_source
+          \ oci_osmanagement_software_sources
+          \ oci_resourcemanager_stack
+          \ oci_resourcemanager_stack_tf_state
+          \ oci_resourcemanager_stacks
+          \ oci_streaming_connect_harness
+          \ oci_streaming_connect_harnesses
+          \ oci_streaming_stream
+          \ oci_streaming_stream_archiver
+          \ oci_streaming_stream_pool
+          \ oci_streaming_stream_pools
+          \ oci_streaming_streams
+          \ oci_waas_address_list
+          \ oci_waas_address_lists
+          \ oci_waas_certificate
+          \ oci_waas_certificates
+          \ oci_waas_custom_protection_rule
+          \ oci_waas_custom_protection_rules
+          \ oci_waas_edge_subnets
+          \ oci_waas_http_redirect
+          \ oci_waas_http_redirects
+          \ oci_waas_waas_policies
+          \ oci_waas_waas_policy
+          \ okta_app
+          \ okta_app_metadata_saml
+          \ okta_app_saml
+          \ okta_default_policy
+          \ okta_everyone_group
+          \ okta_group
+          \ okta_idp_metadata_saml
+          \ okta_idp_saml
+          \ okta_policy
+          \ okta_user
+          \ okta_users
+          \ oneandone_instance_size
+          \ opc_compute_image_list_entry
+          \ opc_compute_ip_address_reservation
+          \ opc_compute_ip_reservation
+          \ opc_compute_machine_image
+          \ opc_compute_network_interface
+          \ opc_compute_ssh_key
+          \ opc_compute_storage_volume_snapshot
+          \ opc_compute_vnic
+          \ openstack_blockstorage_availability_zones_v3
+          \ openstack_blockstorage_snapshot_v2
+          \ openstack_blockstorage_snapshot_v3
+          \ openstack_blockstorage_volume_v2
+          \ openstack_blockstorage_volume_v3
+          \ openstack_compute_availability_zones_v2
+          \ openstack_compute_flavor_v2
+          \ openstack_compute_keypair_v2
+          \ openstack_containerinfra_cluster_v1
+          \ openstack_containerinfra_clustertemplate_v1
+          \ openstack_dns_zone_v2
+          \ openstack_fw_policy_v1
+          \ openstack_identity_auth_scope_v3
+          \ openstack_identity_endpoint_v3
+          \ openstack_identity_group_v3
+          \ openstack_identity_project_v3
+          \ openstack_identity_role_v3
+          \ openstack_identity_service_v3
+          \ openstack_identity_user_v3
+          \ openstack_images_image_v2
+          \ openstack_keymanager_container_v1
+          \ openstack_keymanager_secret_v1
+          \ openstack_networking_addressscope_v2
+          \ openstack_networking_floatingip_v2
+          \ openstack_networking_network_v2
+          \ openstack_networking_port_ids_v2
+          \ openstack_networking_port_v2
+          \ openstack_networking_qos_bandwidth_limit_rule_v2
+          \ openstack_networking_qos_dscp_marking_rule_v2
+          \ openstack_networking_qos_minimum_bandwidth_rule_v2
+          \ openstack_networking_qos_policy_v2
+          \ openstack_networking_router_v2
+          \ openstack_networking_secgroup_v2
+          \ openstack_networking_subnet_v2
+          \ openstack_networking_subnetpool_v2
+          \ openstack_networking_trunk_v2
+          \ openstack_sharedfilesystem_availability_zones_v2
+          \ openstack_sharedfilesystem_share_v2
+          \ openstack_sharedfilesystem_sharenetwork_v2
+          \ openstack_sharedfilesystem_snapshot_v2
+          \ opentelekomcloud_antiddos_v1
+          \ opentelekomcloud_cce_cluster_v3
+          \ opentelekomcloud_cce_node_ids_v3
+          \ opentelekomcloud_cce_node_v3
+          \ opentelekomcloud_compute_bms_flavors_v2
+          \ opentelekomcloud_compute_bms_keypairs_v2
+          \ opentelekomcloud_compute_bms_nic_v2
+          \ opentelekomcloud_compute_bms_server_v2
+          \ opentelekomcloud_csbs_backup_policy_v1
+          \ opentelekomcloud_csbs_backup_v1
+          \ opentelekomcloud_cts_tracker_v1
+          \ opentelekomcloud_dcs_az_v1
+          \ opentelekomcloud_dcs_maintainwindow_v1
+          \ opentelekomcloud_dcs_product_v1
+          \ opentelekomcloud_deh_host_v1
+          \ opentelekomcloud_deh_server_v1
+          \ opentelekomcloud_identity_group_v3
+          \ opentelekomcloud_identity_project_v3
+          \ opentelekomcloud_identity_role_v3
+          \ opentelekomcloud_identity_user_v3
+          \ opentelekomcloud_images_image_v2
+          \ opentelekomcloud_kms_data_key_v1
+          \ opentelekomcloud_kms_key_v1
+          \ opentelekomcloud_networking_network_v2
+          \ opentelekomcloud_networking_port_v2
+          \ opentelekomcloud_networking_secgroup_v2
+          \ opentelekomcloud_rds_flavors_v1
+          \ opentelekomcloud_rds_flavors_v3
+          \ opentelekomcloud_rts_software_config_v1
+          \ opentelekomcloud_rts_software_deployment_v1
+          \ opentelekomcloud_rts_stack_resource_v1
+          \ opentelekomcloud_rts_stack_v1
+          \ opentelekomcloud_s3_bucket_object
+          \ opentelekomcloud_sdrs_domain_v1
+          \ opentelekomcloud_sfs_file_system_v2
+          \ opentelekomcloud_vbs_backup_policy_v2
+          \ opentelekomcloud_vbs_backup_v2
+          \ opentelekomcloud_vpc_peering_connection_v2
+          \ opentelekomcloud_vpc_route_ids_v2
+          \ opentelekomcloud_vpc_route_v2
+          \ opentelekomcloud_vpc_subnet_ids_v1
+          \ opentelekomcloud_vpc_subnet_v1
+          \ opentelekomcloud_vpc_v1
+          \ opsgenie_escalation
+          \ opsgenie_heartbeat
+          \ opsgenie_schedule
+          \ opsgenie_team
+          \ opsgenie_user
+          \ oraclepaas_database_service_instance
+          \ ovh_cloud_region
+          \ ovh_cloud_regions
+          \ ovh_dedicated_installation_templates
+          \ ovh_dedicated_server
+          \ ovh_dedicated_server_boots
+          \ ovh_dedicated_servers
+          \ ovh_domain_zone
+          \ ovh_iploadbalancing
+          \ ovh_iploadbalancing_vrack_network
+          \ ovh_iploadbalancing_vrack_networks
+          \ ovh_me_installation_template
+          \ ovh_me_installation_templates
+          \ ovh_me_paymentmean_bankaccount
+          \ ovh_me_paymentmean_creditcard
+          \ ovh_me_ssh_key
+          \ ovh_me_ssh_keys
+          \ ovh_publiccloud_region
+          \ ovh_publiccloud_regions
+          \ ovh_vracks
+          \ packet_device
+          \ packet_ip_block_ranges
+          \ packet_operating_system
+          \ packet_organization
+          \ packet_precreated_ip_block
+          \ packet_project
+          \ packet_spot_market_price
+          \ packet_spot_market_request
+          \ packet_volume
+          \ pagerduty_escalation_policy
+          \ pagerduty_extension_schema
+          \ pagerduty_schedule
+          \ pagerduty_service
+          \ pagerduty_team
+          \ pagerduty_user
+          \ pagerduty_vendor
+          \ panos_dhcp_interface_info
+          \ panos_panorama_plugin
+          \ panos_system_info
+          \ profitbricks_datacenter
+          \ profitbricks_image
+          \ profitbricks_location
+          \ profitbricks_resource
+          \ profitbricks_snapshot
+          \ pureport_accounts
+          \ pureport_aws_connection
+          \ pureport_azure_connection
+          \ pureport_cloud_regions
+          \ pureport_cloud_services
+          \ pureport_connections
+          \ pureport_google_cloud_connection
+          \ pureport_locations
+          \ pureport_networks
+          \ pureport_site_vpn_connection
+          \ rancher2_app
+          \ rancher2_catalog
+          \ rancher2_certificate
+          \ rancher2_cloud_credential
+          \ rancher2_cluster
+          \ rancher2_cluster_alert_group
+          \ rancher2_cluster_alert_rule
+          \ rancher2_cluster_driver
+          \ rancher2_cluster_logging
+          \ rancher2_cluster_role_template_binding
+          \ rancher2_cluster_template
+          \ rancher2_etcd_backup
+          \ rancher2_global_role_binding
+          \ rancher2_multi_cluster_app
+          \ rancher2_namespace
+          \ rancher2_node_driver
+          \ rancher2_node_pool
+          \ rancher2_node_template
+          \ rancher2_notifier
+          \ rancher2_project
+          \ rancher2_project_alert_group
+          \ rancher2_project_alert_rule
+          \ rancher2_project_logging
+          \ rancher2_project_role_template_binding
+          \ rancher2_registry
+          \ rancher2_role_template
+          \ rancher2_secret
+          \ rancher2_setting
+          \ rancher2_user
+          \ rancher_certificate
+          \ rancher_environment
+          \ rancher_setting
+          \ rightscale_cloud
+          \ rightscale_credential
+          \ rightscale_datacenter
+          \ rightscale_deployment
+          \ rightscale_image
+          \ rightscale_instance
+          \ rightscale_instance_type
+          \ rightscale_multi_cloud_image
+          \ rightscale_network
+          \ rightscale_network_gateway
+          \ rightscale_route_table
+          \ rightscale_security_group
+          \ rightscale_server
+          \ rightscale_server_template
+          \ rightscale_ssh_key
+          \ rightscale_subnet
+          \ rightscale_volume
+          \ rightscale_volume_snapshot
+          \ rightscale_volume_type
+          \ runscope_bucket
+          \ runscope_buckets
+          \ runscope_integration
+          \ runscope_integrations
+          \ scaffolding_data_source
+          \ scaleway_account_ssh_key
+          \ scaleway_baremetal_offer_beta
+          \ scaleway_bootscript
+          \ scaleway_image
+          \ scaleway_instance_image
+          \ scaleway_instance_security_group
+          \ scaleway_instance_server
+          \ scaleway_instance_volume
+          \ scaleway_marketplace_image_beta
+          \ scaleway_security_group
+          \ scaleway_volume
+          \ skytap_project
+          \ skytap_template
+          \ telefonicaopencloud_csbs_backup_policy_v1
+          \ telefonicaopencloud_csbs_backup_v1
+          \ telefonicaopencloud_cts_tracker_v1
+          \ telefonicaopencloud_dcs_az_v1
+          \ telefonicaopencloud_dcs_maintainwindow_v1
+          \ telefonicaopencloud_dcs_product_v1
+          \ telefonicaopencloud_dns_zone_v2
+          \ telefonicaopencloud_networking_network_v2
+          \ telefonicaopencloud_networking_secgroup_v2
+          \ telefonicaopencloud_networking_subnet_v2
+          \ telefonicaopencloud_rds_flavors_v1
+          \ telefonicaopencloud_rts_software_config_v1
+          \ telefonicaopencloud_rts_stack_resource_v1
+          \ telefonicaopencloud_rts_stack_v1
+          \ telefonicaopencloud_s3_bucket_object
+          \ telefonicaopencloud_sfs_file_system_v2
+          \ telefonicaopencloud_vbs_backup_policy_v2
+          \ telefonicaopencloud_vbs_backup_v2
+          \ telefonicaopencloud_vpc_subnet_ids_v1
+          \ telefonicaopencloud_vpc_subnet_v1
+          \ telefonicaopencloud_vpc_v1
+          \ template_cloudinit_config
+          \ template_file
+          \ tencentcloud_as_scaling_configs
+          \ tencentcloud_as_scaling_groups
+          \ tencentcloud_as_scaling_policies
+          \ tencentcloud_availability_zones
+          \ tencentcloud_cam_group_memberships
+          \ tencentcloud_cam_group_policy_attachments
+          \ tencentcloud_cam_groups
+          \ tencentcloud_cam_policies
+          \ tencentcloud_cam_role_policy_attachments
+          \ tencentcloud_cam_roles
+          \ tencentcloud_cam_saml_providers
+          \ tencentcloud_cam_user_policy_attachments
+          \ tencentcloud_cam_users
+          \ tencentcloud_cbs_snapshot_policies
+          \ tencentcloud_cbs_snapshots
+          \ tencentcloud_cbs_storages
+          \ tencentcloud_ccn_bandwidth_limits
+          \ tencentcloud_ccn_instances
+          \ tencentcloud_cfs_access_groups
+          \ tencentcloud_cfs_access_rules
+          \ tencentcloud_cfs_file_systems
+          \ tencentcloud_clb_attachments
+          \ tencentcloud_clb_instances
+          \ tencentcloud_clb_listener_rules
+          \ tencentcloud_clb_listeners
+          \ tencentcloud_clb_redirections
+          \ tencentcloud_container_cluster_instances
+          \ tencentcloud_container_clusters
+          \ tencentcloud_cos_bucket_object
+          \ tencentcloud_cos_buckets
+          \ tencentcloud_dayu_cc_http_policies
+          \ tencentcloud_dayu_cc_https_policies
+          \ tencentcloud_dayu_ddos_policies
+          \ tencentcloud_dayu_ddos_policy_attachments
+          \ tencentcloud_dayu_ddos_policy_cases
+          \ tencentcloud_dayu_l4_rules
+          \ tencentcloud_dayu_l7_rules
+          \ tencentcloud_dc_gateway_ccn_routes
+          \ tencentcloud_dc_gateway_instances
+          \ tencentcloud_dc_instances
+          \ tencentcloud_dcx_instances
+          \ tencentcloud_dnats
+          \ tencentcloud_eip
+          \ tencentcloud_eips
+          \ tencentcloud_enis
+          \ tencentcloud_gaap_certificates
+          \ tencentcloud_gaap_domain_error_pages
+          \ tencentcloud_gaap_http_domains
+          \ tencentcloud_gaap_http_rules
+          \ tencentcloud_gaap_layer4_listeners
+          \ tencentcloud_gaap_layer7_listeners
+          \ tencentcloud_gaap_proxies
+          \ tencentcloud_gaap_realservers
+          \ tencentcloud_gaap_security_policies
+          \ tencentcloud_gaap_security_rules
+          \ tencentcloud_ha_vip_eip_attachments
+          \ tencentcloud_ha_vips
+          \ tencentcloud_image
+          \ tencentcloud_images
+          \ tencentcloud_instance_types
+          \ tencentcloud_instances
+          \ tencentcloud_key_pairs
+          \ tencentcloud_kubernetes_clusters
+          \ tencentcloud_mongodb_instances
+          \ tencentcloud_mongodb_zone_config
+          \ tencentcloud_mysql_backup_list
+          \ tencentcloud_mysql_instance
+          \ tencentcloud_mysql_parameter_list
+          \ tencentcloud_mysql_zone_config
+          \ tencentcloud_nat_gateways
+          \ tencentcloud_nats
+          \ tencentcloud_placement_groups
+          \ tencentcloud_redis_instances
+          \ tencentcloud_redis_zone_config
+          \ tencentcloud_reserved_instance_configs
+          \ tencentcloud_reserved_instances
+          \ tencentcloud_route_table
+          \ tencentcloud_scf_functions
+          \ tencentcloud_scf_logs
+          \ tencentcloud_scf_namespaces
+          \ tencentcloud_security_group
+          \ tencentcloud_security_groups
+          \ tencentcloud_ssl_certificates
+          \ tencentcloud_subnet
+          \ tencentcloud_tcaplus_applications
+          \ tencentcloud_tcaplus_idls
+          \ tencentcloud_tcaplus_tables
+          \ tencentcloud_tcaplus_zones
+          \ tencentcloud_vpc
+          \ tencentcloud_vpc_instances
+          \ tencentcloud_vpc_route_tables
+          \ tencentcloud_vpc_subnets
+          \ tencentcloud_vpn_connections
+          \ tencentcloud_vpn_customer_gateways
+          \ tencentcloud_vpn_gateways
+          \ terraform_remote_state
+          \ test_data_source
+          \ test_provider_label
+          \ tfe_ssh_key
+          \ tfe_team
+          \ tfe_team_access
+          \ tfe_workspace
+          \ tfe_workspace_ids
+          \ tls_public_key
+          \ triton_account
+          \ triton_datacenter
+          \ triton_fabric_network
+          \ triton_fabric_vlan
+          \ triton_image
+          \ triton_network
+          \ triton_package
+          \ ucloud_db_instances
+          \ ucloud_disks
+          \ ucloud_eips
+          \ ucloud_images
+          \ ucloud_instances
+          \ ucloud_lb_attachments
+          \ ucloud_lb_listeners
+          \ ucloud_lb_rules
+          \ ucloud_lb_ssls
+          \ ucloud_lbs
+          \ ucloud_projects
+          \ ucloud_security_groups
+          \ ucloud_subnets
+          \ ucloud_vpcs
+          \ ucloud_zones
+          \ vsphere_compute_cluster
+          \ vsphere_custom_attribute
+          \ vsphere_datacenter
+          \ vsphere_datastore
+          \ vsphere_datastore_cluster
+          \ vsphere_distributed_virtual_switch
+          \ vsphere_folder
+          \ vsphere_host
+          \ vsphere_network
+          \ vsphere_resource_pool
+          \ vsphere_storage_policy
+          \ vsphere_tag
+          \ vsphere_tag_category
+          \ vsphere_vapp_container
+          \ vsphere_virtual_machine
+          \ vsphere_vmfs_disks
+          \ vultr_account
+          \ vultr_api_key
+          \ vultr_application
+          \ vultr_backup
+          \ vultr_bare_metal_plan
+          \ vultr_bare_metal_server
+          \ vultr_block_storage
+          \ vultr_dns_domain
+          \ vultr_firewall_group
+          \ vultr_iso_private
+          \ vultr_iso_public
+          \ vultr_network
+          \ vultr_os
+          \ vultr_plan
+          \ vultr_region
+          \ vultr_reserved_ip
+          \ vultr_server
+          \ vultr_snapshot
+          \ vultr_ssh_key
+          \ vultr_startup_script
+          \ vultr_user
+          \ yandex_compute_disk
+          \ yandex_compute_image
+          \ yandex_compute_instance
+          \ yandex_compute_instance_group
+          \ yandex_compute_snapshot
+          \ yandex_container_registry
+          \ yandex_dataproc_cluster
+          \ yandex_iam_policy
+          \ yandex_iam_role
+          \ yandex_iam_service_account
+          \ yandex_iam_user
+          \ yandex_kubernetes_cluster
+          \ yandex_kubernetes_node_group
+          \ yandex_lb_network_load_balancer
+          \ yandex_lb_target_group
+          \ yandex_mdb_clickhouse_cluster
+          \ yandex_mdb_mongodb_cluster
+          \ yandex_mdb_mysql_cluster
+          \ yandex_mdb_postgresql_cluster
+          \ yandex_mdb_redis_cluster
+          \ yandex_resourcemanager_cloud
+          \ yandex_resourcemanager_folder
+          \ yandex_vpc_network
+          \ yandex_vpc_route_table
+          \ yandex_vpc_subnet
+""" end data sources
+
+""" resource
+syn keyword terraResourceTypeBI
+          \ aci_access_port_block
+          \ aci_access_port_selector
+          \ aci_application_epg
+          \ aci_application_profile
+          \ aci_attachable_access_entity_profile
+          \ aci_autonomous_system_profile
+          \ aci_bridge_domain
+          \ aci_cloud_applicationcontainer
+          \ aci_cloud_availability_zone
+          \ aci_cloud_aws_provider
+          \ aci_cloud_cidr_pool
+          \ aci_cloud_context_profile
+          \ aci_cloud_domain_profile
+          \ aci_cloud_e_pg
+          \ aci_cloud_endpoint_selector
+          \ aci_cloud_endpoint_selectorfor_external_e_pgs
+          \ aci_cloud_external_e_pg
+          \ aci_cloud_provider_profile
+          \ aci_cloud_providers_region
+          \ aci_cloud_subnet
+          \ aci_contract
+          \ aci_contract_subject
+          \ aci_end_point_retention_policy
+          \ aci_external_network_instance_profile
+          \ aci_filter
+          \ aci_filter_entry
+          \ aci_interface_fc_policy
+          \ aci_l2_interface_policy
+          \ aci_l3_ext_subnet
+          \ aci_l3_outside
+          \ aci_lacp_policy
+          \ aci_leaf_access_port_policy_group
+          \ aci_leaf_interface_profile
+          \ aci_leaf_profile
+          \ aci_lldp_interface_policy
+          \ aci_logical_interface_profile
+          \ aci_logical_node_profile
+          \ aci_miscabling_protocol_interface_policy
+          \ aci_ospf_interface_policy
+          \ aci_pcvpc_interface_policy_group
+          \ aci_port_security_policy
+          \ aci_rest
+          \ aci_subnet
+          \ aci_tenant
+          \ aci_vlan_encapsulationfor_vxlan_traffic
+          \ aci_vmm_domain
+          \ aci_vrf
+          \ acme_certificate
+          \ acme_registration
+          \ akamai_cp_code
+          \ akamai_dns_record
+          \ akamai_dns_zone
+          \ akamai_edge_hostname
+          \ akamai_property
+          \ akamai_property_activation
+          \ akamai_property_rules
+          \ akamai_property_variables
+          \ alicloud_actiontrail
+          \ alicloud_alikafka_consumer_group
+          \ alicloud_alikafka_instance
+          \ alicloud_alikafka_sasl_acl
+          \ alicloud_alikafka_sasl_user
+          \ alicloud_alikafka_topic
+          \ alicloud_api_gateway_api
+          \ alicloud_api_gateway_app
+          \ alicloud_api_gateway_app_attachment
+          \ alicloud_api_gateway_group
+          \ alicloud_api_gateway_vpc_access
+          \ alicloud_cas_certificate
+          \ alicloud_cdn_domain
+          \ alicloud_cdn_domain_config
+          \ alicloud_cdn_domain_new
+          \ alicloud_cen_bandwidth_limit
+          \ alicloud_cen_bandwidth_package
+          \ alicloud_cen_bandwidth_package_attachment
+          \ alicloud_cen_instance
+          \ alicloud_cen_instance_attachment
+          \ alicloud_cen_instance_grant
+          \ alicloud_cen_route_entry
+          \ alicloud_cloud_connect_network
+          \ alicloud_cloud_connect_network_attachment
+          \ alicloud_cloud_connect_network_grant
+          \ alicloud_cms_alarm
+          \ alicloud_common_bandwidth_package
+          \ alicloud_common_bandwidth_package_attachment
+          \ alicloud_container_cluster
+          \ alicloud_copy_image
+          \ alicloud_cr_namespace
+          \ alicloud_cr_repo
+          \ alicloud_cs_application
+          \ alicloud_cs_kubernetes
+          \ alicloud_cs_kubernetes_autoscaler
+          \ alicloud_cs_managed_kubernetes
+          \ alicloud_cs_serverless_kubernetes
+          \ alicloud_cs_swarm
+          \ alicloud_datahub_project
+          \ alicloud_datahub_subscription
+          \ alicloud_datahub_topic
+          \ alicloud_db_account
+          \ alicloud_db_account_privilege
+          \ alicloud_db_backup_policy
+          \ alicloud_db_connection
+          \ alicloud_db_database
+          \ alicloud_db_instance
+          \ alicloud_db_read_write_splitting_connection
+          \ alicloud_db_readonly_instance
+          \ alicloud_ddosbgp_instance
+          \ alicloud_ddoscoo_instance
+          \ alicloud_disk
+          \ alicloud_disk_attachment
+          \ alicloud_dns
+          \ alicloud_dns_group
+          \ alicloud_dns_record
+          \ alicloud_drds_instance
+          \ alicloud_eip
+          \ alicloud_eip_association
+          \ alicloud_elasticsearch_instance
+          \ alicloud_emr_cluster
+          \ alicloud_ess_alarm
+          \ alicloud_ess_attachment
+          \ alicloud_ess_lifecycle_hook
+          \ alicloud_ess_notification
+          \ alicloud_ess_scaling_configuration
+          \ alicloud_ess_scaling_group
+          \ alicloud_ess_scaling_rule
+          \ alicloud_ess_scalinggroup_vserver_groups
+          \ alicloud_ess_schedule
+          \ alicloud_ess_scheduled_task
+          \ alicloud_fc_function
+          \ alicloud_fc_service
+          \ alicloud_fc_trigger
+          \ alicloud_forward_entry
+          \ alicloud_gpdb_connection
+          \ alicloud_gpdb_instance
+          \ alicloud_havip
+          \ alicloud_havip_attachment
+          \ alicloud_hbase_instance
+          \ alicloud_image
+          \ alicloud_image_copy
+          \ alicloud_image_export
+          \ alicloud_image_import
+          \ alicloud_image_share_permission
+          \ alicloud_instance
+          \ alicloud_key_pair
+          \ alicloud_key_pair_attachment
+          \ alicloud_kms_ciphertext
+          \ alicloud_kms_key
+          \ alicloud_kvstore_account
+          \ alicloud_kvstore_backup_policy
+          \ alicloud_kvstore_instance
+          \ alicloud_launch_template
+          \ alicloud_log_machine_group
+          \ alicloud_log_project
+          \ alicloud_log_store
+          \ alicloud_log_store_index
+          \ alicloud_logtail_attachment
+          \ alicloud_logtail_config
+          \ alicloud_market_order
+          \ alicloud_mns_queue
+          \ alicloud_mns_topic
+          \ alicloud_mns_topic_subscription
+          \ alicloud_mongodb_instance
+          \ alicloud_mongodb_sharding_instance
+          \ alicloud_nas_access_group
+          \ alicloud_nas_access_rule
+          \ alicloud_nas_file_system
+          \ alicloud_nas_mount_target
+          \ alicloud_nat_gateway
+          \ alicloud_network_acl
+          \ alicloud_network_acl_attachment
+          \ alicloud_network_acl_entries
+          \ alicloud_network_interface
+          \ alicloud_network_interface_attachment
+          \ alicloud_ons_group
+          \ alicloud_ons_instance
+          \ alicloud_ons_topic
+          \ alicloud_oss_bucket
+          \ alicloud_oss_bucket_object
+          \ alicloud_ots_instance
+          \ alicloud_ots_instance_attachment
+          \ alicloud_ots_table
+          \ alicloud_polardb_account
+          \ alicloud_polardb_account_privilege
+          \ alicloud_polardb_backup_policy
+          \ alicloud_polardb_cluster
+          \ alicloud_polardb_database
+          \ alicloud_polardb_endpoint_address
+          \ alicloud_pvtz_zone
+          \ alicloud_pvtz_zone_attachment
+          \ alicloud_pvtz_zone_record
+          \ alicloud_ram_access_key
+          \ alicloud_ram_account_alias
+          \ alicloud_ram_account_password_policy
+          \ alicloud_ram_alias
+          \ alicloud_ram_group
+          \ alicloud_ram_group_membership
+          \ alicloud_ram_group_policy_attachment
+          \ alicloud_ram_login_profile
+          \ alicloud_ram_policy
+          \ alicloud_ram_role
+          \ alicloud_ram_role_attachment
+          \ alicloud_ram_role_policy_attachment
+          \ alicloud_ram_user
+          \ alicloud_ram_user_policy_attachment
+          \ alicloud_reserved_instance
+          \ alicloud_route_entry
+          \ alicloud_route_table
+          \ alicloud_route_table_attachment
+          \ alicloud_router_interface
+          \ alicloud_router_interface_connection
+          \ alicloud_sag_acl
+          \ alicloud_sag_acl_rule
+          \ alicloud_sag_client_user
+          \ alicloud_sag_dnat_entry
+          \ alicloud_sag_qos
+          \ alicloud_sag_qos_car
+          \ alicloud_sag_qos_policy
+          \ alicloud_sag_snat_entry
+          \ alicloud_security_group
+          \ alicloud_security_group_rule
+          \ alicloud_slb
+          \ alicloud_slb_acl
+          \ alicloud_slb_attachment
+          \ alicloud_slb_backend_server
+          \ alicloud_slb_ca_certificate
+          \ alicloud_slb_domain_extension
+          \ alicloud_slb_listener
+          \ alicloud_slb_master_slave_server_group
+          \ alicloud_slb_rule
+          \ alicloud_slb_server_certificate
+          \ alicloud_slb_server_group
+          \ alicloud_snapshot
+          \ alicloud_snapshot_policy
+          \ alicloud_snat_entry
+          \ alicloud_ssl_vpn_client_cert
+          \ alicloud_ssl_vpn_server
+          \ alicloud_subnet
+          \ alicloud_vpc
+          \ alicloud_vpn_connection
+          \ alicloud_vpn_customer_gateway
+          \ alicloud_vpn_gateway
+          \ alicloud_vpn_route_entry
+          \ alicloud_vswitch
+          \ alicloud_yundun_bastionhost_instance
+          \ alicloud_yundun_dbaudit_instance
+          \ arukas_container
+          \ auth0_resource_server
+          \ avi_actiongroupconfig
+          \ avi_alertconfig
+          \ avi_alertemailconfig
+          \ avi_alertscriptconfig
+          \ avi_alertsyslogconfig
+          \ avi_analyticsprofile
+          \ avi_applicationpersistenceprofile
+          \ avi_applicationprofile
+          \ avi_authprofile
+          \ avi_autoscalelaunchconfig
+          \ avi_backup
+          \ avi_backupconfiguration
+          \ avi_certificatemanagementprofile
+          \ avi_cloud
+          \ avi_cloudconnectoruser
+          \ avi_cloudproperties
+          \ avi_cluster
+          \ avi_clusterclouddetails
+          \ avi_controllerportalregistration
+          \ avi_controllerproperties
+          \ avi_controllersite
+          \ avi_customerportalinfo
+          \ avi_customipamdnsprofile
+          \ avi_dnspolicy
+          \ avi_errorpagebody
+          \ avi_errorpageprofile
+          \ avi_fileservice
+          \ avi_gslb
+          \ avi_gslbgeodbprofile
+          \ avi_gslbservice
+          \ avi_hardwaresecuritymodulegroup
+          \ avi_healthmonitor
+          \ avi_httppolicyset
+          \ avi_image
+          \ avi_ipaddrgroup
+          \ avi_ipamdnsproviderprofile
+          \ avi_l4policyset
+          \ avi_microservicegroup
+          \ avi_natpolicy
+          \ avi_network
+          \ avi_networkprofile
+          \ avi_networksecuritypolicy
+          \ avi_networkservice
+          \ avi_objectaccesspolicy
+          \ avi_pingaccessagent
+          \ avi_pkiprofile
+          \ avi_pool
+          \ avi_poolgroup
+          \ avi_poolgroupdeploymentpolicy
+          \ avi_portalfileupload
+          \ avi_prioritylabels
+          \ avi_protocolparser
+          \ avi_role
+          \ avi_scheduler
+          \ avi_securitypolicy
+          \ avi_seproperties
+          \ avi_server
+          \ avi_serverautoscalepolicy
+          \ avi_serviceengine
+          \ avi_serviceenginegroup
+          \ avi_snmptrapprofile
+          \ avi_sslkeyandcertificate
+          \ avi_sslprofile
+          \ avi_ssopolicy
+          \ avi_stringgroup
+          \ avi_systemconfiguration
+          \ avi_tenant
+          \ avi_testsedatastorelevel1
+          \ avi_testsedatastorelevel2
+          \ avi_testsedatastorelevel3
+          \ avi_trafficcloneprofile
+          \ avi_upgradestatusinfo
+          \ avi_upgradestatussummary
+          \ avi_useraccount
+          \ avi_useraccountprofile
+          \ avi_virtualservice
+          \ avi_vrfcontext
+          \ avi_vsdatascriptset
+          \ avi_vsvip
+          \ avi_wafcrs
+          \ avi_wafpolicy
+          \ avi_wafpolicypsmgroup
+          \ avi_wafprofile
+          \ avi_webhook
+          \ aviatrix_account
+          \ aviatrix_account_user
+          \ aviatrix_arm_peer
+          \ aviatrix_aws_peer
+          \ aviatrix_aws_tgw
+          \ aviatrix_aws_tgw_directconnect
+          \ aviatrix_aws_tgw_vpc_attachment
+          \ aviatrix_aws_tgw_vpn_conn
+          \ aviatrix_controller_config
+          \ aviatrix_firenet
+          \ aviatrix_firewall
+          \ aviatrix_firewall_instance
+          \ aviatrix_firewall_tag
+          \ aviatrix_fqdn
+          \ aviatrix_gateway
+          \ aviatrix_gateway_dnat
+          \ aviatrix_gateway_snat
+          \ aviatrix_geo_vpn
+          \ aviatrix_saml_endpoint
+          \ aviatrix_site2cloud
+          \ aviatrix_spoke_gateway
+          \ aviatrix_spoke_vpc
+          \ aviatrix_trans_peer
+          \ aviatrix_transit_gateway
+          \ aviatrix_transit_gateway_peering
+          \ aviatrix_transit_vpc
+          \ aviatrix_tunnel
+          \ aviatrix_vgw_conn
+          \ aviatrix_vpc
+          \ aviatrix_vpn_profile
+          \ aviatrix_vpn_user
+          \ aviatrix_vpn_user_accelerator
+          \ aws_accessanalyzer_analyzer
+          \ aws_acm_certificate
+          \ aws_acm_certificate_validation
+          \ aws_acmpca_certificate_authority
+          \ aws_alb
+          \ aws_alb_listener
+          \ aws_alb_listener_certificate
+          \ aws_alb_listener_rule
+          \ aws_alb_target_group
+          \ aws_alb_target_group_attachment
+          \ aws_ami
+          \ aws_ami_copy
+          \ aws_ami_from_instance
+          \ aws_ami_launch_permission
+          \ aws_api_gateway_account
+          \ aws_api_gateway_api_key
+          \ aws_api_gateway_authorizer
+          \ aws_api_gateway_base_path_mapping
+          \ aws_api_gateway_client_certificate
+          \ aws_api_gateway_deployment
+          \ aws_api_gateway_documentation_part
+          \ aws_api_gateway_documentation_version
+          \ aws_api_gateway_domain_name
+          \ aws_api_gateway_gateway_response
+          \ aws_api_gateway_integration
+          \ aws_api_gateway_integration_response
+          \ aws_api_gateway_method
+          \ aws_api_gateway_method_response
+          \ aws_api_gateway_method_settings
+          \ aws_api_gateway_model
+          \ aws_api_gateway_request_validator
+          \ aws_api_gateway_resource
+          \ aws_api_gateway_rest_api
+          \ aws_api_gateway_stage
+          \ aws_api_gateway_usage_plan
+          \ aws_api_gateway_usage_plan_key
+          \ aws_api_gateway_vpc_link
+          \ aws_app_cookie_stickiness_policy
+          \ aws_appautoscaling_policy
+          \ aws_appautoscaling_scheduled_action
+          \ aws_appautoscaling_target
+          \ aws_appmesh_mesh
+          \ aws_appmesh_route
+          \ aws_appmesh_virtual_node
+          \ aws_appmesh_virtual_router
+          \ aws_appmesh_virtual_service
+          \ aws_appsync_api_key
+          \ aws_appsync_datasource
+          \ aws_appsync_function
+          \ aws_appsync_graphql_api
+          \ aws_appsync_resolver
+          \ aws_athena_database
+          \ aws_athena_named_query
+          \ aws_athena_workgroup
+          \ aws_autoscaling_attachment
+          \ aws_autoscaling_group
+          \ aws_autoscaling_lifecycle_hook
+          \ aws_autoscaling_notification
+          \ aws_autoscaling_policy
+          \ aws_autoscaling_schedule
+          \ aws_backup_plan
+          \ aws_backup_selection
+          \ aws_backup_vault
+          \ aws_batch_compute_environment
+          \ aws_batch_job_definition
+          \ aws_batch_job_queue
+          \ aws_budgets_budget
+          \ aws_cloud9_environment_ec2
+          \ aws_cloudformation_stack
+          \ aws_cloudformation_stack_set
+          \ aws_cloudformation_stack_set_instance
+          \ aws_cloudfront_distribution
+          \ aws_cloudfront_origin_access_identity
+          \ aws_cloudfront_public_key
+          \ aws_cloudhsm_v2_cluster
+          \ aws_cloudhsm_v2_hsm
+          \ aws_cloudtrail
+          \ aws_cloudwatch_dashboard
+          \ aws_cloudwatch_event_permission
+          \ aws_cloudwatch_event_rule
+          \ aws_cloudwatch_event_target
+          \ aws_cloudwatch_log_destination
+          \ aws_cloudwatch_log_destination_policy
+          \ aws_cloudwatch_log_group
+          \ aws_cloudwatch_log_metric_filter
+          \ aws_cloudwatch_log_resource_policy
+          \ aws_cloudwatch_log_stream
+          \ aws_cloudwatch_log_subscription_filter
+          \ aws_cloudwatch_metric_alarm
+          \ aws_codebuild_project
+          \ aws_codebuild_source_credential
+          \ aws_codebuild_webhook
+          \ aws_codecommit_repository
+          \ aws_codecommit_trigger
+          \ aws_codedeploy_app
+          \ aws_codedeploy_deployment_config
+          \ aws_codedeploy_deployment_group
+          \ aws_codepipeline
+          \ aws_codepipeline_webhook
+          \ aws_cognito_identity_pool
+          \ aws_cognito_identity_pool_roles_attachment
+          \ aws_cognito_identity_provider
+          \ aws_cognito_resource_server
+          \ aws_cognito_user_group
+          \ aws_cognito_user_pool
+          \ aws_cognito_user_pool_client
+          \ aws_cognito_user_pool_domain
+          \ aws_config_aggregate_authorization
+          \ aws_config_config_rule
+          \ aws_config_configuration_aggregator
+          \ aws_config_configuration_recorder
+          \ aws_config_configuration_recorder_status
+          \ aws_config_delivery_channel
+          \ aws_config_organization_custom_rule
+          \ aws_config_organization_managed_rule
+          \ aws_cur_report_definition
+          \ aws_customer_gateway
+          \ aws_datapipeline_pipeline
+          \ aws_datasync_agent
+          \ aws_datasync_location_efs
+          \ aws_datasync_location_nfs
+          \ aws_datasync_location_s3
+          \ aws_datasync_location_smb
+          \ aws_datasync_task
+          \ aws_dax_cluster
+          \ aws_dax_parameter_group
+          \ aws_dax_subnet_group
+          \ aws_db_cluster_snapshot
+          \ aws_db_event_subscription
+          \ aws_db_instance
+          \ aws_db_instance_role_association
+          \ aws_db_option_group
+          \ aws_db_parameter_group
+          \ aws_db_security_group
+          \ aws_db_snapshot
+          \ aws_db_subnet_group
+          \ aws_default_network_acl
+          \ aws_default_route_table
+          \ aws_default_security_group
+          \ aws_default_subnet
+          \ aws_default_vpc
+          \ aws_default_vpc_dhcp_options
+          \ aws_devicefarm_project
+          \ aws_directory_service_conditional_forwarder
+          \ aws_directory_service_directory
+          \ aws_directory_service_log_subscription
+          \ aws_dlm_lifecycle_policy
+          \ aws_dms_certificate
+          \ aws_dms_endpoint
+          \ aws_dms_replication_instance
+          \ aws_dms_replication_subnet_group
+          \ aws_dms_replication_task
+          \ aws_docdb_cluster
+          \ aws_docdb_cluster_instance
+          \ aws_docdb_cluster_parameter_group
+          \ aws_docdb_cluster_snapshot
+          \ aws_docdb_subnet_group
+          \ aws_dx_bgp_peer
+          \ aws_dx_connection
+          \ aws_dx_connection_association
+          \ aws_dx_gateway
+          \ aws_dx_gateway_association
+          \ aws_dx_gateway_association_proposal
+          \ aws_dx_hosted_private_virtual_interface
+          \ aws_dx_hosted_private_virtual_interface_accepter
+          \ aws_dx_hosted_public_virtual_interface
+          \ aws_dx_hosted_public_virtual_interface_accepter
+          \ aws_dx_hosted_transit_virtual_interface
+          \ aws_dx_hosted_transit_virtual_interface_accepter
+          \ aws_dx_lag
+          \ aws_dx_private_virtual_interface
+          \ aws_dx_public_virtual_interface
+          \ aws_dx_transit_virtual_interface
+          \ aws_dynamodb_global_table
+          \ aws_dynamodb_table
+          \ aws_dynamodb_table_item
+          \ aws_ebs_default_kms_key
+          \ aws_ebs_encryption_by_default
+          \ aws_ebs_snapshot
+          \ aws_ebs_snapshot_copy
+          \ aws_ebs_volume
+          \ aws_ec2_capacity_reservation
+          \ aws_ec2_client_vpn_endpoint
+          \ aws_ec2_client_vpn_network_association
+          \ aws_ec2_fleet
+          \ aws_ec2_transit_gateway
+          \ aws_ec2_transit_gateway_route
+          \ aws_ec2_transit_gateway_route_table
+          \ aws_ec2_transit_gateway_route_table_association
+          \ aws_ec2_transit_gateway_route_table_propagation
+          \ aws_ec2_transit_gateway_vpc_attachment
+          \ aws_ec2_transit_gateway_vpc_attachment_accepter
+          \ aws_ecr_lifecycle_policy
+          \ aws_ecr_repository
+          \ aws_ecr_repository_policy
+          \ aws_ecs_capacity_provider
+          \ aws_ecs_cluster
+          \ aws_ecs_service
+          \ aws_ecs_task_definition
+          \ aws_efs_file_system
+          \ aws_efs_mount_target
+          \ aws_egress_only_internet_gateway
+          \ aws_eip
+          \ aws_eip_association
+          \ aws_eks_cluster
+          \ aws_eks_fargate_profile
+          \ aws_eks_node_group
+          \ aws_elastic_beanstalk_application
+          \ aws_elastic_beanstalk_application_version
+          \ aws_elastic_beanstalk_configuration_template
+          \ aws_elastic_beanstalk_environment
+          \ aws_elasticache_cluster
+          \ aws_elasticache_parameter_group
+          \ aws_elasticache_replication_group
+          \ aws_elasticache_security_group
+          \ aws_elasticache_subnet_group
+          \ aws_elasticsearch_domain
+          \ aws_elasticsearch_domain_policy
+          \ aws_elastictranscoder_pipeline
+          \ aws_elastictranscoder_preset
+          \ aws_elb
+          \ aws_elb_attachment
+          \ aws_emr_cluster
+          \ aws_emr_instance_group
+          \ aws_emr_security_configuration
+          \ aws_flow_log
+          \ aws_fms_admin_account
+          \ aws_fsx_lustre_file_system
+          \ aws_fsx_windows_file_system
+          \ aws_gamelift_alias
+          \ aws_gamelift_build
+          \ aws_gamelift_fleet
+          \ aws_gamelift_game_session_queue
+          \ aws_glacier_vault
+          \ aws_glacier_vault_lock
+          \ aws_globalaccelerator_accelerator
+          \ aws_globalaccelerator_endpoint_group
+          \ aws_globalaccelerator_listener
+          \ aws_glue_catalog_database
+          \ aws_glue_catalog_table
+          \ aws_glue_classifier
+          \ aws_glue_connection
+          \ aws_glue_crawler
+          \ aws_glue_job
+          \ aws_glue_security_configuration
+          \ aws_glue_trigger
+          \ aws_glue_workflow
+          \ aws_guardduty_detector
+          \ aws_guardduty_invite_accepter
+          \ aws_guardduty_ipset
+          \ aws_guardduty_member
+          \ aws_guardduty_threatintelset
+          \ aws_iam_access_key
+          \ aws_iam_account_alias
+          \ aws_iam_account_password_policy
+          \ aws_iam_group
+          \ aws_iam_group_membership
+          \ aws_iam_group_policy
+          \ aws_iam_group_policy_attachment
+          \ aws_iam_instance_profile
+          \ aws_iam_openid_connect_provider
+          \ aws_iam_policy
+          \ aws_iam_policy_attachment
+          \ aws_iam_role
+          \ aws_iam_role_policy
+          \ aws_iam_role_policy_attachment
+          \ aws_iam_saml_provider
+          \ aws_iam_server_certificate
+          \ aws_iam_service_linked_role
+          \ aws_iam_user
+          \ aws_iam_user_group_membership
+          \ aws_iam_user_login_profile
+          \ aws_iam_user_policy
+          \ aws_iam_user_policy_attachment
+          \ aws_iam_user_ssh_key
+          \ aws_inspector_assessment_target
+          \ aws_inspector_assessment_template
+          \ aws_inspector_resource_group
+          \ aws_instance
+          \ aws_internet_gateway
+          \ aws_iot_certificate
+          \ aws_iot_policy
+          \ aws_iot_policy_attachment
+          \ aws_iot_role_alias
+          \ aws_iot_thing
+          \ aws_iot_thing_principal_attachment
+          \ aws_iot_thing_type
+          \ aws_iot_topic_rule
+          \ aws_key_pair
+          \ aws_kinesis_analytics_application
+          \ aws_kinesis_firehose_delivery_stream
+          \ aws_kinesis_stream
+          \ aws_kms_alias
+          \ aws_kms_ciphertext
+          \ aws_kms_external_key
+          \ aws_kms_grant
+          \ aws_kms_key
+          \ aws_lambda_alias
+          \ aws_lambda_event_source_mapping
+          \ aws_lambda_function
+          \ aws_lambda_function_event_invoke_config
+          \ aws_lambda_layer_version
+          \ aws_lambda_permission
+          \ aws_lambda_provisioned_concurrency_config
+          \ aws_launch_configuration
+          \ aws_launch_template
+          \ aws_lb
+          \ aws_lb_cookie_stickiness_policy
+          \ aws_lb_listener
+          \ aws_lb_listener_certificate
+          \ aws_lb_listener_rule
+          \ aws_lb_ssl_negotiation_policy
+          \ aws_lb_target_group
+          \ aws_lb_target_group_attachment
+          \ aws_licensemanager_association
+          \ aws_licensemanager_license_configuration
+          \ aws_lightsail_domain
+          \ aws_lightsail_instance
+          \ aws_lightsail_key_pair
+          \ aws_lightsail_static_ip
+          \ aws_lightsail_static_ip_attachment
+          \ aws_load_balancer_backend_server_policy
+          \ aws_load_balancer_listener_policy
+          \ aws_load_balancer_policy
+          \ aws_macie_member_account_association
+          \ aws_macie_s3_bucket_association
+          \ aws_main_route_table_association
+          \ aws_media_convert_queue
+          \ aws_media_package_channel
+          \ aws_media_store_container
+          \ aws_media_store_container_policy
+          \ aws_mq_broker
+          \ aws_mq_configuration
+          \ aws_msk_cluster
+          \ aws_msk_configuration
+          \ aws_nat_gateway
+          \ aws_neptune_cluster
+          \ aws_neptune_cluster_instance
+          \ aws_neptune_cluster_parameter_group
+          \ aws_neptune_cluster_snapshot
+          \ aws_neptune_event_subscription
+          \ aws_neptune_parameter_group
+          \ aws_neptune_subnet_group
+          \ aws_network_acl
+          \ aws_network_acl_rule
+          \ aws_network_interface
+          \ aws_network_interface_attachment
+          \ aws_network_interface_sg_attachment
+          \ aws_opsworks_application
+          \ aws_opsworks_custom_layer
+          \ aws_opsworks_ganglia_layer
+          \ aws_opsworks_haproxy_layer
+          \ aws_opsworks_instance
+          \ aws_opsworks_java_app_layer
+          \ aws_opsworks_memcached_layer
+          \ aws_opsworks_mysql_layer
+          \ aws_opsworks_nodejs_app_layer
+          \ aws_opsworks_permission
+          \ aws_opsworks_php_app_layer
+          \ aws_opsworks_rails_app_layer
+          \ aws_opsworks_rds_db_instance
+          \ aws_opsworks_stack
+          \ aws_opsworks_static_web_layer
+          \ aws_opsworks_user_profile
+          \ aws_organizations_account
+          \ aws_organizations_organization
+          \ aws_organizations_organizational_unit
+          \ aws_organizations_policy
+          \ aws_organizations_policy_attachment
+          \ aws_pinpoint_adm_channel
+          \ aws_pinpoint_apns_channel
+          \ aws_pinpoint_apns_sandbox_channel
+          \ aws_pinpoint_apns_voip_channel
+          \ aws_pinpoint_apns_voip_sandbox_channel
+          \ aws_pinpoint_app
+          \ aws_pinpoint_baidu_channel
+          \ aws_pinpoint_email_channel
+          \ aws_pinpoint_event_stream
+          \ aws_pinpoint_gcm_channel
+          \ aws_pinpoint_sms_channel
+          \ aws_placement_group
+          \ aws_proxy_protocol_policy
+          \ aws_qldb_ledger
+          \ aws_quicksight_group
+          \ aws_quicksight_user
+          \ aws_ram_principal_association
+          \ aws_ram_resource_association
+          \ aws_ram_resource_share
+          \ aws_ram_resource_share_accepter
+          \ aws_rds_cluster
+          \ aws_rds_cluster_endpoint
+          \ aws_rds_cluster_instance
+          \ aws_rds_cluster_parameter_group
+          \ aws_rds_global_cluster
+          \ aws_redshift_cluster
+          \ aws_redshift_event_subscription
+          \ aws_redshift_parameter_group
+          \ aws_redshift_security_group
+          \ aws_redshift_snapshot_copy_grant
+          \ aws_redshift_snapshot_schedule
+          \ aws_redshift_snapshot_schedule_association
+          \ aws_redshift_subnet_group
+          \ aws_resourcegroups_group
+          \ aws_route
+          \ aws_route53_delegation_set
+          \ aws_route53_health_check
+          \ aws_route53_query_log
+          \ aws_route53_record
+          \ aws_route53_resolver_endpoint
+          \ aws_route53_resolver_rule
+          \ aws_route53_resolver_rule_association
+          \ aws_route53_zone
+          \ aws_route53_zone_association
+          \ aws_route_table
+          \ aws_route_table_association
+          \ aws_s3_account_public_access_block
+          \ aws_s3_bucket
+          \ aws_s3_bucket_inventory
+          \ aws_s3_bucket_metric
+          \ aws_s3_bucket_notification
+          \ aws_s3_bucket_object
+          \ aws_s3_bucket_policy
+          \ aws_s3_bucket_public_access_block
+          \ aws_sagemaker_endpoint
+          \ aws_sagemaker_endpoint_configuration
+          \ aws_sagemaker_model
+          \ aws_sagemaker_notebook_instance
+          \ aws_sagemaker_notebook_instance_lifecycle_configuration
+          \ aws_secretsmanager_secret
+          \ aws_secretsmanager_secret_version
+          \ aws_security_group
+          \ aws_security_group_rule
+          \ aws_securityhub_account
+          \ aws_securityhub_product_subscription
+          \ aws_securityhub_standards_subscription
+          \ aws_service_discovery_http_namespace
+          \ aws_service_discovery_private_dns_namespace
+          \ aws_service_discovery_public_dns_namespace
+          \ aws_service_discovery_service
+          \ aws_servicecatalog_portfolio
+          \ aws_servicequotas_service_quota
+          \ aws_ses_active_receipt_rule_set
+          \ aws_ses_configuration_set
+          \ aws_ses_domain_dkim
+          \ aws_ses_domain_identity
+          \ aws_ses_domain_identity_verification
+          \ aws_ses_domain_mail_from
+          \ aws_ses_email_identity
+          \ aws_ses_event_destination
+          \ aws_ses_identity_notification_topic
+          \ aws_ses_identity_policy
+          \ aws_ses_receipt_filter
+          \ aws_ses_receipt_rule
+          \ aws_ses_receipt_rule_set
+          \ aws_ses_template
+          \ aws_sfn_activity
+          \ aws_sfn_state_machine
+          \ aws_shield_protection
+          \ aws_simpledb_domain
+          \ aws_snapshot_create_volume_permission
+          \ aws_sns_platform_application
+          \ aws_sns_sms_preferences
+          \ aws_sns_topic
+          \ aws_sns_topic_policy
+          \ aws_sns_topic_subscription
+          \ aws_spot_datafeed_subscription
+          \ aws_spot_fleet_request
+          \ aws_spot_instance_request
+          \ aws_sqs_queue
+          \ aws_sqs_queue_policy
+          \ aws_ssm_activation
+          \ aws_ssm_association
+          \ aws_ssm_document
+          \ aws_ssm_maintenance_window
+          \ aws_ssm_maintenance_window_target
+          \ aws_ssm_maintenance_window_task
+          \ aws_ssm_parameter
+          \ aws_ssm_patch_baseline
+          \ aws_ssm_patch_group
+          \ aws_ssm_resource_data_sync
+          \ aws_storagegateway_cache
+          \ aws_storagegateway_cached_iscsi_volume
+          \ aws_storagegateway_gateway
+          \ aws_storagegateway_nfs_file_share
+          \ aws_storagegateway_smb_file_share
+          \ aws_storagegateway_upload_buffer
+          \ aws_storagegateway_working_storage
+          \ aws_subnet
+          \ aws_swf_domain
+          \ aws_transfer_server
+          \ aws_transfer_ssh_key
+          \ aws_transfer_user
+          \ aws_volume_attachment
+          \ aws_vpc
+          \ aws_vpc_dhcp_options
+          \ aws_vpc_dhcp_options_association
+          \ aws_vpc_endpoint
+          \ aws_vpc_endpoint_connection_notification
+          \ aws_vpc_endpoint_route_table_association
+          \ aws_vpc_endpoint_service
+          \ aws_vpc_endpoint_service_allowed_principal
+          \ aws_vpc_endpoint_subnet_association
+          \ aws_vpc_ipv4_cidr_block_association
+          \ aws_vpc_peering_connection
+          \ aws_vpc_peering_connection_accepter
+          \ aws_vpc_peering_connection_options
+          \ aws_vpn_connection
+          \ aws_vpn_connection_route
+          \ aws_vpn_gateway
+          \ aws_vpn_gateway_attachment
+          \ aws_vpn_gateway_route_propagation
+          \ aws_waf_byte_match_set
+          \ aws_waf_geo_match_set
+          \ aws_waf_ipset
+          \ aws_waf_rate_based_rule
+          \ aws_waf_regex_match_set
+          \ aws_waf_regex_pattern_set
+          \ aws_waf_rule
+          \ aws_waf_rule_group
+          \ aws_waf_size_constraint_set
+          \ aws_waf_sql_injection_match_set
+          \ aws_waf_web_acl
+          \ aws_waf_xss_match_set
+          \ aws_wafregional_byte_match_set
+          \ aws_wafregional_geo_match_set
+          \ aws_wafregional_ipset
+          \ aws_wafregional_rate_based_rule
+          \ aws_wafregional_regex_match_set
+          \ aws_wafregional_regex_pattern_set
+          \ aws_wafregional_rule
+          \ aws_wafregional_rule_group
+          \ aws_wafregional_size_constraint_set
+          \ aws_wafregional_sql_injection_match_set
+          \ aws_wafregional_web_acl
+          \ aws_wafregional_web_acl_association
+          \ aws_wafregional_xss_match_set
+          \ aws_worklink_fleet
+          \ aws_worklink_website_certificate_authority_association
+          \ aws_workspaces_directory
+          \ aws_workspaces_ip_group
+          \ aws_xray_sampling_rule
+          \ azure_affinity_group
+          \ azure_data_disk
+          \ azure_dns_server
+          \ azure_hosted_service
+          \ azure_instance
+          \ azure_local_network_connection
+          \ azure_security_group
+          \ azure_security_group_rule
+          \ azure_sql_database_server
+          \ azure_sql_database_server_firewall_rule
+          \ azure_sql_database_service
+          \ azure_storage_blob
+          \ azure_storage_container
+          \ azure_storage_queue
+          \ azure_storage_service
+          \ azure_virtual_network
+          \ azuread_application
+          \ azuread_application_password
+          \ azuread_group
+          \ azuread_group_member
+          \ azuread_service_principal
+          \ azuread_service_principal_password
+          \ azuread_user
+          \ azurerm_advanced_threat_protection
+          \ azurerm_analysis_services_server
+          \ azurerm_api_management
+          \ azurerm_api_management_api
+          \ azurerm_api_management_api_operation
+          \ azurerm_api_management_api_operation_policy
+          \ azurerm_api_management_api_policy
+          \ azurerm_api_management_api_schema
+          \ azurerm_api_management_api_version_set
+          \ azurerm_api_management_authorization_server
+          \ azurerm_api_management_backend
+          \ azurerm_api_management_certificate
+          \ azurerm_api_management_diagnostic
+          \ azurerm_api_management_group
+          \ azurerm_api_management_group_user
+          \ azurerm_api_management_identity_provider_aad
+          \ azurerm_api_management_identity_provider_facebook
+          \ azurerm_api_management_identity_provider_google
+          \ azurerm_api_management_identity_provider_microsoft
+          \ azurerm_api_management_identity_provider_twitter
+          \ azurerm_api_management_logger
+          \ azurerm_api_management_openid_connect_provider
+          \ azurerm_api_management_product
+          \ azurerm_api_management_product_api
+          \ azurerm_api_management_product_group
+          \ azurerm_api_management_product_policy
+          \ azurerm_api_management_property
+          \ azurerm_api_management_subscription
+          \ azurerm_api_management_user
+          \ azurerm_app_configuration
+          \ azurerm_app_service
+          \ azurerm_app_service_active_slot
+          \ azurerm_app_service_certificate
+          \ azurerm_app_service_certificate_order
+          \ azurerm_app_service_custom_hostname_binding
+          \ azurerm_app_service_plan
+          \ azurerm_app_service_slot
+          \ azurerm_app_service_source_control_token
+          \ azurerm_app_service_virtual_network_swift_connection
+          \ azurerm_application_gateway
+          \ azurerm_application_insights
+          \ azurerm_application_insights_analytics_item
+          \ azurerm_application_insights_api_key
+          \ azurerm_application_insights_web_test
+          \ azurerm_application_security_group
+          \ azurerm_automation_account
+          \ azurerm_automation_certificate
+          \ azurerm_automation_credential
+          \ azurerm_automation_dsc_configuration
+          \ azurerm_automation_dsc_nodeconfiguration
+          \ azurerm_automation_job_schedule
+          \ azurerm_automation_module
+          \ azurerm_automation_runbook
+          \ azurerm_automation_schedule
+          \ azurerm_automation_variable_bool
+          \ azurerm_automation_variable_datetime
+          \ azurerm_automation_variable_int
+          \ azurerm_automation_variable_string
+          \ azurerm_autoscale_setting
+          \ azurerm_availability_set
+          \ azurerm_azuread_application
+          \ azurerm_azuread_service_principal_password
+          \ azurerm_backup_container_storage_account
+          \ azurerm_backup_policy_file_share
+          \ azurerm_backup_policy_vm
+          \ azurerm_backup_protected_file_share
+          \ azurerm_backup_protected_vm
+          \ azurerm_bastion_host
+          \ azurerm_batch_account
+          \ azurerm_batch_application
+          \ azurerm_batch_certificate
+          \ azurerm_batch_pool
+          \ azurerm_bot_channel_email
+          \ azurerm_bot_channel_ms_teams
+          \ azurerm_bot_channel_slack
+          \ azurerm_bot_channels_registration
+          \ azurerm_bot_connection
+          \ azurerm_bot_web_app
+          \ azurerm_cdn_endpoint
+          \ azurerm_cdn_profile
+          \ azurerm_cognitive_account
+          \ azurerm_connection_monitor
+          \ azurerm_container_group
+          \ azurerm_container_registry
+          \ azurerm_container_registry_webhook
+          \ azurerm_container_service
+          \ azurerm_cosmosdb_account
+          \ azurerm_cosmosdb_cassandra_keyspace
+          \ azurerm_cosmosdb_gremlin_database
+          \ azurerm_cosmosdb_gremlin_graph
+          \ azurerm_cosmosdb_mongo_collection
+          \ azurerm_cosmosdb_mongo_database
+          \ azurerm_cosmosdb_sql_container
+          \ azurerm_cosmosdb_sql_database
+          \ azurerm_dashboard
+          \ azurerm_data_factory
+          \ azurerm_data_factory_dataset_mysql
+          \ azurerm_data_factory_dataset_postgresql
+          \ azurerm_data_factory_dataset_sql_server_table
+          \ azurerm_data_factory_integration_runtime_managed
+          \ azurerm_data_factory_linked_service_data_lake_storage_gen2
+          \ azurerm_data_factory_linked_service_mysql
+          \ azurerm_data_factory_linked_service_postgresql
+          \ azurerm_data_factory_linked_service_sql_server
+          \ azurerm_data_factory_pipeline
+          \ azurerm_data_factory_trigger_schedule
+          \ azurerm_data_lake_analytics_account
+          \ azurerm_data_lake_analytics_firewall_rule
+          \ azurerm_data_lake_store_file
+          \ azurerm_data_lake_store_firewall_rule
+          \ azurerm_databricks_workspace
+          \ azurerm_ddos_protection_plan
+          \ azurerm_dedicated_host
+          \ azurerm_dedicated_host_group
+          \ azurerm_dev_test_lab
+          \ azurerm_dev_test_linux_virtual_machine
+          \ azurerm_dev_test_policy
+          \ azurerm_dev_test_schedule
+          \ azurerm_dev_test_virtual_network
+          \ azurerm_devspace_controller
+          \ azurerm_disk_encryption_set
+          \ azurerm_dns_a_record
+          \ azurerm_dns_aaaa_record
+          \ azurerm_dns_caa_record
+          \ azurerm_dns_cname_record
+          \ azurerm_dns_mx_record
+          \ azurerm_dns_ns_record
+          \ azurerm_dns_ptr_record
+          \ azurerm_dns_srv_record
+          \ azurerm_dns_txt_record
+          \ azurerm_eventgrid_domain
+          \ azurerm_eventgrid_event_subscription
+          \ azurerm_eventgrid_topic
+          \ azurerm_eventhub_authorization_rule
+          \ azurerm_eventhub_consumer_group
+          \ azurerm_eventhub_namespace
+          \ azurerm_eventhub_namespace_authorization_rule
+          \ azurerm_eventhub_namespace_disaster_recovery_config
+          \ azurerm_express_route_circuit
+          \ azurerm_express_route_circuit_authorization
+          \ azurerm_express_route_circuit_peering
+          \ azurerm_firewall
+          \ azurerm_firewall_application_rule_collection
+          \ azurerm_firewall_nat_rule_collection
+          \ azurerm_firewall_network_rule_collection
+          \ azurerm_frontdoor
+          \ azurerm_function_app
+          \ azurerm_hdinsight_hadoop_cluster
+          \ azurerm_hdinsight_hbase_cluster
+          \ azurerm_hdinsight_interactive_query_cluster
+          \ azurerm_hdinsight_kafka_cluster
+          \ azurerm_hdinsight_ml_services_cluster
+          \ azurerm_hdinsight_rserver_cluster
+          \ azurerm_hdinsight_spark_cluster
+          \ azurerm_healthcare_service
+          \ azurerm_image
+          \ azurerm_iot_dps
+          \ azurerm_iot_dps_certificate
+          \ azurerm_iothub
+          \ azurerm_iothub_consumer_group
+          \ azurerm_iothub_dps
+          \ azurerm_iothub_dps_certificate
+          \ azurerm_iothub_dps_shared_access_policy
+          \ azurerm_iothub_endpoint_eventhub
+          \ azurerm_iothub_endpoint_servicebus_queue
+          \ azurerm_iothub_endpoint_servicebus_topic
+          \ azurerm_iothub_endpoint_storage_container
+          \ azurerm_iothub_fallback_route
+          \ azurerm_iothub_route
+          \ azurerm_key_vault
+          \ azurerm_key_vault_access_policy
+          \ azurerm_key_vault_certificate
+          \ azurerm_key_vault_key
+          \ azurerm_key_vault_secret
+          \ azurerm_kubernetes_cluster
+          \ azurerm_kubernetes_cluster_node_pool
+          \ azurerm_kusto_cluster
+          \ azurerm_kusto_database
+          \ azurerm_kusto_database_principal
+          \ azurerm_kusto_eventhub_data_connection
+          \ azurerm_lb
+          \ azurerm_lb_backend_address_pool
+          \ azurerm_lb_nat_pool
+          \ azurerm_lb_nat_rule
+          \ azurerm_lb_outbound_rule
+          \ azurerm_lb_probe
+          \ azurerm_lb_rule
+          \ azurerm_local_network_gateway
+          \ azurerm_log_analytics_linked_service
+          \ azurerm_log_analytics_solution
+          \ azurerm_log_analytics_workspace_linked_service
+          \ azurerm_logic_app_action_custom
+          \ azurerm_logic_app_action_http
+          \ azurerm_logic_app_trigger_custom
+          \ azurerm_logic_app_trigger_http_request
+          \ azurerm_logic_app_trigger_recurrence
+          \ azurerm_managed_disk
+          \ azurerm_management_group
+          \ azurerm_management_lock
+          \ azurerm_maps_account
+          \ azurerm_mariadb_configuration
+          \ azurerm_mariadb_database
+          \ azurerm_mariadb_firewall_rule
+          \ azurerm_mariadb_server
+          \ azurerm_marketplace_agreement
+          \ azurerm_media_services_account
+          \ azurerm_metric_alertrule
+          \ azurerm_monitor_action_group
+          \ azurerm_monitor_activity_log_alert
+          \ azurerm_monitor_autoscale_setting
+          \ azurerm_monitor_diagnostic_setting
+          \ azurerm_monitor_log_profile
+          \ azurerm_monitor_metric_alert
+          \ azurerm_mssql_database_vulnerability_assessment_rule_baseline
+          \ azurerm_mssql_elasticpool
+          \ azurerm_mssql_server_security_alert_policy
+          \ azurerm_mssql_server_vulnerability_assessment
+          \ azurerm_mysql_configuration
+          \ azurerm_mysql_database
+          \ azurerm_mysql_firewall_rule
+          \ azurerm_mysql_server
+          \ azurerm_nat_gateway
+          \ azurerm_netapp_account
+          \ azurerm_netapp_pool
+          \ azurerm_netapp_volume
+          \ azurerm_network_connection_monitor
+          \ azurerm_network_ddos_protection_plan
+          \ azurerm_network_interface
+          \ azurerm_network_interface_application_gateway_backend_address_pool_association
+          \ azurerm_network_interface_application_security_group_association
+          \ azurerm_network_interface_backend_address_pool_association
+          \ azurerm_network_interface_nat_rule_association
+          \ azurerm_network_packet_capture
+          \ azurerm_network_profile
+          \ azurerm_network_security_group
+          \ azurerm_network_security_rule
+          \ azurerm_network_watcher
+          \ azurerm_network_watcher_flow_log
+          \ azurerm_notification_hub
+          \ azurerm_notification_hub_authorization_rule
+          \ azurerm_notification_hub_namespace
+          \ azurerm_packet_capture
+          \ azurerm_point_to_site_vpn_gateway
+          \ azurerm_policy_assignment
+          \ azurerm_policy_definition
+          \ azurerm_policy_set_definition
+          \ azurerm_postgresql_configuration
+          \ azurerm_postgresql_database
+          \ azurerm_postgresql_firewall_rule
+          \ azurerm_postgresql_server
+          \ azurerm_postgresql_virtual_network_rule
+          \ azurerm_private_dns_a_record
+          \ azurerm_private_dns_aaaa_record
+          \ azurerm_private_dns_cname_record
+          \ azurerm_private_dns_mx_record
+          \ azurerm_private_dns_ptr_record
+          \ azurerm_private_dns_srv_record
+          \ azurerm_private_dns_zone
+          \ azurerm_private_dns_zone_virtual_network_link
+          \ azurerm_private_endpoint
+          \ azurerm_private_link_endpoint
+          \ azurerm_private_link_service
+          \ azurerm_proximity_placement_group
+          \ azurerm_public_ip
+          \ azurerm_public_ip_prefix
+          \ azurerm_recovery_network_mapping
+          \ azurerm_recovery_replicated_vm
+          \ azurerm_recovery_services_fabric
+          \ azurerm_recovery_services_protected_vm
+          \ azurerm_recovery_services_protection_container
+          \ azurerm_recovery_services_protection_container_mapping
+          \ azurerm_recovery_services_protection_policy_vm
+          \ azurerm_recovery_services_replication_policy
+          \ azurerm_recovery_services_vault
+          \ azurerm_redis_cache
+          \ azurerm_redis_firewall_rule
+          \ azurerm_relay_hybrid_connection
+          \ azurerm_relay_namespace
+          \ azurerm_resource_group
+          \ azurerm_resources
+          \ azurerm_role_assignment
+          \ azurerm_role_definition
+          \ azurerm_route
+          \ azurerm_route_table
+          \ azurerm_scheduler_job
+          \ azurerm_scheduler_job_collection
+          \ azurerm_search_service
+          \ azurerm_security_center_contact
+          \ azurerm_security_center_subscription_pricing
+          \ azurerm_security_center_workspace
+          \ azurerm_service_fabric_cluster
+          \ azurerm_servicebus_namespace
+          \ azurerm_servicebus_namespace_authorization_rule
+          \ azurerm_servicebus_queue
+          \ azurerm_servicebus_queue_authorization_rule
+          \ azurerm_servicebus_subscription
+          \ azurerm_servicebus_subscription_rule
+          \ azurerm_servicebus_topic
+          \ azurerm_servicebus_topic_authorization_rule
+          \ azurerm_shared_image
+          \ azurerm_shared_image_gallery
+          \ azurerm_shared_image_version
+          \ azurerm_signalr_service
+          \ azurerm_site_recovery_fabric
+          \ azurerm_site_recovery_network_mapping
+          \ azurerm_site_recovery_protection_container
+          \ azurerm_site_recovery_protection_container_mapping
+          \ azurerm_site_recovery_replicated_vm
+          \ azurerm_site_recovery_replication_policy
+          \ azurerm_snapshot
+          \ azurerm_sql_active_directory_administrator
+          \ azurerm_sql_database
+          \ azurerm_sql_elasticpool
+          \ azurerm_sql_failover_group
+          \ azurerm_sql_firewall_rule
+          \ azurerm_sql_server
+          \ azurerm_sql_virtual_network_rule
+          \ azurerm_storage_account
+          \ azurerm_storage_account_network_rules
+          \ azurerm_storage_blob
+          \ azurerm_storage_container
+          \ azurerm_storage_data_lake_gen2_filesystem
+          \ azurerm_storage_management_policy
+          \ azurerm_storage_queue
+          \ azurerm_storage_share
+          \ azurerm_storage_share_directory
+          \ azurerm_storage_table
+          \ azurerm_storage_table_entity
+          \ azurerm_stream_analytics_function_javascript_udf
+          \ azurerm_stream_analytics_job
+          \ azurerm_stream_analytics_output_blob
+          \ azurerm_stream_analytics_output_eventhub
+          \ azurerm_stream_analytics_output_mssql
+          \ azurerm_stream_analytics_output_servicebus_queue
+          \ azurerm_stream_analytics_output_servicebus_topic
+          \ azurerm_stream_analytics_reference_input_blob
+          \ azurerm_stream_analytics_stream_input_blob
+          \ azurerm_stream_analytics_stream_input_eventhub
+          \ azurerm_stream_analytics_stream_input_iothub
+          \ azurerm_subnet
+          \ azurerm_subnet_nat_gateway_association
+          \ azurerm_subnet_network_security_group_association
+          \ azurerm_subnet_route_table_association
+          \ azurerm_template_deployment
+          \ azurerm_traffic_manager_endpoint
+          \ azurerm_traffic_manager_profile
+          \ azurerm_user_assigned_identity
+          \ azurerm_virtual_hub
+          \ azurerm_virtual_machine
+          \ azurerm_virtual_machine_data_disk_attachment
+          \ azurerm_virtual_machine_extension
+          \ azurerm_virtual_machine_scale_set
+          \ azurerm_virtual_network
+          \ azurerm_virtual_network_gateway
+          \ azurerm_virtual_network_gateway_connection
+          \ azurerm_virtual_network_peering
+          \ azurerm_virtual_wan
+          \ azurerm_vpn_gateway
+          \ azurerm_vpn_server_configuration
+          \ azurerm_web_application_firewall_policy
+          \ azurestack_availability_set
+          \ azurestack_dns_a_record
+          \ azurestack_dns_zone
+          \ azurestack_lb
+          \ azurestack_lb_backend_address_pool
+          \ azurestack_lb_nat_pool
+          \ azurestack_lb_nat_rule
+          \ azurestack_lb_probe
+          \ azurestack_lb_rule
+          \ azurestack_local_network_gateway
+          \ azurestack_managed_disk
+          \ azurestack_network_interface
+          \ azurestack_network_security_group
+          \ azurestack_network_security_rule
+          \ azurestack_public_ip
+          \ azurestack_resource_group
+          \ azurestack_route
+          \ azurestack_route_table
+          \ azurestack_storage_account
+          \ azurestack_storage_blob
+          \ azurestack_storage_container
+          \ azurestack_subnet
+          \ azurestack_template_deployment
+          \ azurestack_virtual_machine
+          \ azurestack_virtual_machine_extension
+          \ azurestack_virtual_machine_scale_set
+          \ azurestack_virtual_network
+          \ azurestack_virtual_network_gateway
+          \ azurestack_virtual_network_gateway_connection
+          \ bigip_as3
+          \ bigip_cm_device
+          \ bigip_cm_devicegroup
+          \ bigip_do
+          \ bigip_ltm_datagroup
+          \ bigip_ltm_irule
+          \ bigip_ltm_monitor
+          \ bigip_ltm_node
+          \ bigip_ltm_persistence_profile_cookie
+          \ bigip_ltm_persistence_profile_dstaddr
+          \ bigip_ltm_persistence_profile_srcaddr
+          \ bigip_ltm_persistence_profile_ssl
+          \ bigip_ltm_policy
+          \ bigip_ltm_pool
+          \ bigip_ltm_pool_attachment
+          \ bigip_ltm_profile_client_ssl
+          \ bigip_ltm_profile_fasthttp
+          \ bigip_ltm_profile_fastl4
+          \ bigip_ltm_profile_http
+          \ bigip_ltm_profile_http2
+          \ bigip_ltm_profile_httpcompress
+          \ bigip_ltm_profile_oneconnect
+          \ bigip_ltm_profile_server_ssl
+          \ bigip_ltm_profile_tcp
+          \ bigip_ltm_snat
+          \ bigip_ltm_snatpool
+          \ bigip_ltm_virtual_address
+          \ bigip_ltm_virtual_server
+          \ bigip_net_route
+          \ bigip_net_selfip
+          \ bigip_net_vlan
+          \ bigip_ssl_certificate
+          \ bigip_ssl_key
+          \ bigip_sys_bigiplicense
+          \ bigip_sys_dns
+          \ bigip_sys_iapp
+          \ bigip_sys_ntp
+          \ bigip_sys_provision
+          \ bigip_sys_snmp
+          \ bigip_sys_snmp_traps
+          \ bitbucket_branch_restriction
+          \ bitbucket_default_reviewers
+          \ bitbucket_hook
+          \ bitbucket_project
+          \ bitbucket_repository
+          \ bitbucket_repository_variable
+          \ brightbox_api_client
+          \ brightbox_cloudip
+          \ brightbox_database_server
+          \ brightbox_firewall_policy
+          \ brightbox_firewall_rule
+          \ brightbox_load_balancer
+          \ brightbox_orbit_container
+          \ brightbox_server
+          \ brightbox_server_group
+          \ checkpoint_hostname
+          \ checkpoint_management_access_rule
+          \ checkpoint_management_address_range
+          \ checkpoint_management_group
+          \ checkpoint_management_host
+          \ checkpoint_management_install_policy
+          \ checkpoint_management_login
+          \ checkpoint_management_logout
+          \ checkpoint_management_network
+          \ checkpoint_management_package
+          \ checkpoint_management_publish
+          \ checkpoint_management_run_ips_update
+          \ checkpoint_management_service_group
+          \ checkpoint_management_service_tcp
+          \ checkpoint_management_service_udp
+          \ checkpoint_management_threat_indicator
+          \ checkpoint_physical_interface
+          \ checkpoint_put_file
+          \ chef_acl
+          \ chef_client
+          \ chef_cookbook
+          \ chef_data_bag
+          \ chef_data_bag_item
+          \ chef_environment
+          \ chef_node
+          \ chef_role
+          \ cherryservers_ip
+          \ cherryservers_project
+          \ cherryservers_server
+          \ cherryservers_ssh
+          \ circonus_check
+          \ circonus_contact_group
+          \ circonus_dashboard
+          \ circonus_graph
+          \ circonus_maintenance
+          \ circonus_metric
+          \ circonus_metric_cluster
+          \ circonus_overlay_set
+          \ circonus_rule_set
+          \ circonus_rule_set_group
+          \ circonus_worksheet
+          \ ciscoasa_access_in_rules
+          \ ciscoasa_access_out_rules
+          \ ciscoasa_acl
+          \ ciscoasa_network_object
+          \ ciscoasa_network_object_group
+          \ ciscoasa_network_service_group
+          \ ciscoasa_static_route
+          \ clc_group
+          \ clc_load_balancer
+          \ clc_load_balancer_pool
+          \ clc_public_ip
+          \ clc_server
+          \ cloudflare_access_application
+          \ cloudflare_access_group
+          \ cloudflare_access_policy
+          \ cloudflare_access_rule
+          \ cloudflare_access_service_token
+          \ cloudflare_account_member
+          \ cloudflare_argo
+          \ cloudflare_custom_pages
+          \ cloudflare_custom_ssl
+          \ cloudflare_filter
+          \ cloudflare_firewall_rule
+          \ cloudflare_load_balancer
+          \ cloudflare_load_balancer_monitor
+          \ cloudflare_load_balancer_pool
+          \ cloudflare_logpush_job
+          \ cloudflare_origin_ca_certificate
+          \ cloudflare_page_rule
+          \ cloudflare_rate_limit
+          \ cloudflare_record
+          \ cloudflare_spectrum_application
+          \ cloudflare_waf_group
+          \ cloudflare_waf_package
+          \ cloudflare_waf_rule
+          \ cloudflare_worker_route
+          \ cloudflare_worker_script
+          \ cloudflare_workers_kv_namespace
+          \ cloudflare_zone
+          \ cloudflare_zone_lockdown
+          \ cloudflare_zone_settings_override
+          \ cloudscale_floating_ip
+          \ cloudscale_network
+          \ cloudscale_server
+          \ cloudscale_server_group
+          \ cloudscale_volume
+          \ cloudstack_affinity_group
+          \ cloudstack_autoscale_vm_profile
+          \ cloudstack_disk
+          \ cloudstack_egress_firewall
+          \ cloudstack_firewall
+          \ cloudstack_instance
+          \ cloudstack_ipaddress
+          \ cloudstack_loadbalancer_rule
+          \ cloudstack_network
+          \ cloudstack_network_acl
+          \ cloudstack_network_acl_rule
+          \ cloudstack_nic
+          \ cloudstack_port_forward
+          \ cloudstack_private_gateway
+          \ cloudstack_secondary_ipaddress
+          \ cloudstack_security_group
+          \ cloudstack_security_group_rule
+          \ cloudstack_ssh_keypair
+          \ cloudstack_static_nat
+          \ cloudstack_static_route
+          \ cloudstack_template
+          \ cloudstack_vpc
+          \ cloudstack_vpn_connection
+          \ cloudstack_vpn_customer_gateway
+          \ cloudstack_vpn_gateway
+          \ cobbler_distro
+          \ cobbler_kickstart_file
+          \ cobbler_profile
+          \ cobbler_repo
+          \ cobbler_snippet
+          \ cobbler_system
+          \ consul_acl_auth_method
+          \ consul_acl_binding_rule
+          \ consul_acl_policy
+          \ consul_acl_role
+          \ consul_acl_token
+          \ consul_acl_token_policy_attachment
+          \ consul_agent_service
+          \ consul_autopilot_config
+          \ consul_catalog_entry
+          \ consul_config_entry
+          \ consul_intention
+          \ consul_key_prefix
+          \ consul_keys
+          \ consul_license
+          \ consul_node
+          \ consul_prepared_query
+          \ consul_service
+          \ datadog_dashboard
+          \ datadog_dashboard_list
+          \ datadog_downtime
+          \ datadog_integration_aws
+          \ datadog_integration_gcp
+          \ datadog_integration_pagerduty
+          \ datadog_integration_pagerduty_service_object
+          \ datadog_logs_custom_pipeline
+          \ datadog_logs_index
+          \ datadog_logs_index_order
+          \ datadog_logs_integration_pipeline
+          \ datadog_logs_pipeline_order
+          \ datadog_metric_metadata
+          \ datadog_monitor
+          \ datadog_screenboard
+          \ datadog_service_level_objective
+          \ datadog_synthetics_test
+          \ datadog_timeboard
+          \ datadog_user
+          \ digitalocean_cdn
+          \ digitalocean_certificate
+          \ digitalocean_database_cluster
+          \ digitalocean_database_connection_pool
+          \ digitalocean_database_db
+          \ digitalocean_database_firewall
+          \ digitalocean_database_replica
+          \ digitalocean_database_user
+          \ digitalocean_domain
+          \ digitalocean_droplet
+          \ digitalocean_droplet_snapshot
+          \ digitalocean_firewall
+          \ digitalocean_floating_ip
+          \ digitalocean_floating_ip_assignment
+          \ digitalocean_kubernetes_cluster
+          \ digitalocean_kubernetes_node_pool
+          \ digitalocean_loadbalancer
+          \ digitalocean_project
+          \ digitalocean_record
+          \ digitalocean_spaces_bucket
+          \ digitalocean_ssh_key
+          \ digitalocean_tag
+          \ digitalocean_volume
+          \ digitalocean_volume_attachment
+          \ digitalocean_volume_snapshot
+          \ dme_record
+          \ dns_a_record_set
+          \ dns_aaaa_record_set
+          \ dns_cname_record
+          \ dns_mx_record_set
+          \ dns_ns_record_set
+          \ dns_ptr_record
+          \ dns_srv_record_set
+          \ dns_txt_record_set
+          \ dnsimple_record
+          \ docker_config
+          \ docker_container
+          \ docker_image
+          \ docker_network
+          \ docker_secret
+          \ docker_service
+          \ docker_volume
+          \ dyn_record
+          \ exoscale_affinity
+          \ exoscale_compute
+          \ exoscale_domain
+          \ exoscale_domain_record
+          \ exoscale_instance_pool
+          \ exoscale_ipaddress
+          \ exoscale_network
+          \ exoscale_nic
+          \ exoscale_secondary_ipaddress
+          \ exoscale_security_group
+          \ exoscale_security_group_rule
+          \ exoscale_security_group_rules
+          \ exoscale_ssh_keypair
+          \ fastly_service_acl_entries_v1
+          \ fastly_service_dictionary_items_v1
+          \ fastly_service_dynamic_snippet_content_v1
+          \ fastly_service_v1
+          \ flexibleengine_antiddos_v1
+          \ flexibleengine_as_configuration_v1
+          \ flexibleengine_as_group_v1
+          \ flexibleengine_as_policy_v1
+          \ flexibleengine_blockstorage_volume_v2
+          \ flexibleengine_cce_cluster_v3
+          \ flexibleengine_cce_node_v3
+          \ flexibleengine_ces_alarmrule
+          \ flexibleengine_compute_bms_server_v2
+          \ flexibleengine_compute_floatingip_associate_v2
+          \ flexibleengine_compute_floatingip_v2
+          \ flexibleengine_compute_instance_v2
+          \ flexibleengine_compute_interface_attach_v2
+          \ flexibleengine_compute_keypair_v2
+          \ flexibleengine_compute_servergroup_v2
+          \ flexibleengine_compute_volume_attach_v2
+          \ flexibleengine_csbs_backup_policy_v1
+          \ flexibleengine_csbs_backup_v1
+          \ flexibleengine_cts_tracker_v1
+          \ flexibleengine_dcs_instance_v1
+          \ flexibleengine_dds_instance_v3
+          \ flexibleengine_dns_recordset_v2
+          \ flexibleengine_dns_zone_v2
+          \ flexibleengine_drs_replication_v2
+          \ flexibleengine_drs_replicationconsistencygroup_v2
+          \ flexibleengine_dws_cluster_v1
+          \ flexibleengine_elb_backend
+          \ flexibleengine_elb_health
+          \ flexibleengine_elb_listener
+          \ flexibleengine_elb_loadbalancer
+          \ flexibleengine_fw_firewall_group_v2
+          \ flexibleengine_fw_policy_v2
+          \ flexibleengine_fw_rule_v2
+          \ flexibleengine_images_image_v2
+          \ flexibleengine_kms_key_v1
+          \ flexibleengine_lb_certificate_v2
+          \ flexibleengine_lb_l7policy_v2
+          \ flexibleengine_lb_l7rule_v2
+          \ flexibleengine_lb_listener_v2
+          \ flexibleengine_lb_loadbalancer_v2
+          \ flexibleengine_lb_member_v2
+          \ flexibleengine_lb_monitor_v2
+          \ flexibleengine_lb_pool_v2
+          \ flexibleengine_lb_whitelist_v2
+          \ flexibleengine_mls_instance_v1
+          \ flexibleengine_mrs_cluster_v1
+          \ flexibleengine_mrs_job_v1
+          \ flexibleengine_nat_dnat_rule_v2
+          \ flexibleengine_nat_gateway_v2
+          \ flexibleengine_nat_snat_rule_v2
+          \ flexibleengine_networking_floatingip_associate_v2
+          \ flexibleengine_networking_floatingip_v2
+          \ flexibleengine_networking_network_v2
+          \ flexibleengine_networking_port_v2
+          \ flexibleengine_networking_router_interface_v2
+          \ flexibleengine_networking_router_route_v2
+          \ flexibleengine_networking_router_v2
+          \ flexibleengine_networking_secgroup_rule_v2
+          \ flexibleengine_networking_secgroup_v2
+          \ flexibleengine_networking_subnet_v2
+          \ flexibleengine_networking_vip_associate_v2
+          \ flexibleengine_networking_vip_v2
+          \ flexibleengine_rds_instance_v1
+          \ flexibleengine_rds_instance_v3
+          \ flexibleengine_rds_parametergroup_v3
+          \ flexibleengine_rts_software_config_v1
+          \ flexibleengine_rts_stack_resource_v1
+          \ flexibleengine_rts_stack_v1
+          \ flexibleengine_s3_bucket
+          \ flexibleengine_s3_bucket_object
+          \ flexibleengine_s3_bucket_policy
+          \ flexibleengine_sdrs_drill_v1
+          \ flexibleengine_sdrs_protectedinstance_v1
+          \ flexibleengine_sdrs_protectiongroup_v1
+          \ flexibleengine_sdrs_replication_attach_v1
+          \ flexibleengine_sdrs_replication_pair_v1
+          \ flexibleengine_sfs_file_system_v2
+          \ flexibleengine_smn_subscription_v2
+          \ flexibleengine_smn_topic_v2
+          \ flexibleengine_vbs_backup_policy_v2
+          \ flexibleengine_vbs_backup_v2
+          \ flexibleengine_vpc_eip_v1
+          \ flexibleengine_vpc_peering_connection_accepter_v2
+          \ flexibleengine_vpc_peering_connection_v2
+          \ flexibleengine_vpc_route_v2
+          \ flexibleengine_vpc_subnet_v1
+          \ flexibleengine_vpc_v1
+          \ fortios_firewall_object_address
+          \ fortios_firewall_object_addressgroup
+          \ fortios_firewall_object_ippool
+          \ fortios_firewall_object_service
+          \ fortios_firewall_object_servicecategory
+          \ fortios_firewall_object_servicegroup
+          \ fortios_firewall_object_vip
+          \ fortios_firewall_object_vipgroup
+          \ fortios_firewall_security_policy
+          \ fortios_firewall_security_policyseq
+          \ fortios_log_fortianalyzer_setting
+          \ fortios_log_syslog_setting
+          \ fortios_networking_interface_port
+          \ fortios_networking_route_static
+          \ fortios_system_admin_administrator
+          \ fortios_system_admin_profiles
+          \ fortios_system_apiuser_setting
+          \ fortios_system_license_forticare
+          \ fortios_system_license_vdom
+          \ fortios_system_license_vm
+          \ fortios_system_setting_dns
+          \ fortios_system_setting_global
+          \ fortios_system_setting_ntp
+          \ fortios_system_vdom_setting
+          \ fortios_vpn_ipsec_phase1interface
+          \ fortios_vpn_ipsec_phase2interface
+          \ genymotion_cloud
+          \ github_branch_protection
+          \ github_issue_label
+          \ github_membership
+          \ github_organization_block
+          \ github_organization_project
+          \ github_organization_webhook
+          \ github_project_column
+          \ github_repository
+          \ github_repository_collaborator
+          \ github_repository_deploy_key
+          \ github_repository_project
+          \ github_repository_webhook
+          \ github_team
+          \ github_team_membership
+          \ github_team_repository
+          \ github_user_gpg_key
+          \ github_user_invitation_accepter
+          \ github_user_ssh_key
+          \ gitlab_branch_protection
+          \ gitlab_deploy_key
+          \ gitlab_deploy_key_enable
+          \ gitlab_group
+          \ gitlab_group_cluster
+          \ gitlab_group_label
+          \ gitlab_group_membership
+          \ gitlab_group_variable
+          \ gitlab_label
+          \ gitlab_pipeline_schedule
+          \ gitlab_pipeline_schedule_variable
+          \ gitlab_pipeline_trigger
+          \ gitlab_project
+          \ gitlab_project_cluster
+          \ gitlab_project_hook
+          \ gitlab_project_membership
+          \ gitlab_project_push_rules
+          \ gitlab_project_share_group
+          \ gitlab_project_variable
+          \ gitlab_service_jira
+          \ gitlab_service_slack
+          \ gitlab_tag_protection
+          \ gitlab_user
+          \ google_access_context_manager_access_level
+          \ google_access_context_manager_access_policy
+          \ google_access_context_manager_service_perimeter
+          \ google_access_context_manager_service_perimeter_resource
+          \ google_app_engine_application
+          \ google_app_engine_application_url_dispatch_rules
+          \ google_app_engine_domain_mapping
+          \ google_app_engine_firewall_rule
+          \ google_app_engine_standard_app_version
+          \ google_bigquery_data_transfer_config
+          \ google_bigquery_dataset
+          \ google_bigquery_table
+          \ google_bigtable_app_profile
+          \ google_bigtable_gc_policy
+          \ google_bigtable_instance
+          \ google_bigtable_instance_iam_binding
+          \ google_bigtable_instance_iam_member
+          \ google_bigtable_instance_iam_policy
+          \ google_bigtable_table
+          \ google_billing_account_iam_binding
+          \ google_billing_account_iam_member
+          \ google_billing_account_iam_policy
+          \ google_billing_budget
+          \ google_binary_authorization_attestor
+          \ google_binary_authorization_attestor_iam_binding
+          \ google_binary_authorization_attestor_iam_member
+          \ google_binary_authorization_attestor_iam_policy
+          \ google_binary_authorization_policy
+          \ google_cloud_run_domain_mapping
+          \ google_cloud_run_service
+          \ google_cloud_run_service_iam_binding
+          \ google_cloud_run_service_iam_member
+          \ google_cloud_run_service_iam_policy
+          \ google_cloud_scheduler_job
+          \ google_cloud_tasks_queue
+          \ google_cloudbuild_trigger
+          \ google_cloudfunctions_function
+          \ google_cloudfunctions_function_iam_binding
+          \ google_cloudfunctions_function_iam_member
+          \ google_cloudfunctions_function_iam_policy
+          \ google_cloudiot_registry
+          \ google_composer_environment
+          \ google_compute_address
+          \ google_compute_attached_disk
+          \ google_compute_autoscaler
+          \ google_compute_backend_bucket
+          \ google_compute_backend_bucket_signed_url_key
+          \ google_compute_backend_service
+          \ google_compute_backend_service_signed_url_key
+          \ google_compute_disk
+          \ google_compute_disk_resource_policy_attachment
+          \ google_compute_external_vpn_gateway
+          \ google_compute_firewall
+          \ google_compute_forwarding_rule
+          \ google_compute_global_address
+          \ google_compute_global_forwarding_rule
+          \ google_compute_ha_vpn_gateway
+          \ google_compute_health_check
+          \ google_compute_http_health_check
+          \ google_compute_https_health_check
+          \ google_compute_image
+          \ google_compute_instance
+          \ google_compute_instance_from_template
+          \ google_compute_instance_group
+          \ google_compute_instance_group_manager
+          \ google_compute_instance_iam_binding
+          \ google_compute_instance_iam_member
+          \ google_compute_instance_iam_policy
+          \ google_compute_instance_template
+          \ google_compute_interconnect_attachment
+          \ google_compute_managed_ssl_certificate
+          \ google_compute_network
+          \ google_compute_network_endpoint
+          \ google_compute_network_endpoint_group
+          \ google_compute_network_peering
+          \ google_compute_network_peering_routes_config
+          \ google_compute_node_group
+          \ google_compute_node_template
+          \ google_compute_project_default_network_tier
+          \ google_compute_project_metadata
+          \ google_compute_project_metadata_item
+          \ google_compute_region_autoscaler
+          \ google_compute_region_backend_service
+          \ google_compute_region_disk
+          \ google_compute_region_health_check
+          \ google_compute_region_instance_group_manager
+          \ google_compute_region_ssl_certificate
+          \ google_compute_region_target_http_proxy
+          \ google_compute_region_target_https_proxy
+          \ google_compute_region_url_map
+          \ google_compute_reservation
+          \ google_compute_resource_policy
+          \ google_compute_route
+          \ google_compute_router
+          \ google_compute_router_interface
+          \ google_compute_router_nat
+          \ google_compute_router_peer
+          \ google_compute_security_policy
+          \ google_compute_shared_vpc_host_project
+          \ google_compute_shared_vpc_service_project
+          \ google_compute_snapshot
+          \ google_compute_ssl_certificate
+          \ google_compute_ssl_policy
+          \ google_compute_subnetwork
+          \ google_compute_subnetwork_iam_binding
+          \ google_compute_subnetwork_iam_member
+          \ google_compute_subnetwork_iam_policy
+          \ google_compute_target_http_proxy
+          \ google_compute_target_https_proxy
+          \ google_compute_target_instance
+          \ google_compute_target_pool
+          \ google_compute_target_ssl_proxy
+          \ google_compute_target_tcp_proxy
+          \ google_compute_url_map
+          \ google_compute_vpn_gateway
+          \ google_compute_vpn_tunnel
+          \ google_container_analysis_note
+          \ google_container_cluster
+          \ google_container_node_pool
+          \ google_container_registry
+          \ google_data_fusion_instance
+          \ google_dataflow_job
+          \ google_dataproc_autoscaling_policy
+          \ google_dataproc_cluster
+          \ google_dataproc_cluster_iam_binding
+          \ google_dataproc_cluster_iam_member
+          \ google_dataproc_cluster_iam_policy
+          \ google_dataproc_job
+          \ google_dataproc_job_iam_binding
+          \ google_dataproc_job_iam_member
+          \ google_dataproc_job_iam_policy
+          \ google_deployment_manager_deployment
+          \ google_dialogflow_agent
+          \ google_dns_managed_zone
+          \ google_dns_policy
+          \ google_dns_record_set
+          \ google_endpoints_service
+          \ google_filestore_instance
+          \ google_firestore_index
+          \ google_folder
+          \ google_folder_iam_binding
+          \ google_folder_iam_member
+          \ google_folder_iam_policy
+          \ google_folder_organization_policy
+          \ google_healthcare_dataset
+          \ google_healthcare_dataset_iam_binding
+          \ google_healthcare_dataset_iam_member
+          \ google_healthcare_dataset_iam_policy
+          \ google_healthcare_dicom_store
+          \ google_healthcare_dicom_store_iam_binding
+          \ google_healthcare_dicom_store_iam_member
+          \ google_healthcare_dicom_store_iam_policy
+          \ google_healthcare_fhir_store
+          \ google_healthcare_fhir_store_iam_binding
+          \ google_healthcare_fhir_store_iam_member
+          \ google_healthcare_fhir_store_iam_policy
+          \ google_healthcare_hl7_v2_store
+          \ google_healthcare_hl7_v2_store_iam_binding
+          \ google_healthcare_hl7_v2_store_iam_member
+          \ google_healthcare_hl7_v2_store_iam_policy
+          \ google_iap_app_engine_service_iam_binding
+          \ google_iap_app_engine_service_iam_member
+          \ google_iap_app_engine_service_iam_policy
+          \ google_iap_app_engine_version_iam_binding
+          \ google_iap_app_engine_version_iam_member
+          \ google_iap_app_engine_version_iam_policy
+          \ google_iap_tunnel_instance_iam_binding
+          \ google_iap_tunnel_instance_iam_member
+          \ google_iap_tunnel_instance_iam_policy
+          \ google_iap_web_backend_service_iam_binding
+          \ google_iap_web_backend_service_iam_member
+          \ google_iap_web_backend_service_iam_policy
+          \ google_iap_web_iam_binding
+          \ google_iap_web_iam_member
+          \ google_iap_web_iam_policy
+          \ google_iap_web_type_app_engine_iam_binding
+          \ google_iap_web_type_app_engine_iam_member
+          \ google_iap_web_type_app_engine_iam_policy
+          \ google_iap_web_type_compute_iam_binding
+          \ google_iap_web_type_compute_iam_member
+          \ google_iap_web_type_compute_iam_policy
+          \ google_identity_platform_default_supported_idp_config
+          \ google_identity_platform_inbound_saml_config
+          \ google_identity_platform_oauth_idp_config
+          \ google_identity_platform_tenant
+          \ google_identity_platform_tenant_default_supported_idp_config
+          \ google_identity_platform_tenant_inbound_saml_config
+          \ google_identity_platform_tenant_oauth_idp_config
+          \ google_kms_crypto_key
+          \ google_kms_crypto_key_iam_binding
+          \ google_kms_crypto_key_iam_member
+          \ google_kms_crypto_key_iam_policy
+          \ google_kms_key_ring
+          \ google_kms_key_ring_iam_binding
+          \ google_kms_key_ring_iam_member
+          \ google_kms_key_ring_iam_policy
+          \ google_kms_secret_ciphertext
+          \ google_logging_billing_account_exclusion
+          \ google_logging_billing_account_sink
+          \ google_logging_folder_exclusion
+          \ google_logging_folder_sink
+          \ google_logging_metric
+          \ google_logging_organization_exclusion
+          \ google_logging_organization_sink
+          \ google_logging_project_exclusion
+          \ google_logging_project_sink
+          \ google_ml_engine_model
+          \ google_monitoring_alert_policy
+          \ google_monitoring_group
+          \ google_monitoring_notification_channel
+          \ google_monitoring_uptime_check_config
+          \ google_organization_iam_audit_config
+          \ google_organization_iam_binding
+          \ google_organization_iam_custom_role
+          \ google_organization_iam_member
+          \ google_organization_iam_policy
+          \ google_organization_policy
+          \ google_project
+          \ google_project_iam_audit_config
+          \ google_project_iam_binding
+          \ google_project_iam_custom_role
+          \ google_project_iam_member
+          \ google_project_iam_policy
+          \ google_project_organization_policy
+          \ google_project_service
+          \ google_project_services
+          \ google_project_usage_export_bucket
+          \ google_pubsub_subscription
+          \ google_pubsub_subscription_iam_binding
+          \ google_pubsub_subscription_iam_member
+          \ google_pubsub_subscription_iam_policy
+          \ google_pubsub_topic
+          \ google_pubsub_topic_iam_binding
+          \ google_pubsub_topic_iam_member
+          \ google_pubsub_topic_iam_policy
+          \ google_redis_instance
+          \ google_resource_manager_lien
+          \ google_runtimeconfig_config
+          \ google_runtimeconfig_config_iam_binding
+          \ google_runtimeconfig_config_iam_member
+          \ google_runtimeconfig_config_iam_policy
+          \ google_runtimeconfig_variable
+          \ google_scc_source
+          \ google_secret_manager_secret
+          \ google_secret_manager_secret_iam_binding
+          \ google_secret_manager_secret_iam_member
+          \ google_secret_manager_secret_iam_policy
+          \ google_secret_manager_secret_version
+          \ google_security_scanner_scan_config
+          \ google_service_account
+          \ google_service_account_iam_binding
+          \ google_service_account_iam_member
+          \ google_service_account_iam_policy
+          \ google_service_account_key
+          \ google_service_networking_connection
+          \ google_sourcerepo_repository
+          \ google_sourcerepo_repository_iam_binding
+          \ google_sourcerepo_repository_iam_member
+          \ google_sourcerepo_repository_iam_policy
+          \ google_spanner_database
+          \ google_spanner_database_iam_binding
+          \ google_spanner_database_iam_member
+          \ google_spanner_database_iam_policy
+          \ google_spanner_instance
+          \ google_spanner_instance_iam_binding
+          \ google_spanner_instance_iam_member
+          \ google_spanner_instance_iam_policy
+          \ google_sql_database
+          \ google_sql_database_instance
+          \ google_sql_ssl_cert
+          \ google_sql_user
+          \ google_storage_bucket
+          \ google_storage_bucket_access_control
+          \ google_storage_bucket_acl
+          \ google_storage_bucket_iam_binding
+          \ google_storage_bucket_iam_member
+          \ google_storage_bucket_iam_policy
+          \ google_storage_bucket_object
+          \ google_storage_default_object_access_control
+          \ google_storage_default_object_acl
+          \ google_storage_notification
+          \ google_storage_object_access_control
+          \ google_storage_object_acl
+          \ google_storage_transfer_job
+          \ google_tpu_node
+          \ google_vpc_access_connector
+          \ grafana_alert_notification
+          \ grafana_dashboard
+          \ grafana_data_source
+          \ grafana_folder
+          \ grafana_organization
+          \ gridscale_firewall
+          \ gridscale_ipv4
+          \ gridscale_ipv6
+          \ gridscale_isoimage
+          \ gridscale_loadbalancer
+          \ gridscale_network
+          \ gridscale_object_storage_accesskey
+          \ gridscale_paas
+          \ gridscale_paas_securityzone
+          \ gridscale_server
+          \ gridscale_snapshot
+          \ gridscale_snapshotschedule
+          \ gridscale_sshkey
+          \ gridscale_storage
+          \ gridscale_template
+          \ hcloud_floating_ip
+          \ hcloud_floating_ip_assignment
+          \ hcloud_network
+          \ hcloud_network_route
+          \ hcloud_network_subnet
+          \ hcloud_rdns
+          \ hcloud_server
+          \ hcloud_server_network
+          \ hcloud_ssh_key
+          \ hcloud_volume
+          \ hcloud_volume_attachment
+          \ hedvig_access
+          \ hedvig_lun
+          \ hedvig_mount
+          \ hedvig_vdisk
+          \ helm_release
+          \ helm_repository
+          \ heroku_account_feature
+          \ heroku_addon
+          \ heroku_addon_attachment
+          \ heroku_app
+          \ heroku_app_config_association
+          \ heroku_app_feature
+          \ heroku_app_release
+          \ heroku_app_webhook
+          \ heroku_build
+          \ heroku_cert
+          \ heroku_config
+          \ heroku_domain
+          \ heroku_drain
+          \ heroku_formation
+          \ heroku_pipeline
+          \ heroku_pipeline_coupling
+          \ heroku_slug
+          \ heroku_space
+          \ heroku_space_app_access
+          \ heroku_space_inbound_ruleset
+          \ heroku_space_peering_connection_accepter
+          \ heroku_space_vpn_connection
+          \ heroku_team_collaborator
+          \ heroku_team_member
+          \ huaweicloud_as_configuration_v1
+          \ huaweicloud_as_group_v1
+          \ huaweicloud_as_policy_v1
+          \ huaweicloud_blockstorage_volume_v2
+          \ huaweicloud_cce_cluster_v3
+          \ huaweicloud_cce_node_v3
+          \ huaweicloud_cdm_cluster_v1
+          \ huaweicloud_cdn_domain_v1
+          \ huaweicloud_ces_alarmrule
+          \ huaweicloud_cloudtable_cluster_v2
+          \ huaweicloud_compute_floatingip_associate_v2
+          \ huaweicloud_compute_floatingip_v2
+          \ huaweicloud_compute_instance_v2
+          \ huaweicloud_compute_interface_attach_v2
+          \ huaweicloud_compute_keypair_v2
+          \ huaweicloud_compute_secgroup_v2
+          \ huaweicloud_compute_servergroup_v2
+          \ huaweicloud_compute_volume_attach_v2
+          \ huaweicloud_cs_cluster_v1
+          \ huaweicloud_cs_peering_connect_v1
+          \ huaweicloud_cs_route_v1
+          \ huaweicloud_csbs_backup_policy_v1
+          \ huaweicloud_csbs_backup_v1
+          \ huaweicloud_css_cluster_v1
+          \ huaweicloud_cts_tracker_v1
+          \ huaweicloud_dcs_instance_v1
+          \ huaweicloud_dis_stream_v2
+          \ huaweicloud_dli_queue_v1
+          \ huaweicloud_dms_group_v1
+          \ huaweicloud_dms_instance_v1
+          \ huaweicloud_dms_queue_v1
+          \ huaweicloud_dns_ptrrecord_v2
+          \ huaweicloud_dns_recordset_v2
+          \ huaweicloud_dns_zone_v2
+          \ huaweicloud_dws_cluster
+          \ huaweicloud_ecs_instance_v1
+          \ huaweicloud_elb_backendecs
+          \ huaweicloud_elb_healthcheck
+          \ huaweicloud_elb_listener
+          \ huaweicloud_elb_loadbalancer
+          \ huaweicloud_fw_firewall_group_v2
+          \ huaweicloud_fw_policy_v2
+          \ huaweicloud_fw_rule_v2
+          \ huaweicloud_ges_graph_v1
+          \ huaweicloud_iam_agency_v3
+          \ huaweicloud_identity_group_membership_v3
+          \ huaweicloud_identity_group_v3
+          \ huaweicloud_identity_project_v3
+          \ huaweicloud_identity_role_assignment_v3
+          \ huaweicloud_identity_user_v3
+          \ huaweicloud_images_image_v2
+          \ huaweicloud_kms_key_v1
+          \ huaweicloud_lb_certificate_v2
+          \ huaweicloud_lb_l7policy_v2
+          \ huaweicloud_lb_l7rule_v2
+          \ huaweicloud_lb_listener_v2
+          \ huaweicloud_lb_loadbalancer_v2
+          \ huaweicloud_lb_member_v2
+          \ huaweicloud_lb_monitor_v2
+          \ huaweicloud_lb_pool_v2
+          \ huaweicloud_lb_whitelist_v2
+          \ huaweicloud_maas_task_v1
+          \ huaweicloud_mls_instance
+          \ huaweicloud_mrs_cluster_v1
+          \ huaweicloud_mrs_job_v1
+          \ huaweicloud_nat_dnat_rule_v2
+          \ huaweicloud_nat_gateway_v2
+          \ huaweicloud_nat_snat_rule_v2
+          \ huaweicloud_networking_floatingip_associate_v2
+          \ huaweicloud_networking_floatingip_v2
+          \ huaweicloud_networking_network_v2
+          \ huaweicloud_networking_port_v2
+          \ huaweicloud_networking_router_interface_v2
+          \ huaweicloud_networking_router_route_v2
+          \ huaweicloud_networking_router_v2
+          \ huaweicloud_networking_secgroup_rule_v2
+          \ huaweicloud_networking_secgroup_v2
+          \ huaweicloud_networking_subnet_v2
+          \ huaweicloud_networking_vip_associate_v2
+          \ huaweicloud_networking_vip_v2
+          \ huaweicloud_rds_instance_v1
+          \ huaweicloud_rds_instance_v3
+          \ huaweicloud_rds_parametergroup_v3
+          \ huaweicloud_rts_software_config_v1
+          \ huaweicloud_rts_stack_resource_v1
+          \ huaweicloud_rts_stack_v1
+          \ huaweicloud_s3_bucket
+          \ huaweicloud_s3_bucket_object
+          \ huaweicloud_s3_bucket_policy
+          \ huaweicloud_sfs_file_system_v2
+          \ huaweicloud_smn_subscription_v2
+          \ huaweicloud_smn_topic_v2
+          \ huaweicloud_vbs_backup_policy_v2
+          \ huaweicloud_vbs_backup_v2
+          \ huaweicloud_vpc_bandwidth_v2
+          \ huaweicloud_vpc_eip_v1
+          \ huaweicloud_vpc_peering_connection_accepter_v2
+          \ huaweicloud_vpc_peering_connection_v2
+          \ huaweicloud_vpc_route_v2
+          \ huaweicloud_vpc_subnet_v1
+          \ huaweicloud_vpc_v1
+          \ huaweicloud_vpnaas_endpoint_group_v2
+          \ huaweicloud_vpnaas_ike_policy_v2
+          \ huaweicloud_vpnaas_ipsec_policy_v2
+          \ huaweicloud_vpnaas_service_v2
+          \ huaweicloud_vpnaas_site_connection_v2
+          \ huaweicloudstack_as_configuration_v1
+          \ huaweicloudstack_as_group_v1
+          \ huaweicloudstack_as_policy_v1
+          \ huaweicloudstack_blockstorage_volume_v2
+          \ huaweicloudstack_compute_floatingip_associate_v2
+          \ huaweicloudstack_compute_instance_v2
+          \ huaweicloudstack_compute_interface_attach_v2
+          \ huaweicloudstack_compute_keypair_v2
+          \ huaweicloudstack_compute_servergroup_v2
+          \ huaweicloudstack_compute_volume_attach_v2
+          \ huaweicloudstack_lb_certificate_v2
+          \ huaweicloudstack_lb_l7policy_v2
+          \ huaweicloudstack_lb_l7rule_v2
+          \ huaweicloudstack_lb_listener_v2
+          \ huaweicloudstack_lb_loadbalancer_v2
+          \ huaweicloudstack_lb_member_v2
+          \ huaweicloudstack_lb_monitor_v2
+          \ huaweicloudstack_lb_pool_v2
+          \ huaweicloudstack_lb_whitelist_v2
+          \ huaweicloudstack_networking_floatingip_associate_v2
+          \ huaweicloudstack_networking_floatingip_v2
+          \ huaweicloudstack_networking_network_v2
+          \ huaweicloudstack_networking_port_v2
+          \ huaweicloudstack_networking_router_interface_v2
+          \ huaweicloudstack_networking_router_route_v2
+          \ huaweicloudstack_networking_router_v2
+          \ huaweicloudstack_networking_secgroup_rule_v2
+          \ huaweicloudstack_networking_secgroup_v2
+          \ huaweicloudstack_networking_subnet_v2
+          \ huaweicloudstack_networking_vip_associate_v2
+          \ huaweicloudstack_networking_vip_v2
+          \ icinga2_checkcommand
+          \ icinga2_host
+          \ icinga2_hostgroup
+          \ icinga2_notification
+          \ icinga2_service
+          \ icinga2_user
+          \ incapsula_acl_security_rule
+          \ incapsula_custom_certificate
+          \ incapsula_data_center
+          \ incapsula_data_center_server
+          \ incapsula_incap_rule
+          \ incapsula_security_rule_exception
+          \ incapsula_site
+          \ incapsula_waf_security_rule
+          \ influxdb_continuous_query
+          \ influxdb_database
+          \ influxdb_user
+          \ jdcloud_availability_group
+          \ jdcloud_disk
+          \ jdcloud_disk_attachment
+          \ jdcloud_eip
+          \ jdcloud_eip_association
+          \ jdcloud_instance
+          \ jdcloud_instance_ag_instance
+          \ jdcloud_instance_template
+          \ jdcloud_key_pairs
+          \ jdcloud_network_acl
+          \ jdcloud_network_interface
+          \ jdcloud_network_interface_attachment
+          \ jdcloud_network_security_group
+          \ jdcloud_network_security_group_rules
+          \ jdcloud_oss_bucket
+          \ jdcloud_oss_bucket_upload
+          \ jdcloud_rds_account
+          \ jdcloud_rds_database
+          \ jdcloud_rds_instance
+          \ jdcloud_rds_privilege
+          \ jdcloud_route_table
+          \ jdcloud_route_table_association
+          \ jdcloud_route_table_rules
+          \ jdcloud_subnet
+          \ jdcloud_vpc
+          \ kubernetes_api_service
+          \ kubernetes_cluster_role
+          \ kubernetes_cluster_role_binding
+          \ kubernetes_config_map
+          \ kubernetes_cron_job
+          \ kubernetes_daemonset
+          \ kubernetes_deployment
+          \ kubernetes_endpoints
+          \ kubernetes_horizontal_pod_autoscaler
+          \ kubernetes_ingress
+          \ kubernetes_job
+          \ kubernetes_limit_range
+          \ kubernetes_namespace
+          \ kubernetes_network_policy
+          \ kubernetes_persistent_volume
+          \ kubernetes_persistent_volume_claim
+          \ kubernetes_pod
+          \ kubernetes_pod_disruption_budget
+          \ kubernetes_priority_class
+          \ kubernetes_replication_controller
+          \ kubernetes_resource_quota
+          \ kubernetes_role
+          \ kubernetes_role_binding
+          \ kubernetes_secret
+          \ kubernetes_service
+          \ kubernetes_service_account
+          \ kubernetes_stateful_set
+          \ kubernetes_storage_class
+          \ launchdarkly_custom_role
+          \ launchdarkly_environment
+          \ launchdarkly_feature_flag
+          \ launchdarkly_feature_flag_environment
+          \ launchdarkly_project
+          \ launchdarkly_segment
+          \ launchdarkly_team_member
+          \ launchdarkly_webhook
+          \ librato_alert
+          \ librato_metric
+          \ librato_service
+          \ librato_space
+          \ librato_space_chart
+          \ linode_domain
+          \ linode_domain_record
+          \ linode_image
+          \ linode_instance
+          \ linode_nodebalancer
+          \ linode_nodebalancer_config
+          \ linode_nodebalancer_node
+          \ linode_object_storage_bucket
+          \ linode_object_storage_key
+          \ linode_rdns
+          \ linode_sshkey
+          \ linode_stackscript
+          \ linode_token
+          \ linode_volume
+          \ local_file
+          \ logentries_log
+          \ logentries_logset
+          \ logicmonitor_collector
+          \ logicmonitor_collector_group
+          \ logicmonitor_dashboard
+          \ logicmonitor_dashboard_group
+          \ logicmonitor_device
+          \ logicmonitor_device_group
+          \ mailgun_domain
+          \ mailgun_route
+          \ metalcloud_infrastructure
+          \ mongodbatlas_alert_configuration
+          \ mongodbatlas_auditing
+          \ mongodbatlas_cloud_provider_snapshot
+          \ mongodbatlas_cloud_provider_snapshot_restore_job
+          \ mongodbatlas_cluster
+          \ mongodbatlas_custom_db_role
+          \ mongodbatlas_database_user
+          \ mongodbatlas_encryption_at_rest
+          \ mongodbatlas_global_cluster_config
+          \ mongodbatlas_maintenance_window
+          \ mongodbatlas_network_container
+          \ mongodbatlas_network_peering
+          \ mongodbatlas_private_endpoint
+          \ mongodbatlas_private_endpoint_interface_link
+          \ mongodbatlas_private_ip_mode
+          \ mongodbatlas_project
+          \ mongodbatlas_project_ip_whitelist
+          \ mongodbatlas_team
+          \ mongodbatlas_teams
+          \ mongodbatlas_x509_authentication_database_user
+          \ mysql_database
+          \ mysql_grant
+          \ mysql_role
+          \ mysql_user
+          \ mysql_user_password
+          \ ncloud_block_storage
+          \ ncloud_block_storage_snapshot
+          \ ncloud_load_balancer
+          \ ncloud_load_balancer_ssl_certificate
+          \ ncloud_login_key
+          \ ncloud_nas_volume
+          \ ncloud_port_forwarding_rule
+          \ ncloud_public_ip
+          \ ncloud_server
+          \ netlify_build_hook
+          \ netlify_deploy_key
+          \ netlify_hook
+          \ netlify_site
+          \ newrelic_alert_channel
+          \ newrelic_alert_condition
+          \ newrelic_alert_policy
+          \ newrelic_alert_policy_channel
+          \ newrelic_dashboard
+          \ newrelic_infra_alert_condition
+          \ newrelic_insights_event
+          \ newrelic_nrql_alert_condition
+          \ newrelic_plugins_alert_condition
+          \ newrelic_synthetics_alert_condition
+          \ newrelic_synthetics_monitor
+          \ newrelic_synthetics_monitor_script
+          \ nomad_acl_policy
+          \ nomad_acl_token
+          \ nomad_job
+          \ nomad_namespace
+          \ nomad_quota_specification
+          \ nomad_sentinel_policy
+          \ ns1_apikey
+          \ ns1_datafeed
+          \ ns1_datasource
+          \ ns1_monitoringjob
+          \ ns1_notifylist
+          \ ns1_record
+          \ ns1_team
+          \ ns1_user
+          \ ns1_zone
+          \ nsxt_algorithm_type_ns_service
+          \ nsxt_dhcp_relay_profile
+          \ nsxt_dhcp_relay_service
+          \ nsxt_dhcp_server_ip_pool
+          \ nsxt_dhcp_server_profile
+          \ nsxt_ether_type_ns_service
+          \ nsxt_firewall_section
+          \ nsxt_icmp_type_ns_service
+          \ nsxt_igmp_type_ns_service
+          \ nsxt_ip_block
+          \ nsxt_ip_block_subnet
+          \ nsxt_ip_discovery_switching_profile
+          \ nsxt_ip_pool
+          \ nsxt_ip_pool_allocation_ip_address
+          \ nsxt_ip_protocol_ns_service
+          \ nsxt_ip_set
+          \ nsxt_l4_port_set_ns_service
+          \ nsxt_lb_client_ssl_profile
+          \ nsxt_lb_cookie_persistence_profile
+          \ nsxt_lb_fast_tcp_application_profile
+          \ nsxt_lb_fast_udp_application_profile
+          \ nsxt_lb_http_application_profile
+          \ nsxt_lb_http_forwarding_rule
+          \ nsxt_lb_http_monitor
+          \ nsxt_lb_http_request_rewrite_rule
+          \ nsxt_lb_http_response_rewrite_rule
+          \ nsxt_lb_http_virtual_server
+          \ nsxt_lb_https_monitor
+          \ nsxt_lb_icmp_monitor
+          \ nsxt_lb_passive_monitor
+          \ nsxt_lb_pool
+          \ nsxt_lb_server_ssl_profile
+          \ nsxt_lb_service
+          \ nsxt_lb_source_ip_persistence_profile
+          \ nsxt_lb_tcp_monitor
+          \ nsxt_lb_tcp_virtual_server
+          \ nsxt_lb_udp_monitor
+          \ nsxt_lb_udp_virtual_server
+          \ nsxt_logical_dhcp_port
+          \ nsxt_logical_dhcp_server
+          \ nsxt_logical_port
+          \ nsxt_logical_router_centralized_service_port
+          \ nsxt_logical_router_downlink_port
+          \ nsxt_logical_router_link_port_on_tier0
+          \ nsxt_logical_router_link_port_on_tier1
+          \ nsxt_logical_switch
+          \ nsxt_logical_tier0_router
+          \ nsxt_logical_tier1_router
+          \ nsxt_mac_management_switching_profile
+          \ nsxt_nat_rule
+          \ nsxt_ns_group
+          \ nsxt_ns_service_group
+          \ nsxt_policy_bgp_neighbor
+          \ nsxt_policy_dhcp_relay
+          \ nsxt_policy_dhcp_server
+          \ nsxt_policy_gateway_policy
+          \ nsxt_policy_group
+          \ nsxt_policy_ip_address_allocation
+          \ nsxt_policy_ip_block
+          \ nsxt_policy_ip_pool
+          \ nsxt_policy_ip_pool_block_subnet
+          \ nsxt_policy_ip_pool_static_subnet
+          \ nsxt_policy_lb_pool
+          \ nsxt_policy_lb_service
+          \ nsxt_policy_lb_virtual_server
+          \ nsxt_policy_nat_rule
+          \ nsxt_policy_security_policy
+          \ nsxt_policy_segment
+          \ nsxt_policy_service
+          \ nsxt_policy_static_route
+          \ nsxt_policy_tier0_gateway
+          \ nsxt_policy_tier0_gateway_interface
+          \ nsxt_policy_tier1_gateway
+          \ nsxt_policy_tier1_gateway_interface
+          \ nsxt_policy_vlan_segment
+          \ nsxt_policy_vm_tags
+          \ nsxt_qos_switching_profile
+          \ nsxt_spoofguard_switching_profile
+          \ nsxt_static_route
+          \ nsxt_switch_security_switching_profile
+          \ nsxt_vlan_logical_switch
+          \ nsxt_vm_tags
+          \ null_resource
+          \ nutanix_category_key
+          \ nutanix_category_value
+          \ nutanix_image
+          \ nutanix_network_security_rule
+          \ nutanix_subnet
+          \ nutanix_virtual_machine
+          \ nutanix_volume_group
+          \ oci_analytics_analytics_instance
+          \ oci_apigateway_deployment
+          \ oci_apigateway_gateway
+          \ oci_audit_configuration
+          \ oci_autoscaling_auto_scaling_configuration
+          \ oci_budget_alert_rule
+          \ oci_budget_budget
+          \ oci_containerengine_cluster
+          \ oci_containerengine_node_pool
+          \ oci_core_app_catalog_listing_resource_version
+          \ oci_core_app_catalog_listing_resource_version_agreement
+          \ oci_core_app_catalog_listing_resource_versions
+          \ oci_core_app_catalog_subscription
+          \ oci_core_boot_volume
+          \ oci_core_boot_volume_backup
+          \ oci_core_cluster_network
+          \ oci_core_console_history
+          \ oci_core_cpe
+          \ oci_core_cross_connect
+          \ oci_core_cross_connect_group
+          \ oci_core_dedicated_vm_host
+          \ oci_core_default_dhcp_options
+          \ oci_core_default_route_table
+          \ oci_core_default_security_list
+          \ oci_core_dhcp_options
+          \ oci_core_drg
+          \ oci_core_drg_attachment
+          \ oci_core_image
+          \ oci_core_instance
+          \ oci_core_instance_configuration
+          \ oci_core_instance_console_connection
+          \ oci_core_instance_pool
+          \ oci_core_internet_gateway
+          \ oci_core_ipsec
+          \ oci_core_ipsec_connection_tunnel_management
+          \ oci_core_listing_resource_version
+          \ oci_core_listing_resource_version_agreement
+          \ oci_core_listing_resource_versions
+          \ oci_core_local_peering_gateway
+          \ oci_core_nat_gateway
+          \ oci_core_network_security_group
+          \ oci_core_network_security_group_security_rule
+          \ oci_core_private_ip
+          \ oci_core_public_ip
+          \ oci_core_remote_peering_connection
+          \ oci_core_route_table
+          \ oci_core_route_table_attachment
+          \ oci_core_security_list
+          \ oci_core_service_gateway
+          \ oci_core_shape_management
+          \ oci_core_subnet
+          \ oci_core_vcn
+          \ oci_core_virtual_circuit
+          \ oci_core_vnic_attachment
+          \ oci_core_volume
+          \ oci_core_volume_attachment
+          \ oci_core_volume_backup
+          \ oci_core_volume_backup_policy
+          \ oci_core_volume_backup_policy_assignment
+          \ oci_core_volume_group
+          \ oci_core_volume_group_backup
+          \ oci_database_autonomous_container_database
+          \ oci_database_autonomous_data_warehouse
+          \ oci_database_autonomous_data_warehouse_backup
+          \ oci_database_autonomous_database
+          \ oci_database_autonomous_database_backup
+          \ oci_database_autonomous_database_instance_wallet_management
+          \ oci_database_autonomous_database_regional_wallet_management
+          \ oci_database_autonomous_exadata_infrastructure
+          \ oci_database_backup
+          \ oci_database_backup_destination
+          \ oci_database_data_guard_association
+          \ oci_database_database
+          \ oci_database_db_home
+          \ oci_database_db_system
+          \ oci_database_exadata_infrastructure
+          \ oci_database_exadata_iorm_config
+          \ oci_database_maintenance_run
+          \ oci_database_vm_cluster
+          \ oci_database_vm_cluster_network
+          \ oci_datacatalog_catalog
+          \ oci_datacatalog_connection
+          \ oci_datacatalog_data_asset
+          \ oci_dataflow_application
+          \ oci_dataflow_invoke_run
+          \ oci_datascience_model
+          \ oci_datascience_model_provenance
+          \ oci_datascience_notebook_session
+          \ oci_datascience_project
+          \ oci_dns_record
+          \ oci_dns_steering_policy
+          \ oci_dns_steering_policy_attachment
+          \ oci_dns_tsig_key
+          \ oci_dns_zone
+          \ oci_email_sender
+          \ oci_email_suppression
+          \ oci_events_rule
+          \ oci_file_storage_export
+          \ oci_file_storage_export_set
+          \ oci_file_storage_file_system
+          \ oci_file_storage_mount_target
+          \ oci_file_storage_snapshot
+          \ oci_functions_application
+          \ oci_functions_function
+          \ oci_functions_invoke_function
+          \ oci_health_checks_http_monitor
+          \ oci_health_checks_http_probe
+          \ oci_health_checks_ping_monitor
+          \ oci_health_checks_ping_probe
+          \ oci_identity_api_key
+          \ oci_identity_auth_token
+          \ oci_identity_authentication_policy
+          \ oci_identity_compartment
+          \ oci_identity_customer_secret_key
+          \ oci_identity_dynamic_group
+          \ oci_identity_group
+          \ oci_identity_identity_provider
+          \ oci_identity_idp_group_mapping
+          \ oci_identity_policy
+          \ oci_identity_smtp_credential
+          \ oci_identity_swift_password
+          \ oci_identity_tag
+          \ oci_identity_tag_default
+          \ oci_identity_tag_namespace
+          \ oci_identity_ui_password
+          \ oci_identity_user
+          \ oci_identity_user_capabilities_management
+          \ oci_identity_user_group_membership
+          \ oci_integration_integration_instance
+          \ oci_kms_encrypted_data
+          \ oci_kms_generated_key
+          \ oci_kms_key
+          \ oci_kms_key_version
+          \ oci_kms_vault
+          \ oci_limits_quota
+          \ oci_limits_resource_availability
+          \ oci_load_balancer
+          \ oci_load_balancer_backend
+          \ oci_load_balancer_backend_set
+          \ oci_load_balancer_backendset
+          \ oci_load_balancer_certificate
+          \ oci_load_balancer_hostname
+          \ oci_load_balancer_listener
+          \ oci_load_balancer_load_balancer
+          \ oci_load_balancer_path_route_set
+          \ oci_load_balancer_rule_set
+          \ oci_marketplace_accepted_agreement
+          \ oci_marketplace_listing_package_agreement
+          \ oci_monitoring_alarm
+          \ oci_objectstorage_bucket
+          \ oci_objectstorage_namespace_metadata
+          \ oci_objectstorage_object
+          \ oci_objectstorage_object_lifecycle_policy
+          \ oci_objectstorage_preauthrequest
+          \ oci_oce_oce_instance
+          \ oci_oda_oda_instance
+          \ oci_ons_notification_topic
+          \ oci_ons_subscription
+          \ oci_osmanagement_managed_instance_group
+          \ oci_osmanagement_managed_instance_management
+          \ oci_osmanagement_software_source
+          \ oci_osmanagement_software_sources
+          \ oci_resourcemanager_stack
+          \ oci_resourcemanager_stack_tf_state
+          \ oci_resourcemanager_stacks
+          \ oci_streaming_connect_harness
+          \ oci_streaming_stream
+          \ oci_streaming_stream_archiver
+          \ oci_streaming_stream_pool
+          \ oci_waas_address_list
+          \ oci_waas_certificate
+          \ oci_waas_custom_protection_rule
+          \ oci_waas_http_redirect
+          \ oci_waas_purge_cache
+          \ oci_waas_waas_policy
+          \ okta_auto_login_app
+          \ okta_bookmark_app
+          \ okta_idp
+          \ okta_mfa_policy
+          \ okta_mfa_policy_rule
+          \ okta_oauth_app
+          \ okta_oauth_app_redirect_uri
+          \ okta_password_policy
+          \ okta_password_policy_rule
+          \ okta_saml_app
+          \ okta_saml_idp
+          \ okta_saml_idp_signing_key
+          \ okta_secure_password_store_app
+          \ okta_signon_policy
+          \ okta_signon_policy_rule
+          \ okta_social_idp
+          \ okta_swa_app
+          \ okta_three_field_app
+          \ oneandone_baremetal
+          \ oneandone_block_storage
+          \ oneandone_firewall_policy
+          \ oneandone_image
+          \ oneandone_loadbalancer
+          \ oneandone_monitoring_policy
+          \ oneandone_private_network
+          \ oneandone_public_ip
+          \ oneandone_server
+          \ oneandone_shared_storage
+          \ oneandone_ssh_key
+          \ oneandone_vpn
+          \ opc_compute_acl
+          \ opc_compute_image_list
+          \ opc_compute_image_list_entry
+          \ opc_compute_instance
+          \ opc_compute_ip_address_association
+          \ opc_compute_ip_address_prefix_set
+          \ opc_compute_ip_address_reservation
+          \ opc_compute_ip_association
+          \ opc_compute_ip_network
+          \ opc_compute_ip_network_exchange
+          \ opc_compute_ip_reservation
+          \ opc_compute_machine_image
+          \ opc_compute_orchestrated_instance
+          \ opc_compute_route
+          \ opc_compute_sec_rule
+          \ opc_compute_security_application
+          \ opc_compute_security_association
+          \ opc_compute_security_ip_list
+          \ opc_compute_security_list
+          \ opc_compute_security_protocol
+          \ opc_compute_security_rule
+          \ opc_compute_snapshot
+          \ opc_compute_ssh_key
+          \ opc_compute_storage_attachment
+          \ opc_compute_storage_volume
+          \ opc_compute_storage_volume_snapshot
+          \ opc_compute_vnic_set
+          \ opc_compute_vpn_endpoint_v2
+          \ opc_lbaas_certificate
+          \ opc_lbaas_listener
+          \ opc_lbaas_load_balancer
+          \ opc_lbaas_policy
+          \ opc_lbaas_server_pool
+          \ opc_storage_container
+          \ opc_storage_object
+          \ opennebula_group
+          \ opennebula_image
+          \ opennebula_security_group
+          \ opennebula_template
+          \ opennebula_virtual_data_center
+          \ opennebula_virtual_machine
+          \ opennebula_virtual_machine_group
+          \ opennebula_virtual_network
+          \ openstack_blockstorage_quotaset_v2
+          \ openstack_blockstorage_quotaset_v3
+          \ openstack_blockstorage_volume_attach_v2
+          \ openstack_blockstorage_volume_attach_v3
+          \ openstack_blockstorage_volume_v1
+          \ openstack_blockstorage_volume_v2
+          \ openstack_blockstorage_volume_v3
+          \ openstack_compute_flavor_access_v2
+          \ openstack_compute_flavor_v2
+          \ openstack_compute_floatingip_associate_v2
+          \ openstack_compute_floatingip_v2
+          \ openstack_compute_instance_v2
+          \ openstack_compute_interface_attach_v2
+          \ openstack_compute_keypair_v2
+          \ openstack_compute_quotaset_v2
+          \ openstack_compute_secgroup_v2
+          \ openstack_compute_servergroup_v2
+          \ openstack_compute_volume_attach_v2
+          \ openstack_containerinfra_cluster_v1
+          \ openstack_containerinfra_clustertemplate_v1
+          \ openstack_db_configuration_v1
+          \ openstack_db_database_v1
+          \ openstack_db_instance_v1
+          \ openstack_db_user_v1
+          \ openstack_dns_recordset_v2
+          \ openstack_dns_zone_v2
+          \ openstack_fw_firewall_v1
+          \ openstack_fw_policy_v1
+          \ openstack_fw_rule_v1
+          \ openstack_identity_application_credential_v3
+          \ openstack_identity_endpoint_v3
+          \ openstack_identity_project_v3
+          \ openstack_identity_role_assignment_v3
+          \ openstack_identity_role_v3
+          \ openstack_identity_service_v3
+          \ openstack_identity_user_v3
+          \ openstack_images_image_access_accept_v2
+          \ openstack_images_image_access_v2
+          \ openstack_images_image_v2
+          \ openstack_keymanager_container_v1
+          \ openstack_keymanager_secret_v1
+          \ openstack_lb_l7policy_v2
+          \ openstack_lb_l7rule_v2
+          \ openstack_lb_listener_v2
+          \ openstack_lb_loadbalancer_v2
+          \ openstack_lb_member_v1
+          \ openstack_lb_member_v2
+          \ openstack_lb_monitor_v1
+          \ openstack_lb_monitor_v2
+          \ openstack_lb_pool_v1
+          \ openstack_lb_pool_v2
+          \ openstack_lb_vip_v1
+          \ openstack_networking_addressscope_v2
+          \ openstack_networking_floatingip_associate_v2
+          \ openstack_networking_floatingip_v2
+          \ openstack_networking_network_v2
+          \ openstack_networking_port_secgroup_associate_v2
+          \ openstack_networking_port_v2
+          \ openstack_networking_qos_bandwidth_limit_rule_v2
+          \ openstack_networking_qos_dscp_marking_rule_v2
+          \ openstack_networking_qos_minimum_bandwidth_rule_v2
+          \ openstack_networking_qos_policy_v2
+          \ openstack_networking_quota_v2
+          \ openstack_networking_rbac_policy_v2
+          \ openstack_networking_router_interface_v2
+          \ openstack_networking_router_route_v2
+          \ openstack_networking_router_v2
+          \ openstack_networking_secgroup_rule_v2
+          \ openstack_networking_secgroup_v2
+          \ openstack_networking_subnet_route_v2
+          \ openstack_networking_subnet_v2
+          \ openstack_networking_subnetpool_v2
+          \ openstack_networking_trunk_v2
+          \ openstack_objectstorage_container_v1
+          \ openstack_objectstorage_object_v1
+          \ openstack_objectstorage_tempurl_v1
+          \ openstack_orchestration_stack_v1
+          \ openstack_sharedfilesystem_securityservice_v2
+          \ openstack_sharedfilesystem_share_access_v2
+          \ openstack_sharedfilesystem_share_v2
+          \ openstack_sharedfilesystem_sharenetwork_v2
+          \ openstack_vpnaas_endpoint_group_v2
+          \ openstack_vpnaas_ike_policy_v2
+          \ openstack_vpnaas_ipsec_policy_v2
+          \ openstack_vpnaas_service_v2
+          \ openstack_vpnaas_site_connection_v2
+          \ opentelekomcloud_antiddos_v1
+          \ opentelekomcloud_as_configuration_v1
+          \ opentelekomcloud_as_group_v1
+          \ opentelekomcloud_as_policy_v1
+          \ opentelekomcloud_blockstorage_volume_v2
+          \ opentelekomcloud_cce_cluster_v3
+          \ opentelekomcloud_cce_node_v3
+          \ opentelekomcloud_ces_alarmrule
+          \ opentelekomcloud_compute_bms_server_v2
+          \ opentelekomcloud_compute_bms_tags_v2
+          \ opentelekomcloud_compute_floatingip_associate_v2
+          \ opentelekomcloud_compute_floatingip_v2
+          \ opentelekomcloud_compute_instance_v2
+          \ opentelekomcloud_compute_keypair_v2
+          \ opentelekomcloud_compute_secgroup_v2
+          \ opentelekomcloud_compute_servergroup_v2
+          \ opentelekomcloud_compute_volume_attach_v2
+          \ opentelekomcloud_csbs_backup_policy_v1
+          \ opentelekomcloud_csbs_backup_v1
+          \ opentelekomcloud_css_cluster_v1
+          \ opentelekomcloud_cts_tracker_v1
+          \ opentelekomcloud_dcs_instance_v1
+          \ opentelekomcloud_deh_host_v1
+          \ opentelekomcloud_dms_group_v1
+          \ opentelekomcloud_dms_queue_v1
+          \ opentelekomcloud_dns_recordset_v2
+          \ opentelekomcloud_dns_zone_v2
+          \ opentelekomcloud_ecs_instance_v1
+          \ opentelekomcloud_elb_backend
+          \ opentelekomcloud_elb_health
+          \ opentelekomcloud_elb_listener
+          \ opentelekomcloud_elb_loadbalancer
+          \ opentelekomcloud_evs_volume_v3
+          \ opentelekomcloud_fw_firewall_group_v2
+          \ opentelekomcloud_fw_policy_v2
+          \ opentelekomcloud_fw_rule_v2
+          \ opentelekomcloud_identity_agency_v3
+          \ opentelekomcloud_identity_group_membership_v3
+          \ opentelekomcloud_identity_group_v3
+          \ opentelekomcloud_identity_project_v3
+          \ opentelekomcloud_identity_role_assignment_v3
+          \ opentelekomcloud_identity_role_v3
+          \ opentelekomcloud_identity_user_v3
+          \ opentelekomcloud_images_image_v2
+          \ opentelekomcloud_ims_data_image_v2
+          \ opentelekomcloud_ims_image_v2
+          \ opentelekomcloud_kms_key_v1
+          \ opentelekomcloud_lb_certificate_v2
+          \ opentelekomcloud_lb_l7policy_v2
+          \ opentelekomcloud_lb_l7rule_v2
+          \ opentelekomcloud_lb_listener_v2
+          \ opentelekomcloud_lb_loadbalancer_v2
+          \ opentelekomcloud_lb_member_v2
+          \ opentelekomcloud_lb_monitor_v2
+          \ opentelekomcloud_lb_pool_v2
+          \ opentelekomcloud_lb_whitelist_v2
+          \ opentelekomcloud_logtank_group_v2
+          \ opentelekomcloud_logtank_topic_v2
+          \ opentelekomcloud_maas_task_v1
+          \ opentelekomcloud_mrs_cluster_v1
+          \ opentelekomcloud_mrs_job_v1
+          \ opentelekomcloud_nat_gateway_v2
+          \ opentelekomcloud_nat_snat_rule_v2
+          \ opentelekomcloud_networking_floatingip_associate_v2
+          \ opentelekomcloud_networking_floatingip_v2
+          \ opentelekomcloud_networking_network_v2
+          \ opentelekomcloud_networking_port_v2
+          \ opentelekomcloud_networking_router_interface_v2
+          \ opentelekomcloud_networking_router_route_v2
+          \ opentelekomcloud_networking_router_v2
+          \ opentelekomcloud_networking_secgroup_rule_v2
+          \ opentelekomcloud_networking_secgroup_v2
+          \ opentelekomcloud_networking_subnet_v2
+          \ opentelekomcloud_networking_vip_associate_v2
+          \ opentelekomcloud_networking_vip_v2
+          \ opentelekomcloud_rds_instance_v1
+          \ opentelekomcloud_rds_instance_v3
+          \ opentelekomcloud_rds_parametergroup_v3
+          \ opentelekomcloud_rts_software_config_v1
+          \ opentelekomcloud_rts_software_deployment_v1
+          \ opentelekomcloud_rts_stack_resource_v1
+          \ opentelekomcloud_rts_stack_v1
+          \ opentelekomcloud_s3_bucket
+          \ opentelekomcloud_s3_bucket_object
+          \ opentelekomcloud_s3_bucket_policy
+          \ opentelekomcloud_sdrs_protectiongroup_v1
+          \ opentelekomcloud_sfs_file_system_v2
+          \ opentelekomcloud_smn_subscription_v2
+          \ opentelekomcloud_smn_topic_v2
+          \ opentelekomcloud_vbs_backup_policy_v2
+          \ opentelekomcloud_vbs_backup_share_v2
+          \ opentelekomcloud_vbs_backup_v2
+          \ opentelekomcloud_vpc_eip_v1
+          \ opentelekomcloud_vpc_flow_log_v1
+          \ opentelekomcloud_vpc_peering_connection_accepter_v2
+          \ opentelekomcloud_vpc_peering_connection_v2
+          \ opentelekomcloud_vpc_route_v2
+          \ opentelekomcloud_vpc_subnet_v1
+          \ opentelekomcloud_vpc_v1
+          \ opentelekomcloud_vpnaas_endpoint_group_v2
+          \ opentelekomcloud_vpnaas_ike_policy_v2
+          \ opentelekomcloud_vpnaas_ipsec_policy_v2
+          \ opentelekomcloud_vpnaas_service_v2
+          \ opentelekomcloud_vpnaas_site_connection_v2
+          \ opentelekomcloud_waf_ccattackprotection_rule_v1
+          \ opentelekomcloud_waf_certificate_v1
+          \ opentelekomcloud_waf_datamasking_rule_v1
+          \ opentelekomcloud_waf_domain_v1
+          \ opentelekomcloud_waf_falsealarmmasking_rule_v1
+          \ opentelekomcloud_waf_policy_v1
+          \ opentelekomcloud_waf_preciseprotection_rule_v1
+          \ opentelekomcloud_waf_webtamperprotection_rule_v1
+          \ opentelekomcloud_waf_whiteblackip_rule_v1
+          \ opsgenie_api_integration
+          \ opsgenie_email_integration
+          \ opsgenie_escalation
+          \ opsgenie_heartbeat
+          \ opsgenie_maintenance
+          \ opsgenie_notification_policy
+          \ opsgenie_schedule
+          \ opsgenie_schedule_rotation
+          \ opsgenie_team
+          \ opsgenie_team_routing_rule
+          \ opsgenie_user
+          \ opsgenie_user_contact
+          \ oraclepaas_application_container
+          \ oraclepaas_database_access_rule
+          \ oraclepaas_database_service_instance
+          \ oraclepaas_java_access_rule
+          \ oraclepaas_java_service_instance
+          \ oraclepaas_mysql_access_rule
+          \ oraclepaas_mysql_service_instance
+          \ ovh_cloud_network_private
+          \ ovh_cloud_network_private_subnet
+          \ ovh_cloud_user
+          \ ovh_dedicated_server_install_task
+          \ ovh_dedicated_server_reboot_task
+          \ ovh_dedicated_server_update
+          \ ovh_domain_zone_record
+          \ ovh_domain_zone_redirection
+          \ ovh_ip_reverse
+          \ ovh_iploadbalancing_http_farm
+          \ ovh_iploadbalancing_http_farm_server
+          \ ovh_iploadbalancing_http_frontend
+          \ ovh_iploadbalancing_http_route
+          \ ovh_iploadbalancing_http_route_rule
+          \ ovh_iploadbalancing_refresh
+          \ ovh_iploadbalancing_tcp_farm
+          \ ovh_iploadbalancing_tcp_farm_server
+          \ ovh_iploadbalancing_tcp_frontend
+          \ ovh_iploadbalancing_vrack_network
+          \ ovh_me_installation_template
+          \ ovh_me_installation_template_partition_scheme
+          \ ovh_me_installation_template_partition_scheme_hardware_raid
+          \ ovh_me_installation_template_partition_scheme_partition
+          \ ovh_me_ssh_key
+          \ ovh_publiccloud_private_network
+          \ ovh_publiccloud_private_network_subnet
+          \ ovh_publiccloud_user
+          \ ovh_vrack_cloudproject
+          \ ovh_vrack_dedicated_server
+          \ ovh_vrack_dedicated_server_interface
+          \ ovh_vrack_iploadbalancing
+          \ ovh_vrack_publiccloud_attachment
+          \ packet_bgp_session
+          \ packet_device
+          \ packet_ip_attachment
+          \ packet_organization
+          \ packet_port_vlan_attachment
+          \ packet_project
+          \ packet_project_ssh_key
+          \ packet_reserved_ip_block
+          \ packet_spot_market_request
+          \ packet_ssh_key
+          \ packet_vlan
+          \ packet_volume
+          \ packet_volume_attachment
+          \ pagerduty_addon
+          \ pagerduty_escalation_policy
+          \ pagerduty_event_rule
+          \ pagerduty_extension
+          \ pagerduty_maintenance_window
+          \ pagerduty_schedule
+          \ pagerduty_service
+          \ pagerduty_service_integration
+          \ pagerduty_team
+          \ pagerduty_team_membership
+          \ pagerduty_user
+          \ pagerduty_user_contact_method
+          \ panos_address_group
+          \ panos_address_object
+          \ panos_administrative_tag
+          \ panos_aggregate_interface
+          \ panos_application_group
+          \ panos_application_object
+          \ panos_application_signature
+          \ panos_bfd_profile
+          \ panos_bgp
+          \ panos_bgp_aggregate
+          \ panos_bgp_aggregate_advertise_filter
+          \ panos_bgp_aggregate_suppress_filter
+          \ panos_bgp_auth_profile
+          \ panos_bgp_conditional_adv
+          \ panos_bgp_conditional_adv_advertise_filter
+          \ panos_bgp_conditional_adv_non_exist_filter
+          \ panos_bgp_dampening_profile
+          \ panos_bgp_export_rule_group
+          \ panos_bgp_import_rule_group
+          \ panos_bgp_peer
+          \ panos_bgp_peer_group
+          \ panos_bgp_redist_rule
+          \ panos_dag_tags
+          \ panos_edl
+          \ panos_email_server_profile
+          \ panos_ethernet_interface
+          \ panos_general_settings
+          \ panos_gre_tunnel
+          \ panos_http_server_profile
+          \ panos_ike_crypto_profile
+          \ panos_ike_gateway
+          \ panos_ipsec_crypto_profile
+          \ panos_ipsec_tunnel
+          \ panos_ipsec_tunnel_proxy_id_ipv4
+          \ panos_layer2_subinterface
+          \ panos_layer3_subinterface
+          \ panos_license_api_key
+          \ panos_licensing
+          \ panos_log_forwarding_profile
+          \ panos_loopback_interface
+          \ panos_management_profile
+          \ panos_monitor_profile
+          \ panos_nat_policy
+          \ panos_nat_rule
+          \ panos_nat_rule_group
+          \ panos_panorama_address_group
+          \ panos_panorama_address_object
+          \ panos_panorama_administrative_tag
+          \ panos_panorama_aggregate_interface
+          \ panos_panorama_application_group
+          \ panos_panorama_application_object
+          \ panos_panorama_application_signature
+          \ panos_panorama_bfd_profile
+          \ panos_panorama_bgp
+          \ panos_panorama_bgp_aggregate
+          \ panos_panorama_bgp_aggregate_advertise_filter
+          \ panos_panorama_bgp_aggregate_suppress_filter
+          \ panos_panorama_bgp_auth_profile
+          \ panos_panorama_bgp_conditional_adv
+          \ panos_panorama_bgp_conditional_adv_advertise_filter
+          \ panos_panorama_bgp_conditional_adv_non_exist_filter
+          \ panos_panorama_bgp_dampening_profile
+          \ panos_panorama_bgp_export_rule_group
+          \ panos_panorama_bgp_import_rule_group
+          \ panos_panorama_bgp_peer
+          \ panos_panorama_bgp_peer_group
+          \ panos_panorama_bgp_redist_rule
+          \ panos_panorama_device_group
+          \ panos_panorama_device_group_entry
+          \ panos_panorama_edl
+          \ panos_panorama_email_server_profile
+          \ panos_panorama_ethernet_interface
+          \ panos_panorama_gcp_account
+          \ panos_panorama_gke_cluster
+          \ panos_panorama_gke_cluster_group
+          \ panos_panorama_gre_tunnel
+          \ panos_panorama_http_server_profile
+          \ panos_panorama_ike_crypto_profile
+          \ panos_panorama_ike_gateway
+          \ panos_panorama_ipsec_crypto_profile
+          \ panos_panorama_ipsec_tunnel
+          \ panos_panorama_ipsec_tunnel_proxy_id_ipv4
+          \ panos_panorama_layer2_subinterface
+          \ panos_panorama_layer3_subinterface
+          \ panos_panorama_log_forwarding_profile
+          \ panos_panorama_loopback_interface
+          \ panos_panorama_management_profile
+          \ panos_panorama_monitor_profile
+          \ panos_panorama_nat_policy
+          \ panos_panorama_nat_rule
+          \ panos_panorama_nat_rule_group
+          \ panos_panorama_pbf_rule_group
+          \ panos_panorama_redistribution_profile_ipv4
+          \ panos_panorama_security_policies
+          \ panos_panorama_security_policy
+          \ panos_panorama_security_policy_group
+          \ panos_panorama_security_rule_group
+          \ panos_panorama_service_group
+          \ panos_panorama_service_object
+          \ panos_panorama_snmptrap_server_profile
+          \ panos_panorama_static_route_ipv4
+          \ panos_panorama_syslog_server_profile
+          \ panos_panorama_template
+          \ panos_panorama_template_entry
+          \ panos_panorama_template_stack
+          \ panos_panorama_template_stack_entry
+          \ panos_panorama_template_variable
+          \ panos_panorama_tunnel_interface
+          \ panos_panorama_virtual_router
+          \ panos_panorama_virtual_router_entry
+          \ panos_panorama_vlan
+          \ panos_panorama_vlan_entry
+          \ panos_panorama_vlan_interface
+          \ panos_panorama_zone
+          \ panos_panorama_zone_entry
+          \ panos_pbf_rule_group
+          \ panos_redistribution_profile_ipv4
+          \ panos_security_policies
+          \ panos_security_policy
+          \ panos_security_policy_group
+          \ panos_security_rule_group
+          \ panos_service_group
+          \ panos_service_object
+          \ panos_snmptrap_server_profile
+          \ panos_static_route_ipv4
+          \ panos_syslog_server_profile
+          \ panos_telemetry
+          \ panos_tunnel_interface
+          \ panos_virtual_router
+          \ panos_virtual_router_entry
+          \ panos_vlan
+          \ panos_vlan_entry
+          \ panos_vlan_interface
+          \ panos_zone
+          \ panos_zone_entry
+          \ postgresql_database
+          \ postgresql_default_privileges
+          \ postgresql_extension
+          \ postgresql_grant
+          \ postgresql_role
+          \ postgresql_schema
+          \ powerdns_record
+          \ powerdns_zone
+          \ profitbricks_datacenter
+          \ profitbricks_firewall
+          \ profitbricks_group
+          \ profitbricks_ipblock
+          \ profitbricks_ipfailover
+          \ profitbricks_lan
+          \ profitbricks_loadbalancer
+          \ profitbricks_nic
+          \ profitbricks_resource
+          \ profitbricks_server
+          \ profitbricks_share
+          \ profitbricks_snapshot
+          \ profitbricks_user
+          \ profitbricks_volume
+          \ pureport_aws_connection
+          \ pureport_azure_connection
+          \ pureport_google_cloud_connection
+          \ pureport_network
+          \ pureport_site_vpn_connection
+          \ rabbitmq_binding
+          \ rabbitmq_exchange
+          \ rabbitmq_permissions
+          \ rabbitmq_policy
+          \ rabbitmq_queue
+          \ rabbitmq_topic_permissions
+          \ rabbitmq_user
+          \ rabbitmq_vhost
+          \ rancher2_app
+          \ rancher2_auth_config_activedirectory
+          \ rancher2_auth_config_adfs
+          \ rancher2_auth_config_azuread
+          \ rancher2_auth_config_freeipa
+          \ rancher2_auth_config_github
+          \ rancher2_auth_config_keycloak
+          \ rancher2_auth_config_okta
+          \ rancher2_auth_config_openldap
+          \ rancher2_auth_config_ping
+          \ rancher2_bootstrap
+          \ rancher2_catalog
+          \ rancher2_certificate
+          \ rancher2_cloud_credential
+          \ rancher2_cluster
+          \ rancher2_cluster_alert_group
+          \ rancher2_cluster_alert_rule
+          \ rancher2_cluster_driver
+          \ rancher2_cluster_logging
+          \ rancher2_cluster_role_template_binding
+          \ rancher2_cluster_sync
+          \ rancher2_cluster_template
+          \ rancher2_etcd_backup
+          \ rancher2_global_role_binding
+          \ rancher2_multi_cluster_app
+          \ rancher2_namespace
+          \ rancher2_node_driver
+          \ rancher2_node_pool
+          \ rancher2_node_template
+          \ rancher2_notifier
+          \ rancher2_project
+          \ rancher2_project_alert_group
+          \ rancher2_project_alert_rule
+          \ rancher2_project_logging
+          \ rancher2_project_role_template_binding
+          \ rancher2_registry
+          \ rancher2_role_template
+          \ rancher2_secret
+          \ rancher2_setting
+          \ rancher2_token
+          \ rancher2_user
+          \ rancher_certificate
+          \ rancher_environment
+          \ rancher_host
+          \ rancher_registration_token
+          \ rancher_registry
+          \ rancher_registry_credential
+          \ rancher_secret
+          \ rancher_stack
+          \ rancher_volume
+          \ random_id
+          \ random_integer
+          \ random_password
+          \ random_pet
+          \ random_shuffle
+          \ random_string
+          \ random_uuid
+          \ resource_group_name
+          \ rightscale_credential
+          \ rightscale_cwf_process
+          \ rightscale_deployment
+          \ rightscale_instance
+          \ rightscale_network
+          \ rightscale_network_gateway
+          \ rightscale_route
+          \ rightscale_route_table
+          \ rightscale_security_group
+          \ rightscale_security_group_rule
+          \ rightscale_server
+          \ rightscale_server_array
+          \ rightscale_ssh_key
+          \ rightscale_subnet
+          \ rundeck_acl_policy
+          \ rundeck_job
+          \ rundeck_private_key
+          \ rundeck_project
+          \ rundeck_public_key
+          \ runscope_bucket
+          \ runscope_environment
+          \ runscope_schedule
+          \ runscope_step
+          \ runscope_test
+          \ scaffolding_resource
+          \ scaleway_account_ssh_key
+          \ scaleway_baremetal_server_beta
+          \ scaleway_bucket
+          \ scaleway_instance_ip
+          \ scaleway_instance_ip_reverse_dns
+          \ scaleway_instance_placement_group
+          \ scaleway_instance_security_group
+          \ scaleway_instance_server
+          \ scaleway_instance_volume
+          \ scaleway_ip
+          \ scaleway_ip_reverse_dns
+          \ scaleway_k8s_cluster_beta
+          \ scaleway_k8s_pool_beta
+          \ scaleway_lb_backend_beta
+          \ scaleway_lb_beta
+          \ scaleway_lb_frontend_beta
+          \ scaleway_object_bucket
+          \ scaleway_rdb_instance_beta
+          \ scaleway_registry_namespace_beta
+          \ scaleway_security_group
+          \ scaleway_security_group_rule
+          \ scaleway_server
+          \ scaleway_ssh_key
+          \ scaleway_token
+          \ scaleway_user_data
+          \ scaleway_volume
+          \ scaleway_volume_attachment
+          \ selectel_vpc_crossregion_subnet_v2
+          \ selectel_vpc_floatingip_v2
+          \ selectel_vpc_keypair_v2
+          \ selectel_vpc_license_v2
+          \ selectel_vpc_project_v2
+          \ selectel_vpc_role_v2
+          \ selectel_vpc_subnet_v2
+          \ selectel_vpc_token_v2
+          \ selectel_vpc_user_v2
+          \ selectel_vpc_vrrp_subnet_v2
+          \ signalfx_alert_muting_rule
+          \ signalfx_aws_external_integration
+          \ signalfx_aws_integration
+          \ signalfx_aws_token_integration
+          \ signalfx_azure_integration
+          \ signalfx_dashboard
+          \ signalfx_dashboard_group
+          \ signalfx_data_link
+          \ signalfx_detector
+          \ signalfx_event_feed_chart
+          \ signalfx_gcp_integration
+          \ signalfx_heatmap_chart
+          \ signalfx_jira_integration
+          \ signalfx_list_chart
+          \ signalfx_opsgenie_integration
+          \ signalfx_org_token
+          \ signalfx_pagerduty_integration
+          \ signalfx_single_value_chart
+          \ signalfx_slack_integration
+          \ signalfx_team
+          \ signalfx_text_chart
+          \ signalfx_time_chart
+          \ signalfx_victor_ops_integration
+          \ skytap_environment
+          \ skytap_icnr_tunnel
+          \ skytap_label_category
+          \ skytap_network
+          \ skytap_project
+          \ skytap_vm
+          \ softlayer_ssh_key
+          \ softlayer_virtual_guest
+          \ stackpath_compute_network_policy
+          \ stackpath_compute_workload
+          \ statuscake_test
+          \ telefonicaopencloud_antiddos_v1
+          \ telefonicaopencloud_as_configuration_v1
+          \ telefonicaopencloud_as_group_v1
+          \ telefonicaopencloud_as_policy_v1
+          \ telefonicaopencloud_blockstorage_volume_v2
+          \ telefonicaopencloud_ces_alarmrule
+          \ telefonicaopencloud_compute_bms_server_v2
+          \ telefonicaopencloud_compute_floatingip_associate_v2
+          \ telefonicaopencloud_compute_floatingip_v2
+          \ telefonicaopencloud_compute_instance_v2
+          \ telefonicaopencloud_compute_keypair_v2
+          \ telefonicaopencloud_compute_secgroup_v2
+          \ telefonicaopencloud_compute_servergroup_v2
+          \ telefonicaopencloud_compute_volume_attach_v2
+          \ telefonicaopencloud_csbs_backup_policy_v1
+          \ telefonicaopencloud_csbs_backup_v1
+          \ telefonicaopencloud_cts_tracker_v1
+          \ telefonicaopencloud_dcs_instance_v1
+          \ telefonicaopencloud_dms_group_v1
+          \ telefonicaopencloud_dms_queue_v1
+          \ telefonicaopencloud_dns_recordset_v2
+          \ telefonicaopencloud_dns_zone_v2
+          \ telefonicaopencloud_elb_backendecs
+          \ telefonicaopencloud_elb_healthcheck
+          \ telefonicaopencloud_elb_listener
+          \ telefonicaopencloud_elb_loadbalancer
+          \ telefonicaopencloud_fw_firewall_group_v2
+          \ telefonicaopencloud_fw_policy_v2
+          \ telefonicaopencloud_fw_rule_v2
+          \ telefonicaopencloud_maas_task_v1
+          \ telefonicaopencloud_mrs_cluster_v1
+          \ telefonicaopencloud_mrs_job_v1
+          \ telefonicaopencloud_networking_floatingip_v2
+          \ telefonicaopencloud_networking_network_v2
+          \ telefonicaopencloud_networking_port_v2
+          \ telefonicaopencloud_networking_router_interface_v2
+          \ telefonicaopencloud_networking_router_route_v2
+          \ telefonicaopencloud_networking_router_v2
+          \ telefonicaopencloud_networking_secgroup_rule_v2
+          \ telefonicaopencloud_networking_secgroup_v2
+          \ telefonicaopencloud_networking_subnet_v2
+          \ telefonicaopencloud_rds_instance_v1
+          \ telefonicaopencloud_rts_software_config_v1
+          \ telefonicaopencloud_rts_stack_resource_v1
+          \ telefonicaopencloud_rts_stack_v1
+          \ telefonicaopencloud_s3_bucket
+          \ telefonicaopencloud_s3_bucket_object
+          \ telefonicaopencloud_s3_bucket_policy
+          \ telefonicaopencloud_sfs_file_system_v2
+          \ telefonicaopencloud_smn_subscription_v2
+          \ telefonicaopencloud_smn_topic_v2
+          \ telefonicaopencloud_vbs_backup_policy_v2
+          \ telefonicaopencloud_vbs_backup_v2
+          \ telefonicaopencloud_vpc_eip_v1
+          \ telefonicaopencloud_vpc_peering_connection_accepter_v2
+          \ telefonicaopencloud_vpc_peering_connection_v2
+          \ telefonicaopencloud_vpc_subnet_v1
+          \ telefonicaopencloud_vpc_v1
+          \ template_dir
+          \ tencentcloud_alb_server_attachment
+          \ tencentcloud_as_attachment
+          \ tencentcloud_as_lifecycle_hook
+          \ tencentcloud_as_notification
+          \ tencentcloud_as_scaling_config
+          \ tencentcloud_as_scaling_group
+          \ tencentcloud_as_scaling_policy
+          \ tencentcloud_as_schedule
+          \ tencentcloud_cam_group
+          \ tencentcloud_cam_group_membership
+          \ tencentcloud_cam_group_policy_attachment
+          \ tencentcloud_cam_policy
+          \ tencentcloud_cam_role
+          \ tencentcloud_cam_role_policy_attachment
+          \ tencentcloud_cam_saml_provider
+          \ tencentcloud_cam_user
+          \ tencentcloud_cam_user_policy_attachment
+          \ tencentcloud_cbs_snapshot
+          \ tencentcloud_cbs_snapshot_policy
+          \ tencentcloud_cbs_snapshot_policy_attachment
+          \ tencentcloud_cbs_storage
+          \ tencentcloud_cbs_storage_attachment
+          \ tencentcloud_ccn
+          \ tencentcloud_ccn_attachment
+          \ tencentcloud_ccn_bandwidth_limit
+          \ tencentcloud_cfs_access_group
+          \ tencentcloud_cfs_access_rule
+          \ tencentcloud_cfs_file_system
+          \ tencentcloud_clb_attachment
+          \ tencentcloud_clb_instance
+          \ tencentcloud_clb_listener
+          \ tencentcloud_clb_listener_rule
+          \ tencentcloud_clb_redirection
+          \ tencentcloud_container_cluster
+          \ tencentcloud_container_cluster_instance
+          \ tencentcloud_cos_bucket
+          \ tencentcloud_cos_bucket_object
+          \ tencentcloud_dayu_cc_http_policy
+          \ tencentcloud_dayu_cc_https_policy
+          \ tencentcloud_dayu_ddos_policy
+          \ tencentcloud_dayu_ddos_policy_attachment
+          \ tencentcloud_dayu_ddos_policy_case
+          \ tencentcloud_dayu_l4_rule
+          \ tencentcloud_dayu_l7_rule
+          \ tencentcloud_dc_gateway
+          \ tencentcloud_dc_gateway_ccn_route
+          \ tencentcloud_dcx
+          \ tencentcloud_dnat
+          \ tencentcloud_eip
+          \ tencentcloud_eip_association
+          \ tencentcloud_eni
+          \ tencentcloud_eni_attachment
+          \ tencentcloud_gaap_certificate
+          \ tencentcloud_gaap_domain_error_page
+          \ tencentcloud_gaap_http_domain
+          \ tencentcloud_gaap_http_rule
+          \ tencentcloud_gaap_layer4_listener
+          \ tencentcloud_gaap_layer7_listener
+          \ tencentcloud_gaap_proxy
+          \ tencentcloud_gaap_realserver
+          \ tencentcloud_gaap_security_policy
+          \ tencentcloud_gaap_security_rule
+          \ tencentcloud_ha_vip
+          \ tencentcloud_ha_vip_eip_attachment
+          \ tencentcloud_instance
+          \ tencentcloud_key_pair
+          \ tencentcloud_kubernetes_as_scaling_group
+          \ tencentcloud_kubernetes_cluster
+          \ tencentcloud_kubernetes_scale_worker
+          \ tencentcloud_lb
+          \ tencentcloud_mongodb_instance
+          \ tencentcloud_mongodb_sharding_instance
+          \ tencentcloud_mysql_account
+          \ tencentcloud_mysql_account_privilege
+          \ tencentcloud_mysql_backup_policy
+          \ tencentcloud_mysql_instance
+          \ tencentcloud_mysql_privilege
+          \ tencentcloud_mysql_readonly_instance
+          \ tencentcloud_nat_gateway
+          \ tencentcloud_placement_group
+          \ tencentcloud_redis_backup_config
+          \ tencentcloud_redis_instance
+          \ tencentcloud_reserved_instance
+          \ tencentcloud_route_entry
+          \ tencentcloud_route_table
+          \ tencentcloud_route_table_entry
+          \ tencentcloud_scf_function
+          \ tencentcloud_scf_namespace
+          \ tencentcloud_security_group
+          \ tencentcloud_security_group_lite_rule
+          \ tencentcloud_security_group_rule
+          \ tencentcloud_ssl_certificate
+          \ tencentcloud_subnet
+          \ tencentcloud_tcaplus_application
+          \ tencentcloud_tcaplus_idl
+          \ tencentcloud_tcaplus_table
+          \ tencentcloud_tcaplus_zone
+          \ tencentcloud_vpc
+          \ tencentcloud_vpn_connection
+          \ tencentcloud_vpn_customer_gateway
+          \ tencentcloud_vpn_gateway
+          \ test_resource
+          \ test_resource_computed_set
+          \ test_resource_config_mode
+          \ test_resource_defaults
+          \ test_resource_deprecated
+          \ test_resource_diff_suppress
+          \ test_resource_force_new
+          \ test_resource_gh12183
+          \ test_resource_import_other
+          \ test_resource_import_removed
+          \ test_resource_list
+          \ test_resource_list_set
+          \ test_resource_map
+          \ test_resource_nested
+          \ test_resource_nested_id
+          \ test_resource_nested_set
+          \ test_resource_state_func
+          \ test_resource_timeout
+          \ test_resource_with_custom_diff
+          \ test_undeleteable
+          \ tfe_notification_configuration
+          \ tfe_oauth_client
+          \ tfe_organization
+          \ tfe_organization_token
+          \ tfe_policy_set
+          \ tfe_sentinel_policy
+          \ tfe_ssh_key
+          \ tfe_team
+          \ tfe_team_access
+          \ tfe_team_member
+          \ tfe_team_members
+          \ tfe_team_token
+          \ tfe_variable
+          \ tfe_workspace
+          \ tls_cert_request
+          \ tls_locally_signed_cert
+          \ tls_private_key
+          \ tls_self_signed_cert
+          \ triton_fabric
+          \ triton_firewall_rule
+          \ triton_instance_template
+          \ triton_key
+          \ triton_machine
+          \ triton_service_group
+          \ triton_snapshot
+          \ triton_vlan
+          \ ucloud_db_instance
+          \ ucloud_disk
+          \ ucloud_disk_attachment
+          \ ucloud_eip
+          \ ucloud_eip_association
+          \ ucloud_instance
+          \ ucloud_isolation_group
+          \ ucloud_lb
+          \ ucloud_lb_attachment
+          \ ucloud_lb_listener
+          \ ucloud_lb_rule
+          \ ucloud_lb_ssl
+          \ ucloud_lb_ssl_attachment
+          \ ucloud_memcache_instance
+          \ ucloud_nat_gateway
+          \ ucloud_nat_gateway_rule
+          \ ucloud_redis_instance
+          \ ucloud_security_group
+          \ ucloud_subnet
+          \ ucloud_udpn_connection
+          \ ucloud_vip
+          \ ucloud_vpc
+          \ ucloud_vpc_peering_connection
+          \ ucloud_vpn_connection
+          \ ucloud_vpn_customer_gateway
+          \ ucloud_vpn_gateway
+          \ ultradns_dirpool
+          \ ultradns_probe_http
+          \ ultradns_probe_ping
+          \ ultradns_rdpool
+          \ ultradns_record
+          \ ultradns_tcpool
+          \ venafi_certificate
+          \ vra7_deployment
+          \ vsphere_compute_cluster
+          \ vsphere_compute_cluster_host_group
+          \ vsphere_compute_cluster_vm_affinity_rule
+          \ vsphere_compute_cluster_vm_anti_affinity_rule
+          \ vsphere_compute_cluster_vm_dependency_rule
+          \ vsphere_compute_cluster_vm_group
+          \ vsphere_compute_cluster_vm_host_rule
+          \ vsphere_custom_attribute
+          \ vsphere_datacenter
+          \ vsphere_datastore_cluster
+          \ vsphere_datastore_cluster_vm_anti_affinity_rule
+          \ vsphere_distributed_port_group
+          \ vsphere_distributed_virtual_switch
+          \ vsphere_dpm_host_override
+          \ vsphere_drs_vm_override
+          \ vsphere_file
+          \ vsphere_folder
+          \ vsphere_ha_vm_override
+          \ vsphere_host
+          \ vsphere_host_port_group
+          \ vsphere_host_virtual_switch
+          \ vsphere_license
+          \ vsphere_nas_datastore
+          \ vsphere_resource_pool
+          \ vsphere_storage_drs_vm_override
+          \ vsphere_tag
+          \ vsphere_tag_category
+          \ vsphere_vapp_container
+          \ vsphere_vapp_entity
+          \ vsphere_virtual_disk
+          \ vsphere_virtual_machine
+          \ vsphere_virtual_machine_snapshot
+          \ vsphere_vmfs_datastore
+          \ vsphere_vnic
+          \ vthunder_ethernet
+          \ vthunder_rib_route
+          \ vthunder_server
+          \ vthunder_service_group
+          \ vthunder_virtual_server
+          \ vultr_bare_metal_server
+          \ vultr_block_storage
+          \ vultr_dns_domain
+          \ vultr_dns_record
+          \ vultr_firewall_group
+          \ vultr_firewall_rule
+          \ vultr_iso_private
+          \ vultr_network
+          \ vultr_reserved_ip
+          \ vultr_server
+          \ vultr_snapshot
+          \ vultr_snapshot_from_url
+          \ vultr_ssh_key
+          \ vultr_startup_script
+          \ vultr_user
+          \ yandex_compute_disk
+          \ yandex_compute_image
+          \ yandex_compute_instance
+          \ yandex_compute_instance_group
+          \ yandex_compute_snapshot
+          \ yandex_container_registry
+          \ yandex_dataproc_cluster
+          \ yandex_iam_service_account
+          \ yandex_iam_service_account_api_key
+          \ yandex_iam_service_account_iam_binding
+          \ yandex_iam_service_account_iam_member
+          \ yandex_iam_service_account_iam_policy
+          \ yandex_iam_service_account_key
+          \ yandex_iam_service_account_static_access_key
+          \ yandex_kms_symmetric_key
+          \ yandex_kubernetes_cluster
+          \ yandex_kubernetes_node_group
+          \ yandex_lb_network_load_balancer
+          \ yandex_lb_target_group
+          \ yandex_mdb_clickhouse_cluster
+          \ yandex_mdb_mongodb_cluster
+          \ yandex_mdb_mysql_cluster
+          \ yandex_mdb_postgresql_cluster
+          \ yandex_mdb_redis_cluster
+          \ yandex_resourcemanager_cloud
+          \ yandex_resourcemanager_cloud_iam_binding
+          \ yandex_resourcemanager_cloud_iam_member
+          \ yandex_resourcemanager_folder
+          \ yandex_resourcemanager_folder_iam_binding
+          \ yandex_resourcemanager_folder_iam_member
+          \ yandex_resourcemanager_folder_iam_policy
+          \ yandex_storage_bucket
+          \ yandex_storage_object
+          \ yandex_vpc_network
+          \ yandex_vpc_route_table
+          \ yandex_vpc_subnet
+""" end resources
+
+syn keyword terraSection connection output variable terraform locals
+syn keyword terraValueBool true false on off yes no
+
+syn keyword terraTodo         contained TODO FIXME XXX BUG
+syn region  terraComment      start="/\*" end="\*/" contains=terraTodo,@Spell
+syn region  terraComment      start="#" end="$" contains=terraTodo,@Spell
+syn region  terraComment      start="//" end="$" contains=terraTodo,@Spell
+
+syn keyword terraResource        resource nextgroup=terraResourceTypeStr skipwhite
+syn region  terraResourceTypeStr start=/"/ end=/"/ contains=terraResourceTypeBI nextgroup=terraResourceName skipwhite
+syn region  terraResourceName    start=/"/ end=/"/ nextgroup=terraResourceBlock skipwhite
+
+syn keyword terraData        data nextgroup=terraDataTypeStr skipwhite
+syn region  terraDataTypeStr start=/"/ end=/"/ contains=terraDataTypeBI nextgroup=terraDataName skipwhite
+syn region  terraDataName    start=/"/ end=/"/ nextgroup=terraDataBlock skipwhite
+
+""" provider
+syn keyword terraProvider     provider nextgroup=terraProviderName skipwhite
+syn region  terraProviderName start=/"/ end=/"/ nextgroup=terraProviderBlock skipwhite
+
+""" provisioner
+syn keyword terraProvisioner     provisioner nextgroup=terraProvisionerName skipwhite
+syn region  terraProvisionerName start=/"/ end=/"/ nextgroup=terraProvisionerBlock skipwhite
+
+""" module
+syn keyword terraModule     module nextgroup=terraModuleName skipwhite
+syn region  terraModuleName start=/"/ end=/"/ nextgroup=terraModuleBlock skipwhite
+
+""" dynamic (HCL2)
+syn keyword terraDynamic     dynamic nextgroup=terraDynamicName skipwhite
+syn region  terraDynamicName start=/"/ end=/"/ nextgroup=terraDynamicBlock skipwhite
+
+""" misc.
+syn match terraValueDec      "\<[0-9]\+\([kKmMgG]b\?\)\?\>"
+syn match terraValueHexaDec  "\<0x[0-9a-f]\+\([kKmMgG]b\?\)\?\>"
+syn match terraBraces        "[\[\]]"
+
+""" skip \" and \\ in strings.
+syn region terraValueString   start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=terraStringInterp
+syn region terraStringInterp  matchgroup=terraBraces start=/\${/ end=/}/ contained contains=ALL
+syn region terraHereDocText   start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=terraStringInterp
+
+"" TODO match keywords here, not a-z+
+syn match terraValueFunction "[a-z]\+(\@="
+
+""" HCL2
+syn keyword terraContent        content
+syn keyword terraRepeat         for in
+syn keyword terraConditional    if
+syn keyword terraPrimitiveType  string bool number
+syn keyword terraStructuralType object tuple
+syn keyword terraCollectionType list map set
+syn keyword terraValueNull      null
+
+""" Terraform v0.12
+syn keyword terraTodo contained TF-UPGRADE-TODO
+
+" enable block folding
+syn region terraBlock matchgroup=terraBraces start="{" end="}" fold transparent
+
+hi def link terraComment           Comment
+hi def link terraTodo              Todo
+hi def link terraProvider          Structure
+hi def link terraBraces            Delimiter
+hi def link terraProviderName      String
+hi def link terraResource          Structure
+hi def link terraResourceName      String
+hi def link terraResourceTypeBI    Tag
+hi def link terraResourceTypeStr   String
+hi def link terraData              Structure
+hi def link terraDataName          String
+hi def link terraDataTypeBI        Tag
+hi def link terraDataTypeStr       String
+hi def link terraSection           Structure
+hi def link terraValueBool         Boolean
+hi def link terraValueDec          Number
+hi def link terraValueHexaDec      Number
+hi def link terraValueString       String
+hi def link terraHereDocText       String
+hi def link terraProvisioner       Structure
+hi def link terraProvisionerName   String
+hi def link terraModule            Structure
+hi def link terraModuleName        String
+hi def link terraValueFunction     Function
+hi def link terraDynamic           Structure
+hi def link terraDynamicName       String
+hi def link terraContent           Structure
+hi def link terraRepeat            Repeat
+hi def link terraConditional       Conditional
+hi def link terraPrimitiveType     Type
+hi def link terraStructuralType    Type
+hi def link terraCollectionType    Type
+hi def link terraValueNull         Constant
+
+let b:current_syntax = 'terraform'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/pack/language/start/terraform/test/syntax.vader b/pack/language/start/terraform/test/syntax.vader
new file mode 100755
index 0000000..d0b4f25
--- /dev/null
+++ b/pack/language/start/terraform/test/syntax.vader
@@ -0,0 +1,52 @@
+Before:
+  silent! set filetype=terraform
+
+Given terraform (user maps):
+  resource "aws_subnet" "dmz" {
+    cidr_block = "${var.dmz_subnet["${count.index}"]}" # Comment
+  }
+
+Execute (syntax is good):
+  AssertEqual 'terraStringInterp', SyntaxOf('count.index')
+
+  " Check it closed the string and went back to normal mode properly.
+  AssertEqual 'terraComment', SyntaxOf('Comment')
+
+
+Given terraform (heredoc syntax);
+provisioner "local-exec" {
+  command = <<CMD
+echo ${aws_instance.web.private_ip} >> private_ips.txt && \
+my_command
+CMD # Comment
+
+  tags = {}
+  }
+}
+;
+
+Execute (syntax is good):
+  AssertEqual 'terraResourceTypeBI', SyntaxOf('aws_instance')
+  AssertEqual 'terraHereDocText', SyntaxOf('my_command')
+
+  " Closing CMD is still here doc
+  AssertEqual 'terraHereDocText', SyntaxOf('CMD', 2)
+
+  " block should be closed
+  AssertEqual 'terraComment', SyntaxOf('Comment')
+
+  " tags should reset syntax
+  AssertEqual '', SyntaxOf("tags")
+
+
+Given terraform (nested strings):
+  Name = "${var.environment == "staging" ? "sgn-stg-${var.application}" : "sgn-prd-${var.application}"}" # Comment
+  Other = "foo"
+
+Execute (syntax is good):
+  AssertEqual 'terraStringInterp', SyntaxOf('var.environment')
+  AssertEqual 'terraComment', SyntaxOf('Comment')
+  AssertEqual '', SyntaxAt(2, 1)
+
+Execute ("Cleanup"):
+  silent! unset filetype
diff --git a/pack/language/start/terraform/test/terraform_align.vader b/pack/language/start/terraform/test/terraform_align.vader
new file mode 100755
index 0000000..13f8166
--- /dev/null
+++ b/pack/language/start/terraform/test/terraform_align.vader
@@ -0,0 +1,25 @@
+Before:
+  silent! set filetype=terraform
+  silent! let g:terraform_align=1
+
+Given ("That g:terraform_align=1"):
+  You should never see me!
+
+Execute ("File syntax is set for terraform"):
+  AssertEqual "terraform", &ft
+
+Execute ("terraform_align is enabled"):
+  AssertEqual 1, g:terraform_align
+
+Execute ("We display the correct number of spaces when pressing tab"):
+  AssertEqual 2, &tabstop
+
+Execute ("We insert the correct number of spaces when pressing tab"):
+  AssertEqual 2, &softtabstop
+
+Execute ("Number of spaces for indentation"):
+  AssertEqual 2, &shiftwidth
+
+Execute ("Cleanup"):
+  silent! let g:terraform_align=0
+  silent! unset filetype
diff --git a/pack/language/start/terraform/test/terraform_fold_sections.vader b/pack/language/start/terraform/test/terraform_fold_sections.vader
new file mode 100755
index 0000000..9200962
--- /dev/null
+++ b/pack/language/start/terraform/test/terraform_fold_sections.vader
@@ -0,0 +1,16 @@
+Before:
+  silent! set filetype=terraform
+  silent! let g:terraform_fold_sections=1
+
+Given ("That g:terraform_fold_sections=1"):
+  You should never see me!
+
+Execute ("File syntax is set for terraform"):
+  AssertEqual "terraform", &ft
+
+Execute ("terraform_fold_sections is enabled"):
+  AssertEqual 1, g:terraform_fold_sections
+
+Execute ("Cleanup"):
+  silent! let g:terraform_fold_sections=0
+  silent! unset filetype
diff --git a/pack/language/start/terraform/update_automagic.sh b/pack/language/start/terraform/update_automagic.sh
new file mode 100755
index 0000000..2a81bf7
--- /dev/null
+++ b/pack/language/start/terraform/update_automagic.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+VERSION="${1}"
+
+function usage {
+    echo -e "
+    USAGE EXAMPLES:
+
+        ./$(basename $0) 0.8.7
+        ./$(basename $0) 0.9.2
+    "
+}
+
+if [ $# -ne 1 ]; then
+    usage
+    exit 1
+fi
+
+PLATFORM="$(uname | tr [A-Z] [a-z])"
+
+echo "+) Acquiring terraform-${VERSION}"
+if [ ! -f "terraform_${VERSION}_${PLATFORM}_amd64.zip" ]; then
+    curl -O https://releases.hashicorp.com/terraform/${VERSION}/terraform_${VERSION}_${PLATFORM}_amd64.zip
+fi
+
+echo "+) Extracting terraform-${VERSION}.tar.gz"
+rm -f terraform
+unzip terraform_${VERSION}_${PLATFORM}_amd64.zip
+
+echo "+) Getting providers"
+./get_providers.sh
+
+echo "+) Running update_commands.rb"
+./update_commands.rb
+
+echo "+) Running update_data_sources.rb"
+./update_data_sources.rb
+
+echo "+) Running update_resources.rb"
+./update_resources.rb
+
+echo "+) Updating the badge in the README.md"
+sed -i "/img.shields.io/c\[\![](https://img.shields.io/badge/Supports%20Terraform%20Version-%3E%3D${VERSION}-blue.svg)](https://github.com/hashicorp/terraform/blob/v${VERSION}/CHANGELOG.md)" README.md
+
+echo "+) Cleaning up after ourselves"
+rm -f terraform_${VERSION}_${PLATFORM}_amd64.zip
+rm -f terraform
+rm -rf terraform-${VERSION}
+sudo umount terraform-providers
+
+git status
diff --git a/pack/language/start/terraform/update_commands.rb b/pack/language/start/terraform/update_commands.rb
new file mode 100755
index 0000000..eceb822
--- /dev/null
+++ b/pack/language/start/terraform/update_commands.rb
@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+# Use this script to update the commands auto-completed in autoload/terraform.vim.
+
+require 'open3'
+
+command_re = /^\s\s\s\s(\S+)/
+plugin_file = 'autoload/terraform.vim'
+
+# Create the list of commands.
+
+if File.file?('./terraform')
+    stdout, stderr, _status = Open3.capture3('./terraform list-commands')
+else
+    stdout, stderr, _status = Open3.capture3('terraform list-commands')
+end
+
+output = if stderr == ''
+           stdout.split("\n")
+         else
+           stderr.split("\n")
+         end
+commands = output.collect do |l|
+  match = command_re.match(l)
+  "    \\ '#{match[1]}'" if match
+end.reject(&:nil?).join(",\n")
+
+# Read in the existing plugin file.
+plugin = File.open(plugin_file, 'r').readlines
+
+# Replace the terraResourceTypeBI lines with our new list.
+first = plugin.index { |l| /^  let l:commands = \[/.match(l) } + 1
+last = plugin.index { |l| /^  \\ \]\n/.match(l) }
+plugin.slice!(first, last - first)
+commands.split("\n").reverse_each do |r|
+  plugin.insert(first, r)
+end
+
+# Write the plugin file back out.
+File.open(plugin_file, 'w') do |f|
+  f.puts plugin
+end
diff --git a/pack/language/start/terraform/update_data_sources.rb b/pack/language/start/terraform/update_data_sources.rb
new file mode 100755
index 0000000..ca46b31
--- /dev/null
+++ b/pack/language/start/terraform/update_data_sources.rb
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+# Use this script to update the resources recognized in syntax/terraform.vim.
+# You'll need a current checkout of the Terraform source.
+
+resource_declaration = /"(.*)":(.*)dataSource(.*)\(.*\),$/i
+syntax_file = 'syntax/terraform.vim'
+
+# Create the list of resources.
+provider_files = Dir.glob(['terraform-providers/**/*provider*.go', 'terraform-providers/**/*registration*.go'])
+provider_files = provider_files.grep_v('*_test.go')
+resources = provider_files.collect do |f|
+  File.open(f, 'r').readlines.collect do |l|
+    match = resource_declaration.match(l)
+    "          \\ #{match[1]}\n" if match
+  end.reject(&:nil?)
+end.flatten.sort.uniq
+
+# Read in the existing syntax file.
+syntax = File.open(syntax_file, 'r').readlines
+
+# Replace the terraResourceTypeBI lines with our new list.
+first = syntax.index { |l| /^syn keyword terraDataTypeBI/.match(l) } + 1
+last = syntax.index { |l| /^""" end data sources/.match(l) }
+syntax.slice!(first, last - first)
+resources.reverse_each do |r|
+  syntax.insert(first, r)
+end
+
+# Write the syntax file back out.
+File.open(syntax_file, 'w') do |f|
+  f.puts syntax
+end
diff --git a/pack/language/start/terraform/update_resources.rb b/pack/language/start/terraform/update_resources.rb
new file mode 100755
index 0000000..e34f651
--- /dev/null
+++ b/pack/language/start/terraform/update_resources.rb
@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+# Use this script to update the resources recognized in syntax/terraform.vim.
+# You'll need a current checkout of the Terraform source.
+
+resource_declaration = /"(.*)":(.*)resource(.*)\(.*\),$/i
+syntax_file = 'syntax/terraform.vim'
+
+# Create the list of resources.
+provider_files = Dir.glob(['terraform-providers/**/*provider*.go', 'terraform-providers/**/*registration*.go'])
+provider_files = provider_files.grep_v('*_test.go')
+resources = provider_files.collect do |f|
+  File.open(f, 'r').readlines.collect do |l|
+    match = resource_declaration.match(l)
+    "          \\ #{match[1]}\n" if match
+  end.reject(&:nil?)
+end.flatten.sort.uniq
+puts resources
+
+# Read in the existing syntax file.
+syntax = File.open(syntax_file, 'r').readlines
+
+# Replace the terraResourceTypeBI lines with our new list.
+first = syntax.index { |l| /^syn keyword terraResourceTypeBI/.match(l) } + 1
+last = syntax.index { |l| /^""" end resources/.match(l) }
+syntax.slice!(first, last - first)
+resources.reverse_each do |r|
+  syntax.insert(first, r)
+end
+
+# Write the syntax file back out.
+File.open(syntax_file, 'w') do |f|
+  f.puts syntax
+end
diff --git a/bundle/typescript/README.md b/pack/language/start/typescript/README.md
similarity index 100%
rename from bundle/typescript/README.md
rename to pack/language/start/typescript/README.md
diff --git a/bundle/typescript/compiler/typescript.vim b/pack/language/start/typescript/compiler/typescript.vim
similarity index 100%
rename from bundle/typescript/compiler/typescript.vim
rename to pack/language/start/typescript/compiler/typescript.vim
diff --git a/bundle/typescript/ftdetect/typescript.vim b/pack/language/start/typescript/ftdetect/typescript.vim
similarity index 100%
rename from bundle/typescript/ftdetect/typescript.vim
rename to pack/language/start/typescript/ftdetect/typescript.vim
diff --git a/bundle/typescript/ftplugin/typescript.vim b/pack/language/start/typescript/ftplugin/typescript.vim
similarity index 100%
rename from bundle/typescript/ftplugin/typescript.vim
rename to pack/language/start/typescript/ftplugin/typescript.vim
diff --git a/bundle/typescript/indent/typescript.vim b/pack/language/start/typescript/indent/typescript.vim
similarity index 100%
rename from bundle/typescript/indent/typescript.vim
rename to pack/language/start/typescript/indent/typescript.vim
diff --git a/bundle/typescript/syntax/typescript.vim b/pack/language/start/typescript/syntax/typescript.vim
similarity index 100%
rename from bundle/typescript/syntax/typescript.vim
rename to pack/language/start/typescript/syntax/typescript.vim
diff --git a/bundle/typescript/vimshot01.png b/pack/language/start/typescript/vimshot01.png
similarity index 100%
rename from bundle/typescript/vimshot01.png
rename to pack/language/start/typescript/vimshot01.png
diff --git a/pack/navigation/start/ack/.gitignore b/pack/navigation/start/ack/.gitignore
new file mode 100644
index 0000000..6e92f57
--- /dev/null
+++ b/pack/navigation/start/ack/.gitignore
@@ -0,0 +1 @@
+tags
diff --git a/pack/navigation/start/ack/LICENSE b/pack/navigation/start/ack/LICENSE
new file mode 100644
index 0000000..056ea36
--- /dev/null
+++ b/pack/navigation/start/ack/LICENSE
@@ -0,0 +1,89 @@
+ack.vim is distributed under the same license terms as Vim itself, which you
+can find in full with `:help license` within Vim, or copied in full herein.
+
+Copyright (c) 2007-2015 Antoine Imbert <antoine.imbert+ackvim@gmail.com>
+                        and contributors.
+
+Maintainers may be contacted via GitHub Issues at:
+
+   https://github.com/mileszs/ack.vim/issues
+
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
diff --git a/pack/navigation/start/ack/README.md b/pack/navigation/start/ack/README.md
new file mode 100644
index 0000000..a82bb80
--- /dev/null
+++ b/pack/navigation/start/ack/README.md
@@ -0,0 +1,148 @@
+# ack.vim
+
+Run your favorite search tool from Vim, with an enhanced results list.
+
+This plugin was designed as a Vim frontend for the Perl module [App::Ack]. Ack
+can be used as a replacement for 99% of the uses of _grep_. The plugin allows
+you to run ack from Vim, and shows the results in a split window.
+
+But here's a little secret for the Vim-seasoned: it's just a light wrapper for
+Vim's [grepprg] and the [quickfix] window for match results. This makes it easy
+to integrate with your own Vim configuration and use existing knowledge of core
+features. It also means the plugin is flexible to use with other search tools.
+
+[App::Ack]: http://search.cpan.org/~petdance/ack/ack
+[grepprg]: http://vimdoc.sourceforge.net/htmldoc/options.html#'grepprg'
+[quickfix]: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
+
+## Installation
+
+### Ack
+
+You will need ack (>= 2.0), of course. To install it follow the
+[manual](http://beyondgrep.com/install/).
+
+### The Plugin
+
+It is recommended to use one of the popular plugin managers for Vim. There are
+many and you probably already have a preferred one, but a few examples for your
+copy-and-paste convenience:
+
+#### Pathogen
+
+    $ git clone https://github.com/mileszs/ack.vim.git ~/.vim/bundle/ack.vim
+
+#### Vundle
+
+```vim
+Plugin 'mileszs/ack.vim'
+```
+
+#### NeoBundle
+
+```vim
+NeoBundle 'mileszs/ack.vim'
+```
+
+#### Manual (not recommended)
+
+[Download][releases] the plugin and extract it in `~/.vim/` (or
+`%PROGRAMFILES%/Vim/vimfiles` on Windows).
+
+[zipball]: https://github.com/mileszs/ack.vim/archive/master.zip
+
+## Usage
+
+    :Ack [options] {pattern} [{directories}]
+
+Search recursively in `{directories}` (which defaults to the current directory)
+for the `{pattern}`.
+
+Files containing the search term will be listed in the quickfix window, along
+with the line number of the occurrence, once for each occurrence. `<Enter>` on
+a line in this window will open the file, and place the cursor on the matching
+line.
+
+Just like where you use `:grep`, `:grepadd`, `:lgrep`, and :`lgrepadd`, you can
+use `:Ack`, `:AckAdd`, `:LAck`, and `:LAckAdd` respectively. (See `:help Ack`
+after installing, or [`doc/ack.txt`][doc] in the repo, for more information.)
+
+For more ack help see [ack documentation](http://beyondgrep.com/documentation/).
+
+[doc]: https://github.com/mileszs/ack.vim/blob/master/doc/ack.txt
+
+### Keyboard Shortcuts
+
+The quickfix results window is augmented with these convenience mappings:
+
+    ?    a quick summary of these keys, repeat to close
+    o    to open (same as Enter)
+    O    to open and close the quickfix window
+    go   to preview file, open but maintain focus on ack.vim results
+    t    to open in new tab
+    T    to open in new tab without moving to it
+    h    to open in horizontal split
+    H    to open in horizontal split, keeping focus on the results
+    v    to open in vertical split
+    gv   to open in vertical split, keeping focus on the results
+    q    to close the quickfix window
+
+### Gotchas
+
+Some characters have special meaning, and need to be escaped in your search
+pattern. For instance, `#`. You need to escape it with `:Ack '\\\#define
+foo'` to search for '#define foo'. See [issue #5].
+
+[issue #5]: https://github.com/mileszs/ack.vim/issues/5
+
+## Possibly FAQ
+
+#### Can I use `ag` ([The Silver Searcher]) with this?
+
+Absolutely, and probably other tools if their output is similar or you can
+write a pattern match for it--just set `g:ackprg`. If you like, you can fall
+back to Ack in case you use your vimrc on a system without Ag available:
+
+```vim
+if executable('ag')
+  let g:ackprg = 'ag --vimgrep'
+endif
+```
+
+Since Ack is quite portable you might check a copy of it into your dotfiles
+repository in `~/bin` so you'll nearly always have it available.
+
+#### What's the difference from ag.vim?
+
+Well... not a lot really.
+
+Present maintainer, yours truly, [kind of wishes they never forked][sadface],
+contributes to both, and wouldn't mind seeing them merged again. ag.vim got a
+nice code clean-up (which ack.vim is now hopefully getting), and ack.vim picked
+up a few features that haven't made their way to ag.vim, like `:AckWindow`,
+optional background search execution with [vim-dispatch], and auto-previewing.
+
+[The Silver Searcher]: https://github.com/ggreer/the_silver_searcher
+[sadface]: https://github.com/mileszs/ack.vim/commit/d97090fb502d40229e6976dfec0e06636ba227d5#commitcomment-5771145
+
+## Changelog
+
+Please see [the Github releases page][releases].
+
+## Credits
+
+This plugin is derived from Antoine Imbert's blog post [Ack and Vim
+Integration][] (in particular, the function in the update to the post). [Miles
+Sterrett][mileszs] packaged it up as a plugin and documented it in Vim's help
+format, and since then [many contributors][contributors] have submitted
+enhancements and fixes.
+
+And of course, where would we be without [Ack]. And, you know, Vim.
+
+[Ack and Vim Integration]: http://blog.ant0ine.com/typepad/2007/03/ack-and-vim-integration.html
+[mileszs]: https://github.com/mileszs
+[contributors]: https://github.com/mileszs/ack.vim/graphs/contributors
+[Ack]: http://beyondgrep.com/
+
+[vim-dispatch]: https://github.com/tpope/vim-dispatch
+[releases]: https://github.com/mileszs/ack.vim/releases
diff --git a/pack/navigation/start/ack/VERSION b/pack/navigation/start/ack/VERSION
new file mode 100644
index 0000000..e04e39c
--- /dev/null
+++ b/pack/navigation/start/ack/VERSION
@@ -0,0 +1 @@
+v1.0.9
diff --git a/pack/navigation/start/ack/autoload/ack.vim b/pack/navigation/start/ack/autoload/ack.vim
new file mode 100644
index 0000000..814c533
--- /dev/null
+++ b/pack/navigation/start/ack/autoload/ack.vim
@@ -0,0 +1,227 @@
+if exists('g:ack_use_dispatch')
+  if g:ack_use_dispatch && !exists(':Dispatch')
+    call s:Warn('Dispatch not loaded! Falling back to g:ack_use_dispatch = 0.')
+    let g:ack_use_dispatch = 0
+  endif
+else
+  let g:ack_use_dispatch = 0
+endif
+
+"-----------------------------------------------------------------------------
+" Public API
+"-----------------------------------------------------------------------------
+
+function! ack#Ack(cmd, args) "{{{
+  call s:Init(a:cmd)
+  redraw
+
+  " Local values that we'll temporarily set as options when searching
+  let l:grepprg = g:ackprg
+  let l:grepformat = '%f:%l:%c:%m,%f:%l:%m'  " Include column number
+
+  " Strip some options that are meaningless for path search and set match
+  " format accordingly.
+  if s:SearchingFilepaths()
+    let l:grepprg = substitute(l:grepprg, '-H\|--column', '', 'g')
+    let l:grepformat = '%f'
+  endif
+
+  " If no pattern is provided, search for the word under the cursor
+  let l:grepargs = empty(a:args) ? expand("<cword>") : a:args . join(a:000, ' ')
+
+  " NOTE: we escape special chars, but not everything using shellescape to
+  "       allow for passing arguments etc
+  let l:escaped_args = escape(l:grepargs, '|#%')
+
+  echo "Searching ..."
+
+  if g:ack_use_dispatch
+    call s:SearchWithDispatch(l:grepprg, l:escaped_args, l:grepformat)
+  else
+    call s:SearchWithGrep(a:cmd, l:grepprg, l:escaped_args, l:grepformat)
+  endif
+
+  " Dispatch has no callback mechanism currently, we just have to display the
+  " list window early and wait for it to populate :-/
+  call ack#ShowResults()
+  call s:Highlight(l:grepargs)
+endfunction "}}}
+
+function! ack#AckFromSearch(cmd, args) "{{{
+  let search = getreg('/')
+  " translate vim regular expression to perl regular expression.
+  let search = substitute(search, '\(\\<\|\\>\)', '\\b', 'g')
+  call ack#Ack(a:cmd, '"' . search . '" ' . a:args)
+endfunction "}}}
+
+function! ack#AckHelp(cmd, args) "{{{
+  let args = a:args . ' ' . s:GetDocLocations()
+  call ack#Ack(a:cmd, args)
+endfunction "}}}
+
+function! ack#AckWindow(cmd, args) "{{{
+  let files = tabpagebuflist()
+
+  " remove duplicated filenames (files appearing in more than one window)
+  let files = filter(copy(sort(files)), 'index(files,v:val,v:key+1)==-1')
+  call map(files, "bufname(v:val)")
+
+  " remove unnamed buffers as quickfix (empty strings before shellescape)
+  call filter(files, 'v:val != ""')
+
+  " expand to full path (avoid problems with cd/lcd in au QuickFixCmdPre)
+  let files = map(files, "shellescape(fnamemodify(v:val, ':p'))")
+  let args = a:args . ' ' . join(files)
+
+  call ack#Ack(a:cmd, args)
+endfunction "}}}
+
+function! ack#ShowResults() "{{{
+  let l:handler = s:UsingLocList() ? g:ack_lhandler : g:ack_qhandler
+  execute l:handler
+  call s:ApplyMappings()
+  redraw!
+endfunction "}}}
+
+"-----------------------------------------------------------------------------
+" Private API
+"-----------------------------------------------------------------------------
+
+function! s:ApplyMappings() "{{{
+  if !s:UsingListMappings() || &filetype != 'qf'
+    return
+  endif
+
+  let l:wintype = s:UsingLocList() ? 'l' : 'c'
+  let l:closemap = ':' . l:wintype . 'close<CR>'
+  let g:ack_mappings.q = l:closemap
+
+  nnoremap <buffer> <silent> ? :call <SID>QuickHelp()<CR>
+
+  if g:ack_autoclose
+    " We just map the 'go' and 'gv' mappings to close on autoclose, wtf?
+    for key_map in items(g:ack_mappings)
+      execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1) . l:closemap)
+    endfor
+
+    execute "nnoremap <buffer> <silent> <CR> <CR>" . l:closemap
+  else
+    for key_map in items(g:ack_mappings)
+      execute printf("nnoremap <buffer> <silent> %s %s", get(key_map, 0), get(key_map, 1))
+    endfor
+  endif
+
+  if exists("g:ackpreview") " if auto preview in on, remap j and k keys
+    nnoremap <buffer> <silent> j j<CR><C-W><C-W>
+    nnoremap <buffer> <silent> k k<CR><C-W><C-W>
+    nmap <buffer> <silent> <Down> j
+    nmap <buffer> <silent> <Up> k
+  endif
+endfunction "}}}
+
+function! s:GetDocLocations() "{{{
+  let dp = ''
+  for p in split(&rtp, ',')
+    let p = p . '/doc/'
+    if isdirectory(p)
+      let dp = p . '*.txt ' . dp
+    endif
+  endfor
+
+  return dp
+endfunction "}}}
+
+function! s:Highlight(args) "{{{
+  if !g:ackhighlight
+    return
+  endif
+
+  let @/ = matchstr(a:args, "\\v(-)\@<!(\<)\@<=\\w+|['\"]\\zs.{-}\\ze['\"]")
+  call feedkeys(":let &hlsearch=1 \| echo \<CR>", "n")
+endfunction "}}}
+
+" Initialize state for an :Ack* or :LAck* search
+function! s:Init(cmd) "{{{
+  let s:searching_filepaths = (a:cmd =~# '-g$') ? 1 : 0
+  let s:using_loclist       = (a:cmd =~# '^l') ? 1 : 0
+
+  if g:ack_use_dispatch && s:using_loclist
+    call s:Warn('Dispatch does not support location lists! Proceeding with quickfix...')
+    let s:using_loclist = 0
+  endif
+endfunction "}}}
+
+function! s:QuickHelp() "{{{
+  execute 'edit' globpath(&rtp, 'doc/ack_quick_help.txt')
+
+  silent normal gg
+  setlocal buftype=nofile bufhidden=hide nobuflisted
+  setlocal nomodifiable noswapfile
+  setlocal filetype=help
+  setlocal nonumber norelativenumber nowrap
+  setlocal foldmethod=diff foldlevel=20
+
+  nnoremap <buffer> <silent> ? :q!<CR>:call ack#ShowResults()<CR>
+endfunction "}}}
+
+function! s:SearchWithDispatch(grepprg, grepargs, grepformat) "{{{
+  let l:makeprg_bak     = &l:makeprg
+  let l:errorformat_bak = &l:errorformat
+
+  " We don't execute a :grep command for Dispatch, so add -g here instead
+  if s:SearchingFilepaths()
+    let l:grepprg = a:grepprg . ' -g'
+  else
+    let l:grepprg = a:grepprg
+  endif
+
+  try
+    let &l:makeprg     = l:grepprg . ' ' . a:grepargs
+    let &l:errorformat = a:grepformat
+
+    Make
+  finally
+    let &l:makeprg     = l:makeprg_bak
+    let &l:errorformat = l:errorformat_bak
+  endtry
+endfunction "}}}
+
+function! s:SearchWithGrep(grepcmd, grepprg, grepargs, grepformat) "{{{
+  let l:grepprg_bak    = &l:grepprg
+  let l:grepformat_bak = &grepformat
+
+  try
+    let &l:grepprg  = a:grepprg
+    let &grepformat = a:grepformat
+
+    silent execute a:grepcmd a:grepargs
+  finally
+    let &l:grepprg  = l:grepprg_bak
+    let &grepformat = l:grepformat_bak
+  endtry
+endfunction "}}}
+
+" Are we finding matching files, not lines? (the -g option -- :AckFile)
+function! s:SearchingFilepaths() "{{{
+  return get(s:, 'searching_filepaths', 0)
+endfunction "}}}
+
+" Predicate for whether mappings are enabled for list type of current search.
+function! s:UsingListMappings() "{{{
+  if s:UsingLocList()
+    return g:ack_apply_lmappings
+  else
+    return g:ack_apply_qmappings
+  endif
+endfunction "}}}
+
+" Were we invoked with a :LAck command?
+function! s:UsingLocList() "{{{
+  return get(s:, 'using_loclist', 0)
+endfunction "}}}
+
+function! s:Warn(msg) "{{{
+  echohl WarningMsg | echomsg 'Ack: ' . a:msg | echohl None
+endf "}}}
+
+" vim:set et sw=2 ts=2 tw=78 fdm=marker
diff --git a/pack/navigation/start/ack/doc/ack.txt b/pack/navigation/start/ack/doc/ack.txt
new file mode 100644
index 0000000..bdef322
--- /dev/null
+++ b/pack/navigation/start/ack/doc/ack.txt
@@ -0,0 +1,256 @@
+*ack.txt*   Plugin that integrates ack with Vim
+
+==============================================================================
+Author:  Antoine Imbert <antoine.imbert+ackvim@gmail.com>         *ack-author*
+License: Same terms as Vim itself (see |license|)
+
+==============================================================================
+INTRODUCTION                                                             *ack*
+
+This plugin is a front for the Perl module App::Ack.  Ack can be used as a
+replacement for grep.  This plugin will allow you to run ack from vim, and
+shows the results in a split window.
+
+:Ack[!] [options] {pattern} [{directory}]                               *:Ack*
+
+    Search recursively in {directory} (which defaults to the current
+    directory) for the {pattern}.  Behaves just like the |:grep| command, but
+    will open the |Quickfix| window for you. If [!] is not given the first
+    occurence is jumped to.
+
+:AckAdd [options] {pattern} [{directory}]                            *:AckAdd*
+
+    Just like |:Ack|, but instead of making a new list, the matches are
+    appended to the current |quickfix| list.
+
+:AckFromSearch [{directory}]                                  *:AckFromSearch*
+
+    Just like |:Ack| but the pattern is from previous search.
+
+:LAck [options] {pattern} [{directory}]                                *:LAck*
+
+    Just like |:Ack| but instead of the |quickfix| list, matches are placed in
+    the current |location-list|.
+
+:LAckAdd [options] {pattern} [{directory}]                          *:LAckAdd*
+
+    Just like |:AckAdd| but instead of the |quickfix| list, matches are added
+    to the current |location-list|
+
+:AckFile [options] {pattern} [{directory}]                          *:AckFile*
+
+    Search recursively in {directory} (which defaults to the current
+    directory) for filenames matching the {pattern}.  Behaves just like the
+    |:grep| command, but will open the |Quickfix| window for you.
+
+:AckHelp[!] [options] {pattern}                                      *:AckHelp*
+
+    Search vim documentation files for the {pattern}.  Behaves just like the
+    |:Ack| command, but searches only vim documentation .txt files
+
+:LAckHelp [options] {pattern}                                        *:LAckHelp*
+
+    Just like |:AckHelp| but instead of the |quickfix| list, matches are placed
+    in the current |location-list|.
+
+:AckWindow[!] [options] {pattern}                                 *:AckWindow*
+
+    Search all buffers visible in the screen (current tab page only) files for
+    the {pattern}.
+
+:LAckWindow [options] {pattern}                                   *:LAckWindow*
+
+    Just like |:AckWindow| but instead of the |quickfix| list, matches are
+    placed in the current |location-list|.
+
+Files containing the search term will be listed in the split window, along
+with the line number of the occurrence, once for each occurrence.  <Enter> on
+a line in this window will open the file, and place the cursor on the matching
+line.
+
+Note that if you are using Dispatch.vim with |g:ack_use_dispatch|, location
+lists are not supported, because Dispatch does not support them at this time.
+`:LAck` versions of commands above will give a warning and proceed to use the
+quickfix list instead.
+
+See http://beyondgrep.com/ for more information on searching with ack.
+
+
+==============================================================================
+CONFIGURATION                                              *ack-configuration*
+
+                                                                    *g:ackprg*
+g:ackprg
+Default for ubuntu: "ack-grep"
+Default for other systems: "ack"
+
+Use this option to specify the search command and its default arguments.
+
+Example:
+>
+        let g:ackprg = "ag --vimgrep"
+<
+
+                                                       *g:ack_default_options*
+g:ack_default_options
+Default: " -s -H --nocolor --nogroup --column"
+
+Use this option to specify the default arguments given to `ack`. This is only
+used if |g:ackprg| has not been customized from the default--if you are using
+a custom search program instead of Ack, set your preferred options in
+|g:ackprg|.
+
+NOTE: This option may be deprecated in the future. ~
+
+Example:
+>
+        let g:ack_default_options =
+              \ " -s -H --nocolor --nogroup --column --smart-case --follow"
+<
+
+                                                       *g:ack_apply_qmappings*
+g:ack_apply_qmappings
+Default: 1
+
+This option enable mappings on quickview window.
+
+                                                       *g:ack_apply_lmappings*
+g:ack_apply_lmappings
+Default: 1
+
+This option enable mappings on Location list window.
+
+                                                              *g:ack_mappings*
+g:ack_mappings
+Default: {
+      \ "t": "<C-W><CR><C-W>T",
+      \ "T": "<C-W><CR><C-W>TgT<C-W>j",
+      \ "o": "<CR>",
+      \ "O": "<CR><C-W><C-W>:ccl<CR>",
+      \ "go": "<CR><C-W>j",
+      \ "h": "<C-W><CR><C-W>K",
+      \ "H": "<C-W><CR><C-W>K<C-W>b",
+      \ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
+      \ "gv": "<C-W><CR><C-W>H<C-W>b<C-W>J" }
+
+This option list all maps create on quickfix/Location list window.
+
+Example, if you want to open the result in the middle of the screen:
+>
+        let g:ack_mappings = { "o": "<CR>zz" }
+<
+
+                                                              *g:ack_qhandler*
+g:ack_qhandler
+Default: "botright copen"
+
+Command to open the quickview window.
+
+If you want to open a quickview window with 30 lines you can do:
+>
+        let g:ack_qhandler = "botright copen 30"
+<
+
+                                                              *g:ack_lhandler*
+g:ack_lhandler
+Default: "botright lopen"
+
+Command to open the Location list window.
+
+If you want to open a Location list window with 30 lines you can do:
+>
+        let g:ack_lhandler = "botright lopen 30"
+<
+
+                                                              *g:ackhighlight*
+
+g:ackhighlight
+Default: 0
+
+Use this option to highlight the searched term.
+
+Example:
+>
+        let g:ackhighlight = 1
+<
+
+                                                             *g:ack_autoclose*
+g:ack_autoclose
+Default: 0
+
+Use this option to specify whether to close the quickfix window after
+using any of the shortcuts.
+
+Example:
+>
+        let g:ack_autoclose = 1
+<
+
+                                                      *g:ack_autofold_results*
+
+g:ack_autofold_results
+Default: 0
+
+Use this option to fold the results in quickfix by file name. Only the current
+fold will be open by default and while you press 'j' and 'k' to move between the
+results if you hit other fold the last one will be closed and the current will
+be open.
+
+Example:
+>
+        let g:ack_autofold_results = 1
+<
+
+                                                                *g:ackpreview*
+
+g:ackpreview
+Default: 0
+
+Use this option to automagically open the file with 'j' or 'k'.
+
+Example:
+>
+        let g:ackpreview = 1
+<
+
+                                                          *g:ack_use_dispatch*
+
+g:ack_use_dispatch
+Default: 0
+
+Use this option to use vim-dispatch to run searches in the background, with a
+variety of execution backends for different systems.
+
+Due to limitations in Dispatch at this time, location lists are unsupported
+and result windows will appear before results are ready. Still, these may be
+acceptable tradeoffs for very large projects where searches are slow.
+
+Example:
+>
+        let g:ack_use_dispatch = 1
+<
+
+==============================================================================
+MAPPINGS                                                        *ack-mappings*
+
+The following keyboard shortcuts are available in the quickfix window:
+
+o                   open file (same as enter).
+
+O                   open file and close quickfix window.
+
+go                  preview file (open but maintain focus on ack.vim results).
+
+t                   open in a new tab.
+
+T                   open in new tab silently.
+
+h                   open in horizontal split.
+
+H                  open in horizontal split silently.
+
+v                   open in vertical split.
+
+gv                  open in vertical split silently.
+
+q                   close the quickfix window.
diff --git a/pack/navigation/start/ack/doc/ack_quick_help.txt b/pack/navigation/start/ack/doc/ack_quick_help.txt
new file mode 100644
index 0000000..bcdf516
--- /dev/null
+++ b/pack/navigation/start/ack/doc/ack_quick_help.txt
@@ -0,0 +1,14 @@
+====  ack.vim quick help ===============
+
+  *?:*  Show/quit this help
+  *t:*  Open in a new tab
+  *T:*  Open in a new tab silently
+  *o:*  Open
+  *O:*  Open and close result window
+ *go:*  Preview
+  *h:*  Horizontal open
+  *H:*  Horizontal open silently
+  *v:*  Vertical open
+ *gv:*  Vertical open silently
+
+========================================
diff --git a/pack/navigation/start/ack/ftplugin/qf.vim b/pack/navigation/start/ack/ftplugin/qf.vim
new file mode 100644
index 0000000..27564fa
--- /dev/null
+++ b/pack/navigation/start/ack/ftplugin/qf.vim
@@ -0,0 +1,9 @@
+if exists("g:ack_autofold_results") && g:ack_autofold_results
+  setlocal foldlevel=0
+  setlocal foldmethod=expr
+  setlocal foldexpr=matchstr(getline(v:lnum),'^[^\|]\\+')==#matchstr(getline(v:lnum+1),'^[^\|]\\+')?1:'<1'
+  setlocal foldenable
+  setlocal foldclose=all
+  setlocal foldopen=all
+  nnoremap <buffer> j jzz
+endif
diff --git a/pack/navigation/start/ack/plugin/ack.vim b/pack/navigation/start/ack/plugin/ack.vim
new file mode 100644
index 0000000..da3ea9a
--- /dev/null
+++ b/pack/navigation/start/ack/plugin/ack.vim
@@ -0,0 +1,79 @@
+if exists('g:loaded_ack')
+  finish
+endif
+
+if !exists("g:ack_default_options")
+  let g:ack_default_options = " -s -H --nocolor --nogroup --column"
+endif
+
+" Location of the ack utility
+if !exists("g:ackprg")
+  if executable('ack')
+    let g:ackprg = "ack"
+  elseif executable('ack-grep')
+    let g:ackprg = "ack-grep"
+  else
+    finish
+  endif
+  let g:ackprg .= g:ack_default_options
+endif
+
+if !exists("g:ack_apply_qmappings")
+  let g:ack_apply_qmappings = !exists("g:ack_qhandler")
+endif
+
+if !exists("g:ack_apply_lmappings")
+  let g:ack_apply_lmappings = !exists("g:ack_lhandler")
+endif
+
+let s:ack_mappings = {
+      \ "t": "<C-W><CR><C-W>T",
+      \ "T": "<C-W><CR><C-W>TgT<C-W>j",
+      \ "o": "<CR>",
+      \ "O": "<CR><C-W>p<C-W>c",
+      \ "go": "<CR><C-W>p",
+      \ "h": "<C-W><CR><C-W>K",
+      \ "H": "<C-W><CR><C-W>K<C-W>b",
+      \ "v": "<C-W><CR><C-W>H<C-W>b<C-W>J<C-W>t",
+      \ "gv": "<C-W><CR><C-W>H<C-W>b<C-W>J" }
+
+if exists("g:ack_mappings")
+  let g:ack_mappings = extend(s:ack_mappings, g:ack_mappings)
+else
+  let g:ack_mappings = s:ack_mappings
+endif
+
+if !exists("g:ack_qhandler")
+  let g:ack_qhandler = "botright copen"
+endif
+
+if !exists("g:ack_lhandler")
+  let g:ack_lhandler = "botright lopen"
+endif
+
+if !exists("g:ackhighlight")
+  let g:ackhighlight = 0
+endif
+
+if !exists("g:ack_autoclose")
+  let g:ack_autoclose = 0
+endif
+
+if !exists("g:ack_autofold_results")
+  let g:ack_autofold_results = 0
+endif
+
+command! -bang -nargs=* -complete=file Ack           call ack#Ack('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckAdd        call ack#Ack('grepadd<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckFromSearch call ack#AckFromSearch('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file LAck          call ack#Ack('lgrep<bang>', <q-args>)
+command! -bang -nargs=* -complete=file LAckAdd       call ack#Ack('lgrepadd<bang>', <q-args>)
+command! -bang -nargs=* -complete=file AckFile       call ack#Ack('grep<bang> -g', <q-args>)
+command! -bang -nargs=* -complete=help AckHelp       call ack#AckHelp('grep<bang>', <q-args>)
+command! -bang -nargs=* -complete=help LAckHelp      call ack#AckHelp('lgrep<bang>', <q-args>)
+command! -bang -nargs=*                AckWindow     call ack#AckWindow('grep<bang>', <q-args>)
+command! -bang -nargs=*                LAckWindow    call ack#AckWindow('lgrep<bang>', <q-args>)
+
+let g:loaded_ack = 1
+
+" vim:set et sw=2 ts=2 tw=78 fdm=marker
diff --git a/bundle/bclose/plugin/bclose.vim b/pack/navigation/start/bclose/plugin/bclose.vim
similarity index 100%
rename from bundle/bclose/plugin/bclose.vim
rename to pack/navigation/start/bclose/plugin/bclose.vim
diff --git a/bundle/ctrlp/.gitignore b/pack/navigation/start/ctrlp/.gitignore
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/.gitignore
rename to pack/navigation/start/ctrlp/.gitignore
diff --git a/pack/navigation/start/ctrlp/autoload/ctrlp.vim b/pack/navigation/start/ctrlp/autoload/ctrlp.vim
new file mode 100644
index 0000000..44e66ed
--- /dev/null
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp.vim
@@ -0,0 +1,2689 @@
+" =============================================================================
+" File:          autoload/ctrlp.vim
+" Description:   Fuzzy file, buffer, mru, tag, etc finder.
+" Author:        CtrlP Dev Team
+" Original:      Kien Nguyen <github.com/kien>
+" Version:       1.80
+" =============================================================================
+
+" ** Static variables {{{1
+" s:ignore() {{{2
+fu! s:ignore()
+	let igdirs = [
+		\ '\.git',
+		\ '\.hg',
+		\ '\.svn',
+		\ '_darcs',
+		\ '\.bzr',
+		\ '\.cdv',
+		\ '\~\.dep',
+		\ '\~\.dot',
+		\ '\~\.nib',
+		\ '\~\.plst',
+		\ '\.pc',
+		\ '_MTN',
+		\ 'blib',
+		\ 'CVS',
+		\ 'RCS',
+		\ 'SCCS',
+		\ '_sgbak',
+		\ 'autom4te\.cache',
+		\ 'cover_db',
+		\ '_build',
+		\ ]
+	let igfiles = [
+		\ '\~$',
+		\ '#.+#$',
+		\ '[._].*\.swp$',
+		\ 'core\.\d+$',
+		\ '\.exe$',
+		\ '\.so$',
+		\ '\.bak$',
+		\ '\.png$',
+		\ '\.jpg$',
+		\ '\.gif$',
+		\ '\.zip$',
+		\ '\.rar$',
+		\ '\.tar\.gz$',
+		\ ]
+	retu {
+		\ 'dir': '\v[\/]('.join(igdirs, '|').')$',
+		\ 'file': '\v'.join(igfiles, '|'),
+		\ }
+endf
+" Script local vars {{{2
+let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
+	\ ['g:ctrlp_', 'b:ctrlp_', {
+	\ 'abbrev':                ['s:abbrev', {}],
+	\ 'arg_map':               ['s:argmap', 0],
+	\ 'buffer_func':           ['s:buffunc', {}],
+	\ 'by_filename':           ['s:byfname', 0],
+	\ 'custom_ignore':         ['s:usrign', s:ignore()],
+	\ 'default_input':         ['s:deftxt', 0],
+	\ 'dont_split':            ['s:nosplit', 'netrw'],
+	\ 'dotfiles':              ['s:showhidden', 0],
+	\ 'extensions':            ['s:extensions', []],
+	\ 'follow_symlinks':       ['s:folsym', 0],
+	\ 'highlight_match':       ['s:mathi', [1, 'CtrlPMatch']],
+	\ 'jump_to_buffer':        ['s:jmptobuf', 'Et'],
+	\ 'key_loop':              ['s:keyloop', 0],
+	\ 'lazy_update':           ['s:lazy', 0],
+	\ 'match_func':            ['s:matcher', {}],
+	\ 'match_window':          ['s:mw', ''],
+	\ 'match_window_bottom':   ['s:mwbottom', 1],
+	\ 'match_window_reversed': ['s:mwreverse', 1],
+	\ 'max_depth':             ['s:maxdepth', 40],
+	\ 'max_files':             ['s:maxfiles', 10000],
+	\ 'max_height':            ['s:mxheight', 10],
+	\ 'max_history':           ['s:maxhst', exists('+hi') ? &hi : 20],
+	\ 'mruf_default_order':    ['s:mrudef', 0],
+	\ 'open_func':             ['s:openfunc', {}],
+	\ 'open_multi':            ['s:opmul', '1v'],
+	\ 'open_new_file':         ['s:newfop', 'v'],
+	\ 'prompt_mappings':       ['s:urprtmaps', 0],
+	\ 'regexp_search':         ['s:regexp', 0],
+	\ 'root_markers':          ['s:rmarkers', []],
+	\ 'split_window':          ['s:splitwin', 0],
+	\ 'status_func':           ['s:status', {}],
+	\ 'tabpage_position':      ['s:tabpage', 'ac'],
+	\ 'use_caching':           ['s:caching', 1],
+	\ 'user_command':          ['s:usrcmd', ''],
+	\ 'validate':              ['s:validate', ''],
+	\ 'working_path_mode':     ['s:pathmode', 'ra'],
+	\ 'line_prefix':           ['s:lineprefix', '> '],
+	\ 'open_single_match':     ['s:opensingle', []],
+	\ 'brief_prompt':          ['s:brfprt', 0],
+	\ 'match_current_file':    ['s:matchcrfile', 0],
+	\ 'match_natural_name':    ['s:matchnatural', 0],
+	\ 'compare_lim':           ['s:compare_lim', 3000],
+	\ 'bufname_mod':           ['s:bufname_mod', ':t'],
+	\ 'bufpath_mod':           ['s:bufpath_mod', ':~:.:h'],
+	\ 'formatline_func':       ['s:flfunc', 's:formatline(v:val)'],
+	\ 'user_command_async':    ['s:usrcmdasync', 0],
+	\ }, {
+	\ 'open_multiple_files':   's:opmul',
+	\ 'regexp':                's:regexp',
+	\ 'reuse_window':          's:nosplit',
+	\ 'show_hidden':           's:showhidden',
+	\ 'switch_buffer':         's:jmptobuf',
+	\ }, {
+	\ 'root_markers':          's:rmarkers',
+	\ 'user_command':          's:usrcmd',
+	\ 'working_path_mode':     's:pathmode',
+	\ }]
+
+" Global options
+let s:glbs = { 'magic': 1, 'to': 1, 'tm': 0, 'sb': 1, 'hls': 0, 'im': 0,
+	\ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'ttimeout': 0,
+	\ 'gcr': 'a:blinkon0', 'ic': 1, 'lmap': '', 'mousef': 0, 'imd': 1 }
+
+" Keymaps
+let [s:lcmap, s:prtmaps] = ['nn <buffer> <silent>', {
+	\ 'PrtBS()':              ['<bs>', '<c-]>'],
+	\ 'PrtDelete()':          ['<del>'],
+	\ 'PrtDeleteWord()':      ['<c-w>'],
+	\ 'PrtClear()':           ['<c-u>'],
+	\ 'PrtSelectMove("j")':   ['<c-j>', '<down>'],
+	\ 'PrtSelectMove("k")':   ['<c-k>', '<up>'],
+	\ 'PrtSelectMove("t")':   ['<Home>', '<kHome>'],
+	\ 'PrtSelectMove("b")':   ['<End>', '<kEnd>'],
+	\ 'PrtSelectMove("u")':   ['<PageUp>', '<kPageUp>'],
+	\ 'PrtSelectMove("d")':   ['<PageDown>', '<kPageDown>'],
+	\ 'PrtHistory(-1)':       ['<c-n>'],
+	\ 'PrtHistory(1)':        ['<c-p>'],
+	\ 'AcceptSelection("e")': ['<cr>', '<2-LeftMouse>'],
+	\ 'AcceptSelection("h")': ['<c-x>', '<c-cr>', '<c-s>'],
+	\ 'AcceptSelection("t")': ['<c-t>'],
+	\ 'AcceptSelection("v")': ['<c-v>', '<RightMouse>'],
+	\ 'ToggleFocus()':        ['<s-tab>'],
+	\ 'ToggleRegex()':        ['<c-r>'],
+	\ 'ToggleByFname()':      ['<c-d>'],
+	\ 'ToggleType(1)':        ['<c-f>', '<c-up>'],
+	\ 'ToggleType(-1)':       ['<c-b>', '<c-down>'],
+	\ 'PrtExpandDir()':       ['<tab>'],
+	\ 'PrtInsert("c")':       ['<MiddleMouse>', '<insert>'],
+	\ 'PrtInsert()':          ['<c-\>'],
+	\ 'PrtCurStart()':        ['<c-a>'],
+	\ 'PrtCurEnd()':          ['<c-e>'],
+	\ 'PrtCurLeft()':         ['<c-h>', '<left>', '<c-^>'],
+	\ 'PrtCurRight()':        ['<c-l>', '<right>'],
+	\ 'PrtClearCache()':      ['<F5>'],
+	\ 'PrtDeleteEnt()':       ['<F7>'],
+	\ 'CreateNewFile()':      ['<c-y>'],
+	\ 'MarkToOpen()':         ['<c-z>'],
+	\ 'OpenMulti()':          ['<c-o>'],
+	\ 'YankLine()':           [],
+	\ 'PrtExit()':            ['<esc>', '<c-c>', '<c-g>'],
+	\ }]
+
+if !has('gui_running')
+	cal add(s:prtmaps['PrtBS()'], remove(s:prtmaps['PrtCurLeft()'], 0))
+en
+
+let s:ficounts = {}
+
+let s:ccex = s:pref.'clear_cache_on_exit'
+
+" Regexp
+let s:fpats = {
+	\ '^\(\\|\)\|\(\\|\)$': '\\|',
+	\ '^\\\(zs\|ze\|<\|>\)': '^\\\(zs\|ze\|<\|>\)',
+	\ '^\S\*$': '\*',
+	\ '^\S\\?$': '\\?',
+	\ }
+
+let s:has_conceal = has('conceal')
+let s:bufnr_width = 3
+
+" Keypad
+let s:kprange = {
+	\ 'Plus': '+',
+	\ 'Minus': '-',
+	\ 'Divide': '/',
+	\ 'Multiply': '*',
+	\ 'Point': '.',
+	\ }
+
+" Highlight groups
+let s:hlgrps = {
+	\ 'NoEntries': 'Error',
+	\ 'Mode1': 'Character',
+	\ 'Mode2': 'LineNr',
+	\ 'Stats': 'Function',
+	\ 'Match': 'Identifier',
+	\ 'PrtBase': 'Comment',
+	\ 'PrtText': 'Normal',
+	\ 'PrtCursor': 'Constant',
+	\ 'BufferNr':      'Constant',
+	\ 'BufferInd':     'Normal',
+	\ 'BufferHid':     'Comment',
+	\ 'BufferHidMod':  'String',
+	\ 'BufferVis':     'Normal',
+	\ 'BufferVisMod':  'Identifier',
+	\ 'BufferCur':     'Question',
+	\ 'BufferCurMod':  'WarningMsg',
+	\ 'BufferPath':    'Comment',
+	\ }
+
+" lname, sname of the basic(non-extension) modes
+let s:types = ['fil', 'buf', 'mru']
+if !exists('g:ctrlp_types')
+	let g:ctrlp_types = s:types
+el
+	call filter(g:ctrlp_types, "index(['fil', 'buf', 'mru'], v:val)!=-1")
+en
+let g:ctrlp_builtins = len(g:ctrlp_types)-1
+
+let s:coretype_names = {
+	\ 'fil' : 'files',
+	\ 'buf' : 'buffers',
+	\ 'mru' : 'mru files',
+	\ }
+
+let s:coretypes = map(copy(g:ctrlp_types), '[s:coretype_names[v:val], v:val]')
+
+" Get the options {{{2
+fu! s:opts(...)
+	unl! s:usrign s:usrcmd s:urprtmaps
+	for each in ['byfname', 'regexp', 'extensions'] | if exists('s:'.each)
+		let {each} = s:{each}
+	en | endfo
+	for [ke, va] in items(s:opts)
+		let {va[0]} = exists(s:pref.ke) ? {s:pref.ke} : va[1]
+	endfo
+	unl va
+	for [ke, va] in items(s:new_opts)
+		let {va} = {exists(s:pref.ke) ? s:pref.ke : va}
+	endfo
+	unl va
+	for [ke, va] in items(s:lc_opts)
+		if exists(s:bpref.ke)
+			unl {va}
+			let {va} = {s:bpref.ke}
+		en
+	endfo
+	" Match window options
+	cal s:match_window_opts()
+	" One-time values
+	if a:0 && a:1 != {}
+		unl va
+		for [ke, va] in items(a:1)
+			let opke = substitute(ke, '\(\w:\)\?ctrlp_', '', '')
+			if has_key(s:lc_opts, opke)
+				let sva = s:lc_opts[opke]
+				unl {sva}
+				let {sva} = va
+			en
+		endfo
+	en
+	for each in ['byfname', 'regexp'] | if exists(each)
+		let s:{each} = {each}
+	en | endfo
+	if !exists('g:ctrlp_tilde_homedir') | let g:ctrlp_tilde_homedir = 0 | en
+	if !exists('g:ctrlp_newcache') | let g:ctrlp_newcache = 0 | en
+	let s:maxdepth = min([s:maxdepth, 100])
+	let s:glob = s:showhidden ? '.*\|*' : '*'
+	let s:igntype = empty(s:usrign) ? -1 : type(s:usrign)
+	let s:lash = ctrlp#utils#lash()
+	if s:keyloop
+		let [s:lazy, s:glbs['imd']] = [0, 0]
+	en
+	if s:lazy
+		cal extend(s:glbs, { 'ut': ( s:lazy > 1 ? s:lazy : 250 ) })
+	en
+	" Extensions
+	if !( exists('extensions') && extensions == s:extensions )
+		for each in s:extensions
+			exe 'ru autoload/ctrlp/'.each.'.vim'
+		endfo
+	en
+	" Keymaps
+	if type(s:urprtmaps) == 4
+		cal extend(s:prtmaps, s:urprtmaps)
+	en
+endf
+
+fu! s:match_window_opts()
+	let s:mw_pos =
+		\ s:mw =~ 'top\|bottom' ? matchstr(s:mw, 'top\|bottom') :
+		\ exists('g:ctrlp_match_window_bottom') ? ( s:mwbottom ? 'bottom' : 'top' )
+		\ : 'bottom'
+	let s:mw_order =
+		\ s:mw =~ 'order:[^,]\+' ? matchstr(s:mw, 'order:\zs[^,]\+') :
+		\ exists('g:ctrlp_match_window_reversed') ? ( s:mwreverse ? 'btt' : 'ttb' )
+		\ : 'btt'
+	let s:mw_max =
+		\ s:mw =~ 'max:[^,]\+' ? str2nr(matchstr(s:mw, 'max:\zs\d\+')) :
+		\ exists('g:ctrlp_max_height') ? s:mxheight
+		\ : 10
+	let s:mw_min =
+		\ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
+	let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
+	let s:mw_min = min([s:mw_min, s:mw_max])
+	let s:mw_res =
+		\ s:mw =~ 'results:[^,]\+' ? str2nr(matchstr(s:mw, 'results:\zs\d\+'))
+		\ : min([s:mw_max, &lines])
+endf
+"}}}1
+" * Open & Close {{{1
+fu! s:Open()
+	cal s:log(1)
+	cal s:getenv()
+	cal s:execextvar('enter')
+	sil! exe 'keepa' ( s:mw_pos == 'top' ? 'to' : 'bo' ) '1new ControlP'
+	cal s:buffunc(1)
+	let [s:bufnr, s:winw] = [bufnr('%'), winwidth(0)]
+	let [s:focus, s:prompt] = [1, ['', '', '']]
+	abc <buffer>
+	if !exists('s:hstry')
+		let hst = filereadable(s:gethistloc()[1]) ? s:gethistdata() : ['']
+		let s:hstry = empty(hst) || !s:maxhst ? [''] : hst
+	en
+	for [ke, va] in items(s:glbs) | if exists('+'.ke)
+		sil! exe 'let s:glb_'.ke.' = &'.ke.' | let &'.ke.' = '.string(va)
+	en | endfo
+	if s:opmul != '0' && has('signs')
+		sign define ctrlpmark text=+> texthl=CtrlPMark
+		hi def link CtrlPMark Search
+	en
+	cal s:setupblank()
+endf
+
+fu! s:Close()
+	cal s:buffunc(0)
+	if winnr('$') == 1
+		bw!
+	el
+		try | bun!
+		cat | clo! | endt
+		cal s:unmarksigns()
+	en
+	for key in keys(s:glbs) | if exists('+'.key)
+		sil! exe 'let &'.key.' = s:glb_'.key
+	en | endfo
+	if exists('s:glb_acd') | let &acd = s:glb_acd | en
+	let g:ctrlp_lines = []
+	if s:winres[1] >= &lines && s:winres[2] == winnr('$')
+		exe s:winres[0].s:winres[0]
+	en
+	unl! s:focus s:hisidx s:hstgot s:marked s:statypes s:init s:savestr
+		\ s:mrbs s:did_exp
+	cal ctrlp#recordhist()
+	cal s:execextvar('exit')
+	cal s:log(0)
+	let v:errmsg = s:ermsg
+	ec
+endf
+" * Clear caches {{{1
+fu! ctrlp#clr(...)
+	let [s:matches, g:ctrlp_new{ a:0 ? a:1 : 'cache' }] = [1, 1]
+endf
+
+fu! ctrlp#clra()
+	let cadir = ctrlp#utils#cachedir()
+	if isdirectory(cadir)
+		let cafiles = split(s:glbpath(s:fnesc(cadir, 'g', ','), '**', 1), "\n")
+		let eval = '!isdirectory(v:val) && v:val !~ ''\v[\/]cache[.a-z]+$|\.log$'''
+		sil! cal map(s:ifilter(cafiles, eval), 'delete(v:val)')
+	en
+	cal ctrlp#clr()
+endf
+
+fu! s:Reset(args)
+	let opts = has_key(a:args, 'opts') ? [a:args['opts']] : []
+	cal call('s:opts', opts)
+	cal s:autocmds()
+	cal ctrlp#utils#opts()
+	cal s:execextvar('opts')
+endf
+" * Files {{{1
+fu! ctrlp#files()
+	let cafile = ctrlp#utils#cachefile()
+	if g:ctrlp_newcache || !filereadable(cafile) || s:nocache(cafile)
+		let [lscmd, s:initcwd, g:ctrlp_allfiles] = [s:lsCmd(), s:dyncwd, []]
+		" Get the list of files
+		if empty(lscmd)
+			if !ctrlp#igncwd(s:dyncwd)
+				cal s:InitCustomFuncs()
+				cal s:GlobPath(s:fnesc(s:dyncwd, 'g', ','), 0)
+				cal s:CloseCustomFuncs()
+			en
+		el
+			sil! cal ctrlp#progress('Indexing...')
+			try | cal s:UserCmd(lscmd)
+			cat | retu [] | endt
+		en
+		" Remove base directory
+		cal ctrlp#rmbasedir(g:ctrlp_allfiles)
+		if len(g:ctrlp_allfiles) <= s:compare_lim
+			cal sort(g:ctrlp_allfiles, 'ctrlp#complen')
+		en
+		cal s:writecache(cafile)
+		let catime = getftime(cafile)
+	el
+		let catime = getftime(cafile)
+		if !( exists('s:initcwd') && s:initcwd == s:dyncwd )
+			\ || get(s:ficounts, s:dyncwd, [0, catime])[1] != catime
+			let s:initcwd = s:dyncwd
+			let g:ctrlp_allfiles = ctrlp#utils#readfile(cafile)
+		en
+	en
+	cal extend(s:ficounts, { s:dyncwd : [len(g:ctrlp_allfiles), catime] })
+	retu g:ctrlp_allfiles
+endf
+
+fu! s:InitCustomFuncs()
+	if s:igntype == 4 && has_key(s:usrign, 'func-init') && s:usrign['func-init'] != ''
+		exe call(s:usrign['func-init'], [])
+	en
+endf
+
+fu! s:CloseCustomFuncs()
+	if s:igntype == 4 && has_key(s:usrign, 'func-close') && s:usrign['func-close'] != ''
+		exe call(s:usrign['func-close'], [])
+	en
+endf
+
+fu! s:GlobPath(dirs, depth)
+	let entries = split(globpath(a:dirs, s:glob), "\n")
+	let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1]
+	cal extend(g:ctrlp_allfiles, dnf[1])
+	if !empty(dnf[0]) && !s:maxf(len(g:ctrlp_allfiles)) && depth <= s:maxdepth
+		sil! cal ctrlp#progress(len(g:ctrlp_allfiles), 1)
+		cal s:GlobPath(join(map(dnf[0], 's:fnesc(v:val, "g", ",")'), ','), depth)
+	en
+endf
+
+fu! ctrlp#addfile(ch, file)
+	call add(g:ctrlp_allfiles, a:file)
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:safe_printf(format, ...)
+	try
+		retu call('printf', [a:format] + a:000)
+	cat
+		retu a:format
+	endt
+endf
+
+fu! s:UserCmd(lscmd)
+	let [path, lscmd] = [s:dyncwd, a:lscmd]
+	let do_ign =
+		\ type(s:usrcmd) == 4 && has_key(s:usrcmd, 'ignore') && s:usrcmd['ignore']
+	if do_ign && ctrlp#igncwd(s:cwd) | retu | en
+	if exists('+ssl') && &ssl && &shell !~ 'sh'
+		let [ssl, &ssl, path] = [&ssl, 0, tr(path, '/', '\')]
+	en
+	if (has('win32') || has('win64')) && match(&shellcmdflag, "/") != -1
+		let lscmd = substitute(lscmd, '\v(^|\&\&\s*)\zscd (/d)@!', 'cd /d ', '')
+	en
+	let path = exists('*shellescape') ? shellescape(path) : path
+	if (has('win32') || has('win64')) && match(&shell, 'sh') != -1
+		let path = tr(path, '\', '/')
+	en
+	if s:usrcmdasync && v:version >= 800 && exists('*job_start')
+		if exists('s:job')
+			call job_stop(s:job)
+		en
+		let g:ctrlp_allfiles = []
+		let s:job = job_start([&shell, &shellcmdflag, printf(lscmd, path)], {'callback': 'ctrlp#addfile'})
+	elsei has('patch-7.4-597') && !(has('win32') || has('win64'))
+		let g:ctrlp_allfiles = systemlist(s:safe_printf(lscmd, path))
+	el
+		let g:ctrlp_allfiles = split(system(s:safe_printf(lscmd, path)), "\n")
+	en
+	if exists('+ssl') && exists('ssl')
+		let &ssl = ssl
+		cal map(g:ctrlp_allfiles, 'tr(v:val, "\\", "/")')
+	en
+	if exists('s:vcscmd') && s:vcscmd
+		cal map(g:ctrlp_allfiles, 'tr(v:val, "/", "\\")')
+	en
+	if do_ign
+		if !empty(s:usrign)
+			let g:ctrlp_allfiles = ctrlp#dirnfile(g:ctrlp_allfiles)[1]
+		en
+		if &wig != ''
+			cal filter(g:ctrlp_allfiles, 'glob(v:val) != ""')
+		en
+	en
+endf
+
+fu! s:lsCmd()
+	let cmd = s:usrcmd
+	if type(cmd) == 1
+		retu cmd
+	elsei type(cmd) == 3 && len(cmd) >= 2 && cmd[:1] != ['', '']
+		if s:findroot(s:dyncwd, cmd[0], 0, 1) == []
+			retu len(cmd) == 3 ? cmd[2] : ''
+		en
+		let s:vcscmd = s:lash == '\'
+		retu cmd[1]
+	elsei type(cmd) == 4 && ( has_key(cmd, 'types') || has_key(cmd, 'fallback') )
+		let fndroot = []
+		if has_key(cmd, 'types') && cmd['types'] != {}
+			let [markrs, cmdtypes] = [[], values(cmd['types'])]
+			for pair in cmdtypes
+				cal add(markrs, pair[0])
+			endfo
+			let fndroot = s:findroot(s:dyncwd, markrs, 0, 1)
+		en
+		if fndroot == []
+			retu has_key(cmd, 'fallback') ? cmd['fallback'] : ''
+		en
+		for pair in cmdtypes
+			if pair[0] == fndroot[0] | brea | en
+		endfo
+		let s:vcscmd = s:lash == '\'
+		retu pair[1]
+	en
+endf
+" - Buffers {{{1
+fu! s:bufparts(bufnr)
+	let idc  = (a:bufnr == bufnr('#')      ? '#' : '')  " alternative
+	let idc .= (getbufvar(a:bufnr, '&mod') ? '+' : '')  " modified
+	let idc .= (getbufvar(a:bufnr, '&ma')  ? '' : '-')  " nomodifiable
+	let idc .= (getbufvar(a:bufnr, '&ro')  ? '=' : '')  " readonly
+
+	" flags for highlighting
+	let hiflags  = (bufwinnr(a:bufnr) != -1    ? '*' : '')  " visible
+	let hiflags .= (getbufvar(a:bufnr, '&mod') ? '+' : '')  " modified
+	let hiflags .= (a:bufnr == s:crbufnr       ? '!' : '')  " current
+
+	let bname = bufname(a:bufnr)
+	let bname = (bname == '' ? '[No Name]' : fnamemodify(bname, s:bufname_mod))
+
+	let bpath = empty(s:bufpath_mod) ? '' : fnamemodify(bufname(a:bufnr), s:bufpath_mod).s:lash()
+
+	retu [idc, hiflags, bname, bpath]
+endf
+fu! ctrlp#buffers(...)
+	let ids = sort(filter(range(1, bufnr('$')), '(empty(getbufvar(v:val, "&bt"))'
+		\ .' || s:isterminal(v:val)) && getbufvar(v:val, "&bl")'), 's:compmreb')
+	if a:0 && a:1 == 'id'
+		retu ids
+	el
+		let bufs = [[], []]
+		for id in ids
+			let bname = bufname(id)
+			let ebname = bname == ''
+			let fname = fnamemodify(ebname ? '['.id.'*No Name]' : bname, ':.')
+			cal add(bufs[ebname], fname)
+		endfo
+		retu bufs[0] + bufs[1]
+	en
+endf
+" * MatchedItems() {{{1
+fu! s:MatchIt(items, pat, limit, exc)
+	let [lines, id] = [[], 0]
+	let pat =
+		\ s:byfname() ? map(split(a:pat, '^[^;]\+\\\@<!\zs;', 1), 's:martcs.v:val')
+		\ : s:martcs.a:pat
+	for item in a:items
+		let id += 1
+		try
+			if (s:matchcrfile || !( s:ispath && item ==# a:exc )) &&
+						\call(s:mfunc, [item, pat]) >= 0
+				cal add(lines, item)
+			en
+		cat | brea | endt
+		if a:limit > 0 && len(lines) >= a:limit | brea | en
+	endfo
+	let s:mdata = [s:dyncwd, s:itemtype, s:regexp, s:sublist(a:items, id, -1)]
+	retu lines
+endf
+
+fu! s:MatchedItems(items, pat, limit)
+	let exc = exists('s:crfilerel') ? s:crfilerel : ''
+	let items = s:narrowable() ? s:matched + s:mdata[3] : a:items
+	let matcher = s:getextvar('matcher')
+	if empty(matcher) || type(matcher) != 4 || !has_key(matcher, 'match')
+		unlet matcher
+		let matcher = s:matcher
+	en
+	if matcher != {}
+		let argms =
+			\ has_key(matcher, 'arg_type') && matcher['arg_type'] == 'dict' ? [{
+			\ 'items':  items,
+			\ 'str':    a:pat,
+			\ 'limit':  a:limit,
+			\ 'mmode':  s:mmode(),
+			\ 'ispath': s:ispath,
+			\ 'crfile': exc,
+			\ 'regex':  s:regexp,
+			\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
+		let lines = call(matcher['match'], argms, matcher)
+	el
+		let lines = s:MatchIt(items, a:pat, a:limit, exc)
+	en
+	let s:matches = len(lines)
+	unl! s:did_exp
+	retu lines
+endf
+
+fu! s:SplitPattern(str)
+	let str = a:str
+	let s:savestr = str
+	if s:regexp
+		let pat = s:regexfilter(str)
+	el
+		let lst = split(str, '\zs')
+		if exists('+ssl') && !&ssl
+			cal map(lst, 'escape(v:val, ''\'')')
+		en
+		for each in ['^', '$', '.']
+			cal map(lst, 'escape(v:val, each)')
+		endfo
+	en
+	if exists('lst')
+		let pat = ''
+		if !empty(lst)
+			if s:byfname() && index(lst, ';') > 0
+				let fbar = index(lst, ';')
+				let lst_1 = s:sublist(lst, 0, fbar - 1)
+				let lst_2 = len(lst) - 1 > fbar ? s:sublist(lst, fbar + 1, -1) : ['']
+				let pat = s:buildpat(lst_1).';'.s:buildpat(lst_2)
+			el
+				let pat = s:buildpat(lst)
+			en
+		en
+	en
+	retu escape(pat, '~')
+endf
+" * BuildPrompt() {{{1
+fu! s:Render(lines, pat)
+	let [&ma, lines, s:res_count] = [1, a:lines, len(a:lines)]
+	let height = min([max([s:mw_min, s:res_count]), s:winmaxh])
+	let pat = s:byfname() ? split(a:pat, '^[^;]\+\\\@<!\zs;', 1)[0] : a:pat
+	let cur_cmd = 'keepj norm! '.( s:mw_order == 'btt' ? 'G' : 'gg' ).'1|'
+
+	" Setup the match window
+	sil! exe '%d _ | res' height
+	" Print the new items
+	if empty(lines)
+		let [s:matched, s:lines] = [[], []]
+		let lines = [' == NO ENTRIES ==']
+		cal setline(1, s:offset(lines, height - 1))
+		setl noma nocul
+		exe cur_cmd
+		cal s:unmarksigns()
+		if s:dohighlight() | cal clearmatches() | en
+		retu
+	en
+	let s:matched = copy(lines)
+	" Sorting
+	if !s:nosort()
+		let s:compat = s:martcs.pat
+		cal sort(lines, 's:mixedsort')
+		unl s:compat
+	en
+	if s:mw_order == 'btt' | cal reverse(lines) | en
+	let s:lines = copy(lines)
+	cal map(lines, s:flfunc)
+	cal setline(1, s:offset(lines, height))
+	cal s:unmarksigns()
+	cal s:remarksigns()
+	" Highlighting
+	if s:dohighlight()
+		cal s:highlight(pat, s:mathi[1])
+	en
+	setl noma cul
+	exe cur_cmd
+endf
+
+fu! s:Update(str)
+	" Get the previous string if existed
+	let oldstr = exists('s:savestr') ? s:savestr : ''
+	" Get the new string sans tail
+	let str = s:sanstail(a:str)
+	" Stop if the string's unchanged
+	if str == oldstr && !empty(str) && !exists('s:force') | retu | en
+	" Optionally send the string to a custom validate function
+	if s:validate != '' | let str = call(s:validate, [str]) | en
+	let s:martcs = &scs && str =~ '\u' ? '\C' : ''
+	let pat = s:matcher == {} ? s:SplitPattern(str) : str
+	let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
+		\ : s:MatchedItems(g:ctrlp_lines, pat, s:mw_res)
+	if empty(str) | cal clearmatches() | en
+	cal s:Render(lines, pat)
+	return lines
+endf
+
+fu! s:ForceUpdate()
+	let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
+	sil! cal s:Update(escape(s:getinput(), '\'))
+	cal setpos('.', pos)
+endf
+
+fu! s:BuildPrompt(upd)
+	let base = ( s:regexp ? 'r' : '>' ).( s:byfname() ? 'd' : '>' ).'> '
+	let str = escape(s:getinput(), '\')
+	let lazy = str == '' || exists('s:force') || !has('autocmd') ? 0 : s:lazy
+	if a:upd && !lazy && ( s:matches || s:regexp || exists('s:did_exp')
+		\ || str =~ '\(\\\(<\|>\)\|[*|]\)\|\(\\\:\([^:]\|\\:\)*$\)' )
+		sil! cal s:Update(str)
+	en
+	sil! cal ctrlp#statusline()
+	" Toggling
+	let [hiactive, hicursor, base] = s:focus
+		\ ? ['CtrlPPrtText', 'CtrlPPrtCursor', base]
+		\ : ['CtrlPPrtBase', 'CtrlPPrtBase', tr(base, '>', '-')]
+	let hibase = 'CtrlPPrtBase'
+	" Build it
+	redr
+	let prt = copy(s:prompt)
+	cal map(prt, 'escape(v:val, ''"\'')')
+	exe 'echoh' hibase '| echon "'.base.'"
+		\ | echoh' hiactive '| echon "'.prt[0].'"
+		\ | echoh' hicursor '| echon "'.prt[1].'"
+		\ | echoh' hiactive '| echon "'.prt[2].'" | echoh None'
+	" Append the cursor at the end
+	if empty(prt[1]) && s:focus
+		exe 'echoh' hibase '| echon "_" | echoh None'
+	en
+endf
+" - SetDefTxt() {{{1
+fu! s:SetDefTxt()
+	if s:deftxt == '0' || ( s:deftxt == 1 && !s:ispath ) | retu | en
+	let txt = s:deftxt
+	if !type(txt)
+		let path = s:crfpath.s:lash(s:crfpath)
+		let txt = txt && !stridx(path, s:dyncwd) ? ctrlp#rmbasedir([path])[0] : ''
+	en
+	let s:prompt[0] = txt
+endf
+" ** Prt Actions {{{1
+" Editing {{{2
+fu! s:PrtClear()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [s:prompt, s:matches] = [['', '', ''], 1]
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtAdd(char)
+	unl! s:hstgot
+	let s:act_add = 1
+	let s:prompt[0] .= a:char
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+
+fu! s:PrtBS()
+	if !s:focus | retu | en
+	if empty(s:prompt[0]) && s:brfprt != 0
+		cal s:PrtExit()
+		retu
+	en
+	unl! s:hstgot
+	let [s:prompt[0], s:matches] = [substitute(s:prompt[0], '.$', '', ''), 1]
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDelete()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [prt, s:matches] = [s:prompt, 1]
+	let prt[1] = matchstr(prt[2], '^.')
+	let prt[2] = substitute(prt[2], '^.', '', '')
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDeleteWord()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [str, s:matches] = [s:prompt[0], 1]
+	let str = str =~ '\W\w\+$' ? matchstr(str, '^.\+\W\ze\w\+$')
+		\ : str =~ '\w\W\+$' ? matchstr(str, '^.\+\w\ze\W\+$')
+		\ : str =~ '\s\+$' ? matchstr(str, '^.*\S\ze\s\+$')
+		\ : str =~ '\v^(\S+|\s+)$' ? '' : str
+	let s:prompt[0] = str
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtInsert(...)
+	if !s:focus | retu | en
+	let type = !a:0 ? '' : a:1
+	if !a:0
+		let type = s:insertstr()
+		if type == 'cancel' | retu | en
+	en
+	if type ==# 'r'
+		let regcont = s:getregs()
+		if regcont < 0 | retu | en
+	en
+	unl! s:hstgot
+	let s:act_add = 1
+	let s:prompt[0] .= type ==# 'w' ? s:crword
+		\ : type ==# 'f' ? s:crgfile
+		\ : type ==# 's' ? s:regisfilter('/')
+		\ : type ==# 'v' ? s:crvisual
+		\ : type ==# 'c' ? s:regisfilter('+')
+		\ : type ==# 'r' ? regcont : ''
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+
+fu! s:PrtExpandDir()
+	if !s:focus | retu | en
+	let str = s:getinput('c')
+	if str =~ '\v^\@(cd|lc[hd]?|chd)\s.+' && s:spi
+		let hasat = split(str, '\v^\@(cd|lc[hd]?|chd)\s*\zs')
+		let str = get(hasat, 1, '')
+		if str =~# '\v^[~$]\i{-}[\/]?|^#(\<?\d+)?:(p|h|8|\~|\.|g?s+)'
+			let str = expand(s:fnesc(str, 'g'))
+		elsei str =~# '\v^(\%|\<c\h{4}\>):(p|h|8|\~|\.|g?s+)'
+			let spc = str =~# '^%' ? s:crfile
+				\ : str =~# '^<cfile>' ? s:crgfile
+				\ : str =~# '^<cword>' ? s:crword
+				\ : str =~# '^<cWORD>' ? s:crnbword : ''
+			let pat = '(:(p|h|8|\~|\.|g?s(.)[^\3]*\3[^\3]*\3))+'
+			let mdr = matchstr(str, '\v^[^:]+\zs'.pat)
+			let nmd = matchstr(str, '\v^[^:]+'.pat.'\zs.{-}$')
+			let str = fnamemodify(s:fnesc(spc, 'g'), mdr).nmd
+		en
+	en
+	if str == '' | retu | en
+	unl! s:hstgot
+	let s:act_add = 1
+	let [base, seed] = s:headntail(str)
+	if str =~# '^[\/]'
+		let base = expand('/').base
+	en
+	let dirs = s:dircompl(base, seed)
+	if len(dirs) == 1
+		let str = dirs[0]
+	elsei len(dirs) > 1
+		let str .= s:findcommon(dirs, str)
+	en
+	let s:prompt[0] = exists('hasat') ? hasat[0].str : str
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+" Movement {{{2
+fu! s:PrtCurLeft()
+	if !s:focus | retu | en
+	let prt = s:prompt
+	if !empty(prt[0])
+		let s:prompt = [substitute(prt[0], '.$', '', ''), matchstr(prt[0], '.$'),
+			\ prt[1] . prt[2]]
+	en
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurRight()
+	if !s:focus | retu | en
+	let prt = s:prompt
+	let s:prompt = [prt[0] . prt[1], matchstr(prt[2], '^.'),
+		\ substitute(prt[2], '^.', '', '')]
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurStart()
+	if !s:focus | retu | en
+	let str = join(s:prompt, '')
+	let s:prompt = ['', matchstr(str, '^.'), substitute(str, '^.', '', '')]
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurEnd()
+	if !s:focus | retu | en
+	let s:prompt = [join(s:prompt, ''), '', '']
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtSelectMove(dir)
+	let wht = winheight(0)
+	let dirs = {'t': 'gg','b': 'G','j': 'j','k': 'k','u': wht.'k','d': wht.'j'}
+	exe 'keepj norm!' dirs[a:dir]
+	let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
+	cal s:BuildPrompt(0)
+	cal setpos('.', pos)
+endf
+
+fu! s:PrtSelectJump(char)
+	let lines = copy(s:lines)
+	if s:byfname()
+		cal map(lines, 'split(v:val, ''[\/]\ze[^\/]\+$'')[-1]')
+	en
+	" Cycle through matches, use s:jmpchr to store last jump
+	let chr = escape(matchstr(a:char, '^.'), '.~')
+	let smartcs = &scs && chr =~ '\u' ? '\C' : ''
+	if match(lines, smartcs.'^'.chr) >= 0
+		" If not exists or does but not for the same char
+		let pos = match(lines, smartcs.'^'.chr)
+		if !exists('s:jmpchr') || ( exists('s:jmpchr') && s:jmpchr[0] != chr )
+			let [jmpln, s:jmpchr] = [pos, [chr, pos]]
+		elsei exists('s:jmpchr') && s:jmpchr[0] == chr
+			" Start of lines
+			if s:jmpchr[1] == -1 | let s:jmpchr[1] = pos | en
+			let npos = match(lines, smartcs.'^'.chr, s:jmpchr[1] + 1)
+			let [jmpln, s:jmpchr] = [npos == -1 ? pos : npos, [chr, npos]]
+		en
+		exe 'keepj norm!' ( jmpln + 1 ).'G'
+		let pos = exists('*getcurpos') ? getcurpos() : getpos('.')
+		cal s:BuildPrompt(0)
+		cal setpos('.', pos)
+	en
+endf
+" Misc {{{2
+fu! s:PrtFocusMap(char)
+	cal call(( s:focus ? 's:PrtAdd' : 's:PrtSelectJump' ), [a:char])
+endf
+
+fu! s:PrtClearCache()
+	let ct = s:curtype()
+	if ct == 'fil'
+		cal ctrlp#clr()
+	elsei s:itemtype >= len(s:coretypes)
+		cal ctrlp#clr(s:statypes[s:itemtype][1])
+	en
+	if ct == 'mru'
+		let g:ctrlp_lines = ctrlp#mrufiles#refresh()
+	el
+		cal ctrlp#setlines()
+	en
+	let s:force = 1
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+
+fu! s:PrtDeleteEnt()
+	let ct = s:curtype()
+	if ct == 'mru'
+		cal s:PrtDeleteMRU()
+	elsei ct == 'buf'
+		cal s:delbuf()
+	elsei type(s:getextvar('wipe')) == 1
+		cal s:delent(s:getextvar('wipe'))
+	en
+endf
+
+fu! s:PrtDeleteMRU()
+	if s:curtype() == 'mru'
+		cal s:delent('ctrlp#mrufiles#remove')
+	en
+endf
+
+fu! s:PrtExit()
+	let bw = bufwinnr('%')
+	exe bufwinnr(s:bufnr).'winc w'
+	if bufnr('%') == s:bufnr && bufname('%') == 'ControlP'
+		noa cal s:Close()
+		noa winc p
+	els
+		exe bw.'winc w'
+	en
+endf
+
+fu! s:PrtHistory(...)
+	if !s:focus || !s:maxhst | retu | en
+	let [str, hst, s:matches] = [join(s:prompt, ''), s:hstry, 1]
+	" Save to history if not saved before
+	let [hst[0], hslen] = [exists('s:hstgot') ? hst[0] : str, len(hst)]
+	let idx = exists('s:hisidx') ? s:hisidx + a:1 : a:1
+	" Limit idx within 0 and hslen
+	let idx = idx < 0 ? 0 : idx >= hslen ? hslen > 1 ? hslen - 1 : 0 : idx
+	let s:prompt = [hst[idx], '', '']
+	let [s:hisidx, s:hstgot, s:force] = [idx, 1, 1]
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+"}}}1
+" * Mappings {{{1
+fu! s:MapNorms()
+	if exists('s:nmapped') && s:nmapped == s:bufnr | retu | en
+	let pcmd = "nn \<buffer> \<silent> \<k%s> :\<c-u>cal \<SID>%s(\"%s\")\<cr>"
+	let cmd = substitute(pcmd, 'k%s', 'char-%d', '')
+	let pfunc = 'PrtFocusMap'
+	let ranges = [32, 33, 125, 126] + range(35, 91) + range(93, 123)
+	for each in [34, 92, 124]
+		exe printf(cmd, each, pfunc, escape(nr2char(each), '"|\'))
+	endfo
+	for each in ranges
+		exe printf(cmd, each, pfunc, nr2char(each))
+	endfo
+	for each in range(0, 9)
+		exe printf(pcmd, each, pfunc, each)
+	endfo
+	for [ke, va] in items(s:kprange)
+		exe printf(pcmd, ke, pfunc, va)
+	endfo
+	let s:nmapped = s:bufnr
+endf
+
+fu! s:MapSpecs()
+	if !( exists('s:smapped') && s:smapped == s:bufnr )
+		" Correct arrow keys in terminal
+		if ( has('termresponse') && v:termresponse =~ "\<ESC>" )
+			\ || &term =~? '\vxterm|<k?vt|gnome|screen|linux|ansi|tmux|st(-[-a-z0-9]*)?$'
+			for each in ['\A <up>','\B <down>','\C <right>','\D <left>']
+				exe s:lcmap.' <esc>['.each
+			endfo
+		en
+	en
+	for [ke, va] in items(s:prtmaps) | for kp in va
+		exe s:lcmap kp ':<c-u>cal <SID>'.ke.'<cr>'
+	endfo | endfo
+	let s:smapped = s:bufnr
+endf
+
+fu! s:KeyLoop()
+	let [t_ve, guicursor] = [&t_ve, &guicursor]
+	wh exists('s:init') && s:keyloop
+		try
+			set t_ve=
+			if guicursor != ''
+				set guicursor=a:NONE
+			en
+			let nr = getchar()
+		fina
+			let &t_ve = t_ve
+			let &guicursor = guicursor
+		endt
+		let chr = !type(nr) ? nr2char(nr) : nr
+		if nr >=# 0x20
+			cal s:PrtFocusMap(chr)
+		el
+			let cmd = matchstr(maparg(chr), ':<C-U>\zs.\+\ze<CR>$')
+			try
+				exe ( cmd != '' ? cmd : 'norm '.chr )
+			cat
+			endt
+		en
+	endw
+endf
+" * Toggling {{{1
+fu! s:ToggleFocus()
+	let s:focus = !s:focus
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:ToggleRegex()
+	let s:regexp = !s:regexp
+	cal s:PrtSwitcher()
+endf
+
+fu! s:ToggleByFname()
+	if s:ispath
+		let s:byfname = !s:byfname
+		let s:mfunc = s:mfunc()
+		cal s:PrtSwitcher()
+	en
+endf
+
+fu! s:ToggleType(dir)
+	let max = len(g:ctrlp_ext_vars) + len(s:coretypes) - 1
+	let next = s:walker(max, s:itemtype, a:dir)
+	cal ctrlp#setlines(next)
+	cal ctrlp#syntax()
+	cal s:PrtSwitcher()
+endf
+
+fu! s:ToggleKeyLoop()
+	let s:keyloop = !s:keyloop
+	if exists('+imd')
+		let &imd = !s:keyloop
+	en
+	if s:keyloop
+		let [&ut, s:lazy] = [0, 0]
+		cal s:KeyLoop()
+	elsei has_key(s:glbs, 'ut')
+		let [&ut, s:lazy] = [s:glbs['ut'], 1]
+	en
+endf
+
+fu! s:ToggleMRURelative()
+	cal ctrlp#mrufiles#tgrel()
+	cal s:PrtClearCache()
+endf
+
+fu! s:PrtSwitcher()
+	let [s:force, s:matches] = [1, 1]
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+" - SetWD() {{{1
+fu! s:SetWD(args)
+	if has_key(a:args, 'args') && stridx(a:args['args'], '--dir') >= 0
+		\ && exists('s:dyncwd')
+		cal ctrlp#setdir(s:dyncwd) | retu
+	en
+	if has_key(a:args, 'dir') && a:args['dir'] != ''
+		cal ctrlp#setdir(a:args['dir']) | retu
+	en
+	let pmodes = has_key(a:args, 'mode') ? a:args['mode'] : s:pathmode
+	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
+	if (!type(pmodes))
+		let pmodes =
+			\ pmodes == 0 ? '' :
+			\ pmodes == 1 ? 'a' :
+			\ pmodes == 2 ? 'r' :
+			\ 'c'
+	en
+	let spath = pmodes =~ 'd' ? s:dyncwd : pmodes =~ 'w' ? s:cwd : s:crfpath
+	for pmode in split(pmodes, '\zs')
+		if ctrlp#setpathmode(pmode, spath) | retu | en
+	endfo
+endf
+" * AcceptSelection() {{{1
+fu! ctrlp#acceptfile(...)
+	let useb = 0
+	if a:0 == 1 && type(a:1) == 4
+		let [md, line] = [a:1['action'], a:1['line']]
+		let atl = has_key(a:1, 'tail') ? a:1['tail'] : ''
+	el
+		let [md, line] = [a:1, a:2]
+		let atl = a:0 > 2 ? a:3 : ''
+	en
+	if !type(line)
+		let [filpath, bufnr, useb] = [line, line, 1]
+	el
+		let [bufnr, filpath] = s:bufnrfilpath(line)
+		if bufnr == filpath
+			let useb = 1
+		en
+	en
+	cal s:PrtExit()
+	let tail = s:tail()
+	let j2l = atl != '' ? atl : matchstr(tail, '^ +\zs\d\+$')
+	if bufnr > 0 && ( !empty(s:jmptobuf) && s:jmptobuf =~ md )
+		\ && !( md == 'e' && bufnr == bufnr('%') )
+		let [jmpb, bufwinnr] = [1, bufwinnr(bufnr)]
+		let buftab = ( s:jmptobuf =~# '[tTVH]' || s:jmptobuf > 1 )
+			\ ? s:buftab(bufnr, md) : [0, 0]
+	en
+	" Switch to existing buffer or open new one
+	if exists('jmpb') && bufwinnr > 0
+		\ && !( md == 't' && ( s:jmptobuf !~# toupper(md) || buftab[0] ) )
+		exe bufwinnr.'winc w'
+		if j2l | cal ctrlp#j2l(j2l) | en
+	elsei exists('jmpb') && buftab[0]
+		\ && !( md =~ '[evh]' && s:jmptobuf !~# toupper(md) )
+		exe 'tabn' buftab[0]
+		exe buftab[1].'winc w'
+		if j2l | cal ctrlp#j2l(j2l) | en
+	el
+		" Determine the command to use
+		let useb = bufnr > 0 && buflisted(bufnr) && ( empty(tail) || useb )
+		let cmd =
+			\ md == 't' || s:splitwin == 1 ? ( useb ? 'tab sb' : 'tabe' ) :
+			\ md == 'h' || s:splitwin == 2 ? ( useb ? 'sb' : 'new' ) :
+			\ md == 'v' || s:splitwin == 3 ? ( useb ? 'vert sb' : 'vne' ) :
+			\ &bt == 'help' ? 'b' :
+			\ call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
+		" Reset &switchbuf option
+		let [swb, &swb] = [&swb, '']
+		" Open new window/buffer
+		let [fid, tail] = [( useb ? bufnr : filpath ), ( atl != '' ? ' +'.atl : tail )]
+		let args = [cmd, fid, tail, 1, [useb, j2l]]
+		cal call('s:openfile', args)
+		let &swb = swb
+	en
+endf
+
+fu! s:SpecInputs(str)
+	if a:str =~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*)$' && s:spi
+		let cwd = s:dyncwd
+		cal ctrlp#setdir(a:str =~ '^\.\.\.*$' ?
+			\ '../'.repeat('../', strlen(a:str) - 2) : a:str)
+		if cwd != s:dyncwd | cal ctrlp#setlines() | en
+		cal s:PrtClear()
+		retu 1
+	elsei a:str == s:lash && s:spi
+		cal s:SetWD({ 'mode': 'rd' })
+		cal ctrlp#setlines()
+		cal s:PrtClear()
+		retu 1
+	elsei a:str =~ '^@.\+' && s:spi
+		retu s:at(a:str)
+	elsei a:str == '?'
+		cal s:PrtExit()
+		let hlpwin = &columns > 159 ? '| vert res 80' : ''
+		sil! exe 'bo vert h ctrlp-mappings' hlpwin '| norm! 0'
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:AcceptSelection(action)
+	let [md, icr] = [a:action[0], match(a:action, 'r') >= 0]
+	let subm = icr || ( !icr && md == 'e' )
+	if !subm && s:OpenMulti(md) != -1 | retu | en
+	let str = s:getinput()
+	if subm | if s:SpecInputs(str) | retu | en | en
+	" Get the selected line
+	let line = ctrlp#getcline()
+	if !subm && s:curtype() != 'fil' && line == '' && line('.') > s:offset
+		\ && str !~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*|/|\\|\?|\@.+)$'
+		cal s:CreateNewFile(md) | retu
+	en
+	if empty(line) | retu | en
+	" Do something with it
+	if s:openfunc != {} && has_key(s:openfunc, s:ctype)
+		let actfunc = s:openfunc[s:ctype]
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'list'
+	el
+		if s:itemtype < len(s:coretypes)
+			let [actfunc, type] = ['ctrlp#acceptfile', 'dict']
+		el
+			let [actfunc, exttype] = [s:getextvar('accept'), s:getextvar('act_farg')]
+			let type = exttype == 'dict' ? exttype : 'list'
+		en
+	en
+	let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr, 'input': str}]
+		\ : [md, line]
+	cal call(actfunc, actargs)
+endf
+" - CreateNewFile() {{{1
+fu! s:CreateNewFile(...)
+	let [md, str] = ['', s:getinput('n')]
+	if empty(str) | retu | en
+	if s:argmap && !a:0
+		" Get the extra argument
+		let md = s:argmaps(md, 1)
+		if md == 'cancel' | retu | en
+	en
+	let str = s:sanstail(str)
+	let [base, fname] = s:headntail(str)
+	if fname =~ '^[\/]$' | retu | en
+	if exists('s:marked') && len(s:marked)
+		" Use the first marked file's path
+		let path = fnamemodify(values(s:marked)[0], ':p:h')
+		let base = path.s:lash(path).base
+		let str = fnamemodify(base.s:lash.fname, ':.')
+	en
+	if base != '' | if isdirectory(ctrlp#utils#mkdir(base))
+		let optyp = str | en | el | let optyp = fname
+	en
+	if !exists('optyp') | retu | en
+	let [filpath, tail] = [fnamemodify(optyp, ':p'), s:tail()]
+	if !stridx(filpath, s:dyncwd) | cal s:insertcache(str) | en
+	cal s:PrtExit()
+	let cmd = md == 'r' ? ctrlp#normcmd('e') :
+		\ s:newfop =~ '1\|t' || ( a:0 && a:1 == 't' ) || md == 't' ? 'tabe' :
+		\ s:newfop =~ '2\|h' || ( a:0 && a:1 == 'h' ) || md == 'h' ? 'new' :
+		\ s:newfop =~ '3\|v' || ( a:0 && a:1 == 'v' ) || md == 'v' ? 'vne' :
+		\ ctrlp#normcmd('e')
+	cal s:openfile(cmd, filpath, tail, 1)
+endf
+" * OpenMulti() {{{1
+fu! s:MarkToOpen()
+	let ct = s:curtype()
+	if s:bufnr <= 0 || s:opmul == '0'
+		\ || ( s:itemtype >= len(s:coretypes) && s:getextvar('opmul') != 1 )
+		retu
+	en
+	let line = ctrlp#getcline()
+
+	" Do not allow to mark modified or current buffer
+	let bufnr = s:bufnrfilpath(line)[0]
+	if (ct == 'buf' && s:delbufcond(bufnr))
+		retu
+	en
+
+	if empty(line) | retu | en
+	let filpath = s:ispath ? fnamemodify(line, ':p') : line
+	if exists('s:marked') && s:dictindex(s:marked, filpath) > 0
+		" Unmark and remove the file from s:marked
+		let key = s:dictindex(s:marked, filpath)
+		cal remove(s:marked, key)
+		if empty(s:marked) | unl s:marked | en
+		if has('signs')
+			exe 'sign unplace' key 'buffer='.s:bufnr
+		en
+	el
+		" Add to s:marked and place a new sign
+		if exists('s:marked')
+			let vac = s:vacantdict(s:marked)
+			let key = empty(vac) ? len(s:marked) + 1 : vac[0]
+			let s:marked = extend(s:marked, { key : filpath })
+		el
+			let [key, s:marked] = [1, { 1 : filpath }]
+		en
+		if has('signs')
+			exe 'sign place' key 'line='.line('.').' name=ctrlpmark buffer='.s:bufnr
+		en
+	en
+	sil! cal ctrlp#statusline()
+endf
+
+fu! s:OpenMulti(...)
+	let has_marked = exists('s:marked')
+	if ( !has_marked && a:0 ) || s:opmul == '0' || !s:ispath
+		\ || ( s:itemtype >= len(s:coretypes) && s:getextvar('opmul') != 1 )
+		retu -1
+	en
+	" Get the options
+	let [nr, md] = [matchstr(s:opmul, '\d\+'), matchstr(s:opmul, '[thvi]')]
+	let [ur, jf] = [s:opmul =~ 'r', s:opmul =~ 'j']
+	let md = a:0 ? a:1 : ( md == '' ? 'v' : md )
+	let nopt = exists('g:ctrlp_open_multiple_files')
+	if !has_marked
+		let line = ctrlp#getcline()
+		if line == '' | retu | en
+		let marked = { 1 : fnamemodify(line, ':p') }
+		let [nr, ur, jf, nopt] = ['1', 0, 0, 1]
+	en
+	if ( s:argmap || !has_marked ) && !a:0
+		let md = s:argmaps(md, !has_marked ? 2 : 0)
+		if md == 'c'
+			cal s:unmarksigns()
+			unl! s:marked
+			cal s:BuildPrompt(0)
+		elsei !has_marked && md =~ '[axd]'
+			retu s:OpenNoMarks(md, line)
+		en
+		if md =~ '\v^c(ancel)?$' | retu | en
+		let nr = nr == '0' ? ( nopt ? '' : '1' ) : nr
+		let ur = !has_marked && md == 'r' ? 1 : ur
+	en
+	let mkd = values(has_marked ? s:marked : marked)
+	cal s:sanstail(join(s:prompt, ''))
+	cal s:PrtExit()
+	if nr == '0' || md == 'i'
+		retu map(mkd, "s:openfile('bad', v:val, '', 0)")
+	en
+	let tail = s:tail()
+	let [emptytail, bufnr] = [empty(tail), bufnr('^'.mkd[0].'$')]
+	let useb = bufnr > 0 && buflisted(bufnr) && emptytail
+	" Move to a replaceable window
+	let ncmd = ( useb ? ['b', 'bo vert sb'] : ['e', 'bo vne'] )
+		\ + ( ur ? [] : ['ignruw'] )
+	let fst = call('ctrlp#normcmd', ncmd)
+	" Check if the current window has a replaceable buffer
+	let repabl = !( md == 't' && !ur ) && empty(bufname('%')) && empty(&l:ft)
+	" Commands for the rest of the files
+	let [ic, cmds] = [1, { 'v': ['vert sb', 'vne'], 'h': ['sb', 'new'],
+		\ 't': ['tab sb', 'tabe'] }]
+	let [swb, &swb] = [&swb, '']
+	if md == 't' && ctrlp#tabcount() < tabpagenr()
+		let s:tabct = ctrlp#tabcount()
+	en
+	" Open the files
+	for va in mkd
+		let bufnr = bufnr('^'.va.'$')
+		if bufnr < 0 && getftype(va) == '' | con | en
+		let useb = bufnr > 0 && buflisted(bufnr) && emptytail
+		let snd = md != '' && has_key(cmds, md) ?
+			\ ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' )
+		let cmd = ic == 1 && ( !( !ur && fst =~ '^[eb]$' ) || repabl ) ? fst : snd
+		let conds = [( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 ),
+			\ nr != '' && nr < ic]
+		if conds[nopt]
+			if !buflisted(bufnr) | cal s:openfile('bad', va, '', 0) | en
+		el
+			cal s:openfile(cmd, useb ? bufnr : va, tail, ic == 1)
+			if jf | if ic == 1
+				let crpos = [tabpagenr(), winnr()]
+			el
+				let crpos[0] += tabpagenr() <= crpos[0]
+				let crpos[1] += winnr() <= crpos[1]
+			en | en
+			let ic += 1
+		en
+	endfo
+	if jf && exists('crpos') && ic > 2
+		exe ( md == 't' ? 'tabn '.crpos[0] : crpos[1].'winc w' )
+	en
+	let &swb = swb
+	unl! s:tabct
+endf
+
+fu! s:YankLine(...)
+	let @" = s:getinput()
+	let has_marked = exists('s:marked')
+	if !has_marked
+		let line = ctrlp#getcline()
+		if line == '' | retu | en
+		let marked = { 1 : fnamemodify(line, ':p') }
+	en
+	let @" = join(values(has_marked ? s:marked : marked), "\n")
+	cal s:PrtExit()
+endf
+
+fu! s:OpenNoMarks(md, line)
+	if a:md == 'a'
+		let [s:marked, key] = [{}, 1]
+		for line in s:lines
+			let s:marked = extend(s:marked, { key : fnamemodify(line, ':p') })
+			let key += 1
+		endfo
+		cal s:remarksigns()
+		cal s:BuildPrompt(0)
+	elsei a:md == 'x'
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'dict'
+		let argms = type == 'dict' ? [{ 'action': a:md, 'line': a:line }]
+			\ : [a:md, a:line]
+		cal call(s:openfunc[s:ctype], argms, s:openfunc)
+	elsei a:md == 'd'
+		let dir = fnamemodify(a:line, ':h')
+		if isdirectory(dir)
+			cal ctrlp#setdir(dir)
+			cal ctrlp#switchtype(0)
+			cal ctrlp#recordhist()
+			cal s:PrtClear()
+		en
+	en
+endf
+" ** Helper functions {{{1
+" Sorting {{{2
+fu! ctrlp#complen(...)
+	" By length
+	let [len1, len2] = [strlen(a:1), strlen(a:2)]
+	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
+endf
+
+fu! s:compmatlen(...)
+	" By match length
+	let mln1 = s:shortest(s:matchlens(a:1, s:compat))
+	let mln2 = s:shortest(s:matchlens(a:2, s:compat))
+	retu mln1 == mln2 ? 0 : mln1 > mln2 ? 1 : -1
+endf
+
+fu! s:comptime(...)
+	" By last modified time
+	let [time1, time2] = [getftime(a:1), getftime(a:2)]
+	retu time1 == time2 ? 0 : time1 < time2 ? 1 : -1
+endf
+
+fu! s:compmreb(...)
+	" By last entered time (bufnr)
+	let [id1, id2] = [index(s:mrbs, a:1), index(s:mrbs, a:2)]
+	if id1 == id2
+		return 0
+	endif
+	if id1 < 0
+		return 1
+	endif
+	if id2 < 0
+		return -1
+	endif
+	return id1 > id2 ? 1 : -1
+endf
+
+fu! s:compmref(...)
+	" By last entered time (MRU)
+	let [id1, id2] = [index(g:ctrlp_lines, a:1), index(g:ctrlp_lines, a:2)]
+	retu id1 == id2 ? 0 : id1 > id2 ? 1 : -1
+endf
+
+fu! s:comparent(...)
+	" By same parent dir
+	if !stridx(s:crfpath, s:dyncwd)
+		let [as1, as2] = [s:dyncwd.s:lash().a:1, s:dyncwd.s:lash().a:2]
+		let [loc1, loc2] = [s:getparent(as1), s:getparent(as2)]
+		if loc1 == s:crfpath && loc2 != s:crfpath | retu -1 | en
+		if loc2 == s:crfpath && loc1 != s:crfpath | retu 1  | en
+		retu 0
+	en
+	retu 0
+endf
+
+fu! s:compfnlen(...)
+	" By filename length
+	let len1 = strlen(split(a:1, s:lash)[-1])
+	let len2 = strlen(split(a:2, s:lash)[-1])
+	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
+endf
+
+fu! s:matchlens(str, pat, ...)
+	if empty(a:pat) || index(['^', '$'], a:pat) >= 0 | retu {} | en
+	let st   = a:0 ? a:1 : 0
+	let lens = a:0 >= 2 ? a:2 : {}
+	let nr   = a:0 >= 3 ? a:3 : 0
+	if nr > 20 | retu {} | en
+	if match(a:str, a:pat, st) >= 0
+		let [mst, mnd] = [matchstr(a:str, a:pat, st), matchend(a:str, a:pat, st)]
+		let lens = extend(lens, { nr : [strlen(mst), mst] })
+		let lens = s:matchlens(a:str, a:pat, mnd, lens, nr + 1)
+	en
+	retu lens
+endf
+
+fu! s:shortest(lens)
+	retu min(map(values(a:lens), 'v:val[0]'))
+endf
+
+fu! s:mixedsort(...)
+	let ct = s:curtype()
+	if ct == 'buf'
+		let pat = '[\/]\?\[\d\+\*No Name\]$'
+		if a:1 =~# pat && a:2 =~# pat | retu 0
+		elsei a:1 =~# pat | retu 1
+		elsei a:2 =~# pat | retu -1 | en
+	en
+	let [cln, cml] = [ctrlp#complen(a:1, a:2), s:compmatlen(a:1, a:2)]
+	if s:ispath
+		let ms = []
+		if s:res_count < 21
+			let ms += [s:compfnlen(a:1, a:2)]
+			if ct !~ '^\(buf\|mru\)$' | let ms += [s:comptime(a:1, a:2)] | en
+			if !s:itemtype | let ms += [s:comparent(a:1, a:2)] | en
+		en
+		if ct =~ '^\(buf\|mru\)$'
+			let ms += [s:compmref(a:1, a:2)]
+			let cln = cml ? cln : 0
+		en
+		let ms += [cml, 0, 0, 0]
+		let mp = call('s:multipliers', ms[:3])
+		retu cln + ms[0] * mp[0] + ms[1] * mp[1] + ms[2] * mp[2] + ms[3] * mp[3]
+	en
+	retu cln + cml * 2
+endf
+
+fu! s:multipliers(...)
+	let mp0 = !a:1 ? 0 : 2
+	let mp1 = !a:2 ? 0 : 1 + ( !mp0 ? 1 : mp0 )
+	let mp2 = !a:3 ? 0 : 1 + ( !( mp0 + mp1 ) ? 1 : ( mp0 + mp1 ) )
+	let mp3 = !a:4 ? 0 : 1 + ( !( mp0 + mp1 + mp2 ) ? 1 : ( mp0 + mp1 + mp2 ) )
+	retu [mp0, mp1, mp2, mp3]
+endf
+
+fu! s:compval(...)
+	retu a:1 - a:2
+endf
+" Statusline {{{2
+fu! ctrlp#statusline()
+	if !exists('s:statypes')
+		let s:statypes = copy(s:coretypes)
+		if !empty(g:ctrlp_ext_vars)
+			cal map(copy(g:ctrlp_ext_vars),
+				\ 'add(s:statypes, [ v:val["lname"], v:val["sname"] ])')
+		en
+	en
+	let tps = s:statypes
+	let max = len(tps) - 1
+	let nxt = tps[s:walker(max, s:itemtype,  1)][1]
+	let prv = tps[s:walker(max, s:itemtype, -1)][1]
+	let s:ctype = tps[s:itemtype][0]
+	let focus   = s:focus ? 'prt'  : 'win'
+	let byfname = s:ispath ? s:byfname ? 'file' : 'path' : 'line'
+	let marked  = s:opmul != '0' ?
+		\ exists('s:marked') ? ' <'.s:dismrk().'>' : ' <->' : ''
+	if s:status != {}
+		let argms =
+			\ has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict' ? [{
+			\ 'focus':   focus,
+			\ 'byfname': byfname,
+			\ 'regex':   s:regexp,
+			\ 'prev':    prv,
+			\ 'item':    s:ctype,
+			\ 'next':    nxt,
+			\ 'marked':  marked,
+			\ }] : [focus, byfname, s:regexp, prv, s:ctype, nxt, marked]
+		let &l:stl = call(s:status['main'], argms, s:status)
+	el
+		let item    = '%#CtrlPMode1# '.s:ctype.' %*'
+		let focus   = '%#CtrlPMode2# '.focus.' %*'
+		let byfname = '%#CtrlPMode1# '.byfname.' %*'
+		let regex   = s:regexp  ? '%#CtrlPMode2# regex %*' : ''
+		let slider  = ' <'.prv.'>={'.item.'}=<'.nxt.'>'
+		let dir     = ' %=%<%#CtrlPMode2# %{getcwd()} %*'
+		let &l:stl  = focus.byfname.regex.slider.marked.dir
+	en
+endf
+
+fu! s:dismrk()
+	retu has('signs') ? len(s:marked) :
+		\ '%<'.join(values(map(copy(s:marked), 'split(v:val, "[\\/]")[-1]')), ', ')
+endf
+
+fu! ctrlp#progress(enum, ...)
+	if has('macunix') || has('mac') | sl 1m | en
+	let txt = a:0 ? '(press ctrl-c to abort)' : ''
+	if s:status != {}
+		let argms = has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict'
+			\ ? [{ 'str': a:enum }] : [a:enum]
+		let &l:stl = call(s:status['prog'], argms, s:status)
+	el
+		let &l:stl = '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# %{getcwd()} %*'
+	en
+	redraws
+endf
+" *** Paths {{{2
+" Line formatting {{{3
+fu! s:formatline(str)
+	let str = a:str
+	let ct = s:curtype()
+	if ct == 'buf'
+		let bufnr = s:bufnrfilpath(str)[0]
+		let parts = s:bufparts(bufnr)
+		let str = printf('%'.s:bufnr_width.'s', bufnr)
+		if s:has_conceal && has('syntax_items')
+			let str .= printf(' %-13s %s%-36s',
+				\ '<bi>'.parts[0].'</bi>',
+				\ '<bn>'.parts[1], '{'.parts[2].'}</bn>')
+			if (!empty(s:bufpath_mod))
+				let str .= printf('  %s', '<bp>'.parts[3].'</bp>')
+			en
+		el
+			let str .= printf(' %-5s %-30s',
+				\ parts[0],
+				\ parts[2])
+			if (!empty(s:bufpath_mod))
+				let str .= printf('  %s', parts[3])
+			en
+		en
+	en
+	let cond = ct != 'buf' &&s:ispath && ( s:winw - 4 ) < s:strwidth(str)
+	retu s:lineprefix.( cond ? s:pathshorten(str) : str )
+endf
+
+fu! s:pathshorten(str)
+	retu matchstr(a:str, '^.\{9}').'...'
+		\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
+endf
+
+fu! s:offset(lines, height)
+	let s:offset = s:mw_order == 'btt' ? ( a:height - s:res_count ) : 0
+	retu s:offset > 0 ? ( repeat([''], s:offset) + a:lines ) : a:lines
+endf
+" Directory completion {{{3
+fu! s:dircompl(be, sd)
+	if a:sd == '' | retu [] | en
+	if a:be == ''
+		let [be, sd] = [s:dyncwd, a:sd]
+	el
+		let be = a:be.s:lash(a:be)
+		let sd = be.a:sd
+	en
+	let dirs = split(globpath(s:fnesc(be, 'g', ','), a:sd.'*/'), "\n")
+	if a:be == ''
+		let dirs = ctrlp#rmbasedir(dirs)
+	en
+	cal filter(dirs, '!match(v:val, escape(sd, ''~$.\''))'
+		\ . ' && v:val !~ ''\v(^|[\/])\.{1,2}[\/]$''')
+	retu dirs
+endf
+
+fu! s:findcommon(items, seed)
+	let [items, id, cmn, ic] = [copy(a:items), strlen(a:seed), '', 0]
+	cal map(items, 'strpart(v:val, id)')
+	for char in split(items[0], '\zs')
+		for item in items[1:]
+			if item[ic] != char | let brk = 1 | brea | en
+		endfo
+		if exists('brk') | brea | en
+		let cmn .= char
+		let ic += 1
+	endfo
+	retu cmn
+endf
+" Misc {{{3
+fu! s:headntail(str)
+	let parts = split(a:str, '[\/]\ze[^\/]\+[\/:]\?$')
+	retu len(parts) == 1 ? ['', parts[0]] : len(parts) == 2 ? parts : []
+endf
+
+fu! s:lash(...)
+	retu ( a:0 ? a:1 : s:dyncwd ) !~ '[\/]$' ? s:lash : ''
+endf
+
+fu! s:ispathitem()
+	retu s:itemtype < len(s:coretypes) || s:getextvar('type') == 'path'
+endf
+
+fu! ctrlp#igncwd(cwd)
+	retu ctrlp#utils#glob(a:cwd, 0) == '' ||
+		\ ( s:igntype >= 0 && s:usrign(a:cwd, getftype(a:cwd)) )
+endf
+
+fu! ctrlp#dirnfile(entries)
+	let [items, cwd] = [[[], []], s:dyncwd.s:lash()]
+	for each in a:entries
+		let etype = getftype(each)
+		if s:igntype >= 0 && s:usrign(each, etype) | con | en
+		if etype == 'dir'
+			if s:showhidden | if each !~ '[\/]\.\{1,2}$'
+				cal add(items[0], each)
+			en | el
+				cal add(items[0], each)
+			en
+		elsei etype == 'link'
+			if s:folsym
+				let isfile = !isdirectory(each)
+				if s:folsym == 2 || !s:samerootsyml(each, isfile, cwd)
+					cal add(items[isfile], each)
+				en
+			en
+		elsei etype == 'file'
+			cal add(items[1], each)
+		en
+	endfo
+	retu items
+endf
+
+fu! s:usrign(item, type)
+	if s:igntype == 1 | retu a:item =~ s:usrign | en
+	if s:igntype == 2
+		if call(s:usrign, [a:item, a:type])
+			retu 1
+		en
+	elsei s:igntype == 4
+		if has_key(s:usrign, a:type) && s:usrign[a:type] != ''
+					\ && a:item =~ s:usrign[a:type]
+			retu 1
+		elsei has_key(s:usrign, 'func') && s:usrign['func'] != ''
+					\ && call(s:usrign['func'], [a:item, a:type])
+			retu 1
+		en
+	en
+	retu 0
+endf
+
+fu! s:samerootsyml(each, isfile, cwd)
+	let resolve = fnamemodify(resolve(a:each), ':p:h')
+	let resolve .= s:lash(resolve)
+	retu !( stridx(resolve, a:cwd) && ( stridx(a:cwd, resolve) || a:isfile ) )
+endf
+
+fu! ctrlp#rmbasedir(items)
+	if a:items == []
+		retu a:items
+	en
+	let cwd = s:dyncwd.s:lash()
+	let first = a:items[0]
+	if has('win32') || has('win64')
+		let cwd = tr(cwd, '\', '/')
+		let first = tr(first, '\', '/')
+	en
+	if !stridx(first, cwd)
+		let idx = strlen(cwd)
+		retu map(a:items, 'strpart(v:val, idx)')
+	en
+	retu a:items
+endf
+" Working directory {{{3
+fu! s:getparent(item)
+	let parent = substitute(a:item, '[\/][^\/]\+[\/:]\?$', '', '')
+	if parent == '' || parent !~ '[\/]'
+		let parent .= s:lash
+	en
+	retu parent
+endf
+
+fu! s:findroot(curr, mark, depth, type)
+	let [depth, fnd] = [a:depth + 1, 0]
+	if type(a:mark) == 1
+		let fnd = s:glbpath(s:fnesc(a:curr, 'g', ','), a:mark, 1) != ''
+	elsei type(a:mark) == 3
+		for markr in a:mark
+			if s:glbpath(s:fnesc(a:curr, 'g', ','), markr, 1) != ''
+				let fnd = 1
+				brea
+			en
+		endfo
+	en
+	if fnd
+		if !a:type | cal ctrlp#setdir(a:curr) | en
+		retu [exists('markr') ? markr : a:mark, a:curr]
+	elsei depth > s:maxdepth
+		cal ctrlp#setdir(s:cwd)
+	el
+		let parent = s:getparent(a:curr)
+		if parent != a:curr
+			retu s:findroot(parent, a:mark, depth, a:type)
+		en
+	en
+	retu []
+endf
+
+fu! ctrlp#setpathmode(pmode, ...)
+	if a:pmode == 'c' || ( a:pmode == 'a' && stridx(s:crfpath, s:cwd) < 0 )
+		if exists('+acd') | let [s:glb_acd, &acd] = [&acd, 0] | en
+		cal ctrlp#setdir(s:crfpath)
+		retu 1
+	elsei a:pmode == 'r'
+		let spath = a:0 ? a:1 : s:crfpath
+		let markers = ['.git', '.hg', '.svn', '.bzr', '_darcs']
+		if type(s:rmarkers) == 3 && !empty(s:rmarkers)
+			if s:findroot(spath, s:rmarkers, 0, 0) != [] | retu 1 | en
+			cal filter(markers, 'index(s:rmarkers, v:val) < 0')
+			let markers = s:rmarkers + markers
+		en
+		if s:findroot(spath, markers, 0, 0) != [] | retu 1 | en
+	en
+	retu 0
+endf
+
+fu! ctrlp#setdir(path, ...)
+	let cmd = a:0 ? a:1 : 'lc!'
+	sil! exe cmd s:fnesc(a:path, 'c')
+	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
+endf
+" Fallbacks {{{3
+fu! s:glbpath(...)
+	retu call('ctrlp#utils#globpath', a:000)
+endf
+
+fu! s:fnesc(...)
+	retu call('ctrlp#utils#fnesc', a:000)
+endf
+
+fu! ctrlp#setlcdir()
+	if exists('*haslocaldir')
+		cal ctrlp#setdir(getcwd(), haslocaldir() ? 'lc!' : 'cd!')
+	en
+endf
+" Highlighting {{{2
+fu! ctrlp#syntax()
+	if ctrlp#nosy() | retu | en
+	for [ke, va] in items(s:hlgrps) | cal ctrlp#hicheck('CtrlP'.ke, va) | endfo
+	let bgColor=synIDattr(synIDtrans(hlID('Normal')), 'bg')
+	if bgColor !~ '^-1$\|^$'
+		sil! exe 'hi CtrlPLinePre guifg='.bgColor.' ctermfg='.bgColor
+	en
+	sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
+	if hlexists('CtrlPLinePre')
+		exe "sy match CtrlPLinePre '^".escape(get(g:, 'ctrlp_line_prefix', '>'),'^$.*~\')."'"
+	en
+
+	if s:curtype() == 'buf' && s:has_conceal
+		sy region CtrlPBufferNr     matchgroup=CtrlPLinePre start='^>\s\+' end='\s'
+		sy region CtrlPBufferInd    concealends matchgroup=Ignore start='<bi>' end='</bi>'
+		sy region CtrlPBufferRegion concealends matchgroup=Ignore start='<bn>' end='</bn>'
+			\ contains=CtrlPBufferHid,CtrlPBufferHidMod,CtrlPBufferVis,CtrlPBufferVisMod,CtrlPBufferCur,CtrlPBufferCurMod
+		sy region CtrlPBufferHid    concealends matchgroup=Ignore     start='\s*{' end='}' contained
+		sy region CtrlPBufferHidMod concealends matchgroup=Ignore    start='+\s*{' end='}' contained
+		sy region CtrlPBufferVis    concealends matchgroup=Ignore   start='\*\s*{' end='}' contained
+		sy region CtrlPBufferVisMod concealends matchgroup=Ignore  start='\*+\s*{' end='}' contained
+		sy region CtrlPBufferCur    concealends matchgroup=Ignore  start='\*!\s*{' end='}' contained
+		sy region CtrlPBufferCurMod concealends matchgroup=Ignore start='\*+!\s*{' end='}' contained
+		sy region CtrlPBufferPath   concealends matchgroup=Ignore start='<bp>' end='</bp>'
+	en
+endf
+
+fu! s:highlight(pat, grp)
+	if s:matcher != {} | retu | en
+	cal clearmatches()
+	if !empty(a:pat) && s:ispath
+		if s:regexp
+			let pat = substitute(a:pat, '\\\@<!\^', '^> \\zs', 'g')
+			cal matchadd(a:grp, ( s:martcs == '' ? '\c' : '\C' ).pat)
+		el
+			let pat = a:pat
+
+			" get original characters so we can rebuild pat
+			let chars = split(pat, '\[\^\\\?.\]\\{-}')
+
+			" Build a pattern like /a.*b.*c/ from abc (but with .\{-} non-greedy
+			" matchers instead)
+			let pat = join(chars, '.\{-}')
+			" Ensure we match the last version of our pattern
+			let ending = '\(.*'.pat.'\)\@!'
+			" Case sensitive?
+			let beginning = ( s:martcs == '' ? '\c' : '\C' ).'^.*'
+			if s:byfname()
+				" Make sure there are no slashes in our match
+				let beginning = beginning.'\([^\/]*$\)\@='
+			en
+
+			for i in range(len(chars))
+				" Surround our current target letter with \zs and \ze so it only
+				" actually matches that one letter, but has all preceding and trailing
+				" letters as well.
+				" \zsa.*b.*c
+				" a\(\zsb\|.*\zsb)\ze.*c
+				let charcopy = copy(chars)
+				if i == 0
+					let charcopy[i] = '\zs'.charcopy[i].'\ze'
+					let middle = join(charcopy, '.\{-}')
+				el
+					let before = join(charcopy[0:i-1], '.\{-}')
+					let after = join(charcopy[i+1:-1], '.\{-}')
+					let c = charcopy[i]
+					" for abc, match either ab.\{-}c or a.*b.\{-}c in that order
+					let cpat = '\(\zs'.c.'\|'.'.*\zs'.c.'\)\ze.*'
+					let middle = before.cpat.after
+				en
+
+				" Now we matchadd for each letter, the basic form being:
+				" ^.*\zsx\ze.*$, but with our pattern we built above for the letter,
+				" and a negative lookahead ensuring that we only highlight the last
+				" occurrence of our letters. We also ensure that our matcher is case
+				" insensitive or sensitive depending.
+				cal matchadd(a:grp, beginning.middle.ending)
+			endfo
+		en
+
+		cal matchadd('CtrlPLinePre', '^>')
+	elseif !empty(a:pat) && s:regexp &&
+				\ exists('g:ctrlp_regex_always_higlight') &&
+				\ g:ctrlp_regex_always_higlight
+		let pat = substitute(a:pat, '\\\@<!\^', '^> \\zs', 'g')
+		cal matchadd(a:grp, ( s:martcs == '' ? '\c' : '\C').pat)
+	en
+endf
+
+fu! s:dohighlight()
+	retu s:mathi[0] && exists('*clearmatches') && !ctrlp#nosy()
+endf
+" Prompt history {{{2
+fu! s:gethistloc()
+	let utilcadir = ctrlp#utils#cachedir()
+	let cache_dir = utilcadir.s:lash(utilcadir).'hist'
+	retu [cache_dir, cache_dir.s:lash(cache_dir).'cache.txt']
+endf
+
+fu! s:gethistdata()
+	retu ctrlp#utils#readfile(s:gethistloc()[1])
+endf
+
+fu! ctrlp#recordhist()
+	let str = join(s:prompt, '')
+	if empty(str) || !s:maxhst | retu | en
+	let hst = s:hstry
+	if len(hst) > 1 && hst[1] == str | retu | en
+	cal extend(hst, [str], 1)
+	if len(hst) > s:maxhst | cal remove(hst, s:maxhst, -1) | en
+	cal ctrlp#utils#writecache(hst, s:gethistloc()[0], s:gethistloc()[1])
+endf
+" Signs {{{2
+fu! s:unmarksigns()
+	if !s:dosigns() | retu | en
+	for key in keys(s:marked)
+		exe 'sign unplace' key 'buffer='.s:bufnr
+	endfo
+endf
+
+fu! s:remarksigns()
+	if !s:dosigns() | retu | en
+	for ic in range(1, len(s:lines))
+		let line = s:ispath ? fnamemodify(s:lines[ic - 1], ':p') : s:lines[ic - 1]
+		let key = s:dictindex(s:marked, line)
+		if key > 0
+			exe 'sign place' key 'line='.ic.' name=ctrlpmark buffer='.s:bufnr
+		en
+	endfo
+endf
+
+fu! s:dosigns()
+	retu exists('s:marked') && s:bufnr > 0 && s:opmul != '0' && has('signs')
+endf
+" Lists & Dictionaries {{{2
+fu! s:ifilter(list, str)
+	let [rlist, estr] = [[], substitute(a:str, 'v:val', 'each', 'g')]
+	for each in a:list
+		try
+			if eval(estr)
+				cal add(rlist, each)
+			en
+		cat | con | endt
+	endfo
+	retu rlist
+endf
+
+fu! s:dictindex(dict, expr)
+	for key in keys(a:dict)
+		if a:dict[key] ==# a:expr | retu key | en
+	endfo
+	retu -1
+endf
+
+fu! s:vacantdict(dict)
+	retu filter(range(1, max(keys(a:dict))), '!has_key(a:dict, v:val)')
+endf
+
+fu! s:sublist(l, s, e)
+	retu v:version > 701 ? a:l[(a:s):(a:e)] : s:sublist7071(a:l, a:s, a:e)
+endf
+
+fu! s:sublist7071(l, s, e)
+	let [newlist, id, ae] = [[], a:s, a:e == -1 ? len(a:l) - 1 : a:e]
+	wh id <= ae
+		cal add(newlist, get(a:l, id))
+		let id += 1
+	endw
+	retu newlist
+endf
+" Buffers {{{2
+fu! s:buftab(bufnr, md)
+	for tabnr in range(1, tabpagenr('$'))
+		if tabpagenr() == tabnr && a:md == 't' | con | en
+		let buflist = tabpagebuflist(tabnr)
+		if index(buflist, a:bufnr) >= 0
+			for winnr in range(1, tabpagewinnr(tabnr, '$'))
+				if buflist[winnr - 1] == a:bufnr | retu [tabnr, winnr] | en
+			endfo
+		en
+	endfo
+	retu [0, 0]
+endf
+
+fu! s:bufwins(bufnr)
+	let winns = 0
+	for tabnr in range(1, tabpagenr('$'))
+		let winns += count(tabpagebuflist(tabnr), a:bufnr)
+	endfo
+	retu winns
+endf
+
+fu! s:isabs(path)
+	if (has('win32') || has('win64'))
+		return a:path =~ '^\([a-zA-Z]:\)\{-}[/\\]'
+	el
+		return a:path =~ '^[/\\]'
+	en
+endf
+
+fu! s:bufnrfilpath(line)
+  if s:isabs(a:line) || a:line =~ '^\~[/\\]' || a:line =~ '^\w\+:\/\/'
+		let filpath = a:line
+	el
+		let filpath = s:dyncwd.s:lash().a:line
+	en
+	let filpath = fnamemodify(filpath, ':p')
+	let bufnr = bufnr('^'.fnameescape(filpath).'$')
+	if (!filereadable(filpath) && bufnr < 1)
+		if (a:line =~ '[\/]\?\[\d\+\*No Name\]$')
+			let bufnr = str2nr(matchstr(a:line, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
+			let filpath = bufnr
+		els
+			let bufnr = bufnr(a:line)
+			retu [bufnr, a:line]
+		en
+	en
+	retu [bufnr, filpath]
+endf
+
+fu! ctrlp#normcmd(cmd, ...)
+	let buftypes = [ 'quickfix', 'help', 'nofile' ]
+	if a:0 < 2 && s:nosplit() | retu a:cmd | en
+	let norwins = filter(range(1, winnr('$')),
+		\ 'index(buftypes, getbufvar(winbufnr(v:val), "&bt")) == -1 || s:isterminal(winbufnr(v:val))')
+	for each in norwins
+		let bufnr = winbufnr(each)
+		if empty(bufname(bufnr)) && empty(getbufvar(bufnr, '&ft'))
+			let fstemp = each | brea
+		en
+	endfo
+	let norwin = empty(norwins) ? 0 : norwins[0]
+	if norwin
+		if index(norwins, winnr()) < 0
+			exe ( exists('fstemp') ? fstemp : norwin ).'winc w'
+		en
+		retu a:cmd
+	en
+	retu a:0 ? a:1 : 'bo vne'
+endf
+
+fu! ctrlp#modfilecond(w)
+	retu &mod && !&hid && &bh != 'hide' && s:bufwins(bufnr('%')) == 1 && !&cf &&
+		\ ( ( !&awa && a:w ) || filewritable(fnamemodify(bufname('%'), ':p')) != 1 )
+endf
+
+fu! s:nosplit()
+	retu !empty(s:nosplit) && match([bufname('%'), &l:ft, &l:bt], s:nosplit) >= 0
+endf
+
+fu! s:setupblank()
+	setl noswf nonu nobl nowrap nolist nospell nocuc wfh
+	setl fdc=0 fdl=99 tw=0 bt=nofile bh=unload
+	if v:version > 702
+		setl nornu noudf cc=0
+	en
+	if s:has_conceal
+		setl cole=2 cocu=nc
+	en
+endf
+
+fu! s:leavepre()
+	if exists('s:bufnr') && s:bufnr == bufnr('%') | bw! | en
+	if !( exists(s:ccex) && !{s:ccex} )
+		\ && !( has('clientserver') && len(split(serverlist(), "\n")) > 1 )
+		cal ctrlp#clra()
+	en
+endf
+
+fu! s:checkbuf()
+	if !exists('s:init') && exists('s:bufnr') && s:bufnr > 0
+		exe s:bufnr.'bw!'
+	en
+endf
+
+fu! s:iscmdwin()
+	let [ermsg, v:errmsg] = [v:errmsg, '']
+	sil! noa winc p
+	sil! noa winc p
+	let [v:errmsg, ermsg] = [ermsg, v:errmsg]
+	retu ermsg =~ '^E11:'
+endf
+" Arguments {{{2
+fu! s:at(str)
+	if a:str =~ '\v^\@(cd|lc[hd]?|chd).*'
+		let str = substitute(a:str, '\v^\@(cd|lc[hd]?|chd)\s*', '', '')
+		if str == '' | retu 1 | en
+		let str = str =~ '^%:.\+' ? fnamemodify(s:crfile, str[1:]) : str
+		let path = fnamemodify(expand(str, 1), ':p')
+		if isdirectory(path)
+			if path != s:dyncwd
+				cal ctrlp#setdir(path)
+				cal ctrlp#setlines()
+			en
+			cal ctrlp#recordhist()
+			cal s:PrtClear()
+		en
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:tail()
+	if exists('s:optail') && !empty('s:optail')
+		let tailpref = s:optail !~ '^\s*+' ? ' +' : ' '
+		retu tailpref.s:optail
+	en
+	retu ''
+endf
+
+fu! s:sanstail(str)
+	let str = s:spi ?
+		\ substitute(a:str, '^\(@.*$\|\\\\\ze@\|\.\.\zs[.\/]\+$\)', '', 'g') : a:str
+	let [str, pat] = [substitute(str, '\\\\', '\', 'g'), '\([^:]\|\\:\)*$']
+	unl! s:optail
+	if str =~ '\\\@<!:'.pat
+		let s:optail = matchstr(str, '\\\@<!:\zs'.pat)
+		let str = substitute(str, '\\\@<!:'.pat, '', '')
+	en
+	retu substitute(str, '\\\ze:', '', 'g')
+endf
+
+fu! s:argmaps(md, i)
+	let roh = [
+		\ ['Open Multiple Files', '/h[i]dden/[c]lear', ['i', 'c']],
+		\ ['Create a New File', '/[r]eplace', ['r']],
+		\ ['Open Selected', '/[r]eplace', ['r', 'd', 'a']],
+		\ ]
+	if a:i == 2
+		if !buflisted(bufnr('^'.fnamemodify(ctrlp#getcline(), ':p').'$'))
+			let roh[2][1] .= '/h[i]dden'
+			let roh[2][2] += ['i']
+		en
+		if s:openfunc != {} && has_key(s:openfunc, s:ctype)
+			let roh[2][1] .= '/e[x]ternal'
+			let roh[2][2] += ['x']
+		en
+	en
+	let str = roh[a:i][0].': [t]ab/[v]ertical/[h]orizontal'.roh[a:i][1].'? '
+	retu s:choices(str, ['t', 'v', 'h'] + roh[a:i][2], 's:argmaps', [a:md, a:i])
+endf
+
+fu! s:insertstr()
+	let str = 'Insert: c[w]ord/c[f]ile/[s]earch/[v]isual/[c]lipboard/[r]egister? '
+	retu s:choices(str, ['w', 'f', 's', 'v', 'c', 'r'], 's:insertstr', [])
+endf
+
+fu! s:textdialog(str)
+	redr | echoh MoreMsg | echon a:str | echoh None
+	retu nr2char(getchar())
+endf
+
+fu! s:choices(str, choices, func, args)
+	let char = s:textdialog(a:str)
+	if index(a:choices, char) >= 0
+		retu char
+	elsei char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
+		cal s:BuildPrompt(0)
+		retu 'cancel'
+	elsei char =~# "\<CR>" && a:args != []
+		retu a:args[0]
+	en
+	retu call(a:func, a:args)
+endf
+
+fu! s:getregs()
+	let char = s:textdialog('Insert from register: ')
+	if char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
+		cal s:BuildPrompt(0)
+		retu -1
+	elsei char =~# "\<CR>"
+		retu s:getregs()
+	en
+	retu s:regisfilter(char)
+endf
+
+fu! s:regisfilter(reg)
+	retu substitute(getreg(a:reg), "[\t\n]", ' ', 'g')
+endf
+" Misc {{{2
+fu! s:modevar()
+	let s:matchtype = s:mtype()
+	let s:ispath = s:ispathitem()
+	let s:mfunc = s:mfunc()
+	let s:nolim = s:getextvar('nolim')
+	let s:dosort = s:getextvar('sort')
+	let s:spi = !s:itemtype || s:getextvar('specinput') > 0
+endf
+
+fu! s:nosort()
+	let ct = s:curtype()
+	retu s:matcher != {} || s:nolim == 1 || ( ct == 'mru' && s:mrudef )
+		\ || ( ct =~ '^\(buf\|mru\)$' && s:prompt == ['', '', ''] ) || !s:dosort
+endf
+
+fu! s:byfname()
+	retu s:curtype() != 'buf' && s:ispath && s:byfname
+endf
+
+fu! s:narrowable()
+	retu exists('s:act_add') && exists('s:matched') && s:matched != []
+		\ && exists('s:mdata') && s:mdata[:2] == [s:dyncwd, s:itemtype, s:regexp]
+		\ && s:matcher == {} && !exists('s:did_exp')
+endf
+
+fu! s:getinput(...)
+	let [prt, spi] = [s:prompt, ( a:0 ? a:1 : '' )]
+	if s:abbrev != {}
+		let gmd = has_key(s:abbrev, 'gmode') ? s:abbrev['gmode'] : ''
+		let str = ( gmd =~ 't' && !a:0 ) || spi == 'c' ? prt[0] : join(prt, '')
+		if gmd =~ 't' && gmd =~ 'k' && !a:0 && matchstr(str, '.$') =~ '\k'
+			retu join(prt, '')
+		en
+		let [pf, rz] = [( s:byfname() ? 'f' : 'p' ), ( s:regexp ? 'r' : 'z' )]
+		for dict in s:abbrev['abbrevs']
+			let dmd = has_key(dict, 'mode') ? dict['mode'] : ''
+			let pat = escape(dict['pattern'], '~')
+			if ( dmd == '' || ( dmd =~ pf && dmd =~ rz && !a:0 )
+				\ || dmd =~ '['.spi.']' ) && str =~ pat
+				let [str, s:did_exp] = [join(split(str, pat, 1), dict['expanded']), 1]
+			en
+		endfo
+		if gmd =~ 't' && !a:0
+			let prt[0] = str
+		el
+			retu str
+		en
+	en
+	retu spi == 'c' ? prt[0] : join(prt, '')
+endf
+
+fu! s:strwidth(str)
+	retu exists('*strdisplaywidth') ? strdisplaywidth(a:str) : strlen(a:str)
+endf
+
+fu! ctrlp#j2l(nr)
+	exe 'norm!' a:nr.'G'
+	sil! norm! zvzz
+endf
+
+fu! s:maxf(len)
+	retu s:maxfiles && a:len > s:maxfiles
+endf
+
+fu! s:regexfilter(str)
+	let str = a:str
+	for key in keys(s:fpats) | if str =~ key
+		let str = substitute(str, s:fpats[key], '', 'g')
+	en | endfo
+	retu str
+endf
+
+fu! s:walker(m, p, d)
+	retu a:d >= 0 ? a:p < a:m ? a:p + a:d : 0 : a:p > 0 ? a:p + a:d : a:m
+endf
+
+fu! s:delent(rfunc)
+	if a:rfunc == '' | retu | en
+	let [s:force, tbrem] = [1, []]
+	if exists('s:marked')
+		let tbrem = values(s:marked)
+		cal s:unmarksigns()
+		unl s:marked
+	en
+	if tbrem == [] && ( has('dialog_gui') || has('dialog_con') ) &&
+		\ confirm("Wipe all entries?", "&OK\n&Cancel") != 1
+		unl s:force
+		cal s:BuildPrompt(0)
+		retu
+	en
+	let g:ctrlp_lines = call(a:rfunc, [tbrem])
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+
+fu! s:delbufcond(bufnr)
+	retu getbufvar(a:bufnr, "&mod") || a:bufnr == s:crbufnr
+endf
+
+fu! s:delbuf()
+	let lines = []
+	if exists('s:marked')
+		let lines = values(s:marked)
+		cal s:unmarksigns()
+		unl s:marked
+	el
+		let lines += [ctrlp#getcline()]
+	en
+	for line in lines
+		let bufnr = s:bufnrfilpath(line)[0]
+		if (s:delbufcond(bufnr))
+			con
+		en
+		exe 'bd '. bufnr
+	endfo
+	cal s:PrtClearCache()
+endf
+
+fu! s:isterminal(buf)
+	retu getbufvar(a:buf, "&bt") == "terminal"
+endf
+" Entering & Exiting {{{2
+fu! s:getenv()
+	let [s:cwd, s:winres] = [getcwd(), [winrestcmd(), &lines, winnr('$')]]
+	let [s:crword, s:crnbword] = [expand('<cword>', 1), expand('<cWORD>', 1)]
+	let [s:crgfile, s:crline] = [expand('<cfile>', 1), getline('.')]
+	let [s:winmaxh, s:crcursor] = [min([s:mw_max, &lines]), getpos('.')]
+	let [s:crbufnr, s:crvisual] = [bufnr('%'), s:lastvisual()]
+	let s:crfile = bufname('%') == ''
+		\ ? '['.s:crbufnr.'*No Name]' : expand('%:p', 1)
+	let s:crfpath = expand('%:p:h', 1)
+	let s:mrbs = ctrlp#mrufiles#bufs()
+endf
+
+fu! s:lastvisual()
+	let cview = winsaveview()
+	let [ovreg, ovtype] = [getreg('v'), getregtype('v')]
+	let [oureg, outype] = [getreg('"'), getregtype('"')]
+	sil! norm! gV"vy
+	let selected = s:regisfilter('v')
+	cal setreg('v', ovreg, ovtype)
+	cal setreg('"', oureg, outype)
+	cal winrestview(cview)
+	retu selected
+endf
+
+fu! s:log(m)
+	if exists('g:ctrlp_log') && g:ctrlp_log | if a:m
+		let cadir = ctrlp#utils#cachedir()
+		let apd = g:ctrlp_log > 1 ? '>' : ''
+		sil! exe 'redi! >'.apd cadir.s:lash(cadir).'ctrlp.log'
+	el
+		sil! redi END
+	en | en
+endf
+
+fu! s:buffunc(e)
+	if a:e && has_key(s:buffunc, 'enter')
+		cal call(s:buffunc['enter'], [], s:buffunc)
+	elsei !a:e && has_key(s:buffunc, 'exit')
+		cal call(s:buffunc['exit'], [], s:buffunc)
+	en
+endf
+
+fu! s:openfile(cmd, fid, tail, chkmod, ...)
+	let cmd = a:cmd
+	if a:chkmod && cmd =~ '^[eb]$' && ctrlp#modfilecond(!( cmd == 'b' && &aw ))
+		let cmd = cmd == 'b' ? 'sb' : 'sp'
+	en
+	let cmd = cmd =~ '^tab' ? ctrlp#tabcount().cmd : cmd
+	let j2l = a:0 && a:1[0] ? a:1[1] : 0
+	exe cmd.( a:0 && a:1[0] ? '' : a:tail ) s:fnesc(a:fid, 'f')
+	if j2l
+		cal ctrlp#j2l(j2l)
+	en
+	if !empty(a:tail)
+		sil! norm! zvzz
+	en
+	if cmd != 'bad'
+		cal ctrlp#setlcdir()
+	en
+endf
+
+fu! ctrlp#tabcount()
+	if exists('s:tabct')
+		let tabct = s:tabct
+		let s:tabct += 1
+	elsei !type(s:tabpage)
+		let tabct = s:tabpage
+	elsei type(s:tabpage) == 1
+		let tabpos =
+			\ s:tabpage =~ 'c' ? tabpagenr() :
+			\ s:tabpage =~ 'f' ? 1 :
+			\ s:tabpage =~ 'l' ? tabpagenr('$') :
+			\ tabpagenr()
+		let tabct =
+			\ s:tabpage =~ 'a' ? tabpos :
+			\ s:tabpage =~ 'b' ? tabpos - 1 :
+			\ tabpos
+	en
+	retu tabct < 0 ? 0 : tabct
+endf
+
+fu! s:settype(type)
+	retu a:type < 0 ? exists('s:itemtype') ? s:itemtype : 0 : a:type
+endf
+" Matching {{{2
+fu! s:matchfname(item, pat)
+	let parts = split(a:item, '[\/]\ze[^\/]\+$')
+	let mfn = match(parts[-1], a:pat[0])
+	retu len(a:pat) == 1 ? mfn : len(a:pat) == 2 ?
+		\ ( mfn >= 0 && ( len(parts) == 2 ? match(parts[0], a:pat[1]) : -1 ) >= 0
+		\ ? 0 : -1 ) : -1
+endf
+
+fu! s:matchbuf(item, pat)
+	let bufnr = s:bufnrfilpath(a:item)[0]
+	let parts = s:bufparts(bufnr)
+	let item = s:byfname ? parts[2] : bufnr.parts[0].parts[2].s:lash().parts[3]
+	retu match(item, a:pat)
+endf
+
+fu! s:matchtabs(item, pat)
+	retu match(split(a:item, '\t\+')[0], a:pat)
+endf
+
+fu! s:matchtabe(item, pat)
+	retu match(split(a:item, '\t\+[^\t]\+$')[0], a:pat)
+endf
+
+fu! s:buildpat(lst)
+	let pat = a:lst[0]
+	if s:matchnatural == 1
+		for item in range(1, len(a:lst) - 1)
+			let c = a:lst[item - 1]
+			let pat .= (c == '/' ? '[^/]\{-}' : '[^'.c.'/]\{-}').a:lst[item]
+		endfo
+	els
+		for item in range(1, len(a:lst) - 1)
+			let pat .= '[^'.a:lst[item - 1].']\{-}'.a:lst[item]
+		endfo
+	en
+	retu pat
+endf
+
+fu! s:curtype()
+	return s:CurTypeName()[1]
+endf
+
+fu! s:mfunc()
+	let mfunc = 'match'
+	if s:byfname()
+		let mfunc = 's:matchfname'
+	elsei s:curtype() == 'buf'
+		let mfunc = 's:matchbuf'
+	elsei s:itemtype >= len(s:coretypes)
+		let matchtypes = { 'tabs': 's:matchtabs', 'tabe': 's:matchtabe' }
+		if has_key(matchtypes, s:matchtype)
+			let mfunc = matchtypes[s:matchtype]
+		en
+	en
+	retu mfunc
+endf
+
+fu! s:mmode()
+	let matchmodes = {
+		\ 'match': 'full-line',
+		\ 's:matchfname': 'filename-only',
+		\ 's:matchbuf': 'full-line',
+		\ 's:matchtabs': 'first-non-tab',
+		\ 's:matchtabe': 'until-last-tab',
+		\ }
+	retu matchmodes[s:mfunc]
+endf
+" Cache {{{2
+fu! s:writecache(cafile)
+	if ( g:ctrlp_newcache || !filereadable(a:cafile) ) && !s:nocache()
+		cal ctrlp#utils#writecache(g:ctrlp_allfiles)
+		let g:ctrlp_newcache = 0
+	en
+endf
+
+fu! s:nocache(...)
+	if !s:caching
+		retu 1
+	elsei s:caching > 1
+		if !( exists(s:ccex) && !{s:ccex} ) || has_key(s:ficounts, s:dyncwd)
+			retu get(s:ficounts, s:dyncwd, [0, 0])[0] < s:caching
+		elsei a:0 && filereadable(a:1)
+			retu len(ctrlp#utils#readfile(a:1)) < s:caching
+		en
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:insertcache(str)
+	let [data, g:ctrlp_newcache, str] = [g:ctrlp_allfiles, 1, a:str]
+	if data == [] || strlen(str) <= strlen(data[0])
+		let pos = 0
+	elsei strlen(str) >= strlen(data[-1])
+		let pos = len(data) - 1
+	el
+		let pos = 0
+		for each in data
+			if strlen(each) > strlen(str) | brea | en
+			let pos += 1
+		endfo
+	en
+	cal insert(data, str, pos)
+	cal s:writecache(ctrlp#utils#cachefile())
+endf
+" Extensions {{{2
+fu! s:mtype()
+	retu s:itemtype >= len(s:coretypes) ? s:getextvar('type') : 'path'
+endf
+
+fu! s:execextvar(key)
+	if !empty(g:ctrlp_ext_vars)
+		cal map(filter(copy(g:ctrlp_ext_vars),
+			\ 'has_key(v:val, a:key)'), 'eval(v:val[a:key])')
+	en
+endf
+
+fu! s:getextvar(key)
+	if s:itemtype >= len(s:coretypes) && len(g:ctrlp_ext_vars) > 0
+		let vars = g:ctrlp_ext_vars[s:itemtype - len(s:coretypes)]
+		if has_key(vars, a:key)
+			retu vars[a:key]
+		en
+	en
+	retu get(g:, 'ctrlp_' . s:matchtype . '_' . a:key, -1)
+endf
+
+fu! ctrlp#getcline()
+	let [linenr, offset] = [line('.'), ( s:offset > 0 ? s:offset : 0 )]
+	retu !empty(s:lines) && !( offset && linenr <= offset )
+		\ ? s:lines[linenr - 1 - offset] : ''
+endf
+
+fu! ctrlp#getmarkedlist()
+	retu exists('s:marked') ? values(s:marked) : []
+endf
+
+fu! ctrlp#clearmarkedlist()
+	let s:marked = {}
+endf
+
+fu! ctrlp#exit()
+	cal s:PrtExit()
+endf
+
+fu! ctrlp#prtclear()
+	cal s:PrtClear()
+endf
+
+fu! ctrlp#switchtype(id)
+	cal s:ToggleType(a:id - s:itemtype)
+endf
+
+fu! ctrlp#nosy()
+	retu !( has('syntax') && exists('g:syntax_on') )
+endf
+
+fu! ctrlp#hicheck(grp, defgrp)
+	if !hlexists(a:grp)
+		exe 'hi link' a:grp a:defgrp
+	en
+endf
+
+fu! ctrlp#call(func, ...)
+	retu call(a:func, a:000)
+endf
+
+fu! ctrlp#getvar(var)
+	retu {a:var}
+endf
+"}}}1
+" * Initialization {{{1
+fu! s:setlines_pre(...)
+	if a:0 | let s:itemtype = a:1 | en
+	cal s:modevar()
+	let g:ctrlp_lines = []
+endf
+
+fu! s:setlines_post()
+	let inits = {'fil': 'ctrlp#files()', 'buf': 'ctrlp#buffers()', 'mru': 'ctrlp#mrufiles#list()'}
+	let types = map(copy(g:ctrlp_types), 'inits[v:val]')
+	if !empty(g:ctrlp_ext_vars)
+		cal map(copy(g:ctrlp_ext_vars), 'add(types, v:val["init"])')
+	en
+	let g:ctrlp_lines = eval(types[s:itemtype])
+endf
+
+fu! ctrlp#setlines(...)
+	cal call('s:setlines_pre', a:000)
+	cal s:setlines_post()
+endf
+
+" Returns [lname, sname]
+fu! s:CurTypeName()
+	if s:itemtype < len(s:coretypes)
+		return filter(copy(s:coretypes), 'v:val[1]==g:ctrlp_types[s:itemtype]')[0]
+	el
+		return [s:getextvar("lname"), s:getextvar('sname')]
+	en
+endfu
+
+fu! s:ExitIfSingleCandidate()
+	if len(s:Update(s:prompt[0])) == 1
+		call s:AcceptSelection('e')
+		call ctrlp#exit()
+		return 1
+	en
+	return 0
+endfu
+
+fu! s:IsBuiltin()
+	let builtins = ['tag', 'dir', 'bft', 'rts', 'bkd', 'lns', 'chs', 'mix', 'udo', 'qfx']
+	let curtype = s:getextvar('sname')
+	return s:itemtype < len(s:coretypes) || index(builtins, curtype) > -1
+endfu
+
+fu! s:DetectFileType(type, ft)
+	if s:IsBuiltin() || empty(a:ft) || a:ft ==# 'ctrlp'
+		retu 'ctrlp'
+	el
+		retu 'ctrlp.' . a:ft
+	en
+endfu
+
+fu! ctrlp#init(type, ...)
+	if exists('s:init') || s:iscmdwin() | retu | en
+	let [s:ermsg, v:errmsg] = [v:errmsg, '']
+	let [s:matches, s:init] = [1, 1]
+	cal s:Reset(a:0 ? a:1 : {})
+	noa cal s:Open()
+	cal s:SetWD(a:0 ? a:1 : {})
+	cal s:MapNorms()
+	cal s:MapSpecs()
+	if empty(g:ctrlp_types) && empty(g:ctrlp_ext_vars)
+		call ctrlp#exit()
+		retu
+	en
+	if type(a:type) == 0
+		let type = a:type
+	el
+		let type = index(g:ctrlp_types, a:type)
+		if type == -1
+			call ctrlp#exit()
+			retu
+		en
+	en
+	" Fixed issue ctrlpvim/ctrlp.vim#463 : Opening 'ctrlp' in certain modes
+	" (':CtrlPBufTag', ':CtrlPLine') seems to trigger a partially deffective
+	" intialisation (for example, syntax highlighting not working as expected).
+	" Fix: ctrlp#setlines() split in two, as the second part (now in
+	" s:setlines_post()) seems to need '&filetype', and s:DetectFileType() seems
+	" to need the first part of the old ctrlp#setlines() (now in
+	" s:setlines_pre()).
+	cal s:setlines_pre(s:settype(type))
+	let &filetype = s:DetectFileType(type, &filetype)
+	cal s:setlines_post()
+	cal ctrlp#syntax()
+	cal s:SetDefTxt()
+	let curName = s:CurTypeName()
+	let shouldExitSingle = index(s:opensingle, curName[0])>=0 || index(s:opensingle, curName[1])>=0
+	if shouldExitSingle && s:ExitIfSingleCandidate()
+		return 0
+	en
+	cal s:BuildPrompt(1)
+	if s:keyloop | cal s:KeyLoop() | en
+	return 1
+endf
+" - Autocmds {{{1
+if has('autocmd')
+	aug CtrlPAug
+		au!
+		au BufEnter ControlP cal s:checkbuf()
+		au BufLeave ControlP noa cal s:Close()
+		au VimLeavePre * cal s:leavepre()
+	aug END
+en
+
+fu! s:autocmds()
+	if !has('autocmd') | retu | en
+	if exists('#CtrlPLazy')
+		au! CtrlPLazy
+	en
+	if s:lazy
+		aug CtrlPLazy
+			au!
+			au CursorHold ControlP cal s:ForceUpdate()
+		aug END
+	en
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/pack/navigation/start/ctrlp/autoload/ctrlp/autoignore.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/autoignore.vim
new file mode 100644
index 0000000..ec2329e
--- /dev/null
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp/autoignore.vim
@@ -0,0 +1,173 @@
+" =============================================================================
+" File:          autoload/ctrlp/autoignore.vim
+" Description:   Auto-ignore Extension
+" Author:        Ludovic Chabant <github.com/ludovicchabant>
+" =============================================================================
+
+
+" Global Settings {{{
+
+if exists('g:ctrlp_autoignore_loaded') && g:ctrlp_autoignore_loaded
+		\ && !g:ctrlp_autoignore_debug
+	finish
+endif
+let g:ctrlp_autoignore_loaded = 1
+
+if !exists('g:ctrlp_autoignore_debug')
+	let g:ctrlp_autoignore_debug = 0
+endif
+
+if !exists('g:ctrlp_autoignore_trace')
+	let g:ctrlp_autoignore_trace = 0
+endif
+
+" }}}
+
+" Initialization {{{
+
+if !exists('g:ctrlp_custom_ignore')
+	let g:ctrlp_custom_ignore = {}
+endif
+let g:ctrlp_custom_ignore['func'] = 'ctrlp#autoignore#ignore'
+let g:ctrlp_custom_ignore['func-init'] = 'ctrlp#autoignore#ignore_init'
+let g:ctrlp_custom_ignore['func-close'] = 'ctrlp#autoignore#ignore_close'
+
+if !exists('g:ctrlp_root_markers')
+	let g:ctrlp_root_markers = []
+endif
+call add(g:ctrlp_root_markers, '.ctrlpignore')
+
+" }}}
+
+" Internals {{{
+
+function! s:trace(message) abort
+    if g:ctrlp_autoignore_trace
+        echom "ctrlp_autoignore: " . a:message
+    endif
+endfunction
+
+let s:proj_cache = {}
+let s:active_cwd = ''
+let s:active_cwd_len = 0
+let s:active_patterns = []
+let s:changed_wildignore = 0
+let s:prev_wildignore = ''
+
+function! s:load_project_patterns(root_dir) abort
+	let l:ign_path = a:root_dir . '/.ctrlpignore'
+	if !filereadable(l:ign_path)
+		call s:trace("No pattern file at: " . l:ign_path)
+		return []
+	endif
+	let l:cursyntax = 'regexp'
+	let l:knownsyntaxes = ['regexp', 'wildignore']
+	let l:patterns = []
+	let l:lines = readfile(l:ign_path)
+	for line in l:lines
+		" Comment line?
+		if match(line, '\v^\s*$') >= 0 || match(line, '\v^\s*#') >= 0
+			continue
+		endif
+		" Syntax change?
+		let l:matches = matchlist(line, '\v^syntax:\s?(\w+)\s*$')
+		if len(l:matches) > 0
+			let l:cursyntax = l:matches[1]
+			if index(l:knownsyntaxes, l:cursyntax) < 0
+				echoerr "ctrlp_autoignore: Unknown syntax '".l:cursyntax."' in: ".l:ign_path
+			endif
+			continue
+		endif
+		" Patterns!
+		let l:matches = matchlist(line, '\v^((dir|file|link)\:)?(.*)')
+		let l:mtype = l:matches[2]
+		let l:mpat = l:matches[3]
+		call add(l:patterns, {'syn': l:cursyntax, 'type': l:mtype, 'pat': l:mpat})
+	endfor
+	call s:trace("Loaded " . len(l:patterns) . " patterns from: " . l:ign_path)
+	return l:patterns
+endfunction
+
+function! s:get_project_patterns(root_dir) abort
+	let l:ign_path = a:root_dir . '/.ctrlpignore'
+	let l:ign_mtime = getftime(l:ign_path)
+	let l:patterns = get(s:proj_cache, a:root_dir)
+	if type(l:patterns) == type({})
+		" Check that these patterns are still valid.
+		if l:ign_mtime < 0
+			" File got deleted! :(
+			let l:patterns['pats'] = []
+			return l:patterns['pats']
+		elseif l:ign_mtime <= l:patterns['mtime']
+			" File hasn't changed! :)
+			return l:patterns['pats']
+		endif
+	endif
+
+	call s:trace("Loading patterns for project: " . a:root_dir)
+	let l:loaded = s:load_project_patterns(a:root_dir)
+	let s:proj_cache[a:root_dir] = {
+	\'mtime': localtime(),
+	\'pats': l:loaded}
+	return l:loaded
+endfunction
+
+" The custom ignore function that CtrlP will be using in addition to
+" normal pattern-based matching.
+function! ctrlp#autoignore#ignore(item, type) abort
+	let l:cnv_item = tr(strpart(a:item, s:active_cwd_len), "\\", "/")
+	for pat in s:active_patterns
+		if pat['syn'] != 'regexp'
+			continue
+		endif
+		if pat['type'] == '' || pat['type'] == a:type
+			if match(l:cnv_item, pat['pat']) >= 0
+				call s:trace("Ignoring ".l:cnv_item." because of ".pat['pat'])
+				return 1
+			endif
+		endif
+	endfor
+	return 0
+endfunction
+
+function! ctrlp#autoignore#ignore_init() abort
+	let l:root = getcwd()
+	let s:active_cwd = l:root
+	" len+1 is for including the next separator after the root.
+	let s:active_cwd_len = len(l:root) + 1
+	let s:active_patterns = s:get_project_patterns(l:root)
+	call s:trace("Got ".len(s:active_patterns)." patterns for ".l:root)
+
+	let s:changed_wildignore = 0
+	let s:prev_wildignore = &wildignore
+	for pat in s:active_patterns
+		if pat['syn'] == 'wildignore'
+			execute 'set wildignore+='.pat['pat']
+			let s:changed_wildignore = 1
+		endif
+	endfor
+	if s:changed_wildignore
+		call s:trace("Set wildignore to ".&wildignore)
+	endif
+endfunction
+
+function! ctrlp#autoignore#ignore_close() abort
+	if s:changed_wildignore
+		execute 'set wildignore='.s:prev_wildignore
+		let s:prev_wildignore = ''
+		call s:trace("Set wildignore back to ".&wildignore)
+	endif
+endfunction
+
+" List patterns for a given project's root.
+function! ctrlp#autoignore#get_patterns(root_dir) abort
+	let l:patterns = s:get_project_patterns(a:root_dir)
+	for pat in l:patterns
+		let l:prefix = pat['type'] == '' ? '(all)' : pat['type']
+		echom l:prefix . ':' . pat['pat']
+	endfor
+endfunction
+
+" }}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle/ctrlp/autoload/ctrlp/bookmarkdir.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/bookmarkdir.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/bookmarkdir.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/bookmarkdir.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/buffertag.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/buffertag.vim
old mode 100755
new mode 100644
similarity index 93%
rename from bundle/ctrlp/autoload/ctrlp/buffertag.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/buffertag.vim
index 6f3144e..f36a5cf
--- a/bundle/ctrlp/autoload/ctrlp/buffertag.vim
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp/buffertag.vim
@@ -43,6 +43,7 @@ let s:bins = [
 	\ ]
 
 let s:types = {
+	\ 'ant'    : '%sant%sant%spt',
 	\ 'asm'    : '%sasm%sasm%sdlmt',
 	\ 'aspperl': '%sasp%sasp%sfsv',
 	\ 'aspvbs' : '%sasp%sasp%sfsv',
@@ -52,16 +53,20 @@ let s:types = {
 	\ 'cpp'    : '%sc++%sc++%snvdtcgsuf',
 	\ 'cs'     : '%sc#%sc#%sdtncEgsipm',
 	\ 'cobol'  : '%scobol%scobol%sdfgpPs',
+	\ 'delphi' : '%spascal%spascal%sfp',
+	\ 'dosbatch': '%sdosbatch%sdosbatch%slv',
 	\ 'eiffel' : '%seiffel%seiffel%scf',
 	\ 'erlang' : '%serlang%serlang%sdrmf',
 	\ 'expect' : '%stcl%stcl%scfp',
 	\ 'fortran': '%sfortran%sfortran%spbceiklmntvfs',
+	\ 'go'     : '%sgo%sgo%sfctv',
 	\ 'html'   : '%shtml%shtml%saf',
 	\ 'java'   : '%sjava%sjava%spcifm',
 	\ 'javascript': '%sjavascript%sjavascript%sf',
 	\ 'lisp'   : '%slisp%slisp%sf',
 	\ 'lua'    : '%slua%slua%sf',
 	\ 'make'   : '%smake%smake%sm',
+	\ 'matlab' : '%smatlab%smatlab%sf',
 	\ 'ocaml'  : '%socaml%socaml%scmMvtfCre',
 	\ 'pascal' : '%spascal%spascal%sfp',
 	\ 'perl'   : '%sperl%sperl%sclps',
@@ -69,6 +74,7 @@ let s:types = {
 	\ 'python' : '%spython%spython%scmf',
 	\ 'rexx'   : '%srexx%srexx%ss',
 	\ 'ruby'   : '%sruby%sruby%scfFm',
+	\ 'rust'   : '%srust%srust%sfTgsmctid',
 	\ 'scheme' : '%sscheme%sscheme%ssf',
 	\ 'sh'     : '%ssh%ssh%sf',
 	\ 'csh'    : '%ssh%ssh%sf',
@@ -77,9 +83,11 @@ let s:types = {
 	\ 'slang'  : '%sslang%sslang%snf',
 	\ 'sml'    : '%ssml%ssml%secsrtvf',
 	\ 'sql'    : '%ssql%ssql%scFPrstTvfp',
+	\ 'tex'    : '%stex%stex%sipcsubPGl',
 	\ 'tcl'    : '%stcl%stcl%scfmp',
 	\ 'vera'   : '%svera%svera%scdefgmpPtTvx',
 	\ 'verilog': '%sverilog%sverilog%smcPertwpvf',
+	\ 'vhdl'   : '%svhdl%svhdl%sPctTrefp',
 	\ 'vim'    : '%svim%svim%savf',
 	\ 'yacc'   : '%syacc%syacc%sl',
 	\ }
@@ -131,7 +139,7 @@ fu! s:exectags(cmd)
 endf
 
 fu! s:exectagsonfile(fname, ftype)
-	let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs --extra= ', a:ftype]
+	let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs --extra= --file-scope=yes ', a:ftype]
 	if type(s:types[ft]) == 1
 		let ags .= s:types[ft]
 		let bin = s:bin
@@ -152,7 +160,11 @@ fu! s:esctagscmd(bin, args, ...)
 		let [ssl, &ssl] = [&ssl, 0]
 	en
 	let fname = a:0 ? shellescape(a:1) : ''
-	let cmd = shellescape(a:bin).' '.a:args.' '.fname
+	if  (has('win32') || has('win64'))
+		let cmd = a:bin.' '.a:args.' '.fname
+	else
+		let cmd = shellescape(a:bin).' '.a:args.' '.fname
+	endif
 	if &sh =~ 'cmd\.exe'
 		let cmd = substitute(cmd, '[&()@^<>|]', '^\0', 'g')
 	en
diff --git a/bundle/ctrlp/autoload/ctrlp/changes.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/changes.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/changes.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/changes.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/dir.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/dir.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/dir.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/dir.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/line.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/line.vim
old mode 100755
new mode 100644
similarity index 81%
rename from bundle/ctrlp/autoload/ctrlp/line.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/line.vim
index 5bec47e..f5ab83e
--- a/bundle/ctrlp/autoload/ctrlp/line.vim
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp/line.vim
@@ -13,6 +13,7 @@ let g:loaded_ctrlp_line = 1
 cal add(g:ctrlp_ext_vars, {
 	\ 'init': 'ctrlp#line#init(s:crbufnr)',
 	\ 'accept': 'ctrlp#line#accept',
+	\ 'act_farg' : 'dict',
 	\ 'lname': 'lines',
 	\ 'sname': 'lns',
 	\ 'type': 'tabe',
@@ -31,7 +32,7 @@ endf
 " Public {{{1
 fu! ctrlp#line#init(bufnr)
 	let [lines, bufnr] = [[], exists('s:bufnr') ? s:bufnr : a:bufnr]
-	let bufs = exists('s:lnmode') && s:lnmode ? ctrlp#buffers('id') : [bufnr]
+	let bufs = exists('s:lnmode') && !empty(s:lnmode) ? ctrlp#buffers('id') : [bufnr]
 	for bufnr in bufs
 		let [lfb, bufn] = [getbufline(bufnr, 1, '$'), bufname(bufnr)]
 		if lfb == [] && bufn != ''
@@ -50,11 +51,19 @@ fu! ctrlp#line#init(bufnr)
 	retu lines
 endf
 
-fu! ctrlp#line#accept(mode, str)
-	let info = matchlist(a:str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
+fu! ctrlp#line#accept(dict)
+	let mode = a:dict['action']
+	let str = a:dict['line']
+	let input = a:dict['input']
+	let info = matchlist(str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
 	let bufnr = str2nr(get(info, 1))
 	if bufnr
-		cal ctrlp#acceptfile(a:mode, bufnr, get(info, 2))
+		cal ctrlp#acceptfile(mode, bufnr, get(info, 2))
+		if !empty(input)
+			let @/ = input
+			call search(input, 'c')
+			call histadd("search", input)
+		en
 	en
 endf
 
diff --git a/bundle/ctrlp/autoload/ctrlp/mixed.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/mixed.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/mixed.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/mixed.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/mrufiles.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/mrufiles.vim
old mode 100755
new mode 100644
similarity index 94%
rename from bundle/ctrlp/autoload/ctrlp/mrufiles.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/mrufiles.vim
index 0774c13..32473da
--- a/bundle/ctrlp/autoload/ctrlp/mrufiles.vim
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp/mrufiles.vim
@@ -6,6 +6,7 @@
 
 " Static variables {{{1
 let [s:mrbs, s:mrufs] = [[], []]
+let s:mruf_map_string = '!stridx(v:val, cwd) ? strpart(v:val, idx) : v:val'
 
 fu! ctrlp#mrufiles#opts()
 	let [pref, opts] = ['g:ctrlp_mruf_', {
@@ -15,7 +16,7 @@ fu! ctrlp#mrufiles#opts()
 		\ 'case_sensitive': ['s:cseno', 1],
 		\ 'relative': ['s:re', 0],
 		\ 'save_on_update': ['s:soup', 1],
-		\ 'exclude_nomod': ['s:exclnomod', 0],
+		\ 'map_string': ['g:ctrlp_mruf_map_string', s:mruf_map_string],
 		\ }]
 	for [ke, va] in items(opts)
 		let [{va[0]}, {pref.ke}] = [pref.ke, exists(pref.ke) ? {pref.ke} : va[1]]
@@ -52,12 +53,10 @@ fu! s:reformat(mrufs, ...)
 		let cwd = tr(cwd, '\', '/')
 		cal map(a:mrufs, 'tr(v:val, "\\", "/")')
 	en
-	retu map(a:mrufs, '!stridx(v:val, cwd) ? strpart(v:val, idx) : v:val')
+	retu map(a:mrufs, g:ctrlp_mruf_map_string)
 endf
 
 fu! s:record(bufnr)
-	if s:exclnomod && &l:modifiable | retu | en
-  if s:exclnomod && !&l:modifiable | retu | en
 	if s:locked | retu | en
 	let bufnr = a:bufnr + 0
 	let bufname = bufname(bufnr)
@@ -73,7 +72,8 @@ fu! s:addtomrufs(fname)
 	let fn = exists('+ssl') ? tr(fn, '/', '\') : fn
 	let abs_fn = fnamemodify(fn,':p')
 	if ( !empty({s:in}) && fn !~# {s:in} ) || ( !empty({s:ex}) && fn =~# {s:ex} )
-		\ || !empty(getbufvar('^' . abs_fn . '$', '&bt')) || !filereadable(abs_fn) | retu
+		\ || !empty(getbufvar('^' . abs_fn . '$', '&bt')) || !filereadable(abs_fn)
+		retu
 	en
 	let idx = index(s:mrufs, fn, 0, !{s:cseno})
 	if idx
diff --git a/bundle/ctrlp/autoload/ctrlp/quickfix.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/quickfix.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/quickfix.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/quickfix.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/rtscript.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/rtscript.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/rtscript.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/rtscript.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/tag.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/tag.vim
old mode 100755
new mode 100644
similarity index 89%
rename from bundle/ctrlp/autoload/ctrlp/tag.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/tag.vim
index fa8c732..c229480
--- a/bundle/ctrlp/autoload/ctrlp/tag.vim
+++ b/pack/navigation/start/ctrlp/autoload/ctrlp/tag.vim
@@ -21,7 +21,7 @@ cal add(g:ctrlp_ext_vars, {
 
 let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
 " Utilities {{{1
-fu! s:findcount(str)
+fu! s:findcount(str, tgaddr)
 	let [tg, ofname] = split(a:str, '\t\+\ze[^\t]\+$')
 	let tgs = taglist('^'.tg.'$')
 	if len(tgs) < 2
@@ -48,7 +48,13 @@ fu! s:findcount(str)
 	for tgi in ntgs
 		let cnt += 1
 		if tgi["filename"] == ofname
-			let [fnd, pos] = [0, cnt]
+			if a:tgaddr != ""
+				if a:tgaddr == tgi["cmd"]
+					let [fnd, pos] = [0, cnt]
+				en
+			else
+				let [fnd, pos] = [0, cnt]
+			en
 		en
 	endfo
 	retu [1, fnd, pos, len(ctgs)]
@@ -92,8 +98,9 @@ endf
 
 fu! ctrlp#tag#accept(mode, str)
 	cal ctrlp#exit()
+	let tgaddr = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\t\zs[^\t]\{-1,}\ze\%(;"\)\?\t')
 	let str = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\ze\t')
-	let [tg, fdcnt] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
+	let [tg, fdcnt] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str, tgaddr)]
 	let cmds = {
 		\ 't': ['tab sp', 'tab stj'],
 		\ 'h': ['sp', 'stj'],
@@ -130,8 +137,8 @@ fu! ctrlp#tag#id()
 endf
 
 fu! ctrlp#tag#enter()
-	let tfs = tagfiles()
-	let s:tagfiles = tfs != [] ? filter(map(tfs, 'fnamemodify(v:val, ":p")'),
+	let tfs = get(g:, 'ctrlp_custom_tag_files', tagfiles())
+	let s:tagfiles = type(tfs) == 3 && tfs != [] ? filter(map(tfs, 'fnamemodify(v:val, ":p")'),
 		\ 'filereadable(v:val)') : []
 endf
 "}}}
diff --git a/bundle/ctrlp/autoload/ctrlp/undo.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/undo.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/undo.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/undo.vim
diff --git a/bundle/ctrlp/autoload/ctrlp/utils.vim b/pack/navigation/start/ctrlp/autoload/ctrlp/utils.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/ctrlp/autoload/ctrlp/utils.vim
rename to pack/navigation/start/ctrlp/autoload/ctrlp/utils.vim
diff --git a/bundle/ctrlp/doc/ctrlp.cnx b/pack/navigation/start/ctrlp/doc/ctrlp.cnx
old mode 100755
new mode 100644
similarity index 85%
rename from bundle/ctrlp/doc/ctrlp.cnx
rename to pack/navigation/start/ctrlp/doc/ctrlp.cnx
index 3daf91c..d99c4c6
--- a/bundle/ctrlp/doc/ctrlp.cnx
+++ b/pack/navigation/start/ctrlp/doc/ctrlp.cnx
@@ -1,4 +1,4 @@
-*ctrlp.txt*       模糊的 文件, 缓冲区, 最近最多使用, 标签, ... 检索. v1.79
+*ctrlp.txt*       支持模糊匹配的 文件, 缓冲区, 最近最多使用, 标签, ... 检索. v1.80
 *CtrlP* *ControlP* *'ctrlp'* *'ctrl-p'*
 ===============================================================================
 #                                                                             #
@@ -36,7 +36,7 @@
 全面支持Vim的正则表达式 |regexp| 作为搜索模式，内建最近最多使用文件监测，
 项目根目录定位和更多特性。
 
-开启可选的扩展（标记，目录，rtscripts...），参考 |ctrlp-extensions| 。
+开启可选的扩展（标记，目录，rtscript...），参考 |ctrlp-extensions| 。
 
 ===============================================================================
 OPTIONS                                                         *ctrlp-options*
@@ -68,10 +68,15 @@ OPTIONS                                                         *ctrlp-options*
   |ctrlp_arg_map|...............是否拦截<c-y> 和 <c-o> 命令。
   |ctrlp_follow_symlinks|.......是否跟随链接。
   |ctrlp_lazy_update|...........停止输入时才更新。
-  |ctrlp_default_input|.........为提示符面板提供一个种子。
+  |ctrlp_default_input|.........为提示符面板提供一个初始字符串。
   |ctrlp_abbrev|................输入缩写。
   |ctrlp_key_loop|..............为多字节输入开启输入事件循环。
   |ctrlp_prompt_mappings|.......改变提示符面板内部的按键绑定。
+  |ctrlp_line_prefix|...........ctrlp 窗口中为每一行添加前缀。
+  |ctrlp_open_single_match|.....当只有一个候选时自动接受。
+  |ctrlp_brief_prompt|..........提示符为空的时候使用<bs>退出 CtrlP。
+  |ctrlp_match_current_file|....在匹配条目中包含当前文件。
+  |ctrlp_types|.................內建类型的名称。
 
   最近最多使用模式:
   |ctrlp_mruf_max|..............记录的最近最多使用的最大数据。
@@ -82,9 +87,12 @@ OPTIONS                                                         *ctrlp-options*
   |ctrlp_mruf_default_order|....禁用排序。
   |ctrlp_mruf_case_sensitive|...最近最多使用文件是否大小写敏感。
   |ctrlp_mruf_save_on_update|...只要有一个新的条目添加，就保存到磁盘。
-  |ctrlp_mruf_exclude_nomod|....从 MRU 中排除不可编辑的缓冲区。
 
-  缓冲区标签模式: (开启此模式，参考 |ctrlp-extensions| )
+  缓冲模式:
+  |ctrlp_bufname_mod|...........文件名部分修饰符。
+  |ctrlp_bufpath_mod|...........文件路径部分修饰符。
+
+  缓冲标签模式: (开启此模式，参考 |ctrlp-extensions| )
   |g:ctrlp_buftag_ctags_bin|....兼容的ctags二进制程序的位置。
   |g:ctrlp_buftag_systemenc|....ctags命令的编码。
   |g:ctrlp_buftag_types|........添加新的文件类型和设置命令行参数。
@@ -147,6 +155,7 @@ OPTIONS                                                         *ctrlp-options*
 
 结果集的最大数目:
   results:{n} - 列出最多 {n} 条结果 (默认: 和最大高度同步).
+                0代表没有限制。
 
 注意: 当一个设置项没有被设置时，将会使用默认值。
 
@@ -247,7 +256,7 @@ OPTIONS                                                         *ctrlp-options*
 考虑清楚。
 
                                                       *'g:ctrlp_custom_ignore'*
-作为对 |'wildignore'| 的补充，用来设置你只是想在CtrlP中隐藏的文件和目录。使用正
+作为对 |'wildignore'| 和 |g:ctrlp_show_hidden| 的补充，用来设置你只是想在CtrlP中隐藏的文件和目录。使用正
 则表达式来指定匹配模式: >
   let g:ctrlp_custom_ignore = ''
 <
@@ -267,7 +276,7 @@ OPTIONS                                                         *ctrlp-options*
 <
 注意 #1: 默认情况下， |wildignore| 和 |g:ctrlp_custom_ignore| 只在 |globpath()| 被用
 来扫描文件的情况下使用，这样这些选项在那些使用 |g:ctrlp_user_command| 定义的命
-令中不会生效。 
+令中不会生效。
 
 注意 #2: 当改变选项的变量类型时，记得先 |:unlet| ，或者重启Vim来避免这个错误：
 "E706: Variable type mismatch" 。
@@ -330,7 +339,7 @@ OPTIONS                                                         *ctrlp-options*
 
   " 单个版本控制系统，列出命令列出没有被追踪的文件（较慢）:
   let g:ctrlp_user_command =
-    \ ['.git', 'cd %s && git ls-files . -co --exclude-standard']
+    \ ['.git', 'cd %s && git ls-files -co --exclude-standard']
 
   let g:ctrlp_user_command =
     \ ['.hg', 'hg --cwd %s status -numac -I . $(hg root)'] " MacOSX/Linux
@@ -428,6 +437,23 @@ OPTIONS                                                         *ctrlp-options*
 如果不指定1或0，如果选项的值是字符串，会被用来作为默认输入: >
   let g:ctrlp_default_input = 'anystring'
 <
+这个选项可以和 |g:ctrlp_open_single_match| 配合使用。
+
+
+                                                 *'g:ctrlp_match_current_file'*
+在匹配条目中包含当前文件: >
+  let g:ctrlp_match_current_file = 1
+
+默认情况下，当前文件不包含在列表中。
+
+注意: 当使用 |g:ctrlp_match_func| 时不会应用这个选项。
+
+                                                              *'g:ctrlp_types'*
+通过设置这个列表变量的值来定制核心类型: >
+  let g:ctrlp_types = ['mru', 'fil']
+
+类型默认为: >
+  let g:ctrlp_types = ['fil', 'buf', 'mru'].
 
                                                              *'g:ctrlp_abbrev'*
 定义可以在提示面包内被扩展（内部的或者可见的）的输入缩写: >
@@ -530,6 +556,32 @@ OPTIONS                                                         *ctrlp-options*
   let g:ctrlp_prompt_mappings = { 'PrtCurLeft()': ['<left>', '<c-^>'] }
 <
 
+                                                    *'g:ctrlp_line_prefix'*
+这个前缀会被加到ctrlp的条目列表中每一行的前面。
+默认值: >
+  let g:ctrlp_line_prefix = '> '
+<
+
+                                                    *'g:ctrlp_open_single_match'*
+当CtrlP处于列表中配置的模式中时，如果只有一个候选条目，CtrlP会直接接受该条目。
+例子: >
+  let g:ctrlp_open_single_match = ['buffer tags', 'buffer']
+<
+目前这个选项的作用是和 |g:ctrlp_default_input| 一起，使用类似下面的函数，在使用
+前设置，使用完后还原： >
+  fu! <SID>tagsUnderCursor()
+    try
+      let default_input_save = get(g:, 'ctrlp_default_input', '')
+      let g:ctrlp_default_input = expand('<cword>')
+      CtrlPBufTagAll
+    finally
+      if exists('default_input_save')
+        let g:ctrlp_default_input = default_input_save
+      endif
+    endtry
+  endfu
+>
+<
 ----------------------------------------
 MRU mode options:~
 
@@ -580,14 +632,17 @@ MRU mode options:~
 <
 
                                                 *'g:ctrlp_mruf_save_on_update'*
-设置该选项为0将不会每当有一个新条目增加就把最近最多使用列表保存到磁盘文件，而
-是在退出Vim时才保存: >
+设置该选项为 0 禁止 CtrlP 每当有一个新条目增加就把最近最多使用列表保存到磁盘
+文件，而是在退出Vim时才保存: >
   let g:ctrlp_mruf_save_on_update = 1
 <
-
-                                                *'g:ctrlp_mruf_exclude_nomod'*
-将这个选项设置为1来禁止添加不可编辑的缓冲区，例如帮助文件，到 MRU 列表: >
-  let g:ctrlp_mruf_exclude_nomod = 0
+                                                *'g:ctrlp_bufname_mod'*
+根据修饰符修改文件名部分。参见 |filename-modifiers| 。 >
+  let g:ctrlp_bufname_mod = ':t'
+<
+                                                *'g:ctrlp_bufpath_mod'*
+根据修饰符修改文件路径部分。参见 |filename-modifiers| 。 >
+  let g:ctrlp_bufpath_mod = ':~:.:h'
 <
 ----------------------------------------
 高级选项:~
@@ -754,7 +809,10 @@ MRU mode options:~
     " }
   endfunction
 <
-                                                          *ctrl默认值*
+                                                       *'g:ctrlp_brief_prompt'*
+当设置为 1 时, 提示符后为空时按 <bs> 会退出 CtrlP 。
+
+                                                          *ctrlp-default-value*
 另外，你可以使用下面的方式来改变默认值。
 例子: >
   let g:ctrlp_path_nolim = 1
@@ -767,7 +825,8 @@ MRU mode options:~
 :CtrlP [起始目录]
    用文件搜索模式打开CtrlP。
 
-   如果没有给定参数，|g:ctrlp_working_path_mode| 会被用来决定起始目录。
+   如果没有给定参数，|g:ctrlp_working_path_mode| 会被用来决定起始目录。临时覆盖
+   这个参数 的方法见 |:CtrlPCurFile| 和 |:CtrlPCurWD| 。
 
    在输入时你可以使用 <tab> 自动补全[起始目录]。
 
@@ -775,6 +834,16 @@ MRU mode options:~
 :CtrlPBuffer
    用缓冲区搜索模式打开CtrlP。
 
+                                                                *:CtrlPCurFile*
+:CtrlPCurFile
+    行为类似变量 |g:ctrlp_working_path_mode| = '' 时执行 |:CtrlP| ，忽略这个变量
+    现在的值。
+
+                                                                  *:CtrlPCurWD*
+:CtrlPCurWD
+    行为类似变量 |g:ctrlp_working_path_mode| = '' 时执行 |:CtrlP| ，忽略这个变量
+    现在的值。
+
                                                                     *:CtrlPMRU*
 :CtrlPMRU
    用最近最多使用模式打开CtrlP。
@@ -835,7 +904,8 @@ MRU mode options:~
     在匹配窗口和提示符面板之间切换焦点。
 
   <esc>,
-  <c-c>
+  <c-c>,
+  <c-g>
     退出CtrlP。
 
 移动:~
@@ -935,8 +1005,11 @@ MRU mode options:~
     - 从最近最多使用中移除被删除的文件。
 
   <F7>
+    最近最多使用模式：
     - 清除最近最多使用列表。
     - 删除被 <c-z> 标记的最近最多使用条目。
+    缓冲区模式：
+    - 删除光标下的条目或者删除被 <c-z> 标记的多个条目。
 
 粘贴:~
 
@@ -1003,7 +1076,7 @@ d)  提交两个点号 '..' 来进入上级目录。如果想进入向上多级
     你可以使用'@cd path/'来改变CtrlP的工作目录为path/。使用'@cd %:h'来改变为当
     前文件的目录。
 
-e)  相似的，提交'/'或者'\'来查找或者跳转到项目的根目录。
+e)  类似的，提交'/'或者'\'来查找或者跳转到项目的根目录。
 
     如果项目很大，使用版本控制系统的列出命令来寻找文件可能会加速初始化扫描。（
     更多细节参见 |g:ctrlp_user_command| )。
@@ -1135,11 +1208,78 @@ h)  使用?打开帮助文件。
         - 清除书签列表。
         - 删除被 <c-z> 标记的书签条目。
 
+                                                 *ctrlp-autoignore-extension*
+  * 自动忽略模式:~
+    - 名称: 'autoignore'
+
+    - 这个扩展并不会添加新命令。它支持通过项目根目录中的 `.ctrlpignore` 文件为
+      每个项目设置忽略模式 (就像属于单个项目的 |ctrlp_custom_ignore|)。基本
+      上就像 CtrlP 的 `.gitignore` 或者 `.hgignore`。
+
+      注意: 当使用 |g:ctrlp_user_command| 自动忽略模式不起作用。
+
+      注意: `.ctrlpignore` 会被当做根目录的标识(参见 |g:ctrlp_root_markers|).
+
+    - 忽略文件的语法:
+      空行，以 `#` （注释）开头的行会被忽略。
+
+      其他行会被当做正则表达式。 匹配模式如何被使用参见 *string-match* 。
+      任意条目，只要匹配到任意匹配模式，就会从 CtrlP 中搜索结果中忽略。
+
+      例子:
+
+        \.tmp$
+        ^generated/
+        local\.cfg
+
+      注意: 即使在 Windows 上模式也应该使用反斜线。
+
+      你也可以像下面那样使用 glob 命令风格的语法：
+
+        syntax:wildignore
+        *.tar.gz
+        *.tmp
+
+      这样会在搜索文件时临时的把每一个匹配模式添加到 |'wildignore'|
+      中，结束时移除。
+
+      你也可以通过下面的方式切换回默认的正则表达式为基础的模式：
+
+        syntax:regexp
+
+      你也可以只为某一条目类型（文件、目录...）设置匹配模式：
+
+        dir:build
+        file:foo\.txt
+
+      这样只会忽略包含 "build" 的目录和包含 "foo.txt" 的文件。不会忽略带
+      有 "build" 的文件或者反过来。
+
+      注意: 如果为了忽略名为 "build" 的目录，而不是『任何』包含 "build" 
+      的目录，你可以使用下面的正则： ^build$
+
+    - 常见问题:
+      问: 为什么 CtrlP 不能直接支持原生的 `.gitignore` or `.hgignore` ?
+
+      答: 这些文件初看起来好像已经包含了所有你想从 CtrlP 中排除的文件。但是
+      通常情况下，这些文件和你想在 CtrlP 中的配置会有一些不同。这些配置文件
+      列出了不能被包含到版本控制中的文件。这些不能被包含到版本控制中的文件
+      包括了你想忽略的，但是同时可能也包含了你不想忽略的：本地设置，外部包
+      和依赖，等等。作者觉得支持多种语法与只是简单的复制/粘贴几行忽略规则比
+      起来比较麻烦。如果你不这么觉得可以随时提交补丁 :)
+
+      问: 我开启了 |ctrlp-autoignore-extension|， 或者编辑了 `.ctrlpignore`
+      但是这些新模式并没有起作用。我哪里做错了？
+
+      答: 可能什么都没做错！CtrlP 可以为了快速的响应缓存搜索结果。你可以按
+      <F5> 强制刷新。如果 `.ctrlpignore` 改动过，这样也会使用新的匹配模式。
+
 ----------------------------------------
-缓冲区标记模式选项:~
+缓冲标签模式选项:~
 
                                                    *'g:ctrlp_buftag_ctags_bin'*
-如果ctags没有在环境变量中配置，使用该选项来指定它的位置: >
+如果ctags没有在环境变量中配置，或者一个二进制ctags文件存在于
+/opt/local/bin 或 /usr/local/bin，使用该选项来指定它的位置: >
   let g:ctrlp_buftag_ctags_bin = ''
 <
 
@@ -1175,6 +1315,17 @@ h)  使用?打开帮助文件。
     CtrlPPrtText   : 提示符窗口的文本 （|hl-Normal|）。
     CtrlPPrtCursor : 提示符窗口的光标在文本上移动时（常量）。
 
+  * 缓冲区浏览模式:
+    CtrlPBufferNr     : 缓冲区编号
+    CtrlPBufferInd    : '+', '-', '=' 和 '#' 指示符 (参见 |:buffers|)
+    CtrlPBufferHid    : 隐藏缓冲区
+    CtrlPBufferHidMod : 隐藏和被编辑过的缓冲区
+    CtrlPBufferVis    : 可见的缓冲区
+    CtrlPBufferVisMod : 可见的和被编辑过的缓冲区
+    CtrlPBufferCur    : 当前缓冲区
+    CtrlPBufferCurMod : 当前和被编辑过的缓冲区
+    CtrlPBufferPath   : 缓冲区路径
+
   * 在扩展中:
     CtrlPTabExtra  : 每一行中不匹配的部分（注释）。
     CtrlPBufName   : 条目所属的缓冲区名称（|hl-Directory|）。
@@ -1245,11 +1396,11 @@ h)  使用?打开帮助文件。
 ===============================================================================
 开发人员                                                        *ctrlp-credits*
 
-由 Kien Nguyen <github.com/kien>开发。 在Vim的 |license| 下发行。
+最初由 Kien Nguyen <github.com/kien>开发。现在由 Github 上 ctrlpvim 组织的成员
+维护(https://github.com/orgs/ctrlpvim/people) 。在Vim的 |license| 下发行。
 
-项目主页:      http://kien.github.com/ctrlp.vim
-Git仓库:       https://github.com/kien/ctrlp.vim
-Mercurial仓库: https://bitbucket.org/kien/ctrlp.vim
+项目主页:   http://ctrlpvim.github.com/ctrlp.vim
+Git 仓库:   https://github.com/ctrlpvim/ctrlp.vim
 
 -------------------------------------------------------------------------------
 感谢所有通过github，bitbucket或电子邮件提供想法，报告bug或者帮助debugging的人。
@@ -1275,11 +1426,40 @@ Mercurial仓库: https://bitbucket.org/kien/ctrlp.vim
     * Jo De Boeck <github.com/grimpy>
     * Rudi Grinberg <github.com/rgrinberg>
     * Timothy Mellor <github.com/mellort>
+    * Sergey Vlasov <github.com/noscript>
 
 ===============================================================================
 更新日志                                                      *ctrlp-changelog*
 
-    + 结合 *g:ctrlp_match_window_bottom* *g:ctrlp_match_window_reversed* 和 
+    * 新选项 |g:ctrlp_custom_tag_files| 用来指定自定义的标签文件。
+    * 设置 g:ctrlp_match_window 为0来不限制窗口大小
+
+Before 2016/11/28~
+
+    + 新命令: |YankLine()| 来复制整个文件。
+    + 新选项: |g:ctrlp_types| 来选择內建类型。
+    + 新特性: 异步在新线程中调用 |g:ctrlp_user_command| 。 设置
+              |g:user_command_async|  为1来启用。
+    + 为 delphi, rust 和 golang提供buffertag支持。
+    + 新选项: |g:ctrlp_brief_prompt|,
+              |g:match_current_file|,
+              |g:ctrlp_compare_lim|.
+    + 新功能: 自动忽略扩展。
+    + 为 ant, tex, dosbatch, matlab 和 vhdl提供buffertag支持。
+    + 新选项 |g:ctrlp_line_prefix| 来结合第三方插件。
+    + 新选项 |g:open_single_match| 在 matches 中打开单个文件。
+    + 添加启动方式 <plug>(ctrlp) 。
+    + 接受 bang for CtrlPBookmarkDirAdd 来避免确认。
+    + 处理像 "g:ctrlp_TYPE_MODE" 大小写混合的变量名。
+                   例如: let g:ctrlp_path_sort
+    + 新选项: |g:ctrlp_custom_ancestors|
+
+在2014/08/08之前~
+
+    + 新的支持高亮的缓冲区浏览模式 (建议 |+conceal|)
+    + 新选项: |g:ctrlp_bufname_mod|,
+              |g:ctrlp_bufpath_mod|
+    + 结合 *g:ctrlp_match_window_bottom* *g:ctrlp_match_window_reversed* 和
       *g:ctrlp_max_height* 到 |g:ctrlp_match_window| 。
     + 新选项: |g:ctrlp_match_window| 。
 
diff --git a/bundle/ctrlp/doc/ctrlp.txt b/pack/navigation/start/ctrlp/doc/ctrlp.txt
old mode 100755
new mode 100644
similarity index 86%
rename from bundle/ctrlp/doc/ctrlp.txt
rename to pack/navigation/start/ctrlp/doc/ctrlp.txt
index 7538d0c..4090e83
--- a/bundle/ctrlp/doc/ctrlp.txt
+++ b/pack/navigation/start/ctrlp/doc/ctrlp.txt
@@ -1,4 +1,4 @@
-*ctrlp.txt*       Fuzzy file, buffer, mru, tag, ... finder. v1.79
+*ctrlp.txt*       Fuzzy file, buffer, mru, tag, ... finder. v1.80
 *CtrlP* *ControlP* *'ctrlp'* *'ctrl-p'*
 ===============================================================================
 #                                                                             #
@@ -64,6 +64,11 @@ Overview:~
   |ctrlp_abbrev|................Input abbreviations.
   |ctrlp_key_loop|..............Use input looping for multi-byte input.
   |ctrlp_prompt_mappings|.......Change the mappings inside the prompt.
+  |ctrlp_line_prefix|...........Prefix for each line in ctrlp window.
+  |ctrlp_open_single_match|.....Automatically accept when only one candidate.
+  |ctrlp_brief_prompt|..........Exit CtrlP on empty prompt by <bs>.
+  |ctrlp_match_current_file|....Include current file in match entries.
+  |ctrlp_types|.................Names of builtin types.
 
   MRU mode:
   |ctrlp_mruf_max|..............Max MRU entries to remember.
@@ -74,7 +79,10 @@ Overview:~
   |ctrlp_mruf_default_order|....Disable sorting.
   |ctrlp_mruf_case_sensitive|...MRU files are case sensitive or not.
   |ctrlp_mruf_save_on_update|...Save to disk whenever a new entry is added.
-  |ctrlp_mruf_exclude_nomod|....Exclude nonmodifiable buffers from the MRU list.
+
+  Buffer mode:
+  |ctrlp_bufname_mod|...........File name section modificator.
+  |ctrlp_bufpath_mod|...........File path section modificator.
 
   BufferTag mode: (to enable, see |ctrlp-extensions|)
   |g:ctrlp_buftag_ctags_bin|....The location of the ctags-compatible binary.
@@ -119,7 +127,7 @@ Set this to 1 to set regexp search as the default: >
 Can be toggled on/off by pressing <c-r> inside the prompt.
 
                                                        *'g:ctrlp_match_window'*
-Change the postion, the listing order of results, the minimum and the maximum
+Change the position, the listing order of results, the minimum and the maximum
 heights of the match window: >
   let g:ctrlp_match_window = ''
 <
@@ -140,6 +148,7 @@ The minimum and maximum heights:
 
 The maximum number of results:
   results:{n} - list maximum {n} results (default: sync with max height).
+                0 mean no-limit.
 
 Note: When a setting isn't set, its default value will be used.
 
@@ -247,8 +256,9 @@ plugins look for .git/, .hg/,... some other plugins look for external *.exe
 tools on Windows). So be a little mindful of what you put in your |wildignore|.
 
                                                       *'g:ctrlp_custom_ignore'*
-In addition to |'wildignore'|, use this for files and directories you want only
-CtrlP to not show. Use regexp to specify the patterns: >
+In addition to |'wildignore'| and |g:ctrlp_show_hidden|, use this for files
+and directories you want only CtrlP to not show. Use regexp to specify the
+patterns: >
   let g:ctrlp_custom_ignore = ''
 <
 Examples: >
@@ -336,7 +346,7 @@ Some examples: >
 
   " Single VCS, listing command lists untracked files (slower):
   let g:ctrlp_user_command =
-    \ ['.git', 'cd %s && git ls-files . -co --exclude-standard']
+    \ ['.git', 'cd %s && git ls-files -co --exclude-standard']
 
   let g:ctrlp_user_command =
     \ ['.hg', 'hg --cwd %s status -numac -I . $(hg root)'] " MacOSX/Linux
@@ -443,6 +453,23 @@ Instead of 1 or 0, if the value of the option is a string, it'll be used as-is
 as the default input: >
   let g:ctrlp_default_input = 'anystring'
 <
+This option works well together with |g:ctrlp_open_single_match|
+
+
+                                                 *'g:ctrlp_match_current_file'*
+Includes the current file in the match entries: >
+  let g:ctrlp_match_current_file = 1
+
+By default, the current file is excluded from the list.
+
+Note: does not apply when |g:ctrlp_match_func| is used. 
+
+                                                              *'g:ctrlp_types'*
+Set this to list of names to customize core types: >
+  let g:ctrlp_types = ['mru', 'fil']
+
+By default, the types are: >
+  let g:ctrlp_types = ['fil', 'buf', 'mru'].
 
                                                              *'g:ctrlp_abbrev'*
 Define input abbreviations that can be expanded (either internally or visibly)
@@ -552,6 +579,34 @@ default <c-h> mapping: >
   let g:ctrlp_prompt_mappings = { 'PrtCurLeft()': ['<left>', '<c-^>'] }
 <
 
+                                                    *'g:ctrlp_line_prefix'*
+This prefix will be prepended to each line in ctrlp's item listing.
+default: >
+  let g:ctrlp_line_prefix = '> '
+<
+
+                                                    *'g:ctrlp_open_single_match'*
+List of CtrlP modes for which CtrlP should accept an entry directly, if only
+one candidate exists.
+Example: >
+  let g:ctrlp_open_single_match = ['buffer tags', 'buffer']
+<
+This is currently only really useful together with |g:ctrlp_default_input|
+set before launching, and cleared afterwards, with a function such as
+following: >
+  fu! <SID>tagsUnderCursor()
+    try
+      let default_input_save = get(g:, 'ctrlp_default_input', '')
+      let g:ctrlp_default_input = expand('<cword>')
+      CtrlPBufTagAll
+    finally
+      if exists('default_input_save')
+        let g:ctrlp_default_input = default_input_save
+      endif
+    endtry
+  endfu
+>
+<
 ----------------------------------------
 MRU mode options:~
 
@@ -583,7 +638,6 @@ Set this to 1 to save every MRU file path $HOME/$filepath in the $HOME dir
   let g:ctrlp_tilde_homedir = 0
 <
 Note: This applies also to all dir paths stored by :CtrlPBookmarkDirAdd!
-<
 
                                                       *'g:ctrlp_mruf_relative'*
 Set this to 1 to show only MRU files in the current working directory: >
@@ -608,11 +662,13 @@ Set this to 0 to disable saving of the MRU list to hard drive whenever a new
 entry is added, saving will then only occur when exiting Vim: >
   let g:ctrlp_mruf_save_on_update = 1
 <
-
-                                                *'g:ctrlp_mruf_exclude_nomod'*
-Set this to 1 to disable adding nonmodifiable buffers, for example help files,
-to the MRU list: >
-  let g:ctrlp_mruf_exclude_nomod = 0
+                                                *'g:ctrlp_bufname_mod'*
+Modify file name section according to modificator string. See |filename-modifiers|. >
+  let g:ctrlp_bufname_mod = ':t'
+<
+                                                *'g:ctrlp_bufpath_mod'*
+Modify file path section according to modificator string. See |filename-modifiers|. >
+  let g:ctrlp_bufpath_mod = ':~:.:h'
 <
 ----------------------------------------
 Advanced options:~
@@ -787,8 +843,11 @@ Example: >
     " }
   endfunction
 <
+                                                       *'g:ctrlp_brief_prompt'*
+When this is set to 1, the <bs> on empty prompt exit CtrlP.
+
                                                           *ctrlp-default-value*
-Otherwize, you can use below to change default value.
+Otherwise, you can use below to change default value.
 Example: >
   let g:ctrlp_path_nolim = 1
 
@@ -802,7 +861,8 @@ COMMANDS                                                       *ctrlp-commands*
    Open CtrlP in find file mode.
 
    If no argument is given, the value of |g:ctrlp_working_path_mode| will be
-   used to determine the starting directory.
+   used to determine the starting directory.  See |:CtrlPCurFile| and
+   |:CtrlPCurWD| to temporarily override the setting.
 
    You can use <tab> to auto-complete the [starting-directory] when typing it.
 
@@ -810,6 +870,16 @@ COMMANDS                                                       *ctrlp-commands*
 :CtrlPBuffer
    Open CtrlP in find buffer mode.
 
+                                                                *:CtrlPCurFile*
+:CtrlPCurFile
+    This acts like |:CtrlP| with |g:ctrlp_working_path_mode| = 'c' and ignores
+    the variable's current value.
+
+                                                                  *:CtrlPCurWD*
+:CtrlPCurWD
+    This acts like |:CtrlP| with |g:ctrlp_working_path_mode| = 'd' and ignores
+    the variable's current value.
+
                                                                     *:CtrlPMRU*
 :CtrlPMRU
    Open CtrlP in find Most-Recently-Used file mode.
@@ -873,7 +943,8 @@ Once inside the prompt:~
     Toggle the focus between the match window and the prompt.
 
   <esc>,
-  <c-c>
+  <c-c>,
+  <c-g>
     Exit CtrlP.
 
 Moving:~
@@ -974,8 +1045,12 @@ Function keys:~
     - Remove deleted files from the MRU list.
 
   <F7>
-    - Wipe the MRU list.
-    - Delete MRU entries marked by <c-z>.
+    MRU mode:
+    - Wipe the list.
+    - Delete entries marked by <c-z>.
+    Buffer mode:
+    - Delete entry under the cursor or delete multiple entries marked by <c-z>.
+
 
 Pasting:~
 
@@ -1048,7 +1123,7 @@ d)  Submit two dots '..' to go upward the directory tree by 1 level. To go up
 e)  Similarly, submit '/' or '\' to find and go to the project's root.
 
     If the project is large, using a VCS listing command to look for files
-    might help speeding up the intial scan (see |g:ctrlp_user_command| for more
+    might help speeding up the initial scan (see |g:ctrlp_user_command| for more
     details).
 
     Note: d) and e) only work in file, directory and mixed modes.
@@ -1172,12 +1247,13 @@ Available extensions:~
 
     The last command can be used to add all recently used work dirs to the
     CtrlPBookmarkDir list by an autocommand like
+
     >
     augroup CtrlPDirMRU
       autocmd!
       autocmd FileType * if &modifiable | execute 'silent CtrlPBookmarkDirAdd! %:p:h' | endif
     augroup END
-    <
+<
 
     - Mappings:
       + <cr> change the local working directory for CtrlP, keep it open and
@@ -1188,11 +1264,86 @@ Available extensions:~
         - Wipe bookmark list.
         - Delete entries marked by <c-z>.
 
+                                                 *ctrlp-autoignore-extension*
+  * Autoignore mode:~
+    - Name: 'autoignore'
+
+    - This extension doesn't add new commands. It adds support for per-project
+      ignore patterns (as per |ctrlp_custom_ignore|) via a `.ctrlpignore` file
+      at the root of the project. It's basically like a `.gitignore` or
+      `.hgignore` for CtrlP.
+
+      Note: auto-ignore won't work when |g:ctrlp_user_command| is used.
+
+      Note: `.ctrlpignore` will be added to the root markers (see
+      |g:ctrlp_root_markers|).
+
+    - Ignore file syntax:
+      Empty lines, and lines starting with `#` (comments) are ignored.
+
+      Other lines are treated like regular expression patterns. See *string-match*
+      for how patterns are used. Anything that matches any of the patterns will be
+      ignored from CtrlP's search results.
+
+      Example:
+
+        \.tmp$
+        ^generated/
+        local\.cfg
+
+      Note: patterns should use forward slashes, even on Windows.
+
+      You can also switch to a glob-like syntax like this:
+
+        syntax:wildignore
+        *.tar.gz
+        *.tmp
+
+      This will temporarily add each pattern to |'wildignore'| for the
+      duration of the file scan, and remove them at the end.
+
+      You can switch back to the default regular-expression-based patterns by
+      writing:
+
+        syntax:regexp
+
+      You can also specify a match on only a given type of item:
+
+        dir:build
+        file:foo\.txt
+
+      This will only ignore directories with "build" in them, and files with
+      "foo.txt" in them. Not files with "build" in them or vice-versa.
+
+      Note: to ignore a root directory "build", and not _any_ directory with
+      "build" in it, you can root the regex: ^build$
+
+    - FAQ:
+      Q: Why can't CtrlP support `.gitignore` or `.hgignore` natively?
+
+      A: Those files look at first like they may contain all the patterns
+      you'd want to exclude from CtrlP already. However, more often than not,
+      there are some differences. Those files list patterns that should not be
+      included in source-control. This includes things you want to ignore, but
+      also things you may not want to: local settings, external packages and
+      dependencies, etc. The author felt the trouble of supporting various
+      syntaxes was too much compared to just copy/pasting a few lines. Feel
+      free to contribute a patch if you disagree :)
+
+      Q: I enabled |ctrlp-autoignore-extension|, or edited `.ctrlpignore`, but
+      none of the new patterns are working. What did I do wrong?
+
+      A: Probably nothing! CtrlP can cache search results for faster response
+      times. You can hit <F5> to force it to refresh. This will use the newer
+      ignore patterns if the `.ctrlpignore` file has changed, too.
+
+
 ----------------------------------------
 Buffer Tag mode options:~
 
                                                    *'g:ctrlp_buftag_ctags_bin'*
-If ctags isn't in your $PATH, use this to set its location: >
+If ctags isn't in your $PATH, or a ctags binary exists in either
+/opt/local/bin or /usr/local/bin, us this to set its location: >
   let g:ctrlp_buftag_ctags_bin = ''
 <
 
@@ -1228,6 +1379,17 @@ Highlighting:~
     CtrlPPrtText   : the prompt's text (|hl-Normal|)
     CtrlPPrtCursor : the prompt's cursor when moving over the text (Constant)
 
+  * Buffer explorer mode:
+    CtrlPBufferNr     : buffer number
+    CtrlPBufferInd    : '+', '-', '=' and '#' indicators (see |:buffers|)
+    CtrlPBufferHid    : hidden buffer
+    CtrlPBufferHidMod : hidden and modified buffer
+    CtrlPBufferVis    : visible buffer
+    CtrlPBufferVisMod : visible and modified buffer
+    CtrlPBufferCur    : current buffer
+    CtrlPBufferCurMod : current and modified buffer
+    CtrlPBufferPath   : buffer path
+
   * In extensions:
     CtrlPTabExtra  : the part of each line that's not matched against (Comment)
     CtrlPBufName   : the buffer name an entry belongs to (|hl-Directory|)
@@ -1298,11 +1460,12 @@ MISCELLANEOUS CONFIGS                             *ctrlp-miscellaneous-configs*
 ===============================================================================
 CREDITS                                                         *ctrlp-credits*
 
-Developed by Kien Nguyen <github.com/kien>. Distributed under Vim's |license|.
+Originally developed by Kien Nguyen <github.com/kien>.  Now maintained by the
+members of the ctrlpvim Github organisation
+(https://github.com/orgs/ctrlpvim/people).  Distributed under Vim's |license|.
 
-Project's homepage:   http://kien.github.com/ctrlp.vim
-Git repository:       https://github.com/kien/ctrlp.vim
-Mercurial repository: https://bitbucket.org/kien/ctrlp.vim
+Project's homepage:   http://ctrlpvim.github.com/ctrlp.vim
+Git repository:       https://github.com/ctrlpvim/ctrlp.vim
 
 -------------------------------------------------------------------------------
 Thanks to everyone that has submitted ideas, bug reports or helped debugging on
@@ -1329,10 +1492,39 @@ Special thanks:~
     * Jo De Boeck <github.com/grimpy>
     * Rudi Grinberg <github.com/rgrinberg>
     * Timothy Mellor <github.com/mellort>
+    * Sergey Vlasov <github.com/noscript>
 
 ===============================================================================
 CHANGELOG                                                     *ctrlp-changelog*
 
+    * New option |g:ctrlp_custom_tag_files| to specify custom tag files.
+    * Accept 0 for g:ctrlp_match_window no-limited window size.
+
+Before 2016/11/28~
+
+    + New command: |YankLine()| to yank current line.
+    + New option: |g:ctrlp_types| to select builtin modes.
+    + New feature: asynchronized spawn of |g:ctrlp_user_command|. This enable
+                  with set |g:user_command_async| to 1.
+    + Support buffertag for delphi, rust and golang.
+    + New option: |g:ctrlp_brief_prompt|,
+                  |g:match_current_file|,
+                  |g:ctrlp_compare_lim|.
+    + New feature: Auto-ignore extension.
+    + Support buffertag for ant, tex, dosbatch, matlab and vhdl.
+    + New option |g:ctrlp_line_prefix| for integrating third party plugins.
+    + New option |g:open_single_match| to open single file in matches.
+    + Add <plug>(ctrlp) for launch CtrlP.
+    + Accept bang for CtrlPBookmarkDirAdd to avoid confirm.
+    + Handle variable like "g:ctrlp_TYPE_MODE".
+                   ex: let g:ctrlp_path_sort
+    + New option: |g:ctrlp_custom_ancestors|
+
+Before 2014/08/08~
+
+    + New buffer explorer mode with highlighting (|+conceal| recommended)
+    + New options: |g:ctrlp_bufname_mod|,
+                   |g:ctrlp_bufpath_mod|
     + Combine *g:ctrlp_match_window_bottom* *g:ctrlp_match_window_reversed* and
       *g:ctrlp_max_height* into |g:ctrlp_match_window|.
     + New option: |g:ctrlp_match_window|.
diff --git a/pack/navigation/start/ctrlp/plugin/ctrlp.vim b/pack/navigation/start/ctrlp/plugin/ctrlp.vim
new file mode 100644
index 0000000..1e56eca
--- /dev/null
+++ b/pack/navigation/start/ctrlp/plugin/ctrlp.vim
@@ -0,0 +1,72 @@
+" =============================================================================
+" File:          plugin/ctrlp.vim
+" Description:   Fuzzy file, buffer, mru, tag, etc finder.
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+" GetLatestVimScripts: 3736 1 :AutoInstall: ctrlp.zip
+
+if ( exists('g:loaded_ctrlp') && g:loaded_ctrlp ) || v:version < 700 || &cp
+	fini
+en
+let g:loaded_ctrlp = 1
+
+let [g:ctrlp_lines, g:ctrlp_allfiles, g:ctrlp_alltags, g:ctrlp_alldirs,
+	\ g:ctrlp_allmixes, g:ctrlp_buftags, g:ctrlp_ext_vars, g:ctrlp_builtins]
+	\ = [[], [], [], [], {}, {}, [], 2]
+
+if !exists('g:ctrlp_map') | let g:ctrlp_map = '<c-p>' | en
+if !exists('g:ctrlp_cmd') | let g:ctrlp_cmd = 'CtrlP' | en
+
+com! -n=? -com=dir CtrlP         cal ctrlp#init(0, { 'dir': <q-args> })
+com! -n=? -com=dir CtrlPMRUFiles cal ctrlp#init('mru', { 'dir': <q-args> })
+
+com! -bar CtrlPBuffer   cal ctrlp#init('buf')
+com! -n=? CtrlPLastMode cal ctrlp#init(-1, { 'args': <q-args> })
+
+com! -bar CtrlPClearCache     cal ctrlp#clr()
+com! -bar CtrlPClearAllCaches cal ctrlp#clra()
+
+com! -bar ClearCtrlPCache     cal ctrlp#clr()
+com! -bar ClearAllCtrlPCaches cal ctrlp#clra()
+
+com! -bar CtrlPCurWD   cal ctrlp#init('fil', { 'mode': '' })
+com! -bar CtrlPCurFile cal ctrlp#init('fil', { 'mode': 'c' })
+com! -bar CtrlPRoot    cal ctrlp#init('fil', { 'mode': 'r' })
+
+exe 'nn <silent> <plug>(ctrlp) :<c-u>'.g:ctrlp_cmd.'<cr>'
+
+if g:ctrlp_map != '' && !hasmapto('<plug>(ctrlp)')
+	exe 'map' g:ctrlp_map '<plug>(ctrlp)'
+en
+
+if !exists('g:ctrlp_types') || index(g:ctrlp_types, 'mru') >= 0
+	cal ctrlp#mrufiles#init()
+en
+
+com! -bar CtrlPTag      cal ctrlp#init(ctrlp#tag#id())
+com! -bar CtrlPQuickfix cal ctrlp#init(ctrlp#quickfix#id())
+
+com! -n=? -com=dir CtrlPDir
+	\ cal ctrlp#init(ctrlp#dir#id(), { 'dir': <q-args> })
+
+com! -n=? -com=buffer CtrlPBufTag
+	\ cal ctrlp#init(ctrlp#buffertag#cmd(0, <q-args>))
+
+com! -bar CtrlPBufTagAll cal ctrlp#init(ctrlp#buffertag#cmd(1))
+com! -bar CtrlPRTS       cal ctrlp#init(ctrlp#rtscript#id())
+com! -bar CtrlPUndo      cal ctrlp#init(ctrlp#undo#id())
+
+com! -n=? -com=buffer CtrlPLine
+	\ cal ctrlp#init(ctrlp#line#cmd('buf', <q-args>))
+
+com! -n=? -com=buffer CtrlPChange
+	\ cal ctrlp#init(ctrlp#changes#cmd('fil', <q-args>))
+
+com! -bar CtrlPChangeAll   cal ctrlp#init(ctrlp#changes#cmd(1))
+com! -bar CtrlPMixed       cal ctrlp#init(ctrlp#mixed#id())
+com! -bar CtrlPBookmarkDir cal ctrlp#init(ctrlp#bookmarkdir#id())
+
+com! -n=? -com=dir -bang CtrlPBookmarkDirAdd
+	\ cal ctrlp#call('ctrlp#bookmarkdir#add', '<bang>', <q-args>)
+
+" vim:ts=2:sw=2:sts=2
diff --git a/bundle/ctrlp/readme.md b/pack/navigation/start/ctrlp/readme.md
old mode 100755
new mode 100644
similarity index 93%
rename from bundle/ctrlp/readme.md
rename to pack/navigation/start/ctrlp/readme.md
index 4211700..5412b6d
--- a/bundle/ctrlp/readme.md
+++ b/pack/navigation/start/ctrlp/readme.md
@@ -64,6 +64,10 @@ Use `:diffthis` when opening multiple files to run `:diffthis` on the first 4 fi
 
     If more than one mode is specified, they will be tried in order until a directory is located.
 
+* If a file is already open, open it again in a new pane instead of switching to the existing pane
+
+    `let g:ctrlp_switch_buffer = 'et'`
+
 * Exclude files and directories using Vim's `wildignore` and CtrlP's own `g:ctrlp_custom_ignore`. If a custom listing command is being used, exclusions are ignored:
 
     ```vim
@@ -85,6 +89,12 @@ Use `:diffthis` when opening multiple files to run `:diffthis` on the first 4 fi
     let g:ctrlp_user_command = 'dir %s /-n /b /s /a-d'  " Windows
     ```
 
+* Ignore files in `.gitignore`
+    
+    ```vim
+      let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files -co --exclude-standard']
+    ```
+
 Check `:help ctrlp-options` for other options.
 
 ## Installation
diff --git a/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/bug.md b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/bug.md
new file mode 100644
index 0000000..dd35135
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,45 @@
+---
+name: "Bug Report"
+about: "NERDTree is misbehaving? Tell us about it."
+labels: bug
+---
+<!-- Attention! Please Read!
+
+Please fill out ALL the information below so that the issue can be fully
+understood. Omitting information will delay the resolution of your issue. It
+will be labeled "Needs More Info", and may be closed until there is enough
+information.
+
+Keep in mind that others may have the same question in the future. The better
+your information, the more likely they'll be able to help themselves. -->
+
+#### Self-Diagnosis
+<!-- Check the boxes after creating the issue, or use [x]. -->
+- [ ] I have searched the [issues](https://github.com/scrooloose/nerdtree/issues) for an answer to my question.
+- [ ] I have reviewed the NERDTree documentation. `:h NERDTree`
+- [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
+- [ ] I have searched the web for an answer to my question.
+
+#### Environment (for bug reports)
+- [ ] Operating System: 
+- [ ] Vim/Neovim version `:echo v:version`: 
+- [ ] NERDTree version, found on 1st line in NERDTree quickhelp `?`: 
+- [ ] vimrc settings
+    - [ ] NERDTree variables
+    ```vim
+    ```
+    - Other NERDTree-dependent Plugins
+        - [ ] jistr/vim-nerdtree-tabs
+        - [ ] ryanoasis/vim-devicons
+        - [ ] tiagofumo/vim-nerdtree-syntax-highlight
+        - [ ] Xuyuanp/nerdtree-git-plugin
+        - [ ] Others (specify): 
+    - [ ] I've verified the issue occurs with only NERDTree installed.
+
+#### Steps to Reproduce the Issue
+1. 
+
+#### Current Result (Include screenshots where appropriate.)
+
+#### Expected Result
+
diff --git a/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/feature_request.md b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..35db0f6
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,8 @@
+---
+name: "Feature Request"
+about: "What new feature are you requesting for NERDTree?"
+labels: "feature request"
+---
+
+#### Description
+
diff --git a/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/question.md b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..25f15b0
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,24 @@
+---
+name: "General Question"
+about: "Having trouble setting up NERDTree? Need clarification on a setting? Ask your question here."
+labels: "general question"
+---
+<!-- Attention! Please Read!
+
+Please fill out ALL the information below so that the issue can be fully
+understood. Omitting information will delay the resolution of your issue. It
+will be labeled "Needs More Info", and may be closed until there is enough
+information.
+
+Keep in mind that others may have the same question in the future. The better
+your information, the more likely they'll be able to help themselves. -->
+
+#### Self-Diagnosis
+<!-- Check the boxes after creating the issue, or use [x]. -->
+- [ ] I have searched the [issues](https://github.com/scrooloose/nerdtree/issues) for an answer to my question.
+- [ ] I have reviewed the NERDTree documentation. `:h NERDTree`
+- [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
+- [ ] I have searched the web for an answer to my question.
+
+#### State Your Question
+
diff --git a/pack/navigation/start/nerdtree/.github/PULL_REQUEST_TEMPLATE.md b/pack/navigation/start/nerdtree/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..24dba3f
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+### Description of Changes
+Closes #  <!-- Issue number this PR addresses. If none, remove this line. -->
+
+
+---
+### New Version Info
+
+#### Author's Instructions
+- [ ] Derive a new `MAJOR.MINOR.PATCH` version number. Increment the:
+    - `MAJOR` version when you make incompatible API changes
+    - `MINOR` version when you add functionality in a backwards-compatible manner
+    - `PATCH` version when you make backwards-compatible bug fixes
+- [ ] Update [CHANGELOG.md](https://github.com/scrooloose/nerdtree/blob/master/CHANGELOG.md), following the established pattern.
+#### Collaborator's Instructions
+- [ ] Review [CHANGELOG.md](https://github.com/scrooloose/nerdtree/blob/master/CHANGELOG.md), suggesting a different version number if necessary.
+- [ ] After merge, tag the merge commit, e.g. `git tag -a 3.1.4 -m "v3.1.4" && git push origin --tags`
diff --git a/pack/navigation/start/nerdtree/.github/workflows/vint.yml b/pack/navigation/start/nerdtree/.github/workflows/vint.yml
new file mode 100644
index 0000000..36d7258
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.github/workflows/vint.yml
@@ -0,0 +1,15 @@
+name: Vint
+on: [push, pull_request]
+jobs:
+  vint:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Run vint with reviewdog
+      uses: reviewdog/action-vint@v1.0.1
+      with:
+        github_token: ${{ secrets.github_token }}
+        reporter: github-pr-review
diff --git a/bundle/nerdtree/.gitignore b/pack/navigation/start/nerdtree/.gitignore
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/nerdtree/.gitignore
rename to pack/navigation/start/nerdtree/.gitignore
diff --git a/pack/navigation/start/nerdtree/.vintrc.yaml b/pack/navigation/start/nerdtree/.vintrc.yaml
new file mode 100644
index 0000000..c44b6ab
--- /dev/null
+++ b/pack/navigation/start/nerdtree/.vintrc.yaml
@@ -0,0 +1,5 @@
+cmdargs:
+  severity: style_problem
+  color: true
+  env:
+    neovim: false
diff --git a/pack/navigation/start/nerdtree/CHANGELOG.md b/pack/navigation/start/nerdtree/CHANGELOG.md
new file mode 100644
index 0000000..0bcf4d7
--- /dev/null
+++ b/pack/navigation/start/nerdtree/CHANGELOG.md
@@ -0,0 +1,268 @@
+# NERDTree Change Log
+<!-- Introduce a new MAJOR or MINOR version with a 4-hash header.
+     PATCH versions are listed from newest to oldest under their respective MAJOR.MINOR
+     version in an unordered list.  The format is:
+        - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
+-->
+#### 6.7
+- **.10**: Do not consider the tree root to be "cascadable". (lifecrisis) [#1120](https://github.com/preservim/nerdtree/pull/1120)
+- **.9**: Force `:NERDTreeFocus` to allow events to be fired when switching windows. (PhilRunninger) [#1118](https://github.com/preservim/nerdtree/pull/1118)
+- **.8**: Fix example code for the `NERDTreeAddKeyMap()` function. (PhilRunninger) [#1116](https://github.com/preservim/nerdtree/pull/1116)
+- **.7**: Put `'%'` argument in `bufname()` for backwards compatibility. (PhilRunninger) [#1105](https://github.com/preservim/nerdtree/pull/1105)
+- **.6**: If a file's already open in the window, don't edit it again. (PhilRunninger) [#1103](https://github.com/preservim/nerdtree/pull/1103)
+- **.5**: Prevent unneeded tree creation in `:NERDTreeToggle[VCS] <path>` (PhilRunninger) [#1101](https://github.com/preservim/nerdtree/pull/1101)
+- **.4**: Add missing calls to the `shellescape()` function (lifecrisis) [#1099](https://github.com/preservim/nerdtree/pull/1099)
+- **.3**: Fix vsplit to not open empty buffers when opening previously closed file (AwkwardKore) [#1098](https://github.com/preservim/nerdtree/pull/1098)
+- **.2**: Fix infinity loop (on winvim) in FindParentVCSRoot (Eugenij-W) [#1095](https://github.com/preservim/nerdtree/pull/1095)
+- **.1**: File Move: Escape existing directory name when looking for open files. (PhilRunninger) [#1094](https://github.com/preservim/nerdtree/pull/1094)
+- **.0**: Open the parent directory when revealing a non-existent file with :NERDTreeFind (bouk) [#1090](https://github.com/preservim/nerdtree/pull/1090)
+#### 6.6
+- **.1**: [add] How to install using dein.vim (kazukazuinaina) [#1087](https://github.com/preservim/nerdtree/pull/1087)
+- **.0**: Add the ability to turn off directory arrows (PhilRunninger) [#1085](https://github.com/preservim/nerdtree/pull/1085)
+#### 6.5
+- **.0**: `NERDTreeToggle <start-directory>` always sets NERDTree root. (PhilRunninger) [#1083](https://github.com/preservim/nerdtree/pull/1083)
+#### 6.4
+- **.6**: NERDTreeFind shows expected message if file doesn't exist e.g. with vim-startify (andys8). [#1081](https://github.com/preservim/nerdtree/pull/1081)
+- **.5**: Ensure events are (or aren't) being ignored correctly. (PhilRunninger) [#1080](https://github.com/preservim/nerdtree/pull/1080)
+- **.4**: Prevent overwriting existing files/dirs on node move. (PhilRunninger) [#1079](https://github.com/preservim/nerdtree/pull/1079)
+- **.3**: Fix regex that finds keyword for minimal menu. (PhilRunninger) [#1075](https://github.com/preservim/nerdtree/pull/1075)
+- **.2**: Lint vimscript, fix errors and warnings, add CI job to review PRs (Caleb Maclennan) [#1071](https://github.com/preservim/nerdtree/pull/1071)
+- **.1**: Ensure backward compatibility. v:t_func is not available before Vim 8.0 (Phil Runninger)
+- **.0**: Allow use of function references as callbacks (HiPhish) [#1067](https://github.com/preservim/nerdtree/pull/1067)
+#### 6.3
+- **.0**: Add new command that behaves like NERDTreeToggle but defaults to the root of a VCS repository. (willfindlay) [#1060](https://github.com/preservim/nerdtree/pull/1060)
+#### 6.2
+- **.1**: Menu option, 'copy path to clipboard' is aware of VIM clipboard option (jhzn) [#1056](https://github.com/preservim/nerdtree/pull/1056)
+- **.0**: Support tab-specific CWDs (PhilRunninger) [#1032](https://github.com/preservim/nerdtree/pull/1032)
+#### 6.1
+- **.4**: Add VIM built-in package management to read me file. (pesarkhobeee) [#1049](https://github.com/preservim/nerdtree/pull/1049)
+- **.3**: Save/Set screen state also on WinLeave and WinEnter. (PhilRunninger) [#1048](https://github.com/preservim/nerdtree/pull/1048)
+- **.2**: Wrap saveScreenState's statements in a try-catch block. (PhilRunninger) [#1047](https://github.com/preservim/nerdtree/pull/1047)
+- **.1**: Catch errors when trying to read CHANGELOG.md. (PhilRunninger) [#1045](https://github.com/preservim/nerdtree/pull/1045)
+- **.0**: If file path doesn't exist, :NERDTreeFind its parent directory instead. (PhilRunninger) [#1043](https://github.com/preservim/nerdtree/pull/1043)
+#### 6.0
+- **.1**: Reintroduce necessary variable mistakenly removed. (PhilRunninger) [#1040](https://github.com/preservim/nerdtree/pull/1040)
+- **.0**: Make the behavior of window splits consistent (dragonxlwang, PhilRunninger) [#1035](https://github.com/preservim/nerdtree/pull/1035)
+#### 5.3
+- **.3**: Fix (p)ath not displaying in the minimal menu (tuzz) [#1038](https://github.com/preservim/nerdtree/pull/1038)
+- **.2**: Enable events when closing NerdTree window. (PhilRunninger) [#1037](https://github.com/preservim/nerdtree/pull/1037)
+- **.1**: Fix the `e` key mapping to use netrw if desired (PhilRunninger) [#1031](https://github.com/preservim/nerdtree/pull/1031)
+- **.0**: Add file extension and size to sorting capabilities (PhilRunninger) [#1029](https://github.com/preservim/nerdtree/pull/1029)
+#### 5.2
+- **.9**: Suppress events for intermediate window/tab/buffer changes (PhilRunninger) [#1026](https://github.com/preservim/nerdtree/pull/1026)
+- **.8**: Revert [#1019](https://github.com/preservim/nerdtree/pull/1019) to fix nvim artifacts and flickering. (PhilRunninger) [#1021](https://github.com/preservim/nerdtree/pull/1021)
+- **.7**: Use :mode only in neovim. MacVim still needs to use :redraw! (PhilRunninger) [#1019](https://github.com/preservim/nerdtree/pull/1019)
+- **.6**: In CHANGELOG.md and PR template, make reference to PR a true HTML link. (PhilRunninger) [#1017](https://github.com/preservim/nerdtree/pull/1017)
+- **.5**: Use `:mode` instead of `:redraw!` when updating menu. (PhilRunninger) [#1016](https://github.com/preservim/nerdtree/pull/1016)
+- **.4**: When searching for root line num, stop at end of file. (PhilRunninger) [#1015](https://github.com/preservim/nerdtree/pull/1015)
+- **.3**: Fix `<CR>` key map on the bookmark (lkebin) [#1014](https://github.com/preservim/nerdtree/pull/1014)
+- **.2**: Make Enter work on the `.. ( up a dir )` line (PhilRunninger) [#1013](https://github.com/preservim/nerdtree/pull/1013)
+- **.1**: Fix nerdtree#version() on Windows. (PhilRunninger)
+- **.0**: Expand functionality of `<CR>` mapping. (PhilRunninger) [#1011](https://github.com/preservim/nerdtree/pull/1011)
+#### 5.1
+- **.3**: Remove @mentions from PR template and change log. They weren't working. (PhilRunninger) [#1009](https://github.com/preservim/nerdtree/pull/1009)
+- **.2**: Fix NERDTree opening with the wrong size. (PhilRunninger) [#1008](https://github.com/preservim/nerdtree/pull/1008)
+- **.1**: Update Changelog and create PR Template (PhilRunninger) [#1007](https://github.com/preservim/nerdtree/pull/1007)
+- **.0**: Too many changes for one patch...
+    - Refresh a dir_node if the file wasn't found in it, and look once more. (PhilRunninger) [#1005](https://github.com/preservim/nerdtree/pull/1005)
+    - Add a "copy path to clipboard" menu option (PhilRunninger) [#1002](https://github.com/preservim/nerdtree/pull/1002)
+    - Enable root refresh on "vim ." a different way than [#999](https://github.com/preservim/nerdtree/pull/999). (PhilRunninger) [#1001](https://github.com/preservim/nerdtree/pull/1001)
+    - Fix refreshroot (PhilRunninger) [#999](https://github.com/preservim/nerdtree/pull/999)
+    - Change version check to look for 703 not 730 (vhalis) [#994](https://github.com/preservim/nerdtree/pull/994)
+    - Change minimum vim (PhilRunninger) [#991](https://github.com/preservim/nerdtree/pull/991)
+    - Allow multi-character DirArrows (PhilRunninger) [#985](https://github.com/preservim/nerdtree/pull/985)
+    - Remove redraw! while still clearing last message empty string. (PhilRunninger) [#979](https://github.com/preservim/nerdtree/pull/979)
+    - fix `_initChildren` function value set to numChildrenCached error (terryding77) [#969](https://github.com/preservim/nerdtree/pull/969)
+    - On Windows, do a case-insensitive comparison of paths. (PhilRunninger) [#967](https://github.com/preservim/nerdtree/pull/967)
+    - Remove the **Please wait... DONE** messages. (PhilRunninger) [#966](https://github.com/preservim/nerdtree/pull/966)
+    - Smarter delimiter default (PhilRunninger) [#963](https://github.com/preservim/nerdtree/pull/963)
+    - Update directory .vimdc readme example (spencerdcarlson) [#961](https://github.com/preservim/nerdtree/pull/961)
+    - Preview bookmarks (PhilRunninger) [#956](https://github.com/preservim/nerdtree/pull/956)
+    - Add new value to NERDTreeQuitOnOpen to close bookmark table (PhilRunninger) [#955](https://github.com/preservim/nerdtree/pull/955)
+    - Add an :EditBookmarks command to edit the bookmarks file (PhilRunninger) [#954](https://github.com/preservim/nerdtree/pull/954)
+    - Before copying, turn off &shellslash. Restore after copy is finished. (PhilRunninger) [#952](https://github.com/preservim/nerdtree/pull/952)
+    - Set a maximum window size when zooming. (PhilRunninger) [#950](https://github.com/preservim/nerdtree/pull/950)
+    - Confirm the wipeout of a unsaved buffer whose file has been renamed. (PhilRunninger) [#949](https://github.com/preservim/nerdtree/pull/949)
+    - Escape a backslash so it can be used in a key mapping. (PhilRunninger) [#948](https://github.com/preservim/nerdtree/pull/948)
+    - Add a NERDTreeMinimalMenu feature (tuzz) [#938](https://github.com/preservim/nerdtree/pull/938)
+    - fixed root path error for windows (zcodes) [#935](https://github.com/preservim/nerdtree/pull/935)
+    - Restore getDirChildren for use in nerdtree-project-plugin. (PhilRunninger) [#929](https://github.com/preservim/nerdtree/pull/929)
+    - Document NERDTreeNodeDelimiter [#912](https://github.com/preservim/nerdtree/pull/912) (PhilRunninger) [#926](https://github.com/preservim/nerdtree/pull/926)
+    - Allow modification of menu keybindings (Leandros) [#923](https://github.com/preservim/nerdtree/pull/923)
+    - Add two more disqualifications for isCascadable(). (PhilRunninger) [#914](https://github.com/preservim/nerdtree/pull/914)
+    - Allow highlighting more than one flag. (kristijanhusak) [#908](https://github.com/preservim/nerdtree/pull/908)
+    - Support sorting files and directories by modification time. (PhilRunninger) [#901](https://github.com/preservim/nerdtree/pull/901)
+    - Parse . and .. from path string with trailing slash. (PhilRunninger) [#899](https://github.com/preservim/nerdtree/pull/899)
+    - Force sort to recalculate the cached sortKey. (PhilRunninger) [#898](https://github.com/preservim/nerdtree/pull/898)
+    - Add NERDTreeRefreshRoot command (wgfm) [#897](https://github.com/preservim/nerdtree/pull/897)
+    - Call Resolve on the file's path when calling :NERDTreeFind. (PhilRunninger) [#896](https://github.com/preservim/nerdtree/pull/896)
+    - Catch all errors, not just NERDTree errors. (PhilRunninger) [#894](https://github.com/preservim/nerdtree/pull/894)
+    - Fix typo in help file (lvoisin) [#892](https://github.com/preservim/nerdtree/pull/892)
+    - Make NERDTreeCreator set the `'nolist'` option (lifecrisis) [#889](https://github.com/preservim/nerdtree/pull/889)
+    - Refresh buffers after `m`, `m` operation on a folder (PhilRunninger) [#888](https://github.com/preservim/nerdtree/pull/888)
+    - Use a better arg for FINDSTR when using the m,l command in Windows. (PhilRunninger) [#887](https://github.com/preservim/nerdtree/pull/887)
+    - Fix the <C-J>/<C-K> motions, which currently fail with cascades (lifecrisis) [#886](https://github.com/preservim/nerdtree/pull/886)
+    - Function "s:UI.getLineNum()" doesn't always work on cascades. (lifecrisis) [#882](https://github.com/preservim/nerdtree/pull/882)
+    - NERDTreeCWD: reset CWD if changed by NERDTreeFocus (PhilRunninger) [#878](https://github.com/preservim/nerdtree/pull/878)
+    - Use <count>tabnext instead of <count>gt to allow users to remap gt. (PhilRunninger) [#877](https://github.com/preservim/nerdtree/pull/877)
+    - Do a case sensitive comparison of new/existing buffers. (PhilRunninger) [#875](https://github.com/preservim/nerdtree/pull/875)
+    - Fix opening sub-directories that have commas in their name. (PhilRunninger) [#873](https://github.com/preservim/nerdtree/pull/873)
+    - Add new command to open NERDTree in the root of a VCS repository. (PhilRunninger) [#872](https://github.com/preservim/nerdtree/pull/872)
+    - Make sure the path to the bookmarks file exists before writing it. (PhilRunninger) [#871](https://github.com/preservim/nerdtree/pull/871)
+    - Unzoom NERDTree when opening a file (PhilRunninger) [#870](https://github.com/preservim/nerdtree/pull/870)
+    - Support unusual characters in file and directory names (PhilRunninger) [#868](https://github.com/preservim/nerdtree/pull/868)
+    - Reword renamed-buffer prompt to be more clear (aflock) [#867](https://github.com/preservim/nerdtree/pull/867)
+    - Default to placing cursor on root when closing bookmark table (lifecrisis) [#866](https://github.com/preservim/nerdtree/pull/866)
+    - Fix issues with sorting of nodes (PhilRunninger) [#856](https://github.com/preservim/nerdtree/pull/856)
+    - Better OSX detection (bubba-h57) [#853](https://github.com/preservim/nerdtree/pull/853)
+    - Bugfix - ensure keymaps dictionary exists before using it (mnussbaum) [#852](https://github.com/preservim/nerdtree/pull/852)
+    - Decrease startup-time by avoiding linear-time iteration over key mappings (mnussbaum) [#851](https://github.com/preservim/nerdtree/pull/851)
+    - Add code to sort mappings in quickhelp (lifecrisis) [#849](https://github.com/preservim/nerdtree/pull/849)
+    - Use ":clearjumps" in new NERDTree windows (lifecrisis) [#844](https://github.com/preservim/nerdtree/pull/844)
+    - Like m-c did before, create parent directories if needed on m-m. (PhilRunninger) [#840](https://github.com/preservim/nerdtree/pull/840)
+    - BUGFIX: Repair a problem with the `'u'` mapping. (lifecrisis) [#838](https://github.com/preservim/nerdtree/pull/838)
+    - Make the NERDTree buffer writable when rendering it. (PhilRunninger) [#837](https://github.com/preservim/nerdtree/pull/837)
+    - Code cleanup: Remove unsupported bookmark table mappings (lifecrisis) [#835](https://github.com/preservim/nerdtree/pull/835)
+    - Replace strcharpart() with substitute() for backward compatibility (bravestarr) [#834](https://github.com/preservim/nerdtree/pull/834)
+    - Fixed error `unknown function strcharpart` for older versions of Vim (hav4ik) [#833](https://github.com/preservim/nerdtree/pull/833)
+    - Clear output when NERDTree menu is aborted (lifecrisis) [#832](https://github.com/preservim/nerdtree/pull/832)
+    - Display a path with multi-byte characters correctly when it is truncated (bravestarr) [#830](https://github.com/preservim/nerdtree/pull/830)
+    - Support revealing file and executing file with xdg-open for Linux (ngnmhieu) [#824](https://github.com/preservim/nerdtree/pull/824)
+    - If node isn't open, count children on disk before deleting. (PhilRunninger) [#822](https://github.com/preservim/nerdtree/pull/822)
+    - Add new variable g:NERDTreeRemoveFileCmd (kutsan) [#816](https://github.com/preservim/nerdtree/pull/816)
+    - Use a better check for existence of the NERDTree buffer. (PhilRunninger) [#814](https://github.com/preservim/nerdtree/pull/814)
+    - Fix focussing previous buffer when closing NERDTree (mrubli) [#801](https://github.com/preservim/nerdtree/pull/801)
+    - Update the docs for "NERDTreeStatusline" (lifecrisis) [#796](https://github.com/preservim/nerdtree/pull/796)
+    - BUGFIX: Unstable behavior in the "getPath()" method (lifecrisis) [#795](https://github.com/preservim/nerdtree/pull/795)
+    - Revert the bugfix from pull request [#785](https://github.com/preservim/nerdtree/pull/785) (lifecrisis) [#794](https://github.com/preservim/nerdtree/pull/794)
+    - BUGFIX: Allow ":NERDTreeFind" to discover hidden files (lifecrisis) [#786](https://github.com/preservim/nerdtree/pull/786)
+    - BUGFIX: Allow ":NERDTreeFind" to reveal new files (lifecrisis) [#785](https://github.com/preservim/nerdtree/pull/785)
+    - Add modelines (lifecrisis) [#782](https://github.com/preservim/nerdtree/pull/782)
+    - Change the type of completion used by NERDTreeFind (lifecrisis) [#781](https://github.com/preservim/nerdtree/pull/781)
+    - change NERDTreeFind with args (zhenyangze) [#778](https://github.com/preservim/nerdtree/pull/778)
+    - Style Choice: Using confirm() when deleting a bookmark (lifecrisis) [#777](https://github.com/preservim/nerdtree/pull/777)
+    - remove useless substitute when `file =~# "/$"` (skyblueee) [#773](https://github.com/preservim/nerdtree/pull/773)
+    - remove useless removeLeadingSpaces in _stripMarkup (skyblueee) [#772](https://github.com/preservim/nerdtree/pull/772)
+    - Make the "o" mapping consistent with "x" (lifecrisis) [#769](https://github.com/preservim/nerdtree/pull/769)
+    - Fix a problem with the "x" handler (lifecrisis) [#768](https://github.com/preservim/nerdtree/pull/768)
+    - Clean up the handler for the "x" mapping (lifecrisis) [#767](https://github.com/preservim/nerdtree/pull/767)
+    - Revert change to tab opening method (lifecrisis) [#766](https://github.com/preservim/nerdtree/pull/766)
+    - BUGFIX: Add back support for "b:NERDTreeRoot" (lifecrisis) [#765](https://github.com/preservim/nerdtree/pull/765)
+    - Fix broken "t" and "T" mappings, tabs now open at end (lifecrisis) [#759](https://github.com/preservim/nerdtree/pull/759)
+    - Update doc with already existing mapping variables (asnr) [#699](https://github.com/preservim/nerdtree/pull/699)
+    - Fix the broken g:NERDTreeBookmarksSort setting (lifecrisis) [#696](https://github.com/preservim/nerdtree/pull/696)
+    - Correct NERDTreeIgnore pattern in doc (cntoplolicon) [#648](https://github.com/preservim/nerdtree/pull/648)
+    - Remove empty segments when splitting path (sooth-sayer) [#574](https://github.com/preservim/nerdtree/pull/574)
+    - Suppress autocmds less agressively (wincent) [#578](https://github.com/preservim/nerdtree/pull/578) [#691](https://github.com/preservim/nerdtree/pull/691)
+    - Add an Issues template to ask for more info initially.
+    - Fix markdown headers in readme (josephfrazier) [#676](https://github.com/preservim/nerdtree/pull/676)
+    - Don't touch `@o` and `@h` registers when rendering
+    - Fix bug with files and directories with dollar signs (alegen) [#649](https://github.com/preservim/nerdtree/pull/649)
+    - Reuse/reopen existing window trees where possible [#244](https://github.com/preservim/nerdtree/pull/244)
+    - Remove NERDTree.previousBuf()
+    - Change color of arrow (Leeiio) [#630](https://github.com/preservim/nerdtree/pull/630)
+    - Improved a tip in README.markdown (ggicci) [#628](https://github.com/preservim/nerdtree/pull/628)
+    - Shorten delete confimration of empty directory to `y` (mikeperri) [#530](https://github.com/preservim/nerdtree/pull/530)
+    - Fix API call to open directory tree in window (devm33) [#533](https://github.com/preservim/nerdtree/pull/533)
+    - Change default arrows on non-Windows platforms (gwilk) [#546](https://github.com/preservim/nerdtree/pull/546)
+    - Update to README - combine cd and git clone (zwhitchcox) [#584](https://github.com/preservim/nerdtree/pull/584)
+    - Update to README - Tip: start NERDTree when vim starts (therealplato) [#593](https://github.com/preservim/nerdtree/pull/593)
+    - Escape filename when moving an open buffer (zacharyvoase) [#595](https://github.com/preservim/nerdtree/pull/595)
+    - Fixed incorrect :helptags command in README (curran) [#619](https://github.com/preservim/nerdtree/pull/619)
+    - Fixed incomplete escaping of folder arrows (adityanatraj) [#548](https://github.com/preservim/nerdtree/pull/548)
+    - Added NERDTreeCascadeSingleChildDir option (juanibiapina) [#558](https://github.com/preservim/nerdtree/pull/558)
+    - Replace strchars() with backward compatible workaround.
+    - Add support for copy command in Windows (SkylerLipthay) [#231](https://github.com/preservim/nerdtree/pull/231)
+    - Fixed typo in README.markdown - :Helptags -> :helptags
+    - Rename "primary" and "secondary" trees to "tab" and "window" trees.
+    - Move a bunch of buffer level variables into the NERDTree and UI classes.
+    - Display cascading dirs on one line to save vertical/horizontal space (matt-gardner: brainstorming/testing)
+    - Remove the old style UI - Remove `NERDTreeDirArrows` option.
+    - On windows default to + and ~ for expand/collapse directory symbols.
+    - Lots more refactoring. Move a bunch of b: level vars into b:NERDTree and friends.
+
+#### 5.0.0
+- Refactor the code significantly:
+    * Break the classes out into their own files.
+    * Make the majority of the code OO - previously large parts were effectively a tangle of "global" methods.
+- Add an API to assign flags to nodes. This allows VCS plugins like https://github.com/Xuyuanp/nerdtree-git-plugin to exist. Thanks to **Xuyuanp** for helping design/test/build said API.
+- add `scope` argument to the key map API see :help NERDTreeAddKeyMap()
+- add magic [[dir]] and [[file]] flags to NERDTreeIgnore
+- add support for custom path filters. See :help NERDTreeAddPathFilter()
+- add path listener API. See :help NERDTreePathListenerAPI.
+- expand the fs menu functionality to list file properties (PhilRunninger, apbarrero, JESii)
+- make bookmarks work with `~` home shortcuts (hiberabyss)
+- show OSX specific fsmenu options in regular vim on mac (evindor)
+- make dir arrow icons configurable (PickRelated)
+- optimise node sorting performance when opening large dirs (vtsang)
+- make the root note render prettier by truncating it at a path slash (gcmt)
+- remove NERDChristmasTree option - its always christmas now
+- add "cascade" open and closing for dirs containing only another single dir. See :help NERDTreeCascadeOpenSingleChildDir (pendulm)
+- Many other fixes, doc updates and contributions from: **actionshrimp**, **agrussellknives**, **alvan**, **AndrewRadev**, **cperl82** (*many small fixes*), **devmanhinton**, **egalpin**, **franksort**, **gastropoda**, **handcraftedbits**, **kelaban**, **lucascaton**, **mixvin**, **pendulm**, **SchDen**, **shanesmith**, **staeff**, **stephenprater**, **toiffel**, **Twinside**, **WoLpH**, **xiaodili**, **zhangoose**
+
+#### 4.2.0
+- Add NERDTreeDirArrows option to make the UI use pretty arrow chars instead of the old +~| chars to define the tree structure (sickill)
+- shift the syntax highlighting out into its own syntax file (gnap)
+- add some mac specific options to the filesystem menu - for macvim only (andersonfreitas)
+- Add NERDTreeMinimalUI option to remove some non functional parts of the nerdtree ui (camthompson)
+- tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the new behaviour (benjamingeiger)
+- if no name is given to :Bookmark, make it default to the name of the target file/dir (minyoung)
+- use `file` completion when doing copying, create, and move operations (EvanDotPro)
+- lots of misc bug fixes from: **AndrewRadev**, **Bogdanov**, **camthompson**, **kml**, **mathias**, **paddyoloughlin**, **scottstvnsn**, **sdewald**, **Vitaly**, **wycats**, me RAWR!
+
+#### 4.1.0
+- features:
+    - NERDTreeFind to reveal the node for the current buffer in the tree, see `|NERDTreeFind|`. This effectively merges the FindInNERDTree plugin (by **Doug McInnes**) into the script.
+    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to **Stefan Ritter** and **Rémi Prévost**.
+    - truncate the root node if wider than the tree window. Thanks to **Victor Gonzalez**.
+
+- bugfixes:
+    - really fix window state restoring
+    - fix some win32 path escaping issues. Thanks to **Stephan Baumeister**, **Ricky**, **jfilip1024**, and **Chris Chambers**.
+
+#### 4.0.0
+- add a new programmable menu system (see `:help NERDTreeMenu`).
+- add new APIs to add menus/menu-items to the menu system as well as custom key mappings to the NERD tree buffer (see `:help NERDTreeAPI`).
+- removed the old API functions
+- added a mapping to maximize/restore the size of nerd tree window, thanks to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
+- fix a bug where secondary nerd trees (netrw hijacked trees) and NERDTreeQuitOnOpen didnt play nicely, thanks to **Curtis Harvey**.
+- fix a bug where the script ignored directories whose name ended in a dot, thanks to **Aggelos Orfanakos** for the patch.
+- fix a bug when using the x mapping on the tree root, thanks to **Bryan Venteicher** for the patch.
+- fix a bug where the cursor position/window size of the nerd tree buffer wasnt being stored on closing the window, thanks to **Richard Hart**.
+- fix a bug where NERDTreeMirror would mirror the wrong tree
+
+#### 3.1.1
+- fix a bug where a non-listed no-name buffer was getting created every time the tree windows was created, thanks to **Derek Wyatt** and **owen1**
+- make `<CR>` behave the same as the `o` mapping
+- some helptag fixes in the doc, thanks **strull**.
+- fix a bug when using `:set nohidden` and opening a file where the previous buf was modified. Thanks **iElectric**.
+- other minor fixes
+
+#### 3.1.0
+- New features:
+    - add mappings to open files in a vsplit, see `:help NERDTree-s` and `:help NERDTree-gs`
+    - make the statusline for the nerd tree window default to something hopefully more useful. See `:help 'NERDTreeStatusline'`
+- Bugfixes:
+    - make the hijack netrw functionality work when vim is started with `vim <some dir>` (thanks to **Alf Mikula** for the patch).
+    - fix a bug where the CWD wasnt being changed for some operations even when NERDTreeChDirMode==2 (thanks to **Lucas S. Buchala**)
+    - add -bar to all the nerd tree :commands so they can chain with other :commands (thanks to **tpope**)
+    - fix bugs when ignorecase was set (thanks to **nach**)
+    - fix a bug with the relative path code (thanks to **nach**)
+    - fix a bug where doing a `:cd` would cause `:NERDTreeToggle` to fail (thanks **nach**)
+
+
+#### 3.0.1
+- Bugfixes:
+    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when `'hidden'` was not set
+    - fix a bug where `:NERDTree <path>` would fail if `<path>` was relative and didnt start with a `./` or `../`  Thanks to **James Kanze**.
+    - make the `q` mapping work with secondary (`:e <dir>`  style) trees, thanks to **jamessan**
+    - fix a bunch of small bugs with secondary trees
+- More insane refactoring.
+
+#### 3.0.0
+- hijack netrw so that doing an `:edit <directory>`  will put a NERD tree in the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
+- allow sharing of trees across tabs, see `:help :NERDTreeMirror`
+- remove "top" and "bottom" as valid settings for NERDTreeWinPos
+- change the `'<tab>'` mapping to `'i'`
+- change the `'H'` mapping to `'I'`
+- lots of refactoring
diff --git a/bundle/syntastic/LICENCE b/pack/navigation/start/nerdtree/LICENCE
similarity index 100%
rename from bundle/syntastic/LICENCE
rename to pack/navigation/start/nerdtree/LICENCE
diff --git a/pack/navigation/start/nerdtree/README.markdown b/pack/navigation/start/nerdtree/README.markdown
new file mode 100644
index 0000000..09173a6
--- /dev/null
+++ b/pack/navigation/start/nerdtree/README.markdown
@@ -0,0 +1,157 @@
+The NERDTree [![Vint](https://github.com/preservim/nerdtree/workflows/Vint/badge.svg)](https://github.com/preservim/nerdtree/actions?workflow=Vint)
+=============
+
+Introduction
+------------
+
+The NERDTree is a file system explorer for the Vim editor. Using this plugin,
+users can visually browse complex directory hierarchies, quickly open files for
+reading or editing, and perform basic file system operations.
+
+This plugin can also be extended with custom mappings using a special API. The
+details of this API and of other NERDTree features are described in the
+included documentation.
+
+![NERDTree Screenshot](https://github.com/preservim/nerdtree/raw/master/screenshot.png)
+
+Installation
+------------
+
+Below are just some of the methods for installing NERDTree. Do not follow all of these instructions; just pick your favorite one. Other plugin managers exist, and NERDTree should install just fine with any of them.
+
+#### Vim 8+ packages
+
+If you are using VIM version 8 or higher you can use its built-in package management; see `:help packages` for more information. Just run these commands in your terminal:
+
+```bash
+git clone https://github.com/preservim/nerdtree.git ~/.vim/pack/vendor/start/nerdtree
+vim -u NONE -c "helptags ~/.vim/pack/vendor/start/nerdtree/doc" -c q
+```
+
+Otherwise, these are some of the several 3rd-party plugin managers you can choose from. Be sure you read the instructions for your chosen plugin, as there typically are additional steps you nee d to take.
+
+#### [pathogen.vim](https://github.com/tpope/vim-pathogen)
+
+In the terminal,
+```bash
+git clone https://github.com/preservim/nerdtree.git ~/.vim/bundle/nerdtree
+```
+In your vimrc,
+```vim
+call pathogen#infect()
+syntax on
+filetype plugin indent on
+```
+
+Then reload vim, run `:helptags ~/.vim/bundle/nerdtree/doc/` or `:Helptags`.
+
+#### [Vundle.vim](https://github.com/VundleVim/Vundle.vim)
+```vim
+call vundle#begin()
+Plugin 'preservim/nerdtree'
+call vundle#end()
+```
+
+#### [vim-plug](https://github.com/junegunn/vim-plug)
+```vim
+call plug#begin()
+Plug 'preservim/nerdtree'
+call plug#end()
+```
+
+#### [dein.vim](https://github.com/Shougo/dein.vim)
+```vim
+call dein#begin()
+call dein#add('preservim/nerdtree')
+call dein#end()
+```
+
+#### [apt-vim](https://github.com/egalpin/apt-vim)
+```bash
+apt-vim install -y https://github.com/preservim/nerdtree.git
+```
+
+F.A.Q. (here, and in the [Wiki](https://github.com/preservim/nerdtree/wiki))
+------
+
+#### Is there any support for `git` flags?
+
+Yes, install [nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin).
+
+---
+#### Can I have the nerdtree on every tab automatically?
+
+Nope. If this is something you want then chances are you aren't using tabs and
+buffers as they were intended to be used. Read this
+http://stackoverflow.com/questions/102384/using-vims-tabs-like-buffers
+
+If you are interested in this behaviour then consider [vim-nerdtree-tabs](https://github.com/jistr/vim-nerdtree-tabs)
+
+---
+#### How can I open a NERDTree automatically when vim starts up?
+
+Stick this in your vimrc: `autocmd vimenter * NERDTree`
+
+---
+#### How can I open a NERDTree automatically when vim starts up if no files were specified?
+
+Stick this in your vimrc:
+```vim
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+```
+
+Note: Now start vim with plain `vim`, not `vim .`
+
+---
+#### What if I'm also opening a saved session, for example `vim -S session_file.vim`? I don't want NERDTree to open in that scenario.
+```vim
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") && v:this_session == "" | NERDTree | endif
+```
+
+---
+#### How can I open NERDTree automatically when vim starts up on opening a directory?
+```vim
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
+```
+
+This window is tab-specific, meaning it's used by all windows in the tab. This trick also prevents NERDTree from hiding when first selecting a file.
+
+Note: Executing `vim ~/some-directory` will open NERDTree and a new edit window. `exe 'cd '.argv()[0]` sets the `pwd` of the new edit window to `~/some-directory`
+
+---
+#### How can I map a specific key or shortcut to open NERDTree?
+
+Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want):
+```vim
+map <C-n> :NERDTreeToggle<CR>
+```
+
+---
+#### How can I close vim if the only window left open is a NERDTree?
+
+Stick this in your vimrc:
+```vim
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+```
+
+---
+#### Can I have different highlighting for different file extensions?
+
+See here: https://github.com/preservim/nerdtree/issues/433#issuecomment-92590696
+
+---
+#### How can I change default arrows?
+
+Use these variables in your vimrc. Note that below are default arrow symbols
+```vim
+let g:NERDTreeDirArrowExpandable = '▸'
+let g:NERDTreeDirArrowCollapsible = '▾'
+```
+You can remove the arrows altogether by setting these variables to empty strings, as shown below. This will remove not only the arrows, but a single space following them, shifting the whole tree two character positions to the left.
+```vim
+let g:NERDTreeDirArrowExpandable = ''
+let g:NERDTreeDirArrowCollapsible = ''
+```
diff --git a/pack/navigation/start/nerdtree/_config.yml b/pack/navigation/start/nerdtree/_config.yml
new file mode 100644
index 0000000..c419263
--- /dev/null
+++ b/pack/navigation/start/nerdtree/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
\ No newline at end of file
diff --git a/pack/navigation/start/nerdtree/autoload/nerdtree.vim b/pack/navigation/start/nerdtree/autoload/nerdtree.vim
new file mode 100644
index 0000000..156b260
--- /dev/null
+++ b/pack/navigation/start/nerdtree/autoload/nerdtree.vim
@@ -0,0 +1,259 @@
+if exists('g:loaded_nerdtree_autoload')
+    finish
+endif
+let g:loaded_nerdtree_autoload = 1
+
+let s:rootNERDTreePath = resolve(expand('<sfile>:p:h:h'))
+
+"FUNCTION: nerdtree#version(...) {{{1
+"  If any value is given as an argument, the entire line of text from the
+"  change log is shown for the current version; otherwise, only the version
+"  number is shown.
+function! nerdtree#version(...) abort
+    let l:text = 'Unknown'
+    try
+        let l:changelog = readfile(join([s:rootNERDTreePath, 'CHANGELOG.md'], nerdtree#slash()))
+        let l:line = 0
+        while l:line <= len(l:changelog)
+            if l:changelog[l:line] =~# '\d\+\.\d\+'
+                let l:text = substitute(l:changelog[l:line], '.*\(\d\+.\d\+\).*', '\1', '')
+                let l:text .= substitute(l:changelog[l:line+1], '^.\{-}\(\.\d\+\).\{-}:\(.*\)', a:0>0 ? '\1:\2' : '\1', '')
+                break
+            endif
+            let l:line += 1
+        endwhile
+    catch
+    endtry
+    return l:text
+endfunction
+
+" SECTION: General Functions {{{1
+"============================================================
+
+"FUNCTION: nerdtree#slash() {{{2
+function! nerdtree#slash() abort
+
+    if nerdtree#runningWindows()
+        if exists('+shellslash') && &shellslash
+            return '/'
+        endif
+
+        return '\'
+    endif
+
+    return '/'
+endfunction
+
+"FUNCTION: nerdtree#and(x,y) {{{2
+" Implements and() function for Vim <= 7.2
+function! nerdtree#and(x,y) abort
+    if exists('*and')
+        return and(a:x, a:y)
+    else
+        let l:x = a:x
+        let l:y = a:y
+        let l:n = 0
+        let l:result = 0
+        while l:x > 0 && l:y > 0
+            if (l:x % 2) && (l:y % 2)
+                let l:result += float2nr(pow(2, l:n))
+            endif
+            let l:x = float2nr(l:x / 2)
+            let l:y = float2nr(l:y / 2)
+            let l:n += 1
+        endwhile
+        return l:result
+    endif
+endfunction
+
+"FUNCTION: nerdtree#checkForBrowse(dir) {{{2
+"inits a window tree in the current buffer if appropriate
+function! nerdtree#checkForBrowse(dir) abort
+    if !isdirectory(a:dir)
+        return
+    endif
+
+    if s:reuseWin(a:dir)
+        return
+    endif
+
+    call g:NERDTreeCreator.CreateWindowTree(a:dir)
+endfunction
+
+"FUNCTION: s:reuseWin(dir) {{{2
+"finds a NERDTree buffer with root of dir, and opens it.
+function! s:reuseWin(dir) abort
+    let path = g:NERDTreePath.New(fnamemodify(a:dir, ':p'))
+
+    for i in range(1, bufnr('$'))
+        unlet! nt
+        let nt = getbufvar(i, 'NERDTree')
+        if empty(nt)
+            continue
+        endif
+
+        if nt.isWinTree() && nt.root.path.equals(path)
+            call nt.setPreviousBuf(bufnr('#'))
+            exec 'buffer ' . i
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" FUNCTION: nerdtree#completeBookmarks(A,L,P) {{{2
+" completion function for the bookmark commands
+function! nerdtree#completeBookmarks(A,L,P) abort
+    return filter(g:NERDTreeBookmark.BookmarkNames(), 'v:val =~# "^' . a:A . '"')
+endfunction
+
+"FUNCTION: nerdtree#compareNodes(dir) {{{2
+function! nerdtree#compareNodes(n1, n2) abort
+    return a:n1.path.compareTo(a:n2.path)
+endfunction
+
+"FUNCTION: nerdtree#compareNodesBySortKey(n1, n2) {{{2
+function! nerdtree#compareNodesBySortKey(n1, n2) abort
+    let sortKey1 = a:n1.path.getSortKey()
+    let sortKey2 = a:n2.path.getSortKey()
+    let i = 0
+    while i < min([len(sortKey1), len(sortKey2)])
+        " Compare chunks upto common length.
+        " If chunks have different type, the one which has
+        " integer type is the lesser.
+        if type(sortKey1[i]) ==# type(sortKey2[i])
+            if sortKey1[i] <# sortKey2[i]
+                return - 1
+            elseif sortKey1[i] ># sortKey2[i]
+                return 1
+            endif
+        elseif type(sortKey1[i]) ==# v:t_number
+            return -1
+        elseif type(sortKey2[i]) ==# v:t_number
+            return 1
+        endif
+        let i = i + 1
+    endwhile
+
+    " Keys are identical upto common length.
+    " The key which has smaller chunks is the lesser one.
+    if len(sortKey1) < len(sortKey2)
+        return -1
+    elseif len(sortKey1) > len(sortKey2)
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+" FUNCTION: nerdtree#deprecated(func, [msg]) {{{2
+" Issue a deprecation warning for a:func. If a second arg is given, use this
+" as the deprecation message
+function! nerdtree#deprecated(func, ...) abort
+    let msg = a:0 ? a:func . ' ' . a:1 : a:func . ' is deprecated'
+
+    if !exists('s:deprecationWarnings')
+        let s:deprecationWarnings = {}
+    endif
+    if !has_key(s:deprecationWarnings, a:func)
+        let s:deprecationWarnings[a:func] = 1
+        echomsg msg
+    endif
+endfunction
+
+" FUNCTION: nerdtree#exec(cmd, ignoreAll) {{{2
+" Same as :exec cmd but, if ignoreAll is TRUE, set eventignore=all for the duration
+function! nerdtree#exec(cmd, ignoreAll) abort
+    let old_ei = &eventignore
+    if a:ignoreAll
+        set eventignore=all
+    endif
+    try
+        exec a:cmd
+    finally
+        let &eventignore = old_ei
+    endtry
+endfunction
+
+" FUNCTION: nerdtree#has_opt(options, name) {{{2
+function! nerdtree#has_opt(options, name) abort
+    return has_key(a:options, a:name) && a:options[a:name] ==# 1
+endfunction
+
+" FUNCTION: nerdtree#loadClassFiles() {{{2
+function! nerdtree#loadClassFiles() abort
+    runtime lib/nerdtree/path.vim
+    runtime lib/nerdtree/menu_controller.vim
+    runtime lib/nerdtree/menu_item.vim
+    runtime lib/nerdtree/key_map.vim
+    runtime lib/nerdtree/bookmark.vim
+    runtime lib/nerdtree/tree_file_node.vim
+    runtime lib/nerdtree/tree_dir_node.vim
+    runtime lib/nerdtree/opener.vim
+    runtime lib/nerdtree/creator.vim
+    runtime lib/nerdtree/flag_set.vim
+    runtime lib/nerdtree/nerdtree.vim
+    runtime lib/nerdtree/ui.vim
+    runtime lib/nerdtree/event.vim
+    runtime lib/nerdtree/notifier.vim
+endfunction
+
+" FUNCTION: nerdtree#postSourceActions() {{{2
+function! nerdtree#postSourceActions() abort
+    call g:NERDTreeBookmark.CacheBookmarks(1)
+    call nerdtree#ui_glue#createDefaultBindings()
+
+    "load all nerdtree plugins
+    runtime! nerdtree_plugin/**/*.vim
+endfunction
+
+"FUNCTION: nerdtree#runningWindows(dir) {{{2
+function! nerdtree#runningWindows() abort
+    return has('win16') || has('win32') || has('win64')
+endfunction
+
+"FUNCTION: nerdtree#runningCygwin(dir) {{{2
+function! nerdtree#runningCygwin() abort
+    return has('win32unix')
+endfunction
+
+" SECTION: View Functions {{{1
+"============================================================
+
+"FUNCTION: nerdtree#echo  {{{2
+"A wrapper for :echo. Appends 'NERDTree:' on the front of all messages
+"
+"Args:
+"msg: the message to echo
+function! nerdtree#echo(msg) abort
+    redraw
+    echomsg empty(a:msg) ? '' : ('NERDTree: ' . a:msg)
+endfunction
+
+"FUNCTION: nerdtree#echoError {{{2
+"Wrapper for nerdtree#echo, sets the message type to errormsg for this message
+"Args:
+"msg: the message to echo
+function! nerdtree#echoError(msg) abort
+    echohl errormsg
+    call nerdtree#echo(a:msg)
+    echohl normal
+endfunction
+
+"FUNCTION: nerdtree#echoWarning {{{2
+"Wrapper for nerdtree#echo, sets the message type to warningmsg for this message
+"Args:
+"msg: the message to echo
+function! nerdtree#echoWarning(msg) abort
+    echohl warningmsg
+    call nerdtree#echo(a:msg)
+    echohl normal
+endfunction
+
+"FUNCTION: nerdtree#renderView {{{2
+function! nerdtree#renderView() abort
+    call b:NERDTree.render()
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/autoload/nerdtree/ui_glue.vim b/pack/navigation/start/nerdtree/autoload/nerdtree/ui_glue.vim
new file mode 100644
index 0000000..aef1b04
--- /dev/null
+++ b/pack/navigation/start/nerdtree/autoload/nerdtree/ui_glue.vim
@@ -0,0 +1,698 @@
+if exists('g:loaded_nerdtree_ui_glue_autoload')
+    finish
+endif
+let g:loaded_nerdtree_ui_glue_autoload = 1
+
+" FUNCTION: nerdtree#ui_glue#createDefaultBindings() {{{1
+function! nerdtree#ui_glue#createDefaultBindings() abort
+    let s = '<SNR>' . s:SID() . '_'
+
+    call NERDTreeAddKeyMap({ 'key': '<MiddleMouse>', 'scope': 'all', 'callback': s . 'handleMiddleMouse' })
+    call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': 'all', 'callback': s.'handleLeftClick' })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'DirNode', 'callback': s.'activateDirNode' })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'FileNode', 'callback': s.'activateFileNode' })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'Bookmark', 'callback': s.'activateBookmark' })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': 'all', 'callback': s.'activateAll' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'FileNode', 'callback': s.'customOpenFile'})
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'DirNode', 'callback': s.'customOpenDir'})
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'Bookmark', 'callback': s.'customOpenBookmark'})
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCustomOpen, 'scope':'all', 'callback': s.'activateAll' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'DirNode', 'callback': s.'activateDirNode' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'FileNode', 'callback': s.'activateFileNode' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'Bookmark', 'callback': s.'activateBookmark' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Bookmark', 'callback': s.'previewBookmark' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'all', 'callback': s.'activateAll' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': 'Node', 'callback': s.'openHSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': 'Node', 'callback': s.'openVSplit' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Node', 'callback': s.'previewNodeCurrent' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': 'Node', 'callback': s.'previewNodeVSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': 'Node', 'callback': s.'previewNodeHSplit' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': 'DirNode', 'callback': s.'openNodeRecursively' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': 'all', 'callback': s . 'upDirCurrentRootClosed' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': 'all', 'callback': s . 'upDirCurrentRootOpen' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': 'Node', 'callback': s . 'chRoot' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': 'Node', 'callback': s.'chCwd' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': 'all', 'callback': s.'closeTreeWindow' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': 'all', 'callback': 'nerdtree#ui_glue#chRootCwd' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': 'all', 'callback': s.'refreshRoot' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': 'Node', 'callback': s.'refreshCurrent' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': 'all', 'callback': s.'displayHelp' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': 'all', 'callback': s.'toggleZoom' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': 'all', 'callback': s.'toggleShowHidden' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': 'all', 'callback': s.'toggleIgnoreFilter' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': 'all', 'callback': s.'toggleShowFiles' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': 'all', 'callback': s.'toggleShowBookmarks' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': 'Node', 'callback': s.'closeCurrentDir' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': 'DirNode', 'callback': s.'closeChildren' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': 'Node', 'callback': s.'showMenu' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': 'Node', 'callback': s.'jumpToParent' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': 'Node', 'callback': s.'jumpToFirstChild' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': 'Node', 'callback': s.'jumpToLastChild' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': 'all', 'callback': s.'jumpToRoot' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': 'Node', 'callback': s.'jumpToNextSibling' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': 'Node', 'callback': s.'jumpToPrevSibling' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Node', 'callback': s . 'openInNewTab' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Node', 'callback': s . 'openInNewTabSilent' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Bookmark', 'callback': s . 'openInNewTab' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Bookmark', 'callback': s . 'openInNewTabSilent' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': 'DirNode', 'callback': s.'openExplorer' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': 'FileNode', 'callback': s.'openExplorer' })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': 'Bookmark', 'callback': s.'deleteBookmark' })
+endfunction
+
+
+"SECTION: Interface bindings {{{1
+"============================================================
+
+"FUNCTION: s:customOpenFile() {{{1
+" Open file node with the 'custom' key, initially <CR>.
+function! s:customOpenFile(node) abort
+    call a:node.activate(s:initCustomOpenArgs().file)
+endfunction
+
+"FUNCTION: s:customOpenDir() {{{1
+" Open directory node with the 'custom' key, initially <CR>.
+function! s:customOpenDir(node) abort
+    call s:activateDirNode(a:node, s:initCustomOpenArgs().dir)
+endfunction
+
+"FUNCTION: s:customOpenBookmark() {{{1
+" Open bookmark node with the 'custom' key, initially <CR>.
+function! s:customOpenBookmark(node) abort
+    if a:node.path.isDirectory
+        call a:node.activate(b:NERDTree, s:initCustomOpenArgs().dir)
+    else
+        call a:node.activate(b:NERDTree, s:initCustomOpenArgs().file)
+    endif
+endfunction
+
+"FUNCTION: s:initCustomOpenArgs() {{{1
+" Make sure NERDTreeCustomOpenArgs has needed keys
+function! s:initCustomOpenArgs() abort
+    let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
+    return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
+endfunction
+
+"FUNCTION: s:activateAll() {{{1
+"handle the user activating the updir line
+function! s:activateAll() abort
+    if getline('.') ==# g:NERDTreeUI.UpDirLine()
+        return nerdtree#ui_glue#upDir(0)
+    endif
+endfunction
+
+" FUNCTION: s:activateDirNode(directoryNode, options) {{{1
+" Open a directory with optional options
+function! s:activateDirNode(directoryNode, ...) abort
+
+    if a:directoryNode.isRoot() && a:directoryNode.isOpen
+        call nerdtree#echo('cannot close tree root')
+        return
+    endif
+
+    call a:directoryNode.activate((a:0 > 0) ? a:1 : {})
+endfunction
+
+"FUNCTION: s:activateFileNode() {{{1
+"handle the user activating a tree node
+function! s:activateFileNode(node) abort
+    call a:node.activate({'reuse': 'all', 'where': 'p'})
+endfunction
+
+"FUNCTION: s:activateBookmark(bookmark) {{{1
+"handle the user activating a bookmark
+function! s:activateBookmark(bm) abort
+    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p'} : {})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
+" Associate the current node with the given name
+function! nerdtree#ui_glue#bookmarkNode(...) abort
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode !=# {}
+        let name = a:1
+        if empty(name)
+            let name = currentNode.path.getLastPathComponent(0)
+        endif
+        try
+            call currentNode.bookmark(name)
+            call b:NERDTree.render()
+        catch /^NERDTree.IllegalBookmarkNameError/
+            call nerdtree#echo('bookmark names must not contain spaces')
+        endtry
+    else
+        call nerdtree#echo('select a node first')
+    endif
+endfunction
+
+" FUNCTION: s:chCwd(node) {{{1
+function! s:chCwd(node) abort
+    try
+        call a:node.path.changeToDir()
+    catch /^NERDTree.PathChangeError/
+        call nerdtree#echoWarning('could not change cwd')
+    endtry
+endfunction
+
+" FUNCTION: s:chRoot(node) {{{1
+" changes the current root to the selected one
+function! s:chRoot(node) abort
+    call b:NERDTree.changeRoot(a:node)
+endfunction
+
+" FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
+" Change the NERDTree root to match the current working directory.
+function! nerdtree#ui_glue#chRootCwd() abort
+    NERDTreeCWD
+endfunction
+
+" FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
+function! nerdtree#ui_glue#clearBookmarks(bookmarks) abort
+    if a:bookmarks ==# ''
+        let currentNode = g:NERDTreeFileNode.GetSelected()
+        if currentNode !=# {}
+            call currentNode.clearBookmarks()
+        endif
+    else
+        for name in split(a:bookmarks, ' ')
+            let bookmark = g:NERDTreeBookmark.BookmarkFor(name)
+            call bookmark.delete()
+        endfor
+    endif
+    call b:NERDTree.root.refresh()
+    call b:NERDTree.render()
+endfunction
+
+" FUNCTION: s:closeChildren(node) {{{1
+" closes all childnodes of the current node
+function! s:closeChildren(node) abort
+    call a:node.closeChildren()
+    call b:NERDTree.render()
+    call a:node.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:closeCurrentDir(node) {{{1
+" Close the parent directory of the current node.
+function! s:closeCurrentDir(node) abort
+
+    if a:node.isRoot()
+        call nerdtree#echo('cannot close parent of tree root')
+        return
+    endif
+
+    let l:parent = a:node.parent
+
+    while l:parent.isCascadable()
+        let l:parent = l:parent.parent
+    endwhile
+
+    if l:parent.isRoot()
+        call nerdtree#echo('cannot close tree root')
+        return
+    endif
+
+    call l:parent.close()
+    call b:NERDTree.render()
+    call l:parent.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:closeTreeWindow() {{{1
+" close the tree window
+function! s:closeTreeWindow() abort
+    if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() !=# -1
+        exec 'buffer ' . b:NERDTree.previousBuf()
+    else
+        if winnr('$') > 1
+            call g:NERDTree.Close()
+        else
+            call nerdtree#echo('Cannot close last window')
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:deleteBookmark(bookmark) {{{1
+" Prompt the user to confirm the deletion of the selected bookmark.
+function! s:deleteBookmark(bookmark) abort
+    let l:message = 'Delete the bookmark "' . a:bookmark.name
+                \ . '" from the bookmark list?'
+
+    let l:choices = "&Yes\n&No"
+
+    echo | redraw
+    let l:selection = confirm(l:message, l:choices, 1, 'Warning')
+
+    if l:selection !=# 1
+        call nerdtree#echo('bookmark not deleted')
+        return
+    endif
+
+    try
+        call a:bookmark.delete()
+        silent call b:NERDTree.root.refresh()
+        call b:NERDTree.render()
+        echo | redraw
+    catch /^NERDTree/
+        call nerdtree#echoWarning('could not remove bookmark')
+    endtry
+endfunction
+
+" FUNCTION: s:displayHelp() {{{1
+" toggles the help display
+function! s:displayHelp() abort
+    call b:NERDTree.ui.toggleHelp()
+    call b:NERDTree.render()
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:findAndRevealPath(pathStr) {{{1
+function! s:findAndRevealPath(pathStr) abort
+    let l:pathStr = !empty(a:pathStr) ? a:pathStr : expand('%:p')
+    let l:revealOpts = {}
+
+    if empty(l:pathStr)
+        call nerdtree#echoWarning('no file for the current buffer')
+        return
+    endif
+
+    if !filereadable(l:pathStr)
+        let l:pathStr = fnamemodify(l:pathStr, ':h')
+        let l:revealOpts['open'] = 1
+    endif
+
+    try
+        let l:pathStr = g:NERDTreePath.Resolve(l:pathStr)
+        let l:pathObj = g:NERDTreePath.New(l:pathStr)
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echoWarning('invalid path')
+        return
+    endtry
+
+    if !g:NERDTree.ExistsForTab()
+        try
+            let l:cwd = g:NERDTreePath.New(getcwd())
+        catch /^NERDTree.InvalidArgumentsError/
+            call nerdtree#echo('current directory does not exist.')
+            let l:cwd = l:pathObj.getParent()
+        endtry
+
+        if l:pathObj.isUnder(l:cwd)
+            call g:NERDTreeCreator.CreateTabTree(l:cwd.str())
+        else
+            call g:NERDTreeCreator.CreateTabTree(l:pathObj.getParent().str())
+        endif
+    else
+        NERDTreeFocus
+
+        if !l:pathObj.isUnder(b:NERDTree.root.path)
+            call s:chRoot(g:NERDTreeDirNode.New(l:pathObj.getParent(), b:NERDTree))
+        endif
+    endif
+
+    if l:pathObj.isHiddenUnder(b:NERDTree.root.path)
+        call b:NERDTree.ui.setShowHidden(1)
+    endif
+
+    let l:node = b:NERDTree.root.reveal(l:pathObj, l:revealOpts)
+    call b:NERDTree.render()
+    call l:node.putCursorHere(1, 0)
+endfunction
+
+"FUNCTION: s:handleLeftClick() {{{1
+"Checks if the click should open the current node
+function! s:handleLeftClick() abort
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode !=# {}
+
+        "the dir arrows are multibyte chars, and vim's string functions only
+        "deal with single bytes - so split the line up with the hack below and
+        "take the line substring manually
+        let line = split(getline(line('.')), '\zs')
+        let startToCur = ''
+        for i in range(0,len(line)-1)
+            let startToCur .= line[i]
+        endfor
+
+        if currentNode.path.isDirectory
+            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \?$'
+                call currentNode.activate()
+                return
+            endif
+        endif
+
+        if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3
+            let char = strpart(startToCur, strlen(startToCur)-1, 1)
+            if char !~# g:NERDTreeUI.MarkupReg()
+                if currentNode.path.isDirectory
+                    call currentNode.activate()
+                else
+                    call currentNode.activate({'reuse': 'all', 'where': 'p'})
+                endif
+                return
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:handleMiddleMouse() {{{1
+function! s:handleMiddleMouse() abort
+
+    " A middle mouse click does not automatically position the cursor as one
+    " would expect. Forcing the execution of a regular left mouse click here
+    " fixes this problem.
+    execute "normal! \<LeftMouse>"
+
+    let l:currentNode = g:NERDTreeFileNode.GetSelected()
+    if empty(l:currentNode)
+        call nerdtree#echoError('use the pointer to select a node')
+        return
+    endif
+
+    if l:currentNode.path.isDirectory
+        call l:currentNode.openExplorer()
+    else
+        call l:currentNode.open({'where': 'h'})
+    endif
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#invokeKeyMap(key) {{{1
+"this is needed since I cant figure out how to invoke dict functions from a
+"key map
+function! nerdtree#ui_glue#invokeKeyMap(key) abort
+    call g:NERDTreeKeyMap.Invoke(a:key)
+endfunction
+
+" FUNCTION: s:jumpToFirstChild(node) {{{1
+function! s:jumpToFirstChild(node) abort
+    call s:jumpToChild(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToLastChild(node) {{{1
+function! s:jumpToLastChild(node) abort
+    call s:jumpToChild(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToChild(node, last) {{{1
+" Jump to the first or last child node at the same file system level.
+"
+" Args:
+" node: the node on which the cursor currently sits
+" last: 1 (true) if jumping to last child, 0 (false) if jumping to first
+function! s:jumpToChild(node, last) abort
+    let l:node = a:node.path.isDirectory ? a:node.getCascadeRoot() : a:node
+
+    if l:node.isRoot()
+        return
+    endif
+
+    let l:parent = l:node.parent
+    let l:children = l:parent.getVisibleChildren()
+
+    let l:target = a:last ? l:children[len(l:children) - 1] : l:children[0]
+
+    call l:target.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:jumpToParent(node) {{{1
+" Move the cursor to the parent of the specified node.  For a cascade, move to
+" the parent of the cascade's first node.  At the root node, do nothing.
+function! s:jumpToParent(node) abort
+    let l:node = a:node.path.isDirectory ? a:node.getCascadeRoot() : a:node
+
+    if l:node.isRoot()
+        return
+    endif
+
+    if empty(l:node.parent)
+        call nerdtree#echo('could not jump to parent node')
+        return
+    endif
+
+    call l:node.parent.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:jumpToRoot() {{{1
+" moves the cursor to the root node
+function! s:jumpToRoot() abort
+    call b:NERDTree.root.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:jumpToNextSibling(node) {{{1
+function! s:jumpToNextSibling(node) abort
+    call s:jumpToSibling(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToPrevSibling(node) {{{1
+function! s:jumpToPrevSibling(node) abort
+    call s:jumpToSibling(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToSibling(node, forward) {{{1
+" Move the cursor to the next or previous node at the same file system level.
+"
+" Args:
+" node: the node on which the cursor currently sits
+" forward: 0 to jump to previous sibling, 1 to jump to next sibling
+function! s:jumpToSibling(node, forward) abort
+    let l:node = a:node.path.isDirectory ? a:node.getCascadeRoot() : a:node
+    let l:sibling = l:node.findSibling(a:forward)
+
+    if empty(l:sibling)
+        return
+    endif
+
+    call l:sibling.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
+" Open the Bookmark that has the specified name. This function provides the
+" implementation for the :OpenBookmark command.
+function! nerdtree#ui_glue#openBookmark(name) abort
+    try
+        let l:bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
+    catch /^NERDTree.BookmarkNotFoundError/
+        call nerdtree#echoError('bookmark "' . a:name . '" not found')
+        return
+    endtry
+    if l:bookmark.path.isDirectory
+        call l:bookmark.open(b:NERDTree)
+    else
+        call l:bookmark.open(b:NERDTree, {'where': 'p'})
+    endif
+endfunction
+
+" FUNCTION: s:openHSplit(target) {{{1
+function! s:openHSplit(target) abort
+    call a:target.activate({'where': 'h'})
+endfunction
+
+" FUNCTION: s:openVSplit(target) {{{1
+function! s:openVSplit(target) abort
+    call a:target.activate({'where': 'v'})
+endfunction
+
+" FUNCTION: s:openExplorer(node) {{{1
+function! s:openExplorer(node) abort
+    call a:node.openExplorer()
+endfunction
+
+" FUNCTION: s:openInNewTab(target) {{{1
+function! s:openInNewTab(target) abort
+    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't'})
+    call l:opener.open(a:target)
+endfunction
+
+" FUNCTION: s:openInNewTabSilent(target) {{{1
+function! s:openInNewTabSilent(target) abort
+    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't', 'stay': 1})
+    call l:opener.open(a:target)
+endfunction
+
+" FUNCTION: s:openNodeRecursively(node) {{{1
+function! s:openNodeRecursively(node) abort
+    call nerdtree#echo('Recursively opening node. Please wait...')
+    call a:node.openRecursively()
+    call b:NERDTree.render()
+    call nerdtree#echo('')
+endfunction
+
+" FUNCTION: s:previewBookmark(bookmark) {{{1
+function! s:previewBookmark(bookmark) abort
+    if a:bookmark.path.isDirectory
+        execute 'NERDTreeFind '.a:bookmark.path.str()
+    else
+        call a:bookmark.activate(b:NERDTree, {'stay': 1, 'where': 'p', 'keepopen': 1})
+    endif
+endfunction
+
+"FUNCTION: s:previewNodeCurrent(node) {{{1
+function! s:previewNodeCurrent(node) abort
+    call a:node.open({'stay': 1, 'where': 'p', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeHSplit(node) {{{1
+function! s:previewNodeHSplit(node) abort
+    call a:node.open({'stay': 1, 'where': 'h', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeVSplit(node) {{{1
+function! s:previewNodeVSplit(node) abort
+    call a:node.open({'stay': 1, 'where': 'v', 'keepopen': 1})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#revealBookmark(name) {{{1
+" put the cursor on the node associate with the given name
+function! nerdtree#ui_glue#revealBookmark(name) abort
+    try
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
+        call targetNode.putCursorHere(0, 1)
+    catch /^NERDTree.BookmarkNotFoundError/
+        call nerdtree#echo('Bookmark isnt cached under the current root')
+    endtry
+endfunction
+
+" FUNCTION: s:refreshRoot() {{{1
+" Reloads the current root. All nodes below this will be lost and the root dir
+" will be reloaded.
+function! s:refreshRoot() abort
+    if !g:NERDTree.IsOpen()
+        return
+    endif
+    call nerdtree#echo('Refreshing the root node. This could take a while...')
+
+    let l:curWin = winnr()
+    call nerdtree#exec(g:NERDTree.GetWinNum() . 'wincmd w', 1)
+    call b:NERDTree.root.refresh()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#exec(l:curWin . 'wincmd w', 1)
+    call nerdtree#echo('')
+endfunction
+
+" FUNCTION: s:refreshCurrent(node) {{{1
+" refreshes the root for the current node
+function! s:refreshCurrent(node) abort
+    let node = a:node
+    if !node.path.isDirectory
+        let node = node.parent
+    endif
+
+    call nerdtree#echo('Refreshing node. This could take a while...')
+    call node.refresh()
+    call b:NERDTree.render()
+    call nerdtree#echo('')
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
+function! nerdtree#ui_glue#setupCommands() abort
+    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreateTabTree('<args>')
+    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.ToggleTabTree('<args>')
+    command! -n=0 -bar NERDTreeClose :call g:NERDTree.Close()
+    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreateTabTree('<args>')
+    command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
+    command! -n=? -complete=file -bar NERDTreeFind call s:findAndRevealPath('<args>')
+    command! -n=0 -bar NERDTreeRefreshRoot call s:refreshRoot()
+    command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
+    command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
+endfunction
+
+" Function: s:SID()   {{{1
+function! s:SID() abort
+    if !exists('s:sid')
+        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+    endif
+    return s:sid
+endfun
+
+" FUNCTION: s:showMenu(node) {{{1
+function! s:showMenu(node) abort
+    let mc = g:NERDTreeMenuController.New(g:NERDTreeMenuItem.AllEnabled())
+    call mc.showMenu()
+endfunction
+
+" FUNCTION: s:toggleIgnoreFilter() {{{1
+function! s:toggleIgnoreFilter() abort
+    call b:NERDTree.ui.toggleIgnoreFilter()
+endfunction
+
+" FUNCTION: s:toggleShowBookmarks() {{{1
+function! s:toggleShowBookmarks() abort
+    call b:NERDTree.ui.toggleShowBookmarks()
+endfunction
+
+" FUNCTION: s:toggleShowFiles() {{{1
+function! s:toggleShowFiles() abort
+    call b:NERDTree.ui.toggleShowFiles()
+endfunction
+
+" FUNCTION: s:toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:toggleShowHidden() abort
+    call b:NERDTree.ui.toggleShowHidden()
+endfunction
+
+" FUNCTION: s:toggleZoom() {{{1
+function! s:toggleZoom() abort
+    call b:NERDTree.ui.toggleZoom()
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#upDir(preserveState) {{{1
+" Move the NERDTree up one level.
+"
+" Args:
+" preserveState: if 1, the current root is left open when the new tree is
+" rendered; if 0, the current root node is closed
+function! nerdtree#ui_glue#upDir(preserveState) abort
+
+    try
+        call b:NERDTree.root.cacheParent()
+    catch /^NERDTree.CannotCacheParentError/
+        call nerdtree#echo('already at root directory')
+        return
+    endtry
+
+    let l:oldRoot = b:NERDTree.root
+    let l:newRoot = b:NERDTree.root.parent
+
+    call l:newRoot.open()
+    call l:newRoot.transplantChild(l:oldRoot)
+
+    if !a:preserveState
+        call l:oldRoot.close()
+    endif
+
+    call b:NERDTree.changeRoot(l:newRoot)
+    call l:oldRoot.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:upDirCurrentRootOpen() {{{1
+function! s:upDirCurrentRootOpen() abort
+    call nerdtree#ui_glue#upDir(1)
+endfunction
+
+" FUNCTION: s:upDirCurrentRootClosed() {{{1
+function! s:upDirCurrentRootClosed() abort
+    call nerdtree#ui_glue#upDir(0)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/doc/NERDTree.txt b/pack/navigation/start/nerdtree/doc/NERDTree.txt
new file mode 100644
index 0000000..6c11a94
--- /dev/null
+++ b/pack/navigation/start/nerdtree/doc/NERDTree.txt
@@ -0,0 +1,1528 @@
+*NERDTree.txt*   A tree explorer plugin to rule the Vim world. Bwahahaha!!
+
+                                    # #### ####                                ~
+                                  ### \/#|### |/####                           ~
+   d8   888                      ##\/#/ \||/##/_/##/_#                         ~
+  d88   888 ee   ,e e,         ###  \/###|/ \/ # ###                           ~
+ d88888 888 88b d88 88b      ##_\_#\_\## | #/###_/_####                        ~
+  888   888 888 888   ,     ## #### # \ #| /  #### ##/##                       ~
+  888   888 888  "YeeP"     __#_--###`. |{,###---###-~                         ~
+                                     \ % @%                                    ~
+  Y88b Y88 888'Y88 888 88e  888 88e   \%@%  88P'888'Y88                        ~
+   Y88b Y8 888 ,'Y 888 888D 888 888b   %o%  P'  888  'Y 888,8,  ,e e,   ,e e,  ~
+  b Y88b Y 888C8   888 88"  888 8888D  %@%      888     888 "  d88 88b d88 88b ~
+  8b Y88b  888 ",d 888 b,   888 888P   %@%      888     888    888   , 888   , ~
+  88b Y88b 888,d88 888 88b, 888 88"    %@%      888     888     "YeeP"  "YeeP" ~
+                                 , -=-%{@%-^- _                                ~
+                                   ejm `}               Reference Manual       ~
+                                        {                                      ~
+==============================================================================
+CONTENTS                                                     *NERDTree-contents*
+
+    1.Intro...................................|NERDTree|
+    2.Functionality provided..................|NERDTreeFunctionality|
+        2.1.Global commands...................|NERDTreeGlobalCommands|
+        2.2.Bookmarks.........................|NERDTreeBookmarks|
+            2.2.1.The bookmark table..........|NERDTreeBookmarkTable|
+            2.2.2.Bookmark commands...........|NERDTreeBookmarkCommands|
+            2.2.3.Invalid bookmarks...........|NERDTreeInvalidBookmarks|
+        2.3.NERDTree mappings.................|NERDTreeMappings|
+        2.4.The NERDTree menu.................|NERDTreeMenu|
+    3.Settings................................|NERDTreeSettings|
+        3.1.Settings summary..................|NERDTreeSettingsSummary|
+        3.2.Settings details..................|NERDTreeSettingsDetails|
+    4.The NERDTree API........................|NERDTreeAPI|
+        4.1.Key map API.......................|NERDTreeKeymapAPI|
+        4.2.Menu API..........................|NERDTreeMenuAPI|
+        4.3.Menu API..........................|NERDTreeAddPathFilter()|
+        4.4.Path Listener API.................|NERDTreePathListenerAPI|
+    5.About...................................|NERDTreeAbout|
+    6.License.................................|NERDTreeLicense|
+
+==============================================================================
+1. Intro                                                              *NERDTree*
+
+What is this "NERDTree"??
+
+The NERDTree allows you to explore your filesystem and to open files and
+directories. It presents the filesystem to you in the form of a tree which you
+manipulate with the keyboard and/or mouse. It also allows you to perform
+simple filesystem operations.
+
+The following features and functionality are provided by the NERDTree:
+    * Files and directories are displayed in a hierarchical tree structure
+    * Different highlighting is provided for the following types of nodes:
+        * files
+        * directories
+        * sym-links
+        * windows .lnk files
+        * read-only files
+        * executable files
+    * Many (customisable) mappings are provided to manipulate the tree:
+        * Mappings to open/close/explore directory nodes
+        * Mappings to open files in new/existing windows/tabs
+        * Mappings to change the current root of the tree
+        * Mappings to navigate around the tree
+        * ...
+    * Directories and files can be bookmarked.
+    * Most NERDTree navigation can also be done with the mouse
+    * Filtering of tree content (can be toggled at runtime)
+        * custom file filters to prevent e.g. vim backup files being displayed
+        * optional displaying of hidden files (. files)
+        * files can be "turned off" so that only directories are displayed
+    * The position and size of the NERDTree window can be customised
+    * The order in which the nodes in the tree are listed can be customised.
+    * A model of your filesystem is created/maintained as you explore it. This
+      has several advantages:
+        * All filesystem information is cached and is only re-read on demand
+        * If you revisit a part of the tree that you left earlier in your
+          session, the directory nodes will be opened/closed as you left them
+    * The script remembers the cursor position and window position in the NERD
+      tree so you can toggle it off (or just close the tree window) and then
+      reopen it (with NERDTreeToggle) the NERDTree window will appear exactly
+      as you left it
+    * You can have a separate NERDTree for each tab, share trees across tabs,
+      or a mix of both.
+    * By default the script overrides the default file browser (netrw), so if
+      you :edit a directory a (slightly modified) NERDTree will appear in the
+      current window
+    * A programmable menu system is provided (simulates right clicking on a
+      node)
+        * one default menu plugin is provided to perform basic filesystem
+          operations (create/delete/move/copy files/directories)
+    * There's an API for adding your own keymappings
+
+
+==============================================================================
+2. Functionality provided                                *NERDTreeFunctionality*
+
+------------------------------------------------------------------------------
+2.1. Global Commands                                    *NERDTreeGlobalCommands*
+
+:NERDTree [<start-directory> | <bookmark>]                           *:NERDTree*
+    Opens a fresh NERDTree. The root of the tree depends on the argument
+    given. There are 3 cases: If no argument is given, the current directory
+    will be used.  If a directory is given, that will be used. If a bookmark
+    name is given, the corresponding directory will be used.  For example: >
+        :NERDTree /home/marty/vim7/src
+        :NERDTree foo   (foo is the name of a bookmark)
+<
+:NERDTreeVCS [<start-directory> | <bookmark>]                     *:NERDTreeVCS*
+    Like |:NERDTree|, but searches up the directory tree to find the top of
+    the version control system repository, and roots the NERDTree there. It
+    works with Git, Subversion, Mercurial, Bazaar, and Darcs repositories. A
+    couple of examples: >
+        :NERDTreeVCS /home/marty/nerdtree/doc  (opens /home/marty/nerdtree)
+        :NERDTreeVCS              (opens root of repository containing CWD)
+<
+:NERDTreeFromBookmark <bookmark>                         *:NERDTreeFromBookmark*
+    Opens a fresh NERDTree with the root initialized to the dir for
+    <bookmark>.  The only reason to use this command over :NERDTree is for
+    the completion (which is for bookmarks rather than directories).
+
+:NERDTreeToggle [<start-directory> | <bookmark>]               *:NERDTreeToggle*
+    If a NERDTree already exists for this tab, it is reopened and rendered
+    again. If <start-directory> or <bookmark> is given, the root of NERDTree
+    is set to that path. If no NERDTree exists for this tab then this command
+    acts the same as the |:NERDTree| command.
+
+:NERDTreeToggleVCS [<start-directory> | <bookmark>]            *:NERDTreeToggleVCS*
+    Like |:NERDTreeToggle|, but searches up the directory tree to find the top of
+    the version control system repository, and roots the NERDTree there. It
+    works with Git, Subversion, Mercurial, Bazaar, and Darcs repositories. A
+    couple of examples: >
+        :NERDTreeToggleVCS /home/marty/nerdtree/doc  (opens /home/marty/nerdtree)
+        :NERDTreeToggleVCS              (opens root of repository containing CWD)
+
+:NERDTreeFocus                                                  *:NERDTreeFocus*
+    Opens (or reopens) the NERDTree if it is not currently visible;
+    otherwise, the cursor is moved to the already-open NERDTree.
+
+:NERDTreeMirror                                                *:NERDTreeMirror*
+    Shares an existing NERDTree, from another tab, in the current tab.
+    Changes made to one tree are reflected in both as they are actually the
+    same buffer.
+
+    If only one other NERDTree exists, that tree is automatically mirrored.
+    If more than one exists, the script will ask which tree to mirror.
+
+:NERDTreeClose                                                  *:NERDTreeClose*
+    Close the NERDTree in this tab.
+
+:NERDTreeFind [<path>]                                           *:NERDTreeFind*
+    Without the optional argument, find and reveal the file for the active
+    buffer in the NERDTree window.  With the <path> argument, find and
+    reveal the specified path.
+
+    Focus will be shifted to the NERDTree window, and the cursor will be
+    placed on the tree node for the determined path.  If a NERDTree for the
+    current tab does not exist, a new one will be initialized.
+
+:NERDTreeCWD                                                      *:NERDTreeCWD*
+    Change the NERDTree root to the current working directory.  If no
+    NERDTree exists for this tab, a new one is opened.
+
+:NERDTreeRefreshRoot                                      *:NERDTreeRefreshRoot*
+    Refreshes the NERDTree root node.
+
+------------------------------------------------------------------------------
+2.2. Bookmarks                                               *NERDTreeBookmarks*
+
+Bookmarks in the NERDTree are a way to tag files or directories of interest.
+For example, you could use bookmarks to tag all of your project directories.
+
+------------------------------------------------------------------------------
+2.2.1. The Bookmark Table                                *NERDTreeBookmarkTable*
+
+If the bookmark table is active (see |NERDTree-B| and
+|NERDTreeShowBookmarks|), it will be rendered above the tree. You can double
+click bookmarks or use the |NERDTree-o| mapping to activate them. See also,
+|NERDTree-t| and |NERDTree-T|
+
+------------------------------------------------------------------------------
+2.2.2. Bookmark commands                              *NERDTreeBookmarkCommands*
+
+Note: The following commands are only available within the NERDTree buffer.
+
+:Bookmark [<name>]
+    Bookmark the current node as <name>. If there is already a <name>
+    bookmark, it is overwritten. <name> must not contain spaces.
+    If <name> is not provided, it defaults to the file or directory name.
+    For directories, a trailing slash is present.
+
+:BookmarkToRoot <bookmark>
+    Make the directory corresponding to <bookmark> the new root. If a treenode
+    corresponding to <bookmark> is already cached somewhere in the tree then
+    the current tree will be used, otherwise a fresh tree will be opened.
+    Note that if <bookmark> points to a file then its parent will be used
+    instead.
+
+:RevealBookmark <bookmark>
+    If the node is cached under the current root then it will be revealed
+    (i.e. directory nodes above it will be opened) and the cursor will be
+    placed on it.
+
+:OpenBookmark <name>
+    The Bookmark named <name> is opened as if |NERDTree-o| was applied to
+    its entry in the Bookmark table. If the Bookmark points to a directory,
+    it is made the new root of the current NERDTree. If the Bookmark points
+    to a file, that file is opened for editing in another window.
+
+:ClearBookmarks [<bookmarks>]
+    Remove all the given bookmarks. If no bookmarks are given then remove all
+    bookmarks on the current node.
+
+:ClearAllBookmarks
+    Remove all bookmarks.
+
+:EditBookmarks
+    Opens the bookmarks file for manual editing, e.g. for removing invalid
+    bookmarks.
+
+:ReadBookmarks
+    Re-read the bookmarks in the |NERDTreeBookmarksFile|.
+
+See also |:NERDTree| and |:NERDTreeFromBookmark|.
+
+------------------------------------------------------------------------------
+2.2.3. Invalid Bookmarks                              *NERDTreeInvalidBookmarks*
+
+If invalid bookmarks are detected, the script will issue an error message and
+the invalid bookmarks will become unavailable for use.
+
+These bookmarks will still be stored in the bookmarks file (see
+|NERDTreeBookmarksFile|), down at the bottom. There will always be a blank line
+after the valid bookmarks but before the invalid ones.
+
+Each line in the bookmarks file represents one bookmark. The proper format is:
+<bookmark name><space><full path to the bookmark location>
+
+You can use the :EditBookmarks command to open the bookmarks file for editing.
+After you have corrected any invalid bookmarks, either restart vim, or run
+:ReadBookmarks from the NERDTree window.
+
+------------------------------------------------------------------------------
+2.3. NERDTree Mappings                                        *NERDTreeMappings*
+
+Default~
+Key      Description                                                  help-tag~
+
+o........Open files, directories and bookmarks......................|NERDTree-o|
+go.......Open selected file, but leave cursor in the NERDTree......|NERDTree-go|
+         Open selected bookmark dir in current NERDTree
+t........Open selected node/bookmark in a new tab...................|NERDTree-t|
+T........Same as 't' but keep the focus on the current tab..........|NERDTree-T|
+i........Open selected file in a split window.......................|NERDTree-i|
+gi.......Same as i, but leave the cursor on the NERDTree...........|NERDTree-gi|
+s........Open selected file in a new vsplit.........................|NERDTree-s|
+gs.......Same as s, but leave the cursor on the NERDTree...........|NERDTree-gs|
+<CR>.....User-definable custom open action.......................|NERDTree-<CR>|
+O........Recursively open the selected directory....................|NERDTree-O|
+x........Close the current nodes parent.............................|NERDTree-x|
+X........Recursively close all children of the current node.........|NERDTree-X|
+e........Edit the current dir.......................................|NERDTree-e|
+
+double-click....same as |NERDTree-o|.
+middle-click....same as |NERDTree-i| for files, and |NERDTree-e| for dirs.
+
+D........Delete the current bookmark ...............................|NERDTree-D|
+
+P........Jump to the root node......................................|NERDTree-P|
+p........Jump to current nodes parent...............................|NERDTree-p|
+K........Jump up inside directories at the current tree depth.......|NERDTree-K|
+J........Jump down inside directories at the current tree depth.....|NERDTree-J|
+<C-J>....Jump down to next sibling of the current directory.......|NERDTree-C-J|
+<C-K>....Jump up to previous sibling of the current directory.....|NERDTree-C-K|
+
+C........Change the tree root to the selected dir...................|NERDTree-C|
+u........Move the tree root up one directory........................|NERDTree-u|
+U........Same as 'u' except the old root node is left open..........|NERDTree-U|
+r........Recursively refresh the current directory..................|NERDTree-r|
+R........Recursively refresh the current root.......................|NERDTree-R|
+m........Display the NERDTree menu..................................|NERDTree-m|
+cd.......Change the CWD to the dir of the selected node............|NERDTree-cd|
+CD.......Change tree root to the CWD...............................|NERDTree-CD|
+
+I........Toggle whether hidden files displayed......................|NERDTree-I|
+f........Toggle whether the file filters are used...................|NERDTree-f|
+F........Toggle whether files are displayed.........................|NERDTree-F|
+B........Toggle whether the bookmark table is displayed.............|NERDTree-B|
+
+q........Close the NERDTree window..................................|NERDTree-q|
+A........Zoom (maximize/minimize) the NERDTree window...............|NERDTree-A|
+?........Toggle the display of the quick help.......................|NERDTree-?|
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-o*
+Default key: o
+Map setting: NERDTreeMapActivateNode
+Applies to: files and directories.
+
+If a file node is selected, it is opened in the previous window.
+
+If a directory is selected it is opened or closed depending on its current
+state.
+
+If a bookmark that links to a directory is selected then that directory
+becomes the new root.
+
+If a bookmark that links to a file is selected then that file is opened in the
+previous window.
+
+------------------------------------------------------------------------------
+                                                                   *NERDTree-go*
+Default key: go
+Map setting: NERDTreeMapPreview
+Applies to: files.
+
+If a file node or a bookmark that links to a file is selected, it is opened in
+the previous window, but the cursor does not move.
+
+If a bookmark that links to a directory is selected, that directory is found
+in the current NERDTree. If the directory couldn't be found, a new NERDTree is
+created.
+
+The default key combo for this mapping is "g" + NERDTreeMapActivateNode (see
+|NERDTree-o|).
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-t*
+Default key: t
+Map setting: *NERDTreeMapOpenInTab*
+Applies to: files and directories.
+
+Opens the selected file in a new tab. If a directory is selected, a fresh
+NERDTree for that directory is opened in a new tab.
+
+If a bookmark which points to a directory is selected, open a NERDTree for
+that directory in a new tab. If the bookmark points to a file, open that file
+in a new tab.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-T*
+Default key: T
+Map setting: *NERDTreeMapOpenInTabSilent*
+Applies to: files and directories.
+
+The same as |NERDTree-t| except that the focus is kept in the current tab.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-i*
+Default key: i
+Map setting: *NERDTreeMapOpenSplit*
+Applies to: files.
+
+Opens the selected file in a new split window and puts the cursor in the new
+window.
+
+------------------------------------------------------------------------------
+                                                                   *NERDTree-gi*
+Default key: gi
+Map setting: *NERDTreeMapPreviewSplit*
+Applies to: files.
+
+The same as |NERDTree-i| except that the cursor is not moved.
+
+The default key combo for this mapping is "g" + NERDTreeMapOpenSplit (see
+|NERDTree-i|).
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-s*
+Default key: s
+Map setting: *NERDTreeMapOpenVSplit*
+Applies to: files.
+
+Opens the selected file in a new vertically split window and puts the cursor
+in the new window.
+
+------------------------------------------------------------------------------
+                                                                   *NERDTree-gs*
+Default key: gs
+Map setting: *NERDTreeMapPreviewVSplit*
+Applies to: files.
+
+The same as |NERDTree-s| except that the cursor is not moved.
+
+The default key combo for this mapping is "g" + NERDTreeMapOpenVSplit (see
+|NERDTree-s|).
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-<CR>*
+Default key: <CR>
+Map setting: *NERDTreeMapCustomOpen*
+Applies to: files, directories, and bookmarks
+
+Performs a customized open action on the selected node. This allows the user
+to define an action that behaves differently from any of the standard
+keys. See |NERDTreeCustomOpenArgs| for more details.
+------------------------------------------------------------------------------
+                                                                    *NERDTree-O*
+Default key: O
+Map setting: *NERDTreeMapOpenRecursively*
+Applies to: directories.
+
+Recursively opens the selected directory.
+
+All files and directories are cached, but if a directory would not be
+displayed due to file filters (see |NERDTreeIgnore| |NERDTree-f|) or the
+hidden file filter (see |NERDTreeShowHidden|) then its contents are not
+cached. This is handy, especially if you have .svn directories.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-x*
+Default key: x
+Map setting: *NERDTreeMapCloseDir*
+Applies to: files and directories.
+
+Closes the parent of the selected node.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-X*
+Default key: X
+Map setting: *NERDTreeMapCloseChildren*
+Applies to: directories.
+
+Recursively closes all children of the selected directory.
+
+Tip: To quickly "reset" the tree, use |NERDTree-P| with this mapping.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-e*
+Default key: e
+Map setting: *NERDTreeMapOpenExpl*
+Applies to: files and directories.
+
+|:edit|s the selected directory, or the selected file's directory. This could
+result in a NERDTree or a netrw being opened, depending on
+|NERDTreeHijackNetrw|.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-D*
+Default key: D
+Map setting: *NERDTreeMapDeleteBookmark*
+Applies to: lines in the bookmarks table
+
+Deletes the currently selected bookmark.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-P*
+Default key: P
+Map setting: *NERDTreeMapJumpRoot*
+Applies to: no restrictions.
+
+Jump to the tree root.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-p*
+Default key: p
+Map setting: *NERDTreeMapJumpParent*
+Applies to: files and directories.
+
+Jump to the parent node of the selected node.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-K*
+Default key: K
+Map setting: *NERDTreeMapJumpFirstChild*
+Applies to: files and directories.
+
+Jump to the first child of the current nodes parent.
+
+If the cursor is already on the first node then do the following:
+    * loop back thru the siblings of the current nodes parent until we find an
+      open dir with children
+    * go to the first child of that node
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-J*
+Default key: J
+Map setting: *NERDTreeMapJumpLastChild*
+Applies to: files and directories.
+
+Jump to the last child of the current nodes parent.
+
+If the cursor is already on the last node then do the following:
+    * loop forward thru the siblings of the current nodes parent until we find
+      an open dir with children
+    * go to the last child of that node
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-C-J*
+Default key: <C-J>
+Map setting: *NERDTreeMapJumpNextSibling*
+Applies to: files and directories.
+
+Jump to the next sibling of the selected node.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-C-K*
+Default key: <C-K>
+Map setting: *NERDTreeMapJumpPrevSibling*
+Applies to: files and directories.
+
+Jump to the previous sibling of the selected node.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-C*
+Default key: C
+Map setting: *NERDTreeMapChangeRoot*
+Applies to: files and directories.
+
+Make the selected directory node the new tree root. If a file is selected, its
+parent is used.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-u*
+Default key: u
+Map setting: *NERDTreeMapUpdir*
+Applies to: no restrictions.
+
+Move the tree root up a dir (like doing a "cd ..").
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-U*
+Default key: U
+Map setting: *NERDTreeMapUpdirKeepOpen*
+Applies to: no restrictions.
+
+Like |NERDTree-u| except that the old tree root is kept open.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-r*
+Default key: r
+Map setting: *NERDTreeMapRefresh*
+Applies to: files and directories.
+
+If a dir is selected, recursively refresh that dir, i.e. scan the filesystem
+for changes and represent them in the tree.
+
+If a file node is selected then the above is done on it's parent.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-R*
+Default key: R
+Map setting: *NERDTreeMapRefreshRoot*
+Applies to: no restrictions.
+
+Recursively refresh the tree root.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-m*
+Default key: m
+Map setting: *NERDTreeMapMenu*
+Applies to: files and directories.
+
+Display the NERDTree menu. See |NERDTreeMenu| for details.
+
+------------------------------------------------------------------------------
+                                                                   *NERDTree-cd*
+Default key: cd
+Map setting: *NERDTreeMapChdir*
+Applies to: files and directories.
+
+Change Vim's current working directory to that of the selected node.
+
+------------------------------------------------------------------------------
+                                                                   *NERDTree-CD*
+Default key: CD
+Map setting: *NERDTreeMapCWD*
+Applies to: no restrictions.
+
+Change the NERDTree root to Vim's current working directory.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-I*
+Default key: I
+Map setting: *NERDTreeMapToggleHidden*
+Applies to: no restrictions.
+
+Toggles whether hidden files (i.e. "dot files") are displayed.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-f*
+Default key: f
+Map setting: *NERDTreeMapToggleFilters*
+Applies to: no restrictions.
+
+Toggles whether file filters are used. See |NERDTreeIgnore| for details.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-F*
+Default key: F
+Map setting: *NERDTreeMapToggleFiles*
+Applies to: no restrictions.
+
+Toggles whether file nodes are displayed.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-B*
+Default key: B
+Map setting: *NERDTreeMapToggleBookmarks*
+Applies to: no restrictions.
+
+Toggles whether the bookmarks table is displayed.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-q*
+Default key: q
+Map setting: *NERDTreeMapQuit*
+Applies to: no restrictions.
+
+Closes the NERDTree window.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-A*
+Default key: A
+Map setting: *NERDTreeMapToggleZoom*
+Applies to: no restrictions.
+
+Maximize (zoom) and minimize the NERDTree window.
+
+------------------------------------------------------------------------------
+                                                                    *NERDTree-?*
+Default key: ?
+Map setting: *NERDTreeMapHelp*
+Applies to: no restrictions.
+
+Toggles whether the quickhelp is displayed.
+
+------------------------------------------------------------------------------
+ 2.3. The NERDTree menu                                           *NERDTreeMenu*
+
+The NERDTree has a menu that can be programmed via the an API (see
+|NERDTreeMenuAPI|). The idea is to simulate the "right click" menus that most
+file explorers have.
+
+The script comes with two default menu plugins: exec_menuitem.vim and
+fs_menu.vim. fs_menu.vim adds some basic filesystem operations to the menu for
+creating/deleting/moving/copying files and dirs. exec_menuitem.vim provides a
+menu item to execute executable files.
+
+Related tags: |NERDTree-m| |NERDTreeApi|
+
+------------------------------------------------------------------------------
+                                                                *NERDTreeMenu-j*
+Default key: j
+Map option: *NERDTreeMenuDown*
+Applies to: The NERDTree menu.
+
+Moves the cursor down.
+
+------------------------------------------------------------------------------
+                                                                *NERDTreeMenu-k*
+Default key: k
+Map option: *NERDTreeMenuUp*
+Applies to: The NERDTree menu.
+
+Moves the cursor up.
+
+==============================================================================
+3. Customisation                                              *NERDTreeSettings*
+
+
+------------------------------------------------------------------------------
+3.1. Customisation summary                             *NERDTreeSettingsSummary*
+
+The plugin provides the following settings that can customise the behaviour
+the NERDTree. These settings should be set in your vimrc, using `:let`.
+
+|loaded_nerd_tree|            Turns off the script.
+
+|NERDTreeAutoCenter|          Controls whether the NERDTree window centers
+                            when the cursor moves within a specified
+                            distance to the top/bottom of the window.
+
+|NERDTreeAutoCenterThreshold| Controls the sensitivity of autocentering.
+
+|NERDTreeCaseSensitiveSort|   Tells the NERDTree whether to be case
+                            sensitive or not when sorting nodes.
+
+|NERDTreeNaturalSort|         Tells the NERDTree whether to use natural sort
+                            order or not when sorting nodes.
+
+|NERDTreeSortHiddenFirst|     Tells the NERDTree whether to take the dot at
+                            the beginning of the hidden file names into
+                            account when sorting nodes.
+
+|NERDTreeChDirMode|           Tells the NERDTree if/when it should change
+                            vim's current working directory.
+
+|NERDTreeHighlightCursorline| Tell the NERDTree whether to highlight the
+                            current cursor line.
+
+|NERDTreeHijackNetrw|         Tell the NERDTree whether to replace the netrw
+                            autocommands for exploring local directories.
+
+|NERDTreeIgnore|              Tells the NERDTree which files to ignore.
+
+|NERDTreeRespectWildIgnore|   Tells the NERDTree to respect `'wildignore'`.
+
+|NERDTreeBookmarksFile|       Where the bookmarks are stored.
+
+|NERDTreeBookmarksSort|       Control how the Bookmark table is sorted.
+
+|NERDTreeMarkBookmarks|       Render bookmarked nodes with markers.
+
+|NERDTreeMouseMode|           Manage the interpretation of mouse clicks.
+
+|NERDTreeQuitOnOpen|          Closes the tree window or bookmark table after
+                            opening a file.
+
+|NERDTreeShowBookmarks|       Tells the NERDTree whether to display the
+                            bookmarks table on startup.
+
+|NERDTreeShowFiles|           Tells the NERDTree whether to display files in
+                            the tree on startup.
+
+|NERDTreeShowHidden|          Tells the NERDTree whether to display hidden
+                            files on startup.
+
+|NERDTreeShowLineNumbers|     Tells the NERDTree whether to display line
+                            numbers in the tree window.
+
+|NERDTreeSortOrder|           Tell the NERDTree how to sort the nodes in the
+                            tree.
+
+|NERDTreeStatusline|          Set a statusline for NERDTree windows.
+
+|NERDTreeWinPos|              Tells the script where to put the NERDTree
+                            window.
+
+|NERDTreeWinSize|             Sets the window size when the NERDTree is
+                            opened.
+
+|NERDTreeWinSizeMax|          Sets the maximum window size when the NERDTree
+                            is zoomed.
+
+|NERDTreeMinimalUI|           Disables display of the 'Bookmarks' label and
+                            'Press ? for help' text.
+
+|NERDTreeMinimalMenu|         Use a compact menu that fits on a single line
+                            for adding, copying, deleting, etc
+
+|NERDTreeCascadeSingleChildDir|
+                            Collapses on the same line directories that have
+                            only one child directory.
+
+|NERDTreeCascadeOpenSingleChildDir|
+                            Cascade open while selected directory has only
+                            one child that also is a directory.
+
+|NERDTreeAutoDeleteBuffer|    Tells the NERDTree to automatically remove a
+                            buffer when a file is being deleted or renamed
+                            via a context menu command.
+
+|NERDTreeCreatePrefix|        Specify a prefix to be used when creating the
+                            NERDTree window.
+
+|NERDTreeRemoveFileCmd|       Specify a custom shell command to be used when
+                            deleting files. Note that it should include one
+                            space character at the end of the command and it
+                            applies only to files.
+
+|NERDTreeRemoveDirCmd|        Specify a custom shell command to be used when
+                            deleting directories. Note that it should
+                            include one space character at the end of the
+                            command and it applies only to directories.
+
+|NERDTreeDirArrowCollapsible| These characters indicate when a directory is
+|NERDTreeDirArrowExpandable|  either collapsible or expandable.
+
+|NERDTreeNodeDelimiter|       A single character that is used to separate the
+                            file or directory name from the rest of the
+                            characters on the line of text.
+
+|NERDTreeCustomOpenArgs|      A dictionary with values that control how a node
+                            is opened with the |NERDTree-<CR>| key.
+
+------------------------------------------------------------------------------
+3.2. Customisation details                             *NERDTreeSettingsDetails*
+
+To enable any of the below settings you should put an appropriate >
+    let <setting>=<value>
+<line in your ~/.vimrc.
+
+                                                              *loaded_nerd_tree*
+If this plugin is making you feel homicidal, it may be a good idea to turn it
+off with this line in your vimrc: >
+    let loaded_nerd_tree=1
+<
+------------------------------------------------------------------------------
+                                                            *NERDTreeAutoCenter*
+Values: 0 or 1.
+Default: 1
+
+If set to 1, the NERDTree window will center around the cursor if it moves to
+within |NERDTreeAutoCenterThreshold| lines of the top/bottom of the window.
+
+This is ONLY done in response to tree navigation mappings,
+i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-C-K| |NERDTree-p|
+|NERDTree-P|
+
+The centering is done with a |zz| operation.
+
+------------------------------------------------------------------------------
+                                                   *NERDTreeAutoCenterThreshold*
+Values: Any natural number.
+Default: 3
+
+This setting controls the "sensitivity" of the NERDTree auto centering. See
+|NERDTreeAutoCenter| for details.
+
+------------------------------------------------------------------------------
+                                                     *NERDTreeCaseSensitiveSort*
+Values: 0 or 1.
+Default: 0.
+
+By default the NERDTree does not sort nodes case sensitively, i.e. nodes
+could appear like this: >
+    bar.c
+    Baz.c
+    blarg.c
+    boner.c
+    Foo.c
+<
+But, if you set this setting to 1 then the case of the nodes will be taken
+into account. The above nodes would then be sorted like this: >
+    Baz.c
+    Foo.c
+    bar.c
+    blarg.c
+    boner.c
+<
+------------------------------------------------------------------------------
+                                                           *NERDTreeNaturalSort*
+Values: 0 or 1.
+Default: 0.
+
+By default the NERDTree does not sort nodes in natural sort order, i.e. nodes
+could appear like this: >
+    z1.txt
+    z10.txt
+    z100.txt
+    z11.txt
+    z110.txt
+    z2.txt
+    z20.txt
+    z3.txt
+<
+But if you set this setting to 1 then the natural sort order will be used. The
+above nodes would then be sorted like this: >
+    z1.txt
+    z2.txt
+    z3.txt
+    z10.txt
+    z11.txt
+    z20.txt
+    z100.txt
+    z110.txt
+<
+------------------------------------------------------------------------------
+                                                                *NERDTreeUseTCD*
+Values: 0 or 1.
+Default: 0.
+
+By default, NERDTree will use the `:cd` command to change the current working
+directory. If this setting is turned on, and the `:tcd` command is available, it
+will be used instead.
+
+------------------------------------------------------------------------------
+                                                             *NERDTreeChDirMode*
+Values: 0, 1, 2, or 3.
+Default: 0.
+
+Use this setting to tell the script when (if at all) to change the current
+working directory (CWD) for vim.
+
+If it is set to 0 then the CWD is never changed by the NERDTree.
+
+If set to 1 then the CWD is changed when the NERDTree is first loaded to the
+directory it is initialized in. For example, if you start the NERDTree with >
+    :NERDTree /home/marty/foobar
+<
+then the CWD will be changed to /home/marty/foobar and will not be changed
+again unless you init another NERDTree with a similar command.
+
+If the setting is set to 2 then it behaves the same as if set to 1 except that
+the CWD is changed whenever the tree root is changed. For example, if the CWD
+is /home/marty/foobar and you make the node for /home/marty/foobar/baz the new
+root then the CWD will become /home/marty/foobar/baz.
+
+If the set to 3, then it behaves the same as if set to 2, and the CWD is
+changed whenever changing tabs to whatever the tree root is on that tab.
+
+------------------------------------------------------------------------------
+                                                   *NERDTreeHighlightCursorline*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1, the current cursor line in the NERDTree buffer will be
+highlighted. This is done using the `'cursorline'` Vim option.
+
+------------------------------------------------------------------------------
+                                                           *NERDTreeHijackNetrw*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1, doing a >
+    :edit <some directory>
+<
+will open up a window level NERDTree instead of a netrw in the target window.
+
+Window level trees behaves slightly different from a regular trees in the
+following respects:
+    1. 'o' will open the selected file in the same window as the tree,
+       replacing it.
+    2. you can have one tree per window - instead of per tab.
+
+------------------------------------------------------------------------------
+                                                                *NERDTreeIgnore*
+Values: a list of regular expressions.
+Default: ['\~$'].
+
+This setting is used to specify which files the NERDTree should ignore.  It
+must be a list of regular expressions. When the NERDTree is rendered, any
+files/dirs that match any of the regex's in NERDTreeIgnore won't be
+displayed.
+
+For example if you put the following line in your vimrc: >
+    let NERDTreeIgnore=['\.vim$', '\~$']
+<
+then all files ending in .vim or ~ will be ignored.
+
+There are 2 magic flags that can be appended to the end of each regular
+expression to specify that the regex should match only files or only dirs.
+These flags are "[[dir]]" and "[[file]]". Example: >
+    let NERDTreeIgnore=['\.d$[[dir]]', '\.o$[[file]]']
+<
+This will cause all dirs ending in ".d" to be ignored and all files ending in
+".o" to be ignored.
+
+Note: to tell the NERDTree not to ignore any files you must use the following
+line: >
+    let NERDTreeIgnore=[]
+<
+The file filters can be turned on and off dynamically with the |NERDTree-f|
+mapping.
+
+------------------------------------------------------------------------------
+                                                     *NERDTreeRespectWildIgnore*
+Values: 0 or 1.
+Default: 0.
+
+If set to 1, the `'wildignore'` setting is respected.
+
+------------------------------------------------------------------------------
+                                                         *NERDTreeBookmarksFile*
+Values: a path
+Default: $HOME/.NERDTreeBookmarks
+
+This is where bookmarks are saved. See |NERDTreeBookmarkCommands|.
+
+------------------------------------------------------------------------------
+                                                         *NERDTreeBookmarksSort*
+Values: 0, 1, or 2
+Default: 1
+
+This setting controls the method by which the list of user bookmarks is
+sorted. When sorted, bookmarks will render in alphabetical order by name.
+
+If set to 0, the bookmarks list is not sorted.
+If set to 1, the bookmarks list is sorted in a case-insensitive manner.
+If set to 2, the bookmarks list is sorted in a case-sensitive manner.
+
+------------------------------------------------------------------------------
+                                                         *NERDTreeMarkBookmarks*
+Values: 0 or 1
+Default: 1
+
+If set to 1, Bookmarks will be specially marked whenever the NERDTree is
+rendered. Users of the |NERDTreeMinimalUI| setting may prefer to disable
+this setting for even less visual clutter.
+
+------------------------------------------------------------------------------
+                                                             *NERDTreeMouseMode*
+Values: 1, 2 or 3.
+Default: 1.
+
+If set to 1 then a double click on a node is required to open it.
+If set to 2 then a single click will open directory nodes, while a double
+click will still be required for file nodes.
+If set to 3 then a single click will open any node.
+
+Note: a double click anywhere on a line that a tree node is on will
+activate it, but all single-click activations must be done on name of the node
+itself. For example, if you have the following node: >
+    | | |-application.rb
+<
+then (to single click activate it) you must click somewhere in
+'application.rb'.
+
+------------------------------------------------------------------------------
+                                                            *NERDTreeQuitOnOpen*
+Values: 0,1,2 or 3.
+Default: 0
+
+This setting governs whether the NERDTree window or the bookmarks table closes
+after opening a file with the |NERDTree-o|, |NERDTree-i|, |NERDTree-t| and
+|NERDTree-T| mappings.
+
+ Value  | NERDTree Window Behavior
+ -------+-------------------------------------------------------
+ 0      | No change
+ 1      | Closes after opening a file
+ 2      | Closes the bookmark table after opening a bookmark
+ 3(1+2) | Same as both 1 and 2
+
+------------------------------------------------------------------------------
+                                                         *NERDTreeShowBookmarks*
+Values: 0 or 1.
+Default: 0.
+
+If this setting is set to 1 then the bookmarks table will be displayed.
+
+This setting can be toggled dynamically, per tree, with the |NERDTree-B|
+mapping.
+
+------------------------------------------------------------------------------
+                                                             *NERDTreeShowFiles*
+Values: 0 or 1.
+Default: 1.
+
+If this setting is set to 1 then files are displayed in the NERDTree. If it
+is set to 0 then only directories are displayed.
+
+This setting can be toggled dynamically, per tree, with the |NERDTree-F|
+mapping and is useful for drastically shrinking the tree when you are
+navigating to a different part of the tree.
+
+------------------------------------------------------------------------------
+                                                            *NERDTreeShowHidden*
+Values: 0 or 1.
+Default: 0.
+
+This setting tells vim whether to display hidden files by default. This
+setting can be dynamically toggled, per tree, with the |NERDTree-I| mapping.
+Use one of the follow lines for this setting: >
+    let NERDTreeShowHidden=0
+    let NERDTreeShowHidden=1
+<
+------------------------------------------------------------------------------
+                                                       *NERDTreeShowLineNumbers*
+Values: 0 or 1.
+Default: 0.
+
+This setting tells vim whether to display line numbers for the NERDTree
+window.  Use one of the follow lines for this setting: >
+    let NERDTreeShowLineNumbers=0
+    let NERDTreeShowLineNumbers=1
+<
+------------------------------------------------------------------------------
+                                                             *NERDTreeSortOrder*
+Values: a list of regular expressions.
+Default: ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
+
+This setting is a list of regular expressions which are used to group or sort
+the nodes under their parent.
+
+For example, if the setting is: >
+    ['\.vim$', '\.c$', '\.h$', '*', 'foobar']
+<
+then all .vim files will be grouped at the top, followed by all .c files then
+all .h files. All files containing the string 'foobar' will be placed at the
+end.  The star is a special flag: it tells the script that every node that
+doesn't match any of the other regexps should be placed here.
+
+If no star is present in NERDTreeSortOrder, then one is automatically
+appended to the end of the list.
+
+The regex '\/$' should be used to match directory nodes.
+
+Files can also be sorted by 1) the modification timestamp, 2) the size, or 3)
+the extension. Directories are always sorted by name. To accomplish this, the
+following special flags are used:
+  [[timestamp]]   [[-timestamp]]   [[size]]   [[-size]]   [[extension]]
+The hyphen specifies a descending sort; extensions are sorted in ascending
+order only. If placed at the beginning of the list, files are sorted according
+to these flags first, and then grouped by the remaining items in the list. If
+the flags are in any other position of the list, this special sorting is done
+secondarily. See examples 4, 5, and 6 below.
+
+After this sorting is done, the files in each group are sorted alphabetically.
+
+Examples: >
+    (1) ['*', '\/$']
+    (2) []
+    (3) ['\/$', '\.rb$', '\.php$', '*', '\.swp$',  '\.bak$', '\~$']
+    (4) ['[[-size]]']
+    (5) ['\/$', '*', '[[timestamp]]']
+    (6) ['foo','\/$','[[extension]]']
+<
+1. Directories will appear last, everything else will appear above.
+2. Everything will simply appear in alphabetical order.
+3. Dirs will appear first, then ruby and php. Swap files, bak files and vim
+   backup files will appear last with everything else preceding them.
+4. Everything is sorted by size, largest to smallest, with directories
+   considered to have size 0 bytes.
+5. Directories will appear first alphabetically, followed by files, sorted by
+   timestamp, oldest first.
+6. Files and directories matching 'foo' first, followed by other directories,
+   then all other files. Each section of files is sorted by file extension.
+
+------------------------------------------------------------------------------
+                                                            *NERDTreeStatusline*
+Values: Any valid `'statusline'` setting.
+Default: %{exists('b:NERDTree')?b:NERDTree.root.path.str():''}
+
+Defines the value for the `'statusline'` setting in NERDTree windows.
+
+Note: The setting is actually applied using |:let-&|, not |:set|, so
+escaping spaces is not necessary.
+
+Setting this to -1 will deactivate it so that your global `'statusline'`
+setting is used.
+
+------------------------------------------------------------------------------
+                                                                *NERDTreeWinPos*
+Values: "left" or "right"
+Default: "left".
+
+This setting is used to determine where NERDTree window is placed on the
+screen.
+
+This setting makes it possible to use two different explorer plugins
+simultaneously. For example, you could have the taglist plugin on the left of
+the window and the NERDTree on the right.
+
+------------------------------------------------------------------------------
+                                                               *NERDTreeWinSize*
+Values: a positive integer.
+Default: 31.
+
+This setting is used to change the size of the NERDTree when it is loaded.
+
+------------------------------------------------------------------------------
+                                                             *NERDTreeMinimalUI*
+Values: 0 or 1
+Default: 0
+
+This setting disables the 'Bookmarks' label 'Press ? for help' text. Use one
+of the following lines for this setting: >
+    let NERDTreeMinimalUI=0
+    let NERDTreeMinimalUI=1
+<
+------------------------------------------------------------------------------
+                                                           *NERDTreeMinimalMenu*
+Values: 0 or 1
+Default: 0
+
+This setting makes NERDTree use a smaller, more compact menu for adding,
+copying, deleting nodes. This menu fits on a single line so Vim doesn't need to
+scroll down to present it. This setting is recommended for users already
+familiar with the menu items. It will look similar to this:
+
+  Menu: [ (a)dd ,m,d,r,o,q,c,l] (Use j/k/enter or shortcut):
+
+An action can be selected with its shortcut key or with the NERDTreeMenuUp and
+NERDTreeMenuDown keys, then pressing enter.
+
+Use one of the following lines for this setting: >
+    let NERDTreeMinimalMenu=0
+    let NERDTreeMinimalMenu=1
+<
+------------------------------------------------------------------------------
+                                                 *NERDTreeCascadeSingleChildDir*
+Values: 0 or 1
+Default: 1.
+
+When displaying dir nodes, this setting tells NERDTree to collapse dirs that
+have only one child. Use one of the following lines for this setting: >
+    let NERDTreeCascadeSingleChildDir=0
+    let NERDTreeCascadeSingleChildDir=1
+<
+------------------------------------------------------------------------------
+                                             *NERDTreeCascadeOpenSingleChildDir*
+Values: 0 or 1
+Default: 1.
+
+When opening dir nodes, this setting tells NERDTree to recursively open dirs
+that have only one child which is also a dir. NERDTree will stop when it finds
+a dir that contains anything but another single dir. This setting also causes
+the |NERDTree-x| mapping to close dirs in the same manner. This setting may be
+useful for Java projects. Use one of the following lines for this setting: >
+    let NERDTreeCascadeOpenSingleChildDir=0
+    let NERDTreeCascadeOpenSingleChildDir=1
+<
+------------------------------------------------------------------------------
+                                                      *NERDTreeAutoDeleteBuffer*
+Values: 0 or 1
+Default: 0.
+
+When using a context menu to delete or rename a file you may also want to
+delete the buffer which is no more valid. If the setting is not set you will
+see a confirmation if you really want to delete an old buffer. If you always
+press 'y' then it's worth it to set this setting to 1. Use one of the
+following lines for this setting: >
+    let NERDTreeAutoDeleteBuffer=0
+    let NERDTreeAutoDeleteBuffer=1
+<
+------------------------------------------------------------------------------
+                                                          *NERDTreeCreatePrefix*
+Values: Any valid command prefix.
+Default: "silent".
+
+Internally, NERDTree uses the |:edit| command to create a buffer in which to
+display its tree view. You can augment this behavior by specifying a prefix
+string such as "keepalt" or similar. For example, to have NERDTree create its
+tree window using `silent keepalt keepjumps edit`: >
+    let NERDTreeCreatePrefix='silent keepalt keepjumps'
+<
+------------------------------------------------------------------------------
+                        *NERDTreeDirArrowCollapsible* *NERDTreeDirArrowExpandable*
+Values: Any single character.
+Defaults:   Windows: ~ and +    Others: ▾ and ▸
+
+These characters indicate whether a directory is collapsible or expandable.
+Example: >
+    let NERDTreeDirArrowExpandable=">"
+    let NERDTreeDirArrowCollapsible="v"
+<
+They can be set to "\u00a0" to replace the arrows with a non-breaking space.
+If you do this you may need to change the node delimiter. See
+|NERDTreeNodeDelimiter|. You cannot use the same character for both the arrows
+and the delimiter.
+
+Alternatively, they can be set to '' (an empty string). This removes the
+arrows and the single space that follows them, shifting the entire tree two
+character positions to the left.
+
+------------------------------------------------------------------------------
+                                                         *NERDTreeNodeDelimiter*
+Values: Any single character.
+Default: varies (see below)
+
+This character is used to separate the file or directory name from the rest of
+the characters in the line of text. It allows filenames to contain special
+characters that are otherwise used in the NERDTree, such as square brackets,
+braces, trailing asterisk, and leading space. For more details, see the
+responsible pull request: https://github.com/preservim/nerdtree/pull/868.
+
+The default value of this variable depends on the features compiled into your
+vim and the values of |NERDTreeDirArrowCollapsible| and
+|NERDTreeDirArrowExpandable|.
+  * If your vim is compiled with the +conceal feature, it is the "\x07" (BELL)
+    character, and it is hidden by setting 'conceallevel' to 3. If you use
+    autocommands, make sure none of them change that setting in the NERDTree_*
+    buffers.
+  * If your vim does NOT have the +conceal feature and you're using "\u00a0"
+    (non-breaking space) to hide the directory arrows, "\u00b7" (middle dot)
+    is used as the default delimiter.
+  * If neither condition above applies, NERDTree uses "\u00a0" (non-breaking
+    space) as the default delimiter.
+
+In the 2nd and 3rd cases, NERDTree will use the Ignore highlight group to
+"hide" the delimiter. It should appear as an empty space.
+
+Other plugins can interfere with these defaults, so if you need to change the
+delimiter, be sure to choose a character that won't appear in your filenames
+or any of the flags set by your installed NERDTree plugins. The suggestions
+below are but a few of the many possibilities. Remember to use double quotes
+when specifying by hex or Unicode. >
+    let NERDTreeNodeDelimiter="\x07"     "bell
+    let NERDTreeNodeDelimiter="\u00b7"   "middle dot
+    let NERDTreeNodeDelimiter="\u00a0"   "non-breaking space
+    let NERDTreeNodeDelimiter="😀"       "smiley face
+<
+------------------------------------------------------------------------------
+                                                        *NERDTreeCustomOpenArgs*
+Values: A nested dictionary, as described below
+Default: {'file': {'reuse': 'all', 'where': 'p'}, 'dir': {}}
+
+This dictionary contains two keys, 'file' and 'dir', whose values each are
+another dictionary. The inner dictionary is a set of parameters used by
+|NERDTree-<CR>| to open a file or directory. Setting these parameters allows you
+to customize the way the node is opened. The default value matches what
+|NERDTree-o| does. To change that behavior, use these keys and
+values in the inner dictionaries:
+
+'where':    specifies whether the node should be opened in a new split ("h" or
+            "v"), in a new tab ("t") or, in the last window ("p").
+'reuse':    if file is already shown in a window, jump there; takes values
+            "all", "currenttab", or empty
+'keepopen': boolean (0 or 1); if true, the tree window will not be closed
+'stay':     boolean (0 or 1); if true, remain in tree window after opening
+
+For example:
+To open files and directories (creating a new NERDTree) in a new tab, >
+    {'file':{'where': 't'}, 'dir':{'where':'t'}}
+<
+To open a file always in the current tab, and expand directories in place, >
+    {'file': {'reuse':'currenttab', 'where':'p', 'keepopen':1, 'stay':1}}
+<
+==============================================================================
+4. The NERDTree API                                                *NERDTreeAPI*
+
+The NERDTree script allows you to add custom key mappings and menu items via
+a set of API calls. Any scripts that use this API should be placed in
+~/.vim/nerdtree_plugin/ (*nix) or ~/vimfiles/nerdtree_plugin (windows).
+
+The script exposes some prototype objects that can be used to manipulate the
+tree and/or get information from it: >
+    g:NERDTreePath
+    g:NERDTreeDirNode
+    g:NERDTreeFileNode
+    g:NERDTreeBookmark
+<
+See the code/comments in NERD_tree.vim to find how to use these objects. The
+following code conventions are used:
+    * class members start with a capital letter
+    * instance members start with a lower case letter
+    * private members start with an underscore
+
+See this blog post for more details:
+ http://got-ravings.blogspot.com/2008/09/vim-pr0n-prototype-based-objects.html
+
+A number of API functions take a callback argument to call. The callback can
+be either a string with the name of a function to call, or a |Funcref| object
+which will be called directly.
+
+------------------------------------------------------------------------------
+4.1. Key map API                                             *NERDTreeKeymapAPI*
+
+NERDTreeAddKeyMap({options})                               *NERDTreeAddKeyMap()*
+    Adds a new keymapping for all NERDTree buffers.
+    {options} must be a dictionary, and must contain the following keys:
+    "key" - the trigger key for the new mapping
+    "callback" - the function the new mapping will be bound to
+    "quickhelpText" - the text that will appear in the quickhelp (see
+    |NERDTree-?|)
+    "override" - if 1 then this new mapping will override whatever previous
+    mapping was defined for the key/scope combo. Useful for overriding the
+    default mappings.
+
+    Additionally, a "scope" argument may be supplied. This constrains the
+    mapping so that it is only activated if the cursor is on a certain object.
+    That object is then passed into the handling method. Possible values are:
+
+      "FileNode" .... a file node
+      "DirNode" ..... a directory node
+      "Node" ........ a file node OR a directory node
+      "Bookmark" .... a bookmark
+      "all" ......... global scope; handler receives no arguments (default)
+
+    Example: >
+        call NERDTreeAddKeyMap({
+               \ 'key': 'foo',
+               \ 'callback': 'NERDTreeEchoPathHandler',
+               \ 'quickhelpText': 'echo full path of current node',
+               \ 'scope': 'DirNode' })
+
+        function! NERDTreeEchoPathHandler(dirnode)
+            echo a:dirnode.path.str()
+        endfunction
+<
+    This code should sit in a file like ~/.vim/nerdtree_plugin/mymapping.vim.
+    It adds a (redundant) mapping on 'foo' which changes vim's CWD to that of
+    the current dir node. Note this mapping will only fire when the cursor is
+    on a directory node.
+
+------------------------------------------------------------------------------
+4.2. Menu API                                                  *NERDTreeMenuAPI*
+
+NERDTreeAddSubmenu({options})                             *NERDTreeAddSubmenu()*
+    Creates and returns a new submenu.
+
+    {options} must be a dictionary and must contain the following keys:
+    "text" - the text of the submenu that the user will see
+    "shortcut" - a shortcut key for the submenu (need not be unique)
+
+    The following keys are optional:
+    "isActiveCallback" - a function that will be called to determine whether
+    this submenu item will be displayed or not. The callback function must
+    return 0 or 1.
+    "parent" - the parent submenu of the new submenu (returned from a previous
+    invocation of NERDTreeAddSubmenu()). If this key is left out then the new
+    submenu will sit under the top level menu.
+
+    See below for an example.
+
+NERDTreeAddMenuItem({options})                           *NERDTreeAddMenuItem()*
+    Adds a new menu item to the NERDTree menu (see |NERDTreeMenu|).
+
+    {options} must be a dictionary and must contain the
+    following keys:
+    "text" - the text of the menu item which the user will see
+    "shortcut" - a shortcut key for the menu item (need not be unique)
+    "callback" - the function that will be called when the user activates the
+    menu item.
+
+    The following keys are optional:
+    "isActiveCallback" - a function that will be called to determine whether
+    this menu item will be displayed or not. The callback function must return
+    0 or 1.
+    "parent" - if the menu item belongs under a submenu then this key must be
+    specified. This value for this key will be the object that
+    was returned when the submenu was created with |NERDTreeAddSubmenu()|.
+
+    See below for an example.
+
+NERDTreeAddMenuSeparator([{options}])               *NERDTreeAddMenuSeparator()*
+    Adds a menu separator (a row of dashes).
+
+    {options} is an optional dictionary that may contain the following keys:
+    "isActiveCallback" - see description in |NERDTreeAddMenuItem()|.
+
+Below is an example of the menu API in action. >
+    call NERDTreeAddMenuSeparator()
+
+    call NERDTreeAddMenuItem({
+                \ 'text': 'a (t)op level menu item',
+                \ 'shortcut': 't',
+                \ 'callback': 'SomeFunction' })
+
+    let submenu = NERDTreeAddSubmenu({
+                \ 'text': 'a (s)ub menu',
+                \ 'shortcut': 's' })
+
+    call NERDTreeAddMenuItem({
+                \ 'text': '(n)ested item 1',
+                \ 'shortcut': 'n',
+                \ 'callback': 'SomeFunction',
+                \ 'parent': submenu })
+
+    call NERDTreeAddMenuItem({
+                \ 'text': '(n)ested item 2',
+                \ 'shortcut': 'n',
+                \ 'callback': 'SomeFunction',
+                \ 'parent': submenu })
+<
+This will create the following menu: >
+  --------------------
+  a (t)op level menu item
+  a (s)ub menu
+<
+Where selecting "a (s)ub menu" will lead to a second menu: >
+  (n)ested item 1
+  (n)ested item 2
+<
+When any of the 3 concrete menu items are selected the function "SomeFunction"
+will be called.
+
+------------------------------------------------------------------------------
+4.3 NERDTreeAddPathFilter(callback)                    *NERDTreeAddPathFilter()*
+
+Path filters are essentially a more powerful version of  |NERDTreeIgnore|.
+If the simple regex matching in |NERDTreeIgnore| is not enough then use
+|NERDTreeAddPathFilter()| to add a callback function that paths will be
+checked against when the decision to ignore them is made. Example >
+
+    call NERDTreeAddPathFilter('MyFilter')
+
+    function! MyFilter(params)
+        "params is a dict containing keys: 'nerdtree' and 'path' which are
+        "g:NERDTree and g:NERDTreePath objects
+
+        "return 1 to ignore params['path'] or 0 otherwise
+    endfunction
+<
+------------------------------------------------------------------------------
+4.4 Path Listener API                                  *NERDTreePathListenerAPI*
+
+Use this API if you want to run a callback for events on Path objects. E.G >
+
+    call g:NERDTreePathNotifier.AddListener("init", "MyListener")
+
+    "....
+
+    function! MyListener(event)
+        "This function will be called whenever a Path object is created.
+
+        "a:event is an object that contains a bunch of relevant info -
+        "including the affected path. See lib/nerdtree/event.vim for details.
+    endfunction
+<
+Current events supported:
+  init ~
+  refresh ~
+  refreshFlags ~
+
+------------------------------------------------------------------------------
+NERDTreeRender()                                              *NERDTreeRender()*
+    Re-renders the NERDTree buffer. Useful if you change the state of the
+    tree and you want to it to be reflected in the UI.
+
+==============================================================================
+5. About                                                         *NERDTreeAbout*
+
+The author of the NERDTree is a terrible terrible monster called Martyzilla
+who gobbles up small children with milk and sugar for breakfast.
+
+He can be reached at martin.grenfell at gmail dot com. He would love to hear
+from you, so feel free to send him suggestions and/or comments about this
+plugin.  Don't be shy --- the worst he can do is slaughter you and stuff you
+in the fridge for later ;)
+
+Martyzilla recruited two other unwitting accomplices to become his minions in
+his quest to conquer the Vim plugin world. While he may still love to receive
+your emails, the best way to send suggestions, bug reports, and questions is
+to submit an issue at http://github.com/preservim/nerdtree/issues.
+
+The latest stable and development versions are on Github.
+    Stable: http://github.com/preservim/nerdtree (master branch)
+    Development: http://github.com/preservim/nerdtree/branches
+
+Title Credit:
+  * http://ascii.co.uk/art/tree
+
+  * Patrick Gillespie's Text ASCII Art Generator
+    http://patorjk.com/software/taag
+    http://patorjk.com/software/taag/#p=display&f=Rozzo&t=the%20NERD%20Tree
+
+==============================================================================
+6. License                                                     *NERDTreeLicense*
+
+The NERDTree is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.
+
+------------------------------------------------------------------------------
+ vim:tw=78:ts=8:ft=help:noet:nospell
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/bookmark.vim b/pack/navigation/start/nerdtree/lib/nerdtree/bookmark.vim
new file mode 100644
index 0000000..248bb07
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/bookmark.vim
@@ -0,0 +1,365 @@
+" ============================================================================
+" CLASS: Bookmark
+"
+" The Bookmark class serves two purposes:
+"   (1) It is the top-level prototype for new, concrete Bookmark objects.
+"   (2) It provides an interface for client code to query and manipulate the
+"       global list of Bookmark objects within the current Vim session.
+" ============================================================================
+
+
+let s:Bookmark = {}
+let g:NERDTreeBookmark = s:Bookmark
+
+" FUNCTION: Bookmark.activate(nerdtree) {{{1
+function! s:Bookmark.activate(nerdtree, ...)
+    call self.open(a:nerdtree, a:0 ? a:1 : {})
+endfunction
+
+" FUNCTION: Bookmark.AddBookmark(name, path) {{{1
+" Class method to add a new bookmark to the list, if a previous bookmark exists
+" with the same name, just update the path for that bookmark
+function! s:Bookmark.AddBookmark(name, path)
+    for i in s:Bookmark.Bookmarks()
+        if i.name ==# a:name
+            let i.path = a:path
+            return
+        endif
+    endfor
+    call add(s:Bookmark.Bookmarks(), s:Bookmark.New(a:name, a:path))
+endfunction
+
+" FUNCTION: Bookmark.Bookmarks() {{{1
+" Class method to get all bookmarks. Lazily initializes the bookmarks global
+" variable
+function! s:Bookmark.Bookmarks()
+    if !exists('g:NERDTreeBookmarks')
+        let g:NERDTreeBookmarks = []
+    endif
+    return g:NERDTreeBookmarks
+endfunction
+
+" FUNCTION: Bookmark.BookmarkExistsFor(name) {{{1
+" class method that returns 1 if a bookmark with the given name is found, 0
+" otherwise
+function! s:Bookmark.BookmarkExistsFor(name)
+    try
+        call s:Bookmark.BookmarkFor(a:name)
+        return 1
+    catch /^NERDTree.BookmarkNotFoundError/
+        return 0
+    endtry
+endfunction
+
+" FUNCTION: Bookmark.BookmarkFor(name) {{{1
+" Class method that returns the Bookmark object having the specified name.
+" Throws NERDTree.BookmarkNotFoundError if no Bookmark is found.
+function! s:Bookmark.BookmarkFor(name)
+    let l:result = {}
+    for l:bookmark in s:Bookmark.Bookmarks()
+        if l:bookmark.name ==# a:name
+            let l:result = l:bookmark
+            break
+        endif
+    endfor
+    if empty(l:result)
+        throw 'NERDTree.BookmarkNotFoundError: "' . a:name  . '" not found'
+    endif
+    return l:result
+endfunction
+
+" FUNCTION: Bookmark.BookmarkNames() {{{1
+" Class method to return an array of all bookmark names
+function! s:Bookmark.BookmarkNames()
+    let names = []
+    for i in s:Bookmark.Bookmarks()
+        call add(names, i.name)
+    endfor
+    return names
+endfunction
+
+" FUNCTION: Bookmark.CacheBookmarks(silent) {{{1
+" Class method to read all bookmarks from the bookmarks file initialize
+" bookmark objects for each one.
+"
+" Args:
+" silent - dont echo an error msg if invalid bookmarks are found
+function! s:Bookmark.CacheBookmarks(silent)
+    if filereadable(g:NERDTreeBookmarksFile)
+        let g:NERDTreeBookmarks = []
+        let g:NERDTreeInvalidBookmarks = []
+        let bookmarkStrings = readfile(g:NERDTreeBookmarksFile)
+        let invalidBookmarksFound = 0
+        for i in bookmarkStrings
+
+            "ignore blank lines
+            if i !=# ''
+
+                let name = substitute(i, '^\(.\{-}\) .*$', '\1', '')
+                let path = substitute(i, '^.\{-} \(.*\)$', '\1', '')
+                let path = fnamemodify(path, ':p')
+
+                try
+                    let bookmark = s:Bookmark.New(name, g:NERDTreePath.New(path))
+                    call add(g:NERDTreeBookmarks, bookmark)
+                catch /^NERDTree.InvalidArgumentsError/
+                    call add(g:NERDTreeInvalidBookmarks, i)
+                    let invalidBookmarksFound += 1
+                endtry
+            endif
+        endfor
+        if invalidBookmarksFound
+            call s:Bookmark.Write()
+            if !a:silent
+                call nerdtree#echo(invalidBookmarksFound . ' invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.')
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark) {{{1
+" Class method that indicates the relative position of two bookmarks when
+" placed in alphabetical order by name. Case-sensitivity is determined by an
+" option. Supports the s:Bookmark.SortBookmarksList() method.
+function! s:Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark)
+    let l:result = 0
+    if g:NERDTreeBookmarksSort ==# 1
+        if a:firstBookmark.name <? a:secondBookmark.name
+            let l:result = -1
+        elseif a:firstBookmark.name >? a:secondBookmark.name
+            let l:result = 1
+        endif
+    elseif g:NERDTreeBookmarksSort ==# 2
+        if a:firstBookmark.name <# a:secondBookmark.name
+            let l:result = -1
+        elseif a:firstBookmark.name ># a:secondBookmark.name
+            let l:result = 1
+        endif
+    endif
+    return l:result
+endfunction
+
+" FUNCTION: Bookmark.ClearAll() {{{1
+" Class method to delete all bookmarks.
+function! s:Bookmark.ClearAll()
+    for i in s:Bookmark.Bookmarks()
+        call i.delete()
+    endfor
+    call s:Bookmark.Write()
+endfunction
+
+" FUNCTION: Bookmark.delete() {{{1
+" Delete this bookmark. If the node for this bookmark is under the current
+" root, then recache bookmarks for its Path object
+function! s:Bookmark.delete()
+    call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self))
+    call s:Bookmark.Write()
+endfunction
+
+" FUNCTION: s:Edit() {{{1
+" opens the NERDTreeBookmarks file for manual editing
+function! s:Bookmark.Edit()
+    call nerdtree#exec('wincmd w', 1)
+    call nerdtree#exec('edit '.g:NERDTreeBookmarksFile, 1)
+endfunction
+
+" FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1
+" Returns the tree node object associated with this Bookmark.
+" Throws NERDTree.BookmarkedNodeNotFoundError if the node is not found.
+"
+" Args:
+" searchFromAbsoluteRoot: boolean flag, search from the highest cached node
+"   if true and from the current tree root if false
+function! s:Bookmark.getNode(nerdtree, searchFromAbsoluteRoot)
+    if a:searchFromAbsoluteRoot
+        let l:searchRoot = a:nerdtree.root.AbsoluteTreeRoot()
+    else
+        let l:searchRoot = a:nerdtree.root
+    endif
+    let l:targetNode = l:searchRoot.findNode(self.path)
+    if empty(l:targetNode)
+        throw 'NERDTree.BookmarkedNodeNotFoundError: node for bookmark "' . self.name . '" not found'
+    endif
+    return l:targetNode
+endfunction
+
+" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1
+" Class method that returns the tree node object for the Bookmark with the
+" given name. Throws NERDTree.BookmarkNotFoundError if a Bookmark with the
+" name does not exist. Throws NERDTree.BookmarkedNodeNotFoundError if a
+" tree node for the named Bookmark could not be found.
+function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree)
+    let l:bookmark = s:Bookmark.BookmarkFor(a:name)
+    return l:bookmark.getNode(a:nerdtree, a:searchFromAbsoluteRoot)
+endfunction
+
+" FUNCTION: Bookmark.GetSelected() {{{1
+" returns the Bookmark the cursor is over, or {}
+function! s:Bookmark.GetSelected()
+    let line = getline('.')
+    let name = substitute(line, '^>\(.\{-}\) .\+$', '\1', '')
+    if name !=# line
+        try
+            return s:Bookmark.BookmarkFor(name)
+        catch /^NERDTree.BookmarkNotFoundError/
+            return {}
+        endtry
+    endif
+    return {}
+endfunction
+
+" FUNCTION: Bookmark.InvalidBookmarks() {{{1
+" Class method to get all invalid bookmark strings read from the bookmarks
+" file
+function! s:Bookmark.InvalidBookmarks()
+    if !exists('g:NERDTreeInvalidBookmarks')
+        let g:NERDTreeInvalidBookmarks = []
+    endif
+    return g:NERDTreeInvalidBookmarks
+endfunction
+
+" FUNCTION: Bookmark.mustExist() {{{1
+function! s:Bookmark.mustExist()
+    if !self.path.exists()
+        call s:Bookmark.CacheBookmarks(1)
+        throw 'NERDTree.BookmarkPointsToInvalidLocationError: the bookmark "'.
+            \ self.name .'" points to a non existing location: "'. self.path.str()
+    endif
+endfunction
+
+" FUNCTION: Bookmark.New(name, path) {{{1
+" Create a new bookmark object with the given name and path object
+function! s:Bookmark.New(name, path)
+    if a:name =~# ' '
+        throw 'NERDTree.IllegalBookmarkNameError: illegal name:' . a:name
+    endif
+
+    let newBookmark = copy(self)
+    let newBookmark.name = a:name
+    let newBookmark.path = a:path
+    return newBookmark
+endfunction
+
+" FUNCTION: Bookmark.open(nerdtree, [options]) {{{1
+"Args:
+"
+"nerdtree: the tree to load open the bookmark in
+"
+"A dictionary containing the following keys (all optional):
+"  'where': Specifies whether the node should be opened in new split/tab or in
+"           the previous window. Can be either 'v' (vertical split), 'h'
+"           (horizontal split), 't' (new tab) or 'p' (previous window).
+"  'reuse': if a window is displaying the file then jump the cursor there
+"  'keepopen': dont close the tree window
+"  'stay': open the file, but keep the cursor in the tree win
+"
+function! s:Bookmark.open(nerdtree, ...)
+    let opts = a:0 ? a:1 : {}
+
+    if nerdtree#and(g:NERDTreeQuitOnOpen,2)
+        call a:nerdtree.ui.toggleShowBookmarks()
+    endif
+
+    if self.path.isDirectory && !has_key(opts, 'where')
+        call self.toRoot(a:nerdtree)
+    else
+        let opener = g:NERDTreeOpener.New(self.path, opts)
+        call opener.open(self)
+    endif
+endfunction
+
+" FUNCTION: Bookmark.openInNewTab(options) {{{1
+" Create a new bookmark object with the given name and path object
+function! s:Bookmark.openInNewTab(options)
+    call nerdtree#deprecated('Bookmark.openInNewTab', 'is deprecated, use open() instead')
+    call self.open(a:options)
+endfunction
+
+" FUNCTION: Bookmark.setPath(path) {{{1
+" makes this bookmark point to the given path
+function! s:Bookmark.setPath(path)
+    let self.path = a:path
+endfunction
+
+" FUNCTION: Bookmark.SortBookmarksList() {{{1
+" Class method that sorts the global list of bookmarks alphabetically by name.
+" Note that case-sensitivity is determined by a user option.
+function! s:Bookmark.SortBookmarksList()
+    call sort(s:Bookmark.Bookmarks(), s:Bookmark.CompareBookmarksByName, s:Bookmark)
+endfunction
+
+" FUNCTION: Bookmark.str() {{{1
+" Get the string that should be rendered in the view for this bookmark
+function! s:Bookmark.str()
+    let pathStrMaxLen = winwidth(g:NERDTree.GetWinNum()) - 4 - strdisplaywidth(self.name)
+    if &number
+        let pathStrMaxLen = pathStrMaxLen - &numberwidth
+    endif
+
+    let pathStr = self.path.str({'format': 'UI'})
+    if strdisplaywidth(pathStr) > pathStrMaxLen
+        while strdisplaywidth(pathStr) > pathStrMaxLen && strchars(pathStr) > 0
+            let pathStr = substitute(pathStr, '^.', '', '')
+        endwhile
+        let pathStr = '<' . pathStr
+    endif
+    return '>' . self.name . ' ' . pathStr
+endfunction
+
+" FUNCTION: Bookmark.toRoot(nerdtree) {{{1
+" Set the root of the given NERDTree to the node for this Bookmark. If a node
+" for this Bookmark does not exist, a new one is initialized.
+function! s:Bookmark.toRoot(nerdtree)
+    if self.validate()
+        try
+            let l:targetNode = self.getNode(a:nerdtree, 1)
+            call l:targetNode.closeChildren()
+        catch /^NERDTree.BookmarkedNodeNotFoundError/
+            let l:targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path, a:nerdtree)
+        endtry
+        call a:nerdtree.changeRoot(l:targetNode)
+    endif
+endfunction
+
+" FUNCTION: Bookmark.ToRoot(name, nerdtree) {{{1
+" Class method that makes the Bookmark with the given name the root of
+" specified NERDTree.
+function! s:Bookmark.ToRoot(name, nerdtree)
+    let l:bookmark = s:Bookmark.BookmarkFor(a:name)
+    call l:bookmark.toRoot(a:nerdtree)
+endfunction
+
+" FUNCTION: Bookmark.validate() {{{1
+function! s:Bookmark.validate()
+    if self.path.exists()
+        return 1
+    else
+        call s:Bookmark.CacheBookmarks(1)
+        call nerdtree#echo(self.name . 'now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.')
+        return 0
+    endif
+endfunction
+
+" FUNCTION: Bookmark.Write() {{{1
+" Class method to write all bookmarks to the bookmarks file
+function! s:Bookmark.Write()
+    let bookmarkStrings = []
+    for i in s:Bookmark.Bookmarks()
+        call add(bookmarkStrings, i.name . ' ' . fnamemodify(i.path.str(), ':~'))
+    endfor
+
+    "add a blank line before the invalid ones
+    call add(bookmarkStrings, '')
+
+    for j in s:Bookmark.InvalidBookmarks()
+        call add(bookmarkStrings, j)
+    endfor
+
+    try
+        call writefile(bookmarkStrings, g:NERDTreeBookmarksFile)
+    catch
+        call nerdtree#echoError('Failed to write bookmarks file. Make sure g:NERDTreeBookmarksFile points to a valid location.')
+    endtry
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/creator.vim b/pack/navigation/start/nerdtree/lib/nerdtree/creator.vim
new file mode 100644
index 0000000..abaa8db
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/creator.vim
@@ -0,0 +1,395 @@
+" ============================================================================
+" CLASS: Creator
+"
+" This class is responsible for creating NERDTree instances.  The new NERDTree
+" may be a tab tree, a window tree, or a mirrored tree.  In the process of
+" creating a NERDTree, it sets up all of the window and buffer options and key
+" mappings etc.
+" ============================================================================
+
+
+let s:Creator = {}
+let g:NERDTreeCreator = s:Creator
+
+" FUNCTION: s:Creator._bindMappings() {{{1
+function! s:Creator._bindMappings()
+    call g:NERDTreeKeyMap.BindAll()
+
+    command! -buffer -nargs=? Bookmark :call nerdtree#ui_glue#bookmarkNode('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#ui_glue#revealBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark call nerdtree#ui_glue#openBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#ui_glue#clearBookmarks('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>', b:NERDTree)
+    command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
+    command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
+    command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
+    command! -buffer -nargs=0 EditBookmarks call g:NERDTreeBookmark.Edit()
+endfunction
+
+" FUNCTION: s:Creator._broadcastInitEvent() {{{1
+function! s:Creator._broadcastInitEvent()
+    silent doautocmd User NERDTreeInit
+endfunction
+
+" FUNCTION: s:Creator.BufNamePrefix() {{{1
+function! s:Creator.BufNamePrefix()
+    return 'NERD_tree_'
+endfunction
+
+" FUNCTION: s:Creator.CreateTabTree(a:name) {{{1
+function! s:Creator.CreateTabTree(name)
+    let creator = s:Creator.New()
+    call creator.createTabTree(a:name)
+endfunction
+
+" FUNCTION: s:Creator.createTabTree(a:name) {{{1
+" name: the name of a bookmark or a directory
+function! s:Creator.createTabTree(name)
+    let l:path = self._pathForString(a:name)
+
+    " Abort if an exception was thrown (i.e., if the bookmark or directory
+    " does not exist).
+    if empty(l:path)
+        return
+    endif
+
+    " Obey the user's preferences for changing the working directory.
+    if g:NERDTreeChDirMode != 0
+        call l:path.changeToDir()
+    endif
+
+    if g:NERDTree.ExistsForTab()
+        call g:NERDTree.Close()
+        call self._removeTreeBufForTab()
+    endif
+
+    call self._createTreeWin()
+    call self._createNERDTree(l:path, 'tab')
+    call b:NERDTree.render()
+    call b:NERDTree.root.putCursorHere(0, 0)
+
+    call self._broadcastInitEvent()
+endfunction
+
+" FUNCTION: s:Creator.CreateWindowTree(dir) {{{1
+function! s:Creator.CreateWindowTree(dir)
+    let creator = s:Creator.New()
+    call creator.createWindowTree(a:dir)
+endfunction
+
+" FUNCTION: s:Creator.createWindowTree(dir) {{{1
+function! s:Creator.createWindowTree(dir)
+    try
+        let path = g:NERDTreePath.New(a:dir)
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo('Invalid directory name:' . a:dir)
+        return
+    endtry
+
+    "we want the directory buffer to disappear when we do the :edit below
+    setlocal bufhidden=wipe
+
+    let previousBuf = expand('#')
+
+    "we need a unique name for each window tree buffer to ensure they are
+    "all independent
+    exec g:NERDTreeCreatePrefix . ' edit ' . self._nextBufferName()
+
+    call self._createNERDTree(path, 'window')
+    let b:NERDTree._previousBuf = bufnr(previousBuf)
+    call self._setCommonBufOptions()
+
+    call b:NERDTree.render()
+
+    call self._broadcastInitEvent()
+endfunction
+
+" FUNCTION: s:Creator._createNERDTree(path) {{{1
+function! s:Creator._createNERDTree(path, type)
+    let b:NERDTree = g:NERDTree.New(a:path, a:type)
+
+    " TODO: This assignment is kept for compatibility reasons.  Many other
+    " plugins use b:NERDTreeRoot instead of b:NERDTree.root.  Remove this
+    " assignment in the future.
+    let b:NERDTreeRoot = b:NERDTree.root
+
+    call b:NERDTree.root.open()
+endfunction
+
+" FUNCTION: s:Creator.CreateMirror() {{{1
+function! s:Creator.CreateMirror()
+    let creator = s:Creator.New()
+    call creator.createMirror()
+endfunction
+
+" FUNCTION: s:Creator.createMirror() {{{1
+function! s:Creator.createMirror()
+    "get the names off all the nerd tree buffers
+    let treeBufNames = []
+    for i in range(1, tabpagenr('$'))
+        let nextName = self._tabpagevar(i, 'NERDTreeBufName')
+        if nextName != -1 && (!exists('t:NERDTreeBufName') || nextName != t:NERDTreeBufName)
+            call add(treeBufNames, nextName)
+        endif
+    endfor
+    let treeBufNames = self._uniq(treeBufNames)
+
+    "map the option names (that the user will be prompted with) to the nerd
+    "tree buffer names
+    let options = {}
+    let i = 0
+    while i < len(treeBufNames)
+        let bufName = treeBufNames[i]
+        let treeRoot = getbufvar(bufName, 'NERDTree').root
+        let options[i+1 . '. ' . treeRoot.path.str() . '  (buf name: ' . bufName . ')'] = bufName
+        let i = i + 1
+    endwhile
+
+    "work out which tree to mirror, if there is more than 1 then ask the user
+    let bufferName = ''
+    if len(keys(options)) > 1
+        let choices = ['Choose a tree to mirror']
+        let choices = extend(choices, sort(keys(options)))
+        let choice = inputlist(choices)
+        if choice < 1 || choice > len(options) || choice ==# ''
+            return
+        endif
+
+        let bufferName = options[sort(keys(options))[choice-1]]
+    elseif len(keys(options)) ==# 1
+        let bufferName = values(options)[0]
+    else
+        call nerdtree#echo('No trees to mirror')
+        return
+    endif
+
+    if g:NERDTree.ExistsForTab() && g:NERDTree.IsOpen()
+        call g:NERDTree.Close()
+    endif
+
+    let t:NERDTreeBufName = bufferName
+    call self._createTreeWin()
+    exec 'buffer ' .  bufferName
+    if !&hidden
+        call b:NERDTree.render()
+    endif
+endfunction
+
+" FUNCTION: s:Creator._createTreeWin() {{{1
+" Initialize the NERDTree window.  Open the window, size it properly, set all
+" local options, etc.
+function! s:Creator._createTreeWin()
+    let l:splitLocation = g:NERDTreeWinPos ==# 'left' ? 'topleft ' : 'botright '
+    let l:splitSize = g:NERDTreeWinSize
+
+    if !g:NERDTree.ExistsForTab()
+        let t:NERDTreeBufName = self._nextBufferName()
+        silent! execute l:splitLocation . 'vertical ' . l:splitSize . ' new'
+        silent! execute 'edit ' . t:NERDTreeBufName
+        silent! execute 'vertical resize '. l:splitSize
+    else
+        silent! execute l:splitLocation . 'vertical ' . l:splitSize . ' split'
+        silent! execute 'buffer ' . t:NERDTreeBufName
+    endif
+
+    setlocal winfixwidth
+
+    call self._setCommonBufOptions()
+
+    if has('patch-7.4.1925')
+        clearjumps
+    endif
+
+endfunction
+
+" FUNCTION: s:Creator._isBufHidden(nr) {{{1
+function! s:Creator._isBufHidden(nr)
+    redir => bufs
+    silent ls!
+    redir END
+
+    return bufs =~ a:nr . '..h'
+endfunction
+
+" FUNCTION: s:Creator.New() {{{1
+function! s:Creator.New()
+    let newCreator = copy(self)
+    return newCreator
+endfunction
+
+" FUNCTION: s:Creator._nextBufferName() {{{1
+" returns the buffer name for the next nerd tree
+function! s:Creator._nextBufferName()
+    let name = s:Creator.BufNamePrefix() . self._nextBufferNumber()
+    return name
+endfunction
+
+" FUNCTION: s:Creator._nextBufferNumber() {{{1
+" the number to add to the nerd tree buffer name to make the buf name unique
+function! s:Creator._nextBufferNumber()
+    if !exists('s:Creator._NextBufNum')
+        let s:Creator._NextBufNum = 1
+    else
+        let s:Creator._NextBufNum += 1
+    endif
+
+    return s:Creator._NextBufNum
+endfunction
+
+" FUNCTION: s:Creator._pathForString(str) {{{1
+" find a bookmark or adirectory for the given string
+function! s:Creator._pathForString(str)
+    let path = {}
+    if g:NERDTreeBookmark.BookmarkExistsFor(a:str)
+        let path = g:NERDTreeBookmark.BookmarkFor(a:str).path
+    else
+        let dir = a:str ==# '' ? getcwd() : a:str
+
+        "hack to get an absolute path if a relative path is given
+        if dir =~# '^\.'
+            let dir = getcwd() . g:NERDTreePath.Slash() . dir
+        endif
+        let dir = g:NERDTreePath.Resolve(dir)
+
+        try
+            let path = g:NERDTreePath.New(dir)
+        catch /^NERDTree.InvalidArgumentsError/
+            call nerdtree#echo('No bookmark or directory found for: ' . a:str)
+            return {}
+        endtry
+    endif
+    if !path.isDirectory
+        let path = path.getParent()
+    endif
+
+    return path
+endfunction
+
+" Function: s:Creator._removeTreeBufForTab()   {{{1
+function! s:Creator._removeTreeBufForTab()
+    let buf = bufnr(t:NERDTreeBufName)
+
+    "if &hidden is not set then it will already be gone
+    if buf != -1
+
+        "nerdtree buf may be mirrored/displayed elsewhere
+        if self._isBufHidden(buf)
+            exec 'bwipeout ' . buf
+        endif
+
+    endif
+
+    unlet t:NERDTreeBufName
+endfunction
+
+" FUNCTION: s:Creator._setCommonBufOptions() {{{1
+function! s:Creator._setCommonBufOptions()
+
+    " Options for a non-file/control buffer.
+    setlocal bufhidden=hide
+    setlocal buftype=nofile
+    setlocal noswapfile
+
+    " Options for controlling buffer/window appearance.
+    setlocal foldcolumn=0
+    setlocal foldmethod=manual
+    setlocal nobuflisted
+    setlocal nofoldenable
+    setlocal nolist
+    setlocal nospell
+    setlocal nowrap
+
+    if g:NERDTreeShowLineNumbers
+        setlocal number
+    else
+        setlocal nonumber
+        if v:version >= 703
+            setlocal norelativenumber
+        endif
+    endif
+
+    iabc <buffer>
+
+    if g:NERDTreeHighlightCursorline
+        setlocal cursorline
+    endif
+
+    call self._setupStatusline()
+    call self._bindMappings()
+
+    setlocal filetype=nerdtree
+endfunction
+
+" FUNCTION: s:Creator._setupStatusline() {{{1
+function! s:Creator._setupStatusline()
+    if g:NERDTreeStatusline != -1
+        let &l:statusline = g:NERDTreeStatusline
+    endif
+endfunction
+
+" FUNCTION: s:Creator._tabpagevar(tabnr, var) {{{1
+function! s:Creator._tabpagevar(tabnr, var)
+    let currentTab = tabpagenr()
+    let old_ei = &eventignore
+    set eventignore=all
+
+    try
+        exec 'tabnext ' . a:tabnr
+        let v = -1
+        if exists('t:' . a:var)
+            exec 'let v = t:' . a:var
+        endif
+        exec 'tabnext ' . currentTab
+
+    finally
+        let &eventignore = old_ei
+    endtry
+
+    return v
+endfunction
+
+" FUNCTION: s:Creator.ToggleTabTree(dir) {{{1
+function! s:Creator.ToggleTabTree(dir)
+    let creator = s:Creator.New()
+    call creator.toggleTabTree(a:dir)
+endfunction
+
+" FUNCTION: s:Creator.toggleTabTree(dir) {{{1
+" Toggles the NERD tree. I.e if the NERD tree is open, it is closed. If it is
+" closed, it is restored or initialized. If dir is not empty, it will be set
+" as the new root.
+"
+" Args:
+" dir: the full path for the root node (is used if the NERD tree is being
+" initialized, or to change the root to a new dir.)
+function! s:Creator.toggleTabTree(dir)
+    if g:NERDTree.ExistsForTab()
+        if !g:NERDTree.IsOpen()
+            call self._createTreeWin()
+            if !empty(a:dir) && a:dir !=# b:NERDTree.root.path.str()
+                call self.createTabTree(a:dir)
+            elseif !&hidden
+                call b:NERDTree.render()
+            endif
+            call b:NERDTree.ui.restoreScreenState()
+        else
+            call g:NERDTree.Close()
+        endif
+    else
+        call self.createTabTree(a:dir)
+    endif
+endfunction
+
+" Function: s:Creator._uniq(list)   {{{1
+" returns a:list without duplicates
+function! s:Creator._uniq(list)
+  let uniqlist = []
+  for elem in a:list
+    if index(uniqlist, elem) ==# -1
+      let uniqlist += [elem]
+    endif
+  endfor
+  return uniqlist
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/event.vim b/pack/navigation/start/nerdtree/lib/nerdtree/event.vim
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/nerdtree/lib/nerdtree/event.vim
rename to pack/navigation/start/nerdtree/lib/nerdtree/event.vim
diff --git a/bundle/nerdtree/lib/nerdtree/flag_set.vim b/pack/navigation/start/nerdtree/lib/nerdtree/flag_set.vim
old mode 100755
new mode 100644
similarity index 94%
rename from bundle/nerdtree/lib/nerdtree/flag_set.vim
rename to pack/navigation/start/nerdtree/lib/nerdtree/flag_set.vim
index 9d8d335..7552867
--- a/bundle/nerdtree/lib/nerdtree/flag_set.vim
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/flag_set.vim
@@ -43,14 +43,16 @@ endfunction
 
 "FUNCTION: FlagSet.renderToString() {{{1
 function! s:FlagSet.renderToString()
-    let flagstring = ""
+    let flagstring = ''
     for i in values(self._flags)
         let flagstring .= join(i)
     endfor
 
     if len(flagstring) == 0
-        return ""
+        return ''
     endif
 
     return '[' . flagstring . ']'
 endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/key_map.vim b/pack/navigation/start/nerdtree/lib/nerdtree/key_map.vim
new file mode 100644
index 0000000..f3268c2
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/key_map.vim
@@ -0,0 +1,164 @@
+"CLASS: KeyMap
+"============================================================
+let s:KeyMap = {}
+let g:NERDTreeKeyMap = s:KeyMap
+let s:keyMaps = {}
+
+"FUNCTION: KeyMap.All() {{{1
+function! s:KeyMap.All()
+    let sortedKeyMaps = values(s:keyMaps)
+    call sort(sortedKeyMaps, s:KeyMap.Compare, s:KeyMap)
+
+    return sortedKeyMaps
+endfunction
+
+"FUNCTION: KeyMap.Compare(keyMap1, keyMap2) {{{1
+function! s:KeyMap.Compare(keyMap1, keyMap2)
+
+    if a:keyMap1.key >? a:keyMap2.key
+        return 1
+    endif
+
+    if a:keyMap1.key <? a:keyMap2.key
+        return -1
+    endif
+
+    return 0
+endfunction
+
+"FUNCTION: KeyMap.FindFor(key, scope) {{{1
+function! s:KeyMap.FindFor(key, scope)
+    return get(s:keyMaps, a:key . a:scope, {})
+endfunction
+
+"FUNCTION: KeyMap.BindAll() {{{1
+function! s:KeyMap.BindAll()
+    for i in values(s:keyMaps)
+        call i.bind()
+    endfor
+endfunction
+
+"FUNCTION: KeyMap.bind() {{{1
+function! s:KeyMap.bind()
+    " If the key sequence we're trying to map contains any '<>' notation, we
+    " must replace each of the '<' characters with '<lt>' to ensure the string
+    " is not translated into its corresponding keycode during the later part
+    " of the map command below
+    " :he <>
+    let specialNotationRegex = '\m<\([[:alnum:]_-]\+>\)'
+    if self.key =~# specialNotationRegex
+        let keymapInvokeString = substitute(self.key, specialNotationRegex, '<lt>\1', 'g')
+    else
+        let keymapInvokeString = self.key
+    endif
+    let keymapInvokeString = escape(keymapInvokeString, '\')
+
+    let premap = self.key ==# '<LeftRelease>' ? ' <LeftRelease>' : ' '
+
+    exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>'
+endfunction
+
+"FUNCTION: KeyMap.Remove(key, scope) {{{1
+function! s:KeyMap.Remove(key, scope)
+    return remove(s:keyMaps, a:key . a:scope)
+endfunction
+
+"FUNCTION: KeyMap.invoke() {{{1
+"Call the KeyMaps callback function
+function! s:KeyMap.invoke(...)
+    let Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
+    if a:0
+        call Callback(a:1)
+    else
+        call Callback()
+    endif
+endfunction
+
+"FUNCTION: KeyMap.Invoke() {{{1
+"Find a keymapping for a:key and the current scope invoke it.
+"
+"Scope is determined as follows:
+"   * if the cursor is on a dir node then DirNode
+"   * if the cursor is on a file node then FileNode
+"   * if the cursor is on a bookmark then Bookmark
+"
+"If a keymap has the scope of 'all' then it will be called if no other keymap
+"is found for a:key and the scope.
+function! s:KeyMap.Invoke(key)
+
+    "required because clicking the command window below another window still
+    "invokes the <LeftRelease> mapping - but changes the window cursor
+    "is in first
+    "
+    "TODO: remove this check when the vim bug is fixed
+    if !g:NERDTree.ExistsForBuf()
+        return {}
+    endif
+
+    let node = g:NERDTreeFileNode.GetSelected()
+    if !empty(node)
+
+        "try file node
+        if !node.path.isDirectory
+            let km = s:KeyMap.FindFor(a:key, 'FileNode')
+            if !empty(km)
+                return km.invoke(node)
+            endif
+        endif
+
+        "try dir node
+        if node.path.isDirectory
+            let km = s:KeyMap.FindFor(a:key, 'DirNode')
+            if !empty(km)
+                return km.invoke(node)
+            endif
+        endif
+
+        "try generic node
+        let km = s:KeyMap.FindFor(a:key, 'Node')
+        if !empty(km)
+            return km.invoke(node)
+        endif
+
+    endif
+
+    "try bookmark
+    let bm = g:NERDTreeBookmark.GetSelected()
+    if !empty(bm)
+        let km = s:KeyMap.FindFor(a:key, 'Bookmark')
+        if !empty(km)
+            return km.invoke(bm)
+        endif
+    endif
+
+    "try all
+    let km = s:KeyMap.FindFor(a:key, 'all')
+    if !empty(km)
+        return km.invoke()
+    endif
+endfunction
+
+"FUNCTION: KeyMap.Create(options) {{{1
+function! s:KeyMap.Create(options)
+    let opts = extend({'scope': 'all', 'quickhelpText': ''}, copy(a:options))
+
+    "dont override other mappings unless the 'override' option is given
+    if get(opts, 'override', 0) ==# 0 && !empty(s:KeyMap.FindFor(opts['key'], opts['scope']))
+        return
+    end
+
+    let newKeyMap = copy(self)
+    let newKeyMap.key = opts['key']
+    let newKeyMap.quickhelpText = opts['quickhelpText']
+    let newKeyMap.callback = opts['callback']
+    let newKeyMap.scope = opts['scope']
+
+    call s:KeyMap.Add(newKeyMap)
+endfunction
+
+"FUNCTION: KeyMap.Add(keymap) {{{1
+function! s:KeyMap.Add(keymap)
+    let s:keyMaps[a:keymap.key . a:keymap.scope] = a:keymap
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/menu_controller.vim b/pack/navigation/start/nerdtree/lib/nerdtree/menu_controller.vim
new file mode 100644
index 0000000..952c67b
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/menu_controller.vim
@@ -0,0 +1,211 @@
+"CLASS: MenuController
+"============================================================
+let s:MenuController = {}
+let g:NERDTreeMenuController = s:MenuController
+
+"FUNCTION: MenuController.New(menuItems) {{{1
+"create a new menu controller that operates on the given menu items
+function! s:MenuController.New(menuItems)
+    let newMenuController =  copy(self)
+    if a:menuItems[0].isSeparator()
+        let newMenuController.menuItems = a:menuItems[1:-1]
+    else
+        let newMenuController.menuItems = a:menuItems
+    endif
+    return newMenuController
+endfunction
+
+" FUNCTION: s:MenuController.isMinimal() {{{1
+function! s:MenuController.isMinimal()
+    return g:NERDTreeMinimalMenu
+endfunction
+
+" FUNCTION: MenuController.showMenu() {{{1
+" Enter the main loop of the NERDTree menu, prompting the user to select
+" a menu item.
+function! s:MenuController.showMenu()
+    call self._saveOptions()
+
+    try
+        let self.selection = 0
+        let l:done = 0
+
+        while !l:done
+            if has('nvim')
+                mode
+            else
+                redraw!
+            endif
+            call self._echoPrompt()
+
+            let l:key = nr2char(getchar())
+            let l:done = self._handleKeypress(l:key)
+        endwhile
+    finally
+        call self._restoreOptions()
+
+        " Redraw when Ctrl-C or Esc is received.
+        if !l:done || self.selection ==# -1
+            redraw!
+        endif
+    endtry
+
+    if self.selection !=# -1
+        let l:m = self._current()
+        call l:m.execute()
+    endif
+endfunction
+
+"FUNCTION: MenuController._echoPrompt() {{{1
+function! s:MenuController._echoPrompt()
+    let navHelp = 'Use ' . g:NERDTreeMenuDown . '/' . g:NERDTreeMenuUp . '/enter'
+
+    if self.isMinimal()
+        let selection = self.menuItems[self.selection].text
+        let keyword = matchstr(selection, '[^ ]*([^ ]*')
+
+        let shortcuts = map(copy(self.menuItems), "v:val['shortcut']")
+        let shortcuts[self.selection] = ' ' . keyword . ' '
+
+        echo 'Menu: [' . join(shortcuts, ',') . '] (' . navHelp . ' or shortcut): '
+    else
+        echo 'NERDTree Menu. ' . navHelp . ', or the shortcuts indicated'
+        echo '========================================================='
+
+        for i in range(0, len(self.menuItems)-1)
+            if self.selection ==# i
+                echo '> ' . self.menuItems[i].text
+            else
+                echo '  ' . self.menuItems[i].text
+            endif
+        endfor
+    endif
+endfunction
+
+"FUNCTION: MenuController._current(key) {{{1
+"get the MenuItem that is currently selected
+function! s:MenuController._current()
+    return self.menuItems[self.selection]
+endfunction
+
+"FUNCTION: MenuController._handleKeypress(key) {{{1
+"change the selection (if appropriate) and return 1 if the user has made
+"their choice, 0 otherwise
+function! s:MenuController._handleKeypress(key)
+    if a:key ==# g:NERDTreeMenuDown
+        call self._cursorDown()
+    elseif a:key ==# g:NERDTreeMenuUp
+        call self._cursorUp()
+    elseif a:key ==# nr2char(27) "escape
+        let self.selection = -1
+        return 1
+    elseif a:key ==# "\r" || a:key ==# "\n" "enter and ctrl-j
+        return 1
+    else
+        let index = self._nextIndexFor(a:key)
+        if index !=# -1
+            let self.selection = index
+            if len(self._allIndexesFor(a:key)) ==# 1
+                return 1
+            endif
+        endif
+    endif
+
+    return 0
+endfunction
+
+"FUNCTION: MenuController._allIndexesFor(shortcut) {{{1
+"get indexes to all menu items with the given shortcut
+function! s:MenuController._allIndexesFor(shortcut)
+    let toReturn = []
+
+    for i in range(0, len(self.menuItems)-1)
+        if self.menuItems[i].shortcut ==# a:shortcut
+            call add(toReturn, i)
+        endif
+    endfor
+
+    return toReturn
+endfunction
+
+"FUNCTION: MenuController._nextIndexFor(shortcut) {{{1
+"get the index to the next menu item with the given shortcut, starts from the
+"current cursor location and wraps around to the top again if need be
+function! s:MenuController._nextIndexFor(shortcut)
+    for i in range(self.selection+1, len(self.menuItems)-1)
+        if self.menuItems[i].shortcut ==# a:shortcut
+            return i
+        endif
+    endfor
+
+    for i in range(0, self.selection)
+        if self.menuItems[i].shortcut ==# a:shortcut
+            return i
+        endif
+    endfor
+
+    return -1
+endfunction
+
+"FUNCTION: MenuController._setCmdheight() {{{1
+"sets &cmdheight to whatever is needed to display the menu
+function! s:MenuController._setCmdheight()
+    if self.isMinimal()
+        let &cmdheight = 1
+    else
+        let &cmdheight = len(self.menuItems) + 3
+    endif
+endfunction
+
+"FUNCTION: MenuController._saveOptions() {{{1
+"set any vim options that are required to make the menu work (saving their old
+"values)
+function! s:MenuController._saveOptions()
+    let self._oldLazyredraw = &lazyredraw
+    let self._oldCmdheight = &cmdheight
+    set nolazyredraw
+    call self._setCmdheight()
+endfunction
+
+"FUNCTION: MenuController._restoreOptions() {{{1
+"restore the options we saved in _saveOptions()
+function! s:MenuController._restoreOptions()
+    let &cmdheight = self._oldCmdheight
+    let &lazyredraw = self._oldLazyredraw
+endfunction
+
+"FUNCTION: MenuController._cursorDown() {{{1
+"move the cursor to the next menu item, skipping separators
+function! s:MenuController._cursorDown()
+    let done = 0
+    while !done
+        if self.selection < len(self.menuItems)-1
+            let self.selection += 1
+        else
+            let self.selection = 0
+        endif
+
+        if !self._current().isSeparator()
+            let done = 1
+        endif
+    endwhile
+endfunction
+
+"FUNCTION: MenuController._cursorUp() {{{1
+"move the cursor to the previous menu item, skipping separators
+function! s:MenuController._cursorUp()
+    let done = 0
+    while !done
+        if self.selection > 0
+            let self.selection -= 1
+        else
+            let self.selection = len(self.menuItems)-1
+        endif
+
+        if !self._current().isSeparator()
+            let done = 1
+        endif
+    endwhile
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/lib/nerdtree/menu_item.vim b/pack/navigation/start/nerdtree/lib/nerdtree/menu_item.vim
old mode 100755
new mode 100644
similarity index 87%
rename from bundle/nerdtree/lib/nerdtree/menu_item.vim
rename to pack/navigation/start/nerdtree/lib/nerdtree/menu_item.vim
index 92c1bbb..7f25917
--- a/bundle/nerdtree/lib/nerdtree/menu_item.vim
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/menu_item.vim
@@ -6,7 +6,7 @@ let g:NERDTreeMenuItem = s:MenuItem
 "FUNCTION: MenuItem.All() {{{1
 "get all top level menu items
 function! s:MenuItem.All()
-    if !exists("s:menuItems")
+    if !exists('s:menuItems')
         let s:menuItems = []
     endif
     return s:menuItems
@@ -58,7 +58,7 @@ function! s:MenuItem.CreateSeparator(options)
     let standard_options = { 'text': '--------------------',
                 \ 'shortcut': -1,
                 \ 'callback': -1 }
-    let options = extend(a:options, standard_options, "force")
+    let options = extend(a:options, standard_options, 'force')
 
     return s:MenuItem.Create(options)
 endfunction
@@ -67,7 +67,7 @@ endfunction
 "make a new submenu and add it to global list
 function! s:MenuItem.CreateSubmenu(options)
     let standard_options = { 'callback': -1 }
-    let options = extend(a:options, standard_options, "force")
+    let options = extend(a:options, standard_options, 'force')
 
     return s:MenuItem.Create(options)
 endfunction
@@ -79,7 +79,7 @@ endfunction
 "specified
 function! s:MenuItem.enabled()
     if self.isActiveCallback != -1
-        return {self.isActiveCallback}()
+        return type(self.isActiveCallback) == type(function('tr')) ? self.isActiveCallback() : {self.isActiveCallback}()
     endif
     return 1
 endfunction
@@ -94,7 +94,11 @@ function! s:MenuItem.execute()
         call mc.showMenu()
     else
         if self.callback != -1
-            call {self.callback}()
+            if type(self.callback) == type(function('tr'))
+                call self.callback()
+            else
+                call {self.callback}()
+            endif
         endif
     endif
 endfunction
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/nerdtree.vim b/pack/navigation/start/nerdtree/lib/nerdtree/nerdtree.vim
new file mode 100644
index 0000000..982db16
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/nerdtree.vim
@@ -0,0 +1,215 @@
+"CLASS: NERDTree
+"============================================================
+let s:NERDTree = {}
+let g:NERDTree = s:NERDTree
+
+"FUNCTION: s:NERDTree.AddPathFilter() {{{1
+function! s:NERDTree.AddPathFilter(callback)
+    call add(s:NERDTree.PathFilters(), a:callback)
+endfunction
+
+"FUNCTION: s:NERDTree.changeRoot(node) {{{1
+function! s:NERDTree.changeRoot(node)
+    if a:node.path.isDirectory
+        let self.root = a:node
+    else
+        call a:node.cacheParent()
+        let self.root = a:node.parent
+    endif
+
+    call self.root.open()
+
+    "change dir to the dir of the new root if instructed to
+    if g:NERDTreeChDirMode >= 2
+        call self.root.path.changeToDir()
+    endif
+
+    call self.render()
+    call self.root.putCursorHere(0, 0)
+
+    silent doautocmd User NERDTreeNewRoot
+endfunction
+
+"FUNCTION: s:NERDTree.Close() {{{1
+"Closes the tab tree window for this tab
+function! s:NERDTree.Close()
+    if !s:NERDTree.IsOpen()
+        return
+    endif
+
+    if winnr('$') !=# 1
+        " Use the window ID to identify the currently active window or fall
+        " back on the buffer ID if win_getid/win_gotoid are not available, in
+        " which case we'll focus an arbitrary window showing the buffer.
+        let l:useWinId = exists('*win_getid') && exists('*win_gotoid')
+
+        if winnr() ==# s:NERDTree.GetWinNum()
+            call nerdtree#exec('wincmd p', 1)
+            let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr('')
+            call nerdtree#exec('wincmd p', 1)
+        else
+            let l:activeBufOrWin = l:useWinId ? win_getid() : bufnr('')
+        endif
+
+        call nerdtree#exec(s:NERDTree.GetWinNum() . ' wincmd w', 1)
+        call nerdtree#exec('close', 0)
+        if l:useWinId
+            call nerdtree#exec('call win_gotoid(' . l:activeBufOrWin . ')', 0)
+        else
+            call nerdtree#exec(bufwinnr(l:activeBufOrWin) . ' wincmd w', 0)
+        endif
+    else
+        close
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.CloseIfQuitOnOpen() {{{1
+"Closes the NERD tree window if the close on open option is set
+function! s:NERDTree.CloseIfQuitOnOpen()
+    if nerdtree#and(g:NERDTreeQuitOnOpen,1) && s:NERDTree.IsOpen()
+        call s:NERDTree.Close()
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.CursorToBookmarkTable(){{{1
+"Places the cursor at the top of the bookmarks table
+function! s:NERDTree.CursorToBookmarkTable()
+    if !b:NERDTree.ui.getShowBookmarks()
+        throw 'NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active'
+    endif
+
+    if g:NERDTreeMinimalUI
+        return cursor(1, 2)
+    endif
+
+    let rootNodeLine = b:NERDTree.ui.getRootLineNum()
+
+    let line = 1
+    while getline(line) !~# '^>-\+Bookmarks-\+$'
+        let line = line + 1
+        if line >= rootNodeLine
+            throw 'NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table'
+        endif
+    endwhile
+    call cursor(line, 2)
+endfunction
+
+"FUNCTION: s:NERDTree.CursorToTreeWin(){{{1
+"Places the cursor in the nerd tree window
+function! s:NERDTree.CursorToTreeWin(...)
+    call g:NERDTree.MustBeOpen()
+    call nerdtree#exec(g:NERDTree.GetWinNum() . 'wincmd w', a:0 >0 ? a:1 : 1)
+endfunction
+
+" Function: s:NERDTree.ExistsForBuffer()   {{{1
+" Returns 1 if a nerd tree root exists in the current buffer
+function! s:NERDTree.ExistsForBuf()
+    return exists('b:NERDTree')
+endfunction
+
+" Function: s:NERDTree.ExistsForTab()   {{{1
+" Returns 1 if a nerd tree root exists in the current tab
+function! s:NERDTree.ExistsForTab()
+    if !exists('t:NERDTreeBufName')
+        return
+    end
+
+    "check b:NERDTree is still there and hasn't been e.g. :bdeleted
+    return !empty(getbufvar(bufnr(t:NERDTreeBufName), 'NERDTree'))
+endfunction
+
+function! s:NERDTree.ForCurrentBuf()
+    if s:NERDTree.ExistsForBuf()
+        return b:NERDTree
+    else
+        return {}
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.ForCurrentTab() {{{1
+function! s:NERDTree.ForCurrentTab()
+    if !s:NERDTree.ExistsForTab()
+        return
+    endif
+
+    let bufnr = bufnr(t:NERDTreeBufName)
+    return getbufvar(bufnr, 'NERDTree')
+endfunction
+
+"FUNCTION: s:NERDTree.getRoot() {{{1
+function! s:NERDTree.getRoot()
+    return self.root
+endfunction
+
+"FUNCTION: s:NERDTree.GetWinNum() {{{1
+"gets the nerd tree window number for this tab
+function! s:NERDTree.GetWinNum()
+    if exists('t:NERDTreeBufName')
+        return bufwinnr(t:NERDTreeBufName)
+    endif
+
+    " If WindowTree, there is no t:NERDTreeBufName variable. Search all windows.
+    for w in range(1,winnr('$'))
+        if bufname(winbufnr(w)) =~# '^' . g:NERDTreeCreator.BufNamePrefix() . '\d\+$'
+            return w
+        endif
+    endfor
+
+    return -1
+endfunction
+
+"FUNCTION: s:NERDTree.IsOpen() {{{1
+function! s:NERDTree.IsOpen()
+    return s:NERDTree.GetWinNum() !=# -1
+endfunction
+
+"FUNCTION: s:NERDTree.isTabTree() {{{1
+function! s:NERDTree.isTabTree()
+    return self._type ==# 'tab'
+endfunction
+
+"FUNCTION: s:NERDTree.isWinTree() {{{1
+function! s:NERDTree.isWinTree()
+    return self._type ==# 'window'
+endfunction
+
+"FUNCTION: s:NERDTree.MustBeOpen() {{{1
+function! s:NERDTree.MustBeOpen()
+    if !s:NERDTree.IsOpen()
+        throw 'NERDTree.TreeNotOpen'
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.New() {{{1
+function! s:NERDTree.New(path, type)
+    let newObj = copy(self)
+    let newObj.ui = g:NERDTreeUI.New(newObj)
+    let newObj.root = g:NERDTreeDirNode.New(a:path, newObj)
+    let newObj._type = a:type
+    return newObj
+endfunction
+
+"FUNCTION: s:NERDTree.PathFilters() {{{1
+function! s:NERDTree.PathFilters()
+    if !exists('s:NERDTree._PathFilters')
+        let s:NERDTree._PathFilters = []
+    endif
+    return s:NERDTree._PathFilters
+endfunction
+
+"FUNCTION: s:NERDTree.previousBuf() {{{1
+function! s:NERDTree.previousBuf()
+    return self._previousBuf
+endfunction
+
+function! s:NERDTree.setPreviousBuf(bnum)
+    let self._previousBuf = a:bnum
+endfunction
+
+"FUNCTION: s:NERDTree.render() {{{1
+"A convenience function - since this is called often
+function! s:NERDTree.render()
+    call self.ui.render()
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/notifier.vim b/pack/navigation/start/nerdtree/lib/nerdtree/notifier.vim
new file mode 100644
index 0000000..fc3155d
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/notifier.vim
@@ -0,0 +1,35 @@
+"CLASS: Notifier
+"============================================================
+let s:Notifier = {}
+
+function! s:Notifier.AddListener(event, funcname)
+    let listeners = s:Notifier.GetListenersForEvent(a:event)
+    if listeners == []
+        let listenersMap = s:Notifier.GetListenersMap()
+        let listenersMap[a:event] = listeners
+    endif
+    call add(listeners, a:funcname)
+endfunction
+
+function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
+    let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
+
+    for Listener in s:Notifier.GetListenersForEvent(a:event)
+    	let Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
+        call Callback(event)
+    endfor
+endfunction
+
+function! s:Notifier.GetListenersMap()
+    if !exists('s:refreshListenersMap')
+        let s:refreshListenersMap = {}
+    endif
+    return s:refreshListenersMap
+endfunction
+
+function! s:Notifier.GetListenersForEvent(name)
+    let listenersMap = s:Notifier.GetListenersMap()
+    return get(listenersMap, a:name, [])
+endfunction
+
+let g:NERDTreePathNotifier = deepcopy(s:Notifier)
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/opener.vim b/pack/navigation/start/nerdtree/lib/nerdtree/opener.vim
new file mode 100644
index 0000000..0d9f9ba
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/opener.vim
@@ -0,0 +1,328 @@
+" ============================================================================
+" CLASS: Opener
+"
+" The Opener class defines an API for 'opening' operations.
+" ============================================================================
+
+
+let s:Opener = {}
+let g:NERDTreeOpener = s:Opener
+
+" FUNCTION: s:Opener._bufInWindows(bnum) {{{1
+" [[STOLEN FROM VTREEEXPLORER.VIM]]
+" Determine the number of windows open to this buffer number.
+" Care of Yegappan Lakshman.  Thanks!
+"
+" Args:
+" bnum: the subject buffers buffer number
+function! s:Opener._bufInWindows(bnum)
+    let cnt = 0
+    let winnum = 1
+    while 1
+        let bufnum = winbufnr(winnum)
+        if bufnum < 0
+            break
+        endif
+        if bufnum ==# a:bnum
+            let cnt = cnt + 1
+        endif
+        let winnum = winnum + 1
+    endwhile
+
+    return cnt
+endfunction
+
+" FUNCTION: Opener._checkToCloseTree(newtab) {{{1
+" Check the class options and global options (i.e. NERDTreeQuitOnOpen) to see
+" if the tree should be closed now.
+"
+" Args:
+" a:newtab - boolean. If set, only close the tree now if we are opening the
+" target in a new tab. This is needed because we have to close tree before we
+" leave the tab
+function! s:Opener._checkToCloseTree(newtab)
+    if self._keepopen
+        return
+    endif
+
+    if (a:newtab && self._where ==# 't') || !a:newtab
+        call g:NERDTree.CloseIfQuitOnOpen()
+    endif
+endfunction
+
+" FUNCTION: s:Opener._firstUsableWindow() {{{1
+" find the window number of the first normal window
+function! s:Opener._firstUsableWindow()
+    let i = 1
+    while i <= winnr('$')
+        let bnum = winbufnr(i)
+        if bnum !=# -1 && getbufvar(bnum, '&buftype') ==# ''
+                    \ && !getwinvar(i, '&previewwindow')
+                    \ && (!getbufvar(bnum, '&modified') || &hidden)
+            return i
+        endif
+
+        let i += 1
+    endwhile
+    return -1
+endfunction
+
+" FUNCTION: Opener._gotoTargetWin() {{{1
+function! s:Opener._gotoTargetWin()
+    if b:NERDTree.isWinTree()
+        if self._where ==# 'v'
+            call self._newVSplit()
+        elseif self._where ==# 'h'
+            call self._newSplit()
+        elseif self._where ==# 't'
+            tabnew
+        endif
+    else
+        call self._checkToCloseTree(1)
+
+        if self._where ==# 'v'
+            call self._newVSplit()
+        elseif self._where ==# 'h'
+            call self._newSplit()
+        elseif self._where ==# 't'
+            tabnew
+        elseif self._where ==# 'p'
+            call self._previousWindow()
+        endif
+
+        call self._checkToCloseTree(0)
+    endif
+endfunction
+
+" FUNCTION: s:Opener._isWindowUsable(winnumber) {{{1
+" Returns 0 if opening a file from the tree in the given window requires it to
+" be split, 1 otherwise
+"
+" Args:
+" winnumber: the number of the window in question
+function! s:Opener._isWindowUsable(winnumber)
+    "gotta split if theres only one window (i.e. the NERD tree)
+    if winnr('$') ==# 1
+        return 0
+    endif
+
+    let oldwinnr = winnr()
+    call nerdtree#exec(a:winnumber . 'wincmd p', 1)
+    let specialWindow = getbufvar('%', '&buftype') !=# '' || getwinvar('%', '&previewwindow')
+    let modified = &modified
+    call nerdtree#exec(oldwinnr . 'wincmd p', 1)
+
+    "if its a special window e.g. quickfix or another explorer plugin then we
+    "have to split
+    if specialWindow
+        return 0
+    endif
+
+    if &hidden
+        return 1
+    endif
+
+    return !modified || self._bufInWindows(winbufnr(a:winnumber)) >= 2
+endfunction
+
+" FUNCTION: Opener.New(path, opts) {{{1
+" Instantiate a new NERDTreeOpener object.
+" Args:
+" a:path: the path object that is to be opened
+" a:opts: a dictionary containing the following optional keys...
+"   'where': specifies whether the node should be opened in new split, in
+"            a new tab or, in the last window; takes values 'v', 'h', or 't'
+"   'reuse': if file is already shown in a window, jump there; takes values
+"            'all', 'currenttab', or empty
+"   'keepopen': boolean (0 or 1); if true, the tree window will not be closed
+"   'stay': boolean (0 or 1); if true, remain in tree window after opening
+function! s:Opener.New(path, opts)
+    let l:newOpener = copy(self)
+
+    let l:newOpener._keepopen = nerdtree#has_opt(a:opts, 'keepopen')
+    let l:newOpener._nerdtree = b:NERDTree
+    let l:newOpener._path = a:path
+    let l:newOpener._reuse = has_key(a:opts, 'reuse') ? a:opts['reuse'] : ''
+    let l:newOpener._stay = nerdtree#has_opt(a:opts, 'stay')
+    let l:newOpener._where = has_key(a:opts, 'where') ? a:opts['where'] : ''
+
+    call l:newOpener._saveCursorPos()
+
+    return l:newOpener
+endfunction
+
+" FUNCTION: Opener._newSplit() {{{1
+function! s:Opener._newSplit()
+    let onlyOneWin = (winnr('$') ==# 1)
+    let savesplitright = &splitright
+    if onlyOneWin
+        let &splitright = (g:NERDTreeWinPos ==# 'left')
+    endif
+    " If only one window (ie. NERDTree), split vertically instead.
+    let splitMode = onlyOneWin ? 'vertical' : ''
+
+    " Open the new window
+    try
+        call nerdtree#exec('wincmd p', 1)
+        call nerdtree#exec(splitMode . ' split',1)
+    catch /^Vim\%((\a\+)\)\=:E37/
+        call g:NERDTree.CursorToTreeWin()
+        throw 'NERDTree.FileAlreadyOpenAndModifiedError: '. self._path.str() .' is already open and modified.'
+    catch /^Vim\%((\a\+)\)\=:/
+        "do nothing
+    endtry
+
+    "resize the tree window if no other window was open before
+    if onlyOneWin
+        let size = exists('b:NERDTreeOldWindowSize') ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        call nerdtree#exec('wincmd p', 1)
+        call nerdtree#exec('silent '. splitMode .' resize '. size, 1)
+        call nerdtree#exec('wincmd p', 0)
+    endif
+
+    let &splitright=savesplitright
+endfunction
+
+" FUNCTION: Opener._newVSplit() {{{1
+function! s:Opener._newVSplit()
+    let l:winwidth = winwidth('.')
+
+    let onlyOneWin = (winnr('$') ==# 1)
+    let savesplitright = &splitright
+    if onlyOneWin
+        let &splitright = (g:NERDTreeWinPos ==# 'left')
+        let l:winwidth = g:NERDTreeWinSize
+    endif
+
+    call nerdtree#exec('wincmd p', 1)
+    call nerdtree#exec('vsplit', 1)
+
+    let l:currentWindowNumber = winnr()
+
+    " Restore the NERDTree to its original width.
+    call g:NERDTree.CursorToTreeWin()
+    execute 'silent vertical resize ' . l:winwidth
+
+    call nerdtree#exec(l:currentWindowNumber . 'wincmd w', 0)
+    let &splitright=savesplitright
+endfunction
+
+" FUNCTION: Opener.open(target) {{{1
+function! s:Opener.open(target)
+    if self._path.isDirectory
+        call self._openDirectory(a:target)
+        return
+    endif
+
+    call self._openFile()
+endfunction
+
+" FUNCTION: Opener._openFile() {{{1
+function! s:Opener._openFile()
+    if !self._stay && !and(g:NERDTreeQuitOnOpen,1) && exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
+        call b:NERDTree.ui.toggleZoom()
+    endif
+
+    if self._reuseWindow()
+        return
+    endif
+
+    call self._gotoTargetWin()
+
+    if self._stay
+        silent call self._path.edit()
+        call self._restoreCursorPos()
+        return
+    endif
+
+    call self._path.edit()
+endfunction
+
+" FUNCTION: Opener._openDirectory(node) {{{1
+function! s:Opener._openDirectory(node)
+    call self._gotoTargetWin()
+
+    if self._nerdtree.isWinTree()
+        call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
+    else
+        if empty(self._where)
+            call b:NERDTree.changeRoot(a:node)
+        elseif self._where ==# 't'
+            call g:NERDTreeCreator.CreateTabTree(a:node.path.str())
+        else
+            call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
+        endif
+    endif
+
+    if self._stay
+        call self._restoreCursorPos()
+    endif
+endfunction
+
+" FUNCTION: Opener._previousWindow() {{{1
+function! s:Opener._previousWindow()
+    if !self._isWindowUsable(winnr('#')) && self._firstUsableWindow() ==# -1
+        call self._newSplit()
+    else
+        try
+            if !self._isWindowUsable(winnr('#'))
+                call nerdtree#exec(self._firstUsableWindow() . 'wincmd w', 1)
+            else
+                call nerdtree#exec('wincmd p', 1)
+            endif
+        catch /^Vim\%((\a\+)\)\=:E37/
+            call g:NERDTree.CursorToTreeWin()
+            throw 'NERDTree.FileAlreadyOpenAndModifiedError: '. self._path.str() .' is already open and modified.'
+        catch /^Vim\%((\a\+)\)\=:/
+            echo v:exception
+        endtry
+    endif
+endfunction
+
+" FUNCTION: Opener._restoreCursorPos() {{{1
+function! s:Opener._restoreCursorPos()
+    call nerdtree#exec(self._tabnr . 'tabnext', 1)
+    call nerdtree#exec(bufwinnr(self._bufnr) . 'wincmd w', 1)
+endfunction
+
+" FUNCTION: Opener._reuseWindow() {{{1
+" put the cursor in the first window we find for this file
+"
+" return 1 if we were successful
+function! s:Opener._reuseWindow()
+    if empty(self._reuse)
+        return 0
+    endif
+
+    "check the current tab for the window
+    let winnr = bufwinnr('^' . self._path.str() . '$')
+    if winnr !=# -1
+        call nerdtree#exec(winnr . 'wincmd w', 0)
+        call self._checkToCloseTree(0)
+        return 1
+    endif
+
+    if self._reuse ==# 'currenttab'
+        return 0
+    endif
+
+    "check other tabs
+    let tabnr = self._path.tabnr()
+    if tabnr
+        call self._checkToCloseTree(1)
+        call nerdtree#exec(tabnr . 'tabnext', 1)
+        let winnr = bufwinnr('^' . self._path.str() . '$')
+        call nerdtree#exec(winnr . 'wincmd w', 0)
+        return 1
+    endif
+
+    return 0
+endfunction
+
+" FUNCTION: Opener._saveCursorPos() {{{1
+function! s:Opener._saveCursorPos()
+    let self._bufnr = bufnr('')
+    let self._tabnr = tabpagenr()
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/path.vim b/pack/navigation/start/nerdtree/lib/nerdtree/path.vim
new file mode 100644
index 0000000..2ac8c71
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/path.vim
@@ -0,0 +1,900 @@
+" ============================================================================
+" CLASS: Path
+"
+" The Path class provides an abstracted representation of a file system
+" pathname.  Various operations on pathnames are provided and a number of
+" representations of a given path name can be accessed here.
+" ============================================================================
+
+
+let s:Path = {}
+let g:NERDTreePath = s:Path
+
+" FUNCTION: Path.AbsolutePathFor(pathStr) {{{1
+function! s:Path.AbsolutePathFor(pathStr)
+    let l:prependWorkingDir = 0
+
+    if nerdtree#runningWindows()
+        let l:prependWorkingDir = a:pathStr !~# '^.:\(\\\|\/\)\?' && a:pathStr !~# '^\(\\\\\|\/\/\)'
+    else
+        let l:prependWorkingDir = a:pathStr !~# '^/'
+    endif
+
+    let l:result = a:pathStr
+
+    if l:prependWorkingDir
+        let l:result = getcwd()
+
+        if l:result[-1:] ==# s:Path.Slash()
+            let l:result = l:result . a:pathStr
+        else
+            let l:result = l:result . s:Path.Slash() . a:pathStr
+        endif
+    endif
+
+    return l:result
+endfunction
+
+" FUNCTION: Path.bookmarkNames() {{{1
+function! s:Path.bookmarkNames()
+    if !exists('self._bookmarkNames')
+        call self.cacheDisplayString()
+    endif
+    return self._bookmarkNames
+endfunction
+
+" FUNCTION: Path.cacheDisplayString() {{{1
+function! s:Path.cacheDisplayString() abort
+    let self.cachedDisplayString = g:NERDTreeNodeDelimiter . self.getLastPathComponent(1)
+
+    if self.isExecutable
+        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . '*'
+    endif
+
+    let self._bookmarkNames = []
+    for i in g:NERDTreeBookmark.Bookmarks()
+        if i.path.equals(self)
+            call add(self._bookmarkNames, i.name)
+        endif
+    endfor
+    if !empty(self._bookmarkNames) && g:NERDTreeMarkBookmarks ==# 1
+        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' {' . join(self._bookmarkNames) . '}'
+    endif
+
+    if self.isSymLink
+        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' -> ' . self.symLinkDest
+    endif
+
+    if self.isReadOnly
+        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' ['.g:NERDTreeGlyphReadOnly.']'
+    endif
+endfunction
+
+" FUNCTION: Path.addDelimiter() {{{1
+function! s:Path.addDelimiter(line)
+    if a:line =~# '\(.*' . g:NERDTreeNodeDelimiter . '\)\{2}'
+        return a:line
+    else
+        return a:line . g:NERDTreeNodeDelimiter
+    endif
+endfunction
+
+" FUNCTION: Path.changeToDir() {{{1
+function! s:Path.changeToDir()
+    let dir = self.str({'format': 'Cd'})
+    if self.isDirectory ==# 0
+        let dir = self.getParent().str({'format': 'Cd'})
+    endif
+
+    try
+        if g:NERDTreeUseTCD && exists(':tcd') ==# 2
+            execute 'tcd ' . dir
+            call nerdtree#echo("Tab's CWD is now: " . getcwd())
+        else
+            execute 'cd ' . dir
+            call nerdtree#echo('CWD is now: ' . getcwd())
+        endif
+    catch
+        throw 'NERDTree.PathChangeError: cannot change CWD to ' . dir
+    endtry
+endfunction
+
+" FUNCTION: Path.compareTo() {{{1
+"
+" Compares this Path to the given path and returns 0 if they are equal, -1 if
+" this Path is 'less than' the given path, or 1 if it is 'greater'.
+"
+" Args:
+" path: the path object to compare this to
+"
+" Return:
+" 1, -1 or 0
+function! s:Path.compareTo(path)
+    let thisPath = self.getLastPathComponent(1)
+    let thatPath = a:path.getLastPathComponent(1)
+
+    "if the paths are the same then clearly we return 0
+    if thisPath ==# thatPath
+        return 0
+    endif
+
+    let thisSS = self.getSortOrderIndex()
+    let thatSS = a:path.getSortOrderIndex()
+
+    "compare the sort sequences, if they are different then the return
+    "value is easy
+    if thisSS < thatSS
+        return -1
+    elseif thisSS > thatSS
+        return 1
+    else
+        if !g:NERDTreeSortHiddenFirst
+            let thisPath = substitute(thisPath, '^[._]', '', '')
+            let thatPath = substitute(thatPath, '^[._]', '', '')
+        endif
+        "if the sort sequences are the same then compare the paths
+        "alphabetically
+        let pathCompare = g:NERDTreeCaseSensitiveSort ? thisPath <# thatPath : thisPath <? thatPath
+        if pathCompare
+            return -1
+        else
+            return 1
+        endif
+    endif
+endfunction
+
+" FUNCTION: Path.Create(fullpath) {{{1
+"
+" Factory method.
+"
+" Creates a path object with the given path. The path is also created on the
+" filesystem. If the path already exists, a NERDTree.Path.Exists exception is
+" thrown. If any other errors occur, a NERDTree.Path exception is thrown.
+"
+" Args:
+" fullpath: the full filesystem path to the file/dir to create
+function! s:Path.Create(fullpath)
+    "bail if the a:fullpath already exists
+    if isdirectory(a:fullpath) || filereadable(a:fullpath)
+        throw "NERDTree.CreatePathError: Directory Exists: '" . a:fullpath . "'"
+    endif
+
+    try
+
+        "if it ends with a slash, assume its a dir create it
+        if a:fullpath =~# '\(\\\|\/\)$'
+            "whack the trailing slash off the end if it exists
+            let fullpath = substitute(a:fullpath, '\(\\\|\/\)$', '', '')
+
+            call mkdir(fullpath, 'p')
+
+        "assume its a file and create
+        else
+            call s:Path.createParentDirectories(a:fullpath)
+            call writefile([], a:fullpath)
+        endif
+    catch
+        throw "NERDTree.CreatePathError: Could not create path: '" . a:fullpath . "'"
+    endtry
+
+    return s:Path.New(a:fullpath)
+endfunction
+
+" FUNCTION: Path.copy(dest) {{{1
+"
+" Copies the file/dir represented by this Path to the given location
+"
+" Args:
+" dest: the location to copy this dir/file to
+function! s:Path.copy(dest)
+    if !s:Path.CopyingSupported()
+        throw 'NERDTree.CopyingNotSupportedError: Copying is not supported on this OS'
+    endif
+
+    call s:Path.createParentDirectories(a:dest)
+
+    if exists('g:NERDTreeCopyCmd')
+        let cmd_prefix = g:NERDTreeCopyCmd
+    else
+        let cmd_prefix = (self.isDirectory ? g:NERDTreeCopyDirCmd : g:NERDTreeCopyFileCmd)
+    endif
+
+    let cmd = cmd_prefix . ' ' . shellescape(self.str()) . ' ' . shellescape(a:dest)
+    let success = system(cmd)
+    if v:shell_error !=# 0
+        throw "NERDTree.CopyError: Could not copy '". self.str() ."' to: '" . a:dest . "'"
+    endif
+endfunction
+
+" FUNCTION: Path.CopyingSupported() {{{1
+"
+" returns 1 if copying is supported for this OS
+function! s:Path.CopyingSupported()
+    return exists('g:NERDTreeCopyCmd') || (exists('g:NERDTreeCopyDirCmd') && exists('g:NERDTreeCopyFileCmd'))
+endfunction
+
+" FUNCTION: Path.copyingWillOverwrite(dest) {{{1
+"
+" returns 1 if copy this path to the given location will cause files to
+" overwritten
+"
+" Args:
+" dest: the location this path will be copied to
+function! s:Path.copyingWillOverwrite(dest)
+    if filereadable(a:dest)
+        return 1
+    endif
+
+    if isdirectory(a:dest)
+        let path = s:Path.JoinPathStrings(a:dest, self.getLastPathComponent(0))
+        if filereadable(path)
+            return 1
+        endif
+    endif
+endfunction
+
+" FUNCTION: Path.createParentDirectories(path) {{{1
+"
+" create parent directories for this path if needed
+" without throwing any errors if those directories already exist
+"
+" Args:
+" path: full path of the node whose parent directories may need to be created
+function! s:Path.createParentDirectories(path)
+    let dir_path = fnamemodify(a:path, ':h')
+    if !isdirectory(dir_path)
+        call mkdir(dir_path, 'p')
+    endif
+endfunction
+
+" FUNCTION: Path.delete() {{{1
+"
+" Deletes the file or directory represented by this path.
+"
+" Throws NERDTree.Path.Deletion exceptions
+function! s:Path.delete()
+    if self.isDirectory
+
+        let cmd = g:NERDTreeRemoveDirCmd . self.str({'escape': 1})
+        let success = system(cmd)
+
+        if v:shell_error !=# 0
+            throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.str() . "'"
+        endif
+    else
+        if exists('g:NERDTreeRemoveFileCmd')
+            let cmd = g:NERDTreeRemoveFileCmd . self.str({'escape': 1})
+            let success = system(cmd)
+        else
+            let success = delete(self.str())
+        endif
+
+        if success !=# 0
+            throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str() . "'"
+        endif
+    endif
+
+    "delete all bookmarks for this path
+    for i in self.bookmarkNames()
+        let bookmark = g:NERDTreeBookmark.BookmarkFor(i)
+        call bookmark.delete()
+    endfor
+endfunction
+
+" FUNCTION: Path.displayString() {{{1
+"
+" Returns a string that specifies how the path should be represented as a
+" string
+function! s:Path.displayString()
+    if self.cachedDisplayString ==# ''
+        call self.cacheDisplayString()
+    endif
+
+    return self.cachedDisplayString
+endfunction
+
+" FUNCTION: Path.edit() {{{1
+function! s:Path.edit()
+    let l:bufname = self.str({'format': 'Edit'})
+    if bufname('%') !=# l:bufname
+        exec 'edit ' . l:bufname
+    endif
+endfunction
+
+" FUNCTION: Path.extractDriveLetter(fullpath) {{{1
+"
+" If running windows, cache the drive letter for this path
+function! s:Path.extractDriveLetter(fullpath)
+    if nerdtree#runningWindows()
+        if a:fullpath =~# '^\(\\\\\|\/\/\)'
+            "For network shares, the 'drive' consists of the first two parts of the path, i.e. \\boxname\share
+            let self.drive = substitute(a:fullpath, '^\(\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\).*', '\1', '')
+            let self.drive = substitute(self.drive, '/', '\', 'g')
+        else
+            let self.drive = substitute(a:fullpath, '\(^[a-zA-Z]:\).*', '\1', '')
+        endif
+    else
+        let self.drive = ''
+    endif
+
+endfunction
+
+" FUNCTION: Path.exists() {{{1
+" return 1 if this path points to a location that is readable or is a directory
+function! s:Path.exists()
+    let p = self.str()
+    return filereadable(p) || isdirectory(p)
+endfunction
+
+" FUNCTION: Path._escChars() {{{1
+function! s:Path._escChars()
+    if nerdtree#runningWindows()
+        return " `\|\"#%&,?()\*^<>$"
+    endif
+
+    return " \\`\|\"#%&,?()\*^<>[]$"
+endfunction
+
+" FUNCTION: Path.getDir() {{{1
+"
+" Returns this path if it is a directory, else this paths parent.
+"
+" Return:
+" a Path object
+function! s:Path.getDir()
+    if self.isDirectory
+        return self
+    else
+        return self.getParent()
+    endif
+endfunction
+
+" FUNCTION: Path.getParent() {{{1
+"
+" Returns a new path object for this paths parent
+"
+" Return:
+" a new Path object
+function! s:Path.getParent()
+    if nerdtree#runningWindows()
+        let path = self.drive . '\' . join(self.pathSegments[0:-2], '\')
+    else
+        let path = '/'. join(self.pathSegments[0:-2], '/')
+    endif
+
+    return s:Path.New(path)
+endfunction
+
+" FUNCTION: Path.getLastPathComponent(dirSlash) {{{1
+"
+" Gets the last part of this path.
+"
+" Args:
+" dirSlash: if 1 then a trailing slash will be added to the returned value for
+" directory nodes.
+function! s:Path.getLastPathComponent(dirSlash)
+    if empty(self.pathSegments)
+        return ''
+    endif
+    let toReturn = self.pathSegments[-1]
+    if a:dirSlash && self.isDirectory
+        let toReturn = toReturn . '/'
+    endif
+    return toReturn
+endfunction
+
+" FUNCTION: Path.getSortOrderIndex() {{{1
+" returns the index of the pattern in g:NERDTreeSortOrder that this path matches
+function! s:Path.getSortOrderIndex()
+    let i = 0
+    while i < len(g:NERDTreeSortOrder)
+        if g:NERDTreeSortOrder[i] !~? '\[\[-\?\(timestamp\|size\|extension\)\]\]' &&
+        \ self.getLastPathComponent(1) =~# g:NERDTreeSortOrder[i]
+            return i
+        endif
+        let i = i + 1
+    endwhile
+
+    return index(g:NERDTreeSortOrder, '*')
+endfunction
+
+" FUNCTION: Path._splitChunks(path) {{{1
+" returns a list of path chunks
+function! s:Path._splitChunks(path)
+    let chunks = split(a:path, '\(\D\+\|\d\+\)\zs')
+    let i = 0
+    while i < len(chunks)
+        "convert number literals to numbers
+        if match(chunks[i], '^\d\+$') ==# 0
+            let chunks[i] = str2nr(chunks[i])
+        endif
+        let i = i + 1
+    endwhile
+    return chunks
+endfunction
+
+" FUNCTION: Path.getSortKey() {{{1
+" returns a key used in compare function for sorting
+function! s:Path.getSortKey()
+    if !exists('self._sortKey') || g:NERDTreeSortOrder !=# g:NERDTreeOldSortOrder
+        " Look for file metadata tags: [[timestamp]], [[extension]], [[size]]
+        let metadata = []
+        for tag in g:NERDTreeSortOrder
+            if tag =~? '\[\[-\?timestamp\]\]'
+                let metadata += [self.isDirectory ? 0 : getftime(self.str()) * (tag =~# '-' ? -1 : 1)]
+            elseif tag =~? '\[\[-\?size\]\]'
+                let metadata += [self.isDirectory ? 0 : getfsize(self.str()) * (tag =~# '-' ? -1 : 1)]
+            elseif tag =~? '\[\[extension\]\]'
+                let extension = matchstr(self.getLastPathComponent(0), '[^.]\+\.\zs[^.]\+$')
+                let metadata += [self.isDirectory ? '' : (extension ==# '' ? nr2char(str2nr('0x10ffff',16)) : extension)]
+            endif
+        endfor
+
+        if g:NERDTreeSortOrder[0] =~# '\[\[.*\]\]'
+            " Apply tags' sorting first if specified first.
+            let self._sortKey = metadata + [self.getSortOrderIndex()]
+        else
+            " Otherwise, do regex grouping first.
+            let self._sortKey = [self.getSortOrderIndex()] + metadata
+        endif
+
+        let path = self.getLastPathComponent(1)
+        if !g:NERDTreeSortHiddenFirst
+            let path = substitute(path, '^[._]', '', '')
+        endif
+        if !g:NERDTreeCaseSensitiveSort
+            let path = tolower(path)
+        endif
+
+        call extend(self._sortKey, (g:NERDTreeNaturalSort ? self._splitChunks(path) : [path]))
+    endif
+    return self._sortKey
+endfunction
+
+" FUNCTION: Path.isHiddenUnder(path) {{{1
+function! s:Path.isHiddenUnder(path)
+
+    if !self.isUnder(a:path)
+        return 0
+    endif
+
+    let l:startIndex = len(a:path.pathSegments)
+    let l:segments = self.pathSegments[l:startIndex : ]
+
+    for l:segment in l:segments
+
+        if l:segment =~# '^\.'
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" FUNCTION: Path.isUnixHiddenFile() {{{1
+" check for unix hidden files
+function! s:Path.isUnixHiddenFile()
+    return self.getLastPathComponent(0) =~# '^\.'
+endfunction
+
+" FUNCTION: Path.isUnixHiddenPath() {{{1
+" check for unix path with hidden components
+function! s:Path.isUnixHiddenPath()
+    if self.getLastPathComponent(0) =~# '^\.'
+        return 1
+    else
+        for segment in self.pathSegments
+            if segment =~# '^\.'
+                return 1
+            endif
+        endfor
+        return 0
+    endif
+endfunction
+
+" FUNCTION: Path.ignore(nerdtree) {{{1
+" returns true if this path should be ignored
+function! s:Path.ignore(nerdtree)
+    "filter out the user specified paths to ignore
+    if a:nerdtree.ui.isIgnoreFilterEnabled()
+        for i in g:NERDTreeIgnore
+            if self._ignorePatternMatches(i)
+                return 1
+            endif
+        endfor
+
+        for Callback in g:NERDTree.PathFilters()
+            let Callback = type(Callback) ==# type(function('tr')) ? Callback : function(Callback)
+            if Callback({'path': self, 'nerdtree': a:nerdtree})
+                return 1
+            endif
+        endfor
+    endif
+
+    "dont show hidden files unless instructed to
+    if !a:nerdtree.ui.getShowHidden() && self.isUnixHiddenFile()
+        return 1
+    endif
+
+    if a:nerdtree.ui.getShowFiles() ==# 0 && self.isDirectory ==# 0
+        return 1
+    endif
+
+    return 0
+endfunction
+
+" FUNCTION: Path._ignorePatternMatches(pattern) {{{1
+" returns true if this path matches the given ignore pattern
+function! s:Path._ignorePatternMatches(pattern)
+    let pat = a:pattern
+    if strpart(pat,len(pat)-7) ==# '[[dir]]'
+        if !self.isDirectory
+            return 0
+        endif
+        let pat = strpart(pat,0, len(pat)-7)
+    elseif strpart(pat,len(pat)-8) ==# '[[file]]'
+        if self.isDirectory
+            return 0
+        endif
+        let pat = strpart(pat,0, len(pat)-8)
+    endif
+
+    return self.getLastPathComponent(0) =~# pat
+endfunction
+
+" FUNCTION: Path.isAncestor(path) {{{1
+" return 1 if this path is somewhere above the given path in the filesystem.
+"
+" a:path should be a dir
+function! s:Path.isAncestor(path)
+    if !self.isDirectory
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(that, this) ==# 0
+endfunction
+
+" FUNCTION: Path.isUnder(path) {{{1
+" return 1 if this path is somewhere under the given path in the filesystem.
+function! s:Path.isUnder(path)
+    if a:path.isDirectory ==# 0
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(this, that . s:Path.Slash()) ==# 0
+endfunction
+
+" FUNCTION: Path.JoinPathStrings(...) {{{1
+function! s:Path.JoinPathStrings(...)
+    let components = []
+    for i in a:000
+        let components = extend(components, split(i, '/'))
+    endfor
+    return '/' . join(components, '/')
+endfunction
+
+" FUNCTION: Path.equals() {{{1
+"
+" Determines whether 2 path objects are "equal".
+" They are equal if the paths they represent are the same
+"
+" Args:
+" path: the other path obj to compare this with
+function! s:Path.equals(path)
+    if nerdtree#runningWindows()
+        return self.str() ==? a:path.str()
+    else
+        return self.str() ==# a:path.str()
+    endif
+endfunction
+
+" FUNCTION: Path.New(pathStr) {{{1
+function! s:Path.New(pathStr)
+    let l:newPath = copy(self)
+
+    call l:newPath.readInfoFromDisk(s:Path.AbsolutePathFor(a:pathStr))
+
+    let l:newPath.cachedDisplayString = ''
+    let l:newPath.flagSet = g:NERDTreeFlagSet.New()
+
+    return l:newPath
+endfunction
+
+" FUNCTION: Path.Slash() {{{1
+" Return the path separator used by the underlying file system.  Special
+" consideration is taken for the use of the 'shellslash' option on Windows
+" systems.
+function! s:Path.Slash()
+
+    if nerdtree#runningWindows()
+        if exists('+shellslash') && &shellslash
+            return '/'
+        endif
+
+        return '\'
+    endif
+
+    return '/'
+endfunction
+
+" FUNCTION: Path.Resolve() {{{1
+" Invoke the vim resolve() function and return the result
+" This is necessary because in some versions of vim resolve() removes trailing
+" slashes while in other versions it doesn't.  This always removes the trailing
+" slash
+function! s:Path.Resolve(path)
+    let tmp = resolve(a:path)
+    return tmp =~# '.\+/$' ? substitute(tmp, '/$', '', '') : tmp
+endfunction
+
+" FUNCTION: Path.readInfoFromDisk(fullpath) {{{1
+"
+"
+" Throws NERDTree.Path.InvalidArguments exception.
+function! s:Path.readInfoFromDisk(fullpath)
+    call self.extractDriveLetter(a:fullpath)
+
+    let fullpath = s:Path.WinToUnixPath(a:fullpath)
+
+    if getftype(fullpath) ==# 'fifo'
+        throw 'NERDTree.InvalidFiletypeError: Cant handle FIFO files: ' . a:fullpath
+    endif
+
+    let self.pathSegments = filter(split(fullpath, '/'), '!empty(v:val)')
+
+    let self.isReadOnly = 0
+    if isdirectory(a:fullpath)
+        let self.isDirectory = 1
+    elseif filereadable(a:fullpath)
+        let self.isDirectory = 0
+        let self.isReadOnly = filewritable(a:fullpath) ==# 0
+    else
+        throw 'NERDTree.InvalidArgumentsError: Invalid path = ' . a:fullpath
+    endif
+
+    let self.isExecutable = 0
+    if !self.isDirectory
+        let self.isExecutable = getfperm(a:fullpath) =~# 'x'
+    endif
+
+    "grab the last part of the path (minus the trailing slash)
+    let lastPathComponent = self.getLastPathComponent(0)
+
+    "get the path to the new node with the parent dir fully resolved
+    let hardPath = s:Path.Resolve(self.strTrunk()) . '/' . lastPathComponent
+
+    "if  the last part of the path is a symlink then flag it as such
+    let self.isSymLink = (s:Path.Resolve(hardPath) !=# hardPath)
+    if self.isSymLink
+        let self.symLinkDest = s:Path.Resolve(fullpath)
+
+        "if the link is a dir then slap a / on the end of its dest
+        if isdirectory(self.symLinkDest)
+
+            "we always wanna treat MS windows shortcuts as files for
+            "simplicity
+            if hardPath !~# '\.lnk$'
+
+                let self.symLinkDest = self.symLinkDest . '/'
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: Path.refresh(nerdtree) {{{1
+function! s:Path.refresh(nerdtree)
+    call self.readInfoFromDisk(self.str())
+    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, a:nerdtree, {})
+    call self.cacheDisplayString()
+endfunction
+
+" FUNCTION: Path.refreshFlags(nerdtree) {{{1
+function! s:Path.refreshFlags(nerdtree)
+    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, a:nerdtree, {})
+    call self.cacheDisplayString()
+endfunction
+
+" FUNCTION: Path.rename() {{{1
+"
+" Renames this node on the filesystem
+function! s:Path.rename(newPath)
+    if a:newPath ==# ''
+        throw 'NERDTree.InvalidArgumentsError: Invalid newPath for renaming = '. a:newPath
+    endif
+
+    call s:Path.createParentDirectories(a:newPath)
+
+    let success =  rename(self.str(), a:newPath)
+    if success !=# 0
+        throw "NERDTree.PathRenameError: Could not rename: '" . self.str() . "'" . 'to:' . a:newPath
+    endif
+    call self.readInfoFromDisk(a:newPath)
+
+    for i in self.bookmarkNames()
+        let b = g:NERDTreeBookmark.BookmarkFor(i)
+        call b.setPath(copy(self))
+    endfor
+    call g:NERDTreeBookmark.Write()
+endfunction
+
+" FUNCTION: Path.str() {{{1
+" Return a string representation of this Path object.
+"
+" Args:
+" This function takes a single dictionary (optional) with keys and values that
+" specify how the returned pathname should be formatted.
+"
+" The dictionary may have the following keys:
+"  'format'
+"  'escape'
+"  'truncateTo'
+"
+" The 'format' key may have a value of:
+"  'Cd' - a string to be used with ":cd" and similar commands
+"  'Edit' - a string to be used with ":edit" and similar commands
+"  'UI' - a string to be displayed in the NERDTree user interface
+"
+" The 'escape' key, if specified, will cause the output to be escaped with
+" Vim's internal "shellescape()" function.
+"
+" The 'truncateTo' key shortens the length of the path to that given by the
+" value associated with 'truncateTo'. A '<' is prepended.
+function! s:Path.str(...)
+    let options = a:0 ? a:1 : {}
+    let toReturn = ''
+
+    if has_key(options, 'format')
+        let format = options['format']
+        if has_key(self, '_strFor' . format)
+            exec 'let toReturn = self._strFor' . format . '()'
+        else
+            throw 'NERDTree.UnknownFormatError: unknown format "'. format .'"'
+        endif
+    else
+        let toReturn = self._str()
+    endif
+
+    if nerdtree#has_opt(options, 'escape')
+        let toReturn = shellescape(toReturn)
+    endif
+
+    if has_key(options, 'truncateTo')
+        let limit = options['truncateTo']
+        if strdisplaywidth(toReturn) > limit-1
+            while strdisplaywidth(toReturn) > limit-1 && strchars(toReturn) > 0
+                let toReturn = substitute(toReturn, '^.', '', '')
+            endwhile
+            if len(split(toReturn, '/')) > 1
+                let toReturn = '</' . join(split(toReturn, '/')[1:], '/') . '/'
+            else
+                let toReturn = '<' . toReturn
+            endif
+        endif
+    endif
+
+    return toReturn
+endfunction
+
+" FUNCTION: Path._strForUI() {{{1
+function! s:Path._strForUI()
+    let toReturn = '/' . join(self.pathSegments, '/')
+    if self.isDirectory && toReturn !=# '/'
+        let toReturn  = toReturn . '/'
+    endif
+    return toReturn
+endfunction
+
+" FUNCTION: Path._strForCd() {{{1
+" Return a string representation of this Path that is suitable for use as an
+" argument to Vim's internal ":cd" command.
+function! s:Path._strForCd()
+    return fnameescape(self.str())
+endfunction
+
+" FUNCTION: Path._strForEdit() {{{1
+" Return a string representation of this Path that is suitable for use as an
+" argument to Vim's internal ":edit" command.
+function! s:Path._strForEdit()
+
+    " Make the path relative to the current working directory, if possible.
+    let l:result = fnamemodify(self.str(), ':.')
+
+    " On Windows, the drive letter may be removed by "fnamemodify()".  Add it
+    " back, if necessary.
+    if nerdtree#runningWindows() && l:result[0] ==# s:Path.Slash()
+        let l:result = self.drive . l:result
+    endif
+
+    let l:result = fnameescape(l:result)
+
+    if empty(l:result)
+        let l:result = '.'
+    endif
+
+    return l:result
+endfunction
+
+" FUNCTION: Path._strForGlob() {{{1
+function! s:Path._strForGlob()
+    let lead = s:Path.Slash()
+
+    "if we are running windows then slap a drive letter on the front
+    if nerdtree#runningWindows()
+        let lead = self.drive . '\'
+    endif
+
+    let toReturn = lead . join(self.pathSegments, s:Path.Slash())
+
+    if !nerdtree#runningWindows()
+        let toReturn = escape(toReturn, self._escChars())
+    endif
+    return toReturn
+endfunction
+
+" FUNCTION: Path._str() {{{1
+" Return the absolute pathname associated with this Path object.  The pathname
+" returned is appropriate for the underlying file system.
+function! s:Path._str()
+    let l:separator = s:Path.Slash()
+    let l:leader = l:separator
+
+    if nerdtree#runningWindows()
+        let l:leader = self.drive . l:separator
+    endif
+
+    return l:leader . join(self.pathSegments, l:separator)
+endfunction
+
+" FUNCTION: Path.strTrunk() {{{1
+" Gets the path without the last segment on the end.
+function! s:Path.strTrunk()
+    return self.drive . '/' . join(self.pathSegments[0:-2], '/')
+endfunction
+
+" FUNCTION: Path.tabnr() {{{1
+" return the number of the first tab that is displaying this file
+"
+" return 0 if no tab was found
+function! s:Path.tabnr()
+    let str = self.str()
+    for t in range(tabpagenr('$'))
+        for b in tabpagebuflist(t+1)
+            if str ==# expand('#' . b . ':p')
+                return t+1
+            endif
+        endfor
+    endfor
+    return 0
+endfunction
+
+" FUNCTION: Path.WinToUnixPath(pathstr){{{1
+" Takes in a windows path and returns the unix equiv
+"
+" A class level method
+"
+" Args:
+" pathstr: the windows path to convert
+function! s:Path.WinToUnixPath(pathstr)
+    if !nerdtree#runningWindows()
+        return a:pathstr
+    endif
+
+    let toReturn = a:pathstr
+
+    "remove the x:\ of the front
+    let toReturn = substitute(toReturn, '^.*:\(\\\|/\)\?', '/', '')
+
+    "remove the \\ network share from the front
+    let toReturn = substitute(toReturn, '^\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\(\\\|\/\)\?', '/', '')
+
+    "convert all \ chars to /
+    let toReturn = substitute(toReturn, '\', '/', 'g')
+
+    return toReturn
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/tree_dir_node.vim b/pack/navigation/start/nerdtree/lib/nerdtree/tree_dir_node.vim
new file mode 100644
index 0000000..14d2996
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/tree_dir_node.vim
@@ -0,0 +1,705 @@
+" ============================================================================
+" CLASS: TreeDirNode
+"
+" A subclass of NERDTreeFileNode.
+"
+" The 'composite' part of the file/dir composite.
+" ============================================================================
+
+
+let s:TreeDirNode = copy(g:NERDTreeFileNode)
+let g:NERDTreeDirNode = s:TreeDirNode
+
+" FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{1
+" Class method that returns the highest cached ancestor of the current root.
+function! s:TreeDirNode.AbsoluteTreeRoot()
+    let currentNode = b:NERDTree.root
+    while currentNode.parent !=# {}
+        let currentNode = currentNode.parent
+    endwhile
+    return currentNode
+endfunction
+
+" FUNCTION: TreeDirNode.activate([options]) {{{1
+function! s:TreeDirNode.activate(...)
+    let l:options = (a:0 > 0) ? a:1 : {}
+
+    call self.toggleOpen(l:options)
+
+    " Note that we only re-render the NERDTree for this node if we did NOT
+    " create a new node and render it in a new window or tab.  In the latter
+    " case, rendering the NERDTree for this node could overwrite the text of
+    " the new NERDTree!
+    if !has_key(l:options, 'where') || empty(l:options['where'])
+        call self.getNerdtree().render()
+        call self.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: TreeDirNode.addChild(treenode, inOrder) {{{1
+" Adds the given treenode to the list of children for this node
+"
+" Args:
+" -treenode: the node to add
+" -inOrder: 1 if the new node should be inserted in sorted order
+function! s:TreeDirNode.addChild(treenode, inOrder)
+    call add(self.children, a:treenode)
+    let a:treenode.parent = self
+
+    if a:inOrder
+        call self.sortChildren()
+    endif
+endfunction
+
+" FUNCTION: TreeDirNode.close() {{{1
+" Mark this TreeDirNode as closed.
+function! s:TreeDirNode.close()
+
+    " Close all directories in this directory node's cascade. This is
+    " necessary to ensure consistency when cascades are rendered.
+    for l:dirNode in self.getCascade()
+        let l:dirNode.isOpen = 0
+    endfor
+endfunction
+
+" FUNCTION: TreeDirNode.closeChildren() {{{1
+" Recursively close any directory nodes that are descendants of this node.
+function! s:TreeDirNode.closeChildren()
+    for l:child in self.children
+        if l:child.path.isDirectory
+            call l:child.close()
+            call l:child.closeChildren()
+        endif
+    endfor
+endfunction
+
+" FUNCTION: TreeDirNode.createChild(path, inOrder) {{{1
+" Instantiates a new child node for this node with the given path. The new
+" nodes parent is set to this node.
+"
+" Args:
+" path: a Path object that this node will represent/contain
+" inOrder: 1 if the new node should be inserted in sorted order
+"
+" Returns:
+" the newly created node
+function! s:TreeDirNode.createChild(path, inOrder)
+    let newTreeNode = g:NERDTreeFileNode.New(a:path, self.getNerdtree())
+    call self.addChild(newTreeNode, a:inOrder)
+    return newTreeNode
+endfunction
+
+" FUNCTION: TreeDirNode.displayString() {{{1
+" Assemble and return a string that can represent this TreeDirNode object in
+" the NERDTree window.
+function! s:TreeDirNode.displayString()
+    let l:result = ''
+
+    " Build a label that identifies this TreeDirNode.
+    let l:label = ''
+    let l:cascade = self.getCascade()
+    for l:dirNode in l:cascade
+        let l:next = l:dirNode.path.displayString()
+        let l:label .= l:label ==# '' ? l:next : substitute(l:next,'^.','','')
+    endfor
+
+    " Select the appropriate open/closed status indicator symbol.
+    let l:symbol = (l:cascade[-1].isOpen ? g:NERDTreeDirArrowCollapsible : g:NERDTreeDirArrowExpandable )
+    let l:symbol .= (g:NERDTreeDirArrowExpandable ==# '' ? '' : ' ')
+    let l:flags = l:cascade[-1].path.flagSet.renderToString()
+
+    return l:symbol . l:flags . l:label
+endfunction
+
+" FUNCTION: TreeDirNode.findNode(path) {{{1
+" Will find one of the children (recursively) that has the given path
+"
+" Args:
+" path: a path object
+unlet s:TreeDirNode.findNode
+function! s:TreeDirNode.findNode(path)
+    if a:path.equals(self.path)
+        return self
+    endif
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return {}
+    endif
+
+    if self.path.isDirectory
+        for i in self.children
+            let retVal = i.findNode(a:path)
+            if retVal !=# {}
+                return retVal
+            endif
+        endfor
+    endif
+    return {}
+endfunction
+
+" FUNCTION: TreeDirNode.getCascade() {{{1
+" Return an array of dir nodes (starting from self) that can be cascade opened.
+function! s:TreeDirNode.getCascade()
+    if !self.isCascadable()
+        return [self]
+    endif
+
+    let vc = self.getVisibleChildren()
+    let visChild = vc[0]
+
+    return [self] + visChild.getCascade()
+endfunction
+
+" FUNCTION: TreeDirNode.getCascadeRoot() {{{1
+" Return the first directory node in the cascade in which this directory node
+" is rendered.
+function! s:TreeDirNode.getCascadeRoot()
+
+    " Don't search above the current NERDTree root node.
+    if self.isRoot()
+        return self
+    endif
+
+    let l:cascadeRoot = self
+    let l:parent = self.parent
+
+    while !empty(l:parent) && !l:parent.isRoot()
+
+        if index(l:parent.getCascade(), self) ==# -1
+            break
+        endif
+
+        let l:cascadeRoot = l:parent
+        let l:parent = l:parent.parent
+    endwhile
+
+    return l:cascadeRoot
+endfunction
+
+" FUNCTION: TreeDirNode.getChildCount() {{{1
+" Returns the number of children this node has
+function! s:TreeDirNode.getChildCount()
+    return len(self.children)
+endfunction
+
+" FUNCTION: TreeDirNode.getChild(path) {{{1
+" Returns child node of this node that has the given path or {} if no such node
+" exists.
+"
+" This function doesnt not recurse into child dir nodes
+"
+" Args:
+" path: a path object
+function! s:TreeDirNode.getChild(path)
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return {}
+    endif
+
+    let index = self.getChildIndex(a:path)
+    if index ==# -1
+        return {}
+    else
+        return self.children[index]
+    endif
+
+endfunction
+
+" FUNCTION: TreeDirNode.getChildByIndex(indx, visible) {{{1
+" returns the child at the given index
+"
+" Args:
+" indx: the index to get the child from
+" visible: 1 if only the visible children array should be used, 0 if all the
+" children should be searched.
+function! s:TreeDirNode.getChildByIndex(indx, visible)
+    let array_to_search = a:visible? self.getVisibleChildren() : self.children
+    if a:indx > len(array_to_search)
+        throw 'NERDTree.InvalidArgumentsError: Index is out of bounds.'
+    endif
+    return array_to_search[a:indx]
+endfunction
+
+" FUNCTION: TreeDirNode.getChildIndex(path) {{{1
+" Returns the index of the child node of this node that has the given path or
+" -1 if no such node exists.
+"
+" This function doesnt not recurse into child dir nodes
+"
+" Args:
+" path: a path object
+function! s:TreeDirNode.getChildIndex(path)
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return -1
+    endif
+
+    "do a binary search for the child
+    let a = 0
+    let z = self.getChildCount()
+    while a < z
+        let mid = (a+z)/2
+        let diff = a:path.compareTo(self.children[mid].path)
+
+        if diff ==# -1
+            let z = mid
+        elseif diff ==# 1
+            let a = mid+1
+        else
+            return mid
+        endif
+    endwhile
+    return -1
+endfunction
+
+" FUNCTION: TreeDirNode.getDirChildren() {{{1
+" Return a list of all child nodes from 'self.children' that are of type
+" TreeDirNode. This function supports http://github.com/scrooloose/nerdtree-project-plugin.git.
+function! s:TreeDirNode.getDirChildren()
+    return filter(copy(self.children), 'v:val.path.isDirectory ==# 1')
+endfunction
+
+" FUNCTION: TreeDirNode._glob(pattern, all) {{{1
+" Return a list of strings naming the descendants of the directory in this
+" TreeDirNode object that match the specified glob pattern.
+"
+" Args:
+" pattern: (string) the glob pattern to apply
+" all: (0 or 1) if 1, include '.' and '..' if they match 'pattern'; if 0,
+"      always exclude them
+"
+" Note: If the pathnames in the result list are below the working directory,
+" they are returned as pathnames relative to that directory. This is because
+" this function, internally, attempts to obey 'wildignore' rules that use
+" relative paths.
+function! s:TreeDirNode._glob(pattern, all)
+
+    " Construct a path specification such that globpath() will return
+    " relative pathnames, if possible.
+    if self.path.str() ==# getcwd()
+        let l:pathSpec = ','
+    else
+        let l:pathSpec = escape(fnamemodify(self.path.str({'format': 'Glob'}), ':.'), ',')
+
+        " On Windows, the drive letter may be removed by fnamemodify().
+        if nerdtree#runningWindows() && l:pathSpec[0] ==# g:NERDTreePath.Slash()
+            let l:pathSpec = self.path.drive . l:pathSpec
+        endif
+    endif
+
+    let l:globList = []
+
+    " See ':h version7.txt' and ':h version8.txt' for details on the
+    " development of the glob() and globpath() functions.
+    if v:version > 704 || (v:version ==# 704 && has('patch654'))
+        let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1, 0)
+    elseif v:version ==# 704 && has('patch279')
+        let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1)
+    elseif v:version > 702 || (v:version ==# 702 && has('patch051'))
+        let l:globString = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore)
+        let l:globList = split(l:globString, "\n")
+    else
+        let l:globString = globpath(l:pathSpec, a:pattern)
+        let l:globList = split(l:globString, "\n")
+    endif
+
+    " If a:all is false, filter '.' and '..' from the output.
+    if !a:all
+        let l:toRemove = []
+
+        for l:file in l:globList
+            let l:tail = fnamemodify(l:file, ':t')
+
+            " If l:file has a trailing slash, then its :tail will be ''. Use
+            " :h to drop the slash and the empty string after it; then use :t
+            " to get the directory name.
+            if l:tail ==# ''
+                let l:tail = fnamemodify(l:file, ':h:t')
+            endif
+
+            if l:tail ==# '.' || l:tail ==# '..'
+                call add(l:toRemove, l:file)
+                if len(l:toRemove) ==# 2
+                    break
+                endif
+            endif
+        endfor
+
+        for l:file in l:toRemove
+            call remove(l:globList, index(l:globList, l:file))
+        endfor
+    endif
+
+    return l:globList
+endfunction
+
+" FUNCTION: TreeDirNode.GetSelected() {{{1
+" Returns the current node if it is a dir node, or else returns the current
+" nodes parent
+unlet s:TreeDirNode.GetSelected
+function! s:TreeDirNode.GetSelected()
+    let currentDir = g:NERDTreeFileNode.GetSelected()
+    if currentDir !=# {} && !currentDir.isRoot()
+        if currentDir.path.isDirectory ==# 0
+            let currentDir = currentDir.parent
+        endif
+    endif
+    return currentDir
+endfunction
+
+" FUNCTION: TreeDirNode.getVisibleChildCount() {{{1
+" Returns the number of visible children this node has
+function! s:TreeDirNode.getVisibleChildCount()
+    return len(self.getVisibleChildren())
+endfunction
+
+" FUNCTION: TreeDirNode.getVisibleChildren() {{{1
+" Returns a list of children to display for this node, in the correct order
+"
+" Return:
+" an array of treenodes
+function! s:TreeDirNode.getVisibleChildren()
+    let toReturn = []
+    for i in self.children
+        if i.path.ignore(self.getNerdtree()) ==# 0
+            call add(toReturn, i)
+        endif
+    endfor
+    return toReturn
+endfunction
+
+" FUNCTION: TreeDirNode.hasVisibleChildren() {{{1
+" returns 1 if this node has any childre, 0 otherwise..
+function! s:TreeDirNode.hasVisibleChildren()
+    return self.getVisibleChildCount() !=# 0
+endfunction
+
+" FUNCTION: TreeDirNode.isCascadable() {{{1
+" true if this dir has only one visible child that is also a dir
+" false if this dir is bookmarked or symlinked. Why? Two reasons:
+"  1. If cascaded, we don't know which dir is bookmarked or is a symlink.
+"  2. If the parent is a symlink or is bookmarked, you end up with unparsable
+"     text, and NERDTree cannot get the path of any child node.
+" Also, return false if this directory is the tree root, which should never be
+" part of a cascade.
+function! s:TreeDirNode.isCascadable()
+    if g:NERDTreeCascadeSingleChildDir ==# 0
+        return 0
+    endif
+
+    if self.isRoot()
+        return 0
+    endif
+
+    if self.path.isSymLink
+        return 0
+    endif
+
+    for i in g:NERDTreeBookmark.Bookmarks()
+        if i.path.equals(self.path)
+            return 0
+        endif
+    endfor
+
+    let c = self.getVisibleChildren()
+    return len(c) ==# 1 && c[0].path.isDirectory
+endfunction
+
+" FUNCTION: TreeDirNode._initChildren() {{{1
+" Removes all childen from this node and re-reads them
+"
+" Args:
+" silent: 1 if the function should not echo any 'please wait' messages for
+" large directories
+"
+" Return: the number of child nodes read
+function! s:TreeDirNode._initChildren(silent)
+    "remove all the current child nodes
+    let self.children = []
+
+    let files = self._glob('*', 1) + self._glob('.*', 0)
+
+    if !a:silent && len(files) > g:NERDTreeNotificationThreshold
+        call nerdtree#echo('Please wait, caching a large dir ...')
+    endif
+
+    let invalidFilesFound = 0
+    for i in files
+        try
+            let path = g:NERDTreePath.New(i)
+            call self.createChild(path, 0)
+            call g:NERDTreePathNotifier.NotifyListeners('init', path, self.getNerdtree(), {})
+        catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
+            let invalidFilesFound += 1
+        endtry
+    endfor
+
+    call self.sortChildren()
+
+    call nerdtree#echo('')
+
+    if invalidFilesFound
+        call nerdtree#echoWarning(invalidFilesFound . ' file(s) could not be loaded into the NERD tree')
+    endif
+    return self.getChildCount()
+endfunction
+
+" FUNCTION: TreeDirNode.New(path, nerdtree) {{{1
+" Return a new TreeDirNode object with the given path and parent.
+"
+" Args:
+" path: dir that the node represents
+" nerdtree: the tree the node belongs to
+function! s:TreeDirNode.New(path, nerdtree)
+    if a:path.isDirectory !=# 1
+        throw 'NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object.'
+    endif
+
+    let newTreeNode = copy(self)
+    let newTreeNode.path = a:path
+
+    let newTreeNode.isOpen = 0
+    let newTreeNode.children = []
+
+    let newTreeNode.parent = {}
+    let newTreeNode._nerdtree = a:nerdtree
+
+    return newTreeNode
+endfunction
+
+" FUNCTION: TreeDirNode.open([options]) {{{1
+" Open this directory node in the current tree or elsewhere if special options
+" are provided. Return 0 if options were processed. Otherwise, return the
+" number of new cached nodes.
+function! s:TreeDirNode.open(...)
+    let l:options = a:0 ? a:1 : {}
+
+    " If special options were specified, process them and return.
+    if has_key(l:options, 'where') && !empty(l:options['where'])
+        let l:opener = g:NERDTreeOpener.New(self.path, l:options)
+        call l:opener.open(self)
+        return 0
+    endif
+
+    " Open any ancestors of this node that render within the same cascade.
+    let l:parent = self.parent
+    while !empty(l:parent) && !l:parent.isRoot()
+        if index(l:parent.getCascade(), self) >= 0
+            let l:parent.isOpen = 1
+            let l:parent = l:parent.parent
+        else
+            break
+        endif
+    endwhile
+
+    let self.isOpen = 1
+
+    let l:numChildrenCached = 0
+    if empty(self.children)
+        let l:numChildrenCached = self._initChildren(0)
+    endif
+
+    return l:numChildrenCached
+endfunction
+
+" FUNCTION: TreeDirNode.openAlong([opts]) {{{1
+" recursive open the dir if it has only one directory child.
+"
+" return the level of opened directories.
+function! s:TreeDirNode.openAlong(...)
+    let opts = a:0 ? a:1 : {}
+    let level = 0
+
+    let node = self
+    while node.path.isDirectory
+        call node.open(opts)
+        let level += 1
+        if node.getVisibleChildCount() ==# 1
+            let node = node.getChildByIndex(0, 1)
+        else
+            break
+        endif
+    endwhile
+    return level
+endfunction
+
+" FUNCTION: TreeDirNode.openExplorer() {{{1
+" Open an explorer window for this node in the previous window. The explorer
+" can be a NERDTree window or a netrw window.
+function! s:TreeDirNode.openExplorer()
+    execute 'wincmd p'
+    execute 'edit '.self.path.str({'format':'Edit'})
+endfunction
+
+" FUNCTION: TreeDirNode.openInNewTab(options) {{{1
+unlet s:TreeDirNode.openInNewTab
+function! s:TreeDirNode.openInNewTab(options)
+    call nerdtree#deprecated('TreeDirNode.openInNewTab', 'is deprecated, use open() instead')
+    call self.open({'where': 't'})
+endfunction
+
+" FUNCTION: TreeDirNode._openInNewTab() {{{1
+function! s:TreeDirNode._openInNewTab()
+    tabnew
+    call g:NERDTreeCreator.CreateTabTree(self.path.str())
+endfunction
+
+" FUNCTION: TreeDirNode.openRecursively() {{{1
+" Open this directory node and any descendant directory nodes whose pathnames
+" are not ignored.
+function! s:TreeDirNode.openRecursively()
+    silent call self.open()
+
+    for l:child in self.children
+        if l:child.path.isDirectory && !l:child.path.ignore(l:child.getNerdtree())
+            call l:child.openRecursively()
+        endif
+    endfor
+endfunction
+
+" FUNCTION: TreeDirNode.refresh() {{{1
+function! s:TreeDirNode.refresh()
+    call self.path.refresh(self.getNerdtree())
+
+    "if this node was ever opened, refresh its children
+    if self.isOpen || !empty(self.children)
+        let files = self._glob('*', 1) + self._glob('.*', 0)
+        let newChildNodes = []
+        let invalidFilesFound = 0
+        for i in files
+            try
+                "create a new path and see if it exists in this nodes children
+                let path = g:NERDTreePath.New(i)
+                let newNode = self.getChild(path)
+                if newNode !=# {}
+                    call newNode.refresh()
+                    call add(newChildNodes, newNode)
+
+                "the node doesnt exist so create it
+                else
+                    let newNode = g:NERDTreeFileNode.New(path, self.getNerdtree())
+                    let newNode.parent = self
+                    call add(newChildNodes, newNode)
+                endif
+            catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
+                let invalidFilesFound = 1
+            endtry
+        endfor
+
+        "swap this nodes children out for the children we just read/refreshed
+        let self.children = newChildNodes
+        call self.sortChildren()
+
+        if invalidFilesFound
+            call nerdtree#echoWarning('some files could not be loaded into the NERD tree')
+        endif
+    endif
+endfunction
+
+" FUNCTION: TreeDirNode.refreshFlags() {{{1
+unlet s:TreeDirNode.refreshFlags
+function! s:TreeDirNode.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+    for i in self.children
+        call i.refreshFlags()
+    endfor
+endfunction
+
+" FUNCTION: TreeDirNode.refreshDirFlags() {{{1
+function! s:TreeDirNode.refreshDirFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+endfunction
+
+" FUNCTION: TreeDirNode.reveal(path) {{{1
+" reveal the given path, i.e. cache and open all treenodes needed to display it
+" in the UI
+" Returns the revealed node
+function! s:TreeDirNode.reveal(path, ...)
+    let opts = a:0 ? a:1 : {}
+
+    if !a:path.isUnder(self.path)
+        throw 'NERDTree.InvalidArgumentsError: ' . a:path.str() . ' should be under ' . self.path.str()
+    endif
+
+    call self.open()
+
+    if self.path.equals(a:path.getParent())
+        let n = self.findNode(a:path)
+        " We may be looking for a newly-saved file that isn't in the tree yet.
+        if n ==# {}
+            call self.refresh()
+            let n = self.findNode(a:path)
+        endif
+        if has_key(opts, 'open')
+            call n.open()
+        endif
+        return n
+    endif
+
+    let p = a:path
+    while !p.getParent().equals(self.path)
+        let p = p.getParent()
+    endwhile
+
+    let n = self.findNode(p)
+    return n.reveal(a:path, opts)
+endfunction
+
+" FUNCTION: TreeDirNode.removeChild(treenode) {{{1
+" Remove the given treenode from self.children.
+" Throws NERDTree.ChildNotFoundError if the node is not found.
+"
+" Args:
+" treenode: the node object to remove
+function! s:TreeDirNode.removeChild(treenode)
+    for i in range(0, self.getChildCount()-1)
+        if self.children[i].equals(a:treenode)
+            call remove(self.children, i)
+            return
+        endif
+    endfor
+
+    throw 'NERDTree.ChildNotFoundError: child node was not found'
+endfunction
+
+" FUNCTION: TreeDirNode.sortChildren() {{{1
+" Sort self.children by alphabetical order and directory priority.
+function! s:TreeDirNode.sortChildren()
+    if count(g:NERDTreeSortOrder, '*') < 1
+        call add(g:NERDTreeSortOrder, '*')
+    endif
+    let CompareFunc = function('nerdtree#compareNodesBySortKey')
+    call sort(self.children, CompareFunc)
+    let g:NERDTreeOldSortOrder = g:NERDTreeSortOrder
+endfunction
+
+" FUNCTION: TreeDirNode.toggleOpen([options]) {{{1
+" Opens this directory if it is closed and vice versa
+function! s:TreeDirNode.toggleOpen(...)
+    let opts = a:0 ? a:1 : {}
+    if self.isOpen ==# 1
+        call self.close()
+    else
+        if g:NERDTreeCascadeOpenSingleChildDir ==# 0
+            call self.open(opts)
+        else
+            call self.openAlong(opts)
+        endif
+    endif
+endfunction
+
+" FUNCTION: TreeDirNode.transplantChild(newNode) {{{1
+" Replaces the child of this with the given node (where the child node's full
+" path matches a:newNode's fullpath). The search for the matching node is
+" non-recursive
+"
+" Arg:
+" newNode: the node to graft into the tree
+function! s:TreeDirNode.transplantChild(newNode)
+    for i in range(0, self.getChildCount()-1)
+        if self.children[i].equals(a:newNode)
+            let self.children[i] = a:newNode
+            let a:newNode.parent = self
+            break
+        endif
+    endfor
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/tree_file_node.vim b/pack/navigation/start/nerdtree/lib/nerdtree/tree_file_node.vim
new file mode 100644
index 0000000..957b98a
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/tree_file_node.vim
@@ -0,0 +1,349 @@
+" ============================================================================
+" CLASS: TreeFileNode
+"
+" This class is the parent of the TreeDirNode class and is the 'Component'
+" part of the composite design pattern between the NERDTree node classes.
+" ============================================================================
+
+
+let s:TreeFileNode = {}
+let g:NERDTreeFileNode = s:TreeFileNode
+
+" FUNCTION: TreeFileNode.activate(...) {{{1
+function! s:TreeFileNode.activate(...)
+    call self.open(a:0 ? a:1 : {})
+endfunction
+
+" FUNCTION: TreeFileNode.bookmark(name) {{{1
+" bookmark this node with a:name
+function! s:TreeFileNode.bookmark(name)
+
+    " if a bookmark exists with the same name and the node is cached then save
+    " it so we can update its display string
+    let oldMarkedNode = {}
+    try
+        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1, self.getNerdtree())
+    catch /^NERDTree.BookmarkNotFoundError/
+    catch /^NERDTree.BookmarkedNodeNotFoundError/
+    endtry
+
+    call g:NERDTreeBookmark.AddBookmark(a:name, self.path)
+    call self.path.cacheDisplayString()
+    call g:NERDTreeBookmark.Write()
+
+    if !empty(oldMarkedNode)
+        call oldMarkedNode.path.cacheDisplayString()
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.cacheParent() {{{1
+" initializes self.parent if it isnt already
+function! s:TreeFileNode.cacheParent()
+    if empty(self.parent)
+        let parentPath = self.path.getParent()
+        if parentPath.equals(self.path)
+            throw 'NERDTree.CannotCacheParentError: already at root'
+        endif
+        let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree())
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.clearBookmarks() {{{1
+function! s:TreeFileNode.clearBookmarks()
+    for i in g:NERDTreeBookmark.Bookmarks()
+        if i.path.equals(self.path)
+            call i.delete()
+        end
+    endfor
+    call self.path.cacheDisplayString()
+endfunction
+
+" FUNCTION: TreeFileNode.copy(dest) {{{1
+function! s:TreeFileNode.copy(dest)
+    call self.path.copy(a:dest)
+    let newPath = g:NERDTreePath.New(a:dest)
+    let parent = self.getNerdtree().root.findNode(newPath.getParent())
+    if !empty(parent)
+        call parent.refresh()
+        return parent.findNode(newPath)
+    else
+        return {}
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.delete {{{1
+" Removes this node from the tree and calls the Delete method for its path obj
+function! s:TreeFileNode.delete()
+    call self.path.delete()
+    call self.parent.removeChild(self)
+endfunction
+
+" FUNCTION: TreeFileNode.displayString() {{{1
+"
+" Returns a string that specifies how the node should be represented as a
+" string
+"
+" Return:
+" a string that can be used in the view to represent this node
+function! s:TreeFileNode.displayString()
+    return self.path.flagSet.renderToString() . self.path.displayString()
+endfunction
+
+" FUNCTION: TreeFileNode.equals(treenode) {{{1
+"
+" Compares this treenode to the input treenode and returns 1 if they are the
+" same node.
+"
+" Use this method instead of ==  because sometimes when the treenodes contain
+" many children, vim seg faults when doing ==
+"
+" Args:
+" treenode: the other treenode to compare to
+function! s:TreeFileNode.equals(treenode)
+    return self.path.str() ==# a:treenode.path.str()
+endfunction
+
+" FUNCTION: TreeFileNode.findNode(path) {{{1
+" Returns self if this node.path.Equals the given path.
+" Returns {} if not equal.
+"
+" Args:
+" path: the path object to compare against
+function! s:TreeFileNode.findNode(path)
+    if a:path.equals(self.path)
+        return self
+    endif
+    return {}
+endfunction
+
+" FUNCTION: TreeFileNode.findSibling(direction) {{{1
+" Find the next or previous sibling of this node.
+"
+" Args:
+" direction: 0 for previous, 1 for next
+"
+" Return:
+" The next/previous TreeFileNode object or an empty dictionary if not found.
+function! s:TreeFileNode.findSibling(direction)
+
+    " There can be no siblings if there is no parent.
+    if empty(self.parent)
+        return {}
+    endif
+
+    let l:nodeIndex = self.parent.getChildIndex(self.path)
+
+    if l:nodeIndex == -1
+        return {}
+    endif
+
+    " Get the next index to begin the search.
+    let l:nodeIndex += a:direction ? 1 : -1
+
+    while 0 <= l:nodeIndex && l:nodeIndex < self.parent.getChildCount()
+
+        " Return the next node if it is not ignored.
+        if !self.parent.children[l:nodeIndex].path.ignore(self.getNerdtree())
+            return self.parent.children[l:nodeIndex]
+        endif
+
+        let l:nodeIndex += a:direction ? 1 : -1
+    endwhile
+
+    return {}
+endfunction
+
+" FUNCTION: TreeFileNode.getNerdtree(){{{1
+function! s:TreeFileNode.getNerdtree()
+    return self._nerdtree
+endfunction
+
+" FUNCTION: TreeFileNode.GetRootForTab(){{{1
+" get the root node for this tab
+function! s:TreeFileNode.GetRootForTab()
+    if g:NERDTree.ExistsForTab()
+        return getbufvar(t:NERDTreeBufName, 'NERDTree').root
+    end
+    return {}
+endfunction
+
+" FUNCTION: TreeFileNode.GetSelected() {{{1
+" If the cursor is currently positioned on a tree node, return the node.
+" Otherwise, return the empty dictionary.
+function! s:TreeFileNode.GetSelected()
+
+    try
+        let l:path = b:NERDTree.ui.getPath(line('.'))
+
+        if empty(l:path)
+            return {}
+        endif
+
+        return b:NERDTree.root.findNode(l:path)
+    catch
+        return {}
+    endtry
+endfunction
+
+" FUNCTION: TreeFileNode.isVisible() {{{1
+" returns 1 if this node should be visible according to the tree filters and
+" hidden file filters (and their on/off status)
+function! s:TreeFileNode.isVisible()
+    return !self.path.ignore(self.getNerdtree())
+endfunction
+
+" FUNCTION: TreeFileNode.isRoot() {{{1
+function! s:TreeFileNode.isRoot()
+    if !g:NERDTree.ExistsForBuf()
+        throw 'NERDTree.NoTreeError: No tree exists for the current buffer'
+    endif
+
+    return self.equals(self.getNerdtree().root)
+endfunction
+
+" FUNCTION: TreeFileNode.New(path, nerdtree) {{{1
+" Returns a new TreeNode object with the given path and parent
+"
+" Args:
+" path: file/dir that the node represents
+" nerdtree: the tree the node belongs to
+function! s:TreeFileNode.New(path, nerdtree)
+    if a:path.isDirectory
+        return g:NERDTreeDirNode.New(a:path, a:nerdtree)
+    else
+        let newTreeNode = copy(self)
+        let newTreeNode.path = a:path
+        let newTreeNode.parent = {}
+        let newTreeNode._nerdtree = a:nerdtree
+        return newTreeNode
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.open() {{{1
+function! s:TreeFileNode.open(...)
+    let opts = a:0 ? a:1 : {}
+    let opener = g:NERDTreeOpener.New(self.path, opts)
+    call opener.open(self)
+endfunction
+
+" FUNCTION: TreeFileNode.openSplit() {{{1
+" Open this node in a new window
+function! s:TreeFileNode.openSplit()
+    call nerdtree#deprecated('TreeFileNode.openSplit', 'is deprecated, use .open() instead.')
+    call self.open({'where': 'h'})
+endfunction
+
+" FUNCTION: TreeFileNode.openVSplit() {{{1
+" Open this node in a new vertical window
+function! s:TreeFileNode.openVSplit()
+    call nerdtree#deprecated('TreeFileNode.openVSplit', 'is deprecated, use .open() instead.')
+    call self.open({'where': 'v'})
+endfunction
+
+" FUNCTION: TreeFileNode.openInNewTab(options) {{{1
+function! s:TreeFileNode.openInNewTab(options)
+    call nerdtree#deprecated('TreeFileNode.openinNewTab', 'is deprecated, use .open() instead.')
+    call self.open(extend({'where': 't'}, a:options))
+endfunction
+
+" FUNCTION: TreeFileNode.openExplorer()
+function! s:TreeFileNode.openExplorer()
+    execute 'wincmd p'
+    execute 'edit '.self.path.getParent().str({'format':'Edit'})
+endfunction
+
+" FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{1
+" Places the cursor on the line number this node is rendered on
+"
+" Args:
+" isJump: 1 if this cursor movement should be counted as a jump by vim
+" recurseUpward: try to put the cursor on the parent if the this node isnt
+" visible
+function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
+    let ln = self.getNerdtree().ui.getLineNum(self)
+    if ln != -1
+        if a:isJump
+            mark '
+        endif
+        call cursor(ln, col('.'))
+    else
+        if a:recurseUpward
+            let node = self
+            while node != {} && self.getNerdtree().ui.getLineNum(node) ==# -1
+                let node = node.parent
+                call node.open()
+            endwhile
+            call self._nerdtree.render()
+            call node.putCursorHere(a:isJump, 0)
+        endif
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.refresh() {{{1
+function! s:TreeFileNode.refresh()
+    call self.path.refresh(self.getNerdtree())
+endfunction
+
+" FUNCTION: TreeFileNode.refreshFlags() {{{1
+function! s:TreeFileNode.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+endfunction
+
+" FUNCTION: TreeFileNode.rename() {{{1
+" Calls the rename method for this nodes path obj
+function! s:TreeFileNode.rename(newName)
+    let newName = substitute(a:newName, '\(\\\|\/\)$', '', '')
+    call self.path.rename(newName)
+    call self.parent.removeChild(self)
+
+    let parentPath = self.path.getParent()
+    let newParent = self.getNerdtree().root.findNode(parentPath)
+
+    if newParent != {}
+        call newParent.createChild(self.path, 1)
+        call newParent.refresh()
+    endif
+endfunction
+
+" FUNCTION: TreeFileNode.renderToString {{{1
+" returns a string representation for this tree to be rendered in the view
+function! s:TreeFileNode.renderToString()
+    return self._renderToString(0, 0)
+endfunction
+
+" Args:
+" depth: the current depth in the tree for this call
+" drawText: 1 if we should actually draw the line for this node (if 0 then the
+" child nodes are rendered only)
+" for each depth in the tree
+function! s:TreeFileNode._renderToString(depth, drawText)
+    let output = ''
+    if a:drawText ==# 1
+
+        let treeParts = repeat('  ', a:depth - 1)
+        let treeParts .= (self.path.isDirectory || g:NERDTreeDirArrowExpandable ==# '' ? '' : '  ')
+
+        let line = treeParts . self.displayString()
+        let output = output . line . "\n"
+    endif
+
+    " if the node is an open dir, draw its children
+    if self.path.isDirectory ==# 1 && self.isOpen ==# 1
+
+        let childNodesToDraw = self.getVisibleChildren()
+
+        if self.isCascadable() && a:depth > 0
+
+            let output = output . childNodesToDraw[0]._renderToString(a:depth, 0)
+
+        elseif len(childNodesToDraw) > 0
+            for i in childNodesToDraw
+                let output = output . i._renderToString(a:depth + 1, 1)
+            endfor
+        endif
+    endif
+
+    return output
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/lib/nerdtree/ui.vim b/pack/navigation/start/nerdtree/lib/nerdtree/ui.vim
new file mode 100644
index 0000000..9ffadf6
--- /dev/null
+++ b/pack/navigation/start/nerdtree/lib/nerdtree/ui.vim
@@ -0,0 +1,529 @@
+" ============================================================================
+" CLASS: UI
+" ============================================================================
+
+
+let s:UI = {}
+let g:NERDTreeUI = s:UI
+
+" FUNCTION: s:UI.centerView() {{{1
+" centers the nerd tree window around the cursor (provided the nerd tree
+" options permit)
+function! s:UI.centerView()
+    if g:NERDTreeAutoCenter
+        let current_line = winline()
+        let lines_to_top = current_line
+        let lines_to_bottom = winheight(g:NERDTree.GetWinNum()) - current_line
+        if lines_to_top < g:NERDTreeAutoCenterThreshold || lines_to_bottom < g:NERDTreeAutoCenterThreshold
+            normal! zz
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:UI._dumpHelp  {{{1
+" prints out the quick help
+function! s:UI._dumpHelp()
+    if self.getShowHelp()
+        let help  = "\" NERDTree (" . nerdtree#version() . ") quickhelp~\n"
+        let help .= "\" ============================\n"
+        let help .= "\" File node mappings~\n"
+        let help .= '" '. (g:NERDTreeMouseMode ==# 3 ? 'single' : 'double') ."-click,\n"
+        if self.nerdtree.isTabTree()
+            let help .= '" '. g:NERDTreeMapActivateNode .": open in prev window\n"
+        else
+            let help .= '" '. g:NERDTreeMapActivateNode .": open in current window\n"
+        endif
+        if self.nerdtree.isTabTree()
+            let help .= '" '. g:NERDTreeMapPreview .": preview\n"
+        endif
+        let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
+        let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
+        let help .= "\" middle-click,\n"
+        let help .= '" '. g:NERDTreeMapOpenSplit .": open split\n"
+        let help .= '" '. g:NERDTreeMapPreviewSplit .": preview split\n"
+        let help .= '" '. g:NERDTreeMapOpenVSplit .": open vsplit\n"
+        let help .= '" '. g:NERDTreeMapPreviewVSplit .": preview vsplit\n"
+        let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Directory node mappings~\n"
+        let help .= '" '. (g:NERDTreeMouseMode ==# 1 ? 'double' : 'single') ."-click,\n"
+        let help .= '" '. g:NERDTreeMapActivateNode .": open & close node\n"
+        let help .= '" '. g:NERDTreeMapOpenRecursively .": recursively open node\n"
+        let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
+        let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
+        let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
+        let help .= '" '. g:NERDTreeMapCloseDir .": close parent of node\n"
+        let help .= '" '. g:NERDTreeMapCloseChildren .": close all child nodes of\n"
+        let help .= "\"    current node recursively\n"
+        let help .= "\" middle-click,\n"
+        let help .= '" '. g:NERDTreeMapOpenExpl.": explore selected dir\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Bookmark table mappings~\n"
+        let help .= "\" double-click,\n"
+        let help .= '" '. g:NERDTreeMapActivateNode .": open bookmark\n"
+        let help .= '" '. g:NERDTreeMapPreview .": preview file\n"
+        let help .= '" '. g:NERDTreeMapPreview .": find dir in tree\n"
+        let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
+        let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
+        let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
+        let help .= '" '. g:NERDTreeMapDeleteBookmark .": delete bookmark\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Tree navigation mappings~\n"
+        let help .= '" '. g:NERDTreeMapJumpRoot .": go to root\n"
+        let help .= '" '. g:NERDTreeMapJumpParent .": go to parent\n"
+        let help .= '" '. g:NERDTreeMapJumpFirstChild  .": go to first child\n"
+        let help .= '" '. g:NERDTreeMapJumpLastChild   .": go to last child\n"
+        let help .= '" '. g:NERDTreeMapJumpNextSibling .": go to next sibling\n"
+        let help .= '" '. g:NERDTreeMapJumpPrevSibling .": go to prev sibling\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Filesystem mappings~\n"
+        let help .= '" '. g:NERDTreeMapChangeRoot .": change tree root to the\n"
+        let help .= "\"    selected dir\n"
+        let help .= '" '. g:NERDTreeMapUpdir .": move tree root up a dir\n"
+        let help .= '" '. g:NERDTreeMapUpdirKeepOpen .": move tree root up a dir\n"
+        let help .= "\"    but leave old root open\n"
+        let help .= '" '. g:NERDTreeMapRefresh .": refresh cursor dir\n"
+        let help .= '" '. g:NERDTreeMapRefreshRoot .": refresh current root\n"
+        let help .= '" '. g:NERDTreeMapMenu .": Show menu\n"
+        let help .= '" '. g:NERDTreeMapChdir .":change the CWD to the\n"
+        let help .= "\"    selected dir\n"
+        let help .= '" '. g:NERDTreeMapCWD .":change tree root to CWD\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Tree filtering mappings~\n"
+        let help .= '" '. g:NERDTreeMapToggleHidden .': hidden files (' . (self.getShowHidden() ? 'on' : 'off') . ")\n"
+        let help .= '" '. g:NERDTreeMapToggleFilters .': file filters (' . (self.isIgnoreFilterEnabled() ? 'on' : 'off') . ")\n"
+        let help .= '" '. g:NERDTreeMapToggleFiles .': files (' . (self.getShowFiles() ? 'on' : 'off') . ")\n"
+        let help .= '" '. g:NERDTreeMapToggleBookmarks .': bookmarks (' . (self.getShowBookmarks() ? 'on' : 'off') . ")\n"
+
+        " add quickhelp entries for each custom key map
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Custom mappings~\n"
+        for i in g:NERDTreeKeyMap.All()
+            if !empty(i.quickhelpText)
+                let help .= '" '. i.key .': '. i.quickhelpText ."\n"
+            endif
+        endfor
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Other mappings~\n"
+        let help .= '" '. g:NERDTreeMapQuit .": Close the NERDTree window\n"
+        let help .= '" '. g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n"
+        let help .= "\"    the NERDTree window\n"
+        let help .= '" '. g:NERDTreeMapHelp .": toggle help\n"
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Bookmark commands~\n"
+        let help .= "\" :Bookmark [<name>]\n"
+        let help .= "\" :BookmarkToRoot <name>\n"
+        let help .= "\" :RevealBookmark <name>\n"
+        let help .= "\" :OpenBookmark <name>\n"
+        let help .= "\" :ClearBookmarks [<names>]\n"
+        let help .= "\" :ClearAllBookmarks\n"
+        let help .= "\" :ReadBookmarks\n"
+        let help .= "\" :WriteBookmarks\n"
+        let help .= "\" :EditBookmarks\n"
+        silent! put =help
+    elseif !self.isMinimal()
+        let help ='" Press '. g:NERDTreeMapHelp ." for help\n"
+        silent! put =help
+    endif
+endfunction
+
+
+" FUNCTION: s:UI.new(nerdtree) {{{1
+function! s:UI.New(nerdtree)
+    let newObj = copy(self)
+    let newObj.nerdtree = a:nerdtree
+    let newObj._showHelp = 0
+    let newObj._ignoreEnabled = 1
+    let newObj._showFiles = g:NERDTreeShowFiles
+    let newObj._showHidden = g:NERDTreeShowHidden
+    let newObj._showBookmarks = g:NERDTreeShowBookmarks
+
+    return newObj
+endfunction
+
+" FUNCTION: s:UI.getPath(ln) {{{1
+" Return the Path object for the node that is rendered on the given line
+" number.  If the 'up a dir' line is selected, return the Path object for
+" the parent of the root.  Return the empty dictionary if the given line
+" does not reference a tree node.
+function! s:UI.getPath(ln)
+    let line = getline(a:ln)
+
+    let rootLine = self.getRootLineNum()
+
+    if a:ln ==# rootLine
+        return self.nerdtree.root.path
+    endif
+
+    if line ==# s:UI.UpDirLine()
+        return self.nerdtree.root.path.getParent()
+    endif
+
+    if a:ln < rootLine
+        return {}
+    endif
+
+    let indent = self._indentLevelFor(line)
+
+    " remove the tree parts and the leading space
+    let curFile = self._stripMarkup(line)
+
+    let dir = ''
+    let lnum = a:ln
+    while lnum > 0
+        let lnum = lnum - 1
+        let curLine = getline(lnum)
+        let curLineStripped = self._stripMarkup(curLine)
+
+        " have we reached the top of the tree?
+        if lnum ==# rootLine
+            let dir = self.nerdtree.root.path.str({'format': 'UI'}) . dir
+            break
+        endif
+        if curLineStripped =~# '/$'
+            let lpindent = self._indentLevelFor(curLine)
+            if lpindent < indent
+                let indent = indent - 1
+
+                let dir = substitute (curLineStripped,'^\\', '', '') . dir
+                continue
+            endif
+        endif
+    endwhile
+    let curFile = self.nerdtree.root.path.drive . dir . curFile
+    let toReturn = g:NERDTreePath.New(curFile)
+    return toReturn
+endfunction
+
+" FUNCTION: s:UI.getLineNum(node) {{{1
+" Return the line number where the given node is rendered.  Return -1 if the
+" given node is not visible.
+function! s:UI.getLineNum(node)
+
+    if a:node.isRoot()
+        return self.getRootLineNum()
+    endif
+
+    let l:pathComponents = [substitute(self.nerdtree.root.path.str({'format': 'UI'}), '/\s*$', '', '')]
+    let l:currentPathComponent = 1
+
+    let l:fullPath = a:node.path.str({'format': 'UI'})
+
+    for l:lineNumber in range(self.getRootLineNum() + 1, line('$'))
+        let l:currentLine = getline(l:lineNumber)
+        let l:indentLevel = self._indentLevelFor(l:currentLine)
+
+        if l:indentLevel !=# l:currentPathComponent
+            continue
+        endif
+
+        let l:currentLine = self._stripMarkup(l:currentLine)
+        let l:currentPath =  join(l:pathComponents, '/') . '/' . l:currentLine
+
+        " Directories: If the current path 'starts with' the full path, then
+        " either the paths are equal or the line is a cascade containing the
+        " full path.
+        if l:fullPath[-1:] ==# '/' && stridx(l:currentPath, l:fullPath) ==# 0
+            return l:lineNumber
+        endif
+
+        " Files: The paths must exactly match.
+        if l:fullPath ==# l:currentPath
+            return l:lineNumber
+        endif
+
+        " Otherwise: If the full path starts with the current path and the
+        " current path is a directory, we add a new path component.
+        if stridx(l:fullPath, l:currentPath) ==# 0 && l:currentPath[-1:] ==# '/'
+            let l:currentLine = substitute(l:currentLine, '/\s*$', '', '')
+            call add(l:pathComponents, l:currentLine)
+            let l:currentPathComponent += 1
+        endif
+    endfor
+
+    return -1
+endfunction
+
+" FUNCTION: s:UI.getRootLineNum(){{{1
+" gets the line number of the root node
+function! s:UI.getRootLineNum()
+    let rootLine = 1
+    while rootLine <= line('$') && getline(rootLine) !~# '^\(/\|<\)'
+        let rootLine = rootLine + 1
+    endwhile
+    return rootLine
+endfunction
+
+" FUNCTION: s:UI.getShowBookmarks() {{{1
+function! s:UI.getShowBookmarks()
+    return self._showBookmarks
+endfunction
+
+" FUNCTION: s:UI.getShowFiles() {{{1
+function! s:UI.getShowFiles()
+    return self._showFiles
+endfunction
+
+" FUNCTION: s:UI.getShowHelp() {{{1
+function! s:UI.getShowHelp()
+    return self._showHelp
+endfunction
+
+" FUNCTION: s:UI.getShowHidden() {{{1
+function! s:UI.getShowHidden()
+    return self._showHidden
+endfunction
+
+" FUNCTION: s:UI._indentLevelFor(line) {{{1
+function! s:UI._indentLevelFor(line)
+    " Replace multi-character DirArrows with a single space so the
+    " indentation calculation doesn't get messed up.
+    if g:NERDTreeDirArrowExpandable ==# ''
+        let l:line = '  '.a:line
+    else
+        let l:line = substitute(substitute(a:line, '\V'.g:NERDTreeDirArrowExpandable, ' ', ''), '\V'.g:NERDTreeDirArrowCollapsible, ' ', '')
+    endif
+    let leadChars = match(l:line, '\M\[^ ]')
+    return leadChars / s:UI.IndentWid()
+endfunction
+
+" FUNCTION: s:UI.IndentWid() {{{1
+function! s:UI.IndentWid()
+    return 2
+endfunction
+
+" FUNCTION: s:UI.isIgnoreFilterEnabled() {{{1
+function! s:UI.isIgnoreFilterEnabled()
+    return self._ignoreEnabled ==# 1
+endfunction
+
+" FUNCTION: s:UI.isMinimal() {{{1
+function! s:UI.isMinimal()
+    return g:NERDTreeMinimalUI
+endfunction
+
+" FUNCTION: s:UI.MarkupReg() {{{1
+function! s:UI.MarkupReg()
+    return '^ *['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']\? '
+endfunction
+
+" FUNCTION: s:UI._renderBookmarks {{{1
+function! s:UI._renderBookmarks()
+
+    if !self.isMinimal()
+        call setline(line('.')+1, '>----------Bookmarks----------')
+        call cursor(line('.')+1, col('.'))
+    endif
+
+    if g:NERDTreeBookmarksSort ==# 1 || g:NERDTreeBookmarksSort ==# 2
+        call g:NERDTreeBookmark.SortBookmarksList()
+    endif
+
+    for i in g:NERDTreeBookmark.Bookmarks()
+        call setline(line('.')+1, i.str())
+        call cursor(line('.')+1, col('.'))
+    endfor
+
+    call setline(line('.')+1, '')
+    call cursor(line('.')+1, col('.'))
+endfunction
+
+" FUNCTION: s:UI.restoreScreenState() {{{1
+"
+" Sets the screen state back to what it was when nerdtree#saveScreenState was last
+" called.
+"
+" Assumes the cursor is in the NERDTree window
+function! s:UI.restoreScreenState()
+    if !has_key(self, '_screenState')
+        return
+    endif
+    call nerdtree#exec('silent vertical resize ' . self._screenState['oldWindowSize'], 1)
+
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(self._screenState['oldTopLine'], 0)
+    normal! zt
+    call setpos('.', self._screenState['oldPos'])
+    let &scrolloff=old_scrolloff
+endfunction
+
+" FUNCTION: s:UI.saveScreenState() {{{1
+" Saves the current cursor position in the current buffer and the window
+" scroll position
+function! s:UI.saveScreenState()
+    let win = winnr()
+    let self._screenState = {}
+    try
+        call g:NERDTree.CursorToTreeWin()
+        let self._screenState['oldPos'] = getpos('.')
+        let self._screenState['oldTopLine'] = line('w0')
+        let self._screenState['oldWindowSize']= winwidth('')
+        call nerdtree#exec(win . 'wincmd w', 1)
+    catch
+    endtry
+endfunction
+
+" FUNCTION: s:UI.setShowHidden(val) {{{1
+function! s:UI.setShowHidden(val)
+    let self._showHidden = a:val
+endfunction
+
+" FUNCTION: s:UI._stripMarkup(line){{{1
+" find the filename in the given line, and return it.
+"
+" Args:
+" line: the subject line
+function! s:UI._stripMarkup(line)
+    let l:line = substitute(a:line, '^.\{-}' . g:NERDTreeNodeDelimiter, '', '')
+    return substitute(l:line, g:NERDTreeNodeDelimiter.'.*$', '', '')
+endfunction
+
+" FUNCTION: s:UI.render() {{{1
+function! s:UI.render()
+    setlocal noreadonly modifiable
+
+    " remember the top line of the buffer and the current line so we can
+    " restore the view exactly how it was
+    let curLine = line('.')
+    let curCol = col('.')
+    let topLine = line('w0')
+
+    " delete all lines in the buffer (being careful not to clobber a register)
+    silent 1,$delete _
+
+    call self._dumpHelp()
+
+    " delete the blank line before the help and add one after it
+    if !self.isMinimal()
+        call setline(line('.')+1, '')
+        call cursor(line('.')+1, col('.'))
+    endif
+
+    if self.getShowBookmarks()
+        call self._renderBookmarks()
+    endif
+
+    " add the 'up a dir' line
+    if !self.isMinimal()
+        call setline(line('.')+1, s:UI.UpDirLine())
+        call cursor(line('.')+1, col('.'))
+    endif
+
+    " draw the header line
+    let header = self.nerdtree.root.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
+    call setline(line('.')+1, header)
+    call cursor(line('.')+1, col('.'))
+
+    " draw the tree
+    silent put =self.nerdtree.root.renderToString()
+
+    " delete the blank line at the top of the buffer
+    silent 1,1delete _
+
+    " restore the view
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(topLine, 1)
+    normal! zt
+    call cursor(curLine, curCol)
+    let &scrolloff = old_scrolloff
+
+    setlocal readonly nomodifiable
+endfunction
+
+
+" FUNCTION: UI.renderViewSavingPosition {{{1
+" Renders the tree and ensures the cursor stays on the current node or the
+" current nodes parent if it is no longer available upon re-rendering
+function! s:UI.renderViewSavingPosition()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+
+    " go up the tree till we find a node that will be visible or till we run
+    " out of nodes
+    while currentNode !=# {} && !currentNode.isVisible() && !currentNode.isRoot()
+        let currentNode = currentNode.parent
+    endwhile
+
+    call self.render()
+
+    if currentNode !=# {}
+        call currentNode.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:UI.toggleHelp() {{{1
+function! s:UI.toggleHelp()
+    let self._showHelp = !self._showHelp
+endfunction
+
+" FUNCTION: s:UI.toggleIgnoreFilter() {{{1
+" toggles the use of the NERDTreeIgnore option
+function! s:UI.toggleIgnoreFilter()
+    let self._ignoreEnabled = !self._ignoreEnabled
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowBookmarks() {{{1
+" Toggle the visibility of the Bookmark table.
+function! s:UI.toggleShowBookmarks()
+    let self._showBookmarks = !self._showBookmarks
+
+    if self.getShowBookmarks()
+        call self.nerdtree.render()
+        call g:NERDTree.CursorToBookmarkTable()
+    else
+
+        if empty(g:NERDTreeFileNode.GetSelected())
+            call b:NERDTree.root.putCursorHere(0, 0)
+            normal! 0
+        endif
+
+        call self.renderViewSavingPosition()
+    endif
+
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowFiles() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowFiles()
+    let self._showFiles = !self._showFiles
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowHidden()
+    let self._showHidden = !self._showHidden
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleZoom() {{{1
+" zoom (maximize/minimize) the NERDTree window
+function! s:UI.toggleZoom()
+    if exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
+        let size = exists('b:NERDTreeOldWindowSize') ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        call nerdtree#exec('silent vertical resize '. size, 1)
+        let b:NERDTreeZoomed = 0
+    else
+        call nerdtree#exec('vertical resize '. get(g:, 'NERDTreeWinSizeMax', ''), 1)
+        let b:NERDTreeZoomed = 1
+    endif
+endfunction
+
+" FUNCTION: s:UI.UpDirLine() {{{1
+function! s:UI.UpDirLine()
+    return '.. (up a dir)'
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim b/pack/navigation/start/nerdtree/nerdtree_plugin/exec_menuitem.vim
old mode 100755
new mode 100644
similarity index 92%
rename from bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim
rename to pack/navigation/start/nerdtree/nerdtree_plugin/exec_menuitem.vim
index e7a7c53..fb6c486
--- a/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim
+++ b/pack/navigation/start/nerdtree/nerdtree_plugin/exec_menuitem.vim
@@ -2,7 +2,6 @@
 " File:        exec_menuitem.vim
 " Description: plugin for NERD Tree that provides an execute file menu item
 " Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
-" Last Change: 22 July, 2009
 " License:     This program is free software. It comes without any warranty,
 "              to the extent permitted by applicable law. You can redistribute
 "              it and/or modify it under the terms of the Do What The Fuck You
@@ -10,7 +9,7 @@
 "              See http://sam.zoy.org/wtfpl/COPYING for more details.
 "
 " ============================================================================
-if exists("g:loaded_nerdtree_exec_menuitem")
+if exists('g:loaded_nerdtree_exec_menuitem')
     finish
 endif
 let g:loaded_nerdtree_exec_menuitem = 1
@@ -33,9 +32,9 @@ function! NERDTreeExecFile()
     let cmd = treenode.path.str({'escape': 1})
     let cmd = input(':!', cmd . ' ')
 
-    if cmd != ''
+    if cmd !=# ''
         exec ':!' . cmd
     else
-        echo "Aborted"
+        echo 'Aborted'
     endif
 endfunction
diff --git a/pack/navigation/start/nerdtree/nerdtree_plugin/fs_menu.vim b/pack/navigation/start/nerdtree/nerdtree_plugin/fs_menu.vim
new file mode 100644
index 0000000..9750976
--- /dev/null
+++ b/pack/navigation/start/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -0,0 +1,454 @@
+" ============================================================================
+" File:        fs_menu.vim
+" Description: plugin for the NERD Tree that provides a file system menu
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+if exists('g:loaded_nerdtree_fs_menu')
+    finish
+endif
+let g:loaded_nerdtree_fs_menu = 1
+
+"Automatically delete the buffer after deleting or renaming a file
+if !exists('g:NERDTreeAutoDeleteBuffer')
+    let g:NERDTreeAutoDeleteBuffer = 0
+endif
+
+call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callback': 'NERDTreeAddNode'})
+call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
+call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
+
+if has('gui_mac') || has('gui_macvim') || has('mac')
+    call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
+    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
+    call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
+endif
+
+if executable('xdg-open')
+    call NERDTreeAddMenuItem({'text': '(r)eveal the current node in file manager', 'shortcut': 'r', 'callback': 'NERDTreeRevealFileLinux'})
+    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFileLinux'})
+endif
+
+if g:NERDTreePath.CopyingSupported()
+    call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
+endif
+call NERDTreeAddMenuItem({'text': (has('clipboard')?'copy (p)ath to clipboard':'print (p)ath to screen'), 'shortcut': 'p', 'callback': 'NERDTreeCopyPath'})
+
+if has('unix') || has('osx')
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
+else
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
+endif
+
+"FUNCTION: s:inputPrompt(action){{{1
+"returns the string that should be prompted to the user for the given action
+"
+"Args:
+"action: the action that is being performed, e.g. 'delete'
+function! s:inputPrompt(action)
+    if a:action ==# 'add'
+        let title = 'Add a childnode'
+        let info = "Enter the dir/file name to be created. Dirs end with a '/'"
+        let minimal = 'Add node:'
+
+    elseif a:action ==# 'copy'
+        let title = 'Copy the current node'
+        let info = 'Enter the new path to copy the node to:'
+        let minimal = 'Copy to:'
+
+    elseif a:action ==# 'delete'
+        let title = 'Delete the current node'
+        let info = 'Are you sure you wish to delete the node:'
+        let minimal = 'Delete?'
+
+    elseif a:action ==# 'deleteNonEmpty'
+        let title = 'Delete the current node'
+        let info =  "STOP! Directory is not empty! To delete, type 'yes'"
+        let minimal = 'Delete directory?'
+
+    elseif a:action ==# 'move'
+        let title = 'Rename the current node'
+        let info = 'Enter the new path for the node:'
+        let minimal = 'Move to:'
+    endif
+
+    if g:NERDTreeMenuController.isMinimal()
+        redraw! " Clear the menu
+        return minimal . ' '
+    else
+        let divider = '=========================================================='
+        return title . "\n" . divider . "\n" . info . "\n"
+    end
+endfunction
+
+"FUNCTION: s:promptToDelBuffer(bufnum, msg){{{1
+"prints out the given msg and, if the user responds by pushing 'y' then the
+"buffer with the given bufnum is deleted
+"
+"Args:
+"bufnum: the buffer that may be deleted
+"msg: a message that will be echoed to the user asking them if they wish to
+"     del the buffer
+function! s:promptToDelBuffer(bufnum, msg)
+    echo a:msg
+    if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
+        " 1. ensure that all windows which display the just deleted filename
+        " now display an empty buffer (so a layout is preserved).
+        " Is not it better to close single tabs with this file only ?
+        let s:originalTabNumber = tabpagenr()
+        let s:originalWindowNumber = winnr()
+        " Go to the next buffer in buffer list if at least one extra buffer is listed
+        " Otherwise open a new empty buffer
+        if v:version >= 800
+            let l:listedBufferCount = len(getbufinfo({'buflisted':1}))
+        elseif v:version >= 702
+            let l:listedBufferCount = len(filter(range(1, bufnr('$')), 'buflisted(v:val)'))
+        else
+            " Ignore buffer count in this case to make sure we keep the old
+            " behavior
+            let l:listedBufferCount = 0
+        endif
+        if l:listedBufferCount > 1
+            call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . a:bufnum . " | exec ':bnext! ' | endif", 1)
+        else
+            call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . a:bufnum . " | exec ':enew! ' | endif", 1)
+        endif
+        call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
+        call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
+        " 3. We don't need a previous buffer anymore
+        call nerdtree#exec('bwipeout! ' . a:bufnum, 0)
+    endif
+endfunction
+
+"FUNCTION: s:renameBuffer(bufNum, newNodeName, isDirectory){{{1
+"The buffer with the given bufNum is replaced with a new one
+"
+"Args:
+"bufNum: the buffer that may be deleted
+"newNodeName: the name given to the renamed node
+"isDirectory: determines how to do the create the new filenames
+function! s:renameBuffer(bufNum, newNodeName, isDirectory)
+    if a:isDirectory
+        let quotedFileName = fnameescape(a:newNodeName . '/' . fnamemodify(bufname(a:bufNum),':t'))
+        let editStr = g:NERDTreePath.New(a:newNodeName . '/' . fnamemodify(bufname(a:bufNum),':t')).str({'format': 'Edit'})
+    else
+        let quotedFileName = fnameescape(a:newNodeName)
+        let editStr = g:NERDTreePath.New(a:newNodeName).str({'format': 'Edit'})
+    endif
+    " 1. ensure that a new buffer is loaded
+    call nerdtree#exec('badd ' . quotedFileName, 0)
+    " 2. ensure that all windows which display the just deleted filename
+    " display a buffer for a new filename.
+    let s:originalTabNumber = tabpagenr()
+    let s:originalWindowNumber = winnr()
+    call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . a:bufNum . " | exec ':e! " . editStr . "' | endif", 0)
+    call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
+    call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
+    " 3. We don't need a previous buffer anymore
+    try
+        call nerdtree#exec('confirm bwipeout ' . a:bufNum, 0)
+    catch
+        " This happens when answering Cancel if confirmation is needed. Do nothing.
+    endtry
+endfunction
+
+"FUNCTION: NERDTreeAddNode(){{{1
+function! NERDTreeAddNode()
+    let curDirNode = g:NERDTreeDirNode.GetSelected()
+    let prompt = s:inputPrompt('add')
+    let newNodeName = input(prompt, curDirNode.path.str() . g:NERDTreePath.Slash(), 'file')
+
+    if newNodeName ==# ''
+        call nerdtree#echo('Node Creation Aborted.')
+        return
+    endif
+
+    try
+        let newPath = g:NERDTreePath.Create(newNodeName)
+        let parentNode = b:NERDTree.root.findNode(newPath.getParent())
+
+        let newTreeNode = g:NERDTreeFileNode.New(newPath, b:NERDTree)
+        " Emptying g:NERDTreeOldSortOrder forces the sort to
+        " recalculate the cached sortKey so nodes sort correctly.
+        let g:NERDTreeOldSortOrder = []
+        if empty(parentNode)
+            call b:NERDTree.root.refresh()
+            call b:NERDTree.render()
+        elseif parentNode.isOpen || !empty(parentNode.children)
+            call parentNode.addChild(newTreeNode, 1)
+            call NERDTreeRender()
+            call newTreeNode.putCursorHere(1, 0)
+        endif
+
+        redraw!
+    catch /^NERDTree/
+        call nerdtree#echoWarning('Node Not Created.')
+    endtry
+endfunction
+
+"FUNCTION: NERDTreeMoveNode(){{{1
+function! NERDTreeMoveNode()
+    let curNode = g:NERDTreeFileNode.GetSelected()
+    let prompt = s:inputPrompt('move')
+    let newNodePath = input(prompt, curNode.path.str(), 'file')
+    while filereadable(newNodePath)
+        call nerdtree#echoWarning('This destination already exists. Try again.')
+        let newNodePath = input(prompt, curNode.path.str(), 'file')
+    endwhile
+
+
+    if newNodePath ==# ''
+        call nerdtree#echo('Node Renaming Aborted.')
+        return
+    endif
+
+    try
+        if curNode.path.isDirectory
+            let l:curPath = escape(curNode.path.str(),'\') . (nerdtree#runningWindows()?'\\':'/') . '.*'
+            let l:openBuffers = filter(range(1,bufnr('$')),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") =~# "'.escape(l:curPath,'\').'"')
+        else
+            let l:openBuffers = filter(range(1,bufnr('$')),'bufexists(v:val) && fnamemodify(bufname(v:val),":p") ==# curNode.path.str()')
+        endif
+
+        call curNode.rename(newNodePath)
+        " Emptying g:NERDTreeOldSortOrder forces the sort to
+        " recalculate the cached sortKey so nodes sort correctly.
+        let g:NERDTreeOldSortOrder = []
+        call b:NERDTree.root.refresh()
+        call NERDTreeRender()
+
+        " If the file node is open, or files under the directory node are
+        " open, ask the user if they want to replace the file(s) with the
+        " renamed files.
+        if !empty(l:openBuffers)
+            if curNode.path.isDirectory
+                echo "\nDirectory renamed.\n\nFiles with the old directory name are open in buffers " . join(l:openBuffers, ', ') . '. Replace these buffers with the new files? (yN)'
+            else
+                echo "\nFile renamed.\n\nThe old file is open in buffer " . l:openBuffers[0] . '. Replace this buffer with the new file? (yN)'
+            endif
+            if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
+                for bufNum in l:openBuffers
+                    call s:renameBuffer(bufNum, newNodePath, curNode.path.isDirectory)
+                endfor
+            endif
+        endif
+
+        call curNode.putCursorHere(1, 0)
+
+        redraw!
+    catch /^NERDTree/
+        call nerdtree#echoWarning('Node Not Renamed.')
+    endtry
+endfunction
+
+" FUNCTION: NERDTreeDeleteNode() {{{1
+function! NERDTreeDeleteNode()
+    let l:shellslash = &shellslash
+    let &shellslash = 0
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    let confirmed = 0
+
+    if currentNode.path.isDirectory && ((currentNode.isOpen && currentNode.getChildCount() > 0) ||
+                                      \ (len(currentNode._glob('*', 1)) > 0))
+        let prompt = s:inputPrompt('deleteNonEmpty') . currentNode.path.str() . ': '
+        let choice = input(prompt)
+        let confirmed = choice ==# 'yes'
+    else
+        let prompt = s:inputPrompt('delete') . currentNode.path.str() . ' (yN): '
+        echo prompt
+        let choice = nr2char(getchar())
+        let confirmed = choice ==# 'y'
+    endif
+
+    if confirmed
+        try
+            call currentNode.delete()
+            call NERDTreeRender()
+
+            "if the node is open in a buffer, ask the user if they want to
+            "close that buffer
+            let bufnum = bufnr('^'.currentNode.path.str().'$')
+            if buflisted(bufnum)
+                let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? ' (hidden)' : '') .'. Delete this buffer? (yN)'
+                call s:promptToDelBuffer(bufnum, prompt)
+            endif
+
+            redraw!
+        catch /^NERDTree/
+            call nerdtree#echoWarning('Could not remove node')
+        endtry
+    else
+        call nerdtree#echo('delete aborted')
+    endif
+    let &shellslash = l:shellslash
+endfunction
+
+" FUNCTION: NERDTreeListNode() {{{1
+function! NERDTreeListNode()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if !empty(treenode)
+        let s:uname = system('uname')
+        let stat_cmd = 'stat -c "%s" '
+
+        if s:uname =~? 'Darwin'
+            let stat_cmd = 'stat -f "%z" '
+        endif
+
+        let cmd = 'size=$(' . stat_cmd . shellescape(treenode.path.str()) . ') && ' .
+        \         'size_with_commas=$(echo $size | sed -e :a -e "s/\(.*[0-9]\)\([0-9]\{3\}\)/\1,\2/;ta") && ' .
+        \         'ls -ld ' . shellescape(treenode.path.str()) . ' | sed -e "s/ $size / $size_with_commas /"'
+
+        let metadata = split(system(cmd),'\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo('No information available')
+    endif
+endfunction
+
+" FUNCTION: NERDTreeListNodeWin32() {{{1
+function! NERDTreeListNodeWin32()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if !empty(l:node)
+        let l:path = l:node.path.str()
+        call nerdtree#echo(printf('%s:%s  MOD:%s  BYTES:%d  PERMISSIONS:%s',
+                    \ toupper(getftype(l:path)),
+                    \ fnamemodify(l:path, ':t'),
+                    \ strftime('%c', getftime(l:path)),
+                    \ getfsize(l:path),
+                    \ getfperm(l:path)))
+        return
+    endif
+
+    call nerdtree#echo('node not recognized')
+endfunction
+
+" FUNCTION: NERDTreeCopyNode() {{{1
+function! NERDTreeCopyNode()
+    let l:shellslash = &shellslash
+    let &shellslash = 0
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    let prompt = s:inputPrompt('copy')
+    let newNodePath = input(prompt, currentNode.path.str(), 'file')
+
+    if newNodePath !=# ''
+        "strip trailing slash
+        let newNodePath = substitute(newNodePath, '\/$', '', '')
+
+        let confirmed = 1
+        if currentNode.path.copyingWillOverwrite(newNodePath)
+            call nerdtree#echo('Warning: copying may overwrite files! Continue? (yN)')
+            let choice = nr2char(getchar())
+            let confirmed = choice ==# 'y'
+        endif
+
+        if confirmed
+            try
+                let newNode = currentNode.copy(newNodePath)
+                " Emptying g:NERDTreeOldSortOrder forces the sort to
+                " recalculate the cached sortKey so nodes sort correctly.
+                let g:NERDTreeOldSortOrder = []
+                if empty(newNode)
+                    call b:NERDTree.root.refresh()
+                    call b:NERDTree.render()
+                else
+                    call NERDTreeRender()
+                    call newNode.putCursorHere(0, 0)
+                endif
+            catch /^NERDTree/
+                call nerdtree#echoWarning('Could not copy node')
+            endtry
+        endif
+    else
+        call nerdtree#echo('Copy aborted.')
+    endif
+    let &shellslash = l:shellslash
+    redraw!
+endfunction
+
+" FUNCTION: NERDTreeCopyPath() {{{1
+function! NERDTreeCopyPath()
+    let l:nodePath = g:NERDTreeFileNode.GetSelected().path.str()
+    if has('clipboard')
+        if &clipboard ==# 'unnamedplus'
+            let @+ = l:nodePath
+        else
+            let @* = l:nodePath
+        endif
+        call nerdtree#echo('The path [' . l:nodePath . '] was copied to your clipboard.')
+    else
+        call nerdtree#echo('The full path is: ' . l:nodePath)
+    endif
+endfunction
+
+" FUNCTION: NERDTreeQuickLook() {{{1
+function! NERDTreeQuickLook()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if empty(l:node)
+        return
+    endif
+
+    call system('qlmanage -p 2>/dev/null ' . shellescape(l:node.path.str()))
+endfunction
+
+" FUNCTION: NERDTreeRevealInFinder() {{{1
+function! NERDTreeRevealInFinder()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if empty(l:node)
+        return
+    endif
+
+    call system('open -R ' . shellescape(l:node.path.str()))
+endfunction
+
+" FUNCTION: NERDTreeExecuteFile() {{{1
+function! NERDTreeExecuteFile()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if empty(l:node)
+        return
+    endif
+
+    call system('open ' . shellescape(l:node.path.str()))
+endfunction
+
+" FUNCTION: NERDTreeRevealFileLinux() {{{1
+function! NERDTreeRevealFileLinux()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if empty(l:node)
+        return
+    endif
+
+    " Handle the edge case of "/", which has no parent.
+    if l:node.path.str() ==# '/'
+        call system('xdg-open /')
+        return
+    endif
+
+    if empty(l:node.parent)
+        return
+    endif
+
+    call system('xdg-open ' . shellescape(l:node.parent.path.str()))
+endfunction
+
+" FUNCTION: NERDTreeExecuteFileLinux() {{{1
+function! NERDTreeExecuteFileLinux()
+    let l:node = g:NERDTreeFileNode.GetSelected()
+
+    if empty(l:node)
+        return
+    endif
+
+    call system('xdg-open ' . shellescape(l:node.path.str()))
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/nerdtree_plugin/vcs.vim b/pack/navigation/start/nerdtree/nerdtree_plugin/vcs.vim
new file mode 100644
index 0000000..d20e35e
--- /dev/null
+++ b/pack/navigation/start/nerdtree/nerdtree_plugin/vcs.vim
@@ -0,0 +1,47 @@
+" ============================================================================
+" File:        vcs.vim
+" Description: NERDTree plugin that provides a command to open on the root of
+"              a version control system repository.
+" Maintainer:  Phil Runninger
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+command! -n=? -complete=dir -bar NERDTreeVCS :call <SID>CreateTabTreeVCS('<args>')
+command! -n=? -complete=dir -bar NERDTreeToggleVCS :call <SID>ToggleTabTreeVCS('<args>')
+
+" FUNCTION: s:CreateTabTreeVCS(a:name) {{{1
+function! s:CreateTabTreeVCS(name)
+    let l:path = g:NERDTreeCreator._pathForString(a:name)
+    let l:path = s:FindParentVCSRoot(l:path)
+    call g:NERDTreeCreator.createTabTree(empty(l:path) ? '' : l:path._str())
+endfunction
+
+" FUNCTION: s:ToggleTabTreeVCS(a:name) {{{1
+" Behaves the same as ToggleTabTree except roots directory at VCS root
+function! s:ToggleTabTreeVCS(name)
+    let l:path = g:NERDTreeCreator._pathForString(a:name)
+    let l:path = s:FindParentVCSRoot(l:path)
+    call g:NERDTreeCreator.toggleTabTree(empty(l:path) ? '' : l:path._str())
+endfunction
+
+" FUNCTION: s:FindParentVCSRoot(a:path) {{{1
+" Finds the root version control system folder of the given path. If a:path is
+" not part of a repository, return the original path.
+function! s:FindParentVCSRoot(path)
+    let l:path = a:path
+    while !empty(l:path) &&
+        \ l:path._str() !~# '^\(\a:[\\\/]\|\/\)$' &&
+        \ !isdirectory(l:path._str() . '/.git') &&
+        \ !isdirectory(l:path._str() . '/.svn') &&
+        \ !isdirectory(l:path._str() . '/.hg') &&
+        \ !isdirectory(l:path._str() . '/.bzr') &&
+        \ !isdirectory(l:path._str() . '/_darcs')
+        let l:path = l:path.getParent()
+    endwhile
+    return (empty(l:path) || l:path._str() =~# '^\(\a:[\\\/]\|\/\)$') ? a:path : l:path
+endfunction
+
diff --git a/pack/navigation/start/nerdtree/plugin/NERD_tree.vim b/pack/navigation/start/nerdtree/plugin/NERD_tree.vim
new file mode 100644
index 0000000..ca8070d
--- /dev/null
+++ b/pack/navigation/start/nerdtree/plugin/NERD_tree.vim
@@ -0,0 +1,261 @@
+" ============================================================================
+" File:        NERD_tree.vim
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+"
+" SECTION: Script init stuff {{{1
+"============================================================
+scriptencoding utf-8
+
+if exists('loaded_nerd_tree')
+    finish
+endif
+if v:version < 703
+    echoerr "NERDTree: this plugin requires vim >= 7.3. DOWNLOAD IT! You'll thank me later!"
+    finish
+endif
+let loaded_nerd_tree = 1
+
+"for line continuation - i.e dont want C in &cpoptions
+let s:old_cpo = &cpoptions
+set cpoptions&vim
+
+"Function: s:initVariable() function {{{2
+"This function is used to initialise a given variable to a given value. The
+"variable is only initialised if it does not exist prior
+"
+"Args:
+"var: the name of the var to be initialised
+"value: the value to initialise var to
+"
+"Returns:
+"1 if the var is set, 0 otherwise
+function! s:initVariable(var, value)
+    if !exists(a:var)
+        exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", 'g') . "'"
+        return 1
+    endif
+    return 0
+endfunction
+
+"SECTION: Init variable calls and other random constants {{{2
+call s:initVariable('g:NERDTreeAutoCenter', 1)
+call s:initVariable('g:NERDTreeAutoCenterThreshold', 3)
+call s:initVariable('g:NERDTreeCaseSensitiveSort', 0)
+call s:initVariable('g:NERDTreeNaturalSort', 0)
+call s:initVariable('g:NERDTreeSortHiddenFirst', 1)
+call s:initVariable('g:NERDTreeUseTCD', 0)
+call s:initVariable('g:NERDTreeChDirMode', 0)
+call s:initVariable('g:NERDTreeCreatePrefix', 'silent')
+call s:initVariable('g:NERDTreeMinimalUI', 0)
+call s:initVariable('g:NERDTreeMinimalMenu', 0)
+if !exists('g:NERDTreeIgnore')
+    let g:NERDTreeIgnore = ['\~$']
+endif
+call s:initVariable('g:NERDTreeBookmarksFile', expand('$HOME') . '/.NERDTreeBookmarks')
+call s:initVariable('g:NERDTreeBookmarksSort', 1)
+call s:initVariable('g:NERDTreeHighlightCursorline', 1)
+call s:initVariable('g:NERDTreeHijackNetrw', 1)
+call s:initVariable('g:NERDTreeMarkBookmarks', 1)
+call s:initVariable('g:NERDTreeMouseMode', 1)
+call s:initVariable('g:NERDTreeNotificationThreshold', 100)
+call s:initVariable('g:NERDTreeQuitOnOpen', 0)
+call s:initVariable('g:NERDTreeRespectWildIgnore', 0)
+call s:initVariable('g:NERDTreeShowBookmarks', 0)
+call s:initVariable('g:NERDTreeShowFiles', 1)
+call s:initVariable('g:NERDTreeShowHidden', 0)
+call s:initVariable('g:NERDTreeShowLineNumbers', 0)
+call s:initVariable('g:NERDTreeSortDirs', 1)
+
+if !nerdtree#runningWindows() && !nerdtree#runningCygwin()
+    call s:initVariable('g:NERDTreeDirArrowExpandable', '▸')
+    call s:initVariable('g:NERDTreeDirArrowCollapsible', '▾')
+else
+    call s:initVariable('g:NERDTreeDirArrowExpandable', '+')
+    call s:initVariable('g:NERDTreeDirArrowCollapsible', '~')
+endif
+
+call s:initVariable('g:NERDTreeCascadeOpenSingleChildDir', 1)
+call s:initVariable('g:NERDTreeCascadeSingleChildDir', 1)
+
+if !exists('g:NERDTreeSortOrder')
+    let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
+endif
+let g:NERDTreeOldSortOrder = []
+
+call s:initVariable('g:NERDTreeGlyphReadOnly', 'RO')
+
+if has('conceal')
+    call s:initVariable('g:NERDTreeNodeDelimiter', "\x07")
+elseif (g:NERDTreeDirArrowExpandable ==# "\u00a0" || g:NERDTreeDirArrowCollapsible ==# "\u00a0")
+    call s:initVariable('g:NERDTreeNodeDelimiter', "\u00b7")
+else
+    call s:initVariable('g:NERDTreeNodeDelimiter', "\u00a0")
+endif
+
+if !exists('g:NERDTreeStatusline')
+
+    "the exists() crap here is a hack to stop vim spazzing out when
+    "loading a session that was created with an open nerd tree. It spazzes
+    "because it doesnt store b:NERDTree(its a b: var, and its a hash)
+    let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
+
+endif
+call s:initVariable('g:NERDTreeWinPos', 'left')
+call s:initVariable('g:NERDTreeWinSize', 31)
+
+"init the shell commands that will be used to copy nodes, and remove dir trees
+"
+"Note: the space after the command is important
+if nerdtree#runningWindows()
+    call s:initVariable('g:NERDTreeRemoveDirCmd', 'rmdir /s /q ')
+    call s:initVariable('g:NERDTreeCopyDirCmd', 'xcopy /s /e /i /y /q ')
+    call s:initVariable('g:NERDTreeCopyFileCmd', 'copy /y ')
+else
+    call s:initVariable('g:NERDTreeRemoveDirCmd', 'rm -rf ')
+    call s:initVariable('g:NERDTreeCopyCmd', 'cp -r ')
+endif
+
+
+"SECTION: Init variable calls for key mappings {{{2
+call s:initVariable('g:NERDTreeMapCustomOpen', '<CR>')
+call s:initVariable('g:NERDTreeMapActivateNode', 'o')
+call s:initVariable('g:NERDTreeMapChangeRoot', 'C')
+call s:initVariable('g:NERDTreeMapChdir', 'cd')
+call s:initVariable('g:NERDTreeMapCloseChildren', 'X')
+call s:initVariable('g:NERDTreeMapCloseDir', 'x')
+call s:initVariable('g:NERDTreeMapDeleteBookmark', 'D')
+call s:initVariable('g:NERDTreeMapMenu', 'm')
+call s:initVariable('g:NERDTreeMapHelp', '?')
+call s:initVariable('g:NERDTreeMapJumpFirstChild', 'K')
+call s:initVariable('g:NERDTreeMapJumpLastChild', 'J')
+call s:initVariable('g:NERDTreeMapJumpNextSibling', '<C-j>')
+call s:initVariable('g:NERDTreeMapJumpParent', 'p')
+call s:initVariable('g:NERDTreeMapJumpPrevSibling', '<C-k>')
+call s:initVariable('g:NERDTreeMapJumpRoot', 'P')
+call s:initVariable('g:NERDTreeMapOpenExpl', 'e')
+call s:initVariable('g:NERDTreeMapOpenInTab', 't')
+call s:initVariable('g:NERDTreeMapOpenInTabSilent', 'T')
+call s:initVariable('g:NERDTreeMapOpenRecursively', 'O')
+call s:initVariable('g:NERDTreeMapOpenSplit', 'i')
+call s:initVariable('g:NERDTreeMapOpenVSplit', 's')
+call s:initVariable('g:NERDTreeMapPreview', 'g' . NERDTreeMapActivateNode)
+call s:initVariable('g:NERDTreeMapPreviewSplit', 'g' . NERDTreeMapOpenSplit)
+call s:initVariable('g:NERDTreeMapPreviewVSplit', 'g' . NERDTreeMapOpenVSplit)
+call s:initVariable('g:NERDTreeMapQuit', 'q')
+call s:initVariable('g:NERDTreeMapRefresh', 'r')
+call s:initVariable('g:NERDTreeMapRefreshRoot', 'R')
+call s:initVariable('g:NERDTreeMapToggleBookmarks', 'B')
+call s:initVariable('g:NERDTreeMapToggleFiles', 'F')
+call s:initVariable('g:NERDTreeMapToggleFilters', 'f')
+call s:initVariable('g:NERDTreeMapToggleHidden', 'I')
+call s:initVariable('g:NERDTreeMapToggleZoom', 'A')
+call s:initVariable('g:NERDTreeMapUpdir', 'u')
+call s:initVariable('g:NERDTreeMapUpdirKeepOpen', 'U')
+call s:initVariable('g:NERDTreeMapCWD', 'CD')
+call s:initVariable('g:NERDTreeMenuDown', 'j')
+call s:initVariable('g:NERDTreeMenuUp', 'k')
+
+"SECTION: Load class files{{{2
+call nerdtree#loadClassFiles()
+
+" SECTION: Commands {{{1
+"============================================================
+call nerdtree#ui_glue#setupCommands()
+
+" SECTION: Auto commands {{{1
+"============================================================
+augroup NERDTree
+    "Save the cursor position whenever we close the nerd tree
+    exec 'autocmd BufLeave,WinLeave '. g:NERDTreeCreator.BufNamePrefix() .'* if g:NERDTree.IsOpen() | call b:NERDTree.ui.saveScreenState() | endif'
+
+    "disallow insert mode in the NERDTree
+    exec 'autocmd BufEnter,WinEnter '. g:NERDTreeCreator.BufNamePrefix() .'* stopinsert'
+augroup END
+
+if g:NERDTreeHijackNetrw
+    augroup NERDTreeHijackNetrw
+        autocmd VimEnter * silent! autocmd! FileExplorer
+        au BufEnter,VimEnter * call nerdtree#checkForBrowse(expand('<amatch>'))
+    augroup END
+endif
+
+if g:NERDTreeChDirMode ==# 3
+    augroup NERDTreeChDirOnTabSwitch
+        autocmd TabEnter * if g:NERDTree.ExistsForTab()|call g:NERDTree.ForCurrentTab().getRoot().path.changeToDir()|endif
+    augroup END
+endif
+
+" SECTION: Public API {{{1
+"============================================================
+function! NERDTreeAddMenuItem(options)
+    call g:NERDTreeMenuItem.Create(a:options)
+endfunction
+
+function! NERDTreeAddMenuSeparator(...)
+    let opts = a:0 ? a:1 : {}
+    call g:NERDTreeMenuItem.CreateSeparator(opts)
+endfunction
+
+function! NERDTreeAddSubmenu(options)
+    return g:NERDTreeMenuItem.Create(a:options)
+endfunction
+
+function! NERDTreeAddKeyMap(options)
+    call g:NERDTreeKeyMap.Create(a:options)
+endfunction
+
+function! NERDTreeRender()
+    call nerdtree#renderView()
+endfunction
+
+function! NERDTreeFocus()
+    if g:NERDTree.IsOpen()
+        call g:NERDTree.CursorToTreeWin(0)
+    else
+        call g:NERDTreeCreator.ToggleTabTree('')
+    endif
+endfunction
+
+function! NERDTreeCWD()
+
+    if empty(getcwd())
+        call nerdtree#echoWarning('current directory does not exist')
+        return
+    endif
+
+    try
+        let l:cwdPath = g:NERDTreePath.New(getcwd())
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echoWarning('current directory does not exist')
+        return
+    endtry
+
+    call NERDTreeFocus()
+
+    if b:NERDTree.root.path.equals(l:cwdPath)
+        return
+    endif
+
+    let l:newRoot = g:NERDTreeFileNode.New(l:cwdPath, b:NERDTree)
+    call b:NERDTree.changeRoot(l:newRoot)
+    normal! ^
+endfunction
+
+function! NERDTreeAddPathFilter(callback)
+    call g:NERDTree.AddPathFilter(a:callback)
+endfunction
+
+" SECTION: Post Source Actions {{{1
+call nerdtree#postSourceActions()
+
+"reset &cpoptions back to users setting
+let &cpoptions = s:old_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/pack/navigation/start/nerdtree/screenshot.png b/pack/navigation/start/nerdtree/screenshot.png
new file mode 100644
index 0000000..c410c5d
Binary files /dev/null and b/pack/navigation/start/nerdtree/screenshot.png differ
diff --git a/pack/navigation/start/nerdtree/syntax/nerdtree.vim b/pack/navigation/start/nerdtree/syntax/nerdtree.vim
new file mode 100644
index 0000000..df0c804
--- /dev/null
+++ b/pack/navigation/start/nerdtree/syntax/nerdtree.vim
@@ -0,0 +1,95 @@
+let s:tree_up_dir_line = '.. (up a dir)'
+syn match NERDTreeIgnore #\~#
+exec 'syn match NERDTreeIgnore #\['.g:NERDTreeGlyphReadOnly.'\]#'
+
+"highlighting for the .. (up dir) line at the top of the tree
+execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line .'#'
+
+"quickhelp syntax elements
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*,#ms=s+2,me=e-1
+syn match NERDTreeHelpTitle #" .*\~$#ms=s+2,me=e-1
+syn match NERDTreeToggleOn #(on)#ms=s+1,he=e-1
+syn match NERDTreeToggleOff #(off)#ms=e-3,me=e-1
+syn match NERDTreeHelpCommand #" :.\{-}\>#hs=s+3
+syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeIgnore,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
+
+"highlighting for sym links
+syn match NERDTreeLinkTarget #->.*# containedin=NERDTreeDir,NERDTreeFile
+syn match NERDTreeLinkFile #.* ->#me=e-3 containedin=NERDTreeFile
+syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
+
+"highlighting to conceal the delimiter around the file/dir name
+if has('conceal')
+    exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# conceal containedin=ALL'
+    setlocal conceallevel=3 concealcursor=nvic
+else
+    exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# containedin=ALL'
+    hi! link NERDTreeNodeDelimiters Ignore
+endif
+
+"highlighing for directory nodes and file nodes
+syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
+
+if g:NERDTreeDirArrowExpandable !=# ''
+    exec 'syn match NERDTreeClosable #' . escape(g:NERDTreeDirArrowCollapsible, '~') . '\ze .*/# containedin=NERDTreeDir,NERDTreeFile'
+    exec 'syn match NERDTreeOpenable #' . escape(g:NERDTreeDirArrowExpandable, '~') . '\ze .*/# containedin=NERDTreeDir,NERDTreeFile'
+    let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~]\-').escape(g:NERDTreeDirArrowExpandable, '~]\-')
+    exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
+    exec 'syn match NERDTreeExecFile #^.*'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
+    exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+else
+    exec 'syn match NERDTreeDir #[^'.g:NERDTreeNodeDelimiter.']\{-}/\ze\($\|'.g:NERDTreeNodeDelimiter.'\)#'
+    exec 'syn match NERDTreeExecFile #[^'.g:NERDTreeNodeDelimiter.']\{-}'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
+    exec 'syn match NERDTreeFile     #^.*'.g:NERDTreeNodeDelimiter.'.*[^\/]\($\|'.g:NERDTreeNodeDelimiter.'.*\)# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+endif
+
+"highlighting for readonly files
+exec 'syn match NERDTreeRO #.*'.g:NERDTreeNodeDelimiter.'\zs.*\ze'.g:NERDTreeNodeDelimiter.'.*\['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile'
+
+exec 'syn match NERDTreeFlags #\[[^\]]*\]\ze'.g:NERDTreeNodeDelimiter.'# containedin=NERDTreeFile,NERDTreeExecFile,NERDTreeDir'
+
+syn match NERDTreeCWD #^[</].*$#
+
+"highlighting for bookmarks
+syn match NERDTreeBookmark # {.*}#hs=s+1
+
+"highlighting for the bookmarks table
+syn match NERDTreeBookmarksLeader #^>#
+syn match NERDTreeBookmarksHeader #^>-\+Bookmarks-\+$# contains=NERDTreeBookmarksLeader
+syn match NERDTreeBookmarkName #^>.\{-} #he=e-1 contains=NERDTreeBookmarksLeader
+syn match NERDTreeBookmark #^>.*$# contains=NERDTreeBookmarksLeader,NERDTreeBookmarkName,NERDTreeBookmarksHeader
+
+hi def link NERDTreePart Special
+hi def link NERDTreePartFile Type
+hi def link NERDTreeExecFile Title
+hi def link NERDTreeDirSlash Identifier
+
+hi def link NERDTreeBookmarksHeader statement
+hi def link NERDTreeBookmarksLeader ignore
+hi def link NERDTreeBookmarkName Identifier
+hi def link NERDTreeBookmark normal
+
+hi def link NERDTreeHelp String
+hi def link NERDTreeHelpKey Identifier
+hi def link NERDTreeHelpCommand Identifier
+hi def link NERDTreeHelpTitle Macro
+hi def link NERDTreeToggleOn Question
+hi def link NERDTreeToggleOff WarningMsg
+
+hi def link NERDTreeLinkTarget Type
+hi def link NERDTreeLinkFile Macro
+hi def link NERDTreeLinkDir Macro
+
+hi def link NERDTreeDir Directory
+hi def link NERDTreeUp Directory
+hi def link NERDTreeFile Normal
+hi def link NERDTreeCWD Statement
+hi def link NERDTreeOpenable Directory
+hi def link NERDTreeClosable Directory
+hi def link NERDTreeIgnore ignore
+hi def link NERDTreeRO WarningMsg
+hi def link NERDTreeBookmark Statement
+hi def link NERDTreeFlags Number
+
+hi def link NERDTreeCurrentNode Search
diff --git a/bundle/matchit/README b/pack/text/start/matchit/README
similarity index 100%
rename from bundle/matchit/README
rename to pack/text/start/matchit/README
diff --git a/bundle/matchit/doc/matchit.txt b/pack/text/start/matchit/doc/matchit.txt
similarity index 100%
rename from bundle/matchit/doc/matchit.txt
rename to pack/text/start/matchit/doc/matchit.txt
diff --git a/bundle/matchit/plugin/matchit.vim b/pack/text/start/matchit/plugin/matchit.vim
similarity index 100%
rename from bundle/matchit/plugin/matchit.vim
rename to pack/text/start/matchit/plugin/matchit.vim
diff --git a/pack/text/start/nerdcommenter/.github/FUNDING.yml b/pack/text/start/nerdcommenter/.github/FUNDING.yml
new file mode 100644
index 0000000..dc20bd4
--- /dev/null
+++ b/pack/text/start/nerdcommenter/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [alerque, scrooloose]
diff --git a/pack/text/start/nerdcommenter/.github/workflows/vint.yml b/pack/text/start/nerdcommenter/.github/workflows/vint.yml
new file mode 100644
index 0000000..d686760
--- /dev/null
+++ b/pack/text/start/nerdcommenter/.github/workflows/vint.yml
@@ -0,0 +1,17 @@
+name: Vint
+on: [push, pull_request]
+jobs:
+  vint:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Run vint with reviewdog
+      uses: reviewdog/action-vint@v1.0.1
+      with:
+        github_token: ${{ secrets.github_token }}
+        reporter: github-pr-review
+
+
diff --git a/pack/text/start/nerdcommenter/.gitignore b/pack/text/start/nerdcommenter/.gitignore
new file mode 100644
index 0000000..fcfaaec
--- /dev/null
+++ b/pack/text/start/nerdcommenter/.gitignore
@@ -0,0 +1,4 @@
+*~
+*.swp
+tags
+DEBUG
diff --git a/pack/text/start/nerdcommenter/README.md b/pack/text/start/nerdcommenter/README.md
new file mode 100644
index 0000000..dec0bb7
--- /dev/null
+++ b/pack/text/start/nerdcommenter/README.md
@@ -0,0 +1,159 @@
+# NERD Commenter [![Vint](https://github.com/preservim/nerdcommenter/workflows/Vint/badge.svg)](https://github.com/preservim/nerdcommenter/actions?workflow=Vint)
+
+Comment functions so powerful—no comment necessary.
+
+## Installation
+
+### Via Plugin Manager (Recommended)
+
+#### [Vim-Plug](https://github.com/junegunn/vim-plug)
+
+1. Add `Plug 'preservim/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:PlugInstall`
+
+#### [Vundle](https://github.com/VundleVim/Vundle.vim) or similar
+
+1. Add `Plugin 'preservim/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:BundleInstall`
+
+#### [NeoBundle](https://github.com/Shougo/neobundle.vim)
+
+1. Add `NeoBundle 'preservim/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:NeoUpdate`
+
+#### [Pathogen](https://github.com/tpope/vim-pathogen)
+
+```sh
+cd ~/.vim/bundle
+git clone https://github.com/preservim/nerdcommenter.git
+```
+
+### Manual Installation
+
+#### Unix
+
+(For Neovim, change `~/.vim/` to `~/.config/nvim/`.)
+
+```sh
+curl -fLo ~/.vim/plugin/NERD_Commenter.vim --create-dirs \
+  https://raw.githubusercontent.com/preservim/nerdcommenter/master/plugin/NERD_commenter.vim
+curl -fLo ~/.vim/doc/NERD_Commenter.txt --create-dirs \
+  https://raw.githubusercontent.com/preservim/nerdcommenter/master/doc/NERD_commenter.txt
+```
+
+#### Windows (PowerShell)
+
+```powershell
+md ~\vimfiles\plugin
+md ~\vimfiles\doc
+$pluguri = 'https://raw.githubusercontent.com/preservim/nerdcommenter/master/plugin/NERD_commenter.vim'
+$docsuri = 'https://raw.githubusercontent.com/preservim/nerdcommenter/master/doc/NERD_commenter.txt'
+(New-Object Net.WebClient).DownloadFile($pluguri, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("~\vimfiles\plugin\NERD_commenter.vim"))
+(New-Object Net.WebClient).DownloadFile($docsuri, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("~\vimfiles\doc\NERD_commenter.txt"))
+```
+
+### Post Installation
+
+Make sure that you have filetype plugins enabled, as the plugin makes use of **|commentstring|** where possible (which is usually set in a filetype plugin). See **|filetype-plugin-on|** for details, but the short version is make sure this line appears in your vimrc:
+
+```sh
+filetype plugin on
+```
+
+## Usage
+
+### Documentation
+
+Please see the vim help system for full documentation of all options: `:help nerdcommenter`
+
+### Settings
+
+Several settings can be added to your vimrc to change the default behavior. Some examples:
+
+```vim
+" Add spaces after comment delimiters by default
+let g:NERDSpaceDelims = 1
+
+" Use compact syntax for prettified multi-line comments
+let g:NERDCompactSexyComs = 1
+
+" Align line-wise comment delimiters flush left instead of following code indentation
+let g:NERDDefaultAlign = 'left'
+
+" Set a language to use its alternate delimiters by default
+let g:NERDAltDelims_java = 1
+
+" Add your own custom formats or override the defaults
+let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } }
+
+" Allow commenting and inverting empty lines (useful when commenting a region)
+let g:NERDCommentEmptyLines = 1
+
+" Enable trimming of trailing whitespace when uncommenting
+let g:NERDTrimTrailingWhitespace = 1
+
+" Enable NERDCommenterToggle to check all selected lines is commented or not 
+let g:NERDToggleCheckAllLines = 1
+```
+
+### Default mappings
+
+The following key mappings are provided by default (there is also a menu provided that contains menu items corresponding to all the below mappings):
+
+Most of the following mappings are for normal/visual mode only. The **|NERDCommenterInsert|** mapping is for insert mode only.
+
+  * `[count]<leader>cc` **|NERDCommenterComment|**
+
+    Comment out the current line or text selected in visual mode.
+
+  * `[count]<leader>cn` **|NERDCommenterNested|**
+
+    Same as <leader>cc but forces nesting.
+
+  * `[count]<leader>c<space>` **|NERDCommenterToggle|**
+
+    Toggles the comment state of the selected line(s). If the topmost selected line is commented, all selected lines are uncommented and vice versa.
+
+  * `[count]<leader>cm` **|NERDCommenterMinimal|**
+
+    Comments the given lines using only one set of multipart delimiters.
+
+  * `[count]<leader>ci` **|NERDCommenterInvert|**
+
+    Toggles the comment state of the selected line(s) individually.
+
+  * `[count]<leader>cs` **|NERDCommenterSexy|**
+
+    Comments out the selected lines with a pretty block formatted layout.
+
+  * `[count]<leader>cy` **|NERDCommenterYank|**
+
+    Same as <leader>cc except that the commented line(s) are yanked first.
+
+  * `<leader>c$` **|NERDCommenterToEOL|**
+
+    Comments the current line from the cursor to the end of line.
+
+  * `<leader>cA` **|NERDCommenterAppend|**
+
+    Adds comment delimiters to the end of line and goes into insert mode between them.
+
+  * **|NERDCommenterInsert|**
+
+    Adds comment delimiters at the current cursor position and inserts between. Disabled by default.
+
+  * `<leader>ca` **|NERDCommenterAltDelims|**
+
+    Switches to the alternative set of delimiters.
+
+  * `[count]<leader>cl` **|NERDCommenterAlignLeft**
+    `[count]<leader>cb` **|NERDCommenterAlignBoth**
+
+    Same as **|NERDCommenterComment|** except that the delimiters are aligned down the left side (`<leader>cl`) or both sides (`<leader>cb`).
+
+  * `[count]<leader>cu` **|NERDCommenterUncomment|**
+
+    Uncomments the selected line(s).
diff --git a/pack/text/start/nerdcommenter/Rakefile b/pack/text/start/nerdcommenter/Rakefile
new file mode 100644
index 0000000..c7bf9e6
--- /dev/null
+++ b/pack/text/start/nerdcommenter/Rakefile
@@ -0,0 +1,76 @@
+# written by travis jeffery <travisjeffery@gmail.com>
+# contributions by scrooloose <github:scrooloose>
+
+require 'rake'
+require 'find'
+require 'pathname'
+
+IGNORE = [/\.gitignore$/, /Rakefile$/]
+
+files = `git ls-files`.split("\n")
+files.reject! { |f| IGNORE.any? { |re| f.match(re) } }
+
+desc 'Zip up the project files'
+task :zip do
+  zip_name = File.basename(File.dirname(__FILE__))
+  zip_name.gsub!(/ /, '_')
+  zip_name = "#{zip_name}.zip"
+
+  if File.exist?(zip_name)
+    abort("Zip file #{zip_name} already exists. Remove it first.")
+  end
+
+  puts "Creating zip file: #{zip_name}"
+  system("zip #{zip_name} #{files.join(" ")}")
+end
+
+desc 'Install plugin and documentation'
+task :install do
+  vimfiles = if ENV['VIMFILES']
+               ENV['VIMFILES']
+             elsif RUBY_PLATFORM =~ /(win|w)32$/
+               File.expand_path("~/vimfiles")
+             else
+               File.expand_path("~/.vim")
+             end
+  files.each do |file|
+    target_file = File.join(vimfiles, file)
+    FileUtils.mkdir_p File.dirname(target_file)
+    FileUtils.cp file, target_file
+
+    puts "Installed #{file} to #{target_file}"
+  end
+
+end
+
+desc 'Pulls from origin'
+task :pull do
+  puts "Updating local repo..."
+  system("cd " << Dir.new(File.dirname(__FILE__)).path << " && git pull")
+end
+
+desc 'Calls pull task and then install task'
+task :update => ['pull', 'install'] do
+  puts "Update of vim script complete."
+end
+
+desc 'Uninstall plugin and documentation'
+task :uninstall do
+  vimfiles = if ENV['VIMFILES']
+               ENV['VIMFILES']
+             elsif RUBY_PLATFORM =~ /(win|w)32$/
+               File.expand_path("~/vimfiles")
+             else
+               File.expand_path("~/.vim")
+             end
+  files.each do |file|
+    target_file = File.join(vimfiles, file)
+    FileUtils.rm target_file
+
+    puts "Uninstalled #{target_file}"
+  end
+
+end
+
+task :default => ['update']
+
diff --git a/pack/text/start/nerdcommenter/doc/NERD_commenter.txt b/pack/text/start/nerdcommenter/doc/NERD_commenter.txt
new file mode 100644
index 0000000..995c31c
--- /dev/null
+++ b/pack/text/start/nerdcommenter/doc/NERD_commenter.txt
@@ -0,0 +1,1191 @@
+*NERD_commenter.txt*         Plugin for commenting code
+
+
+                        NERD COMMENTER REFERENCE MANUAL~
+
+
+
+
+
+==============================================================================
+CONTENTS                                               *NERDCommenterContents*
+
+    1.Intro...................................|NERDCommenter|
+        1.1 Leader............................|NERDCommenterLeader|
+    2.Installation............................|NERDCommenterInstallation|
+    3.Functionality provided..................|NERDCommenterFunctionality|
+        3.1 Functionality Summary.............|NERDCommenterFunctionalitySummary|
+        3.2 Functionality Details.............|NERDCommenterFunctionalityDetails|
+            3.2.1 Comment map.................|NERDCommenterComment|
+            3.2.2 Nested comment map..........|NERDCommenterNested|
+            3.2.3 Toggle comment map..........|NERDCommenterToggle|
+            3.2.4 Minimal comment map.........|NERDCommenterMinimal|
+            3.2.5 Invert comment map..........|NERDCommenterInvert|
+            3.2.6 Sexy comment map............|NERDCommenterSexy|
+            3.2.7 Yank comment map............|NERDCommenterYank|
+            3.2.8 Comment to EOL map..........|NERDCommenterToEOL|
+            3.2.9 Append com to line map......|NERDCommenterAppend|
+            3.2.10 Insert comment map.........|NERDCommenterInsert|
+            3.2.11 Use alternate delims map...|NERDCommenterAltDelims|
+            3.2.12 Comment aligned maps.......|NERDCommenterAlignLeft|
+                                              |NERDCommenterAlignBoth|
+            3.2.13 Uncomment line map.........|NERDCommenterUncomment|
+        3.3 Sexy Comments.....................|NERDCommenterSexyComments|
+        3.4 The NERDComment function..........|NERDCommenterNERDComment|
+        3.5 The Hooks.........................|NERDCommenterHooks|
+    4.Options.................................|NERDCommenterOptions|
+        4.1 Options summary...................|NERDCommenterOptionsSummary|
+        4.2 Options details...................|NERDCommenterOptionsDetails|
+        4.3 Default delimiter Options.........|NERDCommenterDefaultDelims|
+    5. Customising key mappings...............|NERDCommenterMappings|
+    6. Interfaces.............................|NERDCommenterInterfaces|
+    7. Issues with the script.................|NERDCommenterIssues|
+        7.1 Delimiter detection heuristics....|NERDCommenterHeuristics|
+        7.2 Nesting issues....................|NERDCommenterNesting|
+    8.About..     ............................|NERDCommenterAbout|
+    9.Changelog...............................|NERDCommenterChangelog|
+    10.Credits................................|NERDCommenterCredits|
+    11.License................................|NERDCommenterLicense|
+
+==============================================================================
+1. Intro                                                       *NERDCommenter*
+
+The NERD commenter provides many different commenting operations and styles
+which are invoked via key mappings and a menu. These operations are available
+for most filetypes.
+
+There are also options that allow to tweak the commenting engine to your
+taste.
+
+------------------------------------------------------------------------------
+1.1 Leader key                                           *NERDCommenterLeader*
+
+Most NERD commenter commands are executed using the |<Leader>| key. In Vim
+this is a key dedicated for user-specific customizations. It effectively
+creates a namespace so that custom commands don't interfere with Vim's
+built-in shortcuts.
+
+The leader key can be mapped to whatever the user likes (see :help mapleader).
+In the definition of custom commands |<Leader>| is the placeholder for the 
+leader key. To see the current mapping for |<Leader>| type :echo mapleader.
+If it reports an undefined variable it means the leader key is set to the
+default of '\'.
+
+==============================================================================
+2. Installation                                    *NERDCommenterInstallation*
+
+The NERD Commenter requires Vim 7 or higher.
+
+Extract the plugin files in your ~/.vim (*nix) or ~/vimfiles (Windows). You
+should have 2 files: >
+    plugin/NERD_commenter.vim
+    doc/NERD_commenter.txt
+<
+Next, to finish installing the help file run: >
+    :helptags ~/.vim/doc
+<
+See |add-local-help| for more details.
+
+Make sure that you have filetype plugins enabled, as the script makes use of
+|'commentstring'| where possible (which is usually set in a filetype plugin).
+See |filetype-plugin-on| for details, but basically, stick this in your vimrc >
+    filetype plugin on
+<
+
+==============================================================================
+3. Functionality provided                         *NERDCommenterFunctionality*
+
+------------------------------------------------------------------------------
+3.1 Functionality summary                  *NERDCommenterFunctionalitySummary*
+
+The following key mappings are provided by default (there is also a menu
+with items corresponding to all the mappings below):
+
+[count]|<Leader>|cc |NERDCommenterComment|
+Comment out the current line or text selected in visual mode.
+
+
+[count]|<Leader>|cn |NERDCommenterNested|
+Same as |<Leader>|cc but forces nesting.
+
+
+[count]|<Leader>|c<space> |NERDCommenterToggle|
+Toggles the comment state of the selected line(s). If the topmost selected
+line is commented, all selected lines are uncommented and vice versa.
+
+
+[count]|<Leader>|cm |NERDCommenterMinimal|
+Comments the given lines using only one set of multipart delimiters.
+
+
+[count]|<Leader>|ci |NERDCommenterInvert|
+Toggles the comment state of the selected line(s) individually.
+
+
+[count]|<Leader>|cs |NERDCommenterSexy|
+Comments out the selected lines ``sexily''
+
+
+[count]|<Leader>|cy |NERDCommenterYank|
+Same as |<Leader>|cc except that the commented line(s) are yanked first.
+
+
+|<Leader>|c$ |NERDCommenterToEOL|
+Comments the current line from the cursor to the end of line.
+
+
+|<Leader>|cA |NERDCommenterAppend|
+Adds comment delimiters to the end of line and goes into insert mode between
+them.
+
+
+|NERDCommenterInsert|
+Adds comment delimiters at the current cursor position and inserts between.
+Disabled by default.
+
+
+|<Leader>|ca |NERDCommenterAltDelims|
+Switches to the alternative set of delimiters.
+
+
+[count]|<Leader>|cl    |NERDCommenterAlignLeft|
+[count]|<Leader>|cb    |NERDCommenterAlignBoth|
+Same as |NERDCommenterComment| except that the delimiters are aligned down the
+left side (|<Leader>|cl) or both sides (|<Leader>|cb).
+
+
+[count]|<Leader>|cu |NERDCommenterUncomment|
+Uncomments the selected line(s).
+
+
+With the optional repeat.vim plugin (vimscript #2136), the mappings can also
+be repeated via |.|
+
+------------------------------------------------------------------------------
+3.2 Functionality details                  *NERDCommenterFunctionalityDetails*
+
+------------------------------------------------------------------------------
+3.2.1 Comment map                                       *NERDCommenterComment*
+
+Default mapping: [count]|<Leader>|cc
+Mapped to: <plug>NERDCommenterComment
+Applicable modes: normal visual visual-line visual-block.
+
+
+Comments out the current line. If multiple lines are selected in visual-line
+mode, they are all commented out.  If some text is selected in visual or
+visual-block mode then the script will try to comment out the exact text that
+is selected using multi-part delimiters if they are available.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.2 Nested comment map                                 *NERDCommenterNested*
+
+Default mapping: [count]|<Leader>|cn
+Mapped to: <plug>NERDCommenterNested
+Applicable modes: normal visual visual-line visual-block.
+
+Performs nested commenting.  Works the same as |<Leader>|cc except that if a line
+is already commented then it will be commented again.
+
+If |'NERDUsePlaceHolders'| is set then the previous comment delimiters will
+be replaced by place-holder delimiters if needed.  Otherwise the nested
+comment will only be added if the current commenting delimiters have no right
+delimiter (to avoid syntax errors)
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related options:
+|'NERDDefaultNesting'|
+
+------------------------------------------------------------------------------
+3.2.3 Toggle comment map                                 *NERDCommenterToggle*
+
+Default mapping: [count]|<Leader>|c<space>
+Mapped to: <plug>NERDCommenterToggle
+Applicable modes: normal visual-line.
+
+Toggles commenting of the lines selected. The behaviour of this mapping
+depends on whether the first line selected is commented or not.  If so, all
+selected lines are uncommented and vice versa.
+
+With this mapping, a line is only considered to be commented if it starts with
+a left delimiter.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.4 Minimal comment map                               *NERDCommenterMinimal*
+
+Default mapping: [count]|<Leader>|cm
+Mapped to: <plug>NERDCommenterMinimal
+Applicable modes: normal visual-line.
+
+Comments the selected lines using one set of multipart delimiters if possible.
+
+For example: if you are programming in c and you select 5 lines and press
+|<Leader>|cm then a '/*' will be placed at the start of the top line and a '*/'
+will be placed at the end of the last line.
+
+Sets of multipart comment delimiters that are between the top and bottom
+selected lines are replaced with place holders (see |'NERDLPlace'|) if
+|'NERDUsePlaceHolders'| is set for the current filetype. If it is not, then
+the comment will be aborted if place holders are required to prevent illegal
+syntax.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.5 Invert comment map                                 *NERDCommenterInvert*
+
+Default mapping: |<Leader>|ci
+Mapped to: <plug>NERDCommenterInvert
+Applicable modes: normal visual-line.
+
+Inverts the commented state of each selected line. If the selected line is
+commented then it is uncommented and vice versa. Each line is examined and
+commented/uncommented individually.
+
+With this mapping, a line is only considered to be commented if it starts with
+a left delimiter.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.6 Sexy comment map                                     *NERDCommenterSexy*
+
+Default mapping: [count]|<Leader>|cs
+Mapped to: <plug>NERDCommenterSexy
+Applicable modes: normal, visual-line.
+
+Comments the selected line(s) ``sexily''. See |NERDCommenterSexyComments| for
+a description of what sexy comments are. Can only be done on filetypes for
+which there is at least one set of multipart comment delimiters specified.
+
+Sexy comments cannot be nested and lines inside a sexy comment cannot be
+commented again.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related options:
+|'NERDCompactSexyComs'|
+
+------------------------------------------------------------------------------
+3.2.7 Yank comment map                                     *NERDCommenterYank*
+
+Default mapping: [count]|<Leader>|cy
+Mapped to: <plug>NERDCommenterYank
+Applicable modes: normal visual visual-line visual-block.
+
+Same as |<Leader>|cc except that it yanks the line(s) that are commented first.
+
+------------------------------------------------------------------------------
+3.2.8 Comment to EOL map                                  *NERDCommenterToEOL*
+
+Default mapping: |<Leader>|c$
+Mapped to: <plug>NERDCommenterToEOL
+Applicable modes: normal.
+
+Comments the current line from the current cursor position up to the end of
+the line.
+
+------------------------------------------------------------------------------
+3.2.9 Append com to line map                             *NERDCommenterAppend*
+
+Default mapping: |<Leader>|cA
+Mapped to: <plug>NERDCommenterAppend
+Applicable modes: normal.
+
+Appends comment delimiters to the end of the current line and goes
+to insert mode between the new delimiters.
+
+------------------------------------------------------------------------------
+3.2.10 Insert comment map                                *NERDCommenterInsert*
+
+Default mapping: disabled by default.
+Map it to: <plug>NERDCommenterInsert
+Applicable modes: insert.
+
+Adds comment delimiters at the current cursor position and inserts
+between them.
+
+NOTE: prior to version 2.1.17 this was mapped to <C-c>. To restore this
+mapping add >
+    imap <C-c> <plug>NERDCommenterInsert
+<
+to your vimrc.
+
+------------------------------------------------------------------------------
+3.2.11 Use alternate delims map                       *NERDCommenterAltDelims*
+
+Default mapping: |<Leader>|ca
+Mapped to: <plug>NERDCommenterAltDelims
+Applicable modes: normal.
+
+Changes to the alternative commenting style if one is available. For example,
+if the user is editing a c++ file using // comments and they hit |<Leader>|ca
+then they will be switched over to /**/ comments.
+
+See also |NERDCommenterDefaultDelims|
+
+------------------------------------------------------------------------------
+3.2.12 Comment aligned maps                           *NERDCommenterAlignLeft*
+                                                      *NERDCommenterAlignBoth*
+
+Default mappings: [count]|<Leader>|cl   [count]|<Leader>|cb
+Mapped to: <plug>NERDCommenterAlignLeft
+           <plug>NERDCommenterAlignBoth
+Applicable modes: normal visual-line.
+
+Same as |<Leader>|cc except that the comment delimiters are aligned on the left
+side or both sides respectively. These comments are always nested if the
+line(s) are already commented.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.13 Uncomment line map                             *NERDCommenterUncomment*
+
+Default mapping: [count]|<Leader>|cu
+Mapped to: <plug>NERDCommenterUncomment
+Applicable modes: normal visual visual-line visual-block.
+
+Uncomments the current line. If multiple lines are selected in
+visual mode then they are all uncommented.
+
+When uncommenting, if the line contains multiple sets of delimiters then the
+``outermost'' pair of delimiters will be removed.
+
+The script uses a set of heuristics to distinguish ``real'' delimiters from
+``fake'' ones when uncommenting. See |NERDCommenterIssues| for details.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related  options:
+|'NERDRemoveAltComs'|
+|'NERDRemoveExtraSpaces'|
+
+------------------------------------------------------------------------------
+3.3 Sexy Comments                                  *NERDCommenterSexyComments*
+These are comments that use one set of multipart comment delimiters as well as
+one other marker symbol. For example: >
+    /*
+     * This is a c style sexy comment
+     * So there!
+     */
+
+    /* This is a c style sexy comment
+     * So there!
+     * But this one is ``compact'' style */
+<
+Here the multipart delimiters are /* and */ and the marker is *.
+
+------------------------------------------------------------------------------
+3.4 The NERDComment function                        *NERDCommenterNERDComment*
+
+All of the NERD commenter mappings and menu items invoke a single function
+which delegates the commenting work to other functions. This function is
+public and has the prototype: >
+    function! NERDComment(mode, type)
+<
+The arguments to this function are simple:
+    - mode: a character indicating the mode in which the comment is requested:
+     'n' for Normal mode, 'x' for Visual mode
+    - type: is used to specify what type of commenting operation is to be
+      performed, and it can be one of the following: "sexy", "invert",
+      "minimal", "toggle", "alignLeft", "alignBoth", "comment", "nested",
+      "toEOL", "append", "insert", "uncomment", "yank"
+
+For example, if you typed >
+    :call NERDComment(1, 'sexy')
+<
+then the script would do a sexy comment on the last visual selection.
+
+------------------------------------------------------------------------------
+3.5 The hooks                                             *NERDCommenterHooks*
+|fu! NERDCommenter_before()|  Before NERDComment/SwitchToAlternativeDelimiters
+|fu! NERDCommenter_after()|    After NERDComment/SwitchToAlternativeDelimiters
+
+For example, in order to handle different language blocks embedded in the same
+file such as |vim-vue|, you can change the filetype, comment something and
+change the filetype back: >
+    let g:ft = ''
+    fu! NERDCommenter_before()
+        if &ft == 'vue'
+            let g:ft = 'vue'
+            let stack = synstack(line('.'), col('.'))
+            if len(stack) > 0
+                let syn = synIDattr((stack)[0], 'name')
+                if len(syn) > 0
+                    let syn = tolower(syn)
+                    exe 'setf '.syn
+                endif
+            endif
+        endif
+    endfu
+    fu! NERDCommenter_after()
+        if g:ft == 'vue'
+            setf vue
+            let g:ft = ''
+        endif
+    endfu
+<
+
+==============================================================================
+4. Options                                              *NERDCommenterOptions*
+
+------------------------------------------------------------------------------
+4.1 Options summary                              *NERDCommenterOptionsSummary*
+
+|'loaded_nerd_comments'|              Turns off the script.
+
+|'NERDAllowAnyVisualDelims'|          Allows multipart alternative delimiters
+                                      to be used when commenting in
+                                      visual/visual-block mode.
+
+|'NERDBlockComIgnoreEmpty'|           Forces right delimiters to be placed
+                                      when doing visual-block comments.
+
+|'NERDCommentEmptyLines'|             Specifies if empty lines should be
+                                      commented (useful with regions).
+
+|'NERDCommentWholeLinesInVMode'|      Changes behaviour of visual comments.
+
+|'NERDCreateDefaultMappings'|         Turn the default mappings on/off.
+
+|'NERDCustomDelimiters'|              Add or override delimiters for any
+                                      filetypes.
+                                      
+|'NERDDefaultNesting'|                Tells the script to use nested comments
+                                      by default.
+                                      
+|'NERDMenuMode'|                      Specifies how the NERD commenter menu
+                                      will appear (if at all).
+                                      
+|'NERDLPlace'|                        Specifies what to use as the left
+                                      delimiter placeholder when nesting
+                                      comments.
+                                      
+|'NERDUsePlaceHolders'|               Specifies which filetypes may use
+                                      placeholders when nesting comments.
+                                      
+|'NERDRemoveAltComs'|                 Tells the script whether to remove
+                                      alternative comment delimiters when
+                                      uncommenting.
+                                      
+|'NERDRemoveExtraSpaces'|             Tells the script to always remove the
+                                      extra spaces when uncommenting
+                                      (regardless of whether NERDSpaceDelims
+                                      is set).
+                                      
+|'NERDRPlace'|                        Specifies what to use as the right
+                                      delimiter placeholder when nesting
+                                      comments.
+                                      
+|'NERDSpaceDelims'|                   Specifies whether to add extra spaces
+                                      around delimiters when commenting, and
+                                      whether to remove them when
+                                      uncommenting.
+                                      
+|'NERDTrimTrailingWhitespace'|        Specifies if trailing whitespace
+                                      should be deleted when uncommenting.
+
+|'NERDCompactSexyComs'|               Specifies whether to use the compact
+                                      style sexy comments.
+
+|'NERDDefaultAlign'|                  Specifies the default alignment to use,
+                                      one of 'none', 'left', 'start', or
+                                      'both'.
+
+|'NERDToggleCheckAllLines'|           Enable NERDCommenterToggle to check 
+                                      all selected lines is commented or not.
+
+------------------------------------------------------------------------------
+4.3 Options details                              *NERDCommenterOptionsDetails*
+
+To enable any of the below options you should put the given line in your
+~/.vimrc
+
+                                                       *'loaded_nerd_comments'*
+If this script is driving you insane you can turn it off by setting this
+option >
+    let loaded_nerd_comments=1
+<
+------------------------------------------------------------------------------
+                                                    *'NERDAllowAnyVisualDelims'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1 then, when doing a visual or visual-block comment (but not a
+visual-line comment), the script will choose the right delimiters to use for
+the comment. This means either using the current delimiters if they are
+multipart or using the alternative delimiters if THEY are multipart.  For
+example if we are editing the following java code: >
+    float foo = 1221;
+    float bar = 324;
+    System.out.println(foo * bar);
+<
+If we are using // comments and select the "foo" and "bar" in visual-block
+mode, as shown left below (where '|'s are used to represent the visual-block
+boundary), and comment it then the script will use the alternative delimiters
+as shown on the right: >
+
+    float |foo| = 1221;                   float /*foo*/ = 1221;
+    float |bar| = 324;                    float /*bar*/ = 324;
+    System.out.println(foo * bar);        System.out.println(foo * bar);
+<
+------------------------------------------------------------------------------
+                                                     *'NERDBlockComIgnoreEmpty'*
+Values: 0 or 1.
+Default: 1.
+
+This option  affects visual-block mode commenting. If this option is turned
+on, lines that begin outside the right boundary of the selection block will be
+ignored.
+
+For example, if you are commenting this chunk of c code in visual-block mode
+(where the '|'s are used to represent the visual-block boundary) >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+   |int| main(){
+   |   | printf("SUCK THIS\n");
+   |   | while(1){
+   |   |     fork();
+   |   | }
+   |}  |
+<
+If NERDBlockComIgnoreEmpty=0 then this code will become: >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    /*int*/ main(){
+    /*   */ printf("SUCK THIS\n");
+    /*   */ while(1){
+    /*   */     fork();
+    /*   */ }
+    /*}  */
+<
+Otherwise, the code block would become: >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    /*int*/ main(){
+    printf("SUCK THIS\n");
+    while(1){
+        fork();
+    }
+    /*}  */
+<
+------------------------------------------------------------------------------
+                                                     *'NERDCommentEmptyLines'*
+Values: 0 or 1.
+Default: 0.
+
+This option affects commenting of empty lines. If this option is turned on,
+then empty lines will be commented as well. Useful when commenting regions of
+code.
+
+------------------------------------------------------------------------------
+                                                *'NERDCommentWholeLinesInVMode'*
+Values: 0, 1 or 2.
+Default: 0.
+
+By default the script tries to comment out exactly what is selected in visual
+mode (v). For example if you select and comment the following c code (using |
+to represent the visual boundary): >
+    in|t foo = 3;
+    int bar =| 9;
+    int baz = foo + bar;
+<
+This will result in: >
+    in/*t foo = 3;*/
+    /*int bar =*/ 9;
+    int baz = foo + bar;
+<
+But some people prefer it if the whole lines are commented like: >
+    /*int foo = 3;*/
+    /*int bar = 9;*/
+    int baz = foo + bar;
+<
+If you prefer the second option then stick this line in your vimrc: >
+    let NERDCommentWholeLinesInVMode=1
+<
+
+If the filetype you are editing only has no multipart delimiters (for example
+a shell script) and you hadn't set this option then the above would become >
+    in#t foo = 3;
+    #int bar = 9;
+<
+(where # is the comment delimiter) as this is the closest the script can
+come to commenting out exactly what was selected. If you prefer for whole
+lines to be commented out when there is no multipart delimiters but the EXACT
+text that was selected to be commented out if there IS multipart delimiters
+then stick the following line in your vimrc: >
+    let NERDCommentWholeLinesInVMode=2
+<
+
+Note that this option does not affect the behaviour of commenting in
+|visual-block| mode.
+
+------------------------------------------------------------------------------
+                                                 *'NERDCreateDefaultMappings'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 0, none of the default mappings will be created.
+
+See also |NERDCommenterMappings|.
+
+------------------------------------------------------------------------------
+                                                      *'NERDCustomDelimiters'*
+Values: A map (format specified below).
+Default: {}
+
+Use this option if you have new filetypes you want the script to handle, or if
+you want to override the default delimiters of a filetype.
+
+Example: >
+    let g:NERDCustomDelimiters = {
+        \ 'ruby': { 'left': '#', 'leftAlt': 'FOO', 'rightAlt': 'BAR' },
+        \ 'grondle': { 'left': '{{', 'right': '}}' }
+    \ }
+<
+
+Here we override the delimiter settings for ruby and add FOO/BAR as alternative
+delimiters. We also add {{ and }} as delimiters for a new filetype called
+'grondle'.
+
+------------------------------------------------------------------------------
+                                                           *'NERDRemoveAltComs'*
+Values: 0 or 1.
+Default: 1.
+
+When uncommenting a line (for a filetype with an alternative commenting style)
+this option tells the script whether to look for, and remove, comment
+delimiters of the alternative style.
+
+For example, if you are editing a c++ file using // style comments and you go
+|<Leader>|cu on this line: >
+    /* This is a c++ comment baby! */
+<
+It will not be uncommented if the NERDRemoveAltComs is set to 0.
+
+------------------------------------------------------------------------------
+                                                       *'NERDRemoveExtraSpaces'*
+Values: 0 or 1.
+Default: 0.
+
+By default, the NERD commenter will remove spaces around comment delimiters if
+either:
+1. |'NERDSpaceDelims'| is set to 1.
+2. NERDRemoveExtraSpaces is set to 1.
+
+This means that if we have the following lines in a c code file: >
+    /* int foo = 5; */
+    /* int bar = 10; */
+    int baz = foo + bar
+<
+If either of the above conditions hold then if these lines are uncommented
+they will become: >
+    int foo = 5;
+    int bar = 10;
+    int baz = foo + bar
+<
+Otherwise they would become: >
+     int foo = 5;
+     int bar = 10;
+    int baz = foo + bar
+<
+
+Note: When using 'start' as the default alignment, the enabling of
+NERDRemoveExtraSpaces will still result in the removal of a space after the
+delimiter.  This can be undesirable since aligning the delimiters at the very
+start of the line (index 0) will usually result in spaces between the comment
+delimiters and the text which probably shouldn't be removed.  So when using
+'start' as the default alignment, take care to also disable
+NERDRemoveExtraSpaces.
+
+------------------------------------------------------------------------------
+                                                                  *'NERDLPlace'*
+                                                                  *'NERDRPlace'*
+Values: arbitrary string.
+Default:
+    NERDLPlace: "[>"
+    NERDRPlace: "<]"
+
+These options are used to control the strings used as place-holder delimiters.
+Place holder delimiters are used when performing nested commenting when the
+filetype supports commenting styles with both left and right delimiters.
+To set these options use lines like: >
+    let NERDLPlace="FOO"
+    let NERDRPlace="BAR"
+<
+Following the above example, if we have line of c code: >
+    /* int horse */
+<
+and we comment it with |<Leader>|cn it will be changed to: >
+    /*FOO int horse BAR*/
+<
+When we uncomment this line it will go back to what it was.
+
+------------------------------------------------------------------------------
+                                                                *'NERDMenuMode'*
+Values: 0, 1, 2, 3.
+Default: 3
+
+This option can take 4 values:
+    "0": Turns the menu off.
+    "1": Turns the 'comment' menu on with no menu shortcut.
+    "2": Turns the 'comment' menu on with <alt>-c as the shortcut.
+    "3": Turns the 'Plugin -> comment' menu on with <alt>-c as the shortcut.
+
+------------------------------------------------------------------------------
+                                                         *'NERDUsePlaceHolders'*
+Values: 0 or 1.
+Default 1.
+
+This option is used to specify whether place-holder delimiters should be used
+when creating a nested comment.
+
+------------------------------------------------------------------------------
+                                                             *'NERDSpaceDelims'*
+Values: 0 or 1.
+Default 0.
+
+Some people prefer a space after the left delimiter and before the right
+delimiter like this: >
+    /* int foo=2; */
+<
+as opposed to this: >
+    /*int foo=2;*/
+<
+If you want spaces to be added then set NERDSpaceDelims to 1 in your vimrc.
+
+See also |'NERDRemoveExtraSpaces'|.
+
+------------------------------------------------------------------------------
+                                                  *'NERDTrimTrailingWhitespace'*
+Values: 0 or 1.
+Default 0.
+
+When uncommenting an empty line some whitespace may be left as a result of
+alignment padding. With this option enabled any trailing whitespace will be
+deleted when uncommenting a line.
+
+------------------------------------------------------------------------------
+                                                             *'NERDDefaultAlign'*
+Values: 'none', 'left', 'start', 'both'
+Default 'none'.
+
+Specifies the default alignment to use when inserting comments.
+
+Note: When using 'start' as the default alignment be sure to disable
+NERDRemoveExtraSpaces.  See the note at the bottom of |NERDRemoveExtraSpaces|
+for more details.
+
+------------------------------------------------------------------------------
+                                                         *'NERDCompactSexyComs'*
+Values: 0 or 1.
+Default 0.
+
+Some people may want their sexy comments to be like this: >
+    /* Hi There!
+     * This is a sexy comment
+     * in c */
+<
+As opposed to like this: >
+    /*
+     * Hi There!
+     * This is a sexy comment
+     * in c
+     */
+<
+If this option is set to 1 then the top style will be used.
+
+------------------------------------------------------------------------------
+                                                          *'NERDDefaultNesting'*
+Values: 0 or 1.
+Default 1.
+
+When this option is set to 1, comments are nested automatically. That is, if
+you hit |<Leader>|cc on a line that is already commented it will be commented
+again.
+
+------------------------------------------------------------------------------
+                                                   *'NERDToggleCheckAllLines'*
+Values: 0 or 1.
+Default 0.
+
+When this option is set to 1, NERDCommenterToggle will check all selected line, 
+if there have oneline not be commented, then comment all lines.
+
+------------------------------------------------------------------------------
+                                                *'NERDDisableTabsInBlockComm'*
+Values: 0 or 1.
+Default 0.
+
+When this option is set to 1, NERDDisableTabsInBlockComm will not add
+whitespaces align the start location of the ending comment symbol with the
+end location of the starting comment symbol. For example, in Fortran, the new
+style will be as the following: >
+    close (inpt,iostat=ierr,iomsg=error_message)
+    call io_error(pname,input_fname,2,__LINE__,__FILE__,ierr,error_message)
+<
+to >
+    !===BEGIN===!
+    ! close (inpt,iostat=ierr,iomsg=error_message)
+    ! call io_error(pname,input_fname,2,__LINE__,__FILE__,ierr,error_message)
+    !===END===!
+<
+for the block comment style if customized comment symbols are set up in vimrc
+file by the following line >
+    let g:NERDCustomDelimiters = {
+    \ 'fortran':{'left':'!','leftAlt':'!===BEGIN===!','rightAlt':'!===END===!'}
+    \ }
+<
+
+------------------------------------------------------------------------------
+3.3 Default delimiter customisation               *NERDCommenterDefaultDelims*
+
+If you want the NERD commenter to use the alternative delimiters for a
+specific filetype by default then put a line of this form into your vimrc: >
+    let g:NERDAltDelims_<filetype> = 1
+<
+Example: java uses // style comments by default, but you want it to default to
+/* */ style comments instead. You would put this line in your vimrc: >
+    let g:NERDAltDelims_java = 1
+<
+
+See |NERDCommenterAltDelims| for switching commenting styles at runtime.
+
+==============================================================================
+5. Key mapping customisation                           *NERDCommenterMappings*
+
+To change a mapping just map another key combo to the internal <plug> mapping.
+For example, to remap the |NERDCommenterComment| mapping to ",omg" you would put
+this line in your vimrc: >
+    map ,omg <plug>NERDCommenterComment
+<
+This will stop the corresponding default mappings from being created.
+
+See the help for the mapping in question to see which <plug> mapping to
+map to.
+
+See also |'NERDCreateDefaultMappings'|.
+
+==============================================================================
+6. Interfaces                                        *NERDCommenterInterfaces*
+
+NERDCommentIsLineCommented({lineNo})            *NERDCommentIsLineCommented()*
+            Check if the line is a comment
+            Note this function checks if the line is **completely** a comment
+            Args:
+              {lineNo}:     the line number of the line to check
+            Return: Number, 1 if the line is a comment, 0 else
+
+
+NERDComment({mode}, {type})                                    *NERDComment()*
+            This function is a Wrapper for the main commenting functions
+
+            Args:
+              {mode}:       character indicating the mode in which the comment
+                            is requested:
+                            'n' for Normal mode, 'x' for Visual mode
+              {type}:       the type of commenting requested. Can be 'Sexy', 
+                            'Invert', 'Minimal', 'Toggle', 'AlignLeft', 
+                            'AlignBoth', 'Comment', 'Nested', 'ToEOL', 'Append',
+                            'Insert', 'Uncomment', 'Yank'
+
+
+NERDCommentIsCharCommented({line}, {col})       *NERDCommentIsCharCommented()*
+            Check if the character at [{line}, {col}] is inside a comment
+            Note the Comment delimeter it self is considered as part of the 
+            comment
+
+            Args:
+              {line}       the line number of the character
+              {col}        the column number of the character
+            Return: Number, 1 if the character is inside a comment, 0 else
+
+
+==============================================================================
+7. Issues with the script                                *NERDCommenterIssues*
+
+
+------------------------------------------------------------------------------
+7.1 Delimiter detection heuristics                   *NERDCommenterHeuristics*
+
+Heuristics are used to distinguish the real comment delimiters
+
+Because we have comment mappings that place delimiters in the middle of lines,
+removing comment delimiters is a bit tricky. This is because if comment
+delimiters appear in a line doesn't mean they really ARE delimiters. For
+example, Java uses // comments but the line >
+    System.out.println("//");
+<
+clearly contains no real comment delimiters.
+
+To distinguish between ``real'' comment delimiters and ``fake'' ones we use a
+set of heuristics. For example, one such heuristic states that any comment
+delimiter that has an odd number of non-escaped " characters both preceding
+and following it on the line is not a comment because it is probably part of a
+string. These heuristics, while usually pretty accurate, will not work for all
+cases.
+
+------------------------------------------------------------------------------
+7.2 Nesting issues                                      *NERDCommenterNesting*
+
+If we have some line of code like this: >
+    /*int foo */ = /*5 + 9;*/
+<
+This will not be uncommented legally. The NERD commenter will remove the
+"outer most" delimiters so the line will become: >
+    int foo */ = /*5 + 9;
+<
+which almost certainly will not be what you want. Nested sets of comments will
+uncomment fine though. E.g.: >
+    /*int/* foo =*/ 5 + 9;*/
+<
+will become: >
+    int/* foo =*/ 5 + 9;
+<
+(Note that in the above examples I have deliberately not used place holders
+for simplicity)
+
+==============================================================================
+8. About                                                  *NERDCommenterAbout*
+
+The author of the NERD commenter is Martyzillatron --- the half robot, half
+dinosaur bastard son of Megatron and Godzilla. He enjoys destroying
+metropolises and eating tourist buses.
+
+Drop him a line at martin_grenfell at msn.com. He would love to hear from you.
+It's a lonely life being the worlds premier terror machine. How would you feel
+if your face looked like a toaster and a t-rex put together? :(
+
+The latest stable versions can be found at
+    http://www.vim.org/scripts/script.php?script_id=1218
+
+The latest dev versions are on github
+    http://github.com/preservim/nerdcommenter
+
+==============================================================================
+9. Changelog                                          *NERDCommenterChangelog*
+
+2.3.0
+    - remove all filetypes which have a &commentstring in the standard vim
+      runtime for vim > 7.0 unless the script stores an alternate set of
+      delimiters
+    - make the script complain if the user doesn't have filetype plugins enabled
+    - use |<Leader>| instead of comma to start the default mappings
+    - fix a couple of bugs with sexy comments - thanks to Tim Smart
+    - lots of refactoring
+
+2.2.2
+    - remove the NERDShutup option and the message is suppresses, this makes
+      the plugin silently rely on &commentstring for unknown filetypes.
+    - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and
+      udevrules. Thanks to Thilo Six.
+    - match filetypes case insensitively
+    - add support for mp (metapost), thanks to Andrey Skvortsov.
+    - add support for htmlcheetah, thanks to Simon Hengel.
+    - add support for javacc, thanks to Matt Tolton.
+    - make <%# %> the default delims for eruby, thanks to tpope.
+    - add support for javascript.jquery, thanks to Ivan Devat.
+    - add support for cucumber and pdf. Fix sass and railslog delims,
+      thanks to tpope
+
+2.2.1
+    - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
+    - fix automake comments, thanks to Elias Pipping
+    - make haml comments default to -# with / as the alternative delimiter,
+      thanks to tpope
+    - add support for actionscript and processing thanks to Edwin Benavides
+    - add support for ps1 (powershell), thanks to Jason Mills
+    - add support for hostsaccess, thanks to Thomas Rowe
+    - add support for CVScommit
+    - add support for asciidoc, git and gitrebase. Thanks to Simon Ruderich.
+    - use # for gitcommit comments, thanks to Simon Ruderich.
+    - add support for mako and genshi, thanks to Keitheis.
+    - add support for conkyrc, thanks to David
+    - add support for SVNannotate, thanks to Miguel Jaque Barbero.
+    - add support for sieve, thanks to Stefan Walk
+    - add support for objj, thanks to Adam Thorsen.
+
+2.2.0
+    - rewrote the mappings system to be more "standard".
+      - removed all the mapping options. Now, mappings to <plug> mappings are
+        used
+      - see :help NERDComMappings, and :help NERDCreateDefaultMappings for
+        more info
+    - remove "prepend comments" and "right aligned comments".
+    - add support for applescript, calbire, man, SVNcommit, potwiki, txt2tags and SVNinfo.
+      Thanks to nicothakis, timberke, sgronblo, mntnoe, Bernhard Grotz, John
+      O'Shea, François and Giacomo Mariani respectively.
+    - bugfix for haskell delimiters. Thanks to mntnoe.
+2.1.18
+    - add support for llvm. Thanks to nicothakis.
+    - add support for xquery. Thanks to Phillip Kovalev.
+2.1.17
+    - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
+    - add support for mailcap. Thanks to Pascal Brueckner.
+    - add support for stata. Thanks to Jerónimo Carballo.
+    - applied a patch from ewfalor to fix an error in the help file with the
+      NERDMapleader doc
+    - disable the insert mode ctrl-c mapping by default, see :help
+      NERDCommenterInsert if you wish to restore it
+
+==============================================================================
+10. Credits                                              *NERDCommenterCredits*
+
+Thanks to the follow people for suggestions and patches:
+
+Nick Brettell
+Matthew Hawkins
+Mathieu Clabaut
+Greg Searle
+Nguyen
+Litchi
+Jorge Scandaliaris
+Shufeng Zheng
+Martin Stubenschrott
+Markus Erlmann
+Brent Rice
+Richard Willis
+Igor Prischepoff
+Harry
+David Bourgeois
+Eike Von Seggern
+Torsten Blix
+Alexander Bosecke
+Stefano Zacchiroli
+Norick Chen
+Joseph Barker
+Gary Church
+Tim Carey-Smith
+Markus Klinik
+Anders
+Seth Mason
+James Hales
+Heptite
+Cheng Fang
+Yongwei Wu
+David Miani
+Jeremy Hinegardner
+Marco
+Ingo Karkat
+Zhang Shuhan
+tpope
+Ben Schmidt
+David Fishburn
+Erik Falor
+JaGoTerr
+Elias Pipping
+mntnoe
+Mark S.
+James P. Harvey
+
+
+Thanks to the following people for sending me new filetypes to support:
+
+The hackers                         The filetypes~
+Sam R                               verilog
+Jonathan                            Derque context, plaintext and mail
+Vigil                               fetchmail
+Michael Brunner                     kconfig
+Antono Vasiljev                     netdict
+Melissa Reid                        omlet
+Ilia N Ternovich                    quickfix
+John O'Shea                         RTF, SVNcommitlog and vcscommit, SVNCommit
+Anders                              occam
+Mark Woodward                       csv
+fREW                                gentoo-package-mask,
+                                    gentoo-package-keywords,
+                                    gentoo-package-use, and vo_base
+Alexey                              verilog_systemverilog, systemverilog
+Lizendir                            fstab
+Michael Böhler                      autoit, autohotkey and docbk
+Aaron Small                         cmake
+Ramiro                              htmldjango and django
+Stefano Zacchiroli                  debcontrol, debchangelog, mkd
+Alex Tarkovsky                      ebuild and eclass
+Jorge Rodrigues                     gams
+Rainer Müller                       Objective C
+Jason Mills                         Groovy, ps1
+Normandie Azucena                   vera
+Florian Apolloner                   ldif
+David Fishburn                      lookupfile
+Niels Aan de Brugh                  rst
+Don Hatlestad                       ahk
+Christophe Benz                     Desktop and xsd
+Eyolf Østrem                        lilypond, bbx and lytex
+Ingo Karkat                         dosbatch
+Nicolas Weber                       markdown, objcpp
+tinoucas                            gentoo-conf-d
+Greg Weber                          D, haml
+Bruce Sherrod                       velocity
+timberke                            cobol, calibre
+Aaron Schaefer                      factor
+Mr X                                asterisk, mplayerconf
+Kuchma Michael                      plsql
+Brett Warneke                       spectre
+Pipp                                lhaskell
+Renald Buter                        scala
+Vladimir Lomov                      asymptote
+Marco                               mrxvtrc, aap
+nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate,
+                                    SVNdiff, gitAnnotate, gitdiff, dtrace
+                                    llvm, applescript
+Chen Xing                           Wikipedia
+Jacobo Diaz                         dakota, patran
+Li Jin                              gentoo-env-d, gentoo-init-d,
+                                    gentoo-make-conf, grub, modconf, sudoers
+SpookeyPeanut                       rib
+Greg Jandl                          pyrex/cython
+Christophe Benz                     services, gitcommit
+A Pontus                            vimperator
+Stromnov                            slice, bzr
+Martin Kustermann                   pamconf
+Indriði Einarsson                   mason
+Chris                               map
+Krzysztof A. Adamski                group
+Pascal Brueckner                    mailcap
+Jerónimo Carballo                   stata
+Phillip Kovalev                     xquery
+Bernhard Grotz                      potwiki
+sgronblo                            man
+François                            txt2tags
+Giacomo Mariani                     SVNinfo
+Matthew Lee Hinman                  newlisp, clojure
+Elias Pipping                       automake
+Edwin Benavides                     actionscript, processing
+Thomas Rowe                         hostsaccess
+Simon Ruderich                      asciidoc, git, gitcommit, gitrebase
+Keitheis                            mako, genshi
+David                               conkyrc
+Miguel Jaque Barbero                SVNannotate
+Stefan Walk                         sieve
+Adam Thorsen                        objj
+Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
+                                    udevconf, udevrules
+Andrey Skvortsov                    mp
+Simon Hengel                        htmlcheetah
+Matt Tolton                         javacc
+Ivan Devat                          javascript.jquery
+tpope                               cucumber,pdf
+Lyude Paul                          piglit shader_test
+==============================================================================
+11. License                                             *NERDCommenterLicense*
+
+The NERD commenter is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/pack/text/start/nerdcommenter/plugin/NERD_commenter.vim b/pack/text/start/nerdcommenter/plugin/NERD_commenter.vim
new file mode 100644
index 0000000..21f0a3b
--- /dev/null
+++ b/pack/text/start/nerdcommenter/plugin/NERD_commenter.vim
@@ -0,0 +1,3212 @@
+" ============================================================================
+" File:        NERD_commenter.vim
+" Description: vim global plugin that provides easy code commenting
+" Author:      Martin Grenfell <martin.grenfell at gmail dot com>
+" Maintainer:  Caleb Maclennan <caleb@alerque.com>
+" Version:     2.5.1
+" Last Change: Tue Nov  7 10:45:53 +03 2017
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+
+" Section: script init stuff {{{1
+if exists('loaded_nerd_comments')
+    finish
+endif
+if v:version < 700
+    echoerr "NERDCommenter: this plugin requires vim >= 7. DOWNLOAD IT! You'll thank me later!"
+    finish
+endif
+let loaded_nerd_comments = 1
+
+" Function: s:InitVariable() function {{{2
+" This function is used to initialise a given variable to a given value. The
+" variable is only initialised if it does not exist prior
+"
+" Args:
+"   -var: the name of the var to be initialised
+"   -value: the value to initialise var to
+"
+" Returns:
+"   1 if the var is set, 0 otherwise
+function s:InitVariable(var, value)
+    if !exists(a:var)
+        execute 'let ' . a:var . ' = ' . "'" . a:value . "'"
+        return 1
+    endif
+    return 0
+endfunction
+
+" Section: space string init{{{2
+" When putting spaces after the left delimiter and before the right we use
+" s:spaceStr for the space char. This way we can make it add anything after
+" the left and before the right by modifying this variable
+let s:spaceStr = ' '
+let s:lenSpaceStr = strlen(s:spaceStr)
+
+" Section: variable initialization {{{2
+call s:InitVariable('g:NERDAllowAnyVisualDelims', 1)
+call s:InitVariable('g:NERDBlockComIgnoreEmpty', 0)
+call s:InitVariable('g:NERDCommentWholeLinesInVMode', 0)
+call s:InitVariable('g:NERDCommentEmptyLines', 0)
+call s:InitVariable('g:NERDCompactSexyComs', 0)
+call s:InitVariable('g:NERDCreateDefaultMappings', 1)
+call s:InitVariable('g:NERDDefaultNesting', 1)
+call s:InitVariable('g:NERDMenuMode', 3)
+call s:InitVariable('g:NERDLPlace', '[>')
+call s:InitVariable('g:NERDUsePlaceHolders', 1)
+call s:InitVariable('g:NERDRemoveAltComs', 1)
+call s:InitVariable('g:NERDRemoveExtraSpaces', 0)
+call s:InitVariable('g:NERDRPlace', '<]')
+call s:InitVariable('g:NERDSpaceDelims', 0)
+call s:InitVariable('g:NERDDefaultAlign', 'none')
+call s:InitVariable('g:NERDTrimTrailingWhitespace', 0)
+call s:InitVariable('g:NERDToggleCheckAllLines', 0)
+call s:InitVariable('g:NERDDisableTabsInBlockComm', 0)
+
+let s:NERDFileNameEscape="[]#*$%'\" ?`!&();<>\\"
+
+let s:delimiterMap = {
+    \ 'aap': { 'left': '#' },
+    \ 'abc': { 'left': '%' },
+    \ 'acedb': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'actionscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ada': { 'left': '--', 'leftAlt': '--  ' },
+    \ 'ahdl': { 'left': '--' },
+    \ 'ahk': { 'left': ';', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'amiga': { 'left': ';' },
+    \ 'aml': { 'left': '/*' },
+    \ 'ampl': { 'left': '#' },
+    \ 'ansible': { 'left': '#' },
+    \ 'apache': { 'left': '#' },
+    \ 'apachestyle': { 'left': '#' },
+    \ 'apdl': { 'left': '!' },
+    \ 'applescript': { 'left': '--', 'leftAlt': '(*', 'rightAlt': '*)' },
+    \ 'armasm': { 'left': ';' },
+    \ 'asciidoc': { 'left': '//' },
+    \ 'asm': { 'left': ';', 'leftAlt': '#' },
+    \ 'asm68k': { 'left': ';' },
+    \ 'asn': { 'left': '--' },
+    \ 'asp': { 'left': '%', 'leftAlt': '%*', 'rightAlt': '*%' },
+    \ 'aspvbs': { 'left': '''', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'asterisk': { 'left': ';' },
+    \ 'asy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'atlas': { 'left': 'C', 'right': '$' },
+    \ 'augeas': { 'left': '(*', 'right': '*)' },
+    \ 'autohotkey': { 'left': ';', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'autoit': { 'left': ';' },
+    \ 'ave': { 'left': "'" },
+    \ 'awk': { 'left': '#' },
+    \ 'basic': { 'left': "'", 'leftAlt': 'REM ' },
+    \ 'bbx': { 'left': '%' },
+    \ 'bc': { 'left': '#' },
+    \ 'bib': { 'left': '//' },
+    \ 'bindzone': { 'left': ';' },
+    \ 'blade': { 'left': '{{--', 'right': '--}}' },
+    \ 'bst': { 'left': '%' },
+    \ 'btm': { 'left': '::' },
+    \ 'c': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'cabal': { 'left': '--' },
+    \ 'calibre': { 'left': '//' },
+    \ 'caos': { 'left': '*' },
+    \ 'catalog': { 'left': '--', 'right': '--' },
+    \ 'cf': { 'left': '<!---', 'right': '--->' },
+    \ 'cfg': { 'left': '#' },
+    \ 'cg': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ch': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'cl': { 'left': '#' },
+    \ 'clean': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'clipper': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'clojure': { 'left': ';' },
+    \ 'cmake': { 'left': '#' },
+    \ 'cocci': { 'left': '//' },
+    \ 'coffee': { 'left': '#', 'leftAlt': '###', 'rightAlt': '###' },
+    \ 'conkyrc': { 'left': '#' },
+    \ 'context': { 'left': '%', 'leftAlt': '--' },
+    \ 'coq': { 'left': '(*', 'right': '*)' },
+    \ 'cpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'crontab': { 'left': '#' },
+    \ 'cs': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'csp': { 'left': '--' },
+    \ 'cterm': { 'left': '*' },
+    \ 'cucumber': { 'left': '#' },
+    \ 'cuda': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'cvs': { 'left': 'CVS:' },
+    \ 'cython': { 'left': '# ', 'leftAlt': '#' },
+    \ 'd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'dakota': { 'left': '#' },
+    \ 'dcl': { 'left': '$!' },
+    \ 'debcontrol': { 'left': '#' },
+    \ 'debsources': { 'left': '#' },
+    \ 'def': { 'left': ';' },
+    \ 'desktop': { 'left': '#' },
+    \ 'dhcpd': { 'left': '#' },
+    \ 'diff': { 'left': '#' },
+    \ 'django': { 'left': '{% comment %}', 'right': '{% endcomment %}', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'dns': { 'left': ';' },
+    \ 'docbk': { 'left': '<!--', 'right': '-->' },
+    \ 'dockerfile': { 'left': '#' },
+    \ 'dosbatch': { 'left': 'REM ', 'leftAlt': '::' },
+    \ 'dosini': { 'left': ';' },
+    \ 'dot': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'dracula': { 'left': ';' },
+    \ 'dsl': { 'left': ';' },
+    \ 'dtml': { 'left': '<dtml-comment>', 'right': '</dtml-comment>' },
+    \ 'dylan': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ebuild': { 'left': '#' },
+    \ 'ecd': { 'left': '#' },
+    \ 'eclass': { 'left': '#' },
+    \ 'eiffel': { 'left': '--' },
+    \ 'elf': { 'left': "'" },
+    \ 'elixir': { 'left': '#' },
+    \ 'elm': { 'left': '--', 'leftAlt': '{--', 'rightAlt': '--}' },
+    \ 'elmfilt': { 'left': '#' },
+    \ 'ember-script': { 'left': '#' },
+    \ 'emblem': { 'left': '/' },
+    \ 'erlang': { 'left': '%', 'leftAlt': '%%' },
+    \ 'eruby': { 'left': '<%#', 'right': '%>', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'esmtprc': { 'left': '#' },
+    \ 'expect': { 'left': '#' },
+    \ 'exports': { 'left': '#' },
+    \ 'factor': { 'left': '! ', 'leftAlt': '!# ' },
+    \ 'fancy': { 'left': '#' },
+    \ 'faust': { 'left': '//' },
+    \ 'fgl': { 'left': '#' },
+    \ 'fluent': { 'left': '#', 'leftAlt': '##' },
+    \ 'focexec': { 'left': '-*' },
+    \ 'form': { 'left': '*' },
+    \ 'fortran': { 'left': '!' },
+    \ 'foxpro': { 'left': '*' },
+    \ 'fsharp': { 'left': '(*', 'right': '*)', 'leftAlt': '//' },
+    \ 'fstab': { 'left': '#' },
+    \ 'fvwm': { 'left': '#' },
+    \ 'fx': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gams': { 'left': '*' },
+    \ 'gdb': { 'left': '#' },
+    \ 'gdmo': { 'left': '--' },
+    \ 'gdscript3': { 'left': '# ', 'leftAlt': '#' },
+    \ 'geek': { 'left': 'GEEK_COMMENT:' },
+    \ 'genshi': { 'left': '<!--', 'right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'gentoo-conf-d': { 'left': '#' },
+    \ 'gentoo-env-d': { 'left': '#' },
+    \ 'gentoo-init-d': { 'left': '#' },
+    \ 'gentoo-make-conf': { 'left': '#' },
+    \ 'gentoo-package-keywords': { 'left': '#' },
+    \ 'gentoo-package-mask': { 'left': '#' },
+    \ 'gentoo-package-use': { 'left': '#' },
+    \ 'gitcommit': { 'left': '#' },
+    \ 'gitconfig': { 'left': ';' },
+    \ 'gitignore': { 'left': '#' },
+    \ 'gitrebase': { 'left': '#' },
+    \ 'glsl': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gnuplot': { 'left': '#' },
+    \ 'go': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'groff': { 'left': '\#' },
+    \ 'groovy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gsp': { 'left': '<%--', 'right': '--%>', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'gtkrc': { 'left': '#' },
+    \ 'h': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'haml': { 'left': '-#', 'leftAlt': '/' },
+    \ 'handlebars': { 'left': '{{!-- ', 'right': ' --}}' },
+    \ 'haskell': { 'left': '--', 'nested': 0, 'leftAlt': '{-', 'rightAlt': '-}', 'nestedAlt': 1 },
+    \ 'haxe': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'hb': { 'left': '#' },
+    \ 'hbs': { 'left': '{{!-- ', 'right': ' --}}' },
+    \ 'hercules': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'hive': { 'left': '-- ' },
+    \ 'hog': { 'left': '#' },
+    \ 'hostsaccess': { 'left': '#' },
+    \ 'htmlcheetah': { 'left': '##' },
+    \ 'htmldjango': { 'left': '{% comment %}', 'right': '{% endcomment %}', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'htmlos': { 'left': '#', 'right': '/#' },
+    \ 'hxml': { 'left': '#' },
+    \ 'hyphy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ia64': { 'left': '#' },
+    \ 'icon': { 'left': '#' },
+    \ 'idl': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'idlang': { 'left': ';' },
+    \ 'idris': { 'leftAlt': '--', 'left': '{-', 'right': '-}' },
+    \ 'incar': { 'left': '!' },
+    \ 'inform': { 'left': '!' },
+    \ 'inittab': { 'left': '#' },
+    \ 'ishd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'iss': { 'left': ';' },
+    \ 'ist': { 'left': '%' },
+    \ 'jade': { 'left': '//-', 'leftAlt': '//' },
+    \ 'java': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javacc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javascript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javascriptreact': { 'left': '//', 'leftAlt': '{/*', 'rightAlt': '*/}' },
+    \ 'javascript.jquery': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'jess': { 'left': ';' },
+    \ 'jgraph': { 'left': '(*', 'right': '*)' },
+    \ 'jinja': { 'left': '{#', 'right': '#}', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'jproperties': { 'left': '#' },
+    \ 'jsp': { 'left': '<%--', 'right': '--%>' },
+    \ 'julia': { 'left': '# ', 'leftAlt': '#=', 'rightAlt': '=#' },
+    \ 'kivy': { 'left': '#' },
+    \ 'kix': { 'left': ';' },
+    \ 'kscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'lace': { 'left': '--' },
+    \ 'laravel': { 'left': '{{--', 'right': '--}}' },
+    \ 'ldif': { 'left': '#' },
+    \ 'ledger': { 'left': '#', 'leftAlt': ';' },
+    \ 'less': { 'left': '/*', 'right': '*/' },
+    \ 'lhaskell': { 'left': '>{-', 'right': '-}', 'leftAlt': '>-- ' },
+    \ 'lilo': { 'left': '#' },
+    \ 'lilypond': { 'left': '%' },
+    \ 'liquid': { 'left': '{% comment %}', 'right': '{% endcomment %}' },
+    \ 'lisp': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'llvm': { 'left': ';' },
+    \ 'lotos': { 'left': '(*', 'right': '*)' },
+    \ 'lout': { 'left': '#' },
+    \ 'lpc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'lprolog': { 'left': '%' },
+    \ 'lscript': { 'left': "'" },
+    \ 'lss': { 'left': '#' },
+    \ 'lua': { 'left': '--', 'leftAlt': '--[[', 'rightAlt': ']]' },
+    \ 'lynx': { 'left': '#' },
+    \ 'lytex': { 'left': '%' },
+    \ 'm4': { 'left': 'dnl ' },
+    \ 'mail': { 'left': '> ' },
+    \ 'mako': { 'left': '##' },
+    \ 'man': { 'left': '."' },
+    \ 'mandoc': { 'left': '.\\"' },
+    \ 'map': { 'left': '%' },
+    \ 'maple': { 'left': '#' },
+    \ 'markdown': { 'left': '<!--', 'right': '-->' },
+    \ 'masm': { 'left': ';' },
+    \ 'mason': { 'left': '<% #', 'right': '%>' },
+    \ 'master': { 'left': '$' },
+    \ 'matlab': { 'left': '%', 'leftAlt': '%{', 'rightAlt': '%}' },
+    \ 'mel': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'meson': { 'left': '#' },
+    \ 'mib': { 'left': '--' },
+    \ 'minizinc': { 'left': '% ', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'mips': { 'left': '#' },
+    \ 'mirah': {'left': '#' },
+    \ 'mkd': { 'left': '<!---', 'right': '-->' },
+    \ 'mma': { 'left': '(*', 'right': '*)' },
+    \ 'model': { 'left': '$', 'right': '$' },
+    \ 'modula2': { 'left': '(*', 'right': '*)' },
+    \ 'modula3': { 'left': '(*', 'right': '*)' },
+    \ 'molpro': { 'left': '!' },
+    \ 'monk': { 'left': ';' },
+    \ 'mush': { 'left': '#' },
+    \ 'mustache': { 'left': '{{!', 'right': '}}' },
+    \ 'nagios': { 'left': ';' },
+    \ 'named': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'nasm': { 'left': ';' },
+    \ 'nastran': { 'left': '$' },
+    \ 'natural': { 'left': '/*' },
+    \ 'ncf': { 'left': ';' },
+    \ 'newlisp': { 'left': ';' },
+    \ 'nginx': { 'left': '#' },
+    \ 'nimrod': { 'left': '#' },
+    \ 'nroff': { 'left': '\"' },
+    \ 'nsis': { 'left': '#' },
+    \ 'ntp': { 'left': '#' },
+    \ 'objc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'objcpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'objj': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ocaml': { 'left': '(*', 'right': '*)', 'nested': 1 },
+    \ 'occam': { 'left': '--' },
+    \ 'octave': { 'left': '%', 'leftAlt': '#' },
+    \ 'omlet': { 'left': '(*', 'right': '*)' },
+    \ 'omnimark': { 'left': ';' },
+    \ 'ooc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'openroad': { 'left': '//' },
+    \ 'opl': { 'left': 'REM' },
+    \ 'ora': { 'left': '#' },
+    \ 'ox': { 'left': '//' },
+    \ 'paludis-use-conf': { 'left': '#' },
+    \ 'pandoc': { 'left': '<!--', 'right': '-->' },
+    \ 'pascal': { 'left': '{', 'right': '}', 'leftAlt': '(*', 'rightAlt': '*)' },
+    \ 'patran': { 'left': '$', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pcap': { 'left': '#' },
+    \ 'pccts': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pdf': { 'left': '%' },
+    \ 'perl': { 'left': '#' },
+    \ 'pfmain': { 'left': '//' },
+    \ 'php': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pic': { 'left': ';' },
+    \ 'pike': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pilrc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pine': { 'left': '#' },
+    \ 'plm': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'plsql': { 'left': '-- ', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'po': { 'left': '#' },
+    \ 'poscar': { 'left': '!' },
+    \ 'postscr': { 'left': '%' },
+    \ 'pov': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'povini': { 'left': ';' },
+    \ 'ppd': { 'left': '%' },
+    \ 'ppwiz': { 'left': ';;' },
+    \ 'praat': { 'left': '#' },
+    \ 'privoxy': { 'left': '#' },
+    \ 'processing': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'prolog': { 'left': '%', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'proto': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ps1': { 'left': '#' },
+    \ 'psf': { 'left': '#' },
+    \ 'ptcap': { 'left': '#' },
+    \ 'pug': { 'left': '//-', 'leftAlt': '//' },
+    \ 'puppet': { 'left': '#' },
+    \ 'pyrex': { 'left': '# ', 'leftAlt': '#' },
+    \ 'python': { 'left': '# ', 'leftAlt': '#' },
+    \ 'r': { 'left': '#', 'leftAlt': '#''' },
+    \ 'racket': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'radiance': { 'left': '#' },
+    \ 'ratpoison': { 'left': '#' },
+    \ 'rc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'rebol': { 'left': ';' },
+    \ 'registry': { 'left': ';' },
+    \ 'remind': { 'left': '#' },
+    \ 'renpy': { 'left': '# ' },
+    \ 'resolv': { 'left': '#' },
+    \ 'rgb': { 'left': '!' },
+    \ 'rib': { 'left': '#' },
+    \ 'rmd': { 'left': '<!--', 'right': '-->', 'leftalt': '#' },
+    \ 'robot': { 'left': '#' },
+    \ 'robots': { 'left': '#' },
+    \ 'rspec': { 'left': '#' },
+    \ 'ruby': { 'left': '#' },
+    \ 'rust': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sa': { 'left': '--' },
+    \ 'samba': { 'left': ';', 'leftAlt': '#' },
+    \ 'sass': { 'left': '//', 'leftAlt': '/*' },
+    \ 'sather': { 'left': '--' },
+    \ 'scala': { 'left': '//', 'nested': 1, 'leftAlt': '/*', 'rightAlt': '*/', 'nestedAlt': 1 },
+    \ 'scheme': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'scilab': { 'left': '//' },
+    \ 'scilla': { 'left': '(*', 'right': '*)', 'nested': 1 },
+    \ 'scons': { 'left': '#' },
+    \ 'scsh': { 'left': ';' },
+    \ 'scss': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sdc': { 'left': '#' },
+    \ 'sed': { 'left': '#' },
+    \ 'sentinel': { 'left': '#', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sgmldecl': { 'left': '--', 'right': '--' },
+    \ 'sgmllnx': { 'left': '<!--', 'right': '-->' },
+    \ 'sh': { 'left': '#' },
+    \ 'shader_test': { 'left': '#' },
+    \ 'sicad': { 'left': '*' },
+    \ 'sile': { 'left': '%' },
+    \ 'simula': { 'left': '%', 'leftAlt': '--' },
+    \ 'sinda': { 'left': '$' },
+    \ 'skill': { 'left': ';' },
+    \ 'slang': { 'left': '%' },
+    \ 'slice': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'slim': { 'left': '/', 'leftAlt': '/!' },
+    \ 'slrnrc': { 'left': '%' },
+    \ 'sls': { 'left': '#' },
+    \ 'sm': { 'left': '#' },
+    \ 'smarty': { 'left': '{*', 'right': '*}' },
+    \ 'smil': { 'left': '<!', 'right': '>' },
+    \ 'smith': { 'left': ';' },
+    \ 'sml': { 'left': '(*', 'right': '*)', 'nested': 1 },
+    \ 'snakemake': { 'left': '#' },
+    \ 'snippets': { 'left': '#' },
+    \ 'snnsnet': { 'left': '#' },
+    \ 'snnspat': { 'left': '#' },
+    \ 'snnsres': { 'left': '#' },
+    \ 'snobol4': { 'left': '*' },
+    \ 'spec': { 'left': '#' },
+    \ 'specman': { 'left': '//' },
+    \ 'spectre': { 'left': '//', 'leftAlt': '*' },
+    \ 'spice': { 'left': '$' },
+    \ 'spin': { 'left': '''', 'leftAlt': '{', 'rightAlt': '}' },
+    \ 'sql': { 'left': '-- ', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sqlforms': { 'left': '-- ' },
+    \ 'sqlj': { 'left': '-- ' },
+    \ 'sqr': { 'left': '!' },
+    \ 'squid': { 'left': '#' },
+    \ 'ss': { 'left': ';', 'leftAlt': '#|', 'rightAlt': '|#' },
+    \ 'sshconfig': { 'left': '#' },
+    \ 'sshdconfig': { 'left': '#' },
+    \ 'st': { 'left': '"' },
+    \ 'stan': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'stp': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'supercollider': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'swift': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tads': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tags': { 'left': ';' },
+    \ 'tak': { 'left': '$' },
+    \ 'tasm': { 'left': ';' },
+    \ 'tcl': { 'left': '#' },
+    \ 'teak': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'terraform': { 'left': '#', 'leftAlt': '/*', 'rightAlt': '*/'  },
+    \ 'tex': { 'left': '%' },
+    \ 'texinfo': { 'left': '@c ' },
+    \ 'texmf': { 'left': '%' },
+    \ 'tf': { 'left': '#' },
+    \ 'tidy': { 'left': '#' },
+    \ 'tli': { 'left': '#' },
+    \ 'tmux': { 'left': '#' },
+    \ 'toml': { 'left': '#' },
+    \ 'trasys': { 'left': '$' },
+    \ 'troff': { 'left': '.\\"' },
+    \ 'tsalt': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tsscl': { 'left': '#' },
+    \ 'tssgm': { 'left': "comment = '", 'right': "'" },
+    \ 'ttl': { 'left': '#' },
+    \ 'tup': { 'left': '#' },
+    \ 'twig': { 'left': '{#', 'right': '#}' },
+    \ 'txt2tags': { 'left': '%' },
+    \ 'typescript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'typescriptreact': { 'left': '//', 'leftAlt': '{/*', 'rightAlt': '*/}' },
+    \ 'uc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'uil': { 'left': '!' },
+    \ 'upstart': { 'left': '#' },
+    \ 'vala': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'vasp': { 'left': '!' },
+    \ 'vb': { 'left': "'" },
+    \ 'velocity': { 'left': '##', 'right': '', 'leftAlt': '#*', 'rightAlt': '*#' },
+    \ 'vera': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'verilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'verilog_systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'vgrindefs': { 'left': '#' },
+    \ 'vhdl': { 'left': '--' },
+    \ 'vimperator': { 'left': '"' },
+    \ 'virata': { 'left': '%' },
+    \ 'vrml': { 'left': '#' },
+    \ 'vsejcl': { 'left': '/*' },
+    \ 'webmacro': { 'left': '##' },
+    \ 'wget': { 'left': '#' },
+    \ 'wikipedia': { 'left': '<!--', 'right': '-->' },
+    \ 'winbatch': { 'left': ';' },
+    \ 'wml': { 'left': '#' },
+    \ 'wvdial': { 'left': ';' },
+    \ 'xdefaults': { 'left': '!' },
+    \ 'xkb': { 'left': '//' },
+    \ 'xmath': { 'left': '#' },
+    \ 'xpm2': { 'left': '!' },
+    \ 'xquery': { 'left': '(:', 'right': ':)' },
+    \ 'yaml': { 'left': '#' },
+    \ 'z8a': { 'left': ';' }
+    \ }
+
+let g:NERDDelimiterMap = s:delimiterMap
+
+if exists('g:NERDCustomDelimiters')
+    call extend(s:delimiterMap, g:NERDCustomDelimiters)
+endif
+
+" Section: Comment mapping functions, autocommands and commands {{{1
+" ============================================================================
+" Section: Comment enabler autocommands {{{2
+" ============================================================================
+
+augroup NERDCommenter
+
+    "if the user enters a buffer or reads a buffer then we gotta set up
+    "the comment delimiters for that new filetype
+    autocmd BufEnter,BufRead * :call s:SetUpForNewFiletype(&filetype, 0)
+
+    "if the filetype of a buffer changes, force the script to reset the
+    "delimiters for the buffer
+    autocmd Filetype * :call s:SetUpForNewFiletype(&filetype, 1)
+augroup END
+
+
+" Function: s:SetUpForNewFiletype(filetype) function {{{2
+" This function is responsible for setting up buffer scoped variables for the
+" given filetype.
+"
+" Args:
+"   -filetype: the filetype to set delimiters for
+"   -forceReset: 1 if the delimiters should be reset if they have already be
+"    set for this buffer.
+"
+function s:SetUpForNewFiletype(filetype, forceReset)
+    let filetype = a:filetype
+
+    "for compound filetypes, if we don't know how to handle the full filetype
+    "then break it down and use the first part that we know how to handle
+    if filetype =~# '\.' && !has_key(s:delimiterMap, filetype)
+        let filetypes = split(a:filetype, '\.')
+        for i in filetypes
+            if has_key(s:delimiterMap, i)
+                let filetype = i
+                break
+            endif
+        endfor
+    endif
+
+    let b:NERDSexyComMarker = ''
+
+    if has_key(s:delimiterMap, filetype)
+        let b:NERDCommenterDelims = s:delimiterMap[filetype]
+        for i in ['left', 'leftAlt', 'right', 'rightAlt']
+            if !has_key(b:NERDCommenterDelims, i)
+                let b:NERDCommenterDelims[i] = ''
+            endif
+        endfor
+        for i in ['nested', 'nestedAlt']
+            if !has_key(b:NERDCommenterDelims, i)
+                let b:NERDCommenterDelims[i] = 0
+            endif
+        endfor
+        " if g:NERD_<filetype>_alt_style is defined, use the alternate style
+        let b:NERDCommenterFirstInit = getbufvar(1,'NERDCommenterFirstInit')
+        if exists('g:NERDAltDelims_'.filetype) && eval('g:NERDAltDelims_'.filetype) && !b:NERDCommenterFirstInit
+            call s:SwitchToAlternativeDelimiters(0)
+            let b:NERDCommenterFirstInit = 1
+        endif
+    else
+        let b:NERDCommenterDelims = s:CreateDelimMapFromCms()
+    endif
+
+endfunction
+
+function s:CreateDelimMapFromCms()
+    if &filetype ==# '' && exists('g:NERDDefaultDelims')
+        let delims = g:NERDDefaultDelims
+        for i in ['left', 'leftAlt', 'right', 'rightAlt']
+            if !has_key(delims, i)
+                let delims[i] = ''
+            endif
+        endfor
+        return delims
+    endif
+    return {
+        \ 'left': substitute(&commentstring, '\([^ \t]*\)\s*%s.*', '\1', ''),
+        \ 'right': substitute(&commentstring, '.*%s\s*\(.*\)', '\1', 'g'),
+        \ 'nested': 0,
+        \ 'leftAlt': '',
+        \ 'rightAlt': '',
+        \ 'nestedAlt': 0}
+endfunction
+
+" Function: s:SwitchToAlternativeDelimiters(printMsgs) function {{{2
+" This function is used to swap the delimiters that are being used to the
+" alternative delimiters for that filetype. For example, if a c++ file is
+" being edited and // comments are being used, after this function is called
+" /**/ comments will be used.
+"
+" Args:
+"   -printMsgs: if this is 1 then a message is echoed to the user telling them
+"    if this function changed the delimiters or not
+function s:SwitchToAlternativeDelimiters(printMsgs)
+    if exists('*NERDCommenter_before')
+        exe 'call NERDCommenter_before()'
+    endif
+    "if both of the alternative delimiters are empty then there is no
+    "alternative comment style so bail out
+    if b:NERDCommenterDelims['leftAlt'] ==# '' && b:NERDCommenterDelims['rightAlt'] ==# ''
+        if a:printMsgs
+            call s:NerdEcho('Cannot use alternative delimiters, none are specified', 0)
+        endif
+        return 0
+    endif
+
+    "save the current delimiters
+    let tempLeft = s:Left()
+    let tempRight = s:Right()
+    let tempNested = s:Nested()
+
+    "swap current delimiters for alternative
+    let b:NERDCommenterDelims['left'] = b:NERDCommenterDelims['leftAlt']
+    let b:NERDCommenterDelims['right'] = b:NERDCommenterDelims['rightAlt']
+    "set information on whether these are nested
+    let b:NERDCommenterDelims['nested'] = b:NERDCommenterDelims['nestedAlt']
+
+    "set the previously current delimiters to be the new alternative ones
+    let b:NERDCommenterDelims['leftAlt'] = tempLeft
+    let b:NERDCommenterDelims['rightAlt'] = tempRight
+    let b:NERDCommenterDelims['nestedAlt'] = tempNested
+
+    "tell the user what comment delimiters they are now using
+    if a:printMsgs
+        call s:NerdEcho('Now using ' . s:Left() . ' ' . s:Right() . ' to delimit comments', 1)
+    endif
+
+    if exists('*NERDCommenter_after')
+        exe 'call NERDCommenter_after()'
+    endif
+
+    return 1
+endfunction
+
+" Section: Comment delimiter add/removal functions {{{1
+" ============================================================================
+" Function: s:AppendCommentToLine(){{{2
+" This function appends comment delimiters at the EOL and places the cursor in
+" position to start typing the comment
+function s:AppendCommentToLine()
+    let left = s:Left({'space': 1})
+    let right = s:Right({'space': 1})
+
+    " get the length of the right delimiter
+    let lenRight = strlen(right)
+
+    let isLineEmpty = strlen(getline('.')) ==# 0
+    let insOrApp = (isLineEmpty==#1 ? 'i' : 'A')
+
+    "stick the delimiters down at the end of the line. We have to format the
+    "comment with spaces as appropriate
+    execute ':normal! ' . insOrApp . (isLineEmpty ? '' : ' ') . left . right
+
+    " if there is a right delimiter then we gotta move the cursor left
+    " by the length of the right delimiter so we insert between the delimiters
+    if lenRight > 0
+        let leftMoveAmount = lenRight - 1
+        execute ':normal! ' . leftMoveAmount . 'h'
+        startinsert
+    else
+        startinsert!
+    endif
+endfunction
+
+" Function: s:CommentBlock(top, bottom, lSide, rSide, forceNested ) {{{2
+" This function is used to comment out a region of code. This region is
+" specified as a bounding box by arguments to the function.
+"
+" Args:
+"   -top: the line number for the top line of code in the region
+"   -bottom: the line number for the bottom line of code in the region
+"   -lSide: the column number for the left most column in the region
+"   -rSide: the column number for the right most column in the region
+"   -forceNested: a flag indicating whether comments should be nested
+function s:CommentBlock(top, bottom, lSide, rSide, forceNested )
+    " we need to create local copies of these arguments so we can modify them
+    let top = a:top
+    let bottom = a:bottom
+    let lSide = a:lSide
+    let rSide = a:rSide
+
+    "if the top or bottom line starts with tabs we have to adjust the left and
+    "right boundaries so that they are set as though the tabs were spaces
+    let topline = getline(top)
+    let bottomline = getline(bottom)
+    if s:HasLeadingTabs(topline, bottomline)
+
+        "find out how many tabs are in the top line and adjust the left
+        "boundary accordingly
+        let numTabs = s:NumberOfLeadingTabs(topline)
+        if lSide < numTabs
+            let lSide = &tabstop * lSide
+        else
+            let lSide = (lSide - numTabs) + (&tabstop * numTabs)
+        endif
+
+        "find out how many tabs are in the bottom line and adjust the right
+        "boundary accordingly
+        let numTabs = s:NumberOfLeadingTabs(bottomline)
+        let rSide = (rSide - numTabs) + (&tabstop * numTabs)
+    endif
+
+    "we must check that bottom IS actually below top, if it is not then we
+    "swap top and bottom. Similarly for left and right.
+    if bottom < top
+        let temp = top
+        let top = bottom
+        let bottom = top
+    endif
+    if rSide < lSide
+        let temp = lSide
+        let lSide = rSide
+        let rSide = temp
+    endif
+
+    "if the current delimiters aren't multipart then we will switch to the
+    "alternative delimiters (if THEY are) as the comment will be better and more
+    "accurate with multipart delimiters
+    let switchedDelims = 0
+    if !s:Multipart() && g:NERDAllowAnyVisualDelims && s:AltMultipart()
+        let switchedDelims = 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+    "start the commenting from the top and keep commenting till we reach the
+    "bottom
+    let currentLine=top
+    while currentLine <= bottom
+
+        "check if we are allowed to comment this line
+        if s:CanCommentLine(a:forceNested, currentLine)
+
+            "convert the leading tabs into spaces
+            let theLine = getline(currentLine)
+            let lineHasLeadTabs = s:HasLeadingTabs(theLine)
+            if lineHasLeadTabs
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+            endif
+
+            "don't comment lines that begin after the right boundary of the
+            "block unless the user has specified to do so
+            if theLine !~# '^ \{' . rSide . '\}' || !g:NERDBlockComIgnoreEmpty
+
+                "attempt to place the cursor in on the left of the boundary box,
+                "then check if we were successful, if not then we cant comment this
+                "line
+                call setline(currentLine, theLine)
+                if s:CanPlaceCursor(currentLine, lSide)
+
+                    let leftSpaced = s:Left({'space': 1})
+                    let rightSpaced = s:Right({'space': 1})
+
+                    "stick the left delimiter down
+                    let theLine = strpart(theLine, 0, lSide-1) . leftSpaced . strpart(theLine, lSide-1)
+
+                    if s:Multipart()
+                        "stick the right delimiter down
+                        let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced))
+
+                        let firstLeftDelim = s:FindDelimiterIndex(s:Left(), theLine)
+                        let lastRightDelim = s:LastIndexOfDelim(s:Right(), theLine)
+
+                        if firstLeftDelim !=# -1 && lastRightDelim !=# -1
+                            let searchStr = strpart(theLine, 0, lastRightDelim)
+                            let searchStr = strpart(searchStr, firstLeftDelim+strlen(s:Left()))
+
+                            "replace the outer most delimiters in searchStr with
+                            "place-holders
+                            let theLineWithPlaceHolders = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, searchStr)
+
+                            "add the right delimiter onto the line
+                            let theLine = strpart(theLine, 0, firstLeftDelim+strlen(s:Left())) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim)
+                        endif
+                    endif
+                endif
+            endif
+
+            "restore tabs if needed
+            if lineHasLeadTabs
+                let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+            endif
+
+            if g:NERDTrimTrailingWhitespace ==# 1
+              let theLine = s:TrimTrailingWhitespace(theLine)
+            endif
+
+            call setline(currentLine, theLine)
+        endif
+
+        let currentLine = currentLine + 1
+    endwhile
+
+    "if we switched delimiterss then we gotta go back to what they were before
+    if switchedDelims ==# 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+endfunction
+
+" Function: s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine) {{{2
+" This function comments a range of lines.
+"
+" Args:
+"   -forceNested: a flag indicating whether the called is requesting the comment
+"    to be nested if need be
+"   -align: should be "left", "start", "both" or "none"
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLines(forceNested, align, firstLine, lastLine)
+    " we need to get the left and right indexes of the leftmost char in the
+    " block of of lines and the right most char so that we can do alignment of
+    " the delimiters if the user has specified
+    let leftAlignIndx = a:align ==# 'start' ? 0 : s:LeftMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = s:RightMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+
+    " gotta add the length of the left delimiter onto the rightAlignIndx cos
+    " we'll be adding a left delimiter to the line
+    let rightAlignIndx = rightAlignIndx + strlen(s:Left({'space': 1}))
+
+    " now we actually comment the lines. Do it line by line
+    let currentLine = a:firstLine
+    while currentLine <= a:lastLine
+
+        " get the next line, check commentability and convert spaces to tabs
+        let theLine = getline(currentLine)
+        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        if s:CanCommentLine(a:forceNested, currentLine)
+            "if the user has specified forceNesting then we check to see if we
+            "need to switch delimiters for place-holders
+            if a:forceNested && g:NERDUsePlaceHolders && !s:Nested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+
+            " find out if the line is commented using normal delimiters and/or
+            " alternate ones
+            let isCommented = s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
+
+            " check if we can comment this line
+            if !isCommented || g:NERDUsePlaceHolders || s:Multipart()
+                if a:align ==# 'left' || a:align ==# 'start' || a:align ==# 'both'
+                    let theLine = s:AddLeftDelimAligned(s:Left({'space': 1}), theLine, leftAlignIndx)
+                else
+                    let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
+                endif
+                if a:align ==# 'both'
+                    let theLine = s:AddRightDelimAligned(s:Right({'space': 1}), theLine, rightAlignIndx)
+                else
+                    let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
+                endif
+            endif
+        endif
+
+        " restore leading tabs if appropriate
+        if lineHasLeadingTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace ==# 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " we are done with this line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentLinesMinimal(firstLine, lastLine) {{{2
+" This function comments a range of lines in a minimal style. I
+"
+" Args:
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLinesMinimal(firstLine, lastLine)
+    "check that minimal comments can be done on this filetype
+    if !s:HasMultipartDelims()
+        throw 'NERDCommenter.Delimiters exception: Minimal comments can only be used for filetypes that have multipart delimiters'
+    endif
+
+    let sexyNested = s:SexyNested()
+
+    "if we need to use place holders for the comment, make sure they are
+    "enabled for this filetype, or the delimiterss allow nesting
+    if !g:NERDUsePlaceHolders && !sexyNested && s:DoesBlockHaveMultipartDelim(a:firstLine, a:lastLine)
+        throw 'NERDCommenter.Settings exception: Place holders are required but disabled.'
+    endif
+
+    "get the left and right delimiters to smack on
+    let left = s:GetSexyComLeft(g:NERDSpaceDelims,0)
+    let right = s:GetSexyComRight(g:NERDSpaceDelims,0)
+
+    "make sure all multipart delimiters on the lines are replaced with
+    "placeholders to prevent illegal syntax
+    if !sexyNested
+        let currentLine = a:firstLine
+        while(currentLine <= a:lastLine)
+            let theLine = getline(currentLine)
+            let theLine = s:ReplaceDelims(left, right, g:NERDLPlace, g:NERDRPlace, theLine)
+            call setline(currentLine, theLine)
+            let currentLine = currentLine + 1
+        endwhile
+    endif
+
+    "add the delimiter to the top line
+    let theLine = getline(a:firstLine)
+    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+    let theLine = s:AddLeftDelim(left, theLine)
+    if lineHasLeadingTabs
+        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+    endif
+    call setline(a:firstLine, theLine)
+
+    "add the delimiter to the bottom line
+    let theLine = getline(a:lastLine)
+    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+    let theLine = s:AddRightDelim(right, theLine)
+    if lineHasLeadingTabs
+        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+    endif
+
+    if g:NERDTrimTrailingWhitespace ==# 1
+        let theLine = s:TrimTrailingWhitespace(theLine)
+    endif
+
+    call setline(a:lastLine, theLine)
+endfunction
+
+" Function: s:CommentLinesSexy(topline, bottomline) function {{{2
+" This function is used to comment lines in the 'Sexy' style. E.g., in c:
+" /*
+"  * This is a sexy comment
+"  */
+" Args:
+"   -topline: the line number of the top line in the sexy comment
+"   -bottomline: the line number of the bottom line in the sexy comment
+function s:CommentLinesSexy(topline, bottomline)
+    let left = s:GetSexyComLeft(0, 0)
+    let right = s:GetSexyComRight(0, 0)
+
+    "check if we can do a sexy comment with the available delimiters
+    if left ==# -1 || right ==# -1
+        throw 'NERDCommenter.Delimiters exception: cannot perform sexy comments with available delimiters.'
+    endif
+
+    "make sure the lines aren't already commented sexually or we can nest
+    if !s:CanSexyCommentLines(a:topline, a:bottomline)
+        throw 'NERDCommenter.Nesting exception: cannot nest sexy comments'
+    endif
+
+
+    let sexyComMarker = s:GetSexyComMarker(0,0)
+    let sexyComMarkerSpaced = s:GetSexyComMarker(1,0)
+
+
+    " we jam the comment as far to the right as possible
+    let leftAlignIndx = s:LeftMostIndx(1, 1, a:topline, a:bottomline)
+
+    "check if we should use the compact style i.e that the left/right
+    "delimiters should appear on the first and last lines of the code and not
+    "on separate lines above/below the first/last lines of code
+    if g:NERDCompactSexyComs
+        let spaceString = (g:NERDSpaceDelims ? s:spaceStr : '')
+
+        "comment the top line
+        let theLine = getline(a:topline)
+        let lineHasTabs = s:HasLeadingTabs(theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        endif
+        if !s:SexyNested()
+            let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+        endif
+        let theLine = s:AddLeftDelimAligned(left . spaceString, theLine, leftAlignIndx)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:topline, theLine)
+
+        "comment the bottom line
+        if a:bottomline !=# a:topline
+            let theLine = getline(a:bottomline)
+            let lineHasTabs = s:HasLeadingTabs(theLine)
+            if lineHasTabs
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+            endif
+            if !s:SexyNested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+        endif
+        let theLine = s:AddRightDelim(spaceString . right, theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:bottomline, theLine)
+    else
+
+        " add the left delimiter one line above the lines that are to be commented
+        call cursor(a:topline, 1)
+        execute 'normal! O'
+        let theLine = repeat(' ', leftAlignIndx) . left
+
+        " Make sure tabs are respected
+        if !&expandtab
+           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:topline, theLine)
+
+        " add the right delimiter after bottom line (we have to add 1 cos we moved
+        " the lines down when we added the left delimiter
+        call cursor(a:bottomline+1, 1)
+        execute 'normal! o'
+        if g:NERDDisableTabsInBlockComm
+          let theLine = repeat(' ', leftAlignIndx) . right
+        else
+          let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . right
+        endif
+
+        " Make sure tabs are respected
+        if !&expandtab
+           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:bottomline+2, theLine)
+
+    endif
+
+    " go thru each line adding the sexyComMarker marker to the start of each
+    " line in the appropriate place to align them with the comment delimiters
+    let currentLine = a:topline+1
+    while currentLine <= a:bottomline + !g:NERDCompactSexyComs
+        " get the line and convert the tabs to spaces
+        let theLine = getline(currentLine)
+        let lineHasTabs = s:HasLeadingTabs(theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        endif
+
+        if !s:SexyNested()
+            let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+        endif
+
+        " add the sexyComMarker
+        if g:NERDDisableTabsInBlockComm
+          let theLine = repeat(' ', leftAlignIndx) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx)
+        else
+          let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx)
+        endif
+
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace ==# 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " set the line and move onto the next one
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentLinesToggle(forceNested, firstLine, lastLine) {{{2
+" Applies "toggle" commenting to the given range of lines
+"
+" Args:
+"   -forceNested: a flag indicating whether the called is requesting the comment
+"    to be nested if need be
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLinesToggle(forceNested, firstLine, lastLine)
+    let currentLine = a:firstLine
+
+    let align = g:NERDDefaultAlign
+    let leftAlignIndx = align ==# 'start' ? 0 : s:LeftMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = s:RightMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = rightAlignIndx + strlen(s:Left({'space': 1}))
+
+    while currentLine <= a:lastLine
+
+        " get the next line, check commentability and convert spaces to tabs
+        let theLine = getline(currentLine)
+        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        if s:CanToggleCommentLine(a:forceNested, currentLine)
+
+            "if the user has specified forceNesting then we check to see if we
+            "need to switch delimiters for place-holders
+            if g:NERDUsePlaceHolders && !s:Nested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+
+            if align ==# 'left' || align ==# 'start' || align ==# 'both'
+                let theLine = s:AddLeftDelimAligned(s:Left({'space': 1}), theLine, leftAlignIndx)
+            else
+                let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
+            endif
+            if align ==# 'both'
+                let theLine = s:AddRightDelimAligned(s:Right({'space': 1}), theLine, rightAlignIndx)
+            else
+                let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
+            endif
+        endif
+
+        " restore leading tabs if appropriate
+        if lineHasLeadingTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace ==# 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " we are done with this line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentRegion(topline, topCol, bottomLine, bottomCol) function {{{2
+" This function comments chunks of text selected in visual mode.
+" It will comment exactly the text that they have selected.
+" Args:
+"   -topLine: the line number of the top line in the sexy comment
+"   -topCol: top left column for this comment
+"   -bottomline: the line number of the bottom line in the sexy comment
+"   -bottomCol: the bottom right column for this comment
+"   -forceNested: whether the caller wants comments to be nested if the
+"    line(s) are already commented
+function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested)
+
+    "switch delimiters (if we can) if the current set isn't multipart
+    let switchedDelims = 0
+    if !s:Multipart() && s:AltMultipart() && !g:NERDAllowAnyVisualDelims
+        let switchedDelims = 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+    "if there is only one line in the comment then just do it
+    if a:topLine ==# a:bottomLine
+        call s:CommentBlock(a:topLine, a:bottomLine, a:topCol, a:bottomCol, a:forceNested)
+
+    "there are multiple lines in the comment
+    else
+        "comment the top line
+        call s:CommentBlock(a:topLine, a:topLine, a:topCol, strlen(getline(a:topLine)), a:forceNested)
+
+        "comment out all the lines in the middle of the comment
+        let topOfRange = a:topLine+1
+        let bottomOfRange = a:bottomLine-1
+        if topOfRange <= bottomOfRange
+            call s:CommentLines(a:forceNested, g:NERDDefaultAlign, topOfRange, bottomOfRange)
+        endif
+
+        "comment the bottom line
+        let bottom = getline(a:bottomLine)
+        let numLeadingSpacesTabs = strlen(substitute(bottom, '^\([ \t]*\).*$', '\1', ''))
+        call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested)
+
+    endif
+
+    "stick the cursor back on the char it was on before the comment
+    call cursor(a:topLine, a:topCol + strlen(s:Left()) + g:NERDSpaceDelims)
+
+    "if we switched delimiters then we gotta go back to what they were before
+    if switchedDelims ==# 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+endfunction
+
+" Function: s:InvertComment(firstLine, lastLine) function {{{2
+" Inverts the comments on the lines between and including the given line
+" numbers i.e all commented lines are uncommented and vice versa
+" Args:
+"   -firstLine: the top of the range of lines to be inverted
+"   -lastLine: the bottom of the range of lines to be inverted
+function s:InvertComment(firstLine, lastLine)
+
+    " go thru all lines in the given range
+    let currentLine = a:firstLine
+    while currentLine <= a:lastLine
+        let theLine = getline(currentLine)
+
+        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
+
+        " if the line is commented normally, uncomment it
+        if s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+            call s:UncommentLines(currentLine, currentLine)
+            let currentLine = currentLine + 1
+
+        " check if the line is commented sexually
+        elseif !empty(sexyComBounds)
+            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
+            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
+
+            "move to the line after last line of the sexy comment
+            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
+            let currentLine = sexyComBounds[1] - (numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved) + 1
+
+        " the line isn't commented
+        else
+            call s:CommentLinesToggle(1, currentLine, currentLine)
+            let currentLine = currentLine + 1
+        endif
+
+    endwhile
+endfunction
+
+" Function: NERDCommentIsLineCommented(lineNo)
+" Check if the line is a comment
+" Note this function checks if the line is **completely** a comment
+" Args:
+"   -lineNo:    the line number of the line to check
+" Return: Number, 1 if the line is a comment, 0 else
+function! NERDCommentIsLineCommented(lineNo)
+    let theLine = getline(a:lineNo)
+    return s:IsInSexyComment(a:lineNo) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+endfunction
+
+" Function: NERDComment(mode, type) function {{{2
+" This function is a Wrapper for the main commenting functions
+"
+" Args:
+"   -mode: a character indicating the mode in which the comment is requested:
+"   'n' for Normal mode, 'x' for Visual mode
+"   -type: the type of commenting requested. Can be 'Sexy', 'Invert',
+"    'Minimal', 'Toggle', 'AlignLeft', 'AlignBoth', 'Comment',
+"    'Nested', 'ToEOL', 'Append', 'Insert', 'Uncomment', 'Yank'
+function! NERDComment(mode, type) range
+    if exists('*NERDCommenter_before')
+        exe 'call NERDCommenter_before()'
+    endif
+
+    let isVisual = a:mode =~# '[vsx]'
+
+    if !exists('g:did_load_ftplugin') || g:did_load_ftplugin !=# 1
+        call s:NerdEcho('filetype plugins should be enabled. See :help NERDComInstallation and :help :filetype-plugin-on', 0)
+    endif
+
+    if isVisual
+        let firstLine = line("'<")
+        let lastLine = line("'>")
+        let firstCol = col("'<")
+        let lastCol = col("'>") - (&selection ==# 'exclusive' ? 1 : 0)
+    else
+        let firstLine = a:firstline
+        let lastLine = a:lastline
+    endif
+    "
+    " Save options we need to change so we can recover them later
+    let state = s:SetupStateBeforeLineComment(firstLine, lastLine)
+
+    let countWasGiven = (!isVisual && firstLine !=# lastLine)
+
+    let forceNested = (a:type ==? 'Nested' || g:NERDDefaultNesting)
+
+    if a:type ==? 'Comment' || a:type ==? 'Nested'
+        if isVisual && visualmode() ==# "\<C-V>"
+            call s:CommentBlock(firstLine, lastLine, firstCol, lastCol, forceNested)
+        elseif isVisual && visualmode() ==# 'v' && (g:NERDCommentWholeLinesInVMode==#0 || (g:NERDCommentWholeLinesInVMode==#2 && s:HasMultipartDelims()))
+            call s:CommentRegion(firstLine, firstCol, lastLine, lastCol, forceNested)
+        else
+            call s:CommentLines(forceNested, g:NERDDefaultAlign, firstLine, lastLine)
+        endif
+
+    elseif a:type ==? 'AlignLeft' || a:type ==? 'AlignBoth'
+        let align = 'none'
+        if a:type ==? 'AlignLeft'
+            let align = 'left'
+        elseif a:type ==? 'AlignBoth'
+            let align = 'both'
+        endif
+        call s:CommentLines(forceNested, align, firstLine, lastLine)
+
+    elseif a:type ==? 'Invert'
+        call s:InvertComment(firstLine, lastLine)
+
+    elseif a:type ==? 'Sexy'
+        try
+            call s:CommentLinesSexy(firstLine, lastLine)
+        catch /NERDCommenter.Delimiters/
+            call s:CommentLines(forceNested, g:NERDDefaultAlign, firstLine, lastLine)
+        catch /NERDCommenter.Nesting/
+            call s:NerdEcho('Sexy comment aborted. Nested sexy cannot be nested', 0)
+        endtry
+
+    elseif a:type ==? 'Toggle'
+        if g:NERDToggleCheckAllLines ==# 0
+          let theLine = getline(firstLine)
+          if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+              call s:UncommentLines(firstLine, lastLine)
+          else
+              call s:CommentLinesToggle(forceNested, firstLine, lastLine)
+          endif
+        else
+          let l:commentAllLines = 0
+          for i in range(firstLine, lastLine)
+            let theLine = getline(i)
+            " if have one line no comment(not include blank/whitespace-only lines), then comment all lines
+            if theLine =~# '[^ \t]\+' && !s:IsInSexyComment(firstLine) && !s:IsCommentedFromStartOfLine(s:Left(), theLine) && !s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+              let l:commentAllLines = 1
+              break
+            else
+          endif
+          endfor
+          if l:commentAllLines ==# 1
+            call s:CommentLinesToggle(forceNested, firstLine, lastLine)
+          else
+            call s:UncommentLines(firstLine, lastLine)
+          endif
+        endif
+
+    elseif a:type ==? 'Minimal'
+        try
+            call s:CommentLinesMinimal(firstLine, lastLine)
+        catch /NERDCommenter.Delimiters/
+            call s:NerdEcho('Minimal comments can only be used for filetypes that have multipart delimiters.', 0)
+        catch /NERDCommenter.Settings/
+            call s:NerdEcho('Place holders are required but disabled.', 0)
+        endtry
+
+    elseif a:type ==? 'ToEOL'
+        call s:SaveScreenState()
+        call s:CommentBlock(firstLine, firstLine, col('.'), col('$')-1, 1)
+        call s:RestoreScreenState()
+
+    elseif a:type ==? 'Append'
+        call s:AppendCommentToLine()
+
+    elseif a:type ==? 'Insert'
+        call s:PlaceDelimitersAndInsBetween()
+
+    elseif a:type ==? 'Uncomment'
+        call s:UncommentLines(firstLine, lastLine)
+
+    elseif a:type ==? 'Yank'
+        if isVisual
+            normal! gvy
+        elseif countWasGiven
+            execute firstLine .','. lastLine .'yank'
+        else
+            normal! yy
+        endif
+        execute firstLine .','. lastLine .'call NERDComment("'. a:mode .'", "Comment")'
+    endif
+
+    call s:RecoverStateAfterLineComment(state)
+
+    if isVisual
+        let nlines = lastLine - firstLine
+        silent! call repeat#set('V' . nlines . 'jo' . "\<Plug>NERDCommenter". a:type)
+    else
+        silent! call repeat#set("\<Plug>NERDCommenter". a:type)
+    endif
+
+    if exists('*NERDCommenter_after')
+        exe 'call NERDCommenter_after()'
+    endif
+
+endfunction
+
+" Function: NERDCommentIsCharCommented(line, col) abort
+" Check if the character at [line, col] is inside a comment
+" Note the Comment delimeter it self is considered as part of the comment
+" 
+" Args:
+"   -line       the line number of the character
+"   -col        the column number of the character
+" Return: Number, 1 if the character is inside a comment, 0 if is not
+function! NERDCommentIsCharCommented(line, col) abort
+  " Function: s:searchfor(str, line, col, direction, [maxline])
+  " search str in the buffer, including the character at [line, col]
+  " Args: 
+  "   -str:       the string for search
+  "   -line:      the line number where search begins
+  "   -col:       the column number where search begins
+  "   -direction: 0 if forward, and 1 if backward
+  "   -maxline:   the max lines the search would look up
+  "               1 if search only one line
+  "               if not given, search until reaches the begining or end of file
+  " Return: List, in the format of [line, col], where line and col is the
+  "         position of first found result; If str cannot be found, returns
+  "         [0, 0]
+  function! s:searchfor(str, line, col, direction, ...) abort
+    let l:curlinenr = a:line
+    let l:maxline = (a:0 > 0) ? a:1 : (a:direction ? a:line : line('$') - a:line + 1)
+    while abs(curlinenr - a:line) < maxline
+      let linestr = getline(curlinenr)
+      if curlinenr == a:line
+        if !a:direction
+          let l:partstr = strpart(linestr, a:col - strlen(a:str))
+        else
+          let l:partstr = strpart(linestr, 0, a:col + strlen(a:str) - 1)
+        endif
+      else
+        let l:partstr = linestr
+      endif
+      if !a:direction
+        " forward
+        let idx = stridx(partstr, a:str)
+        if idx != -1
+          if curlinenr == a:line
+            let idx += a:col - strlen(a:str)
+          else
+          endif
+          return [curlinenr, idx + 1]
+        endif
+      else
+        " backward
+        let idx = strridx(partstr, a:str)
+        if idx != -1
+          return [curlinenr, idx + 1]
+        endif
+      endif
+      let curlinenr += a:direction ? -1 : 1
+    endwhile
+    return [0, 0]
+  endfunction
+  " Function: s:checkwith(left, right, line, col) abort
+  " check if the char at [line, col] is commented using [left, right] pair
+  " Args:
+  "   -left:      the string begins a comment
+  "   -right:     the string ends a comment
+  "   -line:      the line position of the character
+  "   -col:       the column position of the character
+  " Return: Number, 1 if is in a comment, 0 else
+  function! s:checkwith(left, right, line, col) abort
+    let linecommented  = 0
+    let blockcommented = 0
+    if a:right ==# ''
+      let leftpos = s:searchfor(a:left, a:line, a:col, 1, 1)
+      if leftpos == [0, 0]
+        if !linecommented | let linecommented = 0 | endif
+      else
+        if !linecommented | let linecommented = 1 | endif
+      endif
+    else
+      let leftpos = s:searchfor(a:left, a:line, a:col, 1)
+      if leftpos == [0, 0]
+        if !blockcommented | let blockcommented = 0 | endif
+      else 
+        " call s:searchfor(a:right, a:line, a:col, 0)
+        let rightpos = s:searchfor(a:right, leftpos[0], leftpos[1] + strlen(a:right) + 1, 0)
+        if rightpos != [0, 0]
+          if rightpos[0] < a:line
+            if !blockcommented | let blockcommented = 0 | endif
+          elseif rightpos[0] == a:line
+            if !blockcommented 
+              let blockcommented = (rightpos[1] + strlen(a:right) > a:col) ? 1 : 0
+            endif
+          else " rightpos > a:line
+            if !blockcommented | let blockcommented = 1 | endif
+          endif
+        else
+          if !blockcommented | let blockcommented = 1 | endif
+        endif
+      endif
+    endif
+    return linecommented || blockcommented
+  endfunction
+  return s:checkwith(
+          \ b:NERDCommenterDelims['left'], 
+          \ b:NERDCommenterDelims['right'], 
+          \ a:line, 
+          \ a:col) || 
+        \ s:checkwith(
+          \ b:NERDCommenterDelims['leftAlt'], 
+          \ b:NERDCommenterDelims['rightAlt'], 
+          \ a:line, 
+          \ a:col)
+endfunction
+
+" Function: s:PlaceDelimitersAndInsBetween() function {{{2
+" This is function is called to place comment delimiters down and place the
+" cursor between them
+function s:PlaceDelimitersAndInsBetween()
+    " get the left and right delimiters without any escape chars in them
+    let left = s:Left({'space': 1})
+    let right = s:Right({'space': 1})
+
+    let theLine = getline('.')
+    let lineHasLeadTabs = s:HasLeadingTabs(theLine) || (theLine =~# '^ *$' && !&expandtab)
+
+    "convert tabs to spaces and adjust the cursors column to take this into
+    "account
+    let untabbedCol = s:UntabbedCol(theLine, col('.'))
+    call setline(line('.'), s:ConvertLeadingTabsToSpaces(theLine))
+    call cursor(line('.'), untabbedCol)
+
+    " get the length of the right delimiter
+    let lenRight = strlen(right)
+
+    let isDelimOnEOL = col('.') >= strlen(getline('.'))
+
+    " if the cursor is in the first col then we gotta insert rather than
+    " append the comment delimiters here
+    let insOrApp = (col('.')==1 ? 'i' : 'a')
+
+    " place the delimiters down. We do it differently depending on whether
+    " there is a left AND right delimiter
+    if lenRight > 0
+        execute ':normal! ' . insOrApp . left . right
+        execute ':normal! ' . lenRight . 'h'
+    else
+        execute ':normal! ' . insOrApp . left
+    endif
+
+    "if needed convert spaces back to tabs and adjust the cursors col
+    "accordingly
+    if lineHasLeadTabs
+        let tabbedCol = s:TabbedCol(getline('.'), col('.'))
+        call setline(line('.'), s:ConvertLeadingSpacesToTabs(getline('.')))
+        call cursor(line('.'), tabbedCol)
+    endif
+
+    if isDelimOnEOL && lenRight ==# 0
+        startinsert!
+    else
+        call feedkeys('a', 'ni')
+    endif
+endfunction
+
+" Function: s:RemoveDelimiters(left, right, line) {{{2
+" this function is called to remove the first left comment delimiter and the
+" last right delimiter of the given line.
+"
+" The arguments left and right must be strings. If there is no right delimiter (as
+" is the case for e.g vim file comments) them the argument right should be ''
+"
+" Args:
+"   -left: the left comment delimiter
+"   -right: the right comment delimiter
+"   -line: the line to remove the delimiters from
+function s:RemoveDelimiters(left, right, line)
+
+    let l:left = a:left
+    let l:right = a:right
+    let lenLeft = strlen(left)
+    let lenRight = strlen(right)
+
+    let delimsSpaced = (g:NERDSpaceDelims || g:NERDRemoveExtraSpaces)
+
+    let line = a:line
+
+    "look for the left delimiter, if we find it, remove it.
+    let leftIndx = s:FindDelimiterIndex(a:left, line)
+    if leftIndx !=# -1
+        let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+lenLeft)
+
+        "if the user has specified that there is a space after the left delimiter
+        "then check for the space and remove it if it is there
+        if delimsSpaced && strpart(line, leftIndx, s:lenSpaceStr) ==# s:spaceStr
+            let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+s:lenSpaceStr)
+        endif
+    endif
+
+    "look for the right delimiter, if we find it, remove it
+    let rightIndx = s:LastIndexOfDelim(a:right, line)
+    if rightIndx !=# -1
+        let line = strpart(line, 0, rightIndx) . strpart(line, rightIndx+lenRight)
+
+        "if the user has specified that there is a space before the right delimiter
+        "then check for the space and remove it if it is there
+        if delimsSpaced && strpart(line, rightIndx-s:lenSpaceStr, s:lenSpaceStr) ==# s:spaceStr && (s:Multipart() || s:AltMultipart())
+            let line = strpart(line, 0, rightIndx-s:lenSpaceStr) . strpart(line, rightIndx)
+        endif
+    endif
+
+    return line
+endfunction
+
+" Function: s:SetupStateBeforeLineComment(topLine, bottomLine) {{{2
+" Changes ignorecase and foldmethod options before commenting lines and saves
+" their original values in a dict, which is returned as a result
+"
+" Args:
+" topLine: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+"
+" Return: a dict with the state prior to configuration changes
+"
+function s:SetupStateBeforeLineComment(topLine, bottomLine)
+    let state = {'foldmethod' : &foldmethod,
+                \'ignorecase' : &ignorecase}
+
+    " Vim's foldmethods are evaluated every time we use 'setline', which can
+    " make commenting wide ranges of lines VERY slow. We'll change it to
+    " manual, do the commenting stuff and recover it later. To avoid slowing
+    " down commenting few lines, we avoid doing this for ranges smaller than
+    " 10 lines
+    if a:bottomLine - a:topLine >= 10 && &foldmethod !=# 'manual'
+        set foldmethod=manual
+    endif
+
+    " we want case sensitivity when commenting
+    set noignorecase
+
+    return state
+endfunction
+
+" Function: s:RecoverStateAfterLineComment(state) {{{2
+" Receives the state returned by s:SetupStateBeforeLineComment and restores
+" the state accordingly
+"
+" Args:
+" state: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+function s:RecoverStateAfterLineComment(state)
+    if a:state['foldmethod'] !=# &foldmethod
+        let &foldmethod = a:state['foldmethod']
+    endif
+    if a:state['ignorecase'] !=# &ignorecase
+        let &ignorecase = a:state['ignorecase']
+    endif
+endfunction
+
+" Function: s:TrimTrailingWhitespace(line) {{{2
+" This function removes all the trailing whitespace
+" Args:
+"   -line: the target line
+function s:TrimTrailingWhitespace(line)
+    let toReturn = substitute(a:line, '\s\+$', '', 'g')
+    return toReturn
+endfunction
+
+" Function: s:UncommentLines(topLine, bottomLine) {{{2
+" This function uncomments the given lines
+"
+" Args:
+" topLine: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+function s:UncommentLines(topLine, bottomLine)
+    "make local copies of a:firstline and a:lastline and, if need be, swap
+    "them around if the top line is below the bottom
+    let l:firstline = a:topLine
+    let l:lastline = a:bottomLine
+    if firstline > lastline
+        let firstline = lastline
+        let lastline = a:topLine
+    endif
+
+    "go thru each line uncommenting each line removing sexy comments
+    let currentLine = firstline
+    while currentLine <= lastline
+
+        "check the current line to see if it is part of a sexy comment
+        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
+        if !empty(sexyComBounds)
+
+            "we need to store the number of lines in the buffer before the comment is
+            "removed so we know how many lines were removed when the sexy comment
+            "was removed
+            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
+
+            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
+
+            "move to the line after last line of the sexy comment
+            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
+            let numLinesRemoved = numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved
+            let currentLine = sexyComBounds[1] - numLinesRemoved + 1
+            let lastline = lastline - numLinesRemoved
+
+        "no sexy com was detected so uncomment the line as normal
+        else
+            call s:UncommentLinesNormal(currentLine, currentLine)
+            let currentLine = currentLine + 1
+        endif
+    endwhile
+
+endfunction
+
+" Function: s:UncommentLinesSexy(topline, bottomline) {{{2
+" This function removes all the comment characters associated with the sexy
+" comment spanning the given lines
+" Args:
+"   -topline/bottomline: the top/bottom lines of the sexy comment
+function s:UncommentLinesSexy(topline, bottomline)
+    let left = s:GetSexyComLeft(0,1)
+    let right = s:GetSexyComRight(0,1)
+
+
+    "check if it is even possible for sexy comments to exist with the
+    "available delimiters
+    if left ==# -1 || right ==# -1
+        throw 'NERDCommenter.Delimiters exception: cannot uncomment sexy comments with available delimiters.'
+    endif
+
+    let leftUnEsc = s:GetSexyComLeft(0,0)
+    let rightUnEsc = s:GetSexyComRight(0,0)
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+    let sexyComMarkerUnEsc = s:GetSexyComMarker(0, 0)
+
+    "the markerOffset is how far right we need to move the sexyComMarker to
+    "line it up with the end of the left delimiter
+    let markerOffset = strlen(leftUnEsc)-strlen(sexyComMarkerUnEsc)
+
+    " go thru the intermediate lines of the sexy comment and remove the
+    " sexy comment markers (e.g., the '*'s on the start of line in a c sexy
+    " comment)
+    let currentLine = a:topline+1
+    while currentLine < a:bottomline
+        let theLine = getline(currentLine)
+
+        " remove the sexy comment marker from the line. We also remove the
+        " space after it if there is one and if appropriate options are set
+        let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
+        if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) ==# s:spaceStr  && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
+        endif
+
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+
+        let theLine = s:ConvertLeadingWhiteSpace(theLine)
+
+        if g:NERDTrimTrailingWhitespace ==# 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " move onto the next line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+    " gotta make a copy of a:bottomline cos we modify the position of the
+    " last line  it if we remove the topline
+    let bottomline = a:bottomline
+
+    " get the first line so we can remove the left delimiter from it
+    let theLine = getline(a:topline)
+
+    " if the first line contains only the left delimiter then just delete it
+    if theLine =~# '^[ \t]*' . left . '[ \t]*$' && !g:NERDCompactSexyComs
+        call cursor(a:topline, 1)
+        normal! dd
+        let bottomline = bottomline - 1
+
+    " topline contains more than just the left delimiter
+    else
+
+        " remove the delimiter. If there is a space after it
+        " then remove this too if appropriate
+        let delimIndx = stridx(theLine, leftUnEsc)
+        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) ==# s:spaceStr && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc))
+        endif
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+        call setline(a:topline, theLine)
+    endif
+
+    " get the last line so we can remove the right delimiter
+    let theLine = getline(bottomline)
+
+    " if the bottomline contains only the right delimiter then just delete it
+    if theLine =~# '^[ \t]*' . right . '[ \t]*$'
+        call cursor(bottomline, 1)
+        normal! dd
+
+    " the last line contains more than the right delimiter
+    else
+        " remove the right delimiter. If there is a space after it and
+        " if the appropriate options are set then remove this too.
+        let delimIndx = s:LastIndexOfDelim(rightUnEsc, theLine)
+        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) ==# s:spaceStr  && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc))
+        endif
+
+        " if the last line also starts with a sexy comment marker then we
+        " remove this as well
+        if theLine =~# '^[ \t]*' . sexyComMarker
+
+            " remove the sexyComMarker. If there is a space after it then
+            " remove that too
+            let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
+            if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) ==# s:spaceStr  && g:NERDSpaceDelims
+                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
+            else
+                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
+            endif
+        endif
+
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+        call setline(bottomline, theLine)
+    endif
+
+    " remove trailing whitespaces for first and last line
+    if g:NERDTrimTrailingWhitespace ==# 1
+        let theLine = getline(a:bottomline)
+        let theLine = s:TrimTrailingWhitespace(theLine)
+        call setline(a:bottomline, theLine)
+        let theLine = getline(a:topline)
+        let theLine = s:TrimTrailingWhitespace(theLine)
+        call setline(a:topline, theLine)
+    endif
+endfunction
+
+" Function: s:UncommentLineNormal(line) {{{2
+" uncomments the given line and returns the result
+" Args:
+"   -line: the line to uncomment
+function s:UncommentLineNormal(line)
+    let line = a:line
+
+    "get the positions of all delimiter types on the line
+    let indxLeft = s:FindDelimiterIndex(s:Left(), line)
+    let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line)
+    let indxRight = s:LastIndexOfDelim(s:Right(), line)
+    let indxRightAlt = s:LastIndexOfDelim(s:Right({'alt': 1}), line)
+
+    "get the comment status on the line so we know how it is commented
+    let lineCommentStatus =  s:IsCommentedOutermost(s:Left(), s:Right(), s:Left({'alt': 1}), s:Right({'alt': 1}), line)
+
+    "it is commented with s:Left() and s:Right() so remove these delimiters
+    if lineCommentStatus ==# 1
+        let line = s:RemoveDelimiters(s:Left(), s:Right(), line)
+
+    "it is commented with s:Left({'alt': 1}) and s:Right({'alt': 1}) so remove these delimiters
+    elseif lineCommentStatus ==# 2 && g:NERDRemoveAltComs
+        let line = s:RemoveDelimiters(s:Left({'alt': 1}), s:Right({'alt': 1}), line)
+
+    "it is not properly commented with any delimiters so we check if it has
+    "any random left or right delimiters on it and remove the outermost ones
+    else
+        "remove the outer most left comment delimiter
+        if indxLeft !=# -1 && (indxLeft < indxLeftAlt || indxLeftAlt ==# -1)
+            let line = s:RemoveDelimiters(s:Left(), '', line)
+        elseif indxLeftAlt !=# -1 && g:NERDRemoveAltComs
+            let line = s:RemoveDelimiters(s:Left({'alt': 1}), '', line)
+        endif
+
+        "remove the outer most right comment delimiter
+        if indxRight !=# -1 && (indxRight < indxRightAlt || indxRightAlt ==# -1)
+            let line = s:RemoveDelimiters('', s:Right(), line)
+        elseif indxRightAlt !=# -1 && g:NERDRemoveAltComs
+            let line = s:RemoveDelimiters('', s:Right({'alt': 1}), line)
+        endif
+    endif
+
+
+    let indxLeftPlace = s:FindDelimiterIndex(g:NERDLPlace, line)
+    let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line)
+
+    let right = s:Right()
+    let left = s:Left()
+    if !s:Multipart()
+        let right = s:Right({'alt': 1})
+        let left = s:Left({'alt': 1})
+    endif
+
+
+    "if there are place-holders on the line then we check to see if they are
+    "the outermost delimiters on the line. If so then we replace them with
+    "real delimiters
+    if indxLeftPlace !=# -1
+        if (indxLeftPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
+            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
+        endif
+    elseif indxRightPlace !=# -1
+        if (indxRightPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
+            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
+        endif
+
+    endif
+
+    let line = s:ConvertLeadingWhiteSpace(line)
+
+    if g:NERDTrimTrailingWhitespace ==# 1
+        let line = s:TrimTrailingWhitespace(line)
+    endif
+
+    return line
+endfunction
+
+" Function: s:UncommentLinesNormal(topline, bottomline) {{{2
+" This function is called to uncomment lines that aren't a sexy comment
+" Args:
+"   -topline/bottomline: the top/bottom line numbers of the comment
+function s:UncommentLinesNormal(topline, bottomline)
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+        let line = getline(currentLine)
+        call setline(currentLine, s:UncommentLineNormal(line))
+        let currentLine = currentLine + 1
+    endwhile
+endfunction
+
+
+" Section: Other helper functions {{{1
+" ============================================================================
+
+" Function: s:AddLeftDelim(delim, theLine) {{{2
+" Args:
+function s:AddLeftDelim(delim, theLine)
+    return substitute(a:theLine, '^\([ \t]*\)', '\1' . a:delim, '')
+endfunction
+
+" Function: s:AddLeftDelimAligned(delim, theLine) {{{2
+" Args:
+function s:AddLeftDelimAligned(delim, theLine, alignIndx)
+
+    "if the line is not long enough then bung some extra spaces on the front
+    "so we can align the delimiter properly
+    let theLine = a:theLine
+    if strlen(theLine) < a:alignIndx
+        let theLine = repeat(' ', a:alignIndx - strlen(theLine))
+    endif
+
+    return strpart(theLine, 0, a:alignIndx) . a:delim . strpart(theLine, a:alignIndx)
+endfunction
+
+" Function: s:AddRightDelim(delim, theLine) {{{2
+" Args:
+function s:AddRightDelim(delim, theLine)
+    if a:delim ==# ''
+        return a:theLine
+    else
+        return substitute(a:theLine, '$', a:delim, '')
+    endif
+endfunction
+
+" Function: s:AddRightDelimAligned(delim, theLine, alignIndx) {{{2
+" Args:
+function s:AddRightDelimAligned(delim, theLine, alignIndx)
+    if a:delim ==# ''
+        return a:theLine
+    else
+
+        " when we align the right delimiter we are just adding spaces
+        " so we get a string containing the needed spaces (it
+        " could be empty)
+        let extraSpaces = ''
+        let extraSpaces = repeat(' ', a:alignIndx-strlen(a:theLine))
+
+        " add the right delimiter
+        return substitute(a:theLine, '$', extraSpaces . a:delim, '')
+    endif
+endfunction
+
+" Function: s:AltMultipart() {{{2
+" returns 1 if the alternative delimiters are multipart
+function s:AltMultipart()
+    return b:NERDCommenterDelims['rightAlt'] !=# ''
+endfunction
+
+" Function: s:AltNested() {{{2
+" returns 1 if the alternate multipart (if any) delimiters allow nesting
+function s:AltNested()
+    return b:NERDCommenterDelims['nestedAlt']
+endfunction
+
+" Function: s:CanCommentLine(forceNested, line) {{{2
+"This function is used to determine whether the given line can be commented.
+"It returns 1 if it can be and 0 otherwise
+"
+" Args:
+"   -forceNested: a flag indicating whether the caller wants comments to be nested
+"    if the current line is already commented
+"   -lineNum: the line number of the line to check for commentability
+function s:CanCommentLine(forceNested, lineNum)
+    let theLine = getline(a:lineNum)
+
+    " make sure we don't comment lines that are just spaces or tabs or empty,
+    " unless configured otherwise
+    if g:NERDCommentEmptyLines ==# 0 && theLine =~# "^[ \t]*$"
+        return 0
+    endif
+
+    "if the line is part of a sexy comment then just flag it...
+    if s:IsInSexyComment(a:lineNum)
+        return 0
+    endif
+
+    let isCommented = s:IsCommentedNormOrSexy(a:lineNum)
+
+    "if the line isn't commented return true
+    if !isCommented
+        return 1
+    endif
+
+    "if the line is commented but nesting is allowed then return true
+    if s:Nested() || (a:forceNested && (!s:Multipart() || g:NERDUsePlaceHolders))
+        return 1
+    endif
+
+    return 0
+endfunction
+
+" Function: s:CanPlaceCursor(line, col) {{{2
+" returns 1 if the cursor can be placed exactly in the given position
+function s:CanPlaceCursor(line, col)
+    let c = col('.')
+    let l = line('.')
+    call cursor(a:line, a:col)
+    let success = (line('.') ==# a:line && col('.') ==# a:col)
+    call cursor(l,c)
+    return success
+endfunction
+
+" Function: s:CanSexyCommentLines(topline, bottomline) {{{2
+" Return: 1 if the given lines can be commented sexually, 0 otherwise
+function s:CanSexyCommentLines(topline, bottomline)
+    " see if the selected regions have any sexy comments
+    " however, if the language allows nested comments,
+    " we allow nested sexy comments
+    if s:SexyNested()
+        return 1
+    endif
+    let currentLine = a:topline
+    while(currentLine <= a:bottomline)
+        if s:IsInSexyComment(currentLine)
+            return 0
+        endif
+        let currentLine = currentLine + 1
+    endwhile
+    return 1
+endfunction
+" Function: s:CanToggleCommentLine(forceNested, line) {{{2
+"This function is used to determine whether the given line can be toggle commented.
+"It returns 1 if it can be and 0 otherwise
+"
+" Args:
+"   -lineNum: the line number of the line to check for commentability
+function s:CanToggleCommentLine(forceNested, lineNum)
+    let theLine = getline(a:lineNum)
+    if (s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)) && !a:forceNested
+        return 0
+    endif
+
+    " make sure we don't comment lines that are just spaces or tabs or empty,
+    " unless configured otherwise
+    if g:NERDCommentEmptyLines ==# 0 && theLine =~# "^[ \t]*$"
+        return 0
+    endif
+
+    "if the line is part of a sexy comment then just flag it...
+    if s:IsInSexyComment(a:lineNum)
+        return 0
+    endif
+
+    return 1
+endfunction
+
+" Function: s:ConvertLeadingSpacesToTabs(line) {{{2
+" This function takes a line and converts all leading tabs on that line into
+" spaces
+"
+" Args:
+"   -line: the line whose leading tabs will be converted
+function s:ConvertLeadingSpacesToTabs(line)
+    let toReturn  = a:line
+    while toReturn =~# '^\t*' . s:TabSpace() . '\(.*\)$'
+        let toReturn = substitute(toReturn, '^\(\t*\)' . s:TabSpace() . '\(.*\)$'  ,  '\1\t\2' , '')
+    endwhile
+
+    return toReturn
+endfunction
+
+
+" Function: s:ConvertLeadingTabsToSpaces(line) {{{2
+" This function takes a line and converts all leading spaces on that line into
+" tabs
+"
+" Args:
+"   -line: the line whose leading spaces will be converted
+function s:ConvertLeadingTabsToSpaces(line)
+    let toReturn  = a:line
+    while toReturn =~# '^\( *\)\t'
+        let toReturn = substitute(toReturn, '^\( *\)\t',  '\1' . s:TabSpace() , '')
+    endwhile
+
+    return toReturn
+endfunction
+
+" Function: s:ConvertLeadingWhiteSpace(line) {{{2
+" Converts the leading white space to tabs/spaces depending on &tabstop
+"
+" Args:
+"   -line: the line to convert
+function s:ConvertLeadingWhiteSpace(line)
+    let toReturn = a:line
+    while toReturn =~# '^ *\t'
+        let toReturn = substitute(toReturn, '^ *\zs\t\ze', s:TabSpace(), 'g')
+    endwhile
+
+    if !&expandtab
+        let toReturn = s:ConvertLeadingSpacesToTabs(toReturn)
+    endif
+
+    return toReturn
+endfunction
+
+
+" Function: s:CountNonESCedOccurances(str, searchstr, escChar) {{{2
+" This function counts the number of substrings contained in another string.
+" These substrings are only counted if they are not escaped with escChar
+" Args:
+"   -str: the string to look for searchstr in
+"   -searchstr: the substring to search for in str
+"   -escChar: the escape character which, when preceding an instance of
+"    searchstr, will cause it not to be counted
+function s:CountNonESCedOccurances(str, searchstr, escChar)
+    "get the index of the first occurrence of searchstr
+    let indx = stridx(a:str, a:searchstr)
+
+    "if there is an instance of searchstr in str process it
+    if indx !=# -1
+        "get the remainder of str after this instance of searchstr is removed
+        let lensearchstr = strlen(a:searchstr)
+        let strLeft = strpart(a:str, indx+lensearchstr)
+
+        "if this instance of searchstr is not escaped, add one to the count
+        "and recurse. If it is escaped, just recurse
+        if !s:IsEscaped(a:str, indx, a:escChar)
+            return 1 + s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
+        else
+            return s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
+        endif
+    endif
+endfunction
+" Function: s:DoesBlockHaveDelim(delim, top, bottom) {{{2
+" Returns 1 if the given block of lines has a delimiter (a:delim) in it
+" Args:
+"   -delim: the comment delimiter to check the block for
+"   -top: the top line number of the block
+"   -bottom: the bottom line number of the block
+function s:DoesBlockHaveDelim(delim, top, bottom)
+    let currentLine = a:top
+    while currentLine < a:bottom
+        let theline = getline(currentLine)
+        if s:FindDelimiterIndex(a:delim, theline) !=# -1
+            return 1
+        endif
+        let currentLine = currentLine + 1
+    endwhile
+    return 0
+endfunction
+
+" Function: s:DoesBlockHaveMultipartDelim(top, bottom) {{{2
+" Returns 1 if the given block has a >= 1 multipart delimiter in it
+" Args:
+"   -top: the top line number of the block
+"   -bottom: the bottom line number of the block
+function s:DoesBlockHaveMultipartDelim(top, bottom)
+    if s:HasMultipartDelims()
+        if s:Multipart()
+            return s:DoesBlockHaveDelim(s:Left(), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right(), a:top, a:bottom)
+        else
+            return s:DoesBlockHaveDelim(s:Left({'alt': 1}), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right({'alt': 1}), a:top, a:bottom)
+        endif
+    endif
+    return 0
+endfunction
+
+
+" Function: s:Esc(str) {{{2
+" Escapes all the tricky chars in the given string
+function s:Esc(str)
+    let charsToEsc = '*/\."&$+'
+    return escape(a:str, charsToEsc)
+endfunction
+
+" Function: s:FindDelimiterIndex(delimiter, line) {{{2
+" This function is used to get the string index of the input comment delimiter
+" on the input line. If no valid comment delimiter is found in the line then
+" -1 is returned
+" Args:
+"   -delimiter: the delimiter we are looking to find the index of
+"   -line: the line we are looking for delimiter on
+function s:FindDelimiterIndex(delimiter, line)
+
+    "make sure the delimiter isn't empty otherwise we go into an infinite loop.
+    if a:delimiter ==# ''
+        return -1
+    endif
+
+
+    let l:delimiter = a:delimiter
+    let lenDel = strlen(l:delimiter)
+
+    "get the index of the first occurrence of the delimiter
+    let delIndx = stridx(a:line, l:delimiter)
+
+    "keep looping thru the line till we either find a real comment delimiter
+    "or run off the EOL
+    while delIndx !=# -1
+
+        "if we are not off the EOL get the str before the possible delimiter
+        "in question and check if it really is a delimiter. If it is, return
+        "its position
+        if delIndx !=# -1
+            if s:IsDelimValid(l:delimiter, delIndx, a:line)
+                return delIndx
+            endif
+        endif
+
+        "we have not yet found a real comment delimiter so move past the
+        "current one we are looking at
+        let restOfLine = strpart(a:line, delIndx + lenDel)
+        let distToNextDelim = stridx(restOfLine , l:delimiter)
+
+        "if distToNextDelim is -1 then there is no more potential delimiters
+        "on the line so set delIndx to -1. Otherwise, move along the line by
+        "distToNextDelim
+        if distToNextDelim ==# -1
+            let delIndx = -1
+        else
+            let delIndx = delIndx + lenDel + distToNextDelim
+        endif
+    endwhile
+
+    "there is no comment delimiter on this line
+    return -1
+endfunction
+
+" Function: s:FindBoundingLinesOfSexyCom(lineNum) {{{2
+" This function takes in a line number and tests whether this line number is
+" the top/bottom/middle line of a sexy comment. If it is then the top/bottom
+" lines of the sexy comment are returned
+" Args:
+"   -lineNum: the line number that is to be tested whether it is the
+"    top/bottom/middle line of a sexy com
+" Returns:
+"   A string that has the top/bottom lines of the sexy comment encoded in it.
+"   The format is 'topline,bottomline'. If a:lineNum turns out not to be the
+"   top/bottom/middle of a sexy comment then -1 is returned
+function s:FindBoundingLinesOfSexyCom(lineNum)
+
+    "find which delimiters to look for as the start/end delimiters of the comment
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left({'esc': 1})
+        let right = s:Right({'esc': 1})
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1, 'esc': 1})
+        let right = s:Right({'alt': 1, 'esc': 1})
+    else
+        return []
+    endif
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+
+    "initialise the top/bottom line numbers of the sexy comment to -1
+    let top = -1
+    let bottom = -1
+
+    let currentLine = a:lineNum
+    while top ==# -1 || bottom ==# -1
+        let theLine = getline(currentLine)
+
+        "check if the current line is the top of the sexy comment
+        if currentLine <= a:lineNum && theLine =~# '^[ \t]*' . left && theLine !~# '.*' . right && currentLine < s:NumLinesInBuf()
+            let top = currentLine
+            let currentLine = a:lineNum
+
+        "check if the current line is the bottom of the sexy comment
+        elseif theLine =~# '^[ \t]*' . right && theLine !~# '.*' . left && currentLine > 1
+            let bottom = currentLine
+
+        "the right delimiter is on the same line as the last sexyComMarker
+        elseif theLine =~# '^[ \t]*' . sexyComMarker . '.*' . right
+            let bottom = currentLine
+
+        "we have not found the top or bottom line so we assume currentLine is an
+        "intermediate line and look to prove otherwise
+        else
+
+            "if the line doesn't start with a sexyComMarker then it is not a sexy
+            "comment
+            if theLine !~# '^[ \t]*' . sexyComMarker
+                return []
+            endif
+
+        endif
+
+        "if top is -1 then we haven't found the top yet so keep looking up
+        if top ==# -1
+            let currentLine = currentLine - 1
+        "if we have found the top line then go down looking for the bottom
+        else
+            let currentLine = currentLine + 1
+        endif
+
+    endwhile
+
+    return [top, bottom]
+endfunction
+
+
+" Function: s:GetSexyComMarker() {{{2
+" Returns the sexy comment marker for the current filetype.
+"
+" C style sexy comments are assumed if possible. If not then the sexy comment
+" marker is the last char of the delimiter pair that has both left and right
+" delimiters and has the longest left delimiter
+"
+" Args:
+"   -space: specifies whether the marker is to have a space string after it
+"    (the space string will only be added if NERDSpaceDelims is set)
+"   -esc: specifies whether the tricky chars in the marker are to be ESCed
+function s:GetSexyComMarker(space, esc)
+    let sexyComMarker = b:NERDSexyComMarker
+
+    "if there is no hardcoded marker then we find one
+    if sexyComMarker ==# ''
+
+        "if the filetype has c style comments then use standard c sexy
+        "comments
+        if s:HasCStyleComments()
+            let sexyComMarker = '*'
+        else
+            "find a comment marker by getting the longest available left delimiter
+            "(that has a corresponding right delimiter) and taking the last char
+            let lenLeft = strlen(s:Left())
+            let lenLeftAlt = strlen(s:Left({'alt': 1}))
+            let left = ''
+            let right = ''
+            if s:Multipart() && lenLeft >= lenLeftAlt
+                let left = s:Left()
+            elseif s:AltMultipart()
+                let left = s:Left({'alt': 1})
+            else
+                return -1
+            endif
+
+            "get the last char of left
+            let sexyComMarker = strpart(left, strlen(left)-1)
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let sexyComMarker = sexyComMarker . s:spaceStr
+    endif
+
+    if a:esc
+        let sexyComMarker = s:Esc(sexyComMarker)
+    endif
+
+    return sexyComMarker
+endfunction
+
+" Function: s:SexyNested() {{{2
+" Returns 1 if the sexy delimeters allow nesting
+" TODO this is ugly copy&paste from the GetSexyComLeft/Right functions,
+" these could all be cleaned up
+function s:SexyNested()
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        return (s:Left() ==# '/*' && s:Nested()) || (s:Left({'alt': 1}) ==# '/*' && s:AltNested())
+    else
+        "grab the longest left delim that has a right
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            return s:Nested()
+        elseif s:AltMultipart()
+            return s:AltNested()
+        else
+            return 0
+        endif
+    endif
+endfunction
+
+" Function: s:GetSexyComLeft(space, esc) {{{2
+" Returns the left delimiter for sexy comments for this filetype or -1 if
+" there is none. C style sexy comments are used if possible
+" Args:
+"   -space: specifies if the delimiter has a space string on the end
+"   (the space string will only be added if NERDSpaceDelims is set)
+"   -esc: specifies whether the tricky chars in the string are ESCed
+function s:GetSexyComLeft(space, esc)
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+    let left = ''
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        let left = '/*'
+    else
+        "grab the longest left delimiter that has a right
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            let left = s:Left()
+        elseif s:AltMultipart()
+            let left = s:Left({'alt': 1})
+        else
+            return -1
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let left = left . s:spaceStr
+    endif
+
+    if a:esc
+        let left = s:Esc(left)
+    endif
+
+    return left
+endfunction
+
+" Function: s:GetSexyComRight(space, esc) {{{2
+" Returns the right delimiter for sexy comments for this filetype or -1 if
+" there is none. C style sexy comments are used if possible.
+" Args:
+"   -space: specifies if the delimiter has a space string on the start
+"   (the space string will only be added if NERDSpaceDelims
+"   is specified for the current filetype)
+"   -esc: specifies whether the tricky chars in the string are ESCed
+function s:GetSexyComRight(space, esc)
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+    let right = ''
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        let right = '*/'
+    else
+        "grab the right delimiter that pairs with the longest left delimiter
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            let right = s:Right()
+        elseif s:AltMultipart()
+            let right = s:Right({'alt': 1})
+        else
+            return -1
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let right = s:spaceStr . right
+    endif
+
+    if a:esc
+        let right = s:Esc(right)
+    endif
+
+    return right
+endfunction
+
+" Function: s:HasMultipartDelims() {{{2
+" Returns 1 if the current filetype has at least one set of multipart delimiters
+function s:HasMultipartDelims()
+    return s:Multipart() || s:AltMultipart()
+endfunction
+
+" Function: s:HasLeadingTabs(...) {{{2
+" Returns 1 if any of the given strings have leading tabs
+function s:HasLeadingTabs(...)
+    for s in a:000
+        if s =~# '^\t.*'
+            return 1
+        end
+    endfor
+    return 0
+endfunction
+" Function: s:HasCStyleComments() {{{2
+" Returns 1 if the current filetype has c style comment delimiters
+function s:HasCStyleComments()
+    return (s:Left() ==# '/*' && s:Right() ==# '*/') || (s:Left({'alt': 1}) ==# '/*' && s:Right({'alt': 1}) ==# '*/')
+endfunction
+
+" Function: s:IsCommentedNormOrSexy(lineNum) {{{2
+"This function is used to determine whether the given line is commented with
+"either set of delimiters or if it is part of a sexy comment
+"
+" Args:
+"   -lineNum: the line number of the line to check
+function s:IsCommentedNormOrSexy(lineNum)
+    let theLine = getline(a:lineNum)
+
+    "if the line is commented normally return 1
+    if s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
+        return 1
+    endif
+
+    "if the line is part of a sexy comment return 1
+    if s:IsInSexyComment(a:lineNum)
+        return 1
+    endif
+    return 0
+endfunction
+
+" Function: s:IsCommented(left, right, line) {{{2
+"This function is used to determine whether the given line is commented with
+"the given delimiters
+"
+" Args:
+"   -line: the line that to check if commented
+"   -left/right: the left and right delimiters to check for
+function s:IsCommented(left, right, line)
+    "if the line isn't commented return true
+    if s:FindDelimiterIndex(a:left, a:line) !=# -1 && (s:LastIndexOfDelim(a:right, a:line) !=# -1 || !s:Multipart())
+        return 1
+    endif
+    return 0
+endfunction
+
+" Function: s:IsCommentedFromStartOfLine(left, line) {{{2
+"This function is used to determine whether the given line is commented with
+"the given delimiters at the start of the line i.e the left delimiter is the
+"first thing on the line (apart from spaces\tabs)
+"
+" Args:
+"   -line: the line that to check if commented
+"   -left: the left delimiter to check for
+function s:IsCommentedFromStartOfLine(left, line)
+    let theLine = s:ConvertLeadingTabsToSpaces(a:line)
+    let numSpaces = strlen(substitute(theLine, '^\( *\).*$', '\1', ''))
+    let delimIndx = s:FindDelimiterIndex(a:left, theLine)
+    return delimIndx ==# numSpaces
+endfunction
+
+" Function: s:IsCommentedOutermost(left, right, leftAlt, rightAlt, line) {{{2
+" Finds the type of the outermost delimiters on the line
+"
+" Args:
+"   -line: the line that to check if the outermost comments on it are
+"    left/right
+"   -left/right: the left and right delimiters to check for
+"   -leftAlt/rightAlt: the left and right alternative delimiters to check for
+"
+" Returns:
+"   0 if the line is not commented with either set of delimiters
+"   1 if the line is commented with the left/right delimiter set
+"   2 if the line is commented with the leftAlt/rightAlt delim set
+function s:IsCommentedOutermost(left, right, leftAlt, rightAlt, line)
+    "get the first positions of the left delimiters and the last positions of the
+    "right delimiters
+    let indxLeft = s:FindDelimiterIndex(a:left, a:line)
+    let indxLeftAlt = s:FindDelimiterIndex(a:leftAlt, a:line)
+    let indxRight = s:LastIndexOfDelim(a:right, a:line)
+    let indxRightAlt = s:LastIndexOfDelim(a:rightAlt, a:line)
+
+    "check if the line has a left delimiter before a leftAlt delimiter
+    if (indxLeft <= indxLeftAlt || indxLeftAlt ==# -1) && indxLeft !=# -1
+        "check if the line has a right delimiter after any rightAlt delimiter
+        if (indxRight > indxRightAlt && indxRight > indxLeft) || !s:Multipart()
+            return 1
+        endif
+
+        "check if the line has a leftAlt delimiter before a left delimiter
+    elseif (indxLeftAlt <= indxLeft || indxLeft ==# -1) && indxLeftAlt !=# -1
+        "check if the line has a rightAlt delimiter after any right delimiter
+        if (indxRightAlt > indxRight && indxRightAlt > indxLeftAlt) || !s:AltMultipart()
+            return 2
+        endif
+    else
+        return 0
+    endif
+
+    return 0
+
+endfunction
+
+
+" Function: s:IsDelimValid(delimiter, delIndx, line) {{{2
+" This function is responsible for determining whether a given instance of a
+" comment delimiter is a real delimiter or not. For example, in java the
+" // string is a comment delimiter but in the line:
+"               System.out.println("//");
+" it does not count as a comment delimiter. This function is responsible for
+" distinguishing between such cases. It does so by applying a set of
+" heuristics that are not fool proof but should work most of the time.
+"
+" Args:
+"   -delimiter: the delimiter we are validating
+"   -delIndx: the position of delimiter in line
+"   -line: the line that delimiter occurs in
+"
+" Returns:
+" 0 if the given delimiter is not a real delimiter (as far as we can tell) ,
+" 1 otherwise
+function s:IsDelimValid(delimiter, delIndx, line)
+    "get the delimiter without the escchars
+    let l:delimiter = a:delimiter
+
+    "get the strings before and after the delimiter
+    let preComStr = strpart(a:line, 0, a:delIndx)
+    let postComStr = strpart(a:line, a:delIndx+strlen(delimiter))
+
+    "to check if the delimiter is real, make sure it isn't preceded by
+    "an odd number of quotes and followed by the same (which would indicate
+    "that it is part of a string and therefore is not a comment)
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '"', '\\'))
+        return 0
+    endif
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "'", '\\')) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "'", '\\'))
+        return 0
+    endif
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '`', '\\')) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '`', '\\'))
+        return 0
+    endif
+
+
+    "if the comment delimiter is escaped, assume it isn't a real delimiter
+    if s:IsEscaped(a:line, a:delIndx, "\\")
+        return 0
+    endif
+
+    "vim comments are so fucking stupid!! Why the hell do they have comment
+    "delimiters that are used elsewhere in the syntax?!?! We need to check
+    "some conditions especially for vim
+    if &filetype ==# 'vim'
+        if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\"))
+            return 0
+        endif
+
+        "if the delimiter is on the very first char of the line or is the
+        "first non-tab/space char on the line then it is a valid comment delimiter
+        if a:delIndx ==# 0 || a:line =~# "^[ \t]\\{" . a:delIndx . "\\}\".*$"
+            return 1
+        endif
+
+        let numLeftParen =s:CountNonESCedOccurances(preComStr, '(', '\\')
+        let numRightParen =s:CountNonESCedOccurances(preComStr, ')', '\\')
+
+        "if the quote is inside brackets then assume it isn't a comment
+        if numLeftParen > numRightParen
+            return 0
+        endif
+
+        "if the line has an even num of unescaped "'s then we can assume that
+        "any given " is not a comment delimiter
+        if s:IsNumEven(s:CountNonESCedOccurances(a:line, '"', '\\'))
+            return 0
+        endif
+    endif
+
+    return 1
+
+endfunction
+
+" Function: s:IsNumEven(num) {{{2
+" A small function the returns 1 if the input number is even and 0 otherwise
+" Args:
+"   -num: the number to check
+function s:IsNumEven(num)
+    return (a:num % 2) ==# 0
+endfunction
+
+" Function: s:IsEscaped(str, indx, escChar) {{{2
+" This function takes a string, an index into that string and an esc char and
+" returns 1 if the char at the index is escaped (i.e if it is preceded by an
+" odd number of esc chars)
+" Args:
+"   -str: the string to check
+"   -indx: the index into str that we want to check
+"   -escChar: the escape char the char at indx may be ESCed with
+function s:IsEscaped(str, indx, escChar)
+    "initialise numEscChars to 0 and look at the char before indx
+    let numEscChars = 0
+    let curIndx = a:indx-1
+
+    "keep going back thru str until we either reach the start of the str or
+    "run out of esc chars
+    while curIndx >= 0 && strpart(a:str, curIndx, 1) ==# a:escChar
+
+        "we have found another esc char so add one to the count and move left
+        "one char
+        let numEscChars  = numEscChars + 1
+        let curIndx = curIndx - 1
+
+    endwhile
+
+    "if there is an odd num of esc chars directly before the char at indx then
+    "the char at indx is escaped
+    return !s:IsNumEven(numEscChars)
+endfunction
+
+" Function: s:IsInSexyComment(line) {{{2
+" returns 1 if the given line number is part of a sexy comment
+function s:IsInSexyComment(line)
+    return !empty(s:FindBoundingLinesOfSexyCom(a:line))
+endfunction
+
+" Function: s:IsSexyComment(topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns 1 if the lines between and
+" including the given line numbers are a sexy comment. It returns 0 otherwise.
+" Args:
+"   -topline: the line that the possible sexy comment starts on
+"   -bottomline: the line that the possible sexy comment stops on
+function s:IsSexyComment(topline, bottomline)
+
+    "get the delimiter set that would be used for a sexy comment
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left()
+        let right = s:Right()
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1})
+        let right = s:Right({'alt': 1})
+    else
+        return 0
+    endif
+
+    "swap the top and bottom line numbers around if need be
+    let topline = a:topline
+    let bottomline = a:bottomline
+    if bottomline < topline
+        let topline = bottomline
+        let bottomline = a:topline
+    endif
+
+    "if there is < 2 lines in the comment it cannot be sexy
+    if (bottomline - topline) <= 0
+        return 0
+    endif
+
+    "if the top line doesn't begin with a left delimiter then the comment isn't sexy
+    if getline(a:topline) !~# '^[ \t]*' . left
+        return 0
+    endif
+
+    "if there is a right delimiter on the top line then this isn't a sexy comment
+    if s:LastIndexOfDelim(right, getline(a:topline)) !=# -1
+        return 0
+    endif
+
+    "if there is a left delimiter on the bottom line then this isn't a sexy comment
+    if s:FindDelimiterIndex(left, getline(a:bottomline)) !=# -1
+        return 0
+    endif
+
+    "if the bottom line doesn't begin with a right delimiter then the comment isn't
+    "sexy
+    if getline(a:bottomline) !~# '^.*' . right . '$'
+        return 0
+    endif
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+
+    "check each of the intermediate lines to make sure they start with a
+    "sexyComMarker
+    let currentLine = a:topline+1
+    while currentLine < a:bottomline
+        let theLine = getline(currentLine)
+
+        if theLine !~# '^[ \t]*' . sexyComMarker
+            return 0
+        endif
+
+        "if there is a right delimiter in an intermediate line then the block isn't
+        "a sexy comment
+        if s:LastIndexOfDelim(right, theLine) !=# -1
+            return 0
+        endif
+
+        let currentLine = currentLine + 1
+    endwhile
+
+    "we have not found anything to suggest that this isn't a sexy comment so
+    return 1
+
+endfunction
+
+" Function: s:LastIndexOfDelim(delim, str) {{{2
+" This function takes a string and a delimiter and returns the last index of
+" that delimiter in string
+" Args:
+"   -delim: the delimiter to look for
+"   -str: the string to look for delimiter in
+function s:LastIndexOfDelim(delim, str)
+    let delim = a:delim
+    let lenDelim = strlen(delim)
+
+    "set index to the first occurrence of delimiter. If there is no occurrence then
+    "bail
+    let indx = s:FindDelimiterIndex(delim, a:str)
+    if indx ==# -1
+        return -1
+    endif
+
+    "keep moving to the next instance of delimiter in str till there is none left
+    while 1
+
+        "search for the next delimiter after the previous one
+        let searchStr = strpart(a:str, indx+lenDelim)
+        let indx2 = s:FindDelimiterIndex(delim, searchStr)
+
+        "if we find a delimiter update indx to record the position of it, if we
+        "don't find another delimiter then indx is the last one so break out of
+        "this loop
+        if indx2 !=# -1
+            let indx = indx + indx2 + lenDelim
+        else
+            break
+        endif
+    endwhile
+
+    return indx
+
+endfunction
+
+" Function: s:Left(...) {{{2
+" returns left delimiter data
+function s:Left(...)
+    let params = a:0 ? a:1 : {}
+
+    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['leftAlt'] : b:NERDCommenterDelims['left']
+
+    if delim ==# ''
+        return ''
+    endif
+
+    if has_key(params, 'space') && g:NERDSpaceDelims
+        let delim = delim . s:spaceStr
+    endif
+
+    if has_key(params, 'esc')
+        let delim = s:Esc(delim)
+    endif
+
+    return delim
+endfunction
+
+" Function: s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns the index of the left most
+" char (that is not a space or a tab) on all of these lines.
+" Args:
+"   -countCommentedLines: 1 if lines that are commented are to be checked as
+"    well. 0 otherwise
+"   -countEmptyLines: 1 if empty lines are to be counted in the search
+"   -topline: the top line to be checked
+"   -bottomline: the bottom line to be checked
+function s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
+
+    " declare the left most index as an extreme value
+    let leftMostIndx = 1000
+
+    " go thru the block line by line updating leftMostIndx
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+
+        " get the next line and if it is allowed to be commented, or is not
+        " commented, check it
+        let theLine = getline(currentLine)
+        if a:countEmptyLines || theLine !~# '^[ \t]*$'
+            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
+                " convert spaces to tabs and get the number of leading spaces for
+                " this line and update leftMostIndx if need be
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+                let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') )
+                if leadSpaceOfLine < leftMostIndx
+                    let leftMostIndx = leadSpaceOfLine
+                endif
+            endif
+        endif
+
+        " move on to the next line
+        let currentLine = currentLine + 1
+    endwhile
+
+    if leftMostIndx ==# 1000
+        return 0
+    else
+        return leftMostIndx
+    endif
+endfunction
+
+" Function: s:Multipart() {{{2
+" returns 1 if the current delimiters are multipart
+function s:Multipart()
+    return s:Right() !=# ''
+endfunction
+
+" Function: s:NerdEcho(msg, typeOfMsg) {{{2
+" Args:
+"   -msg: the message to echo
+"   -typeOfMsg: 0 = warning message
+"               1 = normal message
+function s:NerdEcho(msg, typeOfMsg)
+    if a:typeOfMsg ==# 0
+        echohl WarningMsg
+        echom 'NERDCommenter:' . a:msg
+        echohl None
+    elseif a:typeOfMsg ==# 1
+        echom 'NERDCommenter:' . a:msg
+    endif
+endfunction
+
+" Function: s:Nested() {{{2
+" returns 1 if the current multipart (if any) delimiters allow nesting
+function s:Nested()
+    return b:NERDCommenterDelims['nested']
+endfunction
+
+" Function: s:NumberOfLeadingTabs(s) {{{2
+" returns the number of leading tabs in the given string
+function s:NumberOfLeadingTabs(s)
+    return strlen(substitute(a:s, '^\(\t*\).*$', '\1', ''))
+endfunction
+
+" Function: s:NumLinesInBuf() {{{2
+" Returns the number of lines in the current buffer
+function s:NumLinesInBuf()
+    return line('$')
+endfunction
+
+" Function: s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str) {{{2
+" This function takes in a string, 2 delimiters in that string and 2 strings
+" to replace these delimiters with.
+"
+" Args:
+"   -toReplace1: the first delimiter to replace
+"   -toReplace2: the second delimiter to replace
+"   -replacor1: the string to replace toReplace1 with
+"   -replacor2: the string to replace toReplace2 with
+"   -str: the string that the delimiters to be replaced are in
+function s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str)
+    let line = s:ReplaceLeftMostDelim(a:toReplace1, a:replacor1, a:str)
+    let line = s:ReplaceRightMostDelim(a:toReplace2, a:replacor2, line)
+    return line
+endfunction
+
+" Function: s:ReplaceLeftMostDelim(toReplace, replacor, str) {{{2
+" This function takes a string and a delimiter and replaces the left most
+" occurrence of this delimiter in the string with a given string
+"
+" Args:
+"   -toReplace: the delimiter in str that is to be replaced
+"   -replacor: the string to replace toReplace with
+"   -str: the string that contains toReplace
+function s:ReplaceLeftMostDelim(toReplace, replacor, str)
+    let toReplace = a:toReplace
+    let replacor = a:replacor
+    "get the left most occurrence of toReplace
+    let indxToReplace = s:FindDelimiterIndex(toReplace, a:str)
+
+    "if there IS an occurrence of toReplace in str then replace it and return
+    "the resulting string
+    if indxToReplace !=# -1
+        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
+        return line
+    endif
+
+    return a:str
+endfunction
+
+" Function: s:ReplaceRightMostDelim(toReplace, replacor, str) {{{2
+" This function takes a string and a delimiter and replaces the right most
+" occurrence of this delimiter in the string with a given string
+"
+" Args:
+"   -toReplace: the delimiter in str that is to be replaced
+"   -replacor: the string to replace toReplace with
+"   -str: the string that contains toReplace
+"
+function s:ReplaceRightMostDelim(toReplace, replacor, str)
+    let toReplace = a:toReplace
+    let replacor = a:replacor
+    let lenToReplace = strlen(toReplace)
+
+    "get the index of the last delimiter in str
+    let indxToReplace = s:LastIndexOfDelim(toReplace, a:str)
+
+    "if there IS a delimiter in str, replace it and return the result
+    let line = a:str
+    if indxToReplace !=# -1
+        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
+    endif
+    return line
+endfunction
+
+"FUNCTION: s:RestoreScreenState() {{{2
+"
+"Sets the screen state back to what it was when s:SaveScreenState was last
+"called.
+"
+function s:RestoreScreenState()
+    if !exists('t:NERDComOldTopLine') || !exists('t:NERDComOldPos')
+        throw 'NERDCommenter exception: cannot restore screen'
+    endif
+
+    call cursor(t:NERDComOldTopLine, 0)
+    normal! zt
+    call setpos('.', t:NERDComOldPos)
+endfunction
+
+" Function: s:Right(...) {{{2
+" returns right delimiter data
+function s:Right(...)
+    let params = a:0 ? a:1 : {}
+
+    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['rightAlt'] : b:NERDCommenterDelims['right']
+
+    if delim ==# ''
+        return ''
+    endif
+
+    if has_key(params, 'space') && g:NERDSpaceDelims
+        let delim = s:spaceStr . delim
+    endif
+
+    if has_key(params, 'esc')
+        let delim = s:Esc(delim)
+    endif
+
+    return delim
+endfunction
+
+" Function: s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns the index of the right most
+" char on all of these lines.
+" Args:
+"   -countCommentedLines: 1 if lines that are commented are to be checked as
+"    well. 0 otherwise
+"   -countEmptyLines: 1 if empty lines are to be counted in the search
+"   -topline: the top line to be checked
+"   -bottomline: the bottom line to be checked
+function s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
+    let rightMostIndx = -1
+
+    " go thru the block line by line updating rightMostIndx
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+
+        " get the next line and see if it is commentable, otherwise it doesn't
+        " count
+        let theLine = getline(currentLine)
+        if a:countEmptyLines || theLine !~# '^[ \t]*$'
+
+            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
+
+                " update rightMostIndx if need be
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+                let lineLen = strlen(theLine)
+                if lineLen > rightMostIndx
+                    let rightMostIndx = lineLen
+                endif
+            endif
+        endif
+
+        " move on to the next line
+        let currentLine = currentLine + 1
+    endwhile
+
+    return rightMostIndx
+endfunction
+
+"FUNCTION: s:SaveScreenState() {{{2
+"Saves the current cursor position in the current buffer and the window
+"scroll position
+function s:SaveScreenState()
+    let t:NERDComOldPos = getpos('.')
+    let t:NERDComOldTopLine = line('w0')
+endfunction
+
+" Function: s:SwapOuterMultiPartDelimsForPlaceHolders(line) {{{2
+" This function takes a line and swaps the outer most multi-part delimiters for
+" place holders
+" Args:
+"   -line: the line to swap the delimiters in
+"
+function s:SwapOuterMultiPartDelimsForPlaceHolders(line)
+    " find out if the line is commented using normal delimiters and/or
+    " alternate ones
+    let isCommented = s:IsCommented(s:Left(), s:Right(), a:line)
+    let isCommentedAlt = s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), a:line)
+
+    let line2 = a:line
+
+    "if the line is commented and there is a right delimiter, replace
+    "the delimiters with place-holders
+    if isCommented && s:Multipart()
+        let line2 = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, a:line)
+
+    "similarly if the line is commented with the alternative
+    "delimiters
+    elseif isCommentedAlt && s:AltMultipart()
+        let line2 = s:ReplaceDelims(s:Left({'alt': 1}), s:Right({'alt': 1}), g:NERDLPlace, g:NERDRPlace, a:line)
+    endif
+
+    return line2
+endfunction
+
+" Function: s:SwapOuterPlaceHoldersForMultiPartDelims(line) {{{2
+" This function takes a line and swaps the outermost place holders for
+" multi-part delimiters
+" Args:
+"   -line: the line to swap the delimiters in
+"
+function s:SwapOuterPlaceHoldersForMultiPartDelims(line)
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left()
+        let right = s:Right()
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1})
+        let right = s:Right({'alt': 1})
+    endif
+
+    let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, a:line)
+    return line
+endfunction
+" Function: s:TabbedCol(line, col) {{{2
+" Gets the col number for given line and existing col number. The new col
+" number is the col number when all leading spaces are converted to tabs
+" Args:
+"   -line:the line to get the rel col for
+"   -col: the abs col
+function s:TabbedCol(line, col)
+    let lineTruncated = strpart(a:line, 0, a:col)
+    let lineSpacesToTabs = substitute(lineTruncated, s:TabSpace(), '\t', 'g')
+    return strlen(lineSpacesToTabs)
+endfunction
+"FUNCTION: s:TabSpace() {{{2
+"returns a string of spaces equal in length to &tabstop
+function s:TabSpace()
+    let tabSpace = ''
+    let spacesPerTab = &tabstop
+    while spacesPerTab > 0
+        let tabSpace = tabSpace . ' '
+        let spacesPerTab = spacesPerTab - 1
+    endwhile
+    return tabSpace
+endfunction
+
+" Function: s:UnEsc(str, escChar) {{{2
+" This function removes all the escape chars from a string
+" Args:
+"   -str: the string to remove esc chars from
+"   -escChar: the escape char to be removed
+function s:UnEsc(str, escChar)
+    return substitute(a:str, a:escChar, '', 'g')
+endfunction
+
+" Function: s:UntabbedCol(line, col) {{{2
+" Takes a line and a col and returns the absolute column of col taking into
+" account that a tab is worth 3 or 4 (or whatever) spaces.
+" Args:
+"   -line:the line to get the abs col for
+"   -col: the col that doesn't take into account tabs
+function s:UntabbedCol(line, col)
+    let lineTruncated = strpart(a:line, 0, a:col)
+    let lineTabsToSpaces = substitute(lineTruncated, '\t', s:TabSpace(), 'g')
+    return strlen(lineTabsToSpaces)
+endfunction
+" Section: Comment mapping and menu item setup {{{1
+" ===========================================================================
+
+" Create menu items for the specified modes.  If a:combo is not empty, then
+" also define mappings and show a:combo in the menu items.
+function! s:CreateMaps(modes, target, desc, combo)
+    " Build up a map command like
+    " 'noremap <silent> <plug>NERDCommenterComment :call NERDComment("n", "Comment")'
+    let plug = '<plug>NERDCommenter' . a:target
+    let plug_start = 'noremap <silent> ' . plug . ' :call NERDComment("'
+    let plug_end = '", "' . a:target . '")<cr>'
+    " Build up a menu command like
+    " 'menu <silent> comment.Comment<Tab>\\cc <plug>NERDCommenterComment'
+    let menuRoot = get(['', 'comment', '&comment', '&Plugin.&comment'],
+                \ g:NERDMenuMode, '')
+    let menu_command = 'menu <silent> ' . menuRoot . '.' . escape(a:desc, ' ')
+    if strlen(a:combo)
+        let leader = exists('g:mapleader') ? g:mapleader : '\'
+        let menu_command .= '<Tab>' . escape(leader, '\') . a:combo
+    endif
+    let menu_command .= ' ' . (strlen(a:combo) ? plug : a:target)
+    " Execute the commands built above for each requested mode.
+    for mode in (a:modes ==# '') ? [''] : split(a:modes, '\zs')
+        if strlen(a:combo)
+            execute mode . plug_start . mode . plug_end
+            if g:NERDCreateDefaultMappings && !hasmapto(plug, mode)
+                execute mode . 'map <leader>' . a:combo . ' ' . plug
+            endif
+        endif
+        " Check if the user wants the menu to be displayed.
+        if g:NERDMenuMode !=# 0
+            execute mode . menu_command
+        endif
+    endfor
+endfunction
+call s:CreateMaps('nx', 'Comment',    'Comment', 'cc')
+call s:CreateMaps('nx', 'Toggle',     'Toggle', 'c<space>')
+call s:CreateMaps('nx', 'Minimal',    'Minimal', 'cm')
+call s:CreateMaps('nx', 'Nested',     'Nested', 'cn')
+call s:CreateMaps('n',  'ToEOL',      'To EOL', 'c$')
+call s:CreateMaps('nx', 'Invert',     'Invert', 'ci')
+call s:CreateMaps('nx', 'Sexy',       'Sexy', 'cs')
+call s:CreateMaps('nx', 'Yank',       'Yank then comment', 'cy')
+call s:CreateMaps('n',  'Append',     'Append', 'cA')
+call s:CreateMaps('',   ':',          '-Sep-', '')
+call s:CreateMaps('nx', 'AlignLeft',  'Left aligned', 'cl')
+call s:CreateMaps('nx', 'AlignBoth',  'Left and right aligned', 'cb')
+call s:CreateMaps('',   ':',          '-Sep2-', '')
+call s:CreateMaps('nx', 'Uncomment',  'Uncomment', 'cu')
+call s:CreateMaps('n',  'AltDelims',  'Switch Delimiters', 'ca')
+call s:CreateMaps('i',  'Insert',     'Insert Comment Here', '')
+call s:CreateMaps('',   ':',          '-Sep3-', '')
+call s:CreateMaps('',   ':help NERDCommenterContents<CR>', 'Help', '')
+
+inoremap <silent> <plug>NERDCommenterInsert <SPACE><BS><ESC>:call NERDComment('i', 'insert')<CR>
+
+" switch to/from alternative delimiters (does not use wrapper function)
+nnoremap <plug>NERDCommenterAltDelims :call <SID>SwitchToAlternativeDelimiters(1)<cr>
+
+" This is a workaround to enable lazy-loading from supported plugin managers:
+" See https://github.com/preservim/nerdcommenter/issues/176
+call s:SetUpForNewFiletype(&filetype, 1)
+
+" vim: set foldmethod=marker :
diff --git a/bundle/fugitive/.gitignore b/pack/text/start/sleuth/.gitignore
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/fugitive/.gitignore
rename to pack/text/start/sleuth/.gitignore
diff --git a/pack/text/start/sleuth/CONTRIBUTING.markdown b/pack/text/start/sleuth/CONTRIBUTING.markdown
new file mode 100644
index 0000000..b3f0095
--- /dev/null
+++ b/pack/text/start/sleuth/CONTRIBUTING.markdown
@@ -0,0 +1 @@
+See the [contribution guidelines for pathogen.vim](https://github.com/tpope/vim-pathogen/blob/master/CONTRIBUTING.markdown).
diff --git a/pack/text/start/sleuth/README.markdown b/pack/text/start/sleuth/README.markdown
new file mode 100644
index 0000000..de4aadf
--- /dev/null
+++ b/pack/text/start/sleuth/README.markdown
@@ -0,0 +1,49 @@
+# sleuth.vim
+
+This plugin automatically adjusts `'shiftwidth'` and `'expandtab'`
+heuristically based on the current file, or, in the case the current file is
+new, blank, or otherwise insufficient, by looking at other files of the same
+type in the current and parent directories.  In lieu of adjusting
+`'softtabstop'`, `'smarttab'` is enabled.
+
+Compare to [DetectIndent][].  I wrote this because I wanted something fully
+automatic.  My goal is that by installing this plugin, you can remove all
+indenting related configuration from your vimrc.
+
+[DetectIndent]: http://www.vim.org/scripts/script.php?script_id=1171
+
+## Installation
+
+Install using your favorite package manager, or use Vim's built-in package
+support:
+
+    mkdir -p ~/.vim/pack/tpope/start
+    cd ~/.vim/pack/tpope/start
+    git clone https://tpope.io/vim/sleuth.git
+    vim -u NONE -c "helptags sleuth/doc" -c q
+
+## Notes
+
+* Searching for other files of the same type continues up the directory
+  hierarchy until a match is found. This means, for example, the indent for
+  the first file in a brand new Ruby project might very well be derived from
+  your `.irbrc`.  I consider this a feature.
+* If your file is consistently indented with hard tabs, `'shiftwidth'` will be
+  set to your `'tabstop'`.  Otherwise, a `'tabstop'` of 8 is enforced.
+* The algorithm is rolled from scratch, fairly simplistic, and only lightly
+  battle tested.  It's probably not (yet) as good as [DetectIndent][].
+  Let me know what it fails on for you.
+
+## Self-Promotion
+
+Like sleuth.vim?  Follow the repository on
+[GitHub](https://github.com/tpope/vim-sleuth) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=4375).  And if
+you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
+[Twitter](http://twitter.com/tpope) and
+[GitHub](https://github.com/tpope).
+
+## License
+
+Copyright © Tim Pope.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/pack/text/start/sleuth/doc/sleuth.txt b/pack/text/start/sleuth/doc/sleuth.txt
new file mode 100644
index 0000000..76832a0
--- /dev/null
+++ b/pack/text/start/sleuth/doc/sleuth.txt
@@ -0,0 +1,34 @@
+*sleuth.txt*  Heuristically set buffer options
+
+Author:  Tim Pope <http://tpo.pe/>
+Repo:    https://github.com/tpope/vim-sleuth
+License: Same terms as Vim itself (see |license|)
+
+This plugin is only available if 'compatible' is not set.
+
+SUMMARY                                         *sleuth*
+
+This plugin automatically adjusts 'shiftwidth' and 'expandtab' heuristically
+based on the current file, or, in the case the current file is new, blank, or
+otherwise insufficient, by looking at other files of the same type in the
+current and parent directories.  In lieu of adjusting 'softtabstop',
+'smarttab' is enabled.
+
+                                                *:Sleuth*
+:Sleuth                 Manually detect indentation.
+
+                                                *SleuthIndicator()*
+SleuthIndicator()       Indicator for inclusion in 'statusline'.  Or use
+                        flagship.vim to have it included automatically.
+
+SETTINGS                                     *sleuth-settings*
+
+Automatic detection of buffer options can be controlled with:
+>
+  let g:sleuth_automatic = 0
+<
+or:
+>
+  let b:sleuth_automatic = 0
+<
+ vim:tw=78:et:ft=help:norl:
diff --git a/pack/text/start/sleuth/plugin/sleuth.vim b/pack/text/start/sleuth/plugin/sleuth.vim
new file mode 100644
index 0000000..e5f6355
--- /dev/null
+++ b/pack/text/start/sleuth/plugin/sleuth.vim
@@ -0,0 +1,206 @@
+" sleuth.vim - Heuristically set buffer options
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      1.1
+" GetLatestVimScripts: 4375 1 :AutoInstall: sleuth.vim
+
+if exists("g:loaded_sleuth") || v:version < 700 || &cp
+  finish
+endif
+let g:loaded_sleuth = 1
+
+function! s:guess(lines) abort
+  let options = {}
+  let heuristics = {'spaces': 0, 'hard': 0, 'soft': 0}
+  let ccomment = 0
+  let podcomment = 0
+  let triplequote = 0
+  let backtick = 0
+  let xmlcomment = 0
+  let softtab = repeat(' ', 8)
+
+  for line in a:lines
+    if !len(line) || line =~# '^\s*$'
+      continue
+    endif
+
+    if line =~# '^\s*/\*'
+      let ccomment = 1
+    endif
+    if ccomment
+      if line =~# '\*/'
+        let ccomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^=\w'
+      let podcomment = 1
+    endif
+    if podcomment
+      if line =~# '^=\%(end\|cut\)\>'
+        let podcomment = 0
+      endif
+      continue
+    endif
+
+    if triplequote
+      if line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 0
+      endif
+      continue
+    elseif line =~# '^[^"]*"""[^"]*$'
+      let triplequote = 1
+    endif
+
+    if backtick
+      if line =~# '^[^`]*`[^`]*$'
+        let backtick = 0
+      endif
+      continue
+    elseif line =~# '^[^`]*`[^`]*$'
+      let backtick = 1
+    endif
+
+    if line =~# '^\s*<\!--'
+      let xmlcomment = 1
+    endif
+    if xmlcomment
+      if line =~# '-->'
+        let xmlcomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^\t'
+      let heuristics.hard += 1
+    elseif line =~# '^' . softtab
+      let heuristics.soft += 1
+    endif
+    if line =~# '^  '
+      let heuristics.spaces += 1
+    endif
+    let indent = len(matchstr(substitute(line, '\t', softtab, 'g'), '^ *'))
+    if indent > 1 && (indent < 4 || indent % 2 == 0) &&
+          \ get(options, 'shiftwidth', 99) > indent
+      let options.shiftwidth = indent
+    endif
+  endfor
+
+  if heuristics.hard && !heuristics.spaces
+    return {'expandtab': 0, 'shiftwidth': &tabstop}
+  elseif heuristics.soft != heuristics.hard
+    let options.expandtab = heuristics.soft > heuristics.hard
+    if heuristics.hard
+      let options.tabstop = 8
+    endif
+  endif
+
+  return options
+endfunction
+
+function! s:patterns_for(type) abort
+  if a:type ==# ''
+    return []
+  endif
+  if !exists('s:patterns')
+    redir => capture
+    silent autocmd BufRead
+    redir END
+    let patterns = {
+          \ 'c': ['*.c'],
+          \ 'html': ['*.html'],
+          \ 'sh': ['*.sh'],
+          \ 'vim': ['vimrc', '.vimrc', '_vimrc'],
+          \ }
+    let setfpattern = '\s\+\%(setf\%[iletype]\s\+\|set\%[local]\s\+\%(ft\|filetype\)=\|call SetFileTypeSH(["'']\%(ba\|k\)\=\%(sh\)\@=\)'
+    for line in split(capture, "\n")
+      let match = matchlist(line, '^\s*\(\S\+\)\='.setfpattern.'\(\w\+\)')
+      if !empty(match)
+        call extend(patterns, {match[2]: []}, 'keep')
+        call extend(patterns[match[2]], [match[1] ==# '' ? last : match[1]])
+      endif
+      let last = matchstr(line, '\S.*')
+    endfor
+    let s:patterns = patterns
+  endif
+  return copy(get(s:patterns, a:type, []))
+endfunction
+
+function! s:apply_if_ready(options) abort
+  if !has_key(a:options, 'expandtab') || !has_key(a:options, 'shiftwidth')
+    return 0
+  else
+    for [option, value] in items(a:options)
+      call setbufvar('', '&'.option, value)
+    endfor
+    return 1
+  endif
+endfunction
+
+function! s:detect() abort
+  if &buftype ==# 'help'
+    return
+  endif
+
+  let options = s:guess(getline(1, 1024))
+  if s:apply_if_ready(options)
+    return
+  endif
+  let c = get(b:, 'sleuth_neighbor_limit', get(g:, 'sleuth_neighbor_limit', 20))
+  let patterns = c > 0 ? s:patterns_for(&filetype) : []
+  call filter(patterns, 'v:val !~# "/"')
+  let dir = expand('%:p:h')
+  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && c > 0
+    for pattern in patterns
+      for neighbor in split(glob(dir.'/'.pattern), "\n")[0:7]
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          call extend(options, s:guess(readfile(neighbor, '', 256)), 'keep')
+          let c -= 1
+        endif
+        if s:apply_if_ready(options)
+          let b:sleuth_culprit = neighbor
+          return
+        endif
+        if c <= 0
+          break
+        endif
+      endfor
+      if c <= 0
+        break
+      endif
+    endfor
+    let dir = fnamemodify(dir, ':h')
+  endwhile
+  if has_key(options, 'shiftwidth')
+    return s:apply_if_ready(extend({'expandtab': 1}, options))
+  endif
+endfunction
+
+setglobal smarttab
+
+if !exists('g:did_indent_on')
+  filetype indent on
+endif
+
+function! SleuthIndicator() abort
+  let sw = &shiftwidth ? &shiftwidth : &tabstop
+  if &expandtab
+    return 'sw='.sw
+  elseif &tabstop == sw
+    return 'ts='.&tabstop
+  else
+    return 'sw='.sw.',ts='.&tabstop
+  endif
+endfunction
+
+augroup sleuth
+  autocmd!
+  autocmd FileType *
+        \ if get(b:, 'sleuth_automatic', get(g:, 'sleuth_automatic', 1))
+        \ | call s:detect() | endif
+  autocmd User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+augroup END
+
+command! -bar -bang Sleuth call s:detect()
+
+" vim:set et sw=2:
diff --git a/bundle/surround/doc/surround.txt b/pack/text/start/surround/doc/surround.txt
similarity index 100%
rename from bundle/surround/doc/surround.txt
rename to pack/text/start/surround/doc/surround.txt
diff --git a/bundle/surround/plugin/surround.vim b/pack/text/start/surround/plugin/surround.vim
similarity index 100%
rename from bundle/surround/plugin/surround.vim
rename to pack/text/start/surround/plugin/surround.vim
diff --git a/pack/ui/start/fugitive/autoload/fugitive.vim b/pack/ui/start/fugitive/autoload/fugitive.vim
new file mode 100644
index 0000000..7799520
--- /dev/null
+++ b/pack/ui/start/fugitive/autoload/fugitive.vim
@@ -0,0 +1,8133 @@
+" Location:     autoload/fugitive.vim
+" Maintainer:   Tim Pope <http://tpo.pe/>
+
+" The functions contained within this file are for internal use only.  For the
+" official API, see the commented functions in plugin/fugitive.vim.
+
+if exists('g:autoloaded_fugitive')
+  finish
+endif
+let g:autoloaded_fugitive = 1
+
+" Section: Utility
+
+function! s:function(name) abort
+  return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '.*\zs<SNR>\d\+_'),''))
+endfunction
+
+function! s:sub(str,pat,rep) abort
+  return substitute(a:str,'\v\C'.a:pat,a:rep,'')
+endfunction
+
+function! s:gsub(str,pat,rep) abort
+  return substitute(a:str,'\v\C'.a:pat,a:rep,'g')
+endfunction
+
+function! s:Uniq(list) abort
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    let str = string(a:list[i])
+    if has_key(seen, str)
+      call remove(a:list, i)
+    else
+      let seen[str] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction
+
+function! s:JoinChomp(list) abort
+  if empty(a:list[-1])
+    return join(a:list[0:-2], "\n")
+  else
+    return join(a:list, "\n")
+  endif
+endfunction
+
+function! s:winshell() abort
+  return has('win32') && &shellcmdflag !~# '^-'
+endfunction
+
+function! s:WinShellEsc(arg) abort
+  if type(a:arg) == type([])
+    return join(map(copy(a:arg), 's:WinShellEsc(v:val)'))
+  elseif a:arg =~# '^[A-Za-z0-9_/:.-]\+$'
+    return a:arg
+  else
+    return '"' . s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"') . '"'
+  endif
+endfunction
+
+function! s:shellesc(arg) abort
+  if type(a:arg) == type([])
+    return join(map(copy(a:arg), 's:shellesc(v:val)'))
+  elseif a:arg =~# '^[A-Za-z0-9_/:.-]\+$'
+    return a:arg
+  elseif s:winshell()
+    return '"' . s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"') . '"'
+  else
+    return shellescape(a:arg)
+  endif
+endfunction
+
+let s:fnameescape = " \t\n*?[{`$\\%#'\"|!<"
+function! s:fnameescape(file) abort
+  if type(a:file) == type([])
+    return join(map(copy(a:file), 's:fnameescape(v:val)'))
+  elseif exists('*fnameescape')
+    return fnameescape(a:file)
+  else
+    return escape(a:file, s:fnameescape)
+  endif
+endfunction
+
+function! s:throw(string) abort
+  throw 'fugitive: '.a:string
+endfunction
+
+function! s:VersionCheck() abort
+  if v:version < 703
+    return 'return ' . string('echoerr "fugitive: Vim 7.3 or newer required"')
+  elseif empty(fugitive#GitVersion())
+    let exe = get(s:GitCmd(), 0, '')
+    if len(exe) && !executable(exe)
+      return 'return ' . string('echoerr "fugitive: cannot find ' . string(exe) . ' in PATH"')
+    endif
+    return 'return ' . string('echoerr "fugitive: cannot execute Git"')
+  elseif !fugitive#GitVersion(1, 8, 5)
+    return 'return ' . string('echoerr "fugitive: Git 1.8.5 or newer required"')
+  else
+    return ''
+  endif
+endfunction
+
+let s:worktree_error = "core.worktree is required when using an external Git dir"
+function! s:DirCheck(...) abort
+  let vcheck = s:VersionCheck()
+  if !empty(vcheck)
+    return vcheck
+  endif
+  let dir = call('FugitiveGitDir', a:000)
+  if !empty(dir) && FugitiveWorkTree(dir, 1) is# 0
+    return 'return ' . string('echoerr "fugitive: ' . s:worktree_error . '"')
+  elseif !empty(dir)
+    return ''
+  elseif empty(bufname(''))
+    return 'return ' . string('echoerr "fugitive: working directory does not belong to a Git repository"')
+  else
+    return 'return ' . string('echoerr "fugitive: file does not belong to a Git repository"')
+  endif
+endfunction
+
+function! s:Mods(mods, ...) abort
+  let mods = substitute(a:mods, '\C<mods>', '', '')
+  let mods = mods =~# '\S$' ? mods . ' ' : mods
+  if a:0 && mods !~# '\<\%(aboveleft\|belowright\|leftabove\|rightbelow\|topleft\|botright\|tab\)\>'
+    if a:1 ==# 'Edge'
+      if mods =~# '\<vertical\>' ? &splitright : &splitbelow
+        let mods = 'botright ' . mods
+      else
+        let mods = 'topleft ' . mods
+      endif
+    else
+      let mods = a:1 . ' ' . mods
+    endif
+  endif
+  return substitute(mods, '\s\+', ' ', 'g')
+endfunction
+
+if exists('+shellslash')
+
+  let s:dir_commit_file = '\c^fugitive://\%(/\a\@=\)\=\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
+
+  function! s:Slash(path) abort
+    return tr(a:path, '\', '/')
+  endfunction
+
+  function! s:VimSlash(path) abort
+    return tr(a:path, '\/', &shellslash ? '//' : '\\')
+  endfunction
+
+else
+
+  let s:dir_commit_file = '\c^fugitive://\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
+
+  function! s:Slash(path) abort
+    return a:path
+  endfunction
+
+  function! s:VimSlash(path) abort
+    return a:path
+  endfunction
+
+endif
+
+function! s:AbsoluteVimPath(...) abort
+  if a:0 && type(a:1) == type('')
+    let path = a:1
+  else
+    let path = bufname(a:0 && a:1 > 0 ? a:1 : '')
+    if getbufvar(a:0 && a:1 > 0 ? a:1 : '', '&buftype') !~# '^\%(nowrite\|acwrite\)\=$'
+      return path
+    endif
+  endif
+  if s:Slash(path) =~# '^/\|^\a\+:'
+    return path
+  else
+    return getcwd() . matchstr(getcwd(), '[\\/]') . path
+  endif
+endfunction
+
+function! s:Resolve(path) abort
+  let path = resolve(a:path)
+  if has('win32')
+    let path = s:VimSlash(fnamemodify(fnamemodify(path, ':h'), ':p') . fnamemodify(path, ':t'))
+  endif
+  return path
+endfunction
+
+function! s:FileIgnoreCase(for_completion) abort
+  return (exists('+fileignorecase') && &fileignorecase)
+        \ || (a:for_completion && exists('+wildignorecase') && &wildignorecase)
+endfunction
+
+function! s:cpath(path, ...) abort
+  if s:FileIgnoreCase(0)
+    let path = s:VimSlash(tolower(a:path))
+  else
+    let path = s:VimSlash(a:path)
+  endif
+  return a:0 ? path ==# s:cpath(a:1) : path
+endfunction
+
+let s:executables = {}
+
+function! s:executable(binary) abort
+  if !has_key(s:executables, a:binary)
+    let s:executables[a:binary] = executable(a:binary)
+  endif
+  return s:executables[a:binary]
+endfunction
+
+if !exists('s:temp_scripts')
+  let s:temp_scripts = {}
+endif
+function! s:TempScript(...) abort
+  let body = join(a:000, "\n")
+  if !has_key(s:temp_scripts, body)
+    let s:temp_scripts[body] = tempname() . '.sh'
+  endif
+  let temp = s:temp_scripts[body]
+  if !filereadable(temp)
+    call writefile(['#!/bin/sh'] + a:000, temp)
+  endif
+  return FugitiveGitPath(temp)
+endfunction
+
+function! s:DoAutocmd(...) abort
+  if v:version >= 704 || (v:version == 703 && has('patch442'))
+    return join(map(copy(a:000), "'doautocmd <nomodeline>' . v:val"), '|')
+  elseif &modelines > 0
+    return 'try|set modelines=0|' . join(map(copy(a:000), "'doautocmd ' . v:val"), '|') . '|finally|set modelines=' . &modelines . '|endtry'
+  else
+    return join(map(copy(a:000), "'doautocmd ' . v:val"), '|')
+  endif
+endfunction
+
+let s:nowait = v:version >= 704 ? '<nowait>' : ''
+
+function! s:Map(mode, lhs, rhs, ...) abort
+  let maps = []
+  let defer = a:0 && a:1 =~# '<unique>' || get(g:, 'fugitive_defer_to_existing_maps')
+  let flags = substitute(a:0 ? a:1 : '', '<unique>', '', '') . (a:rhs =~# '<Plug>' ? '' : '<script>') . s:nowait
+  for mode in split(a:mode, '\zs')
+    if a:0 <= 1
+      call add(maps, mode.'map <buffer>' . substitute(flags, '<unique>', '', '') . ' <Plug>fugitive:' . a:lhs . ' ' . a:rhs)
+    endif
+    let skip = 0
+    let head = a:lhs
+    let tail = ''
+    let keys = get(g:, mode.'remap', {})
+    if type(keys) == type([])
+      continue
+    endif
+    while !empty(head)
+      if has_key(keys, head)
+        let head = keys[head]
+        let skip = empty(head)
+        break
+      endif
+      let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
+      let head = substitute(head, '<[^<>]*>$\|.$', '', '')
+    endwhile
+    if !skip && (!defer || empty(mapcheck(head.tail, mode)))
+      call add(maps, mode.'map <buffer>' . flags . ' ' . head.tail . ' ' . a:rhs)
+      if a:0 > 1 && a:2
+        let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') .
+              \ '|sil! exe "' . mode . 'unmap <buffer> ' . head.tail . '"'
+      endif
+    endif
+  endfor
+  exe join(maps, '|')
+  return ''
+endfunction
+
+function! fugitive#Autowrite() abort
+  if &autowrite || &autowriteall
+    try
+      if &confirm
+        let reconfirm = 1
+        setglobal noconfirm
+      endif
+      silent! wall
+    finally
+      if exists('reconfirm')
+        setglobal confirm
+      endif
+    endtry
+  endif
+  return ''
+endfunction
+
+function! fugitive#Wait(job_or_jobs, ...) abort
+  let original = type(a:job_or_jobs) == type([]) ? copy(a:job_or_jobs) : [a:job_or_jobs]
+  let jobs = map(copy(original), 'type(v:val) ==# type({}) ? get(v:val, "job", "") : v:val')
+  call filter(jobs, 'type(v:val) !=# type("")')
+  let timeout_ms = a:0 ? a:1 : -1
+  if exists('*jobwait')
+    call map(copy(jobs), 'chanclose(v:val, "stdin")')
+    call jobwait(jobs, timeout_ms)
+    let jobs = map(copy(original), 'type(v:val) ==# type({}) ? get(v:val, "job", "") : v:val')
+    call filter(jobs, 'type(v:val) !=# type("")')
+    if len(jobs)
+      sleep 1m
+    endif
+  else
+    let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+    for job in jobs
+      if ch_status(job) !=# 'closed'
+        call ch_close_in(job)
+      endif
+    endfor
+    let i = 0
+    for job in jobs
+      while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+        if i == timeout_ms
+          break
+        endif
+        let i += 1
+        exe sleep
+      endwhile
+    endfor
+  endif
+  return a:job_or_jobs
+endfunction
+
+function! s:JobVimExit(dict, callback, temp, job, status) abort
+  let a:dict.exit_status = a:status
+  let a:dict.stderr = readfile(a:temp . '.err', 'b')
+  call delete(a:temp . '.err')
+  let a:dict.stdout = readfile(a:temp . '.out', 'b')
+  call delete(a:temp . '.out')
+  call delete(a:temp . '.in')
+  call remove(a:dict, 'job')
+  call call(a:callback[0], [a:dict] + a:callback[1:-1])
+endfunction
+
+function! s:JobNvimExit(dict, callback, job, data, type) dict abort
+  let a:dict.stdout = self.stdout
+  let a:dict.stderr = self.stderr
+  let a:dict.exit_status = a:data
+  call remove(a:dict, 'job')
+  call call(a:callback[0], [a:dict] + a:callback[1:-1])
+endfunction
+
+function! s:JobExecute(argv, jopts, stdin, callback, ...) abort
+  let dict = a:0 ? a:1 : {}
+  let cb = len(a:callback) ? a:callback : [function('len')]
+  if exists('*jobstart')
+    call extend(a:jopts, {
+          \ 'stdout_buffered': v:true,
+          \ 'stderr_buffered': v:true,
+          \ 'on_exit': function('s:JobNvimExit', [dict, cb])})
+    let dict.job = jobstart(a:argv, a:jopts)
+    if !empty(a:stdin)
+      call chansend(dict.job, a:stdin)
+      call chanclose(dict.job, 'stdin')
+    endif
+  elseif exists('*ch_close_in')
+    let temp = tempname()
+    call extend(a:jopts, {
+          \ 'out_io': 'file',
+          \ 'out_name': temp . '.out',
+          \ 'err_io': 'file',
+          \ 'err_name': temp . '.err',
+          \ 'exit_cb': function('s:JobVimExit', [dict, cb, temp])})
+    if a:stdin ==# ['']
+      let a:jopts.in_io = 'null'
+    elseif !empty(a:stdin)
+      let a:jopts.in_io = 'file'
+      let a:jopts.in_name = temp . '.in'
+      call writefile(a:stdin, a:jopts.in_name, 'b')
+    endif
+    let dict.job = job_start(a:argv, a:jopts)
+  elseif &shell !~# 'sh' || &shell =~# 'fish\|\%(powershell\|pwsh\)\%(\.exe\)\=$'
+    throw 'fugitive: Vim 8 or higher required to use ' . &shell
+  else
+    let cmd = s:shellesc(a:argv)
+    let outfile = tempname()
+    try
+      if len(a:stdin)
+        call writefile(a:stdin, outfile . '.in', 'b')
+        let cmd = ' (' . cmd . ' >' . outfile . ' <' . outfile . '.in) '
+      else
+        let cmd = ' (' . cmd . ' >' . outfile . ') '
+      endif
+      let dict.stderr = split(system(cmd), "\n", 1)
+      let dict.exit_status = v:shell_error
+      let dict.stdout = readfile(outfile, 'b')
+      call call(cb[0], [dict] + cb[1:-1])
+    finally
+      call delete(outfile)
+      call delete(outfile . '.in')
+    endtry
+  endif
+  if empty(a:callback)
+    call fugitive#Wait(dict)
+  endif
+  return dict
+endfunction
+
+function! s:add_methods(namespace, method_names) abort
+  for name in a:method_names
+    let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name)
+  endfor
+endfunction
+
+" Section: Git
+
+let s:run_jobs = (exists('*ch_close_in') || exists('*jobstart')) && exists('*bufwinid')
+
+function! s:GitCmd() abort
+  if !exists('g:fugitive_git_executable')
+    return ['git']
+  elseif type(g:fugitive_git_executable) == type([])
+    return g:fugitive_git_executable
+  else
+    let dquote = '"\%([^"]\|""\|\\"\)*"\|'
+    let string = g:fugitive_git_executable
+    let list = []
+    if string =~# '^\w\+='
+      call add(list, '/usr/bin/env')
+    endif
+    while string =~# '\S'
+      let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] |]\)\+')
+      let string = strpart(string, len(arg))
+      let arg = substitute(arg, '^\s\+', '', '')
+      let arg = substitute(arg,
+            \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\)\|' . s:expand,
+            \ '\=submatch(0)[0] ==# "\\" ? submatch(0)[1] : submatch(0)[1:-2]', 'g')
+      call add(list, arg)
+    endwhile
+    return list
+  endif
+endfunction
+
+function! s:GitShellCmd() abort
+  if !exists('g:fugitive_git_executable')
+    return 'git'
+  elseif type(g:fugitive_git_executable) == type([])
+    return s:shellesc(g:fugitive_git_executable)
+  else
+    return g:fugitive_git_executable
+  endif
+endfunction
+
+function! s:UserCommandCwd(dir) abort
+  let tree = s:Tree(a:dir)
+  return len(tree) ? s:VimSlash(tree) : getcwd()
+endfunction
+
+function! s:UserCommandList(...) abort
+  if !fugitive#GitVersion(1, 8, 5)
+    throw 'fugitive: Git 1.8.5 or higher required'
+  endif
+  if !exists('g:fugitive_git_command')
+    let git = s:GitCmd()
+  elseif type(g:fugitive_git_command) == type([])
+    let git = g:fugitive_git_command
+  else
+    let git = split(g:fugitive_git_command, '\s\+')
+  endif
+  let flags = []
+  if a:0 && type(a:1) == type({})
+    let git = copy(get(a:1, 'git', git))
+    let flags = get(a:1, 'flags', flags)
+    let dir = a:1.git_dir
+  elseif a:0
+    let dir = s:GitDir(a:1)
+  else
+    let dir = ''
+  endif
+  if len(dir)
+    let tree = s:Tree(dir)
+    if empty(tree)
+      call add(git, '--git-dir=' . FugitiveGitPath(dir))
+    else
+      if !s:cpath(tree . '/.git', dir) || len($GIT_DIR)
+        call add(git, '--git-dir=' . FugitiveGitPath(dir))
+      endif
+      if !s:cpath(tree, getcwd())
+        call extend(git, ['-C', FugitiveGitPath(tree)])
+      endif
+    endif
+  endif
+  return git + flags
+endfunction
+
+let s:git_versions = {}
+function! fugitive#GitVersion(...) abort
+  let git = s:GitShellCmd()
+  if !has_key(s:git_versions, git)
+    let s:git_versions[git] = matchstr(get(s:JobExecute(s:GitCmd() + ['--version'], {}, [], [], {}).stdout, 0, ''), '\d[^[:space:]]\+')
+  endif
+  if !a:0
+    return s:git_versions[git]
+  endif
+  let components = split(s:git_versions[git], '\D\+')
+  if empty(components)
+    return -1
+  endif
+  for i in range(len(a:000))
+    if a:000[i] > +get(components, i)
+      return 0
+    elseif a:000[i] < +get(components, i)
+      return 1
+    endif
+  endfor
+  return a:000[i] ==# get(components, i)
+endfunction
+
+function! s:Dir(...) abort
+  return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir()
+endfunction
+
+function! s:GitDir(...) abort
+  return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir()
+endfunction
+
+function! s:SameRepo(one, two) abort
+  let one = s:GitDir(a:one)
+  return !empty(one) && one ==# s:GitDir(a:two)
+endfunction
+
+function! s:DirUrlPrefix(...) abort
+  return 'fugitive://' . call('s:GitDir', a:000) . '//'
+endfunction
+
+function! s:Tree(...) abort
+  return a:0 ? FugitiveWorkTree(a:1) : FugitiveWorkTree()
+endfunction
+
+function! s:HasOpt(args, ...) abort
+  let args = a:args[0 : index(a:args, '--')]
+  let opts = copy(a:000)
+  if type(opts[0]) == type([])
+    if empty(args) || index(opts[0], args[0]) == -1
+      return 0
+    endif
+    call remove(opts, 0)
+  endif
+  for opt in opts
+    if index(args, opt) != -1
+      return 1
+    endif
+  endfor
+endfunction
+
+function! s:PreparePathArgs(cmd, dir, literal, explicit) abort
+  if !a:explicit
+    call insert(a:cmd, '--literal-pathspecs')
+  endif
+  let split = index(a:cmd, '--')
+  for i in range(split < 0 ? len(a:cmd) : split)
+      if type(a:cmd[i]) == type(0)
+        if a:literal
+          let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
+        else
+          let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), ':(top,literal)', a:dir)
+        endif
+      endif
+  endfor
+  if split < 0
+    return a:cmd
+  endif
+  for i in range(split + 1, len(a:cmd) - 1)
+    if type(a:cmd[i]) == type(0)
+      if a:literal
+        let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), './', a:dir)
+      else
+        let a:cmd[i] = fugitive#Path(bufname(a:cmd[i]), ':(top,literal)', a:dir)
+      endif
+    elseif !a:explicit
+      let a:cmd[i] = fugitive#Path(a:cmd[i], './', a:dir)
+    endif
+  endfor
+  return a:cmd
+endfunction
+
+let s:git_index_file_env = {}
+function! s:GitIndexFileEnv() abort
+  if $GIT_INDEX_FILE =~# '^/\|^\a:' && !has_key(s:git_index_file_env, $GIT_INDEX_FILE)
+    let s:git_index_file_env[$GIT_INDEX_FILE] = s:Slash(FugitiveVimPath($GIT_INDEX_FILE))
+  endif
+  return get(s:git_index_file_env, $GIT_INDEX_FILE, '')
+endfunction
+
+function! s:PrepareEnv(env, dir) abort
+  if len($GIT_INDEX_FILE) && len(s:Tree(a:dir)) && !has_key(a:env, 'GIT_INDEX_FILE')
+    let index_dir = substitute(s:GitIndexFileEnv(), '[^/]\+$', '', '')
+    let our_dir = fugitive#Find('.git/', a:dir)
+    if !s:cpath(index_dir, our_dir) && !s:cpath(resolve(index_dir), our_dir)
+      let a:env['GIT_INDEX_FILE'] = FugitiveGitPath(fugitive#Find('.git/index', a:dir))
+    endif
+  endif
+  if len($GIT_WORK_TREE)
+    let a:env['GIT_WORK_TREE'] = '.'
+  endif
+endfunction
+
+let s:prepare_env = {
+      \ 'sequence.editor': 'GIT_SEQUENCE_EDITOR',
+      \ 'core.editor': 'GIT_EDITOR',
+      \ 'core.askpass': 'GIT_ASKPASS',
+      \ }
+function! fugitive#PrepareDirEnvGitFlagsArgs(...) abort
+  if !fugitive#GitVersion(1, 8, 5)
+    throw 'fugitive: Git 1.8.5 or higher required'
+  endif
+  let git = s:GitCmd()
+  if a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'git_dir') && has_key(a:1, 'flags') && has_key(a:1, 'args')
+    let cmd = a:1.flags + a:1.args
+    let dir = a:1.git_dir
+    if has_key(a:1, 'git')
+      let git = a:1.git
+    endif
+    let env = get(a:1, 'env', {})
+  else
+    let list_args = []
+    let cmd = []
+    for arg in a:000
+      if type(arg) ==# type([])
+        call extend(list_args, arg)
+      else
+        call add(cmd, arg)
+      endif
+    endfor
+    call extend(cmd, list_args)
+    let env = {}
+  endif
+  let autoenv = {}
+  let explicit_pathspec_option = 0
+  let literal_pathspecs = 1
+  let i = 0
+  let arg_count = 0
+  while i < len(cmd)
+    if type(cmd[i]) == type({})
+      if has_key(cmd[i], 'git_dir')
+        let dir = cmd[i].git_dir
+      endif
+      if has_key(cmd[i], 'git')
+        let git = cmd[i].git
+      endif
+      if has_key(cmd[i], 'env')
+        call extend(env, cmd[i].env)
+      endif
+      call remove(cmd, i)
+    elseif cmd[i] =~# '^$\|[\/.]' && cmd[i] !~# '^-'
+      let dir = remove(cmd, i)
+    elseif cmd[i] =~# '^--git-dir='
+      let dir = remove(cmd, i)[10:-1]
+    elseif type(cmd[i]) ==# type(0)
+      let dir = s:Dir(remove(cmd, i))
+    elseif cmd[i] ==# '-c' && len(cmd) > i + 1
+      let key = matchstr(cmd[i+1], '^[^=]*')
+      if has_key(s:prepare_env, tolower(key))
+        let var = s:prepare_env[tolower(key)]
+        let val = matchstr(cmd[i+1], '=\zs.*')
+        let autoenv[var] = val
+      endif
+      let i += 2
+    elseif cmd[i] =~# '^--.*pathspecs$'
+      let literal_pathspecs = (cmd[i] ==# '--literal-pathspecs')
+      let explicit_pathspec_option = 1
+      let i += 1
+    elseif cmd[i] !~# '^-'
+      let arg_count = len(cmd) - i
+      break
+    else
+      let i += 1
+    endif
+  endwhile
+  if !exists('dir')
+    let dir = s:Dir()
+  endif
+  call extend(autoenv, env)
+  call s:PrepareEnv(autoenv, dir)
+  if len($GPG_TTY) && !has_key(autoenv, 'GPG_TTY')
+    let autoenv.GPG_TTY = ''
+  endif
+  call s:PreparePathArgs(cmd, dir, literal_pathspecs, explicit_pathspec_option)
+  return [s:GitDir(dir), env, extend(autoenv, env), git, cmd[0 : -arg_count-1], arg_count ? cmd[-arg_count : -1] : []]
+endfunction
+
+function! s:BuildEnvPrefix(env) abort
+  let pre = ''
+  let env = items(a:env)
+  if empty(env)
+    return ''
+  elseif &shell =~# '\%(powershell\|pwsh\)\%(\.exe\)\=$'
+    return join(map(env, '"$Env:" . v:val[0] . " = ''" . substitute(v:val[1], "''", "''''", "g") . "''; "'), '')
+  elseif s:winshell()
+    return join(map(env, '"set " . substitute(join(v:val, "="), "[&|<>^]", "^^^&", "g") . "& "'), '')
+  else
+    return '/usr/bin/env ' . s:shellesc(map(env, 'join(v:val, "=")')) . ' '
+  endif
+endfunction
+
+function! s:JobOpts(cmd, env) abort
+  if empty(a:env)
+    return [a:cmd, {}]
+  elseif has('patch-8.2.0239') ||
+        \ has('nvim') && api_info().version.api_level - api_info().version.api_prerelease >= 7 ||
+        \ has('patch-8.0.0902') && !has('nvim') && (!has('win32') || empty(filter(keys(a:env), 'exists("$" . v:val)')))
+    return [a:cmd, {'env': a:env}]
+  endif
+  let envlist = map(items(a:env), 'join(v:val, "=")')
+  if !has('win32')
+    return [['/usr/bin/env'] + envlist + a:cmd, {}]
+  else
+    let pre = join(map(envlist, '"set " . substitute(v:val, "[&|<>^]", "^^^&", "g") . "& "'), '')
+    if len(a:cmd) == 3 && a:cmd[0] ==# 'cmd.exe' && a:cmd[1] ==# '/c'
+      return [a:cmd[0:1] + [pre . a:cmd[2]], {}]
+    else
+      return [['cmd.exe', '/c', pre . s:WinShellEsc(a:cmd)], {}]
+    endif
+  endif
+endfunction
+
+function! s:PrepareJob(opts) abort
+  let dict = {'argv': a:opts.argv}
+  if has_key(a:opts, 'env')
+    let dict.env = a:opts.env
+  endif
+  let [argv, jopts] = s:JobOpts(a:opts.argv, get(a:opts, 'env', {}))
+  if has_key(a:opts, 'cwd')
+    if has('patch-8.0.0902')
+      let jopts.cwd = a:opts.cwd
+      let dict.cwd = a:opts.cwd
+    else
+      throw 'fugitive: cwd unsupported'
+    endif
+  endif
+  return [argv, jopts, dict]
+endfunction
+
+function! fugitive#PrepareJob(...) abort
+  if a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'argv') && !has_key(a:1, 'args')
+    return s:PrepareJob(a:1)
+  endif
+  let [dir, user_env, exec_env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
+  let dict = {'git': git, 'git_dir': dir, 'flags': flags, 'args': args}
+  if len(user_env)
+    let dict.env = user_env
+  endif
+  let cmd = flags + args
+  let tree = s:Tree(dir)
+  if empty(tree) || index(cmd, '--') == len(cmd) - 1
+    let dict.cwd = getcwd()
+    call extend(cmd, ['--git-dir=' . FugitiveGitPath(dir)], 'keep')
+  else
+    let dict.cwd = s:VimSlash(tree)
+    call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
+    if !s:cpath(tree . '/.git', dir) || len($GIT_DIR)
+      call extend(cmd, ['--git-dir=' . FugitiveGitPath(dir)], 'keep')
+    endif
+  endif
+  call extend(cmd, git, 'keep')
+  return s:JobOpts(cmd, exec_env) + [dict]
+endfunction
+
+function! fugitive#Execute(...) abort
+  let cb = copy(a:000)
+  let cmd = []
+  let stdin = []
+  while len(cb) && type(cb[0]) !=# type(function('tr'))
+    if type(cb[0]) ==# type({}) && has_key(cb[0], 'stdin')
+      if type(cb[0].stdin) == type([])
+        call extend(stdin, cb[0].stdin)
+      elseif type(cb[0].stdin) == type('')
+        call extend(stdin, readfile(cb[0].stdin, 'b'))
+      endif
+      if len(keys(cb[0])) == 1
+        call remove(cb, 0)
+        continue
+      endif
+    endif
+    call add(cmd, remove(cb, 0))
+  endwhile
+  let [argv, jopts, dict] = call('fugitive#PrepareJob', cmd)
+  return s:JobExecute(argv, jopts, stdin, cb, dict)
+endfunction
+
+function! s:BuildShell(dir, env, git, args) abort
+  let cmd = copy(a:args)
+  let tree = s:Tree(a:dir)
+  let pre = s:BuildEnvPrefix(a:env)
+  if empty(tree) || index(cmd, '--') == len(cmd) - 1
+    call insert(cmd, '--git-dir=' . FugitiveGitPath(a:dir))
+  else
+    call extend(cmd, ['-C', FugitiveGitPath(tree)], 'keep')
+    if !s:cpath(tree . '/.git', a:dir) || len($GIT_DIR)
+      call extend(cmd, ['--git-dir=' . FugitiveGitPath(a:dir)], 'keep')
+    endif
+  endif
+  return pre . join(map(a:git + cmd, 's:shellesc(v:val)'))
+endfunction
+
+function! s:JobNvimCallback(lines, job, data, type) abort
+  let a:lines[-1] .= remove(a:data, 0)
+  call extend(a:lines, a:data)
+endfunction
+
+function! s:SystemList(cmd) abort
+  let exit = []
+  if exists('*jobstart')
+    let lines = ['']
+    let jopts = {
+          \ 'on_stdout': function('s:JobNvimCallback', [lines]),
+          \ 'on_stderr': function('s:JobNvimCallback', [lines]),
+          \ 'on_exit': { j, code, _ -> add(exit, code) }}
+    let job = jobstart(a:cmd, jopts)
+    call chanclose(job, 'stdin')
+    call jobwait([job])
+    if empty(lines[-1])
+      call remove(lines, -1)
+    endif
+    return [lines, exit[0]]
+  elseif exists('*ch_close_in')
+    let lines = []
+    let jopts = {
+          \ 'out_cb': { j, str -> add(lines, str) },
+          \ 'err_cb': { j, str -> add(lines, str) },
+          \ 'exit_cb': { j, code -> add(exit, code) }}
+    let job = job_start(a:cmd, jopts)
+    call ch_close_in(job)
+    let sleep = has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+    while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+      exe sleep
+    endwhile
+    return [lines, exit[0]]
+  else
+    let [output, exec_error] = s:SystemError(s:shellesc(a:cmd))
+    let lines = split(output, "\n", 1)
+    if empty(lines[-1])
+      call remove(lines, -1)
+    endif
+    return [lines, v:shell_error]
+  endif
+endfunction
+
+function! fugitive#ShellCommand(...) abort
+  let [dir, _, env, git, flags, args] = call('fugitive#PrepareDirEnvGitFlagsArgs', a:000)
+  return s:BuildShell(dir, env, git, flags + args)
+endfunction
+
+function! fugitive#Prepare(...) abort
+  return call('fugitive#ShellCommand', a:000)
+endfunction
+
+function! s:SystemError(cmd, ...) abort
+  let cmd = type(a:cmd) == type([]) ? s:shellesc(a:cmd) : a:cmd
+  try
+    if &shellredir ==# '>' && &shell =~# 'sh\|cmd'
+      let shellredir = &shellredir
+      if &shell =~# 'csh'
+        set shellredir=>&
+      else
+        set shellredir=>%s\ 2>&1
+      endif
+    endif
+    if exists('+guioptions') && &guioptions =~# '!'
+      let guioptions = &guioptions
+      set guioptions-=!
+    endif
+    let out = call('system', [cmd] + a:000)
+    return [out, v:shell_error]
+  catch /^Vim\%((\a\+)\)\=:E484:/
+    let opts = ['shell', 'shellcmdflag', 'shellredir', 'shellquote', 'shellxquote', 'shellxescape', 'shellslash']
+    call filter(opts, 'exists("+".v:val) && !empty(eval("&".v:val))')
+    call map(opts, 'v:val."=".eval("&".v:val)')
+    call s:throw('failed to run `' . cmd . '` with ' . join(opts, ' '))
+  finally
+    if exists('shellredir')
+      let &shellredir = shellredir
+    endif
+    if exists('guioptions')
+      let &guioptions = guioptions
+    endif
+  endtry
+endfunction
+
+function! s:ChompStderr(...) abort
+  let r = call('fugitive#Execute', a:000)
+  return !r.exit_status ? '' : len(r.stderr) > 1 ? s:JoinChomp(r.stderr) : 'unknown Git error' . string(r)
+endfunction
+
+function! s:ChompDefault(default, ...) abort
+  let r = call('fugitive#Execute', a:000)
+  return r.exit_status ? a:default : s:JoinChomp(r.stdout)
+endfunction
+
+function! s:LinesError(...) abort
+  let r = call('fugitive#Execute', a:000)
+  if empty(r.stdout[-1])
+    call remove(r.stdout, -1)
+  endif
+  return [r.exit_status ? [] : r.stdout, r.exit_status]
+endfunction
+
+function! s:NullError(cmd) abort
+  let r = fugitive#Execute(a:cmd)
+  let list = r.exit_status ? [] : split(tr(join(r.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
+  return [list, s:JoinChomp(r.stderr), r.exit_status]
+endfunction
+
+function! s:TreeChomp(...) abort
+  let r = call('fugitive#Execute', a:000)
+  if !r.exit_status
+    return s:JoinChomp(r.stdout)
+  endif
+  throw 'fugitive: error running `' . call('fugitive#ShellCommand', a:000) . '`: ' . s:JoinChomp(r.stderr)
+endfunction
+
+function! s:StdoutToFile(out, cmd, ...) abort
+  let [argv, jopts, _] = fugitive#PrepareJob(a:cmd)
+  let exit = []
+  if exists('*jobstart')
+    call extend(jopts, {
+          \ 'stdout_buffered': v:true,
+          \ 'stderr_buffered': v:true,
+          \ 'on_exit': { j, code, _ -> add(exit, code) }})
+    let job = jobstart(argv, jopts)
+    if a:0
+      call chansend(job, a:1)
+    endif
+    call chanclose(job, 'stdin')
+    call jobwait([job])
+    if len(a:out)
+      call writefile(jopts.stdout, a:out, 'b')
+    endif
+    return [join(jopts.stderr, "\n"), exit[0]]
+  elseif exists('*ch_close_in')
+    try
+      let err = tempname()
+      call extend(jopts, {
+            \ 'out_io': len(a:out) ? 'file' : 'null',
+            \ 'out_name': a:out,
+            \ 'err_io': 'file',
+            \ 'err_name': err,
+            \ 'exit_cb': { j, code -> add(exit, code) }})
+      let job = job_start(argv, jopts)
+      if a:0
+        call ch_sendraw(job, a:1)
+      endif
+      call ch_close_in(job)
+      while ch_status(job) !=# 'closed' || job_status(job) ==# 'run'
+        exe has('patch-8.2.2366') ? 'sleep! 1m' : 'sleep 1m'
+      endwhile
+      return [join(readfile(err, 'b'), "\n"), exit[0]]
+    finally
+      call delete(err)
+    endtry
+  elseif s:winshell() || &shell !~# 'sh' || &shell =~# 'fish\|\%(powershell\|pwsh\)\%(\.exe\)\=$'
+    throw 'fugitive: Vim 8 or higher required to use ' . &shell
+  else
+    let cmd = fugitive#ShellCommand(a:cmd)
+    return s:SystemError(' (' . cmd . ' >' . a:out . ') ')
+  endif
+endfunction
+
+let s:head_cache = {}
+
+function! fugitive#Head(...) abort
+  let dir = a:0 > 1 ? a:2 : s:Dir()
+  if empty(dir)
+    return ''
+  endif
+  let file = fugitive#Find('.git/HEAD', dir)
+  let ftime = getftime(file)
+  if ftime == -1
+    return ''
+  elseif ftime != get(s:head_cache, file, [-1])[0]
+    let s:head_cache[file] = [ftime, readfile(file)[0]]
+  endif
+  let head = s:head_cache[file][1]
+  let len = a:0 ? a:1 : 0
+  if head =~# '^ref: '
+    if len < 0
+      return strpart(head, 5)
+    else
+      return substitute(head, '\C^ref: \%(refs/\%(heads/\|remotes/\|tags/\)\=\)\=', '', '')
+    endif
+  elseif head =~# '^\x\{40,\}$'
+    return len < 0 ? head : strpart(head, 0, len)
+  else
+    return ''
+  endif
+endfunction
+
+function! fugitive#head(...) abort
+  throw 'Third party code is using fugitive#head() which has been removed. Change it to FugitiveHead()'
+endfunction
+
+function! fugitive#RevParse(rev, ...) abort
+  let hash = s:ChompDefault('', [a:0 ? a:1 : s:Dir(), 'rev-parse', '--verify', a:rev, '--'])
+  if hash =~# '^\x\{40,\}$'
+    return hash
+  endif
+  throw 'fugitive: failed to parse revision ' . a:rev
+endfunction
+
+" Section: Git config
+
+function! s:ConfigTimestamps(dir, dict) abort
+  let files = ['/etc/gitconfig', '~/.gitconfig',
+        \ len($XDG_CONFIG_HOME) ? $XDG_CONFIG_HOME . '/git/config' : '~/.config/git/config']
+  if len(a:dir)
+    call add(files, fugitive#Find('.git/config', a:dir))
+  endif
+  call extend(files, get(a:dict, 'include.path', []))
+  return join(map(files, 'getftime(expand(v:val))'), ',')
+endfunction
+
+function! s:ConfigCallback(r, into) abort
+  let dict = a:into[1]
+  if has_key(dict, 'job')
+    call remove(dict, 'job')
+  endif
+  let lines = a:r.exit_status ? [] : split(tr(join(a:r.stdout, "\1"), "\1\n", "\n\1"), "\1", 1)[0:-2]
+  for line in lines
+    let key = matchstr(line, "^[^\n]*")
+    if !has_key(dict, key)
+      let dict[key] = []
+    endif
+    if len(key) ==# len(line)
+      call add(dict[key], 1)
+    else
+      call add(dict[key], strpart(line, len(key) + 1))
+    endif
+  endfor
+  let callbacks = remove(dict, 'callbacks')
+  lockvar! dict
+  let a:into[0] = s:ConfigTimestamps(dict.git_dir, dict)
+  for callback in callbacks
+    call call(callback[0], [dict] + callback[1:-1])
+  endfor
+endfunction
+
+let s:config_prototype = {}
+
+let s:config = {}
+function! fugitive#ExpireConfig(...) abort
+  if !a:0 || a:1 is# 0
+    let s:config = {}
+  else
+    let key = a:1 is# '' ? '_' : s:GitDir(a:0 ? a:1 : -1)
+    if len(key) && has_key(s:config, key)
+      call remove(s:config, key)
+    endif
+  endif
+endfunction
+
+function! fugitive#Config(...) abort
+  let name = ''
+  let default = get(a:, 3, '')
+  if a:0 && type(a:1) == type(function('tr'))
+    let dir = s:Dir()
+    let callback = a:000
+  elseif a:0 > 1 && type(a:2) == type(function('tr'))
+    if type(a:1) == type({}) && has_key(a:1, 'GetAll')
+      if has_key(a:1, 'callbacks')
+        call add(a:1.callbacks, a:000[1:-1])
+      else
+        call call(a:2, [a:1] + a:000[2:-1])
+      endif
+      return a:1
+    else
+      let dir = s:Dir(a:1)
+      let callback = a:000[1:-1]
+    endif
+  elseif a:0 >= 2 && type(a:2) == type({}) && has_key(a:2, 'GetAll')
+    return get(fugitive#ConfigGetAll(a:1, a:2), 0, default)
+  elseif a:0 >= 2
+    let dir = s:Dir(a:2)
+    let name = a:1
+  elseif a:0 == 1 && type(a:1) == type({}) && has_key(a:1, 'GetAll')
+    return a:1
+  elseif a:0 == 1 && type(a:1) == type('') && a:1 =~# '^[[:alnum:]-]\+\.'
+    let dir = s:Dir()
+    let name = a:1
+  elseif a:0 == 1
+    let dir = s:Dir(a:1)
+  else
+    let dir = s:Dir()
+  endif
+  let name = substitute(name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
+  let git_dir = s:GitDir(dir)
+  let dir_key = len(git_dir) ? git_dir : '_'
+  let [ts, dict] = get(s:config, dir_key, ['new', {}])
+  if !has_key(dict, 'job') && ts !=# s:ConfigTimestamps(git_dir, dict)
+    let dict = copy(s:config_prototype)
+    let dict.git_dir = git_dir
+    let into = ['running', dict]
+    let dict.callbacks = []
+    let exec = fugitive#Execute([dir, 'config', '--list', '-z', '--'], function('s:ConfigCallback'), into)
+    if has_key(exec, 'job')
+      let dict.job = exec.job
+    endif
+    let s:config[dir_key] = into
+  endif
+  if !exists('l:callback')
+    call fugitive#Wait(dict)
+  elseif has_key(dict, 'callbacks')
+    call add(dict.callbacks, callback)
+  else
+    call call(callback[0], [dict] + callback[1:-1])
+  endif
+  return len(name) ? get(fugitive#ConfigGetAll(name, dict), 0, default) : dict
+endfunction
+
+function! fugitive#ConfigGetAll(name, ...) abort
+  if a:0 && (type(a:name) !=# type('') || a:name !~# '^[[:alnum:]-]\+\.' && type(a:1) ==# type('') && a:1 =~# '^[[:alnum:]-]\+\.')
+    let config = fugitive#Config(a:name)
+    let name = a:1
+  else
+    let config = fugitive#Config(a:0 ? a:1 : s:Dir())
+    let name = a:name
+  endif
+  let name = substitute(name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
+  call fugitive#Wait(config)
+  return name =~# '\.' ? copy(get(config, name, [])) : []
+endfunction
+
+function! fugitive#ConfigGetRegexp(pattern, ...) abort
+  if type(a:pattern) !=# type('')
+    let config = fugitive#Config(a:name)
+    let pattern = a:0 ? a:1 : '.*'
+  else
+    let config = fugitive#Config(a:0 ? a:1 : s:Dir())
+    let pattern = a:pattern
+  endif
+  call fugitive#Wait(config)
+  let filtered = map(filter(copy(config), 'v:key =~# "\\." && v:key =~# pattern'), 'copy(v:val)')
+  if pattern !~# '\\\@<!\%(\\\\\)*\\z[se]'
+    return filtered
+  endif
+  let transformed = {}
+  for [k, v] in items(filtered)
+    let k = matchstr(k, pattern)
+    if len(k)
+      let transformed[k] = v
+    endif
+  endfor
+  return transformed
+endfunction
+
+function! s:config_GetAll(name) dict abort
+  let name = substitute(a:name, '^[^.]\+\|[^.]\+$', '\L&', 'g')
+  call fugitive#Wait(self)
+  return name =~# '\.' ? copy(get(self, name, [])) : []
+endfunction
+
+function! s:config_Get(name, ...) dict abort
+  return get(self.GetAll(a:name), 0, a:0 ? a:1 : '')
+endfunction
+
+function! s:config_GetRegexp(pattern) dict abort
+  return fugitive#ConfigGetRegexp(self, a:pattern)
+endfunction
+
+call s:add_methods('config', ['GetAll', 'Get', 'GetRegexp'])
+
+function! s:RemoteDefault(dir) abort
+  let head = FugitiveHead(0, a:dir)
+  let remote = len(head) ? FugitiveConfigGet('branch.' . head . '.remote', a:dir) : ''
+  let i = 10
+  while remote ==# '.' && i > 0
+    let head = matchstr(FugitiveConfigGet('branch.' . head . '.merge', a:dir), 'refs/heads/\zs.*')
+    let remote = len(head) ? FugitiveConfigGet('branch.' . head . '.remote', a:dir) : ''
+    let i -= 1
+  endwhile
+  return remote =~# '^\.\=$' ? 'origin' : remote
+endfunction
+
+function! s:SshParseHost(value) abort
+  let patterns = []
+  let negates = []
+  for host in split(a:value, '\s\+')
+    let pattern = substitute(host, '[\\^$.*~?]', '\=submatch(0) == "*" ? ".*" : submatch(0) == "?" ? "." : "\\" . submatch(0)', 'g')
+    if pattern[0] ==# '!'
+      call add(negates, '\&\%(^' . pattern[1 : -1] . '$\)\@!')
+    else
+      call add(patterns, pattern)
+    endif
+  endfor
+  return '^\%(' . join(patterns, '\|') . '\)$' . join(negates, '')
+endfunction
+
+function! s:SshParseConfig(into, root, file, ...) abort
+  if !filereadable(a:file)
+    return a:into
+  endif
+  let host = a:0 ? a:1 : '^\%(.*\)$'
+  for line in readfile(a:file)
+    let key = tolower(matchstr(line, '^\s*\zs\w\+\ze\s'))
+    let value = matchstr(line, '^\s*\w\+\s\+\zs.*\S')
+    if key ==# 'match'
+      let host = value ==# 'all' ? '^\%(.*\)$' : ''
+    elseif key ==# 'host'
+      let host = s:SshParseHost(value)
+    elseif key ==# 'include'
+      call s:SshParseInclude(a:into, a:root, host, value)
+    elseif len(key) && len(host)
+      call extend(a:into, {key: []}, 'keep')
+      call add(a:into[key], [host, value])
+    endif
+  endfor
+  return a:into
+endfunction
+
+function! s:SshParseInclude(into, root, host, value) abort
+  for glob in split(a:value)
+    if glob !~# '^/'
+      let glob = a:root . glob
+    endif
+    for file in split(glob(glob), "\n")
+      call s:SshParseConfig(a:into, a:root, file, a:host)
+    endfor
+  endfor
+endfunction
+
+unlet! s:ssh_config
+function! fugitive#SshConfig(host, ...) abort
+  if !exists('s:ssh_config')
+    let s:ssh_config = {}
+    for file in [expand("~/.ssh/config"), "/etc/ssh/ssh_config"]
+      call s:SshParseConfig(s:ssh_config, substitute(file, '\w*$', '', ''), file)
+    endfor
+  endif
+  let host_config = {}
+  for key in a:0 ? a:1 : keys(s:ssh_config)
+    for [host_pattern, value] in get(s:ssh_config, key, [])
+      if a:host =~# host_pattern
+        let host_config[key] = value
+        break
+      endif
+    endfor
+  endfor
+  return host_config
+endfunction
+
+function! fugitive#SshHostAlias(authority) abort
+  let [_, user, host, port; __] = matchlist(a:authority, '^\%(\([^/@]\+\)@\)\=\(.\{-\}\)\%(:\(\d\+\)\)\=$')
+  let c = fugitive#SshConfig(host, ['user', 'hostname', 'port'])
+  if empty(user)
+    let user = get(c, 'user', '')
+  endif
+  if empty(port)
+    let port = get(c, 'port', '')
+  endif
+  return (len(user) ? user . '@' : '') . get(c, 'hostname', host) . (port =~# '^\%(22\)\=$' ? '' : ':' . port)
+endfunction
+
+function! s:CurlResponse(result) abort
+  let a:result.headers = {}
+  for line in a:result.exit_status ? [] : remove(a:result, 'stdout')
+    let header = matchlist(line, '^\([[:alnum:]-]\+\):\s\(.\{-\}\)'. "\r\\=$")
+    if len(header)
+      let k = tolower(header[1])
+      if has_key(a:result.headers, k)
+        let a:result.headers[k] .= ', ' . header[2]
+      else
+        let a:result.headers[k] = header[2]
+      endif
+    elseif empty(line)
+      break
+    endif
+  endfor
+endfunction
+
+let s:remote_headers = {}
+
+function! fugitive#RemoteHttpHeaders(remote) abort
+  let remote = type(a:remote) ==# type({}) ? get(a:remote, 'remote', '') : a:remote
+  if type(remote) !=# type('') || remote !~# '^https\=://.' || !s:executable('curl')
+    return {}
+  endif
+  let remote = substitute(remote, '#.*', '', '')
+  if !has_key(s:remote_headers, remote)
+    let url = remote . '/info/refs?service=git-upload-pack'
+    let exec = s:JobExecute(
+          \ ['curl', '--disable', '--silent', '--max-time', '5', '-X', 'GET', '-I',
+          \ url], {}, [], [function('s:CurlResponse')], {})
+    call fugitive#Wait(exec)
+    let s:remote_headers[remote] = exec.headers
+  endif
+  return s:remote_headers[remote]
+endfunction
+
+function! s:UrlParse(url) abort
+  let scp_authority = matchstr(a:url, '^[^:/]\+\ze:\%(//\)\@!')
+  if len(scp_authority) && !(has('win32') && scp_authority =~# '^\a:[\/]')
+    let url = {'scheme': 'ssh', 'authority': scp_authority, 'hash': '',
+          \ 'path': substitute(strpart(a:url, len(scp_authority) + 1), '[#?]', '\=printf("%%%02X", char2nr(submatch(0)))', 'g')}
+  elseif empty(a:url)
+    let url = {'scheme': '', 'authority': '', 'path': '', 'hash': ''}
+  else
+    let match = matchlist(a:url, '^\([[:alnum:].+-]\+\)://\([^/]*\)\(/[^#]*\)\=\(#.*\)\=$')
+    if empty(match)
+      let url = {'scheme': 'file', 'authority': '', 'hash': '',
+            \ 'path': substitute(a:url, '[#?]', '\=printf("%%%02X", char2nr(submatch(0)))', 'g')}
+    else
+      let url = {'scheme': match[1], 'authority': match[2], 'hash': match[4]}
+      let url.path = empty(match[3]) ? '/' : match[3]
+    endif
+  endif
+  return url
+endfunction
+
+function! s:UrlPopulate(string, into) abort
+  let url = a:into
+  let url.protocol = substitute(url.scheme, '.\zs$', ':', '')
+  let url.user = matchstr(url.authority, '.\{-\}\ze@', '', '')
+  let url.host = substitute(url.authority, '.\{-\}@', '', '')
+  let url.hostname = substitute(url.host, ':\d\+$', '', '')
+  let url.port = matchstr(url.host, ':\zs\d\+$', '', '')
+  let url.origin = substitute(url.scheme, '.\zs$', '://', '') . url.host
+  let url.search = matchstr(url.path, '?.*')
+  let url.pathname = '/' . matchstr(url.path, '^/\=\zs[^?]*')
+  if (url.scheme ==# 'ssh' || url.scheme ==# 'git') && url.path[0:1] ==# '/~'
+    let url.path = strpart(url.path, 1)
+  endif
+  if url.path =~# '^/'
+    let url.href = url.scheme . '://' . url.authority . url.path . url.hash
+  elseif url.path =~# '^\~'
+    let url.href = url.scheme . '://' . url.authority . '/' . url.path . url.hash
+  elseif url.scheme ==# 'ssh' && url.authority !~# ':'
+    let url.href = url.authority . ':' . url.path . url.hash
+  else
+    let url.href = a:string
+  endif
+  let url.url = matchstr(url.href, '^[^#]*')
+endfunction
+
+function! s:RemoteResolve(url, flags) abort
+  let remote = s:UrlParse(a:url)
+  if remote.scheme =~# '^https\=$' && index(a:flags, ':nohttp') < 0
+    let headers = fugitive#RemoteHttpHeaders(a:url)
+    let loc = matchstr(get(headers, 'location', ''), '^https\=://.\{-\}\ze/info/refs?')
+    if len(loc)
+      let remote = s:UrlParse(loc)
+    else
+      let remote.headers = headers
+    endif
+  elseif remote.scheme ==# 'ssh'
+    let remote.authority = fugitive#SshHostAlias(remote.authority)
+  endif
+  return remote
+endfunction
+
+function! s:ConfigLengthSort(i1, i2) abort
+  return len(a:i2[0]) - len(a:i1[0])
+endfunction
+
+function! s:RemoteCallback(config, into, flags, cb) abort
+  if a:into.remote_name =~# '^\.\=$'
+    let a:into.remote_name = s:RemoteDefault(a:config)
+  endif
+  let url = a:into.remote_name
+
+  if url ==# '.git'
+    let url = s:GitDir(a:config)
+  elseif url !~# ':\|^/\|^\a:[\/]\|^\.\.\=/'
+    let url = FugitiveConfigGet('remote.' . url . '.url', a:config)
+  endif
+  let instead_of = []
+  for [k, vs] in items(fugitive#ConfigGetRegexp('^url\.\zs.\{-\}\ze\.insteadof$', a:config))
+    for v in vs
+      call add(instead_of, [v, k])
+    endfor
+  endfor
+  call sort(instead_of, 's:ConfigLengthSort')
+  for [orig, replacement] in instead_of
+    if strpart(url, 0, len(orig)) ==# orig
+      let url = replacement . strpart(url, len(orig))
+      break
+    endif
+  endfor
+  if index(a:flags, ':noresolve') < 0
+    call extend(a:into, s:RemoteResolve(url, a:flags))
+  else
+    call extend(a:into, s:UrlParse(url))
+  endif
+  call s:UrlPopulate(url, a:into)
+  if len(a:cb)
+    call call(a:cb[0], [a:into] + a:cb[1:-1])
+  endif
+endfunction
+
+function! s:Remote(dir, remote, flags, cb) abort
+  let into = {'remote_name': a:remote, 'git_dir': s:GitDir(a:dir)}
+  let config = fugitive#Config(a:dir, function('s:RemoteCallback'), into, a:flags, a:cb)
+  if len(a:cb)
+    return config
+  else
+    call fugitive#Wait(config)
+    return into
+  endif
+endfunction
+
+function! s:RemoteParseArgs(args) abort
+  " Extract ':noresolve' style flags and an optional callback
+  let args = []
+  let flags = []
+  let cb = copy(a:args)
+  while len(cb)
+    if type(cb[0]) ==# type(function('tr'))
+      break
+    elseif len(args) > 1 || type(cb[0]) ==# type('') && cb[0] =~# '^:'
+      call add(flags, remove(cb, 0))
+    else
+      call add(args, remove(cb, 0))
+    endif
+  endwhile
+
+  " From the remaining 0-2 arguments, extract the remote and Git config
+  let remote = ''
+  if empty(args)
+    let dir_or_config = s:Dir()
+  elseif len(args) == 1 && type(args[0]) ==# type('') && args[0] !~# '^/\|^\a:[\\/]'
+    let dir_or_config = s:Dir()
+    let remote = args[0]
+  elseif len(args) == 1
+    let dir_or_config = args[0]
+    if type(args[0]) ==# type({}) && has_key(args[0], 'remote_name')
+      let remote = args[0].remote_name
+    endif
+  elseif type(args[1]) !=# type('') || args[1] =~# '^/\|^\a:[\\/]'
+    let dir_or_config = args[1]
+    let remote = args[0]
+  else
+    let dir_or_config = args[0]
+    let remote = args[1]
+  endif
+  return [dir_or_config, remote, flags, cb]
+endfunction
+
+function! fugitive#Remote(...) abort
+  let [dir_or_config, remote, flags, cb] = s:RemoteParseArgs(a:000)
+  return s:Remote(dir_or_config, remote, flags, cb)
+endfunction
+
+function! s:RemoteUrlCallback(remote, callback) abort
+  return call(a:callback[0], [a:remote.url] + a:callback[1:-1])
+endfunction
+
+function! fugitive#RemoteUrl(...) abort
+  let [dir_or_config, remote, flags, cb] = s:RemoteParseArgs(a:000)
+  if len(cb)
+    let cb = [function('s:RemoteUrlCallback'), cb]
+  endif
+  let remote = s:Remote(dir_or_config, remote, flags, cb)
+  return get(remote, 'url', remote)
+endfunction
+
+" Section: Quickfix
+
+function! s:QuickfixGet(nr, ...) abort
+  if a:nr < 0
+    return call('getqflist', a:000)
+  else
+    return call('getloclist', [a:nr] + a:000)
+  endif
+endfunction
+
+function! s:QuickfixSet(nr, ...) abort
+  if a:nr < 0
+    return call('setqflist', a:000)
+  else
+    return call('setloclist', [a:nr] + a:000)
+  endif
+endfunction
+
+function! s:QuickfixCreate(nr, opts) abort
+  if has('patch-7.4.2200')
+    call s:QuickfixSet(a:nr, [], ' ', a:opts)
+  else
+    call s:QuickfixSet(a:nr, [], ' ')
+  endif
+endfunction
+
+function! s:QuickfixOpen(nr, mods) abort
+  let mods = substitute(s:Mods(a:mods), '\<tab\>', '', '')
+  return mods . (a:nr < 0 ? 'c' : 'l').'open' . (mods =~# '\<vertical\>' ? ' 20' : '')
+endfunction
+
+function! s:QuickfixStream(nr, event, title, cmd, first, mods, callback, ...) abort
+  call s:BlurStatus()
+  let opts = {'title': a:title, 'context': {'items': []}}
+  call s:QuickfixCreate(a:nr, opts)
+  let event = (a:nr < 0 ? 'c' : 'l') . 'fugitive-' . a:event
+  exe s:DoAutocmd('QuickFixCmdPre ' . event)
+  let winnr = winnr()
+  exe s:QuickfixOpen(a:nr, a:mods)
+  if winnr != winnr()
+    wincmd p
+  endif
+
+  let buffer = []
+  let lines = s:SystemList(a:cmd)[0]
+  for line in lines
+    call extend(buffer, call(a:callback, a:000 + [line]))
+    if len(buffer) >= 20
+      let contexts = map(copy(buffer), 'get(v:val, "context", {})')
+      lockvar contexts
+      call extend(opts.context.items, contexts)
+      unlet contexts
+      call s:QuickfixSet(a:nr, remove(buffer, 0, -1), 'a')
+      if a:mods !~# '\<silent\>'
+        redraw
+      endif
+    endif
+  endfor
+  call extend(buffer, call(a:callback, a:000 + [0]))
+  call extend(opts.context.items, map(copy(buffer), 'get(v:val, "context", {})'))
+  lockvar opts.context.items
+  call s:QuickfixSet(a:nr, buffer, 'a')
+
+  exe s:DoAutocmd('QuickFixCmdPost ' . event)
+  if a:first && len(s:QuickfixGet(a:nr))
+    return (a:nr < 0 ? 'cfirst' : 'lfirst')
+  else
+    return 'exe'
+  endif
+endfunction
+
+function! fugitive#Cwindow() abort
+  if &buftype == 'quickfix'
+    cwindow
+  else
+    botright cwindow
+    if &buftype == 'quickfix'
+      wincmd p
+    endif
+  endif
+endfunction
+
+" Section: Repository Object
+
+let s:repo_prototype = {}
+let s:repos = {}
+
+function! fugitive#repo(...) abort
+  let dir = a:0 ? s:GitDir(a:1) : (len(s:GitDir()) ? s:GitDir() : FugitiveExtractGitDir(expand('%:p')))
+  if dir !=# ''
+    if has_key(s:repos, dir)
+      let repo = get(s:repos, dir)
+    else
+      let repo = {'git_dir': dir}
+      let s:repos[dir] = repo
+    endif
+    return extend(repo, s:repo_prototype, 'keep')
+  endif
+  call s:throw('not a Git repository')
+endfunction
+
+function! s:repo_dir(...) dict abort
+  return join([self.git_dir]+a:000,'/')
+endfunction
+
+function! s:repo_tree(...) dict abort
+  let dir = s:Tree(self.git_dir)
+  if dir ==# ''
+    call s:throw('no work tree')
+  else
+    return join([dir]+a:000,'/')
+  endif
+endfunction
+
+function! s:repo_bare() dict abort
+  if self.dir() =~# '/\.git$'
+    return 0
+  else
+    return s:Tree(self.git_dir) ==# ''
+  endif
+endfunction
+
+function! s:repo_find(object) dict abort
+  return fugitive#Find(a:object, self.git_dir)
+endfunction
+
+function! s:repo_translate(rev) dict abort
+  return s:Slash(fugitive#Find(substitute(a:rev, '^/', ':(top)', ''), self.git_dir))
+endfunction
+
+function! s:repo_head(...) dict abort
+  return fugitive#Head(a:0 ? a:1 : 0, self.git_dir)
+endfunction
+
+call s:add_methods('repo',['dir','tree','bare','find','translate','head'])
+
+function! s:repo_git_command(...) dict abort
+  throw 'fugitive: fugitive#repo().git_command(...) has been replaced by FugitiveShellCommand(...)'
+endfunction
+
+function! s:repo_git_chomp(...) dict abort
+  return s:sub(system(fugitive#ShellCommand(a:000, self.git_dir)), '\n$', '')
+endfunction
+
+function! s:repo_git_chomp_in_tree(...) dict abort
+  return call(self.git_chomp, a:000, self)
+endfunction
+
+function! s:repo_rev_parse(rev) dict abort
+  return fugitive#RevParse(a:rev, self.git_dir)
+endfunction
+
+call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
+
+function! s:repo_superglob(base) dict abort
+  return map(fugitive#CompleteObject(a:base, self.git_dir), 'substitute(v:val, ''\\\(.\)'', ''\1'', "g")')
+endfunction
+
+call s:add_methods('repo',['superglob'])
+
+function! s:repo_config(name) dict abort
+  return FugitiveConfigGet(a:name, self.git_dir)
+endfunction
+
+function! s:repo_user() dict abort
+  let username = self.config('user.name')
+  let useremail = self.config('user.email')
+  return username.' <'.useremail.'>'
+endfunction
+
+call s:add_methods('repo',['config', 'user'])
+
+" Section: File API
+
+function! s:DirCommitFile(path) abort
+  let vals = matchlist(s:Slash(a:path), s:dir_commit_file)
+  if empty(vals)
+    return ['', '', '']
+  endif
+  return [s:Dir(vals[1])] + (empty(vals[2]) ? ['', '/.git/index'] : vals[2:3])
+endfunction
+
+function! s:DirRev(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  return [dir, commit . file ==# '/.git/index' ? ':' : (!empty(dir) && commit =~# '^.$' ? ':' : '') . commit . substitute(file, '^/', ':', '')]
+endfunction
+
+let s:merge_heads = ['MERGE_HEAD', 'REBASE_HEAD', 'CHERRY_PICK_HEAD', 'REVERT_HEAD']
+function! s:MergeHead(dir) abort
+  let dir = fugitive#Find('.git/', a:dir)
+  for head in s:merge_heads
+    if filereadable(dir . head)
+      return head
+    endif
+  endfor
+  return ''
+endfunction
+
+function! s:Owner(path, ...) abort
+  let dir = a:0 ? s:Dir(a:1) : s:Dir()
+  if empty(dir)
+    return ''
+  endif
+  let actualdir = fugitive#Find('.git/', dir)
+  let [pdir, commit, file] = s:DirCommitFile(a:path)
+  if s:SameRepo(dir, pdir)
+    if commit =~# '^\x\{40,\}$'
+      return commit
+    elseif commit ==# '2'
+      return '@'
+    elseif commit ==# '0'
+      return ''
+    endif
+    let merge_head = s:MergeHead(dir)
+    if empty(merge_head)
+      return ''
+    endif
+    if commit ==# '3'
+      return merge_head
+    elseif commit ==# '1'
+      return s:TreeChomp('merge-base', 'HEAD', merge_head, '--')
+    endif
+  endif
+  let path = fnamemodify(a:path, ':p')
+  if s:cpath(actualdir, strpart(path, 0, len(actualdir))) && a:path =~# 'HEAD$'
+    return strpart(path, len(actualdir))
+  endif
+  let refs = fugitive#Find('.git/refs', dir)
+  if s:cpath(refs . '/', path[0 : len(refs)]) && path !~# '[\/]$'
+    return strpart(path, len(refs) - 4)
+  endif
+  return ''
+endfunction
+
+function! fugitive#Real(url) abort
+  if empty(a:url)
+    return ''
+  endif
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if len(dir)
+    let tree = s:Tree(dir)
+    return s:VimSlash((len(tree) ? tree : s:GitDir(dir)) . file)
+  endif
+  let pre = substitute(matchstr(a:url, '^\a\a\+\ze:'), '^.', '\u&', '')
+  if len(pre) && pre !=? 'fugitive' && exists('*' . pre . 'Real')
+    let url = {pre}Real(a:url)
+  else
+    let url = fnamemodify(a:url, ':p' . (a:url =~# '[\/]$' ? '' : ':s?[\/]$??'))
+  endif
+  return s:VimSlash(empty(url) ? a:url : url)
+endfunction
+
+function! fugitive#Path(url, ...) abort
+  if empty(a:url)
+    return ''
+  endif
+  let repo = call('s:Dir', a:000[1:-1])
+  let dir_s = fugitive#Find('.git/', repo)
+  let tree = fugitive#Find(':/', repo)
+  if !a:0
+    return fugitive#Real(a:url)
+  elseif a:1 =~# '\.$'
+    let path = s:Slash(fugitive#Real(a:url))
+    let cwd = getcwd()
+    let lead = ''
+    while s:cpath(tree . '/', (cwd . '/')[0 : len(tree)])
+      if s:cpath(cwd . '/', path[0 : len(cwd)])
+        if strpart(path, len(cwd) + 1) =~# '^\.git\%(/\|$\)'
+          break
+        endif
+        return a:1[0:-2] . (empty(lead) ? './' : lead) . strpart(path, len(cwd) + 1)
+      endif
+      let cwd = fnamemodify(cwd, ':h')
+      let lead .= '../'
+    endwhile
+    return a:1[0:-2] . path
+  endif
+  let url = a:url
+  let temp_state = s:TempState(url)
+  if has_key(temp_state, 'origin_bufnr')
+    let url = bufname(temp_state.origin_bufnr)
+  endif
+  let url = s:Slash(fnamemodify(url, ':p'))
+  if url =~# '/$' && s:Slash(a:url) !~# '/$'
+    let url = url[0:-2]
+  endif
+  let [argdir, commit, file] = s:DirCommitFile(url)
+  if !empty(argdir) && !s:SameRepo(argdir, repo)
+    let file = ''
+  elseif len(dir_s) && s:cpath(strpart(url, 0, len(dir_s)), dir_s)
+    let file = '/.git' . strpart(url, len(dir_s)-1)
+  elseif len(tree) && s:cpath(url[0 : len(tree)]) ==# s:cpath(tree . '/')
+    let file = url[len(tree) : -1]
+  elseif s:cpath(url) ==# s:cpath(tree)
+    let file = '/'
+  endif
+  if empty(file) && a:1 =~# '^$\|^[.:]/$'
+    return FugitiveGitPath(fugitive#Real(a:url))
+  endif
+  return substitute(file, '^/', '\=a:1', '')
+endfunction
+
+function! s:Relative(...) abort
+  return fugitive#Path(@%, a:0 ? a:1 : ':(top)', a:0 > 1 ? a:2 : s:Dir())
+endfunction
+
+function! fugitive#Find(object, ...) abort
+  if type(a:object) == type(0)
+    let name = bufname(a:object)
+    return s:VimSlash(name =~# '^$\|^/\|^\a\+:' ? name : getcwd() . '/' . name)
+  elseif a:object =~# '^[~$]'
+    let prefix = matchstr(a:object, '^[~$]\i*')
+    let owner = expand(prefix)
+    return s:VimSlash(FugitiveVimPath((len(owner) ? owner : prefix) . strpart(a:object, len(prefix))))
+  endif
+  let rev = s:Slash(a:object)
+  if rev =~# '^$\|^/\|^\%(\a\a\+:\).*\%(//\|::\)' . (has('win32') ? '\|^\a:/' : '')
+    return s:VimSlash(a:object)
+  elseif rev =~# '^\.\.\=\%(/\|$\)'
+    return s:VimSlash(simplify(getcwd() . '/' . a:object))
+  endif
+  let dir = call('s:GitDir', a:000)
+  if empty(dir)
+    let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs\%(\.\.\=$\|\.\.\=/.*\|/.*\|\w:/.*\)')
+    let dir = FugitiveExtractGitDir(file)
+    if empty(dir)
+      return ''
+    endif
+  endif
+  let tree = s:Tree(dir)
+  let urlprefix = s:DirUrlPrefix(dir)
+  let base = len(tree) ? tree : urlprefix . '0'
+  if rev ==# '.git'
+    let f = len(tree) && len(getftype(tree . '/.git')) ? tree . '/.git' : dir
+  elseif rev =~# '^\.git/'
+    let f = strpart(rev, 5)
+    let fdir = dir . '/'
+    let cdir = FugitiveCommonDir(dir) . '/'
+    if f =~# '^\.\./\.\.\%(/\|$\)'
+      let f = simplify(len(tree) ? tree . f[2:-1] : fdir . f)
+    elseif f =~# '^\.\.\%(/\|$\)'
+      let f = base . f[2:-1]
+    elseif cdir !=# fdir && (
+          \ f =~# '^\%(config\|hooks\|info\|logs/refs\|objects\|refs\|worktrees\)\%(/\|$\)' ||
+          \ f !~# '^\%(index$\|index\.lock$\|\w*MSG$\|\w*HEAD$\|logs/\w*HEAD$\|logs$\|rebase-\w\+\)\%(/\|$\)' &&
+          \ getftime(fdir . f) < 0 && getftime(cdir . f) >= 0)
+      let f = simplify(cdir . f)
+    else
+      let f = simplify(fdir . f)
+    endif
+  elseif rev ==# ':/'
+    let f = tree
+  elseif rev =~# '^\.\%(/\|$\)'
+    let f = base . rev[1:-1]
+  elseif rev =~# '^::\%(/\|\a\+\:\)'
+    let f = rev[2:-1]
+  elseif rev =~# '^::\.\.\=\%(/\|$\)'
+    let f = simplify(getcwd() . '/' . rev[2:-1])
+  elseif rev =~# '^::'
+    let f = base . '/' . rev[2:-1]
+  elseif rev =~# '^:\%([0-3]:\)\=\.\.\=\%(/\|$\)\|^:[0-3]:\%(/\|\a\+:\)'
+    let f = rev =~# '^:\%([0-3]:\)\=\.' ? simplify(getcwd() . '/' . matchstr(rev, '\..*')) : rev[3:-1]
+    if s:cpath(base . '/', (f . '/')[0 : len(base)])
+      let f = urlprefix . +matchstr(rev, '^:\zs\d\ze:') . '/' . strpart(f, len(base) + 1)
+    else
+      let altdir = FugitiveExtractGitDir(f)
+      if len(altdir) && !s:cpath(dir, altdir)
+        return fugitive#Find(a:object, altdir)
+      endif
+    endif
+  elseif rev =~# '^:[0-3]:'
+    let f = urlprefix . rev[1] . '/' . rev[3:-1]
+  elseif rev ==# ':'
+    let fdir = dir . '/'
+    let f = fdir . 'index'
+    if len($GIT_INDEX_FILE)
+      let index_dir = substitute(s:GitIndexFileEnv(), '[^/]\+$', '', '')
+      if s:cpath(index_dir, fdir)
+        let f = s:GitIndexFileEnv()
+      elseif s:cpath(resolve(index_dir), fdir)
+        let f = resolve(s:GitIndexFileEnv())
+      endif
+    endif
+  elseif rev =~# '^:(\%(top\|top,literal\|literal,top\|literal\))'
+    let f = matchstr(rev, ')\zs.*')
+    if f=~# '^\.\.\=\%(/\|$\)'
+      let f = simplify(getcwd() . '/' . f)
+    elseif f !~# '^/\|^\%(\a\a\+:\).*\%(//\|::\)' . (has('win32') ? '\|^\a:/' : '')
+      let f = base . '/' . f
+    endif
+  elseif rev =~# '^:/\@!'
+    let f = urlprefix . '0/' . rev[1:-1]
+  else
+    if !exists('f')
+      let commit = matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\|^:.*')
+      let file = substitute(matchstr(rev, '^\%([^:.-]\|\.\.[^/:]\)[^:]*\zs:.*'), '^:', '/', '')
+      if file =~# '^/\.\.\=\%(/\|$\)\|^//\|^/\a\+:'
+        let file = file =~# '^/\.' ? simplify(getcwd() . file) : file[1:-1]
+        if s:cpath(base . '/', (file . '/')[0 : len(base)])
+          let file = '/' . strpart(file, len(base) + 1)
+        else
+          let altdir = FugitiveExtractGitDir(file)
+          if len(altdir) && !s:cpath(dir, altdir)
+            return fugitive#Find(a:object, altdir)
+          endif
+          return file
+        endif
+      endif
+      let commits = split(commit, '\.\.\.-\@!', 1)
+      if len(commits) == 2
+        call map(commits, 'empty(v:val) ? "@" : v:val')
+        let commit = matchstr(s:ChompDefault('', [dir, 'merge-base'] + commits + ['--']), '\<[0-9a-f]\{40,\}\>')
+      endif
+      if commit !~# '^[0-9a-f]\{40,\}$\|^$'
+        let commit = matchstr(s:ChompDefault('', [dir, 'rev-parse', '--verify', commit . (len(file) ? '^{}' : ''), '--']), '\<[0-9a-f]\{40,\}\>')
+        if empty(commit) && len(file)
+          let commit = repeat('0', 40)
+        endif
+      endif
+      if len(commit)
+        let f = urlprefix . commit . file
+      else
+        let f = base . '/' . substitute(rev, '^:/:\=\|^[^:]\+:', '', '')
+      endif
+    endif
+  endif
+  return s:VimSlash(f)
+endfunction
+
+function! s:Generate(object, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  let f = fugitive#Find(a:object, dir)
+  if !empty(f)
+    return f
+  elseif a:object ==# ':/'
+    return len(dir) ? s:VimSlash(s:DirUrlPrefix(dir) . '0') : '.'
+  endif
+  let file = matchstr(a:object, '^\%(:\d:\|[^:]*:\)\zs.*')
+  return fnamemodify(s:VimSlash(len(file) ? file : a:object), ':p')
+endfunction
+
+function! s:DotRelative(path, ...) abort
+  let cwd = a:0 ? a:1 : getcwd()
+  let path = substitute(a:path, '^[~$]\i*', '\=expand(submatch(0))', '')
+  if len(cwd) && s:cpath(cwd . '/', (path . '/')[0 : len(cwd)])
+    return '.' . strpart(path, len(cwd))
+  endif
+  return a:path
+endfunction
+
+function! fugitive#Object(...) abort
+  let dir = a:0 > 1 ? s:Dir(a:2) : s:Dir()
+  let [fdir, rev] = s:DirRev(a:0 ? a:1 : @%)
+  if !s:SameRepo(dir, fdir)
+    let rev = ''
+  endif
+  let tree = s:Tree(dir)
+  let full = a:0 ? a:1 : s:BufName('%')
+  let full = fnamemodify(full, ':p' . (s:Slash(full) =~# '/$' ? '' : ':s?/$??'))
+  if empty(rev) && empty(tree)
+    return FugitiveGitPath(full)
+  elseif empty(rev)
+    let rev = fugitive#Path(full, './', dir)
+    if rev =~# '^\./.git\%(/\|$\)'
+      return FugitiveGitPath(full)
+    endif
+  endif
+  if rev !~# '^\.\%(/\|$\)' || s:cpath(getcwd(), tree)
+    return rev
+  else
+    return FugitiveGitPath(tree . rev[1:-1])
+  endif
+endfunction
+
+let s:var = '\%(<\%(cword\|cWORD\|cexpr\|cfile\|sfile\|slnum\|afile\|abuf\|amatch' . (has('clientserver') ? '\|client' : '') . '\)>\|%\|#<\=\d\+\|##\=\)'
+let s:flag = '\%(:[p8~.htre]\|:g\=s\(.\).\{-\}\1.\{-\}\1\)'
+let s:expand = '\%(\(' . s:var . '\)\(' . s:flag . '*\)\(:S\)\=\)'
+
+function! s:BufName(var) abort
+  if a:var ==# '%'
+    return bufname(get(s:TempState(), 'origin_bufnr', ''))
+  elseif a:var =~# '^#\d*$'
+    let nr = get(s:TempState(+a:var[1:-1]), 'origin_bufnr', '')
+    return bufname(nr ? nr : +a:var[1:-1])
+  else
+    return expand(a:var)
+  endif
+endfunction
+
+function! s:ExpandVarLegacy(str) abort
+  if get(g:, 'fugitive_legacy_quoting', 0)
+    return substitute(a:str, '\\\ze[%#!]', '', 'g')
+  else
+    return a:str
+  endif
+endfunction
+
+function! s:ExpandVar(other, var, flags, esc, ...) abort
+  let cwd = a:0 ? a:1 : getcwd()
+  if a:other =~# '^\'
+    return a:other[1:-1]
+  elseif a:other =~# '^'''
+    return s:ExpandVarLegacy(substitute(a:other[1:-2], "''", "'", "g"))
+  elseif a:other =~# '^"'
+    return s:ExpandVarLegacy(substitute(a:other[1:-2], '""', '"', "g"))
+  elseif a:other =~# '^!'
+    let buffer = s:BufName(len(a:other) > 1 ? '#'. a:other[1:-1] : '%')
+    let owner = s:Owner(buffer)
+    return len(owner) ? owner : '@'
+  elseif a:other =~# '^\~[~.]$'
+    return s:Slash(getcwd())
+  elseif len(a:other)
+    return expand(a:other)
+  elseif a:var ==# '<cfile>'
+    let bufnames = [expand('<cfile>')]
+    if v:version >= 704 && get(maparg('<Plug><cfile>', 'c', 0, 1), 'expr')
+      try
+        let bufnames = [eval(maparg('<Plug><cfile>', 'c'))]
+        if bufnames[0] ==# "\<C-R>\<C-F>"
+          let bufnames = [expand('<cfile>')]
+        endif
+      catch
+      endtry
+    endif
+  elseif a:var =~# '^<'
+    let bufnames = [s:BufName(a:var)]
+  elseif a:var ==# '##'
+    let bufnames = map(argv(), 'fugitive#Real(v:val)')
+  else
+    let bufnames = [fugitive#Real(s:BufName(a:var))]
+  endif
+  let files = []
+  for bufname in bufnames
+    let flags = a:flags
+    let file = s:DotRelative(bufname, cwd)
+    while len(flags)
+      let flag = matchstr(flags, s:flag)
+      let flags = strpart(flags, len(flag))
+      if flag ==# ':.'
+        let file = s:DotRelative(fugitive#Real(file), cwd)
+      else
+        let file = fnamemodify(file, flag)
+      endif
+    endwhile
+    let file = s:Slash(file)
+    if file =~# '^fugitive://'
+      let [dir, commit, file_candidate] = s:DirCommitFile(file)
+      let tree = s:Tree(dir)
+      if len(tree) && len(file_candidate)
+        let file = (commit =~# '^.$' ? ':' : '') . commit . ':' .
+              \ s:DotRelative(tree . file_candidate)
+      elseif empty(file_candidate) && commit !~# '^.$'
+        let file = commit
+      endif
+    endif
+    call add(files, len(a:esc) ? shellescape(file) : file)
+  endfor
+  return join(files, "\1")
+endfunction
+
+function! s:Expand(rev, ...) abort
+  if a:rev =~# '^>' && s:Slash(@%) =~# '^fugitive://' && empty(s:DirCommitFile(@%)[1])
+    return s:Slash(@%)
+  elseif a:rev =~# '^>\=:[0-3]$'
+    let file = len(expand('%')) ? a:rev[-2:-1] . ':%' : '%'
+  elseif a:rev =~# '^>\%(:\=/\)\=$'
+    let file = '%'
+  elseif a:rev ==# '>:'
+    let file = empty(s:DirCommitFile(@%)[0]) ? ':0:%' : '%'
+  elseif a:rev =~# '^>[> ]\@!'
+    let rev = (a:rev =~# '^>[~^]' ? '!' : '') . a:rev[1:-1]
+    let prefix = matchstr(rev, '^\%(\\.\|{[^{}]*}\|[^:]\)*')
+    if prefix !=# rev
+      let file = rev
+    else
+      let file = len(expand('%')) ? rev . ':%' : '%'
+    endif
+  else
+    let file = a:rev
+  endif
+  return substitute(file,
+        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~.]\)\|' . s:expand,
+        \ '\=tr(s:ExpandVar(submatch(1),submatch(2),submatch(3),"", a:0 ? a:1 : getcwd()), "\1", " ")', 'g')
+endfunction
+
+function! fugitive#Expand(object) abort
+  return substitute(a:object,
+        \ '\(\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~.]\)\|' . s:expand,
+        \ '\=tr(s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5)), "\1", " ")', 'g')
+endfunction
+
+function! s:SplitExpandChain(string, ...) abort
+  let list = []
+  let string = a:string
+  let dquote = '"\%([^"]\|""\|\\"\)*"\|'
+  let cwd = a:0 ? a:1 : getcwd()
+  while string =~# '\S'
+    if string =~# '^\s*|'
+      return [list, substitute(string, '^\s*', '', '')]
+    endif
+    let arg = matchstr(string, '^\s*\%(' . dquote . '''[^'']*''\|\\.\|[^[:space:] |]\)\+')
+    let string = strpart(string, len(arg))
+    let arg = substitute(arg, '^\s\+', '', '')
+    if !exists('seen_separator')
+      let arg = substitute(arg, '^\%([^:.][^:]*:\|^:\%((literal)\)\=\|^:[0-3]:\)\=\zs\.\.\=\%(/.*\)\=$',
+            \ '\=s:DotRelative(s:Slash(simplify(getcwd() . "/" . submatch(0))), cwd)', '')
+    endif
+    let arg = substitute(arg,
+          \ '\(' . dquote . '''\%(''''\|[^'']\)*''\|\\[' . s:fnameescape . ']\|^\\[>+-]\|!\d*\|^\~[~]\|^\~\w*\|\$\w\+\)\|' . s:expand,
+          \ '\=s:ExpandVar(submatch(1),submatch(2),submatch(3),submatch(5), cwd)', 'g')
+    call extend(list, split(arg, "\1", 1))
+    if arg ==# '--'
+      let seen_separator = 1
+    endif
+  endwhile
+  return [list, '']
+endfunction
+
+let s:trees = {}
+let s:indexes = {}
+function! s:TreeInfo(dir, commit) abort
+  let key = s:GitDir(a:dir)
+  if a:commit =~# '^:\=[0-3]$'
+    let index = get(s:indexes, key, [])
+    let newftime = getftime(fugitive#Find('.git/index', a:dir))
+    if get(index, 0, -1) < newftime
+      let [lines, exec_error] = s:LinesError([a:dir, 'ls-files', '--stage', '--'])
+      let s:indexes[key] = [newftime, {'0': {}, '1': {}, '2': {}, '3': {}}]
+      if exec_error
+        return [{}, -1]
+      endif
+      for line in lines
+        let [info, filename] = split(line, "\t")
+        let [mode, sha, stage] = split(info, '\s\+')
+        let s:indexes[key][1][stage][filename] = [newftime, mode, 'blob', sha, -2]
+        while filename =~# '/'
+          let filename = substitute(filename, '/[^/]*$', '', '')
+          let s:indexes[key][1][stage][filename] = [newftime, '040000', 'tree', '', 0]
+        endwhile
+      endfor
+    endif
+    return [get(s:indexes[key][1], a:commit[-1:-1], {}), newftime]
+  elseif a:commit =~# '^\x\{40,\}$'
+    if !has_key(s:trees, key)
+      let s:trees[key] = {}
+    endif
+    if !has_key(s:trees[key], a:commit)
+      let ftime = s:ChompDefault('', [a:dir, 'log', '-1', '--pretty=format:%ct', a:commit, '--'])
+      if empty(ftime)
+        let s:trees[key][a:commit] = [{}, -1]
+        return s:trees[key][a:commit]
+      endif
+      let s:trees[key][a:commit] = [{}, +ftime]
+      let [lines, exec_error] = s:LinesError([a:dir, 'ls-tree', '-rtl', '--full-name', a:commit, '--'])
+      if exec_error
+        return s:trees[key][a:commit]
+      endif
+      for line in lines
+        let [info, filename] = split(line, "\t")
+        let [mode, type, sha, size] = split(info, '\s\+')
+        let s:trees[key][a:commit][0][filename] = [+ftime, mode, type, sha, +size, filename]
+      endfor
+    endif
+    return s:trees[key][a:commit]
+  endif
+  return [{}, -1]
+endfunction
+
+function! s:PathInfo(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if empty(dir) || !get(g:, 'fugitive_file_api', 1)
+    return [-1, '000000', '', '', -1]
+  endif
+  let path = substitute(file[1:-1], '/*$', '', '')
+  let [tree, ftime] = s:TreeInfo(dir, commit)
+  let entry = empty(path) ? [ftime, '040000', 'tree', '', -1] : get(tree, path, [])
+  if empty(entry) || file =~# '/$' && entry[2] !=# 'tree'
+    return [-1, '000000', '', '', -1]
+  else
+    return entry
+  endif
+endfunction
+
+function! fugitive#simplify(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if empty(dir)
+    return ''
+  elseif empty(commit)
+    return s:VimSlash(s:DirUrlPrefix(simplify(s:GitDir(dir))))
+  endif
+  if file =~# '/\.\.\%(/\|$\)'
+    let tree = s:Tree(dir)
+    if len(tree)
+      let path = simplify(tree . file)
+      if strpart(path . '/', 0, len(tree) + 1) !=# tree . '/'
+        return s:VimSlash(path)
+      endif
+    endif
+  endif
+  return s:VimSlash(s:DirUrlPrefix(simplify(s:GitDir(dir))) . commit . simplify(file))
+endfunction
+
+function! fugitive#resolve(url) abort
+  let url = fugitive#simplify(a:url)
+  if url =~? '^fugitive:'
+    return url
+  else
+    return resolve(url)
+  endif
+endfunction
+
+function! fugitive#getftime(url) abort
+  return s:PathInfo(a:url)[0]
+endfunction
+
+function! fugitive#getfsize(url) abort
+  let entry = s:PathInfo(a:url)
+  if entry[4] == -2 && entry[2] ==# 'blob' && len(entry[3])
+    let dir = s:DirCommitFile(a:url)[0]
+    let entry[4] = +s:ChompDefault(-1, [dir, 'cat-file', '-s', entry[3]])
+  endif
+  return entry[4]
+endfunction
+
+function! fugitive#getftype(url) abort
+  return get({'tree': 'dir', 'blob': 'file'}, s:PathInfo(a:url)[2], '')
+endfunction
+
+function! fugitive#filereadable(url) abort
+  return s:PathInfo(a:url)[2] ==# 'blob'
+endfunction
+
+function! fugitive#filewritable(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if commit !~# '^\d$' || !filewritable(fugitive#Find('.git/index', dir))
+    return 0
+  endif
+  return s:PathInfo(a:url)[2] ==# 'blob' ? 1 : 2
+endfunction
+
+function! fugitive#isdirectory(url) abort
+  return s:PathInfo(a:url)[2] ==# 'tree'
+endfunction
+
+function! fugitive#getfperm(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  let perm = getfperm(dir)
+  let fperm = s:PathInfo(a:url)[1]
+  if fperm ==# '040000'
+    let fperm = '000755'
+  endif
+  if fperm !~# '[15]'
+    let perm = tr(perm, 'x', '-')
+  endif
+  if fperm !~# '[45]$'
+    let perm = tr(perm, 'rw', '--')
+  endif
+  if commit !~# '^\d$'
+    let perm = tr(perm, 'w', '-')
+  endif
+  return perm ==# '---------' ? '' : perm
+endfunction
+
+function! s:UpdateIndex(dir, info) abort
+  let info = join(a:info[0:-2]) . "\t" . a:info[-1] . "\n"
+  let [error, exec_error] = s:StdoutToFile('', [a:dir, 'update-index', '--index-info'], info)
+  return !exec_error ? '' : len(error) ? error : 'unknown update-index error'
+endfunction
+
+function! fugitive#setfperm(url, perm) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  let entry = s:PathInfo(a:url)
+  let perm = fugitive#getfperm(a:url)
+  if commit !~# '^\d$' || entry[2] !=# 'blob' ||
+      \ substitute(perm, 'x', '-', 'g') !=# substitute(a:perm, 'x', '-', 'g')
+    return -2
+  endif
+  let error = s:UpdateIndex(dir, [a:perm =~# 'x' ? '000755' : '000644', entry[3], commit, file[1:-1]])
+  return len(error) ? -1 : 0
+endfunction
+
+if !exists('s:blobdirs')
+  let s:blobdirs = {}
+endif
+function! s:BlobTemp(url) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if empty(file)
+    return ''
+  endif
+  let key = s:GitDir(dir)
+  if !has_key(s:blobdirs, key)
+    let s:blobdirs[key] = tempname()
+  endif
+  let tempfile = s:blobdirs[key] . '/' . commit . file
+  let tempparent = fnamemodify(tempfile, ':h')
+  if !isdirectory(tempparent)
+    call mkdir(tempparent, 'p')
+  elseif isdirectory(tempfile)
+    if commit =~# '^\d$' && has('patch-7.4.1107')
+      call delete(tempfile, 'rf')
+    else
+      return ''
+    endif
+  endif
+  if commit =~# '^\d$' || !filereadable(tempfile)
+    let rev = s:DirRev(a:url)[1]
+    let blob_or_filters = fugitive#GitVersion(2, 11) ? '--filters' : 'blob'
+    let exec_error = s:StdoutToFile(tempfile, [dir, 'cat-file', blob_or_filters, rev])[1]
+    if exec_error
+      call delete(tempfile)
+      return ''
+    endif
+  endif
+  return s:Resolve(tempfile)
+endfunction
+
+function! fugitive#readfile(url, ...) abort
+  let entry = s:PathInfo(a:url)
+  if entry[2] !=# 'blob'
+    return []
+  endif
+  let temp = s:BlobTemp(a:url)
+  if empty(temp)
+    return []
+  endif
+  return call('readfile', [temp] + a:000)
+endfunction
+
+function! fugitive#writefile(lines, url, ...) abort
+  let url = type(a:url) ==# type('') ? a:url : ''
+  let [dir, commit, file] = s:DirCommitFile(url)
+  let entry = s:PathInfo(url)
+  if commit =~# '^\d$' && entry[2] !=# 'tree'
+    let temp = tempname()
+    if a:0 && a:1 =~# 'a' && entry[2] ==# 'blob'
+      call writefile(fugitive#readfile(url, 'b'), temp, 'b')
+    endif
+    call call('writefile', [a:lines, temp] + a:000)
+    let hash = s:ChompDefault('', [dir, '--literal-pathspecs', 'hash-object', '-w', FugitiveGitPath(temp)])
+    let mode = entry[1] !=# '000000' ? entry[1] : '100644'
+    if hash =~# '^\x\{40,\}$'
+      let error = s:UpdateIndex(dir, [mode, hash, commit, file[1:-1]])
+      if empty(error)
+        return 0
+      endif
+    endif
+  endif
+  return call('writefile', [a:lines, a:url] + a:000)
+endfunction
+
+let s:globsubs = {
+      \ '/**/': '/\%([^./][^/]*/\)*',
+      \ '/**': '/\%([^./][^/]\+/\)*[^./][^/]*',
+      \ '**/': '[^/]*\%(/[^./][^/]*\)*',
+      \ '**': '.*',
+      \ '/*': '/[^/.][^/]*',
+      \ '*': '[^/]*',
+      \ '?': '[^/]'}
+function! fugitive#glob(url, ...) abort
+  let [repo, commit, glob] = s:DirCommitFile(a:url)
+  let dirglob = s:GitDir(repo)
+  let append = matchstr(glob, '/*$')
+  let glob = substitute(glob, '/*$', '', '')
+  let pattern = '^' . substitute(glob, '/\=\*\*/\=\|/\=\*\|[.?\$]\|^^', '\=get(s:globsubs, submatch(0), "\\" . submatch(0))', 'g')[1:-1] . '$'
+  let results = []
+  for dir in dirglob =~# '[*?]' ? split(glob(dirglob), "\n") : [dirglob]
+    if empty(dir) || !get(g:, 'fugitive_file_api', 1) || !filereadable(fugitive#Find('.git/HEAD', dir))
+      continue
+    endif
+    let files = items(s:TreeInfo(dir, commit)[0])
+    if len(append)
+      call filter(files, 'v:val[1][2] ==# "tree"')
+    endif
+    call map(files, 'v:val[0]')
+    call filter(files, 'v:val =~# pattern')
+    let prepend = s:DirUrlPrefix(dir) . substitute(commit, '^:', '', '') . '/'
+    call sort(files)
+    call map(files, 's:VimSlash(prepend . v:val . append)')
+    call extend(results, files)
+  endfor
+  if a:0 > 1 && a:2
+    return results
+  else
+    return join(results, "\n")
+  endif
+endfunction
+
+function! fugitive#delete(url, ...) abort
+  let [dir, commit, file] = s:DirCommitFile(a:url)
+  if a:0 && len(a:1) || commit !~# '^\d$'
+    return -1
+  endif
+  let entry = s:PathInfo(a:url)
+  if entry[2] !=# 'blob'
+    return -1
+  endif
+  let error = s:UpdateIndex(dir, ['000000', '0000000000000000000000000000000000000000', commit, file[1:-1]])
+  return len(error) ? -1 : 0
+endfunction
+
+" Section: Buffer Object
+
+let s:buffer_prototype = {}
+
+function! fugitive#buffer(...) abort
+  let buffer = {'#': bufnr(a:0 ? a:1 : '%')}
+  call extend(buffer, s:buffer_prototype, 'keep')
+  return buffer
+endfunction
+
+function! s:buffer_repo() dict abort
+  return fugitive#repo(self['#'])
+endfunction
+
+function! s:buffer_type(...) dict abort
+  return 'see per type events at :help fugitive-autocommands'
+endfunction
+
+call s:add_methods('buffer', ['repo', 'type'])
+
+" Section: Completion
+
+function! s:FilterEscape(items, ...) abort
+  let items = copy(a:items)
+  call map(items, 'fnameescape(v:val)')
+  if !a:0 || type(a:1) != type('')
+    let match = ''
+  else
+    let match = substitute(a:1, '^[+>]\|\\\@<![' . substitute(s:fnameescape, '\\', '', '') . ']', '\\&', 'g')
+  endif
+  let cmp = s:FileIgnoreCase(1) ? '==?' : '==#'
+  return filter(items, 'strpart(v:val, 0, strlen(match)) ' . cmp . ' match')
+endfunction
+
+function! s:GlobComplete(lead, pattern, ...) abort
+  if a:lead ==# '/'
+    return []
+  elseif v:version >= 704
+    let results = glob(a:lead . a:pattern, a:0 ? a:1 : 0, 1)
+  else
+    let results = split(glob(a:lead . a:pattern), "\n")
+  endif
+  call map(results, 'v:val !~# "/$" && isdirectory(v:val) ? v:val."/" : v:val')
+  call map(results, 'v:val[ strlen(a:lead) : -1 ]')
+  return results
+endfunction
+
+function! fugitive#CompletePath(base, ...) abort
+  let dir = a:0 == 1 ? a:1 : a:0 >= 3 ? a:3 : s:Dir()
+  let stripped = matchstr(a:base, '^\%(:/:\=\|:(top)\|:(top,literal)\|:(literal,top)\)')
+  let base = strpart(a:base, len(stripped))
+  if len(stripped) || a:0 < 4
+    let root = s:Tree(dir)
+  else
+    let root = a:4
+  endif
+  if root !=# '/' && len(root)
+    let root .= '/'
+  endif
+  if empty(stripped)
+    let stripped = matchstr(a:base, '^\%(:(literal)\|:\)')
+    let base = strpart(a:base, len(stripped))
+  endif
+  if base =~# '^\.git/' && len(dir)
+    let pattern = s:gsub(base[5:-1], '/', '*&').'*'
+    let fdir = fugitive#Find('.git/', dir)
+    let matches = s:GlobComplete(fdir, pattern)
+    let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
+    if len(cdir) && s:cpath(fdir) !=# s:cpath(cdir)
+      call extend(matches, s:GlobComplete(cdir, pattern))
+    endif
+    call s:Uniq(matches)
+    call map(matches, "'.git/' . v:val")
+  elseif base =~# '^\~/'
+    let matches = map(s:GlobComplete(expand('~/'), base[2:-1] . '*'), '"~/" . v:val')
+  elseif a:base =~# '^/\|^\a\+:\|^\.\.\=/'
+    let matches = s:GlobComplete('', base . '*')
+  elseif len(root)
+    let matches = s:GlobComplete(root, s:gsub(base, '/', '*&').'*')
+  else
+    let matches = []
+  endif
+  call map(matches, 's:fnameescape(s:Slash(stripped . v:val))')
+  return matches
+endfunction
+
+function! fugitive#PathComplete(...) abort
+  return call('fugitive#CompletePath', a:000)
+endfunction
+
+function! s:CompleteHeads(dir) abort
+  if empty(a:dir)
+    return []
+  endif
+  let dir = fugitive#Find('.git/', a:dir)
+  return sort(filter(['HEAD', 'FETCH_HEAD', 'ORIG_HEAD'] + s:merge_heads, 'filereadable(dir . v:val)')) +
+        \ sort(s:LinesError([a:dir, 'rev-parse', '--symbolic', '--branches', '--tags', '--remotes'])[0])
+endfunction
+
+function! fugitive#CompleteObject(base, ...) abort
+  let dir = a:0 == 1 ? a:1 : a:0 >= 3 ? a:3 : s:Dir()
+  let tree = s:Tree(dir)
+  let cwd = getcwd()
+  let subdir = ''
+  if len(tree) && s:cpath(tree . '/', cwd[0 : len(tree)])
+    let subdir = strpart(cwd, len(tree) + 1) . '/'
+  endif
+  let base = s:Expand(a:base)
+
+  if a:base =~# '^!\d*$' && base !~# '^!'
+    return [base]
+  elseif base =~# '^\.\=/\|^:(' || base !~# ':'
+    let results = []
+    if base =~# '^refs/'
+      let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
+      let results += map(s:GlobComplete(cdir, base . '*'), 's:Slash(v:val)')
+      call map(results, 's:fnameescape(v:val)')
+    elseif base !~# '^\.\=/\|^:('
+      let heads = s:CompleteHeads(dir)
+      if filereadable(fugitive#Find('.git/refs/stash', dir))
+        let heads += ["stash"]
+        let heads += sort(s:LinesError(["stash","list","--pretty=format:%gd"], dir)[0])
+      endif
+      let results += s:FilterEscape(heads, fnameescape(base))
+    endif
+    let results += a:0 == 1 || a:0 >= 3 ? fugitive#CompletePath(base, 0, '', dir, a:0 >= 4 ? a:4 : tree) : fugitive#CompletePath(base)
+    return results
+
+  elseif base =~# '^:'
+    let entries = s:LinesError(['ls-files','--stage'], dir)[0]
+    if base =~# ':\./'
+      call map(entries, 'substitute(v:val, "\\M\t\\zs" . subdir, "./", "")')
+    endif
+    call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")')
+    if base !~# '^:[0-3]\%(:\|$\)'
+      call filter(entries,'v:val[1] == "0"')
+      call map(entries,'v:val[2:-1]')
+    endif
+
+  else
+    let parent = matchstr(base, '.*[:/]')
+    let entries = s:LinesError(['ls-tree', substitute(parent,  ':\zs\./', '\=subdir', '')], dir)[0]
+    call map(entries,'s:sub(v:val,"^04.*\\zs$","/")')
+    call map(entries,'parent.s:sub(v:val,".*\t","")')
+  endif
+  return s:FilterEscape(entries, fnameescape(base))
+endfunction
+
+function! s:CompleteSub(subcommand, A, L, P, ...) abort
+  let pre = strpart(a:L, 0, a:P)
+  if pre =~# ' -- '
+    return fugitive#CompletePath(a:A)
+  elseif a:A =~# '^-' || a:A is# 0
+    return s:FilterEscape(split(s:ChompDefault('', [a:subcommand, '--git-completion-helper']), ' '), a:A)
+  elseif !a:0
+    return fugitive#CompleteObject(a:A, s:Dir())
+  elseif type(a:1) == type(function('tr'))
+    return call(a:1, [a:A, a:L, a:P] + (a:0 > 1 ? a:2 : []))
+  else
+    return s:FilterEscape(a:1, a:A)
+  endif
+endfunction
+
+function! s:CompleteRevision(A, L, P, ...) abort
+  return s:FilterEscape(s:CompleteHeads(a:0 ? a:1 : s:Dir()), a:A)
+endfunction
+
+function! s:CompleteRemote(A, L, P, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  let remote = matchstr(a:L, '\u\w*[! ] *.\{-\}\s\@<=\zs[^-[:space:]]\S*\ze ')
+  if !empty(remote)
+    let matches = s:LinesError([dir, 'ls-remote', remote])[0]
+    call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
+    call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")')
+  else
+    let matches = s:LinesError([dir, 'remote'])[0]
+  endif
+  return s:FilterEscape(matches, a:A)
+endfunction
+
+" Section: Buffer auto-commands
+
+augroup fugitive_dummy_events
+  autocmd!
+  autocmd User Fugitive* "
+  autocmd BufWritePre,FileWritePre,FileWritePost * "
+  autocmd BufNewFile * "
+  autocmd QuickfixCmdPre,QuickfixCmdPost * "
+augroup END
+
+function! s:ReplaceCmd(cmd) abort
+  let temp = tempname()
+  let [err, exec_error] = s:StdoutToFile(temp, a:cmd)
+  if exec_error
+    throw 'fugitive: ' . (len(err) ? substitute(err, "\n$", '', '') : 'unknown error running ' . string(a:cmd))
+  endif
+  setlocal noswapfile
+  silent exe 'lockmarks keepalt noautocmd 0read ++edit' s:fnameescape(temp)
+  if &foldenable && foldlevel('$') > 0
+    set nofoldenable
+    silent keepjumps $delete _
+    set foldenable
+  else
+    silent keepjumps $delete _
+  endif
+  call delete(temp)
+  if s:cpath(s:AbsoluteVimPath(bufnr('$')), temp)
+    silent! noautocmd execute bufnr('$') . 'bwipeout'
+  endif
+endfunction
+
+function! s:QueryLog(refspec, limit) abort
+  let lines = s:LinesError(['log', '-n', '' . a:limit, '--pretty=format:%h%x09%s'] + a:refspec + ['--'])[0]
+  call map(lines, 'split(v:val, "\t", 1)')
+  call map(lines, '{"type": "Log", "commit": v:val[0], "subject": join(v:val[1 : -1], "\t")}')
+  return lines
+endfunction
+
+function! s:FormatLog(dict) abort
+  return a:dict.commit . ' ' . a:dict.subject
+endfunction
+
+function! s:FormatRebase(dict) abort
+  return a:dict.status . ' ' . a:dict.commit . ' ' . a:dict.subject
+endfunction
+
+function! s:FormatFile(dict) abort
+  return a:dict.status . ' ' . a:dict.filename
+endfunction
+
+function! s:Format(val) abort
+  if type(a:val) == type({})
+    return s:Format{a:val.type}(a:val)
+  elseif type(a:val) == type([])
+    return map(copy(a:val), 's:Format(v:val)')
+  else
+    return '' . a:val
+  endif
+endfunction
+
+function! s:AddHeader(key, value) abort
+  if empty(a:value)
+    return
+  endif
+  let before = 1
+  while !empty(getline(before))
+    let before += 1
+  endwhile
+  call append(before - 1, [a:key . ':' . (len(a:value) ? ' ' . a:value : '')])
+  if before == 1 && line('$') == 2
+    silent keepjumps 2delete _
+  endif
+endfunction
+
+function! s:AddSection(label, lines, ...) abort
+  let note = a:0 ? a:1 : ''
+  if empty(a:lines) && empty(note)
+    return
+  endif
+  call append(line('$'), ['', a:label . (len(note) ? ': ' . note : ' (' . len(a:lines) . ')')] + s:Format(a:lines))
+endfunction
+
+function! s:AddLogSection(label, refspec) abort
+  let limit = 256
+  let log = s:QueryLog(a:refspec, limit)
+  if empty(log)
+    return
+  elseif len(log) == limit
+    call remove(log, -1)
+    let label = a:label . ' (' . (limit - 1). '+)'
+  else
+    let label = a:label . ' (' . len(log) . ')'
+  endif
+  call append(line('$'), ['', label] + s:Format(log))
+endfunction
+
+let s:rebase_abbrevs = {
+      \ 'p': 'pick',
+      \ 'r': 'reword',
+      \ 'e': 'edit',
+      \ 's': 'squash',
+      \ 'f': 'fixup',
+      \ 'x': 'exec',
+      \ 'd': 'drop',
+      \ 'l': 'label',
+      \ 't': 'reset',
+      \ 'm': 'merge',
+      \ 'b': 'break',
+      \ }
+
+function! fugitive#BufReadStatus(...) abort
+  let amatch = s:Slash(expand('%:p'))
+  unlet! b:fugitive_reltime b:fugitive_type
+  try
+    doautocmd BufReadPre
+    let config = fugitive#Config()
+
+    let cmd = [s:Dir()]
+    setlocal noreadonly modifiable nomodeline buftype=nowrite
+    if amatch !~# '^fugitive:' && s:cpath($GIT_INDEX_FILE !=# '' ? resolve(s:GitIndexFileEnv()) : fugitive#Find('.git/index')) !=# s:cpath(amatch)
+      let cmd += [{'env': {'GIT_INDEX_FILE': FugitiveGitPath(amatch)}}]
+    endif
+
+    if fugitive#GitVersion(2, 15)
+      call add(cmd, '--no-optional-locks')
+    endif
+
+    let b:fugitive_files = {'Staged': {}, 'Unstaged': {}}
+    let [staged, unstaged, untracked] = [[], [], []]
+    let props = {}
+
+    let pull = ''
+    if empty(s:Tree())
+      let branch = FugitiveHead(0)
+      let head = FugitiveHead(11)
+    elseif fugitive#GitVersion(2, 11)
+      let cmd += ['status', '--porcelain=v2', '-bz']
+      let [output, message, exec_error] = s:NullError(cmd)
+      if exec_error
+        throw 'fugitive: ' . message
+      endif
+
+      let i = 0
+      while i < len(output)
+        let line = output[i]
+        let prop = matchlist(line, '# \(\S\+\) \(.*\)')
+        if len(prop)
+          let props[prop[1]] = prop[2]
+        elseif line[0] ==# '?'
+          call add(untracked, {'type': 'File', 'status': line[0], 'filename': line[2:-1], 'relative': [line[2:-1]]})
+        elseif line[0] !=# '#'
+          if line[0] ==# 'u'
+            let file = matchstr(line, '^.\{37\} \x\{40,\} \x\{40,\} \x\{40,\} \zs.*$')
+          else
+            let file = matchstr(line, '^.\{30\} \x\{40,\} \x\{40,\} \zs.*$')
+          endif
+          if line[0] ==# '2'
+            let i += 1
+            let file = matchstr(file, ' \zs.*')
+            let relative = [file, output[i]]
+          else
+            let relative = [file]
+          endif
+          let filename = join(reverse(copy(relative)), ' -> ')
+          let sub = matchstr(line, '^[12u] .. \zs....')
+          if line[2] !=# '.'
+            call add(staged, {'type': 'File', 'status': line[2], 'filename': filename, 'relative': relative, 'submodule': sub})
+          endif
+          if line[3] !=# '.'
+            let sub = matchstr(line, '^[12u] .. \zs....')
+            call add(unstaged, {'type': 'File', 'status': get({'C':'M','M':'?','U':'?'}, matchstr(sub, 'S\.*\zs[CMU]'), line[3]), 'filename': file, 'relative': [file], 'submodule': sub})
+          endif
+        endif
+        let i += 1
+      endwhile
+      let branch = substitute(get(props, 'branch.head', '(unknown)'), '\C^(\%(detached\|unknown\))$', '', '')
+      if len(branch)
+        let head = branch
+      elseif has_key(props, 'branch.oid')
+        let head = props['branch.oid'][0:10]
+      else
+        let head = FugitiveHead(11)
+      endif
+      let pull = get(props, 'branch.upstream', '')
+    else " git < 2.11
+      let cmd += ['status', '--porcelain', '-bz']
+      let [output, message, exec_error] = s:NullError(cmd)
+      if exec_error
+        throw 'fugitive: ' . message
+      endif
+
+      while get(output, 0, '') =~# '^\l\+:'
+        call remove(output, 0)
+      endwhile
+      let head = matchstr(output[0], '^## \zs\S\+\ze\%($\| \[\)')
+      if head =~# '\.\.\.'
+        let [head, pull] = split(head, '\.\.\.')
+        let branch = head
+      elseif head ==# 'HEAD' || empty(head)
+        let head = FugitiveHead(11)
+        let branch = ''
+      else
+        let branch = head
+      endif
+
+      let i = 0
+      while i < len(output)
+        let line = output[i]
+        let file = line[3:-1]
+        let i += 1
+        if line[2] !=# ' '
+          continue
+        endif
+        if line[0:1] =~# '[RC]'
+          let relative = [file, output[i]]
+          let i += 1
+        else
+          let relative = [file]
+        endif
+        let filename = join(reverse(copy(relative)), ' -> ')
+        if line[0] !~# '[ ?!#]'
+          call add(staged, {'type': 'File', 'status': line[0], 'filename': filename, 'relative': relative, 'submodule': ''})
+        endif
+        if line[0:1] ==# '??'
+          call add(untracked, {'type': 'File', 'status': line[1], 'filename': filename, 'relative': relative})
+        elseif line[1] !~# '[ !#]'
+          call add(unstaged, {'type': 'File', 'status': line[1], 'filename': file, 'relative': [file], 'submodule': ''})
+        endif
+      endwhile
+    endif
+
+    let diff = {'Staged': {'stdout': ['']}, 'Unstaged': {'stdout': ['']}}
+    if len(staged)
+      let diff['Staged'] =
+          \ fugitive#Execute(['-c', 'diff.suppressBlankEmpty=false', 'diff', '--color=never', '--no-ext-diff', '--no-prefix', '--cached'], function('len'))
+    endif
+    if len(unstaged)
+      let diff['Unstaged'] =
+          \ fugitive#Execute(['-c', 'diff.suppressBlankEmpty=false', 'diff', '--color=never', '--no-ext-diff', '--no-prefix'], function('len'))
+    endif
+
+    for dict in staged
+      let b:fugitive_files['Staged'][dict.filename] = dict
+    endfor
+    for dict in unstaged
+      let b:fugitive_files['Unstaged'][dict.filename] = dict
+    endfor
+
+    let pull_type = 'Pull'
+    if len(pull)
+      let rebase = FugitiveConfigGet('branch.' . branch . '.rebase', config)
+      if empty(rebase)
+        let rebase = FugitiveConfigGet('pull.rebase', config)
+      endif
+      if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$'
+        let pull_type = 'Rebase'
+      elseif rebase =~# '^\%(false\|no|off\|0\|\)$'
+        let pull_type = 'Merge'
+      endif
+    endif
+
+    let push_remote = FugitiveConfigGet('branch.' . branch . '.pushRemote', config)
+    if empty(push_remote)
+      let push_remote = FugitiveConfigGet('remote.pushDefault', config)
+    endif
+    let fetch_remote = FugitiveConfigGet('branch.' . branch . '.remote', config)
+    if empty(fetch_remote)
+      let fetch_remote = 'origin'
+    endif
+    if empty(push_remote)
+      let push_remote = fetch_remote
+    endif
+
+    let push_default = FugitiveConfigGet('push.default', config)
+    if empty(push_default)
+      let push_default = fugitive#GitVersion(2) ? 'simple' : 'matching'
+    endif
+    if push_default ==# 'upstream'
+      let push = pull
+    else
+      let push = len(branch) ? (push_remote ==# '.' ? '' : push_remote . '/') . branch : ''
+    endif
+
+    if isdirectory(fugitive#Find('.git/rebase-merge/'))
+      let rebasing_dir = fugitive#Find('.git/rebase-merge/')
+    elseif isdirectory(fugitive#Find('.git/rebase-apply/'))
+      let rebasing_dir = fugitive#Find('.git/rebase-apply/')
+    endif
+
+    let rebasing = []
+    let rebasing_head = 'detached HEAD'
+    if exists('rebasing_dir') && filereadable(rebasing_dir . 'git-rebase-todo')
+      let rebasing_head = substitute(readfile(rebasing_dir . 'head-name')[0], '\C^refs/heads/', '', '')
+      let len = 11
+      let lines = readfile(rebasing_dir . 'git-rebase-todo')
+      for line in lines
+        let hash = matchstr(line, '^[^a-z].*\s\zs[0-9a-f]\{4,\}\ze\.\.')
+        if len(hash)
+          let len = len(hash)
+          break
+        endif
+      endfor
+      if getfsize(rebasing_dir . 'done') > 0
+        let done = readfile(rebasing_dir . 'done')
+        call map(done, 'substitute(v:val, ''^\l\+\>'', "done", "")')
+        let done[-1] = substitute(done[-1], '^\l\+\>', 'stop', '')
+        let lines = done + lines
+      endif
+      call reverse(lines)
+      for line in lines
+        let match = matchlist(line, '^\(\l\+\)\s\+\(\x\{4,\}\)\s\+\(.*\)')
+        if len(match) && match[1] !~# 'exec\|merge\|label'
+          call add(rebasing, {'type': 'Rebase', 'status': get(s:rebase_abbrevs, match[1], match[1]), 'commit': strpart(match[2], 0, len), 'subject': match[3]})
+        endif
+      endfor
+    endif
+
+    let b:fugitive_diff = diff
+    if get(a:, 1, v:cmdbang)
+      unlet! b:fugitive_expanded
+    endif
+    let expanded = get(b:, 'fugitive_expanded', {'Staged': {}, 'Unstaged': {}})
+    let b:fugitive_expanded = {'Staged': {}, 'Unstaged': {}}
+
+    silent keepjumps %delete_
+
+    call s:AddHeader('Head', head)
+    call s:AddHeader(pull_type, pull)
+    if push !=# pull
+      call s:AddHeader('Push', push)
+    endif
+    if empty(s:Tree())
+      if get(fugitive#ConfigGetAll('core.bare', config), 0, '') !~# '^\%(false\|no|off\|0\|\)$'
+        call s:AddHeader('Bare', 'yes')
+      else
+        call s:AddHeader('Error', s:worktree_error)
+      endif
+    endif
+    if get(fugitive#ConfigGetAll('advice.statusHints', config), 0, 'true') !~# '^\%(false\|no|off\|0\|\)$'
+      call s:AddHeader('Help', 'g?')
+    endif
+
+    call s:AddSection('Rebasing ' . rebasing_head, rebasing)
+    call s:AddSection('Untracked', untracked)
+    call s:AddSection('Unstaged', unstaged)
+    let unstaged_end = len(unstaged) ? line('$') : 0
+    call s:AddSection('Staged', staged)
+    let staged_end = len(staged) ? line('$') : 0
+
+    if len(push) && !(push ==# pull && get(props, 'branch.ab') =~# '^+0 ')
+      call s:AddLogSection('Unpushed to ' . push, [push . '..' . head])
+    endif
+    if len(pull) && push !=# pull
+      call s:AddLogSection('Unpushed to ' . pull, [pull . '..' . head])
+    endif
+    if empty(pull) && empty(push) && empty(rebasing)
+      call s:AddLogSection('Unpushed to *', [head, '--not', '--remotes'])
+    endif
+    if len(push) && push !=# pull
+      call s:AddLogSection('Unpulled from ' . push, [head . '..' . push])
+    endif
+    if len(pull) && get(props, 'branch.ab') !~# ' -0$'
+      call s:AddLogSection('Unpulled from ' . pull, [head . '..' . pull])
+    endif
+
+    setlocal nomodified readonly noswapfile
+    doautocmd BufReadPost
+    setlocal nomodifiable
+    if &bufhidden ==# ''
+      setlocal bufhidden=delete
+    endif
+    if !exists('b:dispatch')
+      let b:dispatch = ':Git fetch --all'
+    endif
+    call fugitive#MapJumps()
+    call s:Map('n', '-', ":<C-U>execute <SID>Do('Toggle',0)<CR>", '<silent>')
+    call s:Map('x', '-', ":<C-U>execute <SID>Do('Toggle',1)<CR>", '<silent>')
+    call s:Map('n', 's', ":<C-U>execute <SID>Do('Stage',0)<CR>", '<silent>')
+    call s:Map('x', 's', ":<C-U>execute <SID>Do('Stage',1)<CR>", '<silent>')
+    call s:Map('n', 'u', ":<C-U>execute <SID>Do('Unstage',0)<CR>", '<silent>')
+    call s:Map('x', 'u', ":<C-U>execute <SID>Do('Unstage',1)<CR>", '<silent>')
+    call s:Map('n', 'U', ":<C-U>Git reset -q<CR>", '<silent>')
+    call s:MapMotion('gu', "exe <SID>StageJump(v:count, 'Untracked', 'Unstaged')")
+    call s:MapMotion('gU', "exe <SID>StageJump(v:count, 'Unstaged', 'Untracked')")
+    call s:MapMotion('gs', "exe <SID>StageJump(v:count, 'Staged')")
+    call s:MapMotion('gp', "exe <SID>StageJump(v:count, 'Unpushed')")
+    call s:MapMotion('gP', "exe <SID>StageJump(v:count, 'Unpulled')")
+    call s:MapMotion('gr', "exe <SID>StageJump(v:count, 'Rebasing')")
+    call s:Map('n', 'C', ":echoerr 'fugitive: C has been removed in favor of cc'<CR>", '<silent><unique>')
+    call s:Map('n', 'a', ":<C-U>execute <SID>Do('Toggle',0)<CR>", '<silent>')
+    call s:Map('n', 'i', ":<C-U>execute <SID>NextExpandedHunk(v:count1)<CR>", '<silent>')
+    call s:Map('n', "=", ":<C-U>execute <SID>StageInline('toggle',line('.'),v:count)<CR>", '<silent>')
+    call s:Map('n', "<", ":<C-U>execute <SID>StageInline('hide',  line('.'),v:count)<CR>", '<silent>')
+    call s:Map('n', ">", ":<C-U>execute <SID>StageInline('show',  line('.'),v:count)<CR>", '<silent>')
+    call s:Map('x', "=", ":<C-U>execute <SID>StageInline('toggle',line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
+    call s:Map('x', "<", ":<C-U>execute <SID>StageInline('hide',  line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
+    call s:Map('x', ">", ":<C-U>execute <SID>StageInline('show',  line(\"'<\"),line(\"'>\")-line(\"'<\")+1)<CR>", '<silent>')
+    call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>')
+    call s:Map('n', 'dd', ":<C-U>execute <SID>StageDiff('Gdiffsplit')<CR>", '<silent>')
+    call s:Map('n', 'dh', ":<C-U>execute <SID>StageDiff('Ghdiffsplit')<CR>", '<silent>')
+    call s:Map('n', 'ds', ":<C-U>execute <SID>StageDiff('Ghdiffsplit')<CR>", '<silent>')
+    call s:Map('n', 'dp', ":<C-U>execute <SID>StageDiffEdit()<CR>", '<silent>')
+    call s:Map('n', 'dv', ":<C-U>execute <SID>StageDiff('Gvdiffsplit')<CR>", '<silent>')
+    call s:Map('n', 'd?', ":<C-U>help fugitive_d<CR>", '<silent>')
+    call s:Map('n', 'P', ":<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>", '<silent>')
+    call s:Map('x', 'P', ":<C-U>execute <SID>StagePatch(line(\"'<\"),line(\"'>\"))<CR>", '<silent>')
+    call s:Map('n', 'p', ":<C-U>if v:count<Bar>silent exe <SID>GF('pedit')<Bar>else<Bar>echoerr 'Use = for inline diff, P for :Git add/reset --patch, 1p for :pedit'<Bar>endif<CR>", '<silent>')
+    call s:Map('x', 'p', ":<C-U>execute <SID>StagePatch(line(\"'<\"),line(\"'>\"))<CR>", '<silent>')
+    call s:Map('n', 'I', ":<C-U>execute <SID>StagePatch(line('.'),line('.'))<CR>", '<silent>')
+    call s:Map('x', 'I', ":<C-U>execute <SID>StagePatch(line(\"'<\"),line(\"'>\"))<CR>", '<silent>')
+    call s:Map('n', 'gq', ":<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>", '<silent>')
+    call s:Map('n', 'R', ":echohl WarningMsg<Bar>echo 'Reloading is automatic.  Use :e to force'<Bar>echohl NONE<CR>", '<silent>')
+    call s:Map('n', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent><unique>')
+    call s:Map('x', 'g<Bar>', ":<C-U>echoerr 'Changed to X'<CR>", '<silent><unique>')
+    call s:Map('n', 'X', ":<C-U>execute <SID>StageDelete(line('.'), 0, v:count)<CR>", '<silent>')
+    call s:Map('x', 'X', ":<C-U>execute <SID>StageDelete(line(\"'<\"), line(\"'>\"), v:count)<CR>", '<silent>')
+    call s:Map('n', 'gI', ":<C-U>execute <SID>StageIgnore(line('.'), line('.'), v:count)<CR>", '<silent>')
+    call s:Map('x', 'gI', ":<C-U>execute <SID>StageIgnore(line(\"'<\"), line(\"'>\"), v:count)<CR>", '<silent>')
+    call s:Map('n', '.', ':<C-U> <C-R>=<SID>StageArgs(0)<CR><Home>')
+    call s:Map('x', '.', ':<C-U> <C-R>=<SID>StageArgs(1)<CR><Home>')
+    setlocal filetype=fugitive
+
+    for [lnum, section] in [[staged_end, 'Staged'], [unstaged_end, 'Unstaged']]
+      while len(getline(lnum))
+        let filename = matchstr(getline(lnum), '^[A-Z?] \zs.*')
+        if has_key(expanded[section], filename)
+          call s:StageInline('show', lnum)
+        endif
+        let lnum -= 1
+      endwhile
+    endfor
+
+    let b:fugitive_reltime = reltime()
+    return s:DoAutocmd('User FugitiveIndex')
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  finally
+    let b:fugitive_type = 'index'
+  endtry
+endfunction
+
+function! fugitive#FileReadCmd(...) abort
+  let amatch = a:0 ? a:1 : expand('<amatch>')
+  let [dir, rev] = s:DirRev(amatch)
+  let line = a:0 > 1 ? a:2 : line("'[")
+  if empty(dir)
+    return 'noautocmd ' . line . 'read ' . s:fnameescape(amatch)
+  endif
+  if rev !~# ':' && s:ChompDefault('', [dir, 'cat-file', '-t', rev]) =~# '^\%(commit\|tag\)$'
+    let cmd = [dir, 'log', '--pretty=format:%B', '-1', rev, '--']
+  elseif rev ==# ':'
+    let cmd = [dir, 'status', '--short']
+  else
+    let cmd = [dir, 'cat-file', '-p', rev, '--']
+  endif
+  let temp = tempname()
+  let [err, exec_error] = s:StdoutToFile(temp, cmd)
+  if exec_error
+    call delete(temp)
+    return 'noautocmd ' . line . 'read ' . s:fnameescape(amatch)
+  else
+    return 'silent keepalt ' . line . 'read ' . s:fnameescape(temp) . '|call delete(' . string(temp) . ')'
+  endif
+endfunction
+
+function! fugitive#FileWriteCmd(...) abort
+  let temp = tempname()
+  let amatch = a:0 ? a:1 : expand('<amatch>')
+  let autype = a:0 > 1 ? 'Buf' : 'File'
+  if exists('#' . autype . 'WritePre')
+    execute s:DoAutocmd(autype . 'WritePre ' . s:fnameescape(amatch))
+  endif
+  try
+    let [dir, commit, file] = s:DirCommitFile(amatch)
+    if commit !~# '^[0-3]$' || !v:cmdbang && (line("'[") != 1 || line("']") != line('$'))
+      return "noautocmd '[,']write" . (v:cmdbang ? '!' : '') . ' ' . s:fnameescape(amatch)
+    endif
+    silent execute "noautocmd keepalt '[,']write ".temp
+    let hash = s:TreeChomp([dir, '--literal-pathspecs', 'hash-object', '-w', '--', FugitiveGitPath(temp)])
+    let old_mode = matchstr(s:ChompDefault('', ['ls-files', '--stage', '.' . file], dir), '^\d\+')
+    if empty(old_mode)
+      let old_mode = executable(s:Tree(dir) . file) ? '100755' : '100644'
+    endif
+    let error = s:UpdateIndex(dir, [old_mode, hash, commit, file[1:-1]])
+    if empty(error)
+      setlocal nomodified
+      if exists('#' . autype . 'WritePost')
+        execute s:DoAutocmd(autype . 'WritePost ' . s:fnameescape(amatch))
+      endif
+      exe s:DoAutocmdChanged(dir)
+      return ''
+    else
+      return 'echoerr '.string('fugitive: '.error)
+    endif
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  finally
+    call delete(temp)
+  endtry
+endfunction
+
+function! fugitive#BufReadCmd(...) abort
+  let amatch = a:0 ? a:1 : expand('<amatch>')
+  try
+    let [dir, rev] = s:DirRev(amatch)
+    if empty(dir)
+      return 'echo "Invalid Fugitive URL"'
+    endif
+    let b:git_dir = s:GitDir(dir)
+    if rev ==# ':'
+      return fugitive#BufReadStatus(v:cmdbang)
+    elseif rev =~# '^:\d$'
+      let b:fugitive_type = 'stage'
+    else
+      let r = fugitive#Execute([dir, 'cat-file', '-t', rev])
+      let b:fugitive_type = get(r.stdout, 0, '')
+      if r.exit_status && rev =~# '^:0'
+        let r = fugitive#Execute([dir, 'write-tree', '--prefix=' . rev[3:-1]])
+        let sha = get(r.stdout, 0, '')
+        let b:fugitive_type = 'tree'
+      endif
+      if r.exit_status
+        let error = substitute(join(r.stderr, "\n"), "\n*$", '', '')
+        unlet b:fugitive_type
+        setlocal noswapfile
+        if empty(&bufhidden)
+          setlocal bufhidden=delete
+        endif
+        if rev =~# '^:\d:'
+          let &l:readonly = !filewritable(fugitive#Find('.git/index', dir))
+          return 'doautocmd BufNewFile'
+        else
+          setlocal readonly nomodifiable
+          return 'doautocmd BufNewFile|echo ' . string(error)
+        endif
+      elseif b:fugitive_type !~# '^\%(tag\|commit\|tree\|blob\)$'
+        return "echoerr ".string("fugitive: unrecognized git type '".b:fugitive_type."'")
+      endif
+      if !exists('b:fugitive_display_format') && b:fugitive_type != 'blob'
+        let b:fugitive_display_format = +getbufvar('#','fugitive_display_format')
+      endif
+    endif
+
+    if b:fugitive_type !=# 'blob'
+      setlocal nomodeline
+    endif
+
+    setlocal noreadonly modifiable
+    let pos = getpos('.')
+    silent keepjumps %delete_
+    setlocal endofline
+
+    let events = ['User FugitiveObject', 'User Fugitive' . substitute(b:fugitive_type, '^\l', '\u&', '')]
+
+    try
+      if b:fugitive_type !=# 'blob'
+        setlocal foldmarker=<<<<<<<<,>>>>>>>>
+      endif
+      exe s:DoAutocmd('BufReadPre')
+      if b:fugitive_type ==# 'tree'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd([dir, 'ls-tree', exists('sha') ? sha : rev])
+        else
+          if !exists('sha')
+            let sha = s:TreeChomp(dir, 'rev-parse', '--verify', rev, '--')
+          endif
+          call s:ReplaceCmd([dir, 'show', '--no-color', sha])
+        endif
+      elseif b:fugitive_type ==# 'tag'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd([dir, 'cat-file', b:fugitive_type, rev])
+        else
+          call s:ReplaceCmd([dir, 'cat-file', '-p', rev])
+        endif
+      elseif b:fugitive_type ==# 'commit'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd([dir, 'cat-file', b:fugitive_type, rev])
+        else
+          call s:ReplaceCmd([dir, '-c', 'diff.noprefix=false', '-c', 'log.showRoot=false', 'show', '--no-color', '-m', '--first-parent', '--pretty=format:tree%x20%T%nparent%x20%P%nauthor%x20%an%x20<%ae>%x20%ad%ncommitter%x20%cn%x20<%ce>%x20%cd%nencoding%x20%e%n%n%s%n%n%b', rev])
+          keepjumps 1
+          keepjumps call search('^parent ')
+          if getline('.') ==# 'parent '
+            silent lockmarks keepjumps delete_
+          else
+            silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g')
+          endif
+          keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
+          if lnum
+            silent lockmarks keepjumps delete_
+          end
+          silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/s/\r$//e'
+          keepjumps 1
+        endif
+      elseif b:fugitive_type ==# 'stage'
+        call s:ReplaceCmd([dir, 'ls-files', '--stage'])
+      elseif b:fugitive_type ==# 'blob'
+        let blob_or_filters = rev =~# ':' && fugitive#GitVersion(2, 11) ? '--filters' : 'blob'
+        call s:ReplaceCmd([dir, 'cat-file', blob_or_filters, rev])
+      endif
+    finally
+      keepjumps call setpos('.',pos)
+      setlocal nomodified noswapfile
+      let modifiable = rev =~# '^:.:' && b:fugitive_type !=# 'tree'
+      if modifiable
+        let events = ['User FugitiveStageBlob']
+      endif
+      let &l:readonly = !modifiable || !filewritable(fugitive#Find('.git/index', dir))
+      if empty(&bufhidden)
+        setlocal bufhidden=delete
+      endif
+      let &l:modifiable = modifiable
+      if b:fugitive_type !=# 'blob'
+        setlocal filetype=git
+        call s:Map('n', 'a', ":<C-U>let b:fugitive_display_format += v:count1<Bar>exe fugitive#BufReadCmd(@%)<CR>", '<silent>')
+        call s:Map('n', 'i', ":<C-U>let b:fugitive_display_format -= v:count1<Bar>exe fugitive#BufReadCmd(@%)<CR>", '<silent>')
+      endif
+      call fugitive#MapJumps()
+    endtry
+
+    setlocal modifiable
+
+    return s:DoAutocmd('BufReadPost') .
+          \ (modifiable ? '' : '|setl nomodifiable') . '|' .
+          \ call('s:DoAutocmd', events)
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+endfunction
+
+function! fugitive#BufWriteCmd(...) abort
+  return fugitive#FileWriteCmd(a:0 ? a:1 : expand('<amatch>'), 1)
+endfunction
+
+function! fugitive#SourceCmd(...) abort
+  let amatch = a:0 ? a:1 : expand('<amatch>')
+  let temp = s:BlobTemp(amatch)
+  if empty(temp)
+    return 'noautocmd source ' . s:fnameescape(amatch)
+  endif
+  if !exists('g:virtual_scriptnames')
+    let g:virtual_scriptnames = {}
+  endif
+  let g:virtual_scriptnames[temp] = amatch
+  return 'source ' . s:fnameescape(temp)
+endfunction
+
+" Section: Temp files
+
+if !exists('s:temp_files')
+  let s:temp_files = {}
+endif
+
+function! s:TempState(...) abort
+  return get(s:temp_files, s:cpath(s:AbsoluteVimPath(a:0 ? a:1 : -1)), {})
+endfunction
+
+function! fugitive#Result(...) abort
+  if !a:0 && exists('g:fugitive_event')
+    return get(g:, 'fugitive_result', {})
+  elseif !a:0 || type(a:1) == type('') && a:1 =~# '^-\=$'
+    return get(g:, '_fugitive_last_job', {})
+  elseif type(a:1) == type(0)
+    return s:TempState(a:1)
+  elseif type(a:1) == type('')
+    return s:TempState(a:1)
+  elseif type(a:1) == type({}) && has_key(a:1, 'file')
+    return s:TempState(a:1.file)
+  else
+    return {}
+  endif
+endfunction
+
+function! s:TempDotMap() abort
+  let cfile = s:cfile()
+  if empty(cfile)
+    if getline('.') =~# '^[*+] \+\f' && col('.') < 2
+      return matchstr(getline('.'), '^. \+\zs\f\+')
+    else
+      return expand('<cfile>')
+    endif
+  endif
+  let name = fugitive#Find(cfile[0])
+  let [dir, commit, file] = s:DirCommitFile(name)
+  if len(commit) && empty(file)
+    return commit
+  elseif s:cpath(s:Tree(), getcwd())
+    return fugitive#Path(name, "./")
+  else
+    return fugitive#Real(name)
+  endif
+endfunction
+
+function! s:TempReadPre(file) abort
+  let key = s:cpath(s:AbsoluteVimPath(a:file))
+  if has_key(s:temp_files, key)
+    let dict = s:temp_files[key]
+    setlocal nomodeline
+    if empty(&bufhidden)
+      setlocal bufhidden=delete
+    endif
+    setlocal buftype=nowrite
+    setlocal nomodifiable
+    let b:git_dir = dict.git_dir
+    if len(dict.git_dir)
+      call extend(b:, {'fugitive_type': 'temp'}, 'keep')
+    endif
+  endif
+  return ''
+endfunction
+
+function! s:TempReadPost(file) abort
+  let key = s:cpath(s:AbsoluteVimPath(a:file))
+  if has_key(s:temp_files, key)
+    let dict = s:temp_files[key]
+    if !has_key(dict, 'job')
+      setlocal nobuflisted
+    endif
+    if get(dict, 'filetype', '') ==# 'git'
+      call fugitive#MapJumps()
+      call s:Map('n', '.', ":<C-U> <C-R>=<SID>fnameescape(<SID>TempDotMap())<CR><Home>")
+      call s:Map('x', '.', ":<C-U> <C-R>=<SID>fnameescape(<SID>TempDotMap())<CR><Home>")
+    endif
+    if has_key(dict, 'filetype')
+      if dict.filetype ==# 'man' && has('nvim')
+        let b:man_sect = matchstr(getline(1), '^\w\+(\zs\d\+\ze)')
+      endif
+      if !get(g:, 'did_load_ftplugin') && dict.filetype ==# 'fugitiveblame'
+        call s:BlameMaps(0)
+      endif
+      let &l:filetype = dict.filetype
+    endif
+    setlocal foldmarker=<<<<<<<<,>>>>>>>>
+    if !&modifiable
+      call s:Map('n', 'gq', ":<C-U>bdelete<CR>", '<silent> <unique>')
+    endif
+  endif
+  return s:DoAutocmd('User FugitivePager')
+endfunction
+
+function! s:TempDelete(file) abort
+  let key = s:cpath(s:AbsoluteVimPath(a:file))
+  if has_key(s:temp_files, key) && !has_key(s:temp_files[key], 'job') && key !=# s:cpath(get(get(g:, '_fugitive_last_job', {}), 'file', ''))
+    call delete(a:file)
+    call remove(s:temp_files, key)
+  endif
+  return ''
+endfunction
+
+augroup fugitive_temp
+  autocmd!
+  autocmd BufReadPre  * exe s:TempReadPre( +expand('<abuf>'))
+  autocmd BufReadPost * exe s:TempReadPost(+expand('<abuf>'))
+  autocmd BufWipeout  * exe s:TempDelete(  +expand('<abuf>'))
+augroup END
+
+" Section: :Git
+
+function! s:AskPassArgs(dir) abort
+  if (len($DISPLAY) || len($TERM_PROGRAM) || has('gui_running')) &&
+        \ empty($GIT_ASKPASS) && empty($SSH_ASKPASS) && empty(fugitive#ConfigGetAll('core.askpass', a:dir))
+    if s:executable(s:VimExecPath() . '/git-gui--askpass')
+      return ['-c', 'core.askPass=' . s:ExecPath()[0] . '/git-gui--askpass']
+    elseif s:executable('ssh-askpass')
+      return ['-c', 'core.askPass=ssh-askpass']
+    endif
+  endif
+  return []
+endfunction
+
+function! s:RunSave(state) abort
+  let s:temp_files[s:cpath(a:state.file)] = a:state
+endfunction
+
+function! s:RunFinished(state, ...) abort
+  if has_key(get(g:, '_fugitive_last_job', {}), 'file') && bufnr(g:_fugitive_last_job.file) < 0
+    exe s:TempDelete(remove(g:, '_fugitive_last_job').file)
+  endif
+  let g:_fugitive_last_job = a:state
+  let first = join(readfile(a:state.file, '', 2), "\n")
+  if get(a:state, 'filetype', '') ==# 'git' && first =~# '\<\([[:upper:][:digit:]_-]\+(\d\+)\).*\1'
+    let a:state.filetype = 'man'
+  endif
+  if !has_key(a:state, 'capture_bufnr')
+    return
+  endif
+  call fugitive#DidChange(a:state)
+endfunction
+
+function! s:RunEdit(state, tmp, job) abort
+  if get(a:state, 'request', '') !=# 'edit'
+    return 0
+  endif
+  call remove(a:state, 'request')
+  let sentinel = a:state.file . '.edit'
+  let file = FugitiveVimPath(readfile(sentinel, '', 1)[0])
+  try
+    if !&equalalways && a:state.mods !~# '\<tab\>' && 3 > (a:state.mods =~# '\<vert' ? winwidth(0) : winheight(0))
+      let noequalalways = 1
+      setglobal equalalways
+    endif
+    exe substitute(a:state.mods, '\<tab\>', '-tab', 'g') 'keepalt split' s:fnameescape(file)
+  finally
+    if exists('l:noequalalways')
+      setglobal noequalalways
+    endif
+  endtry
+  set bufhidden=wipe
+  let bufnr = bufnr('')
+  let s:edit_jobs[bufnr] = [a:state, a:tmp, a:job, sentinel]
+  call fugitive#DidChange(a:state.git_dir)
+  if bufnr == bufnr('') && !exists('g:fugitive_event')
+    try
+      let g:fugitive_event = a:state.git_dir
+      let g:fugitive_result = a:state
+      exe s:DoAutocmd('User FugitiveEditor')
+    finally
+      unlet! g:fugitive_event g:fugitive_result
+    endtry
+  endif
+  return 1
+endfunction
+
+function! s:RunReceive(state, tmp, type, job, data, ...) abort
+  if a:type ==# 'err' || a:state.pty
+    let data = type(a:data) == type([]) ? join(a:data, "\n") : a:data
+    let data = a:tmp.escape . data
+    let escape = "\033]51;[^\007]*"
+    let a:tmp.escape = matchstr(data, escape . '$')
+    if len(a:tmp.escape)
+      let data = strpart(data, 0, len(data) - len(a:tmp.escape))
+    endif
+    let cmd = matchstr(data, escape . "\007")[5:-2]
+    let data = substitute(data, escape . "\007", '', 'g')
+    if cmd =~# '^fugitive:'
+      let a:state.request = strpart(cmd, 9)
+    endif
+    let lines = split(a:tmp.err . data, "\r\\=\n", 1)
+    let a:tmp.err = lines[-1]
+    let lines[-1] = ''
+    call map(lines, 'substitute(v:val, ".*\r", "", "")')
+  else
+    let lines = type(a:data) == type([]) ? a:data : split(a:data, "\n", 1)
+    if len(a:tmp.out)
+      let lines[0] = a:tmp.out . lines[0]
+    endif
+    let a:tmp.out = lines[-1]
+    let lines[-1] = ''
+  endif
+  call writefile(lines, a:state.file, 'ba')
+  if has_key(a:tmp, 'echo')
+    if !exists('l:data')
+      let data = type(a:data) == type([]) ? join(a:data, "\n") : a:data
+    endif
+    let a:tmp.echo .= data
+  endif
+  let line_count = a:tmp.line_count
+  let a:tmp.line_count += len(lines) - 1
+  if !has_key(a:state, 'capture_bufnr') || !bufloaded(a:state.capture_bufnr)
+    return
+  endif
+  call remove(lines, -1)
+  try
+    call setbufvar(a:state.capture_bufnr, '&modifiable', 1)
+    if !line_count && len(lines) > 1000
+      let first = remove(lines, 0, 999)
+      call setbufline(a:state.capture_bufnr, 1, first)
+      redraw
+      call setbufline(a:state.capture_bufnr, 1001, lines)
+    else
+      call setbufline(a:state.capture_bufnr, line_count + 1, lines)
+    endif
+    call setbufvar(a:state.capture_bufnr, '&modifiable', 0)
+    if !a:state.pager && getwinvar(bufwinid(a:state.capture_bufnr), '&previewwindow')
+      let winnr = bufwinnr(a:state.capture_bufnr)
+      if winnr > 0
+        let old_winnr = winnr()
+        exe 'noautocmd' winnr.'wincmd w'
+        $
+        exe 'noautocmd' old_winnr.'wincmd w'
+      endif
+    endif
+  catch
+  endtry
+endfunction
+
+function! s:RunExit(state, tmp, job, exit_status) abort
+  let a:state.exit_status = a:exit_status
+  if has_key(a:state, 'job')
+    return
+  endif
+  call s:RunFinished(a:state)
+endfunction
+
+function! s:RunClose(state, tmp, job, ...) abort
+  if a:0
+    call s:RunExit(a:state, a:tmp, a:job, a:1)
+  endif
+  let noeol = substitute(substitute(a:tmp.err, "\r$", '', ''), ".*\r", '', '') . a:tmp.out
+  call writefile([noeol], a:state.file, 'ba')
+  call remove(a:state, 'job')
+  if has_key(a:state, 'capture_bufnr') && bufloaded(a:state.capture_bufnr)
+    if len(noeol)
+      call setbufvar(a:state.capture_bufnr, '&modifiable', 1)
+      call setbufline(a:state.capture_bufnr, a:tmp.line_count + 1, [noeol])
+      call setbufvar(a:state.capture_bufnr, '&eol', 0)
+      call setbufvar(a:state.capture_bufnr, '&modifiable', 0)
+    endif
+    call setbufvar(a:state.capture_bufnr, '&modified', 0)
+    call setbufvar(a:state.capture_bufnr, '&buflisted', 0)
+    if a:state.filetype !=# getbufvar(a:state.capture_bufnr, '&filetype', '')
+      call setbufvar(a:state.capture_bufnr, '&filetype', a:state.filetype)
+    endif
+  endif
+  if !has_key(a:state, 'exit_status')
+    return
+  endif
+  call s:RunFinished(a:state)
+endfunction
+
+function! s:RunSend(job, str) abort
+  try
+    if type(a:job) == type(0)
+      call chansend(a:job, a:str)
+    else
+      call ch_sendraw(a:job, a:str)
+    endif
+    return len(a:str)
+  catch /^Vim\%((\a\+)\)\=:E90[06]:/
+    return 0
+  endtry
+endfunction
+
+function! s:RunCloseIn(job) abort
+  try
+    if type(a:job) ==# type(0)
+      call chanclose(a:job, 'stdin')
+    else
+      call ch_close_in(a:job)
+    endif
+    return 1
+  catch /^Vim\%((\a\+)\)\=:E90[06]:/
+    return 0
+  endtry
+endfunction
+
+function! s:RunEcho(tmp) abort
+  if !has_key(a:tmp, 'echo')
+    return
+  endif
+  let data = a:tmp.echo
+  let a:tmp.echo = matchstr(data, "[\r\n]\\+$")
+  if len(a:tmp.echo)
+    let data = strpart(data, 0, len(data) - len(a:tmp.echo))
+  endif
+  echon substitute(data, "\r\\ze\n", '', 'g')
+endfunction
+
+function! s:RunTick(job) abort
+  if type(a:job) == v:t_number
+    return jobwait([a:job], 1)[0] == -1
+  elseif type(a:job) == 8
+    let running = ch_status(a:job) !~# '^closed$\|^failed$' || job_status(a:job) ==# 'run'
+    sleep 1m
+    return running
+  endif
+endfunction
+
+if !exists('s:edit_jobs')
+  let s:edit_jobs = {}
+endif
+function! s:RunWait(state, tmp, job, ...) abort
+  if a:0 && filereadable(a:1)
+    call delete(a:1)
+  endif
+  try
+    if a:tmp.no_more && &more
+      let more = &more
+      let &more = 0
+    endif
+    while get(a:state, 'request', '') !=# 'edit' && s:RunTick(a:job)
+      call s:RunEcho(a:tmp)
+      if !get(a:tmp, 'closed_in')
+        let peek = getchar(1)
+        if peek != 0 && !(has('win32') && peek == 128)
+          let c = getchar()
+          let c = type(c) == type(0) ? nr2char(c) : c
+          if c ==# "\<C-D>" || c ==# "\<Esc>"
+            let a:tmp.closed_in = 1
+            let can_pedit = s:RunCloseIn(a:job) && exists('*setbufline')
+            for winnr in range(1, winnr('$'))
+              if getwinvar(winnr, '&previewwindow') && getbufvar(winbufnr(winnr), '&modified')
+                let can_pedit = 0
+              endif
+            endfor
+            if can_pedit
+              if has_key(a:tmp, 'echo')
+                call remove(a:tmp, 'echo')
+              endif
+              call writefile(['fugitive: aborting edit due to background operation.'], a:state.file . '.exit')
+              exe (&splitbelow ? 'botright' : 'topleft') 'silent pedit ++ff=unix' s:fnameescape(a:state.file)
+              let a:state.capture_bufnr = bufnr(a:state.file)
+              call setbufvar(a:state.capture_bufnr, '&modified', 1)
+              let finished = 0
+              redraw!
+              return ''
+            endif
+          else
+            call s:RunSend(a:job, c)
+            if !a:state.pty
+              echon c
+            endif
+          endif
+        endif
+      endif
+    endwhile
+    if !has_key(a:state, 'request') && has_key(a:state, 'job') && exists('*job_status') && job_status(a:job) ==# "dead"
+      throw 'fugitive: close callback did not fire; this should never happen'
+    endif
+    call s:RunEcho(a:tmp)
+    if has_key(a:tmp, 'echo')
+      let a:tmp.echo = substitute(a:tmp.echo, "^\r\\=\n", '', '')
+      echo
+    endif
+    let finished = !s:RunEdit(a:state, a:tmp, a:job)
+  finally
+    if exists('l:more')
+      let &more = more
+    endif
+    if !exists('finished')
+      try
+        if a:state.pty && !get(a:tmp, 'closed_in')
+          call s:RunSend(a:job, "\<C-C>")
+        elseif type(a:job) == type(0)
+          call jobstop(a:job)
+        else
+          call job_stop(a:job)
+        endif
+      catch /.*/
+      endtry
+    elseif finished
+      call fugitive#DidChange(a:state)
+    endif
+  endtry
+  return ''
+endfunction
+
+if !exists('s:resume_queue')
+  let s:resume_queue = []
+endif
+function! fugitive#Resume() abort
+  while len(s:resume_queue)
+    let enqueued = remove(s:resume_queue, 0)
+    if enqueued[2] isnot# ''
+      try
+        call call('s:RunWait', enqueued)
+      endtry
+    endif
+  endwhile
+endfunction
+
+function! s:RunBufDelete(bufnr) abort
+  let state = s:TempState(+a:bufnr)
+  if has_key(state, 'job')
+    try
+      if type(state.job) == type(0)
+        call jobstop(state.job)
+      else
+        call job_stop(state.job)
+      endif
+    catch
+    endtry
+  endif
+  if has_key(s:edit_jobs, a:bufnr) |
+    call add(s:resume_queue, remove(s:edit_jobs, a:bufnr))
+    call feedkeys("\<C-\>\<C-N>:redraw!|call delete(" . string(s:resume_queue[-1][0].file . '.edit') .
+          \ ")|call fugitive#Resume()|checktime\r", 'n')
+  endif
+endfunction
+
+augroup fugitive_job
+  autocmd!
+  autocmd BufDelete * call s:RunBufDelete(+expand('<abuf>'))
+  autocmd VimLeave *
+        \ for s:jobbuf in keys(s:edit_jobs) |
+        \   call writefile(['Aborting edit due to Vim exit.'], s:edit_jobs[s:jobbuf][0].file . '.exit') |
+        \   redraw! |
+        \   call call('s:RunWait', remove(s:edit_jobs, s:jobbuf)) |
+        \ endfor
+augroup END
+
+function! fugitive#CanPty() abort
+  return get(g:, 'fugitive_pty_debug_override',
+        \ has('unix') && !has('win32unix') && (has('patch-8.0.0744') || has('nvim')) && fugitive#GitVersion() !~# '\.windows\>')
+endfunction
+
+function! fugitive#PagerFor(argv, ...) abort
+  let args = a:argv
+  if empty(args)
+    return 0
+  elseif (args[0] ==# 'help' || get(args, 1, '') ==# '--help') && !s:HasOpt(args, '--web')
+    return 1
+  endif
+  if args[0] ==# 'config' && (s:HasOpt(args, '-e', '--edit') ||
+        \   !s:HasOpt(args, '--list', '--get-all', '--get-regexp', '--get-urlmatch')) ||
+        \ args[0] =~# '^\%(tag\|branch\)$' && (
+        \    s:HasOpt(args, '--edit-description', '--unset-upstream', '-m', '-M', '--move', '-c', '-C', '--copy', '-d', '-D', '--delete') ||
+        \   len(filter(args[1:-1], 'v:val =~# "^[^-]\\|^--set-upstream-to="')) &&
+        \   !s:HasOpt(args, '--contains', '--no-contains', '--merged', '--no-merged', '--points-at'))
+    return 0
+  endif
+  let config = a:0 ? a:1 : fugitive#Config()
+  let value = get(fugitive#ConfigGetAll('pager.' . args[0], config), 0, -1)
+  if value =~# '^\%(true\|yes\|on\|1\)$'
+    return 1
+  elseif value =~# '^\%(false\|no|off\|0\|\)$'
+    return 0
+  elseif type(value) == type('')
+    return value
+  elseif args[0] =~# '^\%(branch\|config\|diff\|grep\|log\|range-diff\|shortlog\|show\|tag\|whatchanged\)$' ||
+        \ (args[0] ==# 'stash' && get(args, 1, '') ==# 'show') ||
+        \ (args[0] ==# 'reflog' && get(args, 1, '') !~# '^\%(expire\|delete\|exists\)$') ||
+        \ (args[0] ==# 'am' && s:HasOpt(args, '--show-current-patch'))
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+let s:disable_colors = []
+for s:colortype in ['advice', 'branch', 'diff', 'grep', 'interactive', 'pager', 'push', 'remote', 'showBranch', 'status', 'transport', 'ui']
+  call extend(s:disable_colors, ['-c', 'color.' . s:colortype . '=false'])
+endfor
+unlet s:colortype
+function! fugitive#Command(line1, line2, range, bang, mods, arg, ...) abort
+  exe s:VersionCheck()
+  let dir = call('s:Dir', a:000)
+  if len(dir)
+    exe s:DirCheck(dir)
+  endif
+  let config = copy(fugitive#Config(dir))
+  let curwin = a:arg =~# '^++curwin\>' || !a:line2
+  let [args, after] = s:SplitExpandChain(substitute(a:arg, '^++curwin\>\s*', '', ''), s:Tree(dir))
+  let flags = []
+  let pager = -1
+  let explicit_pathspec_option = 0
+  while len(args)
+    if args[0] ==# '-c' && len(args) > 1
+      call extend(flags, remove(args, 0, 1))
+    elseif args[0] =~# '^-p$\|^--paginate$'
+      let pager = 2
+      call remove(args, 0)
+    elseif args[0] =~# '^-P$\|^--no-pager$'
+      let pager = 0
+      call remove(args, 0)
+    elseif args[0] =~# '^--\%([[:lower:]-]\+-pathspecs\)$'
+      let explicit_pathspec_option = 1
+      call add(flags, remove(args, 0))
+    elseif args[0] =~# '^\%(--no-optional-locks\)$'
+      call add(flags, remove(args, 0))
+    elseif args[0] =~# '^-C$\|^--\%(exec-path=\|git-dir=\|work-tree=\|bare$\)'
+      return 'echoerr ' . string('fugitive: ' . args[0] . ' is not supported')
+    else
+      break
+    endif
+  endwhile
+  if !explicit_pathspec_option
+    call insert(flags, '--no-literal-pathspecs')
+  endif
+  let no_pager = pager is# 0
+  if no_pager
+    call add(flags, '--no-pager')
+  endif
+  let env = {}
+  let i = 0
+  while i < len(flags) - 1
+    if flags[i] ==# '-c'
+      let i += 1
+      let config_name = tolower(matchstr(flags[i], '^[^=]\+'))
+      if has_key(s:prepare_env, config_name) && flags[i] =~# '=.'
+        let env[s:prepare_env[config_name]] = matchstr(flags[i], '=\zs.*')
+      endif
+      if flags[i] =~# '='
+        let config[config_name] = [matchstr(flags[i], '=\zs.*')]
+      else
+        let config[config_name] = [1]
+      endif
+    endif
+    let i += 1
+  endwhile
+  let options = {'git': s:UserCommandList(), 'git_dir': s:GitDir(dir), 'flags': flags, 'curwin': curwin}
+  if empty(args) && pager is# -1
+    let cmd = s:StatusCommand(a:line1, a:line2, a:range, curwin ? 0 : a:line2, a:bang, a:mods, '', '', [], options)
+    return (empty(cmd) ? 'exe' : cmd) . after
+  endif
+  let alias = FugitiveConfigGet('alias.' . get(args, 0, ''), config)
+  if get(args, 1, '') !=# '--help' && alias !~# '^$\|^!\|[\"'']' && !filereadable(s:VimExecPath() . '/git-' . args[0])
+        \ && !(has('win32') && filereadable(s:VimExecPath() . '/git-' . args[0] . '.exe'))
+    call remove(args, 0)
+    call extend(args, split(alias, '\s\+'), 'keep')
+  endif
+  let name = substitute(get(args, 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
+  if pager is# -1 && name =~# '^\a\+$' && exists('*s:' . name . 'Subcommand') && get(args, 1, '') !=# '--help'
+    try
+      let overrides = s:{name}Subcommand(a:line1, a:line2, a:range, a:bang, a:mods, extend({'subcommand': args[0], 'subcommand_args': args[1:-1]}, options))
+      if type(overrides) == type('')
+        return 'exe ' . string(overrides) . after
+      endif
+      let args = [get(overrides, 'command', args[0])] + get(overrides, 'insert_args', []) + args[1:-1]
+    catch /^fugitive:/
+      return 'echoerr ' . string(v:exception)
+    endtry
+  else
+    let overrides = {}
+  endif
+  call extend(env, get(overrides, 'env', {}))
+  call s:PrepareEnv(env, dir)
+  if pager is# -1
+    let pager = fugitive#PagerFor(args, config)
+  endif
+  let wants_terminal = type(pager) ==# type('') ||
+        \ (s:HasOpt(args, ['add', 'checkout', 'commit', 'reset', 'restore', 'stage', 'stash'], '-p', '--patch') ||
+        \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive')) && pager is# 0
+  if wants_terminal
+    let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g')
+    let assign = len(dir) ? '|let b:git_dir = ' . string(options.git_dir) : ''
+    let argv = s:UserCommandList(options) + args
+    let term_opts = len(env) ? {'env': env} : {}
+    if has('nvim')
+      call fugitive#Autowrite()
+      return mods . (curwin ? 'enew' : 'new') . '|call termopen(' . string(argv) . ', ' . string(term_opts) . ')' . assign . '|startinsert' . after
+    elseif exists('*term_start')
+      call fugitive#Autowrite()
+      if curwin
+        let term_opts.curwin = 1
+      endif
+      return mods . 'call term_start(' . string(argv) . ', ' . string(term_opts) . ')' . assign . after
+    endif
+  endif
+  let state = {
+        \ 'git': options.git,
+        \ 'flags': flags,
+        \ 'args': args,
+        \ 'git_dir': options.git_dir,
+        \ 'cwd': s:UserCommandCwd(dir),
+        \ 'filetype': 'git',
+        \ 'mods': s:Mods(a:mods),
+        \ 'file': s:Resolve(tempname())}
+  let allow_pty = 1
+  let after_edit = ''
+  let stream = 0
+  if a:bang && pager isnot# 2
+    let state.pager = pager
+    let pager = 1
+    let stream = exists('*setbufline')
+    let do_edit = substitute(s:Mods(a:mods, 'Edge'), '\<tab\>', '-tab', 'g') . 'pedit!'
+  elseif pager
+    let allow_pty = 0
+    if pager is# 2 && a:bang && a:line2 >= 0
+      let [do_edit, after_edit] = s:ReadPrepare(a:line1, a:line2, a:range, a:mods)
+    elseif pager is# 2 && a:bang
+      let do_edit = s:Mods(a:mods) . 'pedit'
+    elseif !curwin
+      let do_edit = s:Mods(a:mods) . 'split'
+    else
+      let do_edit = s:Mods(a:mods) . 'edit'
+      call s:BlurStatus()
+    endif
+    call extend(env, {'COLUMNS': '' . get(g:, 'fugitive_columns', 80)}, 'keep')
+  endif
+  if s:run_jobs
+    call extend(env, {'COLUMNS': '' . (&columns - 1)}, 'keep')
+    let state.pty = allow_pty && fugitive#CanPty()
+    if !state.pty
+      let args = s:AskPassArgs(dir) + args
+    endif
+    let tmp = {
+          \ 'no_more': no_pager || get(overrides, 'no_more'),
+          \ 'line_count': 0,
+          \ 'err': '',
+          \ 'out': '',
+          \ 'escape': ''}
+    let env.FUGITIVE = state.file
+    let editor = 'sh ' . s:TempScript(
+          \ '[ -f "$FUGITIVE.exit" ] && cat "$FUGITIVE.exit" >&2 && exit 1',
+          \ 'echo "$1" > "$FUGITIVE.edit"',
+          \ 'printf "\033]51;fugitive:edit\007" >&2',
+          \ 'while [ -f "$FUGITIVE.edit" -a ! -f "$FUGITIVE.exit" ]; do sleep 0.05 2>/dev/null || sleep 1; done',
+          \ 'exit 0')
+    call extend(env, {
+          \ 'NO_COLOR': '1',
+          \ 'GIT_EDITOR': editor,
+          \ 'GIT_SEQUENCE_EDITOR': editor,
+          \ 'GIT_PAGER': 'cat',
+          \ 'PAGER': 'cat'}, 'keep')
+    if len($GPG_TTY) && !has_key(env, 'GPG_TTY')
+      let env.GPG_TTY = ''
+      let did_override_gpg_tty = 1
+    endif
+    if stream
+      call writefile(['fugitive: aborting edit due to background operation.'], state.file . '.exit')
+    elseif pager
+      call writefile(['fugitive: aborting edit due to use of pager.'], state.file . '.exit')
+      let after = '|' . do_edit . ' ' . s:fnameescape(state.file) . after_edit . after
+    else
+      let env.GIT_MERGE_AUTOEDIT = '1'
+      let tmp.echo = ''
+    endif
+    let args = s:disable_colors + flags + ['-c', 'advice.waitingForEditor=false'] + args
+    let argv = s:UserCommandList({'git': options.git, 'git_dir': options.git_dir}) + args
+    let [argv, jobopts] = s:JobOpts(argv, env)
+    call fugitive#Autowrite()
+    call writefile([], state.file, 'b')
+    call s:RunSave(state)
+    if has_key(tmp, 'echo')
+      echo ""
+    endif
+    if exists('*ch_close_in')
+      call extend(jobopts, {
+            \ 'mode': 'raw',
+            \ 'out_cb': function('s:RunReceive', [state, tmp, 'out']),
+            \ 'err_cb': function('s:RunReceive', [state, tmp, 'err']),
+            \ 'close_cb': function('s:RunClose', [state, tmp]),
+            \ 'exit_cb': function('s:RunExit', [state, tmp]),
+            \ })
+      if state.pty
+        let jobopts.pty = 1
+      endif
+      let job = job_start(argv, jobopts)
+    else
+      let job = jobstart(argv, extend(jobopts, {
+            \ 'pty': state.pty,
+            \ 'TERM': 'dumb',
+            \ 'on_stdout': function('s:RunReceive', [state, tmp, 'out']),
+            \ 'on_stderr': function('s:RunReceive', [state, tmp, 'err']),
+            \ 'on_exit': function('s:RunClose', [state, tmp]),
+            \ }))
+    endif
+    let state.job = job
+    if pager
+      let tmp.closed_in = 1
+      call s:RunCloseIn(job)
+    endif
+    if stream
+      exe 'silent' do_edit '++ff=unix' s:fnameescape(state.file)
+      let state.capture_bufnr = bufnr(state.file)
+      call setbufvar(state.capture_bufnr, '&modified', 1)
+      return (after_edit . after)[1:-1]
+    endif
+    call add(s:resume_queue, [state, tmp, job])
+    return 'call fugitive#Resume()|checktime' . after
+  elseif pager
+    let pre = s:BuildEnvPrefix(env)
+    try
+      if exists('+guioptions') && &guioptions =~# '!'
+        let guioptions = &guioptions
+        set guioptions-=!
+      endif
+      silent! execute '!' . escape(pre . s:shellesc(s:UserCommandList(options) + s:disable_colors + flags + ['--no-pager'] + args), '!#%') .
+            \ (&shell =~# 'csh' ? ' >& ' . s:shellesc(state.file) : ' > ' . s:shellesc(state.file) . ' 2>&1')
+      let state.exit_status = v:shell_error
+    finally
+      if exists('guioptions')
+        let &guioptions = guioptions
+      endif
+    endtry
+    redraw!
+    call s:RunSave(state)
+    call s:RunFinished(state)
+    return do_edit . ' ' . s:fnameescape(state.file) . after_edit .
+          \ '|call fugitive#DidChange(fugitive#Result(' . string(state.file) . '))' . after
+  elseif has('win32')
+    return 'echoerr ' . string('fugitive: Vim 8 with job support required to use :Git on Windows')
+  elseif has('gui_running')
+    return 'echoerr ' . string('fugitive: Vim 8 with job support required to use :Git in GVim')
+  else
+    if !explicit_pathspec_option && get(options.flags, 0, '') ==# '--no-literal-pathspecs'
+      call remove(options.flags, 0)
+    endif
+    if exists('l:did_override_gpg_tty')
+      call remove(env, 'GPG_TTY')
+    endif
+    let cmd = s:BuildEnvPrefix(env) . s:shellesc(s:UserCommandList(options) + args)
+    let after = '|call fugitive#DidChange(' . string(dir) . ')' . after
+    if !wants_terminal && (no_pager || index(['add', 'clean', 'reset', 'restore', 'stage'], get(args, 0, '')) >= 0 || s:HasOpt(args, ['checkout'], '-q', '--quiet', '--no-progress'))
+      let output = substitute(s:SystemError(cmd)[0], "\n$", '', '')
+      if len(output)
+        try
+          if &more && no_pager
+            let more = 1
+            set nomore
+          endif
+          echo substitute(output, "\n$", "", "")
+        finally
+          if exists('l:more')
+            set more
+          endif
+        endtry
+      endif
+      return 'checktime' . after
+    else
+      return 'exe ' . string('noautocmd !' . escape(cmd, '!#%')) . after
+    endif
+  endif
+endfunction
+
+let s:exec_paths = {}
+function! s:ExecPath() abort
+  let git = s:GitShellCmd()
+  if !has_key(s:exec_paths, git)
+    let path = get(s:JobExecute(s:GitCmd() + ['--exec-path'], {}, [], [], {}).stdout, 0, '')
+    let s:exec_paths[git] = [path, FugitiveVimPath(path)]
+  endif
+  return s:exec_paths[git]
+endfunction
+
+function! s:VimExecPath() abort
+  return s:ExecPath()[1]
+endfunction
+
+let s:subcommands_before_2_5 = [
+      \ 'add', 'am', 'apply', 'archive', 'bisect', 'blame', 'branch', 'bundle',
+      \ 'checkout', 'cherry', 'cherry-pick', 'citool', 'clean', 'clone', 'commit', 'config',
+      \ 'describe', 'diff', 'difftool', 'fetch', 'format-patch', 'fsck',
+      \ 'gc', 'grep', 'gui', 'help', 'init', 'instaweb', 'log',
+      \ 'merge', 'mergetool', 'mv', 'notes', 'pull', 'push',
+      \ 'rebase', 'reflog', 'remote', 'repack', 'replace', 'request-pull', 'reset', 'revert', 'rm',
+      \ 'send-email', 'shortlog', 'show', 'show-branch', 'stash', 'stage', 'status', 'submodule',
+      \ 'tag', 'whatchanged',
+      \ ]
+let s:path_subcommands = {}
+function! s:CompletableSubcommands(dir) abort
+  let c_exec_path = s:cpath(s:VimExecPath())
+  if !has_key(s:path_subcommands, c_exec_path)
+    if fugitive#GitVersion(2, 18)
+      let [lines, exec_error] = s:LinesError([a:dir, '--list-cmds=list-mainporcelain,nohelpers,list-complete'])
+      call filter(lines, 'v:val =~# "^\\S\\+$"')
+      if !exec_error && len(lines)
+        let s:path_subcommands[c_exec_path] = lines
+      else
+        let s:path_subcommands[c_exec_path] = s:subcommands_before_2_5 +
+              \ ['maintenance', 'prune', 'range-diff', 'restore', 'sparse-checkout', 'switch', 'worktree']
+      endif
+    else
+      let s:path_subcommands[c_exec_path] = s:subcommands_before_2_5 +
+            \ (fugitive#GitVersion(2, 5) ? ['worktree'] : [])
+    endif
+  endif
+  let commands = copy(s:path_subcommands[c_exec_path])
+  for path in split($PATH, has('win32') ? ';' : ':')
+    if path !~# '^/\|^\a:[\\/]'
+      continue
+    endif
+    let cpath = s:cpath(path)
+    if !has_key(s:path_subcommands, cpath)
+      let s:path_subcommands[cpath] = filter(map(s:GlobComplete(path.'/git-', '*', 1),'substitute(v:val,"\\.exe$","","")'), 'v:val !~# "--\\|/"')
+    endif
+    call extend(commands, s:path_subcommands[cpath])
+  endfor
+  call extend(commands, keys(fugitive#ConfigGetRegexp('^alias\.\zs[^.]\+$', a:dir)))
+  let configured = split(FugitiveConfigGet('completion.commands', a:dir), '\s\+')
+  let rejected = {}
+  for command in configured
+    if command =~# '^-.'
+      let rejected[strpart(command, 1)] = 1
+    endif
+  endfor
+  call filter(configured, 'v:val !~# "^-"')
+  let results = filter(sort(commands + configured), '!has_key(rejected, v:val)')
+  if exists('*uniq')
+    return uniq(results)
+  else
+    let i = 1
+    while i < len(results)
+      if results[i] ==# results[i-1]
+        call remove(results, i)
+      else
+        let i += 1
+      endif
+    endwhile
+    return results
+  endif
+endfunction
+
+function! fugitive#Complete(lead, ...) abort
+  let dir = a:0 == 1 ? a:1 : a:0 >= 3 ? s:Dir(a:3) : s:Dir()
+  let root = a:0 >= 4 ? a:4 : s:Tree(s:Dir())
+  let pre = a:0 > 1 ? strpart(a:1, 0, a:2) : ''
+  let subcmd = matchstr(pre, '\u\w*[! ] *\%(\%(++\S\+\|--\S\+-pathspecs\|-c\s\+\S\+\)\s\+\)*\zs[[:alnum:]][[:alnum:]-]*\ze ')
+  if empty(subcmd) && a:lead =~# '^+'
+    let results = ['++curwin']
+  elseif empty(subcmd) && a:lead =~# '^-'
+    let results = ['--literal-pathspecs', '--no-literal-pathspecs', '--glob-pathspecs', '--noglob-pathspecs', '--icase-pathspecs', '--no-optional-locks']
+  elseif empty(subcmd)
+    let results = s:CompletableSubcommands(dir)
+  elseif a:0 ==# 2 && subcmd =~# '^\%(commit\|revert\|push\|fetch\|pull\|merge\|rebase\|bisect\)$'
+    let cmdline = substitute(a:1, '\u\w*\([! ] *\)' . subcmd, 'G' . subcmd, '')
+    let caps_subcmd = substitute(subcmd, '\%(^\|-\)\l', '\u&', 'g')
+    return fugitive#{caps_subcmd}Complete(a:lead, cmdline, a:2 + len(cmdline) - len(a:1), dir, root)
+  elseif pre =~# ' -- '
+    return fugitive#CompletePath(a:lead, a:1, a:2, dir, root)
+  elseif a:lead =~# '^-'
+    let results = split(s:ChompDefault('', [dir, subcmd, '--git-completion-helper']), ' ')
+  else
+    return fugitive#CompleteObject(a:lead, a:1, a:2, dir, root)
+  endif
+  return filter(results, 'strpart(v:val, 0, strlen(a:lead)) ==# a:lead')
+endfunction
+
+function! fugitive#CompleteForWorkingDir(A, L, P, ...) abort
+  let path = a:0 ? a:1 : getcwd()
+  return fugitive#Complete(a:A, a:L, a:P, FugitiveExtractGitDir(path), path)
+endfunction
+
+" Section: :Gcd, :Glcd
+
+function! fugitive#CdComplete(A, L, P) abort
+  return filter(fugitive#CompletePath(a:A), 'v:val =~# "/$"')
+endfunction
+
+function! fugitive#Cd(path, ...) abort
+  let path = substitute(a:path, '^:/:\=\|^:(\%(top\|top,literal\|literal,top\|literal\))', '', '')
+  if path !~# '^/\|^\a\+:\|^\.\.\=\%(/\|$\)'
+    let dir = s:Dir()
+    exe s:DirCheck(dir)
+    let path = (empty(s:Tree(dir)) ? dir : s:Tree(dir)) . '/' . path
+  endif
+  return (a:0 && a:1 ? 'lcd ' : 'cd ') . fnameescape(s:VimSlash(path))
+endfunction
+
+" Section: :Gstatus
+
+function! s:StatusCommand(line1, line2, range, count, bang, mods, reg, arg, args, ...) abort
+  let dir = a:0 ? s:Dir(a:1) : s:Dir()
+  exe s:DirCheck(dir)
+  try
+    let mods = s:Mods(a:mods, 'Edge')
+    let file = fugitive#Find(':', dir)
+    let arg = ' +setl\ foldmarker=<<<<<<<<,>>>>>>>>\|let\ w:fugitive_status=FugitiveGitDir() ' .
+          \ s:fnameescape(file)
+    for tabnr in [tabpagenr()] + (mods =~# '\<tab\>' ? range(1, tabpagenr('$')) : [])
+      let bufs = tabpagebuflist(tabnr)
+      for winnr in range(1, tabpagewinnr(tabnr, '$'))
+        if s:cpath(file, fnamemodify(bufname(bufs[winnr-1]), ':p'))
+          if tabnr == tabpagenr() && winnr == winnr()
+            call s:ReloadStatus()
+          else
+            call s:ExpireStatus(dir)
+            exe tabnr . 'tabnext'
+            exe winnr . 'wincmd w'
+          endif
+          let w:fugitive_status = dir
+          1
+          return ''
+        endif
+      endfor
+    endfor
+    if a:count ==# 0
+      return mods . 'edit' . (a:bang ? '!' : '') . arg
+    elseif a:bang
+      return mods . 'pedit' . arg . '|wincmd P'
+    else
+      return mods . 'keepalt split' . arg
+    endif
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  return ''
+endfunction
+
+function! s:StageJump(offset, section, ...) abort
+  let line = search('^\%(' . a:section . '\)', 'nw')
+  if !line && a:0
+    let line = search('^\%(' . a:1 . '\)', 'nw')
+  endif
+  if line
+    exe line
+    if a:offset
+      for i in range(a:offset)
+        call search(s:file_commit_pattern . '\|^$', 'W')
+        if empty(getline('.')) && a:0 && getline(line('.') + 1) =~# '^\%(' . a:1 . '\)'
+          call search(s:file_commit_pattern . '\|^$', 'W')
+        endif
+        if empty(getline('.'))
+          return ''
+        endif
+      endfor
+      call s:StageReveal()
+    else
+      call s:StageReveal()
+      +
+    endif
+  endif
+  return ''
+endfunction
+
+function! s:StageSeek(info, fallback) abort
+  let info = a:info
+  if empty(info.heading)
+    return a:fallback
+  endif
+  let line = search('^' . escape(info.heading, '^$.*[]~\') . ' (\d\++\=)$', 'wn')
+  if !line
+    for section in get({'Staged': ['Unstaged', 'Untracked'], 'Unstaged': ['Untracked', 'Staged'], 'Untracked': ['Unstaged', 'Staged']}, info.section, [])
+      let line = search('^' . section, 'wn')
+      if line
+        return line + (info.index > 0 ? 1 : 0)
+      endif
+    endfor
+    return 1
+  endif
+  let i = 0
+  while len(getline(line))
+    let filename = matchstr(getline(line), '^[A-Z?] \zs.*')
+    if len(filename) &&
+          \ ((info.filename[-1:-1] ==# '/' && filename[0 : len(info.filename) - 1] ==# info.filename) ||
+          \ (filename[-1:-1] ==# '/' && filename ==# info.filename[0 : len(filename) - 1]) ||
+          \ filename ==# info.filename)
+      if info.offset < 0
+        return line
+      else
+        if getline(line+1) !~# '^@'
+          exe s:StageInline('show', line)
+        endif
+        if getline(line+1) !~# '^@'
+          return line
+        endif
+        let type = info.sigil ==# '-' ? '-' : '+'
+        let offset = -1
+        while offset < info.offset
+          let line += 1
+          if getline(line) =~# '^@'
+            let offset = +matchstr(getline(line), type . '\zs\d\+') - 1
+          elseif getline(line) =~# '^[ ' . type . ']'
+            let offset += 1
+          elseif getline(line) !~# '^[ @\+-]'
+            return line - 1
+          endif
+        endwhile
+        return line
+      endif
+    endif
+    let commit = matchstr(getline(line), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\+')
+    if len(commit) && commit ==# info.commit
+      return line
+    endif
+    if i ==# info.index
+      let backup = line
+    endif
+    let i += getline(line) !~# '^[ @\+-]'
+    let line += 1
+  endwhile
+  return exists('backup') ? backup : line - 1
+endfunction
+
+function! s:DoAutocmdChanged(dir) abort
+  let dir = a:dir is# -2 ? '' : FugitiveGitDir(a:dir)
+  if empty(dir) || !exists('#User#FugitiveChanged') || exists('g:fugitive_event')
+    return ''
+  endif
+  try
+    let g:fugitive_event = dir
+    if type(a:dir) == type({}) && has_key(a:dir, 'args') && has_key(a:dir, 'exit_status')
+      let g:fugitive_result = a:dir
+    endif
+    exe s:DoAutocmd('User FugitiveChanged')
+  finally
+    unlet! g:fugitive_event g:fugitive_result
+    " Force statusline reload with the buffer's Git dir
+    let &l:ro = &l:ro
+  endtry
+  return ''
+endfunction
+
+function! s:ReloadStatusBuffer(...) abort
+  if get(b:, 'fugitive_type', '') !=# 'index'
+    return ''
+  endif
+  let original_lnum = a:0 ? a:1 : line('.')
+  let info = s:StageInfo(original_lnum)
+  call fugitive#BufReadStatus(0)
+  call setpos('.', [0, s:StageSeek(info, original_lnum), 1, 0])
+  return ''
+endfunction
+
+function! s:ReloadStatus(...) abort
+  call s:ExpireStatus(-1)
+  call s:ReloadStatusBuffer(a:0 ? a:1 : line('.'))
+  exe s:DoAutocmdChanged(-1)
+  return ''
+endfunction
+
+let s:last_time = reltime()
+if !exists('s:last_times')
+  let s:last_times = {}
+endif
+
+function! s:ExpireStatus(bufnr) abort
+  if a:bufnr is# -2 || a:bufnr is# 0
+    let s:head_cache = {}
+    let s:last_time = reltime()
+    return ''
+  endif
+  let head_file = fugitive#Find('.git/HEAD', a:bufnr)
+  if !empty(head_file)
+    let s:last_times[s:Tree(a:bufnr) . '/'] = reltime()
+    if has_key(s:head_cache, head_file)
+      call remove(s:head_cache, head_file)
+    endif
+  endif
+  return ''
+endfunction
+
+function! s:ReloadWinStatus(...) abort
+  if get(b:, 'fugitive_type', '') !=# 'index' || &modified
+    return
+  endif
+  if !exists('b:fugitive_reltime')
+    exe s:ReloadStatusBuffer()
+    return
+  endif
+  let t = b:fugitive_reltime
+  if reltimestr(reltime(s:last_time, t)) =~# '-\|\d\{10\}\.' ||
+        \ reltimestr(reltime(get(s:last_times, s:Tree() . '/', t), t)) =~# '-\|\d\{10\}\.'
+    exe s:ReloadStatusBuffer()
+  endif
+endfunction
+
+function! s:ReloadTabStatus(...) abort
+  let mytab = tabpagenr()
+  let tab = a:0 ? a:1 : mytab
+  let winnr = 1
+  while winnr <= tabpagewinnr(tab, '$')
+    if getbufvar(tabpagebuflist(tab)[winnr-1], 'fugitive_type') ==# 'index'
+      execute 'tabnext '.tab
+      if winnr != winnr()
+        execute winnr.'wincmd w'
+        let restorewinnr = 1
+      endif
+      try
+        call s:ReloadWinStatus()
+      finally
+        if exists('restorewinnr')
+          unlet restorewinnr
+          wincmd p
+        endif
+        execute 'tabnext '.mytab
+      endtry
+    endif
+    let winnr += 1
+  endwhile
+  unlet! t:fugitive_reload_status
+endfunction
+
+function! fugitive#DidChange(...) abort
+  call s:ExpireStatus(a:0 ? a:1 : -1)
+  if a:0 > 1 ? a:2 : (!a:0 || a:1 isnot# 0)
+    let t = reltime()
+    let t:fugitive_reload_status = t
+    for tabnr in exists('*settabvar') ? range(1, tabpagenr('$')) : []
+      call settabvar(tabnr, 'fugitive_reload_status', t)
+    endfor
+    call s:ReloadTabStatus()
+  else
+    call s:ReloadWinStatus()
+    return ''
+  endif
+  exe s:DoAutocmdChanged(a:0 ? a:1 : -1)
+  return ''
+endfunction
+
+function! fugitive#ReloadStatus(...) abort
+  return call('fugitive#DidChange', a:000)
+endfunction
+
+function! fugitive#EfmDir(...) abort
+  let dir = matchstr(a:0 ? a:1 : &errorformat, '\c,%\\&\%(git\|fugitive\)_\=dir=\zs\%(\\.\|[^,]\)*')
+  let dir = substitute(dir, '%%', '%', 'g')
+  let dir = substitute(dir, '\\\ze[\,]', '', 'g')
+  return dir
+endfunction
+
+augroup fugitive_status
+  autocmd!
+  autocmd BufWritePost         * call fugitive#DidChange(+expand('<abuf>'), 0)
+  autocmd User FileChmodPost,FileUnlinkPost call fugitive#DidChange(+expand('<abuf>'), 0)
+  autocmd ShellCmdPost,ShellFilterPost * nested call fugitive#DidChange(0)
+  autocmd BufDelete * nested
+        \ if getbufvar(+expand('<abuf>'), 'buftype') ==# 'terminal' |
+        \   if !empty(FugitiveGitDir(+expand('<abuf>'))) |
+        \     call fugitive#DidChange(+expand('<abuf>')) |
+        \   else |
+        \     call fugitive#DidChange(0) |
+        \  endif |
+        \ endif
+  autocmd QuickFixCmdPost make,lmake,[cl]file,[cl]getfile nested
+        \ call fugitive#DidChange(fugitive#EfmDir())
+  autocmd FocusGained        *
+        \ if get(g:, 'fugitive_focus_gained', !has('win32')) |
+        \   call fugitive#DidChange(0) |
+        \ endif
+  autocmd BufEnter index,index.lock
+        \ call s:ReloadWinStatus()
+  autocmd TabEnter *
+        \ if exists('t:fugitive_reload_status') |
+        \    call s:ReloadTabStatus() |
+        \ endif
+augroup END
+
+function! s:StageInfo(...) abort
+  let lnum = a:0 ? a:1 : line('.')
+  let sigil = matchstr(getline(lnum), '^[ @\+-]')
+  let offset = -1
+  if len(sigil)
+    let type = sigil ==# '-' ? '-' : '+'
+    while lnum > 0 && getline(lnum) !~# '^@'
+      if getline(lnum) =~# '^[ '.type.']'
+        let offset += 1
+      endif
+      let lnum -= 1
+    endwhile
+    let offset += matchstr(getline(lnum), type.'\zs\d\+')
+    while getline(lnum) =~# '^[ @\+-]'
+      let lnum -= 1
+    endwhile
+  endif
+  let slnum = lnum + 1
+  let heading = ''
+  let index = 0
+  while len(getline(slnum - 1)) && empty(heading)
+    let slnum -= 1
+    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\++\=)$')
+    if empty(heading) && getline(slnum) !~# '^[ @\+-]'
+      let index += 1
+    endif
+  endwhile
+  let text = matchstr(getline(lnum), '^[A-Z?] \zs.*')
+  let file = get(get(b:fugitive_files, heading, {}), text, {})
+  let relative = get(file, 'relative', len(text) ? [text] : [])
+  return {'section': matchstr(heading, '^\u\l\+'),
+        \ 'heading': heading,
+        \ 'sigil': sigil,
+        \ 'offset': offset,
+        \ 'filename': text,
+        \ 'relative': copy(relative),
+        \ 'paths': map(copy(relative), 's:Tree() . "/" . v:val'),
+        \ 'commit': matchstr(getline(lnum), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze '),
+        \ 'status': matchstr(getline(lnum), '^[A-Z?]\ze \|^\%(\x\x\x\)\@!\l\+\ze [0-9a-f]'),
+        \ 'submodule': get(file, 'submodule', ''),
+        \ 'index': index}
+endfunction
+
+function! s:Selection(arg1, ...) abort
+  if a:arg1 ==# 'n'
+    let arg1 = line('.')
+    let arg2 = -v:count
+  elseif a:arg1 ==# 'v'
+    let arg1 = line("'<")
+    let arg2 = line("'>")
+  else
+    let arg1 = a:arg1
+    let arg2 = a:0 ? a:1 : 0
+  endif
+  let first = arg1
+  if arg2 < 0
+    let last = first - arg2 - 1
+  elseif arg2 > 0
+    let last = arg2
+  else
+    let last = first
+  endif
+  while first <= line('$') && getline(first) =~# '^$\|^[A-Z][a-z]'
+    let first += 1
+  endwhile
+  if first > last || &filetype !=# 'fugitive'
+    return []
+  endif
+  let flnum = first
+  while getline(flnum) =~# '^[ @\+-]'
+    let flnum -= 1
+  endwhile
+  let slnum = flnum + 1
+  let heading = ''
+  let index = 0
+  while empty(heading)
+    let slnum -= 1
+    let heading = matchstr(getline(slnum), '^\u\l\+.\{-\}\ze (\d\++\=)$')
+    if empty(heading) && getline(slnum) !~# '^[ @\+-]'
+      let index += 1
+    endif
+  endwhile
+  let results = []
+  let template = {
+        \ 'heading': heading,
+        \ 'section': matchstr(heading, '^\u\l\+'),
+        \ 'filename': '',
+        \ 'relative': [],
+        \ 'paths': [],
+        \ 'commit': '',
+        \ 'status': '',
+        \ 'patch': 0,
+        \ 'index': index}
+  let line = getline(flnum)
+  let lnum = first - (arg1 == flnum ? 0 : 1)
+  let root = s:Tree() . '/'
+  while lnum <= last
+    let heading = matchstr(line, '^\u\l\+\ze.\{-\}\ze (\d\++\=)$')
+    if len(heading)
+      let template.heading = heading
+      let template.section = matchstr(heading, '^\u\l\+')
+      let template.index = 0
+    elseif line =~# '^[ @\+-]'
+      let template.index -= 1
+      if !results[-1].patch
+        let results[-1].patch = lnum
+      endif
+      let results[-1].lnum = lnum
+    elseif line =~# '^[A-Z?] '
+      let text = matchstr(line, '^[A-Z?] \zs.*')
+      let file = get(get(b:fugitive_files, template.heading, {}), text, {})
+      let relative = get(file, 'relative', len(text) ? [text] : [])
+      call add(results, extend(deepcopy(template), {
+            \ 'lnum': lnum,
+            \ 'filename': text,
+            \ 'relative': copy(relative),
+            \ 'paths': map(copy(relative), 'root . v:val'),
+            \ 'status': matchstr(line, '^[A-Z?]'),
+            \ }))
+    elseif line =~# '^\x\x\x\+ '
+      call add(results, extend({
+            \ 'lnum': lnum,
+            \ 'commit': matchstr(line, '^\x\x\x\+'),
+            \ }, template, 'keep'))
+    elseif line =~# '^\l\+ \x\x\x\+ '
+      call add(results, extend({
+            \ 'lnum': lnum,
+            \ 'commit': matchstr(line, '^\l\+ \zs\x\x\x\+'),
+            \ 'status': matchstr(line, '^\l\+'),
+            \ }, template, 'keep'))
+    endif
+    let lnum += 1
+    let template.index += 1
+    let line = getline(lnum)
+  endwhile
+  if len(results) && results[0].patch && arg2 == 0
+    while getline(results[0].patch) =~# '^[ \+-]'
+      let results[0].patch -= 1
+    endwhile
+    while getline(results[0].lnum + 1) =~# '^[ \+-]'
+      let results[0].lnum += 1
+    endwhile
+  endif
+  return results
+endfunction
+
+function! s:StageArgs(visual) abort
+  let commits = []
+  let paths = []
+  for record in s:Selection(a:visual ? 'v' : 'n')
+    if len(record.commit)
+      call add(commits, record.commit)
+    endif
+    call extend(paths, record.paths)
+  endfor
+  if s:cpath(s:Tree(), getcwd())
+    call map(paths, 'fugitive#Path(v:val, "./")')
+  endif
+  return join(map(commits + paths, 's:fnameescape(v:val)'), ' ')
+endfunction
+
+function! s:Do(action, visual) abort
+  let line = getline('.')
+  let reload = 0
+  if !a:visual && !v:count && line =~# '^[A-Z][a-z]'
+    let header = matchstr(line, '^\S\+\ze:')
+    if len(header) && exists('*s:Do' . a:action . header . 'Header')
+      let reload = s:Do{a:action}{header}Header(matchstr(line, ': \zs.*')) > 0
+    else
+      let section = matchstr(line, '^\S\+')
+      if exists('*s:Do' . a:action . section . 'Heading')
+        let reload = s:Do{a:action}{section}Heading(line) > 0
+      endif
+    endif
+    return reload ? s:ReloadStatus() : ''
+  endif
+  let selection = s:Selection(a:visual ? 'v' : 'n')
+  if empty(selection)
+    return ''
+  endif
+  call filter(selection, 'v:val.section ==# selection[0].section')
+  let status = 0
+  let err = ''
+  try
+    for record in selection
+      if exists('*s:Do' . a:action . record.section)
+        let status = s:Do{a:action}{record.section}(record)
+      else
+        continue
+      endif
+      if !status
+        return ''
+      endif
+      let reload = reload || (status > 0)
+    endfor
+    if status < 0
+      execute record.lnum + 1
+    endif
+    let success = 1
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  finally
+    if reload
+      execute s:ReloadStatus()
+    endif
+    if exists('success')
+      call s:StageReveal()
+    endif
+  endtry
+  return ''
+endfunction
+
+function! s:StageReveal() abort
+  exe 'normal! zv'
+  let begin = line('.')
+  if getline(begin) =~# '^@'
+    let end = begin + 1
+    while getline(end) =~# '^[ \+-]'
+      let end += 1
+    endwhile
+  elseif getline(begin) =~# '^commit '
+    let end = begin
+    while end < line('$') && getline(end + 1) !~# '^commit '
+      let end += 1
+    endwhile
+  elseif getline(begin) =~# s:section_pattern
+    let end = begin
+    while len(getline(end + 1))
+      let end += 1
+    endwhile
+  endif
+  if exists('end')
+    while line('.') > line('w0') + &scrolloff && end > line('w$')
+      execute "normal! \<C-E>"
+    endwhile
+  endif
+endfunction
+
+let s:file_pattern = '^[A-Z?] .\|^diff --'
+let s:file_commit_pattern = s:file_pattern . '\|^\%(\l\{3,\} \)\=[0-9a-f]\{4,\} '
+let s:item_pattern = s:file_commit_pattern . '\|^@@'
+
+function! s:NextHunk(count) abort
+  if &filetype ==# 'fugitive' && getline('.') =~# s:file_pattern
+    exe s:StageInline('show')
+  endif
+  for i in range(a:count)
+    if &filetype ==# 'fugitive'
+      call search(s:file_pattern . '\|^@', 'W')
+      if getline('.') =~# s:file_pattern
+        exe s:StageInline('show')
+        if getline(line('.') + 1) =~# '^@'
+          +
+        endif
+      endif
+    else
+      call search('^@@', 'W')
+    endif
+  endfor
+  call s:StageReveal()
+  return '.'
+endfunction
+
+function! s:PreviousHunk(count) abort
+  for i in range(a:count)
+    if &filetype ==# 'fugitive'
+      let lnum = search(s:file_pattern . '\|^@','Wbn')
+      call s:StageInline('show', lnum)
+      call search('^? .\|^@','Wb')
+    else
+      call search('^@@', 'Wb')
+    endif
+  endfor
+  call s:StageReveal()
+  return '.'
+endfunction
+
+function! s:NextFile(count) abort
+  for i in range(a:count)
+    exe s:StageInline('hide')
+    if !search(s:file_pattern, 'W')
+      break
+    endif
+  endfor
+  exe s:StageInline('hide')
+  return '.'
+endfunction
+
+function! s:PreviousFile(count) abort
+  exe s:StageInline('hide')
+  for i in range(a:count)
+    if !search(s:file_pattern, 'Wb')
+      break
+    endif
+    exe s:StageInline('hide')
+  endfor
+  return '.'
+endfunction
+
+function! s:NextItem(count) abort
+  for i in range(a:count)
+    if !search(s:item_pattern, 'W') && getline('.') !~# s:item_pattern
+      call search('^commit ', 'W')
+    endif
+  endfor
+  call s:StageReveal()
+  return '.'
+endfunction
+
+function! s:PreviousItem(count) abort
+  for i in range(a:count)
+    if !search(s:item_pattern, 'Wb') && getline('.') !~# s:item_pattern
+      call search('^commit ', 'Wb')
+    endif
+  endfor
+  call s:StageReveal()
+  return '.'
+endfunction
+
+let s:section_pattern = '^[A-Z][a-z][^:]*$'
+let s:section_commit_pattern = s:section_pattern . '\|^commit '
+
+function! s:NextSection(count) abort
+  let orig = line('.')
+  if getline('.') !~# '^commit '
+    -
+  endif
+  for i in range(a:count)
+    if !search(s:section_commit_pattern, 'W')
+      break
+    endif
+  endfor
+  if getline('.') =~# s:section_commit_pattern
+    call s:StageReveal()
+    return getline('.') =~# s:section_pattern ? '+' : ':'
+  else
+    return orig
+  endif
+endfunction
+
+function! s:PreviousSection(count) abort
+  let orig = line('.')
+  if getline('.') !~# '^commit '
+    -
+  endif
+  for i in range(a:count)
+    if !search(s:section_commit_pattern . '\|\%^', 'bW')
+      break
+    endif
+  endfor
+  if getline('.') =~# s:section_commit_pattern || line('.') == 1
+    call s:StageReveal()
+    return getline('.') =~# s:section_pattern ? '+' : ':'
+  else
+    return orig
+  endif
+endfunction
+
+function! s:NextSectionEnd(count) abort
+  +
+  if empty(getline('.'))
+    +
+  endif
+  for i in range(a:count)
+    if !search(s:section_commit_pattern, 'W')
+      return '$'
+    endif
+  endfor
+  return search('^.', 'Wb')
+endfunction
+
+function! s:PreviousSectionEnd(count) abort
+  let old = line('.')
+  for i in range(a:count)
+    if search(s:section_commit_pattern, 'Wb') <= 1
+      exe old
+      if i
+        break
+      else
+        return ''
+      endif
+    endif
+    let old = line('.')
+  endfor
+  return search('^.', 'Wb')
+endfunction
+
+function! s:PatchSearchExpr(reverse) abort
+  let line = getline('.')
+  if col('.') ==# 1 && line =~# '^[+-]'
+    if line =~# '^[+-]\{3\} '
+      let pattern = '^[+-]\{3\} ' . substitute(escape(strpart(line, 4), '^$.*[]~\'), '^\w/', '\\w/', '') . '$'
+    else
+      let pattern = '^[+-]\s*' . escape(substitute(strpart(line, 1), '^\s*\|\s*$', '', ''), '^$.*[]~\') . '\s*$'
+    endif
+    if a:reverse
+      return '?' . escape(pattern, '/?') . "\<CR>"
+    else
+      return '/' . escape(pattern, '/') . "\<CR>"
+    endif
+  endif
+  return a:reverse ? '#' : '*'
+endfunction
+
+function! s:StageInline(mode, ...) abort
+  if &filetype !=# 'fugitive'
+    return ''
+  endif
+  let lnum1 = a:0 ? a:1 : line('.')
+  let lnum = lnum1 + 1
+  if a:0 > 1 && a:2 == 0 && lnum1 == 1
+    let lnum = line('$') - 1
+  elseif a:0 > 1 && a:2 == 0
+    let info = s:StageInfo(lnum - 1)
+    if empty(info.paths) && len(info.section)
+      while len(getline(lnum))
+        let lnum += 1
+      endwhile
+    endif
+  elseif a:0 > 1
+    let lnum += a:2 - 1
+  endif
+  while lnum > lnum1
+    let lnum -= 1
+    while lnum > 0 && getline(lnum) =~# '^[ @\+-]'
+      let lnum -= 1
+    endwhile
+    let info = s:StageInfo(lnum)
+    if !has_key(b:fugitive_diff, info.section)
+      continue
+    endif
+    if getline(lnum + 1) =~# '^[ @\+-]'
+      let lnum2 = lnum + 1
+      while getline(lnum2 + 1) =~# '^[ @\+-]'
+        let lnum2 += 1
+      endwhile
+      if a:mode !=# 'show'
+        setlocal modifiable noreadonly
+        exe 'silent keepjumps ' . (lnum + 1) . ',' . lnum2 . 'delete _'
+        call remove(b:fugitive_expanded[info.section], info.filename)
+        setlocal nomodifiable readonly nomodified
+      endif
+      continue
+    endif
+    if !has_key(b:fugitive_diff, info.section) || info.status !~# '^[ADMRU]$' || a:mode ==# 'hide'
+      continue
+    endif
+    let mode = ''
+    let diff = []
+    let index = 0
+    let start = -1
+    for line in fugitive#Wait(b:fugitive_diff[info.section]).stdout
+      if mode ==# 'await' && line[0] ==# '@'
+        let mode = 'capture'
+      endif
+      if mode !=# 'head' && line !~# '^[ @\+-]'
+        if len(diff)
+          break
+        endif
+        let start = index
+        let mode = 'head'
+      elseif mode ==# 'head' && line =~# '^diff '
+        let start = index
+      elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '--- ' . info.relative[-1]
+        let mode = 'await'
+      elseif mode ==# 'head' && substitute(line, "\t$", '', '') ==# '+++ ' . info.relative[0]
+        let mode = 'await'
+      elseif mode ==# 'capture'
+        call add(diff, line)
+      elseif line[0] ==# '@'
+        let mode = ''
+      endif
+      let index += 1
+    endfor
+    if len(diff)
+      setlocal modifiable noreadonly
+      silent call append(lnum, diff)
+      let b:fugitive_expanded[info.section][info.filename] = [start, len(diff)]
+      setlocal nomodifiable readonly nomodified
+      if foldclosed(lnum+1) > 0
+        silent exe (lnum+1) . ',' . (lnum+len(diff)) . 'foldopen!'
+      endif
+    endif
+  endwhile
+  return lnum
+endfunction
+
+function! s:NextExpandedHunk(count) abort
+  for i in range(a:count)
+    call s:StageInline('show', line('.'), 1)
+    call search(s:file_pattern . '\|^@','W')
+  endfor
+  return '.'
+endfunction
+
+function! s:StageDiff(diff) abort
+  let lnum = line('.')
+  let info = s:StageInfo(lnum)
+  let prefix = info.offset > 0 ? '+' . info.offset : ''
+  if info.submodule =~# '^S'
+    if info.section ==# 'Staged'
+      return 'Git --paginate diff --no-ext-diff --submodule=log --cached -- ' . info.paths[0]
+    elseif info.submodule =~# '^SC'
+      return 'Git --paginate diff --no-ext-diff --submodule=log -- ' . info.paths[0]
+    else
+      return 'Git --paginate diff --no-ext-diff --submodule=diff -- ' . info.paths[0]
+    endif
+  elseif empty(info.paths) && info.section ==# 'Staged'
+    return 'Git --paginate diff --no-ext-diff --cached'
+  elseif empty(info.paths)
+    return 'Git --paginate diff --no-ext-diff'
+  elseif len(info.paths) > 1
+    execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0])
+    return a:diff . '! @:'.s:fnameescape(info.paths[1])
+  elseif info.section ==# 'Staged' && info.sigil ==# '-'
+    execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
+    return a:diff . '! :0:%'
+  elseif info.section ==# 'Staged'
+    execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
+    return a:diff . '! @:%'
+  elseif info.sigil ==# '-'
+    execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
+    return a:diff . '! :(top)%'
+  else
+    execute 'Gedit' prefix s:fnameescape(':(top)'.info.paths[0])
+    return a:diff . '!'
+  endif
+endfunction
+
+function! s:StageDiffEdit() abort
+  let info = s:StageInfo(line('.'))
+  let arg = (empty(info.paths) ? s:Tree() : info.paths[0])
+  if info.section ==# 'Staged'
+    return 'Git --paginate diff --no-ext-diff --cached '.s:fnameescape(arg)
+  elseif info.status ==# '?'
+    call s:TreeChomp('add', '--intent-to-add', '--', arg)
+    return s:ReloadStatus()
+  else
+    return 'Git --paginate diff --no-ext-diff '.s:fnameescape(arg)
+  endif
+endfunction
+
+function! s:StageApply(info, reverse, extra) abort
+  if a:info.status ==# 'R'
+    throw 'fugitive: patching renamed file not yet supported'
+  endif
+  let cmd = ['apply', '-p0', '--recount'] + a:extra
+  let info = a:info
+  let start = info.patch
+  let end = info.lnum
+  let lines = getline(start, end)
+  if empty(filter(copy(lines), 'v:val =~# "^[+-]"'))
+    return -1
+  endif
+  while getline(end) =~# '^[-+\ ]'
+    let end += 1
+    if getline(end) =~# '^[' . (a:reverse ? '+' : '-') . '\ ]'
+      call add(lines, ' ' . getline(end)[1:-1])
+    endif
+  endwhile
+  while start > 0 && getline(start) !~# '^@'
+    let start -= 1
+    if getline(start) =~# '^[' . (a:reverse ? '+' : '-') . ' ]'
+      call insert(lines, ' ' . getline(start)[1:-1])
+    elseif getline(start) =~# '^@'
+      call insert(lines, getline(start))
+    endif
+  endwhile
+  if start == 0
+    throw 'fugitive: could not find hunk'
+  elseif getline(start) !~# '^@@ '
+    throw 'fugitive: cannot apply conflict hunk'
+  endif
+  let i = b:fugitive_expanded[info.section][info.filename][0]
+  let head = []
+  let diff_lines = fugitive#Wait(b:fugitive_diff[info.section]).stdout
+  while get(diff_lines, i, '@') !~# '^@'
+    let line = diff_lines[i]
+    if line ==# '--- /dev/null'
+      call add(head, '--- ' . get(diff_lines, i + 1, '')[4:-1])
+    elseif line !~# '^new file '
+      call add(head, line)
+    endif
+    let i += 1
+  endwhile
+  call extend(lines, head, 'keep')
+  let temp = tempname()
+  call writefile(lines, temp)
+  if a:reverse
+    call add(cmd, '--reverse')
+  endif
+  call extend(cmd, ['--', temp])
+  let output = s:ChompStderr(cmd)
+  if empty(output)
+    return 1
+  endif
+  call s:throw(output)
+endfunction
+
+function! s:StageDelete(lnum1, lnum2, count) abort
+  let restore = []
+
+  let err = ''
+  let did_conflict_err = 0
+  let reset_commit = matchstr(getline(a:lnum1), '^Un\w\+ \%(to\| from\) \zs\S\+')
+  try
+    for info in s:Selection(a:lnum1, a:lnum2)
+      if empty(info.paths)
+        if len(info.commit)
+          let reset_commit = info.commit . '^'
+        endif
+        continue
+      endif
+      let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule')
+      if sub =~# '^S' && info.status ==# 'M'
+        let undo = 'Git checkout ' . fugitive#RevParse('HEAD', FugitiveExtractGitDir(info.paths[0]))[0:10] . ' --'
+      elseif sub =~# '^S'
+        let err .= '|echoerr ' . string('fugitive: will not touch submodule ' . string(info.relative[0]))
+        break
+      elseif info.status ==# 'D'
+        let undo = 'GRemove'
+      elseif info.paths[0] =~# '/$'
+        let err .= '|echoerr ' . string('fugitive: will not delete directory ' . string(info.relative[0]))
+        break
+      else
+        let undo = 'Gread ' . s:TreeChomp('hash-object', '-w', '--', info.paths[0])[0:10]
+      endif
+      if info.patch
+        call s:StageApply(info, 1, info.section ==# 'Staged' ? ['--index'] : [])
+      elseif sub =~# '^S'
+        if info.section ==# 'Staged'
+          call s:TreeChomp('reset', '--', info.paths[0])
+        endif
+        call s:TreeChomp('submodule', 'update', '--', info.paths[0])
+      elseif info.status ==# '?'
+        call s:TreeChomp('clean', '-f', '--', info.paths[0])
+      elseif a:count == 2
+        if get(b:fugitive_files['Staged'], info.filename, {'status': ''}).status ==# 'D'
+          call delete(info.paths[0])
+        else
+          call s:TreeChomp('checkout', '--ours', '--', info.paths[0])
+        endif
+      elseif a:count == 3
+        if get(b:fugitive_files['Unstaged'], info.filename, {'status': ''}).status ==# 'D'
+          call delete(info.paths[0])
+        else
+          call s:TreeChomp('checkout', '--theirs', '--', info.paths[0])
+        endif
+      elseif info.status =~# '[ADU]' &&
+            \ get(b:fugitive_files[info.section ==# 'Staged' ? 'Unstaged' : 'Staged'], info.filename, {'status': ''}).status =~# '[AU]'
+        if get(g:, 'fugitive_conflict_x', 0)
+          call s:TreeChomp('checkout', info.section ==# 'Unstaged' ? '--ours' : '--theirs', '--', info.paths[0])
+        else
+          if !did_conflict_err
+            let err .= '|echoerr "Use 2X for --ours or 3X for --theirs"'
+            let did_conflict_err = 1
+          endif
+          continue
+        endif
+      elseif info.status ==# 'U'
+        call delete(info.paths[0])
+      elseif info.status ==# 'A'
+        call s:TreeChomp('rm', '-f', '--', info.paths[0])
+      elseif info.section ==# 'Unstaged'
+        call s:TreeChomp('checkout', '--', info.paths[0])
+      else
+        call s:TreeChomp('checkout', '@', '--', info.paths[0])
+      endif
+      if len(undo)
+        call add(restore, ':Gsplit ' . s:fnameescape(info.relative[0]) . '|' . undo)
+      endif
+    endfor
+  catch /^fugitive:/
+    let err .= '|echoerr ' . string(v:exception)
+  endtry
+  if empty(restore)
+    if len(reset_commit) && empty(err)
+      call feedkeys(':Git reset ' . reset_commit)
+    endif
+    return err[1:-1]
+  endif
+  exe s:ReloadStatus()
+  call s:StageReveal()
+  return 'checktime|redraw|echomsg ' . string('To restore, ' . join(restore, '|')) . err
+endfunction
+
+function! s:StageIgnore(lnum1, lnum2, count) abort
+  let paths = []
+  for info in s:Selection(a:lnum1, a:lnum2)
+    call extend(paths, info.relative)
+  endfor
+  call map(paths, '"/" . v:val')
+  if !a:0
+    let dir = fugitive#Find('.git/info/')
+    if !isdirectory(dir)
+      try
+        call mkdir(dir)
+      catch
+      endtry
+    endif
+  endif
+  exe 'Gsplit' (a:count ? '.gitignore' : '.git/info/exclude')
+  let last = line('$')
+  if last == 1 && empty(getline(1))
+    call setline(last, paths)
+  else
+    call append(last, paths)
+    exe last + 1
+  endif
+  return ''
+endfunction
+
+function! s:DoToggleHeadHeader(value) abort
+  exe 'edit' fnameescape(fugitive#Find('.git/'))
+  call search('\C^index$', 'wc')
+endfunction
+
+function! s:DoToggleHelpHeader(value) abort
+  exe 'help fugitive-map'
+endfunction
+
+function! s:DoStagePushHeader(value) abort
+  let remote = matchstr(a:value, '\zs[^/]\+\ze/')
+  if empty(remote)
+    let remote = '.'
+  endif
+  let branch = matchstr(a:value, '\%([^/]\+/\)\=\zs\S\+')
+  call feedkeys(':Git push ' . remote . ' ' . branch)
+endfunction
+
+function! s:DoTogglePushHeader(value) abort
+  return s:DoStagePushHeader(a:value)
+endfunction
+
+function! s:DoStageUnpushedHeading(heading) abort
+  let remote = matchstr(a:heading, 'to \zs[^/]\+\ze/')
+  if empty(remote)
+    let remote = '.'
+  endif
+  let branch = matchstr(a:heading, 'to \%([^/]\+/\)\=\zs\S\+')
+  if branch ==# '*'
+    return
+  endif
+  call feedkeys(':Git push ' . remote . ' ' . '@:' . 'refs/heads/' . branch)
+endfunction
+
+function! s:DoToggleUnpushedHeading(heading) abort
+  return s:DoStageUnpushedHeading(a:heading)
+endfunction
+
+function! s:DoStageUnpushed(record) abort
+  let remote = matchstr(a:record.heading, 'to \zs[^/]\+\ze/')
+  if empty(remote)
+    let remote = '.'
+  endif
+  let branch = matchstr(a:record.heading, 'to \%([^/]\+/\)\=\zs\S\+')
+  if branch ==# '*'
+    return
+  endif
+  call feedkeys(':Git push ' . remote . ' ' . a:record.commit . ':' . 'refs/heads/' . branch)
+endfunction
+
+function! s:DoToggleUnpushed(record) abort
+  return s:DoStageUnpushed(a:record)
+endfunction
+
+function! s:DoUnstageUnpulledHeading(heading) abort
+  call feedkeys(':Git rebase')
+endfunction
+
+function! s:DoToggleUnpulledHeading(heading) abort
+  call s:DoUnstageUnpulledHeading(a:heading)
+endfunction
+
+function! s:DoUnstageUnpulled(record) abort
+  call feedkeys(':Git rebase ' . a:record.commit)
+endfunction
+
+function! s:DoToggleUnpulled(record) abort
+  call s:DoUnstageUnpulled(a:record)
+endfunction
+
+function! s:DoUnstageUnpushed(record) abort
+  call feedkeys(':Git -c sequence.editor=true rebase --interactive --autosquash ' . a:record.commit . '^')
+endfunction
+
+function! s:DoToggleStagedHeading(...) abort
+  call s:TreeChomp('reset', '-q')
+  return 1
+endfunction
+
+function! s:DoUnstageStagedHeading(heading) abort
+  return s:DoToggleStagedHeading(a:heading)
+endfunction
+
+function! s:DoToggleUnstagedHeading(...) abort
+  call s:TreeChomp('add', '-u')
+  return 1
+endfunction
+
+function! s:DoStageUnstagedHeading(heading) abort
+  return s:DoToggleUnstagedHeading(a:heading)
+endfunction
+
+function! s:DoToggleUntrackedHeading(...) abort
+  call s:TreeChomp('add', '.')
+  return 1
+endfunction
+
+function! s:DoStageUntrackedHeading(heading) abort
+  return s:DoToggleUntrackedHeading(a:heading)
+endfunction
+
+function! s:DoToggleStaged(record) abort
+  if a:record.patch
+    return s:StageApply(a:record, 1, ['--cached'])
+  else
+    call s:TreeChomp(['reset', '-q', '--'] + a:record.paths)
+    return 1
+  endif
+endfunction
+
+function! s:DoUnstageStaged(record) abort
+  return s:DoToggleStaged(a:record)
+endfunction
+
+function! s:DoToggleUnstaged(record) abort
+  if a:record.patch
+    return s:StageApply(a:record, 0, ['--cached'])
+  else
+    call s:TreeChomp(['add', '-A', '--'] + a:record.paths)
+    return 1
+  endif
+endfunction
+
+function! s:DoStageUnstaged(record) abort
+  return s:DoToggleUnstaged(a:record)
+endfunction
+
+function! s:DoUnstageUnstaged(record) abort
+  if a:record.status ==# 'A'
+    call s:TreeChomp(['reset', '-q', '--'] + a:record.paths)
+    return 1
+  else
+    return -1
+  endif
+endfunction
+
+function! s:DoToggleUntracked(record) abort
+  call s:TreeChomp(['add', '--'] + a:record.paths)
+  return 1
+endfunction
+
+function! s:DoStageUntracked(record) abort
+  return s:DoToggleUntracked(a:record)
+endfunction
+
+function! s:StagePatch(lnum1,lnum2) abort
+  let add = []
+  let reset = []
+  let intend = []
+
+  for lnum in range(a:lnum1,a:lnum2)
+    let info = s:StageInfo(lnum)
+    if empty(info.paths) && info.section ==# 'Staged'
+      execute 'tab Git reset --patch'
+      break
+    elseif empty(info.paths) && info.section ==# 'Unstaged'
+      execute 'tab Git add --patch'
+      break
+    elseif empty(info.paths) && info.section ==# 'Untracked'
+      execute 'tab Git add --interactive'
+      break
+    elseif empty(info.paths)
+      continue
+    endif
+    execute lnum
+    if info.section ==# 'Staged'
+      let reset += info.relative
+    elseif info.section ==# 'Untracked'
+      let intend += info.paths
+    elseif info.status !~# '^D'
+      let add += info.relative
+    endif
+  endfor
+  try
+    if !empty(intend)
+      call s:TreeChomp(['add', '--intent-to-add', '--'] + intend)
+    endif
+    if !empty(add)
+      execute "tab Git add --patch -- ".join(map(add,'fnameescape(v:val)'))
+    endif
+    if !empty(reset)
+      execute "tab Git reset --patch -- ".join(map(reset,'fnameescape(v:val)'))
+    endif
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  return s:ReloadStatus()
+endfunction
+
+" Section: :Git commit, :Git revert
+
+function! s:CommitInteractive(line1, line2, range, bang, mods, options, patch) abort
+  let status = s:StatusCommand(a:line1, a:line2, a:range, get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2, a:bang, a:mods, '', '', [], a:options)
+  let status = len(status) ? status . '|' : ''
+  if a:patch
+    return status . 'if search("^Unstaged")|exe "normal >"|exe "+"|endif'
+  else
+    return status . 'if search("^Untracked\\|^Unstaged")|exe "+"|endif'
+  endif
+endfunction
+
+function! s:CommitSubcommand(line1, line2, range, bang, mods, options) abort
+  let argv = copy(a:options.subcommand_args)
+  let i = 0
+  while get(argv, i, '--') !=# '--'
+    if argv[i] =~# '^-[apzsneiovq].'
+      call insert(argv, argv[i][0:1])
+      let argv[i+1] = '-' . argv[i+1][2:-1]
+    else
+      let i += 1
+    endif
+  endwhile
+  if s:HasOpt(argv, '-i', '--interactive')
+    return s:CommitInteractive(a:line1, a:line2, a:range, a:bang, a:mods, a:options, 0)
+  elseif s:HasOpt(argv, '-p', '--patch')
+    return s:CommitInteractive(a:line1, a:line2, a:range, a:bang, a:mods, a:options, 1)
+  else
+    return {}
+  endif
+endfunction
+
+function! s:RevertSubcommand(line1, line2, range, bang, mods, options) abort
+  return {'insert_args': ['--edit']}
+endfunction
+
+function! fugitive#CommitComplete(A, L, P, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  if a:A =~# '^--fixup=\|^--squash='
+    let commits = s:LinesError([dir, 'log', '--pretty=format:%s', '@{upstream}..'])[0]
+    let pre = matchstr(a:A, '^--\w*=''\=') . ':/^'
+    if pre =~# "'"
+      call map(commits, 'pre . string(tr(v:val, "|\"^$*[]", "......."))[1:-1]')
+      call filter(commits, 'strpart(v:val, 0, strlen(a:A)) ==# a:A')
+      return commits
+    else
+      return s:FilterEscape(map(commits, 'pre . tr(v:val, "\\ !^$*?[]()''\"`&;<>|#", "....................")'), a:A)
+    endif
+  else
+    return s:CompleteSub('commit', a:A, a:L, a:P, function('fugitive#CompletePath'), a:000)
+  endif
+  return []
+endfunction
+
+function! fugitive#RevertComplete(A, L, P, ...) abort
+  return s:CompleteSub('revert', a:A, a:L, a:P, function('s:CompleteRevision'), a:000)
+endfunction
+
+" Section: :Git merge, :Git rebase, :Git pull
+
+function! fugitive#MergeComplete(A, L, P, ...) abort
+  return s:CompleteSub('merge', a:A, a:L, a:P, function('s:CompleteRevision'), a:000)
+endfunction
+
+function! fugitive#RebaseComplete(A, L, P, ...) abort
+  return s:CompleteSub('rebase', a:A, a:L, a:P, function('s:CompleteRevision'), a:000)
+endfunction
+
+function! fugitive#PullComplete(A, L, P, ...) abort
+  return s:CompleteSub('pull', a:A, a:L, a:P, function('s:CompleteRemote'), a:000)
+endfunction
+
+function! s:MergeSubcommand(line1, line2, range, bang, mods, options) abort
+  if empty(a:options.subcommand_args) && (
+        \ filereadable(fugitive#Find('.git/MERGE_MSG', a:options)) ||
+        \ isdirectory(fugitive#Find('.git/rebase-apply', a:options)) ||
+        \  !empty(s:TreeChomp([a:options.git_dir, 'diff-files', '--diff-filter=U'])))
+    return 'echoerr ":Git merge for loading conflicts has been removed in favor of :Git mergetool"'
+  endif
+  return {}
+endfunction
+
+function! s:RebaseSubcommand(line1, line2, range, bang, mods, options) abort
+  let args = a:options.subcommand_args
+  if s:HasOpt(args, '--autosquash') && !s:HasOpt(args, '-i', '--interactive')
+    return {'env': {'GIT_SEQUENCE_EDITOR': 'true'}, 'insert_args': ['--interactive']}
+  endif
+  return {}
+endfunction
+
+" Section: :Git bisect
+
+function! s:CompleteBisect(A, L, P, ...) abort
+  let bisect_subcmd = matchstr(a:L, '\u\w*[! ] *.\{-\}\s\@<=\zs[^-[:space:]]\S*\ze ')
+  if empty(bisect_subcmd)
+    let subcmds = ['start', 'bad', 'new', 'good', 'old', 'terms', 'skip', 'next', 'reset', 'replay', 'log', 'run']
+    return s:FilterEscape(subcmds, a:A)
+  endif
+  let dir = a:0 ? a:1 : s:Dir()
+  return fugitive#CompleteObject(a:A, dir)
+endfunction
+
+function! fugitive#BisectComplete(A, L, P, ...) abort
+  return s:CompleteSub('bisect', a:A, a:L, a:P, function('s:CompleteBisect'), a:000)
+endfunction
+
+" Section: :Git difftool, :Git mergetool
+
+function! s:ToolItems(state, from, to, offsets, text, ...) abort
+  let items = []
+  for i in range(len(a:state.diff))
+    let diff = a:state.diff[i]
+    let path = (i == len(a:state.diff) - 1) ? a:to : a:from
+    if empty(path)
+      return []
+    endif
+    let item = {
+          \ 'valid': a:0 ? a:1 : 1,
+          \ 'filename': diff.filename . s:VimSlash(path),
+          \ 'lnum': matchstr(get(a:offsets, i), '\d\+'),
+          \ 'text': a:text}
+    if len(get(diff, 'module', ''))
+      let item.module = diff.module . path
+    endif
+    call add(items, item)
+  endfor
+  let items[-1].context = {'diff': items[0:-2]}
+  return [items[-1]]
+endfunction
+
+function! s:ToolToFrom(str) abort
+  if a:str =~# ' => '
+    let str = a:str =~# '{.* => .*}' ? a:str : '{' . a:str . '}'
+    return [substitute(str, '{.* => \(.*\)}', '\1', ''),
+          \ substitute(str, '{\(.*\) => .*}', '\1', '')]
+  else
+    return [a:str, a:str]
+  endif
+endfunction
+
+function! s:ToolParse(state, line) abort
+  if type(a:line) !=# type('') || a:state.mode ==# 'hunk' && a:line =~# '^[ +-]'
+    return []
+  elseif a:line =~# '^diff '
+    let a:state.mode = 'diffhead'
+    let a:state.from = ''
+    let a:state.to = ''
+  elseif a:state.mode ==# 'diffhead' && a:line =~# '^--- [^/]'
+    let a:state.from = a:line[4:-1]
+    let a:state.to = a:state.from
+  elseif a:state.mode ==# 'diffhead' && a:line =~# '^+++ [^/]'
+    let a:state.to = a:line[4:-1]
+    if empty(get(a:state, 'from', ''))
+      let a:state.from = a:state.to
+    endif
+  elseif a:line[0] ==# '@'
+    let a:state.mode = 'hunk'
+    if has_key(a:state, 'from')
+      let offsets = split(matchstr(a:line, '^@\+ \zs[-+0-9, ]\+\ze @'), ' ')
+      return s:ToolItems(a:state, a:state.from, a:state.to, offsets, matchstr(a:line, ' @@\+ \zs.*'))
+    endif
+  elseif a:line =~# '^\* Unmerged path .'
+    let file = a:line[16:-1]
+    return s:ToolItems(a:state, file, file, [], '')
+  elseif a:line =~# '^[A-Z]\d*\t.\|^:.*\t.'
+    " --raw, --name-status
+    let [status; files] = split(a:line, "\t")
+    return s:ToolItems(a:state, files[0], files[-1], [], a:state.name_only ? '' : status)
+  elseif a:line =~# '^ \S.* |'
+    " --stat
+    let [_, to, changes; __] = matchlist(a:line, '^ \(.\{-\}\) \+|\zs \(.*\)$')
+    let [to, from] = s:ToolToFrom(to)
+    return s:ToolItems(a:state, from, to, [], changes)
+  elseif a:line =~# '^ *\([0-9.]\+%\) .'
+    " --dirstat
+    let [_, changes, to; __] = matchlist(a:line, '^ *\([0-9.]\+%\) \(.*\)')
+    return s:ToolItems(a:state, to, to, [], changes)
+  elseif a:line =~# '^\(\d\+\|-\)\t\(\d\+\|-\)\t.'
+    " --numstat
+    let [_, add, remove, to; __] = matchlist(a:line, '^\(\d\+\|-\)\t\(\d\+\|-\)\t\(.*\)')
+    let [to, from] = s:ToolToFrom(to)
+    return s:ToolItems(a:state, from, to, [], add ==# '-' ? 'Binary file' : '+' . add . ' -' . remove, add !=# '-')
+  elseif a:state.mode !=# 'diffhead' && a:state.mode !=# 'hunk' && len(a:line) || a:line =~# '^git: \|^usage: \|^error: \|^fatal: '
+    return [{'text': a:line}]
+  endif
+  return []
+endfunction
+
+function! s:ToolStream(line1, line2, range, bang, mods, options, args, state) abort
+  let i = 0
+  let argv = copy(a:args)
+  let prompt = 1
+  let state = a:state
+  while i < len(argv)
+    let match = matchlist(argv[i], '^\(-[a-zABDFH-KN-RT-Z]\)\ze\(.*\)')
+    if len(match) && len(match[2])
+      call insert(argv, match[1])
+      let argv[i+1] = '-' . match[2]
+      continue
+    endif
+    let arg = argv[i]
+    if arg =~# '^-t$\|^--tool=\|^--tool-help$\|^--help$'
+      return {}
+    elseif arg =~# '^-y$\|^--no-prompt$'
+      let prompt = 0
+      call remove(argv, i)
+      continue
+    elseif arg ==# '--prompt'
+      let prompt = 1
+      call remove(argv, i)
+      continue
+    elseif arg =~# '^--\%(no-\)\=\(symlinks\|trust-exit-code\|gui\)$'
+      call remove(argv, i)
+      continue
+    elseif arg ==# '--'
+      break
+    endif
+    let i += 1
+  endwhile
+  call fugitive#Autowrite()
+  let a:state.mode = 'init'
+  let a:state.from = ''
+  let a:state.to = ''
+  let exec = s:UserCommandList({'git': a:options.git, 'git_dir': a:options.git_dir}) + ['-c', 'diff.context=0']
+  let exec += a:options.flags + ['--no-pager', 'diff', '--no-ext-diff', '--no-color', '--no-prefix'] + argv
+  if prompt
+    let title = ':Git ' . s:fnameescape(a:options.flags + [a:options.subcommand] + a:options.subcommand_args)
+    return s:QuickfixStream(get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2, 'difftool', title, exec, !a:bang, a:mods, s:function('s:ToolParse'), a:state)
+  else
+    let filename = ''
+    let cmd = []
+    let tabnr = tabpagenr() + 1
+    for line in s:SystemList(exec)[0]
+      for item in s:ToolParse(a:state, line)
+        if len(get(item, 'filename', '')) && item.filename != filename
+          call add(cmd, 'tabedit ' . s:fnameescape(item.filename))
+          for i in reverse(range(len(get(item.context, 'diff', []))))
+            call add(cmd, (i ? 'rightbelow' : 'leftabove') . ' vertical Gdiffsplit! ' . s:fnameescape(item.context.diff[i].filename))
+          endfor
+          call add(cmd, 'wincmd =')
+          let filename = item.filename
+        endif
+      endfor
+    endfor
+    return join(cmd, '|') . (empty(cmd) ? '' : '|' . tabnr . 'tabnext')
+  endif
+endfunction
+
+function! s:MergetoolSubcommand(line1, line2, range, bang, mods, options) abort
+  let dir = a:options.git_dir
+  exe s:DirCheck(dir)
+  let i = 0
+  let prompt = 1
+  let cmd = ['diff', '--diff-filter=U']
+  let state = {'name_only': 0}
+  let state.diff = [{'prefix': ':2:', 'module': ':2:'}, {'prefix': ':3:', 'module': ':3:'}, {'prefix': ':(top)'}]
+  call map(state.diff, 'extend(v:val, {"filename": fugitive#Find(v:val.prefix, dir)})')
+  return s:ToolStream(a:line1, a:line2, a:range, a:bang, a:mods, a:options, ['--diff-filter=U'] + a:options.subcommand_args, state)
+endfunction
+
+function! s:DifftoolSubcommand(line1, line2, range, bang, mods, options) abort
+  let dir = s:Dir(a:options)
+  exe s:DirCheck(dir)
+  let i = 0
+  let argv = copy(a:options.subcommand_args)
+  let commits = []
+  let cached = 0
+  let reverse = 1
+  let prompt = 1
+  let state = {'name_only': 0}
+  let merge_base_against = {}
+  let dash = (index(argv, '--') > i ? ['--'] : [])
+  while i < len(argv)
+    let match = matchlist(argv[i], '^\(-[a-zABDFH-KN-RT-Z]\)\ze\(.*\)')
+    if len(match) && len(match[2])
+      call insert(argv, match[1])
+      let argv[i+1] = '-' . match[2]
+      continue
+    endif
+    let arg = argv[i]
+    if arg ==# '--cached'
+      let cached = 1
+    elseif arg ==# '-R'
+      let reverse = 1
+    elseif arg ==# '--name-only'
+      let state.name_only = 1
+      let argv[0] = '--name-status'
+    elseif arg ==# '--'
+      break
+    elseif arg !~# '^-\|^\.\.\=\%(/\|$\)'
+      let parsed = s:LinesError(['rev-parse', '--revs-only', substitute(arg, ':.*', '', '')] + dash)[0]
+      call map(parsed, '{"uninteresting": v:val =~# "^\\^", "prefix": substitute(v:val, "^\\^", "", "") . ":"}')
+      let merge_base_against = {}
+      if arg =~# '\.\.\.' && len(parsed) > 2
+        let display = map(split(arg, '\.\.\.', 1), 'empty(v:val) ? "@" : v:val')
+        if len(display) == 2
+          let parsed[0].module = display[1] . ':'
+          let parsed[1].module = display[0] . ':'
+        endif
+        let parsed[2].module = arg . ':'
+        if empty(commits)
+          let merge_base_against = parsed[0]
+          let parsed = [parsed[2]]
+        endif
+      elseif arg =~# '\.\.' && len(parsed) == 2
+        let display = map(split(arg, '\.\.', 1), 'empty(v:val) ? "@" : v:val')
+        if len(display) == 2
+          let parsed[0].module = display[0] . ':'
+          let parsed[1].module = display[1] . ':'
+        endif
+      elseif len(parsed) == 1
+        let parsed[0].module = arg . ':'
+      endif
+      call extend(commits, parsed)
+    endif
+    let i += 1
+  endwhile
+  if len(merge_base_against)
+    call add(commits, merge_base_against)
+  endif
+  let commits = filter(copy(commits), 'v:val.uninteresting') + filter(commits, '!v:val.uninteresting')
+  if cached
+    if empty(commits)
+      call add(commits, {'prefix': '@:', 'module': '@:'})
+    endif
+    call add(commits, {'prefix': ':0:', 'module': ':0:'})
+  elseif len(commits) < 2
+    call add(commits, {'prefix': ':(top)'})
+    if len(commits) < 2
+      call insert(commits, {'prefix': ':0:', 'module': ':0:'})
+    endif
+  endif
+  if reverse
+    let commits = [commits[-1]] + repeat([commits[0]], len(commits) - 1)
+    call reverse(commits)
+  endif
+  if len(commits) > 2
+    call add(commits, remove(commits, 0))
+  endif
+  call map(commits, 'extend(v:val, {"filename": fugitive#Find(v:val.prefix, dir)})')
+  let state.diff = commits
+  return s:ToolStream(a:line1, a:line2, a:range, a:bang, a:mods, a:options, argv, state)
+endfunction
+
+" Section: :Ggrep, :Glog
+
+if !exists('g:fugitive_summary_format')
+  let g:fugitive_summary_format = '%s'
+endif
+
+function! fugitive#GrepComplete(A, L, P) abort
+  return s:CompleteSub('grep', a:A, a:L, a:P)
+endfunction
+
+function! fugitive#LogComplete(A, L, P) abort
+  return s:CompleteSub('log', a:A, a:L, a:P)
+endfunction
+
+function! s:GrepParseLine(options, quiet, dir, line) abort
+  if !a:quiet
+    echo a:line
+  endif
+  let entry = {'valid': 1}
+  let match = matchlist(a:line, '^\(.\{-\}\):\([1-9]\d*\):\([1-9]\d*:\)\=\(.*\)$')
+  if a:line =~# '^git: \|^usage: \|^error: \|^fatal: \|^BUG: '
+    return {'text': a:line}
+  elseif len(match)
+    let entry.module = match[1]
+    let entry.lnum = +match[2]
+    let entry.col = +match[3]
+    let entry.text = match[4]
+  else
+    let entry.module = matchstr(a:line, '\CBinary file \zs.*\ze matches$')
+    if len(entry.module)
+      let entry.text = 'Binary file'
+      let entry.valid = 0
+    endif
+  endif
+  if empty(entry.module) && !a:options.line_number
+    let match = matchlist(a:line, '^\(.\{-\}\):\(.*\)$')
+    if len(match)
+      let entry.module = match[1]
+      let entry.pattern = '\M^' . escape(match[2], '\.^$/') . '$'
+    endif
+  endif
+  if empty(entry.module) && a:options.name_count && a:line =~# ':\d\+$'
+    let entry.text = matchstr(a:line, '\d\+$')
+    let entry.module = strpart(a:line, 0, len(a:line) - len(entry.text) - 1)
+  endif
+  if empty(entry.module) && a:options.name_only
+    let entry.module = a:line
+  endif
+  if empty(entry.module)
+    return {'text': a:line}
+  endif
+  if entry.module !~# ':'
+    let entry.filename = a:options.prefix . entry.module
+  else
+    let entry.filename = fugitive#Find(entry.module, a:dir)
+  endif
+  return entry
+endfunction
+
+let s:grep_combine_flags = '[aiIrhHEGPFnlLzocpWq]\{-\}'
+function! s:GrepOptions(args, dir) abort
+  let options = {'name_only': 0, 'name_count': 0, 'line_number': 0}
+  let tree = s:Tree(a:dir)
+  let prefix = empty(tree) ? fugitive#Find(':0:', a:dir) :
+        \ s:cpath(getcwd(), tree) ? '' : s:VimSlash(tree . '/')
+  let options.prefix = prefix
+  for arg in a:args
+    if arg ==# '--'
+      break
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . 'c\|--count\)$'
+      let options.name_count = 1
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . 'n\|--line-number\)$'
+      let options.line_number = 1
+    elseif arg =~# '^\%(--no-line-number\)$'
+      let options.line_number = 0
+    endif
+    if arg =~# '^\%(-' . s:grep_combine_flags . '[lL]\|--files-with-matches\|--name-only\|--files-without-match\)$'
+      let options.name_only = 1
+    endif
+    if arg ==# '--cached'
+      let options.prefix = fugitive#Find(':0:', a:dir)
+    elseif arg ==# '--no-cached'
+      let options.prefix = prefix
+    endif
+  endfor
+  return options
+endfunction
+
+function! s:GrepCfile(result) abort
+  let options = s:GrepOptions(a:result.args, a:result)
+  let entry = s:GrepParseLine(options, 1, a:result, getline('.'))
+  if get(entry, 'col')
+    return [entry.filename, entry.lnum, "norm!" . entry.col . "|"]
+  elseif has_key(entry, 'lnum')
+    return [entry.filename, entry.lnum]
+  elseif has_key(entry, 'pattern')
+    return [entry.filename, '', 'silent /' . entry.pattern]
+  elseif has_key(entry, 'filename')
+    return [entry.filename]
+  else
+    return []
+  endif
+endfunction
+
+function! s:GrepSubcommand(line1, line2, range, bang, mods, options) abort
+  let args = copy(a:options.subcommand_args)
+  let handle = -1
+  let quiet = 0
+  let i = 0
+  while i < len(args) && args[i] !=# '--'
+    let partition = matchstr(args[i], '^-' . s:grep_combine_flags . '\ze[qzO]')
+    if len(partition) > 1
+      call insert(args, '-' . strpart(args[i], len(partition)), i+1)
+      let args[i] = partition
+    elseif args[i] =~# '^\%(-' . s:grep_combine_flags . '[eABC]\|--max-depth\|--context\|--after-context\|--before-context\|--threads\)$'
+      let i += 1
+    elseif args[i] =~# '^\%(-O\|--open-files-in-pager\)$'
+      let handle = 1
+      call remove(args, i)
+      continue
+    elseif args[i] =~# '^\%(-O\|--open-files-in-pager=\)'
+      let handle = 0
+    elseif args[i] =~# '^-[qz].'
+      let args[i] = '-' . args[i][2:-1]
+      let quiet = 1
+    elseif args[i] =~# '^\%(-[qz]\|--quiet\)$'
+      let quiet = 1
+      call remove(args, i)
+      continue
+    elseif args[i] =~# '^--no-quiet$'
+      let quiet = 0
+    elseif args[i] =~# '^\%(--heading\)$'
+      call remove(args, i)
+      continue
+    endif
+    let i += 1
+  endwhile
+  if handle < 0 ? !quiet : !handle
+    return {}
+  endif
+  call fugitive#Autowrite()
+  let listnr = get(a:options, 'curwin') && a:line2 < 0 ? 0 : a:line2
+  if s:HasOpt(args, '--no-line-number')
+    let lc = []
+  else
+    let lc = fugitive#GitVersion(2, 19) ? ['-n', '--column'] : ['-n']
+  endif
+  let cmd = ['grep', '--no-color', '--full-name'] + lc
+  let dir = s:Dir(a:options)
+  let options = s:GrepOptions(lc + args, dir)
+  if listnr > 0
+    exe listnr 'wincmd w'
+  else
+    call s:BlurStatus()
+  endif
+  let title = (listnr < 0 ? ':Ggrep ' : ':Glgrep ') . s:fnameescape(args)
+  call s:QuickfixCreate(listnr, {'title': title})
+  let tempfile = tempname()
+  let state = {
+        \ 'git': a:options.git,
+        \ 'flags': a:options.flags,
+        \ 'args': cmd + args,
+        \ 'git_dir': s:GitDir(a:options),
+        \ 'cwd': s:UserCommandCwd(a:options),
+        \ 'filetype': 'git',
+        \ 'mods': s:Mods(a:mods),
+        \ 'file': s:Resolve(tempfile)}
+  let event = listnr < 0 ? 'grep-fugitive' : 'lgrep-fugitive'
+  exe s:DoAutocmd('QuickFixCmdPre ' . event)
+  try
+    if !quiet && &more
+      let more = 1
+      set nomore
+    endif
+    if !quiet
+      echo title
+    endif
+    let list = s:SystemList(s:UserCommandList(a:options) + cmd + args)[0]
+    call writefile(list + [''], tempfile, 'b')
+    call s:RunSave(state)
+    call map(list, 's:GrepParseLine(options, ' . quiet . ', dir, v:val)')
+    call s:QuickfixSet(listnr, list, 'a')
+    let press_enter_shortfall = &cmdheight - len(list)
+    if press_enter_shortfall > 0 && !quiet
+      echo repeat("\n", press_enter_shortfall - 1)
+    endif
+  finally
+    if exists('l:more')
+      let &more = more
+    endif
+  endtry
+  call s:RunFinished(state)
+  exe s:DoAutocmd('QuickFixCmdPost ' . event)
+  if quiet
+    let bufnr = bufnr('')
+    exe s:QuickfixOpen(listnr, a:mods)
+    if bufnr != bufnr('') && !a:bang
+      wincmd p
+    endif
+  end
+  if !a:bang && !empty(list)
+    return 'silent ' . (listnr < 0 ? 'c' : 'l').'first'
+  else
+    return ''
+  endif
+endfunction
+
+function! fugitive#GrepCommand(line1, line2, range, bang, mods, arg) abort
+  return fugitive#Command(a:line1, a:line2, a:range, a:bang, a:mods,
+        \ "grep -O " . a:arg)
+endfunction
+
+let s:log_diff_context = '{"filename": fugitive#Find(v:val . from, a:dir), "lnum": get(offsets, v:key), "module": strpart(v:val, 0, len(a:state.base_module)) . from}'
+
+function! s:LogFlushQueue(state, dir) abort
+  let queue = remove(a:state, 'queue')
+  if a:state.child_found && get(a:state, 'ignore_commit')
+    call remove(queue, 0)
+  elseif len(queue) && len(a:state.target) && len(get(a:state, 'parents', []))
+    let from = substitute(a:state.target, '^/', ':', '')
+    let offsets = []
+    let queue[0].context.diff = map(copy(a:state.parents), s:log_diff_context)
+  endif
+  if len(queue) && queue[-1] ==# {'text': ''}
+    call remove(queue, -1)
+  endif
+  return queue
+endfunction
+
+function! s:LogParse(state, dir, prefix, line) abort
+  if a:state.mode ==# 'hunk' && a:line =~# '^[-+ ]'
+    return []
+  endif
+  let list = matchlist(a:line, '^\%(fugitive \(.\{-\}\)\t\|commit \|From \)\=\(\x\{40,\}\)\%( \(.*\)\)\=$')
+  if len(list)
+    let queue = s:LogFlushQueue(a:state, a:dir)
+    let a:state.mode = 'commit'
+    let a:state.base = a:prefix . list[2]
+    if len(list[1])
+      let [a:state.base_module; a:state.parents] = split(list[1], ' ')
+    else
+      let a:state.base_module = list[2]
+      let a:state.parents = []
+    endif
+    let a:state.message = list[3]
+    let a:state.from = ''
+    let a:state.to = ''
+    let context = {}
+    let a:state.queue = [{
+          \ 'valid': 1,
+          \ 'context': context,
+          \ 'filename': a:state.base . a:state.target,
+          \ 'module': a:state.base_module . substitute(a:state.target, '^/', ':', ''),
+          \ 'text': a:state.message}]
+    let a:state.child_found = 0
+    return queue
+  elseif type(a:line) == type(0)
+    return s:LogFlushQueue(a:state, a:dir)
+  elseif a:line =~# '^diff'
+    let a:state.mode = 'diffhead'
+    let a:state.from = ''
+    let a:state.to = ''
+  elseif a:state.mode ==# 'diffhead' && a:line =~# '^--- \w/'
+    let a:state.from = a:line[6:-1]
+    let a:state.to = a:state.from
+  elseif a:state.mode ==# 'diffhead' && a:line =~# '^+++ \w/'
+    let a:state.to = a:line[6:-1]
+    if empty(get(a:state, 'from', ''))
+      let a:state.from = a:state.to
+    endif
+  elseif a:line =~# '^@@[^@]*+\d' && len(get(a:state, 'to', '')) && has_key(a:state, 'base')
+    let a:state.mode = 'hunk'
+    if empty(a:state.target) || a:state.target ==# '/' . a:state.to
+      if !a:state.child_found && len(a:state.queue) && a:state.queue[-1] ==# {'text': ''}
+        call remove(a:state.queue, -1)
+      endif
+      let a:state.child_found = 1
+      let offsets = map(split(matchstr(a:line, '^@\+ \zs[-+0-9, ]\+\ze @'), ' '), '+matchstr(v:val, "\\d\\+")')
+      let context = {}
+      if len(a:state.parents)
+        let from = ":" . a:state.from
+        let context.diff = map(copy(a:state.parents), s:log_diff_context)
+      endif
+      call add(a:state.queue, {
+            \ 'valid': 1,
+            \ 'context': context,
+            \ 'filename': s:VimSlash(a:state.base . '/' . a:state.to),
+            \ 'module': a:state.base_module . ':' . a:state.to,
+            \ 'lnum': offsets[-1],
+            \ 'text': a:state.message . matchstr(a:line, ' @@\+ .\+')})
+    endif
+  elseif a:state.follow &&
+        \ a:line =~# '^ \%(mode change \d\|\%(create\|delete\) mode \d\|\%(rename\|copy\|rewrite\) .* (\d\+%)$\)'
+    let rename = matchstr(a:line, '^ \%(copy\|rename\) \zs.* => .*\ze (\d\+%)$')
+    if len(rename)
+      let rename = rename =~# '{.* => .*}' ? rename : '{' . rename . '}'
+      if a:state.target ==# simplify('/' . substitute(rename, '{.* => \(.*\)}', '\1', ''))
+        let a:state.target = simplify('/' . substitute(rename, '{\(.*\) => .*}', '\1', ''))
+      endif
+    endif
+    if !get(a:state, 'ignore_summary')
+      call add(a:state.queue, {'text': a:line})
+    endif
+  elseif a:state.mode ==# 'commit' || a:state.mode ==# 'init'
+    call add(a:state.queue, {'text': a:line})
+  endif
+  return []
+endfunction
+
+function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
+  let dir = s:Dir()
+  exe s:DirCheck(dir)
+  let listnr = a:type =~# '^l' ? 0 : -1
+  let [args, after] = s:SplitExpandChain('log ' . a:args, s:Tree(dir))
+  call remove(args, 0)
+  let split = index(args, '--')
+  if split > 0
+    let paths = args[split : -1]
+    let args = args[0 : split - 1]
+  elseif split == 0
+    let paths = args
+    let args = []
+  else
+    let paths = []
+  endif
+  if a:line1 == 0 && a:count
+    let path = fugitive#Path(bufname(a:count), '/', dir)
+    let titlepre = ':0,' . a:count
+  elseif a:count >= 0
+    let path = fugitive#Path(@%, '/', dir)
+    let titlepre = a:count == 0 ? ':0,' . bufnr('') : ':'
+  else
+    let titlepre = ':'
+    let path = ''
+  endif
+  let range = ''
+  let extra_args = []
+  let extra_paths = []
+  let state = {'mode': 'init', 'child_found': 0, 'queue': [], 'follow': 0}
+  if path =~# '^/\.git\%(/\|$\)\|^$'
+    let path = ''
+  elseif a:line1 == 0
+    let range = "0," . (a:count ? a:count : bufnr(''))
+    let extra_paths = ['.' . path]
+    if (empty(paths) || paths ==# ['--']) && !s:HasOpt(args, '--no-follow')
+      let state.follow = 1
+      if !s:HasOpt(args, '--follow')
+        call insert(extra_args, '--follow')
+      endif
+      if !s:HasOpt(args, '--summary')
+        call insert(extra_args, '--summary')
+        let state.ignore_summary = 1
+      endif
+    endif
+    let state.ignore_commit = 1
+  elseif a:count > 0
+    if !s:HasOpt(args, '--merges', '--no-merges')
+      call insert(extra_args, '--no-merges')
+    endif
+    call add(args, '-L' . a:line1 . ',' . a:count . ':' . path[1:-1])
+    let state.ignore_commit = 1
+  endif
+  if len(path) && empty(filter(copy(args), 'v:val =~# "^[^-]"'))
+    let owner = s:Owner(@%, dir)
+    if len(owner)
+      call add(args, owner . (owner =~# '^\x\{40,}' ? '' : '^{}'))
+    endif
+  endif
+  if empty(extra_paths)
+    let path = ''
+  endif
+  if s:HasOpt(args, '-g', '--walk-reflogs')
+    let format = "%gd %P\t%H %gs"
+  else
+    let format = "%h %P\t%H " . g:fugitive_summary_format
+  endif
+  let cmd = ['--no-pager']
+  call extend(cmd, ['-c', 'diff.context=0', '-c', 'diff.noprefix=false', 'log'] +
+        \ ['--no-color', '--no-ext-diff', '--pretty=format:fugitive ' . format] +
+        \ args + extra_args + paths + extra_paths)
+  let state.target = path
+  let title = titlepre . (listnr < 0 ? 'Gclog ' : 'Gllog ') . s:fnameescape(args + paths)
+  return s:QuickfixStream(listnr, 'log', title, s:UserCommandList(dir) + cmd, !a:bang, a:mods, s:function('s:LogParse'), state, dir, s:DirUrlPrefix(dir)) . after
+endfunction
+
+" Section: :Gedit, :Gpedit, :Gsplit, :Gvsplit, :Gtabedit, :Gread
+
+function! s:UsableWin(nr) abort
+  return a:nr && !getwinvar(a:nr, '&previewwindow') && !getwinvar(a:nr, '&winfixwidth') &&
+        \ (empty(getwinvar(a:nr, 'fugitive_status')) || getbufvar(winbufnr(a:nr), 'fugitive_type') !=# 'index') &&
+        \ index(['gitrebase', 'gitcommit'], getbufvar(winbufnr(a:nr), '&filetype')) < 0 &&
+        \ index(['nofile','help','quickfix', 'terminal'], getbufvar(winbufnr(a:nr), '&buftype')) < 0
+endfunction
+
+function! s:ArgSplit(string) abort
+  let string = a:string
+  let args = []
+  while string =~# '\S'
+    let arg = matchstr(string, '^\s*\%(\\.\|[^[:space:]]\)\+')
+    let string = strpart(string, len(arg))
+    let arg = substitute(arg, '^\s\+', '', '')
+    call add(args, substitute(arg, '\\\+[|" ]', '\=submatch(0)[len(submatch(0))/2 : -1]', 'g'))
+  endwhile
+  return args
+endfunction
+
+function! s:PlusEscape(string) abort
+  return substitute(a:string, '\\*[|" ]', '\=repeat("\\", len(submatch(0))).submatch(0)', 'g')
+endfunction
+
+function! s:OpenParse(string, wants_cmd) abort
+  let opts = []
+  let cmds = []
+  let args = s:ArgSplit(a:string)
+  while !empty(args)
+    if args[0] =~# '^++'
+      call add(opts, ' ' . s:PlusEscape(remove(args, 0)))
+    elseif a:wants_cmd && args[0] =~# '^+'
+      call add(cmds, remove(args, 0)[1:-1])
+    else
+      break
+    endif
+  endwhile
+  if len(args) && args !=# ['>:']
+    let file = join(args)
+    if file ==# '-'
+      let result = fugitive#Result()
+      if has_key(result, 'file')
+        let file = s:fnameescape(result.file)
+      else
+        throw 'fugitive: no previous command output'
+      endif
+    endif
+  elseif empty(expand('%'))
+    let file = ''
+  elseif empty(s:DirCommitFile(@%)[1]) && s:Relative('./') !~# '^\./\.git\>'
+    let file = '>:0'
+  else
+    let file = '>'
+  endif
+  let dir = s:Dir()
+  let efile = s:Expand(file)
+  let url = s:Generate(efile, dir)
+
+  if a:wants_cmd && file[0] ==# '>' && efile[0] !=# '>' && get(b:, 'fugitive_type', '') isnot# 'tree' && &filetype !=# 'netrw'
+    let line = line('.')
+    if expand('%:p') !=# url
+      let diffcmd = 'diff'
+      let from = s:DirRev(@%)[1]
+      let to = s:DirRev(url)[1]
+      if empty(from) && empty(to)
+        let diffcmd = 'diff-files'
+        let args = ['--', expand('%:p'), url]
+      elseif empty(to)
+        let args = [from, '--', url]
+      elseif empty(from)
+        let args = [to, '--', expand('%:p')]
+        let reverse = 1
+      else
+        let args = [from, to]
+      endif
+      let [res, exec_error] = s:LinesError([dir, diffcmd, '-U0'] + args)
+      if !exec_error
+        call filter(res, 'v:val =~# "^@@ "')
+        call map(res, 'substitute(v:val, ''[-+]\d\+\zs '', ",1 ", "g")')
+        call map(res, 'matchlist(v:val, ''^@@ -\(\d\+\),\(\d\+\) +\(\d\+\),\(\d\+\) @@'')[1:4]')
+        if exists('reverse')
+          call map(res, 'v:val[2:3] + v:val[0:1]')
+        endif
+        call filter(res, 'v:val[0] < '.line('.'))
+        let hunk = get(res, -1, [0,0,0,0])
+        if hunk[0] + hunk[1] > line('.')
+          let line = hunk[2] + max([1 - hunk[3], 0])
+        else
+          let line = hunk[2] + max([hunk[3], 1]) + line('.') - hunk[0] - max([hunk[1], 1])
+        endif
+      endif
+    endif
+    call insert(cmds, line)
+  endif
+
+  let pre = join(opts, '')
+  if len(cmds) > 1
+    let pre .= ' +' . s:PlusEscape(join(map(cmds, '"exe ".string(v:val)'), '|'))
+  elseif len(cmds)
+    let pre .= ' +' . s:PlusEscape(cmds[0])
+  endif
+  return [url, pre]
+endfunction
+
+function! fugitive#DiffClose() abort
+  let mywinnr = winnr()
+  for winnr in [winnr('#')] + range(winnr('$'),1,-1)
+    if winnr != mywinnr && getwinvar(winnr,'&diff')
+      execute winnr.'wincmd w'
+      close
+      if winnr('$') > 1
+        wincmd p
+      endif
+    endif
+  endfor
+  diffoff!
+endfunction
+
+function! s:BlurStatus() abort
+  if (&previewwindow || exists('w:fugitive_status')) && get(b:,'fugitive_type', '') ==# 'index'
+    let winnrs = filter([winnr('#')] + range(1, winnr('$')), 's:UsableWin(v:val)')
+    if len(winnrs)
+      exe winnrs[0].'wincmd w'
+    else
+      belowright new +setl\ bufhidden=delete
+    endif
+    if &diff
+      call fugitive#DiffClose()
+    endif
+  endif
+endfunction
+
+let s:bang_edits = {'split': 'Git', 'vsplit': 'vertical Git', 'tabedit': 'tab Git', 'pedit': 'Git!'}
+function! fugitive#Open(cmd, bang, mods, arg, ...) abort
+  exe s:VersionCheck()
+  if a:bang
+    return 'echoerr ' . string(':G' . a:cmd . '! for temp buffer output has been replaced by :' . get(s:bang_edits, a:cmd, 'Git') . ' --paginate')
+  endif
+
+  let mods = s:Mods(a:mods)
+  try
+    let [file, pre] = s:OpenParse(a:arg, 1)
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  if file !~# '^\a\a\+:' && !(has('win32') && file =~# '^\a:/$')
+    let file = substitute(file, '.\zs' . (has('win32') ? '[\/]' : '/') . '$', '', '')
+  endif
+  if a:cmd ==# 'edit'
+    call s:BlurStatus()
+  endif
+  return mods . a:cmd . pre . ' ' . s:fnameescape(file)
+endfunction
+
+function! s:ReadPrepare(line1, count, range, mods) abort
+  let mods = s:Mods(a:mods)
+  let after = a:count
+  if a:count < 0
+    let delete = 'silent 1,' . line('$') . 'delete_|'
+    let after = line('$')
+  elseif a:range == 2
+    let delete = 'silent ' . a:line1 . ',' . a:count . 'delete_|'
+  else
+    let delete = ''
+  endif
+  if foldlevel(after)
+    let pre = after . 'foldopen!|'
+  else
+    let pre = ''
+  endif
+  return [pre . 'keepalt ' . mods . after . 'read', '|' . delete . 'diffupdate' . (a:count < 0 ? '|' . line('.') : '')]
+endfunction
+
+function! fugitive#ReadCommand(line1, count, range, bang, mods, arg, ...) abort
+  exe s:VersionCheck()
+  if a:bang
+    return 'echoerr ' . string(':Gread! for temp buffer output has been replaced by :{range}Git! --paginate')
+  endif
+  let [read, post] = s:ReadPrepare(a:line1, a:count, a:range, a:mods)
+  try
+    let [file, pre] = s:OpenParse(a:arg, 0)
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  if file =~# '^fugitive:' && a:count is# 0
+    return 'exe ' .string('keepalt ' . s:Mods(a:mods) . fugitive#FileReadCmd(file, 0, pre)) . '|diffupdate'
+  endif
+  return read . ' ' . pre . ' ' . s:fnameescape(file) . post
+endfunction
+
+function! fugitive#EditComplete(A, L, P) abort
+  if a:A =~# '^>'
+    return map(s:FilterEscape(s:CompleteHeads(s:Dir()), a:A[1:-1]), "'>' . v:val")
+  else
+    return fugitive#CompleteObject(a:A, a:L, a:P)
+  endif
+endfunction
+
+function! fugitive#ReadComplete(A, L, P) abort
+  if a:L =~# '^\w\+!'
+    return fugitive#Complete(a:A, a:L, a:P)
+  else
+    return fugitive#EditComplete(a:A, a:L, a:P)
+  endif
+endfunction
+
+" Section: :Gwrite, :Gwq
+
+function! fugitive#WriteCommand(line1, line2, range, bang, mods, arg, ...) abort
+  exe s:VersionCheck()
+  if s:cpath(expand('%:p'), fugitive#Find('.git/COMMIT_EDITMSG')) && empty(a:arg)
+    return (empty($GIT_INDEX_FILE) ? 'write|bdelete' : 'wq') . (a:bang ? '!' : '')
+  elseif get(b:, 'fugitive_type', '') ==# 'index' && empty(a:arg)
+    return 'Git commit'
+  elseif &buftype ==# 'nowrite' && getline(4) =~# '^[+-]\{3\} '
+    return 'echoerr ' . string('fugitive: :Gwrite from :Git diff has been removed in favor of :Git add --edit')
+  endif
+  let mytab = tabpagenr()
+  let mybufnr = bufnr('')
+  let args = s:ArgSplit(a:arg)
+  let after = ''
+  if get(args, 0) =~# '^+'
+    let after = '|' . remove(args, 0)[1:-1]
+  endif
+  try
+    let file = len(args) ? s:Generate(s:Expand(join(args, ' '))) : fugitive#Real(@%)
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  if empty(file)
+    return 'echoerr '.string('fugitive: cannot determine file path')
+  endif
+  if file =~# '^fugitive:'
+    return 'write' . (a:bang ? '! ' : ' ') . s:fnameescape(file)
+  endif
+  exe s:DirCheck()
+  let always_permitted = s:cpath(fugitive#Real(@%), file) && empty(s:DirCommitFile(@%)[1])
+  if !always_permitted && !a:bang && (len(s:TreeChomp('diff', '--name-status', 'HEAD', '--', file)) || len(s:TreeChomp('ls-files', '--others', '--', file)))
+    let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)'
+    return 'echoerr v:errmsg'
+  endif
+  let treebufnr = 0
+  for nr in range(1,bufnr('$'))
+    if fnamemodify(bufname(nr),':p') ==# file
+      let treebufnr = nr
+    endif
+  endfor
+
+  if treebufnr > 0 && treebufnr != bufnr('')
+    let temp = tempname()
+    silent execute 'keepalt %write '.temp
+    for tab in [mytab] + range(1,tabpagenr('$'))
+      for winnr in range(1,tabpagewinnr(tab,'$'))
+        if tabpagebuflist(tab)[winnr-1] == treebufnr
+          execute 'tabnext '.tab
+          if winnr != winnr()
+            execute winnr.'wincmd w'
+            let restorewinnr = 1
+          endif
+          try
+            let lnum = line('.')
+            let last = line('$')
+            silent execute '$read '.temp
+            silent execute '1,'.last.'delete_'
+            silent write!
+            silent execute lnum
+            diffupdate
+            let did = 1
+          finally
+            if exists('restorewinnr')
+              wincmd p
+            endif
+            execute 'tabnext '.mytab
+          endtry
+          break
+        endif
+      endfor
+    endfor
+    if !exists('did')
+      call writefile(readfile(temp,'b'),file,'b')
+    endif
+  else
+    execute 'write! '.s:fnameescape(file)
+  endif
+
+  let message = s:ChompStderr(['add'] + (a:bang ? ['--force'] : []) + ['--', file])
+  if len(message)
+    let v:errmsg = 'fugitive: '.message
+    return 'echoerr v:errmsg'
+  endif
+  if s:cpath(fugitive#Real(@%), file) && s:DirCommitFile(@%)[1] =~# '^\d$'
+    setlocal nomodified
+  endif
+
+  let one = fugitive#Find(':1:'.file)
+  let two = fugitive#Find(':2:'.file)
+  let three = fugitive#Find(':3:'.file)
+  for nr in range(1,bufnr('$'))
+    let name = fnamemodify(bufname(nr), ':p')
+    if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three)
+      execute nr.'bdelete'
+    endif
+  endfor
+
+  unlet! restorewinnr
+  let zero = fugitive#Find(':0:'.file)
+  exe s:DoAutocmd('BufWritePost ' . s:fnameescape(zero))
+  for tab in range(1,tabpagenr('$'))
+    for winnr in range(1,tabpagewinnr(tab,'$'))
+      let bufnr = tabpagebuflist(tab)[winnr-1]
+      let bufname = fnamemodify(bufname(bufnr), ':p')
+      if bufname ==# zero && bufnr != mybufnr
+        execute 'tabnext '.tab
+        if winnr != winnr()
+          execute winnr.'wincmd w'
+          let restorewinnr = 1
+        endif
+        try
+          let lnum = line('.')
+          let last = line('$')
+          silent execute '$read '.s:fnameescape(file)
+          silent execute '1,'.last.'delete_'
+          silent execute lnum
+          setlocal nomodified
+          diffupdate
+        finally
+          if exists('restorewinnr')
+            wincmd p
+          endif
+          execute 'tabnext '.mytab
+        endtry
+        break
+      endif
+    endfor
+  endfor
+  call fugitive#DidChange()
+  return 'checktime' . after
+endfunction
+
+function! fugitive#WqCommand(...) abort
+  let bang = a:4 ? '!' : ''
+  if s:cpath(expand('%:p'), fugitive#Find('.git/COMMIT_EDITMSG'))
+    return 'wq'.bang
+  endif
+  let result = call('fugitive#WriteCommand', a:000)
+  if result =~# '^\%(write\|wq\|echoerr\)'
+    return s:sub(result,'^write','wq')
+  else
+    return result.'|quit'.bang
+  endif
+endfunction
+
+" Section: :Git push, :Git fetch
+
+function! s:CompletePush(A, L, P, ...) abort
+  let dir = a:0 ? a:1 : s:Dir()
+  let remote = matchstr(a:L, '\u\w*[! ] *.\{-\}\s\@<=\zs[^-[:space:]]\S*\ze ')
+  if empty(remote)
+    let matches = s:LinesError([dir, 'remote'])[0]
+  elseif a:A =~# ':'
+    let lead = matchstr(a:A, '^[^:]*:')
+    let matches = s:LinesError([dir, 'ls-remote', remote])[0]
+    call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
+    call map(matches, 'lead . s:sub(v:val, "^.*\t", "")')
+  else
+    let matches = s:CompleteHeads(dir)
+    if a:A =~# '^[\''"]\=+'
+      call map(matches, '"+" . v:val')
+    endif
+  endif
+  return s:FilterEscape(matches, a:A)
+endfunction
+
+function! fugitive#PushComplete(A, L, P, ...) abort
+  return s:CompleteSub('push', a:A, a:L, a:P, function('s:CompletePush'), a:000)
+endfunction
+
+function! fugitive#FetchComplete(A, L, P, ...) abort
+  return s:CompleteSub('fetch', a:A, a:L, a:P, function('s:CompleteRemote'), a:000)
+endfunction
+
+function! s:PushSubcommand(...) abort
+  return {'no_more': 1}
+endfunction
+
+function! s:FetchSubcommand(...) abort
+  return {'no_more': 1}
+endfunction
+
+" Section: :Gdiff
+
+augroup fugitive_diff
+  autocmd!
+  autocmd BufWinLeave * nested
+        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 2 |
+        \   call s:diffoff_all(s:Dir(+expand('<abuf>'))) |
+        \ endif
+  autocmd BufWinEnter * nested
+        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 1 |
+        \   call s:diffoff() |
+        \ endif
+augroup END
+
+function! s:can_diffoff(buf) abort
+  return getwinvar(bufwinnr(a:buf), '&diff') &&
+        \ !empty(getwinvar(bufwinnr(a:buf), 'fugitive_diff_restore'))
+endfunction
+
+function! fugitive#CanDiffoff(buf) abort
+  return s:can_diffoff(bufnr(a:buf))
+endfunction
+
+function! s:DiffModifier(count, default) abort
+  let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+')
+  if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical'
+    return ''
+  elseif &diffopt =~# 'vertical'
+    return 'vertical '
+  elseif !get(g:, 'fugitive_diffsplit_directional_fit', a:default)
+    return ''
+  elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc))
+    return ''
+  else
+    return 'vertical '
+  endif
+endfunction
+
+function! s:diff_window_count() abort
+  let c = 0
+  for nr in range(1,winnr('$'))
+    let c += getwinvar(nr,'&diff')
+  endfor
+  return c
+endfunction
+
+function! s:diff_restore() abort
+  let restore = 'setlocal nodiff noscrollbind'
+        \ . ' scrollopt=' . &l:scrollopt
+        \ . (&l:wrap ? ' wrap' : ' nowrap')
+        \ . ' foldlevel=999'
+        \ . ' foldmethod=' . &l:foldmethod
+        \ . ' foldcolumn=' . &l:foldcolumn
+        \ . ' foldlevel=' . &l:foldlevel
+        \ . (&l:foldenable ? ' foldenable' : ' nofoldenable')
+  if has('cursorbind')
+    let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind'
+  endif
+  return restore
+endfunction
+
+function! s:diffthis() abort
+  if !&diff
+    let w:fugitive_diff_restore = s:diff_restore()
+    diffthis
+  endif
+endfunction
+
+function! s:diffoff() abort
+  if exists('w:fugitive_diff_restore') && v:version < 704
+    execute w:fugitive_diff_restore
+  endif
+  unlet! w:fugitive_diff_restore
+  diffoff
+endfunction
+
+function! s:diffoff_all(dir) abort
+  let curwin = winnr()
+  for nr in range(1,winnr('$'))
+    if getwinvar(nr, '&diff') && !empty(getwinvar(nr, 'fugitive_diff_restore'))
+      if v:version < 704
+        if nr != winnr()
+          execute nr.'wincmd w'
+        endif
+        execute w:fugitive_diff_restore
+      endif
+      call setwinvar(nr, 'fugitive_diff_restore', '')
+    endif
+  endfor
+  if curwin != winnr()
+    execute curwin.'wincmd w'
+  endif
+  diffoff!
+endfunction
+
+function! s:IsConflicted() abort
+  return len(@%) && !empty(s:ChompDefault('', ['ls-files', '--unmerged', '--', expand('%:p')]))
+endfunction
+
+function! fugitive#Diffsplit(autodir, keepfocus, mods, arg, ...) abort
+  exe s:VersionCheck()
+  let args = s:ArgSplit(a:arg)
+  let post = ''
+  let autodir = a:autodir
+  while get(args, 0, '') =~# '^++'
+    if args[0] =~? '^++novertical$'
+      let autodir = 0
+    else
+      return 'echoerr ' . string('fugitive: unknown option ' . args[0])
+    endif
+    call remove(args, 0)
+  endwhile
+  if get(args, 0) =~# '^+'
+    let post = remove(args, 0)[1:-1]
+  endif
+  if exists(':DiffGitCached') && empty(args)
+    return s:Mods(a:mods) . 'DiffGitCached' . (len(post) ? '|' . post : '')
+  endif
+  let commit = s:DirCommitFile(@%)[1]
+  if a:mods =~# '\<tab\>'
+    let mods = substitute(a:mods, '\<tab\>', '', 'g')
+    let pre = 'tab split'
+  else
+    let mods = 'keepalt ' . a:mods
+    let pre = ''
+  endif
+  let back = exists('*win_getid') ? 'call win_gotoid(' . win_getid() . ')' : 'wincmd p'
+  if (empty(args) || args[0] =~# '^>\=:$') && a:keepfocus
+    exe s:DirCheck()
+    if commit =~# '^1\=$' && s:IsConflicted()
+      let parents = [s:Relative(':2:'), s:Relative(':3:')]
+    elseif empty(commit)
+      let parents = [s:Relative(':0:')]
+    elseif commit =~# '^\d\=$'
+      let parents = [s:Relative('@:')]
+    elseif commit =~# '^\x\x\+$'
+      let parents = s:LinesError(['rev-parse', commit . '^@'])[0]
+      call map(parents, 's:Relative(v:val . ":")')
+    endif
+  endif
+  try
+    if exists('parents') && len(parents) > 1
+      exe pre
+      let mods = (autodir ? s:DiffModifier(len(parents) + 1, empty(args) || args[0] =~# '^>') : '') . s:Mods(mods, 'leftabove')
+      let nr = bufnr('')
+      if len(parents) > 1 && !&equalalways
+        let equalalways = 0
+        set equalalways
+      endif
+      execute mods 'split' s:fnameescape(fugitive#Find(parents[0]))
+      call s:Map('n', 'dp', ':diffput '.nr.'<Bar>diffupdate<CR>', '<silent>')
+      let nr2 = bufnr('')
+      call s:diffthis()
+      exe back
+      call s:Map('n', 'd2o', ':diffget '.nr2.'<Bar>diffupdate<CR>', '<silent>')
+      let mods = substitute(mods, '\Cleftabove\|rightbelow\|aboveleft\|belowright', '\=submatch(0) =~# "f" ? "rightbelow" : "leftabove"', '')
+      for i in range(len(parents)-1, 1, -1)
+        execute mods 'split' s:fnameescape(fugitive#Find(parents[i]))
+        call s:Map('n', 'dp', ':diffput '.nr.'<Bar>diffupdate<CR>', '<silent>')
+        let nrx = bufnr('')
+        call s:diffthis()
+        exe back
+        call s:Map('n', 'd' . (i + 2) . 'o', ':diffget '.nrx.'<Bar>diffupdate<CR>', '<silent>')
+      endfor
+      call s:diffthis()
+      return post
+    elseif len(args)
+      let arg = join(args, ' ')
+      if arg ==# ''
+        return post
+      elseif arg ==# ':/'
+        exe s:DirCheck()
+        let file = s:Relative()
+      elseif arg ==# ':'
+        exe s:DirCheck()
+        let file = len(commit) ? s:Relative() : s:Relative(s:IsConflicted() ? ':1:' : ':0:')
+      elseif arg =~# '^:\d$'
+        exe s:DirCheck()
+        let file = s:Relative(arg . ':')
+      elseif arg =~# '^[~^]\d*$'
+        return 'echoerr ' . string('fugitive: change ' . arg . ' to !' . arg . ' to diff against ancestor')
+      else
+        try
+          let file = arg =~# '^:/.' ? fugitive#RevParse(arg) . s:Relative(':') : s:Expand(arg)
+        catch /^fugitive:/
+          return 'echoerr ' . string(v:exception)
+        endtry
+      endif
+      if a:keepfocus || arg =~# '^>'
+        let mods = s:Mods(a:mods, 'leftabove')
+      else
+        let mods = s:Mods(a:mods)
+      endif
+    elseif exists('parents')
+      let file = get(parents, -1, s:Relative(repeat('0', 40). ':'))
+      let mods = s:Mods(a:mods, 'leftabove')
+    elseif len(commit)
+      let file = s:Relative()
+      let mods = s:Mods(a:mods, 'rightbelow')
+    elseif s:IsConflicted()
+      let file = s:Relative(':1:')
+      let mods = s:Mods(a:mods, 'leftabove')
+      if get(g:, 'fugitive_legacy_commands', 1)
+        let post = 'echohl WarningMsg|echo "Use :Gdiffsplit! for 3 way diff"|echohl NONE|' . post
+      endif
+    else
+      exe s:DirCheck()
+      let file = s:Relative(':0:')
+      let mods = s:Mods(a:mods, 'leftabove')
+    endif
+    let spec = s:Generate(file)
+    if spec =~# '^fugitive:' && empty(s:DirCommitFile(spec)[2])
+      let spec = s:VimSlash(spec . s:Relative('/'))
+    endif
+    exe pre
+    let restore = s:diff_restore()
+    let w:fugitive_diff_restore = restore
+    let mods = (autodir ? s:DiffModifier(2, empty(args) || args[0] =~# '^>') : '') . mods
+    if &diffopt =~# 'vertical'
+      let diffopt = &diffopt
+      set diffopt-=vertical
+    endif
+    execute mods 'diffsplit' s:fnameescape(spec)
+    let w:fugitive_diff_restore = restore
+    let winnr = winnr()
+    if getwinvar('#', '&diff')
+      if a:keepfocus
+        exe back
+      endif
+    endif
+    return post
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  finally
+    if exists('l:equalalways')
+      let &g:equalalways = equalalways
+    endif
+    if exists('diffopt')
+      let &diffopt = diffopt
+    endif
+  endtry
+endfunction
+
+" Section: :GMove, :GRemove
+
+function! s:Move(force, rename, destination) abort
+  let dir = s:Dir()
+  exe s:DirCheck(dir)
+  if s:DirCommitFile(@%)[1] !~# '^0\=$' || empty(@%)
+    return 'echoerr ' . string('fugitive: mv not supported for this buffer')
+  endif
+  if a:rename
+    let default_root = expand('%:p:s?[\/]$??:h') . '/'
+  else
+    let default_root = s:Tree(dir) . '/'
+  endif
+  if a:destination =~# '^:/:\='
+    let destination = s:Tree(dir) . s:Expand(substitute(a:destination, '^:/:\=', '', ''))
+  elseif a:destination =~# '^:(top)'
+    let destination = s:Expand(matchstr(a:destination, ')\zs.*'))
+    if destination !~# '^/\|^\a\+:'
+      let destination = s:Tree(dir) . '/' . destination
+    endif
+    let destination = s:Tree(dir) .
+  elseif a:destination =~# '^:(\%(top,literal\|literal,top\))'
+    let destination = s:Tree(dir) . matchstr(a:destination, ')\zs.*')
+  elseif a:destination =~# '^:(literal)\.\.\=\%(/\|$\)'
+    let destination = simplify(getcwd() . '/' . matchstr(a:destination, ')\zs.*'))
+  elseif a:destination =~# '^:(literal)'
+    let destination = simplify(default_root . matchstr(a:destination, ')\zs.*'))
+  else
+    let destination = s:Expand(a:destination)
+    if destination =~# '^\.\.\=\%(/\|$\)'
+      let destination = simplify(getcwd() . '/' . destination)
+    elseif destination !~# '^\a\+:\|^/'
+      let destination = default_root . destination
+    endif
+  endif
+  let destination = s:Slash(destination)
+  if isdirectory(@%)
+    setlocal noswapfile
+  endif
+  let exec = fugitive#Execute(['mv'] + (a:force ? ['-f'] : []) + ['--', expand('%:p'), destination], dir)
+  if exec.exit_status && exec.stderr !=# ['']
+    return 'echoerr ' .string('fugitive: '.s:JoinChomp(exec.stderr))
+  endif
+  if isdirectory(destination)
+    let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.')
+  endif
+  let reload = '|call fugitive#DidChange(' . string(exec) . ')'
+  if empty(s:DirCommitFile(@%)[1])
+    if isdirectory(destination)
+      return 'keepalt edit '.s:fnameescape(destination) . reload
+    else
+      return 'keepalt saveas! '.s:fnameescape(destination) . reload
+    endif
+  else
+    return 'file '.s:fnameescape(fugitive#Find(':0:'.destination, dir)) . reload
+  endif
+endfunction
+
+function! fugitive#RenameComplete(A,L,P) abort
+  if a:A =~# '^[.:]\=/'
+    return fugitive#CompletePath(a:A)
+  else
+    let pre = s:Slash(fnamemodify(expand('%:p:s?[\/]$??'), ':h')) . '/'
+    return map(fugitive#CompletePath(pre.a:A), 'strpart(v:val, len(pre))')
+  endif
+endfunction
+
+function! fugitive#MoveCommand(line1, line2, range, bang, mods, arg, ...) abort
+  return s:Move(a:bang, 0, a:arg)
+endfunction
+
+function! fugitive#RenameCommand(line1, line2, range, bang, mods, arg, ...) abort
+  return s:Move(a:bang, 1, a:arg)
+endfunction
+
+function! s:Remove(after, force) abort
+  let dir = s:Dir()
+  exe s:DirCheck(dir)
+  if len(@%) && s:DirCommitFile(@%)[1] ==# ''
+    let cmd = ['rm']
+  elseif s:DirCommitFile(@%)[1] ==# '0'
+    let cmd = ['rm','--cached']
+  else
+    return 'echoerr ' . string('fugitive: rm not supported for this buffer')
+  endif
+  if a:force
+    let cmd += ['--force']
+  endif
+  let message = s:ChompStderr(cmd + ['--', expand('%:p')], dir)
+  if len(message)
+    let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)')
+    return 'echoerr '.string(v:errmsg)
+  else
+    return a:after . (a:force ? '!' : ''). '|call fugitive#DidChange(' . string(dir) . ')'
+  endif
+endfunction
+
+function! fugitive#RemoveCommand(line1, line2, range, bang, mods, arg, ...) abort
+  return s:Remove('edit', a:bang)
+endfunction
+
+function! fugitive#UnlinkCommand(line1, line2, range, bang, mods, arg, ...) abort
+  return s:Remove('edit', a:bang)
+endfunction
+
+function! fugitive#DeleteCommand(line1, line2, range, bang, mods, arg, ...) abort
+  return s:Remove('bdelete', a:bang)
+endfunction
+
+" Section: :Git blame
+
+function! s:Keywordprg() abort
+  let args = ' --git-dir=' . escape(FugitiveGitPath(s:GitDir()), "\\\"' ")
+  if has('gui_running') && !has('win32')
+    return s:GitShellCmd() . ' --no-pager' . args . ' log -1'
+  else
+    return s:GitShellCmd() . args . ' show'
+  endif
+endfunction
+
+function! s:linechars(pattern) abort
+  let chars = strlen(s:gsub(matchstr(getline('.'), a:pattern), '.', '.'))
+  if exists('*synconcealed') && &conceallevel > 1
+    for col in range(1, chars)
+      let chars -= synconcealed(line('.'), col)[0]
+    endfor
+  endif
+  return chars
+endfunction
+
+function! s:BlameBufnr(...) abort
+  let state = s:TempState(a:0 ? a:1 : bufnr(''))
+  if get(state, 'filetype', '') ==# 'fugitiveblame'
+    return get(state, 'origin_bufnr', -1)
+  else
+    return -1
+  endif
+endfunction
+
+function! s:BlameCommitFileLnum(...) abort
+  let line = a:0 ? a:1 : getline('.')
+  let state = a:0 > 1 ? a:2 : s:TempState()
+  if get(state, 'filetype', '') !=# 'fugitiveblame'
+    return ['', '', 0]
+  endif
+  let commit = matchstr(line, '^\^\=[?*]*\zs\x\+')
+  if commit =~# '^0\+$'
+    let commit = ''
+  elseif has_key(state, 'blame_reverse_end')
+    let commit = get(s:LinesError([state.git_dir, 'rev-list', '--ancestry-path', '--reverse', commit . '..' . state.blame_reverse_end])[0], 0, '')
+  endif
+  let lnum = +matchstr(line, ' \zs\d\+\ze \%((\| *\d\+)\)')
+  let path = matchstr(line, '^\^\=[?*]*\x* \+\%(\d\+ \+\d\+ \+\)\=\zs.\{-\}\ze\s*\d\+ \%((\| *\d\+)\)')
+  if empty(path) && lnum
+    let path = get(state, 'blame_file', '')
+  endif
+  return [commit, path, lnum]
+endfunction
+
+function! s:BlameLeave() abort
+  let bufwinnr = bufwinnr(s:BlameBufnr())
+  if bufwinnr > 0
+    let bufnr = bufnr('')
+    exe bufwinnr . 'wincmd w'
+    return bufnr . 'bdelete'
+  endif
+  return ''
+endfunction
+
+function! s:BlameQuit() abort
+  let cmd = s:BlameLeave()
+  if empty(cmd)
+    return 'bdelete'
+  elseif len(s:DirCommitFile(@%)[1])
+    return cmd . '|Gedit'
+  else
+    return cmd
+  endif
+endfunction
+
+function! fugitive#BlameComplete(A, L, P) abort
+  return s:CompleteSub('blame', a:A, a:L, a:P)
+endfunction
+
+function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
+  let dir = s:Dir(a:options)
+  exe s:DirCheck(dir)
+  let flags = copy(a:options.subcommand_args)
+  let i = 0
+  let raw = 0
+  let commits = []
+  let files = []
+  let ranges = []
+  if a:line1 > 0 && a:count > 0 && a:range != 1
+    call extend(ranges, ['-L', a:line1 . ',' . a:count])
+  endif
+  while i < len(flags)
+    let match = matchlist(flags[i], '^\(-[a-zABDFH-KN-RT-Z]\)\ze\(.*\)')
+    if len(match) && len(match[2])
+      call insert(flags, match[1])
+      let flags[i+1] = '-' . match[2]
+      continue
+    endif
+    let arg = flags[i]
+    if arg =~# '^-p$\|^--\%(help\|porcelain\|line-porcelain\|incremental\)$'
+      let raw = 1
+    elseif arg ==# '--contents' && i + 1 < len(flags)
+      call extend(commits, remove(flags, i, i+1))
+      continue
+    elseif arg ==# '-L' && i + 1 < len(flags)
+      call extend(ranges, remove(flags, i, i+1))
+      continue
+    elseif arg =~# '^--contents='
+      call add(commits, remove(flags, i))
+      continue
+    elseif arg =~# '^-L.'
+      call add(ranges, remove(flags, i))
+      continue
+    elseif arg =~# '^-[GLS]$\|^--\%(date\|encoding\|contents\|ignore-rev\|ignore-revs-file\)$'
+      let i += 1
+      if i == len(flags)
+        echohl ErrorMsg
+        echo s:ChompStderr([dir, 'blame', arg])
+        echohl NONE
+        return ''
+      endif
+    elseif arg ==# '--'
+      if i + 1 < len(flags)
+        call extend(files, remove(flags, i + 1, -1))
+      endif
+      call remove(flags, i)
+      break
+    elseif arg !~# '^-' && (s:HasOpt(flags, '--not') || arg !~# '^\^')
+      if index(flags, '--') >= 0
+        call add(commits, remove(flags, i))
+        continue
+      endif
+      if arg =~# '\.\.' && arg !~# '^\.\.\=\%(/\|$\)' && empty(commits)
+        call add(commits, remove(flags, i))
+        continue
+      endif
+      try
+        let dcf = s:DirCommitFile(fugitive#Find(arg, dir))
+        if len(dcf[1]) && empty(dcf[2])
+          call add(commits, remove(flags, i))
+          continue
+        endif
+      catch /^fugitive:/
+      endtry
+      call add(files, remove(flags, i))
+      continue
+    endif
+    let i += 1
+  endwhile
+  let file = substitute(get(files, 0, get(s:TempState(), 'blame_file', s:Relative('./', dir))), '^\.\%(/\|$\)', '', '')
+  if empty(commits) && len(files) > 1
+    call add(commits, remove(files, 1))
+  endif
+  exe s:BlameLeave()
+  try
+    let cmd = a:options.flags + ['--no-pager', '-c', 'blame.coloring=none', '-c', 'blame.blankBoundary=false', a:options.subcommand, '--show-number']
+    call extend(cmd, filter(copy(flags), 'v:val !~# "\\v^%(-b|--%(no-)=color-.*|--progress)$"'))
+    if a:count > 0 && empty(ranges)
+      let cmd += ['-L', (a:line1 ? a:line1 : line('.')) . ',' . (a:line1 ? a:line1 : line('.'))]
+    endif
+    call extend(cmd, ranges)
+    let tempname = tempname()
+    let temp = tempname . (raw ? '' : '.fugitiveblame')
+    if len(commits)
+      let cmd += commits
+    elseif empty(files) && len(matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$'))
+      let cmd += [matchstr(s:DirCommitFile(@%)[1], '^\x\x\+$')]
+    elseif empty(files) && !s:HasOpt(flags, '--reverse')
+      if &modified || !empty(s:DirCommitFile(@%)[1])
+        let cmd += ['--contents', tempname . '.in']
+        silent execute 'noautocmd keepalt %write ' . s:fnameescape(tempname . '.in')
+        let delete_in = 1
+      elseif &autoread
+        exe 'checktime ' . bufnr('')
+      endif
+    else
+      call fugitive#Autowrite()
+    endif
+    let basecmd = [{'git': a:options.git}, dir, '--literal-pathspecs'] + cmd + ['--'] + (len(files) ? files : [file])
+    let [err, exec_error] = s:StdoutToFile(temp, basecmd)
+    if exists('delete_in')
+      call delete(tempname . '.in')
+    endif
+    redraw
+    try
+      if exec_error
+        let lines = split(err, "\n")
+        if empty(lines)
+          let lines = readfile(temp)
+        endif
+        for i in range(len(lines))
+          if lines[i] =~# '^error: \|^fatal: '
+            echohl ErrorMsg
+            echon lines[i]
+            echohl NONE
+            break
+          else
+            echon lines[i]
+          endif
+          if i != len(lines) - 1
+            echon "\n"
+          endif
+        endfor
+        return ''
+      endif
+      let temp_state = {
+            \ 'git': a:options.git,
+            \ 'flags': a:options.flags,
+            \ 'args': [a:options.subcommand] + a:options.subcommand_args,
+            \ 'git_dir': s:GitDir(a:options),
+            \ 'cwd': s:UserCommandCwd(a:options),
+            \ 'filetype': (raw ? 'git' : 'fugitiveblame'),
+            \ 'blame_options': a:options,
+            \ 'blame_flags': flags,
+            \ 'blame_file': file}
+      if s:HasOpt(flags, '--reverse')
+        let temp_state.blame_reverse_end = matchstr(get(commits, 0, ''), '\.\.\zs.*')
+      endif
+      if a:line1 == 0 && a:count == 1
+        if get(a:options, 'curwin')
+          let edit = 'edit'
+        elseif a:bang
+          let edit = 'pedit'
+        else
+          let edit = 'split'
+        endif
+        return s:BlameCommit(s:Mods(a:mods) . edit, get(readfile(temp), 0, ''), temp_state)
+      elseif (a:line1 == 0 || a:range == 1) && a:count > 0
+        let edit = s:Mods(a:mods) . get(['edit', 'split', 'pedit', 'vsplit', 'tabedit', 'edit'], a:count - (a:line1 ? a:line1 : 1), 'split')
+        return s:BlameCommit(edit, get(readfile(temp), 0, ''), temp_state)
+      else
+        let temp = s:Resolve(temp)
+        let temp_state.file = temp
+        call s:RunSave(temp_state)
+        if len(ranges + commits + files) || raw
+          let reload = '|call fugitive#DidChange(fugitive#Result(' . string(temp_state.file) . '))'
+          let mods = s:Mods(a:mods)
+          if a:count != 0
+            exe 'silent keepalt' mods get(a:options, 'curwin') ? 'edit' : 'split' s:fnameescape(temp)
+          elseif !&modified || a:bang || &bufhidden ==# 'hide' || (empty(&bufhidden) && &hidden)
+            exe 'silent' mods 'edit' . (a:bang ? '! ' : ' ') . s:fnameescape(temp)
+          else
+            return mods . 'edit ' . s:fnameescape(temp) . reload
+          endif
+          return reload[1 : -1]
+        endif
+        if a:mods =~# '\<tab\>'
+          silent tabedit %
+        endif
+        let bufnr = bufnr('')
+        let temp_state.origin_bufnr = bufnr
+        let restore = []
+        let mods = substitute(a:mods, '\<tab\>', '', 'g')
+        for winnr in range(winnr('$'),1,-1)
+          if getwinvar(winnr, '&scrollbind')
+            if !&l:scrollbind
+              call setwinvar(winnr, '&scrollbind', 0)
+            elseif winnr != winnr() && getwinvar(winnr, '&foldenable')
+              call setwinvar(winnr, '&foldenable', 0)
+              call add(restore, 'call setwinvar(bufwinnr('.winbufnr(winnr).'),"&foldenable",1)')
+            endif
+          endif
+          let win_blame_bufnr = s:BlameBufnr(winbufnr(winnr))
+          if getwinvar(winnr, '&scrollbind') ? win_blame_bufnr == bufnr : win_blame_bufnr > 0
+            execute winbufnr(winnr).'bdelete'
+          endif
+        endfor
+        let restore_winnr = exists('*win_getid') ? win_getid() : 'bufwinnr(' . bufnr . ')'
+        if !&l:scrollbind
+          call add(restore, 'call setwinvar(' . restore_winnr . ',"&scrollbind",0)')
+        endif
+        if &l:wrap
+          call add(restore, 'call setwinvar(' . restore_winnr . ',"&wrap",1)')
+        endif
+        if &l:foldenable
+          call add(restore, 'call setwinvar(' . restore_winnr . ',"&foldenable",1)')
+        endif
+        setlocal scrollbind nowrap nofoldenable
+        let top = line('w0') + &scrolloff
+        let current = line('.')
+        exe 'silent keepalt' (a:bang ? s:Mods(mods) . 'split' : s:Mods(mods, 'leftabove') . 'vsplit') s:fnameescape(temp)
+        let w:fugitive_leave = join(restore, '|')
+        execute top
+        normal! zt
+        execute current
+        setlocal nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth
+        if exists('+relativenumber')
+          setlocal norelativenumber
+        endif
+        if exists('+signcolumn')
+          setlocal signcolumn=no
+        endif
+        execute "vertical resize ".(s:linechars('.\{-\}\s\+\d\+\ze)')+1)
+        redraw
+        syncbind
+        exe s:DoAutocmdChanged(temp_state)
+      endif
+    endtry
+    return ''
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+endfunction
+
+function! s:BlameCommit(cmd, ...) abort
+  let line = a:0 ? a:1 : getline('.')
+  let state = a:0 ? a:2 : s:TempState()
+  let sigil = has_key(state, 'blame_reverse_end') ? '-' : '+'
+  let mods = (s:BlameBufnr() < 0 ? '' : &splitbelow ? "botright " : "topleft ")
+  let [commit, path, lnum] = s:BlameCommitFileLnum(line, state)
+  if empty(commit) && len(path) && has_key(state, 'blame_reverse_end')
+    let path = (len(state.blame_reverse_end) ? state.blame_reverse_end . ':' : ':(top)') . path
+    return fugitive#Open(mods . a:cmd, 0, '', '+' . lnum . ' ' . s:fnameescape(path), ['+' . lnum, path])
+  endif
+  if commit =~# '^0*$'
+    return 'echoerr ' . string('fugitive: no commit')
+  endif
+  if line =~# '^\^' && !has_key(state, 'blame_reverse_end')
+    let path = commit . ':' . path
+    return fugitive#Open(mods . a:cmd, 0, '', '+' . lnum . ' ' . s:fnameescape(path), ['+' . lnum, path])
+  endif
+  let cmd = fugitive#Open(mods . a:cmd, 0, '', commit, [commit])
+  if cmd =~# '^echoerr'
+    return cmd
+  endif
+  execute cmd
+  if a:cmd ==# 'pedit' || empty(path)
+    return ''
+  endif
+  if search('^diff .* b/\M'.escape(path,'\').'$','W')
+    call search('^+++')
+    let head = line('.')
+    while search('^@@ \|^diff ') && getline('.') =~# '^@@ '
+      let top = +matchstr(getline('.'),' ' . sigil .'\zs\d\+')
+      let len = +matchstr(getline('.'),' ' . sigil . '\d\+,\zs\d\+')
+      if lnum >= top && lnum <= top + len
+        let offset = lnum - top
+        if &scrolloff
+          +
+          normal! zt
+        else
+          normal! zt
+          +
+        endif
+        while offset > 0 && line('.') < line('$')
+          +
+          if getline('.') =~# '^[ ' . sigil . ']'
+            let offset -= 1
+          endif
+        endwhile
+        return 'normal! zv'
+      endif
+    endwhile
+    execute head
+    normal! zt
+  endif
+  return ''
+endfunction
+
+function! s:BlameJump(suffix, ...) abort
+  let suffix = a:suffix
+  let [commit, path, lnum] = s:BlameCommitFileLnum()
+  if empty(path)
+    return 'echoerr ' . string('fugitive: could not determine filename for blame')
+  endif
+  if commit =~# '^0*$'
+    let commit = '@'
+    let suffix = ''
+  endif
+  let offset = line('.') - line('w0')
+  let state = s:TempState()
+  let flags = get(state, 'blame_flags', [])
+  let blame_bufnr = s:BlameBufnr()
+  if blame_bufnr > 0
+    let bufnr = bufnr('')
+    let winnr = bufwinnr(blame_bufnr)
+    if winnr > 0
+      exe winnr.'wincmd w'
+      exe bufnr.'bdelete'
+    endif
+    execute 'Gedit' s:fnameescape(commit . suffix . ':' . path)
+    execute lnum
+  endif
+  let my_bufnr = bufnr('')
+  if blame_bufnr < 0
+    let blame_args = flags + [commit . suffix, '--', path]
+    let result = s:BlameSubcommand(0, 0, 0, 0, '', extend({'subcommand_args': blame_args}, state.blame_options, 'keep'))
+  else
+    let blame_args = flags
+    let result = s:BlameSubcommand(-1, -1, 0, 0, '', extend({'subcommand_args': blame_args}, state.blame_options, 'keep'))
+  endif
+  if bufnr('') == my_bufnr
+    return result
+  endif
+  execute result
+  execute lnum
+  let delta = line('.') - line('w0') - offset
+  if delta > 0
+    execute 'normal! '.delta."\<C-E>"
+  elseif delta < 0
+    execute 'normal! '.(-delta)."\<C-Y>"
+  endif
+  keepjumps syncbind
+  redraw
+  echo ':Git blame' s:fnameescape(blame_args)
+  return ''
+endfunction
+
+let s:hash_colors = {}
+
+function! fugitive#BlameSyntax() abort
+  let conceal = has('conceal') ? ' conceal' : ''
+  let flags = get(s:TempState(), 'blame_flags', [])
+  syn spell notoplevel
+  syn match FugitiveblameBlank                      "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite
+  syn match FugitiveblameHash       "\%(^\^\=[?*]*\)\@<=\<\x\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
+  if s:HasOpt(flags, '-b') || FugitiveConfigGet('blame.blankBoundary') =~# '^1$\|^true$'
+    syn match FugitiveblameBoundaryIgnore "^\^[*?]*\x\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
+  else
+    syn match FugitiveblameBoundary "^\^"
+  endif
+  syn match FugitiveblameScoreDebug        " *\d\+\s\+\d\+\s\@=" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile contained skipwhite
+  syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%(\s\d\+\)\@<=)" contained keepend oneline
+  syn match FugitiveblameTime "\<[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%(\s\+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation
+  exec 'syn match FugitiveblameLineNumber         "\s[[:digit:][:space:]]\{0,' . (len(line('$'))-1). '\}\d)\@=" contained containedin=FugitiveblameAnnotation' conceal
+  exec 'syn match FugitiveblameOriginalFile       "\s\%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite' (s:HasOpt(flags, '--show-name', '-f') ? '' : conceal)
+  exec 'syn match FugitiveblameOriginalLineNumber "\s*\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite' (s:HasOpt(flags, '--show-number', '-n') ? '' : conceal)
+  exec 'syn match FugitiveblameOriginalLineNumber "\s*\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite' (s:HasOpt(flags, '--show-number', '-n') ? '' : conceal)
+  syn match FugitiveblameShort              " \d\+)" contained contains=FugitiveblameLineNumber
+  syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation
+  hi def link FugitiveblameBoundary           Keyword
+  hi def link FugitiveblameHash               Identifier
+  hi def link FugitiveblameBoundaryIgnore     Ignore
+  hi def link FugitiveblameUncommitted        Ignore
+  hi def link FugitiveblameScoreDebug         Debug
+  hi def link FugitiveblameTime               PreProc
+  hi def link FugitiveblameLineNumber         Number
+  hi def link FugitiveblameOriginalFile       String
+  hi def link FugitiveblameOriginalLineNumber Float
+  hi def link FugitiveblameShort              FugitiveblameDelimiter
+  hi def link FugitiveblameDelimiter          Delimiter
+  hi def link FugitiveblameNotCommittedYet    Comment
+  if !get(g:, 'fugitive_dynamic_colors', 1) && !s:HasOpt(flags, '--color-lines') || s:HasOpt(flags, '--no-color-lines')
+    return
+  endif
+  let seen = {}
+  for lnum in range(1, line('$'))
+    let orig_hash = matchstr(getline(lnum), '^\^\=[*?]*\zs\x\{6\}')
+    let hash = orig_hash
+    let hash = substitute(hash, '\(\x\)\x', '\=submatch(1).printf("%x", 15-str2nr(submatch(1),16))', 'g')
+    let hash = substitute(hash, '\(\x\x\)', '\=printf("%02x", str2nr(submatch(1),16)*3/4+32)', 'g')
+    if hash ==# '' || orig_hash ==# '000000' || has_key(seen, hash)
+      continue
+    endif
+    let seen[hash] = 1
+    if &t_Co == 256
+      let [s, r, g, b; __] = map(matchlist(orig_hash, '\(\x\)\x\(\x\)\x\(\x\)\x'), 'str2nr(v:val,16)')
+      let color = 16 + (r + 1) / 3 * 36 + (g + 1) / 3 * 6 + (b + 1) / 3
+      if color == 16
+        let color = 235
+      elseif color == 231
+        let color = 255
+      endif
+      let s:hash_colors[hash] = ' ctermfg='.color
+    else
+      let s:hash_colors[hash] = ''
+    endif
+    let pattern = substitute(orig_hash, '^\(\x\)\x\(\x\)\x\(\x\)\x$', '\1\\x\2\\x\3\\x', '') . '*\>'
+    exe 'syn match FugitiveblameHash'.hash.'       "\%(^\^\=[*?]*\)\@<='.pattern.'" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite'
+  endfor
+  syn match FugitiveblameUncommitted "\%(^\^\=[?*]*\)\@<=\<0\{7,\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameScoreDebug,FugitiveblameOriginalLineNumber,FugitiveblameOriginalFile skipwhite
+  call s:BlameRehighlight()
+endfunction
+
+function! s:BlameRehighlight() abort
+  for [hash, cterm] in items(s:hash_colors)
+    if !empty(cterm) || has('gui_running') || has('termguicolors') && &termguicolors
+      exe 'hi FugitiveblameHash'.hash.' guifg=#' . hash . cterm
+    else
+      exe 'hi link FugitiveblameHash'.hash.' Identifier'
+    endif
+  endfor
+endfunction
+
+function! s:BlameMaps(is_ftplugin) abort
+  let ft = a:is_ftplugin
+  call s:Map('n', '<F1>', ':help :Git_blame<CR>', '<silent>', ft)
+  call s:Map('n', 'g?',   ':help :Git_blame<CR>', '<silent>', ft)
+  call s:Map('n', 'gq',   ':exe <SID>BlameQuit()<CR>', '<silent>', ft)
+  call s:Map('n', '<2-LeftMouse>', ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>', ft)
+  call s:Map('n', '<CR>', ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>', ft)
+  call s:Map('n', '-',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>', ft)
+  call s:Map('n', 's',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>', ft)
+  call s:Map('n', 'u',    ':<C-U>exe <SID>BlameJump("")<CR>', '<silent>', ft)
+  call s:Map('n', 'P',    ':<C-U>exe <SID>BlameJump("^".v:count1)<CR>', '<silent>', ft)
+  call s:Map('n', '~',    ':<C-U>exe <SID>BlameJump("~".v:count1)<CR>', '<silent>', ft)
+  call s:Map('n', 'i',    ':<C-U>exe <SID>BlameCommit("exe <SID>BlameLeave()<Bar>edit")<CR>', '<silent>', ft)
+  call s:Map('n', 'o',    ':<C-U>exe <SID>BlameCommit("split")<CR>', '<silent>', ft)
+  call s:Map('n', 'O',    ':<C-U>exe <SID>BlameCommit("tabedit")<CR>', '<silent>', ft)
+  call s:Map('n', 'p',    ':<C-U>exe <SID>BlameCommit("pedit")<CR>', '<silent>', ft)
+  call s:Map('n', '.',    ":<C-U> <C-R>=substitute(<SID>BlameCommitFileLnum()[0],'^$','@','')<CR><Home>", ft)
+  call s:Map('n', '(',    "-", ft)
+  call s:Map('n', ')',    "+", ft)
+  call s:Map('n', 'A',    ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze [0-9:/+-][0-9:/+ -]* \\d\\+)')+1+v:count)<CR>", '<silent>', ft)
+  call s:Map('n', 'C',    ":<C-u>exe 'vertical resize '.(<SID>linechars('^\\S\\+')+1+v:count)<CR>", '<silent>', ft)
+  call s:Map('n', 'D',    ":<C-u>exe 'vertical resize '.(<SID>linechars('.\\{-\\}\\ze\\d\\ze\\s\\+\\d\\+)')+1-v:count)<CR>", '<silent>', ft)
+endfunction
+
+function! fugitive#BlameFileType() abort
+  setlocal nomodeline
+  setlocal foldmethod=manual
+  if len(s:GitDir())
+    let &l:keywordprg = s:Keywordprg()
+  endif
+  let b:undo_ftplugin = 'setl keywordprg= foldmethod<'
+  if exists('+concealcursor')
+    setlocal concealcursor=nc conceallevel=2
+    let b:undo_ftplugin .= ' concealcursor< conceallevel<'
+  endif
+  if &modifiable
+    return ''
+  endif
+  call s:BlameMaps(1)
+endfunction
+
+function! s:BlameCursorSync(bufnr, line) abort
+  if a:line == line('.')
+    return
+  endif
+  if get(s:TempState(), 'origin_bufnr') == a:bufnr || get(s:TempState(a:bufnr), 'origin_bufnr') == bufnr('')
+    if &startofline
+      execute a:line
+    else
+      let pos = getpos('.')
+      let pos[1] = a:line
+      call setpos('.', pos)
+    endif
+  endif
+endfunction
+
+augroup fugitive_blame
+  autocmd!
+  autocmd ColorScheme,GUIEnter * call s:BlameRehighlight()
+  autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
+  autocmd WinLeave * let s:cursor_for_blame = [bufnr(''), line('.')]
+  autocmd WinEnter * if exists('s:cursor_for_blame') | call call('s:BlameCursorSync', s:cursor_for_blame) | endif
+augroup END
+
+" Section: :GBrowse
+
+function! s:BrowserOpen(url, mods, echo_copy) abort
+  let url = substitute(a:url, '[ <>\|"]', '\="%".printf("%02X",char2nr(submatch(0)))', 'g')
+  let mods = s:Mods(a:mods)
+  if a:echo_copy
+    if has('clipboard')
+      let @+ = url
+    endif
+    return 'echo '.string(url)
+  elseif exists(':Browse') == 2
+    return 'echo '.string(url).'|' . mods . 'Browse '.url
+  elseif exists(':OpenBrowser') == 2
+    return 'echo '.string(url).'|' . mods . 'OpenBrowser '.url
+  else
+    if !exists('g:loaded_netrw')
+      runtime! autoload/netrw.vim
+    endif
+    if exists('*netrw#BrowseX')
+      return 'echo '.string(url).'|' . mods . 'call netrw#BrowseX('.string(url).', 0)'
+    elseif exists('*netrw#NetrwBrowseX')
+      return 'echo '.string(url).'|' . mods . 'call netrw#NetrwBrowseX('.string(url).', 0)'
+    else
+      return 'echoerr ' . string('Netrw not found. Define your own :Browse to use :GBrowse')
+    endif
+  endif
+endfunction
+
+function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, ...) abort
+  exe s:VersionCheck()
+  let dir = s:Dir()
+  try
+    let arg = a:arg
+    if arg =~# '^++\%([Gg]it\)\=[Rr]emote='
+      let remote = matchstr(arg, '^++\%([Gg]it\)\=[Rr]emote=\zs\S\+')
+      let arg = matchstr(arg, '\s\zs\S.*')
+    endif
+    let validremote = '\.\%(git\)\=\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\='
+    if arg ==# '-'
+      let remote = ''
+      let rev = ''
+      let result = fugitive#Result()
+      if filereadable(get(result, 'file', ''))
+        let rev = s:fnameescape(result.file)
+      else
+        return 'echoerr ' . string('fugitive: could not find prior :Git invocation')
+      endif
+    elseif !exists('l:remote')
+      let remote = matchstr(arg, '@\zs\%('.validremote.'\)$')
+      let rev = substitute(arg, '@\%('.validremote.'\)$','','')
+    else
+      let rev = arg
+    endif
+    if rev =~? '^\a\a\+:[\/][\/]' && rev !~? '^fugitive:'
+      let rev = substitute(rev, '\\\@<![#!]\|\\\@<!%\ze\w', '\\&', 'g')
+    endif
+    let expanded = s:Expand(rev)
+    if expanded =~? '^\a\a\+:[\/][\/]' && expanded !~? '^fugitive:'
+      return s:BrowserOpen(s:Slash(expanded), a:mods, a:bang)
+    endif
+    if !exists('l:result')
+      let result = s:TempState(empty(expanded) ? bufnr('') : expanded)
+    endif
+    if !empty(result) && filereadable(get(result, 'file', ''))
+      for line in readfile(result.file, '', 4096)
+        let rev = s:fnameescape(matchstr(line, '\<https\=://[^[:space:]<>]*[^[:space:]<>.,;:"''!?]'))
+        if len(rev)
+          return s:BrowserOpen(rev, a:mods, a:bang)
+        endif
+      endfor
+      return 'echoerr ' . string('fugitive: no URL found in output of :Git')
+    endif
+    exe s:DirCheck(dir)
+    if empty(expanded)
+      let bufname = &buftype =~# '^\%(nofile\|terminal\)$' ? '' : s:BufName('%')
+      let expanded = s:DirRev(bufname)[1]
+      if empty(expanded)
+        let expanded = fugitive#Path(bufname, ':(top)', dir)
+      endif
+      if a:count > 0 && bufname !=# bufname('')
+        let blame = s:BlameCommitFileLnum(getline(a:count))
+        if len(blame[0])
+          let expanded = blame[0]
+        endif
+      endif
+    endif
+    let refdir = fugitive#Find('.git/refs', dir)
+    for subdir in ['tags/', 'heads/', 'remotes/']
+      if expanded !~# '^[./]' && filereadable(refdir . '/' . subdir . expanded)
+        let expanded = '.git/refs/' . subdir . expanded
+      endif
+    endfor
+    let full = s:Generate(expanded, dir)
+    let commit = ''
+    if full =~? '^fugitive:'
+      let [dir, commit, path] = s:DirCommitFile(full)
+      if commit =~# '^:\=\d$'
+        let commit = ''
+      endif
+      if commit =~ '..'
+        let type = s:TreeChomp(['cat-file','-t',commit.s:sub(path,'^/',':')], dir)
+        let branch = matchstr(expanded, '^[^:]*')
+      elseif empty(path) || path ==# '/'
+        let type = 'tree'
+      else
+        let type = 'blob'
+      endif
+      let path = path[1:-1]
+    elseif empty(s:Tree(dir))
+      let path = '.git/' . full[strlen(dir)+1:-1]
+      let type = ''
+    else
+      let path = fugitive#Path(full, '/')[1:-1]
+      if path =~# '^\.git/'
+        let type = ''
+      elseif isdirectory(full) || empty(path)
+        let type = 'tree'
+      else
+        let type = 'blob'
+      endif
+    endif
+    let config = fugitive#Config(dir)
+    if type ==# 'tree' && !empty(path)
+      let path = s:sub(path, '/\=$', '/')
+    endif
+    let actual_dir = fugitive#Find('.git/', dir)
+    if path =~# '^\.git/.*HEAD$' && filereadable(actual_dir . path[5:-1])
+      let body = readfile(actual_dir . path[5:-1])[0]
+      if body =~# '^\x\{40,\}$'
+        let commit = body
+        let type = 'commit'
+        let path = ''
+      elseif body =~# '^ref: refs/'
+        let path = '.git/' . matchstr(body,'ref: \zs.*')
+      endif
+    endif
+
+    let merge = ''
+    if path =~# '^\.git/refs/remotes/.'
+      if empty(remote)
+        let remote = matchstr(path, '^\.git/refs/remotes/\zs[^/]\+')
+        let branch = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+      else
+        let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+        let branch = merge
+        let path = '.git/refs/heads/'.merge
+      endif
+    elseif path =~# '^\.git/refs/heads/.'
+      let branch = path[16:-1]
+    elseif !exists('branch')
+      let branch = FugitiveHead(0, dir)
+    endif
+    if !empty(branch)
+      let r = FugitiveConfigGet('branch.'.branch.'.remote', config)
+      let m = FugitiveConfigGet('branch.'.branch.'.merge', config)[11:-1]
+      if r ==# '.' && !empty(m)
+        let r2 = FugitiveConfigGet('branch.'.m.'.remote', config)
+        if r2 !~# '^\.\=$'
+          let r = r2
+          let m = FugitiveConfigGet('branch.'.m.'.merge', config)[11:-1]
+        endif
+      endif
+      if empty(remote)
+        let remote = r
+      endif
+      if r ==# '.' || r ==# remote
+        let remote_ref = 'refs/remotes/' . remote . '/' . branch
+        if FugitiveConfigGet('push.default', config) ==# 'upstream' ||
+              \ !filereadable(FugitiveFind('.git/' . remote_ref, dir)) && empty(s:ChompDefault('', ['rev-parse', '--verify', remote_ref, '--'], dir))
+          let merge = m
+          if path =~# '^\.git/refs/heads/.'
+            let path = '.git/refs/heads/'.merge
+          endif
+        else
+          let merge = branch
+        endif
+      endif
+    endif
+
+    let line1 = a:count > 0 && type ==# 'blob' ? a:line1 : 0
+    let line2 = a:count > 0 && type ==# 'blob' ? a:count : 0
+    if empty(commit) && path !~# '^\.git/'
+      if a:count < 0 && !empty(merge)
+        let commit = merge
+      else
+        let commit = ''
+        if len(merge)
+          let owner = s:Owner(@%, dir)
+          let commit = s:ChompDefault('', ['merge-base', 'refs/remotes/' . remote . '/' . merge, empty(owner) ? '@' : owner, '--'], dir)
+          if line2 > 0 && empty(arg) && commit =~# '^\x\{40,\}$'
+            let blame_list = tempname()
+            call writefile([commit, ''], blame_list, 'b')
+            let blame_in = tempname()
+            silent exe 'noautocmd keepalt %write' blame_in
+            let [blame, exec_error] = s:LinesError(['-c', 'blame.coloring=none', 'blame', '--contents', blame_in, '-L', line1.','.line2, '-S', blame_list, '-s', '--show-number', './' . path], dir)
+            if !exec_error
+              let blame_regex = '^\^\x\+\s\+\zs\d\+\ze\s'
+              if get(blame, 0) =~# blame_regex && get(blame, -1) =~# blame_regex
+                let line1 = +matchstr(blame[0], blame_regex)
+                let line2 = +matchstr(blame[-1], blame_regex)
+              else
+                throw "fugitive: can't browse to uncommitted change"
+              endif
+            endif
+          endif
+        endif
+      endif
+      if empty(commit)
+        let commit = readfile(fugitive#Find('.git/HEAD', dir), '', 1)[0]
+      endif
+      let i = 0
+      while commit =~# '^ref: ' && i < 10
+        let ref_file = refdir[0 : -5] . commit[5:-1]
+        if getfsize(ref_file) > 0
+          let commit = readfile(ref_file, '', 1)[0]
+        else
+          let commit = fugitive#RevParse(commit[5:-1], dir)
+        endif
+        let i -= 1
+      endwhile
+    endif
+
+    if empty(remote) || remote ==# '.'
+      let remote = s:RemoteDefault(config)
+    endif
+    if remote =~# ':'
+      let remote_url = remote
+    else
+      let remote_url = fugitive#RemoteUrl(remote, config)
+    endif
+    let raw = empty(remote_url) ? remote : remote_url
+    let git_dir = s:GitDir(dir)
+
+    let opts = {
+          \ 'git_dir': git_dir,
+          \ 'repo': {'git_dir': git_dir},
+          \ 'remote': raw,
+          \ 'remote_name': remote,
+          \ 'commit': commit,
+          \ 'path': path,
+          \ 'type': type,
+          \ 'line1': line1,
+          \ 'line2': line2}
+
+    let url = ''
+    for Handler in get(g:, 'fugitive_browse_handlers', [])
+      let url = call(Handler, [copy(opts)])
+      if !empty(url)
+        break
+      endif
+    endfor
+
+    if empty(url)
+      throw "fugitive: no GBrowse handler installed for '".raw."'"
+    endif
+
+    return s:BrowserOpen(url, a:mods, a:bang)
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+endfunction
+
+" Section: Go to file
+
+let s:ref_header = '\%(Merge\|Rebase\|Upstream\|Pull\|Push\)'
+
+nnoremap <SID>: :<C-U><C-R>=v:count ? v:count : ''<CR>
+function! fugitive#MapCfile(...) abort
+  exe 'cnoremap <buffer> <expr> <Plug><cfile>' (a:0 ? a:1 : 'fugitive#Cfile()')
+  let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|sil! exe "cunmap <buffer> <Plug><cfile>"'
+  if !exists('g:fugitive_no_maps')
+    call s:Map('n', 'gf',          '<SID>:find <Plug><cfile><CR>', '<silent><unique>', 1)
+    call s:Map('n', '<C-W>f',     '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>', 1)
+    call s:Map('n', '<C-W><C-F>', '<SID>:sfind <Plug><cfile><CR>', '<silent><unique>', 1)
+    call s:Map('n', '<C-W>gf',  '<SID>:tabfind <Plug><cfile><CR>', '<silent><unique>', 1)
+    call s:Map('c', '<C-R><C-F>', '<Plug><cfile>', '<silent><unique>', 1)
+  endif
+endfunction
+
+function! s:ContainingCommit() abort
+  let commit = s:Owner(@%)
+  return empty(commit) ? '@' : commit
+endfunction
+
+function! s:SquashArgument(...) abort
+  if &filetype == 'fugitive'
+    let commit = matchstr(getline('.'), '^\%(\%(\x\x\x\)\@!\l\+\s\+\)\=\zs[0-9a-f]\{4,\}\ze \|^' . s:ref_header . ': \zs\S\+')
+  elseif has_key(s:temp_files, s:cpath(expand('%:p')))
+    let commit = matchstr(getline('.'), '\S\@<!\x\{4,\}\>')
+  else
+    let commit = s:Owner(@%)
+  endif
+  return len(commit) && a:0 ? printf(a:1, commit) : commit
+endfunction
+
+function! s:RebaseArgument() abort
+  return s:SquashArgument(' %s^')
+endfunction
+
+function! s:NavigateUp(count) abort
+  let rev = substitute(s:DirRev(@%)[1], '^$', ':', 'g')
+  let c = a:count
+  while c
+    if rev =~# ':.*/.'
+      let rev = matchstr(rev, '.*\ze/.\+', '')
+    elseif rev =~# '.:.'
+      let rev = matchstr(rev, '^.[^:]*:')
+    elseif rev =~# '^:'
+      let rev = '@^{}'
+    elseif rev =~# ':$'
+      let rev = rev[0:-2]
+    else
+      return rev.'~'.c
+    endif
+    let c -= 1
+  endwhile
+  return rev
+endfunction
+
+function! s:MapMotion(lhs, rhs) abort
+  let maps = [
+        \ s:Map('n', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>"),
+        \ s:Map('o', a:lhs, ":<C-U>" . a:rhs . "<CR>", "<silent>"),
+        \ s:Map('x', a:lhs, ":<C-U>exe 'normal! gv'<Bar>" . a:rhs . "<CR>", "<silent>")]
+  call filter(maps, '!empty(v:val)')
+  return join(maps, '|')
+endfunction
+
+function! fugitive#MapJumps(...) abort
+  if !&modifiable
+    if get(b:, 'fugitive_type', '') ==# 'blob'
+      let blame_tail = '<C-R>=v:count ? " --reverse" : ""<CR><CR>'
+      exe s:Map('n', '<2-LeftMouse>', ':<C-U>0,1Git ++curwin blame' . blame_tail, '<silent>')
+      exe s:Map('n', '<CR>', ':<C-U>0,1Git ++curwin blame' . blame_tail, '<silent>')
+      exe s:Map('n', 'o',    ':<C-U>0,1Git blame' . blame_tail, '<silent>')
+      exe s:Map('n', 'p',    ':<C-U>0,1Git blame!' . blame_tail, '<silent>')
+      if has('patch-7.4.1898')
+        exe s:Map('n', 'gO',   ':<C-U>vertical 0,1Git blame' . blame_tail, '<silent>')
+        exe s:Map('n', 'O',    ':<C-U>tab 0,1Git blame' . blame_tail, '<silent>')
+      else
+        exe s:Map('n', 'gO',   ':<C-U>0,4Git blame' . blame_tail, '<silent>')
+        exe s:Map('n', 'O',    ':<C-U>0,5Git blame' . blame_tail, '<silent>')
+      endif
+
+      call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>')
+      call s:Map('n', 'dd', ":<C-U>call fugitive#DiffClose()<Bar>Gdiffsplit!<CR>", '<silent>')
+      call s:Map('n', 'dh', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>')
+      call s:Map('n', 'ds', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>')
+      call s:Map('n', 'dv', ":<C-U>call fugitive#DiffClose()<Bar>Gvdiffsplit!<CR>", '<silent>')
+      call s:Map('n', 'd?', ":<C-U>help fugitive_d<CR>", '<silent>')
+
+    else
+      call s:Map('n', '<2-LeftMouse>', ':<C-U>exe <SID>GF("edit")<CR>', '<silent>')
+      call s:Map('n', '<CR>', ':<C-U>exe <SID>GF("edit")<CR>', '<silent>')
+      call s:Map('n', 'o',    ':<C-U>exe <SID>GF("split")<CR>', '<silent>')
+      call s:Map('n', 'gO',   ':<C-U>exe <SID>GF("vsplit")<CR>', '<silent>')
+      call s:Map('n', 'O',    ':<C-U>exe <SID>GF("tabedit")<CR>', '<silent>')
+      call s:Map('n', 'p',    ':<C-U>exe <SID>GF("pedit")<CR>', '<silent>')
+
+      if !exists('g:fugitive_no_maps')
+        call s:Map('n', '<C-P>', ':exe <SID>PreviousItem(v:count1)<Bar>echohl WarningMsg<Bar>echo "CTRL-P is deprecated in favor of ("<Bar>echohl NONE<CR>', '<unique>')
+        call s:Map('n', '<C-N>', ':exe <SID>NextItem(v:count1)<Bar>echohl WarningMsg<Bar>echo "CTRL-N is deprecated in favor of )"<Bar>echohl NONE<CR>', '<unique>')
+      endif
+      call s:MapMotion('(', 'exe <SID>PreviousItem(v:count1)')
+      call s:MapMotion(')', 'exe <SID>NextItem(v:count1)')
+      call s:MapMotion('K', 'exe <SID>PreviousHunk(v:count1)')
+      call s:MapMotion('J', 'exe <SID>NextHunk(v:count1)')
+      call s:MapMotion('[c', 'exe <SID>PreviousHunk(v:count1)')
+      call s:MapMotion(']c', 'exe <SID>NextHunk(v:count1)')
+      call s:MapMotion('[/', 'exe <SID>PreviousFile(v:count1)')
+      call s:MapMotion(']/', 'exe <SID>NextFile(v:count1)')
+      call s:MapMotion('[m', 'exe <SID>PreviousFile(v:count1)')
+      call s:MapMotion(']m', 'exe <SID>NextFile(v:count1)')
+      call s:MapMotion('[[', 'exe <SID>PreviousSection(v:count1)')
+      call s:MapMotion(']]', 'exe <SID>NextSection(v:count1)')
+      call s:MapMotion('[]', 'exe <SID>PreviousSectionEnd(v:count1)')
+      call s:MapMotion('][', 'exe <SID>NextSectionEnd(v:count1)')
+      call s:Map('nxo', '*', '<SID>PatchSearchExpr(0)', '<expr>')
+      call s:Map('nxo', '#', '<SID>PatchSearchExpr(1)', '<expr>')
+    endif
+    call s:Map('n', 'S',    ':<C-U>echoerr "Use gO"<CR>', '<silent><unique>')
+    call s:Map('n', 'dq', ":<C-U>call fugitive#DiffClose()<CR>", '<silent>')
+    call s:Map('n', '-', ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>NavigateUp(v:count1))<Bar> if getline(1) =~# '^tree \x\{40,\}$' && empty(getline(2))<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR>", '<silent>')
+    call s:Map('n', 'P',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit().'^'.v:count1.<SID>Relative(':'))<CR>", '<silent>')
+    call s:Map('n', '~',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit().'~'.v:count1.<SID>Relative(':'))<CR>", '<silent>')
+    call s:Map('n', 'C',     ":<C-U>exe 'Gedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
+    call s:Map('n', 'cp',    ":<C-U>echoerr 'Use gC'<CR>", '<silent><unique>')
+    call s:Map('n', 'gC',    ":<C-U>exe 'Gpedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
+    call s:Map('n', 'gc',    ":<C-U>exe 'Gpedit ' . <SID>fnameescape(<SID>ContainingCommit())<CR>", '<silent>')
+    call s:Map('n', 'gi',    ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>')
+    call s:Map('x', 'gi',    ":<C-U>exe 'Gsplit' (v:count ? '.gitignore' : '.git/info/exclude')<CR>", '<silent>')
+
+    call s:Map('n', 'c<Space>', ':Git commit<Space>')
+    call s:Map('n', 'c<CR>', ':Git commit<CR>')
+    call s:Map('n', 'cv<Space>', ':tab Git commit -v<Space>')
+    call s:Map('n', 'cv<CR>', ':tab Git commit -v<CR>')
+    call s:Map('n', 'ca', ':<C-U>Git commit --amend<CR>', '<silent>')
+    call s:Map('n', 'cc', ':<C-U>Git commit<CR>', '<silent>')
+    call s:Map('n', 'ce', ':<C-U>Git commit --amend --no-edit<CR>', '<silent>')
+    call s:Map('n', 'cw', ':<C-U>Git commit --amend --only<CR>', '<silent>')
+    call s:Map('n', 'cva', ':<C-U>tab Git commit -v --amend<CR>', '<silent>')
+    call s:Map('n', 'cvc', ':<C-U>tab Git commit -v<CR>', '<silent>')
+    call s:Map('n', 'cRa', ':<C-U>Git commit --reset-author --amend<CR>', '<silent>')
+    call s:Map('n', 'cRe', ':<C-U>Git commit --reset-author --amend --no-edit<CR>', '<silent>')
+    call s:Map('n', 'cRw', ':<C-U>Git commit --reset-author --amend --only<CR>', '<silent>')
+    call s:Map('n', 'cf', ':<C-U>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>')
+    call s:Map('n', 'cF', ':<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --fixup=<C-R>=<SID>SquashArgument()<CR>')
+    call s:Map('n', 'cs', ':<C-U>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>')
+    call s:Map('n', 'cS', ':<C-U><Bar>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><Home>Git commit --no-edit --squash=<C-R>=<SID>SquashArgument()<CR>')
+    call s:Map('n', 'cA', ':<C-U>Git commit --edit --squash=<C-R>=<SID>SquashArgument()<CR>')
+    call s:Map('n', 'c?', ':<C-U>help fugitive_c<CR>', '<silent>')
+
+    call s:Map('n', 'cr<Space>', ':Git revert<Space>')
+    call s:Map('n', 'cr<CR>', ':Git revert<CR>')
+    call s:Map('n', 'crc', ':<C-U>Git revert <C-R>=<SID>SquashArgument()<CR><CR>', '<silent>')
+    call s:Map('n', 'crn', ':<C-U>Git revert --no-commit <C-R>=<SID>SquashArgument()<CR><CR>', '<silent>')
+    call s:Map('n', 'cr?', ':<C-U>help fugitive_cr<CR>', '<silent>')
+
+    call s:Map('n', 'cm<Space>', ':Git merge<Space>')
+    call s:Map('n', 'cm<CR>', ':Git merge<CR>')
+    call s:Map('n', 'cmt', ':Git mergetool')
+    call s:Map('n', 'cm?', ':<C-U>help fugitive_cm<CR>', '<silent>')
+
+    call s:Map('n', 'cz<Space>', ':Git stash<Space>')
+    call s:Map('n', 'cz<CR>', ':Git stash<CR>')
+    call s:Map('n', 'cza', ':<C-U>Git stash apply --quiet --index stash@{<C-R>=v:count<CR>}<CR>')
+    call s:Map('n', 'czA', ':<C-U>Git stash apply --quiet stash@{<C-R>=v:count<CR>}<CR>')
+    call s:Map('n', 'czp', ':<C-U>Git stash pop --quiet --index stash@{<C-R>=v:count<CR>}<CR>')
+    call s:Map('n', 'czP', ':<C-U>Git stash pop --quiet stash@{<C-R>=v:count<CR>}<CR>')
+    call s:Map('n', 'czs', ':<C-U>Git stash push --staged<CR>')
+    call s:Map('n', 'czv', ':<C-U>exe "Gedit" fugitive#RevParse("stash@{" . v:count . "}")<CR>', '<silent>')
+    call s:Map('n', 'czw', ':<C-U>Git stash push --keep-index<C-R>=v:count > 1 ? " --all" : v:count ? " --include-untracked" : ""<CR><CR>')
+    call s:Map('n', 'czz', ':<C-U>Git stash push <C-R>=v:count > 1 ? " --all" : v:count ? " --include-untracked" : ""<CR><CR>')
+    call s:Map('n', 'cz?', ':<C-U>help fugitive_cz<CR>', '<silent>')
+
+    call s:Map('n', 'co<Space>', ':Git checkout<Space>')
+    call s:Map('n', 'co<CR>', ':Git checkout<CR>')
+    call s:Map('n', 'coo', ':<C-U>Git checkout <C-R>=substitute(<SID>SquashArgument(),"^$",get(<SID>TempState(),"filetype","") ==# "git" ? expand("<cfile>") : "","")<CR> --<CR>')
+    call s:Map('n', 'co?', ':<C-U>help fugitive_co<CR>', '<silent>')
+
+    call s:Map('n', 'cb<Space>', ':Git branch<Space>')
+    call s:Map('n', 'cb<CR>', ':Git branch<CR>')
+    call s:Map('n', 'cb?', ':<C-U>help fugitive_cb<CR>', '<silent>')
+
+    call s:Map('n', 'r<Space>', ':Git rebase<Space>')
+    call s:Map('n', 'r<CR>', ':Git rebase<CR>')
+    call s:Map('n', 'ri', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><CR>', '<silent>')
+    call s:Map('n', 'rf', ':<C-U>Git -c sequence.editor=true rebase --interactive --autosquash<C-R>=<SID>RebaseArgument()<CR><CR>', '<silent>')
+    call s:Map('n', 'ru', ':<C-U>Git rebase --interactive @{upstream}<CR>', '<silent>')
+    call s:Map('n', 'rp', ':<C-U>Git rebase --interactive @{push}<CR>', '<silent>')
+    call s:Map('n', 'rw', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/reword/e<CR>', '<silent>')
+    call s:Map('n', 'rm', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/edit/e<CR>', '<silent>')
+    call s:Map('n', 'rd', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/drop/e<CR>', '<silent>')
+    call s:Map('n', 'rk', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/drop/e<CR>', '<silent>')
+    call s:Map('n', 'rx', ':<C-U>Git rebase --interactive<C-R>=<SID>RebaseArgument()<CR><Bar>s/^pick/drop/e<CR>', '<silent>')
+    call s:Map('n', 'rr', ':<C-U>Git rebase --continue<CR>', '<silent>')
+    call s:Map('n', 'rs', ':<C-U>Git rebase --skip<CR>', '<silent>')
+    call s:Map('n', 're', ':<C-U>Git rebase --edit-todo<CR>', '<silent>')
+    call s:Map('n', 'ra', ':<C-U>Git rebase --abort<CR>', '<silent>')
+    call s:Map('n', 'r?', ':<C-U>help fugitive_r<CR>', '<silent>')
+
+    call s:Map('n', '.',     ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
+    call s:Map('x', '.',     ":<C-U> <C-R>=<SID>fnameescape(fugitive#Real(@%))<CR><Home>")
+    call s:Map('n', 'g?',    ":<C-U>help fugitive-map<CR>", '<silent>')
+    call s:Map('n', '<F1>',  ":<C-U>help fugitive-map<CR>", '<silent>')
+  endif
+
+  let old_browsex = maparg('<Plug>NetrwBrowseX', 'n')
+  let new_browsex = substitute(old_browsex, '\Cnetrw#CheckIfRemote(\%(netrw#GX()\)\=)', '0', 'g')
+  let new_browsex = substitute(new_browsex, 'netrw#GX()\|expand((exists("g:netrw_gx")? g:netrw_gx : ''<cfile>''))', 'fugitive#GX()', 'g')
+  if new_browsex !=# old_browsex
+    exe 'nnoremap <silent> <buffer> <Plug>NetrwBrowseX' new_browsex
+  endif
+endfunction
+
+function! fugitive#GX() abort
+  try
+    let results = &filetype ==# 'fugitive' ? s:CfilePorcelain() : &filetype ==# 'git' ? s:cfile() : []
+    if len(results) && len(results[0])
+      return FugitiveReal(s:Generate(results[0]))
+    endif
+  catch /^fugitive:/
+  endtry
+  return expand(get(g:, 'netrw_gx', expand('<cfile>')))
+endfunction
+
+function! s:CfilePorcelain(...) abort
+  let tree = s:Tree()
+  if empty(tree)
+    return ['']
+  endif
+  let lead = s:cpath(tree, getcwd()) ? './' : tree . '/'
+  let info = s:StageInfo()
+  let line = getline('.')
+  if len(info.sigil) && len(info.section) && len(info.paths)
+    if info.section ==# 'Unstaged' && info.sigil !=# '-'
+      return [lead . info.relative[0], info.offset, 'normal!zv']
+    elseif info.section ==# 'Staged' && info.sigil ==# '-'
+      return ['@:' . info.relative[0], info.offset, 'normal!zv']
+    else
+      return [':0:' . info.relative[0], info.offset, 'normal!zv']
+    endif
+  elseif len(info.paths)
+    return [lead . info.relative[0]]
+  elseif len(info.commit)
+    return [info.commit]
+  elseif line =~# '^' . s:ref_header . ': \|^Head: '
+    return [matchstr(line, ' \zs.*')]
+  else
+    return ['']
+  endif
+endfunction
+
+function! fugitive#PorcelainCfile() abort
+  let file = fugitive#Find(s:CfilePorcelain()[0])
+  return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
+endfunction
+
+function! s:StatusCfile(...) abort
+  let tree = s:Tree()
+  if empty(tree)
+    return []
+  endif
+  let lead = s:cpath(tree, getcwd()) ? './' : tree . '/'
+  if getline('.') =~# '^.\=\trenamed:.* -> '
+    return [lead . matchstr(getline('.'),' -> \zs.*')]
+  elseif getline('.') =~# '^.\=\t\(\k\| \)\+\p\?: *.'
+    return [lead . matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')]
+  elseif getline('.') =~# '^.\=\t.'
+    return [lead . matchstr(getline('.'),'\t\zs.*')]
+  elseif getline('.') =~# ': needs merge$'
+    return [lead . matchstr(getline('.'),'.*\ze: needs merge$')]
+  elseif getline('.') =~# '^\%(. \)\=Not currently on any branch.$'
+    return ['HEAD']
+  elseif getline('.') =~# '^\%(. \)\=On branch '
+    return ['refs/heads/'.getline('.')[12:]]
+  elseif getline('.') =~# "^\\%(. \\)\=Your branch .*'"
+    return [matchstr(getline('.'),"'\\zs\\S\\+\\ze'")]
+  else
+    return []
+  endif
+endfunction
+
+function! fugitive#MessageCfile() abort
+  let file = fugitive#Find(get(s:StatusCfile(), 0, ''))
+  return empty(file) ? fugitive#Cfile() : s:fnameescape(file)
+endfunction
+
+function! s:BranchCfile(result) abort
+  return matchstr(getline('.'), '^. \zs\S\+')
+endfunction
+
+function! s:cfile() abort
+  let temp_state = s:TempState()
+  let name = substitute(get(get(temp_state, 'args', []), 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
+  if exists('*s:' . name . 'Cfile')
+    let cfile = s:{name}Cfile(temp_state)
+    if !empty(cfile)
+      return type(cfile) == type('') ? [cfile] : cfile
+    endif
+  endif
+  if empty(FugitiveGitDir())
+    return []
+  endif
+  try
+    let myhash = s:DirRev(@%)[1]
+    if len(myhash)
+      try
+        let myhash = fugitive#RevParse(myhash)
+      catch /^fugitive:/
+        let myhash = ''
+      endtry
+    endif
+    if empty(myhash) && get(temp_state, 'filetype', '') ==# 'git'
+      let lnum = line('.')
+      while lnum > 0
+        if getline(lnum) =~# '^\%(commit\|tag\) \w'
+          let myhash = matchstr(getline(lnum),'^\w\+ \zs\S\+')
+          break
+        endif
+        let lnum -= 1
+      endwhile
+    endif
+
+    let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
+
+    let treebase = substitute(s:DirCommitFile(@%)[1], '^\d$', ':&', '') . ':' .
+          \ s:Relative('') . (s:Relative('') =~# '^$\|/$' ? '' : '/')
+
+    if getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40,\}\t'
+      return [treebase . s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')]
+    elseif showtree
+      return [treebase . s:sub(getline('.'),'/$','')]
+
+    else
+
+      let dcmds = []
+
+      " Index
+      if getline('.') =~# '^\d\{6\} \x\{40,\} \d\t'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':')
+        return [file]
+      endif
+
+      if getline('.') =~# '^ref: '
+        let ref = strpart(getline('.'),5)
+
+      elseif getline('.') =~# '^\%([|/\\_ ]*\*[|/\\_ ]*\)\=commit \x\{40,\}\>'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        return [ref]
+
+      elseif getline('.') =~# '^parent \x\{40,\}\>'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        let line = line('.')
+        let parent = 0
+        while getline(line) =~# '^parent '
+          let parent += 1
+          let line -= 1
+        endwhile
+        return [ref]
+
+      elseif getline('.') =~# '^tree \x\{40,\}$'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        if len(myhash) && fugitive#RevParse(myhash.':') ==# ref
+          let ref = myhash.':'
+        endif
+        return [ref]
+
+      elseif getline('.') =~# '^object \x\{40,\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        let type = matchstr(getline(line('.')+1),'type \zs.*')
+
+      elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$'
+        let ref = s:DirRev(@%)[1]
+
+      elseif getline('.') =~# '^\l\{3,8\} \x\{40,\}\>'
+        let ref = matchstr(getline('.'),'\x\{40,\}')
+        echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*')
+
+      elseif getline('.') =~# '^[A-Z]\d*\t\S' && len(myhash)
+        let files = split(getline('.'), "\t")[1:-1]
+        let ref = 'b/' . files[-1]
+        if getline('.') =~# '^D'
+          let ref = 'a/' . files[0]
+        elseif getline('.') !~# '^A'
+          let dcmds = ['', 'Gdiffsplit! >' . myhash . '^:' . fnameescape(files[0])]
+        endif
+
+      elseif getline('.') =~# '^[+-]\{3\} [abciow12]\=/'
+        let ref = getline('.')[4:]
+
+      elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+\%(,\d\+\)\= +\d\+','bnW')
+        let type = getline('.')[0]
+        let lnum = line('.') - 1
+        let offset = 0
+        while getline(lnum) !~# '^@@ -\d\+\%(,\d\+\)\= +\d\+'
+          if getline(lnum) =~# '^[ '.type.']'
+            let offset += 1
+          endif
+          let lnum -= 1
+        endwhile
+        let offset += matchstr(getline(lnum), type.'\zs\d\+')
+        let ref = getline(search('^'.type.'\{3\} [abciow12]/','bnW'))[4:-1]
+        let dcmds = [offset, 'normal!zv']
+
+      elseif getline('.') =~# '^rename from '
+        let ref = 'a/'.getline('.')[12:]
+      elseif getline('.') =~# '^rename to '
+        let ref = 'b/'.getline('.')[10:]
+
+      elseif getline('.') =~# '^@@ -\d\+\%(,\d\+\)\= +\d\+'
+        let diff = getline(search('^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)', 'bcnW'))
+        let offset = matchstr(getline('.'), '+\zs\d\+')
+
+        let dref = matchstr(diff, '\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(diff, '\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiffsplit! +'.offset
+
+      elseif getline('.') =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)'
+        let dref = matchstr(getline('.'),'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(getline('.'),'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiffsplit!'
+
+      elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)'
+        let line = getline(line('.')-1)
+        let dref = matchstr(line,'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(line,'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiffsplit!'
+
+      elseif line('$') == 1 && getline('.') =~ '^\x\{40,\}$'
+        let ref = getline('.')
+
+      elseif expand('<cword>') =~# '^\x\{7,\}\>'
+        return [expand('<cword>')]
+
+      else
+        let ref = ''
+      endif
+
+      let prefixes = {
+            \ '1': '',
+            \ '2': '',
+            \ 'b': ':0:',
+            \ 'i': ':0:',
+            \ 'o': '',
+            \ 'w': ''}
+
+      if len(myhash)
+        let prefixes.a = myhash.'^:'
+        let prefixes.b = myhash.':'
+      endif
+      let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "@:")', '')
+      if exists('dref')
+        let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "@:")', '')
+      endif
+
+      if ref ==# '/dev/null'
+        " Empty blob
+        let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
+      endif
+
+      if exists('dref')
+        return [ref, dcmd . ' >' . s:fnameescape(dref)] + dcmds
+      elseif ref != ""
+        return [ref] + dcmds
+      endif
+
+    endif
+    return []
+  endtry
+endfunction
+
+function! s:GF(mode) abort
+  try
+    let results = &filetype ==# 'fugitive' ? s:CfilePorcelain() : &filetype ==# 'gitcommit' ? s:StatusCfile() : s:cfile()
+  catch /^fugitive:/
+    return 'echoerr ' . string(v:exception)
+  endtry
+  if len(results) > 1
+    let cmd = 'G' . a:mode .
+          \ (empty(results[1]) ? '' : ' +' . s:PlusEscape(results[1])) . ' ' .
+          \ fnameescape(results[0])
+    let tail = join(map(results[2:-1], '"|" . v:val'), '')
+    if a:mode ==# 'pedit' && len(tail)
+      return cmd . '|wincmd P|exe ' . string(tail[1:-1]) . '|wincmd p'
+    else
+      return cmd . tail
+    endif
+  elseif len(results) && len(results[0])
+    return 'G' . a:mode . ' ' . s:fnameescape(results[0])
+  else
+    return ''
+  endif
+endfunction
+
+function! fugitive#Cfile() abort
+  let pre = ''
+  let results = s:cfile()
+  if empty(results)
+    if !empty(s:TempState())
+      let cfile = s:TempDotMap()
+      if !empty(cfile)
+        return fnameescape(s:Generate(cfile))
+      endif
+    endif
+    let cfile = expand('<cfile>')
+    if &includeexpr =~# '\<v:fname\>'
+      sandbox let cfile = eval(substitute(&includeexpr, '\C\<v:fname\>', '\=string(cfile)', 'g'))
+    endif
+    return cfile
+  elseif len(results) > 1
+    let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' '
+  endif
+  return pre . fnameescape(s:Generate(results[0]))
+endfunction
+
+" Section: Statusline
+
+function! fugitive#Statusline(...) abort
+  let dir = s:Dir(bufnr(''))
+  if empty(dir)
+    return ''
+  endif
+  let status = ''
+  let commit = s:DirCommitFile(@%)[1]
+  if len(commit)
+    let status .= ':' . commit[0:6]
+  endif
+  let status .= '('.FugitiveHead(7, dir).')'
+  return '[Git'.status.']'
+endfunction
+
+function! fugitive#statusline(...) abort
+  return fugitive#Statusline()
+endfunction
+
+" Section: Folding
+
+function! fugitive#Foldtext() abort
+  if &foldmethod !=# 'syntax'
+    return foldtext()
+  endif
+
+  let line_foldstart = getline(v:foldstart)
+  if line_foldstart =~# '^diff '
+    let [add, remove] = [-1, -1]
+    let filename = ''
+    for lnum in range(v:foldstart, v:foldend)
+      let line = getline(lnum)
+      if filename ==# '' && line =~# '^[+-]\{3\} [abciow12]/'
+        let filename = line[6:-1]
+      endif
+      if line =~# '^+'
+        let add += 1
+      elseif line =~# '^-'
+        let remove += 1
+      elseif line =~# '^Binary '
+        let binary = 1
+      endif
+    endfor
+    if filename ==# ''
+      let filename = matchstr(line_foldstart, '^diff .\{-\} [abciow12]/\zs.*\ze [abciow12]/')
+    endif
+    if filename ==# ''
+      let filename = line_foldstart[5:-1]
+    endif
+    if exists('binary')
+      return 'Binary: '.filename
+    else
+      return '+-' . v:folddashes . ' ' . (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename
+    endif
+  elseif line_foldstart =~# '^@@\+ .* @@'
+    return '+-' . v:folddashes . ' ' . line_foldstart
+  elseif &filetype ==# 'gitcommit' && line_foldstart =~# '^# .*:$'
+    let lines = getline(v:foldstart, v:foldend)
+    call filter(lines, 'v:val =~# "^#\t"')
+    cal map(lines, "s:sub(v:val, '^#\t%(modified: +|renamed: +)=', '')")
+    cal map(lines, "s:sub(v:val, '^([[:alpha:] ]+): +(.*)', '\\2 (\\1)')")
+    return line_foldstart.' '.join(lines, ', ')
+  endif
+  return foldtext()
+endfunction
+
+function! fugitive#foldtext() abort
+  return fugitive#Foldtext()
+endfunction
+
+" Section: Initialization
+
+function! fugitive#Init() abort
+  throw 'Third party code is using fugitive#Init() which has been removed. Contact the author if you have a reason to still use it'
+endfunction
+
+function! fugitive#is_git_dir(path) abort
+  throw 'Third party code is using fugitive#is_git_dir() which has been removed. Change it to FugitiveIsGitDir()'
+endfunction
+
+function! fugitive#extract_git_dir(path) abort
+  throw 'Third party code is using fugitive#extract_git_dir() which has been removed. Change it to FugitiveExtractGitDir()'
+endfunction
+
+function! fugitive#detect(path) abort
+  throw 'Third party code is using fugitive#detect() which has been removed. Contact the author if you have a reason to still use it'
+endfunction
+
+" Section: End
diff --git a/pack/ui/start/fugitive/doc/fugitive.txt b/pack/ui/start/fugitive/doc/fugitive.txt
new file mode 100644
index 0000000..41fd829
--- /dev/null
+++ b/pack/ui/start/fugitive/doc/fugitive.txt
@@ -0,0 +1,733 @@
+*fugitive.txt*  A Git wrapper so awesome, it should be illegal
+
+Author:  Tim Pope <http://tpo.pe/>
+License: Same terms as Vim itself (see |license|)
+
+This plugin is only available if 'compatible' is not set.
+
+INTRODUCTION                                    *fugitive*
+
+Whenever you edit a file from a Git repository, a set of commands is defined
+that serve as a gateway to Git.
+
+COMMANDS                                        *fugitive-commands*
+
+These commands are local to the buffers in which they work (generally, buffers
+that are part of Git repositories).
+
+                                                *fugitive-:G*
+:G [args]               Same as :Git, but two characters shorter.
+
+                                                *:Git*
+:Git {args}             Run an arbitrary git command and display any output.
+                        On UNIX this uses a pty and on other platforms it uses
+                        a pipe, which will cause some behavior differences
+                        such as the absence of progress bars.  Any file the
+                        command edits (for example, a commit message) will be
+                        loaded into a split window.  Closing that window will
+                        resume running the command.  A few Git subcommands
+                        have different behavior; these are documented below.
+
+                                                *:Git!*
+:Git! {args}            Run an arbitrary git command in the background and
+                        stream the output to the preview window.  Requires a
+                        Vim with |setbufline()|.  Press CTRL-D during an
+                        interactive :Git invocation to switch to this mode
+                        retroactively.
+
+                                                *:Git_--paginate* *:Git_-p*
+:Git --paginate {args}  Run an arbitrary git command, capture output to a temp
+:Git -p {args}          file, and |:split| that temp file.  Pass ++curwin as
+                        the first argument to |:edit| the temp file instead.
+                        A temp file is always used for commands like diff and
+                        log that typically uses a pager, and for any command
+                        that has the pager.<cmd> Git configuration option set.
+
+:{range}Git! --paginate {args}
+:{range}Git! -p {args}  Run an arbitrary git command, and insert the output
+                        after {range} in the current buffer.
+
+                                                *fugitive-summary*
+:Git                    With no arguments, bring up a summary window vaguely
+                        akin to git-status.  Press g? or see |fugitive-maps|
+                        for usage.
+
+                                                *:Git_blame*
+:Git blame [flags]      Run git-blame [flags] on the current file and open the
+                        results in a scroll-bound vertical split.  The
+                        following maps, which work on the cursor line commit
+                        where sensible, are provided:
+
+                        g?    show this help
+                        A     resize to end of author column
+                        C     resize to end of commit column
+                        D     resize to end of date/time column
+                        gq    close blame, then |:Gedit| to return to work
+                              tree version
+                        <CR>  close blame, and jump to patch that added line
+                              (or directly to blob for boundary commit)
+                        o     jump to patch or blob in horizontal split
+                        O     jump to patch or blob in new tab
+                        p     jump to patch or blob in preview window
+                        -     reblame at commit
+                        ~     reblame at commit~[count]
+                        P     reblame at commit^[count]
+
+                                                *g:fugitive_dynamic_colors*
+                        In the GUI or a 256 color terminal, commit hashes will
+                        highlighted in different colors. To disable this:
+>
+                        let g:fugitive_dynamic_colors = 0
+<
+:[range]Git blame [...] If a range is given, just that part of the file will
+:Git blame [...] {file} be blamed, and a horizontal split without
+                        scrollbinding is used.  You can also give an arbitrary
+                        filename.
+
+                                                *:Git_difftool*
+:Git[!] difftool [args] Invoke `git diff [args]` and load the changes into the
+                        quickfix list.  Each changed hunk gets a separate
+                        quickfix entry unless you pass an option like
+                        --name-only or --name-status.  Jumps to the first
+                        change unless [!] is given.
+
+:Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a
+                        new tab, and invoke |:Gdiffsplit!| against the
+                        appropriate commit.
+
+                                                *:Git_mergetool*
+:Git mergetool [args]   Like |:Git_difftool|, but target merge conflicts.
+
+Wrappers for Vim built-ins ~
+
+These all directly map onto a built-in Vim command, and generally have names
+that prepend "G" to the command they are wrapping.  For example, :Ggrep is G
+plus |:grep|.
+
+                                                *:Ggrep* *:Git_grep*
+:Ggrep[!] [args]        An approximation of |:grep|[!] with git-grep as
+:Git[!] grep -O [args]  'grepprg'.
+
+:Ggrep[!] --quiet [args]
+:Ggrep[!] -q [args]     Like |:Ggrep|, but instead of displaying output, open
+                        the quickfix list.
+
+                                                *:Glgrep*
+:Glgrep[!] [args]       :Ggrep but for |:lgrep|.
+:0Git[!] grep -O [args]
+
+                                                 *:Gclog*
+:Gclog[!] [args]        Use git-log [args] to load the commit history into the
+                        |quickfix| list.  Jumps to the first commit unless [!]
+                        is given.  This command wraps |:cfile|.
+
+                        The quickfix list can be awkward for many use cases
+                        and exhibits extremely poor performance with larger
+                        data sets.  Consider using |:Git| log --oneline
+                        instead.
+
+:{range}Gclog[!] [args] Use git-log -L to load previous revisions of the given
+                        range of the current file into the |quickfix| list.
+                        The cursor is positioned on the first line of the
+                        first diff hunk for each commit.  Use :0Gclog to
+                        target the entire file.
+
+                                                *:Gllog*
+:Gllog [args]           Like |:Gclog|, but use the location list instead of the
+                        |quickfix| list.
+
+                                                *:Gcd*
+:Gcd [directory]        |:cd| relative to the repository.
+
+                                                *:Glcd*
+:Glcd [directory]       |:lcd| relative to the repository.
+
+                                                *:Gedit* *fugitive-:Ge*
+:Gedit [object]         |:edit| a |fugitive-object|.
+
+                                                *:Gsplit*
+:Gsplit [object]        |:split| a |fugitive-object|.
+
+                                                *:Gvsplit*
+:Gvsplit [object]       |:vsplit| a |fugitive-object|.
+
+                                                *:Gtabedit*
+:Gtabedit [object]      |:tabedit| a |fugitive-object|.
+
+                                                *:Gpedit*
+:Gpedit [object]        |:pedit| a |fugitive-object|.
+
+                                                *:Gread* *fugitive-:Gr*
+:Gread [object]         Empty the buffer and |:read| a |fugitive-object|.
+                        When the argument is omitted, this is similar to
+                        git-checkout on a work tree file or git-add on a stage
+                        file, but without writing anything to disk.
+
+:{range}Gread [object]  |:read| in a |fugitive-object| after {range}.
+
+                                                *:Gread!* *fugitive-:Gr!*
+:Gread! [args]          Empty the buffer and |:read| the output of a Git
+                        command.  For example, :Gread! show HEAD:%.
+
+:{range}Gread! [args]   |:read| the output of a Git command after {range}.
+
+                                                *:Gwrite* *fugitive-:Gw*
+:Gwrite                 Write to the current file's path and stage the results.
+                        When run in a work tree file, it is effectively git
+                        add.  Elsewhere, it is effectively git-checkout.  A
+                        great deal of effort is expended to behave sensibly
+                        when the work tree or index version of the file is
+                        open in another buffer.
+
+:Gwrite {path}          You can give |:Gwrite| an explicit path of where in
+                        the work tree to write.  You can also give a path like
+                        :0:foo.txt or :0:% to write to just that stage in
+                        the index.
+
+                                                *:Gwq*
+:Gwq [path]             Like |:Gwrite| followed by |:quit| if the write
+                        succeeded.
+
+:Gwq! [path]            Like |:Gwrite|! followed by |:quit|! if the write
+                        succeeded.
+
+                                                *:Gdiffsplit*
+:Gdiffsplit [object]    Perform a |vimdiff| against the given file, or if a
+                        commit is given, the current file in that commit.
+                        With no argument, the version in the index or work
+                        tree is used, and the work tree version is always
+                        placed to the right or bottom, depending on available
+                        width.  Use Vim's |do| and |dp| to stage and unstage
+                        changes.
+
+                                                *:Gdiffsplit!*
+:Gdiffsplit!            Diff against any and all direct ancestors, retaining
+                        focus on the current window.  During a merge conflict,
+                        this is a three-way diff against the "ours" and
+                        "theirs" ancestors.  Additional d2o and d3o maps are
+                        provided to obtain the hunk from the "ours" or
+                        "theirs" ancestor, respectively.
+
+:Gdiffsplit! {object}   Like |:Gdiffsplit|, but retain focus on the current
+                        window.
+
+                                                *:Gvdiffsplit*
+:Gvdiffsplit [object]   Like |:Gdiffsplit|, but always split vertically.
+
+                                                *:Ghdiffsplit*
+:Gdiffsplit ++novertical [object]
+:Ghdiffsplit [object]   Like |:Gdiffsplit|, but with "vertical" removed from
+                        'diffopt'.  The split will still be vertical if
+                        combined with |:vertical|.
+
+Other commands ~
+
+These do not directly correspond to any built-in Vim command, and have a
+capital letter after the "G" to convey this. For example, the file move
+operation has nothing to do with the |:move| built-in, so it is named :GMove,
+not :Gmove.
+
+                                                *:GMove*
+:GMove {destination}    Wrapper around git-mv that renames the buffer
+                        afterward.  Add a ! to pass -f.
+
+                                                *:GRename*
+:GRename {destination}  Like |:GMove| but operates relative to the parent
+                        directory of the current file.
+
+                                                *:GDelete*
+:GDelete                Wrapper around git-rm that deletes the buffer
+                        afterward.  When invoked in an index file, --cached is
+                        passed.  Add a ! to pass -f and forcefully discard the
+                        buffer.
+
+                                                *:GRemove* *:GUnlink*
+:GRemove                Like |:GDelete|, but keep the (now empty) buffer around.
+:GUnlink
+
+                                                *:GBrowse*
+:GBrowse                Open the current file, blob, tree, commit, or tag
+                        in your browser at the upstream hosting provider.
+                        Upstream providers can be added by installing an
+                        appropriate Vim plugin.  For example, GitHub can be
+                        supported by installing rhubarb.vim, available at
+                        <https://github.com/tpope/vim-rhubarb>.
+
+:GBrowse {object}       Like :GBrowse, but for a given |fugitive-object|.
+
+:{range}GBrowse [args]  Appends an anchor to the URL that emphasizes the
+                        selected lines. This also forces the URL to include a
+                        commit rather than a branch name so it remains valid
+                        if the file changes.  You can give a range of "0" to
+                        force this behavior without including an anchor.
+
+:GBrowse [...]@{remote} Force using the given remote rather than the remote
+                        for the current branch.  The remote is used to
+                        determine which upstream repository to link to.
+
+:GBrowse {url}          Open an arbitrary URL in your browser.
+
+:[range]GBrowse! [args] Like :GBrowse, but put the URL on the clipboard rather
+                        than opening it.
+
+MAPS                                            *fugitive-maps*
+
+These maps are available in both the |fugitive-summary| buffer and Fugitive
+object buffers, although not all maps make sense in all buffers.  Mappings
+that operate on the file or hunk under the cursor are generally available in
+visual mode to operate on multiple files or partial hunks.
+
+                                                *fugitive-staging-maps*
+Staging/unstaging maps ~
+
+                                                *fugitive_s*
+s                       Stage (add) the file or hunk under the cursor.
+
+                                                *fugitive_u*
+u                       Unstage (reset) the file or hunk under the cursor.
+
+                                                *fugitive_-*
+-                       Stage or unstage the file or hunk under the cursor.
+
+                                                *fugitive_U*
+U                       Unstage everything.
+
+                                                *fugitive_X*
+X                       Discard the change under the cursor.  This uses
+                        `checkout` or `clean` under the hood.  A command is
+                        echoed that shows how to undo the change.  Consult
+                        `:messages` to see it again.  During a merge conflict,
+                        use 2X to call `checkout --ours` or 3X to call
+                        `checkout --theirs` .
+
+                                                *fugitive_=*
+=                       Toggle an inline diff of the file under the cursor.
+
+                                                *fugitive_>*
+>                       Insert an inline diff of the file under the cursor.
+
+                                                *fugitive_<*
+<                       Remove the inline diff of the file under the cursor.
+
+                                                *fugitive_gI*
+gI                      Open .git/info/exclude in a split and add the file
+                        under the cursor.  Use a count to open .gitignore.
+
+                                                *fugitive_I*
+I                       Invoke |:Git| add --patch or reset --patch on the file
+P                       under the cursor. On untracked files, this instead
+                        calls |:Git| add --intent-to-add.
+
+                                                *fugitive_d*
+Diff maps ~
+                                                *fugitive_dp*
+dp                      Invoke |:Git| diff on the file under the cursor.
+                        Deprecated in favor of inline diffs.
+
+                                                *fugitive_dd*
+dd                      Perform a |:Gdiffsplit| on the file under the cursor.
+
+                                                *fugitive_dv*
+dv                      Perform a |:Gvdiffsplit| on the file under the cursor.
+
+                                                *fugitive_ds* *fugitive_dh*
+ds                      Perform a |:Ghdiffsplit| on the file under the cursor.
+dh
+
+                                                *fugitive_dq*
+dq                      Close all but one diff buffer, and |:diffoff|! the
+                        last one.
+
+                                                *fugitive_d?*
+d?                      Show this help.
+
+                                                *fugitive-navigation-maps*
+Navigation maps ~
+
+                                                *fugitive_<CR>*
+<CR>                    Open the file or |fugitive-object| under the cursor.
+                        In a blob, this and similar maps jump to the patch
+                        from the diff where this was added, or where it was
+                        removed if a count was given.  If the line is still in
+                        the work tree version, passing a count takes you to
+                        it.
+
+                                                *fugitive_o*
+o                       Open the file or |fugitive-object| under the cursor in
+                        a new split.
+
+                                                *fugitive_gO*
+gO                      Open the file or |fugitive-object| under the cursor in
+                        a new vertical split.
+
+                                                *fugitive_O*
+O                       Open the file or |fugitive-object| under the cursor in
+                        a new tab.
+
+                                                *fugitive_p*
+p                       Open the file or |fugitive-object| under the cursor in
+                        a preview window.  In the status buffer, 1p is
+                        required to bypass the legacy usage instructions.
+
+                                                *fugitive_~*
+~                       Open the current file in the [count]th first ancestor.
+
+                                                *fugitive_P*
+P                       Open the current file in the [count]th parent.
+
+                                                *fugitive_C*
+C                       Open the commit containing the current file.
+
+                                                *fugitive_CTRL-P* *fugitive_(*
+(                       Jump to the previous file, hunk, or revision.
+
+                                                *fugitive_CTRL-N* *fugitive_)*
+)                       Jump to the next file, hunk, or revision.
+
+                                                *fugitive_[c*
+[c                      Jump to previous hunk, expanding inline diffs
+                        automatically.  (This shadows the Vim built-in |[c|
+                        that provides a similar operation in |diff| mode.)
+
+                                                *fugitive_]c*
+]c                      Jump to next hunk, expanding inline diffs
+                        automatically.  (This shadows the Vim built-in |]c|
+                        that provides a similar operation in |diff| mode.)
+
+                                                *fugitive_[/* *fugitive_[m*
+[/                      Jump to previous file, collapsing inline diffs
+[m                      automatically.  (Mnemonic: "/" appears in filenames,
+                        "m" appears in "filenames".)
+
+                                                *fugitive_]/* *fugitive_]m*
+]/                      Jump to next file, collapsing inline diffs
+]m                      automatically.  (Mnemonic: "/" appears in filenames,
+                        "m" appears in "filenames".)
+
+                                                *fugitive_i*
+i                       Jump to the next file or hunk, expanding inline diffs
+                        automatically.
+
+                                                *fugitive_[[*
+[[                      Jump [count] sections backward.
+
+                                                *fugitive_]]*
+]]                      Jump [count] sections forward.
+
+                                                *fugitive_[]*
+[]                      Jump [count] section ends backward.
+
+                                                *fugitive_][*
+][                      Jump [count] section ends forward.
+
+                                                *fugitive_star*
+*                       On the first column of a + or - diff line, search for
+                        the corresponding - or + line.  Otherwise, defer to
+                        built-in |star|.
+
+                                                *fugitive_#*
+#                       Same as "*", but search backward.
+
+                                                *fugitive_gu*
+gu                      Jump to file [count] in the "Untracked" or "Unstaged"
+                        section.
+
+                                                *fugitive_gU*
+gU                      Jump to file [count] in the "Unstaged" section.
+
+                                                *fugitive_gs*
+gs                      Jump to file [count] in the "Staged" section.
+
+                                                *fugitive_gp*
+gp                      Jump to file [count] in the "Unpushed" section.
+
+                                                *fugitive_gP*
+gP                      Jump to file [count] in the "Unpulled" section.
+
+                                                *fugitive_gr*
+gr                      Jump to file [count] in the "Rebasing" section.
+
+                                                *fugitive_gi*
+gi                      Open .git/info/exclude in a split.  Use a count to
+                        open .gitignore.
+
+                                                *fugitive_c*
+Commit maps ~
+
+cc                      Create a commit.
+
+ca                      Amend the last commit and edit the message.
+
+ce                      Amend the last commit without editing the message.
+
+cw                      Reword the last commit.
+
+cvc                     Create a commit with -v.
+
+cva                     Amend the last commit with -v
+
+cf                      Create a `fixup!` commit for the commit under the
+                        cursor.
+
+cF                      Create a `fixup!` commit for the commit under the
+                        cursor and immediately rebase it.
+
+cs                      Create a `squash!` commit for the commit under the
+                        cursor.
+
+cS                      Create a `squash!` commit for the commit under the
+                        cursor and immediately rebase it.
+
+cA                      Create a `squash!` commit for the commit under the
+                        cursor and edit the message.
+
+c<Space>                Populate command line with ":Git commit ".
+
+                                                *fugitive_cr*
+crc                     Revert the commit under the cursor.
+
+crn                     Revert the commit under the cursor in the index and
+                        work tree, but do not actually commit the changes.
+
+cr<Space>               Populate command line with ":Git revert ".
+
+                                                *fugitive_cm*
+cm<Space>               Populate command line with ":Git merge ".
+
+c?                      Show this help.
+
+                                                *fugitive_cb*
+                                                *fugitive_co*
+Checkout/branch maps ~
+
+coo                     Check out the commit under the cursor.
+
+cb<Space>               Populate command line with ":Git branch ".
+
+co<Space>               Populate command line with ":Git checkout ".
+
+cb?                     Show this help.
+co?
+
+                                                *fugitive_cz*
+Stash maps ~
+
+czz                     Push stash.  Pass a [count] of 1 to add
+                        `--include-untracked` or 2 to add `--all`.
+
+czw                     Push stash of worktree.  Like `czz` with
+                        `--keep-index`.
+
+czA                     Apply topmost stash, or stash@{count}.
+
+cza                     Apply topmost stash, or stash@{count}, preserving the
+                        index.
+
+czP                     Pop topmost stash, or stash@{count}.
+
+czp                     Pop topmost stash, or stash@{count}, preserving the
+                        index.
+
+cz<Space>               Populate command line with ":Git stash ".
+
+cz?                     Show this help.
+
+                                                *fugitive_r*
+Rebase maps ~
+
+ri                      Perform an interactive rebase.  Uses ancestor of
+u                       commit under cursor as upstream if available.
+
+rf                      Perform an autosquash rebase without editing the todo
+                        list.  Uses ancestor of commit under cursor as
+                        upstream if available.
+
+ru                      Perform an interactive rebase against @{upstream}.
+
+rp                      Perform an interactive rebase against @{push}.
+
+rr                      Continue the current rebase.
+
+rs                      Skip the current commit and continue the current
+                        rebase.
+
+ra                      Abort the current rebase.
+
+re                      Edit the current rebase todo list.
+
+rw                      Perform an interactive rebase with the commit under
+                        the cursor set to `reword`.
+
+rm                      Perform an interactive rebase with the commit under
+                        the cursor set to `edit`.
+
+rd                      Perform an interactive rebase with the commit under
+                        the cursor set to `drop`.
+
+r<Space>                Populate command line with ":Git rebase ".
+
+r?                      Show this help.
+
+                                                *fugitive-misc-maps*
+Miscellaneous maps ~
+
+                                                *fugitive_gq* *fugitive_q*
+gq                      Close the status buffer.
+
+                                                *fugitive_.*
+.                       Start a |:| command line with the file under the
+                        cursor prepopulated.
+
+                                                *fugitive_g?*
+g?                      Show help for |fugitive-maps|.
+
+                                                *fugitive-global-maps*
+Global maps ~
+
+                                                *fugitive_c_CTRL-R_CTRL-G*
+<C-R><C-G>              On the command line, recall the path to the current
+                        |fugitive-object| (that is, a representation of the
+                        object recognized by |:Gedit|).
+
+                                                *fugitive_y_CTRL-G*
+["x]y<C-G>              Yank the path to the current |fugitive-object|.
+
+                                                *g:fugitive_no_maps*
+Global maps can be disabled with the g:fugitive_no_maps option.
+>
+        let g:fugitive_no_maps = 1
+<
+SPECIFYING OBJECTS                      *fugitive-object* *fugitive-revision*
+
+Fugitive objects are either work tree files or Git revisions as defined in the
+"SPECIFYING REVISIONS" section in the git-rev-parse man page, with expansions
+inspired by |cmdline-special| layered on top.  For commands that accept an
+optional object, the default is the file in the index for work tree files and
+the work tree file for everything else.  Example objects follow.
+
+Object          Meaning ~
+@               The commit referenced by @ aka HEAD
+master          The commit referenced by master
+master^         The parent of the commit referenced by master
+master...other  The merge base of master and other
+master:         The tree referenced by master
+./master        The file named master in the working directory
+:(top)master    The file named master in the work tree
+Makefile        The file named Makefile in the work tree
+@^:Makefile     The file named Makefile in the parent of HEAD
+:Makefile       The file named Makefile in the index (writable)
+@~2:%           The current file in the grandparent of HEAD
+:%              The current file in the index
+:1:%            The current file's common ancestor during a conflict
+:2:#            The alternate file in the target branch during a conflict
+:3:#5           The file from buffer #5 in the merged branch during a conflict
+!               The commit owning the current file
+!:Makefile      The file named Makefile in the commit owning the current file
+!3^2            The second parent of the commit owning buffer #3
+.git/config     The repo config file
+:               The |fugitive-summary| buffer
+-               A temp file containing the last |:Git| invocation's output
+<cfile>         The file or commit under the cursor
+
+STATUSLINE                                      *fugitive-statusline*
+
+                                *FugitiveStatusline()* *fugitive#statusline()*
+Add %{FugitiveStatusline()} to your statusline to get an indicator including
+the current branch and the currently edited file's commit.  If you don't have
+a statusline, this one matches the default when 'ruler' is set:
+>
+        set statusline=%<%f\ %h%m%r%{FugitiveStatusline()}%=%-14.(%l,%c%V%)\ %P
+<
+AUTOCOMMANDS                                    *fugitive-autocommands*
+
+A handful of |User| |autocommands| are provided to allow extending and
+overriding Fugitive behaviors.  Example usage:
+>
+        autocmd User FugitiveBlob,FugitiveStageBlob call s:BlobOverrides()
+<
+                                                *User_FugitiveTag*
+FugitiveTag             After loading a tag object.
+
+                                                *User_FugitiveCommit*
+FugitiveCommit          After loading a commit object.
+
+                                                *User_FugitiveTree*
+FugitiveTree            After loading a tree (directory) object.
+
+                                                *User_FugitiveBlob*
+FugitiveBlob            After loading a committed blob (file) object.
+
+                                                *User_FugitiveObject*
+FugitiveObject          After loading any of the 4 above buffer types.
+
+                                                *User_FugitiveStageBlob*
+FugitiveStageBlob       After loading a staged blob (file) object.  These
+                        buffers are 'modifiable' and oftentimes don't want the
+                        same behavior as the other buffer types.
+
+                                                *User_FugitiveIndex*
+FugitiveIndex           After loading the |fugitive-summary| buffer.
+
+                                                *User_FugitivePager*
+FugitivePager           After loading a temp file created by a command like
+                        :Git --paginate or :Git blame.
+
+                                                *User_FugitiveEditor*
+FugitiveEditor          After a :Git command (e.g., :Git commit) edits a file
+                        (e.g., the commit message).
+
+                                                *User_FugitiveChanged*
+FugitiveChanged         After any event which can potentially change the
+                        repository, for example, any invocation of |:Git|.
+                        Originally intended for expiring caches, but can have
+                        other uses.
+
+API                                             *fugitive-api*
+
+Officially supported functions are documented inline in plugin/fugitive.vim.
+
+DEPRECATIONS                                    *fugitive-deprecated*
+
+The following commands are deprecated in favor of replacements that adhere to
+a new naming scheme.  Remember that |:Git| can be shortened to |:G|, so
+replacements using it are just one space character longer than the legacy
+version.
+
+*:Gremove*      Superseded by |:GRemove|.
+*:Gdelete*      Superseded by |:GDelete|.
+*:Gmove*        Superseded by |:GMove|.
+*:Grename*      Superseded by |:GRename|.
+*:Gbrowse*      Superseded by |:GBrowse|.
+*:Gdiff*        Superseded by |:Gdiffsplit|
+*:Gsdiff*       Superseded by |:Ghdiffsplit|
+*:Gvdiff*       Superseded by |:Gvdiffsplit| or |:vert| |:Gdiffsplit|.
+*:Gblame*       Superseded by |:Git_blame|.
+*:Gcommit*      Superseded by |:Git| commit.
+*:Gmerge*       Superseded by |:Git| merge and |:Git_mergetool|.
+*:Gpull*        Superseded by |:Git| pull.
+*:Grebase*      Superseded by |:Git| rebase.
+*:Grevert*      Superseded by |:Git| revert.
+*:Gpush*        Superseded by |:Git| push.
+*:Gfetch*       Superseded by |:Git| fetch.
+*:Glog*         Superseded by |:Gclog|.
+*:Gstatus*      Superseded by |:Git| (with no arguments).
+*:Gsplit!*      Superseded by |:Git_--paginate|.
+*:Gvsplit!*     Superseded by :vert Git --paginate.
+*:Gtabsplit!*   Superseded by :tab Git --paginate.
+*:Gpedit!*      Superseded by :Git! --paginate.
+
+                                                *User_Fugitive*
+Fugitive used to support `:autocmd User Fugitive` to run an autocommand after
+loading any buffer belonging to a Git repository, but this is being phased
+out.  Instead, one can leverage regular autocommand events like |BufNewFile|
+and |BufReadPost|, and check !empty(FugitiveGitDir()) to confirm Fugitive has
+found a repository.  See also |fugitive-autocommands| for other, more
+selective events.
+
+ABOUT                                           *fugitive-about*
+
+Grab the latest version or report a bug on GitHub:
+
+https://github.com/tpope/vim-fugitive
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/pack/ui/start/fugitive/ftdetect/fugitive.vim b/pack/ui/start/fugitive/ftdetect/fugitive.vim
new file mode 100644
index 0000000..d2bda26
--- /dev/null
+++ b/pack/ui/start/fugitive/ftdetect/fugitive.vim
@@ -0,0 +1 @@
+autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame
diff --git a/pack/ui/start/fugitive/ftplugin/fugitiveblame.vim b/pack/ui/start/fugitive/ftplugin/fugitiveblame.vim
new file mode 100644
index 0000000..1037b09
--- /dev/null
+++ b/pack/ui/start/fugitive/ftplugin/fugitiveblame.vim
@@ -0,0 +1,6 @@
+if exists("b:did_ftplugin") || !exists("*FugitiveGitDir")
+  finish
+endif
+let b:did_ftplugin = 1
+
+call fugitive#BlameFileType()
diff --git a/pack/ui/start/fugitive/plugin/fugitive.vim b/pack/ui/start/fugitive/plugin/fugitive.vim
new file mode 100644
index 0000000..ae7931c
--- /dev/null
+++ b/pack/ui/start/fugitive/plugin/fugitive.vim
@@ -0,0 +1,774 @@
+" fugitive.vim - A Git wrapper so awesome, it should be illegal
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      3.7
+" GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
+
+if exists('g:loaded_fugitive')
+  finish
+endif
+let g:loaded_fugitive = 1
+
+let s:bad_git_dir = '/$\|^fugitive:'
+
+" FugitiveGitDir() returns the detected Git dir for the given buffer number,
+" or the current buffer if no argument is passed.  This will be an empty
+" string if no Git dir was found.  Use !empty(FugitiveGitDir()) to check if
+" Fugitive is active in the current buffer.  Do not rely on this for direct
+" filesystem access; use FugitiveFind('.git/whatever') instead.
+function! FugitiveGitDir(...) abort
+  if v:version < 703
+    return ''
+  elseif !a:0 || type(a:1) == type(0) && a:1 < 0 || a:1 is# get(v:, 'true', -1)
+    if exists('g:fugitive_event')
+      return g:fugitive_event
+    endif
+    let dir = get(b:, 'git_dir', '')
+    if empty(dir) && (empty(bufname('')) || &buftype =~# '^\%(nofile\|acwrite\|quickfix\|terminal\|prompt\)$')
+      return FugitiveExtractGitDir(getcwd())
+    elseif (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && &buftype =~# '^\%(nowrite\)\=$'
+      let b:git_dir = FugitiveExtractGitDir(bufnr(''))
+      return b:git_dir
+    endif
+    return dir =~# s:bad_git_dir ? '' : dir
+  elseif type(a:1) == type(0) && a:1 isnot# 0
+    if a:1 == bufnr('') && (!exists('b:git_dir') || b:git_dir =~# s:bad_git_dir) && &buftype =~# '^\%(nowrite\)\=$'
+      let b:git_dir = FugitiveExtractGitDir(a:1)
+    endif
+    let dir = getbufvar(a:1, 'git_dir')
+    return dir =~# s:bad_git_dir ? '' : dir
+  elseif type(a:1) == type('')
+    return substitute(s:Slash(a:1), '/$', '', '')
+  elseif type(a:1) == type({})
+    return get(a:1, 'git_dir', '')
+  else
+    return ''
+  endif
+endfunction
+
+" FugitiveReal() takes a fugitive:// URL and returns the corresponding path in
+" the work tree.  This may be useful to get a cleaner path for inclusion in
+" the statusline, for example.  Note that the file and its parent directories
+" are not guaranteed to exist.
+"
+" This is intended as an abstract API to be used on any "virtual" path.  For a
+" buffer named foo://bar, check for a function named FooReal(), and if it
+" exists, call FooReal("foo://bar").
+function! FugitiveReal(...) abort
+  let file = a:0 ? a:1 : @%
+  if type(file) ==# type({})
+    let dir = FugitiveGitDir(file)
+    let tree = s:Tree(dir)
+    return s:VimSlash(empty(tree) ? dir : tree)
+  elseif file =~# '^\a\a\+:' || a:0 > 1
+    return call('fugitive#Real', [file] + a:000[1:-1])
+  elseif file =~# '^/\|^\a:\|^$'
+    return file
+  else
+    return fnamemodify(file, ':p' . (file =~# '[\/]$' ? '' : ':s?[\/]$??'))
+  endif
+endfunction
+
+" FugitiveFind() takes a Fugitive object and returns the appropriate Vim
+" buffer name.  You can use this to generate Fugitive URLs ("HEAD:README") or
+" to get the absolute path to a file in the Git dir (".git/HEAD"), the common
+" dir (".git/config"), or the work tree (":(top)Makefile").
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+function! FugitiveFind(...) abort
+  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type(0))
+    return call('fugitive#Find', a:000[1:-1] + [FugitiveGitDir(a:1)])
+  else
+    return fugitive#Find(a:0 ? a:1 : bufnr(''), FugitiveGitDir(a:0 > 1 ? a:2 : -1))
+  endif
+endfunction
+
+" FugitiveParse() takes a fugitive:// URL and returns a 2 element list
+" containing an object name ("commit:file") and the Git dir.  It's effectively
+" the inverse of FugitiveFind().
+function! FugitiveParse(...) abort
+  let path = s:Slash(a:0 ? a:1 : @%)
+  if path !~# '^fugitive://'
+    return ['', '']
+  endif
+  let vals = matchlist(path, s:dir_commit_file)
+  if len(vals)
+    return [(vals[2] =~# '^.\=$' ? ':' : '') . vals[2] . substitute(vals[3], '^/', ':', ''), vals[1]]
+  endif
+  let v:errmsg = 'fugitive: invalid Fugitive URL ' . path
+  throw v:errmsg
+endfunction
+
+" FugitiveGitVersion() queries the version of Git in use.  Pass up to 3
+" arguments to return a Boolean of whether a certain minimum version is
+" available (FugitiveGitVersion(2,3,4) checks for 2.3.4 or higher) or no
+" arguments to get a raw string.
+function! FugitiveGitVersion(...) abort
+  return call('fugitive#GitVersion', a:000)
+endfunction
+
+" FugitiveResult() returns an object encapsulating the result of the most
+" recent :Git command.  Will be empty if no result is available.  During a
+" User FugitiveChanged event, this is guaranteed to correspond to the :Git
+" command that triggered the event, or be empty if :Git was not the trigger.
+" Pass in the name of a temp buffer to get the result object for that command
+" instead.  Contains the following keys:
+"
+" * "args": List of command arguments, starting with the subcommand.  Will be
+"   empty for usages like :Git --help.
+" * "git_dir": Git dir of the relevant repository.
+" * "exit_status": The integer exit code of the process.
+" * "flags": Flags passed directly to Git, like -c and --help.
+" * "file": Path to file containing command output.  Not guaranteed to exist,
+"   so verify with filereadable() before trying to access it.
+function! FugitiveResult(...) abort
+  return call('fugitive#Result', a:000)
+endfunction
+
+" FugitiveExecute() runs Git with a list of arguments and returns a dictionary
+" with the following keys:
+"
+" * "exit_status": The integer exit code of the process.
+" * "stdout": The stdout produced by the process, as a list of lines.
+" * "stderr": The stdout produced by the process, as a list of lines.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+"
+" An optional final argument is a callback Funcref, for asynchronous
+" execution.
+function! FugitiveExecute(args, ...) abort
+  return call('fugitive#Execute', [a:args] + a:000)
+endfunction
+
+" FugitiveShellCommand() turns an array of arugments into a Git command string
+" which can be executed with functions like system() and commands like :!.
+" Integer arguments will be treated as buffer numbers, and the appropriate
+" relative path inserted in their place.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+function! FugitiveShellCommand(...) abort
+  return call('fugitive#ShellCommand', a:000)
+endfunction
+
+" FugitivePrepare() is a deprecated alias for FugitiveShellCommand().  If you
+" are using this in conjunction with system(), consider using
+" FugitiveExecute() instead.
+function! FugitivePrepare(...) abort
+  if !exists('s:did_prepare_warning')
+    let s:did_prepare_warning = 1
+    echohl WarningMsg
+    unsilent echomsg 'FugitivePrepare() has been superseded by FugitiveShellCommand()'
+    echohl NONE
+  endif
+  return call('fugitive#ShellCommand', a:000)
+endfunction
+
+" FugitiveConfig() get returns an opaque structure that can be passed to other
+" FugitiveConfig functions in lieu of a Git directory.  This can be faster
+" when performing multiple config queries.  Do not rely on the internal
+" structure of the return value as it is not guaranteed.  If you want a full
+" dictionary of every config value, use FugitiveConfigGetRegexp('.*').
+"
+" An optional argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.  Pass a blank
+" string to limit to the global config.
+function! FugitiveConfig(...) abort
+  return call('fugitive#Config', a:000)
+endfunction
+
+" FugitiveConfigGet() retrieves a Git configuration value.  An optional second
+" argument can be either the object returned by FugitiveConfig(), or a Git
+" dir or buffer number to be passed along to FugitiveConfig().
+function! FugitiveConfigGet(name, ...) abort
+  return get(call('FugitiveConfigGetAll', [a:name] + (a:0 ? [a:1] : [])), 0, get(a:, 2, ''))
+endfunction
+
+" FugitiveConfigGetAll() is like FugitiveConfigGet() but returns a list of
+" all values.
+function! FugitiveConfigGetAll(name, ...) abort
+  return call('fugitive#ConfigGetAll', [a:name] + a:000)
+endfunction
+
+" FugitiveConfigGetRegexp() retrieves a dictionary of all configuration values
+" with a key matching the given pattern.  Like git config --get-regexp, but
+" using a Vim regexp.  Second argument has same semantics as
+" FugitiveConfigGet().
+function! FugitiveConfigGetRegexp(pattern, ...) abort
+  return call('fugitive#ConfigGetRegexp', [a:pattern] + a:000)
+endfunction
+
+" FugitiveRemoteUrl() retrieves the remote URL for the given remote name,
+" defaulting to the current branch's remote or "origin" if no argument is
+" given.  Similar to `git remote get-url`, but also attempts to resolve HTTP
+" redirects and SSH host aliases.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+function! FugitiveRemoteUrl(...) abort
+  return call('fugitive#RemoteUrl', a:000)
+endfunction
+
+" FugitiveRemote() returns a data structure parsed from the remote URL.
+" For example, for remote URL "https://me@example.com:1234/repo.git", the
+" returned dictionary will contain the following:
+"
+" * "scheme": "https"
+" * "authority": "user@example.com:1234"
+" * "path": "/repo.git" (for SSH URLs this may be a relative path)
+" * "pathname": "/repo.git" (always coerced to absolute path)
+" * "host": "example.com:1234"
+" * "hostname": "example.com"
+" * "port": "1234"
+" * "user": "me"
+" * "path": "/repo.git"
+" * "url": "https://me@example.com:1234/repo.git"
+function! FugitiveRemote(...) abort
+  return call('fugitive#Remote', a:000)
+endfunction
+
+" FugitiveDidChange() triggers a FugitiveChanged event and reloads the summary
+" buffer for the current or given buffer number's repository.  You can also
+" give the result of a FugitiveExecute() and that context will be made
+" available inside the FugitiveChanged() event.
+"
+" Passing the special argument 0 (the number zero) softly expires summary
+" buffers for all repositories.  This can be used after a call to system()
+" with unclear implications.
+function! FugitiveDidChange(...) abort
+  return call('fugitive#DidChange', a:000)
+endfunction
+
+" FugitiveHead() retrieves the name of the current branch. If the current HEAD
+" is detached, FugitiveHead() will return the empty string, unless the
+" optional argument is given, in which case the hash of the current commit
+" will be truncated to the given number of characters.
+"
+" An optional second argument provides the Git dir, or the buffer number of a
+" buffer with a Git dir.  The default is the current buffer.
+function! FugitiveHead(...) abort
+  if a:0 && (type(a:1) ==# type({}) || type(a:1) ==# type('') && a:1 !~# '^\d\+$')
+    let dir = FugitiveGitDir(a:1)
+    let arg = get(a:, 2, 0)
+  elseif a:0 > 1
+    let dir = FugitiveGitDir(a:2)
+    let arg = a:1
+  else
+    let dir = FugitiveGitDir()
+    let arg = get(a:, 1, 0)
+  endif
+  if empty(dir)
+    return ''
+  endif
+  return fugitive#Head(arg, dir)
+endfunction
+
+function! FugitivePath(...) abort
+  if a:0 > 2 && type(a:1) ==# type({})
+    return fugitive#Path(a:2, a:3, FugitiveGitDir(a:1))
+  elseif a:0 && type(a:1) ==# type({})
+    return FugitiveReal(a:0 > 1 ? a:2 : @%)
+  elseif a:0 > 1
+    return fugitive#Path(a:1, a:2, FugitiveGitDir(a:0 > 2 ? a:3 : -1))
+  else
+    return FugitiveReal(a:0 ? a:1 : @%)
+  endif
+endfunction
+
+function! FugitiveStatusline(...) abort
+  if empty(FugitiveGitDir(bufnr('')))
+    return ''
+  endif
+  return fugitive#Statusline()
+endfunction
+
+function! FugitiveActualDir(...) abort
+  return call('FugitiveGitDir', a:000)
+endfunction
+
+let s:commondirs = {}
+function! FugitiveCommonDir(...) abort
+  let dir = call('FugitiveActualDir', a:000)
+  if empty(dir)
+    return ''
+  endif
+  if has_key(s:commondirs, dir)
+    return s:commondirs[dir]
+  endif
+  if getfsize(dir . '/HEAD') >= 10
+    let cdir = get(s:ReadFile(dir . '/commondir', 1), 0, '')
+    if cdir =~# '^/\|^\a:/'
+      let s:commondirs[dir] = s:Slash(FugitiveVimPath(cdir))
+    elseif len(cdir)
+      let s:commondirs[dir] = simplify(dir . '/' . cdir)
+    else
+      let s:commondirs[dir] = dir
+    endif
+  else
+    let s:commondirs[dir] = dir
+  endif
+  return s:commondirs[dir]
+endfunction
+
+function! FugitiveWorkTree(...) abort
+  let tree = s:Tree(FugitiveGitDir(a:0 ? a:1 : -1))
+  if tree isnot# 0 || a:0 > 1
+    return tree
+  else
+    return ''
+  endif
+endfunction
+
+function! FugitiveIsGitDir(...) abort
+  if !a:0 || type(a:1) !=# type('')
+    return !empty(call('FugitiveGitDir', a:000))
+  endif
+  let path = substitute(a:1, '[\/]$', '', '') . '/'
+  return len(path) && getfsize(path.'HEAD') > 10 && (
+        \ isdirectory(path.'objects') && isdirectory(path.'refs') ||
+        \ getftype(path.'commondir') ==# 'file')
+endfunction
+
+function! s:ReadFile(path, line_count) abort
+  if v:version < 800 && !filereadable(a:path)
+    return []
+  endif
+  try
+    return readfile(a:path, 'b', a:line_count)
+  catch
+    return []
+  endtry
+endfunction
+
+let s:worktree_for_dir = {}
+let s:dir_for_worktree = {}
+function! s:Tree(path) abort
+  let dir = a:path
+  if dir =~# '/\.git$'
+    return len(dir) ==# 5 ? '/' : dir[0:-6]
+  elseif dir ==# ''
+    return ''
+  endif
+  if !has_key(s:worktree_for_dir, dir)
+    let s:worktree_for_dir[dir] = ''
+    let ext_wtc_pat = 'v:val =~# "^\\s*worktreeConfig *= *\\%(true\\|yes\\|on\\|1\\) *$"'
+    let config = s:ReadFile(dir . '/config', 50)
+    if len(config)
+      let ext_wtc_config = filter(copy(config), ext_wtc_pat)
+      if len(ext_wtc_config) == 1 && filereadable(dir . '/config.worktree')
+         let config += s:ReadFile(dir . '/config.worktree', 50)
+      endif
+    else
+      let worktree = fnamemodify(FugitiveVimPath(get(s:ReadFile(dir . '/gitdir', 1), '0', '')), ':h')
+      if worktree ==# '.'
+        unlet! worktree
+      endif
+      if len(filter(s:ReadFile(FugitiveCommonDir(dir) . '/config', 50), ext_wtc_pat))
+        let config = s:ReadFile(dir . '/config.worktree', 50)
+      endif
+    endif
+    if len(config)
+      let wt_config = filter(copy(config), 'v:val =~# "^\\s*worktree *="')
+      if len(wt_config)
+        let worktree = FugitiveVimPath(matchstr(wt_config[0], '= *\zs.*'))
+      elseif !exists('worktree')
+        call filter(config,'v:val =~# "^\\s*bare *= *true *$"')
+        if empty(config)
+          let s:worktree_for_dir[dir] = 0
+        endif
+      endif
+    endif
+    if exists('worktree')
+      let s:worktree_for_dir[dir] = s:Slash(resolve(worktree))
+      let s:dir_for_worktree[s:worktree_for_dir[dir]] = dir
+    endif
+  endif
+  if s:worktree_for_dir[dir] =~# '^\.'
+    return simplify(dir . '/' . s:worktree_for_dir[dir])
+  else
+    return s:worktree_for_dir[dir]
+  endif
+endfunction
+
+function! s:CeilingDirectories() abort
+  if !exists('s:ceiling_directories')
+    let s:ceiling_directories = []
+    let resolve = 1
+    for dir in split($GIT_CEILING_DIRECTORIES, has('win32') ? ';' : ':', 1)
+      if empty(dir)
+        let resolve = 0
+      elseif resolve
+        call add(s:ceiling_directories, s:Slash(resolve(dir)))
+      else
+        call add(s:ceiling_directories, s:Slash(dir))
+      endif
+    endfor
+  endif
+  return s:ceiling_directories + get(g:, 'ceiling_directories', [s:Slash(fnamemodify(expand('~'), ':h'))])
+endfunction
+
+function! FugitiveExtractGitDir(path) abort
+  if type(a:path) ==# type({})
+    return get(a:path, 'git_dir', '')
+  elseif type(a:path) == type(0)
+    let path = s:Slash(a:path > 0 ? bufname(a:path) : bufname(''))
+  else
+    let path = s:Slash(a:path)
+  endif
+  if path =~# '^fugitive://'
+    return get(matchlist(path, s:dir_commit_file), 1, '')
+  elseif empty(path)
+    return ''
+  endif
+  let pre = substitute(matchstr(path, '^\a\a\+\ze:'), '^.', '\u&', '')
+  if len(pre) && exists('*' . pre . 'Real')
+    let path = {pre}Real(path)
+  endif
+  let root = s:Slash(fnamemodify(path, ':p:h'))
+  let previous = ""
+  let env_git_dir = len($GIT_DIR) ? s:Slash(simplify(fnamemodify(FugitiveVimPath($GIT_DIR), ':p:s?[\/]$??'))) : ''
+  call s:Tree(env_git_dir)
+  let ceiling_directories = s:CeilingDirectories()
+  while root !=# previous && root !~# '^$\|^//[^/]*$'
+    if index(ceiling_directories, root) >= 0
+      break
+    endif
+    if root ==# $GIT_WORK_TREE && FugitiveIsGitDir(env_git_dir)
+      return env_git_dir
+    elseif has_key(s:dir_for_worktree, root)
+      return s:dir_for_worktree[root]
+    endif
+    let dir = substitute(root, '[\/]$', '', '') . '/.git'
+    let type = getftype(dir)
+    if type ==# 'dir' && FugitiveIsGitDir(dir)
+      return dir
+    elseif type ==# 'link' && FugitiveIsGitDir(dir)
+      return resolve(dir)
+    elseif type !=# ''
+      let line = get(s:ReadFile(dir, 1), 0, '')
+      let file_dir = s:Slash(FugitiveVimPath(matchstr(line, '^gitdir: \zs.*')))
+      if file_dir !~# '^/\|^\a:\|^$' && FugitiveIsGitDir(root . '/' . file_dir)
+        return simplify(root . '/' . file_dir)
+      elseif len(file_dir) && FugitiveIsGitDir(file_dir)
+        return file_dir
+      endif
+    elseif FugitiveIsGitDir(root)
+      return root
+    endif
+    let previous = root
+    let root = fnamemodify(root, ':h')
+  endwhile
+  return ''
+endfunction
+
+function! FugitiveDetect(...) abort
+  if v:version < 703
+    return ''
+  endif
+  if exists('b:git_dir') && b:git_dir =~# '^$\|' . s:bad_git_dir
+    unlet b:git_dir
+  endif
+  if a:0 > 1 && a:2 is# 0 && !exists('#User#Fugitive')
+    return ''
+  endif
+  if !exists('b:git_dir')
+    let b:git_dir = FugitiveExtractGitDir(a:0 ? a:1 : bufnr(''))
+  endif
+  if empty(b:git_dir) || !exists('#User#Fugitive')
+    return ''
+  endif
+  if v:version >= 704 || (v:version == 703 && has('patch442'))
+    doautocmd <nomodeline> User Fugitive
+  elseif &modelines > 0
+    let modelines = &modelines
+    try
+      set modelines=0
+      doautocmd User Fugitive
+    finally
+      let &modelines = modelines
+    endtry
+  else
+    doautocmd User Fugitive
+  endif
+  return ''
+endfunction
+
+function! FugitiveGitPath(path) abort
+  return s:Slash(a:path)
+endfunction
+
+if exists('+shellslash')
+
+  let s:dir_commit_file = '\c^fugitive://\%(/\a\@=\)\=\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
+
+  function! s:Slash(path) abort
+    return tr(a:path, '\', '/')
+  endfunction
+
+  function! s:VimSlash(path) abort
+    return tr(a:path, '\/', &shellslash ? '//' : '\\')
+  endfunction
+
+  function FugitiveVimPath(path) abort
+    return tr(a:path, '\/', &shellslash ? '//' : '\\')
+  endfunction
+
+else
+
+  let s:dir_commit_file = '\c^fugitive://\(.\{-\}\)//\%(\(\x\{40,\}\|[0-3]\)\(/.*\)\=\)\=$'
+
+  function! s:Slash(path) abort
+    return a:path
+  endfunction
+
+  function! s:VimSlash(path) abort
+    return a:path
+  endfunction
+
+  if has('win32unix') && filereadable('/git-bash.exe')
+    function! FugitiveVimPath(path) abort
+      return substitute(a:path, '^\(\a\):', '/\l\1', '')
+    endfunction
+  else
+    function! FugitiveVimPath(path) abort
+      return a:path
+    endfunction
+  endif
+
+endif
+
+function! s:ProjectionistDetect() abort
+  let file = s:Slash(get(g:, 'projectionist_file', ''))
+  let dir = FugitiveExtractGitDir(file)
+  let base = get(matchlist(file, s:dir_commit_file), 1, '')
+  if empty(base)
+    let base = s:Tree(dir)
+  endif
+  if !empty(base)
+    if exists('+shellslash') && !&shellslash
+      let base = tr(base, '/', '\')
+    endif
+    let file = FugitiveFind('.git/info/projections.json', dir)
+    if filereadable(file)
+      call projectionist#append(base, file)
+    endif
+  endif
+endfunction
+
+let s:addr_other = has('patch-8.1.560') || has('nvim-0.5.0') ? '-addr=other' : ''
+let s:addr_tabs  = has('patch-7.4.542') ? '-addr=tabs' : ''
+let s:addr_wins  = has('patch-7.4.542') ? '-addr=windows' : ''
+
+if exists(':G') != 2
+  command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete G   exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
+endif
+command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#Complete Git exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)
+
+if exists(':Gstatus') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echomsg ":Gstatus is deprecated in favor of :Git (with no arguments)"|echohl NONE'
+elseif exists(':Gstatus') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bang -bar     -range=-1' s:addr_other 'Gstatus'
+        \ ' echoerr ":Gstatus has been removed in favor of :Git (with no arguments)"'
+endif
+
+for s:cmd in ['Commit', 'Revert', 'Merge', 'Rebase', 'Pull', 'Push', 'Fetch', 'Blame']
+  if exists(':G' . tolower(s:cmd)) != 2 && get(g:, 'fugitive_legacy_commands', 0)
+    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
+          \ 'echohl WarningMSG|echomsg ":G' . tolower(s:cmd) . ' is deprecated in favor of :Git ' . tolower(s:cmd) . '"|echohl NONE|'
+          \ 'exe fugitive#Command(<line1>, <count>, +"<range>", <bang>0, "<mods>", "' . tolower(s:cmd) . ' " . <q-args>)'
+  elseif exists(':G' . tolower(s:cmd)) != 2 && !exists('g:fugitive_legacy_commands')
+    exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#' . s:cmd . 'Complete G' . tolower(s:cmd)
+          \ 'echoerr ":G' . tolower(s:cmd) . ' has been removed in favor of :Git ' . tolower(s:cmd) . '"'
+  endif
+endfor
+unlet s:cmd
+
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Gcd  exe fugitive#Cd(<q-args>, 0)"
+exe "command! -bar -bang -nargs=? -complete=customlist,fugitive#CdComplete Glcd exe fugitive#Cd(<q-args>, 1)"
+
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Ggrep  exe fugitive#GrepCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bang -nargs=? -range=-1' s:addr_wins '-complete=customlist,fugitive#GrepComplete Glgrep exe fugitive#GrepCommand(0, <count> > 0 ? <count> : 0, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+if exists(':Glog') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog  :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "")'
+        \ '|echohl WarningMSG|echomsg ":Glog is deprecated in favor of :Gclog"|echohl NONE'
+elseif exists(':Glog') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Glog'
+        \ ' echoerr ":Glog has been removed in favor of :Gclog"'
+endif
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gclog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GcLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "c")'
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete Gllog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
+exe 'command! -bang -nargs=? -range=-1 -complete=customlist,fugitive#LogComplete GlLog :exe fugitive#LogCommand(<line1>,<count>,+"<range>",<bang>0,"<mods>",<q-args>, "l")'
+
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Ge       exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#EditComplete   Gedit    exe fugitive#Open("edit<bang>", 0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=*                          -complete=customlist,fugitive#ReadComplete   Gpedit   exe fugitive#Open("pedit", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gsplit   exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "split" : "edit"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_other '-complete=customlist,fugitive#ReadComplete   Gvsplit  exe fugitive#Open((<count> > 0 ? <count> : "").(<count> ? "vsplit" : "edit!"), <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -range=-1' s:addr_tabs  '-complete=customlist,fugitive#ReadComplete   Gtabedit exe fugitive#Open((<count> >= 0 ? <count> : "")."tabedit", <bang>0, "<mods>", <q-args>)'
+
+if exists(':Gr') != 2
+  exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gr     exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+endif
+exe 'command! -bar -bang -nargs=* -range=-1                -complete=customlist,fugitive#ReadComplete   Gread    exe fugitive#ReadCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gdiffsplit  exe fugitive#Diffsplit(1, <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Ghdiffsplit exe fugitive#Diffsplit(0, <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gvdiffsplit exe fugitive#Diffsplit(0, <bang>0, "vertical <mods>", <q-args>)'
+
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gw     exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwrite exe fugitive#WriteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=* -complete=customlist,fugitive#EditComplete Gwq    exe fugitive#WqCommand(   <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+
+exe 'command! -bar -bang -nargs=0 GRemove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=0 GUnlink exe fugitive#UnlinkCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=0 GDelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject GMove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete GRename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+if exists(':Gremove') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bar -bang -nargs=0 Gremove exe fugitive#RemoveCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echomsg ":Gremove is deprecated in favor of :GRemove"|echohl NONE'
+elseif exists(':Gremove') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bar -bang -nargs=0 Gremove echoerr ":Gremove has been removed in favor of :GRemove"'
+endif
+if exists(':Gdelete') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bar -bang -nargs=0 Gdelete exe fugitive#DeleteCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echomsg ":Gdelete is deprecated in favor of :GDelete"|echohl NONE'
+elseif exists(':Gdelete') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bar -bang -nargs=0 Gdelete echoerr ":Gremove has been removed in favor of :GRemove"'
+endif
+if exists(':Gmove') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#CompleteObject Gmove   exe fugitive#MoveCommand(  <line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echomsg ":Gmove is deprecated in favor of :GMove"|echohl NONE'
+elseif exists(':Gmove') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bar -bang -nargs=? -complete=customlist,fugitive#CompleteObject Gmove'
+        \ 'echoerr ":Gmove has been removed in favor of :GMove"'
+endif
+if exists(':Grename') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bar -bang -nargs=1 -complete=customlist,fugitive#RenameComplete Grename exe fugitive#RenameCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|echohl WarningMSG|echomsg ":Grename is deprecated in favor of :GRename"|echohl NONE'
+elseif exists(':Grename') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bar -bang -nargs=? -complete=customlist,fugitive#RenameComplete Grename'
+        \ 'echoerr ":Grename has been removed in favor of :GRename"'
+endif
+
+exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject GBrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+if exists(':Gbrowse') != 2 && get(g:, 'fugitive_legacy_commands', 0)
+  exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse exe fugitive#BrowseCommand(<line1>, <count>, +"<range>", <bang>0, "<mods>", <q-args>)'
+        \ '|if <bang>1|redraw!|endif|echohl WarningMSG|echomsg ":Gbrowse is deprecated in favor of :GBrowse"|echohl NONE'
+elseif exists(':Gbrowse') != 2 && !exists('g:fugitive_legacy_commands')
+  exe 'command! -bar -bang -range=-1 -nargs=* -complete=customlist,fugitive#CompleteObject Gbrowse'
+        \ 'echoerr ":Gbrowse has been removed in favor of :GBrowse"'
+endif
+
+if v:version < 703
+  finish
+endif
+
+let g:io_fugitive = {
+      \ 'simplify': function('fugitive#simplify'),
+      \ 'resolve': function('fugitive#resolve'),
+      \ 'getftime': function('fugitive#getftime'),
+      \ 'getfsize': function('fugitive#getfsize'),
+      \ 'getftype': function('fugitive#getftype'),
+      \ 'filereadable': function('fugitive#filereadable'),
+      \ 'filewritable': function('fugitive#filewritable'),
+      \ 'isdirectory': function('fugitive#isdirectory'),
+      \ 'getfperm': function('fugitive#getfperm'),
+      \ 'setfperm': function('fugitive#setfperm'),
+      \ 'readfile': function('fugitive#readfile'),
+      \ 'writefile': function('fugitive#writefile'),
+      \ 'glob': function('fugitive#glob'),
+      \ 'delete': function('fugitive#delete'),
+      \ 'Real': function('FugitiveReal')}
+
+augroup fugitive
+  autocmd!
+
+  autocmd BufNewFile,BufReadPost *  call FugitiveDetect(+expand('<abuf>'), 0)
+  autocmd FileType           netrw  call FugitiveDetect(+expand('<abuf>'), 0)
+  autocmd BufFilePost            *  unlet! b:git_dir
+
+  autocmd FileType git
+        \ call fugitive#MapCfile()
+  autocmd FileType gitcommit
+        \ call fugitive#MapCfile('fugitive#MessageCfile()')
+  autocmd FileType git,gitcommit
+        \ if &foldtext ==# 'foldtext()' |
+        \    setlocal foldtext=fugitive#Foldtext() |
+        \ endif
+  autocmd FileType fugitive
+        \ call fugitive#MapCfile('fugitive#PorcelainCfile()')
+  autocmd FileType gitrebase
+        \ let &l:include = '^\%(pick\|squash\|edit\|reword\|fixup\|drop\|[pserfd]\)\>' |
+        \ if &l:includeexpr !~# 'Fugitive' |
+        \   let &l:includeexpr = 'v:fname =~# ''^\x\{4,\}$'' && len(FugitiveGitDir()) ? FugitiveFind(v:fname) : ' .
+        \     (len(&l:includeexpr) ? &l:includeexpr : 'v:fname') |
+        \ endif |
+        \ let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl inex= inc='
+
+  autocmd BufReadCmd index{,.lock} nested
+        \ if FugitiveIsGitDir(expand('<amatch>:p:h')) |
+        \   let b:git_dir = s:Slash(expand('<amatch>:p:h')) |
+        \   exe fugitive#BufReadStatus(v:cmdbang) |
+        \ elseif filereadable(expand('<amatch>')) |
+        \   silent doautocmd BufReadPre |
+        \   keepalt noautocmd read <amatch> |
+        \   silent 1delete_ |
+        \   silent doautocmd BufReadPost |
+        \ else |
+        \   silent doautocmd BufNewFile |
+        \ endif
+
+  autocmd BufReadCmd   fugitive://*//*       nested exe fugitive#BufReadCmd() |
+        \ if &path =~# '^\.\%(,\|$\)' |
+        \   let &l:path = substitute(&path, '^\.,\=', '', '') |
+        \ endif
+  autocmd BufWriteCmd  fugitive://*//[0-3]/* nested exe fugitive#BufWriteCmd()
+  autocmd FileReadCmd  fugitive://*//*       nested exe fugitive#FileReadCmd()
+  autocmd FileWriteCmd fugitive://*//[0-3]/* nested exe fugitive#FileWriteCmd()
+  if exists('##SourceCmd')
+    autocmd SourceCmd     fugitive://*//*    nested exe fugitive#SourceCmd()
+  endif
+
+  autocmd User Flags call Hoist('buffer', function('FugitiveStatusline'))
+
+  autocmd User ProjectionistDetect call s:ProjectionistDetect()
+augroup END
+
+if get(g:, 'fugitive_no_maps')
+  finish
+endif
+
+let s:nowait = v:version >= 704 ? '<nowait>' : ''
+
+function! s:Map(mode, lhs, rhs, flags) abort
+  let flags = a:flags . (a:rhs =~# '<Plug>' ? '' : '<script>')
+  let head = a:lhs
+  let tail = ''
+  let keys = get(g:, a:mode.'remap', {})
+  if len(keys) && type(keys) == type({})
+    while !empty(head)
+      if has_key(keys, head)
+        let head = keys[head]
+        if empty(head)
+          return
+        endif
+        break
+      endif
+      let tail = matchstr(head, '<[^<>]*>$\|.$') . tail
+      let head = substitute(head, '<[^<>]*>$\|.$', '', '')
+    endwhile
+  endif
+  if empty(mapcheck(head.tail, a:mode))
+    exe a:mode.'map' s:nowait flags head.tail a:rhs
+  endif
+endfunction
+
+call s:Map('c', '<C-R><C-G>', 'fnameescape(fugitive#Object(@%))', '<expr>')
+call s:Map('n', 'y<C-G>', ':<C-U>call setreg(v:register, fugitive#Object(@%))<CR>', '<silent>')
+nmap <script><silent> <Plug>fugitive:y<C-G> :<C-U>call setreg(v:register, fugitive#Object(@%))<CR>
+nmap <script> <Plug>fugitive: <Nop>
diff --git a/pack/ui/start/fugitive/syntax/fugitive.vim b/pack/ui/start/fugitive/syntax/fugitive.vim
new file mode 100644
index 0000000..e61b34f
--- /dev/null
+++ b/pack/ui/start/fugitive/syntax/fugitive.vim
@@ -0,0 +1,57 @@
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync fromstart
+syn spell notoplevel
+
+syn include @fugitiveDiff syntax/diff.vim
+
+syn match fugitiveHeader /^[A-Z][a-z][^:]*:/
+syn match fugitiveHeader /^Head:/ nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
+syn match fugitiveHeader /^Pull:\|^Rebase:\|^Merge:\|^Push:/ nextgroup=fugitiveSymbolicRef skipwhite
+syn match fugitiveHelpHeader /^Help:/ nextgroup=fugitiveHelpTag skipwhite
+syn match fugitiveHelpTag    /\S\+/ contained
+
+syn region fugitiveSection start=/^\%(.*(\d\++\=)$\)\@=/ contains=fugitiveHeading end=/^$/
+syn cluster fugitiveSection contains=fugitiveSection
+syn match fugitiveHeading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite
+syn match fugitiveCount /(\d\++\=)/hs=s+1,he=e-1 contained
+syn match fugitivePreposition /\<\%([io]nto\|from\|to\|Rebasing\%( detached\)\=\)\>/ transparent contained nextgroup=fugitiveHash,fugitiveSymbolicRef skipwhite
+
+syn match fugitiveInstruction /^\l\l\+\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
+syn match fugitiveDone /^done\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
+syn match fugitiveStop /^stop\>/ contained containedin=@fugitiveSection nextgroup=fugitiveHash skipwhite
+syn match fugitiveModifier /^[MADRCU?]\{1,2} / contained containedin=@fugitiveSection
+syn match fugitiveSymbolicRef /\.\@!\%(\.\.\@!\|[^[:space:][:cntrl:]\:.]\)\+\.\@<!/ contained
+syn match fugitiveHash /^\x\{4,\}\S\@!/ contained containedin=@fugitiveSection
+syn match fugitiveHash /\S\@<!\x\{4,\}\S\@!/ contained
+
+syn region fugitiveHunk start=/^\%(@@\+ -\)\@=/ end=/^\%([A-Za-z?@]\|$\)\@=/ contains=diffLine,diffRemoved,diffAdded,diffNoEOL containedin=@fugitiveSection fold
+
+for s:section in ['Untracked', 'Unstaged', 'Staged']
+  exe 'syn region fugitive' . s:section . 'Section start=/^\%(' . s:section . ' .*(\d\++\=)$\)\@=/ contains=fugitive' . s:section . 'Heading end=/^$/'
+  exe 'syn match fugitive' . s:section . 'Modifier /^[MADRCU?] / contained containedin=fugitive' . s:section . 'Section'
+  exe 'syn cluster fugitiveSection add=fugitive' . s:section . 'Section'
+  exe 'syn match fugitive' . s:section . 'Heading /^[A-Z][a-z][^:]*\ze (\d\++\=)$/ contains=fugitivePreposition contained nextgroup=fugitiveCount skipwhite'
+endfor
+unlet s:section
+
+hi def link fugitiveHelpHeader fugitiveHeader
+hi def link fugitiveHeader Label
+hi def link fugitiveHelpTag Tag
+hi def link fugitiveHeading PreProc
+hi def link fugitiveUntrackedHeading PreCondit
+hi def link fugitiveUnstagedHeading Macro
+hi def link fugitiveStagedHeading Include
+hi def link fugitiveModifier Type
+hi def link fugitiveUntrackedModifier StorageClass
+hi def link fugitiveUnstagedModifier Structure
+hi def link fugitiveStagedModifier Typedef
+hi def link fugitiveInstruction Type
+hi def link fugitiveStop Function
+hi def link fugitiveHash Identifier
+hi def link fugitiveSymbolicRef Function
+hi def link fugitiveCount Number
+
+let b:current_syntax = "fugitive"
diff --git a/pack/ui/start/fugitive/syntax/fugitiveblame.vim b/pack/ui/start/fugitive/syntax/fugitiveblame.vim
new file mode 100644
index 0000000..70c1e74
--- /dev/null
+++ b/pack/ui/start/fugitive/syntax/fugitiveblame.vim
@@ -0,0 +1,7 @@
+if exists("b:current_syntax") || !exists("*FugitiveGitDir")
+  finish
+endif
+
+call fugitive#BlameSyntax()
+
+let b:current_syntax = "fugitiveblame"
diff --git a/bundle/colorscheme-switcher/.gitignore b/pack/ui/start/signify/.gitignore
old mode 100755
new mode 100644
similarity index 100%
rename from bundle/colorscheme-switcher/.gitignore
rename to pack/ui/start/signify/.gitignore
diff --git a/pack/ui/start/signify/CONTRIBUTING.md b/pack/ui/start/signify/CONTRIBUTING.md
new file mode 100644
index 0000000..a01753e
--- /dev/null
+++ b/pack/ui/start/signify/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+CONTRIBUTING
+============
+
+If you intend to contribute to this project, please keep some simple rules in
+mind:
+
+    - one commit per feature/fix
+    - the short commit message shouldn't be longer than 50 characters
+    - the short commit message should start with an uppercase character
+    - use the imperative for the short commit message
+    - don't finish the short commit message with a '.'
+    - don't use github-specific syntax to close an issue (I'll do that, when
+      merging into master)
+    - it's always a good idea to have a look at 'git log' to get an idea how to
+      format one's own commits
+    - if you have questions about a certain patch or feature requests, just open
+      a Github issue
+
+Examples
+--------
+
+```
+Bad:  "fixed loop to start from 0 instead of 1"
+Good: "Avoid off-by-one issue in skiplist loop"
+
+Bad:  "fixed typo"
+Good: "Docs: typo"
+```
diff --git a/pack/ui/start/signify/LICENSE b/pack/ui/start/signify/LICENSE
new file mode 100644
index 0000000..f5b3716
--- /dev/null
+++ b/pack/ui/start/signify/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Marco Hinz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pack/ui/start/signify/README.md b/pack/ui/start/signify/README.md
new file mode 100644
index 0000000..230b77e
--- /dev/null
+++ b/pack/ui/start/signify/README.md
@@ -0,0 +1,65 @@
+![vim-signify](https://raw.githubusercontent.com/mhinz/vim-signify/master/pictures/signify-logo.png)
+
+---
+
+_Signify (or just Sy) uses the sign column to indicate added, modified and
+removed lines in a file that is managed by a version control system (VCS)._
+
+---
+
+- Supports **git**, **mercurial**, **darcs**, **bazaar**, **subversion**,
+  **cvs**, **rcs**, **fossil**, **accurev**, **perforce**, **tfs**, **yadm**.
+- **Asynchronous** execution of VCS tools for Vim 8.0.902+ and Neovim.
+- **Preserves signs** from other plugins.
+- Handles **nested repositories** controlled by different VCS.
+- Provides mappings for **navigating hunks** ("blocks of changed lines").
+- Provides an **operator** that acts on hunks.
+- **Preview** changes in the current line in a popup window.
+- Show all changes in **diff mode**.
+- Alternative workflow: Disable the plugin by default and **toggle it per
+  buffer** on demand.
+- Optional **line highlighting**.
+- Optional **skipping of filetypes/filenames**.
+- Optional **stats in the statusline**.
+- **Works out of the box**, but allows fine-grained configuration.
+- **Great documentation** and **handsome maintainers**!
+
+---
+
+_Similar plugin for git: [vim-gitgutter](https://github.com/airblade/vim-gitgutter)_
+
+## Installation
+
+The `master` branch is async-only and thus requires at least Vim 8.0.902. Use
+the `legacy` branch for older Vim versions.
+
+Using your favorite [plugin
+manager](https://github.com/mhinz/vim-galore#managing-plugins), e.g.
+[vim-plug](https://github.com/junegunn/vim-plug):
+
+```vim
+if has('nvim') || has('patch-8.0.902')
+  Plug 'mhinz/vim-signify'
+else
+  Plug 'mhinz/vim-signify', { 'branch': 'legacy' }
+endif
+```
+
+## Configuration for async update
+```vim
+" default updatetime 4000ms is not good for async update
+set updatetime=100
+```
+
+## Demo
+
+![Example:signify in action](https://raw.githubusercontent.com/mhinz/vim-signify/master/pictures/signify-demo.gif)
+
+## Author and Feedback
+
+If you like this plugin, star it! It's a great way of getting feedback. The same
+goes for reporting issues or feature requests.
+
+Contact: [Twitter](https://twitter.com/_mhinz_)
+
+Co-maintainer: [@jamessan](https://github.com/jamessan)
diff --git a/pack/ui/start/signify/autoload/sy.vim b/pack/ui/start/signify/autoload/sy.vim
new file mode 100644
index 0000000..34e9a8f
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy.vim
@@ -0,0 +1,186 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" #start {{{1
+" Optional argument: {'bufnr': X }
+function! sy#start(...) abort
+  if g:signify_locked
+    call sy#verbose('Locked.')
+    return
+  endif
+
+  let bufnr = a:0 && has_key(a:1, 'bufnr') ? a:1.bufnr : bufnr('')
+  let sy = getbufvar(bufnr, 'sy')
+
+  if empty(sy)
+    let path = s:get_path(bufnr)
+    if s:skip(bufnr, path)
+      call sy#verbose('Skip file: '. path)
+      return
+    endif
+    call sy#verbose('Register new file: '. path)
+    let new_sy = {
+          \ 'path':       path,
+          \ 'buffer':     bufnr,
+          \ 'active':     0,
+          \ 'detecting':  0,
+          \ 'vcs':        [],
+          \ 'hunks':      [],
+          \ 'signid':     0x100,
+          \ 'updated_by': '',
+          \ 'stats':      [-1, -1, -1],
+          \ 'info':       {
+          \    'dir':  fnamemodify(path, ':p:h'),
+          \    'path': sy#util#escape(path),
+          \    'file': sy#util#escape(fnamemodify(path, ':t'))
+          \ }}
+    call setbufvar(bufnr, 'sy', new_sy)
+    if get(g:, 'signify_disable_by_default')
+      call sy#verbose('Disabled by default.')
+      return
+    endif
+    let new_sy.active = 1
+    call setbufvar(bufnr, 'sy', new_sy)
+    call sy#repo#detect(bufnr)
+  elseif has('vim_starting')
+    call sy#verbose("Don't run Sy more than once during startup.")
+    return
+  elseif !sy.active
+    call sy#verbose('Inactive buffer.')
+    return
+  elseif empty(sy.vcs)
+    if get(sy, 'retry')
+      let sy.retry = 0
+      call sy#verbose('Redetecting VCS.')
+      call sy#repo#detect(sy.buffer)
+    else
+      if get(sy, 'detecting')
+        call sy#verbose('Detection is already in progress.')
+      else
+        call sy#verbose('No VCS found. Disabling.')
+        call sy#disable(sy.buffer)
+      endif
+    endif
+  else
+    for vcs in sy.vcs
+      let job_id = getbufvar(sy.buffer, 'sy_job_id_'. vcs, 0)
+      if type(job_id) != type(0) || job_id > 0
+        call sy#verbose('Update is already in progress.', vcs)
+      else
+        call sy#verbose('Updating signs.', vcs)
+        call sy#repo#get_diff(sy.buffer, vcs, function('sy#sign#set_signs'))
+      endif
+    endfor
+  endif
+endfunction
+
+" #stop {{{1
+function! sy#stop(bufnr) abort
+  if empty(getbufvar(a:bufnr, 'sy'))
+    return
+  endif
+  call sy#sign#remove_all_signs(a:bufnr)
+endfunction
+
+" #enable {{{1
+function! sy#enable() abort
+  if !exists('b:sy')
+    call sy#start()
+    return
+  endif
+
+  if !b:sy.active
+    let b:sy.active = 1
+    let b:sy.retry  = 1
+    call sy#start()
+  endif
+endfunction
+
+" #disable {{{1
+function! sy#disable(...) abort
+  let sy = getbufvar(a:0 ? a:1 : bufnr(''), 'sy')
+
+  if !empty(sy) && sy.active
+    call sy#stop(sy.buffer)
+    let b:sy.active = 0
+    let b:sy.stats = [-1, -1, -1]
+  endif
+endfunction
+
+" #toggle {{{1
+function! sy#toggle() abort
+  if !exists('b:sy') || !b:sy.active
+    call sy#enable()
+  else
+    call sy#disable()
+  endif
+endfunction
+
+" #buffer_is_active {{{1
+function! sy#buffer_is_active()
+  return exists('b:sy') && b:sy.active
+endfunction
+
+" #verbose {{{1
+function! sy#verbose(msg, ...) abort
+  if &verbose
+    if type(a:msg) == type([])
+      for msg in a:msg
+        echomsg printf('[sy%s] %s', (a:0 ? ':'.a:1 : ''), msg)
+      endfor
+    else
+      echomsg printf('[sy%s] %s', (a:0 ? ':'.a:1 : ''), a:msg)
+    endif
+  endif
+endfunction
+
+" s:get_path {{{1
+function! s:get_path(bufnr)
+  let path = resolve(fnamemodify(bufname(a:bufnr), ':p'))
+  if has('win32')
+    let path = substitute(path, '\v^(\w):\\\\', '\1:\\', '')
+  endif
+  return path
+endfunction
+
+" s:skip {{{1
+function! s:skip(bufnr, path)
+  if getbufvar(a:bufnr, '&diff') || !filereadable(a:path)
+    return 1
+  endif
+
+  if exists('g:signify_skip_filetype')
+    if has_key(g:signify_skip_filetype, getbufvar(a:bufnr, '&filetype'))
+      return 1
+    elseif has_key(g:signify_skip_filetype, 'help')
+          \ && getbufvar(a:bufnr, '&buftype') == 'help'
+      return 1
+    endif
+  endif
+
+  if exists('g:signify_skip_filename') && has_key(g:signify_skip_filename, a:path)
+    return 1
+  endif
+
+  " DEPRECATED: Use g:signify_skip.pattern instead.
+  if exists('g:signify_skip_filename_pattern')
+    for pattern in g:signify_skip_filename_pattern
+      if a:path =~ pattern
+        return 1
+      endif
+    endfor
+  endif
+
+  if exists('g:signify_skip')
+    if has_key(g:signify_skip, 'pattern')
+      for pattern in g:signify_skip.pattern
+        if a:path =~ pattern
+          return 1
+        endif
+      endfor
+    endif
+  endif
+
+  return 0
+endfunction
diff --git a/pack/ui/start/signify/autoload/sy/debug.vim b/pack/ui/start/signify/autoload/sy/debug.vim
new file mode 100644
index 0000000..5390ba7
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/debug.vim
@@ -0,0 +1,48 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" #list_active_buffers {{{1
+function! sy#debug#list_active_buffers() abort
+  for b in range(1, bufnr('$'))
+    if !buflisted(b) || empty(getbufvar(b, 'sy'))
+      continue
+    endif
+
+    let sy   = copy(getbufvar(b, 'sy'))
+    let path = remove(sy, 'path')
+
+    echo "\n". path ."\n". repeat('=', strlen(path))
+
+    for k in ['active', 'buffer', 'vcs', 'stats', 'signid']
+      if k == 'stats'
+        echo printf("%10s  =  %d added, %d changed, %d removed\n",
+              \ k,
+              \ sy.stats[0],
+              \ sy.stats[1],
+              \ sy.stats[2])
+      else
+        echo printf("%10s  =  %s\n", k, string(sy[k]))
+      endif
+    endfor
+
+    if empty(sy.hunks)
+      echo printf("%10s  =  %s\n", 'hunks', '[]')
+    else
+      for i in range(len(sy.hunks))
+        if i == 0
+          echo printf("%10s  =  start: %d, end: %d, IDs: %s\n",
+                \ 'hunks',
+                \ sy.hunks[i].start,
+                \ sy.hunks[i].end,
+                \ string(sy.hunks[i].ids))
+        else
+          echo printf("%20s: %d, %s: %d, %s: %s\n",
+                \ 'start', sy.hunks[i].start,
+                \ 'end',   sy.hunks[i].end,
+                \ 'IDs',   string(sy.hunks[i].ids))
+        endif
+      endfor
+    endif
+  endfor
+endfunction
diff --git a/pack/ui/start/signify/autoload/sy/fold.vim b/pack/ui/start/signify/autoload/sy/fold.vim
new file mode 100644
index 0000000..0936267
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/fold.vim
@@ -0,0 +1,124 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+" SignifyFoldExpr {{{1
+function! SignifyFoldExpr(lnum)
+  return s:levels[a:lnum]
+endfunction
+
+" SignifyFoldText {{{1
+function! SignifyFoldText()
+  let linelen = &textwidth ? &textwidth : 80
+  let marker  = &foldmarker[:stridx(&foldmarker, ',')-1]
+  let range   = foldclosedend(v:foldstart) - foldclosed(v:foldstart) + 1
+
+  let left    = substitute(getline(v:foldstart), marker, '', '')
+  let leftlen = len(left)
+
+  let right    = printf('%d [%d]', range, v:foldlevel)
+  let rightlen = len(right)
+
+  let tmp    = strpart(left, 0, linelen - rightlen)
+  let tmplen = len(tmp)
+
+  if leftlen > tmplen
+    let left    = strpart(tmp, 0, tmplen - 4) . '... '
+    let leftlen = tmplen
+  endif
+
+  let fill = repeat(' ', linelen - (leftlen + rightlen))
+
+  " return left . fill . right . repeat(' ', 100)
+  return left . fill . right
+endfunction
+
+" #dispatch {{{1
+function! sy#fold#dispatch(do_tab) abort
+  if a:do_tab
+    call sy#fold#enable(1)
+  else
+    call sy#fold#toggle()
+  endif
+endfunction
+
+" #enable {{{1
+function! sy#fold#enable(do_tab) abort
+  execute sy#util#return_if_no_changes()
+
+  if a:do_tab
+    tabedit %
+  endif
+
+  let [s:context0, s:context1] = get(g:, 'signify_fold_context', [3, 8])
+  let s:levels = s:get_levels(s:get_lines())
+
+  setlocal foldexpr=SignifyFoldExpr(v:lnum)
+  setlocal foldtext=SignifyFoldText()
+  setlocal foldmethod=expr
+  setlocal foldlevel=0
+endfunction
+
+" #disable {{{1
+function! sy#fold#disable() abort
+  let &l:foldmethod = b:sy_folded.method
+  let &l:foldtext = b:sy_folded.text
+  normal! zv
+endfunction
+
+" #toggle {{{1
+function! sy#fold#toggle() abort
+  if exists('b:sy_folded')
+    call sy#fold#disable()
+    if b:sy_folded.method == 'manual'
+      loadview
+    endif
+    unlet b:sy_folded
+  else
+    let b:sy_folded = { 'method': &foldmethod, 'text': &foldtext }
+    if &foldmethod == 'manual'
+      let old_vop = &viewoptions
+      mkview
+      let &viewoptions = old_vop
+    endif
+    call sy#fold#enable(0)
+  endif
+
+  redraw!
+  call sy#start()
+endfunction
+
+" s:get_lines {{{1
+function! s:get_lines() abort
+  let signlist = sy#util#execute('sign place buffer='. b:sy.buffer)
+
+  let lines = []
+  for line in split(signlist, '\n')[2:]
+    call insert(lines, matchlist(line, '\v^\s+line\=(\d+)')[1], 0)
+  endfor
+
+  return reverse(lines)
+endfunction
+
+" s:get_levels {{{1
+function! s:get_levels(lines) abort
+  let levels = {}
+
+  for line in range(1, line('$'))
+    let levels[line] = 2
+  endfor
+
+  for line in a:lines
+    for l in range(line - s:context1, line + s:context1)
+      if (l < 1) || (l > line('$'))
+        continue
+      endif
+      if levels[l] == 2
+        let levels[l] = 1
+      endif
+      for ll in range(line - s:context0, line + s:context0)
+        let levels[ll] = 0
+      endfor
+    endfor
+  endfor
+
+  return levels
+endfunction
diff --git a/pack/ui/start/signify/autoload/sy/highlight.vim b/pack/ui/start/signify/autoload/sy/highlight.vim
new file mode 100644
index 0000000..58ac0bb
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/highlight.vim
@@ -0,0 +1,61 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" Variables {{{1
+if get(g:, 'signify_sign_show_text', 1)
+  let s:sign_add               = get(g:, 'signify_sign_add',               '+')
+  let s:sign_delete_first_line = get(g:, 'signify_sign_delete_first_line', '‾')
+  let s:sign_change            = get(g:, 'signify_sign_change',            '!')
+else
+  let s:sign_add               = ' '
+  let s:sign_delete_first_line = ' '
+  let s:sign_change            = ' '
+endif
+
+let s:sign_show_count = get(g:, 'signify_sign_show_count', 1)
+" 1}}}
+
+" #setup {{{1
+function! sy#highlight#setup() abort
+  highlight default link SignifyLineAdd             DiffAdd
+  highlight default link SignifyLineDelete          DiffDelete
+  highlight default link SignifyLineDeleteFirstLine SignifyLineDelete
+  highlight default link SignifyLineChange          DiffChange
+
+  highlight default link SignifySignAdd             DiffAdd
+  highlight default link SignifySignDelete          DiffDelete
+  highlight default link SignifySignDeleteFirstLine SignifySignDelete
+  highlight default link SignifySignChange          DiffChange
+endfunction
+
+" #line_enable {{{1
+function! sy#highlight#line_enable() abort
+  execute 'sign define SignifyAdd text='. s:sign_add 'texthl=SignifySignAdd linehl=SignifyLineAdd'
+  execute 'sign define SignifyChange text='. s:sign_change 'texthl=SignifySignChange linehl=SignifyLineChange'
+  execute 'sign define SignifyRemoveFirstLine text='. s:sign_delete_first_line 'texthl=SignifySignDeleteFirstLine linehl=SignifyLineDeleteFirstLine'
+  let g:signify_line_highlight = 1
+endfunction
+
+" #line_disable {{{1
+function! sy#highlight#line_disable() abort
+  execute 'sign define SignifyAdd text='. s:sign_add 'texthl=SignifySignAdd linehl='
+  execute 'sign define SignifyChange text='. s:sign_change 'texthl=SignifySignChange linehl='
+  execute 'sign define SignifyRemoveFirstLine text='. s:sign_delete_first_line 'texthl=SignifySignDeleteFirstLine linehl='
+  let g:signify_line_highlight = 0
+endfunction
+
+" #line_toggle {{{1
+function! sy#highlight#line_toggle() abort
+  if get(g:, 'signify_line_highlight')
+    call sy#highlight#line_disable()
+  else
+    call sy#highlight#line_enable()
+  endif
+
+  redraw!
+  call sy#start()
+endfunction
+" }}}
+
+call sy#highlight#setup()
diff --git a/pack/ui/start/signify/autoload/sy/jump.vim b/pack/ui/start/signify/autoload/sy/jump.vim
new file mode 100644
index 0000000..b9484f5
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/jump.vim
@@ -0,0 +1,29 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" #next_hunk {{{1
+function! sy#jump#next_hunk(count)
+  execute sy#util#return_if_no_changes()
+
+  let lnum = line('.')
+  let hunks = filter(copy(b:sy.hunks), 'v:val.start > lnum')
+  let hunk = get(hunks, a:count - 1, get(hunks, -1, {}))
+
+  if !empty(hunk)
+    execute 'sign jump '. hunk.ids[0] .' buffer='. b:sy.buffer
+  endif
+endfunction
+
+" #prev_hunk {{{1
+function! sy#jump#prev_hunk(count)
+  execute sy#util#return_if_no_changes()
+
+  let lnum = line('.')
+  let hunks = filter(copy(b:sy.hunks), 'v:val.start < lnum')
+  let hunk = get(hunks, 0 - a:count, get(hunks, 0, {}))
+
+  if !empty(hunk)
+    execute 'sign jump '. hunk.ids[0] .' buffer='. b:sy.buffer
+  endif
+endfunction
diff --git a/pack/ui/start/signify/autoload/sy/repo.vim b/pack/ui/start/signify/autoload/sy/repo.vim
new file mode 100644
index 0000000..5d73dfe
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/repo.vim
@@ -0,0 +1,666 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" #detect {{{1
+function! sy#repo#detect(bufnr) abort
+  let sy = getbufvar(a:bufnr, 'sy')
+  for vcs in s:vcs_list
+    let sy.detecting += 1
+    call sy#repo#get_diff(a:bufnr, vcs, function('sy#sign#set_signs'))
+  endfor
+endfunction
+
+" s:callback_nvim_stdout{{{1
+function! s:callback_nvim_stdout(_job_id, data, _event) dict abort
+  let self.stdoutbuf[-1] .= a:data[0]
+  call extend(self.stdoutbuf, a:data[1:])
+endfunction
+
+" s:callback_nvim_exit {{{1
+function! s:callback_nvim_exit(_job_id, exitval, _event) dict abort
+  return s:handle_diff(self, a:exitval)
+endfunction
+
+" s:callback_vim_stdout {{{1
+function! s:callback_vim_stdout(_job_id, data) dict abort
+  let self.stdoutbuf += [a:data]
+endfunction
+
+" s:callback_vim_close {{{1
+function! s:callback_vim_close(channel) dict abort
+  let job = ch_getjob(a:channel)
+  while 1
+    if job_status(job) == 'dead'
+      let exitval = job_info(job).exitval
+      break
+    endif
+    sleep 10m
+  endwhile
+  return s:handle_diff(self, exitval)
+endfunction
+
+" s:write_buffer {{{1
+function! s:write_buffer(bufnr, file)
+  let bufcontents = getbufline(a:bufnr, 1, '$')
+
+  if bufcontents == [''] && line2byte(1) == -1
+    " Special case: completely empty buffer.
+    " A nearly empty buffer of only a newline has line2byte(1) == 1.
+    call writefile([], a:file)
+    return
+  endif
+
+  if getbufvar(a:bufnr, '&fileformat') ==# 'dos'
+    call map(bufcontents, 'v:val."\r"')
+  endif
+
+  let fenc = getbufvar(a:bufnr, '&fileencoding')
+  let enc  = getbufvar(a:bufnr, '&encoding')
+  if fenc !=# enc
+    call map(bufcontents, 'iconv(v:val, "'.enc.'", "'.fenc.'")')
+  endif
+
+  if getbufvar(a:bufnr, '&bomb')
+    let bufcontents[0]=''.bufcontents[0]
+  endif
+
+  call writefile(bufcontents, a:file)
+endfunction
+
+" sy#get_diff {{{1
+function! sy#repo#get_diff(bufnr, vcs, func) abort
+  call sy#verbose('sy#repo#get_diff()', a:vcs)
+
+  let job_id = getbufvar(a:bufnr, 'sy_job_id_'.a:vcs)
+
+  if getbufvar(a:bufnr, '&modified')
+    let [cmd, options] = s:initialize_buffer_job(a:bufnr, a:vcs)
+    let options.difftool = 'diff'
+  else
+    let [cmd, options] = s:initialize_job(a:bufnr, a:vcs)
+    let options.difftool = a:vcs
+  endif
+
+  let options.func = a:func
+
+  if has('nvim')
+    if job_id
+      silent! call jobstop(job_id)
+    endif
+    let job_id = jobstart(cmd, extend(options, {
+          \ 'cwd':       getbufvar(a:bufnr, 'sy').info.dir,
+          \ 'on_stdout': function('s:callback_nvim_stdout'),
+          \ 'on_exit':   function('s:callback_nvim_exit'),
+          \ }))
+    call setbufvar(a:bufnr, 'sy_job_id_'.a:vcs, job_id)
+  elseif has('patch-8.0.902')
+    if type(job_id) != type(0)
+      silent! call job_stop(job_id)
+    endif
+    let opts = {
+          \ 'cwd':      getbufvar(a:bufnr, 'sy').info.dir,
+          \ 'in_io':    'null',
+          \ 'out_cb':   function('s:callback_vim_stdout', options),
+          \ 'close_cb': function('s:callback_vim_close', options),
+          \ }
+    let job_id = job_start(cmd, opts)
+    call setbufvar(a:bufnr, 'sy_job_id_'.a:vcs, job_id)
+  else
+    let options.stdoutbuf = split(s:run(a:vcs), '\n')
+    call s:handle_diff(options, v:shell_error)
+  endif
+endfunction
+
+" s:handle_diff {{{1
+function! s:handle_diff(options, exitval) abort
+  call sy#verbose('s:handle_diff()', a:options.vcs)
+
+  if has_key(a:options, 'tempfiles')
+    for f in a:options.tempfiles
+      call delete(f)
+    endfor
+  endif
+
+  let sy = getbufvar(a:options.bufnr, 'sy')
+  if empty(sy)
+    call sy#verbose(printf('No b:sy found for %s', bufname(a:options.bufnr)), a:options.vcs)
+    return
+  elseif !empty(sy.updated_by) && sy.updated_by != a:options.vcs
+    call sy#verbose(printf('Signs already got updated by %s.', sy.updated_by), a:options.vcs)
+    return
+  elseif empty(sy.vcs) && sy.active
+    let sy.detecting -= 1
+  endif
+
+  let fenc = getbufvar(a:options.bufnr, '&fenc')
+  let enc  = getbufvar(a:options.bufnr, '&enc')
+  if (fenc != enc) && has('iconv')
+    call map(a:options.stdoutbuf, printf('iconv(v:val, "%s", "%s")', fenc, enc))
+  endif
+
+  let [found_diff, diff] = s:check_diff_{a:options.difftool}(a:exitval, a:options.stdoutbuf)
+  if found_diff
+    if index(sy.vcs, a:options.vcs) == -1
+      let sy.vcs += [a:options.vcs]
+    endif
+    call a:options.func(sy, a:options.vcs, diff)
+  else
+    call sy#verbose('No valid diff found. Disabling this VCS.', a:options.vcs)
+  endif
+
+  call setbufvar(a:options.bufnr, 'sy_job_id_'.a:options.vcs, 0)
+endfunction
+
+" s:check_diff_diff {{{1
+function! s:check_diff_diff(exitval, diff) abort
+  return a:exitval <= 1 ? [1, a:diff] : [0, []]
+endfunction
+
+" s:check_diff_git {{{1
+function! s:check_diff_git(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_yadm {{{1
+function! s:check_diff_yadm(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_hg {{{1
+function! s:check_diff_hg(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_svn {{{1
+function! s:check_diff_svn(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_bzr {{{1
+function! s:check_diff_bzr(exitval, diff) abort
+  return (a:exitval =~ '[012]') ? [1, a:diff] : [0, []]
+endfunction
+
+" s:check_diff_darcs {{{1
+function! s:check_diff_darcs(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_fossil {{{1
+function! s:check_diff_fossil(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_cvs {{{1
+function! s:check_diff_cvs(exitval, diff) abort
+  let [found_diff, diff] = [0, []]
+  if a:exitval == 1
+    for diffline in a:diff
+      if diffline =~ '^+++'
+        let [found_diff, diff] = [1, a:diff]
+        break
+      endif
+    endfor
+  elseif a:exitval == 0 && len(a:diff) == 0
+    let found_diff = 1
+  endif
+  return [found_diff, diff]
+endfunction
+
+" s:check_diff_rcs {{{1
+function! s:check_diff_rcs(exitval, diff) abort
+  return (a:exitval == 2) ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_accurev {{{1
+function! s:check_diff_accurev(exitval, diff) abort
+  return (a:exitval >= 2) ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_perforce {{{1
+function! s:check_diff_perforce(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, a:diff]
+endfunction
+
+" s:check_diff_tfs {{{1
+function! s:check_diff_tfs(exitval, diff) abort
+  return a:exitval ? [0, []] : [1, s:strip_context(a:diff)]
+endfunction
+
+" #get_stats {{{1
+function! sy#repo#get_stats(...) abort
+  let sy = getbufvar(a:0 ? a:1 : bufnr(''), 'sy')
+  return empty(sy) ? [-1, -1, -1] : sy.stats
+endfunction
+
+" #get_stats_decorated {{{1
+function! sy#repo#get_stats_decorated(...)
+  let bufnr = a:0 ? a:1 : bufnr('')
+  let [added, modified, removed] = sy#repo#get_stats(bufnr)
+  let symbols = ['+', '-', '~']
+  let stats = [added, removed, modified]  " reorder
+  let statline = ''
+
+  for i in range(3)
+    if stats[i] > 0
+      let statline .= printf('%s%s ', symbols[i], stats[i])
+    endif
+  endfor
+
+  if !empty(statline)
+    let statline = printf('[%s]', statline[:-2])
+  endif
+
+  return statline
+endfunction
+
+" #debug_detection {{{1
+function! sy#repo#debug_detection()
+  if !exists('b:sy')
+    echomsg 'signify: I cannot detect any changes!'
+    return
+  endif
+
+  for vcs in s:vcs_list
+    let cmd = s:get_base_cmd(bufnr(''), vcs, g:signify_vcs_cmds)
+    echohl Statement
+    echo cmd
+    echo repeat('=', len(cmd))
+    echohl NONE
+
+    let diff = s:run(vcs)
+    if v:shell_error
+      echohl ErrorMsg
+      echo diff
+      echohl NONE
+    else
+      echo empty(diff) ? "<none>" : diff
+    endif
+    echo "\n"
+  endfor
+endfunction
+
+function! s:system_in_dir(cmd) abort
+  let [cwd, chdir] = sy#util#chdir()
+  try
+    execute chdir fnameescape(b:sy.info.dir)
+    return system(a:cmd)
+  finally
+    execute chdir fnameescape(cwd)
+  endtry
+endfunction
+
+" #diffmode {{{1
+function! sy#repo#diffmode(do_tab) abort
+  execute sy#util#return_if_no_changes()
+
+  let vcs = b:sy.updated_by
+
+  call sy#verbose('SignifyDiff', vcs)
+  let ft = &filetype
+  let fenc = &fenc
+  if a:do_tab
+    tabedit %
+  endif
+  diffthis
+
+  let base = s:get_base(bufnr(''), vcs)
+
+  leftabove vnew
+  if (fenc != &enc) && has('iconv')
+    silent put =iconv(base, fenc, &enc)
+  else
+    silent put =base
+  endif
+
+  silent 1delete
+  set buftype=nofile bufhidden=wipe nomodified
+  let &filetype = ft
+  diffthis
+  wincmd p
+  normal! ]czt
+endfunction
+
+" s:extract_current_hunk {{{1
+function! s:extract_current_hunk(diff) abort
+  let header = ''
+  let hunk = []
+
+  for line in a:diff
+    if header != ''
+      if line[:2] == '@@ ' || empty(line)
+        break
+      endif
+      call add(hunk, line)
+    elseif line[:2] == '@@ ' && s:is_cur_line_in_hunk(line)
+      let header = line
+    endif
+  endfor
+
+  return [header, hunk]
+endfunction
+
+function! s:is_cur_line_in_hunk(hunkline) abort
+  let cur_line = line('.')
+  let [_old_line, old_count, new_line, new_count] = sy#sign#parse_hunk(a:hunkline)
+
+  if cur_line == 1 && new_line == 0
+    " deleted first line
+    return 1
+  endif
+
+  if cur_line == new_line && new_count < old_count
+    " deleted lines
+    return 1
+  endif
+
+  if cur_line >= new_line && cur_line < (new_line + new_count)
+    " added/changed lines
+    return 1
+  endif
+
+  return 0
+endfunction
+
+" #diff_hunk {{{1
+function! sy#repo#diff_hunk() abort
+  if exists('b:sy') && !empty(b:sy.updated_by)
+    call sy#repo#get_diff(bufnr(''), b:sy.updated_by, function('s:diff_hunk'))
+  endif
+endfunction
+
+function! s:diff_hunk(_sy, vcs, diff) abort
+  call sy#verbose('s:preview_hunk()', a:vcs)
+
+  let [_, hunk] = s:extract_current_hunk(a:diff)
+  if empty(hunk)
+    return
+  endif
+
+  if sy#util#popup_create(hunk)
+    return
+  endif
+
+  silent! wincmd P
+  if !&previewwindow
+    noautocmd botright new
+  endif
+  call setline(1, hunk)
+  silent! %foldopen!
+  setlocal previewwindow filetype=diff buftype=nofile bufhidden=delete
+  " With :noautocmd wincmd p, the first line of the preview window would show
+  " the 'cursorline', although it's not focused. Use feedkeys() instead.
+  noautocmd call feedkeys("\<c-w>p", 'nt')
+endfunction
+
+" #undo_hunk {{{1
+function! sy#repo#undo_hunk() abort
+  if exists('b:sy') && !empty(b:sy.updated_by)
+    call sy#repo#get_diff(bufnr(''), b:sy.updated_by, function('s:undo_hunk'))
+  endif
+endfunction
+
+function! s:undo_hunk(sy, vcs, diff) abort
+  call sy#verbose('s:undo_hunk()', a:vcs)
+
+  let [header, hunk] = s:extract_current_hunk(a:diff)
+  if empty(hunk)
+    return
+  endif
+
+  let [_old_line, _old_count, new_line, _new_count] = sy#sign#parse_hunk(header)
+
+  for line in hunk
+    let op = line[0]
+    let text = line[1:]
+    if op == ' '
+      if text != getline(new_line)
+        echoerr 'Could not apply context hunk for undo. Try saving the buffer first.'
+        return
+      endif
+      let new_line += 1
+    elseif op == '-'
+      call append(new_line-1, text)
+      let new_line += 1
+    elseif op == '+'
+      if text != getline(new_line)
+        echoerr 'Could not apply addition hunk for undo. Try saving the buffer first.'
+        return
+      endif
+      execute 'silent' new_line 'delete _'
+    else
+      echoer 'Unknown diff operation ' . line
+      return
+    endif
+  endfor
+
+  " Undoing altered the buffer, so update signs.
+  call setbufvar(a:sy.buffer, 'sy_job_id_'.a:vcs, 0)
+  return sy#start()
+endfunction
+
+" s:initialize_job {{{1
+function! s:initialize_job(bufnr, vcs) abort
+  return s:wrap_cmd(a:bufnr, a:vcs, s:get_base_cmd(a:bufnr, a:vcs, g:signify_vcs_cmds))
+endfunction
+
+" s:initialize_buffer_job {{{1
+function! s:initialize_buffer_job(bufnr, vcs) abort
+  let bufferfile = tempname()
+  call s:write_buffer(a:bufnr, bufferfile)
+
+  let basefile = tempname()
+  let base_cmd = s:get_base_cmd(a:bufnr, a:vcs, g:signify_vcs_cmds_diffmode) . '>' . fnameescape(basefile) . ' && '
+
+  let diff_cmd = base_cmd .  s:difftool . ' -U0 ' . fnameescape(basefile) . ' ' . fnameescape(bufferfile)
+  let [cmd, options] = s:wrap_cmd(a:bufnr, a:vcs, diff_cmd)
+
+  let options.tempfiles = [basefile, bufferfile]
+
+  return [cmd, options]
+endfunction
+
+" s:wrap_cmd {{{1
+function! s:wrap_cmd(bufnr, vcs, cmd) abort
+  if has('win32')
+    if has('nvim')
+      let cmd = &shell =~ '\v%(cmd|powershell)' ? a:cmd : ['sh', '-c', a:cmd]
+    else
+      if &shell =~ 'cmd'
+        let cmd = join([&shell, &shellcmdflag, '(', a:cmd, ')'])
+      elseif empty(&shellxquote)
+        let cmd = join([&shell, &shellcmdflag, &shellquote, a:cmd, &shellquote])
+      else
+        let cmd = join([&shell, &shellcmdflag, &shellxquote, a:cmd, &shellxquote])
+      endif
+    endif
+  else
+    let cmd = ['sh', '-c', a:cmd]
+  endif
+  let options = {
+        \ 'stdoutbuf': [''],
+        \ 'vcs': a:vcs,
+        \ 'bufnr': a:bufnr,
+        \ }
+  return [cmd, options]
+endfunction
+
+" s:get_vcs_path {{{1
+function! s:get_vcs_path(bufnr, vcs) abort
+  return (a:vcs =~# '\v(git|cvs|accurev|tfs|yadm)')
+        \ ? getbufvar(a:bufnr, 'sy').info.file
+        \ : getbufvar(a:bufnr, 'sy').info.path
+endfunction
+
+" s:get_base_cmd {{{1
+function! s:get_base_cmd(bufnr, vcs, vcs_cmds) abort
+  let cmd = a:vcs_cmds[a:vcs]
+  let cmd = s:replace(cmd, '%f', s:get_vcs_path(a:bufnr, a:vcs))
+  let cmd = s:replace(cmd, '%d', s:difftool)
+  let cmd = s:replace(cmd, '%n', s:devnull)
+  return cmd
+endfunction
+
+" s:get_base {{{1
+" Get the "base" version of the current buffer as a string.
+function! s:get_base(bufnr, vcs) abort
+  return s:system_in_dir(s:get_base_cmd(a:bufnr, a:vcs, g:signify_vcs_cmds_diffmode))
+endfunction
+
+" s:run {{{1
+function! s:run(vcs)
+  try
+    let ret = s:system_in_dir(s:get_base_cmd(bufnr(''), a:vcs, g:signify_vcs_cmds))
+  catch
+    " This exception message can be seen via :SignifyDebugUnknown.
+    " E.g. unquoted VCS programs in vcd_cmds can lead to E484.
+    let ret = v:exception .' at '. v:throwpoint
+  finally
+    return ret
+  endtry
+endfunction
+
+" s:replace {{{1
+function! s:replace(cmd, pat, sub)
+  let parts = split(a:cmd, a:pat, 1)
+  return join(parts, a:sub)
+endfunction
+
+" s:strip_context {{{1
+function! s:strip_context(context)
+  let diff = []
+  let hunk = []
+  let state = 0
+  let lines = a:context
+  let linenr = 0
+
+  while linenr < len(lines)
+    let line = lines[linenr]
+
+    if state == 0
+      if line =~ "^@@ "
+        let [old_line, old_count, new_line, new_count] = sy#sign#parse_hunk(line)
+        let hunk = []
+        let state = 1
+      else
+        call add(diff,line)
+      endif
+      let linenr += 1
+    elseif index([1,2,3],state) >= 0 && index(['\','/'],line[0]) >= 0
+      let linenr += 1
+      call add(hunk,line)
+    elseif state == 1
+      if line[0] == ' '
+        let old_line += 1
+        let new_line += 1
+        let old_count -= 1
+        let new_count -= 1
+        let linenr += 1
+      else
+        let old_count_part = 0
+        let new_count_part = 0
+        let state = 2
+      endif
+    elseif state == 2
+      if line[0] == '-'
+        call add(hunk,line)
+        let old_count_part += 1
+        let linenr += 1
+      else
+        let state = 3
+      endif
+    elseif state == 3
+      if line[0] == '+'
+        call add(hunk,line)
+        let new_count_part += 1
+        let linenr += 1
+      else
+        call add(diff, printf("@@ -%d%s +%d%s @@",(old_count_part == 0 && old_line > 0) ? old_line -1 : old_line, old_count_part == 1 ? "" : printf(",%d", old_count_part), (new_count_part == 0 && new_line > 0) ? new_line - 1 : new_line, new_count_part == 1 ? "" : printf(",%d", new_count_part)))
+        let diff += hunk
+        let hunk = []
+        let old_count -= old_count_part
+        let new_count -= new_count_part
+        let old_line += old_count_part
+        let new_line += new_count_part
+        let state = 1
+      endif
+    endif
+
+    if state > 0 && new_count <= 0 && old_count <= 0
+      if len(hunk) > 0
+        call add(diff, printf("@@ -%d%s +%d%s @@",(old_count_part == 0 && old_line > 0) ? old_line -1 : old_line, old_count_part == 1 ? "" : printf(",%d", old_count_part), (new_count_part == 0 && new_line > 0) ? new_line - 1 : new_line, new_count_part == 1 ? "" : printf(",%d", new_count_part)))
+        let diff = diff + hunk
+        let hunk = []
+      endif
+      let state = 0
+    endif
+  endwhile
+  if len(hunk) > 0
+    call add(diff, printf("@@ -%d%s +%d%s @@",(old_count_part == 0 && old_line > 0) ? old_line -1 : old_line, old_count_part == 1 ? "" : printf(",%d", old_count_part), (new_count_part == 0 && new_line > 0) ? new_line - 1 : new_line, new_count_part == 1 ? "" : printf(",%d", new_count_part)))
+    let diff = diff + hunk
+    let hunk = []
+  endif
+  return diff
+endfunction
+" 1}}}
+
+" Variables {{{1
+let s:default_vcs_cmds = {
+      \ 'git':      'git diff --no-color --no-ext-diff -U0 -- %f',
+      \ 'yadm':     'yadm diff --no-color --no-ext-diff -U0 -- %f',
+      \ 'hg':       'hg diff --color=never --config aliases.diff= --nodates -U0 -- %f',
+      \ 'svn':      'svn diff --diff-cmd %d -x -U0 -- %f',
+      \ 'bzr':      'bzr diff --using %d --diff-options=-U0 -- %f',
+      \ 'darcs':    'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f',
+      \ 'fossil':   'fossil diff --unified -c 0 -- %f',
+      \ 'cvs':      'cvs diff -U0 -- %f',
+      \ 'rcs':      'rcsdiff -U0 %f 2>%n',
+      \ 'accurev':  'accurev diff %f -- -U0',
+      \ 'perforce': 'p4 info '. sy#util#shell_redirect('%n') . (has('win32') ? ' &&' : ' && env P4DIFF= P4COLORS=') .' p4 diff -du0 %f',
+      \ 'tfs':      'tf diff -version:W -noprompt -format:Unified %f'
+      \ }
+
+let s:default_vcs_cmds_diffmode = {
+      \ 'git':      'git show HEAD:./%f',
+      \ 'yadm':     'yadm show HEAD:./%f',
+      \ 'hg':       'hg cat %f',
+      \ 'svn':      'svn cat %f',
+      \ 'bzr':      'bzr cat %f',
+      \ 'darcs':    'darcs show contents -- %f',
+      \ 'fossil':   'fossil cat %f',
+      \ 'cvs':      'cvs up -p -- %f 2>%n',
+      \ 'rcs':      'co -q -p %f',
+      \ 'accurev':  'accurev cat %f',
+      \ 'perforce': 'p4 print %f',
+      \ 'tfs':      'tf view -version:W -noprompt %f',
+      \ }
+
+if exists('g:signify_vcs_cmds')
+  call extend(g:signify_vcs_cmds, s:default_vcs_cmds, 'keep')
+else
+  let g:signify_vcs_cmds = s:default_vcs_cmds
+endif
+if exists('g:signify_vcs_cmds_diffmode')
+  call extend(g:signify_vcs_cmds_diffmode, s:default_vcs_cmds_diffmode, 'keep')
+else
+  let g:signify_vcs_cmds_diffmode = s:default_vcs_cmds_diffmode
+endif
+
+let s:vcs_dict = map(copy(g:signify_vcs_cmds), 'split(v:val)[0]')
+
+if exists('g:signify_skip') && has_key(g:signify_skip, 'vcs')
+  if has_key(g:signify_skip.vcs, 'allow')
+    let s:vcs_list = filter(copy(g:signify_skip.vcs.allow), 'executable(s:vcs_dict[v:val])')
+  elseif has_key(g:signify_skip.vcs, 'deny')
+    for vcs in g:signify_skip.vcs.deny
+      silent! call remove(s:vcs_dict, vcs)
+    endfor
+    let s:vcs_list = keys(filter(s:vcs_dict, 'executable(v:val)'))
+  end
+else
+  let s:vcs_list = keys(filter(s:vcs_dict, 'executable(v:val)'))
+endif
+
+let s:difftool = sy#util#escape(get(g:, 'signify_difftool', 'diff'))
+let s:devnull  = has('win32') || has ('win64') ? 'NUL' : '/dev/null'
diff --git a/pack/ui/start/signify/autoload/sy/sign.vim b/pack/ui/start/signify/autoload/sy/sign.vim
new file mode 100644
index 0000000..844d245
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/sign.vim
@@ -0,0 +1,250 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" Variables {{{1
+if get(g:, 'signify_sign_show_text', 1)
+  let s:sign_delete = get(g:, 'signify_sign_delete', '_')
+else
+  let s:sign_delete = ' '
+endif
+
+let s:sign_show_count  = get(g:, 'signify_sign_show_count', 1)
+let s:delete_highlight = ['', 'SignifyLineDelete']
+" 1}}}
+
+" #id_next {{{1
+function! sy#sign#id_next(sy) abort
+  let id = a:sy.signid
+  let a:sy.signid += 1
+  return id
+endfunction
+
+" #get_current_signs {{{1
+function! sy#sign#get_current_signs(sy) abort
+  let a:sy.internal = {}
+  let a:sy.external = {}
+
+  let signlist = sy#util#execute('sign place buffer='. a:sy.buffer)
+
+  for signline in split(signlist, '\n')[2:]
+    let tokens = matchlist(signline, '\v^\s+\S+\=(\d+)\s+\S+\=(\d+)\s+\S+\=(.*)$')
+    let line   = str2nr(tokens[1])
+    let id     = str2nr(tokens[2])
+    let type   = tokens[3]
+
+    if type =~# '^Signify'
+      " Handle ambiguous signs. Assume you have signs on line 3 and 4.
+      " Removing line 3 would lead to the second sign to be shifted up
+      " to line 3. Now there are still 2 signs, both one line 3.
+      if has_key(a:sy.internal, line)
+        execute 'sign unplace' a:sy.internal[line].id 'buffer='.a:sy.buffer
+      endif
+      let a:sy.internal[line] = { 'type': type, 'id': id }
+    else
+      let a:sy.external[line] = id
+    endif
+  endfor
+endfunction
+
+
+" #process_diff {{{1
+function! sy#sign#process_diff(sy, vcs, diff) abort
+  let a:sy.signtable             = {}
+  let a:sy.hunks                 = []
+  let [added, modified, deleted] = [0, 0, 0]
+
+  call sy#sign#get_current_signs(a:sy)
+
+  " Determine where we have to put our signs.
+  for line in filter(a:diff, 'v:val =~ "^@@ "')
+    let a:sy.lines = []
+    let ids        = []
+
+    let [old_line, old_count, new_line, new_count] = sy#sign#parse_hunk(line)
+
+    " Workaround for non-conventional diff output in older Fossil versions:
+    " https://fossil-scm.org/forum/forumpost/834ce0f1e1
+    " Fixed as of: https://fossil-scm.org/index.html/info/7fd2a3652ea7368a
+    if a:vcs == 'fossil' && new_line == 0
+      let new_line = old_line - 1 - deleted
+    endif
+
+    " Pure add:
+
+    " @@ -5,0 +6,2 @@ this is line 5
+    " +this is line 5
+    " +this is line 5
+    if (old_count == 0) && (new_count >= 1)
+      let added += new_count
+      let offset = 0
+      while offset < new_count
+        let line    = new_line + offset
+        let offset += 1
+        if s:external_sign_present(a:sy, line) | continue | endif
+        call add(ids, s:add_sign(a:sy, line, 'SignifyAdd'))
+      endwhile
+
+    " Pure delete
+
+    " @@ -6,2 +5,0 @@ this is line 5
+    " -this is line 6
+    " -this is line 7
+    elseif (old_count >= 1) && (new_count == 0)
+      if s:external_sign_present(a:sy, new_line) | continue | endif
+      let deleted += old_count
+      if new_line == 0
+        call add(ids, s:add_sign(a:sy, 1, 'SignifyRemoveFirstLine'))
+      elseif s:sign_show_count
+        let text = s:sign_delete . (old_count <= 99 ? old_count : '>')
+        while strwidth(text) > 2
+          let text = substitute(text, '.', '', '')
+        endwhile
+        call add(ids, s:add_sign(a:sy, new_line, 'SignifyDelete'. old_count, text))
+      else
+        call add(ids, s:add_sign(a:sy, new_line, 'SignifyDeleteMore', s:sign_delete))
+      endif
+
+    " There are additions and deletions, however we don't know which lines are
+    " 'changed' and which are new so we just show the whole block as changed.
+    "
+    " With sufficiently smart heuristics we could see which lines are the most
+    " dissimilar to the previous lines and mark them as additions but for now
+    " we will not do that.
+    else
+      let modified += old_count
+      let offset    = 0
+      while offset < new_count
+        let line    = new_line + offset
+        let offset += 1
+        if s:external_sign_present(a:sy, line) | continue | endif
+        call add(ids, s:add_sign(a:sy, line, 'SignifyChange'))
+      endwhile
+    endif
+
+    if !empty(ids)
+      call add(a:sy.hunks, {
+            \ 'ids'  : ids,
+            \ 'start': a:sy.lines[0],
+            \ 'end'  : a:sy.lines[-1] })
+    endif
+  endfor
+
+  " Remove obsoleted signs.
+  for line in filter(keys(a:sy.internal), '!has_key(a:sy.signtable, v:val)')
+    execute 'sign unplace' a:sy.internal[line].id 'buffer='.a:sy.buffer
+  endfor
+
+  if empty(a:sy.updated_by) && empty(a:sy.hunks)
+    call sy#verbose('Successful exit value, but no diff. Keep VCS for time being.', a:vcs)
+    return
+  endif
+
+  call sy#verbose('Signs updated.', a:vcs)
+  let a:sy.updated_by = a:vcs
+  if len(a:sy.vcs) > 1
+    call sy#verbose('Disable all other VCS.', a:vcs)
+    let a:sy.vcs = [a:vcs]
+  endif
+
+  let a:sy.stats = [added, modified, deleted]
+endfunction
+
+" #remove_all_signs {{{1
+function! sy#sign#remove_all_signs(bufnr) abort
+  let sy = getbufvar(a:bufnr, 'sy')
+
+  for hunk in sy.hunks
+    for id in hunk.ids
+      execute 'sign unplace' id 'buffer='.a:bufnr
+    endfor
+  endfor
+
+  let sy.hunks = []
+endfunction
+
+" #parse_hunk {{{1
+" Parse a hunk as '@@ -273,3 +267,14' into [old_line, old_count, new_line, new_count]
+function! sy#sign#parse_hunk(diffline) abort
+  let tokens = matchlist(a:diffline, '^@@ -\v(\d+),?(\d*) \+(\d+),?(\d*)')
+  return [
+        \ str2nr(tokens[1]),
+        \ empty(tokens[2]) ? 1 : str2nr(tokens[2]),
+        \ str2nr(tokens[3]),
+        \ empty(tokens[4]) ? 1 : str2nr(tokens[4])
+        \ ]
+endfunction
+
+" #set_signs {{{1
+function! sy#sign#set_signs(sy, vcs, diff) abort
+  call sy#verbose('sy#sign#set_signs()', a:vcs)
+
+  if a:sy.stats == [-1, -1, -1]
+    let a:sy.stats = [0, 0, 0]
+  endif
+
+  if empty(a:diff)
+    call sy#verbose('No changes found.', a:vcs)
+    let a:sy.stats = [0, 0, 0]
+    call sy#sign#remove_all_signs(a:sy.buffer)
+    return
+  endif
+
+  if get(g:, 'signify_line_highlight')
+    call sy#highlight#line_enable()
+  else
+    call sy#highlight#line_disable()
+  endif
+
+  call sy#sign#process_diff(a:sy, a:vcs, a:diff)
+
+  if exists('#User#Signify')
+    doautocmd <nomodeline> User Signify
+  endif
+endfunction
+
+" s:add_sign {{{1
+function! s:add_sign(sy, line, type, ...) abort
+  call add(a:sy.lines, a:line)
+  let a:sy.signtable[a:line] = 1
+
+  if has_key(a:sy.internal, a:line)
+    " There is a sign on this line already.
+    if a:type == a:sy.internal[a:line].type
+      " Keep current sign since the new one is of the same type.
+      return a:sy.internal[a:line].id
+    else
+      " Update sign by overwriting the ID of the current sign.
+      let id = a:sy.internal[a:line].id
+    endif
+  endif
+
+  if !exists('id')
+    let id = sy#sign#id_next(a:sy)
+  endif
+
+  if a:type =~# 'SignifyDelete'
+    execute printf('sign define %s text=%s texthl=SignifySignDelete linehl=%s',
+          \ a:type,
+          \ a:1,
+          \ s:delete_highlight[g:signify_line_highlight])
+  endif
+  execute printf('sign place %d line=%d name=%s buffer=%s',
+        \ id,
+        \ a:line,
+        \ a:type,
+        \ a:sy.buffer)
+
+  return id
+endfunction
+
+" s:external_sign_present {{{1
+function! s:external_sign_present(sy, line) abort
+  if has_key(a:sy.external, a:line)
+    if has_key(a:sy.internal, a:line)
+      " Remove Sy signs from lines with other signs.
+      execute 'sign unplace' a:sy.internal[a:line].id 'buffer='.a:sy.buffer
+    endif
+    return 1
+  endif
+endfunction
diff --git a/pack/ui/start/signify/autoload/sy/util.vim b/pack/ui/start/signify/autoload/sy/util.vim
new file mode 100644
index 0000000..e8a516e
--- /dev/null
+++ b/pack/ui/start/signify/autoload/sy/util.vim
@@ -0,0 +1,191 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+" #escape {{{1
+function! sy#util#escape(path) abort
+  if exists('+shellslash')
+    let old_ssl = &shellslash
+    if fnamemodify(&shell, ':t') == 'cmd.exe'
+      set noshellslash
+    else
+      set shellslash
+    endif
+  endif
+
+  let path = shellescape(a:path)
+
+  if exists('old_ssl')
+    let &shellslash = old_ssl
+  endif
+
+  return path
+endfunction
+
+" #refresh_windows {{{1
+function! sy#util#refresh_windows() abort
+  if exists('*win_getid')
+    let winid = win_getid()
+  else
+    let winnr = winnr()
+  endif
+
+  if !get(g:, 'signify_cmdwin_active')
+    for bufnr in tabpagebuflist()
+      call sy#start({'bufnr': bufnr})
+    endfor
+  endif
+
+  if exists('winid')
+    call win_gotoid(winid)
+  else
+    execute winnr .'wincmd w'
+  endif
+endfunction
+
+" #hunk_text_object {{{1
+function! sy#util#hunk_text_object(emptylines) abort
+  execute sy#util#return_if_no_changes()
+
+  let lnum  = line('.')
+  let hunks = filter(copy(b:sy.hunks), 'v:val.start <= lnum && v:val.end >= lnum')
+
+  if empty(hunks)
+    echomsg 'signify: Here is no hunk.'
+    return
+  endif
+
+  execute hunks[0].start
+  normal! V
+
+  if a:emptylines
+    let lnum = hunks[0].end
+    while getline(lnum+1) =~ '^$'
+      let lnum += 1
+    endwhile
+    execute lnum
+  else
+    execute hunks[0].end
+  endif
+endfunction
+
+" #shell_redirect {{{1
+function! sy#util#shell_redirect(path) abort
+  " if shellredir contains a %s it is replaced with the path
+  " otherwise, just append it (from :help shellredir:
+  "   The name of the temporary file can be represented by '%s' if necessary
+  "   (the file name is appended automatically if no %s appears in the value
+  "   of this option)
+  if &shellredir =~# '%s'
+    return substitute(&shellredir, '\C%s', a:path, 'g')
+  else
+    return &shellredir .' '. a:path
+  endif
+endfunction
+
+" #chdir {{{1
+function! sy#util#chdir() abort
+  let chdir = haslocaldir()
+        \ ? 'lcd'
+        \ : (exists(':tcd') && haslocaldir(-1, 0)) ? 'tcd' : 'cd'
+  return [getcwd(), chdir]
+endfunction
+
+" #return_if_no_changes {{{1
+function! sy#util#return_if_no_changes() abort
+  if !exists('b:sy') || empty(b:sy.hunks)
+    echomsg 'signify: There are no changes.'
+    return 'return'
+  endif
+  return ''
+endfunction
+
+" #execute {{{1
+function! sy#util#execute(cmd) abort
+  let lang = v:lang
+  redir => output
+    silent! execute a:cmd
+  redir END
+  silent! execute 'language message' lang
+  return output
+endfunction
+
+let s:popup_window = 0
+
+" #popup_close {{{1
+function! sy#util#popup_close() abort
+  if s:popup_window
+    call nvim_win_close(s:popup_window, 1)
+    let s:popup_window = 0
+  endif
+endfunction
+
+" #popup_create {{{1
+function! sy#util#popup_create(hunkdiff) abort
+  let offset      = s:offset()
+  let winline     = winline()
+  let min_height  = 6
+  let max_height  = winheight('%') - winline
+  let diff_height = len(a:hunkdiff)
+  let height      = min([diff_height, max_height])
+
+  if diff_height > max_height && max_height < min_height
+    let max_scroll = min_height - max_height
+    let scroll     = min([max_scroll, diff_height - max_height])
+    " Old versions don't have feedkeys(..., 'x')
+    execute 'normal!' scroll.''
+    let winline -= scroll
+    let height  += scroll
+  endif
+
+  let padding = repeat(' ', offset - 1)
+
+  if exists('*nvim_open_win')
+    call sy#util#popup_close()
+    let buf = nvim_create_buf(0, 1)
+    call nvim_buf_set_option(buf, 'syntax', 'diff')
+    call nvim_buf_set_lines(buf, 0, -1, 0, map(a:hunkdiff, 'v:val[0].padding.v:val[1:]'))
+    let s:popup_window = nvim_open_win(buf, v:false, {
+          \ 'relative': 'win',
+          \ 'row': winline,
+          \ 'col': 0,
+          \ 'width': winwidth('%'),
+          \ 'height': height,
+          \ })
+    call nvim_win_set_option(s:popup_window, 'cursorline', v:false)
+    call nvim_win_set_option(s:popup_window, 'foldcolumn', 0)
+    call nvim_win_set_option(s:popup_window, 'foldenable', v:false)
+    call nvim_win_set_option(s:popup_window, 'number', v:false)
+    call nvim_win_set_option(s:popup_window, 'relativenumber', v:false)
+    call nvim_win_set_option(s:popup_window, 'wrap', v:true)
+    autocmd CursorMoved * ++once call sy#util#popup_close()
+  elseif exists('*popup_create')
+    let s:popup_window = popup_create(map(a:hunkdiff, 'v:val[0].padding.v:val[1:]'), {
+          \ 'line': 'cursor+1',
+          \ 'col': 0,
+          \ 'minwidth': winwidth('%'),
+          \ 'maxheight': height,
+          \ 'moved': 'any',
+          \ 'zindex': 1000,
+          \ })
+    call setbufvar(winbufnr(s:popup_window), '&syntax', 'diff')
+  else
+    return 0
+  endif
+
+  return 1
+endfunction
+
+" s:offset {{{1
+function! s:offset() abort
+  let offset = &foldcolumn
+  let offset += 2  " FIXME: Find better way to calculate the sign column width.
+  if &number
+    let l = len(line('$')) + 1
+    let offset += (&numberwidth > l) ? &numberwidth : l
+  elseif &relativenumber
+    let l = len(winheight('%')) + 1
+    let offset += (&numberwidth > l) ? &numberwidth : l
+  endif
+  return offset
+endfunction
diff --git a/pack/ui/start/signify/doc/signify.txt b/pack/ui/start/signify/doc/signify.txt
new file mode 100644
index 0000000..b6d2f9d
--- /dev/null
+++ b/pack/ui/start/signify/doc/signify.txt
@@ -0,0 +1,666 @@
+*signify.txt* Indicate changed lines within a file using a VCS.
+*signify*
+>
+                                              ___
+                    __                  __  /'___\
+               ____/\_\     __     ___ /\_\/\ \__/  __  __
+              /',__\/\ \  /'_ `\ /' _ `\/\ \ \ ,__\/\ \/\ \
+             /\__, `\ \ \/\ \L\ \/\ \/\ \ \ \ \ \_/\ \ \_\ \
+             \/\____/\ \_\ \____ \ \_\ \_\ \_\ \_\  \/`____ \
+              \/___/  \/_/\/___L\ \/_/\/_/\/_/\/_/   `/___/> \
+                            /\____/                     /\___/
+                            \_/__/                      \/__/
+<
+  by Marco Hinz~
+
+==============================================================================
+TOC                                                           *signify-contents*
+
+  INTRO .......................... |signify-intro|
+  MODUS OPERANDI ................. |signify-modus-operandi|
+  DEBUG .......................... |signify-debug|
+  SIGNS .......................... |signify-signs|
+  OPTIONS ........................ |signify-options|
+  COMMANDS ....................... |signify-commands|
+  AUTOCMDS ....................... |signify-autocmds|
+  EVENTS ......................... |signify-events|
+  MAPPINGS ....................... |signify-mappings|
+  COLORS ......................... |signify-colors|
+  FAQ ............................ |signify-faq|
+  EXAMPLE ........................ |signify-example|
+
+==============================================================================
+INTRO                                                            *signify-intro*
+
+Signify uses the sign column to indicate added, modified and removed lines
+based on the data of an underlying version control system.
+
+Supported VCS:~
+>
+    git
+    mercurial
+    darcs
+    bzr
+    subversion
+    cvs
+    rcs
+    fossil
+    accurev
+    perforce
+    tfs
+    yadm
+<
+==============================================================================
+MODUS OPERANDI                                          *signify-modus-operandi*
+
+When you open a new buffer, Sy registers it as `active` and tries to figure out
+whether the underlying file is controlled by a VCS (version control system) or
+not.
+
+For that, it asynchronously tries all the `diff` sub commands of all the VCS
+tools that are supported and executable.
+
+If one of the checks produces a proper diff, that VCS will automatically be
+used for all successive calls to Sy.
+
+See |signify-autocmds| for when signs get updated.
+
+If none of the checks produces a proper diff, the VCS will be set to `unknown`.
+The next time Sy gets run, the buffer will be marked as `inactive`, so it won't
+look for changes anymore.
+
+Or you set |g:signify_disable_by_default|, which registers all new buffers as
+`inactive`, and enable Sy on demand using |signify-:SignifyToggle|.
+
+Use |signify-:SignifyList| to list all buffers managed by Sy and their current
+state.
+
+==============================================================================
+DEBUG                                                            *signify-debug*
+
+If signs aren't showing up as expected, see if |signify-:SignifyDebug| shows
+anything suspicious. It will try all VCS and shows either errors or a diff for
+each VCS.
+
+If the output looks fine though, create an issue on GitHub:
+
+    https://github.com/mhinz/vim-signify/issues/new
+
+Make sure to mention your Vim version and which Sy version you use (latest
+release or master).
+
+Additionally, include the output of |:messages| after executing one of the
+following:
+
+    - opening the buffer via `vim -V1 <file>`
+    - or running `:verb w` in the buffer
+
+==============================================================================
+SIGNS                                                            *signify-signs*
+
+    `+`     This line was added.
+
+    `!`     This line was modified.
+
+    `_1`    The number of deleted lines below this sign. If the number is larger
+    `99`    than 9, the `_` will be omitted. For numbers larger than 99, `_>`
+    `_>`    will be shown instead.
+
+    `!1`    This line was modified and the lines below were deleted.
+    `!>`    It is a combination of `!` and `_`. If the number is larger than 9,
+          `!>` will be shown instead.
+
+    `‾`     The first line was removed. It's a special case of the `_` sign.
+
+See |g:signify_sign_add| on how to use different signs.
+
+==============================================================================
+OPTIONS                                                        *signify-options*
+
+Put these variables into your vimrc. The provided examples also indicate the
+default values, as long as no "Default:" section is given.
+
+    |g:signify_vcs_cmds|
+    |g:signify_vcs_cmds_diffmode|
+    |g:signify_disable_by_default|
+    |g:signify_skip_filetype|
+    |g:signify_skip_filename|
+    |g:signify_skip_filename_pattern|
+    |g:signify_line_highlight|
+    |g:signify_sign_add|
+    |g:signify_sign_delete|
+    |g:signify_sign_delete_first_line|
+    |g:signify_sign_change|
+    |g:signify_sign_show_count|
+    |g:signify_sign_show_text|
+    |g:signify_difftool|
+    |g:signify_fold_context|
+
+------------------------------------------------------------------------------
+                                                            *g:signify_vcs_cmds*  >
+    let g:signify_vcs_cmds = {
+        \ 'cvs': 'cvs -d '. $CVSROOT .' diff -U0 -- %f' }
+<
+The command to use for updating signs in an `unmodified` buffer, thus when the
+buffer is in sync with the file on disk.
+
+By default, it returns a diff for all the changes since the last commit.
+
+The key can be any from this list:
+
+    git
+    yadm
+    hg
+    svn
+    darcs
+    bzr
+    fossil
+    cvs
+    rcs
+    accurev
+    perforce
+    tfs
+
+Modifiers:~
+
+    %f       actual filepath
+    %d       |g:signify_difftool|
+    %n       Unix: `/dev/null`, Windows: `NUL`
+
+Redirection: Instead of `>foo` use `sy#util#shell_redirect('foo')`. This
+helper function takes 'shellredir' into account.
+
+The output format mustn't change, otherwise Sy won't give any reasonable
+results. It's probably wise to start with the respective default values.
+
+If your VCS program is not in `$PATH` and you have to specify an absolute path,
+escape spaces by quoting, e.g.:
+>
+    let g:signify_vcs_cmds = {
+      \ 'git': '"C:\Program Files (x86)\Git\bin\git.exe" diff --no-color --no-ext-diff -U0 -- %f'
+      \ }
+<
+NOTE: Always test these commands on the shell first and make sure that no
+colors are emitted. Our parser expects lines in the diff output to start with
+"@@", but with colors the line starts with escape sequences instead.
+
+Default:
+>
+    let g:signify_vcs_cmds = {
+      \ 'git':      'git diff --no-color --no-ext-diff -U0 -- %f',
+      \ 'yadm':     'yadm diff --no-color --no-ext-diff -U0 -- %f',
+      \ 'hg':       'hg diff --color=never --config aliases.diff= --nodates -U0 -- %f',
+      \ 'svn':      'svn diff --diff-cmd %d -x -U0 -- %f',
+      \ 'bzr':      'bzr diff --using %d --diff-options=-U0 -- %f',
+      \ 'darcs':    'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f',
+      \ 'fossil':   'fossil diff --unified -c 0 -- %f',
+      \ 'cvs':      'cvs diff -U0 -- %f',
+      \ 'rcs':      'rcsdiff -U0 %f 2>%n',
+      \ 'accurev':  'accurev diff %f -- -U0',
+      \ 'perforce': 'p4 info '. sy#util#shell_redirect('%n') . (has('win32') ? ' &&' : ' && env P4DIFF= P4COLORS=') .' p4 diff -du0 %f',
+      \ 'tfs':      'tf diff -version:W -noprompt -format:Unified %f'
+      \ }
+<
+------------------------------------------------------------------------------
+                                                   *g:signify_vcs_cmds_diffmode*  >
+    let g:signify_vcs_cmds_diffmode = {
+      \ 'git':      'git show HEAD:./%f',
+      \ 'yadm':     'yadm show HEAD:./%f',
+      \ 'hg':       'hg cat %f',
+      \ 'svn':      'svn cat %f',
+      \ 'bzr':      'bzr cat %f',
+      \ 'darcs':    'darcs show contents -- %f',
+      \ 'fossil':   'fossil cat %f',
+      \ 'cvs':      'cvs up -p -- %f 2>%n',
+      \ 'rcs':      'co -q -p %f',
+      \ 'accurev':  'accurev cat %f',
+      \ 'perforce': 'p4 print %f',
+      \ 'tfs':      'tf view -version:W -noprompt %f',
+      \ }
+<
+The command to use for updating signs in a `modified` buffer, thus when the
+buffer is `not` in sync with the file on disk. Also for |signify-:SignifyDiff|.
+
+By default, it returns the file as of the last commit. Thus without any of the
+current changes in the buffer.
+
+Works the same as |g:signify_vcs_cmds|.
+
+------------------------------------------------------------------------------
+                                                  *g:signify_disable_by_default*  >
+    let g:signify_disable_by_default = 0
+<
+This makes Sy not looking for changes for each new buffer. You can easily
+enable it later using |signify-:SignifyToggle|.
+
+------------------------------------------------------------------------------
+                                               *g:signify_skip_filename_pattern*
+                                                       *g:signify_skip_filename*
+                                                       *g:signify_skip_filetype*
+>
+    let g:signify_skip_filetype = { 'vim': 1, 'c': 1 }
+    let g:signify_skip_filename = { '/home/user/.vimrc': 1 }
+<
+Don't activate the plugin for these filetypes and/or filenames. Filenames have
+to be absolute paths.
+
+These options must be |Dict|s for faster lookup.
+>
+    let g:signify_skip_filename_pattern = [ 'foo.*bar', 'tmp' ]
+<
+Don't activate the plugin for filenames matching these patterns.
+
+Default: <none>
+
+------------------------------------------------------------------------------
+                                                      *g:signify_line_highlight*  >
+    let g:signify_line_highlight = 0
+<
+Enable line highlighting in addition to using signs by default.
+
+------------------------------------------------------------------------------
+                                              *g:signify_sign_add*
+                                              *g:signify_sign_delete*
+                                              *g:signify_sign_delete_first_line*
+                                              *g:signify_sign_change*
+>
+    let g:signify_sign_add               = '+'
+    let g:signify_sign_delete            = '_'
+    let g:signify_sign_delete_first_line = '‾'
+    let g:signify_sign_change            = '!'
+<
+The sign to use if a line was added, deleted or changed or a combination of
+these.
+
+You can use Unicode characters, but signs must not take up more than two
+cells. Otherwise, |E239| is thrown.
+
+------------------------------------------------------------------------------
+                                                     *g:signify_sign_show_count*  >
+    let g:signify_sign_show_count = 1
+<
+Add the number of deleted lines to |g:signify_sign_delete| (up to 99).
+Otherwise, only the usual sign text will be shown.
+
+------------------------------------------------------------------------------
+                                                      *g:signify_sign_show_text*  >
+    let g:signify_sign_show_text = 1
+<
+Don't show any text in the sign column. (Actually it will show a non-breaking
+space.)
+
+This is useful if you only want to see colors instead. If your colorscheme
+doesn't do it for you, you can set the background color of a particular sign
+yourself: |signify-colors|.
+
+If you want no sign column at all and use Vim 7.4.2201+, use 'signcolumn'.
+
+------------------------------------------------------------------------------
+                                                            *g:signify_difftool*  >
+    let g:signify_difftool = 'gnudiff'
+<
+This will avoid the attempt to find the proper diff tool for version control
+systems that rely on an external diff tool that supports the -U0 flag. These
+are: svn, bzr, darcs, fossil.
+
+Default: "diff"
+
+------------------------------------------------------------------------------
+                                                        *g:signify_fold_context*  >
+    let g:signify_fold_context = [0, 3]
+<
+This changes the number of lines of context that |signify-:SignifyFold| should
+use. The first element describes the context at foldlevel 0 and the second the
+context at foldlevel 1.
+
+Example:~
+
+Using "[0,3]" means that after using :SignifyFold, only changed lines will be
+unfolded. Using |zo| (and similar |fold-commands|) on a folded line will reveal
+3 more lines of context. Using |zo| a second time will reveal everything.
+
+Default: [3, 8]
+
+==============================================================================
+COMMAND                                                       *signify-commands*
+                                                        *signify-:SignifyEnable*  >
+    :SignifyEnable
+<
+Enable the plugin for the current buffer only.
+
+Can also be used to when a repository was initialized while Sy was already
+loaded.
+
+------------------------------------------------------------------------------
+                                                       *signify-:SignifyDisable*  >
+    :SignifyDisable
+<
+Disable the plugin for the current buffer only.
+
+------------------------------------------------------------------------------
+                                                        *signify-:SignifyToggle*  >
+    :SignifyToggle
+<
+Toggle the plugin for the current buffer only.
+
+------------------------------------------------------------------------------
+                                               *signify-:SignifyToggleHighlight*  >
+    :SignifyToggleHighlight
+<
+Toggle line highlighting for lines containing changes.
+
+------------------------------------------------------------------------------
+                                                       *signify-:SignifyRefresh*  >
+    :SignifyRefresh
+<
+Refresh signs in all windows.
+
+NOTE: Nothing will happen, if :SignifyRefresh is used from the |cmdline-window|.
+
+------------------------------------------------------------------------------
+                                                          *signify-:SignifyDiff*  >
+    :SignifyDiff[!]
+<
+Open a new tab with two windows using |diff-mode| to show the differences
+between the current file and its version that was last checked in.
+
+With [!], no new tab will be opened.
+
+Also see |g:signify_vcs_cmds_diffmode|.
+
+------------------------------------------------------------------------------
+                                                          *signify-:SignifyFold*  >
+    :SignifyFold[!]
+<
+Open the current buffer in a new tab page and set 'foldexpr' so that only
+changed lines with their surrounding context are unfolded.
+
+The number of lines per context can be changed via |g:signify_fold_context|.
+
+The |foldtext| will be set so that the left side shows the first line in the
+fold and the right side shows something like "50 [1]" which whereas "50"
+stands for the number of folded lines and the "1" is the 'foldlevel'.
+
+If [!] is given, Sy will do the same without opening an extra tab page.
+Another ":SignifyFold!" will toggle back to the previous settings.
+
+See |folds| to learn more about folding.
+
+------------------------------------------------------------------------------
+                                                      *signify-:SignifyHunkDiff*  >
+    :SignifyHunkDiff
+<
+Used on a line with a change, this will show a diff of the hunk in a floating
+window (Nvim), popup (Vim), or preview window (fallback).
+
+------------------------------------------------------------------------------
+                                                      *signify-:SignifyHunkUndo*  >
+    :SignifyHunkUndo
+<
+Used on a line with a change, this will restore the hunk to the base version.
+This effectively undoes the changes that |signify-:SignifyHunkDiff| would show.
+
+------------------------------------------------------------------------------
+                                                          *signify-:SignifyList*  >
+    :SignifyList
+<
+Outputs debug info for all managed buffers.
+
+------------------------------------------------------------------------------
+                                                         *signify-:SignifyDebug*  >
+    :SignifyDebug
+<
+In case no signs are shown, although the buffer contains a file controlled by
+a supported VCS, use this command.
+
+It will show all tried commands and their output. Errors will be highlighted
+via |hl-ErrorMsg|.
+
+==============================================================================
+AUTOCMDS                                                      *signify-autocmds*
+
+By default, signs get updated on these events:
+
+    |BufEnter|      Opening or switching to another buffer.
+    |WinEnter|      Opening or switching to another window.
+    |BufWritePost|  Saving a buffer.
+    |FocusGained|   When the window containing Vim gains focus. Updates signs
+                  for all Vim windows. This event fires for all GUIs and even
+                  a few terminal emulators.
+                  For tmux, use this: `set-option -g focus-events on`
+    |CursorHold|    After 'updatetime' milliseconds without moving the cursor
+                  in normal mode.
+    |CursorHoldI|   After 'updatetime' milliseconds without moving the cursor
+                  in insert mode.
+    |ShellCmdPost|  After shelling out via |:!|. Think `:!git commit -m foo`
+    |VimResume|     After suspending Vim with `<c-z>`, then doing things in
+                  the shell, and resuming to Vim via `fg`. Only Neovim.
+
+See all of them with:
+>
+    :au signify
+<
+You can disable sign updating for certain events:
+>
+    autocmd User SignifySetup autocmd! signify CursorHold,CursorHoldI
+<
+If you don't need immediate feedback or responses from your VCS are slow, then
+use this to only update signs when writing the buffer:
+>
+    autocmd User SignifySetup
+          \ exe 'au! signify' | au signify BufWritePost * call sy#start()
+<
+==============================================================================
+EVENTS                                                          *signify-events*
+
+Signify fires these user events:
+
+User SignifySetup~
+
+    This event fires at the end of `plugin/signify.vim`, in case you want to
+    change any of the default autocmds, commands, or mappings.
+
+User Signify~
+
+    This event fires when Sy updated the signs.
+
+Hook into these user events like this:
+>
+    autocmd User Signify echomsg 'updated!'
+<
+NOTE: Autocmds don't nest by default. If you use any command that triggers
+other events, make sure to use |autocmd-nested|.
+
+==============================================================================
+MAPPINGS                                                      *signify-mappings*
+
+------------------------------------------------------------------------------
+Hunk jumping:~
+
+    ]c   Jump to the next hunk.
+    [c   Jump to the previous hunk.
+
+    ]C   Jump to the last hunk.
+    [C   Jump to the first hunk.
+
+These keys only get mapped by default when:
+
+  - The keys are not mapped already (by you or another plugin).
+  - There are no other keys that are mapped to do the same (to avoid duplicate
+    mappings).
+
+Mapping other keys:
+>
+    nmap <leader>gj <plug>(signify-next-hunk)
+    nmap <leader>gk <plug>(signify-prev-hunk)
+    nmap <leader>gJ 9999<leader>gj
+    nmap <leader>gK 9999<leader>gk
+<
+------------------------------------------------------------------------------
+Hunk text object:~
+>
+    omap ic <plug>(signify-motion-inner-pending)
+    xmap ic <plug>(signify-motion-inner-visual)
+    omap ac <plug>(signify-motion-outer-pending)
+    xmap ac <plug>(signify-motion-outer-visual)
+<
+"ic" operates on all lines of the current hunk. "ac" does the same, but also
+removes all trailing empty lines.
+
+NOTE: Don't be surprised that this also works with "deleted lines".
+
+==============================================================================
+COLORS                                                          *signify-colors*
+
+This plugin defines highlighting groups for two different places: for lines
+and signs. Per default these don't exist but are linked to the standard
+highlighting groups: |hl-DiffAdd|, |hl-DiffChange|, |hl-DiffDelete|:
+>
+    highlight link SignifyLineAdd             DiffAdd
+    highlight link SignifyLineChange          DiffChange
+    highlight link SignifyLineDelete          DiffDelete
+    highlight link SignifyLineDeleteFirstLine SignifyLineDelete
+
+    highlight link SignifySignAdd             DiffAdd
+    highlight link SignifySignChange          DiffChange
+    highlight link SignifySignDelete          DiffDelete
+    highlight link SignifySignDeleteFirstLine SignifySignDelete
+<
+Thus if you do not want to change the standard highlighting groups, but want
+different colors for either your signs or lines, you can overwrite these
+highlighting groups in your vimrc.
+
+Assuming you prefer |hl-DiffText| over |hl-DiffChange| for changed lines:
+>
+    highlight link SignifyLineChange DiffText
+<
+Example configuration #1:~
+>
+    highlight SignifySignAdd    ctermfg=green  guifg=#00ff00 cterm=NONE gui=NONE
+    highlight SignifySignDelete ctermfg=red    guifg=#ff0000 cterm=NONE gui=NONE
+    highlight SignifySignChange ctermfg=yellow guifg=#ffff00 cterm=NONE gui=NONE
+<
+Example configuration #2:~
+>
+    let g:signify_sign_show_text = 0
+
+    highlight SignifySignAdd                  ctermbg=green                guibg=#00ff00
+    highlight SignifySignDelete ctermfg=black ctermbg=red    guifg=#ffffff guibg=#ff0000
+    highlight SignifySignChange ctermfg=black ctermbg=yellow guifg=#000000 guibg=#ffff00
+<
+Note: For Unix people there is a small script in the repo, showcolors.bash,
+that shows all 256 colors available in the terminal. That makes picking the
+right numbers much easier.
+
+Default highlight groups:~
+
+The sign column (often mistakenly called "gutter") itself (all lines without
+signs) is highlighted by |hl-SignColumn|. Some colorschemes define no background
+color for |hl-Normal| but for |hl-SignColumn|. To avoid that visible difference:
+>
+    highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE
+<
+==============================================================================
+FAQ                                                                *signify-faq*
+
+    |signify-faq-01|  How to display changes in the statusline?
+    |signify-faq-02|  The plugin is slow!
+    |signify-faq-03|  Line highlighting without showing signs?
+
+------------------------------------------------------------------------------
+                                                                *signify-faq-01*
+How to display changes in the statusline?~
+
+Use either of the following two functions. Both take an optional buffer number
+and default to the current one.
+
+  - sy#repo#get_stats(...)~
+
+    Returns a list with the number of added, modified, and removed lines.
+
+  - sy#repo#get_stats_decorated(...)~
+
+    Similar to sy#repo#get_stats(), but with added decorations.
+    Example: "[+3 -8 ~5]"
+
+Using 'statusline':
+>
+    function! MyStatusline()
+      return ' %f '. sy#repo#get_stats_decorated()
+    endfunction
+
+    set statusline=%!MyStatusline()
+<
+The above is the short form of:
+>
+    function! s:sy_stats_wrapper()
+      let [added, modified, removed] = sy#repo#get_stats()
+      let symbols = ['+', '-', '~']
+      let stats = [added, removed, modified]  " reorder
+      let statline = ''
+
+      for i in range(3)
+        if stats[i] > 0
+          let statline .= printf('%s%s ', symbols[i], stats[i])
+        endif
+      endfor
+
+      if !empty(statline)
+        let statline = printf('[%s]', statline[:-2])
+      endif
+
+      return statline
+    endfunction
+
+    function! MyStatusline()
+      return ' %f '. s:sy_stats_wrapper()
+    endfunction
+
+    set statusline=%!MyStatusline()
+<
+------------------------------------------------------------------------------
+                                                                *signify-faq-02*
+The plugin is slow!~
+
+  * Sy relies on external tools. Check if these are the bottleneck.
+
+    If you use a centralized VCS like Subversion, is the connection to the
+    server slow?
+
+    If you use a decentralized VCS like Git, are you working on a slow remote
+    file system?
+
+  * Vim's sign handling code is known to be slow. If the delay is very long,
+    chances are the diff is just huge. This often happens after adding (or
+    removing) a huge file to the repo.
+
+------------------------------------------------------------------------------
+                                                                *signify-faq-03*
+Line highlighting without showing signs?~
+
+The line highlighting relies on signs being placed. The sign column is being
+shown automatically if there are placed signs.
+
+With a recent Vim, you can change that behavior using 'signcolumn'.
+
+==============================================================================
+EXAMPLE                                                        *signify-example*
+
+An example configuration for Sy:
+>
+    nnoremap <leader>gd :SignifyDiff<cr>
+    nnoremap <leader>gp :SignifyHunkDiff<cr>
+    nnoremap <leader>gu :SignifyHunkUndo<cr>
+
+    " hunk jumping
+    nmap <leader>gj <plug>(signify-next-hunk)
+    nmap <leader>gk <plug>(signify-prev-hunk)
+
+    " hunk text object
+    omap ic <plug>(signify-motion-inner-pending)
+    xmap ic <plug>(signify-motion-inner-visual)
+    omap ac <plug>(signify-motion-outer-pending)
+    xmap ac <plug>(signify-motion-outer-visual)
+<
+==============================================================================
+vim: et tw=78
diff --git a/pack/ui/start/signify/pictures/signify-demo.gif b/pack/ui/start/signify/pictures/signify-demo.gif
new file mode 100644
index 0000000..4aa09d9
Binary files /dev/null and b/pack/ui/start/signify/pictures/signify-demo.gif differ
diff --git a/pack/ui/start/signify/pictures/signify-logo.png b/pack/ui/start/signify/pictures/signify-logo.png
new file mode 100644
index 0000000..ed4cdb3
Binary files /dev/null and b/pack/ui/start/signify/pictures/signify-logo.png differ
diff --git a/pack/ui/start/signify/plugin/signify.vim b/pack/ui/start/signify/plugin/signify.vim
new file mode 100644
index 0000000..8095c8d
--- /dev/null
+++ b/pack/ui/start/signify/plugin/signify.vim
@@ -0,0 +1,94 @@
+" vim: et sw=2 sts=2 fdm=marker
+
+scriptencoding utf-8
+
+if exists('g:loaded_signify') || !has('signs') || &compatible
+  finish
+endif
+
+" Variables {{{1
+let g:loaded_signify = 1
+let g:signify_locked = 0
+
+" Autocmds {{{1
+augroup signify
+  autocmd!
+
+  autocmd BufEnter     * call sy#start()
+  autocmd WinEnter     * call sy#start()
+  autocmd BufWritePost * call sy#start()
+
+  autocmd CursorHold   * call sy#start()
+  autocmd CursorHoldI  * call sy#start()
+
+  autocmd FocusGained  * SignifyRefresh
+
+  autocmd QuickFixCmdPre  *vimgrep* let g:signify_locked = 1
+  autocmd QuickFixCmdPost *vimgrep* let g:signify_locked = 0
+
+  autocmd CmdwinEnter * let g:signify_cmdwin_active = 1
+  autocmd CmdwinLeave * let g:signify_cmdwin_active = 0
+
+  autocmd ShellCmdPost * call sy#start()
+
+  if exists('##VimResume')
+    autocmd VimResume * call sy#start()
+  endif
+
+  if has('gui_running') && has('win32') && argc()
+    " Fix 'no signs at start' race.
+    autocmd GUIEnter * redraw
+  endif
+augroup END
+
+" Commands {{{1
+command! -nargs=0 -bar       SignifyList            call sy#debug#list_active_buffers()
+command! -nargs=0 -bar       SignifyDebug           call sy#repo#debug_detection()
+command! -nargs=0 -bar -bang SignifyFold            call sy#fold#dispatch(<bang>1)
+command! -nargs=0 -bar -bang SignifyDiff            call sy#repo#diffmode(<bang>1)
+command! -nargs=0 -bar       SignifyHunkDiff        call sy#repo#diff_hunk()
+command! -nargs=0 -bar       SignifyHunkUndo        call sy#repo#undo_hunk()
+command! -nargs=0 -bar       SignifyRefresh         call sy#util#refresh_windows()
+command! -nargs=0 -bar       SignifyEnable          call sy#enable()
+command! -nargs=0 -bar       SignifyDisable         call sy#disable()
+command! -nargs=0 -bar       SignifyToggle          call sy#toggle()
+command! -nargs=0 -bar       SignifyToggleHighlight call sy#highlight#line_toggle()
+
+" Mappings {{{1
+let s:cpoptions = &cpoptions
+set cpoptions+=B
+
+" hunk jumping
+nnoremap <silent> <expr> <plug>(signify-next-hunk) &diff
+      \ ? ']c'
+      \ : ":\<c-u>call sy#jump#next_hunk(v:count1)\<cr>"
+nnoremap <silent> <expr> <plug>(signify-prev-hunk) &diff
+      \ ? '[c'
+      \ : ":\<c-u>call sy#jump#prev_hunk(v:count1)\<cr>"
+
+if empty(maparg(']c', 'n')) && !hasmapto('<plug>(signify-next-hunk)', 'n')
+  nmap ]c <plug>(signify-next-hunk)
+  if empty(maparg(']C', 'n')) && !hasmapto('9999]c', 'n')
+    nmap ]C 9999]c
+  endif
+endif
+if empty(maparg('[c', 'n')) && !hasmapto('<plug>(signify-prev-hunk)', 'n')
+  nmap [c <plug>(signify-prev-hunk)
+  if empty(maparg('[C', 'n')) && !hasmapto('9999[c', 'n')
+    nmap [C 9999[c
+  end
+endif
+
+" hunk text object
+onoremap <silent> <plug>(signify-motion-inner-pending) :<c-u>call sy#util#hunk_text_object(0)<cr>
+xnoremap <silent> <plug>(signify-motion-inner-visual)  :<c-u>call sy#util#hunk_text_object(0)<cr>
+onoremap <silent> <plug>(signify-motion-outer-pending) :<c-u>call sy#util#hunk_text_object(1)<cr>
+xnoremap <silent> <plug>(signify-motion-outer-visual)  :<c-u>call sy#util#hunk_text_object(1)<cr>
+
+let &cpoptions = s:cpoptions
+unlet s:cpoptions
+" 1}}}
+
+if exists('#User#SignifySetup')
+  doautocmd <nomodeline> User SignifySetup
+endif
diff --git a/pack/ui/start/signify/showcolors.bash b/pack/ui/start/signify/showcolors.bash
new file mode 100755
index 0000000..3a60b29
--- /dev/null
+++ b/pack/ui/start/signify/showcolors.bash
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if ! hash tput 2>/dev/null; then
+    echo "I cannot find the 'tput' program." \
+        'You might find it in one of the ncurses packages.' >&2
+    exit 1
+fi
+
+for i in {0..255}; do
+    tput setab $i && echo -n " $i "
+done
+
+tput sgr0
+echo
diff --git a/screenshot.png b/screenshot.png
index 2369ca6..398663d 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/vimrc b/vimrc
index d49e8b0..7ab0b39 100644
--- a/vimrc
+++ b/vimrc
@@ -1,35 +1,25 @@
-call pathogen#infect()
 let mapleader = "\<Space>"
 set nocompatible
+set nomodeline
 set viminfo='1000,f1,:1000,/1000
 set history=1000
-
-let pair_program_mode = 0
-
-"------  Visual Options  ------
+set updatetime=1000
+scriptencoding utf-8
+set encoding=utf-8
 syntax on
 set number
 set nowrap
 set vb
 set ruler
 set statusline=%<%f\ %h%m%r%=%{fugitive#statusline()}\ \ %-14.(%l,%c%V%)\ %P
-let g:buftabs_only_basename=1
-let g:buftabs_marker_modified = "+"
-set colorcolumn=120
+set splitbelow
+set splitright
 
 " Toggle whitespace visibility with ,s
 nmap <Leader>s :set list!<CR>
-set listchars=tab:▸\ ,trail:·,extends:❯,precedes:❮,nbsp:×
+set listchars=tab:>\ ,trail:·,extends:»,precedes:«,nbsp:×
 :set list " Enable by default
 
-" <Leader>L = Toggle line numbers
-map <Leader>L :set invnumber<CR>
-
-" New splits open to right and bottom
-set splitbelow
-set splitright
-
-
 "------  Generic Behavior  ------
 set tabstop=4
 set shiftwidth=4
@@ -37,43 +27,43 @@ set hidden
 filetype indent on
 filetype plugin on
 set autoindent
-"set expandtab
-set wildignore=.svn,CVS,.git,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.png,*.xpm,*.gif,node_modules/*
 
 "allow deletion of previously entered data in insert mode
 set backspace=indent,eol,start
 
-" Allow saving of files as sudo when I forgot to start vim using sudo.
-cmap w!! %!sudo tee > /dev/null %
-
-" F2 = Paste Toggle (in insert mode, pasting indented text behavior changes)
-set pastetoggle=<F2>
-
-" The search for the perfect color scheme...
-map <silent> <Leader>x :RandomColorScheme<CR>
-
-" <Leader>v = Paste
-map <Leader>v "+gP
-
-" <Leader>c = Copy
-map <Leader>c "+y
-
-" Accidentally pressing Shift K will no longer open stupid man entry
-noremap K <nop>
-
 " Edit and Reload .vimrc files
 nmap <silent> <Leader>ev :e $MYVIMRC<CR>
 nmap <silent> <Leader>es :so $MYVIMRC<CR>
 
-" When pressing <Leader>cd switch to the directory of the open buffer
-map ,cd :cd %:p:h<CR>
 
+"------  Disable Annoying Features  ------
 " Wtf is Ex Mode anyways?
 nnoremap Q <nop>
 
 " Annoying window
 map q: :q
 
+" Accidentally pressing Shift K will no longer open stupid man entry
+noremap K <nop>
+
+
+"------  Clipboard  ------
+" Allow Shift+Insert to paste
+map <S-Insert> <MiddleMouse>
+map! <S-Insert> <MiddleMouse>
+" set clipboard=unnamedplus
+
+" Copy filename
+:nmap yY :let @" = expand("%")<CR>
+
+" Copy file path
+:nmap yZ :let @" = expand("%:p")<CR>
+
+" F2 = Paste Toggle (in insert mode, pasting indented text behavior changes)
+set pastetoggle=<F2>
+
+
+
 "------  Text Navigation  ------
 " Prevent cursor from moving to beginning of line when switching buffers
 set nostartofline
@@ -87,8 +77,8 @@ noremap L $
 vnoremap L g_
 
 
-"------  Window Navigation  ------
-" <Leader>hljk = Move between windows
+"------  Split Navigation  ------
+" <Leader>hljk = Move between splits
 nnoremap <Leader>h <C-w>h
 nnoremap <Leader>l <C-w>l
 nnoremap <Leader>j <C-w>j
@@ -96,10 +86,8 @@ nnoremap <Leader>k <C-w>k
 
 
 "------  Buffer Navigation  ------
-" Ctrl Left/h & Right/l cycle between buffers
-noremap <silent> <C-left> :bprev<CR>
+" Ctrl+h & Ctrl+l cycle between buffers in the current split
 noremap <silent> <C-h> :bprev<CR>
-noremap <silent> <C-right> :bnext<CR>
 noremap <silent> <C-l> :bnext<CR>
 
 " <Leader>q Closes the current buffer
@@ -111,6 +99,10 @@ nnoremap <silent> <Leader>Q <C-w>c
 " <Leader>Ctrl+q Force Closes the current buffer
 nnoremap <silent> <Leader><C-q> :Bclose!<CR>
 
+" `g f` will open the filepath under the cursor in current split
+" `Ctrl+w f` will open that same filepath in a horizontal split
+" this allows `g F` to open it in a vertical split
+:nnoremap gF :vertical wincmd f<CR>
 
 "------  Searching  ------
 set incsearch
@@ -125,53 +117,35 @@ nnoremap <silent> <leader>b :nohlsearch<CR>
 " <Leader>a will open a prmompt for a term to search for
 noremap <leader>a :Ack 
 
-" <Leader>A will close the new window created for that ack search
-noremap <leader>A <C-w>j<C-w>c<C-w>l
-
-let g:ackprg="ack -H --nocolor --nogroup --column"
-
-" When searching for words with * and navigating with N/n, keep line centered vertically
-"nnoremap n nzz
-"nnoremap N Nzz
-"nnoremap * *zz
-"nnoremap # #zz
-"nnoremap g* g*zz
-"nnoremap g# g#zz
+let g:ackprg="ag --vimgrep --column"
 
 " CtrlP will load from the CWD, makes it easier with all these nested repos
 let g:ctrlp_working_path_mode = ''
 
 " CtrlP won't show results from node_modules
-let g:ctrlp_custom_ignore = '\v[\/](node_modules|coverage|target|dist)|(\.(swp|ico|git|svn))$'
-
-"type S, then type what you're looking for, a /, and what to replace it with
-nmap S :%s//g<LEFT><LEFT>
-vmap S :s//g<LEFT><LEFT>
+let g:ctrlp_custom_ignore = '\v[\/](node_modules|coverage|target|dist)|(\.(swp|ico|git|svn|png|jpg|gif|ttf))$'
 
 
 "------  NERDTree Options  ------
-let NERDTreeIgnore=['CVS','\.dSYM$']
+let NERDTreeIgnore=['.git', '\.swp$', '\.swo$']
 
-"setting root dir in NT also sets VIM's cd
+"setting root dir in NT also sets VIM's cd (useful for switching projects)
 let NERDTreeChDirMode=2
 
 " Toggle visibility using <Leader>n
 noremap <silent> <Leader>n :NERDTreeToggle<CR>
 " Focus on NERDTree using <Leader>m
 noremap <silent> <Leader>m :NERDTreeFocus<CR>
+" Focus on NERDTree with the currently opened file with <Leader>M
+noremap <silent> <Leader>M :NERDTreeFind<CR>
 
 " These prevent accidentally loading files while focused on NERDTree
-autocmd FileType nerdtree noremap <buffer> <c-left> <nop>
 autocmd FileType nerdtree noremap <buffer> <c-h> <nop>
-autocmd FileType nerdtree noremap <buffer> <c-right> <nop>
 autocmd FileType nerdtree noremap <buffer> <c-l> <nop>
 
 " Open NERDTree if we're executing vim without specifying a file to open
 autocmd vimenter * if !argc() | NERDTree | endif
 
-" Close if only NERDTree open
-"autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
-
 " Hides "Press ? for help"
 let NERDTreeMinimalUI=1
 
@@ -179,12 +153,18 @@ let NERDTreeMinimalUI=1
 let g:NERDTreeShowHidden=1
 
 
+"------ NERDCommenter Options ------
+" Visual select text then use 'Leader c Leader' to comment the selection
+let g:NERDSpaceDelims = 1
+let g:NERDDefaultAlign = 'left'
+
+
 "------  Fugitive Plugin Options  ------
 "https://github.com/tpope/vim-fugitive%20nnoremap%20%3CLeader%3Egs%20:Gstatus%3CCR%3E%20nnoremap%20%3CLeader%3Egr%20:Gremove%3CCR%3E%20nnoremap%20%3CLeader%3Egl%20:Glog%3CCR%3E-nnoremap%20%3CLeader%3Egb%20:Gblame%3CCR%3E+nnoremap%20%3CLeader%3Egb%20:Git%20blame%3CCR%3E%20nnoremap%20%3CLeader%3Egm%20:Gmove%20%20nnoremap%20%3CLeader%3Egp%20:Ggrep%20%20nnoremap%20%3CLeader%3EgR%20:Gread%3CCR%3E@@%20-194,16%20+174,21%20@@%20nnoremap%20%3CLeader%3Egd%20:Gdiff%3CCR%3E"------  Text Editing Utilities  ------
 " <Leader>T = Delete all Trailing space in file
-map <Leader>T :%s/\s\+$//<CR>
+nmap <Leader>T :%s/\s\+$//<CR>
 
 " <Leader>U = Deletes Unwanted empty lines
-map <Leader>U :g/^$/d<CR>
+nmap <Leader>U :g/^$/d<CR>
 
 " <Leader>R = Converts tabs to spaces in document
-map <Leader>R :retab<CR>
+nmap <Leader>R :retab<CR>
+
+" gq will wrap lines, so gQ will unwrap lines
+nmap gQ VipJ
 
-" Deletes trailing space in file upon write
-" autocmd BufWritePre * :%s/\s\+$//e
+
+"------  Text File Settings  ------
+:autocmd! BufNewFile,BufRead * setlocal nowrap
+:autocmd! BufNewFile,BufRead *.txt,*.md,*.tex,*.asciidoc setlocal wrap
 
 
 "------  JSON Filetype Settings  ------
@@ -215,142 +200,96 @@ autocmd BufNewFile,BufRead *.jshintrc set filetype=json
 autocmd BufNewFile,BufRead *.eslintrc set filetype=json
 
 
-"------  CoffeeScript Filetype Settings  ------
-au BufNewFile,BufReadPost *.coffee set shiftwidth=2 softtabstop=2 expandtab
-autocmd BufNewFile,BufRead *.coffee set filetype=coffee
-au BufWritePost *.coffee silent make!
-autocmd QuickFixCmdPost * nested cwindow | redraw!
-
-
-"------  JSX Filetype Settings ------
-autocmd! BufEnter *.jsx let b:syntastic_checkers=['eslint']
-autocmd! BufEnter *.js let b:syntastic_checkers=['eslint']
+"------  Markdown Settings  ------
+let g:vim_markdown_folding_disabled = 1
+let g:pencil#wrapModeDefault = 'soft'
+autocmd FileType markdown setlocal spell
+autocmd FileType markdown call pencil#init()
+let g:vim_markdown_conceal = 0
 
 
-"------  EJS Filetype Settings  ------
-au BufNewFile,BufRead *.ejs set filetype=html
+"------  AsciiDoc Settings  ------
+autocmd FileType asciidoc setlocal spell wrap
 
+"------  GUI Options  ------
+if has("gui_running")
+	" Hides toolbar and scrollbars and File menu
+	set guioptions=gt
 
-"------  SCSS Filetype Settings  ------
-autocmd FileType scss set iskeyword+=-
-
+	colorscheme hybrid
+	let g:gruvbox_bold=0
 
-"------  Airline Settings ------
-let g:airline_left_sep=''
-let g:airline_right_sep=''
-let g:airline#extensions#tabline#enabled = 1
-let g:airline#extensions#tabline#left_sep = ' '
-let g:airline#extensions#tabline#left_alt_sep = ' '
+	" Ctrl+A select all
+	map <C-a> ggVG
 
+	" Ctrl+C OS clipboard copy
+	vmap <C-c> "+y
 
-"------  GUI Options  ------
-if has("gui_running")
-	" Hides toolbar and scrollbars and File menu
-	set guioptions=egt
+	" Ctrl+B OS Clipboard paste
+	map <C-b> "*p
 
 	" Highlights the current line background
 	set cursorline
-	colorscheme gotham
-
-	"autocmd VimEnter * TagbarOpen
 
 	" Open VIM in fullscreen window
+	" ...Unless you have dualscreens, then it's bigger than a screen...
 	set lines=200 columns=500
-
-	" Toggle fullscreen
-	map <silent> <leader>w :set lines=200 columns=500<CR>
-
-	" Build all help tags (slower launch, but I run GUI vim like once per day)
-	call pathogen#helptags()
+	" set lines=60 columns=200
+
+	function Screencast()
+		:set guifont=monospace\ 24
+		:colorscheme github
+		:NERDTreeClose
+		:set cursorline&
+		:set shortmess=F
+		:set noshowmode
+        :set noruler
+		:set laststatus=0
+		:set noshowcmd
+	endfunction
+	nmap <F3> :call Screencast()<CR>
+
+	" Set default starting directory to ~/Projects or ~/projects
+	silent! cd $HOME/Projects
+	silent! cd $HOME/projects
 
 	if has("gui_macvim") " OS X
-		"set guifont=Monaco:h14
 		set guifont=Monaco:h10
 		set noantialias
 		"set transparency=15
 
-		" Swipe to move between bufers :D
+		" Swipe to move between buffers
 		map <silent> <SwipeLeft> :bprev<CR>
 		map <silent> <SwipeRight> :bnext<CR>
 
-		" Cmd+Shift+N = new buffer
-		map <silent> <D-N> :enew<CR>
-
-		" Cmd+P = CtrlP
-		" TODO: This doesn't actually work, still opens Print dialog
-		macmenu File.Print key=<nop>
-		nnoremap <silent> <D-p> :CtrlP<CR>
-
-		" Cmd+t = new tab
-		nnoremap <silent> <D-t> :tabnew<CR>
-
-		" Cmd+w = close tab (this should happen by default)
-		nnoremap <silent> <D-w> :tabclose<CR>
-
-		" Cmd+1...9 = go to that tab
-		map <silent> <D-1> 1gt
-		map <silent> <D-2> 2gt
-		map <silent> <D-3> 3gt
-		map <silent> <D-4> 4gt
-		map <silent> <D-5> 5gt
-		map <silent> <D-6> 6gt
-		map <silent> <D-7> 7gt
-		map <silent> <D-8> 8gt
-		map <silent> <D-9> 9gt
-
-		" OS X probably has ctags in a weird place
-		let g:tagbar_ctags_bin='/usr/local/bin/ctags'
-
-		" Pair Program mode, so that my coworkers can read my screen ;)
-		nnoremap <leader>p :call PairProgramMode()<cr>
-		function! PairProgramMode()
-			if g:pair_program_mode
-				let g:pair_program_mode = 0
-				set guifont=Monaco:h10
-				set noantialias
-				set lines=200 columns=500
-			else
-				set guifont=Monaco:h15
-				set antialias
-				set lines=200 columns=500
-				let g:pair_program_mode = 1
-			endif
-		endfunction
-
-	elseif has("gui_gtk2") " Linux
-		set guifont=monospace\ 9
-
-		" Alt+n = new buffer
-		map <silent> <A-n> :enew<CR>
-
-		" Alt+t = new tab
-		nnoremap <silent> <A-t> :tabnew<CR>
-
-		" Alt+w = close tab
-		nnoremap <silent> <A-w> :tabclose<CR>
-
-		" Alt+1...9 = go to that tab
-		map <silent> <A-1> 1gt
-		map <silent> <A-2> 2gt
-		map <silent> <A-3> 3gt
-		map <silent> <A-4> 4gt
-		map <silent> <A-5> 5gt
-		map <silent> <A-6> 6gt
-		map <silent> <A-7> 7gt
-		map <silent> <A-8> 8gt
-		map <silent> <A-9> 9gt
-
-	elseif has("gui_win32") " Windows
-		" WHAT ARE YOU DOING WITH YOUR LIFE?!
+		" Damn you scrollwheel paste
+		nnoremap <MiddleMouse> <Nop>
+		nnoremap <2-MiddleMouse> <Nop>
+		nnoremap <3-MiddleMouse> <Nop>
+		nnoremap <4-MiddleMouse> <Nop>
+
+		inoremap <MiddleMouse> <Nop>
+		inoremap <2-MiddleMouse> <Nop>
+		inoremap <3-MiddleMouse> <Nop>
+		inoremap <4-MiddleMouse> <Nop>
+	elseif has("gui_gtk") " Linux
+		" set guifont=monospace\ 9
+		" set guifont=ProggyCleanTT\ 12
+		" set guifont=courier\ 10\ pitch\ 14
+
+		let g:NERDTreeDirArrowExpandable = '+'
+		let g:NERDTreeDirArrowCollapsible = '~'
+
+		" Disable mouse scrolling while in INSERT mode
+		" TODO: This doesn't work when shift is pressed
+		inoremap <ScrollWheelUp> <Nop>
+		inoremap <ScrollWheelDown> <Nop>
+		inoremap <ScrollWheelLeft> <Nop>
+		inoremap <ScrollWheelRight> <Nop>
 	endif
 else
+	" Inside of a terminal
 	set t_Co=256
-	colorscheme Mustang
+	colorscheme ir_black
 	set mouse=a
 endif
-
-
-"------  Local Overrides  ------
-if filereadable($HOME.'/.vimrc_local')
-	source $HOME/.vimrc_local
-endif