[SCM] vim-scripts packaging branch, master, updated. v20091011-7-g153d936

James Vega jamessan at debian.org
Tue Jan 26 22:21:55 UTC 2010


The following commit has been merged in the master branch:
commit e592723a38c58d2a10b954e6acacb9202287e893
Author: James Vega <jamessan at debian.org>
Date:   Tue Jan 26 17:04:10 2010 -0500

    Update Color Sampler Pack to 8.03
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/colors/adaryn.vim b/colors/adaryn.vim
new file mode 100644
index 0000000..1b17f22
--- /dev/null
+++ b/colors/adaryn.vim
@@ -0,0 +1,72 @@
+" Vim color file
+" Maintainer:	Glenn T. Norton <gtnorton at 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/adrian.vim b/colors/adrian.vim
new file mode 100644
index 0000000..ba830cd
--- /dev/null
+++ b/colors/adrian.vim
@@ -0,0 +1,97 @@
+" Vim colorscheme file
+" Maintainer:   Adrian Nagle <vim at 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/anotherdark.vim b/colors/anotherdark.vim
new file mode 100644
index 0000000..72a3341
--- /dev/null
+++ b/colors/anotherdark.vim
@@ -0,0 +1,108 @@
+" Vim color file
+" Maintainer:	Hans Fugal <hans at 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/aqua.vim b/colors/aqua.vim
new file mode 100644
index 0000000..483b6ac
--- /dev/null
+++ b/colors/aqua.vim
@@ -0,0 +1,44 @@
+" Vim color file
+" Maintainer:   tranquility at 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/astronaut.vim b/colors/astronaut.vim
new file mode 100644
index 0000000..8caec73
--- /dev/null
+++ b/colors/astronaut.vim
@@ -0,0 +1,164 @@
+" astronaut.vim: a colorscheme
+"    Maintainer: Charles E. Campbell, Jr. <charles.e.campbell.1 at 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
new file mode 100644
index 0000000..ce5f90f
--- /dev/null
+++ b/colors/asu1dark.vim
@@ -0,0 +1,59 @@
+" 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/autumnleaf.vim b/colors/autumnleaf.vim
index 3260354..f7af59f 100644
--- a/colors/autumnleaf.vim
+++ b/colors/autumnleaf.vim
@@ -17,36 +17,36 @@ 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 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
+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 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 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 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 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 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 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
@@ -57,98 +57,98 @@ hi VertSplit    guibg=#aa8866   guifg=#ffe0bb   gui=none
 
 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 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 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 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 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
+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 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 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 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
+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/baycomb.vim b/colors/baycomb.vim
index 3ecc473..1311e72 100644
--- a/colors/baycomb.vim
+++ b/colors/baycomb.vim
@@ -2,7 +2,7 @@
 " baycomb v2.4
 " http://www.vim.org/scripts/script.php?script_id=1454
 " 
-" Maintainer:   Shawn Axsom <axs221 at gmail.com>
+" Maintainer:	Shawn Axsom <axs221 at gmail.com>
 "
 "   * Place :colo baycomb in your VimRC/GVimRC file
 "   * Also add :set background=dark  or :setbackground=light
@@ -17,7 +17,7 @@ if version > 580
     " complaining
     hi clear
     if exists("syntax_on")
-                syntax reset
+		syntax reset
     endif
 endif
 
@@ -28,11 +28,11 @@ 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 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 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
@@ -43,23 +43,23 @@ hi tablinefill  guibg=#2d2d3f guifg=#aaaaaa gui=none
 "hi SpellLocal
 "hi SpellRare
 
