Switch back to gruvbox vim theme

2 files changed, 1027 insertions, 441 deletions

diff --git a/.vim/colors/gruvbox.vim b/.vim/colors/gruvbox.vim
new file mode 100644
index 00000000..3bdd6c0b
--- /dev/null
+++ b/.vim/colors/gruvbox.vim
@@ -0,0 +1,1027 @@
+" -----------------------------------------------------------------------------
+" File: gruvbox.vim
+" Description: Retro groove color scheme for Vim
+" Author: morhetz <morhetz@gmail.com>
+" Source: https://github.com/morhetz/gruvbox
+" Last Modified: 10 Nov 2014
+" -----------------------------------------------------------------------------
+
+" Supporting code -------------------------------------------------------------
+" Initialisation: {{{
+
+if version > 580
+	hi clear
+	if exists("syntax_on")
+		syntax reset
+	endif
+endif
+
+let g:colors_name='gruvbox'
+
+if !has('gui_running') && &t_Co != 256
+	finish
+endif
+
+" }}}
+" Global Settings: {{{
+
+if !exists('g:gruvbox_bold')
+	let g:gruvbox_bold=1
+endif
+if !exists('g:gruvbox_italic')
+	let g:gruvbox_italic=1
+endif
+if !exists('g:gruvbox_undercurl')
+	let g:gruvbox_undercurl=1
+endif
+if !exists('g:gruvbox_underline')
+	let g:gruvbox_underline=1
+endif
+
+if !exists('g:gruvbox_italicize_comments')
+	let g:gruvbox_italicize_comments=1
+endif
+if !exists('g:gruvbox_italicize_strings')
+	let g:gruvbox_italicize_strings=0
+endif
+
+if !exists('g:gruvbox_improved_strings')
+	let g:gruvbox_improved_strings=0
+endif
+
+if !exists('g:gruvbox_improved_warnings')
+	let g:gruvbox_improved_warnings=0
+endif
+
+if !exists('g:gruvbox_termcolors')
+	let g:gruvbox_termcolors=256
+endif
+
+if !exists('g:gruvbox_invert_indent_guides')
+	let g:gruvbox_invert_indent_guides=0
+endif
+
+if !exists('g:gruvbox_hls_cursor')
+	let g:gruvbox_hls_cursor='orange'
+endif
+
+if !exists('g:gruvbox_sign_column')
+	let g:gruvbox_sign_column='dark1'
+endif
+
+if !exists('g:gruvbox_color_column')
+	let g:gruvbox_color_column='dark1'
+endif
+
+if !exists('g:gruvbox_vert_split')
+	let g:gruvbox_vert_split='dark2'
+endif
+
+if !exists('g:gruvbox_invert_signs')
+	let g:gruvbox_invert_signs=0
+endif
+
+if !exists('g:gruvbox_invert_selection')
+	let g:gruvbox_invert_selection=1
+endif
+
+if !exists('g:gruvbox_contrast')
+	let g:gruvbox_contrast='medium'
+endif
+
+if !exists('g:gruvbox_contrast_dark')
+	let g:gruvbox_contrast_dark='medium'
+endif
+
+if !exists('g:gruvbox_contrast_light')
+	let g:gruvbox_contrast_light='medium'
+endif
+
+if !exists('g:gruvbox_invert_tabline')
+	let g:gruvbox_invert_tabline=0
+endif
+
+let s:is_dark=(&background == 'dark')
+
+" }}}
+" Palette: {{{
+
+let s:gb = {}
+
+if s:is_dark
+	let s:gb.dark0  = ['282828', 235]     " 40-40-40
+	let s:gb.dark1  = ['3c3836', 237]     " 60-56-54
+	let s:gb.dark2  = ['504945', 239]     " 80-73-69
+	let s:gb.dark3  = ['665c54', 241]     " 102-92-84
+	let s:gb.dark4  = ['7c6f64', 243]     " 124-111-100
+
+	let s:gb.medium = ['928374', 245]     " 146-131-116
+
+	let s:gb.light0 = ['fdf4c1', 229]     " 253-244-193
+	let s:gb.light1 = ['ebdbb2', 223]     " 235-219-178
+	let s:gb.light2 = ['d5c4a1', 250]     " 213-196-161
+	let s:gb.light3 = ['bdae93', 248]     " 189-174-147
+	let s:gb.light4 = ['a89984', 246]     " 168-153-132
+
+	let s:gb.light4_256 = ['a89984', 246] " 168-153-132
+
+	let s:gb.red    = ['fb4934', 167]     " 251-73-52
+	let s:gb.green  = ['b8bb26', 142]     " 184-187-38
+	let s:gb.yellow = ['fabd2f', 214]     " 250-189-47
+	let s:gb.blue   = ['83a598', 109]     " 131-165-152
+	let s:gb.purple = ['d3869b', 175]     " 211-134-155
+	let s:gb.aqua   = ['8ec07c', 108]     " 142-192-124
+	let s:gb.orange = ['fe8019', 208]     " 254-128-25
+
+	if g:gruvbox_termcolors == 16
+		let s:gb.dark0  = ['282828', 0]
+		let s:gb.light4 = ['a89984', 7]
+		let s:gb.medium = ['928374', 8]
+		let s:gb.red    = ['fb4934', 9]
+		let s:gb.green  = ['b8bb26', 10]
+		let s:gb.yellow = ['fabd2f', 11]
+		let s:gb.blue   = ['83a598', 12]
+		let s:gb.purple = ['d3869b', 13]
+		let s:gb.aqua   = ['8ec07c', 14]
+		let s:gb.light1 = ['ebdbb2', 15]
+	endif
+
+	if g:gruvbox_contrast == 'soft'
+		let s:gb.dark0  = ['32302f', 236]     " 50-48-47
+	endif
+
+	if g:gruvbox_contrast == 'hard'
+		let s:gb.dark0  = ['1d2021', 234]     " 29-32-33
+	endif
+
+	if g:gruvbox_contrast_dark == 'soft'
+		let s:gb.dark0  = ['32302f', 236]     " 50-48-47
+	endif
+
+	if g:gruvbox_contrast_dark == 'hard'
+		let s:gb.dark0  = ['1d2021', 234]     " 29-32-33
+	endif
+else
+	let s:gb.dark0  = ['fbf1c7', 229]     " 251-241-199
+	let s:gb.dark1  = ['ebdbb2', 223]     " 235-219-178
+	let s:gb.dark2  = ['d5c4a1', 250]     " 213-196-161
+	let s:gb.dark3  = ['bdae93', 248]     " 189-174-147
+	let s:gb.dark4  = ['a89984', 246]     " 168-153-132
+
+	let s:gb.medium = ['928374', 244]     " 146-131-116
+
+	let s:gb.light0 = ['282828', 235]     " 40-40-40
+	let s:gb.light1 = ['3c3836', 237]     " 60-56-54
+	let s:gb.light2 = ['504945', 239]     " 80-73-69
+	let s:gb.light3 = ['665c54', 241]     " 102-92-84
+	let s:gb.light4 = ['7c6f64', 243]     " 124-111-100
+
+	let s:gb.light4_256 = ['7c6f64', 243] " 124-111-100
+
+	let s:gb.red    = ['9d0006', 88]      " 157-0-6
+	let s:gb.green  = ['79740e', 100]     " 121-116-14
+	let s:gb.yellow = ['b57614', 136]     " 181-118-20
+	let s:gb.blue   = ['076678', 24]      " 7-102-120
+	let s:gb.purple = ['8f3f71', 96]      " 143-63-113
+	let s:gb.aqua   = ['427b58', 66]      " 66-123-88
+	let s:gb.orange = ['af3a03', 130]     " 175-58-3
+
+	if g:gruvbox_termcolors == 16
+		let s:gb.dark0  = ['fbf1c7', 0]
+		let s:gb.light4 = ['7c6f64', 7]
+		let s:gb.medium = ['928374', 8]
+		let s:gb.red    = ['9d0006', 9]
+		let s:gb.green  = ['79740e', 10]
+		let s:gb.yellow = ['b57614', 11]
+		let s:gb.blue   = ['076678', 12]
+		let s:gb.purple = ['8f3f71', 13]
+		let s:gb.aqua   = ['427b58', 14]
+		let s:gb.light1 = ['3c3836', 15]
+	endif
+
+	if g:gruvbox_contrast == 'soft'
+		let s:gb.dark0  = ['f2e5bc', 228]     " 242-229-188
+	endif
+
+	if g:gruvbox_contrast == 'hard'
+		let s:gb.dark0  = ['f9f5d7', 230]     " 249-245-215
+	endif
+
+	if g:gruvbox_contrast_light == 'soft'
+		let s:gb.dark0  = ['f2e5bc', 228]     " 242-229-188
+	endif
+
+	if g:gruvbox_contrast_light == 'hard'
+		let s:gb.dark0  = ['f9f5d7', 230]     " 249-245-215
+	endif
+endif
+
+" }}}
+" Highlighting Function: {{{
+
+function! s:HL(group, fg, ...)
+	" Arguments: group, guifg, guibg, gui, guisp
+
+	let histring = 'hi ' . a:group . ' '
+
+	if strlen(a:fg)
+		if a:fg == 'fg'
+			let histring .= 'guifg=fg ctermfg=fg '
+		elseif a:fg == 'bg'
+			let histring .= 'guifg=bg ctermfg=bg '
+		elseif a:fg == 'none'
+			let histring .= 'guifg=NONE ctermfg=NONE '
+		else
+			let c = get(s:gb, a:fg)
+			let histring .= 'guifg=#' . c[0] . ' ctermfg=' . c[1] . ' '
+		endif
+	endif
+
+	if a:0 >= 1 && strlen(a:1)
+		if a:1 == 'bg'
+			let histring .= 'guibg=bg ctermbg=bg '
+		elseif a:fg == 'fg'
+			let histring .= 'guibg=fg ctermbg=fg '
+		elseif a:1 == 'none'
+			let histring .= 'guibg=NONE ctermbg=NONE '
+		else
+			let c = get(s:gb, a:1)
+			let histring .= 'guibg=#' . c[0] . ' ctermbg=' . c[1] . ' '
+		endif
+	else
+		let histring .= 'guibg=NONE ctermbg=NONE '
+	endif
+
+	" Hotfixing #24;
+	" TODO: get rid of this spaghetti
+	if a:0 >= 2 && strlen(a:2)
+		if a:2 == 'none'
+			let histring .= 'gui=NONE cterm=NONE '
+		elseif a:2 == 'italic' && g:gruvbox_italic == 0
+			let histring .= 'gui=NONE cterm=NONE '
+		elseif a:2 == 'bold' && g:gruvbox_bold == 0
+			let histring .= 'gui=NONE cterm=NONE '
+		elseif a:2 == 'bold,inverse' && g:gruvbox_bold == 0
+			let histring .= 'gui=inverse cterm=inverse '
+		elseif a:2 == 'undercurl' && g:gruvbox_undercurl == 0
+			let histring .= 'gui=NONE cterm=NONE '
+		elseif a:2 == 'underline' && g:gruvbox_underline == 0
+			let histring .= 'gui=NONE cterm=NONE '
+		elseif a:2 == 'bold,italic'
+			if g:gruvbox_italic == 0 && g:gruvbox_bold == 0
+				let histring .= 'gui=NONE cterm=NONE '
+			elseif g:gruvbox_italic == 0
+				let histring .= 'gui=bold cterm=bold '
+			elseif g:gruvbox_bold == 0
+				let histring .= 'gui=italic cterm=italic '
+			else
+				let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
+			endif
+		elseif a:2 == 'bold,underline'
+			if g:gruvbox_underline == 0 && g:gruvbox_bold == 0
+				let histring .= 'gui=NONE cterm=NONE '
+			elseif g:gruvbox_underline == 0
+				let histring .= 'gui=bold cterm=bold '
+			elseif g:gruvbox_bold == 0
+				let histring .= 'gui=underline cterm=underline '
+			else
+				let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
+			endif
+		elseif a:2 == 'underline,italic'
+			if g:gruvbox_underline == 0 && g:gruvbox_italic == 0
+				let histring .= 'gui=NONE cterm=NONE '
+			elseif g:gruvbox_underline == 0
+				let histring .= 'gui=italic cterm=italic '
+			elseif g:gruvbox_italic == 0
+				let histring .= 'gui=underline cterm=underline '
+			else
+				let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
+			endif
+		elseif a:2 == 'bold,underline,italic'
+			if g:gruvbox_italic == 0 && g:gruvbox_bold == 0
+				let histring .= 'gui=underline cterm=underline '
+			elseif g:gruvbox_italic == 0
+				let histring .= 'gui=bold,underline cterm=bold,underline '
+			elseif g:gruvbox_bold == 0
+				let histring .= 'gui=italic,underline cterm=italic,underline '
+			else
+				let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
+			endif
+		else
+			let histring .= 'gui=' . a:2 . ' cterm=' . a:2 . ' '
+		endif
+	else
+		let histring .= 'gui=NONE cterm=NONE '
+	endif
+
+	if a:0 >= 3 && strlen(a:3)
+		if a:3 == 'none'
+			let histring .= 'guisp=NONE '
+		else
+			let c = get(s:gb, a:3)
+			let histring .= 'guisp=#' . c[0] . ' '
+		endif
+	endif
+
+	execute histring
+endfunction
+
+" }}}
+
+" Vanilla colorscheme ---------------------------------------------------------
+" General UI: {{{
+
+" Normal text
+call s:HL('Normal', 'light1', 'dark0')
+
+" Correct background (see issue #7):
+" --- Problem with changing between dark and light on 256 color terminal
+" --- https://github.com/morhetz/gruvbox/issues/7
+if s:is_dark
+	set background=dark
+else
+	set background=light
+endif
+
+if version >= 700
+	" Screen line that the cursor is
+	call s:HL('CursorLine',   'none', 'dark1')
+	" Screen column that the cursor is
+	call s:HL('CursorColumn', 'none', 'dark1')
+
+if g:gruvbox_invert_tabline == 0
+	" Tab pages line filler
+	call s:HL('TabLineFill', 'dark4', 'bg')
+	" Active tab page label
+	call s:HL('TabLineSel', 'bg', 'dark4', 'bold')
+	" Not active tab page label
+	call s:HL('TabLine', 'dark4', 'bg')
+else
+	call s:HL('TabLineFill', 'bg', 'dark4')
+	call s:HL('TabLineSel', 'dark4', 'bg', 'bold')
+	call s:HL('TabLine', 'bg', 'dark4')
+endif
+
+	" Match paired bracket under the cursor
+	call s:HL('MatchParen', 'none', 'dark3', 'bold')
+endif
+
+if version >= 703
+	" Highlighted screen columns
+	call s:HL('ColorColumn',  'none', g:gruvbox_color_column)
+
+	" Concealed element: \lambda → λ
+	call s:HL('Conceal', 'blue', 'none')
+
+	" Line number of CursorLine
+	call s:HL('CursorLineNr', 'yellow', 'dark1')
+endif
+
+call s:HL('NonText',    'dark2')
+call s:HL('SpecialKey', 'dark2')
+
+if g:gruvbox_invert_selection == 0
+	call s:HL('Visual',    'none',  'dark2')
+	call s:HL('VisualNOS', 'none',  'dark2')
+else
+	call s:HL('Visual',    'none',  'dark3', 'inverse')
+	call s:HL('VisualNOS', 'none',  'dark3', 'inverse')
+endif
+
+call s:HL('Search',    'dark0', 'yellow')
+call s:HL('IncSearch', 'dark0', g:gruvbox_hls_cursor)
+
+call s:HL('Underlined', 'blue', 'none', 'underline')
+
+call s:HL('StatusLine',   'dark4', 'dark0', 'bold,inverse')
+call s:HL('StatusLineNC', 'dark2', 'light4', 'bold,inverse')
+
+" The column separating vertically split windows
+call s:HL('VertSplit', 'light4', g:gruvbox_vert_split)
+
+" Current match in wildmenu completion
+call s:HL('WildMenu', 'blue', 'dark2', 'bold')
+
+" Directory names, special names in listing
+call s:HL('Directory', 'green', 'none', 'bold')
+
+" Titles for output from :set all, :autocmd, etc.
+call s:HL('Title', 'green', 'none', 'bold')
+
+" Error messages on the command line
+call s:HL('ErrorMsg',   'bg', 'red', 'bold')
+" More prompt: -- More --
+call s:HL('MoreMsg',    'yellow', 'none', 'bold')
+" Current mode message: -- INSERT --
+call s:HL('ModeMsg',    'yellow', 'none', 'bold')
+" 'Press enter' prompt and yes/no questions
+call s:HL('Question',   'orange', 'none', 'bold')
+" Warning messages
+call s:HL('WarningMsg', 'red', 'none', 'bold')
+
+" }}}
+" Gutter: {{{
+
+" Line number for :number and :# commands
+call s:HL('LineNr', 'dark4')
+
+" Column where signs are displayed
+call s:HL('SignColumn', 'none', g:gruvbox_sign_column)
+
+" Line used for closed folds
+call s:HL('Folded', 'medium', 'dark1', 'italic')
+" Column where folds are displayed
+call s:HL('FoldColumn', 'medium', 'dark1')
+
+" }}}
+" Cursor: {{{
+
+" Character under cursor
+call s:HL('Cursor', 'none', 'none', 'inverse')
+" Visual mode cursor, selection
+call s:HL('vCursor', 'none', 'none', 'inverse')
+" Input moder cursor
+call s:HL('iCursor', 'none', 'none', 'inverse')
+" Language mapping cursor
+call s:HL('lCursor', 'none', 'none', 'inverse')
+
+" }}}
+" Syntax Highlighting: {{{
+
+if g:gruvbox_improved_strings == 0
+	call s:HL('Special', 'orange')
+else
+	call s:HL('Special', 'dark1', 'orange', 'italic')
+endif
+
+if g:gruvbox_italicize_comments == 0
+	call s:HL('Comment', 'medium', 'none')
+else
+	call s:HL('Comment', 'medium', 'none', 'italic')
+endif
+call s:HL('Todo', 'fg', 'bg', 'bold')
+call s:HL('Error', 'bg', 'red', 'bold')
+
+" Generic statement
+call s:HL('Statement',   'red')
+" if, then, else, endif, swicth, etc.
+call s:HL('Conditional', 'red')
+" for, do, while, etc.
+call s:HL('Repeat',      'red')
+" case, default, etc.
+call s:HL('Label',       'red')
+" try, catch, throw
+call s:HL('Exception',   'red')
+" sizeof, "+", "*", etc.
+hi! link Operator Normal
+" Any other keyword
+call s:HL('Keyword',     'red')
+
+" Variable name
+call s:HL('Identifier', 'blue')
+" Function name
+call s:HL('Function',   'green', 'none', 'bold')
+
+" Generic preprocessor
+call s:HL('PreProc',   'aqua')
+" Preprocessor #include
+call s:HL('Include',   'aqua')
+" Preprocessor #define
+call s:HL('Define',    'aqua')
+" Same as Define
+call s:HL('Macro',     'aqua')
+" Preprocessor #if, #else, #endif, etc.
+call s:HL('PreCondit', 'aqua')
+
+" Generic constant
+call s:HL('Constant',  'purple')
+" Character constant: 'c', '/n'
+call s:HL('Character', 'purple')
+" String constant: "this is a string"
+if g:gruvbox_italicize_strings == 0
+	call s:HL('String',  'green')
+else
+	if g:gruvbox_improved_strings == 0
+		call s:HL('String',  'green', 'none', 'italic')
+	else
+		call s:HL('String',  'dark1', 'light1', 'italic')
+	endif
+endif
+" Boolean constant: TRUE, false
+call s:HL('Boolean',   'purple')
+" Number constant: 234, 0xff
+call s:HL('Number',    'purple')
+" Floating point constant: 2.3e10
+call s:HL('Float',     'purple')
+
+" Generic type
+call s:HL('Type', 'yellow')
+" static, register, volatile, etc
+call s:HL('StorageClass', 'orange')
+" struct, union, enum, etc.
+call s:HL('Structure', 'aqua')
+" typedef
+call s:HL('Typedef', 'yellow')
+
+" }}}
+" Completion Menu: {{{
+
+if version >= 700
+	" Popup menu: normal item
+	call s:HL('Pmenu', 'light1', 'dark2')
+	" Popup menu: selected item
+	call s:HL('PmenuSel', 'dark2', 'blue', 'bold')
+	" Popup menu: scrollbar
+	call s:HL('PmenuSbar', 'none', 'dark2')
+	" Popup menu: scrollbar thumb
+	call s:HL('PmenuThumb', 'none', 'dark4')
+endif
+
+" }}}
+" Diffs: {{{
+
+call s:HL('DiffDelete', 'dark0', 'red')
+call s:HL('DiffAdd',    'dark0', 'green')
+"call s:HL('DiffChange', 'dark0', 'blue')
+"call s:HL('DiffText',   'dark0', 'yellow')
+
+" Alternative setting
+call s:HL('DiffChange', 'dark0', 'aqua')
+call s:HL('DiffText',   'dark0', 'yellow')
+
+" }}}
+" Spelling: {{{
+
+if has("spell")
+	" Not capitalised word, or compile warnings
+	if g:gruvbox_improved_warnings == 0
+		call s:HL('SpellCap',   'none', 'none', 'undercurl', 'red')
+	else
+		call s:HL('SpellCap',   'green', 'none', 'italic,bold')
+	endif
+	" Not recognized word
+	call s:HL('SpellBad',   'none', 'none', 'undercurl', 'blue')
+	" Wrong spelling for selected region
+	call s:HL('SpellLocal', 'none', 'none', 'undercurl', 'aqua')
+	" Rare word
+	call s:HL('SpellRare',  'none', 'none', 'undercurl', 'purple')
+endif
+
+" }}}
+
+" Plugin specific -------------------------------------------------------------
+" EasyMotion: {{{
+
+hi! link EasyMotionTarget Search
+hi! link EasyMotionShade Comment
+
+" }}}
+" Sneak: {{{
+
+hi! link SneakPluginTarget Search
+hi! link SneakStreakTarget Search
+call s:HL('SneakStreakMask', 'yellow', 'yellow')
+hi! link SneakStreakStatusLine Search
+
+" }}}
+" Indent Guides: {{{
+
+let g:indent_guides_auto_colors = 0
+
+if g:gruvbox_invert_indent_guides == 0
+	call s:HL('IndentGuidesOdd', 'bg', 'dark2')
+	call s:HL('IndentGuidesEven', 'bg', 'dark1')
+else
+	call s:HL('IndentGuidesOdd', 'bg', 'dark2', 'inverse')
+	call s:HL('IndentGuidesEven', 'bg', 'dark3', 'inverse')
+endif
+
+" }}}
+" IndentLine: {{{
+
+let g:indentLine_color_term = s:gb.dark2[1]
+let g:indentLine_color_gui = '#' . s:gb.dark2[0]
+
+" }}}
+" Rainbow Parentheses: {{{
+
+if !exists('g:rbpt_colorpairs')
+	let g:rbpt_colorpairs =
+		\ [
+			\ ['blue', '#458588'], ['magenta', '#b16286'],
+			\ ['red',  '#cc241d'], ['166',     '#d65d0e']
+		\ ]
+endif
+
+let g:rainbow_guifgs = [ '#d65d0e', '#cc241d', '#b16286', '#458588' ]
+let g:rainbow_ctermfgs = [ '166', 'red', 'magenta', 'blue' ]
+
+if !exists('g:rainbow_conf')
+   let g:rainbow_conf = {}
+endif
+if !has_key(g:rainbow_conf, 'guifgs')
+   let g:rainbow_conf['guifgs'] = g:rainbow_guifgs
+endif
+if !has_key(g:rainbow_conf, 'ctermfgs')
+   let g:rainbow_conf['ctermfgs'] = g:rainbow_ctermfgs
+endif
+
+let g:niji_dark_colours = g:rbpt_colorpairs
+let g:niji_light_colours = g:rbpt_colorpairs
+
+"}}}
+" GitGutter: {{{
+
+if g:gruvbox_invert_signs == 0
+	call s:HL('GitGutterAdd', 'green', g:gruvbox_sign_column)
+	call s:HL('GitGutterChange', 'aqua', g:gruvbox_sign_column)
+	call s:HL('GitGutterDelete', 'red', g:gruvbox_sign_column)
+	call s:HL('GitGutterChangeDelete', 'aqua', g:gruvbox_sign_column)
+else
+	call s:HL('GitGutterAdd', 'green', g:gruvbox_sign_column, 'inverse')
+	call s:HL('GitGutterChange', 'aqua', g:gruvbox_sign_column, 'inverse')
+	call s:HL('GitGutterDelete', 'red', g:gruvbox_sign_column, 'inverse')
+	call s:HL('GitGutterChangeDelete', 'aqua', g:gruvbox_sign_column, 'inverse')
+endif
+
+" }}}
+" Signify: {{{
+
+if g:gruvbox_invert_signs == 0
+	call s:HL('SignifySignAdd', 'green', g:gruvbox_sign_column)
+	call s:HL('SignifySignChange ', 'aqua', g:gruvbox_sign_column)
+	call s:HL('SignifySignDelete', 'red', g:gruvbox_sign_column)
+else
+	call s:HL('SignifySignAdd', 'green', g:gruvbox_sign_column, 'inverse')
+	call s:HL('SignifySignChange ', 'aqua', g:gruvbox_sign_column, 'inverse')
+	call s:HL('SignifySignDelete', 'red', g:gruvbox_sign_column, 'inverse')
+endif
+
+" }}}
+" Syntastic: {{{
+
+call s:HL('SyntasticError', 'none', 'none', 'undercurl', 'red')
+call s:HL('SyntasticWarning', 'none', 'none', 'undercurl', 'yellow')
+
+if g:gruvbox_invert_signs == 0
+	call s:HL('SyntasticErrorSign', 'red', g:gruvbox_sign_column)
+	call s:HL('SyntasticWarningSign', 'yellow', g:gruvbox_sign_column)
+else
+	call s:HL('SyntasticErrorSign', 'red', g:gruvbox_sign_column, 'inverse')
+	call s:HL('SyntasticWarningSign', 'yellow', g:gruvbox_sign_column, 'inverse')
+endif
+
+" }}}
+" Signature: {{{
+
+if g:gruvbox_invert_signs == 0
+	call s:HL('SignatureMarkerText', 'purple', g:gruvbox_sign_column)
+	call s:HL('SignatureMarkText', 'blue', g:gruvbox_sign_column)
+else
+	call s:HL('SignatureMarkerText', 'purple', g:gruvbox_sign_column, 'inverse')
+	call s:HL('SignatureMarkText', 'blue', g:gruvbox_sign_column, 'inverse')
+endif
+
+let g:SignatureMarkerTextHL='"SignatureMarkerText"'
+let g:SignatureMarkTextHL='"SignatureMarkText"'
+
+" }}}
+" ShowMarks: {{{
+
+if g:gruvbox_invert_signs == 0
+	call s:HL('ShowMarksHLl', 'blue', g:gruvbox_sign_column)
+	call s:HL('ShowMarksHLu', 'blue', g:gruvbox_sign_column)
+	call s:HL('ShowMarksHLo', 'blue', g:gruvbox_sign_column)
+	call s:HL('ShowMarksHLm', 'blue', g:gruvbox_sign_column)
+else
+	call s:HL('ShowMarksHLl', 'blue', g:gruvbox_sign_column, 'inverse')
+	call s:HL('ShowMarksHLu', 'blue', g:gruvbox_sign_column, 'inverse')
+	call s:HL('ShowMarksHLo', 'blue', g:gruvbox_sign_column, 'inverse')
+	call s:HL('ShowMarksHLm', 'blue', g:gruvbox_sign_column, 'inverse')
+endif
+
+" }}}
+" CtrlP: {{{
+
+call s:HL('CtrlPMatch', 'yellow')
+call s:HL('CtrlPNoEntries', 'red')
+call s:HL('CtrlPPrtBase', 'dark2')
+call s:HL('CtrlPPrtCursor', 'blue')
+call s:HL('CtrlPLinePre', 'dark2')
+
+call s:HL('CtrlPMode1', 'blue', 'dark2', 'bold')
+call s:HL('CtrlPMode2', 'dark0', 'blue', 'bold')
+call s:HL('CtrlPStats', 'light4', 'dark2', 'bold')
+
+" }}}
+" Startify: {{{
+
+call s:HL('StartifyBracket', 'light3')
+call s:HL('StartifyFile', 'light0')
+call s:HL('StartifyNumber', 'blue')
+call s:HL('StartifyPath', 'medium')
+call s:HL('StartifySlash', 'medium')
+call s:HL('StartifySection', 'yellow')
+call s:HL('StartifySpecial', 'dark2')
+call s:HL('StartifyHeader', 'orange')
+call s:HL('StartifyFooter', 'dark2')
+
+" }}}
+" Vimshell: {{{
+
+let g:vimshell_escape_colors = map(split(
+	\ 'dark4 red green yellow blue purple aqua light4 ' .
+	\ 'dark0 red green orange blue purple aqua light0'
+	\ ), '"#" . s:gb[v:val][0]')
+
+" }}}
+
+" Filetype specific -----------------------------------------------------------
+" Diff: {{{
+
+call s:HL('diffAdded', 'green')
+call s:HL('diffRemoved', 'red')
+call s:HL('diffChanged', 'aqua')
+
+call s:HL('diffFile', 'orange')
+call s:HL('diffNewFile', 'yellow')
+
+call s:HL('diffLine', 'blue')
+
+" }}}
+" Html: {{{
+
+call s:HL('htmlTag', 'blue')
+call s:HL('htmlEndTag', 'blue')
+
+call s:HL('htmlTagName', 'aqua', 'none', 'bold')
+call s:HL('htmlArg', 'aqua')
+
+call s:HL('htmlScriptTag', 'purple')
+call s:HL('htmlTagN', 'light1')
+call s:HL('htmlSpecialTagName', 'aqua', 'none', 'bold')
+
+call s:HL('htmlLink', 'light4', 'none', 'underline')
+
+call s:HL('htmlSpecialChar', 'orange')
+
+call s:HL('htmlBold', 'fg', 'bg', 'bold')
+call s:HL('htmlBoldUnderline', 'fg', 'bg', 'bold,underline')
+call s:HL('htmlBoldItalic', 'fg', 'bg', 'bold,italic')
+call s:HL('htmlBoldUnderlineItalic', 'fg', 'bg', 'bold,underline,italic')
+
+call s:HL('htmlUnderline', 'fg', 'bg', 'underline')
+call s:HL('htmlUnderlineItalic', 'fg', 'bg', 'underline,italic')
+call s:HL('htmlItalic', 'fg', 'bg', 'italic')
+
+" }}}
+" Xml: {{{
+
+call s:HL('xmlTag', 'blue')
+call s:HL('xmlEndTag', 'blue')
+call s:HL('xmlTagName', 'blue')
+call s:HL('xmlEqual', 'blue')
+call s:HL('docbkKeyword', 'aqua', 'none', 'bold')
+
+call s:HL('xmlDocTypeDecl', 'medium')
+call s:HL('xmlDocTypeKeyword', 'purple')
+call s:HL('xmlCdataStart', 'medium')
+call s:HL('xmlCdataCdata', 'purple')
+call s:HL('dtdFunction', 'medium')
+call s:HL('dtdTagName', 'purple')
+
+call s:HL('xmlAttrib', 'aqua')
+call s:HL('xmlProcessingDelim', 'medium')
+call s:HL('dtdParamEntityPunct', 'medium')
+call s:HL('dtdParamEntityDPunct', 'medium')
+call s:HL('xmlAttribPunct', 'medium')
+
+call s:HL('xmlEntity', 'orange')
+call s:HL('xmlEntityPunct', 'orange')
+" }}}
+" Vim: {{{
+
+if g:gruvbox_italicize_comments == 0
+	call s:HL('vimCommentTitle', 'light4_256', 'none', 'bold')
+else
+	call s:HL('vimCommentTitle', 'light4_256', 'none', 'bold,italic')
+endif
+call s:HL('vimNotation', 'orange')
+call s:HL('vimBracket', 'orange')
+call s:HL('vimMapModKey', 'orange')
+call s:HL('vimFuncSID', 'light3')
+call s:HL('vimSetSep', 'light3')
+call s:HL('vimSep', 'light3')
+call s:HL('vimContinue', 'light3')
+
+" }}}
+" Clojure: {{{
+
+call s:HL('clojureKeyword', 'blue')
+call s:HL('clojureCond', 'orange')
+call s:HL('clojureSpecial', 'orange')
+call s:HL('clojureDefine', 'orange')
+
+call s:HL('clojureFunc', 'yellow')
+call s:HL('clojureRepeat', 'yellow')
+call s:HL('clojureCharacter', 'aqua')
+call s:HL('clojureStringEscape', 'aqua')
+call s:HL('clojureException', 'red')
+
+call s:HL('clojureRegexp', 'aqua')
+call s:HL('clojureRegexpEscape', 'aqua')
+call s:HL('clojureRegexpCharClass', 'light3', 'none', 'bold')
+call s:HL('clojureRegexpMod', 'light3', 'none', 'bold')
+call s:HL('clojureRegexpQuantifier', 'light3', 'none', 'bold')
+
+call s:HL('clojureParen', 'light3')
+call s:HL('clojureAnonArg', 'yellow')
+call s:HL('clojureVariable', 'blue')
+call s:HL('clojureMacro', 'orange')
+
+call s:HL('clojureMeta', 'yellow')
+call s:HL('clojureDeref', 'yellow')
+call s:HL('clojureQuote', 'yellow')
+call s:HL('clojureUnquote', 'yellow')
+
+" }}}
+" C: {{{
+
+call s:HL('cOperator', 'purple')
+call s:HL('cStructure', 'orange')
+
+" }}}
+" Python: {{{
+
+call s:HL('pythonBuiltin', 'orange')
+call s:HL('pythonBuiltinObj', 'orange')
+call s:HL('pythonBuiltinFunc', 'orange')
+call s:HL('pythonFunction', 'aqua')
+call s:HL('pythonDecorator', 'red')
+call s:HL('pythonInclude', 'blue')
+call s:HL('pythonImport', 'blue')
+call s:HL('pythonRun', 'blue')
+call s:HL('pythonCoding', 'blue')
+call s:HL('pythonOperator', 'red')
+call s:HL('pythonExceptions', 'purple')
+call s:HL('pythonBoolean', 'purple')
+call s:HL('pythonDot', 'light3')
+
+" }}}
+" CSS: {{{
+
+call s:HL('cssBraces', 'blue')
+call s:HL('cssFunctionName', 'yellow')
+call s:HL('cssIdentifier', 'orange')
+call s:HL('cssClassName', 'green')
+call s:HL('cssColor', 'blue')
+call s:HL('cssSelectorOp', 'blue')
+call s:HL('cssSelectorOp2', 'blue')
+call s:HL('cssImportant', 'green')
+call s:HL('cssVendor', 'light1')
+
+call s:HL('cssTextProp', 'aqua')
+call s:HL('cssAnimationProp', 'aqua')
+call s:HL('cssUIProp', 'yellow')
+call s:HL('cssTransformProp', 'aqua')
+call s:HL('cssTransitionProp', 'aqua')
+call s:HL('cssPrintProp', 'aqua')
+call s:HL('cssPositioningProp', 'yellow')
+call s:HL('cssBoxProp', 'aqua')
+call s:HL('cssFontDescriptorProp', 'aqua')
+call s:HL('cssFlexibleBoxProp', 'aqua')
+call s:HL('cssBorderOutlineProp', 'aqua')
+call s:HL('cssBackgroundProp', 'aqua')
+call s:HL('cssMarginProp', 'aqua')
+call s:HL('cssListProp', 'aqua')
+call s:HL('cssTableProp', 'aqua')
+call s:HL('cssFontProp', 'aqua')
+call s:HL('cssPaddingProp', 'aqua')
+call s:HL('cssDimensionProp', 'aqua')
+call s:HL('cssRenderProp', 'aqua')
+call s:HL('cssColorProp', 'aqua')
+call s:HL('cssGeneratedContentProp', 'aqua')
+
+" }}}
+" JavaScript: {{{
+
+call s:HL('javaScriptBraces', 'orange')
+call s:HL('javaScriptFunction', 'aqua')
+call s:HL('javaScriptIdentifier', 'red')
+call s:HL('javaScriptMember', 'blue')
+call s:HL('javaScriptNumber', 'purple')
+call s:HL('javaScriptNull', 'purple')
+call s:HL('javaScriptParens', 'light3')
+
+" }}}
+" CoffeeScript: {{{
+
+call s:HL('coffeeExtendedOp', 'light3')
+call s:HL('coffeeSpecialOp', 'light3')
+call s:HL('coffeeCurly', 'orange')
+call s:HL('coffeeParen', 'light3')
+call s:HL('coffeeBracket', 'orange')
+
+" }}}
+" Ruby: {{{
+
+call s:HL('rubyStringDelimiter', 'green')
+call s:HL('rubyInterpolationDelimiter', 'aqua')
+
+" }}}
+" ObjectiveC: {{{
+
+call s:HL('objcTypeModifier', 'red')
+call s:HL('objcDirective', 'blue')
+
+" }}}
+" Go: {{{
+
+call s:HL('goDirective', 'aqua')
+call s:HL('goConstants', 'purple')
+call s:HL('goDeclaration', 'red')
+call s:HL('goDeclType', 'blue')
+call s:HL('goBuiltins', 'orange')
+
+" }}}
+" Lua: {{{
+
+call s:HL('luaIn', 'red')
+call s:HL('luaFunction', 'aqua')
+call s:HL('luaTable', 'orange')
+
+" }}}
+" MoonScript: {{{
+
+call s:HL('moonSpecialOp', 'light3')
+call s:HL('moonExtendedOp', 'light3')
+call s:HL('moonFunction', 'light3')
+call s:HL('moonObject', 'yellow')
+
+" }}}
+" Java: {{{
+
+call s:HL('javaAnnotation', 'blue')
+call s:HL('javaDocTags', 'aqua')
+hi! link javaCommentTitle vimCommentTitle
+call s:HL('javaParen', 'light3')
+call s:HL('javaParen1', 'light3')
+call s:HL('javaParen2', 'light3')
+call s:HL('javaParen3', 'light3')
+call s:HL('javaParen4', 'light3')
+call s:HL('javaParen5', 'light3')
+call s:HL('javaOperator', 'orange')
+
+call s:HL('javaVarArg', 'green')
+
+" }}}
+" Elixir: {{{
+
+hi! link elixirDocString Comment
+
+call s:HL('elixirStringDelimiter', 'green')
+call s:HL('elixirInterpolationDelimiter', 'aqua')
+
+" }}}
+" Scala: {{{
+
+" NB: scala vim syntax file is kinda horrible
+call s:HL('scalaNameDefinition', 'light1')
+call s:HL('scalaCaseFollowing', 'light1')
+call s:HL('scalaCapitalWord', 'light1')
+call s:HL('scalaTypeExtension', 'light1')
+
+call s:HL('scalaKeyword', 'red')
+call s:HL('scalaKeywordModifier', 'red')
+
+call s:HL('scalaSpecial', 'aqua')
+call s:HL('scalaOperator', 'light1')
+
+call s:HL('scalaTypeDeclaration', 'yellow')
+call s:HL('scalaTypeTypePostDeclaration', 'yellow')
+
+call s:HL('scalaInstanceDeclaration', 'light1')
+call s:HL('scalaInterpolation', 'aqua')
+
+" }}}
+
+" Functions -------------------------------------------------------------------
+" Search Highlighting Cursor {{{
+
+function! GruvboxHlsShowCursor()
+	call s:HL('Cursor', 'dark0', g:gruvbox_hls_cursor)
+	call s:HL('vCursor', 'dark0', g:gruvbox_hls_cursor)
+	call s:HL('iCursor', 'dark0', g:gruvbox_hls_cursor)
+	call s:HL('lCursor', 'dark0', g:gruvbox_hls_cursor)
+endfunction
+
+function! GruvboxHlsHideCursor()
+	call s:HL('Cursor', 'none', 'none', 'inverse')
+	call s:HL('vCursor', 'none', 'none', 'inverse')
+	call s:HL('iCursor', 'none', 'none', 'inverse')
+	call s:HL('lCursor', 'none', 'none', 'inverse')
+endfunction
+
+" }}}
+
+" vim: set sw=3 ts=3 sts=3 noet tw=80 ft=vim fdm=marker:
diff --git a/.vim/colors/hybrid.vim b/.vim/colors/hybrid.vim
deleted file mode 100644
index 166907ba..00000000
--- a/.vim/colors/hybrid.vim
+++ /dev/null
@@ -1,441 +0,0 @@
-" File:       hybrid.vim
-" Maintainer: Andrew Wong (w0ng)
-" URL:        https://github.com/w0ng/vim-hybrid
-" Modified:   27 Jan 2013 07:33 AM AEST
-" License:    MIT
-
-" Description:"{{{
-" ----------------------------------------------------------------------------
-" The RGB colour palette is taken from Tomorrow-Night.vim:
-" https://github.com/chriskempson/vim-tomorrow-theme
-"
-" The syntax highlighting scheme is taken from jellybeans.vim:
-" https://github.com/nanotech/jellybeans.vim
-"
-" The code taken from solarized.vim
-" https://github.com/altercation/vim-colors-solarized
-
-"}}}
-" Requirements And Recommendations:"{{{
-" ----------------------------------------------------------------------------
-" This colourscheme is intended for use on:
-"   - gVim 7.3 for Linux, Mac and Windows.
-"   - Vim 7.3 for Linux, using a 256 colour enabled terminal.
-"
-" By default, Vim will use the closest matching cterm equivalent of the RGB
-" colours.
-"
-" However, Due to the limited 256 palette, colours in Vim and gVim will still
-" be noticeably different. In order to get a uniform appearance and the way
-" that this colourscheme was intended, it is HIGHLY recommended that you:
-"
-" 1.  Add these colours to ~/.Xresources:
-"
-"       https://gist.github.com/3278077
-"
-" 2.  Use Xresources colours by setting in ~/.vimrc:
-"
-"       let g:hybrid_use_Xresources = 1
-"       colorscheme hybrid
-"
-" For iTerm2 users:
-" 1.  Install this color preset on your iTerm2:
-"
-"       https://gist.github.com/luan/6362811
-"
-" 2. Use iTerm colours by setting in ~/.vimrc:
-"
-"       let g:hybrid_use_iTerm_colors = 1
-"       colorscheme hybrid
-"
-
-"}}}
-" Initialisation:"{{{
-" ----------------------------------------------------------------------------
-if !has("gui_running") && &t_Co < 256
-  finish
-endif
-
-if !exists("g:hybrid_use_Xresources")
-  let g:hybrid_use_Xresources = 0
-endif
-
-if !exists("g:hybrid_use_iTerm_colors")
-  let g:hybrid_use_iTerm_colors = 0
-endif
-
-set background=dark
-hi clear
-
-if exists("syntax_on")
-  syntax reset
-endif
-
-let colors_name = "hybrid"
-
-"}}}
-" GUI And Cterm Palettes:"{{{
-" ----------------------------------------------------------------------------
-if has("gui_running")
-  let s:vmode      = "gui"
-  let s:background = "#1d1f21"
-  let s:foreground = "#c5c8c6"
-  let s:selection  = "#373b41"
-  let s:line       = "#282a2e"
-  let s:comment    = "#707880"
-  let s:red        = "#cc6666"
-  let s:orange     = "#de935f"
-  let s:yellow     = "#f0c674"
-  let s:green      = "#b5bd68"
-  let s:aqua       = "#8abeb7"
-  let s:blue       = "#81a2be"
-  let s:purple     = "#b294bb"
-  let s:window     = "#303030"
-  let s:darkcolumn = "#1c1c1c"
-  let s:addbg      = "#5F875F"
-  let s:addfg      = "#d7ffaf"
-  let s:changebg   = "#5F5F87"
-  let s:changefg   = "#d7d7ff"
-  let s:darkblue   = "#00005f"
-  let s:darkcyan   = "#005f5f"
-  let s:darkred    = "#5f0000"
-  let s:darkpurple = "#5f005f"
-else
-  let s:vmode      = "cterm"
-  let s:background = "234"
-  let s:window     = "236"
-  let s:darkcolumn = "234"
-  let s:addbg      = "65"
-  let s:addfg      = "193"
-  let s:changebg   = "60"
-  let s:changefg   = "189"
-  let s:darkblue   = "17"
-  let s:darkcyan   = "24"
-  let s:darkred    = "52"
-  let s:darkpurple = "53"
-  if g:hybrid_use_Xresources == 1
-    let s:foreground = "15"   " White
-    let s:selection  = "8"    " DarkGrey
-    let s:line       = "0"    " Black
-    let s:comment    = "7"    " LightGrey
-    let s:red        = "9"    " LightRed
-    let s:orange     = "3"    " DarkYellow
-    let s:yellow     = "11"   " LightYellow
-    let s:green      = "10"   " LightGreen
-    let s:aqua       = "14"   " LightCyan
-    let s:blue       = "12"   " LightBlue
-    let s:purple     = "13"   " LightMagenta
-  elseif g:hybrid_use_iTerm_colors == 1
-    let s:background = "NONE"
-    let s:foreground = "7"
-    let s:selection  = "0"
-    let s:line       = "0"
-    let s:comment    = "15"
-    let s:red        = "1"
-    let s:orange     = "11"
-    let s:yellow     = "3"
-    let s:green      = "2"
-    let s:aqua       = "6"
-    let s:blue       = "4"
-    let s:purple     = "5"
-  else
-    let s:foreground = "250"
-    let s:selection  = "237"
-    let s:line       = "235"
-    let s:comment    = "243"
-    let s:red        = "167"
-    let s:orange     = "173"
-    let s:yellow     = "221"
-    let s:green      = "143"
-    let s:aqua       = "109"
-    let s:blue       = "110"
-    let s:purple     = "139"
-  endif
-endif
-
-"}}}
-" Formatting Options:"{{{
-" ----------------------------------------------------------------------------
-let s:none   = "NONE"
-let s:t_none = "NONE"
-let s:n      = "NONE"
-let s:c      = ",undercurl"
-let s:r      = ",reverse"
-let s:s      = ",standout"
-let s:b      = ",bold"
-let s:u      = ",underline"
-let s:i      = ",italic"
-
-"}}}
-" Highlighting Primitives:"{{{
-" ----------------------------------------------------------------------------
-exe "let s:bg_none       = ' ".s:vmode."bg=".s:none      ."'"
-exe "let s:bg_foreground = ' ".s:vmode."bg=".s:foreground."'"
-exe "let s:bg_background = ' ".s:vmode."bg=".s:background."'"
-exe "let s:bg_selection  = ' ".s:vmode."bg=".s:selection ."'"
-exe "let s:bg_line       = ' ".s:vmode."bg=".s:line      ."'"
-exe "let s:bg_comment    = ' ".s:vmode."bg=".s:comment   ."'"
-exe "let s:bg_red        = ' ".s:vmode."bg=".s:red       ."'"
-exe "let s:bg_orange     = ' ".s:vmode."bg=".s:orange    ."'"
-exe "let s:bg_yellow     = ' ".s:vmode."bg=".s:yellow    ."'"
-exe "let s:bg_green      = ' ".s:vmode."bg=".s:green     ."'"
-exe "let s:bg_aqua       = ' ".s:vmode."bg=".s:aqua      ."'"
-exe "let s:bg_blue       = ' ".s:vmode."bg=".s:blue      ."'"
-exe "let s:bg_purple     = ' ".s:vmode."bg=".s:purple    ."'"
-exe "let s:bg_window     = ' ".s:vmode."bg=".s:window    ."'"
-exe "let s:bg_darkcolumn = ' ".s:vmode."bg=".s:darkcolumn."'"
-exe "let s:bg_addbg      = ' ".s:vmode."bg=".s:addbg     ."'"
-exe "let s:bg_addfg      = ' ".s:vmode."bg=".s:addfg     ."'"
-exe "let s:bg_changebg   = ' ".s:vmode."bg=".s:changebg  ."'"
-exe "let s:bg_changefg   = ' ".s:vmode."bg=".s:changefg  ."'"
-exe "let s:bg_darkblue   = ' ".s:vmode."bg=".s:darkblue  ."'"
-exe "let s:bg_darkcyan   = ' ".s:vmode."bg=".s:darkcyan  ."'"
-exe "let s:bg_darkred    = ' ".s:vmode."bg=".s:darkred   ."'"
-exe "let s:bg_darkpurple = ' ".s:vmode."bg=".s:darkpurple."'"
-
-exe "let s:fg_none       = ' ".s:vmode."fg=".s:none      ."'"
-exe "let s:fg_foreground = ' ".s:vmode."fg=".s:foreground."'"
-exe "let s:fg_background = ' ".s:vmode."fg=".s:background."'"
-exe "let s:fg_selection  = ' ".s:vmode."fg=".s:selection ."'"
-exe "let s:fg_line       = ' ".s:vmode."fg=".s:line      ."'"
-exe "let s:fg_comment    = ' ".s:vmode."fg=".s:comment   ."'"
-exe "let s:fg_red        = ' ".s:vmode."fg=".s:red       ."'"
-exe "let s:fg_orange     = ' ".s:vmode."fg=".s:orange    ."'"
-exe "let s:fg_yellow     = ' ".s:vmode."fg=".s:yellow    ."'"
-exe "let s:fg_green      = ' ".s:vmode."fg=".s:green     ."'"
-exe "let s:fg_aqua       = ' ".s:vmode."fg=".s:aqua      ."'"
-exe "let s:fg_blue       = ' ".s:vmode."fg=".s:blue      ."'"
-exe "let s:fg_purple     = ' ".s:vmode."fg=".s:purple    ."'"
-exe "let s:fg_window     = ' ".s:vmode."fg=".s:window    ."'"
-exe "let s:fg_darkcolumn = ' ".s:vmode."fg=".s:darkcolumn."'"
-exe "let s:fg_addbg      = ' ".s:vmode."fg=".s:addbg     ."'"
-exe "let s:fg_addfg      = ' ".s:vmode."fg=".s:addfg     ."'"
-exe "let s:fg_changebg   = ' ".s:vmode."fg=".s:changebg  ."'"
-exe "let s:fg_changefg   = ' ".s:vmode."fg=".s:changefg  ."'"
-exe "let s:fg_darkblue   = ' ".s:vmode."fg=".s:darkblue  ."'"
-exe "let s:fg_darkcyan   = ' ".s:vmode."fg=".s:darkcyan  ."'"
-exe "let s:fg_darkred    = ' ".s:vmode."fg=".s:darkred   ."'"
-exe "let s:fg_darkpurple = ' ".s:vmode."fg=".s:darkpurple."'"
-
-exe "let s:fmt_none      = ' ".s:vmode."=NONE".          " term=NONE"        ."'"
-exe "let s:fmt_bold      = ' ".s:vmode."=NONE".s:b.      " term=NONE".s:b    ."'"
-exe "let s:fmt_bldi      = ' ".s:vmode."=NONE".s:b.      " term=NONE".s:b    ."'"
-exe "let s:fmt_undr      = ' ".s:vmode."=NONE".s:u.      " term=NONE".s:u    ."'"
-exe "let s:fmt_undb      = ' ".s:vmode."=NONE".s:u.s:b.  " term=NONE".s:u.s:b."'"
-exe "let s:fmt_undi      = ' ".s:vmode."=NONE".s:u.      " term=NONE".s:u    ."'"
-exe "let s:fmt_curl      = ' ".s:vmode."=NONE".s:c.      " term=NONE".s:c    ."'"
-exe "let s:fmt_ital      = ' ".s:vmode."=NONE".s:i.      " term=NONE".s:i    ."'"
-exe "let s:fmt_stnd      = ' ".s:vmode."=NONE".s:s.      " term=NONE".s:s    ."'"
-exe "let s:fmt_revr      = ' ".s:vmode."=NONE".s:r.      " term=NONE".s:r    ."'"
-exe "let s:fmt_revb      = ' ".s:vmode."=NONE".s:r.s:b.  " term=NONE".s:r.s:b."'"
-
-if has("gui_running")
-  exe "let s:sp_none       = ' guisp=".s:none      ."'"
-  exe "let s:sp_foreground = ' guisp=".s:foreground."'"
-  exe "let s:sp_background = ' guisp=".s:background."'"
-  exe "let s:sp_selection  = ' guisp=".s:selection ."'"
-  exe "let s:sp_line       = ' guisp=".s:line      ."'"
-  exe "let s:sp_comment    = ' guisp=".s:comment   ."'"
-  exe "let s:sp_red        = ' guisp=".s:red       ."'"
-  exe "let s:sp_orange     = ' guisp=".s:orange    ."'"
-  exe "let s:sp_yellow     = ' guisp=".s:yellow    ."'"
-  exe "let s:sp_green      = ' guisp=".s:green     ."'"
-  exe "let s:sp_aqua       = ' guisp=".s:aqua      ."'"
-  exe "let s:sp_blue       = ' guisp=".s:blue      ."'"
-  exe "let s:sp_purple     = ' guisp=".s:purple    ."'"
-  exe "let s:sp_window     = ' guisp=".s:window    ."'"
-  exe "let s:sp_addbg      = ' guisp=".s:addbg     ."'"
-  exe "let s:sp_addfg      = ' guisp=".s:addfg     ."'"
-  exe "let s:sp_changebg   = ' guisp=".s:changebg  ."'"
-  exe "let s:sp_changefg   = ' guisp=".s:changefg  ."'"
-  exe "let s:sp_darkblue   = ' guisp=".s:darkblue  ."'"
-  exe "let s:sp_darkcyan   = ' guisp=".s:darkcyan  ."'"
-  exe "let s:sp_darkred    = ' guisp=".s:darkred   ."'"
-  exe "let s:sp_darkpurple = ' guisp=".s:darkpurple."'"
-else
-  let s:sp_none       = ""
-  let s:sp_foreground = ""
-  let s:sp_background = ""
-  let s:sp_selection  = ""
-  let s:sp_line       = ""
-  let s:sp_comment    = ""
-  let s:sp_red        = ""
-  let s:sp_orange     = ""
-  let s:sp_yellow     = ""
-  let s:sp_green      = ""
-  let s:sp_aqua       = ""
-  let s:sp_blue       = ""
-  let s:sp_purple     = ""
-  let s:sp_window     = ""
-  let s:sp_addbg      = ""
-  let s:sp_addfg      = ""
-  let s:sp_changebg   = ""
-  let s:sp_changefg   = ""
-  let s:sp_darkblue   = ""
-  let s:sp_darkcyan   = ""
-  let s:sp_darkred    = ""
-  let s:sp_darkpurple = ""
-endif
-
-"}}}
-" Vim Highlighting: (see :help highlight-groups)"{{{
-" ----------------------------------------------------------------------------
-exe "hi! ColorColumn"   .s:fg_none        .s:bg_line        .s:fmt_none
-"		Conceal"
-"		Cursor"
-"		CursorIM"
-exe "hi! CursorColumn"  .s:fg_none        .s:bg_line        .s:fmt_none
-exe "hi! CursorLine"    .s:fg_none        .s:bg_line        .s:fmt_none
-exe "hi! Directory"     .s:fg_blue        .s:bg_none        .s:fmt_none
-exe "hi! DiffAdd"       .s:fg_addfg       .s:bg_addbg       .s:fmt_none
-exe "hi! DiffChange"    .s:fg_changefg    .s:bg_changebg    .s:fmt_none
-exe "hi! DiffDelete"    .s:fg_background  .s:bg_red         .s:fmt_none
-exe "hi! DiffText"      .s:fg_background  .s:bg_blue        .s:fmt_none
-exe "hi! ErrorMsg"      .s:fg_background  .s:bg_red         .s:fmt_stnd
-exe "hi! VertSplit"     .s:fg_window      .s:bg_none        .s:fmt_none
-exe "hi! Folded"        .s:fg_comment     .s:bg_darkcolumn  .s:fmt_none
-exe "hi! FoldColumn"    .s:fg_none        .s:bg_darkcolumn  .s:fmt_none
-exe "hi! SignColumn"    .s:fg_none        .s:bg_darkcolumn  .s:fmt_none
-"		Incsearch"
-exe "hi! LineNr"        .s:fg_selection   .s:bg_none        .s:fmt_none
-exe "hi! CursorLineNr"  .s:fg_yellow      .s:bg_none        .s:fmt_bold
-exe "hi! MatchParen"    .s:fg_background  .s:bg_changebg    .s:fmt_none
-exe "hi! ModeMsg"       .s:fg_green       .s:bg_none        .s:fmt_none
-exe "hi! MoreMsg"       .s:fg_green       .s:bg_none        .s:fmt_none
-exe "hi! NonText"       .s:fg_selection   .s:bg_none        .s:fmt_none
-exe "hi! Pmenu"         .s:fg_foreground  .s:bg_selection   .s:fmt_none
-exe "hi! PmenuSel"      .s:fg_foreground  .s:bg_selection   .s:fmt_revr
-"		PmenuSbar"
-"		PmenuThumb"
-exe "hi! Question"      .s:fg_green       .s:bg_none        .s:fmt_none
-exe "hi! Search"        .s:fg_background  .s:bg_yellow      .s:fmt_none
-exe "hi! SpecialKey"    .s:fg_selection   .s:bg_none        .s:fmt_none
-exe "hi! SpellCap"      .s:fg_blue        .s:bg_darkblue    .s:fmt_undr
-exe "hi! SpellLocal"    .s:fg_aqua        .s:bg_darkcyan    .s:fmt_undr
-exe "hi! SpellBad"      .s:fg_red         .s:bg_darkred     .s:fmt_undr
-exe "hi! SpellRare"     .s:fg_purple      .s:bg_darkpurple  .s:fmt_undr
-exe "hi! StatusLine"    .s:fg_comment     .s:bg_background  .s:fmt_revr
-exe "hi! StatusLineNC"  .s:fg_window      .s:bg_comment     .s:fmt_revr
-exe "hi! TabLine"       .s:fg_foreground  .s:bg_darkcolumn  .s:fmt_revr
-"		TabLineFill"
-"		TabLineSel"
-exe "hi! Title"         .s:fg_yellow      .s:bg_none        .s:fmt_none
-exe "hi! Visual"        .s:fg_none        .s:bg_selection   .s:fmt_none
-"		VisualNos"
-exe "hi! WarningMsg"    .s:fg_red         .s:bg_none        .s:fmt_none
-"		WildMenu"
-
-" Use Xresources for background colour
-if has('gui_running') || (g:hybrid_use_Xresources != 1 && g:hybrid_use_iTerm_colors != 1)
-  exe "hi! Normal"        .s:fg_foreground  .s:bg_background  .s:fmt_none
-else
-  exe "hi! Normal"        .s:fg_foreground  .s:bg_none        .s:fmt_none
-endif
-
-"}}}
-" Generic Syntax Highlighting: (see :help group-name)"{{{
-" ----------------------------------------------------------------------------
-exe "hi! Comment"         .s:fg_comment     .s:bg_none        .s:fmt_none
-
-exe "hi! Constant"        .s:fg_red         .s:bg_none        .s:fmt_none
-exe "hi! String"          .s:fg_green       .s:bg_none        .s:fmt_none
-"		Character"
-"		Number"
-"		Boolean"
-"		Float"
-
-exe "hi! Identifier"      .s:fg_purple      .s:bg_none        .s:fmt_none
-exe "hi! Function"        .s:fg_yellow      .s:bg_none        .s:fmt_none
-
-exe "hi! Statement"       .s:fg_blue        .s:bg_none        .s:fmt_none
-"		Conditional"
-"		Repeat"
-"		Label"
-exe "hi! Operator"        .s:fg_aqua        .s:bg_none        .s:fmt_none
-"		Keyword"
-"		Exception"
-
-exe "hi! PreProc"         .s:fg_aqua        .s:bg_none        .s:fmt_none
-"		Include"
-"		Define"
-"		Macro"
-"		PreCondit"
-
-exe "hi! Type"            .s:fg_orange      .s:bg_none        .s:fmt_none
-"		StorageClass"
-exe "hi! Structure"       .s:fg_aqua        .s:bg_none        .s:fmt_none
-"		Typedef"
-
-exe "hi! Special"         .s:fg_green       .s:bg_none        .s:fmt_none
-"		SpecialChar"
-"		Tag"
-"		Delimiter"
-"		SpecialComment"
-"		Debug"
-"
-exe "hi! Underlined"      .s:fg_blue        .s:bg_none        .s:fmt_none
-
-exe "hi! Ignore"          .s:fg_none        .s:bg_none        .s:fmt_none
-
-exe "hi! Error"           .s:fg_red         .s:bg_darkred     .s:fmt_undr
-
-exe "hi! Todo"            .s:fg_addfg       .s:bg_none        .s:fmt_none
-
-" Quickfix window highlighting
-exe "hi! qfLineNr"        .s:fg_yellow      .s:bg_none        .s:fmt_none
-"   qfFileName"
-"   qfLineNr"
-"   qfError"
-
-"}}}
-" Diff Syntax Highlighting:"{{{
-" ----------------------------------------------------------------------------
-" Diff
-"		diffOldFile
-"		diffNewFile
-"		diffFile
-"		diffOnly
-"		diffIdentical
-"		diffDiffer
-"		diffBDiffer
-"		diffIsA
-"		diffNoEOL
-"		diffCommon
-hi! link diffRemoved Constant
-"		diffChanged
-hi! link diffAdded Special
-"		diffLine
-"		diffSubname
-"		diffComment
-
-"}}}
-" Legal:"{{{
-" ----------------------------------------------------------------------------
-" Copyright (c) 2011 Ethan Schoonover
-" Copyright (c) 2009-2012 NanoTech
-" Copyright (c) 2012 w0ng
-"
-" Permission is hereby granted, free of charge, to any per‐
-" son obtaining a copy of this software and associated doc‐
-" umentation files (the “Software”), to deal in the Soft‐
-" ware without restriction, including without limitation
-" the rights to use, copy, modify, merge, publish, distrib‐
-" ute, 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 PARTICU‐
-" LAR 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 CON‐
-" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐
-" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-
-" }}}