Updated with base16-builder

21 files changed, 3395 insertions, 250 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
new file mode 100644
index 0000000..7722024
--- /dev/null
+++ b/colors/base16-3024.vim
@@ -0,0 +1,285 @@
+" Base16 3024 (https://github.com/chriskempson/base16)
+" Scheme: Jan T. Sott (http://github.com/idleberg)
+
+" GUI color definitions
+let s:gui00 = "090300"
+let s:gui01 = "3a3432"
+let s:gui02 = "4a4543"
+let s:gui03 = "5c5855"
+let s:gui04 = "807d7c"
+let s:gui05 = "a5a2a2"
+let s:gui06 = "d6d5d4"
+let s:gui07 = "f7f7f7"
+let s:gui08 = "db2d20"
+let s:gui09 = "e8bbd0"
+let s:gui0A = "fded02"
+let s:gui0B = "01a252"
+let s:gui0C = "b5e4f4"
+let s:gui0D = "01a0e4"
+let s:gui0E = "a16a94"
+let s:gui0F = "cdab53"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-3024"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-atelierdune.vim b/colors/base16-atelierdune.vim
new file mode 100644
index 0000000..ec61d89
--- /dev/null
+++ b/colors/base16-atelierdune.vim
@@ -0,0 +1,285 @@
+" Base16 Atelier Dune (https://github.com/chriskempson/base16)
+" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)
+
+" GUI color definitions
+let s:gui00 = "20201d"
+let s:gui01 = "292824"
+let s:gui02 = "6e6b5e"
+let s:gui03 = "7d7a68"
+let s:gui04 = "999580"
+let s:gui05 = "a6a28c"
+let s:gui06 = "e8e4cf"
+let s:gui07 = "fefbec"
+let s:gui08 = "d73737"
+let s:gui09 = "b65611"
+let s:gui0A = "cfb017"
+let s:gui0B = "60ac39"
+let s:gui0C = "1fad83"
+let s:gui0D = "6684e1"
+let s:gui0E = "b854d4"
+let s:gui0F = "d43552"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-atelierdune"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-atelierforest.vim b/colors/base16-atelierforest.vim
new file mode 100644
index 0000000..f10805d
--- /dev/null
+++ b/colors/base16-atelierforest.vim
@@ -0,0 +1,285 @@
+" Base16 Atelier Forest (https://github.com/chriskempson/base16)
+" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest)
+
+" GUI color definitions
+let s:gui00 = "1b1918"
+let s:gui01 = "2c2421"
+let s:gui02 = "68615e"
+let s:gui03 = "766e6b"
+let s:gui04 = "9c9491"
+let s:gui05 = "a8a19f"
+let s:gui06 = "e6e2e0"
+let s:gui07 = "f1efee"
+let s:gui08 = "f22c40"
+let s:gui09 = "df5320"
+let s:gui0A = "d5911a"
+let s:gui0B = "5ab738"
+let s:gui0C = "00ad9c"
+let s:gui0D = "407ee7"
+let s:gui0E = "6666ea"
+let s:gui0F = "c33ff3"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-atelierforest"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-atelierheath.vim b/colors/base16-atelierheath.vim
new file mode 100644
index 0000000..9d9e370
--- /dev/null
+++ b/colors/base16-atelierheath.vim
@@ -0,0 +1,285 @@
+" Base16 Atelier Heath (https://github.com/chriskempson/base16)
+" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath)
+
+" GUI color definitions
+let s:gui00 = "1b181b"
+let s:gui01 = "292329"
+let s:gui02 = "695d69"
+let s:gui03 = "776977"
+let s:gui04 = "9e8f9e"
+let s:gui05 = "ab9bab"
+let s:gui06 = "d8cad8"
+let s:gui07 = "f7f3f7"
+let s:gui08 = "ca402b"
+let s:gui09 = "a65926"
+let s:gui0A = "bb8a35"
+let s:gui0B = "379a37"
+let s:gui0C = "159393"
+let s:gui0D = "516aec"
+let s:gui0E = "7b59c0"
+let s:gui0F = "cc33cc"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-atelierheath"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-atelierlakeside.vim b/colors/base16-atelierlakeside.vim
new file mode 100644
index 0000000..7774896
--- /dev/null
+++ b/colors/base16-atelierlakeside.vim
@@ -0,0 +1,285 @@
+" Base16 Atelier Lakeside (https://github.com/chriskempson/base16)
+" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/)
+
+" GUI color definitions
+let s:gui00 = "161b1d"
+let s:gui01 = "1f292e"
+let s:gui02 = "516d7b"
+let s:gui03 = "5a7b8c"
+let s:gui04 = "7195a8"
+let s:gui05 = "7ea2b4"
+let s:gui06 = "c1e4f6"
+let s:gui07 = "ebf8ff"
+let s:gui08 = "d22d72"
+let s:gui09 = "935c25"
+let s:gui0A = "8a8a0f"
+let s:gui0B = "568c3b"
+let s:gui0C = "2d8f6f"
+let s:gui0D = "257fad"
+let s:gui0E = "5d5db1"
+let s:gui0F = "b72dd2"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-atelierlakeside"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-atelierseaside.vim b/colors/base16-atelierseaside.vim
new file mode 100644
index 0000000..7841ed4
--- /dev/null
+++ b/colors/base16-atelierseaside.vim
@@ -0,0 +1,285 @@
+" Base16 Atelier Seaside (https://github.com/chriskempson/base16)
+" Scheme: Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/)
+
+" GUI color definitions
+let s:gui00 = "131513"
+let s:gui01 = "242924"
+let s:gui02 = "5e6e5e"
+let s:gui03 = "687d68"
+let s:gui04 = "809980"
+let s:gui05 = "8ca68c"
+let s:gui06 = "cfe8cf"
+let s:gui07 = "f0fff0"
+let s:gui08 = "e6193c"
+let s:gui09 = "87711d"
+let s:gui0A = "c3c322"
+let s:gui0B = "29a329"
+let s:gui0C = "1999b3"
+let s:gui0D = "3d62f5"
+let s:gui0E = "ad2bee"
+let s:gui0F = "e619c3"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-atelierseaside"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index 2f6ff7a..5639d22 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -20,16 +20,16 @@ let s:gui0E = "e1a3ee"
 let s:gui0F = "deaf8f"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-default.vim b/colors/base16-default.vim