-hi MatchParen   guibg=#7b5a55 guifg=#001122
+hi MatchParen	guibg=#7b5a55 guifg=#001122
 
 " syntax highlighting """"""""""""""""""""""""""""""""""""""""
 
 
-hi Comment              guifg=#349d58 guibg=bg
-hi Title            guifg=#e5e5ca gui=none
+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 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 Special	    guifg=#aaaaca
 hi Ignore       guifg=grey40
-hi Todo             guifg=orangered guibg=yellow2
+hi Todo		    guifg=orangered guibg=yellow2
 hi Error        guibg=#b03452
 hi Function     guifg=#bab588 guibg=bg gui=bold 
 hi Identifier   guifg=#5094c4   
@@ -75,7 +75,7 @@ highlight Exception gui=bold guifg=#d0a8ad guibg=bg
 
 " highlight groups
 "hi CursorIM
-hi Directory    guifg=#bbd0df
+hi Directory	guifg=#bbd0df
 hi DiffText    guibg=#004335
 hi DiffChange   guibg=#685b5c
 hi DiffAdd      guibg=#0a4b8c
@@ -86,15 +86,15 @@ hi Cursor       guibg=#cad5c0 guifg=#0000aa
 
 
 hi Search       guibg=darkyellow guifg=black
-hi IncSearch    guifg=#babeaa guibg=#3a4520 
+hi IncSearch	guifg=#babeaa guibg=#3a4520 
 
-hi ModeMsg      guifg=#00AACC
+hi ModeMsg    	guifg=#00AACC
 hi MoreMsg      guifg=SeaGreen
-hi Question     guifg=#AABBCC
-hi SpecialKey   guifg=#90dcb0
+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 WarningMsg	guifg=salmon
 "hi WildMenu
 "hi Menu
 "hi Scrollbar  guibg=grey30 guifg=tan
@@ -117,56 +117,56 @@ 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 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 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
+	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
+	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
+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
@@ -177,7 +177,7 @@ hi tabline      ctermfg=black ctermbg=blue
 hi tablinefill  ctermfg=green ctermbg=darkblue
 "vim: sw=4
 "
-hi MatchParen   ctermfg=black ctermbg=green
+hi MatchParen	ctermfg=black ctermbg=green
 
 
 elseif &background == "light"
@@ -190,23 +190,23 @@ hi NonText      guifg=#382920 guibg=#152555
 "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
+	hi Comment		guifg=#daddb8  guibg=#308ae5
 else
-        hi Comment              guifg=darkyellow  guibg=#207ada
+	hi Comment		guifg=darkyellow  guibg=#207ada
 endif
 """"""""""""""""""""""""""""""""""""""""""""""""""""""
 
-hi Title                guifg=#857540  gui=none
+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 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 Special		guifg=#652a7a 
 hi Ignore       guifg=grey40
-hi Todo                 guifg=orangered guibg=yellow2
+hi Todo			guifg=orangered guibg=yellow2
 hi Error        guibg=#b03452
 """""this section borrowed from OceanDeep/Midnight"""""
 hi Number guifg=#006bcd 
@@ -222,7 +222,7 @@ highlight Exception gui=none guifg=#ea5460
 
 " highlight groups
 "hi CursorIM
-hi Directory    guifg=#bbd0df
+hi Directory	guifg=#bbd0df
 "hi DiffAdd
 "hi DiffChange
 "hi DiffDelete
@@ -231,25 +231,25 @@ hi ErrorMsg     guibg=#ff4545
 
 hi Cursor       guibg=#cadaca guifg=#05293d
 
-hi FoldColumn   guibg=#409ae0 guifg=darkgrey
-"hi FoldColumn  guibg=#83a5cd guifg=#70459F
+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 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 IncSearch	guifg=#dadeca guibg=#3a4520 
 
-hi VertSplit    guibg=#525f95 guifg=grey50 gui=none
+hi VertSplit	guibg=#525f95 guifg=grey50 gui=none
 hi Folded       guibg=#252f5d guifg=#BBDDCC
-hi ModeMsg      guifg=#00AACC
+hi ModeMsg    	guifg=#00AACC
 hi MoreMsg      guifg=SeaGreen
-hi Question     guifg=#AABBCC
-hi SpecialKey   guifg=#308c70
+hi Question    	guifg=#AABBCC
+hi SpecialKey	guifg=#308c70
 hi Visual       guifg=#008FBF guibg=#33DFEF
 "hi VisualNOS
-hi WarningMsg   guifg=salmon
+hi WarningMsg	guifg=salmon
 "hi WildMenu
 "hi Menu
 "hi Scrollbar  guibg=grey30 guifg=tan
@@ -272,43 +272,43 @@ 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 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
+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
diff --git a/colors/bclear.vim b/colors/bclear.vim
new file mode 100644
index 0000000..60a9cac
--- /dev/null
+++ b/colors/bclear.vim
@@ -0,0 +1,67 @@
+" Vim colorscheme
+" Name:         bclear
+" Maintainer:   Ricky Cintron 'borosai' [borosai at gmail dot com]
+" Last Change:  2009-08-04
+
+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 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 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/biogoo.vim b/colors/biogoo.vim
new file mode 100644
index 0000000..e99dd14
--- /dev/null
+++ b/colors/biogoo.vim
@@ -0,0 +1,115 @@
+" Vim color File
+" Name:			biogoo
+" Maintainer:	Benjamin Esham <bdesham at gmail.com>
+" Last Change:	2006-11-20
+" Version:		1.5
+"
+" 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
+"
+" Props:
+"	Jani Nurminen's zenburn.vim as an example file.
+"	Scott F. and Matt F. for feature suggestions.
+"	Bill McCarthy for his Vim mailing list post about Vim 7 support.
+"
+" Version History:
+"	1.5:	should fully support Vim 7 now
+"	1.4:	more support for Vim 7: 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
+"
+" TODO: Add new groups as needed.  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 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=#ffffff guibg=#7f0000 gui=undercurl guisp=#d6d6d6
+hi SpellCap			guifg=#ffffff guibg=#7f007f gui=undercurl guisp=#d6d6d6
+hi SpellLocal		guifg=#ffffff guibg=#007f7f gui=undercurl guisp=#d6d6d6
+hi SpellRare		guifg=#ffffff guibg=#b85d00 gui=undercurl guisp=#d6d6d6
+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		guifg=#ffffff guibg=#7f0000 gui=undercurl guisp=#d6d6d6
+
+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
diff --git a/colors/blacksea.vim b/colors/blacksea.vim
new file mode 100644
index 0000000..a98b7ca
--- /dev/null
+++ b/colors/blacksea.vim
@@ -0,0 +1,37 @@
+" 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/borland.vim b/colors/borland.vim
new file mode 100644
index 0000000..c39c101
--- /dev/null
+++ b/colors/borland.vim
@@ -0,0 +1,60 @@
+" 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
new file mode 100644
index 0000000..21cf417
--- /dev/null
+++ b/colors/breeze.vim
@@ -0,0 +1,70 @@
+" 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
index c440002..ee907c6 100644
--- a/colors/brookstream.vim
+++ b/colors/brookstream.vim
@@ -18,45 +18,45 @@ 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
+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 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
@@ -80,4 +80,4 @@ hi Boolean guifg=#9bcd9b
 "hi link Debug   Special
 "hi link FoldColumn  Folded
 
-"- end of colorscheme -----------------------------------------------   
+"- end of colorscheme -----------------------------------------------	
diff --git a/colors/buttercream.vim b/colors/buttercream.vim
new file mode 100644
index 0000000..05931f8
--- /dev/null
+++ b/colors/buttercream.vim
@@ -0,0 +1,59 @@
+" Vim color file
+" vim: tw=0 ts=8 sw=4
+" Scriptname:   buttercream
+" Maintainer:   Håkan Wikström <hakan at 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 at 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/calmar256_dark.vim b/colors/calmar256-dark.vim
similarity index 100%
rename from colors/calmar256_dark.vim
rename to colors/calmar256-dark.vim
diff --git a/colors/calmar256_light.vim b/colors/calmar256-light.vim
similarity index 100%
rename from colors/calmar256_light.vim
rename to colors/calmar256-light.vim
diff --git a/colors/camo.vim b/colors/camo.vim
new file mode 100644
index 0000000..059af42
--- /dev/null
+++ b/colors/camo.vim
@@ -0,0 +1,76 @@
+" Vim color file
+" Maintainer:   Tim Aldrich <aldy0169 at 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/candy.vim b/colors/candy.vim
new file mode 100644
index 0000000..545ff7c
--- /dev/null
+++ b/colors/candy.vim
@@ -0,0 +1,78 @@
+" 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/chela_light.vim b/colors/chela_light.vim
new file mode 100644
index 0000000..3cde34d
--- /dev/null
+++ b/colors/chela_light.vim
@@ -0,0 +1,110 @@
+" Vim color file
+"
+" Maintainer:   Stefan Karlsson <stefan.74 at 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/chocolateliquor.vim b/colors/chocolateliquor.vim
new file mode 100644
index 0000000..9dfa712
--- /dev/null
+++ b/colors/chocolateliquor.vim
@@ -0,0 +1,36 @@
+" 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/clarity.vim b/colors/clarity.vim
new file mode 100644
index 0000000..3440ba3
--- /dev/null
+++ b/colors/clarity.vim
@@ -0,0 +1,52 @@
+" 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
new file mode 100644
index 0000000..c0af691
--- /dev/null
+++ b/colors/cleanphp.vim
@@ -0,0 +1,81 @@
+" Vim color file
+" Maintainer:	Billy McIntosh <billymcintosh at 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/colorer.vim b/colors/colorer.vim
new file mode 100644
index 0000000..30e1277
--- /dev/null
+++ b/colors/colorer.vim
@@ -0,0 +1,79 @@
+" 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 at 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/dante.vim b/colors/dante.vim
index c9e8369..f584889 100644
--- a/colors/dante.vim
+++ b/colors/dante.vim
@@ -8,76 +8,76 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 hi clear
 if exists("syntax on")
-        syntax reset
+	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
+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
+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
+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/darkZ.vim b/colors/darkZ.vim
new file mode 100644
index 0000000..246f69a
--- /dev/null
+++ b/colors/darkZ.vim
@@ -0,0 +1,91 @@
+" 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/darkblue2.vim b/colors/darkblue2.vim
index d42981c..eee2cc7 100644
--- a/colors/darkblue2.vim
+++ b/colors/darkblue2.vim
@@ -32,7 +32,7 @@ hi VertSplit            gui=bold guifg=NONE guibg=gray80
 "hi Folded
 "hi FoldColumn
 "hi IncSearch
-hi LineNr                               gui=bold guifg=lightsteelblue guibg=#132b4a
+hi LineNr				gui=bold guifg=lightsteelblue guibg=#132b4a
 hi ModeMsg              gui=bold
 "hi MoreMsg
 "hi NonText
@@ -48,7 +48,7 @@ hi VisualNOS            gui=bold guifg=steelblue guibg=fg
 hi WarningMsg           guifg=White guibg=Tomato
 "hi WildMenu
 
-hi User2                                guifg=lightskyblue guibg=#021a39 gui=bold
+hi User2				guifg=lightskyblue guibg=#021a39 gui=bold
 
 " If using Motif/Athena
 hi Menu                 guibg=#233b5a guifg=#fff8dc
diff --git a/colors/darkbone.vim b/colors/darkbone.vim
new file mode 100644
index 0000000..a97c8fe
--- /dev/null
+++ b/colors/darkbone.vim
@@ -0,0 +1,102 @@
+" 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/darkslategray.vim b/colors/darkslategray.vim
new file mode 100644
index 0000000..b36aef0
--- /dev/null
+++ b/colors/darkslategray.vim
@@ -0,0 +1,117 @@
+" vim: set tw=0 sw=4 sts=4 et:
+
+" Vim color file
+" Maintainer: Tuomas Susi <tsusi at 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
index 4b78c9d..26ed7f3 100644
--- a/colors/darkspectrum.vim
+++ b/colors/darkspectrum.vim
@@ -17,7 +17,7 @@ if version > 580
     " complaining
     hi clear
     if exists("syntax_on")
-    syntax reset
+	syntax reset
     endif
 endif
 let g:colors_name="darkspectrum"
@@ -25,10 +25,10 @@ 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 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
@@ -42,48 +42,48 @@ hi DiffText        guifg=#8ae234 guibg=#4e9a06 gui=none
 hi DiffDelete      guifg=#000000 guibg=#000000 gui=none
 "hi ErrorMsg
 
-hi Number       guifg=#fce94f
+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 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 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=#ffffff guifg=#ffffff gui=none
 
-hi VertSplit    guibg=#3C3C3C guifg=#3C3C3C 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 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 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
@@ -102,29 +102,29 @@ 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 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 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
+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/dawn.vim b/colors/dawn.vim
index 85d50ad..a97c5ad 100644
--- a/colors/dawn.vim
+++ b/colors/dawn.vim
@@ -1,8 +1,8 @@
 " 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
+" 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.
@@ -15,64 +15,64 @@ endif
 
 let colors_name = "dawn"
 
-hi Normal       guifg=Black guibg=grey90
-"hi Normal      guifg=Black guibg=grey80
+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
+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
+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
+  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
+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
+"  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/denim.vim b/colors/denim.vim
new file mode 100644
index 0000000..c41af9f
--- /dev/null
+++ b/colors/denim.vim
@@ -0,0 +1,141 @@
+" Maintainer:   Tim Aldrich <aldy0169 at 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/desertEx.vim b/colors/desertEx.vim
index 5cf477a..08ef878 100644
--- a/colors/desertEx.vim
+++ b/colors/desertEx.vim
@@ -8,12 +8,12 @@ if version > 580
     " complaining
     hi clear
     if exists("syntax_on")
-        syntax reset
+	syntax reset
     endif
 endif
 let g:colors_name="desertEx"
 
-hi Normal       guifg=gray guibg=grey17 gui=none
+hi Normal	guifg=gray guibg=grey17 gui=none
 
 " AlignCtrl default
 " AlignCtrl =P0 guifg guibg gui
@@ -41,7 +41,7 @@ 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 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
diff --git a/colors/dusk.vim b/colors/dusk.vim
index 6b1ec43..8feddd7 100644
--- a/colors/dusk.vim
+++ b/colors/dusk.vim
@@ -1,8 +1,8 @@
 " 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
+" 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
 
@@ -14,58 +14,58 @@ endif
 
 let colors_name = "dusk"
 
-hi Normal       guifg=ivory guibg=#1f3048
+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
+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
+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
+  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
+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
index 83ee819..52aa178 100644
--- a/colors/earendel.vim
+++ b/colors/earendel.vim
@@ -9,11 +9,11 @@ let colors_name = "earendel"
 execute "command! -nargs=1 Colo set background=<args>"
 
 if &background == "light"
-    hi Normal ctermbg=White ctermfg=Black guibg=#ffffff guifg=#000000 gui=none
+    hi Normal ctermbg=15 ctermfg=0 guibg=#ffffff guifg=#000000 gui=none
 
     hi Cursor guibg=#000000 guifg=#ffffff gui=none
-    hi CursorColumn ctermbg=LightGray ctermfg=fg guibg=#dfdfdf gui=none
-    hi CursorLine ctermbg=LightGray ctermfg=fg guibg=#dfdfdf gui=none
+    hi CursorColumn ctermbg=7 ctermfg=fg guibg=#dfdfdf gui=none
+    hi CursorLine ctermbg=7 ctermfg=fg guibg=#dfdfdf 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
@@ -26,7 +26,7 @@ if &background == "light"
     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=DarkGray guibg=bg guifg=#656565 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
@@ -35,8 +35,8 @@ if &background == "light"
     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=Black ctermfg=White guibg=#96aad3 guifg=fg gui=bold
-    hi StatusLineNC ctermbg=LightGray ctermfg=fg guibg=#bcc7de guifg=#384547 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
@@ -47,13 +47,13 @@ if &background == "light"
     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=LightGray ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none
+    hi VertSplit ctermbg=7 ctermfg=fg guibg=#bcc7de guifg=#384547 gui=none
     if version >= 700
-        hi Visual ctermbg=LightGray ctermfg=fg guibg=#b5c5e6 gui=none
+        hi Visual ctermbg=7 ctermfg=fg guibg=#b5c5e6 gui=none
     else
-        hi Visual ctermbg=LightGray ctermfg=fg guibg=#b5c5e6 guifg=fg gui=none
+        hi Visual ctermbg=7 ctermfg=fg guibg=#b5c5e6 guifg=fg gui=none
     endif    
-    hi VisualNOS ctermbg=DarkGray ctermfg=fg guibg=bg guifg=#4069bf gui=bold,underline
+    hi VisualNOS ctermbg=8 ctermfg=fg guibg=bg guifg=#4069bf gui=bold,underline
     hi WarningMsg guibg=bg guifg=#ca001f gui=bold
     hi WildMenu guibg=#fedc56 guifg=fg gui=bold
 
@@ -79,11 +79,11 @@ if &background == "light"
     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=Black ctermfg=LightGray guibg=#181818 guifg=#cacaca gui=none
+    hi Normal ctermbg=0 ctermfg=7 guibg=#181818 guifg=#cacaca gui=none
 
     hi Cursor guibg=#e5e5e5 guifg=#000000 gui=none
-    hi CursorColumn ctermbg=DarkGray ctermfg=White guibg=#404040 gui=none
-    hi CursorLine ctermbg=DarkGray ctermfg=White guibg=#404040 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
@@ -96,7 +96,7 @@ else
     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=DarkGray guibg=bg guifg=#9a9a9a 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
@@ -105,8 +105,8 @@ else
     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=LightGray ctermfg=Black guibg=#41609e guifg=#e5e5e5 gui=bold
-    hi StatusLineNC ctermbg=LightGray ctermfg=Black guibg=#35466a guifg=#afbacf 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
@@ -116,14 +116,14 @@ else
     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=White guifg=#e5e5e5 gui=bold
-    hi VertSplit ctermbg=LightGray ctermfg=Black guibg=#35466a guifg=#afbacf gui=none
+    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=LightGray ctermfg=Black guibg=#274278 gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#274278 gui=none
     else
-        hi Visual ctermbg=LightGray ctermfg=Black guibg=#274278 guifg=fg gui=none
+        hi Visual ctermbg=7 ctermfg=0 guibg=#274278 guifg=fg gui=none
     endif    
-    hi VisualNOS ctermbg=DarkGray ctermfg=Black guibg=bg guifg=#5c77ad gui=bold,underline
+    hi VisualNOS ctermbg=8 ctermfg=0 guibg=bg guifg=#5c77ad gui=bold,underline
     hi WarningMsg guibg=bg guifg=#ea0023 gui=bold
     hi WildMenu guibg=#fbca01 guifg=#000000 gui=bold
 
@@ -139,15 +139,15 @@ else
     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=White guibg=bg guifg=#8c91e8 gui=underline
+    hi Underlined ctermbg=bg ctermfg=15 guibg=bg guifg=#8c91e8 gui=underline
 
-    hi htmlBold ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=bold
-    hi htmlBoldItalic ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=bold,italic
-    hi htmlBoldUnderline ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=bold,underline
-    hi htmlBoldUnderlineItalic ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=bold,underline,italic
-    hi htmlItalic ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=italic
-    hi htmlUnderline ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=underline
-    hi htmlUnderlineItalic ctermbg=bg ctermfg=White guibg=bg guifg=fg gui=underline,italic
+    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
diff --git a/colors/eclipse.vim b/colors/eclipse.vim
index 2f00d8a..0d7d36a 100644
--- a/colors/eclipse.vim
+++ b/colors/eclipse.vim
@@ -1,8 +1,8 @@
 " 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
+" 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")
diff --git a/colors/ekvoli.vim b/colors/ekvoli.vim
index f4aa13e..3362968 100644
--- a/colors/ekvoli.vim
+++ b/colors/ekvoli.vim
@@ -1,7 +1,7 @@
 " Vim color file
-" Maintainer:   Preben Randhol <randhol+ekvoli at pvv.org>
-" Last Change:  2008 Feb 24
-" License:              GNU Public License (GPL) v2
+" Maintainer:	Preben Randhol <randhol+ekvoli at pvv.org>
+" Last Change:	2008 Feb 24
+" License: 		GNU Public License (GPL) v2
 "
 " Version 1.6: Added colours for TVO and changed folding colour
 
@@ -19,70 +19,70 @@ 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
+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
diff --git a/colors/fine_blue2.vim b/colors/fine_blue.vim
similarity index 100%
copy from colors/fine_blue2.vim
copy to colors/fine_blue.vim
diff --git a/colors/fnaqevan.vim b/colors/fnaqevan.vim
new file mode 100644
index 0000000..d936cee
--- /dev/null
+++ b/colors/fnaqevan.vim
@@ -0,0 +1,67 @@
+" Vim color file
+" Maintainer: Rafal Sulejman <rms at 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
new file mode 100644
index 0000000..ab263ab
--- /dev/null
+++ b/colors/fog.vim
@@ -0,0 +1,170 @@
+" Vim color file
+" vim: tw=0 ts=4 sw=4
+" Maintainer:	Thomas R. Kimpton <tomk at 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/fruit.vim b/colors/fruit.vim
new file mode 100644
index 0000000..624b90f
--- /dev/null
+++ b/colors/fruit.vim
@@ -0,0 +1,69 @@
+" 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/golden.vim b/colors/golden.vim
new file mode 100644
index 0000000..8cceaf7
--- /dev/null
+++ b/colors/golden.vim
@@ -0,0 +1,70 @@
+" vim: tw=0 ts=4 sw=4
+" Vim color file
+"
+" Creator: Ryan Phillips <ryan at 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/guardian.vim b/colors/guardian.vim
new file mode 100644
index 0000000..5bba649
--- /dev/null
+++ b/colors/guardian.vim
@@ -0,0 +1,103 @@
+" Vim color file
+" Maintainer: Anders Korte <anderskorte at 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/habilight.vim b/colors/habilight.vim
index 45d9133..ea294f5 100644
--- a/colors/habilight.vim
+++ b/colors/habilight.vim
@@ -75,28 +75,28 @@ 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 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
+hi! link Debug		Special
 
 " HTML {{{1
 hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
diff --git a/colors/herald.vim b/colors/herald.vim
new file mode 100644
index 0000000..23bab56
--- /dev/null
+++ b/colors/herald.vim
@@ -0,0 +1,385 @@
+" Vim color file
+" Name:       herald.vim
+" Author:     Fabio Cevasco <h3rald at 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/inkpot.vim b/colors/inkpot.vim
new file mode 100644
index 0000000..c6ecb46
--- /dev/null
+++ b/colors/inkpot.vim
@@ -0,0 +1,216 @@
+" Vim color file
+" Name:       inkpot.vim
+" Maintainer: Ciaran McCreesh <ciaran.mccreesh at 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=#ad7b57
+    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(52)
+    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
index c5fcf25..d98a936 100644
--- a/colors/ironman.vim
+++ b/colors/ironman.vim
@@ -31,8 +31,8 @@ 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|
+" hi PmenuSbar	scrollbar  |hl-PmenuSbar|
+" hi PmenuThumb	thumb of the scrollbar  |hl-PmenuThumb|
 
 " Split area
 hi StatusLine                gui=ITALIC guifg=white   guibg=#8090a0
@@ -90,21 +90,21 @@ 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 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
+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
diff --git a/colors/jammy.vim b/colors/jammy.vim
new file mode 100644
index 0000000..b12ed5f
--- /dev/null
+++ b/colors/jammy.vim
@@ -0,0 +1,111 @@
+" Vim color file inherit from the desrt.vim 
+" Maintainer:	Jammy Lee<mistapostle at 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/jellybeans.vim b/colors/jellybeans.vim
index cfd76b7..6b53596 100644
--- a/colors/jellybeans.vim
+++ b/colors/jellybeans.vim
@@ -42,15 +42,15 @@ set background=dark
 hi clear
 
 if exists("syntax_on")
-        syntax reset
+	syntax reset
 endif
 
 let colors_name = "jellybeans"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
-        let s:low_color = 0
+	let s:low_color = 0
 else
-        let s:low_color = 1
+	let s:low_color = 1
 endif
 
 " Color approximation functions by Henry So, Jr. and David Liang {{{
@@ -58,232 +58,232 @@ endif
 
 " 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
+	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
+	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
+	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
+	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
+	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
+	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
+	" 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)
+	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
+	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
 " }}}
 
diff --git a/colors/kellys.vim b/colors/kellys.vim
new file mode 100644
index 0000000..d52713a
--- /dev/null
+++ b/colors/kellys.vim
@@ -0,0 +1,236 @@
+" Description:	a colour scheme inspired by kellys bicycles
+"  Maintainer:	kamil.stachowski at gmail.com
+"     License:	gpl 3+
+"     Version:	0.3 (2008.12.07)
+
+" changelog:
+"         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
+
+" tabline
+
+if has("gui_running")
+	hi Comment		guifg=#67686b	guibg=#2a2b2f	gui=none
+	hi Cursor 		guifg=#2a2b2f	guibg=#e1e0e5	gui=none
+	hi Constant 	guifg=#d1c79e	guibg=#2a2b2f	gui=none
+	hi CursorLine		          	guibg=#303132	gui=none
+	hi DiffAdd		guifg=#2a2b2f	guibg=#9ab2c8	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 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=#62acce	guibg=#2a2b2f	gui=bold
+else
+	if &t_Co == 256
+		hi Comment		ctermfg=239	ctermbg=235	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=74	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 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=234	cterm=none
+		hi Underlined	ctermfg=254	ctermbg=234	cterm=underline
+		hi Visual		ctermfg=235	ctermbg=254	cterm=none
+		hi Wildmenu		ctermfg=81	ctermbg=234	cterm=bold
+	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			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
+
+" 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 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
+" 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			Normal
+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
+" 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
diff --git a/colors/lettuce.vim b/colors/lettuce.vim
new file mode 100644
index 0000000..223dc36
--- /dev/null
+++ b/colors/lettuce.vim
@@ -0,0 +1,215 @@
+" 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, at cParenGroup,cCppParen,cErrInBracket,cCppBracket,cCppString, at Spell
+    au Syntax c,cpp syn region cCppParen matchgroup=Operator transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT, at cParenGroup,cErrInBracket,cParen,cBracket,cString, at Spell
+    au Syntax c,cpp syn region cBracket matchgroup=Operator transparent start='\[\|<::\@!' end=']\|:>' contains=ALLBUT, at cParenGroup,cErrInParen,cCppParen,cCppBracket,cCppString, at Spell
+    au Syntax c,cpp syn region cCppBracket matchgroup=Operator transparent start='\[\|<::\@!' skip='\\$' excludenl end=']\|:>' end='$' contained contains=ALLBUT, at cParenGroup,cErrInParen,cParen,cBracket,cString, at 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, at rubyExtendedStringSpecial,rubyTodo fold
+    au Syntax ruby syn region rubyParentheses matchgroup=Operator start="(" end=")" contains=ALLBUT, at rubyExtendedStringSpecial,rubyTodo
+    au Syntax ruby syn region rubySquareBrackets matchgroup=Operator start="\[" end="\]" contains=ALLBUT, at 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/lucius.vim b/colors/lucius.vim
index c60fad1..f83c92a 100644
--- a/colors/lucius.vim
+++ b/colors/lucius.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Maintainer:   Jonathan Filip <jfilip1024 at gmail.com>
-" Last Modified: Wed Apr 01, 2009  10:03AM
-" Version: 2.5
+" Last Modified: Wed Oct 21, 2009  11:39AM
+" Version: 3.1
 "
 " GUI / 256 color terminal
 "
@@ -17,137 +17,141 @@ hi clear
 if exists("syntax_on")
     syntax reset
 endif
-let g:colors_name="lucius"
+let colors_name="lucius"
 
+" Some other colors to save
 " blue: 3eb8e5
 " green: 92d400
+" c green: d5f876, cae682
+" new blue: 002D62
+" new gray: CCCCCC
 
 
 " Base color
 " ----------
-hi Normal           guifg=#e4e4e4           guibg=#242424
-hi Normal           ctermfg=254             ctermbg=235
+hi Normal           guifg=#e0e0e0           guibg=#202020
+hi Normal           ctermfg=253             ctermbg=235
 
 
 " Comment Group
 " -------------
 " any comment
-hi Comment          guifg=#808080                                   gui=none
-hi Comment          ctermfg=243                                     cterm=none
+hi Comment          guifg=#606060                                   gui=none
+hi Comment          ctermfg=240                                     cterm=none
 
 
 " Constant Group
 " --------------
 " any constant
-hi Constant         guifg=#50d6de                                   gui=none
-hi Constant         ctermfg=80                                      cterm=none
+hi Constant         guifg=#8cd0d3                                   gui=none
+hi Constant         ctermfg=116                                     cterm=none
 " strings
-hi String           guifg=#8ad6f2                                   gui=none
-hi String           ctermfg=117                                     cterm=none
+hi String           guifg=#80c0d9                                   gui=none
+hi String           ctermfg=110                                     cterm=none
 " character constant
-hi Character        guifg=#8ad6f2                                   gui=none
-hi Character        ctermfg=117                                     cterm=none
+hi Character        guifg=#80c0d9                                   gui=none
+hi Character        ctermfg=110                                     cterm=none
 " numbers decimal/hex
-hi Number           guifg=#50d6de                                   gui=none
-hi Number           ctermfg=80                                      cterm=none
+hi Number           guifg=#8cd0d3                                   gui=none
+hi Number           ctermfg=116                                     cterm=none
 " true, false
-hi Boolean          guifg=#50d6de                                   gui=none
-hi Boolean          ctermfg=80                                      cterm=none
+hi Boolean          guifg=#8cd0d3                                   gui=none
+hi Boolean          ctermfg=116                                     cterm=none
 " float
-hi Float            guifg=#50d6de                                   gui=none
-hi Float            ctermfg=80                                      cterm=none
+hi Float            guifg=#8cd0d3                                   gui=none
+hi Float            ctermfg=116                                     cterm=none
 
 
 " Identifier Group
 " ----------------
 " any variable name
-hi Identifier       guifg=#fcb666                                   gui=none
-hi Identifier       ctermfg=215                                     cterm=none
+hi Identifier       guifg=#efaf7f                                   gui=none
+hi Identifier       ctermfg=216                                     cterm=none
 " function, method, class
-hi Function         guifg=#fcb666                                   gui=none
-hi Function         ctermfg=215                                     cterm=none
+hi Function         guifg=#efaf7f                                   gui=none
+hi Function         ctermfg=216                                     cterm=none
 
 
 " Statement Group
 " ---------------
 " any statement
-hi Statement        guifg=#bae682                                   gui=none
+hi Statement        guifg=#b3d38c                                   gui=none
 hi Statement        ctermfg=150                                     cterm=none
 " if, then, else
-hi Conditional      guifg=#bae682                                   gui=none
+hi Conditional      guifg=#b3d38c                                   gui=none
 hi Conditional      ctermfg=150                                     cterm=none
 " try, catch, throw, raise
-hi Exception        guifg=#bae682                                   gui=none
+hi Exception        guifg=#b3d38c                                   gui=none
 hi Exception        ctermfg=150                                     cterm=none
 " for, while, do
-hi Repeat           guifg=#bae682                                   gui=none
+hi Repeat           guifg=#b3d38c                                   gui=none
 hi Repeat           ctermfg=150                                     cterm=none
 " case, default
-hi Label            guifg=#bae682                                   gui=none
+hi Label            guifg=#b3d38c                                   gui=none
 hi Label            ctermfg=150                                     cterm=none
 " sizeof, +, *
-hi Operator         guifg=#bae682                                   gui=none
+hi Operator         guifg=#b3d38c                                   gui=none
 hi Operator         ctermfg=150                                     cterm=none
 " any other keyword
-hi Keyword          guifg=#bae682                                   gui=none
+hi Keyword          guifg=#b3d38c                                   gui=none
 hi Keyword          ctermfg=150                                     cterm=none
 
 
 " Preprocessor Group
 " ------------------
 " generic preprocessor
-hi PreProc          guifg=#efefaf                                   gui=none
-hi PreProc          ctermfg=229                                     cterm=none
+hi PreProc          guifg=#f0dfaf                                   gui=none
+hi PreProc          ctermfg=223                                     cterm=none
 " #include
-hi Include          guifg=#efefaf                                   gui=none
-hi Include          ctermfg=229                                     cterm=none
+hi Include          guifg=#f0dfaf                                   gui=none
+hi Include          ctermfg=223                                     cterm=none
 " #define
-hi Define           guifg=#efefaf                                   gui=none
-hi Define           ctermfg=229                                     cterm=none
+hi Define           guifg=#f0dfaf                                   gui=none
+hi Define           ctermfg=223                                     cterm=none
 " same as define
-hi Macro            guifg=#efefaf                                   gui=none
-hi Macro            ctermfg=229                                     cterm=none
+hi Macro            guifg=#f0dfaf                                   gui=none
+hi Macro            ctermfg=223                                     cterm=none
 " #if, #else, #endif
-hi PreCondit        guifg=#efefaf                                   gui=none
-hi PreCondit        ctermfg=229                                     cterm=none
+hi PreCondit        guifg=#f0dfaf                                   gui=none
+hi PreCondit        ctermfg=223                                     cterm=none
 
 
 " Type Group
 " ----------
 " int, long, char
-hi Type             guifg=#93e690                                   gui=none
-hi Type             ctermfg=114                                     cterm=none
+hi Type             guifg=#93d6a9                                   gui=none
+hi Type             ctermfg=115                                     cterm=none
 " static, register, volative
-hi StorageClass     guifg=#93e690                                   gui=none
-hi StorageClass     ctermfg=114                                     cterm=none
+hi StorageClass     guifg=#93d6a9                                   gui=none
+hi StorageClass     ctermfg=115                                     cterm=none
 " struct, union, enum
-hi Structure        guifg=#93e690                                   gui=none
-hi Structure        ctermfg=114                                     cterm=none
+hi Structure        guifg=#93d6a9                                   gui=none
+hi Structure        ctermfg=115                                     cterm=none
 " typedef
-hi Typedef          guifg=#93e690                                   gui=none
-hi Typedef          ctermfg=114                                     cterm=none
+hi Typedef          guifg=#93d6a9                                   gui=none
+hi Typedef          ctermfg=115                                     cterm=none
 
 
 " Special Group
 " -------------
 " any special symbol
-hi Special          guifg=#cfafcf                                   gui=none
-hi Special          ctermfg=182                                     cterm=none
+hi Special          guifg=#cca3b3                                   gui=none
+hi Special          ctermfg=181                                     cterm=none
 " special character in a constant
-hi SpecialChar      guifg=#cfafcf                                   gui=none
-hi SpecialChar      ctermfg=182                                     cterm=none
+hi SpecialChar      guifg=#cca3b3                                   gui=none
+hi SpecialChar      ctermfg=181                                     cterm=none
 " things you can CTRL-]
-hi Tag              guifg=#cfafcf                                   gui=none
-hi Tag              ctermfg=182                                     cterm=none
+hi Tag              guifg=#cca3b3                                   gui=none
+hi Tag              ctermfg=181                                     cterm=none
 " character that needs attention
-hi Delimiter        guifg=#cfafcf                                   gui=none
-hi Delimiter        ctermfg=182                                     cterm=none
+hi Delimiter        guifg=#cca3b3                                   gui=none
+hi Delimiter        ctermfg=181                                     cterm=none
 " special things inside a comment
-hi SpecialComment   guifg=#cfafcf                                   gui=none
-hi SpecialComment   ctermfg=182                                     cterm=none
+hi SpecialComment   guifg=#cca3b3                                   gui=none
+hi SpecialComment   ctermfg=181                                     cterm=none
 " debugging statements
-hi Debug            guifg=#cfafcf           guibg=NONE              gui=none
-hi Debug            ctermfg=182             ctermbg=NONE            cterm=none
+hi Debug            guifg=#cca3b3           guibg=NONE              gui=none
+hi Debug            ctermfg=181             ctermbg=NONE            cterm=none
 
 
 " Underlined Group
@@ -167,15 +171,15 @@ hi Ignore           ctermfg=bg
 " Error Group
 " -----------
 " any erroneous construct
-hi Error            guifg=#dd4040           guibg=NONE              gui=none
-hi Error            ctermfg=160             ctermbg=NONE            cterm=none
+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=#deee33           guibg=NONE              gui=underline
-hi Todo             ctermfg=190             ctermbg=NONE            cterm=underline
+hi Todo             guifg=#efef8f           guibg=NONE              gui=underline
+hi Todo             ctermfg=228             ctermbg=NONE            cterm=underline
 
 
 " Spelling
@@ -197,90 +201,91 @@ hi SpellLocal                               ctermbg=14              cterm=underc
 " Cursor
 " ------
 " character under the cursor
-hi Cursor           guifg=bg                guibg=#8ac6f2
-hi Cursor           ctermfg=bg              ctermbg=117
+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                             guibg=#3d3d4d
-hi CursorColumn     cterm=NONE              ctermbg=236
+hi CursorColumn     guifg=NONE              guibg=#202438           gui=none
+hi CursorColumn     ctermfg=NONE            ctermbg=236             cterm=none
 " cursor line/row
-hi CursorLine                               guibg=#3d3d4d
-hi CursorLine       cterm=NONE              ctermbg=236             
+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=#95e494                                   gui=none
-hi Directory        ctermfg=114                                     cterm=none
+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=#444444           gui=none
-hi VertSplit        ctermfg=244             ctermbg=238             cterm=none
+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=#857b6f           guibg=#444444
-hi LineNr           ctermfg=101             ctermbg=238
+hi LineNr           guifg=#818698           guibg=#363946
+hi LineNr           ctermfg=102             ctermbg=237
 " match parenthesis, brackets
-hi MatchParen       guifg=#00ff00           guibg=NONE              gui=none
-hi MatchParen       ctermfg=46              ctermbg=NONE            cterm=none
-" text showing what mode you are in
+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 ModeMsg          guifg=#90ee90           guibg=NONE              gui=none
-hi ModeMsg          ctermfg=120             ctermbg=NONE            cterm=none
-" the 'more' prompt when output takes more than one line
-hi NonText          guifg=#444444                                   gui=none
-hi NonText          ctermfg=238                                     cterm=none
+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=#505050
-hi SpecialKey       ctermfg=238
+hi SpecialKey       guifg=#404040
+hi SpecialKey       ctermfg=237
 " titles for output from :set all, :autocmd, etc
-hi Title            guifg=#3eb8e5                                   gui=none
-hi Title            ctermfg=38                                      cterm=none
+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=#000000           guibg=#cae682
-hi WildMenu         ctermfg=16              ctermbg=186             
+hi WildMenu         guifg=#cae682           guibg=#363946           gui=bold,underline
+hi WildMenu         ctermfg=16              ctermbg=186             cterm=bold
 
 
 " Diff
 " ----
 " added line
-hi DiffAdd          guifg=fg                guibg=#008b8b
-hi DiffAdd          ctermfg=fg              ctermbg=30
+hi DiffAdd          guifg=#80a090           guibg=#313c36           gui=none
+hi DiffAdd          ctermfg=108             ctermbg=22              cterm=none
 " changed line
-hi DiffChange       guifg=fg                guibg=#008b00
-hi DiffChange       ctermfg=fg              ctermbg=28
+hi DiffChange       guifg=NONE              guibg=#4a343a           gui=none
+hi DiffChange       ctermfg=fg              ctermbg=52              cterm=none
 " deleted line
-hi DiffDelete       guifg=fg                guibg=#000000
-hi DiffDelete       ctermfg=fg              ctermbg=16
+hi DiffDelete       guifg=#6c6661           guibg=#3c3631           gui=none
+hi DiffDelete       ctermfg=59              ctermbg=58              cterm=none
 " changed text within line
-hi DiffText         guifg=fg
-hi DiffText         ctermfg=fg
+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=#a0a8b0           guibg=#404040           gui=none
-hi Folded           ctermfg=145             ctermbg=238             cterm=none
+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=#b0d0e0           guibg=#305060           gui=none
-hi FoldColumn       ctermfg=152             ctermbg=23              cterm=none
+hi FoldColumn       guifg=#91d6f8           guibg=#363946           gui=none
+hi FoldColumn       ctermfg=117             ctermbg=238             cterm=none
+
 
 " Search
 " ------
@@ -291,50 +296,51 @@ hi IncSearch        ctermfg=87                                      cterm=revers
 hi Search                                    guibg=#ffaa33          gui=none
 hi Search                                    ctermbg=214            cterm=none
 
+
 " Popup Menu
 " ----------
 " normal item in popup
-hi Pmenu            guifg=#f6f3e8           guibg=#444444           gui=none
-hi Pmenu            ctermfg=254             ctermbg=238             cterm=none
+hi Pmenu            guifg=#e0e0e0           guibg=#303840           gui=none
+hi Pmenu            ctermfg=253             ctermbg=233             cterm=none
 " selected item in popup
-hi PmenuSel         guifg=#000000           guibg=#cae682           gui=none
-hi PmenuSel         ctermfg=16              ctermbg=186             cterm=none
+hi PmenuSel         guifg=#cae682           guibg=#505860           gui=none
+hi PmenuSel         ctermfg=186             ctermbg=237             cterm=none
 " scrollbar in popup
-hi PMenuSbar                                guibg=#607b8b           gui=none
-hi PMenuSbar                                ctermbg=66              cterm=none
+hi PMenuSbar                                guibg=#505860           gui=none
+hi PMenuSbar                                ctermbg=59              cterm=none
 " thumb of the scrollbar in the popup
-hi PMenuThumb                               guibg=#aaaaaa           gui=none
-hi PMenuThumb                               ctermbg=247             cterm=none
+hi PMenuThumb                               guibg=#808890           gui=none
+hi PMenuThumb                               ctermbg=102             cterm=none
 
 
 " Status Line
 " -----------
 " status line for current window
-hi StatusLine       guifg=#e0e0e0           guibg=#444444           gui=none
-hi StatusLine       ctermfg=254             ctermbg=238             cterm=none
+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=#777777           guibg=#444444           gui=none
-hi StatusLineNC     ctermfg=244             ctermbg=238             cterm=none
+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=#b6bf98           guibg=#181818           gui=none
-hi TabLine          ctermfg=244             ctermbg=233             cterm=none
+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=#181818           gui=none
-hi TabLineFill      ctermfg=187             ctermbg=233             cterm=none
+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=#1c1c1b           gui=none
-hi TabLineSel       ctermfg=254             ctermbg=233             cterm=none
+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=#445566
-hi Visual           ctermfg=NONE            ctermbg=60
-" visual mode selection when vim is 'not owning the selection' (x11 only)
+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
-
diff --git a/colors/manxome.vim b/colors/manxome.vim
index 2049acb..0db38ea 100644
--- a/colors/manxome.vim
+++ b/colors/manxome.vim
@@ -1,8 +1,8 @@
 """ local syntax file - set colors on a per-machine basis:
 """ Vim color file
-""" Title:                      Manxome Foes Color Scheme
-""" Maintainer:         Ricardo SIGNES <rjbs-vim at lists.manxome.org>
-""" This Version:       R2v2 [2003-07-16]
+""" Title:			Manxome Foes Color Scheme
+""" Maintainer:		Ricardo SIGNES <rjbs-vim at 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
@@ -14,34 +14,34 @@ 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
+""		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
+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
+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.
+"	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
+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
index e21e434..ea9395f 100644
--- a/colors/marklar.vim
+++ b/colors/marklar.vim
@@ -1,9 +1,9 @@
 " ------------------------------------------------------------------
