Merge branch 'master' of fucktheforce.de:xeno

19 files changed, 2285 insertions, 1 deletions

diff --git a/vim/colors/Dim2.vim b/vim/colors/Dim2.vim
new file mode 100644
index 0000000..33ec40f
--- /dev/null
+++ b/vim/colors/Dim2.vim
@@ -0,0 +1,97 @@
+"
+" This is another version of Dim that rearranges the colors a bit...
+"
+
+"
+" Restore default colors
+hi clear
+set background=dark 
+
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = "Dim2"
+
+
+
+hi Normal guibg=black guifg=grey75
+hi Cursor guibg=grey75
+hi NonText guibg=grey10 guifg=yellow4
+
+"hi Statement guifg=wheat4
+"hi Statement guifg=grey75 gui=bold
+"hi Statement guifg=grey65 gui=bold
+"hi Statement guifg=wheat4 gui=bold
+"hi Statement guifg=#8B7E66 gui=bold
+hi Statement guifg=#9B8E76 gui=bold
+
+" Red
+hi Constant guifg=PaleVioletRed3
+
+" Green
+"hi Identifier guifg=#00BB00
+"hi Identifier guifg=#55BB55
+"hi Identifier guifg=#55AA55
+hi Type guifg=#559955 gui=none
+
+" Yellow
+hi Special guifg=khaki3
+
+" Blue
+hi Comment guifg=SkyBlue3
+
+" Purple
+hi PreProc guifg=plum3
+
+" Cyan
+"hi Character guifg=CadetBlue3
+hi Identifier guifg=CadetBlue3
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" The default was cyan, which is too bright, but this takes away any
+" distinction...
+hi SpecialKey guifg=CadetBlue3
+hi Directory guifg=SkyBlue3
+"
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+
+" Orange
+"hi Type guifg=orange4 gui=none
+"hi Type guifg=orange3 gui=none
+"hi Type guifg=#DD9550 gui=none
+"hi Type guifg=#CD8550 gui=none
+"hi Function guifg=#CD8550 gui=none
+hi Character guifg=#CD8550 gui=none
+
+hi link Function Identifier
+
+"
+" Colors not part of the original set:
+"
+"hi Folded guifg=cyan4 guibg=grey20
+"hi Folded guifg=grey90 guibg=grey45
+hi Folded guifg=black guibg=grey55
+
+hi Visual gui=reverse guibg=fg guifg=darkolivegreen
+
+"hi Search guifg=black guibg=LightSkyBlue3 gui=none
+hi Search guifg=black guibg=LightSkyBlue4 gui=none
+
+hi IncSearch guifg=yellow guibg=LightSkyBlue3 gui=bold
+hi WarningMsg guifg=red guibg=GhostWhite gui=bold
+hi Error guibg=red3
+
+
+" Here are the original colors:
+"hi guifg=grey70 gui=bold
+"hi guifg=#FF7070 gui=bold
+"hi guifg=green gui=bold
+"hi guifg=yellow gui=bold
+"hi guifg=SkyBlue gui=bold
+"hi guifg=orchid1 gui=bold
+"hi guifg=Cyan gui=bold
+"hi guifg=White gui=bold
+"
diff --git a/vim/colors/DimGreens.vim b/vim/colors/DimGreens.vim
new file mode 100644
index 0000000..ad73a4a
--- /dev/null
+++ b/vim/colors/DimGreens.vim
@@ -0,0 +1,65 @@
+
+" It's based on:
+runtime colors/Dim.vim
+
+let g:colors_name = "DimGreen2"
+
+hi Normal guibg=#001800 guifg=#99aa99
+hi Normal guibg=black guifg=ForestGreen
+hi Normal guifg=DarkSeaGreen4
+hi Normal guifg=#448844
+"hi Normal guifg=khaki4
+hi NonText guibg=#000800
+
+" SeaGreen4
+" aquamarine4
+" green4
+" khaki4
+" yellow4
+
+hi Cursor guibg=green4
+hi NonText guibg=grey10 guifg=yellow4
+
+hi Statement guifg=ForestGreen gui=bold
+hi Statement guifg=DarkOliveGreen4 gui=bold
+"hi Statement guifg=khaki4 gui=bold
+hi Constant guifg=OliveDrab
+hi Identifier guifg=#46AD8A
+hi Identifier guifg=ForestGreen
+"hi Identifier guifg=aquamarine4
+hi Special guifg=PaleGreen3
+hi Comment guifg=DarkSeaGreen4
+hi Comment guifg=SkyBlue4
+hi Comment guifg=DarkSlateGray4
+"hi Comment guibg=black guifg=ForestGreen
+hi PreProc guifg=wheat4
+
+hi Character guifg=CadetBlue3
+hi Character guifg=CadetBlue4
+hi SpecialKey guifg=CadetBlue3
+hi SpecialKey guifg=CadetBlue4
+hi Directory guifg=SkyBlue3
+hi Directory guifg=SkyBlue4
+
+hi Type guifg=#BD7550 gui=none
+hi Type guifg=#9D7530 gui=none
+
+
+hi link Function Identifier
+
+
+
+
+"
+" Colors not part of the original set:
+"
+hi Folded guifg=black guibg=grey55
+
+hi Visual gui=reverse guibg=fg guifg=darkolivegreen
+
+hi Search guifg=black guibg=LightSkyBlue4 gui=none
+
+hi IncSearch guifg=yellow guibg=LightSkyBlue3 gui=bold
+hi WarningMsg guifg=red guibg=GhostWhite gui=bold
+hi Error guibg=red3
+
diff --git a/vim/colors/darkZ.vim b/vim/colors/darkZ.vim
new file mode 100644
index 0000000..246f69a
--- /dev/null
+++ b/vim/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/vim/colors/fruity.vim b/vim/colors/fruity.vim
new file mode 100644
index 0000000..261500c
--- /dev/null
+++ b/vim/colors/fruity.vim
@@ -0,0 +1,147 @@
+"
+" Fruity Color Scheme
+" ===================
+"
+" Author:   Armin Ronacher <armin.ronacher@active-4.com>
+" Version:  0.2
+"
+set background=dark
+
+hi clear
+if exists("syntax_on")
+    syntax reset
+endif
+
+let colors_name = "fruity"
+
+" Default Colors
+hi Normal       guifg=#ffffff   guibg=#111111
+hi NonText      guifg=#444444   guibg=#000000
+hi Cursor       guibg=#aaaaaa
+hi lCursor      guibg=#aaaaaa
+
+" Search
+hi Search       guifg=#800000   guibg=#ffae00
+hi IncSearch    guifg=#800000   guibg=#ffae00
+
+" Window Elements
+hi StatusLine   guifg=#ffffff   guibg=#8090a0   gui=bold
+hi StatusLineNC guifg=#506070   guibg=#a0b0c0
+hi VertSplit    guifg=#a0b0c0   guibg=#a0b0c0
+hi Folded       guifg=#111111   guibg=#8090a0
+hi IncSearch    guifg=#708090   guibg=#f0e68c
+hi Pmenu        guifg=#ffffff   guibg=#cb2f27
+hi SignColumn   guibg=#111111
+hi CursorLine   guibg=#181818
+hi LineNr       guifg=#aaaaaa   guibg=#222222
+
+" Specials
+hi Todo         guifg=#e50808   guibg=#520000   gui=bold
+hi Title        guifg=#ffffff                   gui=bold
+hi Special      guifg=#fd8900
+
+" Syntax Elements
+hi String       guifg=#0086d2
+hi Constant     guifg=#0086d2
+hi Number       guifg=#0086f7                   gui=bold
+hi Statement    guifg=#fb660a                   gui=bold
+hi Function     guifg=#ff0086                   gui=bold
+hi PreProc      guifg=#ff0007                   gui=bold
+hi Comment      guifg=#00d2ff   guibg=#0f140f   gui=italic
+hi Type         guifg=#cdcaa9                   gui=bold
+hi Error        guifg=#ffffff   guibg=#ab0000
+hi Identifier   guifg=#ff0086                   gui=bold
+hi Label        guifg=#ff0086
+
+" Python Highlighting for python.vim
+hi pythonCoding guifg=#ff0086
+hi pythonRun    guifg=#ff0086
+hi pythonBuiltinObj     guifg=#2b6ba2           gui=bold
+hi pythonBuiltinFunc    guifg=#2b6ba2           gui=bold
+hi pythonException      guifg=#ee0000           gui=bold
+hi pythonExClass        guifg=#66cd66           gui=bold
+hi pythonSpaceError     guibg=#270000
+hi pythonDocTest    guifg=#2f5f49
+hi pythonDocTest2   guifg=#3b916a
+hi pythonFunction   guifg=#ee0000               gui=bold
+hi pythonClass      guifg=#ff0086               gui=bold
+
+" JavaScript Highlighting
+hi javaScript                   guifg=#ffffff
+hi javaScriptRegexpString       guifg=#aa6600
+hi javaScriptDocComment         guifg=#aaaaaa
+hi javaScriptCssStyles          guifg=#dd7700
+hi javaScriptDomElemFuncs       guifg=#66cd66
+hi javaScriptHtmlElemFuncs      guifg=#dd7700
+hi javaScriptLabel              guifg=#00bdec   gui=italic
+hi javaScriptPrototype          guifg=#00bdec
+hi javaScriptConditional        guifg=#ff0007   gui=bold
+hi javaScriptRepeat             guifg=#ff0007   gui=bold
+hi javaScriptFunction           guifg=#ff0086   gui=bold
+
+" CSS Highlighting
+hi cssIdentifier            guifg=#66cd66       gui=bold
+hi cssBraces                guifg=#00bdec       gui=bold
+
+" Ruby Highlighting
+hi rubyFunction     guifg=#0066bb               gui=bold
+hi rubyClass        guifg=#ff0086               gui=bold
+hi rubyModule       guifg=#ff0086               gui=bold,underline
+hi rubyKeyword      guifg=#008800               gui=bold
+hi rubySymbol       guifg=#aa6600
+hi rubyIndentifier              guifg=#008aff
+hi rubyGlobalVariable           guifg=#dd7700
+hi rubyConstant                 guifg=#5894d2   gui=bold
+hi rubyBlockParameter           guifg=#66cd66
+hi rubyPredefinedIdentifier     guifg=#555555   gui=bold
+hi rubyString           guifg=#0086d2
+hi rubyStringDelimiter  guifg=#dd7700
+hi rubySpaceError       guibg=#270000
+hi rubyDocumentation    guifg=#aaaaaa
+hi rubyData             guifg=#555555
+
+" XML Highlighting
+hi xmlTag           guifg=#00bdec
+hi xmlTagName       guifg=#00bdec
+hi xmlEndTag        guifg=#00bdec
+hi xmlNamespace     guifg=#00bdec                   gui=underline
+hi xmlAttribPunct   guifg=#cccaa9                   gui=bold
+hi xmlEqual         guifg=#cccaa9                   gui=bold
+hi xmlCdata         guifg=#bf0945                   gui=bold
+hi xmlCdataCdata	guifg=#ac1446   guibg=#23010c   gui=none
+hi xmlCdataStart	guifg=#bf0945                   gui=bold
+hi xmlCdataEnd		guifg=#bf0945                   gui=bold
+
+" HTML Highlighting
+hi htmlTag          guifg=#00bdec               gui=bold
+hi htmlEndTag       guifg=#00bdec               gui=bold
+hi htmlSpecialTagName   guifg=#66cd66
+hi htmlTagName      guifg=#66cd66
+hi htmlTagN         guifg=#66cd66
+hi htmlEvent        guifg=#ffffff
+
+" Django Highlighting
+hi djangoTagBlock   guifg=#ff0007   guibg=#200000   gui=bold
+hi djangoVarBlock   guifg=#ff0007   guibg=#200000
+hi djangoArgument   guifg=#0086d2   guibg=#200000
+hi djangoStatement  guifg=#fb660a   guibg=#200000   gui=bold
+hi djangoComment    guifg=#008800   guibg=#002300   gui=italic
+hi djangoFilter     guifg=#ff0086   guibg=#200000   gui=italic
+
+" Jinja Highlighting
+hi jinjaTagBlock    guifg=#ff0007   guibg=#200000   gui=bold
+hi jinjaVarBlock    guifg=#ff0007   guibg=#200000
+hi jinjaString      guifg=#0086d2   guibg=#200000
+hi jinjaNumber      guifg=#bf0945   guibg=#200000   gui=bold
+hi jinjaStatement   guifg=#fb660a   guibg=#200000   gui=bold
+hi jinjaComment     guifg=#008800   guibg=#002300   gui=italic
+hi jinjaFilter      guifg=#ff0086   guibg=#200000
+hi jinjaRaw         guifg=#aaaaaa   guibg=#200000
+hi jinjaOperator    guifg=#ffffff   guibg=#200000
+hi jinjaVariable    guifg=#92cd35   guibg=#200000
+hi jinjaAttribute   guifg=#dd7700   guibg=#200000
+hi jinjaSpecial     guifg=#008ffd   guibg=#200000
+
+" ERuby Highlighting (for my eruby.vim)
+hi erubyRubyDelim   guifg=#2c8a16                   gui=bold
+hi erubyComment     guifg=#4d9b3a                   gui=italic
diff --git a/vim/colors/greenvision.vim b/vim/colors/greenvision.vim
new file mode 100644
index 0000000..c20329c
--- /dev/null
+++ b/vim/colors/greenvision.vim
@@ -0,0 +1,72 @@
+" Vim color file
+" Name: greenvision.vim
+" Maintainer: Paul B. Mahol <onemda@No-NoSpaMgmail.com>
+" Last Change: 6.6.2008
+" License: Vim License
+" Revision: 29
+
+if !has("gui_running") && &t_Co != 256 && &t_Co != 88
+	echomsg ""
+	echomsg "err: please use GUI or a 256-color terminal or 88-color terminal"
+	echomsg ""
+	finish
+endif
+
+if &background == "light"
+	set background=dark
+endif
+
+hi clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = 'greenvision'
+
+hi Comment		guifg=#008220 guibg=#000000 gui=none ctermfg=034 ctermbg=000 cterm=none
+hi Constant		guifg=#1fc700 guibg=#001c00 gui=none ctermfg=041 ctermbg=000 cterm=none
+hi Cursor		guifg=#00ff00 gui=bold,reverse ctermfg=010 ctermbg=000 cterm=bold,reverse
+hi CursorColumn 	guifg=#000000 guibg=#00cc00 gui=none ctermfg=000 ctermbg=002 cterm=none
+hi CursorIM		guifg=#00ff00 guibg=#000000 gui=bold ctermfg=046 ctermbg=000 cterm=bold
+hi CursorLine		guifg=#000000 guibg=#00cc00 gui=none ctermfg=000 ctermbg=002 cterm=none
+hi DiffAdd		guifg=#00bf00 guibg=#002200 gui=none ctermfg=034 ctermbg=000 cterm=none
+hi DiffChange		guifg=#00a900 guibg=#002200 gui=none ctermfg=040 ctermbg=000 cterm=none
+hi DiffDelete		guifg=#000000 guibg=#005500 gui=none ctermfg=002 ctermbg=000 cterm=none
+hi DiffText		guifg=#00aa00 guibg=#004400 gui=underline ctermfg=028 ctermbg=000 cterm=none
+hi Directory		guifg=#009330 guibg=#000000 gui=none ctermfg=022 ctermbg=000 cterm=none
+hi Error		guifg=#000000 guibg=#00d000 gui=none ctermfg=000 ctermbg=010 cterm=none
+hi ErrorMsg		guifg=#000000 guibg=#00ff00 gui=bold ctermfg=000 ctermbg=010 cterm=none
+hi FoldColumn		guifg=#00b900 guibg=#000300 gui=none ctermfg=046 ctermbg=016 cterm=none
+hi Folded		guifg=#00bf00 guibg=#001200 gui=none ctermfg=010 ctermbg=022 cterm=none
+hi Identifier		guifg=#50d930 guibg=#000000 gui=none ctermfg=028 ctermbg=000 cterm=none
+hi IncSearch		gui=reverse cterm=reverse
+hi LineNr		guifg=#007900 guibg=#000600 gui=none ctermfg=034 ctermbg=016 cterm=none
+hi MatchParen		guifg=#304300 guibg=#00fe00 gui=none ctermfg=010 ctermbg=022 cterm=bold
+hi ModeMsg		guifg=#00ea00 guibg=#000900 gui=none ctermfg=002 ctermbg=000 cterm=none
+hi MoreMsg		guifg=#00e700 guibg=#001000 gui=bold ctermfg=002 ctermbg=000 cterm=bold
+hi NonText		guifg=#008700 guibg=#001000 gui=none ctermfg=022 ctermbg=000 cterm=none
+hi Normal		guifg=#00a900 guibg=#000000 gui=none ctermfg=002 ctermbg=000 cterm=none
+hi Pmenu		guifg=#00bf00 guibg=#000a00 gui=none ctermfg=002 ctermbg=000 cterm=none
+hi PmenuSbar		guifg=#00dc00 guibg=#001c00 gui=none ctermfg=034 ctermbg=022 cterm=none
+hi PmenuSel		guifg=#00f300 guibg=#002200 gui=none ctermfg=010 ctermbg=022 cterm=none
+hi PreProc		guifg=#00ac5c guibg=#000000 gui=none ctermfg=047 ctermbg=000 cterm=none
+hi Question		guifg=#009f00 guibg=#000000 gui=none ctermfg=040 ctermbg=000 cterm=none
+hi Search		gui=reverse cterm=reverse
+hi Special		guifg=#00d700 guibg=#001200 gui=none ctermfg=002 ctermbg=000 cterm=none
+hi SpecialKey		guifg=#008000 guibg=#002300 gui=bold ctermfg=034 ctermbg=000 cterm=bold
+hi Statement		guifg=#2fc626 guibg=#000000 gui=none ctermfg=010 ctermbg=000 cterm=none
+hi StatusLine		guifg=#00ff00 guibg=#001000 gui=none ctermfg=047 ctermbg=022 cterm=bold
+hi StatusLineNC		guifg=#005500 guibg=#001000 gui=none ctermfg=034 ctermbg=022 cterm=none
+hi TabLine		guifg=#00f400 guibg=#000a00 gui=none ctermfg=040 ctermbg=000 cterm=none
+hi TabLineFill		guifg=#00ea00 guibg=#000000 gui=none ctermfg=000 ctermbg=000 cterm=none
+hi TabLineSel		guifg=#00f000 guibg=#002a00 gui=none ctermfg=046 ctermbg=022 cterm=bold
+hi Title		guifg=#09ab00 guibg=#000000 gui=bold ctermfg=010 ctermbg=000 cterm=bold
+hi Todo			guifg=#000000 guibg=#00ed00 gui=none ctermfg=000 ctermbg=002 cterm=none
+hi Type			guifg=#1fb631 guibg=#000000 gui=none ctermfg=046 ctermbg=000 cterm=none
+hi Underlined		guifg=#00b400 guibg=#000000 gui=underline ctermfg=002 ctermbg=000 cterm=underline
+hi VertSplit		guifg=#000600 guibg=#001f00 gui=none ctermfg=022 ctermbg=022 cterm=none
+hi Visual		guibg=#001500 gui=reverse ctermbg=000 cterm=reverse
+hi VisualNOS		guibg=#002700 gui=reverse ctermbg=022 cterm=reverse
+hi WarningMsg		guifg=#000000 guibg=#00ff00 gui=none ctermfg=010 ctermbg=000 cterm=none
+hi WildMenu		guifg=#00cb00 guibg=#000000 gui=reverse ctermfg=000 ctermbg=010 cterm=reverse
diff --git a/vim/colors/greyblue.vim b/vim/colors/greyblue.vim
new file mode 100644
index 0000000..1b3c233
--- /dev/null
+++ b/vim/colors/greyblue.vim
@@ -0,0 +1,75 @@
+" Vim color file
+"
+
+set background=dark
+hi clear
+if exists("syntax_on")
+   syntax reset
+endif
+
+let colors_name = "greyblue"
+
+hi Normal          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#b7af9f guibg=#090909
+
+" Search
+hi IncSearch       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7800ff guibg=#e0d8ff
+hi Search          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7800ff guibg=#e0d8ff
+
+" Messages
+hi ErrorMsg        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
+hi WarningMsg      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
+hi ModeMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
+hi MoreMsg         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
+hi Question        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffffff guibg=NONE
+
+" Split area
+hi StatusLine      ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#070707 guibg=#cfcfbf
+hi StatusLineNC    ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#5f5f4f guibg=#cfcfbf
+hi VertSplit       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#cfcfbf
+hi WildMenu        ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#070707 guibg=#ff5533
+
+" Diff
+hi DiffText        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#07cfef guibg=#00151f
+hi DiffChange      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ff97ff guibg=#2f002f
+hi DiffDelete      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
+hi DiffAdd         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#dfdf00 guibg=#370d15
+
+" Cursor
+hi Cursor       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffff00 guibg=#7fff00
+hi lCursor      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#7fff00
+hi CursorIM     ctermfg=NONE ctermbg=NONE gui=NONE guifg=#070707 guibg=#7fff00
+
+" Fold
+hi Folded          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#87ff00 guibg=#1f2700
+hi FoldColumn      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#559f00 guibg=#0f0f0b
+
+" Other
+hi Directory       ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaba guibg=NONE
+hi LineNr          ctermfg=NONE ctermbg=NONE gui=NONE guifg=#7f7f5f guibg=NONE
+hi NonText         ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#211d1a guibg=#211d1a
+hi SpecialKey      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#378fff guibg=NONE
+hi Title           ctermfg=NONE ctermbg=NONE gui=NONE guifg=#ffbf9f guibg=#370f07
+hi Visual          ctermfg=NONE ctermbg=NONE gui=reverse guifg=#a5a5a5 guibg=#353535
+
+" Syntax group
+hi Comment         ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#555565 guibg=NONE
+hi Constant        ctermfg=NONE ctermbg=NONE gui=NONE guifg=#d1bfb1 guibg=#151515
+hi Error           ctermfg=NONE ctermbg=NONE gui=NONE guifg=#00ffff guibg=NONE
+hi Identifier      ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aaaaba guibg=NONE
+hi Ignore          ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
+hi PreProc         ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
+hi Special         ctermfg=NONE ctermbg=NONE gui=NONE guifg=#aa1565 guibg=NONE
+hi Statement       ctermfg=NONE ctermbg=NONE gui=bold guifg=#d1bfb1 guibg=NONE
+hi Todo            ctermfg=NONE ctermbg=NONE gui=NONE guifg=NONE guibg=NONE
+hi Type            ctermfg=NONE ctermbg=NONE gui=BOLD guifg=#d1bfb1 guibg=NONE
+hi Underlined      ctermfg=NONE ctermbg=NONE gui=UNDERLINE guifg=NONE guibg=NONE
+
+" HTML
+hi htmlLink        gui=UNDERLINE guifg=#ffff00 guibg=NONE
+hi htmlBold        gui=BOLD
+hi htmlBoldItalic  gui=BOLD,ITALIC
+hi htmlBoldUnderline  gui=BOLD,UNDERLINE
+hi htmlBoldUnderlineItalic  gui=BOLD,UNDERLINE,ITALIC
+hi htmlItalic      gui=ITALIC
+hi htmlUnderline   gui=UNDERLINE
+hi htmlUnderlineItalic  gui=UNDERLINE,ITALIC
diff --git a/vim/colors/jellybeans.vim b/vim/colors/jellybeans.vim
new file mode 100644
index 0000000..6b53596
--- /dev/null
+++ b/vim/colors/jellybeans.vim
@@ -0,0 +1,410 @@
+" Vim color file
+"
+"  "    __       _ _       _                             "
+"  "    \ \  ___| | |_   _| |__   ___  __ _ _ __  ___    "
+"  "     \ \/ _ \ | | | | |  _ \ / _ \/ _  |  _ \/ __|   "
+"  "  /\_/ /  __/ | | |_| | |_| |  __/ |_| | | | \__ \   "
+"  "  \___/ \___|_|_|\__  |____/ \___|\____|_| |_|___/   "
+"  "                 \___/                               "
+"
+"         "A colorful, dark color scheme for Vim."
+"
+" File:         jellybeans.vim
+" Maintainer:   NanoTech <http://nanotech.nanotechcorp.net/>
+" Version:      1.2
+" Last Change:  May 26th, 2009
+" Contributors: Daniel Herbert <http://pocket-ninja.com>,
+"               Henry So, Jr. <henryso@panix.com>,
+"               David Liang <bmdavll at gmail dot com>
+"
+" Copyright (c) 2009 NanoTech
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to deal
+" in the Software without restriction, including without limitation the rights
+" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+" copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+" THE SOFTWARE.
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+	syntax reset
+endif
+
+let colors_name = "jellybeans"
+
+if has("gui_running") || &t_Co == 88 || &t_Co == 256
+	let s:low_color = 0
+else
+	let s:low_color = 1
+endif
+
+" Color approximation functions by Henry So, Jr. and David Liang {{{
+" Added to jellybeans.vim by Daniel Herbert
+
+" returns an approximate grey index for the given grey level
+fun! s:grey_number(x)
+	if &t_Co == 88
+		if a:x < 23
+			return 0
+		elseif a:x < 69
+			return 1
+		elseif a:x < 103
+			return 2
+		elseif a:x < 127
+			return 3
+		elseif a:x < 150
+			return 4
+		elseif a:x < 173
+			return 5
+		elseif a:x < 196
+			return 6
+		elseif a:x < 219
+			return 7
+		elseif a:x < 243
+			return 8
+		else
+			return 9
+		endif
+	else
+		if a:x < 14
+			return 0
+		else
+			let l:n = (a:x - 8) / 10
+			let l:m = (a:x - 8) % 10
+			if l:m < 5
+				return l:n
+			else
+				return l:n + 1
+			endif
+		endif
+	endif
+endfun
+
+" returns the actual grey level represented by the grey index
+fun! s:grey_level(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 0
+		elseif a:n == 1
+			return 46
+		elseif a:n == 2
+			return 92
+		elseif a:n == 3
+			return 115
+		elseif a:n == 4
+			return 139
+		elseif a:n == 5
+			return 162
+		elseif a:n == 6
+			return 185
+		elseif a:n == 7
+			return 208
+		elseif a:n == 8
+			return 231
+		else
+			return 255
+		endif
+	else
+		if a:n == 0
+			return 0
+		else
+			return 8 + (a:n * 10)
+		endif
+	endif
+endfun
+
+" returns the palette index for the given grey index
+fun! s:grey_color(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 16
+		elseif a:n == 9
+			return 79
+		else
+			return 79 + a:n
+		endif
+	else
+		if a:n == 0
+			return 16
+		elseif a:n == 25
+			return 231
+		else
+			return 231 + a:n
+		endif
+	endif
+endfun
+
+" returns an approximate color index for the given color level
+fun! s:rgb_number(x)
+	if &t_Co == 88
+		if a:x < 69
+			return 0
+		elseif a:x < 172
+			return 1
+		elseif a:x < 230
+			return 2
+		else
+			return 3
+		endif
+	else
+		if a:x < 75
+			return 0
+		else
+			let l:n = (a:x - 55) / 40
+			let l:m = (a:x - 55) % 40
+			if l:m < 20
+				return l:n
+			else
+				return l:n + 1
+			endif
+		endif
+	endif
+endfun
+
+" returns the actual color level for the given color index
+fun! s:rgb_level(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 0
+		elseif a:n == 1
+			return 139
+		elseif a:n == 2
+			return 205
+		else
+			return 255
+		endif
+	else
+		if a:n == 0
+			return 0
+		else
+			return 55 + (a:n * 40)
+		endif
+	endif
+endfun
+
+" returns the palette index for the given R/G/B color indices
+fun! s:rgb_color(x, y, z)
+	if &t_Co == 88
+		return 16 + (a:x * 16) + (a:y * 4) + a:z
+	else
+		return 16 + (a:x * 36) + (a:y * 6) + a:z
+	endif
+endfun
+
+" returns the palette index to approximate the given R/G/B color levels
+fun! s:color(r, g, b)
+	" get the closest grey
+	let l:gx = s:grey_number(a:r)
+	let l:gy = s:grey_number(a:g)
+	let l:gz = s:grey_number(a:b)
+
+	" get the closest color
+	let l:x = s:rgb_number(a:r)
+	let l:y = s:rgb_number(a:g)
+	let l:z = s:rgb_number(a:b)
+
+	if l:gx == l:gy && l:gy == l:gz
+		" there are two possibilities
+		let l:dgr = s:grey_level(l:gx) - a:r
+		let l:dgg = s:grey_level(l:gy) - a:g
+		let l:dgb = s:grey_level(l:gz) - a:b
+		let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+		let l:dr = s:rgb_level(l:gx) - a:r
+		let l:dg = s:rgb_level(l:gy) - a:g
+		let l:db = s:rgb_level(l:gz) - a:b
+		let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+		if l:dgrey < l:drgb
+			" use the grey
+			return s:grey_color(l:gx)
+		else
+			" use the color
+			return s:rgb_color(l:x, l:y, l:z)
+		endif
+	else
+		" only one possibility
+		return s:rgb_color(l:x, l:y, l:z)
+	endif
+endfun
+
+" returns the palette index to approximate the 'rrggbb' hex string
+fun! s:rgb(rgb)
+	let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+	let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+	let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+	return s:color(l:r, l:g, l:b)
+endfun
+
+" sets the highlighting for the given group
+fun! s:X(group, fg, bg, attr, lcfg, lcbg)
+	if s:low_color
+		let l:fge = empty(a:lcfg)
+		let l:bge = empty(a:lcbg)
+
+		if !l:fge && !l:bge
+			exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=".a:lcbg
+		elseif !l:fge && l:bge
+			exec "hi ".a:group." ctermfg=".a:lcfg." ctermbg=NONE"
+		elseif l:fge && !l:bge
+			exec "hi ".a:group." ctermfg=NONE ctermbg=".a:lcbg
+		endif
+	else
+		let l:fge = empty(a:fg)
+		let l:bge = empty(a:bg)
+
+		if !l:fge && !l:bge
+			exec "hi ".a:group." guifg=#".a:fg." guibg=#".a:bg." ctermfg=".s:rgb(a:fg)." ctermbg=".s:rgb(a:bg)
+		elseif !l:fge && l:bge
+			exec "hi ".a:group." guifg=#".a:fg." guibg=NONE ctermfg=".s:rgb(a:fg)
+		elseif l:fge && !l:bge
+			exec "hi ".a:group." guifg=NONE guibg=#".a:bg." ctermbg=".s:rgb(a:bg)
+		endif
+	endif
+
+	if a:attr == ""
+		exec "hi ".a:group." gui=none cterm=none"
+	else
+		if a:attr == 'italic'
+			exec "hi ".a:group." gui=".a:attr." cterm=none"
+		else
+			exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
+		endif
+	endif
+endfun
+" }}}
+
+if version >= 700
+  call s:X("CursorLine","","1c1c1c","","","")
+  call s:X("CursorColumn","","1c1c1c","","","")
+  call s:X("MatchParen","ffffff","80a090","bold","","")
+
+  call s:X("TabLine","000000","b0b8c0","italic","","Black")
+  call s:X("TabLineFill","9098a0","","","","")
+  call s:X("TabLineSel","000000","f0f0f0","italic,bold","","")
+
+  " Auto-completion
+  call s:X("Pmenu","ffffff","000000","","","")
+  call s:X("PmenuSel","101010","eeeeee","","","")
+endif
+
+call s:X("Visual","","404040","","","")
+call s:X("Cursor","","b0d0f0","","","")
+
+call s:X("Normal","e8e8d3","151515","","White","")
+call s:X("LineNr","605958","151515","none","Black","")
+call s:X("Comment","888888","","italic","Grey","")
+call s:X("Todo","808080","","bold","","")
+
+call s:X("StatusLine","f0f0f0","101010","italic","","")
+call s:X("StatusLineNC","a0a0a0","181818","italic","","")
+call s:X("VertSplit","181818","181818","italic","","")
+
+call s:X("Folded","a0a8b0","384048","italic","black","")
+call s:X("FoldColumn","a0a8b0","384048","","","")
+call s:X("SignColumn","a0a8b0","384048","","","")
+
+call s:X("Title","70b950","","bold","","")
+
+call s:X("Constant","cf6a4c","","","Red","")
+call s:X("Special","799d6a","","","Green","")
+call s:X("Delimiter","668799","","","Grey","")
+
+call s:X("String","99ad6a","","","Green","")
+call s:X("StringDelimiter","556633","","","DarkGreen","")
+
+call s:X("Identifier","c6b6ee","","","LightCyan","")
+call s:X("Structure","8fbfdc","","","LightCyan","")
+call s:X("Function","fad07a","","","Yellow","")
+call s:X("Statement","8197bf","","","DarkBlue","")
+call s:X("PreProc","8fbfdc","","","LightBlue","")
+
+hi link Operator Normal
+
+call s:X("Type","ffb964","","","Yellow","")
+call s:X("NonText","808080","151515","","","")
+
+call s:X("SpecialKey","808080","343434","","","")
+
+call s:X("Search","f0a0c0","302028","underline","Magenta","")
+
+call s:X("Directory","dad085","","","","")
+call s:X("ErrorMsg","","902020","","","")
+hi link Error ErrorMsg
+
+" Diff
+
+hi link diffRemoved Constant
+hi link diffAdded String
+
+" VimDiff
+
+call s:X("DiffAdd","","032218","","Black","DarkGreen")
+call s:X("DiffChange","","100920","","Black","DarkMagenta")
+call s:X("DiffDelete","220000","220000","","DarkRed","DarkRed")
+call s:X("DiffText","","000940","","","DarkRed")
+
+" PHP
+
+hi link phpFunctions Function
+call s:X("StorageClass","c59f6f","","","Red","")
+hi link phpSuperglobal Identifier
+hi link phpQuoteSingle StringDelimiter
+hi link phpQuoteDouble StringDelimiter
+hi link phpBoolean Constant
+hi link phpNull Constant
+hi link phpArrayPair Operator
+
+" Ruby
+
+hi link rubySharpBang Comment
+call s:X("rubyClass","447799","","","DarkBlue","")
+call s:X("rubyIdentifier","c6b6fe","","","","")
+
+call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","")
+call s:X("rubySymbol","7697d6","","","Blue","")
+hi link rubyGlobalVariable rubyInstanceVariable
+hi link rubyModule rubyClass
+call s:X("rubyControl","7597c6","","","","")
+
+hi link rubyString String
+hi link rubyStringDelimiter StringDelimiter
+hi link rubyInterpolationDelimiter Identifier
+
+call s:X("rubyRegexpDelimiter","540063","","","Magenta","")
+call s:X("rubyRegexp","dd0093","","","DarkMagenta","")
+call s:X("rubyRegexpSpecial","a40073","","","Magenta","")
+
+call s:X("rubyPredefinedIdentifier","de5577","","","Red","")
+
+" JavaScript
+hi link javaScriptValue Constant
+hi link javaScriptRegexpString rubyRegexp
+
+" Tag list
+hi link TagListFileName Directory
+
+" delete functions {{{
+delf s:X
+delf s:rgb
+delf s:color
+delf s:rgb_color
+delf s:rgb_level
+delf s:rgb_number
+delf s:grey_color
+delf s:grey_level
+delf s:grey_number
+" }}}
diff --git a/vim/colors/matrix.vim b/vim/colors/matrix.vim
new file mode 100644
index 0000000..da5c687
--- /dev/null
+++ b/vim/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@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/vim/colors/quagmire.vim b/vim/colors/quagmire.vim
new file mode 100644
index 0000000..8b9c583
--- /dev/null
+++ b/vim/colors/quagmire.vim
@@ -0,0 +1,112 @@
+" Vim color file
+" Maintainer:   Streak "at rsmw dot net" Porchfleece
+" Last Change:  2008 Dec 12
+" Version:      0.3
+
+" This is as close a port as I could manage of the camouflage-inspired
+" Glitterbomb theme for TextMate. Due to some fundamental differences
+" in the way the two editors handle syntax highlighting, it's more or
+" less impossible to make it a perfect match, but it's close enough to
+" look fairly nice in most circumstances.
+"
+" By the way, the original can be found on the TextMate wiki:
+" http://wiki.macromates.com/Themes/UserSubmittedThemes
+
+set background=dark
+if version > 580
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+let g:colors_name="quagmire"
+
+" UI customization
+hi Normal       guifg=#cfcfcf   guibg=#0b0a0a
+hi ModeMsg      guifg=#44444e
+hi MoreMsg      guifg=#44444e
+hi Visual       guibg=#3a3a3a
+hi NonText      guifg=#111010
+hi MatchParen   guibg=#44444e
+hi Cursor       guifg=fg        guibg=bg gui=reverse
+hi CursorLine   guibg=#11100c
+hi TabLine      guibg=bg        guifg=#44444e gui=reverse
+hi TabLineSel   guibg=bg        guifg=#44444e gui=none,bold
+hi StatusLine   guibg=bg        guifg=#44444e gui=reverse
+hi! link Question MoreMsg
+hi! link Search Visual
+hi! link TabLineFill TabLine
+hi Error        guifg=#ffffff   guibg=#d8290e
+hi DiffAdd      guifg=#f8f8f8   guibg=#41a83e
+hi DiffDelete   guifg=#f8f8f8   guibg=#d03620
+hi DiffChange   guifg=#f8f8f8   guibg=#c4b14a
+"hi DiffAdd      guifg=#41a83e   guibg=#f8f8f8
+
+" Stuff that most color schemes seem to leave out for some reason
+hi! link FoldColumn StatusLine
+hi! link SpecialKey String
+hi! link SpecialChar Character
+hi! link Folded StatusLine
+hi! link Directory String
+hi! link Label Delimiter
+hi Pmenu guibg=#4d6537
+hi PmenuSbar guibg=#44444e
+"hi PmenuSel guibg=#888888 guifg=#dbb800
+"hi PmenuThumb guibg=#
+
+" :tab h group-name
+hi Comment      guifg=#44444e   gui=italic
+hi Constant     guifg=#c0a368
+hi Number       guifg=#d3c788
+hi Identifier   guifg=#ae5251
+hi Function     guifg=#e16521 gui=bold
+hi Statement    guifg=#dbb800   gui=bold
+hi Operator     guifg=#988155   gui=none
+hi Type         guifg=#f6f080   gui=none
+hi StorageClass guifg=#7D6C55
+hi String       guifg=#4d6537 
+hi Character    guifg=#707576
+hi Special      guifg=#ebac47
+hi Delimiter    guifg=#935e29
+hi SpecialComment guifg=#73817d
+hi Underlined   guifg=#73817d gui=underline
+"hi Tag          guifg=#ebac47
+"hi Keyword      guifg=#ff3a55   gui=bold
+
+hi PreProc      guifg=#8996ab
+hi PreCondit    guifg=#afc4db
+hi LineNr       guifg=#888888 guibg=#eeeeee gui=none
+hi Todo         guifg=bg guibg=#4d6537
+"hi htmlTag      guifg=#ffeca1
+hi htmlTag      guifg=#aad7ef gui=bold
+"hi htmlTagName  guifg=#ffffff gui=bold
+"hi htmlArg      guifg=#ff6600 gui=none
+hi htmlBold     gui=bold
+hi htmlItalic   gui=italic
+hi Title        guifg=#999966 gui=none
+hi htmlTitle    guifg=fg        gui=none
+hi tmeSupport   guifg=#7d6c55 gui=none
+
+" TextMate grammars organize their highlight categories a little
+" differently. These changes do very little to make things exactly how
+" TextMate has them (yeah right, good luck) and instead concentrates
+" on making everything a little less goofy-looking.
+hi link cssAttributeSelector htmlArg
+hi link cssBraces Normal
+hi link javascriptBraces Normal
+hi link cssTagName Function
+hi link htmlEndTag htmlTag
+hi link htmlTagName htmlTag
+hi link htmlH1  htmlTitle
+"hi link lispVar Identifier
+hi link perlMatch Constant
+hi link perlMatchStartEnd perlMatch
+hi link perlFunctionName Function
+hi link perlStatementSub Type
+hi link vimHiAttrib Special
+hi link macFullscreenBG Normal
+"hi link perlSubstitutionSlash perlMatch
+
+
+
+
diff --git a/vim/colors/skittles_dark.vim b/vim/colors/skittles_dark.vim
new file mode 100644
index 0000000..847ffce
--- /dev/null
+++ b/vim/colors/skittles_dark.vim
@@ -0,0 +1,122 @@
+" Vim color file
+"
+" Version: 1.1
+"
+" Author: Shawn Biddle <shawn@shawnbiddle.com>
+"
+" Note: Used the molokai color scheme as a template
+" to build off then completely recolored almost
+" everything to be a bit more colorful while still
+" being quite readable
+"
+
+hi clear
+
+set background=dark
+if version > 580
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+let g:colors_name="skittles_dark"
+
+
+hi Boolean guifg=#AE81FF
+hi Character guifg=#E6DB74
+hi Number guifg=#AE81FF
+hi String guifg=#75d142
+hi Conditional guifg=#d44d3e gui=bold
+hi Constant guifg=#AE81FF gui=bold
+hi Cursor guifg=#000000 guibg=#F8F8F0
+hi Debug guifg=#BCA3A3 gui=bold
+hi Define guifg=#d44d3e gui=bold
+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=#8ac6f2 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=#d44d3e
+
+hi Identifier guifg=#ffffff
+
+hi Ignore guifg=#808080 guibg=bg
+hi IncSearch guifg=#C4BE89 guibg=#000000
+
+hi Keyword guifg=#8ac6f2 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=#FF9900
+
+" 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=#d44d3e gui=bold
+hi Search guifg=#FFFFFF guibg=#455354
+" marks column
+hi SignColumn guifg=#A6E22E guibg=#232526
+hi SpecialChar guifg=#FF9900 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=#8ac6f2 gui=bold
+hi Statement guifg=#d44d3e gui=italic
+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=#8ac6f2 gui=italic
+hi Title guifg=#ef5939
+hi Todo guifg=#FFFFFF guibg=bg gui=bold
+
+hi phpDocBlock guifg=#94E1E4 guibg=bg gui=bold,italic,underline
+
+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=#121212
+
+hi Normal guifg=#F8F8F2 guibg=#050505
+hi Comment guifg=#5D8D8F
+hi CursorLine guibg=#121212
+hi CursorColumn guibg=#121212
+hi LineNr guifg=#FFFFFF guibg=#000000 gui=underline
+hi NonText guifg=#BCBCBC guibg=#232526
+
+hi yamlBaseKey  gui=bold,underline
+hi yamlTab guibg=#FF0000
+hi User1 guifg=#000000 guibg=#84E12E gui=bold
+
+hi clear htmlTagN
+hi link htmlTagN Typedef
diff --git a/vim/colors/soruby.vim b/vim/colors/soruby.vim
new file mode 100644
index 0000000..514adf7
--- /dev/null
+++ b/vim/colors/soruby.vim
@@ -0,0 +1,80 @@
+" Vim color scheme
+"
+" Name:         soruby.vim
+" Maintainer:   Mitko Kostov <mitkok@7thoughts.com>
+" Last Change:  09 May 2009
+" License:      MIT
+" Version:      0.2
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = "SORuby"
+
+hi link htmlTag                     xmlTag
+hi link htmlTagName                 xmlTagName
+hi link htmlEndTag                  xmlEndTag
+
+highlight Normal                    guifg=#E6E1DC guibg=#111111 
+highlight Cursor                    guifg=#FFFFFF ctermfg=0 guibg=#FFFFFF ctermbg=15	
+highlight CursorLine                guibg=#000000 ctermbg=233 cterm=NONE
+
+highlight Comment                   guifg=#868686 ctermfg=180
+highlight Constant                  guifg=#4596ff ctermfg=73
+highlight Define                    guifg=#ff6458 ctermfg=173
+highlight Error                     guifg=#FFC66D ctermfg=221 guibg=#990000 ctermbg=88
+highlight Function                  guifg=#50e7c5 ctermfg=221 gui=NONE cterm=NONE
+highlight Identifier                guifg=yellow ctermfg=73 gui=NONE cterm=NONE
+highlight Include                   guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
+highlight PreCondit                 guifg=yellow ctermfg=173 gui=NONE cterm=NONE
+highlight Keyword                   guifg=yellow ctermfg=173 cterm=NONE
+highlight LineNr                    guifg=#9E9E9E ctermfg=159 guibg=#171717
+highlight Number                    guifg=#A5C261 ctermfg=107
+highlight PreProc                   guifg=#CC7833 ctermfg=103
+highlight Search                    guifg=NONE ctermfg=NONE guibg=#2b2b2b ctermbg=235 gui=italic cterm=underline
+highlight Statement                 guifg=#ff6458 ctermfg=173 gui=NONE cterm=NONE
+highlight String                    guifg=#e6f881 ctermfg=107
+highlight Title                     guifg=#CC7833 ctermfg=15
+highlight Type                      guifg=#DA4939 ctermfg=167 gui=NONE cterm=NONE
+highlight Visual                    guibg=#5A647E ctermbg=60
+
+highlight DiffAdd                   guifg=#E6E1DC ctermfg=7 guibg=#519F50 ctermbg=71
+highlight DiffDelete                guifg=#E6E1DC ctermfg=7 guibg=#660000 ctermbg=52
+highlight Special                   guifg=red ctermfg=167 
+
+highlight rubyBlockParameter        guifg=#7bcfff ctermfg=15
+highlight rubyClass                 guifg=#ee6969 ctermfg=15
+highlight rubyConstant              guifg=#72c6ff ctermfg=167
+highlight rubyInstanceVariable      guifg=#4596ff ctermfg=189
+highlight rubyInterpolation         guifg=#d990de ctermfg=107
+highlight rubyLocalVariableOrMethod guifg=#d990de ctermfg=189
+highlight rubyPredefinedConstant    guifg=#4596ff ctermfg=167
+highlight rubyPseudoVariable        guifg=#4596ff ctermfg=221
+highlight rubyStringDelimiter       guifg=#99cf50 ctermfg=143
+highlight rubyIdentifier            guifg=red     ctermfg=143
+highlight rubyOperator              guifg=red     ctermfg=143
+highlight rubyInclude               guifg=#ee6969
+highlight rubyConditional           guifg=#d8f881
+highlight rubyOptionalDo            guifg=#d8f881
+highlight rubyConditionalModifier   guifg=#d8f881
+highlight rubyControl               guifg=#d8f881
+highlight rubyClassVariable         guifg=#54b2d9
+highlight rubyAttribute             guifg=#becbf5
+highlight rubyEval                  guifg=#88d1f0
+highlight rubyPseudoVariable        guifg=#b5e4f7
+highlight rubyPredifinedIdentifier  guifg=red
+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 rubyModule                guifg=#ee6969
+highlight rubyDefine                guifg=#ee6969
+highlight SpellBad                  guifg=#D70000 ctermfg=160 ctermbg=NONE cterm=underline
+highlight SpellRare                 guifg=#D75F87 ctermfg=168 guibg=NONE ctermbg=NONE gui=underline cterm=underline
+highlight SpellCap                  guifg=#D0D0FF ctermfg=189 guibg=NONE ctermbg=NONE gui=underline cterm=underline
+highlight MatchParen                guifg=#519F50 ctermfg=15 guibg=#005f5f ctermbg=23
diff --git a/vim/colors/synic.vim b/vim/colors/synic.vim
new file mode 100644
index 0000000..9ae9cf8
--- /dev/null
+++ b/vim/colors/synic.vim
@@ -0,0 +1,81 @@
+" ------------------------------------------------------------------
+" Filename:	 synic.vim
+" Last Modified: May, 14 2007 (10:47)
+" Maintainer:	 Adam Olsen (arolsen@gmail.com)
+" Copyright:	 2007 Adam Olsen
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme synic
+" ------------------------------------------------------------------
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+""
+""                        SPECIAL NOTE:
+"" I believe this colorscheme is based off of Hans 
+"" Fugal's colorscheme "desert".  
+"" http://hans.fugal.net/vim/colors/desert.html
+"" I might be wrong on this... if it looks like it was based off 
+"" of your colorscheme, let me know so I can give you credits.
+""
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+let g:colors_name = "synic"
+
+hi Normal	guifg=ivory guibg=Black
+
+hi TabLineFill  guifg=#272d2f guibg=#272d2f gui=None
+hi TabLine  guifg=MistyRose3 guibg=#272d2f gui=None
+hi TabLineSel   guifg=LightBlue3 guibg=#272d2f gui=None
+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=LightBlue3 guibg=#272d2f
+hi StatusLineNC	gui=NONE guifg=MistyRose3 guibg=#272d2f
+hi VertSplit	gui=NONE guifg=LightBlue4 guibg=Black
+hi Visual	gui=reverse guifg=LightBlue4 guibg=Black
+hi VisualNOS	gui=underline guifg=fg guibg=bg
+hi DiffText	gui=NONE guifg=Yellow guibg=LightSkyBlue4
+hi Cursor	guibg=Lavender guifg=Black
+hi lCursor	guibg=Lavender guifg=Black
+hi Directory	guifg=LightGreen guibg=bg
+hi LineNr	guifg=LightBlue3 guibg=bg
+hi MoreMsg	gui=NONE guifg=SeaGreen guibg=bg
+hi NonText	gui=NONE guifg=Cyan4 guibg=Black
+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=Black
+hi WildMenu	gui=NONE guifg=Black guibg=SkyBlue4
+hi Folded	guifg=#f4aba2 guibg=bg
+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 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 Operator	gui=NONE guifg=#8673e8 guibg=bg
+hi Ignore	gui=NONE guifg=bg 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=#62c600 guibg=bg
+hi Identifier	gui=bold guifg=LightBlue4 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/vim/colors/thestars.vim b/vim/colors/thestars.vim
new file mode 100644
index 0000000..d2f7783
--- /dev/null
+++ b/vim/colors/thestars.vim
@@ -0,0 +1,151 @@
+" Vim Color File
+" Maintainer: Michael Wiseman (thestarslookdown at gmail dot com)
+" Last Change: August 11, 2005
+
+" Color Help Screens
+" h cterm-colors
+" h group-name
+" h highlight-groups
+
+set bg=dark
+hi clear
+if exists("syntax_on")
+    syntax reset
+endif
+
+let colors_name = "thestars"
+
+"------------------------------------------------------------------------------
+" Highlight Groups
+"------------------------------------------------------------------------------
+
+" Cursors
+hi Cursor guibg=white guifg=black gui=bold
+hi lCursor guifg=white guifg=black gui=bold
+
+" Directory
+hi Directory guibg=black guifg=#9BC4E2
+
+" Diff
+hi DiffAdd guibg=white guifg=blue
+hi DiffChange guibg=white guifg=darkred
+hi DiffDelete guibg=white guifg=red gui=bold
+hi DiffText guibg=white guifg=green gui=italic
+
+" Error Message
+hi ErrorMsg guibg=black guifg=red
+
+" Vertical Split
+hi VertSplit guibg=#666666 guifg=#F5F5F5
+
+" Folding
+hi Folded guibg=gainsboro guifg=#666666
+hi FoldColumn guibg=gainsboro guifg=#666666
+
+" Sign Column
+hi SignColumn guibg=black guifg=red
+
+" Incremental Search
+hi IncSearch guibg=gainsboro guifg=#666666
+
+" Line Number
+hi LineNr guibg=gainsboro guifg=#666666 gui=bold
+
+" Mode Message
+hi ModeMsg guibg=black guifg=white
+
+" More Prompt
+hi MoreMsg guibg=black guifg=#F5F5F5
+
+" Nontext
+hi NonText guibg=black guifg=white
+
+" Normal Text
+hi Normal guibg=black guifg=white
+
+" Question
+hi Question guibg=black guifg=darkgreen gui=bold
+
+" Search
+hi Search guibg=#666666 guifg=gainsboro
+
+" Special Key
+hi SpecialKey guibg=black guifg=#337147
+
+" Status Line
+hi StatusLine guibg=#666666 guifg=#F5F5F5
+hi StatusLineNC guibg=#333333 guifg=#666666
+
+" Title
+hi Title guifg=black guifg=white gui=bold
+
+" Visual
+hi Visual guibg=#DAF4F0 guifg=#666666
+hi VisualNOS guibg=#DAF4F0 guifg=#666666 gui=italic
+
+" Warning Message
+hi WarningMsg guibg=black guifg=red
+
+" Wild Menu
+hi WildMenu guibg=white guifg=black gui=bold
+
+"------------------------------------------------------------------------------
+" Group Name
+"------------------------------------------------------------------------------
+
+" Comments
+hi Comment guibg=black guifg=#FDF8FF gui=italic
+
+" Constants
+hi Constant guibg=black guifg=#CC1100
+" hi String guibg=black guifg=#337147
+" hi Character guibg=black guifg=#337147
+" hi Number guibg=black guifg=#C6C3B5
+" hi Boolean guibg=black guifg=#8C1717
+" hi Float guibg=black guifg=#C6C3B5
+
+" Identifier
+hi Identifier guibg=black guifg=#FF9955
+" hi Function guibg=black guifg=#4682B4
+
+" Statement
+hi Statement guibg=black guifg=#FCD59C
+" hi Conditional guibg=black guifg=#D98719
+" hi Repeat guibg=black guifg=#D98719
+" hi Label guibg=black guifg=white
+" hi Operator guibg=black guifg=white
+" hi Keyword guibg=black guifg=white
+" hi Exception guibg=black guifg=#D98719
+
+" PreProc
+hi PreProc guibg=black guifg=blue
+" hi Include guibg=black guifg=#D98719
+" hi Define guibg=black guifg=#D98719
+" hi Macro guibg=black guifg=#D98719
+" hi PreCondit guibg=black guifg=#D98719
+ 
+" Type
+hi Type guibg=black guifg=darkgreen
+" hi StorageClass guibg=black guifg=white
+" hi Structure guibg=black guifg=white
+" hi Typedef guibg=black guifg=white
+
+" Special
+hi Special guibg=black guifg=#87CEFA
+"hi SpecialChar guibg=black guifg=orange
+"hi Tag guibg=black guifg=orange
+"hi Delimiter guibg=black guifg=orange
+"hi SpecialComment guibg=black guifg=#96C8A2
+"hi Debug guibg=black guifg=orange
+
+" Underlined
+hi Underlined guibg=darkgray guifg=#00FF40 gui=underline
+
+"Ignore
+hi Ignore guibg=black guifg=black
+
+" Error
+hi Error guibg=red guifg=white
+
+" Todo
+hi Todo  guibg=black guifg=blue
diff --git a/vim/colors/twilight.vim b/vim/colors/twilight.vim
new file mode 100644
index 0000000..ab08bc5
--- /dev/null
+++ b/vim/colors/twilight.vim
@@ -0,0 +1,66 @@
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "twilight"
+
+if version >= 700
+  hi CursorLine guibg=#182028
+  hi CursorColumn guibg=#182028
+  hi MatchParen guifg=white guibg=#80a090 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
+
+hi Cursor guifg=NONE guibg=#586068
+
+hi Normal guifg=#f8f8f8 guibg=#141414
+"hi LineNr guifg=#808080 guibg=#e0e0e0
+hi LineNr guifg=#808080 guibg=#141414 gui=italic
+
+hi StatusLine guifg=#f0f0f0 guibg=#4f4a50 gui=italic
+hi StatusLineNC guifg=#c0c0c0 guibg=#5f5a60 gui=italic
+hi VertSplit guifg=#5f5a60 guibg=#5f5a60 gui=italic
+hi Folded guibg=#384048 guifg=#a0a8b0
+
+hi Comment guifg=#5f5a60 gui=italic
+hi Todo guifg=#808080 guibg=NONE gui=bold,italic
+
+hi Constant guifg=#cf6a4c
+"hi String guifg=#8f9d6a
+hi String guifg=#ddf2a4
+
+hi Identifier guifg=#7587a6
+" Type
+hi Structure guifg=#9B859D
+hi Function guifg=#dad085
+" dylan: method, library, ...
+hi Statement guifg=#dad085 gui=NONE
+" Keywords
+hi PreProc guifg=#cda869
+"gui=underline
+
+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
+
+
diff --git a/vim/colors/two2tango.vim b/vim/colors/two2tango.vim
new file mode 100644
index 0000000..fc6827e
--- /dev/null
+++ b/vim/colors/two2tango.vim
@@ -0,0 +1,101 @@
+" Vim color file
+" Name: two2tango
+" Maintainer: Erik Falor <ewfalor@gmail.com>
+" Version: 1.1
+"
+" Big props to Panos Laganakos <panos.laganakos@gmail.com>
+" for the original darktango.vim colorscheme upon which 
+" this scheme is based.
+
+set background=dark
+if version > 580
+    " no guarantees for version 5.8 and below, but this makes it stop
+    " complaining
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+
+let g:colors_name="two2tango"
+
+"Tango palette
+"http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
+" {{{
+let s:Butter        = ['#fce94f', '#edd400', '#c4a000']
+let s:Chameleon     = ['#8ae234', '#73d216', '#4e9a06']
+let s:Orange        = ['#fcaf3e', '#f57900', '#ce5c00']
+let s:SkyBlue       = ['#729fcf', '#3465a4', '#204a87']
+let s:Plum          = ['#ad7fa8', '#75507b', '#5c3566']
+let s:Chocolate     = ['#e9b96e', '#c17d11', '#8f5902']
+let s:ScarletRed    = ['#ef2929', '#cc0000', '#a40000']
+let s:Aluminium     = ['#eeeeec', '#d3d7cf', '#babdb6',
+                    \'#888a85', '#555753', '#2e3436']
+"This color isn't part of the Tango Palette; I use it because there
+"isn't a Tango color that provides enough contrast
+let s:Background    = '#212628'
+" }}}
+
+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/vim/colors/wombat256.vim b/vim/colors/wombat256.vim
new file mode 100644
index 0000000..73be6db
--- /dev/null
+++ b/vim/colors/wombat256.vim
@@ -0,0 +1,302 @@
+" Vim color file
+" Maintainer:   David Liang (bmdavll at gmail dot com)
+" Last Change:  November 28 2008
+"
+" wombat256.vim - a modified version of Wombat by Lars Nielsen that also
+" works on xterms with 88 or 256 colors. The algorithm for approximating the
+" GUI colors with the xterm palette is from desert256.vim by Henry So Jr.
+
+set background=dark
+
+if version > 580
+	hi clear
+	if exists("syntax_on")
+		syntax reset
+	endif
+endif
+
+let g:colors_name = "wombat256"
+
+if !has("gui_running") && &t_Co != 88 && &t_Co != 256
+	finish
+endif
+
+" functions {{{
+" returns an approximate grey index for the given grey level
+fun <SID>grey_number(x)
+	if &t_Co == 88
+		if a:x < 23
+			return 0
+		elseif a:x < 69
+			return 1
+		elseif a:x < 103
+			return 2
+		elseif a:x < 127
+			return 3
+		elseif a:x < 150
+			return 4
+		elseif a:x < 173
+			return 5
+		elseif a:x < 196
+			return 6
+		elseif a:x < 219
+			return 7
+		elseif a:x < 243
+			return 8
+		else
+			return 9
+		endif
+	else
+		if a:x < 14
+			return 0
+		else
+			let l:n = (a:x - 8) / 10
+			let l:m = (a:x - 8) % 10
+			if l:m < 5
+				return l:n
+			else
+				return l:n + 1
+			endif
+		endif
+	endif
+endfun
+
+" returns the actual grey level represented by the grey index
+fun <SID>grey_level(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 0
+		elseif a:n == 1
+			return 46
+		elseif a:n == 2
+			return 92
+		elseif a:n == 3
+			return 115
+		elseif a:n == 4
+			return 139
+		elseif a:n == 5
+			return 162
+		elseif a:n == 6
+			return 185
+		elseif a:n == 7
+			return 208
+		elseif a:n == 8
+			return 231
+		else
+			return 255
+		endif
+	else
+		if a:n == 0
+			return 0
+		else
+			return 8 + (a:n * 10)
+		endif
+	endif
+endfun
+
+" returns the palette index for the given grey index
+fun <SID>grey_color(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 16
+		elseif a:n == 9
+			return 79
+		else
+			return 79 + a:n
+		endif
+	else
+		if a:n == 0
+			return 16
+		elseif a:n == 25
+			return 231
+		else
+			return 231 + a:n
+		endif
+	endif
+endfun
+
+" returns an approximate color index for the given color level
+fun <SID>rgb_number(x)
+	if &t_Co == 88
+		if a:x < 69
+			return 0
+		elseif a:x < 172
+			return 1
+		elseif a:x < 230
+			return 2
+		else
+			return 3
+		endif
+	else
+		if a:x < 75
+			return 0
+		else
+			let l:n = (a:x - 55) / 40
+			let l:m = (a:x - 55) % 40
+			if l:m < 20
+				return l:n
+			else
+				return l:n + 1
+			endif
+		endif
+	endif
+endfun
+
+" returns the actual color level for the given color index
+fun <SID>rgb_level(n)
+	if &t_Co == 88
+		if a:n == 0
+			return 0
+		elseif a:n == 1
+			return 139
+		elseif a:n == 2
+			return 205
+		else
+			return 255
+		endif
+	else
+		if a:n == 0
+			return 0
+		else
+			return 55 + (a:n * 40)
+		endif
+	endif
+endfun
+
+" returns the palette index for the given R/G/B color indices
+fun <SID>rgb_color(x, y, z)
+	if &t_Co == 88
+		return 16 + (a:x * 16) + (a:y * 4) + a:z
+	else
+		return 16 + (a:x * 36) + (a:y * 6) + a:z
+	endif
+endfun
+
+" returns the palette index to approximate the given R/G/B color levels
+fun <SID>color(r, g, b)
+	" get the closest grey
+	let l:gx = <SID>grey_number(a:r)
+	let l:gy = <SID>grey_number(a:g)
+	let l:gz = <SID>grey_number(a:b)
+
+	" get the closest color
+	let l:x = <SID>rgb_number(a:r)
+	let l:y = <SID>rgb_number(a:g)
+	let l:z = <SID>rgb_number(a:b)
+
+	if l:gx == l:gy && l:gy == l:gz
+		" there are two possibilities
+		let l:dgr = <SID>grey_level(l:gx) - a:r
+		let l:dgg = <SID>grey_level(l:gy) - a:g
+		let l:dgb = <SID>grey_level(l:gz) - a:b
+		let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+		let l:dr = <SID>rgb_level(l:gx) - a:r
+		let l:dg = <SID>rgb_level(l:gy) - a:g
+		let l:db = <SID>rgb_level(l:gz) - a:b
+		let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+		if l:dgrey < l:drgb
+			" use the grey
+			return <SID>grey_color(l:gx)
+		else
+			" use the color
+			return <SID>rgb_color(l:x, l:y, l:z)
+		endif
+	else
+		" only one possibility
+		return <SID>rgb_color(l:x, l:y, l:z)
+	endif
+endfun
+
+" returns the palette index to approximate the 'rrggbb' hex string
+fun <SID>rgb(rgb)
+	let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+	let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+	let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+	return <SID>color(l:r, l:g, l:b)
+endfun
+
+" sets the highlighting for the given group
+fun <SID>X(group, fg, bg, attr)
+	if a:fg != ""
+		exec "hi ".a:group." guifg=#".a:fg." ctermfg=".<SID>rgb(a:fg)
+	endif
+	if a:bg != ""
+		exec "hi ".a:group." guibg=#".a:bg." ctermbg=".<SID>rgb(a:bg)
+	endif
+	if a:attr != ""
+		if a:attr == 'italic'
+			exec "hi ".a:group." gui=".a:attr." cterm=none"
+		else
+			exec "hi ".a:group." gui=".a:attr." cterm=".a:attr
+		endif
+	endif
+endfun
+" }}}
+
+call <SID>X("Normal",		"cccccc",	"242424",	"none")
+call <SID>X("Cursor",		"222222",	"ecee90",	"none")
+call <SID>X("CursorLine",	"",			"32322e",	"none")
+call <SID>X("CursorColumn",	"",			"2d2d2d",	"")
+			"CursorIM
+			"Question
+			"IncSearch
+call <SID>X("Search",		"444444",	"af87d7",	"")
+call <SID>X("MatchParen",	"ecee90",	"857b6f",	"bold")
+call <SID>X("SpecialKey",	"6c6c6c",	"2d2d2d",	"none")
+call <SID>X("Visual",		"ecee90",	"597418",	"none")
+call <SID>X("LineNr",		"857b6f",	"121212",	"none")
+call <SID>X("Folded",		"a0a8b0",	"404048",	"none")
+call <SID>X("Title",		"f6f3e8",	"",			"bold")
+call <SID>X("VertSplit",	"444444",	"444444",	"none")
+call <SID>X("StatusLine",	"f6f3e8",	"444444",	"italic")
+call <SID>X("StatusLineNC",	"857b6f",	"444444",	"none")
+			"Scrollbar
+			"Tooltip
+			"Menu
+			"WildMenu
+call <SID>X("Pmenu",		"f6f3e8",	"444444",	"")
+call <SID>X("PmenuSel",		"121212",	"caeb82",	"")
+call <SID>X("WarningMsg",	"ff0000",	"",			"")
+			"ErrorMsg
+			"ModeMsg
+			"MoreMsg
+			"Directory
+			"DiffAdd
+			"DiffChange
+			"DiffDelete
+			"DiffText
+
+" syntax highlighting
+call <SID>X("Number",		"e5786d",	"",			"none")
+call <SID>X("Constant",		"e5786d",	"",			"none")
+call <SID>X("String",		"95e454",	"",			"italic")
+call <SID>X("Comment",		"c0bc6c",	"",			"italic")
+call <SID>X("Identifier",	"caeb82",	"",			"none")
+call <SID>X("Keyword",		"87afff",	"",			"none")
+call <SID>X("Statement",	"87afff",	"",			"none")
+call <SID>X("Function",		"caeb82",	"",			"none")
+call <SID>X("PreProc",		"e5786d",	"",			"none")
+call <SID>X("Type",			"caeb82",	"",			"none")
+call <SID>X("Special",		"ffdead",	"",			"none")
+call <SID>X("Todo",			"857b6f",	"",			"italic")
+			"Underlined
+			"Error
+			"Ignore
+
+hi! link VisualNOS	Visual
+hi! link NonText	LineNr
+hi! link FoldColumn	Folded
+
+" delete functions {{{
+delf <SID>X
+delf <SID>rgb
+delf <SID>color
+delf <SID>rgb_color
+delf <SID>rgb_level
+delf <SID>rgb_number
+delf <SID>grey_color
+delf <SID>grey_level
+delf <SID>grey_number
+" }}}
+
+" vim:set ts=4 sw=4 noet fdm=marker:
diff --git a/vim/colors/xoria256.vim b/vim/colors/xoria256.vim
new file mode 100644
index 0000000..266069e
--- /dev/null
+++ b/vim/colors/xoria256.vim
@@ -0,0 +1,173 @@
+" Vim color file
+" Name:		xoria256.vim
+" Version:	0.3.2
+" License:	Public Domain
+" Maintainer:	Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
+"
+" Heavily based on 'moria' color scheme.
+"
+" Sould work in a 256 color terminal (like latest versions of xterm, konsole,
+" etc).  Will not, however, work in 88 color terminals like urxvt.
+"
+" Color numbers (0-255) see:
+" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
+"
+" TODO:
+" 	- Diff (currently *VERY* ugly)
+" 	- Html
+
+
+
+if &t_Co != 256 && ! has("gui_running")
+  echomsg ""
+  echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)"
+  echomsg ""
+  finish
+endif
+
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+
+" Which one is right?
+"let colors_name = "xoria256"
+let g:colors_name = "xoria256"
+
+
+
+hi Normal	cterm=none	ctermfg=252	ctermbg=234	gui=none	guifg=#d0d0d0	guibg=#202020
+
+hi Cursor	cterm=none	ctermfg=bg	ctermbg=214	gui=none	guifg=bg	guibg=#ffaf00
+hi CursorColumn	cterm=none			ctermbg=238	gui=none			guibg=#444444
+hi CursorLine	cterm=none			ctermbg=238	gui=none			guibg=#444444
+hi lCursor	cterm=none	ctermfg=0	ctermbg=40	gui=none	guifg=#000000	guibg=#00df00
+"hi CursorIM	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+hi IncSearch	cterm=none	ctermfg=0	ctermbg=223	gui=none	guifg=#000000	guibg=#ffdfaf
+hi Search	cterm=none	ctermfg=0	ctermbg=149	gui=none	guifg=#000000	guibg=#afdf5f
+hi ErrorMsg	cterm=none	ctermfg=15	ctermbg=160	gui=bold	guifg=#ffffff	guibg=#df0000
+hi WarningMsg	cterm=bold	ctermfg=196	ctermbg=bg	gui=bold	guifg=#ff0000	guibg=bg
+hi ModeMsg	cterm=bold	ctermfg=fg	ctermbg=bg	gui=bold	guifg=fg	guibg=bg
+hi MoreMsg	cterm=bold	ctermfg=250	ctermbg=bg	gui=bold	guifg=#bcbcbc	guibg=bg
+hi Question	cterm=bold	ctermfg=113	ctermbg=bg	gui=bold	guifg=#87df7f	guibg=bg
+
+hi StatusLine	cterm=bold	ctermfg=fg	ctermbg=239	gui=bold	guifg=fg	guibg=#4e4e4e
+hi StatusLineNC	cterm=none	ctermfg=fg	ctermbg=237	gui=none	guifg=fg	guibg=#3a3a3a
+hi User1	cterm=none	ctermfg=15	ctermbg=20	gui=none	guifg=#ffffff	guibg=#0000df
+hi User2	cterm=none	ctermfg=46	ctermbg=20	gui=none	guifg=#00ff00	guibg=#0000df
+hi User3	cterm=none	ctermfg=46	ctermbg=20	gui=none	guifg=#00ff00	guibg=#0000df
+hi User4	cterm=none	ctermfg=50	ctermbg=20	gui=none	guifg=#00ffdf	guibg=#0000df
+hi User5	cterm=none	ctermfg=46	ctermbg=20	gui=none	guifg=#00ff00	guibg=#0000df
+hi VertSplit	cterm=reverse	ctermfg=fg	ctermbg=237	gui=reverse	guifg=fg	guibg=#3a3a3a
+
+hi WildMenu	cterm=bold	ctermfg=0	ctermbg=184	gui=bold	guifg=#000000	guibg=#dfdf00
+"hi Menu	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+"hi Scrollbar	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+"hi Tooltip	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+
+"hi MBENormal	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+"hi MBEChanged	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+"hi MBEVisibleNormal cterm=	ctermfg=	ctermbg=	gui=		guifg=		guibg=
+"hi MBEVisibleChanged cterm=	ctermfg=	ctermbg=	gui=		guifg=		guibg=
+
+"hi DiffText	cterm=bold	ctermfg=fg	ctermbg=20	gui=bold	guifg=fg	guibg=#0000df
+"hi DiffDelete	cterm=none	ctermfg=fg	ctermbg=88	gui=none	guifg=fg	guibg=#870000
+"hi DiffChange	cterm=none	ctermfg=fg	ctermbg=18	gui=none	guifg=fg	guibg=#000087
+"hi DiffAdd	cterm=none	ctermfg=fg	ctermbg=28	gui=none	guifg=fg	guibg=#008700
+
+hi Folded	cterm=none	ctermfg=255	ctermbg=60	gui=none	guifg=#eeeeee	guibg=#5f5f87
+"hi Folded	cterm=none	ctermfg=251	ctermbg=240	gui=bold	guifg=#c6c6c6	guibg=#585858
+"hi Folded	cterm=none	ctermfg=251	ctermbg=95	gui=none	guifg=#c6c6c6	guibg=#585858
+hi FoldColumn	cterm=none	ctermfg=248	ctermbg=58	gui=none	guifg=#a8a8a8	guibg=bg
+hi SignColumn	cterm=none	ctermfg=248	ctermbg=bg	gui=none	guifg=#a8a8a8	guibg=bg
+
+hi Directory	cterm=none	ctermfg=39	ctermbg=bg	gui=none	guifg=#00afff	guibg=bg
+hi LineNr	cterm=none	ctermfg=248			gui=none	guifg=#a8a8a8
+hi NonText	cterm=bold	ctermfg=248	ctermbg=bg	gui=bold	guifg=#a8a8a8	guibg=bg
+hi SpecialKey	cterm=none	ctermfg=77	ctermbg=bg	gui=none	guifg=#5fdf5f	guibg=bg
+hi Title	cterm=none	ctermfg=0	ctermbg=184	gui=none	guifg=#000000	guibg=#dfdf00
+hi Visual	cterm=none	ctermfg=24	ctermbg=153	gui=none	guifg=#005f87	guibg=#afdfff
+"hi Visual	cterm=none	ctermfg=18	ctermbg=153	gui=none	guifg=#005f87	guibg=#afdfff
+hi VisualNOS	cterm=bold,underline ctermfg=247 ctermbg=bg	gui=bold,underline guifg=#9e9e9e guibg=bg
+
+hi Comment	cterm=none	ctermfg=244	ctermbg=bg	gui=none	guifg=#808080	guibg=bg
+""" COLD
+hi Constant	cterm=none	ctermfg=187	ctermbg=bg	gui=none	guifg=#dfdfaf	guibg=bg
+""" COLD-DARK
+"hi Constant	cterm=none	ctermfg=223	ctermbg=bg	gui=none	guifg=#ffdfaf	guibg=bg
+""" NEUTRAL
+"hi Constant	cterm=none	ctermfg=229	ctermbg=bg	gui=none	guifg=#ffffaf	guibg=bg
+""" WARM
+"hi Constant	cterm=none	ctermfg=222	ctermbg=bg	gui=none	guifg=#ffdf87	guibg=bg
+"hi String	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+hi Error	cterm=none	ctermfg=196	ctermbg=bg	gui=none	guifg=#ff0000	guibg=bg
+""" COLD
+"hi Identifier	cterm=none	ctermfg=115	ctermbg=bg	gui=none	guifg=#87dfaf	guibg=bg
+""" NEUTRAL
+"hi Identifier	cterm=none	ctermfg=114	ctermbg=bg	gui=none	guifg=#87df87	guibg=bg
+""" WARM
+hi Identifier	cterm=none	ctermfg=150	ctermbg=bg	gui=none	guifg=#afdf87	guibg=bg
+hi Ignore	cterm=none	ctermfg=238	ctermbg=bg	gui=none	guifg=#444444	guibg=bg
+hi Number	cterm=none	ctermfg=180	ctermbg=bg	gui=none	guifg=#dfaf87	guibg=bg
+"hi Number	cterm=none	ctermfg=222	ctermbg=bg	gui=none	guifg=#ffaf87	guibg=bg
+"hi Number	cterm=none	ctermfg=215	ctermbg=bg	gui=none	guifg=#ffaf87	guibg=bg
+"hi Number	cterm=none	ctermfg=209	ctermbg=0	gui=none	guifg=#ff875f	guibg=#000000
+"hi Number	cterm=none	ctermfg=210	ctermbg=0	gui=none	guifg=#ff8787	guibg=#000000
+hi PreProc	cterm=none	ctermfg=182	ctermbg=bg	gui=none	guifg=#dfafdf	guibg=bg
+"hi PreProc	cterm=none	ctermfg=218	ctermbg=bg	gui=none	guifg=#ffafdf	guibg=bg
+""" LIGHT
+"hi Special	cterm=none	ctermfg=174	ctermbg=bg	gui=none	guifg=#ffafaf	guibg=bg
+""" DARK
+hi Special	cterm=none	ctermfg=174	ctermbg=bg	gui=none	guifg=#df8787	guibg=bg
+"hi Special	cterm=none	ctermfg=114	ctermbg=bg	gui=none	guifg=#87df87	guibg=bg
+"hi SpecialChar	cterm=		ctermfg=	ctermbg=	gui=		guifg=		guibg=
+hi Statement	cterm=none	ctermfg=74	ctermbg=bg	gui=none	guifg=#5fafdf	guibg=bg
+"hi Statement	cterm=none	ctermfg=75	ctermbg=bg	gui=none	guifg=#5fafff	guibg=bg
+hi Todo		cterm=none	ctermfg=0	ctermbg=184	gui=none	guifg=#000000	guibg=#dfdf00
+"hi Type		cterm=none	ctermfg=153	ctermbg=bg	gui=none	guifg=#afdfff	guibg=bg
+hi Type		cterm=none	ctermfg=146	ctermbg=bg	gui=none	guifg=#afafdf	guibg=bg
+hi Underlined	cterm=underline	ctermfg=39	ctermbg=bg	gui=underline	guifg=#00afff	guibg=bg
+
+"hi htmlBold	cterm=		ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=bold
+"hi htmlBoldItalic cterm=	ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=bold,italic
+"hi htmlBoldUnderline cterm=	ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=bold,underline
+"hi htmlBoldUnderlineItalic cterm= ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=bold,underline,italic
+"hi htmlItalic	cterm=		ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=italic
+"hi htmlUnderline cterm=	ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=underline
+"hi htmlUnderlineItalici cterm=	ctermbg=0	ctermfg=15	guibg=bg	guifg=fg	gui=underline,italic
+
+
+" For taglist plugin
+if exists('loaded_taglist')
+  hi TagListTagName  cterm=none	ctermfg=16	ctermbg=28	gui=none	guifg=#000000	guibg=#008700
+  hi TagListTagScope cterm=none	ctermfg=16	ctermbg=28	gui=none	guifg=#000000	guibg=#008700
+  hi TagListTitle    cterm=none	ctermfg=199	ctermbg=16	gui=none	guifg=#ff00af	guibg=#000000
+  hi TagListComment  cterm=none	ctermfg=16	ctermbg=28	gui=none	guifg=#000000	guibg=#008700
+  hi TagListFileName cterm=none	ctermfg=15	ctermbg=90	gui=none	guifg=#ffffff	guibg=#870087
+endif
+
+
+" For features in vim v.7.0 and higher
+if v:version >= 700
+  hi Pmenu      cterm=none	ctermfg=0	ctermbg=246	gui=none	guifg=#000000	guibg=#949494
+  hi PmenuSel   cterm=none	ctermfg=0	ctermbg=243	gui=none	guifg=#000000	guibg=#767676
+  hi PmenuSbar  cterm=none	ctermfg=fg	ctermbg=243	gui=none	guifg=fg	guibg=#767676
+  hi PmenuThumb cterm=none	ctermfg=bg	ctermbg=252	gui=none	guifg=bg	guibg=#d0d0d0
+  
+  "  if has("spell")
+  "  	hi SpellBad	guisp=#ee2c2c	gui=undercurl
+  "  	hi SpellCap	guisp=#2c2cee	gui=undercurl
+  "  	hi SpellLocal	guisp=#2ceeee	gui=undercurl
+  "  	hi SpellRare	guisp=#ee2cee	gui=undercurl
+  "  endif
+  
+  hi MatchParen	cterm=none	ctermfg=188	ctermbg=68	gui=bold	guifg=#dfdfdf	guibg=#5f87df
+  "hi MatchParen	cterm=none	ctermfg=24	ctermbg=153	gui=none	guifg=#005f87	guibg=#afdfff
+  "hi MatchParen	cterm=none	ctermfg=117	ctermbg=31	gui=bold	guifg=#87dfff	guibg=#0087af
+  "hi MatchParen	cterm=none	ctermfg=187	ctermbg=67	gui=none	guifg=#005f87	guibg=#afdfff
+
+  hi TabLineSel	cterm=bold	ctermfg=fg	ctermbg=bg	gui=bold	guifg=fg	guibg=bg
+  hi TabLine	cterm=underline	ctermfg=fg	ctermbg=242	gui=underline	guifg=fg	guibg=#666666
+  hi TabLineFill cterm=underline ctermfg=fg	ctermbg=242	gui=underline	guifg=fg	guibg=#666666
+endif
diff --git a/vim/colors/zmrok.vim b/vim/colors/zmrok.vim
new file mode 100644
index 0000000..122b051
--- /dev/null
+++ b/vim/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/xorg/xresources b/xorg/xresources
index 41b9e6b..9238f82 100644
--- a/xorg/xresources
+++ b/xorg/xresources
@@ -1,4 +1,4 @@
-urxvt*termName: rxvt-unicode-256color
+urxvt*termName: rxvt
 
 *font: xft:Terminus:size=8:antialias=false
 *geometry: 110x24