index a2a5485..cc78a6d 100644
--- a/colors/base16-default.vim
+++ b/colors/base16-default.vim
@@ -20,16 +20,16 @@ let s:gui0E = "aa759f"
 let s:gui0F = "8f5536"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index c5620d5..8fcb1fe 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -20,16 +20,16 @@ let s:gui0E = "cc99cc"
 let s:gui0F = "d27b53"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
new file mode 100644
index 0000000..f1f7b09
--- /dev/null
+++ b/colors/base16-flat.vim
@@ -0,0 +1,285 @@
+" Base16 Flat (https://github.com/chriskempson/base16)
+" Scheme: Chris Kempson (http://chriskempson.com)
+
+" GUI color definitions
+let s:gui00 = "2C3E50"
+let s:gui01 = "34495E"
+let s:gui02 = "7F8C8D"
+let s:gui03 = "95A5A6"
+let s:gui04 = "BDC3C7"
+let s:gui05 = "e0e0e0"
+let s:gui06 = "f5f5f5"
+let s:gui07 = "ECF0F1"
+let s:gui08 = "E74C3C"
+let s:gui09 = "E67E22"
+let s:gui0A = "F1C40F"
+let s:gui0B = "2ECC71"
+let s:gui0C = "1ABC9C"
+let s:gui0D = "3498DB"
+let s:gui0E = "9B59B6"
+let s:gui0F = "be643c"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-flat"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-grayscale.vim b/colors/base16-grayscale.vim
new file mode 100644
index 0000000..10e52b8
--- /dev/null
+++ b/colors/base16-grayscale.vim
@@ -0,0 +1,285 @@
+" Base16 Grayscale (https://github.com/chriskempson/base16)
+" Scheme: Alexandre Gavioli (https://github.com/Alexx2/)
+
+" GUI color definitions
+let s:gui00 = "101010"
+let s:gui01 = "252525"
+let s:gui02 = "464646"
+let s:gui03 = "525252"
+let s:gui04 = "ababab"
+let s:gui05 = "b9b9b9"
+let s:gui06 = "e3e3e3"
+let s:gui07 = "f7f7f7"
+let s:gui08 = "7c7c7c"
+let s:gui09 = "999999"
+let s:gui0A = "a0a0a0"
+let s:gui0B = "8e8e8e"
+let s:gui0C = "868686"
+let s:gui0D = "686868"
+let s:gui0E = "747474"
+let s:gui0F = "5e5e5e"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-grayscale"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index f458ed5..f633e92 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -20,16 +20,16 @@ let s:gui0E = "00bb00"
 let s:gui0F = "005500"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