-" Filename:      marklar.vim
+" 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
+" 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 
diff --git a/colors/maroloccio.vim b/colors/maroloccio.vim
new file mode 100644
index 0000000..732bbae
--- /dev/null
+++ b/colors/maroloccio.vim
@@ -0,0 +1,594 @@
+" File        : maroloccio.vim
+" Description : a colour scheme for Vim (GUI only)
+" Scheme      : maroloccio
+" Maintainer  : Marco Ippolito < m a r o l o c c i o [at] g m a i l . c o m >
+" Comment     : works well in GUI mode
+" Version     : v0.3.0 inspired by watermark
+" Date        : 6 may 2009
+"
+" History:
+"
+" 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=29
+    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=36
+    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=23 ctermfg=white
+    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=20 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/matrix.vim b/colors/matrix.vim
new file mode 100644
index 0000000..75a0950
--- /dev/null
+++ b/colors/matrix.vim
@@ -0,0 +1,80 @@
+" vim:set ts=8 sts=2 sw=2 tw=0:
+"
+" matrix.vim - MATRIX like colorscheme.
+"
+" Maintainer:   MURAOKA Taro <koron at 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/metacosm.vim b/colors/metacosm.vim
deleted file mode 100644
index 642a326..0000000
--- a/colors/metacosm.vim
+++ /dev/null
@@ -1,141 +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
-
-" -----------------------------------------------------------------------------
-" For Plugins
-" ----------------------------------------------------------------------------
-hi MyTagListFileName guibg=black guifg=yellow
diff --git a/colors/molokai.vim b/colors/molokai.vim
new file mode 100644
index 0000000..aae9420
--- /dev/null
+++ b/colors/molokai.vim
@@ -0,0 +1,211 @@
+" Vim color file
+"
+" Author: Tomas Restrepo <tomas at 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/moss.vim b/colors/moss.vim
new file mode 100644
index 0000000..fa8f47c
--- /dev/null
+++ b/colors/moss.vim
@@ -0,0 +1,109 @@
+" ------------------------------------------------------------------
+" Vim color file
+" Name: moss (è‹”)
+" Maintainer: Li Chunlin <yeiicn!gmail.com>
+" Last Change: 2009-10-15
+" Version: 2.0
+" 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"
+
+" 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
+
diff --git a/colors/motus.vim b/colors/motus.vim
index 53abd5e..146e88d 100644
--- a/colors/motus.vim
+++ b/colors/motus.vim
@@ -22,45 +22,45 @@ let g:colors_name = "motus"
 " GUI Comment : #80a0ff = Light blue
 
 " GUI
