added some more

5 files changed, 1050 insertions, 0 deletions

diff --git a/.vim/colors/candycode.vim b/.vim/colors/candycode.vim
new file mode 100644
index 0000000..3800d9d
--- /dev/null
+++ b/.vim/colors/candycode.vim
@@ -0,0 +1,174 @@
+" Vim color file -- candycode
+" Maintainer:   Justin Constantino <goflyapig-at-gmail-com>
+" Last Change:  2006 Aug 12
+
+set background=dark
+highlight clear
+let g:colors_name="candycode"
+
+let save_cpo = &cpo
+set cpo&vim
+
+" basic highlight groups (:help highlight-groups) {{{
+
+" text {{{
+
+hi Normal       guifg=#ffffff       guibg=#050505       gui=NONE
+            \   ctermfg=white       ctermbg=black       cterm=NONE
+
+hi Folded       guifg=#c2bfa5       guibg=#050505       gui=underline
+            \   ctermfg=lightgray   ctermbg=black       cterm=underline
+
+hi LineNr       guifg=#928c75       guibg=NONE          gui=NONE
+            \   ctermfg=darkgray    ctermbg=NONE        cterm=NONE
+
+hi Directory    guifg=#00bbdd       guibg=NONE          gui=NONE
+            \   ctermfg=cyan        ctermbg=NONE        cterm=NONE
+hi NonText      guifg=#77ff22       guibg=NONE          gui=bold
+            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
+hi SpecialKey   guifg=#559933       guibg=NONE          gui=NONE
+            \   ctermfg=green       ctermbg=NONE        cterm=NONE
+
+hi SpellBad     guifg=NONE          guibg=NONE          gui=undercurl
+            \   ctermfg=white       ctermbg=darkred     guisp=#ff0011
+hi SpellCap     guifg=NONE          guibg=NONE          gui=undercurl
+            \   ctermfg=white       ctermbg=darkblue    guisp=#0044ff
+hi SpellLocal   guifg=NONE          guibg=NONE          gui=undercurl
+            \   ctermfg=black       ctermbg=cyan        guisp=#00dd99   
+hi SpellRare    guifg=NONE          guibg=NONE          gui=undercurl
+            \   ctermfg=white       ctermbg=darkmagenta guisp=#ff22ee   
+
+hi DiffAdd      guifg=#ffffff       guibg=#126493       gui=NONE
+            \   ctermfg=white       ctermbg=darkblue    cterm=NONE
+hi DiffChange   guifg=#000000       guibg=#976398       gui=NONE
+            \   ctermfg=black       ctermbg=darkmagenta cterm=NONE
+hi DiffDelete   guifg=#000000       guibg=#be1923       gui=bold
+            \   ctermfg=black       ctermbg=red         cterm=bold
+hi DiffText     guifg=#ffffff       guibg=#976398       gui=bold
+            \   ctermfg=white       ctermbg=green       cterm=bold
+
+" }}}
+" borders / separators / menus {{{
+
+hi FoldColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold            
+            \   ctermfg=lightgray   ctermbg=darkgray    cterm=NONE
+hi SignColumn   guifg=#c8bcb9       guibg=#786d65       gui=bold
+            \   ctermfg=lightgray   ctermbg=darkgray    cterm=NONE
+
+hi Pmenu        guifg=#000000       guibg=#a6a190       gui=NONE
+            \   ctermfg=white       ctermbg=darkgray    cterm=NONE
+hi PmenuSel     guifg=#ffffff       guibg=#133293       gui=NONE
+            \   ctermfg=white       ctermbg=lightblue   cterm=NONE
+hi PmenuSbar    guifg=NONE          guibg=#555555       gui=NONE
+            \   ctermfg=black       ctermbg=black       cterm=NONE
+hi PmenuThumb   guifg=NONE          guibg=#cccccc       gui=NONE
+            \   ctermfg=gray        ctermbg=gray        cterm=NONE
+
+hi StatusLine   guifg=#000000       guibg=#c2bfa5       gui=bold    
+            \   ctermfg=black       ctermbg=white       cterm=bold
+hi StatusLineNC guifg=#444444       guibg=#c2bfa5       gui=NONE    
+            \   ctermfg=darkgray    ctermbg=white       cterm=NONE
+hi WildMenu     guifg=#ffffff       guibg=#133293       gui=bold
+            \   ctermfg=white       ctermbg=darkblue    cterm=bold
+hi VertSplit    guifg=#c2bfa5       guibg=#c2bfa5       gui=NONE
+            \   ctermfg=white       ctermbg=white       cterm=NONE
+
+hi TabLine      guifg=#000000       guibg=#c2bfa5       gui=NONE
+            \   ctermfg=black       ctermbg=white       cterm=NONE
+hi TabLineFill  guifg=#000000       guibg=#c2bfa5       gui=NONE
+            \   ctermfg=black       ctermbg=white       cterm=NONE
+hi TabLineSel   guifg=#ffffff       guibg=#133293       gui=NONE
+            \   ctermfg=white       ctermbg=black       cterm=NONE
+
+"hi Menu
+"hi Scrollbar
+"hi Tooltip
+
+" }}}
+" cursor / dynamic / other {{{
+
+hi Cursor       guifg=#000000       guibg=#ffff99       gui=NONE
+            \   ctermfg=black       ctermbg=white       cterm=NONE
+hi CursorIM     guifg=#000000       guibg=#aaccff       gui=NONE
+            \   ctermfg=black       ctermbg=white       cterm=reverse
+hi CursorLine   guifg=NONE          guibg=#1b1b1b       gui=NONE
+            \   ctermfg=NONE        ctermbg=NONE        cterm=NONE
+hi CursorColumn guifg=NONE          guibg=#1b1b1b       gui=NONE
+            \   ctermfg=NONE        ctermbg=NONE        cterm=NONE
+
+hi Visual       guifg=#ffffff       guibg=#606070       gui=NONE
+            \   ctermfg=white       ctermbg=lightblue   cterm=NONE
+
+hi IncSearch    guifg=#000000       guibg=#eedd33       gui=bold 
+            \   ctermfg=white       ctermbg=yellow      cterm=NONE
+hi Search       guifg=#efefd0       guibg=#937340       gui=NONE
+            \   ctermfg=white       ctermbg=darkgreen   cterm=NONE
+
+hi MatchParen   guifg=NONE          guibg=#3377aa       gui=NONE
+            \   ctermfg=white       ctermbg=blue        cterm=NONE
+
+"hi VisualNOS
+
+" }}}
+" listings / messages {{{
+
+hi ModeMsg      guifg=#eecc18       guibg=NONE          gui=NONE
+            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
+hi Title        guifg=#dd4452       guibg=NONE          gui=bold
+            \   ctermfg=red         ctermbg=NONE        cterm=bold
+hi Question     guifg=#66d077       guibg=NONE          gui=NONE
+            \   ctermfg=green       ctermbg=NONE        cterm=NONE
+hi MoreMsg      guifg=#39d049       guibg=NONE          gui=NONE
+            \   ctermfg=green       ctermbg=NONE        cterm=NONE
+
+hi ErrorMsg     guifg=#ffffff       guibg=#ff0000       gui=bold
+            \   ctermfg=white       ctermbg=red         cterm=bold
+hi WarningMsg   guifg=#ccae22       guibg=NONE          gui=bold    
+            \   ctermfg=yellow      ctermbg=NONE        cterm=bold
+
+" }}}
+
+" }}}
+" syntax highlighting groups (:help group-name) {{{
+
+hi Comment      guifg=#ff9922       guibg=NONE          gui=NONE
+            \   ctermfg=brown       ctermbg=NONE        cterm=NONE
+
+hi Constant     guifg=#ff6050       guibg=NONE          gui=NONE
+            \   ctermfg=red         ctermbg=NONE        cterm=NONE
+hi Boolean      guifg=#ff6050       guibg=NONE          gui=bold  
+            \   ctermfg=red         ctermbg=NONE        cterm=bold
+
+hi Identifier   guifg=#eecc44       guibg=NONE          gui=NONE
+            \   ctermfg=yellow      ctermbg=NONE        cterm=NONE
+
+hi Statement    guifg=#66d077       guibg=NONE          gui=bold
+            \   ctermfg=green       ctermbg=NONE        cterm=bold
+
+hi PreProc      guifg=#bb88dd       guibg=NONE          gui=NONE
+            \   ctermfg=darkmagenta ctermbg=NONE        cterm=NONE
+
+hi Type         guifg=#4093cc       guibg=NONE          gui=bold
+            \   ctermfg=lightblue   ctermbg=NONE        cterm=bold
+
+hi Special      guifg=#9999aa       guibg=NONE          gui=bold  
+            \   ctermfg=lightgray   ctermbg=NONE        cterm=bold
+
+hi Underlined   guifg=#80a0ff       guibg=NONE          gui=underline
+            \   ctermfg=NONE        ctermbg=NONE        cterm=underline
+            \   term=underline 
+
+hi Ignore       guifg=#888888       guibg=NONE          gui=NONE
+            \   ctermfg=darkgray    ctermbg=NONE        cterm=NONE
+
+hi Error        guifg=#ffffff       guibg=#ff0000       gui=NONE
+            \   ctermfg=white       ctermbg=red         cterm=NONE
+
+hi Todo         guifg=#ffffff       guibg=#ee7700       gui=bold
+            \   ctermfg=black       ctermbg=yellow      cterm=bold
+
+" }}}
+
+let &cpo = save_cpo
+
+" vim: fdm=marker fdl=0
diff --git a/.vim/colors/desert256.vim b/.vim/colors/desert256.vim
new file mode 100644
index 0000000..d505761
--- /dev/null
+++ b/.vim/colors/desert256.vim
@@ -0,0 +1,338 @@
+" Vim color file
+" Maintainer: Henry So, Jr. <henryso@panix.com>
+
+" These are the colors of the "desert" theme by Hans Fugal with a few small
+" modifications (namely that I lowered the intensity of the normal white and
+" made the normal and nontext backgrounds black), modified to work with 88-
+" and 256-color xterms.
+"
+" The original "desert" theme is available as part of the vim distribution or
+" at http://hans.fugal.net/vim/colors/.
+"
+" The real feature of this color scheme, with a wink to the "inkpot" theme, is
+" the programmatic approximation of the gui colors to the palettes of 88- and
+" 256- color xterms.  The functions that do this (folded away, for
+" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
+" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
+"
+" I struggled with trying to parse the rgb.txt file to avoid the necessity of
+" converting color names to #rrggbb form, but decided it was just not worth
+" the effort.  Maybe someone seeing this may decide otherwise...
+
+set background=dark
+if version > 580
+    " no guarantees for version 5.8 and below, but this makes it stop
+    " complaining
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+let g:colors_name="desert256"
+
+if has("gui_running") || &t_Co == 88 || &t_Co == 256
+    " functions {{{
+    " returns an approximate grey index for the given grey level
+    fun <SID>grey_number(x)
+        if &t_Co == 88
+            if a:x < 23
+                return 0
+            elseif a:x < 69
+                return 1
+            elseif a:x < 103
+                return 2
+            elseif a:x < 127
+                return 3
+            elseif a:x < 150
+                return 4
+            elseif a:x < 173
+                return 5
+            elseif a:x < 196
+                return 6
+            elseif a:x < 219
+                return 7
+            elseif a:x < 243
+                return 8
+            else
+                return 9
+            endif
+        else
+            if a:x < 14
+                return 0
+            else
+                let l:n = (a:x - 8) / 10
+                let l:m = (a:x - 8) % 10
+                if l:m < 5
+                    return l:n
+                else
+                    return l:n + 1
+                endif
+            endif
+        endif
+    endfun
+
+    " returns the actual grey level represented by the grey index
+    fun <SID>grey_level(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 0
+            elseif a:n == 1
+                return 46
+            elseif a:n == 2
+                return 92
+            elseif a:n == 3
+                return 115
+            elseif a:n == 4
+                return 139
+            elseif a:n == 5
+                return 162
+            elseif a:n == 6
+                return 185
+            elseif a:n == 7
+                return 208
+            elseif a:n == 8
+                return 231
+            else
+                return 255
+            endif
+        else
+            if a:n == 0
+                return 0
+            else
+                return 8 + (a:n * 10)
+            endif
+        endif
+    endfun
+
+    " returns the palette index for the given grey index
+    fun <SID>grey_color(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 16
+            elseif a:n == 9
+                return 79
+            else
+                return 79 + a:n
+            endif
+        else
+            if a:n == 0
+                return 16
+            elseif a:n == 25
+                return 231
+            else
+                return 231 + a:n
+            endif
+        endif
+    endfun
+
+    " returns an approximate color index for the given color level
+    fun <SID>rgb_number(x)
+        if &t_Co == 88
+            if a:x < 69
+                return 0
+            elseif a:x < 172
+                return 1
+            elseif a:x < 230
+                return 2
+            else
+                return 3
+            endif
+        else
+            if a:x < 75
+                return 0
+            else
+                let l:n = (a:x - 55) / 40
+                let l:m = (a:x - 55) % 40
+                if l:m < 20
+                    return l:n
+                else
+                    return l:n + 1
+                endif
+            endif
+        endif
+    endfun
+
+    " returns the actual color level for the given color index
+    fun <SID>rgb_level(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 0
+            elseif a:n == 1
+                return 139
+            elseif a:n == 2
+                return 205
+            else
+                return 255
+            endif
+        else
+            if a:n == 0
+                return 0
+            else
+                return 55 + (a:n * 40)
+            endif
+        endif
+    endfun
+
+    " returns the palette index for the given R/G/B color indices
+    fun <SID>rgb_color(x, y, z)
+        if &t_Co == 88
+            return 16 + (a:x * 16) + (a:y * 4) + a:z
+        else
+            return 16 + (a:x * 36) + (a:y * 6) + a:z
+        endif
+    endfun
+
+    " returns the palette index to approximate the given R/G/B color levels
+    fun <SID>color(r, g, b)
+        " get the closest grey
+        let l:gx = <SID>grey_number(a:r)
+        let l:gy = <SID>grey_number(a:g)
+        let l:gz = <SID>grey_number(a:b)
+
+        " get the closest color
+        let l:x = <SID>rgb_number(a:r)
+        let l:y = <SID>rgb_number(a:g)
+        let l:z = <SID>rgb_number(a:b)
+
+        if l:gx == l:gy && l:gy == l:gz
+            " there are two possibilities
+            let l:dgr = <SID>grey_level(l:gx) - a:r
+            let l:dgg = <SID>grey_level(l:gy) - a:g
+            let l:dgb = <SID>grey_level(l:gz) - a:b
+            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+            let l:dr = <SID>rgb_level(l:gx) - a:r
+            let l:dg = <SID>rgb_level(l:gy) - a:g
+            let l:db = <SID>rgb_level(l:gz) - a:b
+            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+            if l:dgrey < l:drgb
+                " use the grey
+                return <SID>grey_color(l:gx)
+            else
+                " use the color
+                return <SID>rgb_color(l:x, l:y, l:z)
+            endif
+        else
+            " only one possibility
+            return <SID>rgb_color(l:x, l:y, l:z)
+        endif
+    endfun
+
+    " returns the palette index to approximate the 'rrggbb' hex string
+    fun <SID>rgb(rgb)
+        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+
+        return <SID>color(l:r, l:g, l:b)
+    endfun
+
+    " sets the highlighting for the given group
+    fun <SID>X(group, fg, bg, attr)
+        if a:fg != ""
+            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
+        endif
+        if a:bg != ""
+            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
+        endif
+        if a:attr != ""
+            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+        endif
+    endfun
+    " }}}
+
+    call <SID>X("Normal", "cccccc", "", "")
+
+    " highlight groups
+    call <SID>X("Cursor", "708090", "f0e68c", "")
+    "CursorIM
+    "Directory
+    "DiffAdd
+    "DiffChange
+    "DiffDelete
+    "DiffText
+    "ErrorMsg
+    call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
+    call <SID>X("Folded", "ffd700", "4d4d4d", "")
+    call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
+    call <SID>X("IncSearch", "708090", "f0e68c", "")
+    "LineNr
+    call <SID>X("ModeMsg", "daa520", "", "")
+    call <SID>X("MoreMsg", "2e8b57", "", "")
+    call <SID>X("NonText", "addbe7", "", "bold")
+    call <SID>X("Question", "00ff7f", "", "")
+    call <SID>X("Search", "f5deb3", "cd853f", "")
+    call <SID>X("SpecialKey", "9acd32", "", "")
+    call <SID>X("StatusLine", "c2bfa5", "000000", "reverse")
+    call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse")
+    call <SID>X("Title", "cd5c5c", "", "")
+    call <SID>X("Visual", "6b8e23", "f0e68c", "reverse")
+    "VisualNOS
+    call <SID>X("WarningMsg", "fa8072", "", "")
+    "WildMenu
+    "Menu
+    "Scrollbar
+    "Tooltip
+
+    " syntax highlighting groups
+    call <SID>X("Comment", "87ceeb", "", "")
+    call <SID>X("Constant", "ffa0a0", "", "")
+    call <SID>X("Identifier", "98fb98", "", "none")
+    call <SID>X("Statement", "f0e68c", "", "bold")
+    call <SID>X("PreProc", "cd5c5c", "", "")
+    call <SID>X("Type", "bdb76b", "", "bold")
+    call <SID>X("Special", "ffdead", "", "")
+    "Underlined
+    call <SID>X("Ignore", "666666", "", "")
+    "Error
+    call <SID>X("Todo", "ff4500", "eeee00", "")
+
+     " delete functions {{{
+    delf <SID>X
+    delf <SID>rgb
+    delf <SID>color
+    delf <SID>rgb_color
+    delf <SID>rgb_level
+    delf <SID>rgb_number
+    delf <SID>grey_color
+    delf <SID>grey_level
+    delf <SID>grey_number
+    " }}}
+else
+    " color terminal definitions
+    hi SpecialKey    ctermfg=darkgreen
+    hi NonText       cterm=bold ctermfg=darkblue
+    hi Directory     ctermfg=darkcyan
+    hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
+    hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
+    hi Search        cterm=NONE ctermfg=grey ctermbg=blue
+    hi MoreMsg       ctermfg=darkgreen
+    hi ModeMsg       cterm=NONE ctermfg=brown
+    hi LineNr        ctermfg=3
+    hi Question      ctermfg=green
+    hi StatusLine    cterm=bold,reverse
+    hi StatusLineNC  cterm=reverse
+    hi VertSplit     cterm=reverse
+    hi Title         ctermfg=5
+    hi Visual        cterm=reverse
+    hi VisualNOS     cterm=bold,underline
+    hi WarningMsg    ctermfg=1
+    hi WildMenu      ctermfg=0 ctermbg=3
+    hi Folded        ctermfg=darkgrey ctermbg=NONE
+    hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
+    hi DiffAdd       ctermbg=4
+    hi DiffChange    ctermbg=5
+    hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
+    hi DiffText      cterm=bold ctermbg=1
+    hi Comment       ctermfg=darkcyan
+    hi Constant      ctermfg=brown
+    hi Special       ctermfg=5
+    hi Identifier    ctermfg=6
+    hi Statement     ctermfg=3
+    hi PreProc       ctermfg=5
+    hi Type          ctermfg=2
+    hi Underlined    cterm=underline ctermfg=5
+    hi Ignore        ctermfg=darkgrey
+    hi Error         cterm=bold ctermfg=7 ctermbg=1
+endif
+
+" vim: set fdl=0 fdm=marker:
diff --git a/.vim/colors/gardener.vim b/.vim/colors/gardener.vim
new file mode 100644
index 0000000..27beec7
--- /dev/null
+++ b/.vim/colors/gardener.vim
@@ -0,0 +1,271 @@
+" Vim color file
+" Original Maintainer: Anders Korte <anderskorte@eml.cc>
+
+"    Modified: by entheon <jazzworksweb@yahoo.com>
+" Last Change: 13 Sept 2005
+
+" Gardener v1.1
+" A modification of the Guardian colorscheme v1.2
+
+"   'For code surgeons and web gardeners everywhere'
+
+" A nice earthy  color scheme which is easy on  the eyes. It
+" has  as it's  base a  dark background  monocrhomatic khaki
+" scheme with dabs of color thrown  in here and there on the
+" keywords. Plus  lots of  extra config  options so  you can
+" tweak  it to  your liking  and or  make it  more like  the
+" original Guardian scheme. All the defaults are what I like
+" but if you want to change stuff just set the right var and
+" it will change pretty much  immediately, you might have to
+" move out of and back into your buffer for it to refresh.
+
+
+" Features:
+"   256 Color XTerm Compatibility
+"   Richer Syntax
+"   Black Background
+"   Functions
+"   No Italics
+"   Purple Booleans
+"   Swapped Status Line Colors
+"   Other minor tweaks
+
+" Change Log:
+"   changed the  ghastly puke  salmon red  to green  like it
+"   should have been in the  first place esp considering the
+"   name  Gardener, now  all  vimsters can  truly frolic  in
+"   their Vim Gardens
+
+" Options:
+"   g:gardener_light_comments
+"       if  this var  exists then  comments are  white on  a
+"       gray-blue  background  if it  is  not  set then  the
+"       comments default  to medium grey with  no background
+"       color, I can't stand bg colors but some people might
+"       like it, so I left it as an option.
+"
+"   g:gardener_soil
+"       This  is a  GUI  only option  because  there are  no
+"       colors that work  even in the 256  color XTerm. This
+"       option gives you a  brownish background instead of a
+"       black background. I think the black background gives
+"       better contrast and thus is  easier to read from. if
+"       you disagree then you've got this option
+"
+"   g:gardener_setnum
+"       turns the background of the line numbers black
+
+" Using The Options:
+"       To enable a feature add the line
+"           let g:gardenter_some_feature=1
+"       to your ~/.vimrc 
+"       To disable the feature temporarily run the command
+"           :unlet g:gardener_some_feature
+"       To  disable the  feature permanently,  simply remove
+"       the line from your .vimrc file.
+
+set background=dark
+hi clear
+syntax reset
+
+if has("gui_running")
+
+" Colors for the User Interface.
+    if exists("g:gardener_setnum")
+        hi linenr           guibg=black       guifg=#808080    gui=bold
+    else
+        hi linenr           guibg=#262626     guifg=#808080    gui=bold
+    endif
+
+    hi Cursor           guibg=#cc4455     guifg=white      gui=bold 
+    hi link             CursorIM Cursor
+    if exists("g:gardener_soil")
+        hi Normal           guibg=#332211     guifg=white      gui=none 
+    else
+        hi Normal           guibg=black       guifg=white      gui=none 
+    endif
+    hi NonText          guibg=#445566     guifg=#ffeecc    gui=bold 
+    hi Visual           guibg=#557799     guifg=white      gui=none 
+
+    hi Directory        guibg=bg	      guifg=#337700    gui=none
+
+    hi IncSearch        guibg=#0066cc     guifg=white      gui=none
+    hi link Seach       IncSearch
+
+    hi SpecialKey       guibg=bg	      guifg=fg         gui=none 
+    hi Titled           guibg=bg	      guifg=fg         gui=none 
+
+    hi ErrorMsg         guibg=bg	      guifg=#ff0000    gui=bold 
+    hi ModeMsg          guibg=bg	      guifg=#ffeecc    gui=none 
+    hi link	            MoreMsg           ModeMsg
+    hi Question         guibg=bg	      guifg=#ccffcc    gui=bold 
+    hi link	            WarningMsg        ErrorMsg
+
+    hi StatusLineNC     guibg=#ffeecc	  guifg=black	   gui=none 
+    hi StatusLine       guibg=#cc4455	  guifg=white	   gui=bold 
+    hi VertSplit        guibg=#ffeecc	  guifg=black	   gui=none 
+
+    hi DiffAdd          guibg=#446688     guifg=fg	       gui=none 
+    hi DiffChange       guibg=#558855     guifg=fg	       gui=none 
+    hi DiffDelete       guibg=#884444     guifg=fg	       gui=none 
+    hi DiffText         guibg=#884444     guifg=fg	       gui=bold 
+
+    " Colors for Syntax Highlighting.
+    if exists("g:gardener_light_comments")
+        hi Comment          guibg=#334455     guifg=#dddddd    gui=none 
+    else
+        hi Comment          guibg=bg          guifg=#888888    gui=none    
+    endif
+
+
+    hi Define	        guibg=bg          guifg=#66ccdd    gui=bold
+    hi Conditional      guibg=bg          guifg=#aadd55    gui=bold
+
+    hi Constant         guibg=bg          guifg=white	   gui=bold    
+    hi Identifier       guibg=bg          guifg=#ffddaa    gui=none    
+    hi String           guibg=bg          guifg=#ffffcc    gui=none    
+    hi Character        guibg=bg          guifg=#ffffcc    gui=bold    
+    hi Number           guibg=bg          guifg=#bbddff    gui=bold    
+    hi Boolean          guibg=bg          guifg=#ff55ff    gui=bold    
+    hi Float            guibg=bg          guifg=#bbddff    gui=bold    
+
+    hi Function         guibg=bg          guifg=#ffffaa    gui=bold    
+    hi Statement        guibg=bg          guifg=#ffffcc    gui=bold    
+
+    hi Repeat           guibg=bg          guifg=#ff9900    gui=bold    
+    hi Label            guibg=bg          guifg=#ffccff    gui=bold    
+    hi Operator         guibg=bg          guifg=#cc9966    gui=bold    
+    hi Keyword          guibg=bg          guifg=#66ffcc    gui=bold    
+    hi Exception        guibg=bg          guifg=#66ffcc    gui=bold    
+
+    hi PreProc	        guibg=bg          guifg=#ffcc99    gui=bold    
+    hi Include	        guibg=bg          guifg=#99cc99    gui=bold    
+    hi link Macro	  Include
+    hi link PreCondit Include
+
+    hi Type		        guibg=bg	      guifg=#ccffaa    gui=bold    
+    hi Structure	    guibg=bg	      guifg=#99ff99    gui=bold    
+    hi Typedef	        guibg=bg	      guifg=#99cc99    gui=italic  
+
+    hi StorageClass	    guibg=bg	      guifg=#99cc99    gui=bold    
+    hi Special	        guibg=bg	      guifg=#bbddff	   gui=bold    
+    hi SpecialChar	    guibg=bg	      guifg=#bbddff	   gui=bold    
+    hi Tag		        guibg=bg	      guifg=#bbddff	   gui=bold    
+    hi Delimiter	    guibg=bg	      guifg=fg	       gui=bold    
+    hi SpecialComment   guibg=#334455     guifg=#dddddd	   gui=italic  
+    hi Debug	        guibg=bg          guifg=#ff9999	   gui=none    
+
+    hi Underlined       guibg=bg          guifg=#99ccff    gui=underline
+
+    hi Title            guibg=#445566     guifg=white	   gui=bold    
+    hi Ignore           guibg=bg	      guifg=#cccccc    gui=italic  
+    hi Error            guibg=#ff0000     guifg=white	   gui=bold    
+    hi Todo	            guibg=#556677     guifg=#ff0000    gui=bold    
+
+    hi htmlH1           guibg=bg          guifg=#ffffff    gui=bold
+    hi htmlH2           guibg=bg          guifg=#dadada    gui=bold
+    hi htmlH3           guibg=bg          guifg=#c6c6c6    gui=bold
+    hi htmlH4           guibg=bg          guifg=#b2b2b2    gui=bold
+    hi htmlH5           guibg=bg          guifg=#9e9e9e    gui=bold
+    hi htmlH6           guibg=bg          guifg=#8a8a8a    gui=bold
+
+else
+" Colors for the User Interface.
+
+    if exists("g:gardener_setnum")
+        exec "hi linenr     cterm=BOLD   ctermfg=235   ctermbg=244"
+    else
+        exec "hi linenr     cterm=BOLD   ctermfg=244   ctermbg=235"
+    endif
+
+
+    exec "hi Cursor         cterm=BOLD   ctermfg=255   ctermbg=167"
+    exec "hi CursorIM       cterm=BOLD   ctermfg=255   ctermbg=167"
+
+    exec "hi Normal         cterm=NONE   ctermfg=255   ctermbg=NONE"
+"    exec "hi NonText        cterm=NONE   ctermfg=230   ctermbg=60"
+    exec "hi Visual         cterm=NONE   ctermfg=255   ctermbg=68"
+
+    exec "hi Linear         cterm=NONE   ctermfg=248   ctermbg=NONE"
+
+    exec "hi Directory      cterm=NONE   ctermfg=64    ctermbg=NONE"
+
+    exec "hi IncSearch      cterm=NONE   ctermfg=255   ctermbg=25"
+
+    exec "hi ErrorMsg       cterm=BOLD   ctermfg=196   ctermbg=NONE"
+    exec "hi WarningMsg     cterm=BOLD   ctermfg=196   ctermbg=NONE"
+    exec "hi ModeMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
+    exec "hi MoreMsg        cterm=NONE   ctermfg=230   ctermbg=NONE"
+    exec "hi Question       cterm=NONE   ctermfg=194   ctermbg=NONE"
+
+    exec "hi StatusLineNC   cterm=NONE   ctermfg=16    ctermbg=229"
+    exec "hi StatusLine     cterm=BOLD   ctermfg=255   ctermbg=167"
+    exec "hi VertSplit      cterm=NONE   ctermfg=16    ctermbg=229"
+
+    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=60"
+    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=65"
+    exec "hi DiffAdd        cterm=NONE   ctermfg=255   ctermbg=95"
+    exec "hi DiffAdd        cterm=BOLD   ctermfg=255   ctermbg=95"
+
+    " Colors for Syntax Highlighting.
+    if exists("g:gardener_light_comments")
+        exec "hi Comment        cterm=NONE   ctermfg=253   ctermbg=60"
+    else
+        exec "hi Comment        cterm=NONE   ctermfg=244   ctermbg=NONE"
+    endif
+
+    exec "hi Constant       cterm=BOLD   ctermfg=255  ctermbg=NONE"
+    exec "hi String         cterm=NONE   ctermfg=230  ctermbg=NONE"
+    exec "hi Character      cterm=BOLD   ctermfg=230  ctermbg=NONE"
+    exec "hi Number         cterm=BOLD   ctermfg=153  ctermbg=NONE"
+    exec "hi Boolean        cterm=NONE   ctermfg=207  ctermbg=NONE"
+    exec "hi Float          cterm=BOLD   ctermfg=153  ctermbg=NONE"
+
+    exec "hi Identifier     cterm=NONE   ctermfg=223  ctermbg=NONE"
+    exec "hi Function       cterm=BOLD   ctermfg=229  ctermbg=NONE"
+    exec "hi Statement      cterm=BOLD   ctermfg=230  ctermbg=NONE"
+
+    exec "hi Define         cterm=BOLD   ctermfg=68  ctermbg=NONE"
+    exec "hi Conditional    cterm=BOLD   ctermfg=149  ctermbg=NONE"
+
+    exec "hi Repeat         cterm=BOLD   ctermfg=208  ctermbg=NONE"
+    exec "hi Label          cterm=BOLD   ctermfg=225  ctermbg=NONE"
+    exec "hi Operator       cterm=BOLD   ctermfg=173  ctermbg=NONE"
+    exec "hi Keyword        cterm=BOLD   ctermfg=86   ctermbg=NONE"
+    exec "hi Exception      cterm=BOLD   ctermfg=86   ctermbg=NONE"
+
+    exec "hi PreProc        cterm=BOLD   ctermfg=222   ctermbg=NONE"
+    exec "hi Include        cterm=BOLD   ctermfg=114   ctermbg=NONE"
+    exec "hi Macro          cterm=BOLD   ctermfg=114   ctermbg=NONE"
+    exec "hi PreCondit      cterm=BOLD   ctermfg=114   ctermbg=NONE"
+
+    exec "hi Type           cterm=BOLD   ctermfg=193   ctermbg=NONE"
+    exec "hi StorageClass   cterm=BOLD   ctermfg=78    ctermbg=NONE"
+    exec "hi Structure      cterm=BOLD   ctermfg=114   ctermbg=NONE"
+    exec "hi Typedef        cterm=BOLD   ctermfg=114   ctermbg=NONE"
+
+    exec "hi Special        cterm=BOLD   ctermfg=153   ctermbg=NONE"
+    exec "hi SpecialChar    cterm=BOLD   ctermfg=153   ctermbg=NONE"
+    exec "hi Tag            cterm=BOLD   ctermfg=153   ctermbg=NONE"
+    exec "hi Delimiter      cterm=BOLD   ctermfg=255   ctermbg=NONE"
+    exec "hi SpecialComment cterm=BOLD   ctermfg=253   ctermbg=24"
+    exec "hi Debug          cterm=NONE   ctermfg=210   ctermbg=NONE"
+
+    exec "hi Title          cterm=BOLD   ctermfg=255   ctermbg=60"
+    exec "hi Ignore         cterm=NONE   ctermfg=251   ctermbg=NONE"
+    exec "hi Error          cterm=NONE   ctermfg=255   ctermbg=196"
+    exec "hi Ignore         cterm=NONE   ctermfg=196   ctermbg=60"
+
+    exec "hi htmlH1         cterm=BOLD   ctermfg=255   ctermbg=NONE"
+    exec "hi htmlH2         cterm=BOLD   ctermfg=253   ctermbg=NONE"
+    exec "hi htmlH3         cterm=BOLD   ctermfg=251   ctermbg=NONE"
+    exec "hi htmlH4         cterm=BOLD   ctermfg=249   ctermbg=NONE"
+    exec "hi htmlH5         cterm=BOLD   ctermfg=247   ctermbg=NONE"
+    exec "hi htmlH6         cterm=BOLD   ctermfg=245   ctermbg=NONE"
+
+endif
+" And finally.
+
+let g:colors_name = "gardener"
+let colors_name   = "gardener"
+
diff --git a/.vim/colors/inkpot.vim b/.vim/colors/inkpot.vim
new file mode 100644
index 0000000..a062248
--- /dev/null
+++ b/.vim/colors/inkpot.vim
@@ -0,0 +1,212 @@
+" Vim color file
+" Name:       inkpot.vim
+" Maintainer: Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+" 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 IncSearch      gui=BOLD   guifg=#303030   guibg=#cd8b60
+    hi Search         gui=NONE   guifg=#303030   guibg=#cd8b60
+    hi ErrorMsg       gui=BOLD   guifg=#ffffff   guibg=#ce4e4e
+    hi WarningMsg     gui=BOLD   guifg=#ffffff   guibg=#ce8e4e
+    hi ModeMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
+    hi MoreMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
+    hi Question       gui=BOLD   guifg=#ffcd00   guibg=NONE
+
+    hi StatusLine     gui=BOLD   guifg=#b9b9b9   guibg=#3e3e5e
+    hi User1          gui=BOLD   guifg=#00ff8b   guibg=#3e3e5e
+    hi User2          gui=BOLD   guifg=#7070a0   guibg=#3e3e5e
+    hi StatusLineNC   gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
+    hi VertSplit      gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
+
+    hi WildMenu       gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+
+    hi MBENormal                 guifg=#cfbfad   guibg=#2e2e3f
+    hi MBEChanged                guifg=#eeeeee   guibg=#2e2e3f
+    hi MBEVisibleNormal          guifg=#cfcfcd   guibg=#4e4e8f
+    hi MBEVisibleChanged         guifg=#eeeeee   guibg=#4e4e8f
+
+    hi DiffText       gui=NONE   guifg=#ffffcd   guibg=#4a2a4a
+    hi DiffChange     gui=NONE   guifg=#ffffcd   guibg=#306b8f
+    hi DiffDelete     gui=NONE   guifg=#ffffcd   guibg=#6d3030
+    hi DiffAdd        gui=NONE   guifg=#ffffcd   guibg=#306d30
+
+    hi Cursor         gui=NONE   guifg=#404040   guibg=#8b8bff
+    hi lCursor        gui=NONE   guifg=#404040   guibg=#8fff8b
+    hi CursorIM       gui=NONE   guifg=#404040   guibg=#8b8bff
+
+    hi Folded         gui=NONE   guifg=#cfcfcd   guibg=#4b208f
+    hi FoldColumn     gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
+
+    hi Directory      gui=NONE   guifg=#00ff8b   guibg=NONE
+    hi LineNr         gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
+    hi NonText        gui=BOLD   guifg=#8b8bcd   guibg=NONE
+    hi SpecialKey     gui=BOLD   guifg=#ab60ed   guibg=NONE
+    hi Title          gui=BOLD   guifg=#af4f4b   guibg=NONE
+    hi Visual         gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
+
+    hi Comment        gui=NONE   guifg=#cd8b00   guibg=NONE
+    hi Constant       gui=NONE   guifg=#ffcd8b   guibg=NONE
+    hi String         gui=NONE   guifg=#ffcd8b   guibg=#404040
+    hi Error          gui=NONE   guifg=#ffffff   guibg=#6e2e2e
+    hi Identifier     gui=NONE   guifg=#ff8bff   guibg=NONE
+    hi Ignore         gui=NONE
+    hi Number         gui=NONE   guifg=#f0ad6d   guibg=NONE
+    hi PreProc        gui=NONE   guifg=#409090   guibg=NONE
+    hi Special        gui=NONE   guifg=#c080d0   guibg=NONE
+    hi SpecialChar    gui=NONE   guifg=#c080d0   guibg=#404040
+    hi Statement      gui=NONE   guifg=#808bed   guibg=NONE
+    hi Todo           gui=BOLD   guifg=#303030   guibg=#d0a060
+    hi Type           gui=NONE   guifg=#ff8bff   guibg=NONE
+    hi Underlined     gui=BOLD   guifg=#df9f2d   guibg=NONE
+    hi TaglistTagName gui=BOLD   guifg=#808bed   guibg=NONE
+
+    hi perlSpecialMatch   gui=NONE guifg=#c080d0   guibg=#404040
+    hi perlSpecialString  gui=NONE guifg=#c080d0   guibg=#404040
+
+    hi cSpecialCharacter  gui=NONE guifg=#c080d0   guibg=#404040
+    hi cFormat            gui=NONE guifg=#c080d0   guibg=#404040
+
+    hi doxygenBrief                 gui=NONE guifg=#fdab60   guibg=NONE
+    hi doxygenParam                 gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenPrev                  gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenSmallSpecial          gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenSpecial               gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenComment               gui=NONE guifg=#ad7b20   guibg=NONE
+    hi doxygenSpecial               gui=NONE guifg=#fdab60   guibg=NONE
+    hi doxygenSpecialMultilineDesc  gui=NONE guifg=#ad600b   guibg=NONE
+    hi doxygenSpecialOnelineDesc    gui=NONE guifg=#ad600b   guibg=NONE
+
+    if v:version >= 700
+        hi Pmenu          gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
+        hi PmenuSel       gui=BOLD   guifg=#eeeeee   guibg=#2e2e3f
+        hi PmenuSbar      gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+        hi PmenuThumb     gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+
+        hi SpellBad     gui=undercurl guisp=#cc6666
+        hi SpellRare    gui=undercurl guisp=#cc66cc
+        hi SpellLocal   gui=undercurl guisp=#cccc66
+        hi SpellCap     gui=undercurl guisp=#66cccc
+
+        hi MatchParen   gui=NONE      guifg=#404040   guibg=#8fff8b
+    endif
+else
+    if ! g:inkpot_black_background
+        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(80)
+    else
+        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(16)
+    endif
+
+    exec "hi IncSearch      cterm=BOLD   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
+    exec "hi Search         cterm=NONE   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
+    exec "hi ErrorMsg       cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(48)
+    exec "hi WarningMsg     cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(68)
+    exec "hi ModeMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
+    exec "hi MoreMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
+    exec "hi Question       cterm=BOLD   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
+
+    exec "hi StatusLine     cterm=BOLD   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
+    exec "hi User1          cterm=BOLD   ctermfg=" . <SID>X(28) . " ctermbg=" . <SID>X(81)
+    exec "hi User2          cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(81)
+    exec "hi StatusLineNC   cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
+    exec "hi VertSplit      cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
+
+    exec "hi WildMenu       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
+
+    exec "hi MBENormal                   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
+    exec "hi MBEChanged                  ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(81)
+    exec "hi MBEVisibleNormal            ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(82)
+    exec "hi MBEVisibleChanged           ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
+
+    exec "hi DiffText       cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(34)
+    exec "hi DiffChange     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(17)
+    exec "hi DiffDelete     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
+    exec "hi DiffAdd        cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(20)
+
+    exec "hi Folded         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(35)
+    exec "hi FoldColumn     cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
+
+    exec "hi Directory      cterm=NONE   ctermfg=" . <SID>X(28) . " ctermbg=" . "NONE"
+    exec "hi LineNr         cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
+    exec "hi NonText        cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
+    exec "hi SpecialKey     cterm=BOLD   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
+    exec "hi Title          cterm=BOLD   ctermfg=" . <SID>X(48) . " ctermbg=" . "NONE"
+    exec "hi Visual         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(38)
+
+    exec "hi Comment        cterm=NONE   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
+    exec "hi Constant       cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . "NONE"
+    exec "hi String         cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . <SID>X(81)
+    exec "hi Error          cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
+    exec "hi Identifier     cterm=NONE   ctermfg=" . <SID>X(53) . " ctermbg=" . "NONE"
+    exec "hi Ignore         cterm=NONE"
+    exec "hi Number         cterm=NONE   ctermfg=" . <SID>X(69) . " ctermbg=" . "NONE"
+    exec "hi PreProc        cterm=NONE   ctermfg=" . <SID>X(25) . " ctermbg=" . "NONE"
+    exec "hi Special        cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
+    exec "hi SpecialChar    cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . <SID>X(81)
+    exec "hi Statement      cterm=NONE   ctermfg=" . <SID>X(27) . " ctermbg=" . "NONE"
+    exec "hi Todo           cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(57)
+    exec "hi Type           cterm=NONE   ctermfg=" . <SID>X(71) . " ctermbg=" . "NONE"
+    exec "hi Underlined     cterm=BOLD   ctermfg=" . <SID>X(77) . " ctermbg=" . "NONE"
+    exec "hi TaglistTagName cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
+
+    if v:version >= 700
+        exec "hi Pmenu          cterm=NONE   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
+        exec "hi PmenuSel       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
+        exec "hi PmenuSbar      cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
+        exec "hi PmenuThumb     cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
+
+        exec "hi SpellBad       cterm=NONE ctermbg=" . <SID>X(32)
+        exec "hi SpellRare      cterm=NONE ctermbg=" . <SID>X(33)
+        exec "hi SpellLocal     cterm=NONE ctermbg=" . <SID>X(36)
+        exec "hi SpellCap       cterm=NONE ctermbg=" . <SID>X(21)
+        exec "hi MatchParen     cterm=NONE ctermbg=" . <SID>X(14) . "ctermfg=" . <SID>X(25)
+    endif
+endif
+
+" vim: set et :
diff --git a/.vim/colors/mustang.vim b/.vim/colors/mustang.vim
new file mode 100644
index 0000000..f268a55
--- /dev/null
+++ b/.vim/colors/mustang.vim
@@ -0,0 +1,55 @@
+" Maintainer:	Henrique C. Alves (hcarvalhoalves@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=none
+hi NonText 		guifg=#808080 guibg=#303030 gui=none ctermfg=244 ctermbg=none
+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
+