new file mode 100644
index 0000000..b09fe10
--- /dev/null
+++ b/colors/base16-marrakesh.vim
@@ -0,0 +1,285 @@
+" Base16 Marrakesh (https://github.com/chriskempson/base16)
+" Scheme: Alexandre Gavioli (http://github.com/Alexx2/)
+
+" GUI color definitions
+let s:gui00 = "201602"
+let s:gui01 = "302e00"
+let s:gui02 = "5f5b17"
+let s:gui03 = "6c6823"
+let s:gui04 = "86813b"
+let s:gui05 = "948e48"
+let s:gui06 = "ccc37a"
+let s:gui07 = "faf0a5"
+let s:gui08 = "c35359"
+let s:gui09 = "b36144"
+let s:gui0A = "a88339"
+let s:gui0B = "18974e"
+let s:gui0C = "75a738"
+let s:gui0D = "477ca1"
+let s:gui0E = "8868b3"
+let s:gui0F = "b3588e"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-marrakesh"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index d4f7d2e..bae7f76 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -20,16 +20,16 @@ let s:gui0E = "a89bb9"
 let s:gui0F = "bb9584"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index af594ad..a69c41f 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -20,16 +20,16 @@ let s:gui0E = "ae81ff"
 let s:gui0F = "cc6633"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index d38f266..a51942e 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b48ead"
 let s:gui0F = "ab7967"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 83b85e0..a92f004 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b6b3eb"
 let s:gui0F = "bc9458"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
new file mode 100644
index 0000000..6220367
--- /dev/null
+++ b/colors/base16-shapeshifter.vim
@@ -0,0 +1,285 @@
+" Base16 shapeshifter (https://github.com/chriskempson/base16)
+" Scheme: Tyler Benziger (http://tybenz.com)
+
+" GUI color definitions
+let s:gui00 = "000000"
+let s:gui01 = "040404"
+let s:gui02 = "102015"
+let s:gui03 = "343434"
+let s:gui04 = "555555"
+let s:gui05 = "ababab"
+let s:gui06 = "e0e0e0"
+let s:gui07 = "f9f9f9"
+let s:gui08 = "e92f2f"
+let s:gui09 = "e09448"
+let s:gui0A = "dddd13"
+let s:gui0B = "0ed839"
+let s:gui0C = "23edda"
+let s:gui0D = "3b48e3"
+let s:gui0E = "f996e2"
+let s:gui0F = "69542d"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-shapeshifter"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-solarized.vim b/colors/base16-solarized.vim
index aaa0645..d491f08 100644
--- a/colors/base16-solarized.vim
+++ b/colors/base16-solarized.vim
@@ -20,16 +20,16 @@ let s:gui0E = "6c71c4"
 let s:gui0F = "d33682"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 6fd52eb..3093cfb 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -20,16 +20,16 @@ let s:gui0E = "b294bb"
 let s:gui0F = "a3685a"
 
 " Terminal color definitions
-let s:cterm00 = "00"
-let s:cterm03 = "08"
-let s:cterm05 = "07"
-let s:cterm07 = "15"
-let s:cterm08 = "01"
-let s:cterm0A = "03"
-let s:cterm0B = "02"
-let s:cterm0C = "06"
-let s:cterm0D = "04"
-let s:cterm0E = "05"
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
 if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm01 = "18"
   let s:cterm02 = "19"
@@ -38,12 +38,12 @@ if exists('base16colorspace') && base16colorspace == "256"
   let s:cterm09 = "16"
   let s:cterm0F = "17"
 else
-  let s:cterm01 = "10"
-  let s:cterm02 = "11"
-  let s:cterm04 = "12"
-  let s:cterm06 = "13"
-  let s:cterm09 = "09"
-  let s:cterm0F = "14"
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
 endif
 
 " Theme setup
@@ -88,8 +88,6 @@ fun s:gui(color)
     return s:gui03
   elseif a:color == s:gui05
     return s:gui02
-  elseif a:color == s:gui05
-    return s:gui02
   elseif a:color == s:gui06
     return s:gui01
   elseif a:color == s:gui07