-highlight Normal     guifg=Grey80       guibg=Black
+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 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 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
+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 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 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
+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
+    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/mustang.vim b/colors/mustang.vim
new file mode 100644
index 0000000..98cf18e
--- /dev/null
+++ b/colors/mustang.vim
@@ -0,0 +1,57 @@
+" Maintainer:	Henrique C. Alves (hcarvalhoalves at gmail.com)
+" Version:      1.0
+" Last Change:	September 25 2008
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "mustang"
+
+" Vim >= 7.0 specific colors
+if version >= 700
+  hi CursorLine guibg=#2d2d2d ctermbg=236
+  hi CursorColumn guibg=#2d2d2d ctermbg=236
+  hi MatchParen guifg=#d0ffc0 guibg=#2f2f2f gui=bold ctermfg=157 ctermbg=237 cterm=bold
+  hi Pmenu 		guifg=#ffffff guibg=#444444 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=#303030 gui=none ctermfg=244 ctermbg=235
+hi LineNr 		guifg=#808080 guibg=#000000 gui=none ctermfg=244 ctermbg=232
+hi StatusLine 	guifg=#d3d3d5 guibg=#444444 gui=italic ctermfg=253 ctermbg=238 cterm=italic
+hi StatusLineNC guifg=#939395 guibg=#444444 gui=none ctermfg=246 ctermbg=238
+hi VertSplit 	guifg=#444444 guibg=#444444 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=#808080 gui=italic ctermfg=244
+hi Todo 		guifg=#8f8f8f gui=italic ctermfg=245
+hi Boolean      guifg=#b1d631 gui=none ctermfg=148
+hi String 		guifg=#b1d631 gui=italic ctermfg=148
+hi Identifier 	guifg=#b1d631 gui=none ctermfg=148
+hi Function 	guifg=#ffffff gui=bold 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=#000000 guibg=#e6ea50 gui=italic
+
+" Code-specific colors
+hi pythonOperator guifg=#7e8aa2 gui=none ctermfg=103
+
+hi Search     guifg=white	guibg=NONE	cterm=NONE	gui=underline
+
diff --git a/colors/navajo_night.vim b/colors/navajo-night.vim
similarity index 99%
rename from colors/navajo_night.vim
rename to colors/navajo-night.vim
index b100c0a..f0c27f0 100644
--- a/colors/navajo_night.vim
+++ b/colors/navajo-night.vim
@@ -1,6 +1,6 @@
 " Vim colour file
 " Maintainer: Matthew Hawkins <matt at mh.dropbear.id.au>
-" Last Change:  Mon, 22 Apr 2002 15:28:04 +1000
+" 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
diff --git a/colors/navajo.vim b/colors/navajo.vim
new file mode 100644
index 0000000..e7eebe7
--- /dev/null
+++ b/colors/navajo.vim
@@ -0,0 +1,65 @@
+" Vim color file
+" Maintainer: R. Edward Ralston <eralston at 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/neon.vim b/colors/neon.vim
new file mode 100644
index 0000000..d0ba309
--- /dev/null
+++ b/colors/neon.vim
@@ -0,0 +1,70 @@
+" 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/neverness.vim b/colors/neverness.vim
index d8ea5a0..450ea47 100644
--- a/colors/neverness.vim
+++ b/colors/neverness.vim
@@ -1,7 +1,7 @@
 " NEVERNESS colour scheme
 " Author:      Yann GOLANSKI
-" Version:     1.1
-" Last Change: 22 May 2006
+" Version:     1.2
+" Last Change: 13 Jan 2010
 " url http://web.njit.edu/~kevin/rgb.txt.html
 
 set background=dark
@@ -13,67 +13,67 @@ endif
 let g:colors_name = 'neverness'
 
 " Comments: grey
-hi Comment        ctermfg=DarkCyan ctermbg=black  guifg=#848484 guibg=#000000 gui=none 
+hi Comment        ctermfg=DarkCyan     guifg=#848484 guibg=#000000 gui=none 
 
 " Constants: SkyBlue
-hi Boolean        ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
-hi Character      ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
-hi Constant       ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
-hi Float          ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
-hi Number         ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
-hi String         ctermfg=Cyan      ctermbg=black  guifg=#87ceeb guibg=#000000 gui=none
+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 ctermbg=black  guifg=#63b8ff guibg=#000000 gui=none
-hi Function       ctermfg=LightCyan ctermbg=black  guifg=#63b8ff guibg=#000000 gui=none
+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  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Exception      ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Keyword        ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Label          ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Operator       ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Repeat         ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi Statement      ctermfg=DarkBlue  ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
+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 ctermbg=black  guifg=#bf3eff guibg=#000000 gui=none
-hi Include        ctermfg=DarkGreen ctermbg=black  guifg=#bf3eff guibg=#000000 gui=none
-hi Define         ctermfg=DarkGreen ctermbg=black  guifg=#bf3eff guibg=#000000 gui=none
-hi Macro          ctermfg=DarkGreen ctermbg=black  guifg=#bf3eff guibg=#000000 gui=none
-hi PreCondit      ctermfg=DarkGreen ctermbg=black  guifg=#bf3eff guibg=#000000 gui=none
+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 ctermbg=black  guifg=#ee7ae9 guibg=#000000 gui=bold
-hi StorageClass   ctermfg=DarkGreen ctermbg=black  guifg=#ee7ae9 guibg=#000000 gui=bold
-hi Structure      ctermfg=DarkGreen ctermbg=black  guifg=#ee7ae9 guibg=#000000 gui=bold
-hi Typedef        ctermfg=DarkGreen ctermbg=black  guifg=#ee7ae9 guibg=#000000 gui=bold
+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  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
-hi SpecialChar    ctermfg=DarkGray  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
-hi Tag            ctermfg=DarkGray  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
-hi SpecialComment ctermfg=DarkGray  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
-hi Delimiter      ctermfg=DarkGray  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
-hi Debug          ctermfg=DarkGray  ctermbg=black  guifg=#00eeee guibg=#000000 gui=none
+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 ctermbg=black  guifg=#eecfa1 guibg=#000000 gui=none
+hi Underlined     ctermfg=LightGray     guifg=#eecfa1 guibg=#000000 gui=none
 
 " Ignore: black
-hi Ignore         ctermfg=LightGray ctermbg=black  guifg=#ffffff guibg=#000000 gui=none
+hi Ignore         ctermfg=LightGray     guifg=#ffffff guibg=#000000 gui=none
 
 " Error: red
-hi Error          ctermfg=LightGray ctermbg=black  guifg=#ff0000 guibg=#232323 gui=bold
+hi Error          ctermfg=LightGray     guifg=#ff0000 guibg=#232323 gui=bold
 
 " To do: SlateGray3
-hi Todo           ctermfg=LightMagenta ctermbg=black  guifg=#9fb6cd guibg=#232323 gui=none
+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
+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
@@ -81,8 +81,8 @@ hi CursorColumn   guibg=#222222 gui=none
 hi CursorLine     guibg=#222222 gui=none
 
 " Line number.
-"hi LineNr         ctermfg=DarkMagenta ctermbg=black  guifg=#4682b4 guibg=#000000 gui=bold
-hi LineNr         ctermfg=DarkMagenta ctermbg=black  guifg=#213d54 guibg=#000000 gui=none
+"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
@@ -114,3 +114,28 @@ 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 at 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/nightshimmer.vim b/colors/nightshimmer.vim
new file mode 100644
index 0000000..53dce84
--- /dev/null
+++ b/colors/nightshimmer.vim
@@ -0,0 +1,111 @@
+" Vim color file
+" Maintainer: Niklas Lindström <nlm at valtech.se>
+" Last Change: 2002-03-22
+" Version: 0.3
+" URI: http://localhost/
+
+
+""" 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=Green guifg=White
+highlight CursorIM gui=bold guifg=white guibg=Green1
+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=bold guibg=#305060 guifg=#b0d0e0
+highlight IncSearch gui=reverse guifg=fg guibg=bg
+highlight LineNr        gui=bold guibg=grey6 guifg=Purple3
+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
+
+highlight Comment       gui=reverse guifg=#507080
+"highlight Comment       gui=None guifg=#507080
+
+highlight Constant      guifg=Cyan guibg=bg
+    "hi String gui=None guifg=Cyan guibg=bg
+    "hi Character gui=None guifg=Cyan guibg=bg
+    highlight Number gui=None guifg=Cyan guibg=bg
+    highlight Boolean gui=bold guifg=Cyan 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
+
+highlight Ignore    guifg=#204050
+
+highlight Error      guifg=LightYellow  guibg=FireBrick
+
+highlight Todo          guifg=Cyan guibg=#507080
+
+""" OLD COLORS
+
+
+
diff --git a/colors/no_quarter.vim b/colors/no_quarter.vim
new file mode 100644
index 0000000..5c0ee20
--- /dev/null
+++ b/colors/no_quarter.vim
@@ -0,0 +1,134 @@
+" Vim color file
+"  Maintainer: Otavio Fernandes <otaviof at gmail.com>
+" Last Change: 2010/01/03 Sun 22:56
+"     Version: 1.0.6
+"
+" 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=grey90                        guibg=#303030
+
+hi Comment				gui=NONE		guifg=#647bcf       guibg=NONE
+hi Constant				gui=NONE		guifg=#b07050       guibg=NONE
+hi Cursor				gui=NONE		guifg=#424242       guibg=green
+hi CursorIM				gui=NONE		guifg=#ffffff       guibg=#8800ff
+hi CursorLine           gui=NONE                            guibg=gray25
+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=#ffffff       guibg=#8000ff
+hi ErrorMsg				gui=BOLD		guifg=#ffa0ff       guibg=NONE
+hi FoldColumn			gui=NONE		guifg=#40c0ff       guibg=#404040
+hi Folded				gui=NONE		guifg=#40f0f0       guibg=#006090
+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=#707070       guibg=NONE
+hi ModeMsg				gui=BOLD		guifg=#a0d0ff       guibg=NONE
+hi MoreMsg				gui=NONE        guifg=lightred      guibg=bg
+hi NonText				gui=BOLD		guifg=#707070       guibg=#383838
+hi OverLength           gui=NONE        guifg=fg            guibg=#353535
+hi PreProc				gui=NONE		guifg=#c090c0       guibg=NONE
+hi Question				gui=BOLD		guifg=#e8e800       guibg=NONE
+hi Search				gui=NONE		guifg=bg            guibg=grey60
+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=#909090
+hi StatusLineNC			gui=NONE		guifg=#abac84       guibg=#404040
+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=#404040
+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 perlIdentifier			gui=NONE	guifg=#90c0c0	guibg=NONE
+hi perlStatement			gui=NONE	guifg=#c0c090	guibg=NONE
+hi perlStatementHash		gui=NONE	guifg=#c0c090	guibg=#404040
+hi perlStatementNew			gui=NONE	guifg=#c0c090	guibg=#424242
+hi perlMatchStartEnd		gui=NONE	guifg=#c0c090	guibg=#424242
+hi perlVarPlain				gui=NONE	guifg=#74c5c6	guibg=bg
+hi perlVarNotInMatches		gui=NONE	guifg=#915555	guibg=bg
+hi perlVarPlain2			gui=NONE	guifg=#74c6a8	guibg=bg
+hi perlFunctionName			gui=NONE	guifg=white 	guibg=bg
+hi perlNumber				gui=NONE	guifg=#80ac7b	guibg=bg
+hi perlQQ					gui=NONE	guifg=fg		guibg=#393939
+hi perlSpecialString		gui=NONE	guifg=#dc966b	guibg=bg
+hi perlSpecialMatch			gui=NONE	guifg=#c864c7	guibg=bg
+hi perlSpecialBEOM			gui=NONE	guifg=fg		guibg=#404040
+hi perlStringStartEnd		gui=NONE	guifg=#b07050	guibg=#353535
+hi perlShellCommand			gui=NONE	guibg=#c090c0	guibg=#424242
+hi perlOperator				gui=NONE	guifg=#c0c090	guibg=#404040
+hi perlLabel				gui=NONE	guifg=#c0c090	guibg=#404040
+hi perlControl				gui=NONE	guifg=#c0c090	guibg=#404040
+hi perlSharpBang			gui=NONE	guifg=#c0c090	guibg=#505050
+hi perlPackageDecl			gui=NONE	guifg=#80ac7b	guibg=#404040
+hi perlStatementFiledesc	gui=NONE	guifg=#a2c090	guibg=bg
+hi perlRepeat				gui=NONE	guifg=#c0b790	guibg=bg
+hi perlStatementInclude 	gui=NONE 	guifg=#c0c090 	guibg=#3b4038
+hi perlStatementControl		gui=NONE	guifg=#dcdb6b	guibg=bg
+hi perlStatementSub 		gui=NONE 	guifg=#c0c090 	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=#404040
+hi PmenuSbar			guibg=grey20
+hi PmenuThumb			guifg=grey30
+
+"
+" Right Margin
+"
+
+hi rightMargin          guibg=#453030
+
+" EOF
diff --git a/colors/habilight.vim b/colors/nuvola.vim
similarity index 57%
copy from colors/habilight.vim
copy to colors/nuvola.vim
index 45d9133..f9a608a 100644
--- a/colors/habilight.vim
+++ b/colors/nuvola.vim
@@ -1,22 +1,18 @@
+" local syntax file - set colors on a per-machine basis:
+" vim: tw=0 ts=4 sw=4
 " 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
+" Maintainer:	Dr. J. Pfefferl <johann.pfefferl at 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 $
 
-" 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"
+let g:colors_name = "nuvola"
 
 " Normal {{{1
 hi Normal ctermfg=black ctermbg=NONE guifg=black guibg=#F9F5F9
@@ -64,7 +60,7 @@ hi Visual term=reverse ctermfg=yellow ctermbg=black gui=NONE guifg=Black guibg=#
 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 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
@@ -75,28 +71,28 @@ 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 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
+hi! link Debug		Special
 
 " HTML {{{1
 hi htmlLink                 gui=UNDERLINE guifg=#0000ff guibg=NONE
@@ -108,31 +104,4 @@ 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/oceanblack.vim b/colors/oceanblack.vim
new file mode 100644
index 0000000..e6e6be3
--- /dev/null
+++ b/colors/oceanblack.vim
@@ -0,0 +1,115 @@
+" Vim color file
+" Maintainer: Chris Vertonghen <chris at 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/oceandeep.vim b/colors/oceandeep.vim
new file mode 100644
index 0000000..08923d0
--- /dev/null
+++ b/colors/oceandeep.vim
@@ -0,0 +1,140 @@
+" Vim color file
+" Maintainer: Tom Regner <vim at 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
new file mode 100644
index 0000000..08fb22e
--- /dev/null
+++ b/colors/oceanlight.vim
@@ -0,0 +1,105 @@
+" Vim color file
+" Maintainer: Håkan Wikström <hakan at 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/papayawhip.vim b/colors/papayawhip.vim
new file mode 100644
index 0000000..5f8725a
--- /dev/null
+++ b/colors/papayawhip.vim
@@ -0,0 +1,31 @@
+" 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/peaksea.vim b/colors/peaksea.vim
index 2b454ca..359a9ac 100644
--- a/colors/peaksea.vim
+++ b/colors/peaksea.vim
@@ -1,34 +1,34 @@
 " 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:  31 Oct 2008
-" Version:      3.3
+" 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:	31 Oct 2008
+" Version:	3.3
 "
-"       Comments and e-mails are welcomed, thanks.
+"	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 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
+"	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" inside a colorscheme
-"       may cause colorscheme be sourced twice or in the worst case result an
-"       infinite loop.
+"	It is much better *not* to set 'background' option inside
+"	a colorscheme file.  because ":set background" inside a colorscheme
+"	may cause colorscheme be sourced twice or in the worst case result an
+"	infinite loop.
 "
 " Color Scheme Overview: 
-"       :ru syntax/hitest.vim
+"	:ru syntax/hitest.vim
 "
 " Relevant Help: 
-"       :h highlight-groups
-"       :h psc-cterm-color-table
+"	:h highlight-groups
+"	:h psc-cterm-color-table
 "
 " Colors Order:
-"       #rrggbb
+"	#rrggbb
 "
 
 hi clear
@@ -44,355 +44,355 @@ 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
+  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
+  " 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
+  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
+      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
+    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
+    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
+      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
+    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
+  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
+  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
 
   if &t_Co==256
     " 256color light terminal support here
 
-    hi Normal           ctermfg=16      ctermbg=254     cterm=NONE
+    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
+    "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
+    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
+    "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
+          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
+          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
+      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
+    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
+    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
+  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
+  " 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
+      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
+    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  
+    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 
+      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 
+    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
+    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
+        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
+      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
@@ -401,167 +401,167 @@ elseif &background=='dark'
       "
       " 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 
+      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 
+      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 
+      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
+    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
+    "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
+    " 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
+    "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
+          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
+          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 
+      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
@@ -573,23 +573,23 @@ endif
 "
 " COLOR LINKS DEFINE START
 
-hi link         String          Constant
+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
+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
+hi link		Warning		MoreMsg
+hi link		Notice		Constant
 " these are used by Calendar
-hi link         CalToday        PreProc
+hi link		CalToday	PreProc
 " these are used by TagList
-hi link         MyTagListTagName        IncSearch
-hi link         MyTagListTagScope       Constant
+hi link		MyTagListTagName	IncSearch
+hi link		MyTagListTagScope	Constant
 
 " COLOR LINKS DEFINE END
 
diff --git a/colors/print_bw.vim b/colors/print_bw.vim
new file mode 100644
index 0000000..7a4f5e1
--- /dev/null
+++ b/colors/print_bw.vim
@@ -0,0 +1,65 @@
+" Vim color file
+" Maintainer:   Mike Williams <mrw at 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/railscasts.vim b/colors/railscasts.vim
index 54545f0..138e876 100644
--- a/colors/railscasts.vim
+++ b/colors/railscasts.vim
@@ -1,96 +1,124 @@
 " Vim color scheme
 "
-" Name:         railscasts.vim
-" Maintainer:   Nick Moffitt <nick at zork.net>
-" Last Change:  01 Mar 2008
-" License:      WTFPL <http://sam.zoy.org/wtfpl/>
-" Version:      2.1
+" Name:        railscast.vim
+" Maintainer:  Josh O'Rourke <jorourke23 at gmail.com> 
+" License:     public domain
 "
-" This theme is based on Josh O'Rourke's Vim clone of the railscast
-" textmate theme.  The key thing I have done here is supply 256-color
-" terminal equivalents for as many of the colors as possible, and fixed
-" up some of the funny behaviors for editing e-mails and such.
-"
-" To use for gvim:
-" 1: install this file as ~/.vim/colors/railscasts.vim
-" 2: put "colorscheme railscasts" in your .gvimrc
-"
-" If you are using Ubuntu, you can get the benefit of this in your
-" terminals using ordinary vim by taking the following steps:
-"
-" 1: sudo apt-get install ncurses-term
-" 2: put the following in your .vimrc
-"     if $COLORTERM == 'gnome-terminal'
-"         set term=gnome-256color
-"         colorscheme railscasts
-"     else
-"         colorscheme default
-"     endif
-" 3: if you wish to use this with screen, add the following to your .screenrc:
-"     attrcolor b ".I"
-"     termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
-"     defbce "on"
-"     term screen-256color-bce
+" 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"
 
-hi link htmlTag                     xmlTag
-hi link htmlTagName                 xmlTagName
-hi link htmlEndTag                  xmlEndTag
-
-highlight Normal                    guifg=#E6E1DC guibg=#111111 
-highlight Cursor                    guifg=#000000 ctermfg=0 guibg=#FFFFFF ctermbg=15    
-highlight CursorLine                guibg=#000000 ctermbg=233 cterm=NONE
-
-highlight Comment                   guifg=#BC9458 ctermfg=180 gui=italic
-highlight Constant                  guifg=#6D9CBE ctermfg=73
-highlight Define                    guifg=#CC7833 ctermfg=173
-highlight Error                     guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88
-highlight Function                  guifg=#FFC66D ctermfg=221 gui=NONE cterm=NONE
-highlight Identifier                guifg=#6D9CBE ctermfg=73 gui=NONE cterm=NONE
-highlight Include                   guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE
-highlight PreCondit                 guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE
-highlight Keyword                   guifg=#CC7833 ctermfg=173 cterm=NONE
-highlight LineNr                    guifg=#2B2B2B ctermfg=159 guibg=#C0C0FF
-highlight Number                    guifg=#A5C261 ctermfg=107
-highlight PreProc                   guifg=#E6E1DC ctermfg=103
-highlight Search                    guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline
-highlight Statement                 guifg=#CC7833 ctermfg=173 gui=NONE cterm=NONE
-highlight String                    guifg=#A5C261 ctermfg=107
-highlight Title                     guifg=#FFFFFF 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=#DA4939 ctermfg=167 
-
-highlight pythonBuiltin             guifg=#6D9CBE ctermfg=73 gui=NONE cterm=NONE
-highlight rubyBlockParameter        guifg=#FFFFFF ctermfg=15
-highlight rubyClass                 guifg=#FFFFFF ctermfg=15
-highlight rubyConstant              guifg=#DA4939 ctermfg=167
-highlight rubyInstanceVariable      guifg=#D0D0FF ctermfg=189
-highlight rubyInterpolation         guifg=#519F50 ctermfg=107
-highlight rubyLocalVariableOrMethod guifg=#D0D0FF ctermfg=189
-highlight rubyPredefinedConstant    guifg=#DA4939 ctermfg=167
-highlight rubyPseudoVariable        guifg=#FFC66D ctermfg=221
-highlight rubyStringDelimiter       guifg=#A5C261 ctermfg=143
-
-highlight xmlTag                    guifg=#E8BF6A ctermfg=179
-highlight xmlTagName                guifg=#E8BF6A ctermfg=179
-highlight xmlEndTag                 guifg=#E8BF6A 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 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=#FFFFFF ctermfg=15 guibg=#005f5f ctermbg=23
+" 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
+hi Cursor                    guibg=#FFFFFF
+hi CursorLine                guibg=#333435
+hi LineNr                    guifg=#888888 guibg=#DEDEDE
+hi Search                    guibg=#5A647E
+hi Visual                    guibg=#5A647E
+
+" Folds
+" -----
+" line used for closed folds
+hi Folded                    guifg=#F6F3E8 guibg=#444444 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
+hi Todo                      guifg=#BC9458 guibg=NONE gui=italic
+
+"rubyPseudoVariable
+"nil, self, symbols, etc
+hi Constant                  guifg=#6D9CBE
+
+"rubyClass, rubyModule, rubyDefine
+"def, end, include, etc
+hi Define                    guifg=#CC7833
+
+"rubyInterpolation
+hi Delimiter                 guifg=#519F50
+
+"rubyError, rubyInvalidVariable
+hi Error                     guifg=#FFFFFF guibg=#990000
+
+"rubyFunction
+hi Function                  guifg=#FFC66D gui=NONE
+
+"rubyIdentifier
+"@var, @@var, $var, etc
+hi Identifier                guifg=#D0D0FF gui=NONE
+
+"rubyInclude
+"include, autoload, extend, load, require
+hi Include                   guifg=#CC7833 gui=NONE
+
+"rubyKeyword, rubyKeywordAsMethod
+"alias, undef, super, yield, callcc, caller, lambda, proc
+hi Keyword                   guifg=#CC7833
+
+" same as define
+hi Macro                     guifg=#CC7833 gui=NONE
+
+"rubyInteger
+hi Number                    guifg=#A5C261
+
+" #if, #else, #endif
+hi PreCondit                 guifg=#CC7833 gui=NONE
+
+" generic preprocessor
+hi PreProc                   guifg=#CC7833 gui=NONE
+
+"rubyControl, rubyAccess, rubyEval
+"case, begin, do, for, if unless, while, until else, etc.
+hi Statement                 guifg=#CC7833 gui=NONE
+
+"rubyString
+hi String                    guifg=#A5C261
+
+hi Title                     guifg=#FFFFFF
+
+"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/rdark.vim b/colors/rdark.vim
index be54587..62c7cdd 100644
--- a/colors/rdark.vim
+++ b/colors/rdark.vim
@@ -15,15 +15,15 @@ set background=dark
 
 hi clear
 if exists("syntax_on")
-        syntax reset
+	syntax reset
 endif
 
 let colors_name = "rdark"
 
 " Current Line
 if exists('rdark_current_line') && rdark_current_line == 1
-        set cursorline
-        hi CursorLine guibg=#191f21
+	set cursorline
+	hi CursorLine guibg=#191f21
 endif
 
 " Default Colors