@@ -117,8 +115,6 @@ fun s:cterm(color)
     return s:cterm03
   elseif a:color == s:cterm05
     return s:cterm02
-  elseif a:color == s:cterm05
-    return s:cterm02
   elseif a:color == s:cterm06
     return s:cterm01
   elseif a:color == s:cterm07
@@ -136,14 +132,14 @@ call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
 call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
 call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
 call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
-call <sid>hi("IncSearch",     s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
 call <sid>hi("Italic",        "", "", "", "", "none")
 call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
-call <sid>hi("MatchParen",    s:gui03, s:gui00, s:cterm03, s:cterm00,  "reverse")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
 call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
 call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
-call <sid>hi("Search",        s:gui0A, s:gui01, s:cterm0A, s:cterm01,  "reverse")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
 call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
 call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
 call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
@@ -167,7 +163,7 @@ call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
 call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
 call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
-call <sid>hi("PMenuSel",      s:gui04, s:gui01, s:cterm04, s:cterm01, "reverse")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
 call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
 call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
@@ -269,6 +265,11 @@ call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
 call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
 call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
 
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
 
 " GitGutter highlighting
 call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
@@ -281,4 +282,4 @@ delf <sid>cterm
 
 " Remove color variables
 unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
-unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
\ No newline at end of file
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
new file mode 100644
index 0000000..97f524d
--- /dev/null
+++ b/colors/base16-twilight.vim
@@ -0,0 +1,285 @@
+" Base16 Twilight (https://github.com/chriskempson/base16)
+" Scheme: David Hart (http://hart-dev.com)
+
+" GUI color definitions
+let s:gui00 = "1e1e1e"
+let s:gui01 = "323537"
+let s:gui02 = "464b50"
+let s:gui03 = "5f5a60"
+let s:gui04 = "838184"
+let s:gui05 = "a7a7a7"
+let s:gui06 = "c3c3c3"
+let s:gui07 = "ffffff"
+let s:gui08 = "cf6a4c"
+let s:gui09 = "cda869"
+let s:gui0A = "f9ee98"
+let s:gui0B = "8f9d6a"
+let s:gui0C = "afc4db"
+let s:gui0D = "7587a6"
+let s:gui0E = "9b859d"
+let s:gui0F = "9b703f"
+
+" Terminal color definitions
+let s:cterm00 = "Black"
+let s:cterm03 = "DarkGray"
+let s:cterm05 = "Gray"
+let s:cterm07 = "White"
+let s:cterm08 = "DarkRed"
+let s:cterm0A = "Brown"
+let s:cterm0B = "DarkGreen"
+let s:cterm0C = "DarkCyan"
+let s:cterm0D = "DarkBlue"
+let s:cterm0E = "DarkMagenta"
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = "18"
+  let s:cterm02 = "19"
+  let s:cterm04 = "20"
+  let s:cterm06 = "21"
+  let s:cterm09 = "16"
+  let s:cterm0F = "17"
+else
+  let s:cterm01 = "Green"
+  let s:cterm02 = "Yellow"
+  let s:cterm04 = "Blue"
+  let s:cterm06 = "Magenta"
+  let s:cterm09 = "Red"
+  let s:cterm0F = "Cyan"
+endif
+
+" Theme setup
+hi clear
+syntax reset
+let g:colors_name = "base16-twilight"
+
+" Highlighting function
+fun <sid>hi(group, guifg, guibg, ctermfg, ctermbg, attr)
+  if a:guifg != ""
+    exec "hi " . a:group . " guifg=#" . s:gui(a:guifg)
+  endif
+  if a:guibg != ""
+    exec "hi " . a:group . " guibg=#" . s:gui(a:guibg)
+  endif
+  if a:ctermfg != ""
+    exec "hi " . a:group . " ctermfg=" . s:cterm(a:ctermfg)
+  endif
+  if a:ctermbg != ""
+    exec "hi " . a:group . " ctermbg=" . s:cterm(a:ctermbg)
+  endif
+  if a:attr != ""
+    exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+  endif
+endfun
+
+" Return GUI color for light/dark variants
+fun s:gui(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:gui00
+    return s:gui07
+  elseif a:color == s:gui01
+    return s:gui06
+  elseif a:color == s:gui02
+    return s:gui05
+  elseif a:color == s:gui03
+    return s:gui04
+  elseif a:color == s:gui04
+    return s:gui03
+  elseif a:color == s:gui05
+    return s:gui02
+  elseif a:color == s:gui06
+    return s:gui01
+  elseif a:color == s:gui07
+    return s:gui00
+  endif
+
+  return a:color
+endfun
+
+" Return terminal color for light/dark variants
+fun s:cterm(color)
+  if &background == "dark"
+    return a:color
+  endif
+
+  if a:color == s:cterm00
+    return s:cterm07
+  elseif a:color == s:cterm01
+    return s:cterm06
+  elseif a:color == s:cterm02
+    return s:cterm05
+  elseif a:color == s:cterm03
+    return s:cterm04
+  elseif a:color == s:cterm04
+    return s:cterm03
+  elseif a:color == s:cterm05
+    return s:cterm02
+  elseif a:color == s:cterm06
+    return s:cterm01
+  elseif a:color == s:cterm07
+    return s:cterm00
+  endif
+
+  return a:color
+endfun
+
+" Vim editor colors
+call <sid>hi("Bold",          "", "", "", "", "bold")
+call <sid>hi("Debug",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Directory",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("ErrorMsg",      s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("Exception",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("FoldColumn",    "", s:gui01, "", s:cterm01, "")
+call <sid>hi("Folded",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("IncSearch",     s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none")
+call <sid>hi("Italic",        "", "", "", "", "none")
+call <sid>hi("Macro",         s:gui08, "", s:cterm08, "", "")
+call <sid>hi("MatchParen",    s:gui00, s:gui03, s:cterm00, s:cterm03,  "")
+call <sid>hi("ModeMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("MoreMsg",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Question",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Search",        s:gui01, s:gui0A, s:cterm01, s:cterm0A,  "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("TooLong",       s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Underlined",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Visual",        "", s:gui02, "", s:cterm02, "")
+call <sid>hi("VisualNOS",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WarningMsg",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("WildMenu",      s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Title",         s:gui0D, "", s:cterm0D, "", "none")
+call <sid>hi("Conceal",       s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("Cursor",        s:gui00, s:gui05, s:cterm00, s:cterm05, "")
+call <sid>hi("NonText",       s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Normal",        s:gui05, s:gui00, s:cterm05, s:cterm00, "")
+call <sid>hi("LineNr",        s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SignColumn",    s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("SpecialKey",    s:gui03, "", s:cterm03, "", "")
+call <sid>hi("StatusLine",    s:gui04, s:gui02, s:cterm04, s:cterm02, "none")
+call <sid>hi("StatusLineNC",  s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("VertSplit",     s:gui02, s:gui02, s:cterm02, s:cterm02, "none")
+call <sid>hi("ColorColumn",   "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorColumn",  "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLine",    "", s:gui01, "", s:cterm01, "none")
+call <sid>hi("CursorLineNr",  s:gui03, s:gui01, s:cterm03, s:cterm01, "")
+call <sid>hi("PMenu",         s:gui04, s:gui01, s:cterm04, s:cterm01, "none")
+call <sid>hi("PMenuSel",      s:gui01, s:gui04, s:cterm01, s:cterm04, "")
+call <sid>hi("TabLine",       s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineFill",   s:gui03, s:gui01, s:cterm03, s:cterm01, "none")
+call <sid>hi("TabLineSel",    s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none")
+
+" Standard syntax highlighting
+call <sid>hi("Boolean",      s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Character",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("Comment",      s:gui03, "", s:cterm03, "", "")
+call <sid>hi("Conditional",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Constant",     s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Define",       s:gui0E, "", s:cterm0E, "", "none")
+call <sid>hi("Delimiter",    s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Float",        s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Function",     s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Identifier",   s:gui08, "", s:cterm08, "", "none")
+call <sid>hi("Include",      s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("Keyword",      s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Label",        s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Number",       s:gui09, "", s:cterm09, "", "")
+call <sid>hi("Operator",     s:gui05, "", s:cterm05, "", "none")
+call <sid>hi("PreProc",      s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Repeat",       s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Special",      s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("SpecialChar",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("Statement",    s:gui08, "", s:cterm08, "", "")
+call <sid>hi("StorageClass", s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("String",       s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("Structure",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("Tag",          s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("Todo",         s:gui0A, s:gui01, s:cterm0A, s:cterm01, "")
+call <sid>hi("Type",         s:gui09, "", s:cterm09, "", "none")
+call <sid>hi("Typedef",      s:gui0A, "", s:cterm0A, "", "")
+
+" Spelling highlighting
+call <sid>hi("SpellBad",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellLocal",   "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellCap",     "", s:gui00, "", s:cterm00, "undercurl")
+call <sid>hi("SpellRare",    "", s:gui00, "", s:cterm00, "undercurl")
+
+" Additional diff highlighting
+call <sid>hi("DiffAdd",      s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffChange",   s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffDelete",   s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffText",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffAdded",    s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffFile",     s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+call <sid>hi("DiffNewFile",  s:gui0B, s:gui00, s:cterm0B, s:cterm00, "")
+call <sid>hi("DiffLine",     s:gui0D, s:gui00, s:cterm0D, s:cterm00, "")
+call <sid>hi("DiffRemoved",  s:gui08, s:gui00, s:cterm08, s:cterm00, "")
+
+" Ruby highlighting
+call <sid>hi("rubyAttribute",               s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("rubyConstant",                s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("rubyInterpolation",           s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyInterpolationDelimiter",  s:gui0F, "", s:cterm0F, "", "")
+call <sid>hi("rubyRegexp",                  s:gui0C, "", s:cterm0C, "", "")
+call <sid>hi("rubySymbol",                  s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("rubyStringDelimiter",         s:gui0B, "", s:cterm0B, "", "")
+
+" PHP highlighting
+call <sid>hi("phpMemberSelector",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpComparison",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("phpParent",          s:gui05, "", s:cterm05, "", "")
+
+" HTML highlighting
+call <sid>hi("htmlBold",    s:gui0A, "", s:cterm0A, "", "")
+call <sid>hi("htmlItalic",  s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("htmlEndTag",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("htmlTag",     s:gui05, "", s:cterm05, "", "")
+
+" CSS highlighting
+call <sid>hi("cssBraces",      s:gui05, "", s:cterm05, "", "")
+call <sid>hi("cssClassName",   s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("cssColor",       s:gui0C, "", s:cterm0C, "", "")
+
+" SASS highlighting
+call <sid>hi("sassidChar",     s:gui08, "", s:cterm08, "", "")
+call <sid>hi("sassClassChar",  s:gui09, "", s:cterm09, "", "")
+call <sid>hi("sassInclude",    s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "")
+call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "")
+
+" JavaScript highlighting
+call <sid>hi("javaScript",        s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptBraces",  s:gui05, "", s:cterm05, "", "")
+call <sid>hi("javaScriptNumber",  s:gui09, "", s:cterm09, "", "")
+
+" Markdown highlighting
+call <sid>hi("markdownCode",              s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownCodeBlock",         s:gui0B, "", s:cterm0B, "", "")
+call <sid>hi("markdownHeadingDelimiter",  s:gui0D, "", s:cterm0D, "", "")
+
+" Git highlighting
+call <sid>hi("gitCommitOverflow",  s:gui08, "", s:cterm08, "", "")
+call <sid>hi("gitCommitSummary",   s:gui0B, "", s:cterm0B, "", "")
+  
+" GitGutter highlighting
+call <sid>hi("GitGutterAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("GitGutterChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("GitGutterDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+" Signify highlighting
+call <sid>hi("SignifySignAdd",     s:gui0B, s:gui01, s:cterm0B, s:cterm01, "")
+call <sid>hi("SignifySignChange",  s:gui0D, s:gui01, s:cterm0D, s:cterm01, "")
+call <sid>hi("SignifySignDelete",  s:gui08, s:gui01, s:cterm08, s:cterm01, "")
+
+
+" GitGutter highlighting
+call <sid>hi("NERDTreeDirSlash",  s:gui0D, "", s:cterm0D, "", "")
+call <sid>hi("NERDTreeExecFile",  s:gui05, "", s:cterm05, "", "")
+
+" Remove functions
+delf <sid>hi
+delf <sid>gui
+delf <sid>cterm
+
+" Remove color variables
+unlet s:gui00 s:gui01 s:gui02 s:gui03  s:gui04  s:gui05  s:gui06  s:gui07  s:gui08  s:gui09 s:gui0A  s:gui0B  s:gui0C  s:gui0D  s:gui0E  s:gui0F
+unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F