diff --git a/colors/relaxedgreen.vim b/colors/relaxedgreen.vim
new file mode 100644
index 0000000..9d2bf14
--- /dev/null
+++ b/colors/relaxedgreen.vim
@@ -0,0 +1,112 @@
+" ----------------------------------------------------------------------------------------------------------------------------------
+" 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/robinhood.vim b/colors/robinhood.vim
new file mode 100644
index 0000000..ab1d14d
--- /dev/null
+++ b/colors/robinhood.vim
@@ -0,0 +1,103 @@
+" Vim color file
+" Maintainer: Datila Carvalho <datila at 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
index cb4f1cb..4be5aeb 100644
--- a/colors/rootwater.vim
+++ b/colors/rootwater.vim
@@ -1,5 +1,5 @@
 " Name: rootwater.vim
-" Maintainer:   Kojo Sugita
+" Maintainer:	Kojo Sugita
 " Last Change:  2008-11-22
 " Revision: 1.2
 "
@@ -11,85 +11,86 @@ 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 lCursor      guifg=#3a553a   guibg=#77dd88
-hi CursorIM     guifg=#3a553a   guibg=#77dd88
+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
+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 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
+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
+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 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
+" 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
+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
+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 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
+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 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
+  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
diff --git a/colors/satori.vim b/colors/satori.vim
new file mode 100644
index 0000000..5c7b250
--- /dev/null
+++ b/colors/satori.vim
@@ -0,0 +1,47 @@
+" Vim color file
+" Maintainer: Ruda Moura <ruda at rudix.org>
+" Last Change: Sun Feb 24 18:50:47 BRT 2008
+
+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
+
+" 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
diff --git a/colors/sea.vim b/colors/sea.vim
new file mode 100644
index 0000000..0c79c47
--- /dev/null
+++ b/colors/sea.vim
@@ -0,0 +1,69 @@
+" 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/settlemyer.vim b/colors/settlemyer.vim
index 675d3c6..91495ff 100644
--- a/colors/settlemyer.vim
+++ b/colors/settlemyer.vim
@@ -13,7 +13,7 @@ if version > 580
     " complaining
     hi clear
     if exists("syntax_on")
-        syntax reset
+	syntax reset
     endif
 endif
 let g:colors_name="settlemyer"
@@ -34,20 +34,20 @@ 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
+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/sienna.vim b/colors/sienna.vim
index 8d6cd30..08b8eda 100644
--- a/colors/sienna.vim
+++ b/colors/sienna.vim
@@ -1,7 +1,7 @@
 " Vim colour scheme
-" Maintainer:   Georg Dahn
-" Last Change:  26 April 2006
-" Version:      1.6
+" 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
diff --git a/colors/silent.vim b/colors/silent.vim
new file mode 100644
index 0000000..679ecd7
--- /dev/null
+++ b/colors/silent.vim
@@ -0,0 +1,116 @@
+" Vim color file
+" @Author: Pascal Vasilii <jabberroid at 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
diff --git a/colors/simpleandfriendly.vim b/colors/simpleandfriendly.vim
index 54f835f..cd6d8b4 100644
--- a/colors/simpleandfriendly.vim
+++ b/colors/simpleandfriendly.vim
@@ -1,13 +1,14 @@
 " Vim color file
-" Maintainer:   Thomas Schmall <ts_nowhere at NOSPAM_yahoo.com>
-" Last Change:  2004 Nov 20
+" Maintainer:	Thomas Schmall www.oxpal.com
+" Last Change:	Nov 2 2009 
 " URL: http://www.vim.org/scripts/script.php?script_id=792
-" Version: 1.3
+" Version: 1.4
 
 " This color scheme uses a light grey background.
 
 " Last Changes:
 " *line number colors changed
+" *current line highlighting
 
 
 " First remove all existing highlighting.
@@ -19,38 +20,46 @@ endif
 
 let g:colors_name = "simpleandfriendly"
 
+"set the highlighting of the current line to true - then give it a color
+"delete next line to turn off current line highlighting for this color scheme
+set cul
+hi cursorline gui=underline 
+"guibg=grey91 
+hi visual guibg=grey80 guifg=black
+
+
 "Set nice colors #DC6210
 "Cursor is Cyan when ":lmap" mappings are active
 hi lCursor guibg=Cyan guifg=NONE
-hi LineNr        guifg=white  guibg=#acbbff
+hi LineNr	 guifg=white  guibg=#acbbff
 
 "Text below the last line is darker grey
-hi NonText      guibg=grey80
+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
+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
+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 Statement	guifg=#4A2B99	gui=NONE  	ctermfg=Blue
 
-hi Title    guifg=red           ctermfg=red gui=NONE term=BOLD
+hi Title    guifg=red		ctermfg=red gui=NONE term=BOLD
 "color for _NONE_ for instance:
-hi PreProc      term=underline  ctermfg=LightBlue       guifg=#DC6210
+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       
+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 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
+"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 Special 	guibg=grey90	guifg=Slateblue	gui=UNDERLINE
 
 hi operator guifg=gray25  ctermfg=Black   term=bold   cterm=bold  gui=bold
diff --git a/colors/softblue.vim b/colors/softblue.vim
new file mode 100644
index 0000000..8d8ee1b
--- /dev/null
+++ b/colors/softblue.vim
@@ -0,0 +1,45 @@
+" 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/soso.vim b/colors/soso.vim
new file mode 100644
index 0000000..c1e1a02
--- /dev/null
+++ b/colors/soso.vim
@@ -0,0 +1,67 @@
+"---------------------------------------------------------------------
+" $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/desert256.vim b/colors/summerfruit256.vim
similarity index 61%
copy from colors/desert256.vim
copy to colors/summerfruit256.vim
index 7a97742..d62cbf8 100644
--- a/colors/desert256.vim
+++ b/colors/summerfruit256.vim
@@ -1,25 +1,18 @@
 " Vim color file
-" Maintainer: Henry So, Jr. <henryso at 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.
+" Maintainer: Martin Baeuml <baeuml at gmail.com>
+" Last Change: 2008-02-09
 "
-" The original "desert" theme is available as part of the vim distribution or
-" at http://hans.fugal.net/vim/colors/.
+" 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.
 "
-" 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 removed the "italic" option and the background color from
+" comment-coloring because that looks odd on my console.
 "
-" 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...
+" The original "summerfruit" color scheme and "desert256" are available from vim.org.
 
-set background=dark
+set background=light
 if version > 580
     " no guarantees for version 5.8 and below, but this makes it stop
     " complaining
@@ -28,7 +21,7 @@ if version > 580
         syntax reset
     endif
 endif
-let g:colors_name="desert256"
+let g:colors_name="summerfruit256"
 
 if has("gui_running") || &t_Co == 88 || &t_Co == 256
     " functions {{{
@@ -240,51 +233,77 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     endfun
     " }}}
 
-    call <SID>X("Normal", "cccccc", "000000", "")
+    " 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", "")
 
-    " 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", "")
+    " 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", "")
-    "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
+    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", "", "")
 
-    " 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", "")
+    " 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
@@ -297,42 +316,7 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     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/taqua.vim b/colors/taqua.vim
new file mode 100644
index 0000000..51e7039
--- /dev/null
+++ b/colors/taqua.vim
@@ -0,0 +1,84 @@
+" Vim color file
+" Maintainer:   TaQ <eustaquiorangel at 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=BOLD guifg=#0384F6 guibg=#DBF2FF
+hi Error      gui=BOLD guifg=#FF0000 guibg=#FFFFFF
+" hi Identifier gui=NONE guifg=#1F89E0 guibg=#FFFFFF 
+hi Identifier gui=NONE guifg=#000000 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=#F36CE5 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/tcsoft.vim b/colors/tcsoft.vim
new file mode 100644
index 0000000..3198341
--- /dev/null
+++ b/colors/tcsoft.vim
@@ -0,0 +1,83 @@
+" Vim Farben-Datei
+" Ersteller:	Ingo Fabbri <vim at 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/tir_black.vim b/colors/tir_black.vim
new file mode 100644
index 0000000..802dec1
--- /dev/null
+++ b/colors/tir_black.vim
@@ -0,0 +1,130 @@
+" 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
new file mode 100644
index 0000000..7b97b9a
--- /dev/null
+++ b/colors/tolerable.vim
@@ -0,0 +1,43 @@
+" 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/twilight.vim b/colors/twilight.vim
new file mode 100644
index 0000000..f2ccdd3
--- /dev/null
+++ b/colors/twilight.vim
@@ -0,0 +1,114 @@
+
+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/two2tango.vim b/colors/two2tango.vim
new file mode 100644
index 0000000..8fa42be
--- /dev/null
+++ b/colors/two2tango.vim
@@ -0,0 +1,101 @@
+" Vim color file
+" Name: two2tango
+" Maintainer: Erik Falor <ewfalor at gmail.com>
+" Version: 1.1
+"
+" Big props to Panos Laganakos <panos.laganakos at 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'
+" }}}
+
+hi Normal      guibg=#2e3436 guifg=#d3d7cf
+execute "hi Normal      guibg=" . s:Aluminium[5]  . " guifg=" . s:Aluminium[1] 
+
+" {{{ syntax
+execute "hi Comment      gui=italic guifg=" . s:Aluminium[4]
+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 CursorLine   guibg=" . s:Background
+execute "hi CursorColumn guibg=" . s:Background
+"hi CursorIM TODO
+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]
+"hi Menu      TODO
+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] 
+"hi Scrollbar TODO
+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]
+"hi TabLine     TODO - non-active tab page label
+"hi TabLineFill TODO - fill color where there are no tabs
+"hi TabLineSel  TODO - active tab page label
+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   TODO - Visual mode selection when vim is "Not Owning the Selection".
+execute "hi WarningMsg   guifg=" . s:Orange[0]
+execute "hi WildMenu     guifg=" . s:Butter[2] . " guibg=" . s:Butter[0]
+" }}}
+
+"  {{{ terminal
+" TODO
+" }}}
+
+" vim: sw=4 foldmethod=marker
diff --git a/colors/vc.vim b/colors/vc.vim
index 372994c..53ecc22 100644
--- a/colors/vc.vim
+++ b/colors/vc.vim
@@ -10,15 +10,15 @@ if exists("syntax_on")
 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                
+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/vylight.vim b/colors/vylight.vim
new file mode 100644
index 0000000..156adf3
--- /dev/null
+++ b/colors/vylight.vim
@@ -0,0 +1,81 @@
+"
+" Vim colour file
+"
+" Maintainer:  Vy-Shane Sin Fat <shane at 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/wombat.vim b/colors/wombat.vim
index 92415ff..9ad1e56 100644
--- a/colors/wombat.vim
+++ b/colors/wombat.vim
@@ -1,5 +1,5 @@
-" Maintainer:   Lars H. Nielsen (dengmao at gmail.com)
-" Last Change:  January 22 2007
+" Maintainer:	Lars H. Nielsen (dengmao at gmail.com)
+" Last Change:	January 22 2007
 
 set background=dark
 
@@ -17,35 +17,35 @@ 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
+  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 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
+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
+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/wood.vim b/colors/wood.vim
new file mode 100644
index 0000000..2f6059e
--- /dev/null
+++ b/colors/wood.vim
@@ -0,0 +1,39 @@
+" Vim color file
+" Maintainer:   freddydaoud at 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
new file mode 100644
index 0000000..88a6126
--- /dev/null
+++ b/colors/wuye.vim
@@ -0,0 +1,82 @@
+" 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/zenburn.vim b/colors/zenburn.vim
index a2fa135..edbd6d7 100644
--- a/colors/zenburn.vim
+++ b/colors/zenburn.vim
@@ -1,7 +1,7 @@
 " Vim color file
 " Maintainer:   Jani Nurminen <slinky at iki.fi>
-" Last Change:  $Id: zenburn.vim,v 2.4 2008/11/18 20:43:18 slinky Exp $
-" URL:          http://slinky.imukuppi.org/zenburnpage/
+" Last Change:  $Id: zenburn.vim,v 2.13 2009/10/24 10:16:01 slinky Exp $
+" URL:      	http://slinky.imukuppi.org/zenburnpage/
 " License:      GPL
 "
 " Nothing too fancy, just some alien fruit salad to keep you in the zone.
@@ -12,7 +12,16 @@
 " Owes heavily to other Vim color files! With special mentions
 " to "BlackDust", "Camo" and "Desert".
 "
-" To install, copy to ~/.vim/colors directory. Then :colorscheme zenburn.  
+" To install, copy to ~/.vim/colors directory.
+"
+" Alternatively, you can use Vimball installation:
+"     vim zenburn.vba
+"     :so %
+"     :q
+"
+" For details, see :help vimball
+"
+" After installation, use it with :colorscheme zenburn.
 " See also :help syntax
 "
 " Credits:
@@ -23,28 +32,44 @@
 "  - Charlie - spotted too bright StatusLine in non-high contrast mode
 "  - Pablo Castellazzi - CursorLine fix for 256 color mode
 "  - Tim Smith - force dark background
+"  - John Gabriele - spotted bad Ignore-group handling
+"  - Zac Thompson - spotted invisible NonText in low contrast mode
+"  - Christophe-Marie Duquesne - suggested making a Vimball
 "
 " CONFIGURABLE PARAMETERS:
-" 
+"
 " You can use the default (don't set any parameters), or you can
 " set some parameters to tweak the Zenburn colours.
 "
+" To use them, put them into your .vimrc file before loading the color scheme,
+" example:
+"    let g:zenburn_high_Contrast=1
+"    colors zenburn
+"
 " * You can now set a darker background for bright environments. To activate, use:
 "   contrast Zenburn, use:
 "
 "      let g:zenburn_high_Contrast = 1
 "
+" * For example, Vim help files uses the Ignore-group for the pipes in tags 
+"   like "|somelink.txt|". By default, the pipes are not visible, as they
+"   map to Ignore group. If you wish to enable coloring of the Ignore group,
+"   set the following parameter to 1. Warning, it might make some syntax files
+"   look strange.
+"
+"      let g:zenburn_color_also_Ignore = 1
+"
 " * To get more contrast to the Visual selection, use
-"   
+"
 "      let g:zenburn_alternate_Visual = 1
-" 
+"
 " * To use alternate colouring for Error message, use
-"     
+"
 "      let g:zenburn_alternate_Error = 1
 "
 " * The new default for Include is a duller orange. To use the original
 "   colouring for Include, use
-"     
+"
 "      let g:zenburn_alternate_Include = 1
 "
 " * Work-around to a Vim bug, it seems to misinterpret ctermfg and 234 and 237
@@ -53,6 +78,8 @@
 "
 "      let g:zenburn_force_dark_Background = 1
 "
+" NOTE:
+"
 " * To turn the parameter(s) back to defaults, use UNLET:
 "
 "      unlet g:zenburn_alternate_Include
@@ -60,13 +87,13 @@
 "   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          
+hi clear
 if exists("syntax_on")
     syntax reset
 endif
@@ -100,7 +127,6 @@ hi LineNr          guifg=#9fafaf guibg=#262626
 hi Macro           guifg=#ffcfaf gui=bold
 hi ModeMsg         guifg=#ffcfaf 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
@@ -136,51 +162,50 @@ hi SpellLocal guisp=#7cac7c guifg=#9ccc9c
 
 " Entering Kurt zone
 if &t_Co > 255
-    hi Boolean         ctermfg=181  
+    hi Boolean         ctermfg=181
     hi Character       ctermfg=181   cterm=bold
-    hi Comment         ctermfg=108   
+    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 Delimiter       ctermfg=245
     hi DiffAdd         ctermfg=66    ctermbg=237     cterm=bold
-    hi DiffChange      ctermbg=236  
-    hi DiffDelete      ctermfg=236   ctermbg=238    
+    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 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 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 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 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 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 StatusLine      ctermfg=236   ctermbg=186
+    hi StatusLineNC    ctermfg=235   ctermbg=108
     hi StorageClass    ctermfg=249   cterm=bold
-    hi String          ctermfg=174  
+    hi String          ctermfg=174
     hi Structure       ctermfg=229   cterm=bold
     hi Tag             ctermfg=181   cterm=bold
     hi Title           ctermfg=7     ctermbg=234     cterm=bold
@@ -188,7 +213,7 @@ if &t_Co > 255
     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 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
@@ -199,13 +224,18 @@ if &t_Co > 255
     hi SpellBad   ctermfg=9   ctermbg=237
     hi SpellCap   ctermfg=12  ctermbg=237
     hi SpellRare  ctermfg=13  ctermbg=237
-  
+
     " pmenu
     hi PMenu      ctermfg=248  ctermbg=0
     hi PMenuSel   ctermfg=223 ctermbg=235
 
     if exists("g:zenburn_high_Contrast")
         hi Normal ctermfg=188 ctermbg=234
+        hi NonText         ctermfg=238
+
+        if exists("g:zenburn_color_also_Ignore")
+            hi Ignore          ctermfg=238
+        endif
     else
         hi Normal ctermfg=188 ctermbg=237
         hi Cursor          ctermbg=109
@@ -216,7 +246,7 @@ if &t_Co > 255
         hi foldcolumn      ctermbg=238
         hi folded          ctermbg=238
         hi incsearch       ctermbg=228
-        hi linenr          ctermbg=238  
+        hi linenr          ctermbg=238
         hi search          ctermbg=238
         hi statement       ctermbg=237
         hi statusline      ctermbg=144
@@ -224,10 +254,23 @@ if &t_Co > 255
         hi title           ctermbg=237
         hi todo            ctermbg=237
         hi underlined      ctermbg=237
-        hi vertsplit       ctermbg=65 
+        hi vertsplit       ctermbg=65
         hi visualnos       ctermbg=210
         hi warningmsg      ctermbg=236
         hi wildmenu        ctermbg=236
+        hi NonText         ctermfg=240
+        
+        if exists("g:zenburn_color_also_Ignore")
+            hi Ignore          ctermfg=240
+        endif
+    endif
+
+    if exists("g:zenburn_alternate_Error")
+        " use more jumpy Error
+        hi Error ctermfg=210 ctermbg=52 gui=bold
+    else
+        " default is something more zenburn-compatible
+        hi Error ctermfg=228 ctermbg=95 gui=bold
     endif
 endif
 
@@ -246,13 +289,14 @@ if exists("g:zenburn_high_Contrast")
     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 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
+    hi NonText         guifg=#404040 gui=bold
 else
     " Original, lighter background
     hi Normal          guifg=#dcdccc guibg=#3f3f3f
@@ -260,15 +304,16 @@ else
     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 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
+    hi NonText         guifg=#5b605e gui=bold
 endif
-    
+
 
 if exists("g:zenburn_alternate_Visual")
     " Visual with more contrast, thanks to Steve Hall & Cream posse
@@ -282,18 +327,25 @@ else
 endif
 
 if exists("g:zenburn_alternate_Error")
-    " use a bit different Error
-    hi Error           guifg=#ef9f9f guibg=#201010 gui=bold  
+    " use more jumpy Error
+    hi Error        guifg=#e37170 guibg=#664040 gui=bold
 else
-    " default
-    hi Error           guifg=#e37170 guibg=#332323 gui=none
+    " default is something more zenburn-compatible
+    hi Error        guifg=#e37170 guibg=#3d3535 gui=none
 endif
 
 if exists("g:zenburn_alternate_Include")
     " original setting
-    hi Include         guifg=#ffcfaf gui=bold
+    hi Include      guifg=#ffcfaf gui=bold
 else
     " new, less contrasted one
-    hi Include         guifg=#dfaf8f gui=bold
+    hi Include      guifg=#dfaf8f gui=bold
 endif
-    " TODO check for more obscure syntax groups that they're ok
+
+if exists("g:zenburn_color_also_Ignore")
+    " color the Ignore groups
+    " note: if you get strange coloring for your files, turn this off (unlet)
+    hi Ignore guifg=#545a4f
+endif
+
+" TODO check for more obscure syntax groups that they're ok
diff --git a/colors/zmrok.vim b/colors/zmrok.vim
new file mode 100644
index 0000000..122b051
--- /dev/null
+++ b/colors/zmrok.vim
@@ -0,0 +1,59 @@
+" 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/debian/changelog b/debian/changelog
index 3252025..abcfcc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ vim-scripts (20091012) UNRELEASED; urgency=low
   * Updated addons:
     - supertab: Updated to 1.0
     - DoxygenToolkit: Update to 0.2.7
+    - Color Sampler Pack: Update to 8.03
 
  -- James Vega <jamessan at debian.org>  Sun, 24 Jan 2010 17:10:16 -0500
 
diff --git a/debian/patches/disabledby-color_sample_pack.diff b/debian/patches/disabledby-color_sample_pack.diff
index a7a602b..de2a3f7 100644
--- a/debian/patches/disabledby-color_sample_pack.diff
+++ b/debian/patches/disabledby-color_sample_pack.diff
@@ -6,7 +6,7 @@ Index: vim-scripts/plugin/color_sample_pack.vim
 +++ vim-scripts/plugin/color_sample_pack.vim
 @@ -1,6 +1,11 @@
  " Maintainer: Robert Melton ( iam -at- robertmelton -dot- com)
- " Last Change: 2009 June 4th
+ " Last Change: 2010 Jan 20th
  
 +if exists("loaded_color_sample_pack")
 +  finish
diff --git a/debian/vim-scripts.status b/debian/vim-scripts.status
index 9473821..0336888 100644
--- a/debian/vim-scripts.status
+++ b/debian/vim-scripts.status
@@ -223,15 +223,15 @@ version:     1.3
 
 script_name: plugin/color_sample_pack.vim
 addon:       colors-sampler-pack
-description: colors sampler pack: all the color schemes on vim.sf.net
+description: colors sampler pack: top 100 color schemes on vim.sf.net
 script_url:  http://www.vim.org/scripts/script.php?script_id=625
 author:      Robert (MetaCosm)
 author_url:  http://www.vim.org/account/profile.php?user_id=2162
-email:       vim at metacosm.dhs.org
+email:       iam at robertmelton.com
 license:     see colors/*.vim for per color scheme licenses
 extras:	     colors/*.vim
 disabledby:  let loaded_color_sample_pack = 1
-version:     7.01
+version:     8.03
 
 script_name: macros/closetag.vim
 addon:       closetag
diff --git a/html/index.html b/html/index.html
index 94d21eb..67a6ce1 100644
--- a/html/index.html
+++ b/html/index.html
@@ -50,7 +50,7 @@
    <li><a href="syntax_mkd.vim.html">syntax/mkd.vim.html</a></li>
   </ul>
   <p>
-  Page generated on Tue, 26 Jan 2010 16:50:17 -0500
+  Page generated on Tue, 26 Jan 2010 17:01:16 -0500
 .
   </p>
  </body>
diff --git a/html/plugin_color_sample_pack.vim.html b/html/plugin_color_sample_pack.vim.html
index d785934..576e639 100644
--- a/html/plugin_color_sample_pack.vim.html
+++ b/html/plugin_color_sample_pack.vim.html
@@ -3,7 +3,7 @@
 
 <head>
   <link rel="Stylesheet" type="text/css" href="/css/style.css" >
-  <title>Color Sampler Pack - [June 2009 Update] Top 100 Themes, Better Menu, Online Demo! : vim online</title>
+  <title>Color Sampler Pack - *NEW* [Jan 2010 Update] Top 100 Themes, GUI Menu : vim online</title>
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   <meta name="KEYWORDS" content="Vim, Vi IMproved, text editor, home, documentation, tips, scripts, news">
   <link rel="shortcut icon" type="image/x-icon" href="/images/vim_shortcut.ico">
@@ -156,7 +156,7 @@
         <tr>
           <td valign="top">
 
-<span class="txth1">Color Sampler Pack : [June 2009 Update] Top 100 Themes, Better Menu, Online Demo!</span> 
+<span class="txth1">Color Sampler Pack : *NEW* [Jan 2010 Update] Top 100 Themes, GUI Menu</span> 
 
 <br>
 <br>
@@ -166,8 +166,8 @@
 <tr>
   <td class="lightbg"><b>&nbsp;script karma&nbsp;</b></td>
   <td>
-    Rating <b>1460/539</b>,
-    Downloaded by 33873  </td>
+    Rating <b>1679/620</b>,
+    Downloaded by 37510  </td>
 </tr>
 </table>
 <p>
@@ -180,7 +180,7 @@
 <tr><td>color scheme</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">description</td></tr>
-<tr><td>This package is simply to help people who want to try out a lot of color schemes.&nbsp;&nbsp;It is the top 100 rated color schemes on vim.sf.net as of June 04th, 2009 that are are not &quot;evil&quot; (binding keys, changing fonts, etc) --&nbsp;&nbsp;zipped up in a single package.&nbsp;&nbsp;Every single theme was updated to its newest revision, and converted to unix formatted line endings. 
<br>
<br>Check out a demo of these themes at: <a target="_blank" href="http://www.vi-improved.org/color_sampler_pack/">http://www.vi-improved.org/color_sampler_pack/</A>
<br>
<br>The menu has been simplified based on feedback to simply three categories.&nbsp;&nbsp;Dark / Light / Other. 
<br>
<br>This package was put together simply to save others time in downloading the color schemes.&nbsp;&nbsp;If you are a scheme author and for some reason do not want your scheme included, please simply drop me a note.&nbsp;&nbsp;iam -at- robertmelton.com
<br>
<br>Now, the pack comes with an organized GUI menu, but no tool for console users.&nbsp;&nbsp;I recommend you pick up <a target="_blank" href="http://www.vim.org/scripts/script.php?script_id=1488">http://www.vim.org/scripts/script.php?script_id=1488</A> which is a colorscheme scroller / chooser and browser.&nbsp;&nbsp;
<br>
<br>Many of these schemes are Gvim only, and do not support consoles well... but there is a plugin to allow Gvim only themes to work in 88/256 color terminals -&gt; <a target="_blank" href="http://www.vim.org/scripts/script.php?script_id=2390">http://www.vim.org/scripts/script.php?script_id=2390</A>.
<br>
<br>Love it or Hate it -- Rate it.&nbsp;&nbsp;:)</td></tr>
+<tr><td>This package is simply to help people who want to try out a lot of color schemes.&nbsp;&nbsp;It is the top 100 rated color schemes on vim.sf.net as of Jan 20th, 2010 that are are not &quot;evil&quot; (binding keys, changing fonts, etc) --&nbsp;&nbsp;zipped up in a single package.&nbsp;&nbsp;Every single theme was updated to its newest revision, and converted to unix formatted line endings. 
<br>
<br>Check out a demo of these themes at: <a target="_blank" href="http://www.vi-improved.org/color_sampler_pack/">http://www.vi-improved.org/color_sampler_pack/</A>
<br>
<br>The menu has been simplified based on feedback to simply three categories.&nbsp;&nbsp;Dark / Light / Other. 
<br>
<br>This package was put together simply to save others time in downloading the color schemes.&nbsp;&nbsp;If you are a scheme author and for some reason do not want your scheme included, please simply drop me a note.&nbsp;&nbsp;iam -at- robertmelton.com
<br>
<br>Now, the pack comes with an organized GUI menu, but no tool for console users.&nbsp;&nbsp;I recommend you pick up <a target="_blank" href="http://www.vim.org/scripts/script.php?script_id=1488">http://www.vim.org/scripts/script.php?script_id=1488</A> which is a colorscheme scroller / chooser and browser.&nbsp;&nbsp;
<br>
<br>Many of these schemes are Gvim only, and do not support consoles well... but there is a plugin to allow Gvim only themes to work in 88/256 color terminals -&gt; <a target="_blank" href="http://www.vim.org/scripts/script.php?script_id=2390">http://www.vim.org/scripts/script.php?script_id=2390</A>.
<br>
<br>Love it or Hate it -- Rate it.&nbsp;&nbsp;:)</td></tr>
 <tr><td>&nbsp;</td></tr>
 <tr><td class="prompt">install details</td></tr>
 <tr><td>Simply unzip, and place the files in ~/.vim/plugin and ~/.vim/colors --- it will unzip with correct dir structure, so you can just unzip to ~/.vim
<br>
<br>Hope this helps you... join #vim on irc.freenode.net for all your vim help needs :)</td></tr>
@@ -217,12 +217,12 @@ Click on the package to download.
     <th valign="top">release notes</th>
 </tr>
 <tr>
-        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=10775">ColorSamplerPack.zip</a></td>
-    <td class="rowodd" valign="top" nowrap><b>7.01</b></td>
-    <td class="rowodd" valign="top" nowrap><i>2009-06-08</i></td>
+        <td class="rowodd" valign="top" nowrap><a href="download_script.php?src_id=12179">ColorSamplerPack.zip</a></td>
+    <td class="rowodd" valign="top" nowrap><b>8.03</b></td>
+    <td class="rowodd" valign="top" nowrap><i>2010-01-25</i></td>
     <td class="rowodd" valign="top" nowrap>7.0</td>
     <td class="rowodd" valign="top"><i><a href="/account/profile.php?user_id=2162">Robert (MetaCosm)</a></i></td>
-    <td class="rowodd" valign="top" width="2000">[June 2009 Update] Improved and simplified menu, more strict script checking for evil, removed some default themes I was repackaging and removed some more &quot;bad actors&quot; from the pack.&nbsp;&nbsp;I now simply include the 100 highest rated themes, which in this case was themes with a Karma and above.&nbsp;&nbsp;Online demo of themes at: <a target="_blank" href="http://www.vi-improved.org/color_sampler_pack/">http://www.vi-improved.org/color_sampler_pack/</A></td>
+    <td class="rowodd" valign="top" width="2000">[Jan 2010 Update] 30 new themes climbed into the top 100, which means 30 were deprecated.&nbsp;&nbsp;Online demo of themes at: <a target="_blank" href="http://www.vi-improved.org/color_sampler_pack/">http://www.vi-improved.org/color_sampler_pack/</A> .&nbsp;&nbsp;Total theme count, 137 (that is 100 themes, some of them have multiple sub-versions)
<br></td>
 </tr>
 </table>
 <!-- finish off the framework -->
diff --git a/plugin/color_sample_pack.vim b/plugin/color_sample_pack.vim
index 914cb3f..00e8af2 100644
--- a/plugin/color_sample_pack.vim
+++ b/plugin/color_sample_pack.vim
@@ -1,5 +1,5 @@
 " Maintainer: Robert Melton ( iam -at- robertmelton -dot- com)
-" Last Change: 2009 June 4th
+" Last Change: 2010 Jan 20th
 
 " default schemes
 amenu T&hemes.D&efault.Blue :colo blue<CR>
@@ -19,10 +19,83 @@ amenu T&hemes.D&efault.Shine :colo shine<CR>
 amenu T&hemes.D&efault.Torte :colo torte<CR>
 amenu T&hemes.-s1- :
 
+" 37 new themes
+amenu T&hemes.&New.&Dark.Adaryn :colo adaryn<CR>
+amenu T&hemes.&New.&Dark.Adrian :colo adrian<CR>
+amenu T&hemes.&New.&Dark.Anotherdark :colo anotherdark<CR>
+amenu T&hemes.&New.&Dark.BlackSea :colo blacksea<CR>
+amenu T&hemes.&New.&Dark.Colorer :colo colorer<CR>
+amenu T&hemes.&New.&Dark.Darkbone :colo darkbone<CR>
+amenu T&hemes.&New.&Dark.DarkZ :colo darkz<CR>
+amenu T&hemes.&New.&Dark.Herald :colo herald<CR>
+amenu T&hemes.&New.&Dark.Jammy :colo jammy<CR>
+amenu T&hemes.&New.&Dark.Kellys :colo kellys<CR>
+amenu T&hemes.&New.&Dark.Lettuce :colo lettuce<CR>
+amenu T&hemes.&New.&Dark.Maroloccio :colo maroloccio<CR>
+amenu T&hemes.&New.&Dark.Molokai :colo molokai<CR>
+amenu T&hemes.&New.&Dark.Mustang :colo mustang<CR>
+amenu T&hemes.&New.&Dark.TIRBlack :colo tir_black<CR>
+amenu T&hemes.&New.&Dark.Twilight :colo twilight<CR>
+amenu T&hemes.&New.&Dark.Two2Tango :colo two2tango<CR>
+amenu T&hemes.&New.&Dark.Wuye :colo wuye<CR>
+amenu T&hemes.&New.&Dark.Zmrok :colo zmrok<CR>
+amenu T&hemes.&New.&Light.BClear :colo bclear<CR>
+amenu T&hemes.&New.&Light.Satori :colo satori<CR>
+amenu T&hemes.&New.&Light.Silent :colo silent<CR>
+amenu T&hemes.&New.&Light.SoSo :colo soso<CR>
+amenu T&hemes.&New.&Light.SummerFruit256 :colo summerfruit256<CR>
+amenu T&hemes.&New.&Light.TAqua :colo taqua<CR>
+amenu T&hemes.&New.&Light.TCSoft :colo tcsoft<CR>
+amenu T&hemes.&New.&Light.VYLight :colo vylight<CR>
+amenu T&hemes.&New.&Other.Aqua :colo aqua<CR>
+amenu T&hemes.&New.&Other.Clarity :colo clarity<CR>
+amenu T&hemes.&New.&Other.CleanPHP :colo cleanphp<CR>
+amenu T&hemes.&New.&Other.Denim :colo denim<CR>
+amenu T&hemes.&New.&Other.Guardian :colo guardian<CR>
+amenu T&hemes.&New.&Other.Moss :colo moss<CR>
+amenu T&hemes.&New.&Other.Nightshimmer :colo nightshimmer<CR>
+amenu T&hemes.&New.&Other.NoQuarter :colo no_quarter<CR>
+amenu T&hemes.&New.&Other.RobinHood :colo robinhood<CR>
+amenu T&hemes.&New.&Other.SoftBlue :colo softblue<CR>
+amenu T&hemes.&New.&Other.Wood :colo wood<CR>
+
+" 30 removed themes
+amenu T&hemes.De&precated.&Dark.DwBlue :colo dw_blue<CR>
+amenu T&hemes.De&precated.&Dark.DwCyan :colo dw_cyan<CR>
+amenu T&hemes.De&precated.&Dark.DwGreen :colo dw_green<CR>
+amenu T&hemes.De&precated.&Dark.DwOrange :colo dw_orange<CR>
+amenu T&hemes.De&precated.&Dark.DwPurple :colo dw_purple<CR>
+amenu T&hemes.De&precated.&Dark.DwRed :colo dw_red<CR>
+amenu T&hemes.De&precated.&Dark.DwYellow :colo dw_yellow<CR>
+amenu T&hemes.De&precated.&Dark.Fruity :colo fruity<CR>
+amenu T&hemes.De&precated.&Dark.Leo :colo leo<CR>
+amenu T&hemes.De&precated.&Dark.Matrix :colo matrix<CR>
+amenu T&hemes.De&precated.&Dark.Metacosm :colo metacosm<CR>
+amenu T&hemes.De&precated.&Dark.Northland :colo northland<CR>
+amenu T&hemes.De&precated.&Dark.Railscasts2 :colo railscasts2<CR>
+amenu T&hemes.De&precated.&Dark.Synic :colo synic<CR>
+amenu T&hemes.De&precated.&Dark.Wombat256 :colo wombat256<CR>
+amenu T&hemes.De&precated.&Dark.Xoria256 :colo xoria256<CR>
+amenu T&hemes.De&precated.&Light.Autumn2 :colo autumn2<CR>
+amenu T&hemes.De&precated.&Light.Buttercream :colo buttercream<CR>
+amenu T&hemes.De&precated.&Light.Fine_blue :colo fine_blue<CR>
+amenu T&hemes.De&precated.&Light.Impact :colo impact<CR>
+amenu T&hemes.De&precated.&Light.Oceanlight :colo oceanlight<CR>
+amenu T&hemes.De&precated.&Light.Print_bw :colo print_bw<CR>
+amenu T&hemes.De&precated.&Light.Pyte :colo pyte<CR>
+amenu T&hemes.De&precated.&Light.Spring :colo spring<CR>
+amenu T&hemes.De&precated.&Light.Winter :colo winter<CR>
+amenu T&hemes.De&precated.&Other.Astronaut :colo astronaut<CR>
+amenu T&hemes.De&precated.&Other.Bluegreen :colo bluegreen<CR>
+amenu T&hemes.De&precated.&Other.Navajo :colo navajo<CR>
+amenu T&hemes.De&precated.&Other.Olive :colo olive<CR>
+amenu T&hemes.De&precated.&Other.Tabula :colo tabula<CR>
+amenu T&hemes.De&precated.&Other.Xemacs :colo xemacs<CR>
+
 " Themepack Themes
 amenu T&hemes.&Dark.Asu1dark :colo asu1dark<CR>
 amenu T&hemes.&Dark.Brookstream :colo brookstream<CR>
-amenu T&hemes.&Dark.Calmar256_dark :colo calmar256_dark<CR>
+amenu T&hemes.&Dark.Calmar256-dark :colo calmar256-dark<CR>
 amenu T&hemes.&Dark.Camo :colo camo<CR>
 amenu T&hemes.&Dark.Candy :colo candy<CR>
 amenu T&hemes.&Dark.Candycode :colo candycode<CR>
@@ -31,92 +104,61 @@ amenu T&hemes.&Dark.Darkspectrum :colo darkspectrum<CR>
 amenu T&hemes.&Dark.Desert256 :colo desert256<CR>
 amenu T&hemes.&Dark.DesertEx :colo desertEx<CR>
 amenu T&hemes.&Dark.Dusk :colo dusk<CR>
-amenu T&hemes.&Dark.Dw_blue :colo dw_blue<CR>
-amenu T&hemes.&Dark.Dw_cyan :colo dw_cyan<CR>
-amenu T&hemes.&Dark.Dw_green :colo dw_green<CR>
-amenu T&hemes.&Dark.Dw_orange :colo dw_orange<CR>
-amenu T&hemes.&Dark.Dw_purple :colo dw_purple<CR>
-amenu T&hemes.&Dark.Dw_red :colo dw_red<CR>
-amenu T&hemes.&Dark.Dw_yellow :colo dw_yellow<CR>
 amenu T&hemes.&Dark.Earendel :colo earendel<CR>
 amenu T&hemes.&Dark.Ekvoli :colo ekvoli<CR>
 amenu T&hemes.&Dark.Fnaqevan :colo fnaqevan<CR>
 amenu T&hemes.&Dark.Freya :colo freya<CR>
-amenu T&hemes.&Dark.Fruity :colo fruity<CR>
 amenu T&hemes.&Dark.Golden :colo golden<CR>
 amenu T&hemes.&Dark.Inkpot :colo inkpot<CR>
 amenu T&hemes.&Dark.Jellybeans :colo jellybeans<CR>
-amenu T&hemes.&Dark.Leo :colo leo<CR>
 amenu T&hemes.&Dark.Lucius :colo lucius<CR>
 amenu T&hemes.&Dark.Manxome :colo manxome<CR>
-amenu T&hemes.&Dark.Matrix :colo matrix<CR>
-amenu T&hemes.&Dark.Metacosm :colo metacosm<CR>
 amenu T&hemes.&Dark.Moria :colo moria<CR>
 amenu T&hemes.&Dark.Motus :colo motus<CR>
 amenu T&hemes.&Dark.Neon :colo neon<CR>
 amenu T&hemes.&Dark.Neverness :colo neverness<CR>
-amenu T&hemes.&Dark.Northland :colo northland<CR>
 amenu T&hemes.&Dark.Oceanblack :colo oceanblack<CR>
 amenu T&hemes.&Dark.Railscasts :colo railscasts<CR>
-amenu T&hemes.&Dark.Railscasts2 :colo railscasts2<CR>
 amenu T&hemes.&Dark.Rdark :colo rdark<CR>
 amenu T&hemes.&Dark.Relaxedgreen :colo relaxedgreen<CR>
 amenu T&hemes.&Dark.Rootwater :colo rootwater<CR>
-amenu T&hemes.&Dark.Synic :colo synic<CR>
 amenu T&hemes.&Dark.Tango :colo tango<CR>
 amenu T&hemes.&Dark.Tango2 :colo tango2<CR>
 amenu T&hemes.&Dark.Vibrantink :colo vibrantink<CR>
 amenu T&hemes.&Dark.Vividchalk :colo vividchalk<CR>
 amenu T&hemes.&Dark.Wombat :colo wombat<CR>
-amenu T&hemes.&Dark.Wombat256 :colo wombat256<CR>
-amenu T&hemes.&Dark.Xoria256 :colo xoria256<CR>
 amenu T&hemes.&Dark.Zenburn :colo zenburn<CR>
 
 amenu T&hemes.&Light.Autumn :colo autumn<CR>
-amenu T&hemes.&Light.Autumn2 :colo autumn2<CR>
 amenu T&hemes.&Light.Autumnleaf :colo autumnleaf<CR>
 amenu T&hemes.&Light.Baycomb :colo baycomb<CR>
 amenu T&hemes.&Light.Biogoo :colo biogoo<CR>
-amenu T&hemes.&Light.Buttercream :colo buttercream<CR>
-amenu T&hemes.&Light.Calmar256_light :colo calmar256_light<CR>
+amenu T&hemes.&Light.Calmar256-light :colo calmar256-light<CR>
 amenu T&hemes.&Light.Chela_light :colo chela_light<CR>
 amenu T&hemes.&Light.Dawn :colo dawn<CR>
 amenu T&hemes.&Light.Eclipse :colo eclipse<CR>
-amenu T&hemes.&Light.Fine_blue :colo fine_blue<CR>
 amenu T&hemes.&Light.Fog :colo fog<CR>
 amenu T&hemes.&Light.Fruit :colo fruit<CR>
 amenu T&hemes.&Light.Habilight :colo habilight<CR>
-amenu T&hemes.&Light.Impact :colo impact<CR>
 amenu T&hemes.&Light.Ironman :colo ironman<CR>
 amenu T&hemes.&Light.Martin_krischik :colo martin_krischik<CR>
 amenu T&hemes.&Light.Nuvola :colo nuvola<CR>
-amenu T&hemes.&Light.Oceanlight :colo oceanlight<CR>
 amenu T&hemes.&Light.PapayaWhip :colo PapayaWhip<CR>
-amenu T&hemes.&Light.Print_bw :colo print_bw<CR>
-amenu T&hemes.&Light.Pyte :colo pyte<CR>
 amenu T&hemes.&Light.Sienna :colo sienna<CR>
 amenu T&hemes.&Light.Simpleandfriendly :colo simpleandfriendly<CR>
-amenu T&hemes.&Light.Spring :colo spring<CR>
 amenu T&hemes.&Light.Tolerable :colo tolerable<CR>
 amenu T&hemes.&Light.Vc :colo vc<CR>
-amenu T&hemes.&Light.Winter :colo winter<CR>
 
 amenu T&hemes.&Other.Aiseered :colo aiseered<CR>
-amenu T&hemes.&Other.Astronaut :colo astronaut<CR>
-amenu T&hemes.&Other.Bluegreen :colo bluegreen<CR>
 amenu T&hemes.&Other.Borland :colo borland<CR>
 amenu T&hemes.&Other.Breeze :colo breeze<CR>
 amenu T&hemes.&Other.Chocolateliquor :colo chocolateliquor<CR>
 amenu T&hemes.&Other.Darkblue2 :colo darkblue2<CR>
 amenu T&hemes.&Other.Darkslategray :colo darkslategray<CR>
 amenu T&hemes.&Other.Marklar :colo marklar<CR>
-amenu T&hemes.&Other.Navajo :colo navajo<CR>
-amenu T&hemes.&Other.Navajo_night :colo navajo_night<CR>
+amenu T&hemes.&Other.Navajo-night :colo navajo-night<CR>
 amenu T&hemes.&Other.Night :colo night<CR>
 amenu T&hemes.&Other.Oceandeep :colo oceandeep<CR>
-amenu T&hemes.&Other.Olive :colo olive<CR>
 amenu T&hemes.&Other.Peaksea :colo peaksea<CR>
 amenu T&hemes.&Other.Sea :colo sea<CR>
 amenu T&hemes.&Other.Settlemyer :colo settlemyer<CR>
-amenu T&hemes.&Other.Tabula :colo tabula<CR>
-amenu T&hemes.&Other.Xemacs :colo xemacs<CR>

-- 
vim-scripts packaging



More information about the pkg-vim-maintainers mailing list